diff --git a/.editorconfig b/.editorconfig index 7c2ae4c00..0a71769c2 100644 --- a/.editorconfig +++ b/.editorconfig @@ -3,12 +3,14 @@ root = true [*] end_of_line = lf insert_final_newline = true - -[*.java] charset = utf-8 -indent_style = tab +indent_style = space indent_size = 4 trim_trailing_whitespace = true +max_line_length = 120 [*.md] trim_trailing_whitespace = false + +[*.{json,toml,properties,yml}] +indent_size = 2 \ No newline at end of file diff --git a/.gitattributes b/.gitattributes index 16c2a9cc7..e38c04ddc 100644 --- a/.gitattributes +++ b/.gitattributes @@ -9,6 +9,3 @@ src/generated/**/*.json text eol=lf *.md text eol=lf /gradlew text eol=lf /gradlew.bat text eol=lf - -# Keep the original whitespace in checksum-verified patch files. -/ci-fixtures/tools/*.patch whitespace=-blank-at-eol,-blank-at-eof diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index dc0b3a4c7..3700574e6 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,158 +1,69 @@ -name: Base Metals 1.19.4 CI +name: Base Metals CI on: push: branches: - - master-1.19.4 + - 'master-1.21.1-neo' - 'feature/**' pull_request: branches: - - master-1.19.4 + - 'master-1.21.1-neo' + +env: + JAVA_VERSION: '21' permissions: contents: read + checks: write + pull-requests: write concurrency: - group: basemetals-1.19.4-${{ github.workflow }}-${{ github.ref }} + group: basemetals-ci-${{ github.ref }} cancel-in-progress: true jobs: build: - name: Build, test, and audit + name: Build & Test runs-on: ubuntu-latest - timeout-minutes: 90 + timeout-minutes: 20 steps: - - name: Check out source - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7 + - name: Checkout code + uses: actions/checkout@v4 - - name: Install pinned Java 17 runtime and toolchain - uses: actions/setup-java@b6effb05e454b25005698d916606bdc6ffcbf961 # v5 + - name: Set up JDK ${{ env.JAVA_VERSION }} + uses: actions/setup-java@v4 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 first candidate - run: | - chmod +x ./gradlew - ./gradlew clean check build javadoc verifyReleaseArtifacts writeReleaseChecksums \ - -PorespawnVerificationRepository="${{ steps.orespawn.outputs.repository }}" \ - --no-daemon --stacktrace - first="$RUNNER_TEMP/basemetals-first" - mkdir -p "$first" - cp build/libs/BaseMetals-3.1.0.119041.jar "$first/" - cp build/libs/BaseMetals-3.1.0.119041-sources.jar "$first/" - cp build/libs/BaseMetals-3.1.0.119041-javadoc.jar "$first/" - cp build/release/SHA256SUMS "$first/" - - - name: Rebuild and prove byte-identical archives - run: | - ./gradlew clean assemble verifyReleaseArtifacts writeReleaseChecksums \ - -PorespawnVerificationRepository="${{ steps.orespawn.outputs.repository }}" \ - --no-daemon --stacktrace - cmp "$RUNNER_TEMP/basemetals-first/BaseMetals-3.1.0.119041.jar" build/libs/BaseMetals-3.1.0.119041.jar - cmp "$RUNNER_TEMP/basemetals-first/BaseMetals-3.1.0.119041-sources.jar" build/libs/BaseMetals-3.1.0.119041-sources.jar - cmp "$RUNNER_TEMP/basemetals-first/BaseMetals-3.1.0.119041-javadoc.jar" build/libs/BaseMetals-3.1.0.119041-javadoc.jar - cmp "$RUNNER_TEMP/basemetals-first/SHA256SUMS" build/release/SHA256SUMS + java-version: ${{ env.JAVA_VERSION }} + distribution: 'microsoft' - - name: Run all required GameTests - run: >- - timeout 15m ./gradlew runGameTestServer - -PorespawnVerificationRepository=${{ steps.orespawn.outputs.repository }} - --no-daemon --stacktrace + - name: Setup Gradle + uses: gradle/actions/setup-gradle@v4 - - name: Install official Forge packaged runtimes - id: forge-runtimes - run: | - server_runtime="$RUNNER_TEMP/forge-1.19.4-45.4.0-server" - client_runtime="$RUNNER_TEMP/forge-1.19.4-45.4.0-client" - installer="$RUNNER_TEMP/forge-1.19.4-45.4.0-installer.jar" - mkdir -p "$server_runtime" "$client_runtime" - curl --fail --location --retry 3 \ - --output "$installer" \ - https://maven.minecraftforge.net/net/minecraftforge/forge/1.19.4-45.4.0/forge-1.19.4-45.4.0-installer.jar - echo "6643bb8c21f409cc528ff656daf60c206d304cc77bf529bbbab4b336004dfc53 $installer" | sha256sum --check --strict - ( - cd "$server_runtime" - java -jar "$installer" --installServer - ) - python3 gradle/prepare-forge-client-runtime.py \ - --installer "$installer" \ - --runtime "$client_runtime" \ - --java "$JAVA_HOME/bin/java" - echo "server_runtime=$server_runtime" >> "$GITHUB_OUTPUT" - echo "client_runtime=$client_runtime" >> "$GITHUB_OUTPUT" + - name: Grant execute permission for gradlew + run: chmod +x ./gradlew - - name: Run exact packaged dedicated-server smoke - run: >- - timeout 15m ./gradlew packagedServerStartupSmoke - -PpackagedForgeServerRuntime=${{ steps.forge-runtimes.outputs.server_runtime }} - -PorespawnVerificationRepository=${{ steps.orespawn.outputs.repository }} - --no-daemon --stacktrace + - name: Build with Gradle + env: + BUILD_NUMBER: ${{ github.run_number }} + run: ./gradlew assemble - - name: Run exact packaged integrated-world client smoke - run: >- - timeout 15m xvfb-run -a ./gradlew packagedClientStartupSmoke - -PpackagedForgeClientRuntime=${{ steps.forge-runtimes.outputs.client_runtime }} - -PorespawnVerificationRepository=${{ steps.orespawn.outputs.repository }} - --no-daemon --stacktrace + - name: Run tests + run: ./gradlew check - - name: Run bounded development integrated-world client smoke - run: >- - timeout 15m xvfb-run -a ./gradlew runClient - -PintegratedWorldSmoke=true - -PintegratedWorldSmokeName=basemetals-ci-${{ github.run_id }} - -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 + - name: Publish Test Report + uses: mikepenz/action-junit-report@v4 + if: success() || failure() with: - name: BaseMetals-1.19.4-${{ github.sha }} - if-no-files-found: error - retention-days: 30 - path: | - build/libs/BaseMetals-3.1.0.119041.jar - build/libs/BaseMetals-3.1.0.119041-sources.jar - build/libs/BaseMetals-3.1.0.119041-javadoc.jar - build/release/SHA256SUMS - CHANGELOG.txt + report_paths: '**/build/test-results/test/TEST-*.xml' - - name: Upload bounded diagnostics on failure - if: failure() - uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7 + - name: Upload build artifacts + if: success() + uses: actions/upload-artifact@v4 with: - name: BaseMetals-1.19.4-diagnostics-${{ github.sha }} - if-no-files-found: ignore + name: ${{ github.event.repository.name }}-${{ github.sha }} + if-no-files-found: error retention-days: 14 path: | - build/test-results/** - build/reports/** - run/logs/** - run/crash-reports/** - run-gametest/logs/** - run-gametest/crash-reports/** - run-integrated-smoke/logs/** - run-integrated-smoke/crash-reports/** - run-data/logs/** - build/problems/** - build/packaged-server-run/logs/** - build/packaged-server-run/crash-reports/** - build/packaged-client-run/logs/** - build/packaged-client-run/crash-reports/** + build/libs/*.jar + CHANGELOG.md diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 7b035dabb..a7beec717 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -3,11 +3,11 @@ name: CodeQL on: push: branches: - - master-1.19.4 + - 'master-1.21.1-neo' - 'feature/**' pull_request: branches: - - master-1.19.4 + - 'master-1.21.1-neo' permissions: actions: read @@ -18,39 +18,30 @@ jobs: analyze: name: Analyze Java runs-on: ubuntu-latest - timeout-minutes: 45 + timeout-minutes: 30 steps: - name: Check out source - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7 + uses: actions/checkout@v4 - - name: Install pinned Java 17 runtime and toolchain - uses: actions/setup-java@b6effb05e454b25005698d916606bdc6ffcbf961 # v5 + - name: Install Java 21 + uses: actions/setup-java@v4 with: - distribution: temurin - java-version: '17.0.1+12' + distribution: 'microsoft' + java-version: '21' - 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" + uses: gradle/actions/setup-gradle@v4 - name: Initialize CodeQL - uses: github/codeql-action/init@db488ddef3bf6cb639b32c2e9a7c0a7ea8271d28 # v4 + uses: github/codeql-action/init@v3 with: languages: java-kotlin - name: Compile production code run: | chmod +x ./gradlew - ./gradlew clean classes --rerun-tasks --no-build-cache \ - -PorespawnVerificationRepository="${{ steps.orespawn.outputs.repository }}" \ - --no-daemon --stacktrace + ./gradlew clean classes --no-daemon - name: Analyze - uses: github/codeql-action/analyze@db488ddef3bf6cb639b32c2e9a7c0a7ea8271d28 # v4 + uses: github/codeql-action/analyze@v3 diff --git a/.github/workflows/release-on-tag.yml b/.github/workflows/release-on-tag.yml index 793f251b9..ca7ad555f 100644 --- a/.github/workflows/release-on-tag.yml +++ b/.github/workflows/release-on-tag.yml @@ -1,83 +1,107 @@ -name: Validate Base Metals release tag +name: Upload Release Artifacts on: push: tags: - '*.*.*.*' + - 'v*.*.*.*' -permissions: - actions: read - contents: read - -concurrency: - group: basemetals-release-tag-${{ github.ref_name }} - cancel-in-progress: false +env: + JAVA_VERSION: '21' + TAG: ${{ github.ref_name }} + BUILD_NUMBER: ${{ github.run_number }} + MAVEN_UPLOAD_URL: ${{ secrets.MAVEN_UPLOAD_URL }} + MAVEN_UPLOAD_USERNAME: ${{ secrets.MAVEN_UPLOAD_USERNAME }} + MAVEN_UPLOAD_PASSWORD: ${{ secrets.MAVEN_UPLOAD_PASSWORD }} jobs: - validate-release-tag: - name: Validate tag for manual release confirmation - if: github.repository == 'MinecraftModDevelopmentMods/BaseMetals' + build: + name: Build & Publish Maven runs-on: ubuntu-latest - timeout-minutes: 10 + permissions: + id-token: write + attestations: write + contents: read + steps: + - name: Checkout code + uses: actions/checkout@v4 + + - name: Set up JDK ${{ env.JAVA_VERSION }} + uses: actions/setup-java@v4 + with: + java-version: ${{ env.JAVA_VERSION }} + distribution: 'microsoft' + + - name: Setup Gradle + uses: gradle/actions/setup-gradle@v4 + + - name: Grant execute permission for gradlew + run: chmod +x ./gradlew + + - name: Build with Gradle + run: ./gradlew assemble + + - name: Maven Release + if: env.MAVEN_UPLOAD_URL != '' + run: ./gradlew publish + + - name: Upload build artifacts + uses: actions/upload-artifact@v4 + with: + name: ${{ github.event.repository.name }}-${{ env.TAG }} + path: build/libs/*.jar + - name: Generate build attestation + uses: actions/attest-build-provenance@v1 + with: + subject-path: | + build/libs/*.jar + !build/libs/*-sources.jar + !build/libs/*-javadoc.jar + + publish_github: + name: Publish (GitHub Releases) + needs: build + runs-on: ubuntu-latest + permissions: + contents: write steps: - - name: Check out tagged source - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7 + - name: Download build artifacts + uses: actions/download-artifact@v4 with: - fetch-depth: 0 + name: ${{ github.event.repository.name }}-${{ env.TAG }} + path: build/libs - - 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 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: Publish (GitHub Releases) + id: publish_github + uses: Kira-NT/mc-publish@v3 + with: + github-token: ${{ github.token }} + files: | + build/libs/*.jar - - 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 CI check." - echo "Nothing has been published by this validation workflow." - echo - echo "Use the default-branch Release Base Metals dispatcher with explicit live-publication confirmation." - echo "$RELEASE_WORKFLOW_URL" - } >> "$GITHUB_STEP_SUMMARY" + publish_curseforge: + name: Publish (CurseForge) + needs: build + runs-on: ubuntu-latest + if: env.CURSEFORGE_TOKEN != '' + env: + CURSEFORGE_TOKEN: ${{ secrets.CURSEFORGE_TOKEN }} + steps: + - name: Download build artifacts + uses: actions/download-artifact@v4 + with: + name: ${{ github.event.repository.name }}-${{ env.TAG }} + path: build/libs + + - name: Publish (CurseForge) + uses: Kira-NT/mc-publish@v3 + with: + curseforge-token: ${{ secrets.CURSEFORGE_TOKEN }} + curseforge-id: 240967 + loaders: neoforge + game-versions: 1.21.1 + version: ${{ env.TAG }} + files: | + build/libs/!(*-@(sources|javadoc)).jar + build/libs/*-@(sources|javadoc).jar diff --git a/.github/workflows/validate-gradle-build.yml b/.github/workflows/validate-gradle.yml similarity index 57% rename from .github/workflows/validate-gradle-build.yml rename to .github/workflows/validate-gradle.yml index 2d52c08f6..1e82835c7 100644 --- a/.github/workflows/validate-gradle-build.yml +++ b/.github/workflows/validate-gradle.yml @@ -3,11 +3,11 @@ name: Validate Gradle Wrapper on: push: branches: - - master-1.19.4 + - 'master-1.21.1-neo' - 'feature/**' pull_request: branches: - - master-1.19.4 + - 'master-1.21.1-neo' permissions: contents: read @@ -18,6 +18,6 @@ jobs: runs-on: ubuntu-latest steps: - name: Check out source - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7 + uses: actions/checkout@v4 - name: Validate wrapper integrity - uses: gradle/actions/wrapper-validation@9c971963bec38e04b3d30dcc455b5382be2fdbfb # v6 + uses: gradle/actions/wrapper-validation@v4 diff --git a/CHANGELOG.txt b/CHANGELOG.md similarity index 80% rename from CHANGELOG.txt rename to CHANGELOG.md index f221dea03..f3d9b5f6e 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -Base Metals 3.1.0.121012 (in development) +### Base Metals 4.0.0.121012 (in development) - Port Base Metals to Minecraft 1.21.1 and NeoForge. - Restore recipe-book unlocks and armour advancements in the new data-pack folders. @@ -9,8 +9,12 @@ Base Metals 3.1.0.121012 (in development) - Resolve enchanted smith trades through the world's enchantment registry. - Add optional regression tests without changing the normal build or deployment tasks. - Document the Eclipse cache settings needed to avoid duplicate launcher modules. +- Build on MMDLib 2.0: materials, anvils and the human detector are MMDLib definitions, and armour and weapon effects are MMDLib event handlers. +- Bring the vanilla extras (diamond doors, iron crackhammers, emerald armour, molten diamond and so on) back from MMDLib as `basemetals:` content. Their powders keep the 1.12 `_powder` names, and their molten metals are Base Metals fluids. Base Metals keeps its own copper set rather than MMDLib's vanilla-copper extension. +- Compatibility double slabs are now `_double_slab`; old saves are remapped. +- Crystals, shards, clumps and dirty powders exist only when Mekanism is installed. -Base Metals 3.1.0.119041 +### Base Metals 3.1.0.119041 - Port the 1.18 version to Minecraft 1.19.4 and Forge 45.4.0. - Keep raw metals, Kiri's ore overlays, High/Low Fantasy modes and the fixes from 1.18. @@ -22,7 +26,7 @@ Base Metals 3.1.0.119041 - Require the published OreSpawn 4.1.0.119041 release, keeping the same ore rules and copper defaults. - Keep unsupported optional-mod jars out of development launches. Their integration data is retained for future compatibility work. -Base Metals 3.1.0.118021 +### Base Metals 3.1.0.118021 - Bring raw metals, ore overlays and High/Low Fantasy modes to Minecraft 1.18.2, along with the fixes from the earlier ports. - Use KiriCattus' ore overlays over vanilla block textures, including resource-pack replacements. @@ -39,7 +43,7 @@ Base Metals 3.1.0.118021 - Keep optional mods out of normal development launches. Add a separate client profile for Tinkers, Mantle and compatibility testing. - Fix flickering bar textures by using the correct centre-post and end pieces, without changing their collision shapes. -Base Metals 3.0.1.118021 +### Base Metals 3.0.1.118021 - Modernize the Minecraft 1.18.2 build to ForgeGradle 7.0.34 and Gradle 9.6.1. - Qualify against the exact OreSpawn 4.0.16.118021 CurseForge release while retaining the supported OreSpawn 4.x runtime range. @@ -47,4 +51,4 @@ Base Metals 3.0.1.118021 - Isolate GameTests and smoke fixtures from production artifacts and Eclipse production launches. - Add pinned GitHub Actions for build, GameTests, generated-data drift, CodeQL, wrapper validation, and target-qualified releases. -Gameplay, registry IDs, recipes, save migration, and the OreSpawn provider rules are unchanged from Base Metals 3.0.0. +- Gameplay, registry IDs, recipes, save migration, and the OreSpawn provider rules are unchanged from Base Metals 3.0.0. diff --git a/LICENSE b/LICENSE.md similarity index 100% rename from LICENSE rename to LICENSE.md diff --git a/README.md b/README.md index c15414cea..ca4b29da2 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,30 @@ [![Discord](https://img.shields.io/badge/Discord-MMD-green.svg?style=flat&logo=Discord)](https://discord.moddev.zone) [![CurseForge downloads](https://cf.way2muchnoise.eu/full_base-metals_downloads.svg)](https://www.curseforge.com/minecraft/mc-mods/base-metals) [![Supported Minecraft versions](https://cf.way2muchnoise.eu/versions/Minecraft_base-metals_all.svg)](https://www.curseforge.com/minecraft/mc-mods/base-metals) +

Base Metals

+ + Discord server invite. + +======= +[![Discord](https://img.shields.io/badge/Discord-MMD-green.svg?style=flat&logo=Discord)](https://discord.moddev.zone) +[![CurseForge downloads](https://cf.way2muchnoise.eu/full_base-metals_downloads.svg)](https://www.curseforge.com/minecraft/mc-mods/base-metals) +[![Supported Minecraft versions](https://cf.way2muchnoise.eu/versions/Minecraft_base-metals_all.svg)](https://www.curseforge.com/minecraft/mc-mods/base-metals) + + + CurseForge Badge. + + + + Github + + + + Website link. + -# Base Metals + + Build and test + Base Metals adds historically common metals, useful alloys, and fantasy metals to Minecraft. Depending on the material, these are available as ores, storage @@ -11,7 +33,7 @@ shields, bows, crossbows, arrows, and bolts. The mod also includes Crack Hammers, scythes, metal anvils, the human detector, villager trades, advancements, and structure loot. -This is the Minecraft 1.21.1 NeoForge port, `3.1.0.121012`. It includes raw +This is the Minecraft 1.21.1 NeoForge port, `4.0.0.121012`. It includes raw metals, ore texture overlays and High/Low Fantasy modes. Existing Base Metals items and blocks keep their registry IDs. OreSpawn handles ore generation; MMDLib and Additional Loot Tables are no longer needed. @@ -24,7 +46,7 @@ Tables are no longer needed. - OreSpawn `[4.0.16.121012,5.0.0)` for Minecraft 1.21.1 NeoForge on both client and server This version builds against OreSpawn `4.0.16.121012`. Put -`BaseMetals-3.1.0.121012.jar` and a compatible OreSpawn JAR in the `mods` +`BaseMetals-4.0.0.121012.jar` and a compatible OreSpawn JAR in the `mods` directory. MMDLib and Additional Loot Tables must not be carried forward from an older installation. Mineralogy is optional. @@ -185,10 +207,10 @@ They do not change the build or deployment workflow. See [Port regression checks](tools/verification/README.md) for details. Release artifacts use Maven coordinate -`zone.moddev.mc.basemetals:BaseMetals:3.1.0.121012`. +`zone.moddev.mc.basemetals:BaseMetals:4.0.0.121012`. Report defects and compatibility problems through the [Base Metals issue tracker](https://github.com/MinecraftModDevelopmentMods/BaseMetals/issues). -Base Metals is licensed under [LGPL-2.1](LICENSE). Bundled or derived third-party +Base Metals is licensed under [LGPL-2.1](LICENSE.md). Bundled or derived third-party art is covered by the accompanying attribution and licence files. diff --git a/build.gradle b/build.gradle index b5c116ec2..a4588374a 100644 --- a/build.gradle +++ b/build.gradle @@ -1,94 +1,212 @@ plugins { - id 'java-library' - id 'eclipse' - id 'idea' - id 'net.neoforged.gradle.userdev' version '7.1.38' + id "java-library" + id "maven-publish" + id "net.neoforged.moddev" version "2.0.148" + id "idea" + id "eclipse" } -version = mod_version -group = mod_group_id +def ENV = System.getenv() +def tag = providers.environmentVariable("TAG") +def buildNumber = providers.environmentVariable("BUILD_NUMBER") -base { - archivesName = 'BaseMetals' -} +version = tag.orElse(provider { + "${mod_version}-development" + buildNumber.map { "+build.${it}" }.getOrElse("") +}).get() + + +println "Building ${project.name}-${version}" + +group = mod_group +base.archivesName = mod_archive_name java { toolchain.languageVersion = JavaLanguageVersion.of(21) + withSourcesJar() + withJavadocJar() } sourceSets { main.java.srcDir 'src/dataGenerator/java' + // Include resources generated by data generators. main.resources.srcDir 'src/generated/resources' - test { - java.setSrcDirs([]) - resources.setSrcDirs([]) - } -} -tasks.named('test') { - enabled = false + // Exclude common development only resources from finalized outputs + main.resources.exclude('**/*.bbmodel') // BlockBench project files + main.resources.exclude('**/.cache/**') // datagen cache files } -runs { - configureEach { - workingDirectory project.layout.projectDirectory.dir('run') - modSource project.sourceSets.main +repositories { + mavenCentral() + + maven { + url = uri('https://maven.covers1624.net/') } - client {} - server { - argument '--nogui' + + maven { + name = "ModDevZone" + url = uri("https://maven.moddev.zone/releases") + content { + includeGroup "zone.moddev.mc.orespawn" + includeGroup "zone.moddev.mc.lib" + } } - data { - systemProperty 'basemetals.projectDir', projectDir.absolutePath - workingDirectory project.layout.projectDirectory.dir('run-data') - arguments.addAll '--mod', mod_id, '--all', '--output', - file('src/generated/resources').absolutePath, '--existing', - file('src/main/resources').absolutePath + + maven { + url = uri("https://modmaven.dev/") } } -repositories { - mavenCentral() +neoForge { + version = project.neo_version - maven { url = uri('https://maven.covers1624.net/') } - maven { - name = 'ModDevZone' - url = uri('https://maven.moddev.zone/releases') - content { includeGroup 'zone.moddev.mc.orespawn' } + parchment { + mappingsVersion = project.parchment_mappings_version + minecraftVersion = project.parchment_minecraft_version } - maven { url = uri('https://modmaven.dev/') } - maven { url = uri('https://dvs1.progwml6.com/files/maven/') } + runs { + client { + client() + // Comma-separated list of namespaces to load gametests from. Empty = all namespaces. + systemProperty 'neoforge.enabledGameTestNamespaces', project.mod_id + } + + server { + server() + programArgument '--nogui' + systemProperty 'neoforge.enabledGameTestNamespaces', project.mod_id + } + + // 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 { + type = "gameTestServer" + systemProperty 'neoforge.enabledGameTestNamespaces', project.mod_id + } + + data { + data() + // example of overriding the workingDirectory set in configureEach above, uncomment if you want to use it + gameDirectory = file('run-data') + systemProperty "${mod_id}.projectDir", projectDir.absolutePath + + // Specify the modid for data generation, where to output the resulting resource, and where to look for existing resources. + programArguments.addAll(['--mod', mod_id, '--all', + '--output', file('src/generated/resources/').getAbsolutePath(), + '--existing', file('src/main/resources/').getAbsolutePath()]) + } + + // applies to all the run configs above + configureEach { + // 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. + systemProperty 'forge.logging.markers', 'REGISTRIES' + + // 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 + logLevel = org.slf4j.event.Level.DEBUG + } + } + + mods { + // define mod <-> source bindings + // these are used to tell the game which sources are for which mod + // multi mod projects should define one per mod + "${mod_id}" { + sourceSet(sourceSets.main) + } + } +} + +// Sets up a dependency configuration called 'localRuntime'. +// This configuration should be used instead of 'runtimeOnly' to declare +// a dependency that will be present for runtime testing but that is +// "optional", meaning it will not be pulled by dependents of this mod. +configurations { + runtimeClasspath.extendsFrom localRuntime } dependencies { + //TODO Move version strings to gradle.properties implementation "net.neoforged:neoforge:${neo_version}" implementation 'zone.moddev.mc.orespawn:OreSpawn:4.0.16.121012' + implementation "zone.moddev.mc.lib:mmdlib:${mmdlib_version}" // API only: Mekanism remains optional at runtime. Its public slurry // registry is required to provide the eight historical processing chains. compileOnly 'mekanism:Mekanism:1.21.1-10.7.19.85:api' } -tasks.named('processResources', ProcessResources) { - def properties = [ - minecraft_version: minecraft_version, - minecraft_version_range: minecraft_version_range, - neo_version: neo_version, - neo_version_range: neo_version_range, - loader_version_range: loader_version_range, - mod_id: mod_id, - mod_name: mod_name, - mod_license: mod_license, - mod_version: mod_version, - mod_authors: mod_authors, - mod_description: mod_description +// This block of code expands all declared replace properties in the specified resource targets. +// A missing property will result in an error. Properties are expanded using ${} Groovy notation. +var generateModMetadata = tasks.register("generateModMetadata", ProcessResources) { + var replaceProperties = [ + minecraft_version : minecraft_version, + neo_version : neo_version, + mod_id : mod_id, + mod_name : mod_name, + mod_license : mod_license, + mod_version : project.version.toString(), + mod_authors : mod_authors, + mod_description : mod_description ] - inputs.properties properties - filesMatching('META-INF/neoforge.mods.toml') { - expand properties - } + inputs.properties replaceProperties + expand replaceProperties + from "src/main/templates" + into "build/generated/sources/modMetadata" } +// Include the output of "generateModMetadata" as an input directory for the build +// this works with both building through Gradle and the IDE. +sourceSets.main.resources.srcDir generateModMetadata +// To avoid having to run "generateModMetadata" manually, make it run on every project reload +neoForge.ideSyncTask generateModMetadata tasks.withType(JavaCompile).configureEach { options.encoding = 'UTF-8' } + +tasks.named('jar', Jar) { + manifest { + attributes([ + "Specification-Title" : mod_id, + "Specification-Vendor" : mod_authors, + "Specification-Version" : '1', // We are version 1 of ourselves + "Implementation-Title" : project.name, + "Implementation-Version" : archiveVersion, + "Implementation-Vendor" : mod_authors + ]) + } +} + +publishing { + publications { + "mavenJava${project.name}"(MavenPublication) { + artifactId "${project.name}" + from components.java + } + } + repositories { + if (ENV.MAVEN_UPLOAD_URL) { + maven { + url = ENV.MAVEN_UPLOAD_URL + credentials { + username = ENV.MAVEN_UPLOAD_USERNAME + password = ENV.MAVEN_UPLOAD_PASSWORD + } + } + } + } +} + +// IDEA no longer automatically downloads sources/javadoc jars for dependencies, so we need to explicitly enable the behavior. +idea { + module { + downloadSources = true + downloadJavadoc = true + } +} diff --git a/changelog.mustache b/changelog.mustache deleted file mode 100644 index 076ba598a..000000000 --- a/changelog.mustache +++ /dev/null @@ -1,10 +0,0 @@ -{{#tags}} - {{#issues}} - {{#commits}} -**{{{messageTitle}}}** -{{#messageBodyItems}} - * {{.}} -{{/messageBodyItems}} - {{/commits}} - {{/issues}} -{{/tags}} diff --git a/ci-fixtures/tools/LICENSE-MAVENIZER.txt b/ci-fixtures/tools/LICENSE-MAVENIZER.txt deleted file mode 100644 index 8000a6faa..000000000 --- a/ci-fixtures/tools/LICENSE-MAVENIZER.txt +++ /dev/null @@ -1,504 +0,0 @@ - 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 deleted file mode 100644 index 284a2e36e..000000000 --- a/ci-fixtures/tools/README.md +++ /dev/null @@ -1,25 +0,0 @@ -# Forge 1.19.4 Mavenizer compatibility fixture - -`minecraft-mavenizer-0.5.21-orespawn-compat.jar` is a build-only derivative of -MinecraftForge MinecraftMavenizer `0.5.21`, source commit -`6968241ce7a0a902cdc1c534b976e8373a423091`. - -Forge 45's decompiler emits eight duplicate record accessors in Holder.Direct, -OptionInstance and MemoryCondition. The target-specific rules in -`minecraft-source-compatibility.json` remove only those accessors; Java -generates the same public methods automatically. Missing or ambiguous source -matches stop the build. The derivative also honors -`ORESPAWN_MAVENIZER_OFFLINE=true` by adding Mavenizer's native `--offline` -argument. This closes ForgeGradle 7's failure to propagate Gradle offline mode -to the subprocess; it does not alter normal online builds. - -`minecraft-mavenizer-0.5.21-orespawn-compat.patch` contains OreSpawn's source -changes. Apply it to the pinned upstream commit with `git am` to rebuild the -fixture using Temurin 25.0.3+9 and the upstream Gradle 9.1.0 wrapper. - -The fixture is used only while ForgeGradle prepares the development dependency. -It is checksum-verified by the build and excluded from every Base Metals artifact. -MinecraftMavenizer remains licensed LGPL-2.1-only; see `LICENSE-MAVENIZER.txt`. - -SHA-256: -`341B3FB10ABA6EA7DC612FBE519DC290A1C81867AED5DD320ACD783688AC49DE` diff --git a/ci-fixtures/tools/minecraft-mavenizer-0.5.21-orespawn-compat.jar b/ci-fixtures/tools/minecraft-mavenizer-0.5.21-orespawn-compat.jar deleted file mode 100644 index cc781cdb8..000000000 Binary files a/ci-fixtures/tools/minecraft-mavenizer-0.5.21-orespawn-compat.jar and /dev/null differ diff --git a/ci-fixtures/tools/minecraft-mavenizer-0.5.21-orespawn-compat.patch b/ci-fixtures/tools/minecraft-mavenizer-0.5.21-orespawn-compat.patch deleted file mode 100644 index 28951fba9..000000000 --- a/ci-fixtures/tools/minecraft-mavenizer-0.5.21-orespawn-compat.patch +++ /dev/null @@ -1,425 +0,0 @@ -From 10279f8ab1adadb87b56f36c85dbda3cf64e62b3 Mon Sep 17 00:00:00 2001 -From: OreSpawn Build Fixture -Date: Fri, 28 Aug 2026 15:21:10 +0100 -Subject: [PATCH] Add target-aware source compatibility rules - ---- - build.gradle | 2 +- - .../net/minecraftforge/mcmaven/cli/Main.java | 18 +- - .../minecraftforge/mcmaven/cli/MavenTask.java | 3 + - .../mcmaven/impl/util/ProcessUtils.java | 2 + - .../impl/util/SourceCompatibilityPatcher.java | 241 ++++++++++++++++++ - .../minecraft-source-compatibility.json | 58 +++++ - 6 files changed, 322 insertions(+), 2 deletions(-) - create mode 100644 src/main/java/net/minecraftforge/mcmaven/impl/util/SourceCompatibilityPatcher.java - create mode 100644 src/main/resources/META-INF/orespawn/minecraft-source-compatibility.json - -diff --git a/build.gradle b/build.gradle -index 439c211..9d99d81 100644 ---- a/build.gradle -+++ b/build.gradle -@@ -17,7 +17,7 @@ plugins { - gradleutils.displayName = 'Minecraft Mavenizer' - description = 'A pure-blooded Java tool to generate a maven repository for Minecraft artifacts.' - group = 'net.minecraftforge' --version = gitversion.tagOffset -+version = '0.5.21' - - println "Version: $version" - -diff --git a/src/main/java/net/minecraftforge/mcmaven/cli/Main.java b/src/main/java/net/minecraftforge/mcmaven/cli/Main.java -index eeda8a0..ad0fe93 100644 ---- a/src/main/java/net/minecraftforge/mcmaven/cli/Main.java -+++ b/src/main/java/net/minecraftforge/mcmaven/cli/Main.java -@@ -12,6 +12,7 @@ import static net.minecraftforge.mcmaven.impl.Mavenizer.LOGGER; - - import java.time.Duration; - import java.util.ArrayList; -+import java.util.Arrays; - - public class Main { - private static final String DISPLAY_NAME = "Minecraft Mavenizer"; -@@ -20,6 +21,8 @@ public class Main { - try { - LOGGER.capture(); - LOGGER.info(JarVersionInfo.of(DISPLAY_NAME, Main.class).implementation()); -+ LOGGER.info("OreSpawn Mavenizer compatibility runtime: Java " + Runtime.version() -+ + " (" + System.getProperty("java.vendor") + ")"); - run(args); - } catch (Throwable e) { - LOGGER.release(); -@@ -36,7 +39,8 @@ public class Main { - LOGGER.getInfo().printf(", took %d:%02d.%03d%n", time.toMinutesPart(), time.toSecondsPart(), time.toMillisPart()); - } - -- private static void run(String[] args) throws Exception { -+ private static void run(String[] suppliedArgs) throws Exception { -+ var args = withOfflinePropagation(suppliedArgs); - var parser = new OptionParser(); - parser.allowsUnrecognizedOptions(); - var tasks = Tasks.values(); -@@ -88,4 +92,16 @@ public class Main { - Tasks.MAVEN.callback.run(args, false); - } - } -+ -+ private static String[] withOfflinePropagation(String[] suppliedArgs) { -+ if (!"true".equalsIgnoreCase(System.getenv("ORESPAWN_MAVENIZER_OFFLINE")) -+ || Arrays.asList(suppliedArgs).contains("--offline")) { -+ return suppliedArgs; -+ } -+ -+ var propagated = Arrays.copyOf(suppliedArgs, suppliedArgs.length + 1); -+ propagated[suppliedArgs.length] = "--offline"; -+ LOGGER.info("OreSpawn Mavenizer compatibility: propagated Gradle offline mode"); -+ return propagated; -+ } - } -diff --git a/src/main/java/net/minecraftforge/mcmaven/cli/MavenTask.java b/src/main/java/net/minecraftforge/mcmaven/cli/MavenTask.java -index 825820e..39bb9b3 100644 ---- a/src/main/java/net/minecraftforge/mcmaven/cli/MavenTask.java -+++ b/src/main/java/net/minecraftforge/mcmaven/cli/MavenTask.java -@@ -21,6 +21,7 @@ import net.minecraftforge.mcmaven.impl.cache.Cache; - import net.minecraftforge.mcmaven.impl.mappings.Mappings; - import net.minecraftforge.mcmaven.impl.util.Artifact; - import net.minecraftforge.mcmaven.impl.util.Constants; -+import net.minecraftforge.mcmaven.impl.util.SourceCompatibilityPatcher; - - import static net.minecraftforge.mcmaven.impl.Mavenizer.LOGGER; - -@@ -194,6 +195,8 @@ class MavenTask { - if (artifact.getVersion() == null) - artifact = artifact.withVersion(options.valueOf(versionO)); - -+ SourceCompatibilityPatcher.selectTarget(artifact); -+ - var mappings = getMappings(options, mappingsO, parchmentO); - - var foreignRepositories = new HashMap(); -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..d8c14fd 100644 ---- a/src/main/java/net/minecraftforge/mcmaven/impl/util/ProcessUtils.java -+++ b/src/main/java/net/minecraftforge/mcmaven/impl/util/ProcessUtils.java -@@ -305,6 +305,8 @@ public final class ProcessUtils { - throw new RuntimeException("Failed to extract source jar: " + sourcesJar.getAbsolutePath(), e); - } - -+ SourceCompatibilityPatcher.apply(sourcesOutput.toPath(), outputJar.toPath()); -+ - // track source files - var sourcePath = new StringBuilder(); - var nonSourceFiles = new ArrayList(); -diff --git a/src/main/java/net/minecraftforge/mcmaven/impl/util/SourceCompatibilityPatcher.java b/src/main/java/net/minecraftforge/mcmaven/impl/util/SourceCompatibilityPatcher.java -new file mode 100644 -index 0000000..2cb07e0 ---- /dev/null -+++ b/src/main/java/net/minecraftforge/mcmaven/impl/util/SourceCompatibilityPatcher.java -@@ -0,0 +1,241 @@ -+/* -+ * Copyright (c) Forge Development LLC and contributors -+ * SPDX-License-Identifier: LGPL-2.1-only -+ */ -+package net.minecraftforge.mcmaven.impl.util; -+ -+import com.google.gson.Gson; -+import java.io.IOException; -+import java.io.InputStream; -+import java.nio.charset.StandardCharsets; -+import java.nio.file.Files; -+import java.nio.file.Path; -+import java.nio.file.StandardCopyOption; -+import java.security.MessageDigest; -+import java.security.NoSuchAlgorithmException; -+import java.util.HashSet; -+import java.util.LinkedHashMap; -+import java.util.List; -+import java.util.Map; -+import java.util.Objects; -+import java.util.stream.Collectors; -+ -+import static net.minecraftforge.mcmaven.impl.Mavenizer.LOGGER; -+ -+/** Applies exact, target-scoped source compatibility rules before recompilation. */ -+public final class SourceCompatibilityPatcher { -+ public static final String MANIFEST_RESOURCE = "META-INF/orespawn/minecraft-source-compatibility.json"; -+ private static final Gson GSON = new Gson(); -+ private static volatile String selectedArtifact; -+ -+ private SourceCompatibilityPatcher() {} -+ -+ public static void selectTarget(Artifact artifact) { -+ selectedArtifact = artifact.getDescriptor(); -+ } -+ -+ public static void apply(Path sourceRoot, Path outputJar) { -+ var artifact = selectedArtifact; -+ if (artifact == null) -+ throw new IllegalStateException("No Mavenizer target artifact was selected before source recompilation"); -+ -+ var manifestBytes = readManifest(); -+ var manifestHash = sha256(manifestBytes); -+ var manifest = GSON.fromJson(new String(manifestBytes, StandardCharsets.UTF_8), RuleManifest.class); -+ if (manifest == null || manifest.schema != 1 || manifest.targets == null) -+ throw new IllegalStateException("Unsupported or incomplete OreSpawn Mavenizer compatibility manifest"); -+ -+ var target = manifest.targets.get(artifact); -+ if (target == null) { -+ LOGGER.info("OreSpawn Mavenizer compatibility: no rules for " + artifact); -+ return; -+ } -+ -+ validateTarget(target); -+ var sourceByFile = new LinkedHashMap(); -+ var present = 0; -+ var absent = 0; -+ for (var rule : target.rules) { -+ var file = sourceRoot.resolve(rule.file).normalize(); -+ if (!file.startsWith(sourceRoot.normalize())) -+ throw new IllegalStateException("Compatibility rule escapes source root: " + rule.id); -+ if (!Files.isRegularFile(file)) -+ throw new IllegalStateException("Compatibility source file is missing for " + rule.id + ": " + rule.file); -+ -+ var source = sourceByFile.computeIfAbsent(file, -+ ignored -> readUtf8(file).replace("\r\n", "\n")); -+ requireCount(source, rule.recordDeclaration, 1, "record declaration", rule); -+ var accessorCount = countInRecord(source, rule); -+ if (accessorCount == 1) -+ present++; -+ else if (accessorCount == 0) -+ absent++; -+ else -+ throw new IllegalStateException("Ambiguous accessor match for " + rule.id + ": expected at most 1, found " + accessorCount); -+ } -+ -+ if (present != 0 && absent != 0) -+ throw new IllegalStateException("Partial compatibility state for " + artifact + ": " + present + " present, " + absent + " absent"); -+ -+ if (present == target.expectedApplications) { -+ for (var rule : target.rules) { -+ var file = sourceRoot.resolve(rule.file).normalize(); -+ var patched = replaceInRecord(sourceByFile.get(file), rule); -+ sourceByFile.put(file, patched); -+ } -+ sourceByFile.forEach(SourceCompatibilityPatcher::writeUtf8); -+ writeMarker(outputJar, artifact, manifestHash, target.rules); -+ LOGGER.info("OreSpawn Mavenizer compatibility: applied " + present + " rule(s) for " + artifact -+ + " [" + ruleIds(target.rules) + "] manifest SHA-256 " + manifestHash); -+ } else if (absent == target.expectedApplications) { -+ writeMarker(outputJar, artifact, manifestHash, target.rules); -+ LOGGER.info("OreSpawn Mavenizer compatibility: verified " + absent + " rule(s) already applied for " + artifact -+ + " [" + ruleIds(target.rules) + "] manifest SHA-256 " + manifestHash); -+ } else { -+ throw new IllegalStateException("Compatibility manifest expected " + target.expectedApplications -+ + " applications for " + artifact + " but defines " + target.rules.size()); -+ } -+ } -+ -+ private static void validateTarget(TargetRuleSet target) { -+ if (target.expectedApplications <= 0 || target.rules == null -+ || target.rules.size() != target.expectedApplications) { -+ throw new IllegalStateException("Compatibility target has an invalid expected application count"); -+ } -+ var ids = new HashSet(); -+ for (var rule : target.rules) { -+ Objects.requireNonNull(rule.id, "Compatibility rule id"); -+ Objects.requireNonNull(rule.file, "Compatibility rule file"); -+ Objects.requireNonNull(rule.recordDeclaration, "Compatibility record declaration"); -+ Objects.requireNonNull(rule.accessor, "Compatibility accessor"); -+ if (!ids.add(rule.id)) -+ throw new IllegalStateException("Duplicate compatibility rule id: " + rule.id); -+ } -+ } -+ -+ private static byte[] readManifest() { -+ try (InputStream in = SourceCompatibilityPatcher.class.getClassLoader().getResourceAsStream(MANIFEST_RESOURCE)) { -+ if (in == null) -+ throw new IllegalStateException("Missing embedded compatibility manifest: " + MANIFEST_RESOURCE); -+ return in.readAllBytes(); -+ } catch (IOException e) { -+ throw new IllegalStateException("Could not read embedded compatibility manifest", e); -+ } -+ } -+ -+ private static String readUtf8(Path file) { -+ try { -+ return Files.readString(file, StandardCharsets.UTF_8); -+ } catch (IOException e) { -+ throw new IllegalStateException("Could not read compatibility source " + file, e); -+ } -+ } -+ -+ private static void writeUtf8(Path file, String content) { -+ try { -+ Files.writeString(file, content, StandardCharsets.UTF_8); -+ } catch (IOException e) { -+ throw new IllegalStateException("Could not write compatibility source " + file, e); -+ } -+ } -+ -+ private static void writeMarker(Path outputJar, String artifact, String manifestHash, List rules) { -+ var marker = Path.of(outputJar.toString() + ".orespawn-compatibility"); -+ var temp = Path.of(marker.toString() + ".tmp"); -+ var content = "artifact=" + artifact + "\nmanifestSha256=" + manifestHash + "\nrules=" + ruleIds(rules) + "\n"; -+ try { -+ Files.writeString(temp, content, StandardCharsets.UTF_8); -+ try { -+ Files.move(temp, marker, StandardCopyOption.ATOMIC_MOVE, StandardCopyOption.REPLACE_EXISTING); -+ } catch (java.nio.file.AtomicMoveNotSupportedException ignored) { -+ Files.move(temp, marker, StandardCopyOption.REPLACE_EXISTING); -+ } -+ } catch (IOException e) { -+ throw new IllegalStateException("Could not write compatibility marker " + marker, e); -+ } -+ } -+ -+ private static String ruleIds(List rules) { -+ return rules.stream().map(rule -> rule.id).collect(Collectors.joining(",")); -+ } -+ -+ private static void requireCount(String source, String needle, int expected, String description, Rule rule) { -+ var actual = count(source, needle); -+ if (actual != expected) -+ throw new IllegalStateException("Invalid " + description + " match for " + rule.id -+ + ": expected " + expected + ", found " + actual); -+ } -+ -+ private static int count(String source, String needle) { -+ var count = 0; -+ var from = 0; -+ while ((from = source.indexOf(needle, from)) >= 0) { -+ count++; -+ from += needle.length(); -+ } -+ return count; -+ } -+ -+ private static int countInRecord(String source, Rule rule) { -+ var bounds = recordBounds(source, rule); -+ return count(source.substring(bounds[0], bounds[1]), rule.accessor); -+ } -+ -+ private static String replaceInRecord(String source, Rule rule) { -+ var bounds = recordBounds(source, rule); -+ var body = source.substring(bounds[0], bounds[1]); -+ var count = count(body, rule.accessor); -+ if (count != 1) -+ throw new IllegalStateException("Accessor state changed while applying " + rule.id -+ + ": expected 1, found " + count); -+ var patchedBody = body.replace(rule.accessor, ""); -+ if (count(patchedBody, rule.accessor) != 0) -+ throw new IllegalStateException("Accessor remained after applying " + rule.id); -+ return source.substring(0, bounds[0]) + patchedBody + source.substring(bounds[1]); -+ } -+ -+ private static int[] recordBounds(String source, Rule rule) { -+ var declaration = source.indexOf(rule.recordDeclaration); -+ var open = source.indexOf('{', declaration + rule.recordDeclaration.length()); -+ if (declaration < 0 || open < 0) -+ throw new IllegalStateException("Could not locate record body for " + rule.id); -+ var depth = 0; -+ for (var index = open; index < source.length(); index++) { -+ var character = source.charAt(index); -+ if (character == '{') -+ depth++; -+ else if (character == '}' && --depth == 0) -+ return new int[] {open, index + 1}; -+ } -+ throw new IllegalStateException("Unterminated record body for " + rule.id); -+ } -+ -+ private static String sha256(byte[] bytes) { -+ try { -+ var digest = MessageDigest.getInstance("SHA-256").digest(bytes); -+ var result = new StringBuilder(digest.length * 2); -+ for (byte value : digest) -+ result.append(String.format("%02X", value)); -+ return result.toString(); -+ } catch (NoSuchAlgorithmException e) { -+ throw new IllegalStateException("SHA-256 is unavailable", e); -+ } -+ } -+ -+ private static final class RuleManifest { -+ int schema; -+ Map targets; -+ } -+ -+ private static final class TargetRuleSet { -+ int expectedApplications; -+ List rules; -+ } -+ -+ private static final class Rule { -+ String id; -+ String file; -+ String recordDeclaration; -+ String accessor; -+ } -+} -diff --git a/src/main/resources/META-INF/orespawn/minecraft-source-compatibility.json b/src/main/resources/META-INF/orespawn/minecraft-source-compatibility.json -new file mode 100644 -index 0000000..462d571 ---- /dev/null -+++ b/src/main/resources/META-INF/orespawn/minecraft-source-compatibility.json -@@ -0,0 +1,58 @@ -+{ -+ "schema": 1, -+ "targets": { -+ "net.minecraftforge:forge:1.19.4-45.4.0": { -+ "expectedApplications": 8, -+ "rules": [ -+ { -+ "id": "forge-1.19.4-holder-direct-value", -+ "file": "net/minecraft/core/Holder.java", -+ "recordDeclaration": "public static record Direct(T value) implements Holder", -+ "accessor": "\n public T value() {\n return this.value;\n }\n" -+ }, -+ { -+ "id": "forge-1.19.4-option-alt-enum-value-setter", -+ "file": "net/minecraft/client/OptionInstance.java", -+ "recordDeclaration": "public static record AltEnum(List values, List altValues, BooleanSupplier altCondition, OptionInstance.CycleableValueSet.ValueSetter valueSetter, Codec codec)", -+ "accessor": "\n public OptionInstance.CycleableValueSet.ValueSetter valueSetter() {\n return this.valueSetter;\n }\n" -+ }, -+ { -+ "id": "forge-1.19.4-option-alt-enum-codec", -+ "file": "net/minecraft/client/OptionInstance.java", -+ "recordDeclaration": "public static record AltEnum(List values, List altValues, BooleanSupplier altCondition, OptionInstance.CycleableValueSet.ValueSetter valueSetter, Codec codec)", -+ "accessor": "\n public Codec codec() {\n return this.codec;\n }\n" -+ }, -+ { -+ "id": "forge-1.19.4-option-enum-codec", -+ "file": "net/minecraft/client/OptionInstance.java", -+ "recordDeclaration": "public static record Enum(List values, Codec codec)", -+ "accessor": "\n public Codec codec() {\n return this.codec;\n }\n" -+ }, -+ { -+ "id": "forge-1.19.4-option-lazy-enum-codec", -+ "file": "net/minecraft/client/OptionInstance.java", -+ "recordDeclaration": "public static record LazyEnum(Supplier> values, Function> validateValue, Codec codec)", -+ "accessor": "\n public Codec codec() {\n return this.codec;\n }\n" -+ }, -+ { -+ "id": "forge-1.19.4-memory-absent-memory", -+ "file": "net/minecraft/world/entity/ai/behavior/declarative/MemoryCondition.java", -+ "recordDeclaration": "public static record Absent(MemoryModuleType memory)", -+ "accessor": "\n public MemoryModuleType memory() {\n return this.memory;\n }\n" -+ }, -+ { -+ "id": "forge-1.19.4-memory-present-memory", -+ "file": "net/minecraft/world/entity/ai/behavior/declarative/MemoryCondition.java", -+ "recordDeclaration": "public static record Present(MemoryModuleType memory)", -+ "accessor": "\n public MemoryModuleType memory() {\n return this.memory;\n }\n" -+ }, -+ { -+ "id": "forge-1.19.4-memory-registered-memory", -+ "file": "net/minecraft/world/entity/ai/behavior/declarative/MemoryCondition.java", -+ "recordDeclaration": "public static record Registered(MemoryModuleType memory)", -+ "accessor": "\n public MemoryModuleType memory() {\n return this.memory;\n }\n" -+ } -+ ] -+ } -+ } -+} --- -2.55.0.windows.3 - diff --git a/ci-fixtures/tools/minecraft-source-compatibility.json b/ci-fixtures/tools/minecraft-source-compatibility.json deleted file mode 100644 index 462d5714e..000000000 --- a/ci-fixtures/tools/minecraft-source-compatibility.json +++ /dev/null @@ -1,58 +0,0 @@ -{ - "schema": 1, - "targets": { - "net.minecraftforge:forge:1.19.4-45.4.0": { - "expectedApplications": 8, - "rules": [ - { - "id": "forge-1.19.4-holder-direct-value", - "file": "net/minecraft/core/Holder.java", - "recordDeclaration": "public static record Direct(T value) implements Holder", - "accessor": "\n public T value() {\n return this.value;\n }\n" - }, - { - "id": "forge-1.19.4-option-alt-enum-value-setter", - "file": "net/minecraft/client/OptionInstance.java", - "recordDeclaration": "public static record AltEnum(List values, List altValues, BooleanSupplier altCondition, OptionInstance.CycleableValueSet.ValueSetter valueSetter, Codec codec)", - "accessor": "\n public OptionInstance.CycleableValueSet.ValueSetter valueSetter() {\n return this.valueSetter;\n }\n" - }, - { - "id": "forge-1.19.4-option-alt-enum-codec", - "file": "net/minecraft/client/OptionInstance.java", - "recordDeclaration": "public static record AltEnum(List values, List altValues, BooleanSupplier altCondition, OptionInstance.CycleableValueSet.ValueSetter valueSetter, Codec codec)", - "accessor": "\n public Codec codec() {\n return this.codec;\n }\n" - }, - { - "id": "forge-1.19.4-option-enum-codec", - "file": "net/minecraft/client/OptionInstance.java", - "recordDeclaration": "public static record Enum(List values, Codec codec)", - "accessor": "\n public Codec codec() {\n return this.codec;\n }\n" - }, - { - "id": "forge-1.19.4-option-lazy-enum-codec", - "file": "net/minecraft/client/OptionInstance.java", - "recordDeclaration": "public static record LazyEnum(Supplier> values, Function> validateValue, Codec codec)", - "accessor": "\n public Codec codec() {\n return this.codec;\n }\n" - }, - { - "id": "forge-1.19.4-memory-absent-memory", - "file": "net/minecraft/world/entity/ai/behavior/declarative/MemoryCondition.java", - "recordDeclaration": "public static record Absent(MemoryModuleType memory)", - "accessor": "\n public MemoryModuleType memory() {\n return this.memory;\n }\n" - }, - { - "id": "forge-1.19.4-memory-present-memory", - "file": "net/minecraft/world/entity/ai/behavior/declarative/MemoryCondition.java", - "recordDeclaration": "public static record Present(MemoryModuleType memory)", - "accessor": "\n public MemoryModuleType memory() {\n return this.memory;\n }\n" - }, - { - "id": "forge-1.19.4-memory-registered-memory", - "file": "net/minecraft/world/entity/ai/behavior/declarative/MemoryCondition.java", - "recordDeclaration": "public static record Registered(MemoryModuleType memory)", - "accessor": "\n public MemoryModuleType memory() {\n return this.memory;\n }\n" - } - ] - } - } -} diff --git a/gradle.properties b/gradle.properties index 61d98546f..b70e3d2e5 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,49 +1,26 @@ -# Sets default memory used for gradle commands. Can be overridden by user or command line properties. -# 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 - - - -## Environment Properties +# Project +mod_version = 4.0.0.121012 +mod_name = MMD Base Metals +mod_id=basemetals +mod_archive_name = basemetals +mod_description = Adds historically common metals, fantasy metals, alloys, tools, armour, and OreSpawn-powered deposits. +mod_group = zone.moddev.mc.basemetals +mod_authors=Cyanobacterium, jriwanek, DShadowWolf, GetDizzy611, SkyBlade1978, the MMD Team +mod_license = LGPL-2.1 +curseforge_id = 240967 +update_url = https://raw.githubusercontent.com/MinecraftModDevelopmentMods/BaseMetals/blob/master-1.21.1-neo/update.json +issues_url = https://github.com/MinecraftModDevelopmentMods/BaseMetals/issues -# The Minecraft version must agree with the NeoForge version to get a valid artifact -minecraft_version=1.21.1 -# The Minecraft version range can use any release version of Minecraft as bounds. -# Snapshots, pre-releases, and release candidates are not guaranteed to sort properly -# as they do not follow standard versioning conventions. -minecraft_version_range=[1.21.1,1.22) -# NeoForge 21.1 targets Minecraft 1.21.1. -neo_version=21.1.247 -neo_version_range=[21.1.247,21.2) -# NeoForge 21.1.247 declares JavaFML loader major 3. -loader_version_range=[3,) -loader_name=neoforge -loader_code=2 -java_version=21 -java_toolchain_version=21.0.12.1+1 -java_setup_version=21.0.12.1+1-LTS -gradle_java_version=21 -curseforge_project_id=240967 +# Version properties +minecraft_version = 1.21.1 +neo_version = 21.1.247 +mmdlib_version = 2.0.1.121012+Neo +parchment_minecraft_version=1.21.1 +parchment_mappings_version=2024.11.17 -# 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=basemetals -# The human-readable display name for the mod. -mod_name=MMD BaseMetals -# The license of the mod. Review your options at https://choosealicense.com/. All Rights Reserved is the default. -mod_license=LGPL-2.1 -# The mod version. See https://semver.org/ -mod_version=3.1.0.121012 -# 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.basemetals -# The authors of the mod. This is a simple text string that is used for display purposes in the mod list. -mod_authors=Cyanobacterium, jriwanek, dshadowwolf, GetDizzy611, SkyBlade1978, the MMD Team -# The description of the mod. This is a simple multiline text string that is used for display purposes in the mod list. -mod_description=Adds historically common metals, fantasy metals, alloys, tools, armour, and OreSpawn-powered deposits. +# Gradle +org.gradle.jvmargs = -Xmx3G +org.gradle.debug = false +org.gradle.configuration-cache = false +org.gradle.caching = true +org.gradle.parallel = true diff --git a/gradle/README.md b/gradle/README.md deleted file mode 100644 index dc413da19..000000000 --- a/gradle/README.md +++ /dev/null @@ -1,34 +0,0 @@ -# Gradle build layout - -The top-level `build.gradle` contains the shared project identity, Java -toolchain, source sets, and Forge development runs. The applied scripts keep -the remaining build concerns small enough to review independently. - -- `dependencies.gradle` owns repositories and dependency scopes. -- `release/artifacts.gradle` builds and audits deterministic release files. -- `release/publishing.gradle` describes guarded Maven publication. -- `verification/support.gradle` owns data, GameTest, and upgrade smoke gates. -- `verification/packaged-runtime.gradle` runs the built mod in official - packaged client and dedicated-server installations. -- `ide/eclipse.gradle` normalizes ForgeGradle's Eclipse launches and checks - that production runs cannot see validation-only code. - -Applied-script order is intentional. Artifact setup publishes an immutable -`baseMetalsRelease` map consumed by publishing and packaged-runtime checks. -Keep machine-specific paths in Gradle properties, never in these scripts. - -Model and data providers live in the separate `dataGenerator` source set. -Use `generateResources` after changing them to update the committed resources. -`check` generates a temporary copy and reports differences without changing -source files. Neither the providers nor test probes enter ordinary game -launches or public jars. - -Normal client and server launches use an explicit runtime classpath, not -Buildship's full dependency container. Compile-only integration APIs therefore -remain available in the editor without loading extra mods into the game. - -`runClientOptionalMods` uses a separate folder for optional-mod testing. No -optional mods are added automatically: the inherited integration mods do not -publish builds for Minecraft 1.19.4. The `compatSmoke` and `packagedCompatSmoke` -switches reject those unsupported jars rather than loading another Minecraft -version's mods. diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle deleted file mode 100644 index 58f3ac647..000000000 --- a/gradle/dependencies.gradle +++ /dev/null @@ -1,69 +0,0 @@ -ext.orespawnModule = "mmd-orespawn-${project.orespawn_curse_project_id}" -def orespawnVerificationRepository = project.findProperty('orespawnVerificationRepository') -configurations.create('packagedCompatibilityMods') -def mantleDevelopment = renamer.dependency('slimeknights.mantle:Mantle:1.19.2-1.10.49') -def tinkersDevelopment = renamer.dependency('slimeknights.tconstruct:TConstruct:1.19.2-3.8.5.63') -repositories { - minecraft.mavenizer(it) - maven fg.forgeMaven - maven fg.minecraftLibsMaven - mavenCentral() - - // CI stages and hashes the exact public OreSpawn jar in a temporary Maven - // mirror. Normal development resolves the same coordinates from CurseMaven. - 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) - } - } - - maven { url = uri('https://modmaven.dev/') } - maven { url = uri('https://dvs1.progwml6.com/files/maven/') } - maven { url = uri('https://maven.covers1624.net/') } -} - -dependencies { - // ForgeGradle supplies the patched Minecraft development environment. - implementation minecraft.dependency("net.minecraftforge:forge:${minecraft_version}-${forge_version}") - - // OreSpawn remains an ordinary hard mod dependency in metadata and is - // never shaded into Base Metals. Use the published 1.19.4 release in - // development so clean checkouts exercise the same artifact as players. - implementation renamer.dependency("curse.maven:mmd-orespawn-${orespawn_curse_project_id}:${orespawn_curse_file_id}") - orespawnRelease "curse.maven:mmd-orespawn-${orespawn_curse_project_id}:${orespawn_curse_file_id}" - - // API only: Mekanism remains optional at runtime. Its public slurry - // registry is required to provide the eight historical processing chains. - compileOnly 'mekanism:Mekanism:1.19.2-10.3.9.13:api' - compileOnly mantleDevelopment - compileOnly tinkersDevelopment - - // These mods have no published Forge 1.19.4 build. Keep their APIs compile-only; - // loading jars for another Minecraft version would break the development client. - if (providers.gradleProperty('compatSmoke').isPresent() - || providers.gradleProperty('packagedCompatSmoke').isPresent()) { - throw new GradleException('Optional-mod runtime qualification needs a published Forge 1.19.4 build') - } - - testImplementation platform('org.junit:junit-bom:5.10.2') - testImplementation 'org.junit.jupiter:junit-jupiter' - testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.10.2' - -} - -renamer.mappings.from minecraft.dependency.toSrgFile - -configurations.named('testRuntimeClasspath') { - exclude group: 'curse.maven', module: orespawnModule -} diff --git a/gradle/ide/eclipse.gradle b/gradle/ide/eclipse.gradle deleted file mode 100644 index b192cb21b..000000000 --- a/gradle/ide/eclipse.gradle +++ /dev/null @@ -1,325 +0,0 @@ -import groovy.xml.XmlSlurper -import groovy.xml.XmlParser -import groovy.xml.XmlUtil - -def eclipseWorkspaceProjectName = projectDir.name - -// ForgeGradle 7 Eclipse launches are normalized after generation: they use the -// configured Gradle cache and Java 17, load only bin/main, and exclude all unit, -// GameTest, integrated-smoke, and upgrade-smoke code from production launches. -eclipse { - classpath { - downloadSources = true - downloadJavadoc = true - file.whenMerged { classpath -> - classpath.entries.findAll { entry -> - String path = entry.path?.replace('\\', '/') ?: '' - path.startsWith('src/test/') || path.startsWith('src/gametest/') - || path.startsWith('src/dataGenerator/') - || path.startsWith('src/integratedSmoke/') || path.startsWith('src/packagedClientSmoke/') - || path.startsWith('src/upgradeSmoke/') - || path.startsWith('src/packagedServerSmoke/') - }.each { entry -> - entry.entryAttributes['test'] = 'true' - } - } - } - synchronizationTasks 'isolateEclipseProductionRuns' -} - -idea { - module { - downloadSources = true - downloadJavadoc = true - } -} - -def verifyDevelopmentRunProfiles = tasks.register('verifyDevelopmentRunProfiles') { - group = 'verification' - description = 'Checks that ordinary launches use only essential runtime dependencies.' - doLast { - ['runClient.launch', 'runServer.launch', 'runClientOptionalMods.launch'].each { name -> - String launch = file(name).getText('UTF-8') - if (launch.contains('org.eclipse.buildship.core.gradleclasspathcontainer')) { - throw new GradleException("${name} must not load Buildship's compile-only dependencies") - } - boolean optional = name == 'runClientOptionalMods.launch' - if (launch =~ /(?i)(TConstruct|Mantle|Mekanism|cofh_core|thermal_|EnderIO)/) { - throw new GradleException("${name} includes an optional integration dependency") - } - if (!launch.contains('mmd-orespawn-')) { - throw new GradleException("${name} is missing OreSpawn") - } - String expectedDirectory = file(optional ? 'run-optional-mods' : 'run').absolutePath - def launchXml = new XmlSlurper(false, false).parse(file(name)) - if (launchXml.stringAttribute.find { - it.@key.text() == 'org.eclipse.jdt.launching.WORKING_DIRECTORY' - }?.@value?.text() != expectedDirectory) { - throw new GradleException("${name} uses the wrong run directory") - } - } - ['runClient', 'runServer'].each { name -> - if (tasks.named(name, JavaExec).get().classpath.files.any { - it.name =~ /(?i)(TConstruct|Mantle|Mekanism|cofh_core|thermal_|EnderIO)/ - }) { - throw new GradleException("${name} includes an optional integration dependency") - } - } - def optionalClient = tasks.named('runOptionalModsClient', JavaExec).get() - if (optionalClient.sourceSetName.get() != 'optionalMods' - || optionalClient.classpath.files.any { it.name =~ /(?i)(TConstruct|Mantle|Mekanism|cofh_core|thermal_|EnderIO)/ }) { - throw new GradleException('The optional client must not load APIs for another Minecraft version') - } - } -} - -def syncForge45EclipseLaunches = tasks.register('syncForge45EclipseLaunches') { - group = 'ide' - description = 'Normalizes Forge 45 Eclipse launches to the production-only merged output.' - dependsOn tasks.named('processResources') - doLast { - String mainOutput = new File(projectDir, 'bin/main').absolutePath - String modClasses = "${mod_id}%%${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') - - File processedResources = layout.buildDirectory.dir('resources/main').get().asFile - copy { - from processedResources - into mainOutput - } - ['Client', 'Server', 'OptionalModsClient'].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('')) { - text = text.replace( - '', - '\r\n' + - " \r\n" + - '') - } - text = text.replaceFirst( - //, - java.util.regex.Matcher.quoteReplacement( - "")) - text = text.replaceFirst(//, - java.util.regex.Matcher.quoteReplacement("")) - - 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}") - valueStart += prefix.length() - int valueEnd = arguments.indexOf(' --', valueStart) - if (valueEnd < 0) throw new GradleException("ForgeGradle generated an unterminated --${flag} path") - 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]) - - String legacyPrefix = '-DlegacyClassPath.file=' - int legacyStart = text.indexOf(legacyPrefix) - int legacyEnd = text.indexOf(' -DignoreList=', legacyStart) - if (legacyStart < 0 || legacyEnd < 0) { - throw new GradleException("ForgeGradle omitted -DlegacyClassPath.file from ${launch.name}") - } - String xmlQuote = '"' - boolean quoted = legacyStart >= xmlQuote.length() - && text.substring(legacyStart - xmlQuote.length(), legacyStart) == xmlQuote - && text.substring(legacyEnd - xmlQuote.length(), legacyEnd) == xmlQuote - if (!quoted) { - text = text.substring(0, legacyStart) + xmlQuote + - text.substring(legacyStart, legacyEnd) + xmlQuote + text.substring(legacyEnd) - } - if (!text.contains('ATTR_EXCLUDE_TEST_CODE')) { - text = text.replace('', - ' \r\n' + - '') - } - // Buildship also exposes compile-only APIs. Use the selected runtime instead. - def launchXml = new XmlParser(false, false).parseText(text) - def classpath = launchXml.listAttribute.find { - it.@key == 'org.eclipse.jdt.launching.CLASSPATH' - } - def oldEntries = classpath.listEntry.collect { - new XmlSlurper(false, false).parseText(it.@value.toString()) - } - List launcherArchives = oldEntries.collect { - it.@externalArchive.text() ? file(it.@externalArchive.text()) : null - }.findAll { it != null && it.name.startsWith('slime-launcher-') } - def runtime = runName == 'OptionalModsClient' - ? configurations.optionalModsRuntimeClasspath : configurations.runtimeClasspath - classpath.children().clear() - ([new File(mainOutput)] + runtime.files + launcherArchives).unique().sort { - it.absolutePath - }.each { archive -> - def entry = new Node(null, 'runtimeClasspathEntry', [ - externalArchive: archive.absolutePath, type: '2', path: '5']) - classpath.appendNode('listEntry', [value: XmlUtil.serialize(entry)]) - } - oldEntries.findAll { it.@containerPath.text().startsWith('org.eclipse.jdt.launching.JRE_CONTAINER') } - .each { entry -> classpath.appendNode('listEntry', [value: XmlUtil.serialize(entry)]) } - text = XmlUtil.serialize(launchXml).replace('\r\n', '\n') - launch.setText(text, 'UTF-8') - if (runName == 'OptionalModsClient') { - file('runClientOptionalMods.launch').setText(text, 'UTF-8') - } - } - } -} - -def verifyEclipseProductionClasspath = tasks.register('verifyEclipseProductionClasspath') { - group = 'verification' - description = 'Verifies Eclipse client/server launches cannot see validation-only code.' - dependsOn syncForge45EclipseLaunches - dependsOn verifyDevelopmentRunProfiles - 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') - if (!buildshipPreferences.isFile()) { - throw new GradleException('Missing Eclipse Buildship preferences') - } - Properties buildshipConfiguration = new Properties() - buildshipPreferences.withInputStream { buildshipConfiguration.load(it) } - String expectedGradleHome = gradle.gradleUserHomeDir.canonicalPath - String expectedJavaHome = new File( - System.getenv('JAVA_HOME') ?: System.getProperty('java.home')).canonicalPath - if (buildshipConfiguration.getProperty('connection.gradle.user.home') != expectedGradleHome - || buildshipConfiguration.getProperty('gradle.user.home') != expectedGradleHome - || buildshipConfiguration.getProperty('java.home') != expectedJavaHome - || buildshipConfiguration.getProperty('override.workspace.settings') != 'true') { - throw new GradleException( - "Eclipse Buildship must use Gradle home ${expectedGradleHome} and Java ${expectedJavaHome}") - } - def classpathXml = new XmlSlurper(false, false).parse(classpath) - classpathXml.classpathentry.each { entry -> - String path = entry.@path.text().replace('\\', '/') - boolean validationSource = path.startsWith('src/test/') || path.startsWith('src/gametest/') - || path.startsWith('src/integratedSmoke/') || path.startsWith('src/packagedClientSmoke/') - || path.startsWith('src/upgradeSmoke/') - || path.startsWith('src/packagedServerSmoke/') - if (validationSource) { - String testFlag = entry.attributes.attribute.find { it.@name.text() == 'test' }?.@value?.text() - if (testFlag != 'true') { - throw new GradleException("Eclipse validation source is not isolated: ${path}") - } - } - } - ['runClient.launch', 'runServer.launch'].each { name -> - File launchFile = file(name) - String launch = launchFile.getText('UTF-8') - def launchXml = new XmlSlurper(false, false).parse(launchFile) - String mainType = launchXml.stringAttribute.find { - it.@key.text() == 'org.eclipse.jdt.launching.MAIN_TYPE' - }?.@value?.text() - if (mainType != 'net.minecraftforge.launcher.Main') { - throw new GradleException("Eclipse launch has the wrong ForgeGradle 7 main class: ${name}") - } - String mainClassEntry = mainType.replace('.', '/') + '.class' - List explicitArchives = launchXml.listAttribute.find { - it.@key.text() == 'org.eclipse.jdt.launching.CLASSPATH' - }?.listEntry?.collect { entry -> - def runtimeEntry = new XmlSlurper(false, false).parseText(entry.@value.text()) - String archive = runtimeEntry.@externalArchive.text() - archive ? file(archive) : null - }?.findAll { it != null } ?: [] - boolean mainClassAvailable = explicitArchives.any { archive -> - archive.isFile() && new java.util.zip.ZipFile(archive).withCloseable { zip -> - zip.getEntry(mainClassEntry) != null - } - } - if (!mainClassAvailable) { - throw new GradleException( - "Eclipse launch main class ${mainType} is absent from its explicit classpath: ${name}") - } - if (!launch.contains('ATTR_EXCLUDE_TEST_CODE') - || launch =~ /(?i)(junit|mockito|src[\\\/]test|src[\\\/]gametest|integratedsmoke|packagedclientsmoke|upgradesmoke|packagedserversmoke)/) { - 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 expectedModClasses = "${mod_id}%%${new File(projectDir, 'bin/main').absolutePath}" - if (!launch.contains(expectedModClasses)) { - throw new GradleException("Eclipse launch is not using Forge 45's merged production output: ${name}") - } - ['cache', 'metadata', 'to-srg', 'to-obf'].each { flag -> - if (!launch.contains("--${flag} "")) { - throw new GradleException("Eclipse launch does not quote its --${flag} path: ${name}") - } - } - if (!launch.contains('"-DlegacyClassPath.file=') - || !launch.contains('minecraft_classpath.txt" -DignoreList=')) { - throw new GradleException("Eclipse launch does not quote -DlegacyClassPath.file: ${name}") - } - } - File processed = layout.buildDirectory.dir('resources/main').get().asFile - ['META-INF/mods.toml', 'data/basemetals/orespawn/provider.json', - 'data/basemetals/recipes/stone_crackhammer.json'].each { name -> - File expected = new File(processed, name) - File actual = new File(projectDir, "bin/main/${name}") - if (!expected.isFile() || !actual.isFile() - || !java.util.Arrays.equals(actual.bytes, expected.bytes)) { - throw new GradleException("Eclipse output contains stale production resource ${name}") - } - } - String metadata = new File(projectDir, 'bin/main/META-INF/mods.toml').getText('UTF-8') - if (metadata.contains('${') || !metadata.contains('version="3.1.0.119041"')) { - throw new GradleException('Eclipse output contains unresolved or invalid Base Metals version metadata') - } - } -} - -verifyDevelopmentRunProfiles.configure { - dependsOn syncForge45EclipseLaunches -} - -tasks.matching { it.name == 'genEclipseRuns' }.configureEach { - finalizedBy syncForge45EclipseLaunches -} - -tasks.register('isolateEclipseProductionRuns') { - group = 'ide' - dependsOn tasks.named('genEclipseRuns') - dependsOn syncForge45EclipseLaunches -} - -tasks.matching { it.name == 'eclipse' }.configureEach { - finalizedBy syncForge45EclipseLaunches -} diff --git a/gradle/prepare-forge-client-runtime.py b/gradle/prepare-forge-client-runtime.py deleted file mode 100644 index f5ffbf1fd..000000000 --- a/gradle/prepare-forge-client-runtime.py +++ /dev/null @@ -1,297 +0,0 @@ -#!/usr/bin/env python3 -"""Prepare a checksum-verified official Forge client runtime for packaged smoke tests.""" - -from __future__ import annotations - -import argparse -import concurrent.futures -import hashlib -import json -import os -import platform -import shutil -import subprocess -import sys -import time -import urllib.request -import zipfile -from pathlib import Path -from typing import Any - -MINECRAFT_VERSION = "1.19.4" -FORGE_VERSION = "45.4.0" -FORGE_INSTALLER_SHA256 = "6643bb8c21f409cc528ff656daf60c206d304cc77bf529bbbab4b336004dfc53" -VERSION_MANIFEST_URL = "https://piston-meta.mojang.com/mc/game/version_manifest_v2.json" -ASSET_OBJECT_URL = "https://resources.download.minecraft.net/{prefix}/{digest}" -USER_AGENT = "BaseMetals-release-validation/3.1.0.119041" - - -def digest_file(path: Path, algorithm: str) -> str: - digest = hashlib.new(algorithm) - with path.open("rb") as source: - for block in iter(lambda: source.read(1024 * 1024), b""): - digest.update(block) - return digest.hexdigest() - - -def download(url: str, target: Path, algorithm: str | None = None, - expected: str | None = None) -> Path: - if target.is_file() and (expected is None or digest_file(target, algorithm or "sha1") == expected): - return target - - target.parent.mkdir(parents=True, exist_ok=True) - temporary = target.with_name(target.name + ".part") - for attempt in range(1, 4): - try: - request = urllib.request.Request(url, headers={"User-Agent": USER_AGENT}) - with urllib.request.urlopen(request, timeout=90) as response, temporary.open("wb") as output: - shutil.copyfileobj(response, output) - if expected is not None: - actual = digest_file(temporary, algorithm or "sha1") - if actual != expected: - raise RuntimeError( - f"Checksum mismatch for {url}: expected {expected}, found {actual}") - os.replace(temporary, target) - return target - except Exception: - temporary.unlink(missing_ok=True) - if attempt == 3: - raise - time.sleep(attempt * 2) - raise AssertionError("unreachable") - - -def load_json(path: Path) -> dict[str, Any]: - with path.open("r", encoding="utf-8") as source: - return json.load(source) - - -def current_os() -> tuple[str, str]: - system = platform.system().lower() - if system.startswith("win"): - os_name = "windows" - elif system == "darwin": - os_name = "osx" - else: - os_name = "linux" - - machine = platform.machine().lower() - arch = "x86" if machine in {"x86", "i386", "i686"} else machine - return os_name, arch - - -def rule_matches(rule: dict[str, Any], os_name: str, arch: str) -> bool: - if rule.get("features"): - return False - required_os = rule.get("os") - if required_os is None: - return True - if required_os.get("name") not in {None, os_name}: - return False - if required_os.get("arch") not in {None, arch}: - return False - version_pattern = required_os.get("version") - if version_pattern is not None: - import re - if re.search(version_pattern, platform.version()) is None: - return False - return True - - -def library_allowed(library: dict[str, Any], os_name: str, arch: str) -> bool: - rules = library.get("rules") - if not rules: - return True - allowed = False - for rule in rules: - if rule_matches(rule, os_name, arch): - allowed = rule.get("action") == "allow" - return allowed - - -def install_forge_client(java: Path, installer: Path, runtime: Path) -> None: - profile = runtime / "launcher_profiles.json" - if not profile.exists(): - profile.write_text(json.dumps({ - "profiles": {}, - "selectedProfile": None, - "clientToken": "00000000-0000-0000-0000-000000000000", - "authenticationDatabase": {}, - "launcherVersion": {"name": "basemetals-validation", "format": 21}, - }, separators=(",", ":")), encoding="utf-8") - - completed = subprocess.run( - [str(java), "-jar", str(installer), "--installClient", str(runtime)], - text=True, - stdout=subprocess.PIPE, - stderr=subprocess.STDOUT, - check=False, - ) - if completed.returncode != 0: - tail = "\n".join(completed.stdout.splitlines()[-200:]) - raise RuntimeError(f"Forge client installation failed:\n{tail}") - if "Successfully installed client into launcher." not in completed.stdout: - raise RuntimeError("Forge installer did not report successful client installation") - print("Forge installer completed and validated its downloads.") - - -def prepare_minecraft_metadata(runtime: Path) -> tuple[dict[str, Any], dict[str, Any], str]: - metadata_dir = runtime / ".validation-metadata" - manifest_file = download(VERSION_MANIFEST_URL, metadata_dir / "version_manifest_v2.json") - manifest = load_json(manifest_file) - version = next((entry for entry in manifest["versions"] - if entry["id"] == MINECRAFT_VERSION), None) - if version is None: - raise RuntimeError(f"Minecraft {MINECRAFT_VERSION} is absent from the official manifest") - - base_json_file = download( - version["url"], - runtime / "versions" / MINECRAFT_VERSION / f"{MINECRAFT_VERSION}.json", - "sha1", - version["sha1"], - ) - base_json = load_json(base_json_file) - - forge_version_id = next(( - candidate for candidate in ( - f"{MINECRAFT_VERSION}-forge-{FORGE_VERSION}", - f"forge-{FORGE_VERSION}", - ) - if (runtime / "versions" / candidate / f"{candidate}.json").is_file() - ), None) - if forge_version_id is None: - raise RuntimeError(f"Forge {FORGE_VERSION} client profile was not installed") - forge_json = load_json( - runtime / "versions" / forge_version_id / f"{forge_version_id}.json") - return base_json, forge_json, forge_version_id - - -def prepare_client_jar(runtime: Path, base_json: dict[str, Any]) -> None: - client = base_json["downloads"]["client"] - download( - client["url"], - runtime / "versions" / MINECRAFT_VERSION / f"{MINECRAFT_VERSION}.jar", - "sha1", - client["sha1"], - ) - - -def prepare_libraries(runtime: Path, metadata: list[dict[str, Any]], - forge_version_id: str) -> int: - os_name, arch = current_os() - arch_bits = "32" if arch == "x86" else "64" - native_archives: list[tuple[Path, tuple[str, ...]]] = [] - artifact_count = 0 - - for document in metadata: - for library in document.get("libraries", []): - if not library_allowed(library, os_name, arch): - continue - downloads = library.get("downloads", {}) - artifact = downloads.get("artifact") - if artifact: - target = runtime / "libraries" / artifact["path"] - url = artifact.get("url") - if url: - download(url, target, "sha1", artifact.get("sha1")) - elif not target.is_file(): - raise RuntimeError(f"Missing installed Forge library: {target}") - elif artifact.get("sha1") and digest_file(target, "sha1") != artifact["sha1"]: - raise RuntimeError(f"Installed Forge library checksum mismatch: {target}") - artifact_count += 1 - - classifier_template = library.get("natives", {}).get(os_name) - if classifier_template is None: - continue - classifier = classifier_template.replace("${arch}", arch_bits) - native = downloads.get("classifiers", {}).get(classifier) - if native is None: - raise RuntimeError( - f"Missing native classifier {classifier} for {library.get('name')}") - archive = runtime / "libraries" / native["path"] - download(native["url"], archive, "sha1", native.get("sha1")) - native_archives.append((archive, tuple(library.get("extract", {}).get("exclude", [])))) - - natives = runtime / "natives" / forge_version_id - if natives.exists(): - shutil.rmtree(natives) - natives.mkdir(parents=True) - - natives_root = natives.resolve() - for archive, excludes in native_archives: - with zipfile.ZipFile(archive) as zipped: - for member in zipped.infolist(): - name = member.filename.replace("\\", "/") - if member.is_dir() or any(name.startswith(prefix) for prefix in excludes): - continue - target = (natives / name).resolve() - if natives_root not in target.parents: - raise RuntimeError(f"Unsafe native archive member: {name}") - target.parent.mkdir(parents=True, exist_ok=True) - with zipped.open(member) as source, target.open("wb") as output: - shutil.copyfileobj(source, output) - return artifact_count - - -def prepare_assets(runtime: Path, base_json: dict[str, Any]) -> int: - index = base_json["assetIndex"] - index_file = download( - index["url"], - runtime / "assets" / "indexes" / f"{index['id']}.json", - "sha1", - index["sha1"], - ) - objects = load_json(index_file)["objects"] - unique_hashes = sorted({entry["hash"] for entry in objects.values()}) - - def fetch(digest: str) -> None: - download( - ASSET_OBJECT_URL.format(prefix=digest[:2], digest=digest), - runtime / "assets" / "objects" / digest[:2] / digest, - "sha1", - digest, - ) - - with concurrent.futures.ThreadPoolExecutor(max_workers=16) as pool: - list(pool.map(fetch, unique_hashes)) - return len(unique_hashes) - - -def main() -> int: - parser = argparse.ArgumentParser() - parser.add_argument("--installer", required=True, type=Path) - parser.add_argument("--runtime", required=True, type=Path) - parser.add_argument("--java", required=True, type=Path) - args = parser.parse_args() - - installer = args.installer.resolve() - runtime = args.runtime.resolve() - java = args.java.resolve() - if not installer.is_file(): - raise RuntimeError(f"Forge installer is missing: {installer}") - if not java.is_file(): - raise RuntimeError(f"Java executable is missing: {java}") - actual_installer = digest_file(installer, "sha256") - if actual_installer != FORGE_INSTALLER_SHA256: - raise RuntimeError( - f"Forge installer checksum mismatch: expected {FORGE_INSTALLER_SHA256}, " - f"found {actual_installer}") - - runtime.mkdir(parents=True, exist_ok=True) - install_forge_client(java, installer, runtime) - base_json, forge_json, forge_version_id = prepare_minecraft_metadata(runtime) - prepare_client_jar(runtime, base_json) - libraries = prepare_libraries(runtime, [base_json, forge_json], forge_version_id) - assets = prepare_assets(runtime, base_json) - print( - f"Prepared official Minecraft {MINECRAFT_VERSION}/Forge {FORGE_VERSION} " - f"client runtime with {libraries} libraries and {assets} asset objects.") - return 0 - - -if __name__ == "__main__": - try: - raise SystemExit(main()) - except Exception as exception: - print(f"ERROR: {exception}", file=sys.stderr) - raise SystemExit(1) diff --git a/gradle/release/artifacts.gradle b/gradle/release/artifacts.gradle deleted file mode 100644 index 32aae58b7..000000000 --- a/gradle/release/artifacts.gradle +++ /dev/null @@ -1,418 +0,0 @@ -import groovy.json.JsonSlurper -import groovy.xml.XmlSlurper -import java.security.MessageDigest -import java.util.zip.ZipFile -import org.apache.tools.ant.filters.FixCrLfFilter - -// Normalize archive text as well as the working tree, including generated Javadocs. -tasks.withType(Jar).configureEach { - filteringCharset = 'UTF-8' - filesMatching(['**/*.java', '**/*.json', '**/*.lang', '**/*.mcmeta', '**/*.md', - '**/*.txt', '**/*.cfg', '**/*.properties', '**/*.xml', '**/*.html', - '**/*.css', '**/*.js', '**/element-list', '**/package-list']) { - filter(FixCrLfFilter, eol: FixCrLfFilter.CrLf.newInstance('lf'), - eof: FixCrLfFilter.AddAsisRemove.newInstance('asis')) - } -} - -// Expand the release identity into Forge metadata and package public documentation. -tasks.named('processResources', ProcessResources).configure { - filteringCharset = 'UTF-8' - var replaceProperties = [ - minecraft_version: minecraft_version, minecraft_version_range: minecraft_version_range, - forge_version: forge_version, forge_version_range: forge_version_range, - loader_version_range: loader_version_range, - mod_id: mod_id, mod_name: mod_name, mod_license: mod_license, mod_version: mod_version, - mod_authors: mod_authors, mod_description: mod_description, - ] - inputs.properties replaceProperties - - filesMatching(['META-INF/mods.toml', 'pack.mcmeta']) { - expand replaceProperties + [project: project] - } - - from('docs') { - into 'META-INF/basemetals/docs' - } -} - -// Eclipse launches use this processed directory as a stable metadata/resource -// root. This prevents a transient Gradle resolution failure immediately before -// launch from starting Forge with Java classes but no Base Metals data pack. -tasks.matching { it.name in ['genEclipseRuns', 'eclipse'] }.configureEach { - dependsOn tasks.named('processResources') -} - -def expectedMavenGroup = 'zone.moddev.mc.basemetals' -def expectedMavenArtifact = 'BaseMetals' -def expectedMavenCoordinate = "${expectedMavenGroup}:${expectedMavenArtifact}:${project.version}" - -tasks.named('jar', Jar) { - archiveClassifier = 'deobf' - destinationDirectory = layout.buildDirectory.dir('libs-dev') - manifest { - attributes([ - 'Maven-Artifact' : expectedMavenCoordinate, - 'Specification-Title' : 'Base Metals', - 'Specification-Vendor' : project.mod_authors, - 'Specification-Version' : '1', - 'Implementation-Title' : 'Base Metals', - 'Implementation-Version': project.version, - 'Implementation-Vendor' : project.mod_authors, - 'Built-On-Java' : '17', - 'Built-On' : "${project.minecraft_version}-${project.forge_version}", - 'Build-Target' : "minecraft-${project.minecraft_version}-${project.loader_name}-${project.forge_version}-java-${project.java_version}" - ]) - } -} - -def releaseJar = renamer.classes(tasks.named('jar', Jar)) { - map.from minecraft.dependency.toSrgFile - archiveClassifier = null - output = layout.buildDirectory.file( - "libs/${base.archivesName.get()}-${project.version}.jar") -} - -['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 = "BaseMetals-${project.version}.jar" -def sourcesReleaseName = "BaseMetals-${project.version}-sources.jar" -def javadocReleaseName = "BaseMetals-${project.version}-javadoc.jar" -def expectedReleaseNames = [mainReleaseName, sourcesReleaseName, javadocReleaseName] - -def packagedServerSmokeJar = tasks.register('packagedServerSmokeJar', Jar) { - dependsOn tasks.named(sourceSets.packagedServerSmoke.classesTaskName) - dependsOn tasks.named(sourceSets.upgradeSmoke.classesTaskName) - archiveFileName = 'basemetals-server-smoke-dev.jar' - destinationDirectory = layout.buildDirectory.dir('packaged-smoke-probes') - from sourceSets.packagedServerSmoke.output.classesDirs - from sourceSets.upgradeSmoke.output.classesDirs - from 'src/packagedServerSmoke/packaged-resources' -} -def packagedServerSmokeProbe = renamer.classes(packagedServerSmokeJar) { - map.from minecraft.dependency.toSrgFile - output = layout.buildDirectory.file('packaged-smoke-probes/basemetals-server-smoke.jar') -} - -def packagedClientSmokeJar = tasks.register('packagedClientSmokeJar', Jar) { - dependsOn tasks.named(sourceSets.integratedSmoke.classesTaskName) - dependsOn tasks.named(sourceSets.packagedClientSmoke.classesTaskName) - archiveFileName = 'basemetals-client-smoke-dev.jar' - destinationDirectory = layout.buildDirectory.dir('packaged-smoke-probes') - from sourceSets.integratedSmoke.output.classesDirs - from sourceSets.packagedClientSmoke.output.classesDirs - from 'src/packagedClientSmoke/packaged-resources' -} -def packagedClientSmokeProbe = renamer.classes(packagedClientSmokeJar) { - map.from minecraft.dependency.toSrgFile - output = layout.buildDirectory.file('packaged-smoke-probes/basemetals-client-smoke.jar') -} - -def preparedReleaseDir = project.findProperty('preparedReleaseDir') -project.ext.baseMetalsRelease = [ - expectedMavenGroup: expectedMavenGroup, - expectedMavenArtifact: expectedMavenArtifact, - expectedMavenCoordinate: expectedMavenCoordinate, - releaseJar: releaseJar, - mainReleaseName: mainReleaseName, - sourcesReleaseName: sourcesReleaseName, - javadocReleaseName: javadocReleaseName, - expectedReleaseNames: expectedReleaseNames.asImmutable(), - packagedServerSmokeProbe: packagedServerSmokeProbe, - packagedClientSmokeProbe: packagedClientSmokeProbe, - preparedReleaseDir: preparedReleaseDir -].asImmutable() - -def sha256 = { File artifact -> - MessageDigest.getInstance('SHA-256').digest(artifact.bytes).encodeHex().toString().toUpperCase() -} - -def configuredReleaseVersion = project.version.toString() -def configuredReleaseGroup = project.group.toString() -def configuredJavaToolchainVersion = project.java_toolchain_version.toString() -def configuredReleaseIdentity = [ - modVersion: project.mod_version.toString(), - modGroup: project.mod_group.toString(), - minecraftVersion: project.minecraft_version.toString(), - forgeVersion: project.forge_version.toString(), - forgeInstallerSha256: project.forge_installer_sha256.toString(), - mappingChannel: project.mapping_channel.toString(), - mappingVersion: project.mapping_version.toString(), - loaderName: project.loader_name.toString(), - loaderCode: project.loader_code.toString(), - javaVersion: project.java_version.toString(), - gradleJavaVersion: project.gradle_java_version.toString(), - curseForgeProjectId: project.curseforge_project_id.toString() -] -def configuredOreSpawnIdentity = [ - version: project.orespawn_version.toString(), - curseProjectId: project.orespawn_curse_project_id.toString(), - curseFileId: project.orespawn_curse_file_id.toString(), - sha256: project.orespawn_sha256.toString() -] - -tasks.register('verifyJava17Toolchain') { - group = 'verification' - description = 'Verifies the exact Java product toolchain used for Base Metals compilation.' - dependsOn tasks.named('compileJava') - doLast { - def metadata = tasks.named('compileJava', JavaCompile).get().javaCompiler.get().metadata - if (configuredJavaToolchainVersion != '17.0.1+12' - || metadata.languageVersion.asInt() != 17 - || metadata.jvmVersion != configuredJavaToolchainVersion - || !metadata.vendor.toString().toLowerCase(Locale.ROOT).contains('temurin')) { - throw new GradleException("Expected Eclipse Temurin ${configuredJavaToolchainVersion}, found " + - "${metadata.vendor} ${metadata.jvmVersion} at ${metadata.installationPath}") - } - } -} - -tasks.register('verifyMavenCoordinates') { - group = 'verification' - description = 'Verifies the generated POM uses the Base Metals release namespace.' - dependsOn '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, configuredReleaseVersion] - if (configuredReleaseGroup != expectedMavenGroup || actual != expected) { - throw new GradleException("Expected Maven coordinate ${expected.join(':')}, found ${actual.join(':')}") - } - } -} - -tasks.register('verifyMavenizerCompatibilityFixture') { - group = 'verification' - description = 'Verifies the checksum-sealed Forge 1.19.4 Mavenizer compatibility fixture.' - inputs.file project.ext.mavenizerCompatibilityJar - doLast { - File fixture = project.ext.mavenizerCompatibilityJar.asFile - if (!fixture.isFile()) throw new GradleException("Missing Mavenizer compatibility fixture: ${fixture}") - String actual = sha256(fixture) - if (actual != project.ext.mavenizerCompatibilitySha256) { - throw new GradleException("Mavenizer compatibility fixture checksum mismatch: ${actual}") - } - } -} - -tasks.register('verifyReleaseConfiguration') { - group = 'verification' - description = 'Verifies the exact Base Metals 1.19.4 release identity.' - dependsOn tasks.named('verifyMavenizerCompatibilityFixture') - dependsOn tasks.named('verifyJava17Toolchain') - doLast { - if (configuredReleaseIdentity.modVersion != '3.1.0.119041' - || configuredReleaseIdentity.modGroup != expectedMavenGroup - || configuredReleaseIdentity.minecraftVersion != '1.19.4' - || configuredReleaseIdentity.forgeVersion != '45.4.0' - || configuredReleaseIdentity.forgeInstallerSha256 != '6643BB8C21F409CC528FF656DAF60C206D304CC77BF529BBBAB4B336004DFC53' - || configuredReleaseIdentity.mappingChannel != 'official' - || configuredReleaseIdentity.mappingVersion != '1.19.4' - || configuredReleaseIdentity.loaderName != 'forge' - || configuredReleaseIdentity.loaderCode != '1' - || configuredReleaseIdentity.javaVersion != '17' - || configuredReleaseIdentity.gradleJavaVersion != '17' - || configuredReleaseIdentity.curseForgeProjectId != '240967') { - throw new GradleException('Unexpected Base Metals 1.19.4 release identity') - } - } -} - -tasks.register('verifyReleaseDependencies') { - group = 'verification' - description = 'Resolves and verifies the exact released OreSpawn qualification dependency.' - doLast { - if (configuredOreSpawnIdentity.version != '4.1.0.119041' - || configuredOreSpawnIdentity.curseProjectId != '245586' - || configuredOreSpawnIdentity.curseFileId != '9171353' - || configuredOreSpawnIdentity.sha256 != '1B2ECAA546E7FFB35863AC1D9FF92504471EE857045DCD01A068C5CA7F53CFFD') { - 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 actual = sha256(artifact) - if (actual != configuredOreSpawnIdentity.sha256) { - throw new GradleException("OreSpawn SHA-256 mismatch: ${actual}") - } - } -} - -def forbiddenReleasePath = { String entryName -> - String name = entryName.replace('\\', '/').toLowerCase(Locale.ROOT) - name.startsWith('com/mcmoddev/') - || name.startsWith('ci-fixtures/') - || name.startsWith('reference/') - || name.startsWith('agent-notes/') - || name.contains('/agent-notes/') - || name.startsWith('src/datagenerator/') - || name.startsWith('zone/moddev/mc/basemetals/data/') - || name.startsWith('src/gametest/') - || name.startsWith('src/integratedsmoke/') - || name.startsWith('src/packagedclientsmoke/') - || name.startsWith('src/upgradesmoke/') - || name.startsWith('src/packagedserversmoke/') - || name.contains('minecraft-mavenizer') - || name =~ /(^|\/)(agents?\.md|claude\.md|gemini\.md|validation\.md|development\.md|registry_audit\.md)$/ - || name =~ /(^|\/)(\.agents?|\.codex|\.claude|\.gemini)(\/|$)/ - || name =~ /(^|\/)(agent|codex)-[^\/]*\.md$/ - || name.contains('gametests.class') - || name.contains('/smoke/') - || name.endsWith('/oregenerator.class') - || name.endsWith('/worldgenerator.class') -} - -tasks.register('verifyReleaseArtifacts') { - group = 'verification' - description = 'Audits the deterministic release jars and their production-only contents.' - dependsOn tasks.named('verifyReleaseConfiguration') - dependsOn tasks.named('verifyReleaseDependencies') - dependsOn tasks.named('verifyMavenCoordinates') - dependsOn tasks.named('assemble') - doLast { - File libs = file("${buildDir}/libs") - def actual = fileTree(libs) { include 'BaseMetals-*.jar' }.files.collect { it.name }.sort() - def expected = expectedReleaseNames.sort() - if (actual != expected) { - throw new GradleException("Expected exactly ${expected}, found ${actual}") - } - expectedReleaseNames.each { artifactName -> - new ZipFile(new File(libs, artifactName)).withCloseable { zip -> - def leaked = zip.entries().toList().find { forbiddenReleasePath(it.name) } - if (leaked != null) { - throw new GradleException("${artifactName} contains validation, fixture, legacy, or agent-only path ${leaked.name}") - } - } - } - - File main = new File(libs, mainReleaseName) - new ZipFile(main).withCloseable { zip -> - zip.entries().toList().findAll { it.name.endsWith('.class') }.each { entry -> - new DataInputStream(zip.getInputStream(entry)).withCloseable { input -> - if (input.readInt() != (int) 0xCAFEBABE) throw new GradleException("Invalid class: ${entry.name}") - input.readUnsignedShort() - if (input.readUnsignedShort() != 61) throw new GradleException("Class is not Java 17: ${entry.name}") - } - } - def names = zip.entries().toList().collect { it.name } as Set - [ - 'META-INF/mods.toml', - 'META-INF/MANIFEST.MF', - 'pack.mcmeta', - 'data/basemetals/orespawn/provider.json', - 'data/basemetals/recipes/stone_crackhammer.json', - 'data/forge/loot_modifiers/global_loot_modifiers.json', - 'assets/basemetals/lang/en_us.json', - 'META-INF/basemetals/docs/VERSIONS.md', - 'META-INF/basemetals/docs/schemas/orespawn-4.1.0/orespawn-provider.schema.json' - ].each { required -> - if (!names.contains(required)) throw new GradleException("Release jar is missing ${required}") - } - def manifest = new java.util.jar.Manifest(zip.getInputStream(zip.getEntry('META-INF/MANIFEST.MF'))) - if (manifest.mainAttributes.getValue('Maven-Artifact') != expectedMavenCoordinate) { - throw new GradleException('Release manifest contains the wrong Maven coordinate') - } - String expectedBuildTarget = 'minecraft-1.19.4-forge-45.4.0-java-17' - if (manifest.mainAttributes.getValue('Build-Target') != expectedBuildTarget) { - throw new GradleException('Release manifest contains the wrong stable build target') - } - String modsToml = zip.getInputStream(zip.getEntry('META-INF/mods.toml')).getText('UTF-8') - if (modsToml.contains('${') - || !modsToml.contains('version="3.1.0.119041"') - || !modsToml.contains('versionRange="[4.1.0.119041,5.0.0)"')) { - throw new GradleException('Release mods.toml contains unresolved or incompatible metadata') - } - def provider = new JsonSlurper().parse(zip.getInputStream( - zip.getEntry('data/basemetals/orespawn/provider.json'))) - if (provider.schema_version != 3 || provider.provider_revision != 1 - || provider.provider_modid != 'basemetals') { - throw new GradleException('OreSpawn provider schema/revision identity changed') - } - def locales = names.findAll { it ==~ /assets\/basemetals\/lang\/.+\.json/ } - if (locales.size() != 18) { - throw new GradleException("Release jar must contain all 18 language files, found ${locales.size()}") - } - locales.each { path -> - File sourceFile = sourceSets.main.resources.srcDirs - .collect { new File(it, path) }.find { it.isFile() } - if (sourceFile == null) { - throw new GradleException("No source language file for ${path}") - } - String source = sourceFile.getText('UTF-8') - .replace('\r\n', '\n').replace('\r', '\n') - if (!source.endsWith('\n')) source += '\n' - String packaged = zip.getInputStream(zip.getEntry(path)).getText('UTF-8') - if (packaged != source) { - throw new GradleException("Release jar changed translated text in ${path}") - } - } - if (names.any { it.endsWith('.class') && (it.contains('/gametest/') - || it.contains('/smoke/') || it.startsWith('com/mcmoddev/')) }) { - throw new GradleException('Release jar contains validation or legacy implementation classes') - } - } - } -} - -tasks.register('writeReleaseChecksums') { - group = 'verification' - description = 'Writes SHA-256 checksums for exactly the three release jars.' - dependsOn tasks.named('verifyReleaseArtifacts') - doLast { - File output = file("${buildDir}/release/SHA256SUMS") - output.parentFile.mkdirs() - output.setText(expectedReleaseNames.sort().collect { name -> - "${sha256(file("${buildDir}/libs/${name}")).toLowerCase(Locale.ROOT)} ${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 expectedBundle = (expectedReleaseNames + ['SHA256SUMS', 'CHANGELOG.txt']).sort() - def actualBundle = prepared.listFiles().findAll { it.isFile() }.collect { it.name }.sort() - if (actualBundle != expectedBundle) { - throw new GradleException("Expected prepared bundle ${expectedBundle}, found ${actualBundle}") - } - def declared = [:] - new File(prepared, 'SHA256SUMS').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}") - declared[match[0][2]] = match[0][1].toUpperCase(Locale.ROOT) - } - if (declared.keySet().sort() != expectedReleaseNames.sort()) { - throw new GradleException('Prepared checksums do not declare exactly the three release jars') - } - declared.each { name, expectedHash -> - if (sha256(new File(prepared, name)) != expectedHash) { - throw new GradleException("Prepared checksum mismatch for ${name}") - } - } - } -} diff --git a/gradle/release/publishing.gradle b/gradle/release/publishing.gradle deleted file mode 100644 index cf269428e..000000000 --- a/gradle/release/publishing.gradle +++ /dev/null @@ -1,74 +0,0 @@ -import org.gradle.api.publish.maven.MavenPublication -import org.gradle.api.publish.maven.tasks.PublishToMavenRepository - -def release = project.ext.baseMetalsRelease -def preparedReleaseDir = release.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 { - mavenJava(MavenPublication) { - groupId = project.group - artifactId = release.expectedMavenArtifact - version = project.version - if (preparedReleaseDir != null) { - artifact new File(preparedReleaseDir.toString(), release.mainReleaseName) - artifact(new File(preparedReleaseDir.toString(), release.sourcesReleaseName)) { - classifier = 'sources' - } - artifact(new File(preparedReleaseDir.toString(), release.javadocReleaseName)) { - classifier = 'javadoc' - } - } else { - artifact release.releaseJar - artifact tasks.named('sourcesJar') - artifact tasks.named('javadocJar') - } - pom.withXml { - def root = asNode() - root.appendNode('name', 'Base Metals') - root.appendNode('description', - 'Historically inspired and fantasy metals, equipment, processing, and OreSpawn provider data.') - root.appendNode('url', 'https://github.com/MinecraftModDevelopmentMods/BaseMetals') - 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 { - name = 'release' - url = uri(mavenUploadUrl) - credentials { - username = mavenUploadUsername - password = mavenUploadPassword - } - } - } -} - -tasks.register('validateMavenReleaseCredentials') { - group = 'publishing' - description = 'Prevents Maven publication from targeting an incomplete or local 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')) -} diff --git a/gradle/stage-orespawn-release.sh b/gradle/stage-orespawn-release.sh deleted file mode 100644 index c17c4a37e..000000000 --- a/gradle/stage-orespawn-release.sh +++ /dev/null @@ -1,39 +0,0 @@ -#!/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/verification/packaged-runtime.gradle b/gradle/verification/packaged-runtime.gradle deleted file mode 100644 index f442264be..000000000 --- a/gradle/verification/packaged-runtime.gradle +++ /dev/null @@ -1,274 +0,0 @@ -import groovy.json.JsonSlurper -import org.gradle.api.provider.Provider - -def release = project.ext.baseMetalsRelease -def releaseJar = release.releaseJar -def packagedServerSmokeProbe = release.packagedServerSmokeProbe -def packagedClientSmokeProbe = release.packagedClientSmokeProbe - -def java17Launcher = javaToolchains.launcherFor { - languageVersion = JavaLanguageVersion.of(17) - vendor = JvmVendorSpec.ADOPTIUM -} - -def packagedForgeServerRuntime = providers.gradleProperty('packagedForgeServerRuntime') -def packagedForgeClientRuntime = providers.gradleProperty('packagedForgeClientRuntime') -def packagedClientJavaExecutable = providers.gradleProperty('packagedClientJavaExecutable') -def packagedServerRunDirectory = layout.buildDirectory.dir('packaged-server-run') -def packagedClientRunDirectory = layout.buildDirectory.dir('packaged-client-run') - -def requireRuntimeDirectory = { Provider configuredPath, String propertyName -> - if (!configuredPath.isPresent()) { - throw new GradleException("Pass -P${propertyName}=") - } - File runtime = file(configuredPath.get()) - if (!runtime.isDirectory()) throw new GradleException("${propertyName} does not name a directory: ${runtime}") - runtime -} - -def verifyPackagedLog = { File runDirectory, String passMarker, String label -> - File log = new File(runDirectory, 'logs/latest.log') - if (!log.isFile()) throw new GradleException("${label} did not create logs/latest.log") - String text = log.getText('UTF-8') - if (!text.contains(passMarker)) throw new GradleException("${label} completion marker is absent from latest.log") - ['Failed to load correctly', 'Exception stopping the server', 'This crash report has been saved to'].each { failure -> - if (text.contains(failure)) throw new GradleException("${label} log contains fatal marker: ${failure}") - } -} - -def preparePackagedServerSmoke = tasks.register('preparePackagedServerSmoke') { - group = 'verification' - description = 'Stages the public Base Metals and OreSpawn jars with an isolated dedicated-server probe.' - dependsOn releaseJar - dependsOn packagedServerSmokeProbe - dependsOn tasks.named('verifyReleaseDependencies') - doLast { - File runDirectory = packagedServerRunDirectory.get().asFile - delete runDirectory - runDirectory.mkdirs() - copy { - from releaseJar - from packagedServerSmokeProbe - from configurations.orespawnRelease - from configurations.packagedCompatibilityMods - into new File(runDirectory, 'mods') - } - new File(runDirectory, 'server.properties').setText('''\ -level-name=packaged-server-smoke-world -level-seed=basemetals-release-smoke -online-mode=false -server-port=0 -allow-nether=true -generate-structures=false -spawn-protection=0 -max-tick-time=-1 -''', 'UTF-8') - new File(runDirectory, 'eula.txt').setText('eula=true\n', 'UTF-8') - String mode = providers.gradleProperty('packagedContentMode').getOrElse('') - if (!mode.isEmpty()) { - if (!(mode in ['high_fantasy', 'low_fantasy'])) throw new GradleException("Invalid test mode: ${mode}") - File config = new File(runDirectory, 'config/basemetals-common.toml') - config.parentFile.mkdirs() - config.setText("contentMode=\"${mode}\"\n", 'UTF-8') - } - } -} - -def packagedServerStartupSmoke = tasks.register('packagedServerStartupSmoke', Exec) { - group = 'verification' - description = 'Starts an official Forge dedicated server with the exact packaged release jars.' - dependsOn preparePackagedServerSmoke - doFirst { - File runtime = requireRuntimeDirectory(packagedForgeServerRuntime, 'packagedForgeServerRuntime') - File libraries = new File(runtime, 'libraries') - File forgeDirectory = new File(libraries, 'net/minecraftforge/forge/1.19.4-45.4.0') - File launcher = new File(forgeDirectory, 'forge-1.19.4-45.4.0-server.jar') - File sourceArguments = new File(forgeDirectory, - System.getProperty('os.name').toLowerCase(Locale.ROOT).contains('windows') - ? 'win_args.txt' : 'unix_args.txt') - [launcher, sourceArguments, libraries].each { - if (!it.exists()) throw new GradleException("Incomplete official server runtime: ${it}") - } - File runDirectory = packagedServerRunDirectory.get().asFile - File absoluteArguments = new File(runDirectory, 'forge-server-args.txt') - String libraryPath = libraries.canonicalPath.replace('\\', '/') + '/' - absoluteArguments.setText(sourceArguments.getText('UTF-8') - .replace('libraries/', libraryPath) - .replace('-DlibraryDirectory=libraries', - "-DlibraryDirectory=${libraries.canonicalPath}"), 'UTF-8') - workingDir runDirectory - commandLine java17Launcher.get().executablePath.asFile.absolutePath, - '-Xms512m', '-Xmx2g', "@${absoluteArguments.absolutePath}", 'nogui' - } - doLast { - File runDirectory = packagedServerRunDirectory.get().asFile - File marker = new File(runDirectory, 'packaged-server-smoke-pass.properties') - if (!marker.isFile()) throw new GradleException('Packaged dedicated-server completion marker is missing') - Properties values = new Properties() - marker.withInputStream { values.load(it) } - if (values.getProperty('basemetals') != '3.1.0.119041' - || values.getProperty('orespawn') != '4.1.0.119041' - || values.getProperty('forge') != '45.4.0') { - throw new GradleException("Packaged dedicated-server versions are wrong: ${values}") - } - verifyPackagedLog(runDirectory, 'BASEMETALS_PACKAGED_SERVER_SMOKE PASS', - 'Packaged dedicated-server smoke') - } -} - -def preparePackagedClientSmoke = tasks.register('preparePackagedClientSmoke') { - group = 'verification' - description = 'Stages the public Base Metals and OreSpawn jars with the isolated integrated-client probe.' - dependsOn releaseJar - dependsOn packagedClientSmokeProbe - dependsOn tasks.named('verifyReleaseDependencies') - doLast { - File runDirectory = packagedClientRunDirectory.get().asFile - delete runDirectory - runDirectory.mkdirs() - copy { - from releaseJar - from packagedClientSmokeProbe - from configurations.orespawnRelease - from configurations.packagedCompatibilityMods - into new File(runDirectory, 'mods') - } - File probeJar = new File(runDirectory, 'mods/basemetals-client-smoke.jar') - new java.util.zip.ZipFile(probeJar).withCloseable { zip -> - ['META-INF/mods.toml', 'pack.mcmeta'].each { requiredEntry -> - if (zip.getEntry(requiredEntry) == null) { - throw new GradleException("Packaged client smoke probe is missing ${requiredEntry}") - } - } - } - new File(runDirectory, 'options.txt').setText('fullscreen:false\nlang:en_us\nonboardAccessibility:false\n', 'UTF-8') - if (providers.gradleProperty('packagedHostTextureProbe').isPresent()) { - File runtime = requireRuntimeDirectory(packagedForgeClientRuntime, 'packagedForgeClientRuntime') - File hostPack = new File(runDirectory, 'resourcepacks/basemetals-host-test') - File texture = new File(hostPack, 'assets/minecraft/textures/block/stone.png') - texture.parentFile.mkdirs() - new java.util.zip.ZipFile(new File(runtime, 'versions/1.19.4/1.19.4.jar')).withCloseable { zip -> - texture.bytes = zip.getInputStream(zip.getEntry('assets/minecraft/textures/block/dirt.png')).bytes - } - new File(hostPack, 'pack.mcmeta').setText( - '{"pack":{"pack_format":13,"description":"Ore host replacement test"}}\n', 'UTF-8') - new File(runDirectory, 'options.txt').append( - 'resourcePacks:["vanilla","mod_resources","file/basemetals-host-test"]\n', 'UTF-8') - } - String mode = providers.gradleProperty('packagedContentMode').getOrElse('') - if (!mode.isEmpty()) { - if (!(mode in ['high_fantasy', 'low_fantasy'])) throw new GradleException("Invalid test mode: ${mode}") - File config = new File(runDirectory, 'config/basemetals-common.toml') - config.parentFile.mkdirs() - config.setText("contentMode=\"${mode}\"\n", 'UTF-8') - } - } -} - -def packagedClientStartupSmoke = tasks.register('packagedClientStartupSmoke', Exec) { - group = 'verification' - description = 'Starts an official Forge client with the exact packaged release jars and integrated-world probe.' - dependsOn preparePackagedClientSmoke - doFirst { - File runtime = requireRuntimeDirectory(packagedForgeClientRuntime, 'packagedForgeClientRuntime') - String forgeVersionId = ['1.19.4-forge-45.4.0', 'forge-45.4.0'].find { candidate -> - new File(runtime, "versions/${candidate}/${candidate}.json").isFile() - } - if (forgeVersionId == null) throw new GradleException('Official client runtime has no Forge 45.4.0 profile') - File forgeJsonFile = new File(runtime, "versions/${forgeVersionId}/${forgeVersionId}.json") - File baseJsonFile = new File(runtime, 'versions/1.19.4/1.19.4.json') - File baseJar = new File(runtime, 'versions/1.19.4/1.19.4.jar') - File nativesDirectory = new File(runtime, "natives/${forgeVersionId}") - [forgeJsonFile, baseJsonFile, baseJar, new File(runtime, 'libraries'), - new File(runtime, 'assets'), nativesDirectory].each { - if (!it.exists()) throw new GradleException("Incomplete official client runtime: ${it}") - } - def slurper = new JsonSlurper() - Map forgeJson = (Map) slurper.parse(forgeJsonFile) - Map baseJson = (Map) slurper.parse(baseJsonFile) - String currentOsName = System.getProperty('os.name').toLowerCase(Locale.ROOT).with { name -> - name.contains('windows') ? 'windows' : (name.contains('mac') ? 'osx' : 'linux') - } - String currentOsArch = System.getProperty('os.arch') - Map classpathByModule = new LinkedHashMap<>() - [baseJson, forgeJson].each { Map metadata -> - ((List) metadata.libraries).each { Map library -> - List rules = (List) library.rules - boolean allowed = rules == null || rules.isEmpty() - if (rules != null) { - rules.each { Map rule -> - Map os = (Map) rule.os - boolean matches = os == null || (os.name == currentOsName - && (os.arch == null || os.arch == currentOsArch)) - if (matches) allowed = rule.action == 'allow' - } - } - if (!allowed) return - String relative = (String) ((Map) ((Map) library.downloads).artifact).path - File artifact = new File(runtime, "libraries/${relative}") - if (!artifact.isFile()) throw new GradleException("Missing official client library: ${artifact}") - List coordinates = ((String) library.name).split(':') as List - String module = coordinates.size() >= 2 - ? "${coordinates[0]}:${coordinates[1]}:${coordinates.size() >= 4 ? coordinates[3] : ''}" - : (String) library.name - classpathByModule.put(module, artifact) - } - } - List classpathFiles = new ArrayList<>(classpathByModule.values()) - classpathFiles.add(baseJar) - String libraryDirectory = new File(runtime, 'libraries').absolutePath - List forgeJvmArguments = ((List) ((Map) forgeJson.arguments).jvm) - .collect { String argument -> - argument.replace('${library_directory}', libraryDirectory) - .replace('${classpath_separator}', File.pathSeparator) - .replace('${version_name}', (String) forgeJson.inheritsFrom) - } - List gameArguments = [] - gameArguments.addAll((List) ((Map) forgeJson.arguments).game) - gameArguments.addAll([ - '--username', 'BaseMetalsValidation', - '--version', (String) forgeJson.id, - '--gameDir', packagedClientRunDirectory.get().asFile.absolutePath, - '--assetsDir', new File(runtime, 'assets').absolutePath, - '--assetIndex', (String) ((Map) baseJson.assetIndex).id, - '--uuid', '00000000-0000-0000-0000-000000000001', - '--accessToken', 'validation-token', - '--userType', 'legacy', - '--versionType', 'release', - '--width', '854', '--height', '480' - ]) - File runDirectory = packagedClientRunDirectory.get().asFile - workingDir runDirectory - File clientJava = packagedClientJavaExecutable.isPresent() - ? file(packagedClientJavaExecutable.get()) : java17Launcher.get().executablePath.asFile - if (!clientJava.isFile()) { - throw new GradleException("packagedClientJavaExecutable does not name a Java executable: ${clientJava}") - } - List command = [ - clientJava.absolutePath, - '-Xms512m', '-Xmx2g', - '-Dbasemetals.integratedWorldSmoke=true', - '-Dbasemetals.integratedWorldSmokeName=basemetals-packaged-client-smoke', - "-Dbasemetals.hostTextureProbe=${providers.gradleProperty('packagedHostTextureProbe').isPresent()}", - "-Djava.library.path=${nativesDirectory.absolutePath}", - '-Dminecraft.launcher.brand=basemetals-validation', - '-Dminecraft.launcher.version=1' - ] - command.addAll(forgeJvmArguments) - command.addAll(['-cp', classpathFiles.collect { it.absolutePath }.join(File.pathSeparator), - (String) forgeJson.mainClass]) - command.addAll(gameArguments) - commandLine(command) - } - doLast { - verifyPackagedLog(packagedClientRunDirectory.get().asFile, - 'BASEMETALS_INTEGRATED_SMOKE PASS', 'Packaged client smoke') - } -} - -tasks.register('packagedRuntimeSmoke') { - group = 'verification' - description = 'Runs both official packaged client and dedicated-server startup gates.' - dependsOn packagedServerStartupSmoke - dependsOn packagedClientStartupSmoke -} diff --git a/gradle/verification/support.gradle b/gradle/verification/support.gradle deleted file mode 100644 index fa621b7d8..000000000 --- a/gradle/verification/support.gradle +++ /dev/null @@ -1,128 +0,0 @@ -// Shared validation gates that do not require an installed packaged runtime. -tasks.named('test', Test).configure { - useJUnitPlatform() -} - -def prepareCustomDimensionSmoke = tasks.register('prepareCustomDimensionSmoke', Sync) { - group = 'verification' - description = 'Installs the runtime-only custom-dimension datapack into the disposable smoke world.' - from layout.projectDirectory.dir('src/smoke/datapack') - into layout.projectDirectory.dir('run/smoke-custom-dimension/datapacks/basemetals-smoke') -} - -tasks.matching { it.name == 'runServer' }.configureEach { - if (providers.gradleProperty('smokeCustomDimension').isPresent()) { - dependsOn prepareCustomDimensionSmoke - } -} - -def upgradeWorldSmokeRequested = providers.gradleProperty('upgradeWorldSmoke').isPresent() -def legacyWorldSmokeRequested = providers.gradleProperty('legacyWorldSmoke').isPresent() -def configuredUpgradeWorldName = upgradeWorldSmokeRequested - ? providers.gradleProperty('upgradeWorldName').orNull - : providers.gradleProperty('legacyWorldName').orNull -def upgradeSmokeResultFile = configuredUpgradeWorldName == null - ? null - : layout.projectDirectory.file("run-upgrade/${configuredUpgradeWorldName}/BASEMETALS_UPGRADE_SMOKE_RESULT.txt") - -def verifyUpgradeWorldSmokeResult = tasks.register('verifyUpgradeWorldSmokeResult') { - group = 'verification' - description = 'Fails unless the selected upgraded-world smoke writes its expected success marker.' - onlyIf { upgradeWorldSmokeRequested || legacyWorldSmokeRequested } - doLast { - if (configuredUpgradeWorldName == null || configuredUpgradeWorldName.isBlank()) { - throw new GradleException('An upgraded-world smoke requires -PupgradeWorldName or -PlegacyWorldName') - } - if (configuredUpgradeWorldName.contains('/') || configuredUpgradeWorldName.contains('\\') - || configuredUpgradeWorldName == '.' || configuredUpgradeWorldName == '..') { - throw new GradleException("Invalid upgraded-world smoke name: ${configuredUpgradeWorldName}") - } - File result = upgradeSmokeResultFile.asFile - if (!result.isFile()) { - throw new GradleException("Upgraded-world smoke did not write ${result}") - } - String expected = upgradeWorldSmokeRequested - ? 'BASEMETALS_UPGRADE_SMOKE PASS' - : 'BASEMETALS_LEGACY_WORLD_SMOKE PASS' - String actual = result.getText('UTF-8').trim() - if (!actual.startsWith(expected)) { - throw new GradleException("Upgraded-world smoke failed: ${actual}") - } - } -} - -tasks.matching { it.name == 'runServer' }.configureEach { - if (upgradeWorldSmokeRequested || legacyWorldSmokeRequested) { - finalizedBy verifyUpgradeWorldSmokeResult - doFirst { - if (configuredUpgradeWorldName == null || configuredUpgradeWorldName.isBlank()) { - throw new GradleException('An upgraded-world smoke requires -PupgradeWorldName or -PlegacyWorldName') - } - if (configuredUpgradeWorldName.contains('/') || configuredUpgradeWorldName.contains('\\') - || configuredUpgradeWorldName == '.' || configuredUpgradeWorldName == '..') { - throw new GradleException("Invalid upgraded-world smoke name: ${configuredUpgradeWorldName}") - } - delete upgradeSmokeResultFile - } - } -} - -// Native datagen uses a disposable output tree; check never rewrites source files. -def generatedResourcesDir = layout.projectDirectory.dir('src/generated/resources') -def generatedVerificationDir = layout.buildDirectory.dir('generated-verification') - -def generatedFingerprint = { File directory -> - fileTree(directory).matching { exclude '.cache/**' }.files - .findAll { it.isFile() }.sort { a, b -> a.absolutePath <=> b.absolutePath } - .collectEntries { File resource -> - String relative = directory.toPath().relativize(resource.toPath()).toString().replace('\\', '/') - byte[] digest = java.security.MessageDigest.getInstance('SHA-256').digest(resource.bytes) - [(relative): digest.encodeHex().toString()] - } -} - -tasks.register('generateResources', Sync) { - group = 'build' - description = 'Updates the checked-in recipes, models, translations and tags.' - dependsOn 'runData' - from generatedVerificationDir - exclude '.cache/**' - into generatedResourcesDir -} - -def verifyGeneratedData = tasks.register('verifyGeneratedData') { - group = 'verification' - description = 'Compares native datagen output with checked-in resources without modifying them.' - dependsOn 'runData' - doLast { - Map committed = generatedFingerprint(generatedResourcesDir.asFile) - Map generated = generatedFingerprint(generatedVerificationDir.get().asFile) - if (committed != generated) { - Set changed = new TreeSet<>(committed.keySet() + generated.keySet()) - changed.removeIf { committed[it] == generated[it] } - throw new GradleException("Generated resources are stale. Run generateResources: ${changed.join(', ')}") - } - } -} - -tasks.named('check').configure { - dependsOn verifyGeneratedData - dependsOn tasks.named('verifyReleaseDependencies') - dependsOn tasks.named('verifyMavenCoordinates') - dependsOn tasks.named('verifyReleaseConfiguration') -} - -def prepareGameTestStructures = tasks.register('prepareGameTestStructures', Copy) { - group = 'verification' - description = 'Copies the tracked SNBT fixtures into the GameTest working directory.' - from layout.projectDirectory.dir('src/gametest/resources/gameteststructures') - into layout.projectDirectory.dir('run-gametest/gameteststructures') -} - -tasks.matching { it.name == 'prepareRunGameTestServer' }.configureEach { - dependsOn prepareGameTestStructures -} - -tasks.matching { it.name == 'runGameTestServer' }.configureEach { - dependsOn prepareGameTestStructures -} diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 0d4a95168..5097068a8 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 2c68b418f..1eca32e7b 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,10 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-9.6.1-bin.zip -distributionSha256Sum=9c0f7faeeb306cb14e4279a3e084ca6b596894089a0638e68a07c945a32c9e14 +distributionSha256Sum=bafd5ce9cfaea0fbccfdc8439a1ac42fbd4cd9c89dc9a988228d8a2639a58e6c +distributionUrl=https\://services.gradle.org/distributions/gradle-9.8.0-bin.zip +networkTimeout=10000 +retries=0 +retryBackOffMs=500 +validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index cccdd3d51..249efbb03 100755 --- a/gradlew +++ b/gradlew @@ -1,78 +1,128 @@ -#!/usr/bin/env sh +#!/bin/sh + +# +# Copyright © 2015 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. +# +# SPDX-License-Identifier: Apache-2.0 +# ############################################################################## -## -## Gradle start up script for UN*X -## +# +# gradlew 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 gradlew +# +# 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/3d91ce3b8caaf77ad09f381f43615b715b53f72c/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# ############################################################################## # Attempt to set APP_HOME + # Resolve links: $0 may be a link -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 +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 done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null - -APP_NAME="Gradle" -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="" +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit # 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 - ;; - MINGW* ) - msys=true - ;; - NONSTOP* ) - nonstop=true - ;; +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | 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 @@ -81,92 +131,118 @@ Please set the JAVA_HOME variable in your environment to match the location of your Java installation." fi else - 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. + JAVACMD=java + if ! command -v java >/dev/null 2>&1 + then + 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 location of your Java installation." + fi fi # Increase the maximum file descriptors if we can. -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 +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac fi -# 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 +# 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" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) -# 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 - 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\"" + 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" ) fi - i=$((i+1)) + # 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 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 -# Escape application args -save () { - for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done - echo " " -} -APP_ARGS=$(save "$@") - -# 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")" +# 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"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" fi +# 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' ' ' + )" '"$@"' + exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat index f9553162f..3185a43f7 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -1,84 +1,112 @@ -@if "%DEBUG%" == "" @echo off +@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 +@rem SPDX-License-Identifier: Apache-2.0 +@rem + +@if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem -@rem Gradle startup script for Windows +@rem gradlew startup script for Windows @rem @rem ########################################################################## -@rem Set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" setlocal +@rem Set local scope for the variables, and ensure extensions are enabled +setlocal EnableExtensions + +@rem Catch executions from older scripts and ensure they exit cleanly. +@rem This can be removed once we can be reasonably confident that few people +@rem will be migrating directly to this new wrapper. +goto afterSafetyNet +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +goto exitWithErrorLevel +:afterSafetyNet set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused 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= +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%" == "0" goto init +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. +1>&2 echo. +1>&2 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +1>&2 echo. +1>&2 echo Please set the JAVA_HOME variable in your environment to match the +1>&2 echo location of your Java installation. -goto fail +"%COMSPEC%" /c exit 1 +goto exitWithErrorLevel :findJavaFromJavaHome set JAVA_HOME=%JAVA_HOME:"=% set JAVA_EXE=%JAVA_HOME%/bin/java.exe -if exist "%JAVA_EXE%" goto init +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. +1>&2 echo. +1>&2 echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +1>&2 echo. +1>&2 echo Please set the JAVA_HOME variable in your environment to match the +1>&2 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=%* +"%COMSPEC%" /c exit 1 +goto exitWithErrorLevel :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 +@rem Execute gradlew +@rem endlocal doesn't take effect until after the line is parsed and variables are expanded +@rem which allows us to clear the local environment before executing the java command +endlocal & "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* & call :exitWithErrorLevel & goto exitWithErrorLevel -:omega +@rem This label must not be changed. We rely on old scripts being able to jump to this point. +:exitWithErrorLevel +@rem Use "%COMSPEC%" /c exit to allow operators to work properly in scripts +"%COMSPEC%" /c exit %ERRORLEVEL% diff --git a/settings.gradle b/settings.gradle index 2c1d24c16..03d3aa0f1 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,12 +1,11 @@ pluginManagement { repositories { gradlePluginPortal() - maven { url = 'https://maven.neoforged.net/releases' } } } plugins { - id 'org.gradle.toolchains.foojay-resolver-convention' version '1.0.0' + id("org.gradle.toolchains.foojay-resolver-convention") version '1.0.0' } -rootProject.name = 'BaseMetals' +rootProject.name = "BaseMetals" diff --git a/src/dataGenerator/java/zone/moddev/mc/basemetals/data/BMBlockStateProvider.java b/src/dataGenerator/java/zone/moddev/mc/basemetals/data/BMBlockStateProvider.java index 59a8a9ceb..b146f31cf 100644 --- a/src/dataGenerator/java/zone/moddev/mc/basemetals/data/BMBlockStateProvider.java +++ b/src/dataGenerator/java/zone/moddev/mc/basemetals/data/BMBlockStateProvider.java @@ -40,7 +40,7 @@ public static void gatherData(GatherDataEvent event) { @Override protected void registerStatesAndModels() { - for (MaterialDefinition material : MaterialCatalogue.ALL) { + for (MaterialDefinition material : MaterialCatalogue.all()) { if (!material.hasOre()) continue; Block block = ModContent.blocksById().get(material.name() + "_ore").get(); diff --git a/src/dataGenerator/java/zone/moddev/mc/basemetals/data/BaseMetalsDataGenerators.java b/src/dataGenerator/java/zone/moddev/mc/basemetals/data/BaseMetalsDataGenerators.java index 53fff13f1..e2a885f17 100644 --- a/src/dataGenerator/java/zone/moddev/mc/basemetals/data/BaseMetalsDataGenerators.java +++ b/src/dataGenerator/java/zone/moddev/mc/basemetals/data/BaseMetalsDataGenerators.java @@ -14,11 +14,9 @@ import net.neoforged.fml.common.EventBusSubscriber; import net.neoforged.neoforge.data.event.GatherDataEvent; -//import zone.moddev.mc.basemetals.content.CompatibilityDoubleSlabBlock; -import zone.moddev.mc.basemetals.content.BaseMetalAnvilBlock; -import zone.moddev.mc.basemetals.content.HumanDetectorBlock; import zone.moddev.mc.basemetals.content.ModContent; -import zone.moddev.mc.basemetals.content.PlateBlock; +import zone.moddev.mc.lib.common.runtime.MaterialAnvilBlock; +import zone.moddev.mc.lib.common.runtime.PlateBlock; import zone.moddev.mc.basemetals.material.MaterialCatalogue; import net.minecraft.world.level.block.AnvilBlock; @@ -58,6 +56,9 @@ protected void registerStatesAndModels() { ModContent.blocksById().forEach((id, object) -> { net.minecraft.world.level.block.Block block = object.get(); if (block instanceof LiquidBlock || id.endsWith("_ore")) return; + // The vanilla extensions ship static blockstates imported from MMDLib. + if (models().existingFileHelper.exists(modLoc(id), net.minecraft.server.packs.PackType.CLIENT_RESOURCES, + ".json", "blockstates")) return; if (block instanceof PlateBlock) { plateBlock(block, existing(id)); } else if (block instanceof IronBarsBlock bars) { @@ -70,7 +71,7 @@ protected void registerStatesAndModels() { } else if (block instanceof ButtonBlock button) { buttonBlock(button, existing(id), existing(id + "_pressed")); } else if (block instanceof SlabBlock slab) { - String base = id.startsWith("double_") ? id.substring(7, id.length() - 5) : id.substring(0, id.length() - 5); + String base = id.substring(0, id.length() - (id.endsWith("_double_slab") ? "_double_slab" : "_slab").length()); slabBlock(slab, existing("half_slab_" + base), existing("upper_slab_" + base), fullBlockModel(base)); } else if (block instanceof PressurePlateBlock plate) { @@ -84,11 +85,9 @@ protected void registerStatesAndModels() { } else if (block instanceof LeverBlock lever) { getVariantBuilder(lever).forAllStates(state -> ConfiguredModel.builder() .modelFile(existing(state.getValue(BlockStateProperties.POWERED) ? id : id + "_off")).build()); - } else if (block instanceof HumanDetectorBlock detector) { - pressurePlateBlock(detector, existing("human_detector_up"), existing("human_detector_down")); - } else if (block instanceof BaseMetalAnvilBlock anvil) { + } else if (block instanceof MaterialAnvilBlock anvil) { getVariantBuilder(anvil).forAllStates(state -> ConfiguredModel.builder() - .modelFile(existing(id + switch (state.getValue(BaseMetalAnvilBlock.DAMAGE)) { + .modelFile(existing(id + switch (state.getValue(MaterialAnvilBlock.DAMAGE)) { case 0 -> "_undamaged"; case 1 -> "_slightly_damaged"; default -> "_very_damaged"; @@ -133,14 +132,14 @@ private ModelFile existing(String name) { } private ModelFile fullBlockModel(String material) { - return MaterialCatalogue.BY_NAME.containsKey(material) + return MaterialCatalogue.byName().containsKey(material) ? existing(material + "_block") : models().getExistingFile(mcLoc("block/" + (material.equals("obsidian") ? "obsidian" : material + "_block"))); } private net.minecraft.resources.ResourceLocation fullBlockTexture(String material) { - return MaterialCatalogue.BY_NAME.containsKey(material) + return MaterialCatalogue.byName().containsKey(material) ? modLoc("block/" + material + "_block") : mcLoc("block/" + switch (material) { case "obsidian" -> "obsidian"; @@ -208,12 +207,8 @@ private Items(net.minecraft.data.PackOutput generator, ExistingFileHelper helper @Override protected void registerModels() { - MaterialCatalogue.ALL.stream().filter(material -> material.hasOre() && !material.name().equals("copper")) + MaterialCatalogue.all().stream().filter(material -> material.hasOre() && !material.name().equals("copper")) .forEach(material -> basicFromTexture(material.name() + "_raw", material.name() + "_raw")); - for (String material : java.util.List.of("diamond", "gold", "iron")) { - basicFromTexture(material + "_blend", material + "_powder"); - basicFromTexture(material + "_smallblend", material + "_smallpowder"); - } ModContent.fluids().forEach((name, fluid) -> getBuilder(name + "_bucket") .parent(getExistingFile(net.minecraft.resources.ResourceLocation.fromNamespaceAndPath("neoforge", "item/bucket"))) diff --git a/src/dataGenerator/java/zone/moddev/mc/basemetals/data/GeneratedData.java b/src/dataGenerator/java/zone/moddev/mc/basemetals/data/GeneratedData.java index 4de39cf36..fbc51cfe1 100644 --- a/src/dataGenerator/java/zone/moddev/mc/basemetals/data/GeneratedData.java +++ b/src/dataGenerator/java/zone/moddev/mc/basemetals/data/GeneratedData.java @@ -40,7 +40,12 @@ final class GeneratedData implements DataProvider { private static final List PROCESSING_MATERIALS = List.of( "adamantine", "antimony", "bismuth", "coldiron", "nickel", "platinum", "starsteel", "zinc"); + // MMDLib only plans these forms when Mekanism is installed. + private static final List MEKANISM_FORMS = List.of("crystals", "shards", "clumps", "dirty_dusts"); private static final String WOODEN_ROD = "#c:rods/wooden"; + /** Vanilla materials whose extensions include equipment and decorative blocks. */ + private static final List VANILLA_EQUIPMENT = List.of( + "diamond", "emerald", "gold", "iron", "obsidian", "quartz"); private static final Map> ALLOYS = Map.ofEntries( Map.entry("aquarium", List.of(component("copper", 2), component("zinc", 1), new AlloyComponent("#c:dusts/prismarine", 1))), @@ -112,8 +117,8 @@ private void writeLoot(CachedOutput cache) throws IOException { continue; } String drop = id; - boolean compatibilitySlab = id.startsWith("double_") && id.endsWith("_slab"); - if (compatibilitySlab) drop = id.substring("double_".length()); + boolean compatibilitySlab = id.endsWith("_double_slab"); + if (compatibilitySlab) drop = id.substring(0, id.length() - "_double_slab".length()) + "_slab"; JsonObject entry = object("type", "minecraft:item", "name", "basemetals:" + drop); JsonArray functions = new JsonArray(); if (compatibilitySlab) { @@ -127,7 +132,7 @@ private void writeLoot(CachedOutput cache) throws IOException { count.add("conditions", conditions); functions.add(count); } else if (ModContent.blocksById().get(id).get() - instanceof zone.moddev.mc.basemetals.content.BaseMetalAnvilBlock) { + instanceof zone.moddev.mc.lib.common.runtime.MaterialAnvilBlock) { JsonObject copyDamage = object("function", "minecraft:copy_state", "block", "basemetals:" + id); copyDamage.add("properties", array("damage")); @@ -157,29 +162,29 @@ private void writeTags(CachedOutput cache) throws IOException { if (!ModContent.fluids().containsKey(id)) allBlockDrops.add("basemetals:" + id); } tag(cache, "minecraft", "blocks/mineable/pickaxe", allBlockDrops); - List beaconBases = MaterialCatalogue.ALL.stream() + List beaconBases = MaterialCatalogue.all().stream() .filter(MaterialDefinition::hasEquipment) .map(material -> "basemetals:" + material.name() + "_block") .collect(java.util.stream.Collectors.toCollection(ArrayList::new)); beaconBases.add("basemetals:charcoal_block"); tag(cache, "minecraft", "blocks/beacon_base_blocks", beaconBases); - // AnvilBlock.damage is hard-coded to the three vanilla blocks in 1.18. - // Tagging a custom anvil makes any damaging fall delete it immediately. - // BaseMetalAnvilBlock supplies the menu and durability handling itself. - tag(cache, "basemetals", "blocks/scythe_harvestable", scytheHarvestableBlocks()); - tag(cache, "basemetals", "blocks/crackhammer_crushable", crackhammerCrushableBlocks()); + // MMDLib's scythe and crackhammer read these tags; add Base Metals blocks to them. + tag(cache, "mmdlib", "blocks/scythe_harvestable", scytheHarvestableBlocks()); + tag(cache, "mmdlib", "blocks/crackhammer_crushable", crackhammerCrushableBlocks()); writeHarvestTierTags(cache); tag(cache, "forge", "blocks/netherrack", List.of("minecraft:netherrack")); tag(cache, "forge", "blocks/end_stones", List.of("minecraft:end_stone")); + // Bolts are arrows to MMDLib's crossbow, as they are in MMDLib's own tag. tag(cache, "minecraft", "items/arrows", java.util.stream.Stream.concat( - MaterialCatalogue.ALL.stream().filter(MaterialDefinition::hasEquipment) - .map(material -> "basemetals:" + material.name() + "_arrow"), - List.of("diamond", "emerald", "gold", "iron", "obsidian", "quartz").stream() - .map(name -> "basemetals:" + name + "_arrow")).toList()); + MaterialCatalogue.all().stream().filter(MaterialDefinition::hasEquipment).map(MaterialDefinition::name), + VANILLA_EQUIPMENT.stream()) + .flatMap(name -> java.util.stream.Stream.of( + "basemetals:" + name + "_arrow", "basemetals:" + name + "_bolt")) + .toList()); Map> aggregateItems = new LinkedHashMap<>(); Map> aggregateBlocks = new LinkedHashMap<>(); - for (MaterialDefinition material : MaterialCatalogue.ALL) { + for (MaterialDefinition material : MaterialCatalogue.all()) { String name = material.name(); itemTag(cache, "ingots", name, entries(name, "ingot", name.equals("copper") ? "minecraft:copper_ingot" : null)); itemTag(cache, "nuggets", name, entries(name, "nugget")); @@ -215,7 +220,11 @@ private void writeTags(CachedOutput cache) throws IOException { case "dirty_dusts" -> "powder_dirty"; default -> form.substring(0, form.length() - 1); }; - itemTag(cache, form, name, entries(name, itemSuffix)); + if (MEKANISM_FORMS.contains(form)) { + optionalTag(cache, "c", "item/" + form + "/" + name, entries(name, itemSuffix)); + } else { + itemTag(cache, form, name, entries(name, itemSuffix)); + } } } addAggregate(aggregateItems, "ingots", "#c:ingots/" + name); @@ -260,6 +269,7 @@ private void writeTags(CachedOutput cache) throws IOException { writeCompatibilityTags(cache); } + /** Tags for the vanilla material extensions (1.12's Vanilla Bits). */ private void writeVanillaBitsTags(CachedOutput cache) throws IOException { Map vanillaIngot = Map.of( "diamond", "minecraft:diamond", "emerald", "minecraft:emerald", @@ -269,32 +279,24 @@ private void writeVanillaBitsTags(CachedOutput cache) throws IOException { "diamond", "minecraft:diamond_block", "emerald", "minecraft:emerald_block", "gold", "minecraft:gold_block", "iron", "minecraft:iron_block", "quartz", "minecraft:quartz_block", "obsidian", "minecraft:obsidian"); - for (String material : List.of("diamond", "emerald", "gold", "iron", "obsidian", "quartz")) { - if (ModContent.itemsById().containsKey(material + "_rod")) { - tag(cache, "forge", "items/rods/" + material, - List.of("basemetals:" + material + "_rod")); + for (String material : VANILLA_EQUIPMENT) { + if (hasItem(material + "_rod")) { + tag(cache, "forge", "items/rods/" + material, List.of("basemetals:" + material + "_rod")); } - if (ModContent.itemsById().containsKey(material + "_gear")) { - tag(cache, "forge", "items/gears/" + material, - List.of("basemetals:" + material + "_gear")); + if (hasItem(material + "_gear")) { + tag(cache, "forge", "items/gears/" + material, List.of("basemetals:" + material + "_gear")); } - tag(cache, "forge", "items/materials/" + material, - List.of(vanillaIngot.get(material))); - tag(cache, "forge", "items/storage_blocks/" + material, - List.of(vanillaBlock.get(material))); - tag(cache, "forge", "blocks/storage_blocks/" + material, - List.of(vanillaBlock.get(material))); + tag(cache, "forge", "items/materials/" + material, List.of(vanillaIngot.get(material))); + tag(cache, "forge", "items/storage_blocks/" + material, List.of(vanillaBlock.get(material))); + tag(cache, "forge", "blocks/storage_blocks/" + material, List.of(vanillaBlock.get(material))); } tag(cache, "forge", "items/rods/stone", List.of("basemetals:stone_rod")); for (String material : List.of("wood", "stone")) { - tag(cache, "forge", "items/gears/" + material, - List.of("basemetals:" + material + "_gear")); + tag(cache, "forge", "items/gears/" + material, List.of("basemetals:" + material + "_gear")); } for (String material : List.of("coal", "charcoal", "diamond", "emerald", "gold", "iron", "obsidian", "quartz")) { - tag(cache, "forge", "items/dusts/" + material, - List.of("basemetals:" + material + "_powder")); - tag(cache, "forge", "items/tiny_dusts/" + material, - List.of("basemetals:" + material + "_smallpowder")); + tag(cache, "forge", "items/dusts/" + material, List.of("basemetals:" + material + "_powder")); + tag(cache, "forge", "items/tiny_dusts/" + material, List.of("basemetals:" + material + "_smallpowder")); } tag(cache, "forge", "items/tiny_dusts/redstone", List.of("basemetals:redstone_smallpowder")); tag(cache, "forge", "items/tiny_dusts/lapis", List.of("basemetals:lapis_smallpowder")); @@ -302,18 +304,15 @@ private void writeVanillaBitsTags(CachedOutput cache) throws IOException { tag(cache, "forge", "items/dusts/lapis", List.of("minecraft:lapis_lazuli")); tag(cache, "forge", "items/dusts/prismarine", List.of("minecraft:prismarine_shard")); for (String material : List.of("coal", "charcoal", "diamond", "emerald", "obsidian", "quartz")) { - tag(cache, "forge", "items/nuggets/" + material, - List.of("basemetals:" + material + "_nugget")); + tag(cache, "forge", "items/nuggets/" + material, List.of("basemetals:" + material + "_nugget")); } tag(cache, "forge", "items/ingots/obsidian", List.of("basemetals:obsidian_ingot")); tag(cache, "forge", "items/ingots/redstone", List.of("basemetals:redstone_ingot")); tag(cache, "forge", "items/plates/gold", List.of("basemetals:gold_plate")); tag(cache, "forge", "items/plates/iron", List.of("basemetals:iron_plate")); for (String material : List.of("diamond", "gold", "iron")) { - tag(cache, "forge", "items/blends/" + material, - List.of("basemetals:" + material + "_blend")); - tag(cache, "forge", "items/small_blends/" + material, - List.of("basemetals:" + material + "_smallblend")); + tag(cache, "forge", "items/blends/" + material, List.of("basemetals:" + material + "_blend")); + tag(cache, "forge", "items/small_blends/" + material, List.of("basemetals:" + material + "_smallblend")); } tag(cache, "forge", "items/storage_blocks/charcoal", List.of("basemetals:charcoal_block")); tag(cache, "forge", "blocks/storage_blocks/charcoal", List.of("basemetals:charcoal_block")); @@ -346,9 +345,9 @@ private static List scytheHarvestableBlocks() { private static List crackhammerCrushableBlocks() { LinkedHashSet values = new LinkedHashSet<>(); - MaterialCatalogue.ALL.stream().filter(MaterialDefinition::hasOre) + MaterialCatalogue.all().stream().filter(MaterialDefinition::hasOre) .map(material -> "#c:ores/" + material.name()).forEach(values::add); - MaterialCatalogue.ALL.stream().filter(MaterialDefinition::hasEquipment) + MaterialCatalogue.all().stream().filter(MaterialDefinition::hasEquipment) .map(material -> "#c:storage_blocks/" + material.name()).forEach(values::add); for (String name : List.of("coal", "diamond", "emerald", "gold", "iron", "lapis", "redstone", "quartz", "netherite_scrap")) { @@ -388,7 +387,7 @@ private void writeHarvestTierTags(CachedOutput cache) throws IOException { "diamond", 3, "emerald", 3, "obsidian", 3, "iron", 2, "quartz", 1); vanillaLevels.forEach((name, level) -> ModContent.blocksById().keySet().stream() - .filter(id -> id.startsWith(name + "_") || id.equals("double_" + name + "_slab")) + .filter(id -> id.startsWith(name + "_")) .map(id -> "basemetals:" + id) .forEach(byTier.get(level)::add)); byTier.get(1).add("basemetals:charcoal_block"); @@ -412,10 +411,9 @@ private void writeCompatibilityTags(CachedOutput cache) throws IOException { PROCESSING_MATERIALS.stream() .map(material -> "basemetals:" + state + "_" + material).toList()); } - for (MaterialDefinition material : MaterialCatalogue.ALL) { - tag(cache, "forge", "fluids/molten_" + material.name(), List.of( - "basemetals:" + material.name(), - "basemetals:flowing_" + material.name())); + for (String fluid : ModContent.fluids().keySet()) { + tag(cache, "forge", "fluids/molten_" + fluid, List.of( + "basemetals:" + fluid, "basemetals:flowing_" + fluid)); } for (String material : PROCESSING_MATERIALS) { for (String family : List.of("dirty_dusts", "clumps", "crystals", "shards")) { @@ -426,7 +424,7 @@ private void writeCompatibilityTags(CachedOutput cache) throws IOException { } private void writeRecipes(CachedOutput cache) throws IOException { - for (MaterialDefinition material : MaterialCatalogue.ALL) { + for (MaterialDefinition material : MaterialCatalogue.all()) { String name = material.name(); String ingot = "basemetals:" + name + "_ingot"; String ingotIngredient = "#c:ingots/" + name; @@ -568,13 +566,8 @@ private void vanillaBitsRecipes(CachedOutput cache) throws IOException { "diamond", "#c:gems/diamond", "emerald", "#c:gems/emerald", "gold", "#c:ingots/gold", "iron", "#c:ingots/iron", "obsidian", "#c:ingots/obsidian", "quartz", "#c:gems/quartz"); - Map blocks = Map.of( - "diamond", "#c:storage_blocks/diamond", "emerald", "#c:storage_blocks/emerald", - "gold", "#c:storage_blocks/gold", "iron", "#c:storage_blocks/iron", - "obsidian", "#c:storage_blocks/obsidian", "quartz", "#c:storage_blocks/quartz"); - for (Map.Entry entry : materials.entrySet()) { - String name = entry.getKey(); - String material = entry.getValue(); + for (String name : VANILLA_EQUIPMENT) { + String material = materials.get(name); if (hasItem(name + "_rod")) { shaped(cache, name + "_rod", List.of("X", "X"), Map.of('X', material), "basemetals:" + name + "_rod", 4); @@ -586,14 +579,13 @@ private void vanillaBitsRecipes(CachedOutput cache) throws IOException { "basemetals:" + name + "_gear", 4); } vanillaEquipmentRecipes(cache, name, material); - vanillaDecorativeRecipes(cache, name, material, blocks.get(name)); + vanillaDecorativeRecipes(cache, name, material, "#c:storage_blocks/" + name); } shaped(cache, "gold_plate", List.of("XXX"), Map.of('X', "#c:ingots/gold"), "basemetals:gold_plate", 3); shaped(cache, "iron_plate", List.of("XXX"), Map.of('X', "#c:ingots/iron"), "basemetals:iron_plate", 3); for (String name : List.of("stone", "wood")) { - String material = name.equals("stone") ? "minecraft:cobblestone" : "#minecraft:planks"; if (hasItem(name + "_crackhammer")) { String hammerHead = name.equals("stone") ? "minecraft:stone_bricks" : "#minecraft:logs"; shaped(cache, name + "_crackhammer", List.of("X", "S", "S"), @@ -601,11 +593,21 @@ private void vanillaBitsRecipes(CachedOutput cache) throws IOException { "basemetals:" + name + "_crackhammer", 1); } if (hasItem(name + "_scythe")) { - String scytheMaterial = name.equals("stone") ? "#c:stones" : material; + String scytheMaterial = name.equals("stone") ? "#c:stones" : "#minecraft:planks"; shaped(cache, name + "_scythe", List.of("XX ", " X", " S "), Map.of('X', scytheMaterial, 'S', WOODEN_ROD), "basemetals:" + name + "_scythe", 1); } + if (hasItem(name + "_gear")) { + String gearMaterial = name.equals("stone") ? "#c:cobblestones" : "#minecraft:planks"; + String gearRod = name.equals("stone") ? "#c:rods/stone" : WOODEN_ROD; + shaped(cache, name + "_gear", List.of(" X ", "XRX", " X "), + Map.of('X', gearMaterial, 'R', gearRod), "basemetals:" + name + "_gear", 4); + } + } + if (hasItem("stone_rod")) { + shaped(cache, "stone_rod", List.of("X", "X"), Map.of('X', "#c:cobblestones"), + "basemetals:stone_rod", 4); } // Vanilla Bits also allowed three Base Metals iron rods to make four // vanilla iron bars. @@ -617,7 +619,7 @@ private void vanillaBitsRecipes(CachedOutput cache) throws IOException { private void vanillaCrushingRecipes(CachedOutput cache) throws IOException { // Default MMDLib 1.12 ore-dictionary behaviour, extended through - // Forge's 1.18 ore tags so normal and deepslate ores share a recipe. + // the common ore tags so normal and deepslate ores share a recipe. for (String name : List.of("coal", "diamond", "emerald", "gold", "iron")) { crushing(cache, name + "_ore_crushing", "#c:ores/" + name, "basemetals:" + name + "_powder", 2); @@ -658,48 +660,9 @@ private void vanillaCrushingRecipes(CachedOutput cache) throws IOException { crushing(cache, "quartz_nugget_crushing", "#c:nuggets/quartz", "basemetals:quartz_smallpowder", 1); - crushing(cache, "stone_crushing", "#c:stones", "minecraft:cobblestone", 1); - crushing(cache, "stone_bricks_crushing", "minecraft:stone_bricks", "minecraft:cobblestone", 1); - crushing(cache, "stone_slab_crushing", "minecraft:stone_slab", "minecraft:cobblestone_slab", 1); - crushing(cache, "stone_brick_slab_crushing", "minecraft:stone_brick_slab", - "minecraft:cobblestone_slab", 1); - crushing(cache, "cobblestone_crushing", "#c:cobblestones", "minecraft:gravel", 1); - crushing(cache, "mossy_cobblestone_crushing", "minecraft:mossy_cobblestone", "minecraft:gravel", 1); - crushing(cache, "cobblestone_wall_crushing", "minecraft:cobblestone_wall", "minecraft:gravel", 1); - crushing(cache, "mossy_cobblestone_wall_crushing", "minecraft:mossy_cobblestone_wall", - "minecraft:gravel", 1); - crushing(cache, "gravel_crushing", "#c:gravels", "minecraft:sand", 1); - crushing(cache, "sandstone_crushing", "minecraft:sandstone", "minecraft:sand", 4); - crushing(cache, "sandstone_slab_crushing", "minecraft:sandstone_slab", "minecraft:sand", 2); - crushing(cache, "glass_crushing", "minecraft:glass", "minecraft:sand", 1); - crushing(cache, "red_sandstone_crushing", "minecraft:red_sandstone", "minecraft:red_sand", 4); - crushing(cache, "red_sandstone_slab_crushing", "minecraft:red_sandstone_slab", - "minecraft:red_sand", 2); - crushing(cache, "glowstone_crushing", "minecraft:glowstone", "minecraft:glowstone_dust", 4); - crushing(cache, "lapis_ore_crushing", "#c:ores/lapis", "minecraft:lapis_lazuli", 8); - crushing(cache, "lapis_block_crushing", "#c:storage_blocks/lapis", - "minecraft:lapis_lazuli", 9); - crushing(cache, "redstone_ore_crushing", "#c:ores/redstone", "minecraft:redstone", 8); - crushing(cache, "redstone_block_crushing", "#c:storage_blocks/redstone", - "minecraft:redstone", 9); crushing(cache, "obsidian_crushing", "minecraft:obsidian", "basemetals:obsidian_powder", 4); - crushing(cache, "sugar_cane_crushing", "minecraft:sugar_cane", "minecraft:sugar", 2); - crushing(cache, "bone_block_crushing", "minecraft:bone_block", "minecraft:bone_meal", 9); - crushing(cache, "bone_crushing", "minecraft:bone", "minecraft:bone_meal", 3); - crushing(cache, "blaze_rod_crushing", "minecraft:blaze_rod", "minecraft:blaze_powder", 2); - crushing(cache, "quartz_ore_crushing", "#c:ores/quartz", "minecraft:quartz", 2); - crushing(cache, "quartz_block_crushing", "minecraft:quartz_block", "minecraft:quartz", 4); - crushing(cache, "quartz_slab_crushing", "minecraft:quartz_slab", "minecraft:quartz", 2); - crushing(cache, "ancient_debris_crushing", "#c:ores/netherite_scrap", - "minecraft:netherite_scrap", 2); - crushing(cache, "prismarine_crushing", "minecraft:prismarine", "minecraft:prismarine_shard", 4); - crushing(cache, "prismarine_bricks_crushing", "minecraft:prismarine_bricks", - "minecraft:prismarine_shard", 9); - crushing(cache, "dark_prismarine_crushing", "minecraft:dark_prismarine", - "minecraft:prismarine_shard", 8); - crushing(cache, "sea_lantern_crushing", "minecraft:sea_lantern", - "minecraft:prismarine_crystals", 5); - crushing(cache, "slime_block_crushing", "minecraft:slime_block", "minecraft:slime_ball", 9); + // Crushing that yields vanilla items (stone to cobblestone, bone to bone meal, ...) + // is shared by every Metals and Advantage mod, so MMDLib registers it. } private void vanillaEquipmentRecipes(CachedOutput cache, String name, String material) throws IOException { @@ -738,23 +701,19 @@ private void vanillaEquipmentRecipes(CachedOutput cache, String name, String mat if (hasItem(name + "_horse_armor")) shaped(cache, name + "_horsearmor", List.of(" X", "XWX", "XXX"), Map.of('X', material, 'W', "#minecraft:wool"), "basemetals:" + name + "_horse_armor", 1); if (hasItem(name + "_sword")) { - equipmentRecipesForVanillaTools(cache, name, material); + Map tool = Map.of('X', material, 'S', WOODEN_ROD); + shaped(cache, name + "_pickaxe", List.of("XXX", " S ", " S "), tool, "basemetals:" + name + "_pickaxe", 1); + shaped(cache, name + "_axe", List.of("XX", "XS", " S"), tool, "basemetals:" + name + "_axe", 1); + shaped(cache, name + "_shovel", List.of("X", "S", "S"), tool, "basemetals:" + name + "_shovel", 1); + shaped(cache, name + "_hoe", List.of("XX", " S", " S"), tool, "basemetals:" + name + "_hoe", 1); + shaped(cache, name + "_sword", List.of("X", "X", "S"), tool, "basemetals:" + name + "_sword", 1); + shaped(cache, name + "_helmet", List.of("XXX", "X X"), Map.of('X', material), "basemetals:" + name + "_helmet", 1); + shaped(cache, name + "_chestplate", List.of("X X", "XXX", "XXX"), Map.of('X', material), "basemetals:" + name + "_chestplate", 1); + shaped(cache, name + "_leggings", List.of("XXX", "X X", "X X"), Map.of('X', material), "basemetals:" + name + "_leggings", 1); + shaped(cache, name + "_boots", List.of("X X", "X X"), Map.of('X', material), "basemetals:" + name + "_boots", 1); } } - private void equipmentRecipesForVanillaTools(CachedOutput cache, String name, String material) throws IOException { - Map tool = Map.of('X', material, 'S', WOODEN_ROD); - shaped(cache, name + "_pickaxe", List.of("XXX", " S ", " S "), tool, "basemetals:" + name + "_pickaxe", 1); - shaped(cache, name + "_axe", List.of("XX", "XS", " S"), tool, "basemetals:" + name + "_axe", 1); - shaped(cache, name + "_shovel", List.of("X", "S", "S"), tool, "basemetals:" + name + "_shovel", 1); - shaped(cache, name + "_hoe", List.of("XX", " S", " S"), tool, "basemetals:" + name + "_hoe", 1); - shaped(cache, name + "_sword", List.of("X", "X", "S"), tool, "basemetals:" + name + "_sword", 1); - shaped(cache, name + "_helmet", List.of("XXX", "X X"), Map.of('X', material), "basemetals:" + name + "_helmet", 1); - shaped(cache, name + "_chestplate", List.of("X X", "XXX", "XXX"), Map.of('X', material), "basemetals:" + name + "_chestplate", 1); - shaped(cache, name + "_leggings", List.of("XXX", "X X", "X X"), Map.of('X', material), "basemetals:" + name + "_leggings", 1); - shaped(cache, name + "_boots", List.of("X X", "X X"), Map.of('X', material), "basemetals:" + name + "_boots", 1); - } - private void vanillaDecorativeRecipes(CachedOutput cache, String name, String material, String block) throws IOException { if (hasItem(name + "_bars")) shaped(cache, name + "_bars", List.of("XXX", "XXX"), Map.of('X', material), "basemetals:" + name + "_bars", 16); @@ -762,15 +721,15 @@ private void vanillaDecorativeRecipes(CachedOutput cache, String name, String ma shaped(cache, name + "_bars_2", List.of("XXX"), Map.of('X', "#c:rods/" + name), "basemetals:" + name + "_bars", 4); } - if (hasItem(name + "_door")) { - List doorPattern = List.of("XX", "XX", "XX"); - shaped(cache, name + "_door", doorPattern, Map.of('X', material), - "basemetals:" + name + "_door", 3); - } + if (hasItem(name + "_door")) shaped(cache, name + "_door", List.of("XX", "XX", "XX"), + Map.of('X', material), "basemetals:" + name + "_door", 3); if (hasItem(name + "_trapdoor")) shaped(cache, name + "_trapdoor", List.of("XX", "XX"), Map.of('X', material), "basemetals:" + name + "_trapdoor", 1); - if (hasItem(name + "_button")) shaped(cache, name + "_button", List.of("X", "X"), - Map.of('X', "#c:nuggets/" + name), "basemetals:" + name + "_button", 1); + if (hasItem(name + "_button")) { + // Gold and iron have no Base Metals nugget: use the vanilla one via the common tag. + shaped(cache, name + "_button", List.of("X", "X"), + Map.of('X', "#c:nuggets/" + name), "basemetals:" + name + "_button", 1); + } if (hasItem(name + "_slab")) shaped(cache, name + "_slab", List.of("XXX"), Map.of('X', block), "basemetals:" + name + "_slab", 6); if (hasItem(name + "_pressure_plate")) shaped(cache, name + "_pressure_plate", List.of("XX"), Map.of('X', material), "basemetals:" + name + "_pressure_plate", 1); if (hasItem(name + "_stairs")) shaped(cache, name + "_stairs", List.of("X ", "XX ", "XXX"), Map.of('X', block), "basemetals:" + name + "_stairs", 4); @@ -817,7 +776,16 @@ private void vanillaPowderRecipes(CachedOutput cache) throws IOException { legacyRecyclingRecipes(cache, name, ingots.get(name), nuggets.get(name), blocks.get(name), ingotExperience, legacyNuggetExperience(baseExperience)); } + // MMDLib added pure-material blends for these three; 1.12 had the small blends. for (String name : List.of("diamond", "gold", "iron")) { + shapeless(cache, name + "_blend", List.of("#c:dusts/" + name, "#c:dusts/" + name), + "basemetals:" + name + "_blend", 2); + shaped(cache, name + "_blend_from_small", List.of("XXX", "XXX", "XXX"), + Map.of('X', "#c:small_blends/" + name), "basemetals:" + name + "_blend", 1); + shapeless(cache, name + "_smallblend", List.of("#c:blends/" + name), + "basemetals:" + name + "_smallblend", 9); + smelting(cache, name + "_blend_smelting", "#c:blends/" + name, ingots.get(name), + vanillaIngotSmeltingExperience(name), 200, "minecraft:smelting"); smelting(cache, name + "_smallblend_smelting", "#c:small_blends/" + name, nuggets.get(name), legacyNuggetExperience(vanillaBaseSmeltingExperience(name)), 200, "minecraft:smelting"); @@ -826,6 +794,30 @@ private void vanillaPowderRecipes(CachedOutput cache) throws IOException { Map.of('X', "#c:tiny_dusts/redstone"), "minecraft:redstone", 1); shapeless(cache, "redstone_smallpowder", List.of("#c:dusts/redstone"), "basemetals:redstone_smallpowder", 9); + shaped(cache, "lapis_from_smallpowder", List.of("XXX", "XXX", "XXX"), + Map.of('X', "#c:tiny_dusts/lapis"), "minecraft:lapis_lazuli", 1); + shapeless(cache, "lapis_smallpowder", List.of("#c:dusts/lapis"), + "basemetals:lapis_smallpowder", 9); + smelting(cache, "redstone_ingot", "#c:dusts/redstone", "basemetals:redstone_ingot", + 0.1F, 200, "minecraft:smelting"); + } + + private static float vanillaBaseSmeltingExperience(String name) { + return switch (name) { + case "gold" -> 1.0F; + case "iron" -> 0.45F; + case "diamond", "emerald", "obsidian" -> 0.4F; + case "quartz" -> 0.2F; + default -> throw new IllegalArgumentException("No Vanilla Bits furnace material " + name); + }; + } + + private static float vanillaIngotSmeltingExperience(String name) { + return switch (name) { + case "diamond", "emerald", "gold" -> 1.0F; + case "iron" -> 0.7F; + default -> vanillaBaseSmeltingExperience(name); + }; } private void legacyRecyclingRecipes(CachedOutput cache, String name, String ingot, String nugget, @@ -872,40 +864,21 @@ private static float legacyNuggetExperience(float experience) { return Math.round((experience / 9.0F) * 100.0F) / 100.0F; } - private static float vanillaBaseSmeltingExperience(String name) { - return switch (name) { - case "gold" -> 1.0F; - case "iron" -> 0.45F; - case "diamond", "emerald", "obsidian" -> 0.4F; - case "quartz" -> 0.2F; - default -> throw new IllegalArgumentException("No Vanilla Bits furnace material " + name); - }; - } - - private static float vanillaIngotSmeltingExperience(String name) { - return switch (name) { - case "diamond", "emerald", "gold" -> 1.0F; - case "iron" -> 0.7F; - default -> vanillaBaseSmeltingExperience(name); - }; - } - private void plateRepairRecipes(CachedOutput cache) throws IOException { - List materials = new ArrayList<>(MaterialCatalogue.ALL.stream() + List materials = new ArrayList<>(MaterialCatalogue.all().stream() .map(MaterialDefinition::name) .filter(name -> !List.of("aquarium", "invar", "mercury", "mithril").contains(name)) .toList()); - materials.addAll(List.of("diamond", "emerald", "gold", "iron")); + materials.addAll(List.of("gold", "iron")); for (String material : materials) { for (String form : List.of("boots", "chestplate", "helmet", "leggings", "shield")) { - String namespace = !form.equals("shield") - && List.of("diamond", "gold", "iron").contains(material) - ? "minecraft" : "basemetals"; + // Vanilla gold and iron armour, with the Base Metals shield. + String namespace = !form.equals("shield") && List.of("gold", "iron").contains(material) + ? "minecraft" : "basemetals"; String targetMaterial = namespace.equals("minecraft") && material.equals("gold") ? "golden" : material; plateRepair(cache, material + "_" + form + "_plate_repair", - namespace + ":" + targetMaterial + "_" + form, - "#c:plates/" + material); + namespace + ":" + targetMaterial + "_" + form, "#c:plates/" + material); } } } @@ -937,6 +910,8 @@ private void legacySpecialRecipes(CachedOutput cache) throws IOException { shaped(cache, "charcoal_block", List.of("XXX", "XXX", "XXX"), Map.of('X', "minecraft:charcoal"), "basemetals:charcoal_block", 1); + shapeless(cache, "charcoal_from_block", List.of("basemetals:charcoal_block"), + "minecraft:charcoal", 9); shaped(cache, "charcoal_block_dust", List.of("XXX", "XXX", "XXX"), Map.of('X', "#c:dusts/charcoal"), "basemetals:charcoal_block", 1); shaped(cache, "charcoal_ingot", List.of("XXX", "XXX", "XXX"), @@ -959,6 +934,14 @@ private void legacySpecialRecipes(CachedOutput cache) throws IOException { Map.of('X', "#c:nuggets/quartz"), "minecraft:quartz", 1); shapeless(cache, "quartz_nugget", List.of("#c:gems/quartz"), "basemetals:quartz_nugget", 9); + shaped(cache, "diamond_ingot", List.of("XXX", "XXX", "XXX"), + Map.of('X', "#c:nuggets/diamond"), "minecraft:diamond", 1); + shapeless(cache, "diamond_nugget", List.of("#c:gems/diamond"), + "basemetals:diamond_nugget", 9); + shaped(cache, "emerald_ingot", List.of("XXX", "XXX", "XXX"), + Map.of('X', "#c:nuggets/emerald"), "minecraft:emerald", 1); + shapeless(cache, "emerald_nugget", List.of("#c:gems/emerald"), + "basemetals:emerald_nugget", 9); } private void anvilRecipes(CachedOutput cache) throws IOException { @@ -1101,7 +1084,7 @@ private void mekanismDissolution(CachedOutput cache, String id, String material, } private void writeThermalRecipes(CachedOutput cache) throws IOException { - for (MaterialDefinition material : MaterialCatalogue.ALL) { + for (MaterialDefinition material : MaterialCatalogue.all()) { String name = material.name(); String root = "compat/thermal/" + name + "/"; thermalItemMachine(cache, root + "ingot_pulverizing", "thermal:pulverizer", @@ -1169,7 +1152,7 @@ private static JsonObject thermalAlloyIngredient(AlloyComponent component) { accepted.add(object("tag", tag)); if (tag.startsWith("forge:dusts/")) { String material = tag.substring("forge:dusts/".length()); - if (MaterialCatalogue.BY_NAME.containsKey(material) + if (MaterialCatalogue.byName().containsKey(material) || material.equals("iron") || material.equals("gold")) { accepted.add(object("tag", "c:ingots/" + material)); } @@ -1178,7 +1161,7 @@ private static JsonObject thermalAlloyIngredient(AlloyComponent component) { } private void writeEnderIoRecipes(CachedOutput cache) throws IOException { - for (MaterialDefinition material : MaterialCatalogue.ALL) { + for (MaterialDefinition material : MaterialCatalogue.all()) { String name = material.name(); enderSag(cache, "compat/enderio/" + name + "/ingot_sag_milling", "#c:ingots/" + name, "basemetals:" + name + "_powder", 1); @@ -1210,7 +1193,7 @@ private void enderSag(CachedOutput cache, String id, String input, String output } private void writeTinkersRecipes(CachedOutput cache) throws IOException { - for (MaterialDefinition material : MaterialCatalogue.ALL) { + for (MaterialDefinition material : MaterialCatalogue.all()) { String name = material.name(); int temperature = 769; tinkerMelting(cache, name, "ingot", 90, temperature); @@ -1288,7 +1271,7 @@ private void tinkerBlockCasting(CachedOutput cache, String material, int tempera private void writeTinkersMaterials(CachedOutput cache) throws IOException { int order = 0; - for (MaterialDefinition material : MaterialCatalogue.ALL) { + for (MaterialDefinition material : MaterialCatalogue.all()) { if (!material.hasEquipment()) continue; String name = material.name(); JsonObject definition = object("craftable", false, @@ -1434,7 +1417,8 @@ private void writeLanguages(CachedOutput cache) throws IOException { addIfAbsent(language, "itemGroup.basemetals.items", "Base Metals Items"); addIfAbsent(language, "itemGroup.basemetals.tools", "Base Metals Tools"); addIfAbsent(language, "itemGroup.basemetals.combat", "Base Metals Combat"); - for (MaterialDefinition material : MaterialCatalogue.ALL) { + addIfAbsent(language, "itemGroup.basemetals.materials", "Base Metals Materials"); + for (MaterialDefinition material : MaterialCatalogue.all()) { addIfAbsent(language, "material.basemetals." + material.name(), title(material.name())); } for (String material : PROCESSING_MATERIALS) { @@ -1459,7 +1443,7 @@ private void writeLanguages(CachedOutput cache) throws IOException { language.addProperty("item.bucket." + material, name); language.addProperty("item.basemetals." + material + "_bucket", name); }); - MaterialCatalogue.ALL.stream().filter(material -> material.hasOre() && !material.name().equals("copper")) + MaterialCatalogue.all().stream().filter(material -> material.hasOre() && !material.name().equals("copper")) .forEach(material -> language.addProperty("item.basemetals." + material.name() + "_raw", String.format(rawTemplates.get(source), materialName(language, material.name())))); save(cache, language, "assets/basemetals/lang/" + locale + ".json"); @@ -1614,7 +1598,7 @@ private void writeManifest(CachedOutput cache) throws IOException { java.util.stream.Stream.of("basemetals:" + id, "basemetals:flowing_" + id)).toList())); root.add("entities", array("basemetals:custom_arrow", "basemetals:custom_bolt")); root.add("recipe_serializers", array( - "basemetals:crushing", "basemetals:legacy_smelting", "basemetals:plate_repair", "basemetals:content_crafting")); + "mmdlib:crushing", "basemetals:legacy_smelting", "basemetals:plate_repair", "basemetals:content_crafting")); root.add("loot_modifier_serializers", array("basemetals:add_table")); root.add("restored_blocks", array(restoredBlocks)); root.add("restored_items", array(restoredItems)); @@ -1623,7 +1607,7 @@ private void writeManifest(CachedOutput cache) throws IOException { root.add("new_fluids", array(flowingFluids)); root.add("new_entities", array("basemetals:custom_arrow", "basemetals:custom_bolt")); root.add("new_recipe_serializers", array( - "basemetals:crushing", "basemetals:legacy_smelting", "basemetals:plate_repair", "basemetals:content_crafting")); + "mmdlib:crushing", "basemetals:legacy_smelting", "basemetals:plate_repair", "basemetals:content_crafting")); root.add("new_loot_modifier_serializers", array("basemetals:add_table")); save(cache, root, "data/basemetals/registry_manifest.json"); } @@ -1655,6 +1639,12 @@ private void tag(CachedOutput cache, String namespace, String path, List JsonObject root = new JsonObject(); root.addProperty("replace", false); root.add("values", array(values)); save(cache, root, "data/" + namespace + "/tags/" + path + ".json"); } + private void optionalTag(CachedOutput cache, String namespace, String path, List values) throws IOException { + JsonArray entries = new JsonArray(); + values.forEach(value -> entries.add(object("id", value, "required", false))); + JsonObject root = new JsonObject(); root.addProperty("replace", false); root.add("values", entries); + save(cache, root, "data/" + namespace + "/tags/" + path + ".json"); + } private void uncheckedTag(CachedOutput cache, String namespace, String path, List values) { try { tag(cache, namespace, path, values); } catch (IOException e) { throw new RuntimeException(e); } } @@ -1696,7 +1686,7 @@ private void legacySmelting(CachedOutput cache, String id, String input, String save(cache, root, "data/basemetals/recipe/" + id + ".json"); } private void crushing(CachedOutput cache, String id, String input, String result, int count) throws IOException { - JsonObject root = object("type", "basemetals:crushing", "ingredient", ingredient(input), + JsonObject root = object("type", "mmdlib:crushing", "ingredient", ingredient(input), "result", result(result, count)); save(cache, root, "data/basemetals/recipe/" + id + ".json"); } @@ -1844,7 +1834,7 @@ private void writeOreLoot(CachedOutput cache, String ore) throws IOException { private void writeRawProcessing(CachedOutput cache) throws IOException { List rawMaterials = new ArrayList<>(List.of("iron", "gold", "copper")); - MaterialCatalogue.ALL.stream().filter(material -> material.hasOre() && !material.name().equals("copper")) + MaterialCatalogue.all().stream().filter(material -> material.hasOre() && !material.name().equals("copper")) .map(MaterialDefinition::name).forEach(rawMaterials::add); for (String material : rawMaterials) { @@ -1874,7 +1864,7 @@ private void writeCraftingUnlock(CachedOutput cache, String id, JsonObject recip if (List.of("activator_rail", "detector_rail", "flint_and_steel", "human_detector", "minecart", "piston", "rail", "tripwire_hook").contains(id)) material = "steel"; String discovery = switch (material) { - case "diamond", "emerald", "quartz" -> "#c:gems/" + material; + case "diamond", "emerald", "quartz", "lapis" -> "#c:gems/" + material; case "coal", "charcoal" -> "minecraft:" + material; case "stone" -> "#c:stones"; case "wood" -> "#minecraft:logs"; diff --git a/src/generated/resources/.cache/0074282aa2770fc4617ec9868c2b801e671b60e7 b/src/generated/resources/.cache/0074282aa2770fc4617ec9868c2b801e671b60e7 index 696595a09..4c44a8f29 100644 --- a/src/generated/resources/.cache/0074282aa2770fc4617ec9868c2b801e671b60e7 +++ b/src/generated/resources/.cache/0074282aa2770fc4617ec9868c2b801e671b60e7 @@ -1,4 +1,4 @@ -// 1.21.1 2026-10-24T02:20:00.293988175 Base Metals catalogue data +// 1.21.1 2026-11-11T07:50:25.99950505 Base Metals catalogue data b28254c69734330bf87816a5d6963f29fa42ac81 assets/basemetals/blockstates/adamantine.json 1b98c4f9dcfe27b816e8ab38b3a146b5a159256b assets/basemetals/blockstates/antimony.json 9e0a8e96e8b285c76f51132c66f91583bf8e68b8 assets/basemetals/blockstates/aquarium.json @@ -17,7 +17,6 @@ ee7cb8cd19997fdb6cee6b2f40cdcc83d4081994 assets/basemetals/blockstates/cupronick 0928ee53addb314a4cd81cb8722981f5839f3e5b assets/basemetals/blockstates/gold.json 8e0a159e11661bfdf8ac7a4b6f4b644ecfd4e360 assets/basemetals/blockstates/invar.json b7d32cc87f07f55d128fd7fa2397f5a725a8ddc8 assets/basemetals/blockstates/iron.json -3b0aa207fe242768d6b5f9de1035702da35c3ae4 assets/basemetals/blockstates/lapis.json f44bbe2aa9ce727994433fbe610d71a18740bd1d assets/basemetals/blockstates/lead.json 7b14c4ad255a7b504ba79e20999b82f0e567b352 assets/basemetals/blockstates/mercury.json ff4c00e42c78d8e31ea79169aa4d9fc28ed12061 assets/basemetals/blockstates/mithril.json @@ -31,28 +30,26 @@ e24e73ceee71df1aec4467e6580baf0f1b2b6410 assets/basemetals/blockstates/quartz.js bc3d4c7a377275881764d10a2e3022906a51e18b assets/basemetals/blockstates/silver.json 4e2cacf74533d8e26f10a8c7476c2530107da131 assets/basemetals/blockstates/starsteel.json cebc54b9eb7ec737afd45518d950f4b0aea98256 assets/basemetals/blockstates/steel.json -5fb3235339bed0157427c654ce4119c450b4216e assets/basemetals/blockstates/stone.json 0f28df011faecef89b76bd9f0d22314387eb82ee assets/basemetals/blockstates/tin.json -ca9f0befbeb59cebef5d64b9de306ac5a275a1d4 assets/basemetals/blockstates/wood.json 24a8beae4482fb742d09bec135e4bfa2d617e8e4 assets/basemetals/blockstates/zinc.json -cee4913bcfee3c57ba47005e98884c83af39a00d assets/basemetals/lang/de_de.json -482e8e8e2579c191cd8fb21038dc8b73ad57b679 assets/basemetals/lang/en_au.json -482e8e8e2579c191cd8fb21038dc8b73ad57b679 assets/basemetals/lang/en_ca.json -482e8e8e2579c191cd8fb21038dc8b73ad57b679 assets/basemetals/lang/en_en.json -482e8e8e2579c191cd8fb21038dc8b73ad57b679 assets/basemetals/lang/en_gb.json -1f297e22233d68e14b80667026395224d9a6ccdc assets/basemetals/lang/en_pt.json -b564cfb1e2eff87a6c17a85846773dd2405ce642 assets/basemetals/lang/en_us.json -19bf7f30f72b6ff0b1c26461745c57310c340b25 assets/basemetals/lang/es_es.json -19bf7f30f72b6ff0b1c26461745c57310c340b25 assets/basemetals/lang/es_mx.json -607139a73a1a5aa4bf5ce90a6c9aa18c1a0a56d1 assets/basemetals/lang/fr_ca.json -607139a73a1a5aa4bf5ce90a6c9aa18c1a0a56d1 assets/basemetals/lang/fr_fr.json -67c98a384da01a6b214c5b62c3e758fb57640394 assets/basemetals/lang/it_it.json -bf9eeea9bf8b19a4b93077ca15eadc9cd0596af6 assets/basemetals/lang/ja_jp.json -13e64e4ac7da371ecc3fbfc6d52846f798df4a1a assets/basemetals/lang/nl_nl.json -d894e4e86f48b86e3403c93f5219fad84309a394 assets/basemetals/lang/pt_br.json -4e8af32e7ab1cd3a4d0fbb291c3d65299ca82a5b assets/basemetals/lang/ru_ru.json -03f2c106fa9c36859c1c3b9b50ec0671e72e24ee assets/basemetals/lang/zh_cn.json -8a5717961ecde793ed7e5ff893df041459c13c73 assets/basemetals/lang/zh_tw.json +f991fee967d3f0e536c9eef32ccd8b8f51a181ba assets/basemetals/lang/de_de.json +994afdd5b39a0199f20f90e42a9d0a82871e2c1f assets/basemetals/lang/en_au.json +994afdd5b39a0199f20f90e42a9d0a82871e2c1f assets/basemetals/lang/en_ca.json +994afdd5b39a0199f20f90e42a9d0a82871e2c1f assets/basemetals/lang/en_en.json +994afdd5b39a0199f20f90e42a9d0a82871e2c1f assets/basemetals/lang/en_gb.json +a64ca301d1b1545fe6cf26c751109a85083b1abd assets/basemetals/lang/en_pt.json +eaca5ae4ad7ecd193aac02fddd9c08c7f70e57ab assets/basemetals/lang/en_us.json +cb111d08a3f483b336cc4ee95b59a8a49216d1db assets/basemetals/lang/es_es.json +cb111d08a3f483b336cc4ee95b59a8a49216d1db assets/basemetals/lang/es_mx.json +5cc67b2ad0f48e3fbeacb99fcba1487d9266598c assets/basemetals/lang/fr_ca.json +5cc67b2ad0f48e3fbeacb99fcba1487d9266598c assets/basemetals/lang/fr_fr.json +2aadb0e5f3ddad2c44a77ae9d620adbaa8e723f0 assets/basemetals/lang/it_it.json +d50d53932c24acb23568e07f931b454b756be6b4 assets/basemetals/lang/ja_jp.json +08d878a789c8be83ed8016c6a8baa351340f872c assets/basemetals/lang/nl_nl.json +745ef9b3d47dce159686ce015b438293055e3a84 assets/basemetals/lang/pt_br.json +a821005beb07c8d8aef36a5900daa467aecf4a28 assets/basemetals/lang/ru_ru.json +0e04139028c614cd07114888394f6a8a881e126e assets/basemetals/lang/zh_cn.json +a028f787d46dfd4735437f0b92eab0c74d96b2d8 assets/basemetals/lang/zh_tw.json 16c15c8eec8192998f70514f51ae587415fcc019 assets/basemetals/tinkering/materials/adamantine.json 4529db71c052b65a4544bdd335be6c6dbeb47f44 assets/basemetals/tinkering/materials/antimony.json aa7fa56c77a586a0ac87f8d260e4d9b7010f0e3a assets/basemetals/tinkering/materials/aquarium.json @@ -336,6 +333,7 @@ ea2cdf5e96ede5d4a77e7dde5189f968a54eb332 data/basemetals/advancement/recipes/bro a4a33206495b3c63d918300cb05a3e6a27d7518c data/basemetals/advancement/recipes/bronze_wall.json 630a4e7547daa1204ea361380da5356c6e9b88e0 data/basemetals/advancement/recipes/charcoal_block.json 8004422c8b0c7182833b21b5981222bd2ebcd6c0 data/basemetals/advancement/recipes/charcoal_block_dust.json +e8d09f83ca169f099088f41236ec79fa00008748 data/basemetals/advancement/recipes/charcoal_from_block.json 63447a6ffb830e37deb09637514ecbe563924c94 data/basemetals/advancement/recipes/charcoal_ingot.json de90ad144c576d9d0d46a26798b033daa752005e data/basemetals/advancement/recipes/charcoal_nugget.json 27a78b3bd3584dee99949ad3d7373a09d16abe71 data/basemetals/advancement/recipes/charcoal_powder_from_small.json @@ -468,6 +466,8 @@ df984a51a8b2266ecb15707a2626b7c1cdb967fc data/basemetals/advancement/recipes/det b58593d9e3f4b8758de5924ec577eeffd6864ad3 data/basemetals/advancement/recipes/diamond_arrow.json e65444e18ee0b87e291f98e129ef4df771b31f00 data/basemetals/advancement/recipes/diamond_bars.json 41d0ef685c8e1f38e6de4e95964105fc881f9647 data/basemetals/advancement/recipes/diamond_bars_2.json +f54e55f209d364fefec7af63af9412796a5f78fe data/basemetals/advancement/recipes/diamond_blend.json +fc2acd9020005816d484b06d2a9d664628f52012 data/basemetals/advancement/recipes/diamond_blend_from_small.json b8c202b946c4b654fafd36d953f79b06727d93d4 data/basemetals/advancement/recipes/diamond_bolt.json f6a0467b8b3249d3844ba8ff9db933c2165fed3e data/basemetals/advancement/recipes/diamond_bow.json 10129a7297290bab456a4679817a04e3ef0a653a data/basemetals/advancement/recipes/diamond_button.json @@ -476,7 +476,9 @@ b879a3156c83fdf24ac103949c18a53099fb606b data/basemetals/advancement/recipes/dia d7fc66b44b39cb5b09e1f96388c0ba2fbfcccc88 data/basemetals/advancement/recipes/diamond_door.json 3b45e33d30c85bd4bfe25d0b790b91376ead5e91 data/basemetals/advancement/recipes/diamond_fishingrod.json 93de7392aeea0ebffc2dc73eb951910e2e9da608 data/basemetals/advancement/recipes/diamond_gear.json +9c5a49b0026bfff475392fc56d28fa7c960ed256 data/basemetals/advancement/recipes/diamond_ingot.json a66ebfd3daa891d994cdf666b001fe6bbb9d0906 data/basemetals/advancement/recipes/diamond_lever.json +827d86b4b4b5053ae1560b15b6b9cc408267c5e0 data/basemetals/advancement/recipes/diamond_nugget.json a2580ca524f3f5b079d5e279616e008789e07eba data/basemetals/advancement/recipes/diamond_powder_from_small.json 9c95e8973d93a21517fd512541da8230dade9a6e data/basemetals/advancement/recipes/diamond_pressure_plate.json 97414f5847dce4fa37ae6a77c706b53cdb5ed8a1 data/basemetals/advancement/recipes/diamond_rod.json @@ -484,6 +486,7 @@ c7e0864c71c3925de38711e7062816c598dfe9f6 data/basemetals/advancement/recipes/dia a60dc839290dbfd433feacecac38a56477c42a2b data/basemetals/advancement/recipes/diamond_shears.json 0b86d41174739a8e1970357b78fa12eafa472428 data/basemetals/advancement/recipes/diamond_shield.json 2cbb0db3f97aca2fa378a1e16fa1f7d8ea41e23a data/basemetals/advancement/recipes/diamond_slab.json +ee063ff22d517d5c20e0fc9d1d9de809f73b476a data/basemetals/advancement/recipes/diamond_smallblend.json ea4f398fae77d8b18c4ce8b63b5632b3ad225a96 data/basemetals/advancement/recipes/diamond_smallpowder.json 60d5f016c417343b102c7b9b2e59e8b471fbf805 data/basemetals/advancement/recipes/diamond_stairs.json e08095742ec22c1e752956cf191769e44a0b0aaa data/basemetals/advancement/recipes/diamond_trapdoor.json @@ -546,8 +549,10 @@ be2ba21a4c11e94fc670e834345dc9f0b8078224 data/basemetals/advancement/recipes/eme c99e91ead495678ba4a787027ae76a9c742e0166 data/basemetals/advancement/recipes/emerald_helmet.json e211f72280bf8441cea6da150636dad7b469f334 data/basemetals/advancement/recipes/emerald_hoe.json d86d689956525a11822d2460b4d2b8c02cb2ac37 data/basemetals/advancement/recipes/emerald_horsearmor.json +6c0f0c649ae4568b704adca1190058119f30afbc data/basemetals/advancement/recipes/emerald_ingot.json 11925f5bcebeb0247483d5751cff2194db2e374b data/basemetals/advancement/recipes/emerald_leggings.json aeadf50eb02b6fcdaad685b44cdd3d5263e25982 data/basemetals/advancement/recipes/emerald_lever.json +db020f047e076cc7c657339dc929a8d5bdb3e5b6 data/basemetals/advancement/recipes/emerald_nugget.json b75b3e5fbc5b11881823f95ec6ad971b580cfdd3 data/basemetals/advancement/recipes/emerald_pickaxe.json 0c5e8696fe8b35de136c3fc1859522d7135dd103 data/basemetals/advancement/recipes/emerald_powder_from_small.json 7117628b58c0e786c0bae878242d7032d6e5f7a6 data/basemetals/advancement/recipes/emerald_pressure_plate.json @@ -566,6 +571,8 @@ a54065ff4994f09a5a2d7d66d1df89ffc804f2ef data/basemetals/advancement/recipes/eme 6bffff8e27ef016aec7c46d143acc829073203b9 data/basemetals/advancement/recipes/gold_arrow.json 2109309a29dfb404cf5a944f455f7e0187c45263 data/basemetals/advancement/recipes/gold_bars.json b92509ff0368286506cb62ba097b96dbfe88b1cb data/basemetals/advancement/recipes/gold_bars_2.json +c447cc4145ed48f5d40a97ab63ad03ed9edd618b data/basemetals/advancement/recipes/gold_blend.json +3537619e93e7e7a4df9e0e8cc176611fd2380620 data/basemetals/advancement/recipes/gold_blend_from_small.json eddfdef5872a04654b12da2f6dffc5a9a28e96a9 data/basemetals/advancement/recipes/gold_bolt.json 469671e95bfb2e16121e1d541c1ba3e488c0bfc3 data/basemetals/advancement/recipes/gold_bow.json 9e0f750cbdd77214dccf5c294ec93894bdd4a3b3 data/basemetals/advancement/recipes/gold_button.json @@ -582,6 +589,7 @@ bfa6e9e8372fcae05ccd933178457809a679814b data/basemetals/advancement/recipes/gol 19397be1574aa006fa1055247c969a1478e4ad78 data/basemetals/advancement/recipes/gold_shears.json 837eebeb0d88cbdeee515f736197d88f837c23ab data/basemetals/advancement/recipes/gold_shield.json 4fe3a597c4a4209562d069795bc1e0385a0554ab data/basemetals/advancement/recipes/gold_slab.json +931c42707066015c78f7b4a850b16f7db8273106 data/basemetals/advancement/recipes/gold_smallblend.json 6ee52ca5cb8e7a037e13eb05564ba654de752cfd data/basemetals/advancement/recipes/gold_smallpowder.json a224d72265f461d1d20394c11f5ee268812eaea8 data/basemetals/advancement/recipes/gold_stairs.json 07cf6f42d95fc43dcbf35c2f1767571f11c36ab9 data/basemetals/advancement/recipes/gold_trapdoor.json @@ -630,6 +638,8 @@ b290feeabca25f01ba67003c27962f864ff07ec3 data/basemetals/advancement/recipes/inv e6b7d200f595523032504c9ad592b4e2fa847e14 data/basemetals/advancement/recipes/invar_wall.json 69f57f443b6d6c5c6bd9dd992447041ada803ab4 data/basemetals/advancement/recipes/iron_arrow.json 7273ee688b8c3251346867803cbb56d9dec04dd4 data/basemetals/advancement/recipes/iron_bars_2.json +5cf6ee2af731a7e4a5e3e0ce9d20d7371761b405 data/basemetals/advancement/recipes/iron_blend.json +cfccf9ec1ac39b19fd40f074ba129027722961b6 data/basemetals/advancement/recipes/iron_blend_from_small.json a482cebbaed24757959024a6cc7ce589924c440b data/basemetals/advancement/recipes/iron_bolt.json dfcf111ed9a54793093ecd302899764241ba7d8e data/basemetals/advancement/recipes/iron_bow.json 203a374dbee2a8a1786747cb5755ed1a91582776 data/basemetals/advancement/recipes/iron_button.json @@ -644,9 +654,12 @@ a191174e44b99b179272d2641162a1990933ff55 data/basemetals/advancement/recipes/iro 3e0fb76548cdcf00ab76a6d5d28fa338602126e8 data/basemetals/advancement/recipes/iron_scythe.json bba70f6755a92598b8d7270094e59d73b4a7a5d3 data/basemetals/advancement/recipes/iron_shield.json 402f602869549d7f528eae935b8054d6a182ffe8 data/basemetals/advancement/recipes/iron_slab.json +254286ca6b12524bd540fd59b19e1e82df4801e8 data/basemetals/advancement/recipes/iron_smallblend.json 431454d226225bebc9b93b3543901043e6293033 data/basemetals/advancement/recipes/iron_smallpowder.json 47e80d1952788c436ac16cb3550c4789495f710b data/basemetals/advancement/recipes/iron_stairs.json 8277fee47fb6025842fc543aa789830b150067a1 data/basemetals/advancement/recipes/iron_wall.json +62bbbb3b42ee8b660665d52d50ac4835492e18bf data/basemetals/advancement/recipes/lapis_from_smallpowder.json +24d69e9b8a7c378817587631c2a6fd8b7dc8eea1 data/basemetals/advancement/recipes/lapis_smallpowder.json 663802facf4aaca4f0511b40a7d94295c7b1bc6a data/basemetals/advancement/recipes/lead_arrow.json 090459492a8f3d855556119924792a4f0fae92ce data/basemetals/advancement/recipes/lead_axe.json a95451f37ed39ca359d38fae8ce8231107faae30 data/basemetals/advancement/recipes/lead_bars.json @@ -1053,6 +1066,8 @@ aaccd2bd3a10682383930f8385ffc5b690f4eb13 data/basemetals/advancement/recipes/ste cf8d8c619d58c639fd0a8ce9d500b2e852cb234b data/basemetals/advancement/recipes/steel_wall.json 3fc26c9f227bf487eaf88c91483e9e04d2286f53 data/basemetals/advancement/recipes/stone_anvil.json 4b440d524ca620735a500f678383be4c2de9b536 data/basemetals/advancement/recipes/stone_crackhammer.json +9f4f5c9ad9d2838415e35f24087d58ccda18244d data/basemetals/advancement/recipes/stone_gear.json +73a0cdbad36c4b5789b44ad5f4ecd87e68ee5f28 data/basemetals/advancement/recipes/stone_rod.json 71bcd2e3a2a03573bb9bb77fe4cb1517e4fc90ad data/basemetals/advancement/recipes/stone_scythe.json 6283be77b7ada30242eabfdf6fe3021d8b3a57f0 data/basemetals/advancement/recipes/tin_arrow.json 15dadca5d4fda75e18bffc0775f4cbce54978d9a data/basemetals/advancement/recipes/tin_axe.json @@ -1096,6 +1111,7 @@ d5a08fa8d2fbec9dd694fc325afd9029a65bdbe3 data/basemetals/advancement/recipes/tin fa43512cfed31768730362e0f2e4c5b6b4558ddf data/basemetals/advancement/recipes/tin_wall.json 739c0a78a823990efc31304f0041d91069cdbca7 data/basemetals/advancement/recipes/tripwire_hook.json d2cca07a6a9e26eac9524967efe68308672e19a7 data/basemetals/advancement/recipes/wood_crackhammer.json +59d598632a55a29ae9f3aca59898c96f83af2e33 data/basemetals/advancement/recipes/wood_gear.json 9aaf7cd4ec6bb1d35be62062a87f6b52a0b7d95a data/basemetals/advancement/recipes/wood_scythe.json f07aff9f15cf7e976548fa47b552aea7d05f2c5e data/basemetals/advancement/recipes/zinc_arrow.json 2f2f81ea23a91de8f08a8931890db24ed81acd23 data/basemetals/advancement/recipes/zinc_axe.json @@ -1157,6 +1173,7 @@ ad9064a76ba1bb15f962156cfbbd0ddee6bc7830 data/basemetals/loot_table/blocks/adama 380ab10d500939eabd2cee3e7c8616e506360b8f data/basemetals/loot_table/blocks/adamantine_block.json 40c771b8076b73511a50f960a072e5efc8e8e24a data/basemetals/loot_table/blocks/adamantine_button.json 70191695e374b9f8e8d96810c26463e3462fa04c data/basemetals/loot_table/blocks/adamantine_door.json +5e674843233319f01330401638d5fa541b161142 data/basemetals/loot_table/blocks/adamantine_double_slab.json f9847465b6dbe870381a10924dc6fcad41079d30 data/basemetals/loot_table/blocks/adamantine_lever.json 3821fd195dccdc79434fb2b46e753b58cdee9cc7 data/basemetals/loot_table/blocks/adamantine_ore.json 6dd1cf5d214bf6a6bdff57f703c6553d4db60275 data/basemetals/loot_table/blocks/adamantine_plate.json @@ -1169,6 +1186,7 @@ ec563d7b20f7bb28f68d6664ce8d3dcf1f1be734 data/basemetals/loot_table/blocks/antim 78ff803249a781eabde505b9d563e569b4f469d2 data/basemetals/loot_table/blocks/antimony_block.json da9cc9f7f9383a68bb54aa00035bfff3f279afbb data/basemetals/loot_table/blocks/antimony_button.json b57db51044687598c70ded8396fae1937357416f data/basemetals/loot_table/blocks/antimony_door.json +791aac5fc37aa1faf0efea847d6b50e8f5414248 data/basemetals/loot_table/blocks/antimony_double_slab.json edd5fb832eac100fae49e43ff24c418e8c1ae4b1 data/basemetals/loot_table/blocks/antimony_lever.json 583e874111e990236ebeb76c971b03872bcc6754 data/basemetals/loot_table/blocks/antimony_ore.json 23a3dccb87a9a20eecc579cf84e0eceff3af6b45 data/basemetals/loot_table/blocks/antimony_plate.json @@ -1181,6 +1199,7 @@ a7528167953ac4efed3b46d6c0017d3c2ccb3513 data/basemetals/loot_table/blocks/antim c6d1ad007d8d388d19cd3dd48ead5d22c1388c5b data/basemetals/loot_table/blocks/aquarium_block.json b1d262df4ca1ffc6c08278af2dcfb25a346e09d8 data/basemetals/loot_table/blocks/aquarium_button.json 491383813b3fbd7d019524b1cd765217ede32dd0 data/basemetals/loot_table/blocks/aquarium_door.json +4a285c951020f31f607b1e036395671b621bcc86 data/basemetals/loot_table/blocks/aquarium_double_slab.json 76a366e964ce373c1fa9082fc049793da185436e data/basemetals/loot_table/blocks/aquarium_lever.json 866b165fa3f0bb3810cbbdf6f5fa177d766ff81c data/basemetals/loot_table/blocks/aquarium_plate.json df7f6d4a3d4fa776d1bae09a85ed920be5297dc2 data/basemetals/loot_table/blocks/aquarium_pressure_plate.json @@ -1192,6 +1211,7 @@ d33c85355e99ba4d23b37f2955a8a2f2c2d99dad data/basemetals/loot_table/blocks/bismu c0a9393ddac21cafadacef9f06da0469ff4fa2b2 data/basemetals/loot_table/blocks/bismuth_block.json d6f611073d0e2c935751b2592a2255261e4598e7 data/basemetals/loot_table/blocks/bismuth_button.json 46c00bff57f5711ec0ffa01943ed2cf814c2ca08 data/basemetals/loot_table/blocks/bismuth_door.json +ce2ff0ab4cbc4094e4195e2ab7b5d82b6db58933 data/basemetals/loot_table/blocks/bismuth_double_slab.json 53b3265f5175f5a55a6753c04258aab2e7541e6e data/basemetals/loot_table/blocks/bismuth_lever.json 6d3f38b4941d8be682f5d7f5498907e0ea866fa5 data/basemetals/loot_table/blocks/bismuth_ore.json 3b76cbecaeef1b76babd227eab7bcf40244588c6 data/basemetals/loot_table/blocks/bismuth_plate.json @@ -1204,6 +1224,7 @@ a9de524da33065e4cccb84751df7c9efc99eec79 data/basemetals/loot_table/blocks/bismu bcee038da2d241be7b2647af7c62c57e6f8f7d50 data/basemetals/loot_table/blocks/brass_block.json 683f13603ab7381e229aeef25a85b460cfc13cbb data/basemetals/loot_table/blocks/brass_button.json 4e874c3920cec7d4c659240ee3834d6770120efe data/basemetals/loot_table/blocks/brass_door.json +3dd0242145b5fba07e5449741daaa05e289c71fb data/basemetals/loot_table/blocks/brass_double_slab.json c8b8efe8b5737ba213f21ffcc02a7483fa3bea8c data/basemetals/loot_table/blocks/brass_lever.json 64236a49492ceaae4d7480d2022d6e0481b02dda data/basemetals/loot_table/blocks/brass_plate.json d4094f538c3e2a792356337c4f7005eae25dce52 data/basemetals/loot_table/blocks/brass_pressure_plate.json @@ -1215,6 +1236,7 @@ be1efabb2a7d0af81b76b3fffceeb80196a418fd data/basemetals/loot_table/blocks/brass 9597ab4e15b21229c402241a482dfcfa2ff0ee23 data/basemetals/loot_table/blocks/bronze_block.json 402de384c6476f68f1e37c0871d497b840547537 data/basemetals/loot_table/blocks/bronze_button.json 4e66935496cc62e9128a1c659cc706a7dd5ba5b5 data/basemetals/loot_table/blocks/bronze_door.json +6674aa437bc9ca7cc5f5524b6e56eaa6cc27474e data/basemetals/loot_table/blocks/bronze_double_slab.json 9e0caebcad5d49f268946feb678de4400ed1c3c6 data/basemetals/loot_table/blocks/bronze_lever.json d2293d2dbd4e202b3f74969c5d16187a359c42a2 data/basemetals/loot_table/blocks/bronze_plate.json 0f20993f6e12f40cde7de583a0b8380901e0b1b1 data/basemetals/loot_table/blocks/bronze_pressure_plate.json @@ -1227,6 +1249,7 @@ e32bf2dba0b7833398b256faf26bdfb98a10d3c2 data/basemetals/loot_table/blocks/charc 2fe1cd92eee97ae3b452c3d6407d512288f96145 data/basemetals/loot_table/blocks/coldiron_block.json d5e533781f5f77821cb05aba70b9a4a4efad3051 data/basemetals/loot_table/blocks/coldiron_button.json 4e59137f6b543e28effe82725f8c508e016c6e14 data/basemetals/loot_table/blocks/coldiron_door.json +0ad6c5cc5ec7dcbdade890b4843f9b68bacb7966 data/basemetals/loot_table/blocks/coldiron_double_slab.json 8dc4965efabb3f3a56b678efe3ab8cdb5f81ae12 data/basemetals/loot_table/blocks/coldiron_lever.json e7fd5b4ad470e1835ef2a6f41c62e45fc164b1f4 data/basemetals/loot_table/blocks/coldiron_ore.json 2eb2740a3854b76113396af8f726183aeba2b715 data/basemetals/loot_table/blocks/coldiron_plate.json @@ -1239,6 +1262,7 @@ c2352fbac1fde0f113d4e27a48a0ae65a6200464 data/basemetals/loot_table/blocks/coldi af53f841e6045a311207a437c3374c981cd6eaf7 data/basemetals/loot_table/blocks/copper_block.json b48bdde7583297a400c65c574afa36a9e98155e5 data/basemetals/loot_table/blocks/copper_button.json 361375b37ca5b4c18370c916d15a349e2e967a74 data/basemetals/loot_table/blocks/copper_door.json +831f830b6f095f891dc50e3d990a93ed5f1b74eb data/basemetals/loot_table/blocks/copper_double_slab.json 109eb19c03cce4f0e7c89cd9d25270ef943b3eb5 data/basemetals/loot_table/blocks/copper_lever.json 658c12d5ea022d9798ff907c38b0fbbd4683134a data/basemetals/loot_table/blocks/copper_ore.json 5bc83abad25103fda5a441b51ce673e84d337b6f data/basemetals/loot_table/blocks/copper_plate.json @@ -1251,6 +1275,7 @@ b48bdde7583297a400c65c574afa36a9e98155e5 data/basemetals/loot_table/blocks/coppe efe467fc1156ef8cd7f1d1eadc00c481bf1def54 data/basemetals/loot_table/blocks/cupronickel_block.json ad27de5883daa615d4b5bde47b524f6cd81d0a4b data/basemetals/loot_table/blocks/cupronickel_button.json 0840836ded6d9251b9a01cd01c4f581edbbebebc data/basemetals/loot_table/blocks/cupronickel_door.json +9302362e61212ab015c514ed04d22c6427993f78 data/basemetals/loot_table/blocks/cupronickel_double_slab.json de1c4656cbbd72aff37331ca499882e8636d4d4d data/basemetals/loot_table/blocks/cupronickel_lever.json d9f614970e3c75ff036b9f1908b0b1fb20c4222a data/basemetals/loot_table/blocks/cupronickel_plate.json 2ae9450aace7d5b8f980ea3cfbceb8993018dea3 data/basemetals/loot_table/blocks/cupronickel_pressure_plate.json @@ -1261,42 +1286,18 @@ b736cf596fd8e7e5107cd08730f6e74189973a62 data/basemetals/loot_table/blocks/cupro 23e1b6cc1fdc257a4e929c1c081626a2479cb596 data/basemetals/loot_table/blocks/diamond_bars.json e28b10e8984c6065ae8ceda59815c0aa3d8507f1 data/basemetals/loot_table/blocks/diamond_button.json 9aebf61acc49b3c7fa488cb7f96f873524e1ae6a data/basemetals/loot_table/blocks/diamond_door.json +8da9aba8200a71f632077b0bcdd21aa463f01ace data/basemetals/loot_table/blocks/diamond_double_slab.json 6ad4fc03c486acfc62457a8d74a80b51e5ba543b data/basemetals/loot_table/blocks/diamond_lever.json ed59eab7ddc418f086c52379ee11d0a3c060b263 data/basemetals/loot_table/blocks/diamond_pressure_plate.json 3f46a48e260e25474b0a3eb5b81b2ab323b3d06f data/basemetals/loot_table/blocks/diamond_slab.json 0c48e5818ceb6d64d654df2914df2dbd15cf45ec data/basemetals/loot_table/blocks/diamond_stairs.json 1c6edc79b49da65d3843de5f312d03f63eefe9c6 data/basemetals/loot_table/blocks/diamond_trapdoor.json 5fed1f5b6fdc443f0351fed6e4e12d508ff98f8a data/basemetals/loot_table/blocks/diamond_wall.json -5e674843233319f01330401638d5fa541b161142 data/basemetals/loot_table/blocks/double_adamantine_slab.json -791aac5fc37aa1faf0efea847d6b50e8f5414248 data/basemetals/loot_table/blocks/double_antimony_slab.json -4a285c951020f31f607b1e036395671b621bcc86 data/basemetals/loot_table/blocks/double_aquarium_slab.json -ce2ff0ab4cbc4094e4195e2ab7b5d82b6db58933 data/basemetals/loot_table/blocks/double_bismuth_slab.json -3dd0242145b5fba07e5449741daaa05e289c71fb data/basemetals/loot_table/blocks/double_brass_slab.json -6674aa437bc9ca7cc5f5524b6e56eaa6cc27474e data/basemetals/loot_table/blocks/double_bronze_slab.json -0ad6c5cc5ec7dcbdade890b4843f9b68bacb7966 data/basemetals/loot_table/blocks/double_coldiron_slab.json -831f830b6f095f891dc50e3d990a93ed5f1b74eb data/basemetals/loot_table/blocks/double_copper_slab.json -9302362e61212ab015c514ed04d22c6427993f78 data/basemetals/loot_table/blocks/double_cupronickel_slab.json -8da9aba8200a71f632077b0bcdd21aa463f01ace data/basemetals/loot_table/blocks/double_diamond_slab.json -dfcfb668309ccfed93ba5c22c788e3ec19f50b2e data/basemetals/loot_table/blocks/double_electrum_slab.json -6aaec2b7555ad953efb9a773e9553dcc2329cebf data/basemetals/loot_table/blocks/double_emerald_slab.json -44c3be0dafbb15241d73b628c13be5b89862bbec data/basemetals/loot_table/blocks/double_gold_slab.json -a01f48b1777cf7cd7e7e83146f58487135e0b75d data/basemetals/loot_table/blocks/double_invar_slab.json -b1e8498900aadec5f1ba4bc7e05835e64849cef2 data/basemetals/loot_table/blocks/double_iron_slab.json -134dfe243614134789395b6db033fa346190fd21 data/basemetals/loot_table/blocks/double_lead_slab.json -f189dad287e935def42df1b46ac4763d21662977 data/basemetals/loot_table/blocks/double_mithril_slab.json -cc8dfb58c779ea799b9c8043c4c7fdce9c6c74c5 data/basemetals/loot_table/blocks/double_nickel_slab.json -97d675abe9a22f36e487648257e16cf722d6b02e data/basemetals/loot_table/blocks/double_obsidian_slab.json -ba5e5d8a429440b2c83deaf32c2cf61fcb3d33a1 data/basemetals/loot_table/blocks/double_pewter_slab.json -a03fee16c9b908b98f29ea6e7d7ac560c476a832 data/basemetals/loot_table/blocks/double_platinum_slab.json -1b464830928470ae95b13831582346637fcf16e5 data/basemetals/loot_table/blocks/double_silver_slab.json -5dd21d485cf970cf8df93d6c91455779facd89ab data/basemetals/loot_table/blocks/double_starsteel_slab.json -bf88289da7372143f4ddd91350816acd160844ab data/basemetals/loot_table/blocks/double_steel_slab.json -be8cdfd1ed0ac6b64aa51dd0c1ced5ac1321a772 data/basemetals/loot_table/blocks/double_tin_slab.json -b3b69b11523ec35613101c78dfbe47d43bd79a0a data/basemetals/loot_table/blocks/double_zinc_slab.json 05fa84e8d44a56fe13b91bb99814fdfa7d367a80 data/basemetals/loot_table/blocks/electrum_bars.json b88eacf0f410317f5d64abe4c6851a6efac9bc56 data/basemetals/loot_table/blocks/electrum_block.json c378d94b69dba009b6b9a537edb9dc77c5512ec6 data/basemetals/loot_table/blocks/electrum_button.json f2dd53b99fee41c4b04e8060077a0df18d76c12f data/basemetals/loot_table/blocks/electrum_door.json +dfcfb668309ccfed93ba5c22c788e3ec19f50b2e data/basemetals/loot_table/blocks/electrum_double_slab.json 2407c4c9d5d1bab49b5f80e700fc33ca82216f75 data/basemetals/loot_table/blocks/electrum_lever.json 82f253dd7c7a65ed7c805d9535f219b47646f6b3 data/basemetals/loot_table/blocks/electrum_plate.json f14bb2c345aec462f200654f1559cd9fb242666a data/basemetals/loot_table/blocks/electrum_pressure_plate.json @@ -1307,6 +1308,7 @@ a387c1046e3f80c3328f46d524af688304d36b0e data/basemetals/loot_table/blocks/elect 5e1ac2a50f3fd3a52202643d629ae5230aa5056c data/basemetals/loot_table/blocks/emerald_bars.json d21f875ef0da1649ee23854ea7073606767e027d data/basemetals/loot_table/blocks/emerald_button.json f2cf387577c08f81144b18c343bf4a05ba60558b data/basemetals/loot_table/blocks/emerald_door.json +6aaec2b7555ad953efb9a773e9553dcc2329cebf data/basemetals/loot_table/blocks/emerald_double_slab.json 1490228555afca0a535392856af95f3dcf3767a1 data/basemetals/loot_table/blocks/emerald_lever.json 070534fa2d530f70562baf7ca1377e5032d1976e data/basemetals/loot_table/blocks/emerald_pressure_plate.json eef373c250c332cad520e8b1475c40b09109772e data/basemetals/loot_table/blocks/emerald_slab.json @@ -1316,6 +1318,7 @@ c700fafe919558d4805c4537c832216fd901c630 data/basemetals/loot_table/blocks/emera 10361dfcfb8329b48d3a79c8c7e7737bbdb9caf2 data/basemetals/loot_table/blocks/gold_bars.json f585f49e86f031d4a95ecd96bb8e4ddb42128d90 data/basemetals/loot_table/blocks/gold_button.json 1586b714ab6806cc49b32ec4ba1075e7242fd4a1 data/basemetals/loot_table/blocks/gold_door.json +44c3be0dafbb15241d73b628c13be5b89862bbec data/basemetals/loot_table/blocks/gold_double_slab.json 20cad56cd2f86a205b1936a8300b0a38775f5b1f data/basemetals/loot_table/blocks/gold_lever.json 2d1eb6bf1458fcdf873ed258b9cf7e6711fb5ade data/basemetals/loot_table/blocks/gold_plate.json 37858b85dae110786abb6460797ad0d4b8a68431 data/basemetals/loot_table/blocks/gold_slab.json @@ -1327,6 +1330,7 @@ a054a88c7a6ff9f624b0b5fc6b62c02486153232 data/basemetals/loot_table/blocks/invar 6febcf4266f925e1c0b46e2c70f010fb1737afa0 data/basemetals/loot_table/blocks/invar_block.json 975d16dbf6e6b80be873b6b282ca4153d4693613 data/basemetals/loot_table/blocks/invar_button.json e0bbf9842f9f182d6f18b40822055c289a17fbe0 data/basemetals/loot_table/blocks/invar_door.json +a01f48b1777cf7cd7e7e83146f58487135e0b75d data/basemetals/loot_table/blocks/invar_double_slab.json a859547d8d7dc3893c496eb6174b6ca5c34c1d5a data/basemetals/loot_table/blocks/invar_lever.json 7c51c597b5029685e992e38793a3343816eafc98 data/basemetals/loot_table/blocks/invar_plate.json 9c28474b7d5875fd283323d099e43ad0135d1665 data/basemetals/loot_table/blocks/invar_pressure_plate.json @@ -1335,6 +1339,7 @@ a859547d8d7dc3893c496eb6174b6ca5c34c1d5a data/basemetals/loot_table/blocks/invar cc7c6854666229dab86d4c25e95e309de537b74c data/basemetals/loot_table/blocks/invar_trapdoor.json b241e826386a8e92446f07fb9a3af8cc9461e5f8 data/basemetals/loot_table/blocks/invar_wall.json 374d3c4dd4a1eef44d282b5ed7e52b3c84129d0b data/basemetals/loot_table/blocks/iron_button.json +b1e8498900aadec5f1ba4bc7e05835e64849cef2 data/basemetals/loot_table/blocks/iron_double_slab.json 4a8eee21001e6f923f2d274dfd5235a24502faa0 data/basemetals/loot_table/blocks/iron_lever.json 154aae87dfe01f626ddde6291e3813836308053a data/basemetals/loot_table/blocks/iron_plate.json f74c3d888c27bc307c198cd97c6c8e95d857bf33 data/basemetals/loot_table/blocks/iron_slab.json @@ -1344,6 +1349,7 @@ f74c3d888c27bc307c198cd97c6c8e95d857bf33 data/basemetals/loot_table/blocks/iron_ bf73f1a256cc5ff9e02f60943493d234e59d7931 data/basemetals/loot_table/blocks/lead_block.json dde819662d124b16c4da9fa6d42345c4773c68f7 data/basemetals/loot_table/blocks/lead_button.json 1dc208088ea4ab8273ad171a090079c838805db4 data/basemetals/loot_table/blocks/lead_door.json +134dfe243614134789395b6db033fa346190fd21 data/basemetals/loot_table/blocks/lead_double_slab.json 4ddb70f0ed571b91b140a2b4c81c26bbbe46aee7 data/basemetals/loot_table/blocks/lead_lever.json 2ef42095cb03db28df22c63c531533f1f2394e75 data/basemetals/loot_table/blocks/lead_ore.json d46193c1d466aab67834f86d6d228a95668bebe1 data/basemetals/loot_table/blocks/lead_plate.json @@ -1357,6 +1363,7 @@ ecf37f31be46b425884f62ceea8e7edbaa6db509 data/basemetals/loot_table/blocks/mercu 3c570524efe393188085df7a63f5a85cfd72be5e data/basemetals/loot_table/blocks/mithril_block.json 6c5fa4fbbfe7fa24a5a7607357534616d48e565f data/basemetals/loot_table/blocks/mithril_button.json 687f9001e2aca297a2d8bd1bc3bc73b889e59af6 data/basemetals/loot_table/blocks/mithril_door.json +f189dad287e935def42df1b46ac4763d21662977 data/basemetals/loot_table/blocks/mithril_double_slab.json 8b0c11967742e71165fbe3a2b80431b20664d032 data/basemetals/loot_table/blocks/mithril_lever.json d2041492f98f99e835673d8b0aa89b93920f7ad6 data/basemetals/loot_table/blocks/mithril_plate.json 2c376bbf0a9adf902155222264b50692e40e888b data/basemetals/loot_table/blocks/mithril_pressure_plate.json @@ -1368,6 +1375,7 @@ da12755bfea78c202a55bd5c87456a0312f7d78f data/basemetals/loot_table/blocks/nicke 5f11702e95f7efe0493a697c548bde376c05559b data/basemetals/loot_table/blocks/nickel_block.json c738399059bb23d22bdaa56399e0b07338b6d774 data/basemetals/loot_table/blocks/nickel_button.json e47c3fdf52e7201ef9672a88a989b687a00dd055 data/basemetals/loot_table/blocks/nickel_door.json +cc8dfb58c779ea799b9c8043c4c7fdce9c6c74c5 data/basemetals/loot_table/blocks/nickel_double_slab.json 20a08ce87ec7a8a933bdcc8f1a507356c683f807 data/basemetals/loot_table/blocks/nickel_lever.json 8411110bd6c677865921aaba9d98d455e2f5fee9 data/basemetals/loot_table/blocks/nickel_ore.json fcd82694dad253625f30a98f663962442dbef185 data/basemetals/loot_table/blocks/nickel_plate.json @@ -1379,6 +1387,7 @@ df242ceafb8e8d0163eecef6399b0fd3a9451899 data/basemetals/loot_table/blocks/nicke bb397d5a4d7627f02f9819dd362cf5aed385e0c3 data/basemetals/loot_table/blocks/obsidian_bars.json 6cc87d004af6114eeef7f5cd4ab099d165eb48ee data/basemetals/loot_table/blocks/obsidian_button.json b2cc03556e8620d9d8e2c0511c4efc94acf56670 data/basemetals/loot_table/blocks/obsidian_door.json +97d675abe9a22f36e487648257e16cf722d6b02e data/basemetals/loot_table/blocks/obsidian_double_slab.json d2631ddac7c26a387b9c700f29345cee34f9d5bb data/basemetals/loot_table/blocks/obsidian_lever.json 1abe512957c1c2d3c36ca54d83658d8efd9ffb6e data/basemetals/loot_table/blocks/obsidian_pressure_plate.json 85bc51dbbe41926e2a0ad8570e39cecbe9db0d71 data/basemetals/loot_table/blocks/obsidian_slab.json @@ -1389,6 +1398,7 @@ f848bc01fd77a4c08d0e14a44bbbd9ee9503e30f data/basemetals/loot_table/blocks/obsid 258ffe915cb9e53197fcd276ee2101e2d49000b6 data/basemetals/loot_table/blocks/pewter_block.json 93d75d831f1884597d3b5b3c1b1fe4ce7ce9b97e data/basemetals/loot_table/blocks/pewter_button.json 00d86743f60a30d6c51ffa8aff522662e8a1c4e1 data/basemetals/loot_table/blocks/pewter_door.json +ba5e5d8a429440b2c83deaf32c2cf61fcb3d33a1 data/basemetals/loot_table/blocks/pewter_double_slab.json 00013d1fd94a96a7e5fac7254ad7c816dfc7c5a1 data/basemetals/loot_table/blocks/pewter_lever.json 117006528a2170f66b64e77b6dc3f03e8e59d5b2 data/basemetals/loot_table/blocks/pewter_plate.json 6539495645738795a7c591b387c8ab97650ce5b3 data/basemetals/loot_table/blocks/pewter_pressure_plate.json @@ -1400,6 +1410,7 @@ e3867f422253bb418e37fff8f37cb93445437fe1 data/basemetals/loot_table/blocks/plati fc0d122dbd0c21e78511539b4e9faa3caacc226c data/basemetals/loot_table/blocks/platinum_block.json c766778c244b88a7cb51f7d6aaa5cf6d41727c1d data/basemetals/loot_table/blocks/platinum_button.json 17fe37b5ddcdf068373b3bef349135c22f7296aa data/basemetals/loot_table/blocks/platinum_door.json +a03fee16c9b908b98f29ea6e7d7ac560c476a832 data/basemetals/loot_table/blocks/platinum_double_slab.json b7a0622750bbc8f3aec62b412453fbf1bd37aadb data/basemetals/loot_table/blocks/platinum_lever.json f0b02b461cc7477b0c9a465a5c205aff0c9b5c34 data/basemetals/loot_table/blocks/platinum_ore.json 176b5044250d6e70b91d5f0097e75544c39b910b data/basemetals/loot_table/blocks/platinum_plate.json @@ -1419,6 +1430,7 @@ d7fce89f65952c036b655170107cae4337615b41 data/basemetals/loot_table/blocks/quart 10b05a9181c08e5992b7984b1ce053613d3fb95f data/basemetals/loot_table/blocks/silver_block.json d871b5bb9aa654dfc304b3276fa4e6e96308c690 data/basemetals/loot_table/blocks/silver_button.json dc6c4915994cc72cc5e6f68a965aa734177e74de data/basemetals/loot_table/blocks/silver_door.json +1b464830928470ae95b13831582346637fcf16e5 data/basemetals/loot_table/blocks/silver_double_slab.json 391c7192f7ea58e13f1cf5e7a34d87ae9fd74b85 data/basemetals/loot_table/blocks/silver_lever.json 2541ead724dc41bae92e9608f9925a3379f309ba data/basemetals/loot_table/blocks/silver_ore.json bb9c1400bfb0531a21c1fef04e48d5b4ed9a7a38 data/basemetals/loot_table/blocks/silver_plate.json @@ -1431,6 +1443,7 @@ e903df813354d96683a436499b293d9e18b0ef38 data/basemetals/loot_table/blocks/stars 60892a0e7299e960b90dba4af82d5787179f3c8d data/basemetals/loot_table/blocks/starsteel_block.json 5de427afb86b169b188333a64119343402225c27 data/basemetals/loot_table/blocks/starsteel_button.json 781447778d4a111ede63c1a5e729e79d52fea6ad data/basemetals/loot_table/blocks/starsteel_door.json +5dd21d485cf970cf8df93d6c91455779facd89ab data/basemetals/loot_table/blocks/starsteel_double_slab.json 49159c80f8fdefdb8df25be85e27bcc6e8419544 data/basemetals/loot_table/blocks/starsteel_lever.json 362bbe280239db3abcaa032207a8a7053c5a5173 data/basemetals/loot_table/blocks/starsteel_ore.json 290be9729c0638d5bb8575b1d5662bb502246fe3 data/basemetals/loot_table/blocks/starsteel_plate.json @@ -1444,6 +1457,7 @@ fbcb28720c0832de0fa90d9d7c47fe741781cd79 data/basemetals/loot_table/blocks/steel 05cfc2d512ef35277e79341a8faded1b5a9c98f9 data/basemetals/loot_table/blocks/steel_block.json 5c6a289e54a6db6d9318ef6b4c5d362e19abacd8 data/basemetals/loot_table/blocks/steel_button.json a1302234e3d9ed60875d9a4be2de3e60db1b158e data/basemetals/loot_table/blocks/steel_door.json +bf88289da7372143f4ddd91350816acd160844ab data/basemetals/loot_table/blocks/steel_double_slab.json ef85826a758c5eb883b2f4a5495c6f66af0be7da data/basemetals/loot_table/blocks/steel_lever.json 4c56ad5c76b0791f50bdcd921ee3dadb141ce08e data/basemetals/loot_table/blocks/steel_plate.json 4f7575069a7471facd7eda3baf938b0227499d23 data/basemetals/loot_table/blocks/steel_pressure_plate.json @@ -1456,6 +1470,7 @@ c1e7fcd77fea79306d7ef6c301942aae6ce78abf data/basemetals/loot_table/blocks/steel 4db4873a962c99c5977023c174d49d248e659ec7 data/basemetals/loot_table/blocks/tin_block.json 1f4c65377a2eb746f17203e1bf811df8a25600fc data/basemetals/loot_table/blocks/tin_button.json 93130c73ae4c9c0e19b9c501e02b22339b9334b1 data/basemetals/loot_table/blocks/tin_door.json +be8cdfd1ed0ac6b64aa51dd0c1ced5ac1321a772 data/basemetals/loot_table/blocks/tin_double_slab.json 51b65f716d50c43312f53fa784902999ce8b7903 data/basemetals/loot_table/blocks/tin_lever.json d2fca56d2e3494ae71377c686b0731992b6ecc32 data/basemetals/loot_table/blocks/tin_ore.json 08873806737d01677a7989a4258bcede705cd747 data/basemetals/loot_table/blocks/tin_plate.json @@ -1468,6 +1483,7 @@ c1a768fb081039dd5f4e4de4c812433aa9b50352 data/basemetals/loot_table/blocks/tin_t aea4ab1ce4212edf7a438b99ee3b2194241ca4f3 data/basemetals/loot_table/blocks/zinc_block.json d4a7d84c626875fd3f2924ca389d94512c25a75c data/basemetals/loot_table/blocks/zinc_button.json aff998fe25fc19298257a4cd762b486af6ee1950 data/basemetals/loot_table/blocks/zinc_door.json +b3b69b11523ec35613101c78dfbe47d43bd79a0a data/basemetals/loot_table/blocks/zinc_double_slab.json 89316711552c8f91cf373fd325ac9533b201652f data/basemetals/loot_table/blocks/zinc_lever.json c6008f959803793f81fdb9567a619e68c9a0a1e9 data/basemetals/loot_table/blocks/zinc_ore.json 2e1321743cdf9d62b1f1b4ffdc5c04c367538f72 data/basemetals/loot_table/blocks/zinc_plate.json @@ -1498,7 +1514,7 @@ eda50558d127481468921e42a78b6bb033593f97 data/basemetals/recipe/adamantine_anvil 10a8c9f445cf1858e793b3e27a72fc7791de60d5 data/basemetals/recipe/adamantine_bars_2.json d58f8b375376da2cf908e17bc7e317bc2e81d3eb data/basemetals/recipe/adamantine_bars_recycling.json e7a1cf45b4b19d14b9d8b76f72cdaae0cea000a7 data/basemetals/recipe/adamantine_block.json -1428ff162dadbf10e15bfa92313c3a1051c186e1 data/basemetals/recipe/adamantine_block_crushing.json +f3533528c5cb1024d01e7c179fb0d97f10df253f data/basemetals/recipe/adamantine_block_crushing.json 8c11b633cb12b5712338c2f5aebef38f682a130b data/basemetals/recipe/adamantine_block_ingot.json 9d38dcc56c155da10f5aaeca8575d7634aba8e8c data/basemetals/recipe/adamantine_bolt.json a6f04ae68dfcd2bea91c9de4d4970b74b6de28fa data/basemetals/recipe/adamantine_bolt_recycling.json @@ -1527,17 +1543,17 @@ c7c5fb51c25cadcb8393ee3e69998848cbd18144 data/basemetals/recipe/adamantine_helme 9950121478a62cf3e610bc400fa04e403242d08b data/basemetals/recipe/adamantine_hoe.json afddc9c4c0131fd5298ca803dd921046a1c98d16 data/basemetals/recipe/adamantine_hoe_recycling.json 9b9509a88ad75fd4e9ef9e4c589b4447fd4e9e93 data/basemetals/recipe/adamantine_horsearmor.json -3519ecad8fa881c19fb0e824bf9bef1a5aa95691 data/basemetals/recipe/adamantine_ingot_crushing.json +58ab8dbf47e7bcabaedc23685ace548f07a92e59 data/basemetals/recipe/adamantine_ingot_crushing.json deac93975408458edeb23ea0caceeada3b3f3307 data/basemetals/recipe/adamantine_ingot_from_nuggets.json f6ec765d35d4b882fe83acbd3f43977abe5a5c89 data/basemetals/recipe/adamantine_leggings.json b0defeb82581e707dd2254b20bf61b14d8dd4abb data/basemetals/recipe/adamantine_leggings_plate_repair.json ce6129f3b883b6e5ca33dbd3dbbf576dc9c238ac data/basemetals/recipe/adamantine_leggings_recycling.json a9219686c5ede00e8ecfae29c5c6c7a09602dc9e data/basemetals/recipe/adamantine_lever.json e1ae6b450d15e01ace81c6e3238723aae29cf025 data/basemetals/recipe/adamantine_lever_recycling.json -b7e74b203f227bc65c71fbbc940eaf8ade1fc2a1 data/basemetals/recipe/adamantine_nugget_crushing.json +945ec6591f9b80d00b218b4988549b1eec863230 data/basemetals/recipe/adamantine_nugget_crushing.json 5ad198b4ef3cb697932111cda4bbc8d8877b2b52 data/basemetals/recipe/adamantine_nuggets.json 84e1a2d6eed88e692104282db7947fb98219f7b4 data/basemetals/recipe/adamantine_ore_blasting.json -54b7ca2cba11bfb517c039f347e9b21a07f12aa0 data/basemetals/recipe/adamantine_ore_crushing.json +ce413a880db98d5aee25fc25ad79d4068a6e8549 data/basemetals/recipe/adamantine_ore_crushing.json bc754b31600f5e244bc6c9c86b159d0953f43055 data/basemetals/recipe/adamantine_ore_smelting.json ed24541a504c02f64ff221722ede88bc57ff8002 data/basemetals/recipe/adamantine_pickaxe.json 8a37db58f96b58da86cf6bf3efd9015792994ad7 data/basemetals/recipe/adamantine_pickaxe_recycling.json @@ -1548,7 +1564,7 @@ f4ca616ebdc16a7c1d717527d8b75e4c576c165b data/basemetals/recipe/adamantine_powde 03765aabd1718caa57bb7c5bae21088b2a85935f data/basemetals/recipe/adamantine_pressure_plate.json 39b430efa809b975ca93cb7dc071d2115d5a5c7f data/basemetals/recipe/adamantine_pressure_plate_recycling.json 0951b9fcefcded7db3b8750c1c8817adcd6e007f data/basemetals/recipe/adamantine_raw_blasting.json -04e6d35158fcd0aeb8a3e7ed67cd5a08f6cdf068 data/basemetals/recipe/adamantine_raw_crushing.json +e5e68b80744fdb3e7a2d5b108e12d0900bbf2915 data/basemetals/recipe/adamantine_raw_crushing.json 5efc1757c2fe0578b18fab8193f711dd70bf5c4c data/basemetals/recipe/adamantine_raw_smelting.json d7be61fe638356ec24546753cc5725a5bf4ae0bb data/basemetals/recipe/adamantine_rod.json e48a2636db368ea5483207ca441ae96ff136eccd data/basemetals/recipe/adamantine_rod_recycling.json @@ -1570,7 +1586,6 @@ bee5e6ec51e5da3628f892163c2e8384f620314c data/basemetals/recipe/adamantine_small 4478f9a46d7fe11731e00345570a66927d112016 data/basemetals/recipe/adamantine_trapdoor_recycling.json cced268bdbd9b95766f8676856e0191386e68e1a data/basemetals/recipe/adamantine_wall.json 3b15626bf17e817b919fe774f809f31b85b81d16 data/basemetals/recipe/adamantine_wall_recycling.json -a69e0d3e67b5f06ede1912f3d4893aa80b301960 data/basemetals/recipe/ancient_debris_crushing.json 18995cac4f4bc743cdb9e0e318d3bc994894e7bd data/basemetals/recipe/antimony_arrow.json 11a8e3b027fc8562126393cdecbfa26f0ca83c37 data/basemetals/recipe/antimony_arrow_recycling.json 318dd4cd891bec102244e0ba542f1b97b7876724 data/basemetals/recipe/antimony_axe.json @@ -1579,7 +1594,7 @@ b436bc85b726c5093cef578522faab561061fe08 data/basemetals/recipe/antimony_axe_rec d5a4d1e911c11cfb562226b67bf793c7fa0c9509 data/basemetals/recipe/antimony_bars_2.json 0f3302b518341c7201f9b516899940ca0d4db15a data/basemetals/recipe/antimony_bars_recycling.json 5128bc6535ce140a893646e194f393e19f4ee726 data/basemetals/recipe/antimony_block.json -5a066c3e3283def81fd6aac2068b643cd2fa2ab9 data/basemetals/recipe/antimony_block_crushing.json +dbb5f1c18b28f6dd13c9ed9adf636d3083fd188c data/basemetals/recipe/antimony_block_crushing.json d32afb54266666b165619c15b488fef836683a3f data/basemetals/recipe/antimony_block_ingot.json 719f4812470149faec9df596ceacc5fa9ba78877 data/basemetals/recipe/antimony_bolt.json 867dcf90b6567ab1addef6cf43e7e1b4c84918d4 data/basemetals/recipe/antimony_bolt_recycling.json @@ -1608,17 +1623,17 @@ d7b85828cceb76805525ae96e622b6a79a3b442f data/basemetals/recipe/antimony_helmet_ 466233126a118129cc569325b689ce8b0c8b1eba data/basemetals/recipe/antimony_hoe.json bf5784a18bba8077d201b415a9d0155f0d12b32d data/basemetals/recipe/antimony_hoe_recycling.json b18140187f796173d71b632029282a2b6fcaed55 data/basemetals/recipe/antimony_horsearmor.json -7c35861e8150e71b550308039962671f34d90113 data/basemetals/recipe/antimony_ingot_crushing.json +5da5c5af3af2ec593152c4543d50a7706258e880 data/basemetals/recipe/antimony_ingot_crushing.json 961262b224e12399b1de7f5c07d3be2ce6918283 data/basemetals/recipe/antimony_ingot_from_nuggets.json 7632f395eb74c9f96f21304b965004a447bea114 data/basemetals/recipe/antimony_leggings.json 21d9160a2841c2aefc07a4962be7ea44dd7f2616 data/basemetals/recipe/antimony_leggings_plate_repair.json fa9c5b8603ee6c3a05abd81a664b018ac61b842f data/basemetals/recipe/antimony_leggings_recycling.json 95630462aa5dbf9f0607a4a7d91e853825f13ec5 data/basemetals/recipe/antimony_lever.json 02d20da66732188243bf78382ea65a75c30a5e1c data/basemetals/recipe/antimony_lever_recycling.json -bed9fca11a6bbc56f0c09372c8c316e92eb9ba91 data/basemetals/recipe/antimony_nugget_crushing.json +dd8dda659cf777752f0c90df58f33de12c90343c data/basemetals/recipe/antimony_nugget_crushing.json cbdc31f600aa769756ec3fae95d1d86a79c5af0a data/basemetals/recipe/antimony_nuggets.json 386a59ee543387b1c830f5dc0abb748269c95f55 data/basemetals/recipe/antimony_ore_blasting.json -05360913a672d15d6b56a989b85ce6c6fcd2b7a4 data/basemetals/recipe/antimony_ore_crushing.json +de53b47323cdee149045d79211b5ad0f8fc72f97 data/basemetals/recipe/antimony_ore_crushing.json 352bb79775c992284947992b37a5addf20f52d20 data/basemetals/recipe/antimony_ore_smelting.json bbb01610a147746c5f8eeb135c7e03518b45ad19 data/basemetals/recipe/antimony_pickaxe.json 78f0263eb01e3d265685a95e18a6917386d836b0 data/basemetals/recipe/antimony_pickaxe_recycling.json @@ -1629,7 +1644,7 @@ bbb01610a147746c5f8eeb135c7e03518b45ad19 data/basemetals/recipe/antimony_pickaxe 1cf2c530a7de522eca9dcde9959fdce43117369b data/basemetals/recipe/antimony_pressure_plate.json 4bc55d111d59182de5b4f45af5bdcd20f508dd86 data/basemetals/recipe/antimony_pressure_plate_recycling.json df812fa17a9b3edbe7abfad2925862046e5c63ef data/basemetals/recipe/antimony_raw_blasting.json -6c2f1100b225d4b622b270342ec5f32c6ba34820 data/basemetals/recipe/antimony_raw_crushing.json +e492786a54c79edf2b8b4d9246a142acfec808a4 data/basemetals/recipe/antimony_raw_crushing.json 66a66a556b64cdd74d305e33289628c1c12c5406 data/basemetals/recipe/antimony_raw_smelting.json 0055874fd47d23cd940ad1618d53cb6a86c94669 data/basemetals/recipe/antimony_rod.json a2d4375e48b18465c6d8000c2cb9c1ffc8fd1973 data/basemetals/recipe/antimony_rod_recycling.json @@ -1662,7 +1677,7 @@ c5b52fff4f11330c2c41a11170fd6a8d5cc1b4a3 data/basemetals/recipe/aquarium_blend.j 33e2920eabf2c1a5ee34ef8f7e4d3ed444c342c1 data/basemetals/recipe/aquarium_blend_from_small.json 73483e0392fe784a689a7c1273a9cc4cec37b67b data/basemetals/recipe/aquarium_blend_smelting.json be3ba7d6e41b815a7310d16ac42c51569b66348d data/basemetals/recipe/aquarium_block.json -6bd9d6d9fa7d942adcfa517b1c6f0f36a97f6050 data/basemetals/recipe/aquarium_block_crushing.json +a606c73bc232fa36622f67b51ceb6415e3dd5405 data/basemetals/recipe/aquarium_block_crushing.json afe09b4216e31bb88f920b8391fc2b55a8f7bec5 data/basemetals/recipe/aquarium_block_ingot.json 68aa777123f57768398f240e8709f29c8319d8be data/basemetals/recipe/aquarium_bolt.json 65025708589553840bf5a6ed4d856e774f00ff12 data/basemetals/recipe/aquarium_bolt_recycling.json @@ -1688,13 +1703,13 @@ db960f64f839e4142b3898b46f18597bd959afaa data/basemetals/recipe/aquarium_fishing 331b481e75759effa8e65321322ad778e2c3bf8d data/basemetals/recipe/aquarium_hoe.json a1ef077f22b4efa0852b9dd54c56eb3a08c41168 data/basemetals/recipe/aquarium_hoe_recycling.json 2d3cc946e8cf8a993d4e709c232b029a62d57c2d data/basemetals/recipe/aquarium_horsearmor.json -50127c942d76a7c39a08c774151231bdda151bb5 data/basemetals/recipe/aquarium_ingot_crushing.json +794891425016f56a53ea16c4b527c238c1d51009 data/basemetals/recipe/aquarium_ingot_crushing.json e0deee274b241b98ac6a06f4ba0dacd6be8725a9 data/basemetals/recipe/aquarium_ingot_from_nuggets.json a7379561a8c8920565395c28cbbf5176ff4a1b3a data/basemetals/recipe/aquarium_leggings.json 6cfd3278b302e4722393c0aba4e7de6754a56616 data/basemetals/recipe/aquarium_leggings_recycling.json ee355fe127a6268b0884de131a49ab7837d59b5a data/basemetals/recipe/aquarium_lever.json b80f207c7beca172db70b51eb0c87eacb69c8c0e data/basemetals/recipe/aquarium_lever_recycling.json -1b17d1cd291f6956a12d23234110866c363dc133 data/basemetals/recipe/aquarium_nugget_crushing.json +ba5d81cfe6784db06853b3a94729188543ed98ce data/basemetals/recipe/aquarium_nugget_crushing.json 8e8bd9e356e5a2117b4d07d1f52d5d30da26e5bf data/basemetals/recipe/aquarium_nuggets.json 0be90242ef21d24a1800b6bd55dfb696932b8746 data/basemetals/recipe/aquarium_pickaxe.json 21334b69344d374ef5bd85c8e2693b16f841c281 data/basemetals/recipe/aquarium_pickaxe_recycling.json @@ -1733,7 +1748,7 @@ d0bb32b0514f4b41a1289c4c8844db2f08d278dd data/basemetals/recipe/aquarium_sword.j 2eb5d20ab12230675a091225688a12a4af7d07ee data/basemetals/recipe/bismuth_bars_2.json e0d869fe3d6942a23b8ee21573da393aaac2c65c data/basemetals/recipe/bismuth_bars_recycling.json 31b71678318ea6df8c4a38f27362e264fc15038e data/basemetals/recipe/bismuth_block.json -f77113c15da6e128c968f4089cf1cec2f6b5a5f9 data/basemetals/recipe/bismuth_block_crushing.json +b7773956727242c08233a807ab1d52deccf5ca5d data/basemetals/recipe/bismuth_block_crushing.json b0b401639f925d9a5244d12cb9d668220349141a data/basemetals/recipe/bismuth_block_ingot.json 452b4d2dbcbcd4b8421b6c8a8bd88a20a083b3e0 data/basemetals/recipe/bismuth_bolt.json e6ffdaffc0c26cbb689f93358e786246c8c1be34 data/basemetals/recipe/bismuth_bolt_recycling.json @@ -1762,17 +1777,17 @@ b2826e7cff99a60194b123ee306753eba49caa11 data/basemetals/recipe/bismuth_helmet_p 6d2464650f1049d1de7d9a49ce2fb82cf2ca655b data/basemetals/recipe/bismuth_hoe.json e05fc16b186fe24272d9d098a5531a069213bf82 data/basemetals/recipe/bismuth_hoe_recycling.json fc6a365e3c994c46ff004c4177695f9a0b989542 data/basemetals/recipe/bismuth_horsearmor.json -d8c5fb5ec0e8cfa340bde49025454d87159d04a2 data/basemetals/recipe/bismuth_ingot_crushing.json +b6ed56c48fadca4d19ef964151423f6a9aaa0029 data/basemetals/recipe/bismuth_ingot_crushing.json 5531d5f616b6ce751b9caae6d38980f2ba7b8024 data/basemetals/recipe/bismuth_ingot_from_nuggets.json bb53f8658f253b47cf002c1c968f11b6d3df9cd4 data/basemetals/recipe/bismuth_leggings.json fa1514a88077de49b817e05da3eccfb9ca73435c data/basemetals/recipe/bismuth_leggings_plate_repair.json 081f26aca16dd017f9e75ff0d4492ed3cae75bd6 data/basemetals/recipe/bismuth_leggings_recycling.json 77c02db58365edefbfd89d2952194401acc74e77 data/basemetals/recipe/bismuth_lever.json cf2f9025aaaa9be1f950b284fc74074ade9e7a61 data/basemetals/recipe/bismuth_lever_recycling.json -3bca768250bb09531ef58a5d150ef2555ee47884 data/basemetals/recipe/bismuth_nugget_crushing.json +52be4541ad94560603f1f393462390b3a279172d data/basemetals/recipe/bismuth_nugget_crushing.json ca0f215fe9dda775d48c7470ead46054931bed56 data/basemetals/recipe/bismuth_nuggets.json bfe1a0e3772fe242cfbc3ed483c2674d912a8477 data/basemetals/recipe/bismuth_ore_blasting.json -dbc446bf5af8456e61b541e70f4f06251e920e73 data/basemetals/recipe/bismuth_ore_crushing.json +ceb5df33276714323430265bec574237b3fdbc41 data/basemetals/recipe/bismuth_ore_crushing.json 83db45dfa24109bf3baa55399d9466cfa67212ed data/basemetals/recipe/bismuth_ore_smelting.json 764fc0f047e82178c35a70c95cbbfcc5fdf5c849 data/basemetals/recipe/bismuth_pickaxe.json 6a5efefe3bef4a925ac550df30b0906302b9cd5a data/basemetals/recipe/bismuth_pickaxe_recycling.json @@ -1783,7 +1798,7 @@ dbc446bf5af8456e61b541e70f4f06251e920e73 data/basemetals/recipe/bismuth_ore_crus e9c03c762b5c143d5cf8ae7f8139bc35effe496c data/basemetals/recipe/bismuth_pressure_plate.json ed339593472763445c025e0e151743dec9c2fad8 data/basemetals/recipe/bismuth_pressure_plate_recycling.json 0c253de6c7fe45a7be5f36249e01c2afc2b32dcd data/basemetals/recipe/bismuth_raw_blasting.json -d3ba8dc87ed98429791739f86a2953a8c26f1af7 data/basemetals/recipe/bismuth_raw_crushing.json +ed0cefaa320c55e9d9da17b385f02fb66e32396f data/basemetals/recipe/bismuth_raw_crushing.json 37b776a53a455cab9b7bbbda45585307180716ee data/basemetals/recipe/bismuth_raw_smelting.json 8ef36fb95e7bf64485fe81df9a2460e578d8bc28 data/basemetals/recipe/bismuth_rod.json 121fbf06fdfab939cf110204d69b2cccf6882f5c data/basemetals/recipe/bismuth_rod_recycling.json @@ -1805,9 +1820,6 @@ e90d364999de55365b6f210caf493dde8ef1fb9c data/basemetals/recipe/bismuth_smallpow d6e530b12cccf4e87bb5c66a39e395e5fe4f194b data/basemetals/recipe/bismuth_trapdoor_recycling.json 0508908f1b7cd2288d754cb5293a791d4d509b51 data/basemetals/recipe/bismuth_wall.json 1a72057c6ecdbef5b7a74dac3690d120253ea73a data/basemetals/recipe/bismuth_wall_recycling.json -96e9b38e36510f4610768e45eb4d16245b40c355 data/basemetals/recipe/blaze_rod_crushing.json -807d01b93e04993ab3e930a0eac560017279eda7 data/basemetals/recipe/bone_block_crushing.json -b3842158cf404629a562a7f53eac4f1c56562be2 data/basemetals/recipe/bone_crushing.json 4373df1adb71946abde1ec8d248f1e96c4e9a157 data/basemetals/recipe/brass_arrow.json 07f18a91d5abe8423b847ead8a5c26fa4ada68e0 data/basemetals/recipe/brass_arrow_recycling.json b0f0f596664becb55c57c150967f4a389ee40d18 data/basemetals/recipe/brass_axe.json @@ -1819,7 +1831,7 @@ ee7096a66943ca04bf4d09c61aa3dc8c1875b570 data/basemetals/recipe/brass_blend.json ee3dfce53aa9c5f76250abc18cb90107cdd8cb96 data/basemetals/recipe/brass_blend_from_small.json 9f61f135f9201c9bc1afe64d3d63998c8f25bbf9 data/basemetals/recipe/brass_blend_smelting.json 91f87747525a0f7d11b079350917f469e75dd9df data/basemetals/recipe/brass_block.json -1bc8c3f87abfbc760dc3db4101dfbe551e05f572 data/basemetals/recipe/brass_block_crushing.json +6aab00c12da9c87628047339ebad4a7a59fb9a89 data/basemetals/recipe/brass_block_crushing.json 3adfee6bb871be8e0ff2859c55456e7e75e3d9d0 data/basemetals/recipe/brass_block_ingot.json 4e6ce6306420f8700b72d9859b00f913d2296721 data/basemetals/recipe/brass_bolt.json edf1318868c16c7bd1f6c7fc3cd3bd06240e71ab data/basemetals/recipe/brass_bolt_recycling.json @@ -1848,14 +1860,14 @@ c8ca712c929b3fcc88976a27129f086f32557c52 data/basemetals/recipe/brass_helmet_rec ac29b5edf812be1b1c747c89d70702aa3b23c5ea data/basemetals/recipe/brass_hoe.json aafe6049a5530ba30f5d36a8846d752a7a28afaa data/basemetals/recipe/brass_hoe_recycling.json c4916dfd6f198947030343518d61a208b05a4462 data/basemetals/recipe/brass_horsearmor.json -57e7b2efd4a292c66a9a9353f1b7346f914a98d9 data/basemetals/recipe/brass_ingot_crushing.json +dfc767cb834c1f2eadd6ab80f1664e813031c7ce data/basemetals/recipe/brass_ingot_crushing.json e24bd8fc442ec3ce16dcd5a78b895868f1fc4972 data/basemetals/recipe/brass_ingot_from_nuggets.json 254bbd092f373813279c9ac14d5c75f9397a8833 data/basemetals/recipe/brass_leggings.json 80a84e0e990457d2cc7c4e7cdc721f624987b88f data/basemetals/recipe/brass_leggings_plate_repair.json dd3d652312ef6130204765728fa4d926bed0bece data/basemetals/recipe/brass_leggings_recycling.json b85e37d97438ee769fd2a8113cc56d7f5cc4dc7a data/basemetals/recipe/brass_lever.json be12d1a9535074137c4888747c9c8af4363b1e09 data/basemetals/recipe/brass_lever_recycling.json -d536bb6929499ae132b5b6725364b5cb3f87b652 data/basemetals/recipe/brass_nugget_crushing.json +cbd2e6f32c40a0b593a8b63c8957f3b8db0ec1c3 data/basemetals/recipe/brass_nugget_crushing.json 6d12b60df26a1f8cb023663b819b284ca87e4b6e data/basemetals/recipe/brass_nuggets.json 1a2df14951fe15558f6af5de411f8fb1695b591b data/basemetals/recipe/brass_pickaxe.json b2da32f9e3342252fa84da593e65c0201f854c5c data/basemetals/recipe/brass_pickaxe_recycling.json @@ -1898,7 +1910,7 @@ aa1f023c9d1f4155fec3066f7ef6e0d0c68da21d data/basemetals/recipe/bronze_blend.jso 939dc97004ebf7c79427559ed8b452f51ba703cc data/basemetals/recipe/bronze_blend_from_small.json 17a13b82b16bebe2053b8e01e5bf757285d279ca data/basemetals/recipe/bronze_blend_smelting.json af5fa214df661c2ee69eebcb18e99298a5af6b6f data/basemetals/recipe/bronze_block.json -a4c460ce5769994b208c97f9ff86d21b6a096cb4 data/basemetals/recipe/bronze_block_crushing.json +267c5a3e0d2fd0b60fb6d99e9390ec9c23b66620 data/basemetals/recipe/bronze_block_crushing.json 6746a54f817f5f4b98a9198c62d97133662d4842 data/basemetals/recipe/bronze_block_ingot.json 13ba840a196ab4d2214935343b962560bfe4ad64 data/basemetals/recipe/bronze_bolt.json 77f95e588c629c40b0efcc95e848d74f1146a23d data/basemetals/recipe/bronze_bolt_recycling.json @@ -1927,14 +1939,14 @@ e48fedfc7e6a687ead1416e0a9f4a742005e6b22 data/basemetals/recipe/bronze_gear_recy 175f3a8feeab4b1940c13cca5401aa7ba45bd64d data/basemetals/recipe/bronze_hoe.json 084f9caf1af5db0dd092aca230507952cc330a00 data/basemetals/recipe/bronze_hoe_recycling.json f62b66de39fb302d57f981d5019ab0eae6837952 data/basemetals/recipe/bronze_horsearmor.json -aeadcbb988b32e4ba8cca5dc0033649c3a112306 data/basemetals/recipe/bronze_ingot_crushing.json +2f9f55eff0d7f016f1820ebf80fd79466fc3f7b5 data/basemetals/recipe/bronze_ingot_crushing.json 4c63eaf8d11f44f9ecefa3336eb33bdc5e4bcb77 data/basemetals/recipe/bronze_ingot_from_nuggets.json d56ce77d1822df2e2f10f9805669449e54ef70aa data/basemetals/recipe/bronze_leggings.json ca798e1a72a4d6a65d668af8cc1f63a6d129f5c1 data/basemetals/recipe/bronze_leggings_plate_repair.json 2b1882db9ec8969e6fe6114b6a34944f34583ffa data/basemetals/recipe/bronze_leggings_recycling.json 276583798ed179d8c3d3d598cba9d4946dba9759 data/basemetals/recipe/bronze_lever.json 8b132e7f5adf156678fa277eb4f072a881c5bfb9 data/basemetals/recipe/bronze_lever_recycling.json -554e799380d50dbbb75b11a185dd7e2eec1e7f92 data/basemetals/recipe/bronze_nugget_crushing.json +14f25ee8af485c64170ae396ecc00417259a9d91 data/basemetals/recipe/bronze_nugget_crushing.json d5ba1bbe9e82e4a9bed5c115319e73556eb3c049 data/basemetals/recipe/bronze_nuggets.json 3b240f28a9c2c0baec8be2f3f200caa76d3ec05f data/basemetals/recipe/bronze_pickaxe.json 283155ee2127f15cc554664edda118ad21e4a167 data/basemetals/recipe/bronze_pickaxe_recycling.json @@ -1967,25 +1979,24 @@ be7ed4ff658889af6bbacfcbd1d7d89d8262a558 data/basemetals/recipe/bronze_trapdoor_ 6ed8a4cf0194f7ab452f53b6da058b5e8e957512 data/basemetals/recipe/bronze_wall.json f15a5b0cdb8eb02c6ffa5120ab7f10100cf5407f data/basemetals/recipe/bronze_wall_recycling.json 52357582b46cfffc2fc6e1bae5a80339456dc0d5 data/basemetals/recipe/charcoal_block.json -57b8b9be89a7cd28604fe7fcb69e3d1ce5f062f8 data/basemetals/recipe/charcoal_block_crushing.json +5766403fa71f7d1ab3bb2f9ecf5685f367cb0144 data/basemetals/recipe/charcoal_block_crushing.json 0a8789c24ceca21baf768b4d79577804616a19c2 data/basemetals/recipe/charcoal_block_dust.json -abad7949018a86b4a8b8d2ec01f500e0472a5522 data/basemetals/recipe/charcoal_crushing.json +dd843602f5ebc39489274750b70559f2c2795e26 data/basemetals/recipe/charcoal_crushing.json +2584dfa6a96624e9a5b1eb2bc0f7df07f50fbd97 data/basemetals/recipe/charcoal_from_block.json ca220bfbe8dfb79cbe20d7ded7d97eaa146e1f74 data/basemetals/recipe/charcoal_ingot.json c2601645004ee0885ca0a13bb6776f188b7761ca data/basemetals/recipe/charcoal_nugget.json -0845731098ca2f73de39db3b250a3e0848997c15 data/basemetals/recipe/charcoal_nugget_crushing.json +da0ff2cfe9f47c5a5c7ff2f517479f51db55267a data/basemetals/recipe/charcoal_nugget_crushing.json 78a7b93652287da87e58b47937a8703c495e1fea data/basemetals/recipe/charcoal_powder_from_small.json 432c6a716982239ca5fa29e83287d3e7350fe6d3 data/basemetals/recipe/charcoal_smallpowder.json -4538cd1b01cfd76733c298108bc7efdd8183c9ff data/basemetals/recipe/coal_block_crushing.json +146d928031aaa953066deefec1e6e7478959cb9c data/basemetals/recipe/coal_block_crushing.json 6cdb1746488241a61db92176a8208df014bb9db8 data/basemetals/recipe/coal_block_dust.json -b70cfa0970d2aa964d91ee8da1faabaec2c31640 data/basemetals/recipe/coal_crushing.json +22ae3a66773986b4b9e5b55e7df3a2343fc38d12 data/basemetals/recipe/coal_crushing.json bd26c3024e1f91f113cf12de3f670b2908d1a05d data/basemetals/recipe/coal_ingot.json 494523192f6f2ee2bc127ebe1d231063c19a9a94 data/basemetals/recipe/coal_nugget.json -b8fabac205051e0fdd962d70635628255d131a78 data/basemetals/recipe/coal_nugget_crushing.json -89b5e79eac327f423d051dfe883911d3d2547eea data/basemetals/recipe/coal_ore_crushing.json +52200e34843bc968361d3cd8950cc1bb5fa383d2 data/basemetals/recipe/coal_nugget_crushing.json +6d74417b6a735ea790df15c51cb3ee5d7e0c2774 data/basemetals/recipe/coal_ore_crushing.json 31416e7d9a85d3204343b8937c5814f3b736de68 data/basemetals/recipe/coal_powder_from_small.json 595af1d39590d7614bea66ce3842eac628b766ea data/basemetals/recipe/coal_smallpowder.json -cd5e90865e6acc39cf997dda40401287343474a1 data/basemetals/recipe/cobblestone_crushing.json -9717b77bfff42d9128646a566c54609be90134f0 data/basemetals/recipe/cobblestone_wall_crushing.json bb34e22de8fd5ed535f4d8e4e704f42a64841015 data/basemetals/recipe/coldiron_arrow.json 6e300be1b3ab53ec5ff81a4c8f48b4973c572d46 data/basemetals/recipe/coldiron_arrow_recycling.json d654f635b467752a0d266be014ca69f6b699d94b data/basemetals/recipe/coldiron_axe.json @@ -1994,7 +2005,7 @@ b804d7f0d6df7dac0d8c045fd584f6b7f72ce774 data/basemetals/recipe/coldiron_axe_rec fb6232f0333bfb3d3d28c3a8a83aea20d11cb249 data/basemetals/recipe/coldiron_bars_2.json e81e385683db42532058a9dc8eb86f52b11e7a1c data/basemetals/recipe/coldiron_bars_recycling.json 908e5800bc70a92f20522c7c7a9cda14f1d22b73 data/basemetals/recipe/coldiron_block.json -a493f5ea291b7937f7f0e2da59a744749237d855 data/basemetals/recipe/coldiron_block_crushing.json +694093842eb633e50c90d7ba8cc83a2fa4fd8f34 data/basemetals/recipe/coldiron_block_crushing.json 014555e50bdd2ee390bdc6513bfa8691efcc60a9 data/basemetals/recipe/coldiron_block_ingot.json 718fd6c9ef2445af2092a7003fc08ba972a37a75 data/basemetals/recipe/coldiron_bolt.json 6f92364ccb328fd1f6033ffd7ab44d7be147ad98 data/basemetals/recipe/coldiron_bolt_recycling.json @@ -2023,17 +2034,17 @@ f6132f27544a9b98a149338a1802f226d1835461 data/basemetals/recipe/coldiron_helmet_ c3769ef7f18e944f4862839a362d9626bde9c079 data/basemetals/recipe/coldiron_hoe.json 9cb24c77100da09d4d12d99e11734bf4b8259d30 data/basemetals/recipe/coldiron_hoe_recycling.json f5e75d5bc37435008468ae50a63119056aabf3ff data/basemetals/recipe/coldiron_horsearmor.json -1872e35c920843e711686054a97a7c384f8482f1 data/basemetals/recipe/coldiron_ingot_crushing.json +71d0aded420017ac446f6ba831f2c8f6db4c8f93 data/basemetals/recipe/coldiron_ingot_crushing.json 108050bea8088d3e9653f1866dae1adff38d6bb7 data/basemetals/recipe/coldiron_ingot_from_nuggets.json c07b2c75170c43c204a39dbe0442b00ae21f084b data/basemetals/recipe/coldiron_leggings.json 86d89ba339945c82ef16552d4d873be343a51d0b data/basemetals/recipe/coldiron_leggings_plate_repair.json 51a56092d63d389aee3f9a57063f7c9585813066 data/basemetals/recipe/coldiron_leggings_recycling.json db2976a20f275b2bcd4d03ac89870f1ccf57589b data/basemetals/recipe/coldiron_lever.json 7cf68404bea2b36e7f3f0d768b187295fb01d308 data/basemetals/recipe/coldiron_lever_recycling.json -e9500b4afc14cab37f33abaebee3b09d682ff1f3 data/basemetals/recipe/coldiron_nugget_crushing.json +8c830bd312f6b4fbc9f4ede9c1c1b4ce6d292db8 data/basemetals/recipe/coldiron_nugget_crushing.json 50f0736f2d5b90c5cff4bb445d865a541435672c data/basemetals/recipe/coldiron_nuggets.json 7c2b59785016c4a246c9ab7a5619b3a291279401 data/basemetals/recipe/coldiron_ore_blasting.json -b69e344df91d474e4fe91293f48d83b87edf8a27 data/basemetals/recipe/coldiron_ore_crushing.json +c6b4038814804519ffeeae60a9b4a41dd97a46b3 data/basemetals/recipe/coldiron_ore_crushing.json 9c16a9478b7d80deecbf4b206d72f676b6b7f3fc data/basemetals/recipe/coldiron_ore_smelting.json 38b26335003c43b37ffe602f9894c5d329cb3200 data/basemetals/recipe/coldiron_pickaxe.json da428a8ed11874cf8c66bb7a80ed340b1b2563f7 data/basemetals/recipe/coldiron_pickaxe_recycling.json @@ -2044,7 +2055,7 @@ d321a2f7faad85404266f99f660b089008f0d018 data/basemetals/recipe/coldiron_powder_ d5b96d58f93b0420100293bb9113f6f43c399eae data/basemetals/recipe/coldiron_pressure_plate.json b3ffab00e892d4495a7c1eef7416ae3766781203 data/basemetals/recipe/coldiron_pressure_plate_recycling.json b885479adb736a397c2b5469ae8e006a09b35ac3 data/basemetals/recipe/coldiron_raw_blasting.json -ec7e970c2f5ef1175af1543165f57336334a681f data/basemetals/recipe/coldiron_raw_crushing.json +56fe341fa1e86994591a6b607ef5b774a657e7fb data/basemetals/recipe/coldiron_raw_crushing.json 9ccd2a4584f788b49cc1bdb04fda4bf3388fe798 data/basemetals/recipe/coldiron_raw_smelting.json de4e1036714278108fcf87f9193381610af05f55 data/basemetals/recipe/coldiron_rod.json c5ef0cf365a92b77b5b8d6fc90138e61c06a967d data/basemetals/recipe/coldiron_rod_recycling.json @@ -2840,7 +2851,7 @@ ad8a7fe9fdb8abe1c547f141ad46b95ca6189279 data/basemetals/recipe/compat/thermal/z fb72dfbcdca5082939b32309be9d83cc70947987 data/basemetals/recipe/copper_bars_2.json 8f493d5b0420603fef1d1da3670adeb81796841b data/basemetals/recipe/copper_bars_recycling.json 39f2717cb0d09222e887f0fbb00024044d3fa17a data/basemetals/recipe/copper_block.json -81524880a4a49347d024628f4db45a8bc61eaa55 data/basemetals/recipe/copper_block_crushing.json +20e08cc13e78aa7f0c1f46e6d377ef7dfec78018 data/basemetals/recipe/copper_block_crushing.json 4200b81975503e976a8aa1222f24f304f3ba8876 data/basemetals/recipe/copper_block_ingot.json e2e7ffb631633f3dfb5d9745bbf5219b636084ae data/basemetals/recipe/copper_bolt.json 920d8309ba67448989b46bdd49cdfe01686bf132 data/basemetals/recipe/copper_bolt_recycling.json @@ -2869,17 +2880,17 @@ e46f1d188481a1e4d31285a359b70b711d2cf829 data/basemetals/recipe/copper_helmet_pl 5f611b681582917ba0775d4b97425b8be0ca18bb data/basemetals/recipe/copper_hoe.json 084a632b9d3b42b5246d7426108ae6dcdbde6e00 data/basemetals/recipe/copper_hoe_recycling.json 772fb40308f55625560fabbfd361883a94ee508f data/basemetals/recipe/copper_horsearmor.json -8437297f476a0c809e9a553a1a24449a9d91bed0 data/basemetals/recipe/copper_ingot_crushing.json +5d0a3643100b3df3681807136412aaeb727a925c data/basemetals/recipe/copper_ingot_crushing.json fc94a125faec77eae268f62017881fa8d93a747b data/basemetals/recipe/copper_ingot_from_nuggets.json ede590a9030bc2aa8f1999f5bb7db8fb71707809 data/basemetals/recipe/copper_leggings.json 31df64c423e8f2325d7498f2bd4cf95b41758654 data/basemetals/recipe/copper_leggings_plate_repair.json 4a7de02eb02704b4436d474e0e34af99c0be1702 data/basemetals/recipe/copper_leggings_recycling.json 656158cb3b25a431c734f39da8381a18fb2836df data/basemetals/recipe/copper_lever.json 95ff58f95e210377e4b6b0e86b4673c48504d70a data/basemetals/recipe/copper_lever_recycling.json -fa942ee8284d9d47c4a0c580afade869fb2b4ae2 data/basemetals/recipe/copper_nugget_crushing.json +baff484e4972ef8d4be973d123e4d4dc54b402b6 data/basemetals/recipe/copper_nugget_crushing.json 21a64a6a7fbe15c9491bdeb0db64b15bfca8b6fe data/basemetals/recipe/copper_nuggets.json 3b6568389cb199b4c3b92b639187722dc66d4ece data/basemetals/recipe/copper_ore_blasting.json -3d8d33f90903590321fa2d40dc019f5661f8db85 data/basemetals/recipe/copper_ore_crushing.json +113544897e568a4ed9eb9fb7e3b9c675d764d60a data/basemetals/recipe/copper_ore_crushing.json de2cd3cfea3679d1ec1b28183e84ac5b9cbf1b8d data/basemetals/recipe/copper_ore_smelting.json 4610e23d76d684ff2afd321198fd2d4f099c4917 data/basemetals/recipe/copper_pickaxe.json d40bbe8058f46c2024908207ef694e1d05608a71 data/basemetals/recipe/copper_pickaxe_recycling.json @@ -2889,7 +2900,7 @@ f25b8c16423156aeb7d5a2bad3f338aedae1bbfd data/basemetals/recipe/copper_plate.jso 77303db653fede4b11b74e14313fc45c5ded298c data/basemetals/recipe/copper_powder_smelting.json 21668e4a794ecf3df7c7eabb82e0f8e095627185 data/basemetals/recipe/copper_pressure_plate.json 814ffc1ee9da5daf108dbe0bc63eca1026189c90 data/basemetals/recipe/copper_pressure_plate_recycling.json -af4526626e5474f7b187ee64e9b6882e8620c765 data/basemetals/recipe/copper_raw_crushing.json +8c7a63bb717caa0ae424473613d67a3603b39148 data/basemetals/recipe/copper_raw_crushing.json d4cfc044128bafec1feed8722b694427141ac700 data/basemetals/recipe/copper_rod.json d7ce745012819ea8e37261d380273b98239215b2 data/basemetals/recipe/copper_rod_recycling.json 7009881770d53960876433f75131eed787bc9275 data/basemetals/recipe/copper_scythe.json @@ -2921,7 +2932,7 @@ d3cfe50e8bdb1f18d6b4e610dc011f69acbcbec7 data/basemetals/recipe/cupronickel_bars 9cd90c124be82f73877f2175b152e5b6feb6099b data/basemetals/recipe/cupronickel_blend_from_small.json 85731b33980a010671f94cba68a142d72508e718 data/basemetals/recipe/cupronickel_blend_smelting.json 31563e14a164555a42fa777fe1879953c3d961b3 data/basemetals/recipe/cupronickel_block.json -80de7808cd7f9b72b433ffd7f49c6b7e5f9f6684 data/basemetals/recipe/cupronickel_block_crushing.json +5360214132d0095c07efc537a1ffe0b8bbfe5b8c data/basemetals/recipe/cupronickel_block_crushing.json 606d41753ba61c7fe6ed252b7421abd17e46eeb4 data/basemetals/recipe/cupronickel_block_ingot.json 3bf2d8e5f1ae7dc12fa542535b9f77cbabd6d8f7 data/basemetals/recipe/cupronickel_bolt.json fb85e466f0dcee2d1cf91e04a48e3f9745fe9963 data/basemetals/recipe/cupronickel_bolt_recycling.json @@ -2950,14 +2961,14 @@ fcfb5395359ef8c13028fd77e1a506f9807cb968 data/basemetals/recipe/cupronickel_helm ff4d9837f71c610b624e24b71a68fe0fb6e67185 data/basemetals/recipe/cupronickel_hoe.json 8e3a51ce17e50f28253aac4507732f2fe2ad5bee data/basemetals/recipe/cupronickel_hoe_recycling.json 0fa7b140382af7d3f3667f169f4555f66b75a085 data/basemetals/recipe/cupronickel_horsearmor.json -7955f633effe5aa376182df46b5c4afed306857b data/basemetals/recipe/cupronickel_ingot_crushing.json +87084c81761881ede98eb5b583b33bc29cc1d8fb data/basemetals/recipe/cupronickel_ingot_crushing.json 2af91eb5076ae91a7be3d7059a6c10827b96c57b data/basemetals/recipe/cupronickel_ingot_from_nuggets.json 6b6b7d3a6a89ffe01d4a88912d6ee8ef8d0715dc data/basemetals/recipe/cupronickel_leggings.json 52d22cfe1544dd02e73ff908c4d2de6857644db5 data/basemetals/recipe/cupronickel_leggings_plate_repair.json 7541464dae1434cbc53e367bc13c1306ed70e0d9 data/basemetals/recipe/cupronickel_leggings_recycling.json 65249346773cd250b1cbc608d6b8e01dc62f8116 data/basemetals/recipe/cupronickel_lever.json 5212d8b43c94c672baddfa9856bbe51278a6f180 data/basemetals/recipe/cupronickel_lever_recycling.json -6a91a03d46a72b9797a667a973d718b9c183678c data/basemetals/recipe/cupronickel_nugget_crushing.json +3261b0616c7e8ef92008caa30f572aa489e5da91 data/basemetals/recipe/cupronickel_nugget_crushing.json c2c2e6b27554e218461d3ee6ebe53dde8cb78721 data/basemetals/recipe/cupronickel_nuggets.json b1da042332c5f51a82162fcb6dd67a1bd192bd23 data/basemetals/recipe/cupronickel_pickaxe.json 9d190e9cd96d82c3506a57372a7ad0887854a7cc data/basemetals/recipe/cupronickel_pickaxe_recycling.json @@ -2989,38 +3000,38 @@ cf235007d77d144ccad09247d2d5fcdc9ad748bd data/basemetals/recipe/cupronickel_smal ee97ac271dbee8108b7f16ca3b9d8a7dfe14e8c2 data/basemetals/recipe/cupronickel_trapdoor_recycling.json 9e64ffabfdfa0467c17b3e40606a9a966dae5fdb data/basemetals/recipe/cupronickel_wall.json cba54ec1ce43b74526f8703584eee833c2f375c0 data/basemetals/recipe/cupronickel_wall_recycling.json -c6e3cb91c1866e8cb3084e3cdb57fb3fcf1f7f1e data/basemetals/recipe/dark_prismarine_crushing.json 90580302b8202c044ab3e989f3f7ca6c9c6cda83 data/basemetals/recipe/detector_rail.json ca3749898adceba1a11e7fc7ae09b43c6d0311c5 data/basemetals/recipe/diamond_arrow.json d51d69179f8142a43d82b1d75c87853d972762b5 data/basemetals/recipe/diamond_arrow_recycling.json 59b67305a8d1d4492ef66ce7a279eb321af26f36 data/basemetals/recipe/diamond_bars.json 4cd45e7f91a78dcff6c242a81e762949f14c2850 data/basemetals/recipe/diamond_bars_2.json 81269f591a7786d9216e9944cb047701650e7114 data/basemetals/recipe/diamond_bars_recycling.json -0259ac6dd6a752b9118240d969e0b12f6c27d08e data/basemetals/recipe/diamond_block_crushing.json +37a6a79f5f74d4ac0efcef2065a12db4c61cf957 data/basemetals/recipe/diamond_blend.json +02cee22cc68a5c6f037498eed2c1632aaf180393 data/basemetals/recipe/diamond_blend_from_small.json +4c14a74a042f6084c69f2d473fe819fdfe5814d4 data/basemetals/recipe/diamond_blend_smelting.json +8300361b7a1db6b04ef0048f85c3a75ce0808b35 data/basemetals/recipe/diamond_block_crushing.json 86ab9437139391a3ca1077b43b04d9cf2043b238 data/basemetals/recipe/diamond_bolt.json edbe5dac547ffac7a2ff711427a0fe58b0849eec data/basemetals/recipe/diamond_bolt_recycling.json -53c1141731cc69c967bca2947cbc95e7eb678137 data/basemetals/recipe/diamond_boots_plate_repair.json 6b3b986868bebed8249a5b7d0659e57039af586c data/basemetals/recipe/diamond_bow.json 77f28c9b7e448590d7e147a5bda5ae5e442a794b data/basemetals/recipe/diamond_bow_recycling.json e5d60befa2589d0c8f96f655de747f579fdeee8a data/basemetals/recipe/diamond_button.json 921270ca6d80c7b86b1b73d40f598b5449e7805c data/basemetals/recipe/diamond_button_recycling.json -25575f58c8e44b05d3fed9661f66d23983b23fec data/basemetals/recipe/diamond_chestplate_plate_repair.json 78692b2452a6c287997266b97cbf72efb4827abf data/basemetals/recipe/diamond_crackhammer.json 7b5824270ea8438cad9e4d31be864c3a7165cc48 data/basemetals/recipe/diamond_crackhammer_recycling.json ca39c9c12aa9e3dda23a36d23dcf4ba3ad813fe5 data/basemetals/recipe/diamond_crossbow.json 593bacdf64067f8314f40f849d3063819d8d313b data/basemetals/recipe/diamond_crossbow_recycling.json -2516ec6ba95d0ce8ae7defa209f6c140e25ad083 data/basemetals/recipe/diamond_crushing.json +9bb5c06c7f4ade0af73a8de03fd7895283cbd619 data/basemetals/recipe/diamond_crushing.json def93d862f0e788a8b26b2656b0f331b958eaa42 data/basemetals/recipe/diamond_door.json 3778837c1d74acb8ceff34d8246f6f403cc8bd0f data/basemetals/recipe/diamond_door_recycling.json e1ab77c6a004ccd2fcf7d3c2f1aa639b1cae2ed1 data/basemetals/recipe/diamond_fishingrod.json e9857e73b02a960512c2bd543d863e378d0ea349 data/basemetals/recipe/diamond_gear.json 090a805a82e7eff681e731f3c6f0ed1d522eba8c data/basemetals/recipe/diamond_gear_recycling.json -1f09b43baad3c38a2800447d142adb227a5f7d18 data/basemetals/recipe/diamond_helmet_plate_repair.json -70f212bc8d4b63ec125a8dfca86fdd3c114346d9 data/basemetals/recipe/diamond_leggings_plate_repair.json +54981e6cfe7eb6ab7f0ce02686a5c65170f68098 data/basemetals/recipe/diamond_ingot.json eac7b78c22e29d17dfb473790926776c2ae0f86c data/basemetals/recipe/diamond_lever.json f557911e48bf9a90f6ae2b3b43397661ed4aa8f4 data/basemetals/recipe/diamond_lever_recycling.json -b6d7e2cc2b756b05ffa70864b5682bf80d7ed9ee data/basemetals/recipe/diamond_nugget_crushing.json -b3dc5d3d4ed2ed54c41a5ee5b63d787a8f55ff08 data/basemetals/recipe/diamond_ore_crushing.json +000c99da479319b81decb43a5d2983cefec7f4e5 data/basemetals/recipe/diamond_nugget.json +0e41c0be588b6f398dd980392f86c6fc21c2187c data/basemetals/recipe/diamond_nugget_crushing.json +bba4aa597f0d27b7b0fc97ac778492a71df9a386 data/basemetals/recipe/diamond_ore_crushing.json 1497d26f248a71a92209490528d1bc9d36cd0d94 data/basemetals/recipe/diamond_powder_from_small.json 33d6a229a58e2285763ece4b1906babd1abb542c data/basemetals/recipe/diamond_powder_smelting.json 0068971152b3a758706f249ee6b3df569e250bb6 data/basemetals/recipe/diamond_pressure_plate.json @@ -3031,9 +3042,9 @@ ea52a1b1e8b473a9becdea0afd96536ed64f5261 data/basemetals/recipe/diamond_scythe.j e3e7d41339a5123eaf437f41ceff86c6041112d1 data/basemetals/recipe/diamond_shears.json 43eb0f5348fe18991841bc862dfaa9cbd4f8f663 data/basemetals/recipe/diamond_shears_recycling.json 2863d22b3e20d8160950eeb3fdfcd11207f0c95e data/basemetals/recipe/diamond_shield.json -dd5af83e7d50f54bbe435bfdf610bf6d2ec05dde data/basemetals/recipe/diamond_shield_plate_repair.json 4f197f18bf58d792a12c09750d3bfe18d1277f5b data/basemetals/recipe/diamond_slab.json 1f610be074209573ae49676283f17be9d477b894 data/basemetals/recipe/diamond_slab_recycling.json +c4fd5e5d61f6a8633fe5ed9763618ded48c1e116 data/basemetals/recipe/diamond_smallblend.json be21227754ac326d8f6f4bd3b7eea394b5e53bc8 data/basemetals/recipe/diamond_smallblend_smelting.json 1684ae5436de31ef2f963f090b24ea7d6fd4034b data/basemetals/recipe/diamond_smallpowder.json 1dd208001aff66dc94b37263de26d270b369020f data/basemetals/recipe/diamond_smallpowder_smelting.json @@ -3053,7 +3064,7 @@ f24a08b5f166adb8aedb8a409abcca8c9669cd73 data/basemetals/recipe/electrum_bars.js 1da1594a2c95e5ded2609e11f6253556315bda80 data/basemetals/recipe/electrum_blend_from_small.json ad0c9ae328493d62c5b1d442c7ff8865fdcda572 data/basemetals/recipe/electrum_blend_smelting.json 5ffbbcde5b93e4012dbfe0b5bb9ae1c18c344445 data/basemetals/recipe/electrum_block.json -cd4607a761d5562aa55a521f324515a2411ca151 data/basemetals/recipe/electrum_block_crushing.json +523ce8b3f753fc435795236cefd6089c6ce5fde9 data/basemetals/recipe/electrum_block_crushing.json 675356d59b98bd10cc243e43ea1a6d0c4e60a08b data/basemetals/recipe/electrum_block_ingot.json 00185a2b3a3b1e1070c5dc690ca314216cb52c00 data/basemetals/recipe/electrum_bolt.json b59a4e0093a66f09652f26ce33aeab26bfa78d28 data/basemetals/recipe/electrum_bolt_recycling.json @@ -3082,14 +3093,14 @@ f6b3a3510eac186fb274ebc484261156a876cbb1 data/basemetals/recipe/electrum_helmet_ c052305520ffcfe5ff26dbdebabc1ce8bc340828 data/basemetals/recipe/electrum_hoe.json 1b5fc85287358a8f1ee36294248065fd5100f927 data/basemetals/recipe/electrum_hoe_recycling.json e01e1ede3d9021766f4ffd77cbefa34c147d1709 data/basemetals/recipe/electrum_horsearmor.json -016ac2998c48b347702d1eac69d4d91131fa6a31 data/basemetals/recipe/electrum_ingot_crushing.json +a37337aade326e2652813bffa698c4edb6b7b395 data/basemetals/recipe/electrum_ingot_crushing.json 57bb1766c4b3cafdd28a05b00fe032a2f8076003 data/basemetals/recipe/electrum_ingot_from_nuggets.json f4c804cbb7b9358ad2c4939d4a71df63356e7fac data/basemetals/recipe/electrum_leggings.json f3dfc68cbca06f6d1ad3e07ac6d0b0adc7e6cd58 data/basemetals/recipe/electrum_leggings_plate_repair.json d6e0dc7206d6827329725c3cdc6d84f73f97ef7c data/basemetals/recipe/electrum_leggings_recycling.json e67902c78e43a93d96efd90eac83e523a6e0fbe3 data/basemetals/recipe/electrum_lever.json 99c693127d750c5f634614dfe276cc9de7128e88 data/basemetals/recipe/electrum_lever_recycling.json -bba613149bfe6be865b4873273bd045848473723 data/basemetals/recipe/electrum_nugget_crushing.json +f719511824e0cf85394a0070161874a5fe0b9b38 data/basemetals/recipe/electrum_nugget_crushing.json 732cf717f26696890bc232758d375dc4aa7d180f data/basemetals/recipe/electrum_nuggets.json 3391106548af9ea96f7e043697fc214c786afca0 data/basemetals/recipe/electrum_pickaxe.json 06f58bff7acffe8893ae680220db5da1d94ec9c7 data/basemetals/recipe/electrum_pickaxe_recycling.json @@ -3128,42 +3139,40 @@ c80b907a96344a1004497ae7cd7def5de2e8d5ed data/basemetals/recipe/emerald_arrow_re 128de6a745ac81deec2fe99f7b3a9dae551ac94c data/basemetals/recipe/emerald_bars.json 5fcd66d2f16e89b9973cd584b3c07a8943162f40 data/basemetals/recipe/emerald_bars_2.json c94b2d84b07515797aa492a8ecf2288e0ef33668 data/basemetals/recipe/emerald_bars_recycling.json -370c4a7bdf051c569e97dc90d80314d2d767ed61 data/basemetals/recipe/emerald_block_crushing.json +709f78aaf08557036055ff702fd3c23edfdaffee data/basemetals/recipe/emerald_block_crushing.json e351baf846f8265f35466b4a7cabdb9d1e5febbf data/basemetals/recipe/emerald_bolt.json 627a263614b1d54fe7f9ce8cbcac296f8e8faf44 data/basemetals/recipe/emerald_bolt_recycling.json 51ce6b7941ce7cfb14e9ba15f8e69a1a22248212 data/basemetals/recipe/emerald_boots.json -0faa0823de036a59f96de82d4ec27c6595874a65 data/basemetals/recipe/emerald_boots_plate_repair.json 68bc392cc61b9bbb34814f7478caaf3496933bba data/basemetals/recipe/emerald_boots_recycling.json 12ed0296eeb93e54de00088b56b8b40133484a60 data/basemetals/recipe/emerald_bow.json 9fd74171004968b8537918631cac33fd5920f19a data/basemetals/recipe/emerald_bow_recycling.json 350ee9d61ae7cad0d15aeabe21e9c023b40ca459 data/basemetals/recipe/emerald_button.json de0f7da207957cc36fb137b982a8ae3dac0be8d9 data/basemetals/recipe/emerald_button_recycling.json bed23a5b13cc014d6b0d11311a280bcd17f15023 data/basemetals/recipe/emerald_chestplate.json -f37839a0c7f43a5956efe8bbfc4d30f220bd033a data/basemetals/recipe/emerald_chestplate_plate_repair.json cdf17a7ea3a87f747b0cabdd5d8288890b5e90e1 data/basemetals/recipe/emerald_chestplate_recycling.json dbef5c1eec61f940de4eb8eedc8cd9cf6a47721b data/basemetals/recipe/emerald_crackhammer.json 2e5f449123b82070931d2d1f31a21015fb8fc64b data/basemetals/recipe/emerald_crackhammer_recycling.json 55de5477ea18a2a7f5e99a6c5569534e94bf3abd data/basemetals/recipe/emerald_crossbow.json 84731ba16a97912248cb956e3f40646d43e70aa4 data/basemetals/recipe/emerald_crossbow_recycling.json -1b8035a0fbc638fc1f7ec124ab3dbeb102110c58 data/basemetals/recipe/emerald_crushing.json +50d7e66410138d08f822e038e121adb166a9bcbb data/basemetals/recipe/emerald_crushing.json 7a8d6e0e7bc99d290bb746700a1a6cd2a2bff847 data/basemetals/recipe/emerald_door.json 36b04b9736e03e6a83fac7feb9497d595d2a1319 data/basemetals/recipe/emerald_door_recycling.json e052b1e9d20401e4632d3fc41e0b027c06d63f89 data/basemetals/recipe/emerald_fishingrod.json ce6dca792f578a59b86fe0b630a61839b06b3316 data/basemetals/recipe/emerald_gear.json 54e6b996efb550009a61a5e932f2ebb4794899c4 data/basemetals/recipe/emerald_gear_recycling.json a2bf30687063a232ff9415700de519c58b1fdec3 data/basemetals/recipe/emerald_helmet.json -853d93169b696cd2ec7eedaac038b7e23fa3565a data/basemetals/recipe/emerald_helmet_plate_repair.json 22a4f085be2ab6d5a87a05e9255b65aa0530b19d data/basemetals/recipe/emerald_helmet_recycling.json 182bdcd1f0afc5139f6a2489ed5587f3bf01f4f1 data/basemetals/recipe/emerald_hoe.json c1da8b32cc90efcc15919ec961e004c88f221660 data/basemetals/recipe/emerald_hoe_recycling.json 21f0aa10459b5fea18d5cae13da063d245fab2a8 data/basemetals/recipe/emerald_horsearmor.json +24d35bbecaf13a1bb33b40f2a51ccb28e1af2545 data/basemetals/recipe/emerald_ingot.json 851fb8bfb065c2a46760ab28267e5e5aea9ac95c data/basemetals/recipe/emerald_leggings.json -6a446ef219737210e4cc70b9c8db6e1097972bd8 data/basemetals/recipe/emerald_leggings_plate_repair.json 85ed62a74d6d30cf45cefa2770a3e5e07268a35b data/basemetals/recipe/emerald_leggings_recycling.json 91b7ed4aea6e1b7b64288a7fc932b2d092480cc7 data/basemetals/recipe/emerald_lever.json 8a192e1f3e1aa30298776023eafc917999d83be2 data/basemetals/recipe/emerald_lever_recycling.json -2e9463a43c733728d22e57a65d4d84c97ee7eff2 data/basemetals/recipe/emerald_nugget_crushing.json -4263f5c2f44a70f948cd2aefbf5fc0b2b62a52eb data/basemetals/recipe/emerald_ore_crushing.json +6031af3a2af700f6b2240f9c803971d6fb12645e data/basemetals/recipe/emerald_nugget.json +6bc77cd3faa398b94f81970a6874951d26bf4c93 data/basemetals/recipe/emerald_nugget_crushing.json +52a63bfaadb70be3b8552f997eb31cd429cdcdc9 data/basemetals/recipe/emerald_ore_crushing.json 3f50a8208c8dd97daef97b5435433e69ed65d31c data/basemetals/recipe/emerald_pickaxe.json e2ef2bffbecda293bdfdd008288d1030eab3fbad data/basemetals/recipe/emerald_pickaxe_recycling.json 7a023022d92aedf1eca012af7dd665bd3d2ea8e5 data/basemetals/recipe/emerald_powder_from_small.json @@ -3176,7 +3185,6 @@ e9877f38f21774841ec2f220e7483e0b119e722d data/basemetals/recipe/emerald_scythe.j 451a4be467f7f90926a0ff96c4b4948fbec4b744 data/basemetals/recipe/emerald_shears.json 0a2b6ff19fc651ba7b9b9dd8d50b26b5e25ad360 data/basemetals/recipe/emerald_shears_recycling.json 007c0ad624f72456dbad3dca5f09ac0d207c76bf data/basemetals/recipe/emerald_shield.json -244442ea760827ab29b5859634e65ada4f351ca6 data/basemetals/recipe/emerald_shield_plate_repair.json 8ef23e2022c334ee84f7de5573e8db8d47c1e5c5 data/basemetals/recipe/emerald_shovel.json bee93ec497193c2a751fca0c4abe3a9fb6fe2cb0 data/basemetals/recipe/emerald_shovel_recycling.json f37810d9f949b23ecdc6b70b716b28a65fddeeee data/basemetals/recipe/emerald_slab.json @@ -3191,14 +3199,15 @@ a5f0d868341d9ea78e831939f844107128ffd6d9 data/basemetals/recipe/emerald_sword.js 7020b4f763ff3402e485d3a9102c317ff6068081 data/basemetals/recipe/emerald_wall.json a721e5f8dd4093876844ec7e918e0743c5e7fd6f data/basemetals/recipe/emerald_wall_recycling.json 081b5a48d5928ab8645550ec1fff3c4080892962 data/basemetals/recipe/flint_and_steel.json -22d1eea444a931bb57443f19910344ea7fe449b3 data/basemetals/recipe/glass_crushing.json -ab80fb2d5018d0c33685311ffebaf5cb7e6f16f6 data/basemetals/recipe/glowstone_crushing.json aa6164607dd82218a4206b2efbe28d2e147a6920 data/basemetals/recipe/gold_arrow.json 4698526e384bc3605dfb400f4a5fcf8004c51a6e data/basemetals/recipe/gold_arrow_recycling.json 37d5f0504ae7bb0c80ff1d70f8cfd6186497b57d data/basemetals/recipe/gold_bars.json ed43fc1c41801777f72850e113ccbe49264eb867 data/basemetals/recipe/gold_bars_2.json e68cf3f54e6d304899d2b52d9ce4cba72fca79ca data/basemetals/recipe/gold_bars_recycling.json -1f625344adb4817772a554bd92c1d8ccc2036aab data/basemetals/recipe/gold_block_crushing.json +8bfcd7a6146b442cfd11343ba5370e0b9716ceae data/basemetals/recipe/gold_blend.json +d57bb1611ee471848f84ba037f4fa46ece58c6b3 data/basemetals/recipe/gold_blend_from_small.json +29fa6b10500c5dfcdd3fcb485be3d3e35dbfb333 data/basemetals/recipe/gold_blend_smelting.json +9a28d60e3fce0905d9986d1a40c5a285f9e61144 data/basemetals/recipe/gold_block_crushing.json 6b9809fb5156817319117d5f6537bb5c54eaaeaf data/basemetals/recipe/gold_bolt.json 2341797411386879a24a4ea57900cbf8a97ac234 data/basemetals/recipe/gold_bolt_recycling.json e6ade6b37fb56cc58999ec02b7dbad2b7985c549 data/basemetals/recipe/gold_boots_plate_repair.json @@ -3217,17 +3226,17 @@ fb8d836dba22168b9dc9a379aa5d847bc0c9ef78 data/basemetals/recipe/gold_door_recycl e98cdb9ecec93300b6cd9fe9fb843fdb1cc9cf3c data/basemetals/recipe/gold_gear.json 938eefe0df757a504b7c42edf8abc1f72ba4c309 data/basemetals/recipe/gold_gear_recycling.json 89fc471c20e66a175622ff1bff3d960315cfad2f data/basemetals/recipe/gold_helmet_plate_repair.json -d9f3d78cce663b9a9373300d6b395764a8ea2e25 data/basemetals/recipe/gold_ingot_crushing.json +ddb4b35c671e3ba2867cc4f6f517eb8f580e7e13 data/basemetals/recipe/gold_ingot_crushing.json dc3c20ca10c8cc95d5fb386e9857d249ac0795e9 data/basemetals/recipe/gold_leggings_plate_repair.json fbadd6129b90ef230242d105d700f77f9ca49384 data/basemetals/recipe/gold_lever.json 798c1cd0102a1416f0a193653bce067826dfaa89 data/basemetals/recipe/gold_lever_recycling.json -8247308f57d2d9f4c31eb4089b4ef23f485f2acc data/basemetals/recipe/gold_nugget_crushing.json -31beaa6775c309b444b3566ea2bb0e30618b529b data/basemetals/recipe/gold_ore_crushing.json +52f768f17b092676ec219c09afa6ed297cfccdb2 data/basemetals/recipe/gold_nugget_crushing.json +8b82f0c2bbcedbfaf589a9b345fd112649d691fa data/basemetals/recipe/gold_ore_crushing.json baa906e077343e01e6faffdebd5e64d025225e19 data/basemetals/recipe/gold_plate.json 53a4a37655d36dd866d25e56b69fcbd895dd43bf data/basemetals/recipe/gold_plate_recycling.json ea6b7a018c5e623bff66f23adfb2cc9c43de9244 data/basemetals/recipe/gold_powder_from_small.json fe8ff2dbcdc6f7b33b197dcf95a67452bfe5b6fb data/basemetals/recipe/gold_powder_smelting.json -a8aa68df1064343caa8d4bd57510df5d082bf992 data/basemetals/recipe/gold_raw_crushing.json +caa2da96e3b109abbc1a068b1f526bab9f9dd2af data/basemetals/recipe/gold_raw_crushing.json 68f35cf2218e37876d6a3416a1cb0957ae76bacf data/basemetals/recipe/gold_rod.json a5745e04bdaede29c8982ed4d71da795c1423fca data/basemetals/recipe/gold_rod_recycling.json 6d222f966c895a90475bcf0c0e3ff8ed9b42641c data/basemetals/recipe/gold_scythe.json @@ -3237,6 +3246,7 @@ d9efd88748d8ef1b4e877ca70729b7b31ffb617a data/basemetals/recipe/gold_shield.json 86972e038dfb5b90df0645ea80e2a3e9ef8acab9 data/basemetals/recipe/gold_shield_plate_repair.json 24d38ed40f9313fa27e8b4cfabf938f370a0421a data/basemetals/recipe/gold_slab.json d8b75f276e2b841cd63c1df2da5c31894fc027ff data/basemetals/recipe/gold_slab_recycling.json +bd4443f4ec10ae7156b05866863fbd0304a967bc data/basemetals/recipe/gold_smallblend.json da7492b794115468112ecb5d3883948aa76ab2d8 data/basemetals/recipe/gold_smallblend_smelting.json ad53c8bcb85295692cd01b1bde5dcbb2ad258d0b data/basemetals/recipe/gold_smallpowder.json 60d639fd0a72dd0e59c246e2245202d9c270097e data/basemetals/recipe/gold_smallpowder_smelting.json @@ -3245,7 +3255,6 @@ e7705df1ae015401ce598206882d9eefb2099314 data/basemetals/recipe/gold_stairs.json 07233a191b5db635197775cf27ad6e0b1f49e9a6 data/basemetals/recipe/gold_trapdoor_recycling.json 73eb015392b880ec9708d909012d00234ed2c519 data/basemetals/recipe/gold_wall.json 5eeefc5dcf54a7f06b0b28934e956ff11057bafc data/basemetals/recipe/gold_wall_recycling.json -749c1f9494510426a3b3cf46403450a5ab401a9d data/basemetals/recipe/gravel_crushing.json 52453890bf2756b009e8ab62db9d033ba4e88c97 data/basemetals/recipe/human_detector.json 461d496402cce4b5acc874faace99e3a7493c278 data/basemetals/recipe/invar_arrow.json 33fca1e96bea7161ac4637bcd625c6a3e2c94ab4 data/basemetals/recipe/invar_arrow_recycling.json @@ -3258,7 +3267,7 @@ a0e131ef4948c15a924bfedfbfc7c9e618395cbb data/basemetals/recipe/invar_bars_recyc 8c7cf74ce05ef1e9bf610997834006d54fcd1d96 data/basemetals/recipe/invar_blend_from_small.json d81e65455710f3fcdfcdb28a8e81ec1bf478eb2d data/basemetals/recipe/invar_blend_smelting.json b9ec3fa4d663a2f0614c0fd15b0c62e5e7221871 data/basemetals/recipe/invar_block.json -2035bff1c4c4d573c69bf4a356c8076c43f907fb data/basemetals/recipe/invar_block_crushing.json +2cf7047573afe721c66eb05d42128c29b20acbe3 data/basemetals/recipe/invar_block_crushing.json 6bdf216605248dedb7e6e1e16fcda6961afdfac8 data/basemetals/recipe/invar_block_ingot.json c8cf1a325d9363ffa802de5cdedf66277767c0ce data/basemetals/recipe/invar_bolt.json cae0cd1ca104395b7557aa8b4af5ddd3def00032 data/basemetals/recipe/invar_bolt_recycling.json @@ -3284,13 +3293,13 @@ dfbaffa0861529a406a1522919d4dd323feddf05 data/basemetals/recipe/invar_helmet_rec 658141fd6d6c3139d3a8fa18e5a41d9a64b20e7e data/basemetals/recipe/invar_hoe.json 1d147a3dd24cb16d976270bbd412adad5f3637d3 data/basemetals/recipe/invar_hoe_recycling.json 3286a4cdcff146cf89b6d221bbed9de424a564c7 data/basemetals/recipe/invar_horsearmor.json -ab2f50f7e0a6460570a75bc64448441ccb1bc848 data/basemetals/recipe/invar_ingot_crushing.json +ea5f31b189bedf350b3c202977a90898ed562d2d data/basemetals/recipe/invar_ingot_crushing.json c814169ef1f997651ce753edfd9cd40ec99f634d data/basemetals/recipe/invar_ingot_from_nuggets.json 7020917ff575b97feae178c5de7322bbf5852a92 data/basemetals/recipe/invar_leggings.json 1b191b98dc1c17f7745e12b4ff2ed9cbbf2c59a7 data/basemetals/recipe/invar_leggings_recycling.json e4cccaa3449bb01b886acadc70bb0254b7781b08 data/basemetals/recipe/invar_lever.json 8bfc3bc4e2f541d00e56d865b77cebe414d6e7e0 data/basemetals/recipe/invar_lever_recycling.json -d4b125e5a28a939c4a8134f5c1b779c14974c166 data/basemetals/recipe/invar_nugget_crushing.json +84b5131ecf3fbc0d8727fed088e4fde8cba01504 data/basemetals/recipe/invar_nugget_crushing.json 3a9d0e65b9d4f6fe071b337bb82d5d53e2810988 data/basemetals/recipe/invar_nuggets.json ffcffd95fed6ea14a3e8c3234f215a98bdd89134 data/basemetals/recipe/invar_pickaxe.json 9c276c1b4c03a960fc00f7afb238ea43dbd45748 data/basemetals/recipe/invar_pickaxe_recycling.json @@ -3324,7 +3333,10 @@ b90d388144e917bbbe851ffecf01da500737a715 data/basemetals/recipe/invar_wall_recyc aaa1ca16e098f52bb828d0e8fd10c4c1e825fdda data/basemetals/recipe/iron_arrow.json 08e0f4f6dbb1fdf280f90de1d2b1dc89c3b2419d data/basemetals/recipe/iron_arrow_recycling.json 4a84c86f4e883307079cad3abcb8e9402d6de63f data/basemetals/recipe/iron_bars_2.json -495c250a4c063864573798568e0873fec2b11f2f data/basemetals/recipe/iron_block_crushing.json +22345ab7ee899d580ee53dbeee909c8fd8b07538 data/basemetals/recipe/iron_blend.json +8a1c6736973bec91a3b72d74e9f07fb7262ea73f data/basemetals/recipe/iron_blend_from_small.json +e7208ea5a22a1c11ba5b45f325cf9ba437eca5ea data/basemetals/recipe/iron_blend_smelting.json +1d7bf55fd9593269765d8bef04521f82943973e7 data/basemetals/recipe/iron_block_crushing.json fa941f08268cd5b0bd914bf7b009019a61aef01e data/basemetals/recipe/iron_bolt.json 68ba859b31a969d895a8e6d7906e07187d00fab8 data/basemetals/recipe/iron_bolt_recycling.json 7e7aa11a284cabe2e378b73be20443086737bd61 data/basemetals/recipe/iron_boots_plate_repair.json @@ -3341,17 +3353,17 @@ d919ef84a8ccdc823bffc860ba9041ac340e0004 data/basemetals/recipe/iron_crossbow_re ba0693af8b240870f9d91eb9cae048911a77aa01 data/basemetals/recipe/iron_gear.json 82161bc5ed42fcd3fc246fbcb613e4e921cd0a58 data/basemetals/recipe/iron_gear_recycling.json 256d5f1a0e4d37ad631cf5d0f555b8d467a55ac3 data/basemetals/recipe/iron_helmet_plate_repair.json -0d5dd9bc7c6ebf894bf9d329375b582ae00ba3f2 data/basemetals/recipe/iron_ingot_crushing.json +ac4b5923bc236afb5b385479d2d8df7a98e75eb6 data/basemetals/recipe/iron_ingot_crushing.json db501903b617345c5ac3d512d82fc881c89f91a1 data/basemetals/recipe/iron_leggings_plate_repair.json 912ba282ea7c32b5ea73549a696ba4a206cc1e06 data/basemetals/recipe/iron_lever.json b3d709c43b2d565f738333690af3352672bf95d2 data/basemetals/recipe/iron_lever_recycling.json -ee37282da5b5e0acea5030f0810ecd863f73b01d data/basemetals/recipe/iron_nugget_crushing.json -5d685e546268ca614d359efaabaf119c50637364 data/basemetals/recipe/iron_ore_crushing.json +87b3ff162cb93ab68f1f6b8fde5c64f2c321910c data/basemetals/recipe/iron_nugget_crushing.json +c5e8d99f874fef232711e890c5c9713f7781e290 data/basemetals/recipe/iron_ore_crushing.json 122c2cfe9022b610eb9cf385bafa370659e84bc3 data/basemetals/recipe/iron_plate.json 8a6c2efc9817926d7574e2740841ba228d820964 data/basemetals/recipe/iron_plate_recycling.json abaae074c009ce5f799ac8c920cbc1e5de5e5ba5 data/basemetals/recipe/iron_powder_from_small.json fecbbe2a79f7dd0dd55098f19d8864a26d9d8889 data/basemetals/recipe/iron_powder_smelting.json -ffefe3d14fbfcf96f5a9aa1e09b4e6373653f8bf data/basemetals/recipe/iron_raw_crushing.json +ccdaf9cb2032c12adbc5b0fbc69679429796318e data/basemetals/recipe/iron_raw_crushing.json d0f0b341975d6167be04b7eea75a3c4506751021 data/basemetals/recipe/iron_rod.json 090efcfd1525812dd02a69e8ee0d92a97b292bc0 data/basemetals/recipe/iron_rod_recycling.json 456ad92200a4daf9ca958e71d611f0a5bac827ab data/basemetals/recipe/iron_scythe.json @@ -3359,14 +3371,15 @@ fe080d7cbac2169df095db51b5bc0a8380d20be2 data/basemetals/recipe/iron_shield.json 39c7688db1c8286bd5a95427cb4cab9671dfe325 data/basemetals/recipe/iron_shield_plate_repair.json 69192bfea0d876c2348c7446bd5583f3ca0b5e9c data/basemetals/recipe/iron_slab.json 77f3efdfdd781f67db99cb2966ad027833272131 data/basemetals/recipe/iron_slab_recycling.json +40078272b23db400ffc118cd78326a8a5f829470 data/basemetals/recipe/iron_smallblend.json 55b3dd55f9e1a7fd7f354dc8522b590f71ebadc6 data/basemetals/recipe/iron_smallblend_smelting.json 8e0dd3903841906a81576ccbdab7f97447790454 data/basemetals/recipe/iron_smallpowder.json 3becde6605bc486e573fe617bf5fd1686b245414 data/basemetals/recipe/iron_smallpowder_smelting.json 8b1debbe090acd526de976436f65b6cbaceb44de data/basemetals/recipe/iron_stairs.json 005a79092989af5ec2786fed0bf1f0f152c49ebe data/basemetals/recipe/iron_wall.json 57233a6f65cb5a9afb97756fa28326e5c39daf20 data/basemetals/recipe/iron_wall_recycling.json -9f415cc1d677c9deee006ba1a9a652bf4ff6ddfb data/basemetals/recipe/lapis_block_crushing.json -2fe115a37bf770bf1d296a5ec05cf52a23dd0488 data/basemetals/recipe/lapis_ore_crushing.json +96a4ed1a707cd5774fb15ca67921efa89930f7a9 data/basemetals/recipe/lapis_from_smallpowder.json +efaa9cc8c75ab17df2de9344dbe2d16302a34a82 data/basemetals/recipe/lapis_smallpowder.json 354c31bdedd9f1b271f7b4cdb4d6542a53665b0b data/basemetals/recipe/lead_arrow.json afe2effbbe1c9589c2e06a9d87144bfc5634d348 data/basemetals/recipe/lead_arrow_recycling.json 7d622963785e7d1b634b7d051ac350de7ba2efda data/basemetals/recipe/lead_axe.json @@ -3375,7 +3388,7 @@ dc32fe0f4cd9ede1192090b9104587fa39090f6a data/basemetals/recipe/lead_bars.json 5120b15c88a9c7797405caff6fee9cef9cea4bc2 data/basemetals/recipe/lead_bars_2.json 19f326ddf6d88d3e77a0972f9a03f09759ba819d data/basemetals/recipe/lead_bars_recycling.json fb334a95b97b9cf1c929c2449fbd3cb05d05b4d2 data/basemetals/recipe/lead_block.json -252652dc2d0eff906a6d056d4e16ef3883bb0f04 data/basemetals/recipe/lead_block_crushing.json +2aa6c44112ac72cff59caa78d267ba6414b1b9b9 data/basemetals/recipe/lead_block_crushing.json 5e94fce7ce9a61baaf25461435d1e9054ae086dc data/basemetals/recipe/lead_block_ingot.json 99875b631110411a646d60af6ceb606c6bbd407f data/basemetals/recipe/lead_bolt.json ef649c12853e1c476113cec58e0fd0378038d679 data/basemetals/recipe/lead_bolt_recycling.json @@ -3404,17 +3417,17 @@ ecf7420560d9b2b01f8c96f83d06e666fdf0aeb4 data/basemetals/recipe/lead_helmet_recy a4068a91b8680bf4ff70555eae8c8dc9cdc0df2d data/basemetals/recipe/lead_hoe.json 1b5dcb21d2c2943865161eaeb067faa60db29ecc data/basemetals/recipe/lead_hoe_recycling.json bc7b3c43e416de7435776bbf7f77e802546db73e data/basemetals/recipe/lead_horsearmor.json -5aab8a8993b0a3288ad7d4c6642232fbeea4aefe data/basemetals/recipe/lead_ingot_crushing.json +903e8f3a840d73990f7180d889a6fa2991d30917 data/basemetals/recipe/lead_ingot_crushing.json a4f6bf56d9c7a0593cdd107500a3232cf3f78598 data/basemetals/recipe/lead_ingot_from_nuggets.json 55e40876ffe56f8c7c9100661bbbb14130a522b8 data/basemetals/recipe/lead_leggings.json b05e30e1b26aca625b93320d4802707ab8ceeb80 data/basemetals/recipe/lead_leggings_plate_repair.json f822bac6641d088e84058eed6063e2e4fc89a83c data/basemetals/recipe/lead_leggings_recycling.json c0738648ed7b7c1359ef766caf6a4c5c4b3b4eaf data/basemetals/recipe/lead_lever.json efdf0a0359f04bddf4c841912ef50f3b50113e8a data/basemetals/recipe/lead_lever_recycling.json -0bf2a7923e3f0d2b29f1c3598fb4fcf45f26b96e data/basemetals/recipe/lead_nugget_crushing.json +be4f484a8c16f090b5cce476942e063de4ef8738 data/basemetals/recipe/lead_nugget_crushing.json 4798e542268f898a2b28fa5a66f5a99863bb5f6c data/basemetals/recipe/lead_nuggets.json c1d1cb5c2df2670d1985e8db2984946ebc67b918 data/basemetals/recipe/lead_ore_blasting.json -8ee23f60083e43bb31550b7faf6b1c794a7f73cf data/basemetals/recipe/lead_ore_crushing.json +58096b1ba2b3acbea1cd80b16e565aa99727c4c7 data/basemetals/recipe/lead_ore_crushing.json 7cd6df2617afb0ec7cbae0407d4b774f4bf0a3dc data/basemetals/recipe/lead_ore_smelting.json 386b68b15e3f780f6c17bca1037627d3beac4a61 data/basemetals/recipe/lead_pickaxe.json c2993840c9d4d70dbed04800479c0380b86ce0d9 data/basemetals/recipe/lead_pickaxe_recycling.json @@ -3425,7 +3438,7 @@ fa45cbece42137cad27b77cfc70a8029a977b985 data/basemetals/recipe/lead_powder_smel 3121b42167e46ebbc4c3ed19797531f4d35add0d data/basemetals/recipe/lead_pressure_plate.json e5bbc2f9c235ba369685a207c3f66f9a96e52cb9 data/basemetals/recipe/lead_pressure_plate_recycling.json 317fa8ae30742fde4071acbdb61473e6f5fdac43 data/basemetals/recipe/lead_raw_blasting.json -16d2015f36a1bc783fb3aa5f125ef3903a60576b data/basemetals/recipe/lead_raw_crushing.json +7d2e3146f7b04135ef15322c40bc0a8c32255956 data/basemetals/recipe/lead_raw_crushing.json 767e0f3b1c740721de3cbe955b1afcae6bb7de5b data/basemetals/recipe/lead_raw_smelting.json efc49b2b518ad145c5f78310b4ccaceefb0829d8 data/basemetals/recipe/lead_rod.json fb9d2ccbd3d8178052781053eca0dc07ba5e7fd3 data/basemetals/recipe/lead_rod_recycling.json @@ -3447,17 +3460,17 @@ adc431a9f805c888e7c88d60af5e31833a74f164 data/basemetals/recipe/lead_trapdoor.js 9fb550e94bf34e7be6b34f3523cdda628aaee581 data/basemetals/recipe/lead_trapdoor_recycling.json 81e60e595f266965556c76aaca084142485c9ed9 data/basemetals/recipe/lead_wall.json b3850341a2ec9f6657d6148dda007cd7719e7e74 data/basemetals/recipe/lead_wall_recycling.json -1fa3484b29b2d0a38122213245861bf13c20cb08 data/basemetals/recipe/mercury_ingot_crushing.json +c0ec6807833ea7d91c4db2409b6d0c5c9ef13637 data/basemetals/recipe/mercury_ingot_crushing.json f161c293f1910ca6249744290830eda376759fa0 data/basemetals/recipe/mercury_ingot_from_nuggets.json -98bcb439c9a9efb76eb90574b609deeb717e4ff9 data/basemetals/recipe/mercury_nugget_crushing.json +4e9c8667e0486c9a24af9b371136707f4303a214 data/basemetals/recipe/mercury_nugget_crushing.json 13a9aad892bd14faf70f10aa0c871a4afebe0fc9 data/basemetals/recipe/mercury_nuggets.json 481fb54f69b2598bc388791d156933f53dcb7e00 data/basemetals/recipe/mercury_ore_blasting.json -b4b4d0b7f597bd10297dccba1f65721ca478779c data/basemetals/recipe/mercury_ore_crushing.json +b756ef3a561ddd484ee0ba161714c7c26a24f856 data/basemetals/recipe/mercury_ore_crushing.json e22d48742df27b1ee423e1c48446faa92d6d431f data/basemetals/recipe/mercury_ore_smelting.json b67e87de4bc4a4b6cf362bb56a1ee7bb0b23a712 data/basemetals/recipe/mercury_powder_from_small.json ca273e5d90bfb82e4d8da931af614b130918e7ea data/basemetals/recipe/mercury_powder_smelting.json f91f494f5837f7aa8240c523fe000c9c45caec5f data/basemetals/recipe/mercury_raw_blasting.json -d18fb63a275d733d5ee05b20059cec7c723d882d data/basemetals/recipe/mercury_raw_crushing.json +5f71351dfbe6217c6781156928402c8f306a6a79 data/basemetals/recipe/mercury_raw_crushing.json f6db31575d1119bc5951f80bf8901b18b33b0ebe data/basemetals/recipe/mercury_raw_smelting.json 47ef1a88e86386efa97e4854a66d877e621b9990 data/basemetals/recipe/mercury_smallpowder.json cfb1526121737fee372128d9d072a77cc6d1fc83 data/basemetals/recipe/mercury_smallpowder_smelting.json @@ -3473,7 +3486,7 @@ cfb1526121737fee372128d9d072a77cc6d1fc83 data/basemetals/recipe/mercury_smallpow 20bd8c94f3289ca190335ba3ba4b5d7b00f837d0 data/basemetals/recipe/mithril_blend_from_small.json 53befa763ae286d2bfe4591b3a7abf1fca36d3a5 data/basemetals/recipe/mithril_blend_smelting.json b0ce6ff58a505413eb38d2f98a1a70907d044728 data/basemetals/recipe/mithril_block.json -16550299dd8e9b20824e3c3415400e4915c5f663 data/basemetals/recipe/mithril_block_crushing.json +9e3832b93fb27e75a647656c0bf8e7cabb61a2fe data/basemetals/recipe/mithril_block_crushing.json e3621f25c0cc5c44c3cda4dbb1b0e44c588e1837 data/basemetals/recipe/mithril_block_ingot.json a6919f311c31d10ebf9eb266afb05dcbef69c68c data/basemetals/recipe/mithril_bolt.json c1a53e9302ae19da0512dbb397a0b243b46b835f data/basemetals/recipe/mithril_bolt_recycling.json @@ -3499,13 +3512,13 @@ e21683fb363af42c1782ac293f4e4f7edc3ba25d data/basemetals/recipe/mithril_helmet_r 2fda58e26b5ce5b5d2ed9ea0d6ca550d53292e3e data/basemetals/recipe/mithril_hoe.json 748a7634c6599ba385c8d462a6d0821a9df03437 data/basemetals/recipe/mithril_hoe_recycling.json 2f1c0814cfb2033ac3563bbdae7f8830be950226 data/basemetals/recipe/mithril_horsearmor.json -2f9d9e938f9be152339fdbc0889b6cb709208828 data/basemetals/recipe/mithril_ingot_crushing.json +4113353b17187c958394133451abe0097fa670af data/basemetals/recipe/mithril_ingot_crushing.json 4a4f8b62bfd15e90e187a3e52a51cae57cfd6f7a data/basemetals/recipe/mithril_ingot_from_nuggets.json dd8d69f9637d4d67808dca50158ababeac8610c4 data/basemetals/recipe/mithril_leggings.json 3eedd0ae65b199d4facb3514dddd1d9317a7393f data/basemetals/recipe/mithril_leggings_recycling.json f136cd62d127015cb24da8e2d326c94e551c22e5 data/basemetals/recipe/mithril_lever.json 9eb838f5c5acd27e0441a2a573b5442beab7ea64 data/basemetals/recipe/mithril_lever_recycling.json -b56736c59126665f830e11d00b0bd23545e1ad45 data/basemetals/recipe/mithril_nugget_crushing.json +0345ad1be450fdd4bd4c7eccdaa890a364c5f136 data/basemetals/recipe/mithril_nugget_crushing.json 45f830b4288468f0bf3fb451568964adb693fa05 data/basemetals/recipe/mithril_nuggets.json 523f7f000145aaf81be12f75ca8d8900a45f17dc data/basemetals/recipe/mithril_pickaxe.json bbf9317a63342bb0372de9f9dd425d11122fa211 data/basemetals/recipe/mithril_pickaxe_recycling.json @@ -3536,8 +3549,6 @@ c0fcd9cb9d91b2f65d01920ab261382b0fa572fe data/basemetals/recipe/mithril_stairs.j 344f5a5ad40c8208dfd35e5b5b8e441b98b0c230 data/basemetals/recipe/mithril_trapdoor_recycling.json 83eceaae4727c2c60bd90559fbccbc03d67726cc data/basemetals/recipe/mithril_wall.json 661aeb7ec5d8e7e060e8ef937f86429257bca05d data/basemetals/recipe/mithril_wall_recycling.json -ee2e563d13016d40ecd4b56a759498e01166a488 data/basemetals/recipe/mossy_cobblestone_crushing.json -ff58d763dbd42a77a01ff5983c6531d505d052dc data/basemetals/recipe/mossy_cobblestone_wall_crushing.json f7aa5081bb5cdef2b4a664735329492693eb6efb data/basemetals/recipe/nickel_arrow.json 19d5188a590864056ed64ba676868ee04e695936 data/basemetals/recipe/nickel_arrow_recycling.json 745f05c2423773d4aa27fdf02cd0da511a5d8312 data/basemetals/recipe/nickel_axe.json @@ -3546,7 +3557,7 @@ acd7df48def78b33f165a23bf366bc73f43cb626 data/basemetals/recipe/nickel_bars.json 828429b273bf8c98aebe2bc55f0df587996bb1e7 data/basemetals/recipe/nickel_bars_2.json 9898d3154fc717a2b19d582ff7ebf4ced6d9f81a data/basemetals/recipe/nickel_bars_recycling.json 7373e28597245fc55742a2f511cc69e75aedf155 data/basemetals/recipe/nickel_block.json -34ac7ea8152693a0ceb8e8a55ce94d0d5d5ea1a4 data/basemetals/recipe/nickel_block_crushing.json +36476a717036f830b0957c0c8594c595bf287138 data/basemetals/recipe/nickel_block_crushing.json 586797ff7272de821fa27f6572b8db8c96a299cd data/basemetals/recipe/nickel_block_ingot.json de9a797ed7b6cf095e034cda5ab74a70cfe70f05 data/basemetals/recipe/nickel_bolt.json fc480cd4c0eae7c973a1653edf2d4fe937e6a214 data/basemetals/recipe/nickel_bolt_recycling.json @@ -3575,17 +3586,17 @@ d5b95e350313ad22344a1f62740a66764642ef8d data/basemetals/recipe/nickel_gear_recy c18b46ff14040df47c3e56135eb19a8171719a34 data/basemetals/recipe/nickel_hoe.json a0a7841fdf290d9608e56ac50da28d106d2d8dd9 data/basemetals/recipe/nickel_hoe_recycling.json 05b42e936827dd37b77b3f6c2751954abdb02c3d data/basemetals/recipe/nickel_horsearmor.json -b6a47ab88b1ebfa346a40b0904b8f08e39867fbc data/basemetals/recipe/nickel_ingot_crushing.json +aa50661ef4a772402f2a9a2f2f7919081edad921 data/basemetals/recipe/nickel_ingot_crushing.json cb8330979d2155a2f6c0a8109d58b5e125f8b8e6 data/basemetals/recipe/nickel_ingot_from_nuggets.json 6912e9f14eed143b49e510040a3df1e3d865bc44 data/basemetals/recipe/nickel_leggings.json 76701d24925c0b6f06ab114cfd47594286dca64c data/basemetals/recipe/nickel_leggings_plate_repair.json ec3fdec59a5d287f1d48c32243a92ffb60b144c0 data/basemetals/recipe/nickel_leggings_recycling.json a7a69e006d1b4479fa58eb9212871c04341e7dbe data/basemetals/recipe/nickel_lever.json 3c8d37fa42a1fc500374e1e41b9b85b8be133161 data/basemetals/recipe/nickel_lever_recycling.json -fb9fcec1f4d5a82be1a848c545e34716b326bea0 data/basemetals/recipe/nickel_nugget_crushing.json +73fbf1828eb12c6a139636491e656ee03b908d29 data/basemetals/recipe/nickel_nugget_crushing.json 57cfdabbc4713c851ad70b3335fcc17ddcec6d78 data/basemetals/recipe/nickel_nuggets.json 1c66be7b5d32cc65ba1855473d3bbf3ee6aa98dc data/basemetals/recipe/nickel_ore_blasting.json -bf0dc1e62d14af75d61acd0c4a1585d874bc246c data/basemetals/recipe/nickel_ore_crushing.json +33239906f3f536afa92e40665e87ea8e17a29ff0 data/basemetals/recipe/nickel_ore_crushing.json 0ad85c7d95fb6dbb01574dcf562402b55f49b290 data/basemetals/recipe/nickel_ore_smelting.json b18da81204c15a9e3fcc58ba95680114249a6807 data/basemetals/recipe/nickel_pickaxe.json cceb6d418d65ea6f6e9c9bd8547ccb200b6c3def data/basemetals/recipe/nickel_pickaxe_recycling.json @@ -3596,7 +3607,7 @@ d89fcbc5507059bcce93f12d2894d15f53243887 data/basemetals/recipe/nickel_plate.jso b2aab93e1b4d3d7faf5d25436ad43358c6695c75 data/basemetals/recipe/nickel_pressure_plate.json 838bfb50d68fbba66c3c65e26658354740fbeed7 data/basemetals/recipe/nickel_pressure_plate_recycling.json 79a0226755fc86f08cd3006930688319f7998cb5 data/basemetals/recipe/nickel_raw_blasting.json -f917bf3b5c2f62dde788133ec00ec08e1efef7cf data/basemetals/recipe/nickel_raw_crushing.json +e0ab27d895536fc2ca6714f0b7f2ae14fdb112cd data/basemetals/recipe/nickel_raw_crushing.json 7518b3a4b710701577783c86c075fada8130928b data/basemetals/recipe/nickel_raw_smelting.json 981c1bc0d63a86407bf5c56aba740b13f3543145 data/basemetals/recipe/nickel_rod.json 2c4d22287584bd47902f50e8482c0a274e81467e data/basemetals/recipe/nickel_rod_recycling.json @@ -3640,7 +3651,7 @@ c15226f6ae219d13f048508a8969c8e86b1d23d6 data/basemetals/recipe/obsidian_crackha 81f4d62fe496b880c66c135994c2f93606d4543f data/basemetals/recipe/obsidian_crackhammer_recycling.json 580eb668050907dd17520345ac4a3a7347185298 data/basemetals/recipe/obsidian_crossbow.json a6b9a6fb657cd3340f7e6c041751852d4881fea9 data/basemetals/recipe/obsidian_crossbow_recycling.json -a14d87230d4595a076fe86c290a4608efca61c3e data/basemetals/recipe/obsidian_crushing.json +f46bc493b9629d037e24977780e7836bbccf4e51 data/basemetals/recipe/obsidian_crushing.json e49d977b4838bfb80a24cea552c582df68b9040a data/basemetals/recipe/obsidian_door.json 753c67a96ced268568ceceee3f460397e8e8b271 data/basemetals/recipe/obsidian_door_recycling.json 5dc4cbc92754212d9ec44abce8ef38c08e9d16cd data/basemetals/recipe/obsidian_fishingrod.json @@ -3652,13 +3663,13 @@ f2354088b083d6ba539f61e3d34565e93564e9d9 data/basemetals/recipe/obsidian_gear_re 0d9777f81929fee985a7f68799712d73d535be11 data/basemetals/recipe/obsidian_hoe_recycling.json 528d337e3fc89af7a521847fa267b1243d87ae3f data/basemetals/recipe/obsidian_horsearmor.json f4da5c63c5defdcd9ee5bf4e879c3b478ffda060 data/basemetals/recipe/obsidian_ingot.json -bf7e4c8fa04fefd067b4e74c58b12ed49df1dba2 data/basemetals/recipe/obsidian_ingot_crushing.json +ef1a58638c6d3f426d297de1bd0aa6accc1c5f3c data/basemetals/recipe/obsidian_ingot_crushing.json 4752c36ea8827f1ab4562771aed2297afe2164f0 data/basemetals/recipe/obsidian_leggings.json 5f2c00ad257d352c5bcf97333cd4a1d96ddd17f5 data/basemetals/recipe/obsidian_leggings_recycling.json 0e83781cecac8f9ab9fcc93b604c3fa480b6353a data/basemetals/recipe/obsidian_lever.json 2f3e591cdd32bc572c157938c325a479a1be364e data/basemetals/recipe/obsidian_lever_recycling.json e1edccffb33f66a46b68e431e660b3632815696c data/basemetals/recipe/obsidian_nugget.json -af7da5a34954a898f7d59c86b149ae8cbb110f6e data/basemetals/recipe/obsidian_nugget_crushing.json +31625c6697bcc7500d85648b42d1ebde1c03d0c6 data/basemetals/recipe/obsidian_nugget_crushing.json c76ba4c3b91092af593d27cd0f62d4379fc1a321 data/basemetals/recipe/obsidian_pickaxe.json 1f4ee59f4559fd3c21837fd12e4557307684dee7 data/basemetals/recipe/obsidian_pickaxe_recycling.json 2659164c2eb4584be1c96ed596b0cd8b7b177372 data/basemetals/recipe/obsidian_powder_from_small.json @@ -3695,7 +3706,7 @@ d3a32a3660ad06ed8c981679397acb766728f630 data/basemetals/recipe/pewter_blend.jso b08cc12b5fbf4f34775bb91345a9150bd1190398 data/basemetals/recipe/pewter_blend_from_small.json 83895182a07ded42fefcadb5cf34eeb5e646ae6b data/basemetals/recipe/pewter_blend_smelting.json ffda9d050a2ce813d4347ca24af38927ad9bff01 data/basemetals/recipe/pewter_block.json -5cd53415abdbd95a73343a27250fd3c18dc943d7 data/basemetals/recipe/pewter_block_crushing.json +6fb038c9cce66b0e7703dd77f5a21aa7e0c6a4d9 data/basemetals/recipe/pewter_block_crushing.json ec96ee1412a6509a852898c74845cd78b939e5cc data/basemetals/recipe/pewter_block_ingot.json f2836c8dba6b759bd5f6722629bacf0ff831cce4 data/basemetals/recipe/pewter_bolt.json 9d43ec0b500c91f91eb52024de6c05d087bf4193 data/basemetals/recipe/pewter_bolt_recycling.json @@ -3724,14 +3735,14 @@ a60d4e203f6b3c64774cc247f7b2b4cb9266e64c data/basemetals/recipe/pewter_helmet_pl 0703a061f748b79847cfd79e8a95a782422d39a2 data/basemetals/recipe/pewter_hoe.json 8762429a4cc8bb093575185c706ae3db2e1e1629 data/basemetals/recipe/pewter_hoe_recycling.json e5c3c0da96dfbbc07f259532385f81d544f323dd data/basemetals/recipe/pewter_horsearmor.json -04d8a8e1074063846712774b6b61d590ca4818e0 data/basemetals/recipe/pewter_ingot_crushing.json +e6a0b71cfe991c0b4486044007ef4a3489cd0513 data/basemetals/recipe/pewter_ingot_crushing.json 902545e22591652113e6c446112ab390cdc3beed data/basemetals/recipe/pewter_ingot_from_nuggets.json 0ebd97e8f5ee2165fdf45fb46897199703132eda data/basemetals/recipe/pewter_leggings.json 7d943854d971a0cf78c67a8f728264e4d8fd9fa1 data/basemetals/recipe/pewter_leggings_plate_repair.json ed8cad01dd434d4354fc660129150d977eccb57d data/basemetals/recipe/pewter_leggings_recycling.json 17beb3c0b9be9ab7e547abf7edabb2bc5c4e8459 data/basemetals/recipe/pewter_lever.json 5a107efc32a105bbd6ddf551464c994d0bbb1a31 data/basemetals/recipe/pewter_lever_recycling.json -ea68c41996303beb17411a92fa5c0bf3b84dcb8d data/basemetals/recipe/pewter_nugget_crushing.json +38ef209c0c1494147042b0c419bf6ada2fd15d9e data/basemetals/recipe/pewter_nugget_crushing.json 03c1f980015fb05c64ac7399738c822a69f92f9f data/basemetals/recipe/pewter_nuggets.json 796c3b50e01a63d7a9c6407ccb392d3f00108b3b data/basemetals/recipe/pewter_pickaxe.json e7cca32bc7a62ab6b274c88089d61b0cba7e4209 data/basemetals/recipe/pewter_pickaxe_recycling.json @@ -3772,7 +3783,7 @@ ba1244b284999454e091a9a691c5ea46c1d1bb04 data/basemetals/recipe/platinum_arrow_r 388dd9e8ecc90662cc5f7847929ecff3649f7d34 data/basemetals/recipe/platinum_bars_2.json dabfdc89eec91362bbaacce69cba95335ac8d261 data/basemetals/recipe/platinum_bars_recycling.json 3b30df7a15eff6f504080f1b3defabf337ff420a data/basemetals/recipe/platinum_block.json -f20858a9bd4c953c6a7db662f37a4a71c1137348 data/basemetals/recipe/platinum_block_crushing.json +23c1d30439c10eefd689ccf303b6eaa1daa923a6 data/basemetals/recipe/platinum_block_crushing.json b5bf138f1bbe7691f2aa486e5d230d07dab7cf49 data/basemetals/recipe/platinum_block_ingot.json 39ce1fe2b74220df1395714cfbf2c5732589dca4 data/basemetals/recipe/platinum_bolt.json a79e63122216b30f7abc6fb0340c88ed5cd68361 data/basemetals/recipe/platinum_bolt_recycling.json @@ -3801,17 +3812,17 @@ a4a211f3ea8ec70f1326035a00e7f273e899a504 data/basemetals/recipe/platinum_gear.js e0d5cf5a68b7213ae9709eb1c896d371f57ad834 data/basemetals/recipe/platinum_hoe.json 95033796d74c7852d625a9013a1e71dedb67accd data/basemetals/recipe/platinum_hoe_recycling.json e096e6c8e8c387ce64591ef5f850deaa5f97be8a data/basemetals/recipe/platinum_horsearmor.json -73f02808629eb630cda74bdf3498ff33e38fd508 data/basemetals/recipe/platinum_ingot_crushing.json +e77565e492acade16fe45baf63e04d856865029e data/basemetals/recipe/platinum_ingot_crushing.json 8a25b93a04e363996c601dfd9c03502980a38645 data/basemetals/recipe/platinum_ingot_from_nuggets.json ab1607781c9160380c3d8c5201a1bf78b3c04c82 data/basemetals/recipe/platinum_leggings.json 7a15a663248407704cc492fd27cd83bd6d25d896 data/basemetals/recipe/platinum_leggings_plate_repair.json 6227e0a3b7f8e1e2c1f238176f1cea783da2c6ab data/basemetals/recipe/platinum_leggings_recycling.json 991d135c1868ae3e972940e03aa6c7eaf8e5a570 data/basemetals/recipe/platinum_lever.json fd493d722426fb7d05de78a3e5eb318a409b7b02 data/basemetals/recipe/platinum_lever_recycling.json -945b58b0f378e3486b9b59ea2daa1bc0f279a1c4 data/basemetals/recipe/platinum_nugget_crushing.json +95804a928a2bd73c1eafdf912de3e938e57685af data/basemetals/recipe/platinum_nugget_crushing.json 8c4cc2284f0ab063a69f226fa893c0ba83e867be data/basemetals/recipe/platinum_nuggets.json a47a0a1e61fa7b7ba9cfd6a526f78c949c705a42 data/basemetals/recipe/platinum_ore_blasting.json -0d5b5478e9a8f29e5a5090a4fe67f8acfff4c446 data/basemetals/recipe/platinum_ore_crushing.json +8a8021dd65714fa56c6f1b46433628ecf1125ec6 data/basemetals/recipe/platinum_ore_crushing.json 10605748a0f3522eb0a41bb07fa99c90525831df data/basemetals/recipe/platinum_ore_smelting.json 9c2fa7a3e60318b794059f2e390e53c5ba79e403 data/basemetals/recipe/platinum_pickaxe.json 79fce94c3bf0a99daa81b59660ebf866cce69de5 data/basemetals/recipe/platinum_pickaxe_recycling.json @@ -3822,7 +3833,7 @@ c282e5fb76dd445bc2c3b7de84bbe5094d5aef58 data/basemetals/recipe/platinum_plate_r 79cd814b6b75d5404a69de1946da6f778618441a data/basemetals/recipe/platinum_pressure_plate.json 39bda62f04ac47cedc9d61ba11c5da0432bf9cbe data/basemetals/recipe/platinum_pressure_plate_recycling.json 0d332c4880e7c232490c535b91c8c3d39f79b063 data/basemetals/recipe/platinum_raw_blasting.json -097e94ba271cad4614542307b07bf0d21e2a1dd5 data/basemetals/recipe/platinum_raw_crushing.json +fdabed469db25cb3ff246f800de38fa778d591e0 data/basemetals/recipe/platinum_raw_crushing.json 73aad994bb78f85be53f50d56435fdf897e9a710 data/basemetals/recipe/platinum_raw_smelting.json e7f0bb826860b6e89fd571ed105ba200408effab data/basemetals/recipe/platinum_rod.json fef87ddd497036fd86357d4d2fd5ebe173dc4ec2 data/basemetals/recipe/platinum_rod_recycling.json @@ -3844,8 +3855,6 @@ b99b23c23b7a780a088489bd182154f9ac6cb9d4 data/basemetals/recipe/platinum_sword_r 0e6b27e88df4947fb02cfb7e9ac1547fecb7e03a data/basemetals/recipe/platinum_trapdoor_recycling.json 97a4f952767d738b95c15bbe1714f41b8017adc4 data/basemetals/recipe/platinum_wall.json 91e6a57f690e63c9a4432da069e77db833b7aa54 data/basemetals/recipe/platinum_wall_recycling.json -e25a94dd448993e289b9d80cab455f01cbe2b8e1 data/basemetals/recipe/prismarine_bricks_crushing.json -5b6be50e5e57680b337a016f2265c23859def967 data/basemetals/recipe/prismarine_crushing.json 9b72571ca668684d9c68c0d541de0b02ca326479 data/basemetals/recipe/quartz_arrow.json 7b532123f4b30c608bbb7a22974c458d6a600c97 data/basemetals/recipe/quartz_arrow_recycling.json 36870b3c616e036ee7822f0a1fafda4195596c90 data/basemetals/recipe/quartz_axe.json @@ -3853,7 +3862,6 @@ e25a94dd448993e289b9d80cab455f01cbe2b8e1 data/basemetals/recipe/prismarine_brick ec30c800f120e2ff77e6ac4ccdd20d28331abb1c data/basemetals/recipe/quartz_bars.json c2ad49027e83b394f9115d29964e2d3b23d218d1 data/basemetals/recipe/quartz_bars_2.json 91f79435c62f784de2d20092addbca81a6a2194d data/basemetals/recipe/quartz_bars_recycling.json -7edf69f483825151eb0e08dc4e8a7dded20b4226 data/basemetals/recipe/quartz_block_crushing.json 5ef08fd63b9ba39c27ab8e592bedb48cc6c43310 data/basemetals/recipe/quartz_bolt.json 374becc2ebe14afbef88d10b8460c785d51de797 data/basemetals/recipe/quartz_bolt_recycling.json e6cdb99c8b5825ee8628a48adc804da253fd50e3 data/basemetals/recipe/quartz_boots.json @@ -3868,7 +3876,7 @@ b0f7cff6843d28f48bbe2a2d375efb7357ed2974 data/basemetals/recipe/quartz_button_re e5b3257873ca0ab0b4fdb7f261bc6dd554ba5f18 data/basemetals/recipe/quartz_crackhammer_recycling.json 959624c9698b33d9a9cc3197418e9baff2ff93ef data/basemetals/recipe/quartz_crossbow.json eb34b9ede3a95e1d6e7e5dcbfdd26db13d2f0546 data/basemetals/recipe/quartz_crossbow_recycling.json -0f2190ac5689868250636fd974cb7f2883ae7573 data/basemetals/recipe/quartz_crushing.json +ed4b3d4cb52c64df06e6357fecca9abc390a09d5 data/basemetals/recipe/quartz_crushing.json 4ed8032ffa03790110f00a816828dc82106f7b51 data/basemetals/recipe/quartz_door.json 9325d9ba8c68af61915baa532c9dd9bd8f67558c data/basemetals/recipe/quartz_door_recycling.json b2734147e48b8d8be5a2cea8b05e0f351417cdaf data/basemetals/recipe/quartz_fishingrod.json @@ -3885,8 +3893,7 @@ a9258a7094582785c2032c915d820fdeab8b15ff data/basemetals/recipe/quartz_leggings_ 970eb8c434ab637020ff86cd9b6bec29ff7af000 data/basemetals/recipe/quartz_lever.json 693825e882eeff3dfd02d656d8b017214a0a6dab data/basemetals/recipe/quartz_lever_recycling.json 7e2bd6f21363fd91d2b01a78a1cb933a43d086dd data/basemetals/recipe/quartz_nugget.json -013b94db7fe45b2a45fa9a9526bf52304ca432c6 data/basemetals/recipe/quartz_nugget_crushing.json -3e81caac5e3059d3d8a53025cfc079690960c36e data/basemetals/recipe/quartz_ore_crushing.json +c4a3084a1845ce5218ffd951e96636532b2eb052 data/basemetals/recipe/quartz_nugget_crushing.json b8df31c2385c0308f8f05d5f8d29767033471178 data/basemetals/recipe/quartz_pickaxe.json 1d7e1adb8bf8c7538c3dab25b62fb9d506787b9d data/basemetals/recipe/quartz_pickaxe_recycling.json 505efa85c6dd5007e379b352044ecc705c6508e6 data/basemetals/recipe/quartz_powder_from_small.json @@ -3901,7 +3908,6 @@ db81cdd912a48fe264f4054fe3f0d6d7361a2343 data/basemetals/recipe/quartz_scythe.js 12429a856a3ca6b0e90f50c6c187c5d5fcd4fa45 data/basemetals/recipe/quartz_shield.json 3d528c43da76640a075abb1c7a02eec92a754ca5 data/basemetals/recipe/quartz_shovel.json dc8b3277fbeaf0372f6698bdf69e67183acf57c2 data/basemetals/recipe/quartz_shovel_recycling.json -a579cc4bcc4dbd35dd94d25843807010fc4d7099 data/basemetals/recipe/quartz_slab_crushing.json 0fe1dbb528fdcd2437fddebe8e4bef07532938e2 data/basemetals/recipe/quartz_smallpowder.json 1f75f81a41db88d7b7c571e55ce79ab4a14cd4f0 data/basemetals/recipe/quartz_smallpowder_smelting.json f4c2d9c311eaaba33160abe48740580d8615c715 data/basemetals/recipe/quartz_sword.json @@ -3911,15 +3917,9 @@ f4c2d9c311eaaba33160abe48740580d8615c715 data/basemetals/recipe/quartz_sword.jso 581c6a8e22c602f039a9105d95a876c9d4459005 data/basemetals/recipe/quartz_wall.json c463e47a48330d9ae55bc904a7ab973f05f6b705 data/basemetals/recipe/quartz_wall_recycling.json ee78548962ef567f6ac9cf48b383c29958032bdf data/basemetals/recipe/rail.json -93293f96c095fee180a7f0c2c18f679140d96189 data/basemetals/recipe/red_sandstone_crushing.json -3d3dda01701351039a3fd78fa032548e73ac9361 data/basemetals/recipe/red_sandstone_slab_crushing.json -7405c96a188c20da788e976f569fa78d5b409c07 data/basemetals/recipe/redstone_block_crushing.json f997ae70f6cdd258fe420ea59112fe3cd65867b8 data/basemetals/recipe/redstone_from_smallpowder.json -3940901a1c2f48644bafdb172a7c7a817bb766da data/basemetals/recipe/redstone_ore_crushing.json +940e4b7c0c4b6de206dec0b5d0793dbcaa3ebccd data/basemetals/recipe/redstone_ingot.json 1d3d05fbfa96402740d21d43dc6dfd2c49f6d355 data/basemetals/recipe/redstone_smallpowder.json -e7e12f02cd36e376799f6f714343e8f68140d953 data/basemetals/recipe/sandstone_crushing.json -49df1be38109240591bf38795863637569034eda data/basemetals/recipe/sandstone_slab_crushing.json -4453cd35a5d5aa23de9ffd6136515cd7cc1da66a data/basemetals/recipe/sea_lantern_crushing.json cea9b366358cb0f7710bb9f268caf6b11a981a55 data/basemetals/recipe/silver_arrow.json 3c14f8b460cd305bdfda49ceab5c63301847d188 data/basemetals/recipe/silver_arrow_recycling.json ba2b1a7ba35c8a5c4d79d020c24df0370eabde03 data/basemetals/recipe/silver_axe.json @@ -3928,7 +3928,7 @@ bf7a2a4d65b56363accb8e5812d6eb7915f64d66 data/basemetals/recipe/silver_axe_recyc cf5af30146049059334b830d40eea4d4eddc24e8 data/basemetals/recipe/silver_bars_2.json 1144d1d2f922644a6b529f2d716bdb27232bf814 data/basemetals/recipe/silver_bars_recycling.json 8d147bbf5ed735e8de8c646ae28a6985952b1ba7 data/basemetals/recipe/silver_block.json -6bbbb7e28fbf01d60171dbf15a25da9a6bd94d62 data/basemetals/recipe/silver_block_crushing.json +85a3d71c13c7fce738411c7c1bc7deda5c6eb2e6 data/basemetals/recipe/silver_block_crushing.json 4c0be08afc296a26381c00781500e3d297dc26f4 data/basemetals/recipe/silver_block_ingot.json 3ead9780ee9a8c588139b9204d84edb0fada89c3 data/basemetals/recipe/silver_bolt.json db2fa4a807f77d75f35dc61c4e72b92fb07b866a data/basemetals/recipe/silver_bolt_recycling.json @@ -3957,17 +3957,17 @@ f6b426fbab0f7a62c39b5138a3f8e1bbee213b2f data/basemetals/recipe/silver_helmet_pl 8007d86f6e4ce211b5f1fa24ffac25955607df4b data/basemetals/recipe/silver_hoe.json f3090ab84bf19617bf9f417563cc62033fd28bdd data/basemetals/recipe/silver_hoe_recycling.json 93f93611612fe62d52993c24e609b527f22b802d data/basemetals/recipe/silver_horsearmor.json -8ff21524c1f26ac2424458599856129706d5975b data/basemetals/recipe/silver_ingot_crushing.json +69c259210b0876183bcb71e10f232b5aac1ee071 data/basemetals/recipe/silver_ingot_crushing.json a26542f4ad63d74e95b873497ca5b426d5eaa7d0 data/basemetals/recipe/silver_ingot_from_nuggets.json 3a6ee3a663cf8f20823ad87592b15ed101d7620e data/basemetals/recipe/silver_leggings.json 9dbbcc1f24db124051ab0274fb1e0dbdcd225a80 data/basemetals/recipe/silver_leggings_plate_repair.json 381f24b9662e3e358a57478a3fa4bade60091def data/basemetals/recipe/silver_leggings_recycling.json 7428a2e82a7c0a60ab03d1a648238ce5705294a7 data/basemetals/recipe/silver_lever.json 18e05f760c12cd8886f346e8cdef54dfe3968832 data/basemetals/recipe/silver_lever_recycling.json -04a5f2fde3a74de9b147f1a8f9799b3a8cefceb6 data/basemetals/recipe/silver_nugget_crushing.json +605d7412e20e889e81087b17da2bea90279f0b4e data/basemetals/recipe/silver_nugget_crushing.json 2f25c0fd3912885d81a769cf223e43f2efd6fd43 data/basemetals/recipe/silver_nuggets.json 810c3b1535f0f29d07cf05097a7bbea1aff42e49 data/basemetals/recipe/silver_ore_blasting.json -66904ff61a483caa7017610994cd2c50e3c8c73d data/basemetals/recipe/silver_ore_crushing.json +fb374fda5019a4ae42a3416e6ae4fd9f0d592a28 data/basemetals/recipe/silver_ore_crushing.json df62b1308e9eeae3cf87324c6e0d58b32913155b data/basemetals/recipe/silver_ore_smelting.json 93e298c944f6ef35cf5524bbc9fb6b0fb789d83f data/basemetals/recipe/silver_pickaxe.json dcfb3b5daf9023903dc2f2ffee80f6ce1bb7e11c data/basemetals/recipe/silver_pickaxe_recycling.json @@ -3978,7 +3978,7 @@ dcfb3b5daf9023903dc2f2ffee80f6ce1bb7e11c data/basemetals/recipe/silver_pickaxe_r fb107ab5ba033020029cdb0659b63a341a7b582f data/basemetals/recipe/silver_pressure_plate.json 676a0a2e29aec2e86bde0f93925b93f2e57871c1 data/basemetals/recipe/silver_pressure_plate_recycling.json e0d36b368ac61f3b89c91a8397b32dae524debd6 data/basemetals/recipe/silver_raw_blasting.json -4283cdc66bfc42a4bea112339ead43afc26011e8 data/basemetals/recipe/silver_raw_crushing.json +97f6cbc9049dbcfce8889e377ccf62c6c00b8699 data/basemetals/recipe/silver_raw_crushing.json f60d2c28223249b7f10dfca094789fd4436fc5d3 data/basemetals/recipe/silver_raw_smelting.json a51a94880e770b265e6217b360a6b7baa2b5a627 data/basemetals/recipe/silver_rod.json 0bb13ae58b00538f44b86c067ea63c1f8feb2eca data/basemetals/recipe/silver_rod_recycling.json @@ -4000,7 +4000,6 @@ aaff8173c35ce86b4ce28a99da46b07086aff887 data/basemetals/recipe/silver_sword.jso 8765880b60fb76154691ef6615e81778bb86d668 data/basemetals/recipe/silver_trapdoor_recycling.json 7da4d1901c1e15a4baf0041088b9265308bb8697 data/basemetals/recipe/silver_wall.json df5f5250f6c1b52b8b0e1c5678e43614d124d6b3 data/basemetals/recipe/silver_wall_recycling.json -f8b5b2a8eae1bec0279e051f30af6eea7f6d3c5a data/basemetals/recipe/slime_block_crushing.json a4e1dd8fc9299209c9ea4fb04a692aeafed8ef96 data/basemetals/recipe/starsteel_arrow.json 1b33947014b380031f20c63c7e8fdd2370f00752 data/basemetals/recipe/starsteel_arrow_recycling.json f7fd53025b17abbe4a95a787939b1e0d49140476 data/basemetals/recipe/starsteel_axe.json @@ -4009,7 +4008,7 @@ e2b816c22fb49a939261f3d9f402eadb0af6188a data/basemetals/recipe/starsteel_axe_re c2d864f91e3f866c91d5dc696baf638f332c23f9 data/basemetals/recipe/starsteel_bars_2.json 5f90e10906cc48e39972d37edabab6f12370be17 data/basemetals/recipe/starsteel_bars_recycling.json 19fbc541048a7c12de6b84a6676554a51b0a27bc data/basemetals/recipe/starsteel_block.json -ee85a45d92bacd2691596dd6009cd44773ae432e data/basemetals/recipe/starsteel_block_crushing.json +8c9639eb555e101b666ca99c1c12cd12459020b5 data/basemetals/recipe/starsteel_block_crushing.json 2d568d2dbbe81038b41d13d07f5a70ccccb637c6 data/basemetals/recipe/starsteel_block_ingot.json a2487b0166c1deb7ba8045b056677655a70e9715 data/basemetals/recipe/starsteel_bolt.json 6b4595ddd1b87e65186fdf8c7d0afe12bb103271 data/basemetals/recipe/starsteel_bolt_recycling.json @@ -4038,17 +4037,17 @@ cd6acb18fd50141782ad72f9e999dbecca884387 data/basemetals/recipe/starsteel_fishin 10d3eee5afae0d66263ea81647c3cc87f082a7e4 data/basemetals/recipe/starsteel_hoe.json d168fd90febdc9cc04d871ed1c4f8d3df9c47817 data/basemetals/recipe/starsteel_hoe_recycling.json 8b3939f1cab977f6382d4df62d34d9bf1e819d0d data/basemetals/recipe/starsteel_horsearmor.json -b53bdf0d2ec261aa035594c263f9509fe32535d3 data/basemetals/recipe/starsteel_ingot_crushing.json +56f98dce6c7769bf617810ca2bf9bdb0bc8d38cd data/basemetals/recipe/starsteel_ingot_crushing.json fe77e266bcfa50352c88e3d7655382a2900a36eb data/basemetals/recipe/starsteel_ingot_from_nuggets.json 268ec7c342854aa1cd9cc2d51350351312157c92 data/basemetals/recipe/starsteel_leggings.json 816d3c722ecf65b562f6b42b36575b3cebba3215 data/basemetals/recipe/starsteel_leggings_plate_repair.json 8810d5930a1255a82d3a1cb7d824f095264718cb data/basemetals/recipe/starsteel_leggings_recycling.json 229b127ba101f2dfd7edc82847ff87cab840b572 data/basemetals/recipe/starsteel_lever.json c1765c380270d63ee2f970cb06275db9b48da8ad data/basemetals/recipe/starsteel_lever_recycling.json -10fe80a689cfcf185a729eb4374d551da08db9c6 data/basemetals/recipe/starsteel_nugget_crushing.json +74f8170287796e921623be82c0dca5b9d7ea31cb data/basemetals/recipe/starsteel_nugget_crushing.json ff14445693b5871c5ac7cbf5282f31bc20ce2a7e data/basemetals/recipe/starsteel_nuggets.json 943fc03db47af9e084de1aff94aa991e2cd0f8ae data/basemetals/recipe/starsteel_ore_blasting.json -11cf6a1c92478d231c2b5fb4c09ebe55ed2ee258 data/basemetals/recipe/starsteel_ore_crushing.json +48e557bd60af264d142d101b5d5c073d74ca7296 data/basemetals/recipe/starsteel_ore_crushing.json c62b30ec382754f34f6d592cd43fca0027dfb286 data/basemetals/recipe/starsteel_ore_smelting.json 745bf3eebaea9f1deb31a1585da883ec070be98c data/basemetals/recipe/starsteel_pickaxe.json 6b3c03c441c9851a8f62d000aac3e178876c4bc7 data/basemetals/recipe/starsteel_pickaxe_recycling.json @@ -4059,7 +4058,7 @@ b7ad9d8e58cf02d2f00b3911151e88d2d4dc41c2 data/basemetals/recipe/starsteel_powder 84859631ee8a2ad93e00c4c48f97e02e5dd4b1aa data/basemetals/recipe/starsteel_pressure_plate.json e8463785d652584f463df3554d329920fb1a9c33 data/basemetals/recipe/starsteel_pressure_plate_recycling.json 2de87ecddb72568a4bd00e69955fddb1daf46bb0 data/basemetals/recipe/starsteel_raw_blasting.json -28550e51f03d2b0ee3b756062471192961f797a8 data/basemetals/recipe/starsteel_raw_crushing.json +1741bd2db452f6305d010d9d0fad36dec3aa99cf data/basemetals/recipe/starsteel_raw_crushing.json 42a0ccba98d3d79eed8a0165c22bd7eea441c7f0 data/basemetals/recipe/starsteel_raw_smelting.json 2f0f5334522551a4fc7e4e90769caec43e0214b9 data/basemetals/recipe/starsteel_rod.json dea583ba6ad736b6cfc1929b890501d9a8d1ac0d data/basemetals/recipe/starsteel_rod_recycling.json @@ -4093,7 +4092,7 @@ e5819b6a5ac6778a6693b0231e07cacb9dad4167 data/basemetals/recipe/steel_bars_recyc 209827ed0b10638c82b2e58816ca736f2e8ce4a5 data/basemetals/recipe/steel_blend_from_small.json 1ea9cc1a9cddcc51bf91fe9cea216dcbc2a6b8d8 data/basemetals/recipe/steel_blend_smelting.json 70368e4645878a45859d471ffed8d292fa874739 data/basemetals/recipe/steel_block.json -d3388c7e215c52a03b0f20a032ef650d11cd3dba data/basemetals/recipe/steel_block_crushing.json +8b66db1388f5ab84e84f216a40e92a3dc1417692 data/basemetals/recipe/steel_block_crushing.json 0c18bf7b90ba168d99b04cccdb93dbd04562198f data/basemetals/recipe/steel_block_ingot.json 68232b590c0eea5b4b4b833372128b17ec5075ba data/basemetals/recipe/steel_bolt.json f8711971e4b0981a82711cb01b5266158263c4ca data/basemetals/recipe/steel_bolt_recycling.json @@ -4122,14 +4121,14 @@ d00dd5cd64d52d2bb64087f16bc76c59dd12c583 data/basemetals/recipe/steel_helmet_rec 45d2bd8d031bbe9faf8ade4e4397fcd35a1beeff data/basemetals/recipe/steel_hoe.json d828dfa544ce95c6d77a8bd32a9a500f4c4dc75d data/basemetals/recipe/steel_hoe_recycling.json 64cfa8d67da61ae6ff3d83972f4e42b34075cce6 data/basemetals/recipe/steel_horsearmor.json -71b236e8b25a466c5170f76c728fbf9a31bbad68 data/basemetals/recipe/steel_ingot_crushing.json +5be413973ad5db89bca1aef78aa39fc13a3a82de data/basemetals/recipe/steel_ingot_crushing.json 2b405727309813fba6817d8e597fce1f1f17a0c5 data/basemetals/recipe/steel_ingot_from_nuggets.json 6ba2f5c9ed74165368e014a9e3f9f570838eab21 data/basemetals/recipe/steel_leggings.json 39a02a42c67df6f63b9376864c2614d5ad39d21e data/basemetals/recipe/steel_leggings_plate_repair.json e1fc13cf96ffaf0dfa6e75cafd5e4f9b996ae16e data/basemetals/recipe/steel_leggings_recycling.json 4af72405f421cb16c76d308d039c1faf94745691 data/basemetals/recipe/steel_lever.json c3ecf9586e766e3e74e06909538753b5369503ed data/basemetals/recipe/steel_lever_recycling.json -183b3f9268fe5f4c0698c4f882c0c7ebf2f101c9 data/basemetals/recipe/steel_nugget_crushing.json +b9e828d53cf15eb52a0184256a6a1fb71cc3eb02 data/basemetals/recipe/steel_nugget_crushing.json 927d4cc3b5e491a499c112386955ac586550b586 data/basemetals/recipe/steel_nuggets.json dcb5056d68f9256cf9d3502c34d76ba4c9be7270 data/basemetals/recipe/steel_pickaxe.json 6f9b4be1d62f60fe70ccbd0054760c6f965a86a0 data/basemetals/recipe/steel_pickaxe_recycling.json @@ -4162,13 +4161,10 @@ addaa7b0b8e27192ad2a6e10c1c7fc59bf3e2e45 data/basemetals/recipe/steel_trapdoor_r b0e32038b209b8f687e6df905c345134a7a557de data/basemetals/recipe/steel_wall.json 2f7d17c6e516019d746fea9834fd844689829e5e data/basemetals/recipe/steel_wall_recycling.json 615c35394a998a2cf83a7052d85114ea29570e67 data/basemetals/recipe/stone_anvil.json -7945b405007128776b99f0fd74c30b5722f678c1 data/basemetals/recipe/stone_brick_slab_crushing.json -0ce3838452e0c0824069dfa44f1ba693aa07667f data/basemetals/recipe/stone_bricks_crushing.json d4bdc34a813486588414eb8ad2b8d0ab84f45828 data/basemetals/recipe/stone_crackhammer.json -d13e278be2410fb94ea66abc2a10ba82cb0f585d data/basemetals/recipe/stone_crushing.json +b19c5a5377e3f65f266e3c694a095c6e309cdb5b data/basemetals/recipe/stone_gear.json +0dc84a64ad32cae1c40db75960c2f4c1836d4082 data/basemetals/recipe/stone_rod.json e051c32cd67f721d25c88deebf633ff4ba0b77fd data/basemetals/recipe/stone_scythe.json -04d1c2529da67c3e0a2973f0e282d76fd48b8362 data/basemetals/recipe/stone_slab_crushing.json -8a85159876d12cec585e95dedf8d079dac960e58 data/basemetals/recipe/sugar_cane_crushing.json 5614ec8ca6785aa3403806bd0a00cb723830c70f data/basemetals/recipe/tin_arrow.json 8bb4173f6d68261db5258358fdcc89eaf7aaa7f9 data/basemetals/recipe/tin_arrow_recycling.json 82244a98e4cc9a9dd360a9f38c1333f08968c8d8 data/basemetals/recipe/tin_axe.json @@ -4177,7 +4173,7 @@ e051c32cd67f721d25c88deebf633ff4ba0b77fd data/basemetals/recipe/stone_scythe.jso 8f354d8b16734822b1cc3d23fc82750e438c54c5 data/basemetals/recipe/tin_bars_2.json ae98751dc34b123c275823bce3c7063f96d3a6cc data/basemetals/recipe/tin_bars_recycling.json 0aa959ab0e42ed9a6af93c0bccaa637edf1c3d0b data/basemetals/recipe/tin_block.json -8a287807e6cc55790e667fcff6b1365913cfac0f data/basemetals/recipe/tin_block_crushing.json +e0199f320fdac18a246d2efa98670c9ba16ff3ad data/basemetals/recipe/tin_block_crushing.json 3f74048db5de89fe9fc46dfcd76715610c73f655 data/basemetals/recipe/tin_block_ingot.json cec0ddd9c761177da1b5867ca5c3099ae2cb0392 data/basemetals/recipe/tin_bolt.json b8a30674546b4cf9a964600ae8a65166089c0dd4 data/basemetals/recipe/tin_bolt_recycling.json @@ -4206,17 +4202,17 @@ cb3d3171868f70076be5c42784f12e2a1caed2d9 data/basemetals/recipe/tin_helmet_recyc 9a21111305db0059497c4a7caab2cf27fff5d349 data/basemetals/recipe/tin_hoe.json 7804e1acacf8d9d3ff14dd4d7f47a8b40c820df3 data/basemetals/recipe/tin_hoe_recycling.json 9f27bf573a20fa0871858b67b17f4548cd646ab9 data/basemetals/recipe/tin_horsearmor.json -209dc0b03dfc8a9c3b9b1ee6d1dfb9beac2aa82b data/basemetals/recipe/tin_ingot_crushing.json +f46e4cf45078ffd4871a37b76f659f5aedcda033 data/basemetals/recipe/tin_ingot_crushing.json 87233b74b7b7453c6c3030f3ff129ef92e99b59d data/basemetals/recipe/tin_ingot_from_nuggets.json bfc16b8e9360a75e894fc388551ef903da670956 data/basemetals/recipe/tin_leggings.json 0caa6ce628a9d50d4e5459565b6c85dd08039e37 data/basemetals/recipe/tin_leggings_plate_repair.json 0e87cd29fce0e4a1f8b42c099c1e3117e6d817c1 data/basemetals/recipe/tin_leggings_recycling.json 759ba65e19f4b0afb33b7ecb94bfe2cdef815aa8 data/basemetals/recipe/tin_lever.json 5324289232f5728a5432b9756997f033ededc55f data/basemetals/recipe/tin_lever_recycling.json -953351e0e7f1532b4c46aef65b74e3539214495a data/basemetals/recipe/tin_nugget_crushing.json +c5b95cb91184efd95912d7c81513c94f72029268 data/basemetals/recipe/tin_nugget_crushing.json 91bb787751f9917aa7bf90af59f83d265754c3ca data/basemetals/recipe/tin_nuggets.json ebf29063528580a2885d7d5724e19e7e073f0dc0 data/basemetals/recipe/tin_ore_blasting.json -3e7544b4178ba7e946a1664be810b96875ae4819 data/basemetals/recipe/tin_ore_crushing.json +eb41bc57e5921e48e4272c429fe78bf1702ca398 data/basemetals/recipe/tin_ore_crushing.json e6cadfeafb33178bac47dee7ab39c3c224e0581b data/basemetals/recipe/tin_ore_smelting.json d4f18be04926ea372aa8f6137d2b36c8f0ed69c3 data/basemetals/recipe/tin_pickaxe.json 8f5276f249af4adf1bd65aca41a5ff43323bee4c data/basemetals/recipe/tin_pickaxe_recycling.json @@ -4227,7 +4223,7 @@ a7a031386307b99e5f1a70d81d252f975eac2c3f data/basemetals/recipe/tin_plate_recycl 78ed0c0f811f388d704c87587661a2786055c58d data/basemetals/recipe/tin_pressure_plate.json 8370b4cb2780cc56d3d1a01ee32039536cdae4bf data/basemetals/recipe/tin_pressure_plate_recycling.json 9cb37d863274cd540380545a94bcf8db9d70c87e data/basemetals/recipe/tin_raw_blasting.json -bbcea37bd6a2a2bc53f5019a94a7d604491aaccd data/basemetals/recipe/tin_raw_crushing.json +716b7ec75f364d7506b935392ee06ff17b7bbde5 data/basemetals/recipe/tin_raw_crushing.json 0612c2d41103adffb0f247ea40a24ddc78b85ed0 data/basemetals/recipe/tin_raw_smelting.json 4aac35f8c1c236db70081a49df9f5227be8d2f18 data/basemetals/recipe/tin_rod.json b36997152c8ee70e4bb48eda43f67724ff7d63aa data/basemetals/recipe/tin_rod_recycling.json @@ -4251,6 +4247,7 @@ d2f21d0845d4d9e4f9a25da8a74961eb85173826 data/basemetals/recipe/tin_wall.json ee0be9da3576c7760aba8342155d8b1e238de372 data/basemetals/recipe/tin_wall_recycling.json 124efdf49654afb99f492a4f6291f65d06b02f28 data/basemetals/recipe/tripwire_hook.json be6c43286df2225d09c635e94954ddddda16e156 data/basemetals/recipe/wood_crackhammer.json +3dd412104e7588ff717e32eca9834fc000560a70 data/basemetals/recipe/wood_gear.json c49a15b051d3f0e2a56c2581fb072e9ca8462f33 data/basemetals/recipe/wood_scythe.json 1a0704313244de6b5c6c0f4d255f5a6081fb02ee data/basemetals/recipe/zinc_arrow.json 1a54da46350aea7e491edf779bc3887c33e592ce data/basemetals/recipe/zinc_arrow_recycling.json @@ -4260,7 +4257,7 @@ bcc8ef77bf5f9d70b944a022a432c18e68e7fd13 data/basemetals/recipe/zinc_axe_recycli 476d1a69b2104c6ecb56c210eb66710621895c6e data/basemetals/recipe/zinc_bars_2.json 45ef17892ea36def9db7fd1d3b3c9e8e2401dba1 data/basemetals/recipe/zinc_bars_recycling.json 50207e71441c3c6b4e021a816bb100cc96e7ae65 data/basemetals/recipe/zinc_block.json -f9305417048658b78a265ef07a75e8e9c06974e6 data/basemetals/recipe/zinc_block_crushing.json +cdad09704a3e7fe3d66fd1ab2abaff38b6737b6c data/basemetals/recipe/zinc_block_crushing.json af5de19b5e2e6e8841afaeb091a2b51d40f8e903 data/basemetals/recipe/zinc_block_ingot.json 7f413347dbe78a96d8c67f583d5d1e36b9bdda92 data/basemetals/recipe/zinc_bolt.json 697e6942d6075428a3d362768835a25f2a275e25 data/basemetals/recipe/zinc_bolt_recycling.json @@ -4289,17 +4286,17 @@ d5900f0e8325c8654257ff76c72752028fe53641 data/basemetals/recipe/zinc_gear_recycl f50e3acf389f323b5f36a097d95ccd9950295f9a data/basemetals/recipe/zinc_hoe.json 95fb2affcf5f991c37c9640ea7d4ac933d588672 data/basemetals/recipe/zinc_hoe_recycling.json 4cdd70ecd158e52c56cfad61a5efe4a900c2a666 data/basemetals/recipe/zinc_horsearmor.json -1d9c5c26735047c97efcf458b41a7603ab612bb6 data/basemetals/recipe/zinc_ingot_crushing.json +7db55217861172892b3d2132420b83afa6dfc865 data/basemetals/recipe/zinc_ingot_crushing.json 990a8892e4f79d45f0c39e4858ad7d234a9ea61e data/basemetals/recipe/zinc_ingot_from_nuggets.json ade8e300027699adc1ae8dfe73dc7b8720ef58b0 data/basemetals/recipe/zinc_leggings.json 8a1d53ef65c56f4b8c2ef536a56c8bbf3dcbe783 data/basemetals/recipe/zinc_leggings_plate_repair.json 367c0d6146a5596f78e7a4adf8e45123af3a0166 data/basemetals/recipe/zinc_leggings_recycling.json 968412fde5ea197dca02f9fa5dff634560ca0147 data/basemetals/recipe/zinc_lever.json ed4662022481c4f008eac6d61d34ecb410752849 data/basemetals/recipe/zinc_lever_recycling.json -11261d65b845295e2cf54497411f5e41e3c5b9fd data/basemetals/recipe/zinc_nugget_crushing.json +75ddcab44a8d9a37e2b9c01e7e743769eb73c330 data/basemetals/recipe/zinc_nugget_crushing.json 0f138793e652866f909d9e85fd6c1fcff869f6b4 data/basemetals/recipe/zinc_nuggets.json c04f76723dc7eb6db7fee342251ee8689ba74120 data/basemetals/recipe/zinc_ore_blasting.json -668a20d1fd211d334b12d9e6002e59742111a195 data/basemetals/recipe/zinc_ore_crushing.json +a22cc0e32bd7b31e0458cc30ff2994cf59a091c8 data/basemetals/recipe/zinc_ore_crushing.json 1c7160bdc9254f41481b7b7ffe3aebf0f8df85b5 data/basemetals/recipe/zinc_ore_smelting.json 3e877e1be69ee5ec720befac94abb7cc22fc80a0 data/basemetals/recipe/zinc_pickaxe.json 17b4d7d2ccd2648a684f08d63a0fa8b9ba81bef7 data/basemetals/recipe/zinc_pickaxe_recycling.json @@ -4310,7 +4307,7 @@ e123669bf550067af3d65b586bb0bade9133ab38 data/basemetals/recipe/zinc_plate_recyc 684c38d7ef007a5c0fa4fe87915cd15adcca1279 data/basemetals/recipe/zinc_pressure_plate.json 6018d592a0e75b2a8e7b58dacdef32dd6a7c1bd9 data/basemetals/recipe/zinc_pressure_plate_recycling.json 40e66f7cb5803edcc79a6c95bcc9cfe3c919185b data/basemetals/recipe/zinc_raw_blasting.json -a8247d19c5abbd2b0b721bac14a528c1e0524730 data/basemetals/recipe/zinc_raw_crushing.json +48e80a9fc323d816239b75e40adb32bbea581416 data/basemetals/recipe/zinc_raw_crushing.json efbeaec6daa655090c880c1834f9eadf9122ffc7 data/basemetals/recipe/zinc_raw_smelting.json 8b46f857d50cbee72d2643595a673b7d64dc03f5 data/basemetals/recipe/zinc_rod.json 1e9f594522fabe059b379b7faa4d63fdab609308 data/basemetals/recipe/zinc_rod_recycling.json @@ -4332,10 +4329,8 @@ f4e5016b4b65f26c50306d7e1cd9b31e22d8d6cf data/basemetals/recipe/zinc_smallpowder e3934f553b17964cd5d860893e7af79f4be30daa data/basemetals/recipe/zinc_trapdoor_recycling.json 2eb9c252609000e92a633f27a203188f7f02513f data/basemetals/recipe/zinc_wall.json 8c392c723f90efdb173aa7c215943983e535c719 data/basemetals/recipe/zinc_wall_recycling.json -3e73416b0445383fd0532d01112a8f8cc4527c77 data/basemetals/registry_manifest.json +85be2f388a1dcfc04566f2de69783c1a22956ff3 data/basemetals/registry_manifest.json 6c48667f8dc61d4911df0b4b684af0c125e54f5c data/basemetals/registry_manifest_1_12.json -f9716f857b1b9101a6a96e1d211aeb69f6e7cc14 data/basemetals/tags/block/crackhammer_crushable.json -f2901f43fa7b10ba254e946d02999b7e31fe05b6 data/basemetals/tags/block/scythe_harvestable.json 5473a5b9563c1a04d48005218fe6cdaf12686c15 data/basemetals/tinkering/materials/definition/adamantine.json c417c00bcde08fc2d3b7d8108a5f291f32929a4e data/basemetals/tinkering/materials/definition/antimony.json d7c14e22dabdfb1c921ef8c9e157e51df1b6923e data/basemetals/tinkering/materials/definition/aquarium.json @@ -4450,17 +4445,28 @@ e728c3c76494d8b496023b014f72bb05d76af4fe data/c/tags/fluid/molten_aquarium.json 10f1b86937706f1da0935b24aec2c2037b06e0b0 data/c/tags/fluid/molten_bismuth.json 05d0add834ac43f0a7e518984ed9e717e50979f3 data/c/tags/fluid/molten_brass.json e782c460e4b40161b036fa5f42b2068241bf0932 data/c/tags/fluid/molten_bronze.json +2df924ca619cef40aa1fa6311d6627f38da6cd48 data/c/tags/fluid/molten_charcoal.json +a3e64432f9eec9a7a4ea51bb475e9926e15f2da1 data/c/tags/fluid/molten_coal.json 6a320031cf5ac2d4e220fb08c657ecce32cc68f8 data/c/tags/fluid/molten_coldiron.json dd00edb507e4a8d29359c447f7f2cb61cd2e05f0 data/c/tags/fluid/molten_copper.json 4ff73372a6ac5cf8ce37798903af5f46abc42165 data/c/tags/fluid/molten_cupronickel.json +3e3ba0c3b2cb6fef6867935331910bc9a2d0e1a7 data/c/tags/fluid/molten_diamond.json 97a8f6f3115c147bf571331261a832c36f45a392 data/c/tags/fluid/molten_electrum.json +9a460ec6e4ee809fdc1d1b50b4deea3870124ace data/c/tags/fluid/molten_emerald.json +84f414e1b5430ed65632fc0b739fe3f37eed4203 data/c/tags/fluid/molten_ender.json +4595a76702ff39a26a61295dad75593cb2dd6c99 data/c/tags/fluid/molten_gold.json f0c28c75f08612e834c062b616e9729df1c8e692 data/c/tags/fluid/molten_invar.json +dd3299e6c1a7465a11aa81e700ad1062d7828831 data/c/tags/fluid/molten_iron.json 61ae09d361b42d730556de9120d2204fa2b8f7be data/c/tags/fluid/molten_lead.json 652fc4077f3642e3f3520ef3f8c77303c5df69c4 data/c/tags/fluid/molten_mercury.json a8262af7b9e8917655dab099e29f06330db32cb4 data/c/tags/fluid/molten_mithril.json 086a3d766d54ede478871b2563e38d5565eb82c2 data/c/tags/fluid/molten_nickel.json +b6cea55466f7b89081166f7a8920fc781bf127dc data/c/tags/fluid/molten_obsidian.json 3990a730c858f48d55ec1f45135b4a9815872c6b data/c/tags/fluid/molten_pewter.json 3cf022acff07503764c2af09374292e6e5c501ba data/c/tags/fluid/molten_platinum.json +cdd6b303dea205a920284f26d3eb214afd879c3b data/c/tags/fluid/molten_prismarine.json +eda0578cfcb9fb9b42d6e0abd8043247e3a6627d data/c/tags/fluid/molten_quartz.json +b2d5d227dd7422d842c410172b25afd3d12b2ace data/c/tags/fluid/molten_redstone.json 46c2980b819cc8af3e541ce119f60b52883e201b data/c/tags/fluid/molten_silver.json 5ec7a8799ccd42479a26eadbf54f2111ae689cb7 data/c/tags/fluid/molten_starsteel.json 29c9e2cd32fb3fc5850215b83d8eeb401f7ad34e data/c/tags/fluid/molten_steel.json @@ -4486,14 +4492,14 @@ a9b55dcc5a8e1289e4a6f2a78927c4fa6bbe032c data/c/tags/item/casings/coldiron.json 5ddba8273f22850ad2a69bce3621286c30760d91 data/c/tags/item/casings/platinum.json 68f16ec05499525aa695de5b40b3b6af6bd9cfc4 data/c/tags/item/casings/starsteel.json c0c8b59dd6c0e63972a2c8738d4fffed1fa224ab data/c/tags/item/casings/zinc.json -5f8cb00f7a0049521b4055a09a4fa746302e72c0 data/c/tags/item/clumps/adamantine.json -82d21874dcf856a1b6033ba899071f2bde17de01 data/c/tags/item/clumps/antimony.json -f8297808e2f42b6012f74bf9d49c1c6160382529 data/c/tags/item/clumps/bismuth.json -893ae76cf6e20407ab8ccfa29d8b346f3b997d86 data/c/tags/item/clumps/coldiron.json -e0499a3c6f1ff710331cb074860d226f32b612da data/c/tags/item/clumps/nickel.json -4ba01b21bffda009d12eee9be6647b349ae7fd82 data/c/tags/item/clumps/platinum.json -7bf2bcdf64658f41ade71762f23d6605ac66595a data/c/tags/item/clumps/starsteel.json -b1bd8a7eba0664616c35a5a8e7a46b783dd74f55 data/c/tags/item/clumps/zinc.json +0b7c508b5841f630309acac21a804b2a9ff7b8a6 data/c/tags/item/clumps/adamantine.json +1c76179cfd7bf508698f297f65821e7550a48145 data/c/tags/item/clumps/antimony.json +9502ee7f17a685cdec65f86222a3161218f86d52 data/c/tags/item/clumps/bismuth.json +819c83eb7340cb7c7353e359b6c5687d672a75c9 data/c/tags/item/clumps/coldiron.json +bb0784ca95abacf78f8830d21c9dc7b663c0de0d data/c/tags/item/clumps/nickel.json +60f3e0a6f5ac7cb34dc891c8ed5480b028687a0e data/c/tags/item/clumps/platinum.json +7b07e7486f764da8cab89f6b8f0bd261e4613eed data/c/tags/item/clumps/starsteel.json +1f974acac2eaa4172742e3a06a9f5b96b59259aa data/c/tags/item/clumps/zinc.json db7ea2acfa595aa5e5677da38bdcb48623885a47 data/c/tags/item/crushed_ores/adamantine.json 142f39f89eb9544d2aa3dc04da05b04647d1c74c data/c/tags/item/crushed_ores/antimony.json ad51af6662a034cbcefbccde6ef3c55c8066d513 data/c/tags/item/crushed_ores/bismuth.json @@ -4502,14 +4508,14 @@ c3a2e76d274d8a574a901ae82066415d610fbdd0 data/c/tags/item/crushed_ores/coldiron. 2b969be6e885dcf971aa8d37b9fe3c1596d6cc3f data/c/tags/item/crushed_ores/platinum.json fab3fb7409767c64cbc113900b9c871dafcaacb7 data/c/tags/item/crushed_ores/starsteel.json 14599c7211c1537dcb0211c6fc1719a4c751ac05 data/c/tags/item/crushed_ores/zinc.json -901e052c7aab1993732c68a632903acc450f02bc data/c/tags/item/crystals/adamantine.json -798820137e925be84e81240f441e4e34acb1aef3 data/c/tags/item/crystals/antimony.json -c7b2418dfdde69787846bf37ca65eae36715ccd6 data/c/tags/item/crystals/bismuth.json -70e39ad2a00e0a8a37556b0a9dd7e4bc6f95a8e6 data/c/tags/item/crystals/coldiron.json -be511fdbfb8357c20c58ea5bcafedc1853405b57 data/c/tags/item/crystals/nickel.json -989d0f7515747fe1b4986dbfcb3cc36175e32fd7 data/c/tags/item/crystals/platinum.json -849d278098202f32fba1259dd81711cdedf74e04 data/c/tags/item/crystals/starsteel.json -52264459cbe7d27624a243002ff9fd84e137b6ea data/c/tags/item/crystals/zinc.json +428a8526bc6637a744db7b884dab59d2da8128d7 data/c/tags/item/crystals/adamantine.json +12a376e4f4409bb205a7bbaad7bcc57c2dba1030 data/c/tags/item/crystals/antimony.json +39cc61be6bdccf3e5a2ce0c19db3ed68b41ac4a1 data/c/tags/item/crystals/bismuth.json +40654a2bfa72ce883beedfafce092bbbd4fe91f8 data/c/tags/item/crystals/coldiron.json +7090d26ee70aaae51d19f16055a54fdff4ebc918 data/c/tags/item/crystals/nickel.json +4849b371c4f3fcd2681cb5645aabed3002aadcaa data/c/tags/item/crystals/platinum.json +148bc33ed24b87f4ba76fd6cd03d880e7f8e9d64 data/c/tags/item/crystals/starsteel.json +c2992a443da447e17bd50417ef85046500e2318b data/c/tags/item/crystals/zinc.json 2a361d141cc23a098bfc9e1757abc33593516bfa data/c/tags/item/dense_plates/adamantine.json ae0c8efc420abca82ff92f210d97d0d6bf7a0b44 data/c/tags/item/dense_plates/antimony.json 165a062434640c502100f59be9ff138549268b4d data/c/tags/item/dense_plates/bismuth.json @@ -4518,14 +4524,14 @@ ae0c8efc420abca82ff92f210d97d0d6bf7a0b44 data/c/tags/item/dense_plates/antimony. 0cea3d034366661b6a75cfaff6232275f2002ae9 data/c/tags/item/dense_plates/platinum.json 186bf5a19c425cca055588822abac4fd62197d23 data/c/tags/item/dense_plates/starsteel.json cbea68e164af3bf895c744fc6a547a8296ef024d data/c/tags/item/dense_plates/zinc.json -5f3b8c82ba0e10d0ddb1e27a6bb20bcdb2ccbb34 data/c/tags/item/dirty_dusts/adamantine.json -e582421055dd74baf0e647607bb560efcd0af45d data/c/tags/item/dirty_dusts/antimony.json -42bf563c5a1e438524f450b5a14ea486da525b44 data/c/tags/item/dirty_dusts/bismuth.json -c9529199e8167106924101528e8cab5414bde428 data/c/tags/item/dirty_dusts/coldiron.json -fd44e78b5099da383319cba620d842e969494db2 data/c/tags/item/dirty_dusts/nickel.json -d965ce078eab2cc718d0d5a4746a2049ac3d0469 data/c/tags/item/dirty_dusts/platinum.json -9710c4624c74f02fba32141cdcae7bd481ddadaf data/c/tags/item/dirty_dusts/starsteel.json -d85c5a9827fc413056772e128e82134640e2ba9f data/c/tags/item/dirty_dusts/zinc.json +bcccc7a46e5b10bae954857f4f62c5d61a6cb083 data/c/tags/item/dirty_dusts/adamantine.json +4ae0cb48cb0f67fea71963adf46cc672bacbaaaf data/c/tags/item/dirty_dusts/antimony.json +8e5c5db2bcb0ad4a8405824ea02bfacd97eadb0d data/c/tags/item/dirty_dusts/bismuth.json +bc255a5b7fe85df88534b17b1b569447e299f674 data/c/tags/item/dirty_dusts/coldiron.json +8f78b22d6cbbe44e79068b22e8f06f5ebb5efe5b data/c/tags/item/dirty_dusts/nickel.json +c2fbbbf3fcff03664fe5e69c1e32046e323f9a57 data/c/tags/item/dirty_dusts/platinum.json +1dcaa8141307ca09d77d8e9a0c3f1d5d8e55fb30 data/c/tags/item/dirty_dusts/starsteel.json +fc946478178b64b7e6fb01fd450b151f1a8e0b2b data/c/tags/item/dirty_dusts/zinc.json a48c6671d8291ad9ad3ece3de2a89605eb11f714 data/c/tags/item/dusts.json d943c4aa28cc47b0db943b7ff51d35ae9da2c8c2 data/c/tags/item/dusts/adamant.json 04026a6e3931cb3cc6a086db2a94f4152788f77a data/c/tags/item/dusts/adamantine.json @@ -4753,14 +4759,14 @@ b818773707a07e0bfc42d781e7fc8c9754426688 data/c/tags/item/rods/quartz.json 757fac8bfa0d003c89e124ea6501c7de7cd13d73 data/c/tags/item/rods/stone.json 79d0b008166df1021f3c10bcd3a6458137ce7300 data/c/tags/item/rods/tin.json b3a349124295ee90c6501a22f5604b66329074bf data/c/tags/item/rods/zinc.json -242373d19c7b7202c89afa80d4f902903466cd2d data/c/tags/item/shards/adamantine.json -245aec5e82c94a80085d81ddfee2ed8960b09ad8 data/c/tags/item/shards/antimony.json -4ab9537b40ab762f60234f19524132b288831c55 data/c/tags/item/shards/bismuth.json -36223da6139be65eebfe9ea26327ceb3460f129a data/c/tags/item/shards/coldiron.json -b59266b7f5913c6dcc53a2d031c04e990a249a50 data/c/tags/item/shards/nickel.json -c558becbbb8025d59e3873c0c46bf4a9a8988237 data/c/tags/item/shards/platinum.json -85a39a2f96c76a6b38490c20e552bf879df9b13a data/c/tags/item/shards/starsteel.json -e9f05197efa691195079554f9fefa24a72f954cd data/c/tags/item/shards/zinc.json +281e5586442389c5f4122100c8a41661aaa2defb data/c/tags/item/shards/adamantine.json +038fa3b32c80ae44b304cfb2942cb29ad149f464 data/c/tags/item/shards/antimony.json +9b32a756efa12855f7c080b7d8575ac6952408a3 data/c/tags/item/shards/bismuth.json +86b39bbfcaf5365af2548934d2a6be4af5b25e5b data/c/tags/item/shards/coldiron.json +dfd075914d172228883775f84c08fa4f192b7b7f data/c/tags/item/shards/nickel.json +5c74fecc49f39ecc9c2edd4ad302b237ea2f3bea data/c/tags/item/shards/platinum.json +bf6642f7fc20a6a4eaaa2d7f14ed813172140d01 data/c/tags/item/shards/starsteel.json +359d368015e3fa1c629e12d5b20c2256b3094a24 data/c/tags/item/shards/zinc.json 549d11eac687eabafadb6e0f05f01d67c63bc4e0 data/c/tags/item/small_blends/aquarium.json f15769e86b6dacb63b4f7a38233aa728a9f18f96 data/c/tags/item/small_blends/brass.json bdc462be341577257e11305ee2655f9e5d80072c data/c/tags/item/small_blends/bronze.json @@ -4871,9 +4877,11 @@ de5bec279f8c3d19d6d2654fbcc2413b0840a1a4 data/mekanism/tags/item/shards/nickel.j ec2b7680fcbc36453938fdb579538c7abd616cac data/mekanism/tags/mekanism/chemical/clean.json ec082a87dca66b5854aa21a856f41e0a95fcb8be data/mekanism/tags/mekanism/chemical/dirty.json 138596b3f5bc477eb5b4c2a8abe341ae92d69517 data/minecraft/tags/block/beacon_base_blocks.json -6a291ced1fcad07d65d7a2fbd7986e4398ee4e42 data/minecraft/tags/block/mineable/pickaxe.json -00279f6a4ede904232414d1c826fea2809e0e108 data/minecraft/tags/block/needs_diamond_tool.json -46a1973280a7d6ae2a1a9a3fea0057bec0b72acc data/minecraft/tags/block/needs_iron_tool.json -5be5f6f8f48e7fcb0ee156c207e19f6b6be579eb data/minecraft/tags/block/needs_stone_tool.json -ff3fdd9e5f36a35c9c97cdefa4828edd6bf60ecf data/minecraft/tags/item/arrows.json +e64dc98dbc3040302641ca2101e7cf6577fc9b38 data/minecraft/tags/block/mineable/pickaxe.json +6cbc5c27b6d25546117b3641537924fad984479c data/minecraft/tags/block/needs_diamond_tool.json +27d7ae03f9d0388d86dfcde4a0314a819e5f1ad3 data/minecraft/tags/block/needs_iron_tool.json +a9962007eda7f8dc2c517c3e3a111b6107834969 data/minecraft/tags/block/needs_stone_tool.json +7f97306e6ec5153fc0463f1bc3bb09a1c85e7db4 data/minecraft/tags/item/arrows.json +f9716f857b1b9101a6a96e1d211aeb69f6e7cc14 data/mmdlib/tags/block/crackhammer_crushable.json +f2901f43fa7b10ba254e946d02999b7e31fe05b6 data/mmdlib/tags/block/scythe_harvestable.json 9fcdc74b31e8dfd426650689e472340c5dc2a953 data/neoforge/loot_modifiers/global_loot_modifiers.json diff --git a/src/generated/resources/.cache/1add663ef95b102012a97731c9740da27c17529e b/src/generated/resources/.cache/1add663ef95b102012a97731c9740da27c17529e index 06dbb91e8..68e200bf5 100644 --- a/src/generated/resources/.cache/1add663ef95b102012a97731c9740da27c17529e +++ b/src/generated/resources/.cache/1add663ef95b102012a97731c9740da27c17529e @@ -1,9 +1,10 @@ -// 1.21.1 2026-10-22T22:06:50.588816682 Block States: basemetals +// 1.21.1 2026-10-29T15:58:30.797871457 Block States: basemetals c3d1a2ae9f43bb4e2df558135cd1f31ecf9a3796 assets/basemetals/blockstates/adamantine_anvil.json 99b32cb975eb6f6c852a028fdbd9ec23b44e864e assets/basemetals/blockstates/adamantine_bars.json e828ed304ebe1b6be38406ee0a26d42c7c1bdea8 assets/basemetals/blockstates/adamantine_block.json 6ed22151d93541f32eadc0691c7b27dfd39ba2d6 assets/basemetals/blockstates/adamantine_button.json 3b28da9d55ffba95232a7d46b9717c0d212b6f2b assets/basemetals/blockstates/adamantine_door.json +bd299dfbcc29c00e22e990e98d1730e36581b201 assets/basemetals/blockstates/adamantine_double_slab.json 12dd71806c4cda519f5799faef9a335f97cf107e assets/basemetals/blockstates/adamantine_lever.json 69f0e2023d655295db400e884c449a59a426bd6d assets/basemetals/blockstates/adamantine_plate.json a06d82a8258cfaa70a802b768530c892382fe8e6 assets/basemetals/blockstates/adamantine_pressure_plate.json @@ -15,6 +16,7 @@ e9651169eecb5c860bf42d50ab478ef462612cb1 assets/basemetals/blockstates/antimony_ 21cfbcb95b885551793a982d91c280107329d7fe assets/basemetals/blockstates/antimony_block.json c71140ab9e8fe53a669427a779386b2ca0d70270 assets/basemetals/blockstates/antimony_button.json 1d8b9ebb21f82a8262094a9970ab961bfd0ee74f assets/basemetals/blockstates/antimony_door.json +94f5e54819778cad81b6e934599bbc4693dc170d assets/basemetals/blockstates/antimony_double_slab.json ee7adbdfb7f5b5af75c84b9342b024128f9da8e8 assets/basemetals/blockstates/antimony_lever.json 4df3e627730ee518798e8e7bb51f383725d232d5 assets/basemetals/blockstates/antimony_plate.json a8f2ab052e5d94de989b1de63b75e8751037f8c2 assets/basemetals/blockstates/antimony_pressure_plate.json @@ -26,6 +28,7 @@ a8f2ab052e5d94de989b1de63b75e8751037f8c2 assets/basemetals/blockstates/antimony_ 369409398b3b4737787dc26d35c43376a92e214d assets/basemetals/blockstates/aquarium_block.json 4466adcb16982dfcd9e87b31d09c49295a9c8382 assets/basemetals/blockstates/aquarium_button.json 9ca50cd5e0a999ac7ecf787de880421cf9c6e409 assets/basemetals/blockstates/aquarium_door.json +34debb7ace93ec716fea85e17f39dce76181dd28 assets/basemetals/blockstates/aquarium_double_slab.json 9c84b42beac95efb21f909e403984b500c402ca4 assets/basemetals/blockstates/aquarium_lever.json 10d9c2564e6f2ff1c5d19b4fb67a1a7774df6adc assets/basemetals/blockstates/aquarium_plate.json 6b206dd2241ee8571e2c86f3d90ac6f44c14b151 assets/basemetals/blockstates/aquarium_pressure_plate.json @@ -37,6 +40,7 @@ f4bd1cccc3f7fbfb49235565a65fbe629845aa65 assets/basemetals/blockstates/aquarium_ 5e17979225301e95462a172001db7e31177e1aff assets/basemetals/blockstates/bismuth_block.json 6421d4046f46f258e67c386b3d6b2d95489a7f99 assets/basemetals/blockstates/bismuth_button.json 437f48dd41789cf924288c7f53c9248a2b0a6583 assets/basemetals/blockstates/bismuth_door.json +bcd9365e83dbcced571e9279ca87a34032d5e3be assets/basemetals/blockstates/bismuth_double_slab.json 30df891eacaff1f992489e80910d2d7980defe5a assets/basemetals/blockstates/bismuth_lever.json c61da86cfad973bff0493d40a4640b8dc2b062e4 assets/basemetals/blockstates/bismuth_plate.json 48845ceee3705f61db3659d7a21200f3a95fda84 assets/basemetals/blockstates/bismuth_pressure_plate.json @@ -48,6 +52,7 @@ a5dd32a4e01995000e9964523f91d86d2461f057 assets/basemetals/blockstates/bismuth_w 824da9772156e2c3552c4fd00f6d274c9782a8c3 assets/basemetals/blockstates/brass_block.json f3a9e656ae0f764286ed61c4c1888033ed59d2a0 assets/basemetals/blockstates/brass_button.json fe10e5eccf9101db5ae9fc8345722ef2056e6d6c assets/basemetals/blockstates/brass_door.json +edebf9553b476410dec8a59dc55e0c18a538eb42 assets/basemetals/blockstates/brass_double_slab.json f535794542067ef2e7aa2fe73d24614a11ed6c37 assets/basemetals/blockstates/brass_lever.json 01c7bbc601070db9537b859f06191a648d3fc8a6 assets/basemetals/blockstates/brass_plate.json 6b5f9582f7b1b1d2bfded48bbc832f4977199984 assets/basemetals/blockstates/brass_pressure_plate.json @@ -59,6 +64,7 @@ f0cfbd274e27ca15aee47d6c888fddfd3830fa27 assets/basemetals/blockstates/brass_wal 35fb52dd8cde78bb95985252f8d1dbf4215c0f06 assets/basemetals/blockstates/bronze_block.json 7eb8175187794e96bbd0105d17017404c6ee4006 assets/basemetals/blockstates/bronze_button.json 69ad980d16079a147fa596e05971cd4df8971d09 assets/basemetals/blockstates/bronze_door.json +b6a8a4dd14d9deaf7b0fe5906957998aa7509d7a assets/basemetals/blockstates/bronze_double_slab.json fc33dc38f1f7a3abfa67304e6ce939f3c73610df assets/basemetals/blockstates/bronze_lever.json bb1ce134a13d66bac9aca984122eab14378f269b assets/basemetals/blockstates/bronze_plate.json 50b1529890d563fe1d6e23c804352f5f16fd633a assets/basemetals/blockstates/bronze_pressure_plate.json @@ -66,11 +72,11 @@ b6a8a4dd14d9deaf7b0fe5906957998aa7509d7a assets/basemetals/blockstates/bronze_sl 9e3dfe378d3ab0dd7bfbb0bb2eac8f40d86ce85d assets/basemetals/blockstates/bronze_stairs.json 51e44cedafcc60b18aaea30258bcc9a84f714b00 assets/basemetals/blockstates/bronze_trapdoor.json b0d067be9f4c564e87b8e33d00f357e63fde1206 assets/basemetals/blockstates/bronze_wall.json -b0bd48bc87e4c28e011088668d38dc19bfb73a43 assets/basemetals/blockstates/charcoal_block.json ddc860011250812126d21503f384151af3321634 assets/basemetals/blockstates/coldiron_bars.json c867215f9038d848bf7e47b6fece4cfa8b6cf07a assets/basemetals/blockstates/coldiron_block.json 5440024b47b8f05f9fbe66e441bc48949d225ed5 assets/basemetals/blockstates/coldiron_button.json 04f59af4db9425db66cf7bff5b373424d1a9b885 assets/basemetals/blockstates/coldiron_door.json +f54f31a54ce1e693983e1c1106f7f60b5724d4e6 assets/basemetals/blockstates/coldiron_double_slab.json 31f41c910a0399d625653de4b6019cfea39dc668 assets/basemetals/blockstates/coldiron_lever.json 2ae83f994877c2e5b9bc8ce069bbd5c2ba6060ff assets/basemetals/blockstates/coldiron_plate.json a4a7dccb8ab7abe104712ac91f34cb29474acc0c assets/basemetals/blockstates/coldiron_pressure_plate.json @@ -82,6 +88,7 @@ a7e52e803405db0380b91e74705e9df721e0a432 assets/basemetals/blockstates/coldiron_ 0bf5deec8aa693f04c409e3cfe9cb7dc78ecfb87 assets/basemetals/blockstates/copper_block.json c892895c3dfc1b7c4aaffabd90c35484ff76e930 assets/basemetals/blockstates/copper_button.json b55d3b0082c9f141123f88b978f74de4db54d93f assets/basemetals/blockstates/copper_door.json +8b952869275fed636c55a1f5ff8b908a0d753be5 assets/basemetals/blockstates/copper_double_slab.json 861e51286ce2e3e3345e16c1e334f27373f272d9 assets/basemetals/blockstates/copper_lever.json fe282ad05bed3fcc64131dd965871e386c256063 assets/basemetals/blockstates/copper_plate.json 3a692729f7541e8cd8560644efe641d8c7402726 assets/basemetals/blockstates/copper_pressure_plate.json @@ -93,6 +100,7 @@ ef128ae115b30d1df28ac7675dfb349e24e52868 assets/basemetals/blockstates/copper_st 3fdffb3dba3f0e2748b46cd1564070b66ef0a39c assets/basemetals/blockstates/cupronickel_block.json 0e613eef1c19ec1ab45d2edc656ab12f73e4208d assets/basemetals/blockstates/cupronickel_button.json b89f8247a7ea53c5f63ba37524e07342d69b3fa8 assets/basemetals/blockstates/cupronickel_door.json +d7fb7445ef085cbc2a6ae94df8f3b68827dc453d assets/basemetals/blockstates/cupronickel_double_slab.json ff7b0aba8be9d23710d9a1a5e2c6f2884b1f92e7 assets/basemetals/blockstates/cupronickel_lever.json e8ca51e8d5a0946eac278d5ef001e1ff2a146d8e assets/basemetals/blockstates/cupronickel_plate.json f8f559c8d0a735639ba2ab006db3299922e91581 assets/basemetals/blockstates/cupronickel_pressure_plate.json @@ -100,45 +108,11 @@ d7fb7445ef085cbc2a6ae94df8f3b68827dc453d assets/basemetals/blockstates/cupronick f539c8ed2685eaacd8edcb2a6b9ebf8f02e1e07d assets/basemetals/blockstates/cupronickel_stairs.json 9122812392c860b61d1ef40bfe0a2f8fbd742975 assets/basemetals/blockstates/cupronickel_trapdoor.json 0f5afc2e3dd20e1b893dc8d9298490f58232d3be assets/basemetals/blockstates/cupronickel_wall.json -fec1e42f5f9cce53f2aef42ed5d9d4c043246e33 assets/basemetals/blockstates/diamond_bars.json -2451765bbfae1dd2dbcc9a934ba81272949b1fed assets/basemetals/blockstates/diamond_button.json -1d58b52b0946376f9728843ed1d8c5965cd62c84 assets/basemetals/blockstates/diamond_door.json -e024f426f3ad6366b4220afbc29d7cf3846c825c assets/basemetals/blockstates/diamond_lever.json -7c3ebe4a952420c34785e2c7a32534e7d8ff4e1a assets/basemetals/blockstates/diamond_pressure_plate.json -ea11cc50c2bee1565b1713984f1dc64fdfb34b7b assets/basemetals/blockstates/diamond_slab.json -b5f384de7fc2ca069a53c6db7442cead76429927 assets/basemetals/blockstates/diamond_stairs.json -d3325ef1481e618384679ea31182372ddc56da97 assets/basemetals/blockstates/diamond_trapdoor.json -82181fb2c011bee9a11517e159323bf86dcc2b8f assets/basemetals/blockstates/diamond_wall.json -bd299dfbcc29c00e22e990e98d1730e36581b201 assets/basemetals/blockstates/double_adamantine_slab.json -94f5e54819778cad81b6e934599bbc4693dc170d assets/basemetals/blockstates/double_antimony_slab.json -34debb7ace93ec716fea85e17f39dce76181dd28 assets/basemetals/blockstates/double_aquarium_slab.json -bcd9365e83dbcced571e9279ca87a34032d5e3be assets/basemetals/blockstates/double_bismuth_slab.json -edebf9553b476410dec8a59dc55e0c18a538eb42 assets/basemetals/blockstates/double_brass_slab.json -b6a8a4dd14d9deaf7b0fe5906957998aa7509d7a assets/basemetals/blockstates/double_bronze_slab.json -f54f31a54ce1e693983e1c1106f7f60b5724d4e6 assets/basemetals/blockstates/double_coldiron_slab.json -8b952869275fed636c55a1f5ff8b908a0d753be5 assets/basemetals/blockstates/double_copper_slab.json -d7fb7445ef085cbc2a6ae94df8f3b68827dc453d assets/basemetals/blockstates/double_cupronickel_slab.json -ea11cc50c2bee1565b1713984f1dc64fdfb34b7b assets/basemetals/blockstates/double_diamond_slab.json -21f2fefaeca859ed09010c12278295ef4540a3cd assets/basemetals/blockstates/double_electrum_slab.json -fef6a63b3b6a20ecf94bf8db6c2afac71ef9e424 assets/basemetals/blockstates/double_emerald_slab.json -976a65a19e74138c3167701f17b895d082b499cf assets/basemetals/blockstates/double_gold_slab.json -bc4696f008c9a14f1200f7088bf946a1495fb935 assets/basemetals/blockstates/double_invar_slab.json -67fcb55108d69b291cb960f63851b84da7ec66e0 assets/basemetals/blockstates/double_iron_slab.json -8735a8ca4785d3927655a3df21ec0541ab9f2f7c assets/basemetals/blockstates/double_lead_slab.json -200ec797f42a5745f8fe11d8d0fe80ebb337017c assets/basemetals/blockstates/double_mithril_slab.json -fa3ed25140bf1b5fc54c9834d55abf32f12ad799 assets/basemetals/blockstates/double_nickel_slab.json -3ae6b7f24000cf18fc06512a1b91c751fd7c8dc6 assets/basemetals/blockstates/double_obsidian_slab.json -036295aed61e6eee22153a79831fc7c25e988665 assets/basemetals/blockstates/double_pewter_slab.json -99840129d522b9d214c827a808c4866487c5fcba assets/basemetals/blockstates/double_platinum_slab.json -efb1244a1554d3e397bf1c083efd2783882c64d9 assets/basemetals/blockstates/double_silver_slab.json -6c40c18576fbc8a8cec0c8ba80cb65a14e11c7ef assets/basemetals/blockstates/double_starsteel_slab.json -500cc2bc41fbf6f0cb77edb624dbb78ee9498e8e assets/basemetals/blockstates/double_steel_slab.json -31cd8604cf5ba7e4a65191d91690658a14705ca2 assets/basemetals/blockstates/double_tin_slab.json -ec22536ca779101500f3f71309ede9b423caacbb assets/basemetals/blockstates/double_zinc_slab.json c64da98cf66b7e765e4e0f883ec26a2a5a6a750a assets/basemetals/blockstates/electrum_bars.json 2bfdc635edbb4c50b311986e510f300f622dbba6 assets/basemetals/blockstates/electrum_block.json 2ff89ab2b09406aa5edc5df75baa88c545a5fbee assets/basemetals/blockstates/electrum_button.json 20ddab114adb751b07f267b708a12df427f4eea0 assets/basemetals/blockstates/electrum_door.json +21f2fefaeca859ed09010c12278295ef4540a3cd assets/basemetals/blockstates/electrum_double_slab.json 96898352b87b7e9873fdd5e339f7ad9a3646914b assets/basemetals/blockstates/electrum_lever.json 9e3134d4b9ee3d0a829d8b08f9c1f9a48491463f assets/basemetals/blockstates/electrum_plate.json 0ed1ea940a590a14a378ab12aae557488426ee01 assets/basemetals/blockstates/electrum_pressure_plate.json @@ -146,29 +120,12 @@ c64da98cf66b7e765e4e0f883ec26a2a5a6a750a assets/basemetals/blockstates/electrum_ a48f83eb314ffc58f449f51c1c8094c563e5334f assets/basemetals/blockstates/electrum_stairs.json 2cfd715ba18cb1235ad532158d80f6d3033d90d4 assets/basemetals/blockstates/electrum_trapdoor.json 081a861710edbb51fb9f8b73cc9070ddf4d0a1a9 assets/basemetals/blockstates/electrum_wall.json -4091a62e3b794436b9751039a164fadc67709e80 assets/basemetals/blockstates/emerald_bars.json -1d162daaf82c183b8655e0e0a3e2ee5e2d6461ef assets/basemetals/blockstates/emerald_button.json -fd4c82055605ffcab244b7b83dca77a08d3a1dcd assets/basemetals/blockstates/emerald_door.json -15456f4f7171baf8fe2637c3e5674310c0e0656d assets/basemetals/blockstates/emerald_lever.json -ad35e022812e2175dd845830236f574545652a28 assets/basemetals/blockstates/emerald_pressure_plate.json -fef6a63b3b6a20ecf94bf8db6c2afac71ef9e424 assets/basemetals/blockstates/emerald_slab.json -17c7162a9c9456b24a41ee86a5aeacf079bf3ba3 assets/basemetals/blockstates/emerald_stairs.json -bb73a8f23ce6a79ee0d6953710757ac5ca2180b5 assets/basemetals/blockstates/emerald_trapdoor.json -063b0e09d935f27964b958b1dc4f45c2c807c0c9 assets/basemetals/blockstates/emerald_wall.json -3d2bbf78f695be303e8c436bc793fd33a99a5519 assets/basemetals/blockstates/gold_bars.json -0dbf73cbe18cd5beeaae82cd8ab282714a9faf02 assets/basemetals/blockstates/gold_button.json -8b2a535bf8d11c900083429b62c15f697c3ae1e6 assets/basemetals/blockstates/gold_door.json -0c9e0560f11b66c86ad00625d8b9cb5844fae82e assets/basemetals/blockstates/gold_lever.json -f88f4f39d51377e857da03c069149a0f966b27fe assets/basemetals/blockstates/gold_plate.json -976a65a19e74138c3167701f17b895d082b499cf assets/basemetals/blockstates/gold_slab.json -6f759ba08aafee23c814c13954226e5165021bf1 assets/basemetals/blockstates/gold_stairs.json -64f2a4f8bd29c3ebce0853172a463136d5bfa252 assets/basemetals/blockstates/gold_trapdoor.json -fafdee34158de6c9ce5aaee399afad84af39dba8 assets/basemetals/blockstates/gold_wall.json e3795b9ba1b3d2afcff97702e4970c5ca92e5a15 assets/basemetals/blockstates/human_detector.json ffa37a1761eda689cebee0f9970c5d0d98397542 assets/basemetals/blockstates/invar_bars.json 5fcab928e668fbf9f54ec1e1f7de05d2fe25c46e assets/basemetals/blockstates/invar_block.json ba454d7db8cc9fd9d05ccb3f456cc5420eee657a assets/basemetals/blockstates/invar_button.json 66a83d62788bccdbf3239b6a07e7a24489def5ac assets/basemetals/blockstates/invar_door.json +bc4696f008c9a14f1200f7088bf946a1495fb935 assets/basemetals/blockstates/invar_double_slab.json 2caed502432610b7dbb28b56cb90f114fe8577dc assets/basemetals/blockstates/invar_lever.json 606d819b7a9cf25a5f468d3b8405b0dbab9c0e70 assets/basemetals/blockstates/invar_plate.json eb05b147b64955a8846e9ce81c7fff0a7b70d880 assets/basemetals/blockstates/invar_pressure_plate.json @@ -176,16 +133,11 @@ bc4696f008c9a14f1200f7088bf946a1495fb935 assets/basemetals/blockstates/invar_sla c807e33b78dd338498d1929aa4b194e5d28a2950 assets/basemetals/blockstates/invar_stairs.json f83be807401368968f3a8cb28f2d87b5637654c6 assets/basemetals/blockstates/invar_trapdoor.json fcc7ce2d29fe6843ac8ebe86588993f0ded77fa2 assets/basemetals/blockstates/invar_wall.json -3a60f457f4d5606289117b360a7996ee83d72f1c assets/basemetals/blockstates/iron_button.json -38a05a1359395cd2727555fcf4638429084ed298 assets/basemetals/blockstates/iron_lever.json -e944b46083365c6bf17113cef550cf837c0d7db4 assets/basemetals/blockstates/iron_plate.json -67fcb55108d69b291cb960f63851b84da7ec66e0 assets/basemetals/blockstates/iron_slab.json -e1266fffd45731609776edf45514daf2f242d569 assets/basemetals/blockstates/iron_stairs.json -4c07a58d309a20ee52c7d9333e4c15cad303632d assets/basemetals/blockstates/iron_wall.json 05cb494805fc6df6c583c521462ba218d3fd0902 assets/basemetals/blockstates/lead_bars.json da16b4caebff7656a8dfdd65492d8a7b473217fe assets/basemetals/blockstates/lead_block.json f25d95952f5b55665f23ae6b2b49bfc26d535c52 assets/basemetals/blockstates/lead_button.json 5622e208f031a578b8af16375998c5f9bae6663f assets/basemetals/blockstates/lead_door.json +8735a8ca4785d3927655a3df21ec0541ab9f2f7c assets/basemetals/blockstates/lead_double_slab.json 17a39d310304bc0e08852abda5da66e63157da08 assets/basemetals/blockstates/lead_lever.json 676a0b23e1812615dc555a837ef47e1cb00c4e18 assets/basemetals/blockstates/lead_plate.json c6b26a18a673f30de88ba288c9ebd2c19031102b assets/basemetals/blockstates/lead_pressure_plate.json @@ -197,6 +149,7 @@ df2c0d09097a7be79f1b193b0173e2c25f2394aa assets/basemetals/blockstates/mithril_b f2c8bbf441bd82f78b09217ad3adaaf9e15154ec assets/basemetals/blockstates/mithril_block.json 5cc1c0bc53ae1ddb113cb30d59fdc823458337ad assets/basemetals/blockstates/mithril_button.json 032f4c87e4739164a63886451b9548c98721339a assets/basemetals/blockstates/mithril_door.json +200ec797f42a5745f8fe11d8d0fe80ebb337017c assets/basemetals/blockstates/mithril_double_slab.json 12893053948fecae23f91447becc346eb1dc338e assets/basemetals/blockstates/mithril_lever.json a9886c5ed8fb33b3a2f9e4ba9d9e58e6cb7c671c assets/basemetals/blockstates/mithril_plate.json 8bdcee91e1643d93ac6475b8babd323140e2e521 assets/basemetals/blockstates/mithril_pressure_plate.json @@ -208,6 +161,7 @@ bb9aa60af58b8a1aeea18cf03b7218fcd3a4f4c8 assets/basemetals/blockstates/mithril_t f5564fdedb4ee5569e3caf1a56ed7e596ef556f9 assets/basemetals/blockstates/nickel_block.json 29b4130863eda02dd1e963d8c245afdf0d063db1 assets/basemetals/blockstates/nickel_button.json fe1e35573223f480c8f89f7fb54abc741ae472ff assets/basemetals/blockstates/nickel_door.json +fa3ed25140bf1b5fc54c9834d55abf32f12ad799 assets/basemetals/blockstates/nickel_double_slab.json 1da464676e320241a140501d2c914346e1ffdd7d assets/basemetals/blockstates/nickel_lever.json cf354354f6aa0b6b3cfe4d688818617093827a2a assets/basemetals/blockstates/nickel_plate.json 9774054d5f8b25aebd9cd88c41268ad2ec538cde assets/basemetals/blockstates/nickel_pressure_plate.json @@ -215,19 +169,11 @@ fa3ed25140bf1b5fc54c9834d55abf32f12ad799 assets/basemetals/blockstates/nickel_sl 6754e3d8ff233070744de5bbcdd09d7984cec6f3 assets/basemetals/blockstates/nickel_stairs.json 926ac5a10f194d935f614ca42a32b28d380932e2 assets/basemetals/blockstates/nickel_trapdoor.json 6f78dfae74fa69fb314420453f81b21e8b339db7 assets/basemetals/blockstates/nickel_wall.json -ded3bb1fe5b14840c384bbe0845836decab6f5c2 assets/basemetals/blockstates/obsidian_bars.json -6dd391a27e8b6ef4499929d49143270903f80386 assets/basemetals/blockstates/obsidian_button.json -15853b01c39ffdc9cea199c9f04732dae2213d5a assets/basemetals/blockstates/obsidian_door.json -4d01a5e54b3ad4a263404c32064999165d47c07d assets/basemetals/blockstates/obsidian_lever.json -245f8e2c6266f97bdc64270f5068e92d51f20adc assets/basemetals/blockstates/obsidian_pressure_plate.json -3ae6b7f24000cf18fc06512a1b91c751fd7c8dc6 assets/basemetals/blockstates/obsidian_slab.json -50c268d8a8248b3bb5427fb399b56c48d2ec52d3 assets/basemetals/blockstates/obsidian_stairs.json -bbb5ce03ef921982035e86793a442a5242d6ef82 assets/basemetals/blockstates/obsidian_trapdoor.json -da21b42df80d67cc1f9ded13ffb480268b5a19ea assets/basemetals/blockstates/obsidian_wall.json 7a377c7c169e1fb5d50cb802da8b6af8218fc6a1 assets/basemetals/blockstates/pewter_bars.json 02670b481f3dfaae7d9d569d499e544f82b53e0a assets/basemetals/blockstates/pewter_block.json a7827cfd9d20cdcb1a126f13a0d24d1f791000e9 assets/basemetals/blockstates/pewter_button.json 56a7a97fac11144154f22e000a5830a1f0660a80 assets/basemetals/blockstates/pewter_door.json +036295aed61e6eee22153a79831fc7c25e988665 assets/basemetals/blockstates/pewter_double_slab.json 05030ac79b195851e90ff78c7c60f9a487623bbb assets/basemetals/blockstates/pewter_lever.json fcb0194332452d30bd0ac044bf70d91575dbb90f assets/basemetals/blockstates/pewter_plate.json ff8bae993ff55f23c044b7e7699b74c6af00ef0b assets/basemetals/blockstates/pewter_pressure_plate.json @@ -239,6 +185,7 @@ ff8bae993ff55f23c044b7e7699b74c6af00ef0b assets/basemetals/blockstates/pewter_pr b122a5ee92d30801eb6527675507fbf0a0d41954 assets/basemetals/blockstates/platinum_block.json a08721848acd117754d03e57d727bc991ba3722b assets/basemetals/blockstates/platinum_button.json 976f800c3eab126ec38eb51b37020b6e0390931d assets/basemetals/blockstates/platinum_door.json +99840129d522b9d214c827a808c4866487c5fcba assets/basemetals/blockstates/platinum_double_slab.json a4801a7ef4caaeaf9382bb85336b811ec929170d assets/basemetals/blockstates/platinum_lever.json 3d9c961581d95587e53331aa6835777a4698c98a assets/basemetals/blockstates/platinum_plate.json 73285783708b5512bca301d2ef5a2f6763162901 assets/basemetals/blockstates/platinum_pressure_plate.json @@ -246,17 +193,11 @@ a4801a7ef4caaeaf9382bb85336b811ec929170d assets/basemetals/blockstates/platinum_ 9e45bfe80693eeef7397674f3057f39463583cd8 assets/basemetals/blockstates/platinum_stairs.json 291b588a6b5b2ee513e7144eacef24c9d905a164 assets/basemetals/blockstates/platinum_trapdoor.json e9b02e63da91f01032b6d75ba85f7514cf91af47 assets/basemetals/blockstates/platinum_wall.json -d58ecdae344825123908d787305afdade1f65f57 assets/basemetals/blockstates/quartz_bars.json -1f9e65f0a912dab39ad27474861a08a00b701054 assets/basemetals/blockstates/quartz_button.json -e2077306bce63a26f01e11859151c1e76191cd9f assets/basemetals/blockstates/quartz_door.json -866fd3a52b656af59358bfc7682dd103a0c27283 assets/basemetals/blockstates/quartz_lever.json -25de5f47017a4530844826f1dbff9f43fa829e8c assets/basemetals/blockstates/quartz_pressure_plate.json -55ec1c114fe239ef552831cbc61ddb405bdcc352 assets/basemetals/blockstates/quartz_trapdoor.json -fecc8b5cdae38da567878304f0520a4813f7c87f assets/basemetals/blockstates/quartz_wall.json 881c3b64e208e9f587cebb1cdc7f937b09515c93 assets/basemetals/blockstates/silver_bars.json b7211bc958cd0693e95edd19d62ba9ebc4007a2c assets/basemetals/blockstates/silver_block.json c065dd0841aa844523122bfa16d55dfa6093d9e4 assets/basemetals/blockstates/silver_button.json a37cebfbb3104c6ccbd21a8f80b738af5db4c1d2 assets/basemetals/blockstates/silver_door.json +efb1244a1554d3e397bf1c083efd2783882c64d9 assets/basemetals/blockstates/silver_double_slab.json 870bc26748438b5f5a3864c671dd55732bb39739 assets/basemetals/blockstates/silver_lever.json aeda3b543ea34404b26b932d466ef41eda861464 assets/basemetals/blockstates/silver_plate.json 4d1402c861cae71fdc5c79fef5608e9110154795 assets/basemetals/blockstates/silver_pressure_plate.json @@ -268,6 +209,7 @@ ffb5d4e4b8235740903036e9cdb7a1117d1c3cc0 assets/basemetals/blockstates/silver_wa 236c14195a7004e0efa41b4c460402956f883ae0 assets/basemetals/blockstates/starsteel_block.json f192b4b65bbe9a5b78fbb0749800d6ccc64ac13f assets/basemetals/blockstates/starsteel_button.json 0d3176588a19b16f83f0bd530bb7ba843a9e178b assets/basemetals/blockstates/starsteel_door.json +6c40c18576fbc8a8cec0c8ba80cb65a14e11c7ef assets/basemetals/blockstates/starsteel_double_slab.json 7bb98a45009d17288c2d71875ed69367c6d6743a assets/basemetals/blockstates/starsteel_lever.json 0998ee819680cdb9d2f85b24b06e752e9700b8c2 assets/basemetals/blockstates/starsteel_plate.json 4c8adfb3ae930e748ed139ff377153eacc6262e7 assets/basemetals/blockstates/starsteel_pressure_plate.json @@ -280,6 +222,7 @@ b0b08af65579277814d1b825246cf6e0ee6f669f assets/basemetals/blockstates/steel_bar fdd478b6e286789b83a4e1aad4328027eb9e1fe1 assets/basemetals/blockstates/steel_block.json 6de36dc41dafbc57a25e9c09ec6fd3244e88c6c5 assets/basemetals/blockstates/steel_button.json e1f82d40228eeb60709b9b5aebb98d4713e003a1 assets/basemetals/blockstates/steel_door.json +500cc2bc41fbf6f0cb77edb624dbb78ee9498e8e assets/basemetals/blockstates/steel_double_slab.json 6402b0505f8191bb6eaa23ab257d124a70e47305 assets/basemetals/blockstates/steel_lever.json bb30b61a7b6dbc7acb70613fd245a265b2f4ae00 assets/basemetals/blockstates/steel_plate.json 3b3ae6613fdb7e0534047fad104409f6e687f2ff assets/basemetals/blockstates/steel_pressure_plate.json @@ -292,6 +235,7 @@ fdb83b6bd0e2fef251228b753bc2c9f83da93465 assets/basemetals/blockstates/tin_bars. a05a18959a82ee60be161ab1bc3f46f54ffec102 assets/basemetals/blockstates/tin_block.json 0d73d587f945012cbc67a437a8cb2a8418d142af assets/basemetals/blockstates/tin_button.json c8a541256a8dd400fab8abd8954806e97e795f20 assets/basemetals/blockstates/tin_door.json +31cd8604cf5ba7e4a65191d91690658a14705ca2 assets/basemetals/blockstates/tin_double_slab.json f468ca15a511fca7925f40899544da79d6ce9645 assets/basemetals/blockstates/tin_lever.json 404b93e2d28972b5e54d8476a2ae1282ab548996 assets/basemetals/blockstates/tin_plate.json 1a5c5474a098d9946b694eb37084f74a872761fb assets/basemetals/blockstates/tin_pressure_plate.json @@ -303,6 +247,7 @@ f468ca15a511fca7925f40899544da79d6ce9645 assets/basemetals/blockstates/tin_lever cfae3c9ee954bcbe2fd482ab7919d572d49913f0 assets/basemetals/blockstates/zinc_block.json f966098d72a26b9196d6c5fd16f1e802e39a6b64 assets/basemetals/blockstates/zinc_button.json af2e90284c2777ae5d05f96965e22926c9f708e5 assets/basemetals/blockstates/zinc_door.json +ec22536ca779101500f3f71309ede9b423caacbb assets/basemetals/blockstates/zinc_double_slab.json e8ed647b95f3b3b50a8037d11703d50ffbbb8bcd assets/basemetals/blockstates/zinc_lever.json fb5d75bd6a86fe2555bebb9054b77c619153f61e assets/basemetals/blockstates/zinc_plate.json 55fd1dbff147dc4205509ce5d297e726ce16efea assets/basemetals/blockstates/zinc_pressure_plate.json @@ -400,16 +345,6 @@ b023ae5300033054043fb39758d2ef71209250e9 assets/basemetals/models/block/cupronic 8c08c72827cc1aef166e5dfeb6d9ac3d02e5f7fa assets/basemetals/models/block/cupronickel_door_top_right.json be8ea58cd1b875c39ea997bfeb4ddd37ec3c6e64 assets/basemetals/models/block/cupronickel_door_top_right_open.json dc02e6acd6b5025cf843d93f6eb8b99cbbe6beae assets/basemetals/models/block/cupronickel_wall_side_tall.json -d892f5d8690c96626fac3974729d9f62db1730d2 assets/basemetals/models/block/diamond_bars_post_ends.json -6b7184c6acd56355d76dded2a74841e7bc2dc2d4 assets/basemetals/models/block/diamond_door_bottom_left.json -74f75ce21b2af4f3baa329d123b74374f23c84ab assets/basemetals/models/block/diamond_door_bottom_left_open.json -98b31ddf114c943e73ad271a3a10c85353c52138 assets/basemetals/models/block/diamond_door_bottom_right.json -d7f642cf9cf5c0482721af89ddc52cc3b4b27b4a assets/basemetals/models/block/diamond_door_bottom_right_open.json -4613aa5703eadffad2ab7186ccde297e4c916c47 assets/basemetals/models/block/diamond_door_top_left.json -7f2bf472feae14498c3c62894130bf9addddbaf5 assets/basemetals/models/block/diamond_door_top_left_open.json -19c4b13c3b39b83ed17e1d5dec8c1685fed8f72a assets/basemetals/models/block/diamond_door_top_right.json -acf8e9ab972ec88b52b8fbc5ee5e852d9b5d7125 assets/basemetals/models/block/diamond_door_top_right_open.json -49ff3ef049925b0feb4b235074d276706ae2f6e4 assets/basemetals/models/block/diamond_wall_side_tall.json ef2b91c97125919b0e6caa3cf790d8f940a14570 assets/basemetals/models/block/electrum_bars_post_ends.json 6a74d6d497276210053c6aa51df847f863fe6266 assets/basemetals/models/block/electrum_door_bottom_left.json e1291e2a44ef6d49e726e6e8c3339e94d0afe37e assets/basemetals/models/block/electrum_door_bottom_left_open.json @@ -420,26 +355,6 @@ b982f5ff22c1cd58036a9e4440e4aef4778d95ff assets/basemetals/models/block/electrum 400bf6cc2d44f3902da742329039f51f9ca76054 assets/basemetals/models/block/electrum_door_top_right.json 88d5a81ccd261d45c75cdbe45192d895eb4b49de assets/basemetals/models/block/electrum_door_top_right_open.json a36fc3675caf86ace84d4216dd1fa6bd3784a2c2 assets/basemetals/models/block/electrum_wall_side_tall.json -07f86fbae6b198517f545c308f2fce1ad4eddf03 assets/basemetals/models/block/emerald_bars_post_ends.json -2a5250c2e93416c8b8e02e1c9482f6b2410b9d39 assets/basemetals/models/block/emerald_door_bottom_left.json -2d8f2ff07f4c53ac48fae1d6bcdaccf9c5f70be3 assets/basemetals/models/block/emerald_door_bottom_left_open.json -891c670657d07a025b15353a83695f58ffb165b7 assets/basemetals/models/block/emerald_door_bottom_right.json -ae575cd8a53804d084798bdf8dafb8baa7536137 assets/basemetals/models/block/emerald_door_bottom_right_open.json -efe10eaca3f3010cdce6f7d9a8d16a8248ffb93a assets/basemetals/models/block/emerald_door_top_left.json -27a4b93471a7b7975242d6e4b3e3801998b210f4 assets/basemetals/models/block/emerald_door_top_left_open.json -02859513aeab6014aa35e1f4981a57ba0c512442 assets/basemetals/models/block/emerald_door_top_right.json -0f5aa220802ff0d2c46f153318bf469ef118862c assets/basemetals/models/block/emerald_door_top_right_open.json -ba31083373840abb9b32fa09e04efb1c55134f3c assets/basemetals/models/block/emerald_wall_side_tall.json -2552ecc148f834bcac5f535ee9c3aef2b2efa976 assets/basemetals/models/block/gold_bars_post_ends.json -2d258d5a1d09a248051883c1315bf27684cb7688 assets/basemetals/models/block/gold_door_bottom_left.json -7a281b8632af28c08527cc3fd88e2b29360d137a assets/basemetals/models/block/gold_door_bottom_left_open.json -e3237ac022bfc07510c779c60dfda8da9dd908a3 assets/basemetals/models/block/gold_door_bottom_right.json -eca0bb93ded3554f09ab9080089ec199c3d69aa8 assets/basemetals/models/block/gold_door_bottom_right_open.json -7cb5e3d21948667da653e673f3789d36a44c8786 assets/basemetals/models/block/gold_door_top_left.json -9d3b51d560f113716619d93071c23a9f6471e54f assets/basemetals/models/block/gold_door_top_left_open.json -5a8362ed1261f836294e92b0054b1da1e4ee91cd assets/basemetals/models/block/gold_door_top_right.json -ecae73390923d50044f2fa586f54390baf1801b7 assets/basemetals/models/block/gold_door_top_right_open.json -88d11fca8d09c175236bc20637d93601b5126063 assets/basemetals/models/block/gold_wall_side_tall.json 2bb7d2129da0ed81dc26051f7c004f751597fdd7 assets/basemetals/models/block/invar_bars_post_ends.json 8ec3a89721bf1fcfe7699cfdea1ff069241dfd9e assets/basemetals/models/block/invar_door_bottom_left.json 51fd41f5b23c209da17888ed3a44b0282ae4a49b assets/basemetals/models/block/invar_door_bottom_left_open.json @@ -450,7 +365,6 @@ ef4011657eebba819aca80b9824975055b83fb34 assets/basemetals/models/block/invar_do 300cf74b9bdf5fef0b896b9b401014b0c8d71cc0 assets/basemetals/models/block/invar_door_top_right.json 1704e05389bd9b7b9e9b41a08e4e32d8059a0047 assets/basemetals/models/block/invar_door_top_right_open.json addddb9b86284d58e84be4a981461562720d8fd7 assets/basemetals/models/block/invar_wall_side_tall.json -51d35bf3304e90d2c7567abdc37a6ee3e035dfc3 assets/basemetals/models/block/iron_wall_side_tall.json ba4ff10d9e2edc9e48f2731680369e981b53e94f assets/basemetals/models/block/lead_bars_post_ends.json 3b071b82f06eaabd7a44215b19154d53b4ba38f4 assets/basemetals/models/block/lead_door_bottom_left.json eb8cdeb85298591f5b95a23ef5ecdec75677bf7b assets/basemetals/models/block/lead_door_bottom_left_open.json @@ -481,16 +395,6 @@ b700302abec37f292ea4aaf37faa2174c5e54bdd assets/basemetals/models/block/nickel_d ff3c34899741b1e4a8a7df55fec01b89a67980f1 assets/basemetals/models/block/nickel_door_top_right.json b371cae3b241dbcf19c8c31565c7031fcd7cd875 assets/basemetals/models/block/nickel_door_top_right_open.json 72db6dfb792e08c63bbac205580134b53ede2f8e assets/basemetals/models/block/nickel_wall_side_tall.json -0cf8e17bbe70f110797d98a4548d5532a07a850b assets/basemetals/models/block/obsidian_bars_post_ends.json -fc57375e4b2dca2e5440b003b6ce30c044a4b766 assets/basemetals/models/block/obsidian_door_bottom_left.json -97e8b95f4cc6f13d0a060f8313352da22caaff1b assets/basemetals/models/block/obsidian_door_bottom_left_open.json -121956c6dfd5a27748c9e89c5d3be5593c33a11f assets/basemetals/models/block/obsidian_door_bottom_right.json -8ac4c11ebc7046ecad57c0a026c0dfbbc2bc3c86 assets/basemetals/models/block/obsidian_door_bottom_right_open.json -6c29fe8a99a40a68835a79475143e3f81bf10a29 assets/basemetals/models/block/obsidian_door_top_left.json -019519856d75d0f5e8c141c4f29f03e041e7c6a9 assets/basemetals/models/block/obsidian_door_top_left_open.json -9892a7ee6ad558a5ba0c297617bcac9816e5d31c assets/basemetals/models/block/obsidian_door_top_right.json -c71edc2179673976b18b34c36d0046e0256762fd assets/basemetals/models/block/obsidian_door_top_right_open.json -277e105e99aea5dd34f0e613fe88403e3520db53 assets/basemetals/models/block/obsidian_wall_side_tall.json 11432c4faf8aeac9cb653846793f617bd9c44d6f assets/basemetals/models/block/pewter_bars_post_ends.json bc47723e7384bca2cb80984fbe24c15df110a09d assets/basemetals/models/block/pewter_door_bottom_left.json 059b7aa16c91341639faf2d472a4b9ef44a70730 assets/basemetals/models/block/pewter_door_bottom_left_open.json @@ -511,16 +415,6 @@ d9d797c1800304d6566c5eb8f981699e0d93bc60 assets/basemetals/models/block/platinum 45db768325e85ad0323e0da8d59382f523eae2b6 assets/basemetals/models/block/platinum_door_top_right.json 82c074fd062e5cc490c83c88045745c324b940e6 assets/basemetals/models/block/platinum_door_top_right_open.json 5c800343e66275f2a48d53626e0e06d01410f681 assets/basemetals/models/block/platinum_wall_side_tall.json -acd9b8802cd4f203262a60e2beb42252baddb509 assets/basemetals/models/block/quartz_bars_post_ends.json -8822e73eea028820589ec8700d3737bbe749fa7e assets/basemetals/models/block/quartz_door_bottom_left.json -9ed3f8f3a416839e60042b45824c472530847902 assets/basemetals/models/block/quartz_door_bottom_left_open.json -c2ccbfbb4eb3961be686a8818839c9ad20597eb0 assets/basemetals/models/block/quartz_door_bottom_right.json -73bff599039153d883a516a440e765c28fad7cc7 assets/basemetals/models/block/quartz_door_bottom_right_open.json -670af9c36cd1f1a946184b83a80a08bf232db1e1 assets/basemetals/models/block/quartz_door_top_left.json -11f796d9f2dcc536b34320648a8197ea4dc1c702 assets/basemetals/models/block/quartz_door_top_left_open.json -241f436b5c9215e4bf7ee48804bde863cdf0c5a0 assets/basemetals/models/block/quartz_door_top_right.json -cf24a651f2b31e2b5fb26fedcac92dc22e8d5615 assets/basemetals/models/block/quartz_door_top_right_open.json -0c779ed3ba8fda15f98aaf5b866f26afafb8122f assets/basemetals/models/block/quartz_wall_side_tall.json f53a7ace7f1e26eb56fe1fc272106eda2d4e7102 assets/basemetals/models/block/silver_bars_post_ends.json 61a62bbf1ae00f3e41e577f01bcb035e4acd73d5 assets/basemetals/models/block/silver_door_bottom_left.json 0c5baed719d5ad0eab94b87eac616fd407827a3e assets/basemetals/models/block/silver_door_bottom_left_open.json diff --git a/src/generated/resources/.cache/6b8a9abf7d0ac2e8d9148a76abdbf1523afff253 b/src/generated/resources/.cache/6b8a9abf7d0ac2e8d9148a76abdbf1523afff253 index 5a79a8b25..b7871c83c 100644 --- a/src/generated/resources/.cache/6b8a9abf7d0ac2e8d9148a76abdbf1523afff253 +++ b/src/generated/resources/.cache/6b8a9abf7d0ac2e8d9148a76abdbf1523afff253 @@ -1,4 +1,4 @@ -// 1.21.1 2026-10-22T22:06:50.587057192 Item Models: basemetals +// 1.21.1 2026-11-11T07:50:25.997263861 Item Models: basemetals 78168678a8799ce97ef23476d3b8a2407d0cc352 assets/basemetals/models/item/adamantine.json 48156136fce119acebab42f0ae6cd3f61ae8dbb4 assets/basemetals/models/item/adamantine_bucket.json 3cb598145d7445c43f54957d4953c8a7540e2f18 assets/basemetals/models/item/adamantine_raw.json @@ -26,9 +26,7 @@ ce60072a1c9a2a02b797cd4d0a7c352defa626a4 assets/basemetals/models/item/copper_bu 78168678a8799ce97ef23476d3b8a2407d0cc352 assets/basemetals/models/item/cupronickel.json a646dde1584d6f36fae7c6ec38336916b70c6fa2 assets/basemetals/models/item/cupronickel_bucket.json 78168678a8799ce97ef23476d3b8a2407d0cc352 assets/basemetals/models/item/diamond.json -1ab54b658ae7ac7259ae54d25faba8454291682d assets/basemetals/models/item/diamond_blend.json 02ba0390bbd4564b037c02ce6e93ad5966ce6af5 assets/basemetals/models/item/diamond_bucket.json -28c1829755fd40ce7d2791cfab4887b1694e4d9d assets/basemetals/models/item/diamond_smallblend.json 78168678a8799ce97ef23476d3b8a2407d0cc352 assets/basemetals/models/item/electrum.json 16325925ca849b50b8a37500ff8b02d43669b00c assets/basemetals/models/item/electrum_bucket.json 78168678a8799ce97ef23476d3b8a2407d0cc352 assets/basemetals/models/item/emerald.json @@ -36,17 +34,11 @@ a646dde1584d6f36fae7c6ec38336916b70c6fa2 assets/basemetals/models/item/cupronick 78168678a8799ce97ef23476d3b8a2407d0cc352 assets/basemetals/models/item/ender.json 64724cb850e5382d72ee872ee397a959691f32e2 assets/basemetals/models/item/ender_bucket.json 78168678a8799ce97ef23476d3b8a2407d0cc352 assets/basemetals/models/item/gold.json -c4c48c7f685f7dad1495277e55d59a3fe3c6d4a0 assets/basemetals/models/item/gold_blend.json 468d6108faec4f3442800a14e61880f245e99556 assets/basemetals/models/item/gold_bucket.json -232024519f9ab39d0180542b0324c34ee86aa4ae assets/basemetals/models/item/gold_smallblend.json 78168678a8799ce97ef23476d3b8a2407d0cc352 assets/basemetals/models/item/invar.json 99d01920c8141e89f876492ba9b5e9e3492dce48 assets/basemetals/models/item/invar_bucket.json 78168678a8799ce97ef23476d3b8a2407d0cc352 assets/basemetals/models/item/iron.json -5a8b3c691a56af269ead355d558ddf52f5f1b540 assets/basemetals/models/item/iron_blend.json 177e722850ca798d67528c9b330c3d9dbb53aade assets/basemetals/models/item/iron_bucket.json -a7f2ee2c33d1c2d2194bcb74be02d5120beed873 assets/basemetals/models/item/iron_smallblend.json -78168678a8799ce97ef23476d3b8a2407d0cc352 assets/basemetals/models/item/lapis.json -00e4336ed9bea0b7be5be3457ab38f2baabbf783 assets/basemetals/models/item/lapis_bucket.json 78168678a8799ce97ef23476d3b8a2407d0cc352 assets/basemetals/models/item/lead.json 0d9c3411cb64ffccb3828a2b5dbcd92d61c06bfa assets/basemetals/models/item/lead_bucket.json 815c0c1b72b759c686a992339f1f84e43ceef4d6 assets/basemetals/models/item/lead_raw.json @@ -79,13 +71,9 @@ d69eddeaed322ca07e0dac75f52d61c2164d32cc assets/basemetals/models/item/silver_ra 9604c58feabc4afefb4f720c70789fc2e8ce5c15 assets/basemetals/models/item/starsteel_raw.json 78168678a8799ce97ef23476d3b8a2407d0cc352 assets/basemetals/models/item/steel.json 6fe22e1301cb38cf40d0dbc836b9e8f660d93e46 assets/basemetals/models/item/steel_bucket.json -78168678a8799ce97ef23476d3b8a2407d0cc352 assets/basemetals/models/item/stone.json -20c8874eb9aa759c403e2429116cbe3266adce19 assets/basemetals/models/item/stone_bucket.json 78168678a8799ce97ef23476d3b8a2407d0cc352 assets/basemetals/models/item/tin.json 394892859277c089933f853b6807215054a56237 assets/basemetals/models/item/tin_bucket.json f0db2e5fd172c6f5a127bb331864bc237195e4de assets/basemetals/models/item/tin_raw.json -78168678a8799ce97ef23476d3b8a2407d0cc352 assets/basemetals/models/item/wood.json -b639035438ff46949f65c235fa1ae19826b6f708 assets/basemetals/models/item/wood_bucket.json 78168678a8799ce97ef23476d3b8a2407d0cc352 assets/basemetals/models/item/zinc.json 027ce239f921f580ddb4e45f9218f68ce258c92a assets/basemetals/models/item/zinc_bucket.json 9813b65391dd6664397203c1da0d241c35f9b995 assets/basemetals/models/item/zinc_raw.json diff --git a/src/generated/resources/assets/basemetals/blockstates/double_adamantine_slab.json b/src/generated/resources/assets/basemetals/blockstates/adamantine_double_slab.json similarity index 100% rename from src/generated/resources/assets/basemetals/blockstates/double_adamantine_slab.json rename to src/generated/resources/assets/basemetals/blockstates/adamantine_double_slab.json diff --git a/src/generated/resources/assets/basemetals/blockstates/double_antimony_slab.json b/src/generated/resources/assets/basemetals/blockstates/antimony_double_slab.json similarity index 100% rename from src/generated/resources/assets/basemetals/blockstates/double_antimony_slab.json rename to src/generated/resources/assets/basemetals/blockstates/antimony_double_slab.json diff --git a/src/generated/resources/assets/basemetals/blockstates/double_aquarium_slab.json b/src/generated/resources/assets/basemetals/blockstates/aquarium_double_slab.json similarity index 100% rename from src/generated/resources/assets/basemetals/blockstates/double_aquarium_slab.json rename to src/generated/resources/assets/basemetals/blockstates/aquarium_double_slab.json diff --git a/src/generated/resources/assets/basemetals/blockstates/double_bismuth_slab.json b/src/generated/resources/assets/basemetals/blockstates/bismuth_double_slab.json similarity index 100% rename from src/generated/resources/assets/basemetals/blockstates/double_bismuth_slab.json rename to src/generated/resources/assets/basemetals/blockstates/bismuth_double_slab.json diff --git a/src/generated/resources/assets/basemetals/blockstates/double_brass_slab.json b/src/generated/resources/assets/basemetals/blockstates/brass_double_slab.json similarity index 100% rename from src/generated/resources/assets/basemetals/blockstates/double_brass_slab.json rename to src/generated/resources/assets/basemetals/blockstates/brass_double_slab.json diff --git a/src/generated/resources/assets/basemetals/blockstates/double_bronze_slab.json b/src/generated/resources/assets/basemetals/blockstates/bronze_double_slab.json similarity index 100% rename from src/generated/resources/assets/basemetals/blockstates/double_bronze_slab.json rename to src/generated/resources/assets/basemetals/blockstates/bronze_double_slab.json diff --git a/src/generated/resources/assets/basemetals/blockstates/charcoal_block.json b/src/generated/resources/assets/basemetals/blockstates/charcoal_block.json deleted file mode 100644 index 70ed9168b..000000000 --- a/src/generated/resources/assets/basemetals/blockstates/charcoal_block.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "basemetals:block/charcoal_block" - } - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/blockstates/double_coldiron_slab.json b/src/generated/resources/assets/basemetals/blockstates/coldiron_double_slab.json similarity index 100% rename from src/generated/resources/assets/basemetals/blockstates/double_coldiron_slab.json rename to src/generated/resources/assets/basemetals/blockstates/coldiron_double_slab.json diff --git a/src/generated/resources/assets/basemetals/blockstates/double_copper_slab.json b/src/generated/resources/assets/basemetals/blockstates/copper_double_slab.json similarity index 100% rename from src/generated/resources/assets/basemetals/blockstates/double_copper_slab.json rename to src/generated/resources/assets/basemetals/blockstates/copper_double_slab.json diff --git a/src/generated/resources/assets/basemetals/blockstates/double_cupronickel_slab.json b/src/generated/resources/assets/basemetals/blockstates/cupronickel_double_slab.json similarity index 100% rename from src/generated/resources/assets/basemetals/blockstates/double_cupronickel_slab.json rename to src/generated/resources/assets/basemetals/blockstates/cupronickel_double_slab.json diff --git a/src/generated/resources/assets/basemetals/blockstates/diamond_lever.json b/src/generated/resources/assets/basemetals/blockstates/diamond_lever.json deleted file mode 100644 index 5f2a78b7d..000000000 --- a/src/generated/resources/assets/basemetals/blockstates/diamond_lever.json +++ /dev/null @@ -1,76 +0,0 @@ -{ - "variants": { - "face=ceiling,facing=east,powered=false": { - "model": "basemetals:block/diamond_lever_off" - }, - "face=ceiling,facing=east,powered=true": { - "model": "basemetals:block/diamond_lever" - }, - "face=ceiling,facing=north,powered=false": { - "model": "basemetals:block/diamond_lever_off" - }, - "face=ceiling,facing=north,powered=true": { - "model": "basemetals:block/diamond_lever" - }, - "face=ceiling,facing=south,powered=false": { - "model": "basemetals:block/diamond_lever_off" - }, - "face=ceiling,facing=south,powered=true": { - "model": "basemetals:block/diamond_lever" - }, - "face=ceiling,facing=west,powered=false": { - "model": "basemetals:block/diamond_lever_off" - }, - "face=ceiling,facing=west,powered=true": { - "model": "basemetals:block/diamond_lever" - }, - "face=floor,facing=east,powered=false": { - "model": "basemetals:block/diamond_lever_off" - }, - "face=floor,facing=east,powered=true": { - "model": "basemetals:block/diamond_lever" - }, - "face=floor,facing=north,powered=false": { - "model": "basemetals:block/diamond_lever_off" - }, - "face=floor,facing=north,powered=true": { - "model": "basemetals:block/diamond_lever" - }, - "face=floor,facing=south,powered=false": { - "model": "basemetals:block/diamond_lever_off" - }, - "face=floor,facing=south,powered=true": { - "model": "basemetals:block/diamond_lever" - }, - "face=floor,facing=west,powered=false": { - "model": "basemetals:block/diamond_lever_off" - }, - "face=floor,facing=west,powered=true": { - "model": "basemetals:block/diamond_lever" - }, - "face=wall,facing=east,powered=false": { - "model": "basemetals:block/diamond_lever_off" - }, - "face=wall,facing=east,powered=true": { - "model": "basemetals:block/diamond_lever" - }, - "face=wall,facing=north,powered=false": { - "model": "basemetals:block/diamond_lever_off" - }, - "face=wall,facing=north,powered=true": { - "model": "basemetals:block/diamond_lever" - }, - "face=wall,facing=south,powered=false": { - "model": "basemetals:block/diamond_lever_off" - }, - "face=wall,facing=south,powered=true": { - "model": "basemetals:block/diamond_lever" - }, - "face=wall,facing=west,powered=false": { - "model": "basemetals:block/diamond_lever_off" - }, - "face=wall,facing=west,powered=true": { - "model": "basemetals:block/diamond_lever" - } - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/blockstates/diamond_pressure_plate.json b/src/generated/resources/assets/basemetals/blockstates/diamond_pressure_plate.json deleted file mode 100644 index 6483516de..000000000 --- a/src/generated/resources/assets/basemetals/blockstates/diamond_pressure_plate.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "variants": { - "powered=false": { - "model": "basemetals:block/diamond_pressure_plate_up" - }, - "powered=true": { - "model": "basemetals:block/diamond_pressure_plate_down" - } - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/blockstates/diamond_slab.json b/src/generated/resources/assets/basemetals/blockstates/diamond_slab.json deleted file mode 100644 index 2da59129d..000000000 --- a/src/generated/resources/assets/basemetals/blockstates/diamond_slab.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "variants": { - "type=bottom": { - "model": "basemetals:block/half_slab_diamond" - }, - "type=double": { - "model": "minecraft:block/diamond_block" - }, - "type=top": { - "model": "basemetals:block/upper_slab_diamond" - } - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/blockstates/diamond_trapdoor.json b/src/generated/resources/assets/basemetals/blockstates/diamond_trapdoor.json deleted file mode 100644 index 4481584f8..000000000 --- a/src/generated/resources/assets/basemetals/blockstates/diamond_trapdoor.json +++ /dev/null @@ -1,68 +0,0 @@ -{ - "variants": { - "facing=east,half=bottom,open=false": { - "model": "basemetals:block/diamond_trapdoor_bottom", - "y": 90 - }, - "facing=east,half=bottom,open=true": { - "model": "basemetals:block/diamond_trapdoor_open", - "y": 90 - }, - "facing=east,half=top,open=false": { - "model": "basemetals:block/diamond_trapdoor_top", - "y": 90 - }, - "facing=east,half=top,open=true": { - "model": "basemetals:block/diamond_trapdoor_open", - "x": 180, - "y": 270 - }, - "facing=north,half=bottom,open=false": { - "model": "basemetals:block/diamond_trapdoor_bottom" - }, - "facing=north,half=bottom,open=true": { - "model": "basemetals:block/diamond_trapdoor_open" - }, - "facing=north,half=top,open=false": { - "model": "basemetals:block/diamond_trapdoor_top" - }, - "facing=north,half=top,open=true": { - "model": "basemetals:block/diamond_trapdoor_open", - "x": 180, - "y": 180 - }, - "facing=south,half=bottom,open=false": { - "model": "basemetals:block/diamond_trapdoor_bottom", - "y": 180 - }, - "facing=south,half=bottom,open=true": { - "model": "basemetals:block/diamond_trapdoor_open", - "y": 180 - }, - "facing=south,half=top,open=false": { - "model": "basemetals:block/diamond_trapdoor_top", - "y": 180 - }, - "facing=south,half=top,open=true": { - "model": "basemetals:block/diamond_trapdoor_open", - "x": 180 - }, - "facing=west,half=bottom,open=false": { - "model": "basemetals:block/diamond_trapdoor_bottom", - "y": 270 - }, - "facing=west,half=bottom,open=true": { - "model": "basemetals:block/diamond_trapdoor_open", - "y": 270 - }, - "facing=west,half=top,open=false": { - "model": "basemetals:block/diamond_trapdoor_top", - "y": 270 - }, - "facing=west,half=top,open=true": { - "model": "basemetals:block/diamond_trapdoor_open", - "x": 180, - "y": 90 - } - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/blockstates/double_diamond_slab.json b/src/generated/resources/assets/basemetals/blockstates/double_diamond_slab.json deleted file mode 100644 index 2da59129d..000000000 --- a/src/generated/resources/assets/basemetals/blockstates/double_diamond_slab.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "variants": { - "type=bottom": { - "model": "basemetals:block/half_slab_diamond" - }, - "type=double": { - "model": "minecraft:block/diamond_block" - }, - "type=top": { - "model": "basemetals:block/upper_slab_diamond" - } - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/blockstates/double_emerald_slab.json b/src/generated/resources/assets/basemetals/blockstates/double_emerald_slab.json deleted file mode 100644 index b4930b290..000000000 --- a/src/generated/resources/assets/basemetals/blockstates/double_emerald_slab.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "variants": { - "type=bottom": { - "model": "basemetals:block/half_slab_emerald" - }, - "type=double": { - "model": "minecraft:block/emerald_block" - }, - "type=top": { - "model": "basemetals:block/upper_slab_emerald" - } - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/blockstates/double_gold_slab.json b/src/generated/resources/assets/basemetals/blockstates/double_gold_slab.json deleted file mode 100644 index c6aec6b61..000000000 --- a/src/generated/resources/assets/basemetals/blockstates/double_gold_slab.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "variants": { - "type=bottom": { - "model": "basemetals:block/half_slab_gold" - }, - "type=double": { - "model": "minecraft:block/gold_block" - }, - "type=top": { - "model": "basemetals:block/upper_slab_gold" - } - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/blockstates/double_iron_slab.json b/src/generated/resources/assets/basemetals/blockstates/double_iron_slab.json deleted file mode 100644 index 4c0a6f4f3..000000000 --- a/src/generated/resources/assets/basemetals/blockstates/double_iron_slab.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "variants": { - "type=bottom": { - "model": "basemetals:block/half_slab_iron" - }, - "type=double": { - "model": "minecraft:block/iron_block" - }, - "type=top": { - "model": "basemetals:block/upper_slab_iron" - } - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/blockstates/double_obsidian_slab.json b/src/generated/resources/assets/basemetals/blockstates/double_obsidian_slab.json deleted file mode 100644 index d9e4ac3a8..000000000 --- a/src/generated/resources/assets/basemetals/blockstates/double_obsidian_slab.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "variants": { - "type=bottom": { - "model": "basemetals:block/half_slab_obsidian" - }, - "type=double": { - "model": "minecraft:block/obsidian" - }, - "type=top": { - "model": "basemetals:block/upper_slab_obsidian" - } - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/blockstates/double_electrum_slab.json b/src/generated/resources/assets/basemetals/blockstates/electrum_double_slab.json similarity index 100% rename from src/generated/resources/assets/basemetals/blockstates/double_electrum_slab.json rename to src/generated/resources/assets/basemetals/blockstates/electrum_double_slab.json diff --git a/src/generated/resources/assets/basemetals/blockstates/emerald_lever.json b/src/generated/resources/assets/basemetals/blockstates/emerald_lever.json deleted file mode 100644 index 7a9373859..000000000 --- a/src/generated/resources/assets/basemetals/blockstates/emerald_lever.json +++ /dev/null @@ -1,76 +0,0 @@ -{ - "variants": { - "face=ceiling,facing=east,powered=false": { - "model": "basemetals:block/emerald_lever_off" - }, - "face=ceiling,facing=east,powered=true": { - "model": "basemetals:block/emerald_lever" - }, - "face=ceiling,facing=north,powered=false": { - "model": "basemetals:block/emerald_lever_off" - }, - "face=ceiling,facing=north,powered=true": { - "model": "basemetals:block/emerald_lever" - }, - "face=ceiling,facing=south,powered=false": { - "model": "basemetals:block/emerald_lever_off" - }, - "face=ceiling,facing=south,powered=true": { - "model": "basemetals:block/emerald_lever" - }, - "face=ceiling,facing=west,powered=false": { - "model": "basemetals:block/emerald_lever_off" - }, - "face=ceiling,facing=west,powered=true": { - "model": "basemetals:block/emerald_lever" - }, - "face=floor,facing=east,powered=false": { - "model": "basemetals:block/emerald_lever_off" - }, - "face=floor,facing=east,powered=true": { - "model": "basemetals:block/emerald_lever" - }, - "face=floor,facing=north,powered=false": { - "model": "basemetals:block/emerald_lever_off" - }, - "face=floor,facing=north,powered=true": { - "model": "basemetals:block/emerald_lever" - }, - "face=floor,facing=south,powered=false": { - "model": "basemetals:block/emerald_lever_off" - }, - "face=floor,facing=south,powered=true": { - "model": "basemetals:block/emerald_lever" - }, - "face=floor,facing=west,powered=false": { - "model": "basemetals:block/emerald_lever_off" - }, - "face=floor,facing=west,powered=true": { - "model": "basemetals:block/emerald_lever" - }, - "face=wall,facing=east,powered=false": { - "model": "basemetals:block/emerald_lever_off" - }, - "face=wall,facing=east,powered=true": { - "model": "basemetals:block/emerald_lever" - }, - "face=wall,facing=north,powered=false": { - "model": "basemetals:block/emerald_lever_off" - }, - "face=wall,facing=north,powered=true": { - "model": "basemetals:block/emerald_lever" - }, - "face=wall,facing=south,powered=false": { - "model": "basemetals:block/emerald_lever_off" - }, - "face=wall,facing=south,powered=true": { - "model": "basemetals:block/emerald_lever" - }, - "face=wall,facing=west,powered=false": { - "model": "basemetals:block/emerald_lever_off" - }, - "face=wall,facing=west,powered=true": { - "model": "basemetals:block/emerald_lever" - } - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/blockstates/emerald_pressure_plate.json b/src/generated/resources/assets/basemetals/blockstates/emerald_pressure_plate.json deleted file mode 100644 index 087d5e37f..000000000 --- a/src/generated/resources/assets/basemetals/blockstates/emerald_pressure_plate.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "variants": { - "powered=false": { - "model": "basemetals:block/emerald_pressure_plate_up" - }, - "powered=true": { - "model": "basemetals:block/emerald_pressure_plate_down" - } - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/blockstates/emerald_slab.json b/src/generated/resources/assets/basemetals/blockstates/emerald_slab.json deleted file mode 100644 index b4930b290..000000000 --- a/src/generated/resources/assets/basemetals/blockstates/emerald_slab.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "variants": { - "type=bottom": { - "model": "basemetals:block/half_slab_emerald" - }, - "type=double": { - "model": "minecraft:block/emerald_block" - }, - "type=top": { - "model": "basemetals:block/upper_slab_emerald" - } - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/blockstates/emerald_trapdoor.json b/src/generated/resources/assets/basemetals/blockstates/emerald_trapdoor.json deleted file mode 100644 index c1f354c7c..000000000 --- a/src/generated/resources/assets/basemetals/blockstates/emerald_trapdoor.json +++ /dev/null @@ -1,68 +0,0 @@ -{ - "variants": { - "facing=east,half=bottom,open=false": { - "model": "basemetals:block/emerald_trapdoor_bottom", - "y": 90 - }, - "facing=east,half=bottom,open=true": { - "model": "basemetals:block/emerald_trapdoor_open", - "y": 90 - }, - "facing=east,half=top,open=false": { - "model": "basemetals:block/emerald_trapdoor_top", - "y": 90 - }, - "facing=east,half=top,open=true": { - "model": "basemetals:block/emerald_trapdoor_open", - "x": 180, - "y": 270 - }, - "facing=north,half=bottom,open=false": { - "model": "basemetals:block/emerald_trapdoor_bottom" - }, - "facing=north,half=bottom,open=true": { - "model": "basemetals:block/emerald_trapdoor_open" - }, - "facing=north,half=top,open=false": { - "model": "basemetals:block/emerald_trapdoor_top" - }, - "facing=north,half=top,open=true": { - "model": "basemetals:block/emerald_trapdoor_open", - "x": 180, - "y": 180 - }, - "facing=south,half=bottom,open=false": { - "model": "basemetals:block/emerald_trapdoor_bottom", - "y": 180 - }, - "facing=south,half=bottom,open=true": { - "model": "basemetals:block/emerald_trapdoor_open", - "y": 180 - }, - "facing=south,half=top,open=false": { - "model": "basemetals:block/emerald_trapdoor_top", - "y": 180 - }, - "facing=south,half=top,open=true": { - "model": "basemetals:block/emerald_trapdoor_open", - "x": 180 - }, - "facing=west,half=bottom,open=false": { - "model": "basemetals:block/emerald_trapdoor_bottom", - "y": 270 - }, - "facing=west,half=bottom,open=true": { - "model": "basemetals:block/emerald_trapdoor_open", - "y": 270 - }, - "facing=west,half=top,open=false": { - "model": "basemetals:block/emerald_trapdoor_top", - "y": 270 - }, - "facing=west,half=top,open=true": { - "model": "basemetals:block/emerald_trapdoor_open", - "x": 180, - "y": 90 - } - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/blockstates/gold_lever.json b/src/generated/resources/assets/basemetals/blockstates/gold_lever.json deleted file mode 100644 index f21455a05..000000000 --- a/src/generated/resources/assets/basemetals/blockstates/gold_lever.json +++ /dev/null @@ -1,76 +0,0 @@ -{ - "variants": { - "face=ceiling,facing=east,powered=false": { - "model": "basemetals:block/gold_lever_off" - }, - "face=ceiling,facing=east,powered=true": { - "model": "basemetals:block/gold_lever" - }, - "face=ceiling,facing=north,powered=false": { - "model": "basemetals:block/gold_lever_off" - }, - "face=ceiling,facing=north,powered=true": { - "model": "basemetals:block/gold_lever" - }, - "face=ceiling,facing=south,powered=false": { - "model": "basemetals:block/gold_lever_off" - }, - "face=ceiling,facing=south,powered=true": { - "model": "basemetals:block/gold_lever" - }, - "face=ceiling,facing=west,powered=false": { - "model": "basemetals:block/gold_lever_off" - }, - "face=ceiling,facing=west,powered=true": { - "model": "basemetals:block/gold_lever" - }, - "face=floor,facing=east,powered=false": { - "model": "basemetals:block/gold_lever_off" - }, - "face=floor,facing=east,powered=true": { - "model": "basemetals:block/gold_lever" - }, - "face=floor,facing=north,powered=false": { - "model": "basemetals:block/gold_lever_off" - }, - "face=floor,facing=north,powered=true": { - "model": "basemetals:block/gold_lever" - }, - "face=floor,facing=south,powered=false": { - "model": "basemetals:block/gold_lever_off" - }, - "face=floor,facing=south,powered=true": { - "model": "basemetals:block/gold_lever" - }, - "face=floor,facing=west,powered=false": { - "model": "basemetals:block/gold_lever_off" - }, - "face=floor,facing=west,powered=true": { - "model": "basemetals:block/gold_lever" - }, - "face=wall,facing=east,powered=false": { - "model": "basemetals:block/gold_lever_off" - }, - "face=wall,facing=east,powered=true": { - "model": "basemetals:block/gold_lever" - }, - "face=wall,facing=north,powered=false": { - "model": "basemetals:block/gold_lever_off" - }, - "face=wall,facing=north,powered=true": { - "model": "basemetals:block/gold_lever" - }, - "face=wall,facing=south,powered=false": { - "model": "basemetals:block/gold_lever_off" - }, - "face=wall,facing=south,powered=true": { - "model": "basemetals:block/gold_lever" - }, - "face=wall,facing=west,powered=false": { - "model": "basemetals:block/gold_lever_off" - }, - "face=wall,facing=west,powered=true": { - "model": "basemetals:block/gold_lever" - } - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/blockstates/gold_plate.json b/src/generated/resources/assets/basemetals/blockstates/gold_plate.json deleted file mode 100644 index 1b537e60e..000000000 --- a/src/generated/resources/assets/basemetals/blockstates/gold_plate.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "variants": { - "facing=down": { - "model": "basemetals:block/gold_plate", - "x": 90 - }, - "facing=east": { - "model": "basemetals:block/gold_plate", - "y": 90 - }, - "facing=north": { - "model": "basemetals:block/gold_plate" - }, - "facing=south": { - "model": "basemetals:block/gold_plate", - "y": 180 - }, - "facing=up": { - "model": "basemetals:block/gold_plate", - "x": 270 - }, - "facing=west": { - "model": "basemetals:block/gold_plate", - "y": 270 - } - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/blockstates/gold_slab.json b/src/generated/resources/assets/basemetals/blockstates/gold_slab.json deleted file mode 100644 index c6aec6b61..000000000 --- a/src/generated/resources/assets/basemetals/blockstates/gold_slab.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "variants": { - "type=bottom": { - "model": "basemetals:block/half_slab_gold" - }, - "type=double": { - "model": "minecraft:block/gold_block" - }, - "type=top": { - "model": "basemetals:block/upper_slab_gold" - } - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/blockstates/gold_trapdoor.json b/src/generated/resources/assets/basemetals/blockstates/gold_trapdoor.json deleted file mode 100644 index c089b2cb8..000000000 --- a/src/generated/resources/assets/basemetals/blockstates/gold_trapdoor.json +++ /dev/null @@ -1,68 +0,0 @@ -{ - "variants": { - "facing=east,half=bottom,open=false": { - "model": "basemetals:block/gold_trapdoor_bottom", - "y": 90 - }, - "facing=east,half=bottom,open=true": { - "model": "basemetals:block/gold_trapdoor_open", - "y": 90 - }, - "facing=east,half=top,open=false": { - "model": "basemetals:block/gold_trapdoor_top", - "y": 90 - }, - "facing=east,half=top,open=true": { - "model": "basemetals:block/gold_trapdoor_open", - "x": 180, - "y": 270 - }, - "facing=north,half=bottom,open=false": { - "model": "basemetals:block/gold_trapdoor_bottom" - }, - "facing=north,half=bottom,open=true": { - "model": "basemetals:block/gold_trapdoor_open" - }, - "facing=north,half=top,open=false": { - "model": "basemetals:block/gold_trapdoor_top" - }, - "facing=north,half=top,open=true": { - "model": "basemetals:block/gold_trapdoor_open", - "x": 180, - "y": 180 - }, - "facing=south,half=bottom,open=false": { - "model": "basemetals:block/gold_trapdoor_bottom", - "y": 180 - }, - "facing=south,half=bottom,open=true": { - "model": "basemetals:block/gold_trapdoor_open", - "y": 180 - }, - "facing=south,half=top,open=false": { - "model": "basemetals:block/gold_trapdoor_top", - "y": 180 - }, - "facing=south,half=top,open=true": { - "model": "basemetals:block/gold_trapdoor_open", - "x": 180 - }, - "facing=west,half=bottom,open=false": { - "model": "basemetals:block/gold_trapdoor_bottom", - "y": 270 - }, - "facing=west,half=bottom,open=true": { - "model": "basemetals:block/gold_trapdoor_open", - "y": 270 - }, - "facing=west,half=top,open=false": { - "model": "basemetals:block/gold_trapdoor_top", - "y": 270 - }, - "facing=west,half=top,open=true": { - "model": "basemetals:block/gold_trapdoor_open", - "x": 180, - "y": 90 - } - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/blockstates/double_invar_slab.json b/src/generated/resources/assets/basemetals/blockstates/invar_double_slab.json similarity index 100% rename from src/generated/resources/assets/basemetals/blockstates/double_invar_slab.json rename to src/generated/resources/assets/basemetals/blockstates/invar_double_slab.json diff --git a/src/generated/resources/assets/basemetals/blockstates/iron_lever.json b/src/generated/resources/assets/basemetals/blockstates/iron_lever.json deleted file mode 100644 index 2174798bd..000000000 --- a/src/generated/resources/assets/basemetals/blockstates/iron_lever.json +++ /dev/null @@ -1,76 +0,0 @@ -{ - "variants": { - "face=ceiling,facing=east,powered=false": { - "model": "basemetals:block/iron_lever_off" - }, - "face=ceiling,facing=east,powered=true": { - "model": "basemetals:block/iron_lever" - }, - "face=ceiling,facing=north,powered=false": { - "model": "basemetals:block/iron_lever_off" - }, - "face=ceiling,facing=north,powered=true": { - "model": "basemetals:block/iron_lever" - }, - "face=ceiling,facing=south,powered=false": { - "model": "basemetals:block/iron_lever_off" - }, - "face=ceiling,facing=south,powered=true": { - "model": "basemetals:block/iron_lever" - }, - "face=ceiling,facing=west,powered=false": { - "model": "basemetals:block/iron_lever_off" - }, - "face=ceiling,facing=west,powered=true": { - "model": "basemetals:block/iron_lever" - }, - "face=floor,facing=east,powered=false": { - "model": "basemetals:block/iron_lever_off" - }, - "face=floor,facing=east,powered=true": { - "model": "basemetals:block/iron_lever" - }, - "face=floor,facing=north,powered=false": { - "model": "basemetals:block/iron_lever_off" - }, - "face=floor,facing=north,powered=true": { - "model": "basemetals:block/iron_lever" - }, - "face=floor,facing=south,powered=false": { - "model": "basemetals:block/iron_lever_off" - }, - "face=floor,facing=south,powered=true": { - "model": "basemetals:block/iron_lever" - }, - "face=floor,facing=west,powered=false": { - "model": "basemetals:block/iron_lever_off" - }, - "face=floor,facing=west,powered=true": { - "model": "basemetals:block/iron_lever" - }, - "face=wall,facing=east,powered=false": { - "model": "basemetals:block/iron_lever_off" - }, - "face=wall,facing=east,powered=true": { - "model": "basemetals:block/iron_lever" - }, - "face=wall,facing=north,powered=false": { - "model": "basemetals:block/iron_lever_off" - }, - "face=wall,facing=north,powered=true": { - "model": "basemetals:block/iron_lever" - }, - "face=wall,facing=south,powered=false": { - "model": "basemetals:block/iron_lever_off" - }, - "face=wall,facing=south,powered=true": { - "model": "basemetals:block/iron_lever" - }, - "face=wall,facing=west,powered=false": { - "model": "basemetals:block/iron_lever_off" - }, - "face=wall,facing=west,powered=true": { - "model": "basemetals:block/iron_lever" - } - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/blockstates/iron_plate.json b/src/generated/resources/assets/basemetals/blockstates/iron_plate.json deleted file mode 100644 index c171b62fc..000000000 --- a/src/generated/resources/assets/basemetals/blockstates/iron_plate.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "variants": { - "facing=down": { - "model": "basemetals:block/iron_plate", - "x": 90 - }, - "facing=east": { - "model": "basemetals:block/iron_plate", - "y": 90 - }, - "facing=north": { - "model": "basemetals:block/iron_plate" - }, - "facing=south": { - "model": "basemetals:block/iron_plate", - "y": 180 - }, - "facing=up": { - "model": "basemetals:block/iron_plate", - "x": 270 - }, - "facing=west": { - "model": "basemetals:block/iron_plate", - "y": 270 - } - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/blockstates/iron_slab.json b/src/generated/resources/assets/basemetals/blockstates/iron_slab.json deleted file mode 100644 index 4c0a6f4f3..000000000 --- a/src/generated/resources/assets/basemetals/blockstates/iron_slab.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "variants": { - "type=bottom": { - "model": "basemetals:block/half_slab_iron" - }, - "type=double": { - "model": "minecraft:block/iron_block" - }, - "type=top": { - "model": "basemetals:block/upper_slab_iron" - } - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/blockstates/lapis.json b/src/generated/resources/assets/basemetals/blockstates/lapis.json deleted file mode 100644 index da4bf1deb..000000000 --- a/src/generated/resources/assets/basemetals/blockstates/lapis.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "variants": { - "": { - "custom": { - "fluid": "basemetals:lapis" - }, - "model": "minecraft:block/water" - } - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/blockstates/double_lead_slab.json b/src/generated/resources/assets/basemetals/blockstates/lead_double_slab.json similarity index 100% rename from src/generated/resources/assets/basemetals/blockstates/double_lead_slab.json rename to src/generated/resources/assets/basemetals/blockstates/lead_double_slab.json diff --git a/src/generated/resources/assets/basemetals/blockstates/double_mithril_slab.json b/src/generated/resources/assets/basemetals/blockstates/mithril_double_slab.json similarity index 100% rename from src/generated/resources/assets/basemetals/blockstates/double_mithril_slab.json rename to src/generated/resources/assets/basemetals/blockstates/mithril_double_slab.json diff --git a/src/generated/resources/assets/basemetals/blockstates/double_nickel_slab.json b/src/generated/resources/assets/basemetals/blockstates/nickel_double_slab.json similarity index 100% rename from src/generated/resources/assets/basemetals/blockstates/double_nickel_slab.json rename to src/generated/resources/assets/basemetals/blockstates/nickel_double_slab.json diff --git a/src/generated/resources/assets/basemetals/blockstates/obsidian_lever.json b/src/generated/resources/assets/basemetals/blockstates/obsidian_lever.json deleted file mode 100644 index 194cf5613..000000000 --- a/src/generated/resources/assets/basemetals/blockstates/obsidian_lever.json +++ /dev/null @@ -1,76 +0,0 @@ -{ - "variants": { - "face=ceiling,facing=east,powered=false": { - "model": "basemetals:block/obsidian_lever_off" - }, - "face=ceiling,facing=east,powered=true": { - "model": "basemetals:block/obsidian_lever" - }, - "face=ceiling,facing=north,powered=false": { - "model": "basemetals:block/obsidian_lever_off" - }, - "face=ceiling,facing=north,powered=true": { - "model": "basemetals:block/obsidian_lever" - }, - "face=ceiling,facing=south,powered=false": { - "model": "basemetals:block/obsidian_lever_off" - }, - "face=ceiling,facing=south,powered=true": { - "model": "basemetals:block/obsidian_lever" - }, - "face=ceiling,facing=west,powered=false": { - "model": "basemetals:block/obsidian_lever_off" - }, - "face=ceiling,facing=west,powered=true": { - "model": "basemetals:block/obsidian_lever" - }, - "face=floor,facing=east,powered=false": { - "model": "basemetals:block/obsidian_lever_off" - }, - "face=floor,facing=east,powered=true": { - "model": "basemetals:block/obsidian_lever" - }, - "face=floor,facing=north,powered=false": { - "model": "basemetals:block/obsidian_lever_off" - }, - "face=floor,facing=north,powered=true": { - "model": "basemetals:block/obsidian_lever" - }, - "face=floor,facing=south,powered=false": { - "model": "basemetals:block/obsidian_lever_off" - }, - "face=floor,facing=south,powered=true": { - "model": "basemetals:block/obsidian_lever" - }, - "face=floor,facing=west,powered=false": { - "model": "basemetals:block/obsidian_lever_off" - }, - "face=floor,facing=west,powered=true": { - "model": "basemetals:block/obsidian_lever" - }, - "face=wall,facing=east,powered=false": { - "model": "basemetals:block/obsidian_lever_off" - }, - "face=wall,facing=east,powered=true": { - "model": "basemetals:block/obsidian_lever" - }, - "face=wall,facing=north,powered=false": { - "model": "basemetals:block/obsidian_lever_off" - }, - "face=wall,facing=north,powered=true": { - "model": "basemetals:block/obsidian_lever" - }, - "face=wall,facing=south,powered=false": { - "model": "basemetals:block/obsidian_lever_off" - }, - "face=wall,facing=south,powered=true": { - "model": "basemetals:block/obsidian_lever" - }, - "face=wall,facing=west,powered=false": { - "model": "basemetals:block/obsidian_lever_off" - }, - "face=wall,facing=west,powered=true": { - "model": "basemetals:block/obsidian_lever" - } - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/blockstates/obsidian_pressure_plate.json b/src/generated/resources/assets/basemetals/blockstates/obsidian_pressure_plate.json deleted file mode 100644 index 9398f3344..000000000 --- a/src/generated/resources/assets/basemetals/blockstates/obsidian_pressure_plate.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "variants": { - "powered=false": { - "model": "basemetals:block/obsidian_pressure_plate_up" - }, - "powered=true": { - "model": "basemetals:block/obsidian_pressure_plate_down" - } - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/blockstates/obsidian_slab.json b/src/generated/resources/assets/basemetals/blockstates/obsidian_slab.json deleted file mode 100644 index d9e4ac3a8..000000000 --- a/src/generated/resources/assets/basemetals/blockstates/obsidian_slab.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "variants": { - "type=bottom": { - "model": "basemetals:block/half_slab_obsidian" - }, - "type=double": { - "model": "minecraft:block/obsidian" - }, - "type=top": { - "model": "basemetals:block/upper_slab_obsidian" - } - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/blockstates/obsidian_trapdoor.json b/src/generated/resources/assets/basemetals/blockstates/obsidian_trapdoor.json deleted file mode 100644 index 2d2a08c49..000000000 --- a/src/generated/resources/assets/basemetals/blockstates/obsidian_trapdoor.json +++ /dev/null @@ -1,68 +0,0 @@ -{ - "variants": { - "facing=east,half=bottom,open=false": { - "model": "basemetals:block/obsidian_trapdoor_bottom", - "y": 90 - }, - "facing=east,half=bottom,open=true": { - "model": "basemetals:block/obsidian_trapdoor_open", - "y": 90 - }, - "facing=east,half=top,open=false": { - "model": "basemetals:block/obsidian_trapdoor_top", - "y": 90 - }, - "facing=east,half=top,open=true": { - "model": "basemetals:block/obsidian_trapdoor_open", - "x": 180, - "y": 270 - }, - "facing=north,half=bottom,open=false": { - "model": "basemetals:block/obsidian_trapdoor_bottom" - }, - "facing=north,half=bottom,open=true": { - "model": "basemetals:block/obsidian_trapdoor_open" - }, - "facing=north,half=top,open=false": { - "model": "basemetals:block/obsidian_trapdoor_top" - }, - "facing=north,half=top,open=true": { - "model": "basemetals:block/obsidian_trapdoor_open", - "x": 180, - "y": 180 - }, - "facing=south,half=bottom,open=false": { - "model": "basemetals:block/obsidian_trapdoor_bottom", - "y": 180 - }, - "facing=south,half=bottom,open=true": { - "model": "basemetals:block/obsidian_trapdoor_open", - "y": 180 - }, - "facing=south,half=top,open=false": { - "model": "basemetals:block/obsidian_trapdoor_top", - "y": 180 - }, - "facing=south,half=top,open=true": { - "model": "basemetals:block/obsidian_trapdoor_open", - "x": 180 - }, - "facing=west,half=bottom,open=false": { - "model": "basemetals:block/obsidian_trapdoor_bottom", - "y": 270 - }, - "facing=west,half=bottom,open=true": { - "model": "basemetals:block/obsidian_trapdoor_open", - "y": 270 - }, - "facing=west,half=top,open=false": { - "model": "basemetals:block/obsidian_trapdoor_top", - "y": 270 - }, - "facing=west,half=top,open=true": { - "model": "basemetals:block/obsidian_trapdoor_open", - "x": 180, - "y": 90 - } - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/blockstates/double_pewter_slab.json b/src/generated/resources/assets/basemetals/blockstates/pewter_double_slab.json similarity index 100% rename from src/generated/resources/assets/basemetals/blockstates/double_pewter_slab.json rename to src/generated/resources/assets/basemetals/blockstates/pewter_double_slab.json diff --git a/src/generated/resources/assets/basemetals/blockstates/double_platinum_slab.json b/src/generated/resources/assets/basemetals/blockstates/platinum_double_slab.json similarity index 100% rename from src/generated/resources/assets/basemetals/blockstates/double_platinum_slab.json rename to src/generated/resources/assets/basemetals/blockstates/platinum_double_slab.json diff --git a/src/generated/resources/assets/basemetals/blockstates/quartz_door.json b/src/generated/resources/assets/basemetals/blockstates/quartz_door.json deleted file mode 100644 index 35fb08fea..000000000 --- a/src/generated/resources/assets/basemetals/blockstates/quartz_door.json +++ /dev/null @@ -1,124 +0,0 @@ -{ - "variants": { - "facing=east,half=lower,hinge=left,open=false": { - "model": "basemetals:block/quartz_door_bottom_left" - }, - "facing=east,half=lower,hinge=left,open=true": { - "model": "basemetals:block/quartz_door_bottom_left_open", - "y": 90 - }, - "facing=east,half=lower,hinge=right,open=false": { - "model": "basemetals:block/quartz_door_bottom_right" - }, - "facing=east,half=lower,hinge=right,open=true": { - "model": "basemetals:block/quartz_door_bottom_right_open", - "y": 270 - }, - "facing=east,half=upper,hinge=left,open=false": { - "model": "basemetals:block/quartz_door_top_left" - }, - "facing=east,half=upper,hinge=left,open=true": { - "model": "basemetals:block/quartz_door_top_left_open", - "y": 90 - }, - "facing=east,half=upper,hinge=right,open=false": { - "model": "basemetals:block/quartz_door_top_right" - }, - "facing=east,half=upper,hinge=right,open=true": { - "model": "basemetals:block/quartz_door_top_right_open", - "y": 270 - }, - "facing=north,half=lower,hinge=left,open=false": { - "model": "basemetals:block/quartz_door_bottom_left", - "y": 270 - }, - "facing=north,half=lower,hinge=left,open=true": { - "model": "basemetals:block/quartz_door_bottom_left_open" - }, - "facing=north,half=lower,hinge=right,open=false": { - "model": "basemetals:block/quartz_door_bottom_right", - "y": 270 - }, - "facing=north,half=lower,hinge=right,open=true": { - "model": "basemetals:block/quartz_door_bottom_right_open", - "y": 180 - }, - "facing=north,half=upper,hinge=left,open=false": { - "model": "basemetals:block/quartz_door_top_left", - "y": 270 - }, - "facing=north,half=upper,hinge=left,open=true": { - "model": "basemetals:block/quartz_door_top_left_open" - }, - "facing=north,half=upper,hinge=right,open=false": { - "model": "basemetals:block/quartz_door_top_right", - "y": 270 - }, - "facing=north,half=upper,hinge=right,open=true": { - "model": "basemetals:block/quartz_door_top_right_open", - "y": 180 - }, - "facing=south,half=lower,hinge=left,open=false": { - "model": "basemetals:block/quartz_door_bottom_left", - "y": 90 - }, - "facing=south,half=lower,hinge=left,open=true": { - "model": "basemetals:block/quartz_door_bottom_left_open", - "y": 180 - }, - "facing=south,half=lower,hinge=right,open=false": { - "model": "basemetals:block/quartz_door_bottom_right", - "y": 90 - }, - "facing=south,half=lower,hinge=right,open=true": { - "model": "basemetals:block/quartz_door_bottom_right_open" - }, - "facing=south,half=upper,hinge=left,open=false": { - "model": "basemetals:block/quartz_door_top_left", - "y": 90 - }, - "facing=south,half=upper,hinge=left,open=true": { - "model": "basemetals:block/quartz_door_top_left_open", - "y": 180 - }, - "facing=south,half=upper,hinge=right,open=false": { - "model": "basemetals:block/quartz_door_top_right", - "y": 90 - }, - "facing=south,half=upper,hinge=right,open=true": { - "model": "basemetals:block/quartz_door_top_right_open" - }, - "facing=west,half=lower,hinge=left,open=false": { - "model": "basemetals:block/quartz_door_bottom_left", - "y": 180 - }, - "facing=west,half=lower,hinge=left,open=true": { - "model": "basemetals:block/quartz_door_bottom_left_open", - "y": 270 - }, - "facing=west,half=lower,hinge=right,open=false": { - "model": "basemetals:block/quartz_door_bottom_right", - "y": 180 - }, - "facing=west,half=lower,hinge=right,open=true": { - "model": "basemetals:block/quartz_door_bottom_right_open", - "y": 90 - }, - "facing=west,half=upper,hinge=left,open=false": { - "model": "basemetals:block/quartz_door_top_left", - "y": 180 - }, - "facing=west,half=upper,hinge=left,open=true": { - "model": "basemetals:block/quartz_door_top_left_open", - "y": 270 - }, - "facing=west,half=upper,hinge=right,open=false": { - "model": "basemetals:block/quartz_door_top_right", - "y": 180 - }, - "facing=west,half=upper,hinge=right,open=true": { - "model": "basemetals:block/quartz_door_top_right_open", - "y": 90 - } - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/blockstates/quartz_lever.json b/src/generated/resources/assets/basemetals/blockstates/quartz_lever.json deleted file mode 100644 index c66698470..000000000 --- a/src/generated/resources/assets/basemetals/blockstates/quartz_lever.json +++ /dev/null @@ -1,76 +0,0 @@ -{ - "variants": { - "face=ceiling,facing=east,powered=false": { - "model": "basemetals:block/quartz_lever_off" - }, - "face=ceiling,facing=east,powered=true": { - "model": "basemetals:block/quartz_lever" - }, - "face=ceiling,facing=north,powered=false": { - "model": "basemetals:block/quartz_lever_off" - }, - "face=ceiling,facing=north,powered=true": { - "model": "basemetals:block/quartz_lever" - }, - "face=ceiling,facing=south,powered=false": { - "model": "basemetals:block/quartz_lever_off" - }, - "face=ceiling,facing=south,powered=true": { - "model": "basemetals:block/quartz_lever" - }, - "face=ceiling,facing=west,powered=false": { - "model": "basemetals:block/quartz_lever_off" - }, - "face=ceiling,facing=west,powered=true": { - "model": "basemetals:block/quartz_lever" - }, - "face=floor,facing=east,powered=false": { - "model": "basemetals:block/quartz_lever_off" - }, - "face=floor,facing=east,powered=true": { - "model": "basemetals:block/quartz_lever" - }, - "face=floor,facing=north,powered=false": { - "model": "basemetals:block/quartz_lever_off" - }, - "face=floor,facing=north,powered=true": { - "model": "basemetals:block/quartz_lever" - }, - "face=floor,facing=south,powered=false": { - "model": "basemetals:block/quartz_lever_off" - }, - "face=floor,facing=south,powered=true": { - "model": "basemetals:block/quartz_lever" - }, - "face=floor,facing=west,powered=false": { - "model": "basemetals:block/quartz_lever_off" - }, - "face=floor,facing=west,powered=true": { - "model": "basemetals:block/quartz_lever" - }, - "face=wall,facing=east,powered=false": { - "model": "basemetals:block/quartz_lever_off" - }, - "face=wall,facing=east,powered=true": { - "model": "basemetals:block/quartz_lever" - }, - "face=wall,facing=north,powered=false": { - "model": "basemetals:block/quartz_lever_off" - }, - "face=wall,facing=north,powered=true": { - "model": "basemetals:block/quartz_lever" - }, - "face=wall,facing=south,powered=false": { - "model": "basemetals:block/quartz_lever_off" - }, - "face=wall,facing=south,powered=true": { - "model": "basemetals:block/quartz_lever" - }, - "face=wall,facing=west,powered=false": { - "model": "basemetals:block/quartz_lever_off" - }, - "face=wall,facing=west,powered=true": { - "model": "basemetals:block/quartz_lever" - } - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/blockstates/quartz_pressure_plate.json b/src/generated/resources/assets/basemetals/blockstates/quartz_pressure_plate.json deleted file mode 100644 index a3cd597c9..000000000 --- a/src/generated/resources/assets/basemetals/blockstates/quartz_pressure_plate.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "variants": { - "powered=false": { - "model": "basemetals:block/quartz_pressure_plate_up" - }, - "powered=true": { - "model": "basemetals:block/quartz_pressure_plate_down" - } - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/blockstates/quartz_trapdoor.json b/src/generated/resources/assets/basemetals/blockstates/quartz_trapdoor.json deleted file mode 100644 index a5a42f531..000000000 --- a/src/generated/resources/assets/basemetals/blockstates/quartz_trapdoor.json +++ /dev/null @@ -1,68 +0,0 @@ -{ - "variants": { - "facing=east,half=bottom,open=false": { - "model": "basemetals:block/quartz_trapdoor_bottom", - "y": 90 - }, - "facing=east,half=bottom,open=true": { - "model": "basemetals:block/quartz_trapdoor_open", - "y": 90 - }, - "facing=east,half=top,open=false": { - "model": "basemetals:block/quartz_trapdoor_top", - "y": 90 - }, - "facing=east,half=top,open=true": { - "model": "basemetals:block/quartz_trapdoor_open", - "x": 180, - "y": 270 - }, - "facing=north,half=bottom,open=false": { - "model": "basemetals:block/quartz_trapdoor_bottom" - }, - "facing=north,half=bottom,open=true": { - "model": "basemetals:block/quartz_trapdoor_open" - }, - "facing=north,half=top,open=false": { - "model": "basemetals:block/quartz_trapdoor_top" - }, - "facing=north,half=top,open=true": { - "model": "basemetals:block/quartz_trapdoor_open", - "x": 180, - "y": 180 - }, - "facing=south,half=bottom,open=false": { - "model": "basemetals:block/quartz_trapdoor_bottom", - "y": 180 - }, - "facing=south,half=bottom,open=true": { - "model": "basemetals:block/quartz_trapdoor_open", - "y": 180 - }, - "facing=south,half=top,open=false": { - "model": "basemetals:block/quartz_trapdoor_top", - "y": 180 - }, - "facing=south,half=top,open=true": { - "model": "basemetals:block/quartz_trapdoor_open", - "x": 180 - }, - "facing=west,half=bottom,open=false": { - "model": "basemetals:block/quartz_trapdoor_bottom", - "y": 270 - }, - "facing=west,half=bottom,open=true": { - "model": "basemetals:block/quartz_trapdoor_open", - "y": 270 - }, - "facing=west,half=top,open=false": { - "model": "basemetals:block/quartz_trapdoor_top", - "y": 270 - }, - "facing=west,half=top,open=true": { - "model": "basemetals:block/quartz_trapdoor_open", - "x": 180, - "y": 90 - } - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/blockstates/double_silver_slab.json b/src/generated/resources/assets/basemetals/blockstates/silver_double_slab.json similarity index 100% rename from src/generated/resources/assets/basemetals/blockstates/double_silver_slab.json rename to src/generated/resources/assets/basemetals/blockstates/silver_double_slab.json diff --git a/src/generated/resources/assets/basemetals/blockstates/double_starsteel_slab.json b/src/generated/resources/assets/basemetals/blockstates/starsteel_double_slab.json similarity index 100% rename from src/generated/resources/assets/basemetals/blockstates/double_starsteel_slab.json rename to src/generated/resources/assets/basemetals/blockstates/starsteel_double_slab.json diff --git a/src/generated/resources/assets/basemetals/blockstates/double_steel_slab.json b/src/generated/resources/assets/basemetals/blockstates/steel_double_slab.json similarity index 100% rename from src/generated/resources/assets/basemetals/blockstates/double_steel_slab.json rename to src/generated/resources/assets/basemetals/blockstates/steel_double_slab.json diff --git a/src/generated/resources/assets/basemetals/blockstates/stone.json b/src/generated/resources/assets/basemetals/blockstates/stone.json deleted file mode 100644 index fb554290a..000000000 --- a/src/generated/resources/assets/basemetals/blockstates/stone.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "variants": { - "": { - "custom": { - "fluid": "basemetals:stone" - }, - "model": "minecraft:block/water" - } - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/blockstates/double_tin_slab.json b/src/generated/resources/assets/basemetals/blockstates/tin_double_slab.json similarity index 100% rename from src/generated/resources/assets/basemetals/blockstates/double_tin_slab.json rename to src/generated/resources/assets/basemetals/blockstates/tin_double_slab.json diff --git a/src/generated/resources/assets/basemetals/blockstates/wood.json b/src/generated/resources/assets/basemetals/blockstates/wood.json deleted file mode 100644 index 8f1ec4388..000000000 --- a/src/generated/resources/assets/basemetals/blockstates/wood.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "variants": { - "": { - "custom": { - "fluid": "basemetals:wood" - }, - "model": "minecraft:block/water" - } - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/blockstates/double_zinc_slab.json b/src/generated/resources/assets/basemetals/blockstates/zinc_double_slab.json similarity index 100% rename from src/generated/resources/assets/basemetals/blockstates/double_zinc_slab.json rename to src/generated/resources/assets/basemetals/blockstates/zinc_double_slab.json diff --git a/src/generated/resources/assets/basemetals/lang/de_de.json b/src/generated/resources/assets/basemetals/lang/de_de.json index 456562f9f..ca162118c 100644 --- a/src/generated/resources/assets/basemetals/lang/de_de.json +++ b/src/generated/resources/assets/basemetals/lang/de_de.json @@ -43,6 +43,7 @@ "block.basemetals.adamantine_button": "Adamantschalter", "block.basemetals.adamantine_dense_plate": "Verdichtetes Adamantblech", "block.basemetals.adamantine_door": "Adamanttür", + "block.basemetals.adamantine_double_slab": "Adamantine Double Slab", "block.basemetals.adamantine_lever": "Adamanthebel", "block.basemetals.adamantine_ore": "Adamanterz", "block.basemetals.adamantine_plate": "Verdichtetes Adamantblech", @@ -57,6 +58,7 @@ "block.basemetals.antimony_button": "Antimonschalter", "block.basemetals.antimony_dense_plate": "Verdichtetes Antimonblech", "block.basemetals.antimony_door": "Antimontür", + "block.basemetals.antimony_double_slab": "Antimony Double Slab", "block.basemetals.antimony_lever": "Antimonhebel", "block.basemetals.antimony_ore": "Antimonerz", "block.basemetals.antimony_plate": "Verdichtetes Antimonblech", @@ -71,6 +73,7 @@ "block.basemetals.aquarium_button": "Aquariumschalter", "block.basemetals.aquarium_dense_plate": "Verdichtetes Aquariumblech", "block.basemetals.aquarium_door": "Aquariumtür", + "block.basemetals.aquarium_double_slab": "Aquarium Double Slab", "block.basemetals.aquarium_lever": "Aquariumhebel", "block.basemetals.aquarium_ore": "Aquariumerz", "block.basemetals.aquarium_plate": "Verdichtetes Aquariumblech", @@ -85,6 +88,7 @@ "block.basemetals.bismuth_button": "Bismuthschalter", "block.basemetals.bismuth_dense_plate": "Verdichtetes Bismuthblech", "block.basemetals.bismuth_door": "Bismuthtür", + "block.basemetals.bismuth_double_slab": "Bismuth Double Slab", "block.basemetals.bismuth_lever": "Bismuthhebel", "block.basemetals.bismuth_ore": "Bismutherz", "block.basemetals.bismuth_plate": "Verdichtetes Bismuthblech", @@ -99,6 +103,7 @@ "block.basemetals.brass_button": "Messingschalter", "block.basemetals.brass_dense_plate": "Verdichtetes Messingblech", "block.basemetals.brass_door": "Messingtür", + "block.basemetals.brass_double_slab": "Brass Double Slab", "block.basemetals.brass_lever": "Messinghebel", "block.basemetals.brass_plate": "Verdichtetes Messingblech", "block.basemetals.brass_pressure_plate": "Messingdruckplatte", @@ -112,6 +117,7 @@ "block.basemetals.bronze_button": "Bronzeschalter", "block.basemetals.bronze_dense_plate": "Verdichtetes Bronzeblech", "block.basemetals.bronze_door": "Bronzetür", + "block.basemetals.bronze_double_slab": "Bronze Double Slab", "block.basemetals.bronze_lever": "Bronzehebel", "block.basemetals.bronze_plate": "Verdichtetes Bronzeblech", "block.basemetals.bronze_pressure_plate": "Bronzedruckplatte", @@ -128,6 +134,7 @@ "block.basemetals.coldiron_button": "Kalteisenschalter", "block.basemetals.coldiron_dense_plate": "Verdichtetes Kalteisenblech", "block.basemetals.coldiron_door": "Kalteisentür", + "block.basemetals.coldiron_double_slab": "Cold Iron Double Slab", "block.basemetals.coldiron_lever": "Kalteisenhebel", "block.basemetals.coldiron_ore": "Kalteisenerz", "block.basemetals.coldiron_plate": "Verdichtetes Kalteisenblech", @@ -142,6 +149,7 @@ "block.basemetals.copper_button": "Kupferschalter", "block.basemetals.copper_dense_plate": "Verdichtetes Kupferblech", "block.basemetals.copper_door": "Kupfertür", + "block.basemetals.copper_double_slab": "Copper Double Slab", "block.basemetals.copper_lever": "Kupferhebel", "block.basemetals.copper_ore": "Kupfererz", "block.basemetals.copper_plate": "Verdichtetes Kupferblech", @@ -156,6 +164,7 @@ "block.basemetals.cupronickel_button": "Kupfernickelschalter", "block.basemetals.cupronickel_dense_plate": "Verdichtetes Kupfernickelblech", "block.basemetals.cupronickel_door": "Kupfernickeltür", + "block.basemetals.cupronickel_double_slab": "Cupronickel Double Slab", "block.basemetals.cupronickel_lever": "Kupfernickelhebel", "block.basemetals.cupronickel_plate": "Verdichtetes Kupfernickelblech", "block.basemetals.cupronickel_pressure_plate": "Kupfernickeldruckplatte", @@ -167,44 +176,20 @@ "block.basemetals.diamond_bars": "Diamantgitter", "block.basemetals.diamond_button": "Diamantschalter", "block.basemetals.diamond_door": "Diamanttür", + "block.basemetals.diamond_double_slab": "Diamond Double Slab", "block.basemetals.diamond_lever": "Diamanthebel", "block.basemetals.diamond_pressure_plate": "Diamantdruckplatte", "block.basemetals.diamond_slab": "Diamantfliese", "block.basemetals.diamond_stairs": "Diamanttreppe", "block.basemetals.diamond_trapdoor": "Diamantfalltür", "block.basemetals.diamond_wall": "Diamantmauer", - "block.basemetals.double_adamantine_slab": "Double Adamantine Slab", - "block.basemetals.double_antimony_slab": "Double Antimony Slab", - "block.basemetals.double_aquarium_slab": "Double Aquarium Slab", - "block.basemetals.double_bismuth_slab": "Double Bismuth Slab", - "block.basemetals.double_brass_slab": "Double Brass Slab", - "block.basemetals.double_bronze_slab": "Double Bronze Slab", - "block.basemetals.double_coldiron_slab": "Double Cold Iron Slab", - "block.basemetals.double_copper_slab": "Double Copper Slab", - "block.basemetals.double_cupronickel_slab": "Double Cupronickel Slab", - "block.basemetals.double_diamond_slab": "Double Diamond Slab", - "block.basemetals.double_electrum_slab": "Double Electrum Slab", - "block.basemetals.double_emerald_slab": "Double Emerald Slab", - "block.basemetals.double_gold_slab": "Double Gold Slab", - "block.basemetals.double_invar_slab": "Double Invar Slab", - "block.basemetals.double_iron_slab": "Double Iron Slab", - "block.basemetals.double_lead_slab": "Double Lead Slab", - "block.basemetals.double_mithril_slab": "Double Mithril Slab", - "block.basemetals.double_nickel_slab": "Double Nickel Slab", - "block.basemetals.double_obsidian_slab": "Double Obsidian Slab", - "block.basemetals.double_pewter_slab": "Double Pewter Slab", - "block.basemetals.double_platinum_slab": "Double Platinum Slab", - "block.basemetals.double_silver_slab": "Double Silver Slab", - "block.basemetals.double_starsteel_slab": "Double Starsteel Slab", - "block.basemetals.double_steel_slab": "Double Steel Slab", - "block.basemetals.double_tin_slab": "Double Tin Slab", - "block.basemetals.double_zinc_slab": "Double Zinc Slab", "block.basemetals.electrum": "Geschmolzenes Elektron", "block.basemetals.electrum_bars": "Elektrongitter", "block.basemetals.electrum_block": "Elektronblock", "block.basemetals.electrum_button": "Elektronschalter", "block.basemetals.electrum_dense_plate": "Verdichtetes Elektronblech", "block.basemetals.electrum_door": "Elektrontür", + "block.basemetals.electrum_double_slab": "Electrum Double Slab", "block.basemetals.electrum_lever": "Elektronhebel", "block.basemetals.electrum_plate": "Verdichtetes Elektronblech", "block.basemetals.electrum_pressure_plate": "Elektrondruckplatte", @@ -216,6 +201,7 @@ "block.basemetals.emerald_bars": "Smaragdgitter", "block.basemetals.emerald_button": "Smaragdschalter", "block.basemetals.emerald_door": "Smaragdtür", + "block.basemetals.emerald_double_slab": "Emerald Double Slab", "block.basemetals.emerald_lever": "Smaragdhebel", "block.basemetals.emerald_pressure_plate": "Smaragddruckplatte", "block.basemetals.emerald_slab": "Smaragdfliese", @@ -228,6 +214,7 @@ "block.basemetals.gold_button": "Goldschalter", "block.basemetals.gold_dense_plate": "Verdichtetes Verdichtetes Goldblech", "block.basemetals.gold_door": "Goldtür", + "block.basemetals.gold_double_slab": "Gold Double Slab", "block.basemetals.gold_lever": "Goldhebel", "block.basemetals.gold_plate": "Verdichtetes Goldblech", "block.basemetals.gold_pressure_plate": "Golddruckplatte", @@ -242,6 +229,7 @@ "block.basemetals.invar_button": "Invarschalter", "block.basemetals.invar_dense_dense_plate": "Verdichtetes Invarblech", "block.basemetals.invar_door": "Invartür", + "block.basemetals.invar_double_slab": "Invar Double Slab", "block.basemetals.invar_lever": "Invarhebel", "block.basemetals.invar_plate": "Verdichtetes Invarblech", "block.basemetals.invar_pressure_plate": "Invardruckplatte", @@ -252,19 +240,20 @@ "block.basemetals.iron": "Geschmolzenes Eisen", "block.basemetals.iron_button": "Eisenschalter", "block.basemetals.iron_dense_plate": "Verdichtetes Verdichtetes Eisenblech", + "block.basemetals.iron_double_slab": "Iron Double Slab", "block.basemetals.iron_lever": "Eisenhebel", "block.basemetals.iron_plate": "Verdichtetes Eisenblech", "block.basemetals.iron_pressure_plate": "Eisendruckplatte", "block.basemetals.iron_slab": "Eisenfliese", "block.basemetals.iron_stairs": "Eisentreppe", "block.basemetals.iron_wall": "Eisenmauer", - "block.basemetals.lapis": "Molten Lapis", "block.basemetals.lead": "Geschmolzenes Blei", "block.basemetals.lead_bars": "Bleigitter", "block.basemetals.lead_block": "Bleiblock", "block.basemetals.lead_button": "Bleischalter", "block.basemetals.lead_dense_plate": "Verdichtetes Verdichtetes Bleiblech", "block.basemetals.lead_door": "Bleitür", + "block.basemetals.lead_double_slab": "Lead Double Slab", "block.basemetals.lead_lever": "Bleihebel", "block.basemetals.lead_ore": "Bleierz", "block.basemetals.lead_plate": "Verdichtetes Bleiblech", @@ -281,6 +270,7 @@ "block.basemetals.mithril_button": "Mithrilschalter", "block.basemetals.mithril_dense_plate": "Verdichtetes Verdichtetes Mithrilblech", "block.basemetals.mithril_door": "Mithriltür", + "block.basemetals.mithril_double_slab": "Mithril Double Slab", "block.basemetals.mithril_lever": "Mithrilhebel", "block.basemetals.mithril_plate": "Verdichtetes Mithrilblech", "block.basemetals.mithril_pressure_plate": "Mithrildruckplatte", @@ -294,6 +284,7 @@ "block.basemetals.nickel_button": "Nickelschalter", "block.basemetals.nickel_dense_plate": "Verdichtetes Verdichtetes Nickelblech", "block.basemetals.nickel_door": "Nickeltür", + "block.basemetals.nickel_double_slab": "Nickel Double Slab", "block.basemetals.nickel_lever": "Nickelhebel", "block.basemetals.nickel_ore": "Nickelerz", "block.basemetals.nickel_plate": "Verdichtetes Nickelblech", @@ -306,6 +297,7 @@ "block.basemetals.obsidian_bars": "Obsidiangitter", "block.basemetals.obsidian_button": "Obsidianschalter", "block.basemetals.obsidian_door": "Obsidiantür", + "block.basemetals.obsidian_double_slab": "Obsidian Double Slab", "block.basemetals.obsidian_lever": "Obsidianhebel", "block.basemetals.obsidian_pressure_plate": "Obsidiandruckplatte", "block.basemetals.obsidian_slab": "Obsidianfliese", @@ -318,6 +310,7 @@ "block.basemetals.pewter_button": "Hartzinnschalter", "block.basemetals.pewter_dense_plate": "Verdichtetes Verdichtetes Hartzinnblech", "block.basemetals.pewter_door": "Hartzinntür", + "block.basemetals.pewter_double_slab": "Pewter Double Slab", "block.basemetals.pewter_lever": "Hartzinnhebel", "block.basemetals.pewter_ore": "Hartzinnerz", "block.basemetals.pewter_plate": "Verdichtetes Hartzinnblech", @@ -332,6 +325,7 @@ "block.basemetals.platinum_button": "Platinschalter", "block.basemetals.platinum_dense_plate": "Verdichtetes Verdichtetes Platinblech", "block.basemetals.platinum_door": "Platintür", + "block.basemetals.platinum_double_slab": "Platinum Double Slab", "block.basemetals.platinum_lever": "Platinhebel", "block.basemetals.platinum_ore": "Platinerz", "block.basemetals.platinum_plate": "Verdichtetes Platinblech", @@ -356,6 +350,7 @@ "block.basemetals.silver_button": "Silberschalter", "block.basemetals.silver_dense_plate": "Verdichtetes Verdichtetes Silberblech", "block.basemetals.silver_door": "Silbertür", + "block.basemetals.silver_double_slab": "Silver Double Slab", "block.basemetals.silver_lever": "Silberhebel", "block.basemetals.silver_ore": "Silbererz", "block.basemetals.silver_plate": "Verdichtetes Silberblech", @@ -370,6 +365,7 @@ "block.basemetals.starsteel_button": "Sternenstahlschalter", "block.basemetals.starsteel_dense_plate": "Verdichtetes Verdichtetes Sternenstahlblech", "block.basemetals.starsteel_door": "Sternenstahltür", + "block.basemetals.starsteel_double_slab": "Starsteel Double Slab", "block.basemetals.starsteel_lever": "Sternenstahlhebel", "block.basemetals.starsteel_ore": "Sternenstahlerz", "block.basemetals.starsteel_plate": "Verdichtetes Sternenstahlblech", @@ -385,6 +381,7 @@ "block.basemetals.steel_button": "Stahlschalter", "block.basemetals.steel_dense_plate": "Verdichtetes Verdichtetes Stahlblech", "block.basemetals.steel_door": "Stahltür", + "block.basemetals.steel_double_slab": "Steel Double Slab", "block.basemetals.steel_lever": "Stahlhebel", "block.basemetals.steel_plate": "Verdichtetes Stahlblech", "block.basemetals.steel_pressure_plate": "Stahldruckplatte", @@ -392,7 +389,6 @@ "block.basemetals.steel_stairs": "Stahltreppe", "block.basemetals.steel_trapdoor": "Stahlfalltür", "block.basemetals.steel_wall": "Stahlmauer", - "block.basemetals.stone": "Molten Stone", "block.basemetals.stone_anvil": "Stone Anvil", "block.basemetals.tin": "Geschmolzenes Zinn", "block.basemetals.tin_bars": "Zinngitter", @@ -400,6 +396,7 @@ "block.basemetals.tin_button": "Zinnschalter", "block.basemetals.tin_dense_plate": "Verdichtetes Verdichtetes Zinnblech", "block.basemetals.tin_door": "Zinntür", + "block.basemetals.tin_double_slab": "Tin Double Slab", "block.basemetals.tin_lever": "Zinnhebel", "block.basemetals.tin_ore": "Zinnerz", "block.basemetals.tin_plate": "Verdichtetes Zinnblech", @@ -408,13 +405,13 @@ "block.basemetals.tin_stairs": "Zinntreppe", "block.basemetals.tin_trapdoor": "Zinnfalltür", "block.basemetals.tin_wall": "Zinnmauer", - "block.basemetals.wood": "Molten Wood", "block.basemetals.zinc": "Geschmolzenes Zink", "block.basemetals.zinc_bars": "Zinkgitter", "block.basemetals.zinc_block": "Zinkblock", "block.basemetals.zinc_button": "Zinkschalter", "block.basemetals.zinc_dense_plate": "Verdichtetes Verdichtetes Zinkblech", "block.basemetals.zinc_door": "Zinktür", + "block.basemetals.zinc_double_slab": "Zinc Double Slab", "block.basemetals.zinc_lever": "Zinkhebel", "block.basemetals.zinc_ore": "Zinkerz", "block.basemetals.zinc_plate": "Verdichtetes Zinkblech", @@ -1190,8 +1187,6 @@ "item.basemetals.iron_smallpowder": "Kleiner Eisenpulverhaufen", "item.basemetals.iron_stairs": "Eisentreppe", "item.basemetals.iron_wall": "Eisenmauer", - "item.basemetals.lapis": "Lapis", - "item.basemetals.lapis_bucket": "Eimer mit geschmolzenem Lapislazuli", "item.basemetals.lapis_smallpowder": "Kleiner Lapispulverhaufen", "item.basemetals.lead": "Lead", "item.basemetals.lead_arrow": "Bleipfeil", @@ -1673,9 +1668,7 @@ "item.basemetals.steel_sword": "Stahlschwert", "item.basemetals.steel_trapdoor": "Stahlfalltür", "item.basemetals.steel_wall": "Stahlmauer", - "item.basemetals.stone": "Stone", "item.basemetals.stone_anvil": "Stone Anvil", - "item.basemetals.stone_bucket": "Eimer mit geschmolzenem Stein", "item.basemetals.stone_crackhammer": "Stonebruchhammer", "item.basemetals.stone_gear": "Stonezahnrad", "item.basemetals.stone_rod": "Stonestange", @@ -1729,8 +1722,6 @@ "item.basemetals.tin_sword": "Zinnschwert", "item.basemetals.tin_trapdoor": "Zinnfalltür", "item.basemetals.tin_wall": "Zinnmauer", - "item.basemetals.wood": "Wood", - "item.basemetals.wood_bucket": "Eimer mit verflüssigtem Holz", "item.basemetals.wood_crackhammer": "Holzbruchhammer", "item.basemetals.wood_gear": "Holzzahnrad", "item.basemetals.wood_powder": "Kleiner Sägemehlhaufen", @@ -1802,7 +1793,6 @@ "item.bucket.gold": "Eimer mit geschmolzenem Gold", "item.bucket.invar": "Eimer mit geschmolzenem Invar", "item.bucket.iron": "Eimer mit geschmolzenem Eisen", - "item.bucket.lapis": "Eimer mit geschmolzenem Lapislazuli", "item.bucket.lead": "Eimer mit geschmolzenem Blei", "item.bucket.mercury": "Eimer mit Quecksilber", "item.bucket.mithril": "Eimer mit geschmolzenem Mithril", @@ -1816,13 +1806,12 @@ "item.bucket.silver": "Eimer mit geschmolzenem Silber", "item.bucket.starsteel": "Eimer mit geschmolzenem Sternenstahl", "item.bucket.steel": "Eimer mit geschmolzenem Stahl", - "item.bucket.stone": "Eimer mit geschmolzenem Stein", "item.bucket.tin": "Eimer mit geschmolzenem Zinn", - "item.bucket.wood": "Eimer mit verflüssigtem Holz", "item.bucket.zinc": "Eimer mit geschmolzenem Zink", "itemGroup.basemetals.blocks": "Base Metals Blöcke", "itemGroup.basemetals.combat": "Base Metals Combat", "itemGroup.basemetals.items": "Base Metals Gegenstände", + "itemGroup.basemetals.materials": "Base Metals Materials", "itemGroup.basemetals.tools": "Base Metals Werkzeuge", "material.adamantine.name": "Adamant", "material.antimony.name": "Antimon", diff --git a/src/generated/resources/assets/basemetals/lang/en_au.json b/src/generated/resources/assets/basemetals/lang/en_au.json index aa04a59be..145660d50 100644 --- a/src/generated/resources/assets/basemetals/lang/en_au.json +++ b/src/generated/resources/assets/basemetals/lang/en_au.json @@ -44,6 +44,7 @@ "block.basemetals.adamantine_block": "Adamantine Block", "block.basemetals.adamantine_button": "Adamantine Button", "block.basemetals.adamantine_door": "Adamantine Door", + "block.basemetals.adamantine_double_slab": "Adamantine Double Slab", "block.basemetals.adamantine_lever": "Adamantine Lever", "block.basemetals.adamantine_ore": "Adamantine Ore", "block.basemetals.adamantine_plate": "Adamantine Plate", @@ -57,6 +58,7 @@ "block.basemetals.antimony_block": "Antimony Block", "block.basemetals.antimony_button": "Antimony Button", "block.basemetals.antimony_door": "Antimony Door", + "block.basemetals.antimony_double_slab": "Antimony Double Slab", "block.basemetals.antimony_lever": "Antimony Lever", "block.basemetals.antimony_ore": "Antimony Ore", "block.basemetals.antimony_plate": "Antimony Plate", @@ -70,6 +72,7 @@ "block.basemetals.aquarium_block": "Aquarium Block", "block.basemetals.aquarium_button": "Aquarium Button", "block.basemetals.aquarium_door": "Aquarium Door", + "block.basemetals.aquarium_double_slab": "Aquarium Double Slab", "block.basemetals.aquarium_lever": "Aquarium Lever", "block.basemetals.aquarium_plate": "Aquarium Plate", "block.basemetals.aquarium_pressure_plate": "Aquarium Pressure Plate", @@ -82,6 +85,7 @@ "block.basemetals.bismuth_block": "Bismuth Block", "block.basemetals.bismuth_button": "Bismuth Button", "block.basemetals.bismuth_door": "Bismuth Door", + "block.basemetals.bismuth_double_slab": "Bismuth Double Slab", "block.basemetals.bismuth_lever": "Bismuth Lever", "block.basemetals.bismuth_ore": "Bismuth Ore", "block.basemetals.bismuth_plate": "Bismuth Plate", @@ -95,6 +99,7 @@ "block.basemetals.brass_block": "Brass Block", "block.basemetals.brass_button": "Brass Button", "block.basemetals.brass_door": "Brass Door", + "block.basemetals.brass_double_slab": "Brass Double Slab", "block.basemetals.brass_lever": "Brass Lever", "block.basemetals.brass_plate": "Brass Plate", "block.basemetals.brass_pressure_plate": "Brass Pressure Plate", @@ -107,6 +112,7 @@ "block.basemetals.bronze_block": "Bronze Block", "block.basemetals.bronze_button": "Bronze Button", "block.basemetals.bronze_door": "Bronze Door", + "block.basemetals.bronze_double_slab": "Bronze Double Slab", "block.basemetals.bronze_lever": "Bronze Lever", "block.basemetals.bronze_plate": "Bronze Plate", "block.basemetals.bronze_pressure_plate": "Bronze Pressure Plate", @@ -122,6 +128,7 @@ "block.basemetals.coldiron_block": "Cold-Iron Block", "block.basemetals.coldiron_button": "Cold Iron Button", "block.basemetals.coldiron_door": "Cold-Iron Door", + "block.basemetals.coldiron_double_slab": "Cold Iron Double Slab", "block.basemetals.coldiron_lever": "Cold Iron Lever", "block.basemetals.coldiron_ore": "Cold-Iron Ore", "block.basemetals.coldiron_plate": "Cold-Iron Plate", @@ -135,6 +142,7 @@ "block.basemetals.copper_block": "Copper Block", "block.basemetals.copper_button": "Copper Button", "block.basemetals.copper_door": "Copper Door", + "block.basemetals.copper_double_slab": "Copper Double Slab", "block.basemetals.copper_lever": "Copper Lever", "block.basemetals.copper_ore": "Copper Ore", "block.basemetals.copper_plate": "Copper Plate", @@ -148,6 +156,7 @@ "block.basemetals.cupronickel_block": "Cupronickel Block", "block.basemetals.cupronickel_button": "Cupronickel Button", "block.basemetals.cupronickel_door": "Cupronickel Door", + "block.basemetals.cupronickel_double_slab": "Cupronickel Double Slab", "block.basemetals.cupronickel_lever": "Cupronickel Lever", "block.basemetals.cupronickel_plate": "Cupronickel Plate", "block.basemetals.cupronickel_pressure_plate": "Cupronickel Pressure Plate", @@ -159,43 +168,19 @@ "block.basemetals.diamond_bars": "Diamond Bars", "block.basemetals.diamond_button": "Diamond Button", "block.basemetals.diamond_door": "Diamond Door", + "block.basemetals.diamond_double_slab": "Diamond Double Slab", "block.basemetals.diamond_lever": "Diamond Lever", "block.basemetals.diamond_pressure_plate": "Diamond Pressure Plate", "block.basemetals.diamond_slab": "Diamond Slab", "block.basemetals.diamond_stairs": "Diamond Stairs", "block.basemetals.diamond_trapdoor": "Diamond Trapdoor", "block.basemetals.diamond_wall": "Diamond Wall", - "block.basemetals.double_adamantine_slab": "Double Adamantine Slab", - "block.basemetals.double_antimony_slab": "Double Antimony Slab", - "block.basemetals.double_aquarium_slab": "Double Aquarium Slab", - "block.basemetals.double_bismuth_slab": "Double Bismuth Slab", - "block.basemetals.double_brass_slab": "Double Brass Slab", - "block.basemetals.double_bronze_slab": "Double Bronze Slab", - "block.basemetals.double_coldiron_slab": "Double Cold Iron Slab", - "block.basemetals.double_copper_slab": "Double Copper Slab", - "block.basemetals.double_cupronickel_slab": "Double Cupronickel Slab", - "block.basemetals.double_diamond_slab": "Double Diamond Slab", - "block.basemetals.double_electrum_slab": "Double Electrum Slab", - "block.basemetals.double_emerald_slab": "Double Emerald Slab", - "block.basemetals.double_gold_slab": "Double Gold Slab", - "block.basemetals.double_invar_slab": "Double Invar Slab", - "block.basemetals.double_iron_slab": "Double Iron Slab", - "block.basemetals.double_lead_slab": "Double Lead Slab", - "block.basemetals.double_mithril_slab": "Double Mithril Slab", - "block.basemetals.double_nickel_slab": "Double Nickel Slab", - "block.basemetals.double_obsidian_slab": "Double Obsidian Slab", - "block.basemetals.double_pewter_slab": "Double Pewter Slab", - "block.basemetals.double_platinum_slab": "Double Platinum Slab", - "block.basemetals.double_silver_slab": "Double Silver Slab", - "block.basemetals.double_starsteel_slab": "Double Starsteel Slab", - "block.basemetals.double_steel_slab": "Double Steel Slab", - "block.basemetals.double_tin_slab": "Double Tin Slab", - "block.basemetals.double_zinc_slab": "Double Zinc Slab", "block.basemetals.electrum": "Molten Electrum", "block.basemetals.electrum_bars": "Electrum Bars", "block.basemetals.electrum_block": "Electrum Block", "block.basemetals.electrum_button": "Electrum Button", "block.basemetals.electrum_door": "Electrum Door", + "block.basemetals.electrum_double_slab": "Electrum Double Slab", "block.basemetals.electrum_lever": "Electrum Lever", "block.basemetals.electrum_plate": "Electrum Plate", "block.basemetals.electrum_pressure_plate": "Electrum Pressure Plate", @@ -207,6 +192,7 @@ "block.basemetals.emerald_bars": "Emerald Bars", "block.basemetals.emerald_button": "Emerald Button", "block.basemetals.emerald_door": "Emerald Door", + "block.basemetals.emerald_double_slab": "Emerald Double Slab", "block.basemetals.emerald_lever": "Emerald Lever", "block.basemetals.emerald_pressure_plate": "Emerald Pressure Plate", "block.basemetals.emerald_slab": "Emerald Slab", @@ -218,6 +204,7 @@ "block.basemetals.gold_bars": "Gold Bars", "block.basemetals.gold_button": "Gold Button", "block.basemetals.gold_door": "Gold Door", + "block.basemetals.gold_double_slab": "Gold Double Slab", "block.basemetals.gold_lever": "Gold Lever", "block.basemetals.gold_plate": "Gold Plate", "block.basemetals.gold_slab": "Gold Slab", @@ -230,6 +217,7 @@ "block.basemetals.invar_block": "Invar Block", "block.basemetals.invar_button": "Invar Button", "block.basemetals.invar_door": "Invar Door", + "block.basemetals.invar_double_slab": "Invar Double Slab", "block.basemetals.invar_lever": "Invar Lever", "block.basemetals.invar_plate": "Invar Plate", "block.basemetals.invar_pressure_plate": "Invar Pressure Plate", @@ -239,17 +227,18 @@ "block.basemetals.invar_wall": "Invar Wall", "block.basemetals.iron": "Molten Iron", "block.basemetals.iron_button": "Iron Button", + "block.basemetals.iron_double_slab": "Iron Double Slab", "block.basemetals.iron_lever": "Iron Lever", "block.basemetals.iron_plate": "Iron Plate", "block.basemetals.iron_slab": "Iron Slab", "block.basemetals.iron_stairs": "Iron Stairs", "block.basemetals.iron_wall": "Iron Wall", - "block.basemetals.lapis": "Molten Lapis", "block.basemetals.lead": "Molten Lead", "block.basemetals.lead_bars": "Lead Bars", "block.basemetals.lead_block": "Lead Block", "block.basemetals.lead_button": "Lead Button", "block.basemetals.lead_door": "Lead Door", + "block.basemetals.lead_double_slab": "Lead Double Slab", "block.basemetals.lead_lever": "Lead Lever", "block.basemetals.lead_ore": "Lead Ore", "block.basemetals.lead_plate": "Lead Plate", @@ -265,6 +254,7 @@ "block.basemetals.mithril_block": "Mithril Block", "block.basemetals.mithril_button": "Mithril Button", "block.basemetals.mithril_door": "Mithril Door", + "block.basemetals.mithril_double_slab": "Mithril Double Slab", "block.basemetals.mithril_lever": "Mithril Lever", "block.basemetals.mithril_plate": "Mithril Plate", "block.basemetals.mithril_pressure_plate": "Mithril Pressure Plate", @@ -277,6 +267,7 @@ "block.basemetals.nickel_block": "Nickel Block", "block.basemetals.nickel_button": "Nickel Button", "block.basemetals.nickel_door": "Nickel Door", + "block.basemetals.nickel_double_slab": "Nickel Double Slab", "block.basemetals.nickel_lever": "Nickel Lever", "block.basemetals.nickel_ore": "Nickel Ore", "block.basemetals.nickel_plate": "Nickel Plate", @@ -289,6 +280,7 @@ "block.basemetals.obsidian_bars": "Obsidian Bars", "block.basemetals.obsidian_button": "Obsidian Button", "block.basemetals.obsidian_door": "Obsidian Door", + "block.basemetals.obsidian_double_slab": "Obsidian Double Slab", "block.basemetals.obsidian_lever": "Obsidian Lever", "block.basemetals.obsidian_pressure_plate": "Obsidian Pressure Plate", "block.basemetals.obsidian_slab": "Obsidian Slab", @@ -300,6 +292,7 @@ "block.basemetals.pewter_block": "Pewter Block", "block.basemetals.pewter_button": "Pewter Button", "block.basemetals.pewter_door": "Pewter Door", + "block.basemetals.pewter_double_slab": "Pewter Double Slab", "block.basemetals.pewter_lever": "Pewter Lever", "block.basemetals.pewter_plate": "Pewter Plate", "block.basemetals.pewter_pressure_plate": "Pewter Pressure Plate", @@ -312,6 +305,7 @@ "block.basemetals.platinum_block": "Platinum Block", "block.basemetals.platinum_button": "Platinum Button", "block.basemetals.platinum_door": "Platinum Door", + "block.basemetals.platinum_double_slab": "Platinum Double Slab", "block.basemetals.platinum_lever": "Platinum Lever", "block.basemetals.platinum_ore": "Platinum Ore", "block.basemetals.platinum_plate": "Platinum Plate", @@ -335,6 +329,7 @@ "block.basemetals.silver_block": "Silver Block", "block.basemetals.silver_button": "Silver Button", "block.basemetals.silver_door": "Silver Door", + "block.basemetals.silver_double_slab": "Silver Double Slab", "block.basemetals.silver_lever": "Silver Lever", "block.basemetals.silver_ore": "Silver Ore", "block.basemetals.silver_plate": "Silver Plate", @@ -348,6 +343,7 @@ "block.basemetals.starsteel_block": "Star-Steel Block", "block.basemetals.starsteel_button": "Starsteel Button", "block.basemetals.starsteel_door": "Star-Steel Door", + "block.basemetals.starsteel_double_slab": "Starsteel Double Slab", "block.basemetals.starsteel_lever": "Starsteel Lever", "block.basemetals.starsteel_ore": "Star-Steel Ore", "block.basemetals.starsteel_plate": "Star-Steel Plate", @@ -365,6 +361,7 @@ "block.basemetals.steel_block": "Steel Block", "block.basemetals.steel_button": "Steel Button", "block.basemetals.steel_door": "Steel Door", + "block.basemetals.steel_double_slab": "Steel Double Slab", "block.basemetals.steel_lever": "Steel Lever", "block.basemetals.steel_plate": "Steel Plate", "block.basemetals.steel_pressure_plate": "Steel Pressure Plate", @@ -372,7 +369,6 @@ "block.basemetals.steel_stairs": "Steel Stairs", "block.basemetals.steel_trapdoor": "Steel Trapdoor", "block.basemetals.steel_wall": "Steel Wall", - "block.basemetals.stone": "Molten Stone", "block.basemetals.stone_anvil": "Stone Anvil", "block.basemetals.stone_anvil.intact": "Stone Anvil", "block.basemetals.stone_anvil.slightlyDamaged": "Slightly Damaged Stone Anvil", @@ -382,6 +378,7 @@ "block.basemetals.tin_block": "Tin Block", "block.basemetals.tin_button": "Tin Button", "block.basemetals.tin_door": "Tin Door", + "block.basemetals.tin_double_slab": "Tin Double Slab", "block.basemetals.tin_lever": "Tin Lever", "block.basemetals.tin_ore": "Tin Ore", "block.basemetals.tin_plate": "Tin Plate", @@ -390,12 +387,12 @@ "block.basemetals.tin_stairs": "Tin Stairs", "block.basemetals.tin_trapdoor": "Tin Trapdoor", "block.basemetals.tin_wall": "Tin Wall", - "block.basemetals.wood": "Molten Wood", "block.basemetals.zinc": "Molten Zinc", "block.basemetals.zinc_bars": "Zinc Bars", "block.basemetals.zinc_block": "Zinc Block", "block.basemetals.zinc_button": "Zinc Button", "block.basemetals.zinc_door": "Zinc Door", + "block.basemetals.zinc_double_slab": "Zinc Double Slab", "block.basemetals.zinc_lever": "Zinc Lever", "block.basemetals.zinc_ore": "Zinc Ore", "block.basemetals.zinc_plate": "Zinc Plate", @@ -457,12 +454,10 @@ "item.basemetals.adamantine_button": "Adamantine Button", "item.basemetals.adamantine_casing": "Adamantine Casing", "item.basemetals.adamantine_chestplate": "Adamantine Chestplate", - "item.basemetals.adamantine_clump": "Adamantine Clump", "item.basemetals.adamantine_crackhammer": "Adamantine Crack Hammer", "item.basemetals.adamantine_crossbow": "Adamantine Crossbow", "item.basemetals.adamantine_crushed": "Adamantine Crushed", "item.basemetals.adamantine_crushed_purified": "Adamantine Crushed Purified", - "item.basemetals.adamantine_crystal": "Adamantine Crystal", "item.basemetals.adamantine_dense_plate": "Adamantine Dense Plate", "item.basemetals.adamantine_door": "Adamantine Door", "item.basemetals.adamantine_fishing_rod": "Adamantine Fishing Rod", @@ -478,12 +473,10 @@ "item.basemetals.adamantine_pickaxe": "Adamantine Pickaxe", "item.basemetals.adamantine_plate": "Adamantine Plate", "item.basemetals.adamantine_powder": "Powdered Adamantine", - "item.basemetals.adamantine_powder_dirty": "Adamantine Powder Dirty", "item.basemetals.adamantine_pressure_plate": "Adamantine Pressure Plate", "item.basemetals.adamantine_raw": "Raw Adamantine", "item.basemetals.adamantine_rod": "Adamantine Rod", "item.basemetals.adamantine_scythe": "Adamantine Sickle", - "item.basemetals.adamantine_shard": "Adamantine Shard", "item.basemetals.adamantine_shears": "Adamantine Shears", "item.basemetals.adamantine_shield": "Adamantine Shield", "item.basemetals.adamantine_shovel": "Adamantine Shovel", @@ -505,12 +498,10 @@ "item.basemetals.antimony_button": "Antimony Button", "item.basemetals.antimony_casing": "Antimony Casing", "item.basemetals.antimony_chestplate": "Antimony Chestplate", - "item.basemetals.antimony_clump": "Antimony Clump", "item.basemetals.antimony_crackhammer": "Antimony Crackhammer", "item.basemetals.antimony_crossbow": "Antimony Crossbow", "item.basemetals.antimony_crushed": "Antimony Crushed", "item.basemetals.antimony_crushed_purified": "Antimony Crushed Purified", - "item.basemetals.antimony_crystal": "Antimony Crystal", "item.basemetals.antimony_dense_plate": "Antimony Dense Plate", "item.basemetals.antimony_door": "Antimony Door", "item.basemetals.antimony_fishing_rod": "Antimony Fishing Rod", @@ -526,12 +517,10 @@ "item.basemetals.antimony_pickaxe": "Antimony Pickaxe", "item.basemetals.antimony_plate": "Antimony Plate", "item.basemetals.antimony_powder": "Antimony Powder", - "item.basemetals.antimony_powder_dirty": "Antimony Powder Dirty", "item.basemetals.antimony_pressure_plate": "Antimony Pressure Plate", "item.basemetals.antimony_raw": "Raw Antimony", "item.basemetals.antimony_rod": "Antimony Rod", "item.basemetals.antimony_scythe": "Antimony Sickle", - "item.basemetals.antimony_shard": "Antimony Shard", "item.basemetals.antimony_shears": "Antimony Shears", "item.basemetals.antimony_shield": "Antimony Shield", "item.basemetals.antimony_shovel": "Antimony Shovel", @@ -594,12 +583,10 @@ "item.basemetals.bismuth_button": "Bismuth Button", "item.basemetals.bismuth_casing": "Bismuth Casing", "item.basemetals.bismuth_chestplate": "Bismuth Chestplate", - "item.basemetals.bismuth_clump": "Bismuth Clump", "item.basemetals.bismuth_crackhammer": "Bismuth Crackhammer", "item.basemetals.bismuth_crossbow": "Bismuth Crossbow", "item.basemetals.bismuth_crushed": "Bismuth Crushed", "item.basemetals.bismuth_crushed_purified": "Bismuth Crushed Purified", - "item.basemetals.bismuth_crystal": "Bismuth Crystal", "item.basemetals.bismuth_dense_plate": "Bismuth Dense Plate", "item.basemetals.bismuth_door": "Bismuth Door", "item.basemetals.bismuth_fishing_rod": "Bismuth Fishing Rod", @@ -615,12 +602,10 @@ "item.basemetals.bismuth_pickaxe": "Bismuth Pickaxe", "item.basemetals.bismuth_plate": "Bismuth Plate", "item.basemetals.bismuth_powder": "Bismuth Powder", - "item.basemetals.bismuth_powder_dirty": "Bismuth Powder Dirty", "item.basemetals.bismuth_pressure_plate": "Bismuth Pressure Plate", "item.basemetals.bismuth_raw": "Raw Bismuth", "item.basemetals.bismuth_rod": "Bismuth Rod", "item.basemetals.bismuth_scythe": "Bismuth Sickle", - "item.basemetals.bismuth_shard": "Bismuth Shard", "item.basemetals.bismuth_shears": "Bismuth Shears", "item.basemetals.bismuth_shield": "Bismuth Shield", "item.basemetals.bismuth_shovel": "Bismuth Shovel", @@ -734,12 +719,10 @@ "item.basemetals.coldiron_button": "Cold Iron Button", "item.basemetals.coldiron_casing": "Cold Iron Casing", "item.basemetals.coldiron_chestplate": "Cold-Iron Chestplate", - "item.basemetals.coldiron_clump": "Cold Iron Clump", "item.basemetals.coldiron_crackhammer": "Cold-Iron Crack Hammer", "item.basemetals.coldiron_crossbow": "Cold Iron Crossbow", "item.basemetals.coldiron_crushed": "Cold Iron Crushed", "item.basemetals.coldiron_crushed_purified": "Cold Iron Crushed Purified", - "item.basemetals.coldiron_crystal": "Cold Iron Crystal", "item.basemetals.coldiron_dense_plate": "Cold Iron Dense Plate", "item.basemetals.coldiron_door": "Cold-Iron Door", "item.basemetals.coldiron_fishing_rod": "Cold Iron Fishing Rod", @@ -755,12 +738,10 @@ "item.basemetals.coldiron_pickaxe": "Cold-Iron Pickaxe", "item.basemetals.coldiron_plate": "Cold Iron Plate", "item.basemetals.coldiron_powder": "Powdered Cold-Iron", - "item.basemetals.coldiron_powder_dirty": "Cold Iron Powder Dirty", "item.basemetals.coldiron_pressure_plate": "Cold Iron Pressure Plate", "item.basemetals.coldiron_raw": "Raw Cold Iron", "item.basemetals.coldiron_rod": "Cold-Iron Rod", "item.basemetals.coldiron_scythe": "Coldiron Sickle", - "item.basemetals.coldiron_shard": "Cold Iron Shard", "item.basemetals.coldiron_shears": "Cold Iron Shears", "item.basemetals.coldiron_shield": "Cold Iron Shield", "item.basemetals.coldiron_shovel": "Cold-Iron Shovel", @@ -1043,8 +1024,6 @@ "item.basemetals.iron_smallpowder": "Iron Smallpowder", "item.basemetals.iron_stairs": "Iron Stairs", "item.basemetals.iron_wall": "Iron Wall", - "item.basemetals.lapis": "Lapis", - "item.basemetals.lapis_bucket": "Bucket of Molten Lapis Lazuli", "item.basemetals.lapis_smallpowder": "Lapis Smallpowder", "item.basemetals.lead": "Lead", "item.basemetals.lead_arrow": "Lead Arrow", @@ -1146,12 +1125,10 @@ "item.basemetals.nickel_button": "Nickel Button", "item.basemetals.nickel_casing": "Nickel Casing", "item.basemetals.nickel_chestplate": "Nickel Chestplate", - "item.basemetals.nickel_clump": "Nickel Clump", "item.basemetals.nickel_crackhammer": "Nickel Crack Hammer", "item.basemetals.nickel_crossbow": "Nickel Crossbow", "item.basemetals.nickel_crushed": "Nickel Crushed", "item.basemetals.nickel_crushed_purified": "Nickel Crushed Purified", - "item.basemetals.nickel_crystal": "Nickel Crystal", "item.basemetals.nickel_dense_plate": "Nickel Dense Plate", "item.basemetals.nickel_door": "Nickel Door", "item.basemetals.nickel_fishing_rod": "Nickel Fishing Rod", @@ -1167,12 +1144,10 @@ "item.basemetals.nickel_pickaxe": "Nickel Pickaxe", "item.basemetals.nickel_plate": "Nickel Plate", "item.basemetals.nickel_powder": "Powdered Nickel", - "item.basemetals.nickel_powder_dirty": "Nickel Powder Dirty", "item.basemetals.nickel_pressure_plate": "Nickel Pressure Plate", "item.basemetals.nickel_raw": "Raw Nickel", "item.basemetals.nickel_rod": "Nickel Rod", "item.basemetals.nickel_scythe": "Nickel Sickle", - "item.basemetals.nickel_shard": "Nickel Shard", "item.basemetals.nickel_shears": "Nickel Shears", "item.basemetals.nickel_shield": "Nickel Shield", "item.basemetals.nickel_shovel": "Nickel Shovel", @@ -1270,12 +1245,10 @@ "item.basemetals.platinum_button": "Platinum Button", "item.basemetals.platinum_casing": "Platinum Casing", "item.basemetals.platinum_chestplate": "Platinum Chestplate", - "item.basemetals.platinum_clump": "Platinum Clump", "item.basemetals.platinum_crackhammer": "Platinum Crack Hammer", "item.basemetals.platinum_crossbow": "Platinum Crossbow", "item.basemetals.platinum_crushed": "Platinum Crushed", "item.basemetals.platinum_crushed_purified": "Platinum Crushed Purified", - "item.basemetals.platinum_crystal": "Platinum Crystal", "item.basemetals.platinum_dense_plate": "Platinum Dense Plate", "item.basemetals.platinum_door": "Platinum Door", "item.basemetals.platinum_fishing_rod": "Platinum Fishing Rod", @@ -1291,12 +1264,10 @@ "item.basemetals.platinum_pickaxe": "Platinum Pickaxe", "item.basemetals.platinum_plate": "Platinum Plate", "item.basemetals.platinum_powder": "Powdered Platinum", - "item.basemetals.platinum_powder_dirty": "Platinum Powder Dirty", "item.basemetals.platinum_pressure_plate": "Platinum Pressure Plate", "item.basemetals.platinum_raw": "Raw Platinum", "item.basemetals.platinum_rod": "Platinum Rod", "item.basemetals.platinum_scythe": "Platinum Sickle", - "item.basemetals.platinum_shard": "Platinum Shard", "item.basemetals.platinum_shears": "Platinum Shears", "item.basemetals.platinum_shield": "Platinum Shield", "item.basemetals.platinum_shovel": "Platinum Shovel", @@ -1397,12 +1368,10 @@ "item.basemetals.starsteel_button": "Starsteel Button", "item.basemetals.starsteel_casing": "Starsteel Casing", "item.basemetals.starsteel_chestplate": "Star-Steel Chestplate", - "item.basemetals.starsteel_clump": "Starsteel Clump", "item.basemetals.starsteel_crackhammer": "Star-Steel Crack Hammer", "item.basemetals.starsteel_crossbow": "Starsteel Crossbow", "item.basemetals.starsteel_crushed": "Starsteel Crushed", "item.basemetals.starsteel_crushed_purified": "Starsteel Crushed Purified", - "item.basemetals.starsteel_crystal": "Starsteel Crystal", "item.basemetals.starsteel_dense_plate": "Starsteel Dense Plate", "item.basemetals.starsteel_door": "Star-Steel Door", "item.basemetals.starsteel_fishing_rod": "Starsteel Fishing Rod", @@ -1418,12 +1387,10 @@ "item.basemetals.starsteel_pickaxe": "Star-Steel Pickaxe", "item.basemetals.starsteel_plate": "Starsteel Plate", "item.basemetals.starsteel_powder": "Powdered Star-Steel", - "item.basemetals.starsteel_powder_dirty": "Starsteel Powder Dirty", "item.basemetals.starsteel_pressure_plate": "Starsteel Pressure Plate", "item.basemetals.starsteel_raw": "Raw Starsteel", "item.basemetals.starsteel_rod": "Star-Steel Rod", "item.basemetals.starsteel_scythe": "Starsteel Sickle", - "item.basemetals.starsteel_shard": "Starsteel Shard", "item.basemetals.starsteel_shears": "Starsteel Shears", "item.basemetals.starsteel_shield": "Starsteel Shield", "item.basemetals.starsteel_shovel": "Star-Steel Shovel", @@ -1474,9 +1441,7 @@ "item.basemetals.steel_sword": "Steel Sword", "item.basemetals.steel_trapdoor": "Steel Trapdoor", "item.basemetals.steel_wall": "Steel Wall", - "item.basemetals.stone": "Stone", "item.basemetals.stone_anvil": "Stone Anvil", - "item.basemetals.stone_bucket": "Bucket of Molten Stone", "item.basemetals.stone_crackhammer": "Stone Crack Hammer", "item.basemetals.stone_gear": "Stone Gear", "item.basemetals.stone_rod": "Stone Rod", @@ -1521,8 +1486,6 @@ "item.basemetals.tin_sword": "Tin Sword", "item.basemetals.tin_trapdoor": "Tin Trapdoor", "item.basemetals.tin_wall": "Tin Wall", - "item.basemetals.wood": "Wood", - "item.basemetals.wood_bucket": "Bucket of Liquefied Wood", "item.basemetals.wood_crackhammer": "Wooden Crack Hammer", "item.basemetals.wood_gear": "Wood Gear", "item.basemetals.wood_scythe": "Wood Sickle", @@ -1538,12 +1501,10 @@ "item.basemetals.zinc_button": "Zinc Button", "item.basemetals.zinc_casing": "Zinc Casing", "item.basemetals.zinc_chestplate": "Zinc Chestplate", - "item.basemetals.zinc_clump": "Zinc Clump", "item.basemetals.zinc_crackhammer": "Zinc Crackhammer", "item.basemetals.zinc_crossbow": "Zinc Crossbow", "item.basemetals.zinc_crushed": "Zinc Crushed", "item.basemetals.zinc_crushed_purified": "Zinc Crushed Purified", - "item.basemetals.zinc_crystal": "Zinc Crystal", "item.basemetals.zinc_dense_plate": "Zinc Dense Plate", "item.basemetals.zinc_door": "Zinc Door", "item.basemetals.zinc_fishing_rod": "Zinc Fishing Rod", @@ -1559,12 +1520,10 @@ "item.basemetals.zinc_pickaxe": "Zinc Pickaxe", "item.basemetals.zinc_plate": "Zinc Plate", "item.basemetals.zinc_powder": "Powdered Zinc", - "item.basemetals.zinc_powder_dirty": "Zinc Powder Dirty", "item.basemetals.zinc_pressure_plate": "Zinc Pressure Plate", "item.basemetals.zinc_raw": "Raw Zinc", "item.basemetals.zinc_rod": "Zinc Rod", "item.basemetals.zinc_scythe": "Zinc Sickle", - "item.basemetals.zinc_shard": "Zinc Shard", "item.basemetals.zinc_shears": "Zinc Shears", "item.basemetals.zinc_shield": "Zinc Shield", "item.basemetals.zinc_shovel": "Zinc Shovel", @@ -1592,7 +1551,6 @@ "item.bucket.gold": "Bucket of Molten Gold", "item.bucket.invar": "Bucket of Molten Invar", "item.bucket.iron": "Bucket of Molten Iron", - "item.bucket.lapis": "Bucket of Molten Lapis Lazuli", "item.bucket.lead": "Bucket of Molten Lead", "item.bucket.mercury": "Bucket of Mercury", "item.bucket.mithril": "Bucket of Molten Mithril", @@ -1606,13 +1564,12 @@ "item.bucket.silver": "Bucket of Molten Silver", "item.bucket.starsteel": "Bucket of Molten Starsteel", "item.bucket.steel": "Bucket of Molten Steel", - "item.bucket.stone": "Bucket of Molten Stone", "item.bucket.tin": "Bucket of Molten Tin", - "item.bucket.wood": "Bucket of Liquefied Wood", "item.bucket.zinc": "Bucket of Molten Zinc", "itemGroup.basemetals.blocks": "Base Metals Blocks", "itemGroup.basemetals.combat": "Base Metals Combat", "itemGroup.basemetals.items": "Base Metals Items", + "itemGroup.basemetals.materials": "Base Metals Materials", "itemGroup.basemetals.tools": "Base Metals Tools", "material.basemetals.adamantine": "Adamantine", "material.basemetals.antimony": "Antimony", diff --git a/src/generated/resources/assets/basemetals/lang/en_ca.json b/src/generated/resources/assets/basemetals/lang/en_ca.json index aa04a59be..145660d50 100644 --- a/src/generated/resources/assets/basemetals/lang/en_ca.json +++ b/src/generated/resources/assets/basemetals/lang/en_ca.json @@ -44,6 +44,7 @@ "block.basemetals.adamantine_block": "Adamantine Block", "block.basemetals.adamantine_button": "Adamantine Button", "block.basemetals.adamantine_door": "Adamantine Door", + "block.basemetals.adamantine_double_slab": "Adamantine Double Slab", "block.basemetals.adamantine_lever": "Adamantine Lever", "block.basemetals.adamantine_ore": "Adamantine Ore", "block.basemetals.adamantine_plate": "Adamantine Plate", @@ -57,6 +58,7 @@ "block.basemetals.antimony_block": "Antimony Block", "block.basemetals.antimony_button": "Antimony Button", "block.basemetals.antimony_door": "Antimony Door", + "block.basemetals.antimony_double_slab": "Antimony Double Slab", "block.basemetals.antimony_lever": "Antimony Lever", "block.basemetals.antimony_ore": "Antimony Ore", "block.basemetals.antimony_plate": "Antimony Plate", @@ -70,6 +72,7 @@ "block.basemetals.aquarium_block": "Aquarium Block", "block.basemetals.aquarium_button": "Aquarium Button", "block.basemetals.aquarium_door": "Aquarium Door", + "block.basemetals.aquarium_double_slab": "Aquarium Double Slab", "block.basemetals.aquarium_lever": "Aquarium Lever", "block.basemetals.aquarium_plate": "Aquarium Plate", "block.basemetals.aquarium_pressure_plate": "Aquarium Pressure Plate", @@ -82,6 +85,7 @@ "block.basemetals.bismuth_block": "Bismuth Block", "block.basemetals.bismuth_button": "Bismuth Button", "block.basemetals.bismuth_door": "Bismuth Door", + "block.basemetals.bismuth_double_slab": "Bismuth Double Slab", "block.basemetals.bismuth_lever": "Bismuth Lever", "block.basemetals.bismuth_ore": "Bismuth Ore", "block.basemetals.bismuth_plate": "Bismuth Plate", @@ -95,6 +99,7 @@ "block.basemetals.brass_block": "Brass Block", "block.basemetals.brass_button": "Brass Button", "block.basemetals.brass_door": "Brass Door", + "block.basemetals.brass_double_slab": "Brass Double Slab", "block.basemetals.brass_lever": "Brass Lever", "block.basemetals.brass_plate": "Brass Plate", "block.basemetals.brass_pressure_plate": "Brass Pressure Plate", @@ -107,6 +112,7 @@ "block.basemetals.bronze_block": "Bronze Block", "block.basemetals.bronze_button": "Bronze Button", "block.basemetals.bronze_door": "Bronze Door", + "block.basemetals.bronze_double_slab": "Bronze Double Slab", "block.basemetals.bronze_lever": "Bronze Lever", "block.basemetals.bronze_plate": "Bronze Plate", "block.basemetals.bronze_pressure_plate": "Bronze Pressure Plate", @@ -122,6 +128,7 @@ "block.basemetals.coldiron_block": "Cold-Iron Block", "block.basemetals.coldiron_button": "Cold Iron Button", "block.basemetals.coldiron_door": "Cold-Iron Door", + "block.basemetals.coldiron_double_slab": "Cold Iron Double Slab", "block.basemetals.coldiron_lever": "Cold Iron Lever", "block.basemetals.coldiron_ore": "Cold-Iron Ore", "block.basemetals.coldiron_plate": "Cold-Iron Plate", @@ -135,6 +142,7 @@ "block.basemetals.copper_block": "Copper Block", "block.basemetals.copper_button": "Copper Button", "block.basemetals.copper_door": "Copper Door", + "block.basemetals.copper_double_slab": "Copper Double Slab", "block.basemetals.copper_lever": "Copper Lever", "block.basemetals.copper_ore": "Copper Ore", "block.basemetals.copper_plate": "Copper Plate", @@ -148,6 +156,7 @@ "block.basemetals.cupronickel_block": "Cupronickel Block", "block.basemetals.cupronickel_button": "Cupronickel Button", "block.basemetals.cupronickel_door": "Cupronickel Door", + "block.basemetals.cupronickel_double_slab": "Cupronickel Double Slab", "block.basemetals.cupronickel_lever": "Cupronickel Lever", "block.basemetals.cupronickel_plate": "Cupronickel Plate", "block.basemetals.cupronickel_pressure_plate": "Cupronickel Pressure Plate", @@ -159,43 +168,19 @@ "block.basemetals.diamond_bars": "Diamond Bars", "block.basemetals.diamond_button": "Diamond Button", "block.basemetals.diamond_door": "Diamond Door", + "block.basemetals.diamond_double_slab": "Diamond Double Slab", "block.basemetals.diamond_lever": "Diamond Lever", "block.basemetals.diamond_pressure_plate": "Diamond Pressure Plate", "block.basemetals.diamond_slab": "Diamond Slab", "block.basemetals.diamond_stairs": "Diamond Stairs", "block.basemetals.diamond_trapdoor": "Diamond Trapdoor", "block.basemetals.diamond_wall": "Diamond Wall", - "block.basemetals.double_adamantine_slab": "Double Adamantine Slab", - "block.basemetals.double_antimony_slab": "Double Antimony Slab", - "block.basemetals.double_aquarium_slab": "Double Aquarium Slab", - "block.basemetals.double_bismuth_slab": "Double Bismuth Slab", - "block.basemetals.double_brass_slab": "Double Brass Slab", - "block.basemetals.double_bronze_slab": "Double Bronze Slab", - "block.basemetals.double_coldiron_slab": "Double Cold Iron Slab", - "block.basemetals.double_copper_slab": "Double Copper Slab", - "block.basemetals.double_cupronickel_slab": "Double Cupronickel Slab", - "block.basemetals.double_diamond_slab": "Double Diamond Slab", - "block.basemetals.double_electrum_slab": "Double Electrum Slab", - "block.basemetals.double_emerald_slab": "Double Emerald Slab", - "block.basemetals.double_gold_slab": "Double Gold Slab", - "block.basemetals.double_invar_slab": "Double Invar Slab", - "block.basemetals.double_iron_slab": "Double Iron Slab", - "block.basemetals.double_lead_slab": "Double Lead Slab", - "block.basemetals.double_mithril_slab": "Double Mithril Slab", - "block.basemetals.double_nickel_slab": "Double Nickel Slab", - "block.basemetals.double_obsidian_slab": "Double Obsidian Slab", - "block.basemetals.double_pewter_slab": "Double Pewter Slab", - "block.basemetals.double_platinum_slab": "Double Platinum Slab", - "block.basemetals.double_silver_slab": "Double Silver Slab", - "block.basemetals.double_starsteel_slab": "Double Starsteel Slab", - "block.basemetals.double_steel_slab": "Double Steel Slab", - "block.basemetals.double_tin_slab": "Double Tin Slab", - "block.basemetals.double_zinc_slab": "Double Zinc Slab", "block.basemetals.electrum": "Molten Electrum", "block.basemetals.electrum_bars": "Electrum Bars", "block.basemetals.electrum_block": "Electrum Block", "block.basemetals.electrum_button": "Electrum Button", "block.basemetals.electrum_door": "Electrum Door", + "block.basemetals.electrum_double_slab": "Electrum Double Slab", "block.basemetals.electrum_lever": "Electrum Lever", "block.basemetals.electrum_plate": "Electrum Plate", "block.basemetals.electrum_pressure_plate": "Electrum Pressure Plate", @@ -207,6 +192,7 @@ "block.basemetals.emerald_bars": "Emerald Bars", "block.basemetals.emerald_button": "Emerald Button", "block.basemetals.emerald_door": "Emerald Door", + "block.basemetals.emerald_double_slab": "Emerald Double Slab", "block.basemetals.emerald_lever": "Emerald Lever", "block.basemetals.emerald_pressure_plate": "Emerald Pressure Plate", "block.basemetals.emerald_slab": "Emerald Slab", @@ -218,6 +204,7 @@ "block.basemetals.gold_bars": "Gold Bars", "block.basemetals.gold_button": "Gold Button", "block.basemetals.gold_door": "Gold Door", + "block.basemetals.gold_double_slab": "Gold Double Slab", "block.basemetals.gold_lever": "Gold Lever", "block.basemetals.gold_plate": "Gold Plate", "block.basemetals.gold_slab": "Gold Slab", @@ -230,6 +217,7 @@ "block.basemetals.invar_block": "Invar Block", "block.basemetals.invar_button": "Invar Button", "block.basemetals.invar_door": "Invar Door", + "block.basemetals.invar_double_slab": "Invar Double Slab", "block.basemetals.invar_lever": "Invar Lever", "block.basemetals.invar_plate": "Invar Plate", "block.basemetals.invar_pressure_plate": "Invar Pressure Plate", @@ -239,17 +227,18 @@ "block.basemetals.invar_wall": "Invar Wall", "block.basemetals.iron": "Molten Iron", "block.basemetals.iron_button": "Iron Button", + "block.basemetals.iron_double_slab": "Iron Double Slab", "block.basemetals.iron_lever": "Iron Lever", "block.basemetals.iron_plate": "Iron Plate", "block.basemetals.iron_slab": "Iron Slab", "block.basemetals.iron_stairs": "Iron Stairs", "block.basemetals.iron_wall": "Iron Wall", - "block.basemetals.lapis": "Molten Lapis", "block.basemetals.lead": "Molten Lead", "block.basemetals.lead_bars": "Lead Bars", "block.basemetals.lead_block": "Lead Block", "block.basemetals.lead_button": "Lead Button", "block.basemetals.lead_door": "Lead Door", + "block.basemetals.lead_double_slab": "Lead Double Slab", "block.basemetals.lead_lever": "Lead Lever", "block.basemetals.lead_ore": "Lead Ore", "block.basemetals.lead_plate": "Lead Plate", @@ -265,6 +254,7 @@ "block.basemetals.mithril_block": "Mithril Block", "block.basemetals.mithril_button": "Mithril Button", "block.basemetals.mithril_door": "Mithril Door", + "block.basemetals.mithril_double_slab": "Mithril Double Slab", "block.basemetals.mithril_lever": "Mithril Lever", "block.basemetals.mithril_plate": "Mithril Plate", "block.basemetals.mithril_pressure_plate": "Mithril Pressure Plate", @@ -277,6 +267,7 @@ "block.basemetals.nickel_block": "Nickel Block", "block.basemetals.nickel_button": "Nickel Button", "block.basemetals.nickel_door": "Nickel Door", + "block.basemetals.nickel_double_slab": "Nickel Double Slab", "block.basemetals.nickel_lever": "Nickel Lever", "block.basemetals.nickel_ore": "Nickel Ore", "block.basemetals.nickel_plate": "Nickel Plate", @@ -289,6 +280,7 @@ "block.basemetals.obsidian_bars": "Obsidian Bars", "block.basemetals.obsidian_button": "Obsidian Button", "block.basemetals.obsidian_door": "Obsidian Door", + "block.basemetals.obsidian_double_slab": "Obsidian Double Slab", "block.basemetals.obsidian_lever": "Obsidian Lever", "block.basemetals.obsidian_pressure_plate": "Obsidian Pressure Plate", "block.basemetals.obsidian_slab": "Obsidian Slab", @@ -300,6 +292,7 @@ "block.basemetals.pewter_block": "Pewter Block", "block.basemetals.pewter_button": "Pewter Button", "block.basemetals.pewter_door": "Pewter Door", + "block.basemetals.pewter_double_slab": "Pewter Double Slab", "block.basemetals.pewter_lever": "Pewter Lever", "block.basemetals.pewter_plate": "Pewter Plate", "block.basemetals.pewter_pressure_plate": "Pewter Pressure Plate", @@ -312,6 +305,7 @@ "block.basemetals.platinum_block": "Platinum Block", "block.basemetals.platinum_button": "Platinum Button", "block.basemetals.platinum_door": "Platinum Door", + "block.basemetals.platinum_double_slab": "Platinum Double Slab", "block.basemetals.platinum_lever": "Platinum Lever", "block.basemetals.platinum_ore": "Platinum Ore", "block.basemetals.platinum_plate": "Platinum Plate", @@ -335,6 +329,7 @@ "block.basemetals.silver_block": "Silver Block", "block.basemetals.silver_button": "Silver Button", "block.basemetals.silver_door": "Silver Door", + "block.basemetals.silver_double_slab": "Silver Double Slab", "block.basemetals.silver_lever": "Silver Lever", "block.basemetals.silver_ore": "Silver Ore", "block.basemetals.silver_plate": "Silver Plate", @@ -348,6 +343,7 @@ "block.basemetals.starsteel_block": "Star-Steel Block", "block.basemetals.starsteel_button": "Starsteel Button", "block.basemetals.starsteel_door": "Star-Steel Door", + "block.basemetals.starsteel_double_slab": "Starsteel Double Slab", "block.basemetals.starsteel_lever": "Starsteel Lever", "block.basemetals.starsteel_ore": "Star-Steel Ore", "block.basemetals.starsteel_plate": "Star-Steel Plate", @@ -365,6 +361,7 @@ "block.basemetals.steel_block": "Steel Block", "block.basemetals.steel_button": "Steel Button", "block.basemetals.steel_door": "Steel Door", + "block.basemetals.steel_double_slab": "Steel Double Slab", "block.basemetals.steel_lever": "Steel Lever", "block.basemetals.steel_plate": "Steel Plate", "block.basemetals.steel_pressure_plate": "Steel Pressure Plate", @@ -372,7 +369,6 @@ "block.basemetals.steel_stairs": "Steel Stairs", "block.basemetals.steel_trapdoor": "Steel Trapdoor", "block.basemetals.steel_wall": "Steel Wall", - "block.basemetals.stone": "Molten Stone", "block.basemetals.stone_anvil": "Stone Anvil", "block.basemetals.stone_anvil.intact": "Stone Anvil", "block.basemetals.stone_anvil.slightlyDamaged": "Slightly Damaged Stone Anvil", @@ -382,6 +378,7 @@ "block.basemetals.tin_block": "Tin Block", "block.basemetals.tin_button": "Tin Button", "block.basemetals.tin_door": "Tin Door", + "block.basemetals.tin_double_slab": "Tin Double Slab", "block.basemetals.tin_lever": "Tin Lever", "block.basemetals.tin_ore": "Tin Ore", "block.basemetals.tin_plate": "Tin Plate", @@ -390,12 +387,12 @@ "block.basemetals.tin_stairs": "Tin Stairs", "block.basemetals.tin_trapdoor": "Tin Trapdoor", "block.basemetals.tin_wall": "Tin Wall", - "block.basemetals.wood": "Molten Wood", "block.basemetals.zinc": "Molten Zinc", "block.basemetals.zinc_bars": "Zinc Bars", "block.basemetals.zinc_block": "Zinc Block", "block.basemetals.zinc_button": "Zinc Button", "block.basemetals.zinc_door": "Zinc Door", + "block.basemetals.zinc_double_slab": "Zinc Double Slab", "block.basemetals.zinc_lever": "Zinc Lever", "block.basemetals.zinc_ore": "Zinc Ore", "block.basemetals.zinc_plate": "Zinc Plate", @@ -457,12 +454,10 @@ "item.basemetals.adamantine_button": "Adamantine Button", "item.basemetals.adamantine_casing": "Adamantine Casing", "item.basemetals.adamantine_chestplate": "Adamantine Chestplate", - "item.basemetals.adamantine_clump": "Adamantine Clump", "item.basemetals.adamantine_crackhammer": "Adamantine Crack Hammer", "item.basemetals.adamantine_crossbow": "Adamantine Crossbow", "item.basemetals.adamantine_crushed": "Adamantine Crushed", "item.basemetals.adamantine_crushed_purified": "Adamantine Crushed Purified", - "item.basemetals.adamantine_crystal": "Adamantine Crystal", "item.basemetals.adamantine_dense_plate": "Adamantine Dense Plate", "item.basemetals.adamantine_door": "Adamantine Door", "item.basemetals.adamantine_fishing_rod": "Adamantine Fishing Rod", @@ -478,12 +473,10 @@ "item.basemetals.adamantine_pickaxe": "Adamantine Pickaxe", "item.basemetals.adamantine_plate": "Adamantine Plate", "item.basemetals.adamantine_powder": "Powdered Adamantine", - "item.basemetals.adamantine_powder_dirty": "Adamantine Powder Dirty", "item.basemetals.adamantine_pressure_plate": "Adamantine Pressure Plate", "item.basemetals.adamantine_raw": "Raw Adamantine", "item.basemetals.adamantine_rod": "Adamantine Rod", "item.basemetals.adamantine_scythe": "Adamantine Sickle", - "item.basemetals.adamantine_shard": "Adamantine Shard", "item.basemetals.adamantine_shears": "Adamantine Shears", "item.basemetals.adamantine_shield": "Adamantine Shield", "item.basemetals.adamantine_shovel": "Adamantine Shovel", @@ -505,12 +498,10 @@ "item.basemetals.antimony_button": "Antimony Button", "item.basemetals.antimony_casing": "Antimony Casing", "item.basemetals.antimony_chestplate": "Antimony Chestplate", - "item.basemetals.antimony_clump": "Antimony Clump", "item.basemetals.antimony_crackhammer": "Antimony Crackhammer", "item.basemetals.antimony_crossbow": "Antimony Crossbow", "item.basemetals.antimony_crushed": "Antimony Crushed", "item.basemetals.antimony_crushed_purified": "Antimony Crushed Purified", - "item.basemetals.antimony_crystal": "Antimony Crystal", "item.basemetals.antimony_dense_plate": "Antimony Dense Plate", "item.basemetals.antimony_door": "Antimony Door", "item.basemetals.antimony_fishing_rod": "Antimony Fishing Rod", @@ -526,12 +517,10 @@ "item.basemetals.antimony_pickaxe": "Antimony Pickaxe", "item.basemetals.antimony_plate": "Antimony Plate", "item.basemetals.antimony_powder": "Antimony Powder", - "item.basemetals.antimony_powder_dirty": "Antimony Powder Dirty", "item.basemetals.antimony_pressure_plate": "Antimony Pressure Plate", "item.basemetals.antimony_raw": "Raw Antimony", "item.basemetals.antimony_rod": "Antimony Rod", "item.basemetals.antimony_scythe": "Antimony Sickle", - "item.basemetals.antimony_shard": "Antimony Shard", "item.basemetals.antimony_shears": "Antimony Shears", "item.basemetals.antimony_shield": "Antimony Shield", "item.basemetals.antimony_shovel": "Antimony Shovel", @@ -594,12 +583,10 @@ "item.basemetals.bismuth_button": "Bismuth Button", "item.basemetals.bismuth_casing": "Bismuth Casing", "item.basemetals.bismuth_chestplate": "Bismuth Chestplate", - "item.basemetals.bismuth_clump": "Bismuth Clump", "item.basemetals.bismuth_crackhammer": "Bismuth Crackhammer", "item.basemetals.bismuth_crossbow": "Bismuth Crossbow", "item.basemetals.bismuth_crushed": "Bismuth Crushed", "item.basemetals.bismuth_crushed_purified": "Bismuth Crushed Purified", - "item.basemetals.bismuth_crystal": "Bismuth Crystal", "item.basemetals.bismuth_dense_plate": "Bismuth Dense Plate", "item.basemetals.bismuth_door": "Bismuth Door", "item.basemetals.bismuth_fishing_rod": "Bismuth Fishing Rod", @@ -615,12 +602,10 @@ "item.basemetals.bismuth_pickaxe": "Bismuth Pickaxe", "item.basemetals.bismuth_plate": "Bismuth Plate", "item.basemetals.bismuth_powder": "Bismuth Powder", - "item.basemetals.bismuth_powder_dirty": "Bismuth Powder Dirty", "item.basemetals.bismuth_pressure_plate": "Bismuth Pressure Plate", "item.basemetals.bismuth_raw": "Raw Bismuth", "item.basemetals.bismuth_rod": "Bismuth Rod", "item.basemetals.bismuth_scythe": "Bismuth Sickle", - "item.basemetals.bismuth_shard": "Bismuth Shard", "item.basemetals.bismuth_shears": "Bismuth Shears", "item.basemetals.bismuth_shield": "Bismuth Shield", "item.basemetals.bismuth_shovel": "Bismuth Shovel", @@ -734,12 +719,10 @@ "item.basemetals.coldiron_button": "Cold Iron Button", "item.basemetals.coldiron_casing": "Cold Iron Casing", "item.basemetals.coldiron_chestplate": "Cold-Iron Chestplate", - "item.basemetals.coldiron_clump": "Cold Iron Clump", "item.basemetals.coldiron_crackhammer": "Cold-Iron Crack Hammer", "item.basemetals.coldiron_crossbow": "Cold Iron Crossbow", "item.basemetals.coldiron_crushed": "Cold Iron Crushed", "item.basemetals.coldiron_crushed_purified": "Cold Iron Crushed Purified", - "item.basemetals.coldiron_crystal": "Cold Iron Crystal", "item.basemetals.coldiron_dense_plate": "Cold Iron Dense Plate", "item.basemetals.coldiron_door": "Cold-Iron Door", "item.basemetals.coldiron_fishing_rod": "Cold Iron Fishing Rod", @@ -755,12 +738,10 @@ "item.basemetals.coldiron_pickaxe": "Cold-Iron Pickaxe", "item.basemetals.coldiron_plate": "Cold Iron Plate", "item.basemetals.coldiron_powder": "Powdered Cold-Iron", - "item.basemetals.coldiron_powder_dirty": "Cold Iron Powder Dirty", "item.basemetals.coldiron_pressure_plate": "Cold Iron Pressure Plate", "item.basemetals.coldiron_raw": "Raw Cold Iron", "item.basemetals.coldiron_rod": "Cold-Iron Rod", "item.basemetals.coldiron_scythe": "Coldiron Sickle", - "item.basemetals.coldiron_shard": "Cold Iron Shard", "item.basemetals.coldiron_shears": "Cold Iron Shears", "item.basemetals.coldiron_shield": "Cold Iron Shield", "item.basemetals.coldiron_shovel": "Cold-Iron Shovel", @@ -1043,8 +1024,6 @@ "item.basemetals.iron_smallpowder": "Iron Smallpowder", "item.basemetals.iron_stairs": "Iron Stairs", "item.basemetals.iron_wall": "Iron Wall", - "item.basemetals.lapis": "Lapis", - "item.basemetals.lapis_bucket": "Bucket of Molten Lapis Lazuli", "item.basemetals.lapis_smallpowder": "Lapis Smallpowder", "item.basemetals.lead": "Lead", "item.basemetals.lead_arrow": "Lead Arrow", @@ -1146,12 +1125,10 @@ "item.basemetals.nickel_button": "Nickel Button", "item.basemetals.nickel_casing": "Nickel Casing", "item.basemetals.nickel_chestplate": "Nickel Chestplate", - "item.basemetals.nickel_clump": "Nickel Clump", "item.basemetals.nickel_crackhammer": "Nickel Crack Hammer", "item.basemetals.nickel_crossbow": "Nickel Crossbow", "item.basemetals.nickel_crushed": "Nickel Crushed", "item.basemetals.nickel_crushed_purified": "Nickel Crushed Purified", - "item.basemetals.nickel_crystal": "Nickel Crystal", "item.basemetals.nickel_dense_plate": "Nickel Dense Plate", "item.basemetals.nickel_door": "Nickel Door", "item.basemetals.nickel_fishing_rod": "Nickel Fishing Rod", @@ -1167,12 +1144,10 @@ "item.basemetals.nickel_pickaxe": "Nickel Pickaxe", "item.basemetals.nickel_plate": "Nickel Plate", "item.basemetals.nickel_powder": "Powdered Nickel", - "item.basemetals.nickel_powder_dirty": "Nickel Powder Dirty", "item.basemetals.nickel_pressure_plate": "Nickel Pressure Plate", "item.basemetals.nickel_raw": "Raw Nickel", "item.basemetals.nickel_rod": "Nickel Rod", "item.basemetals.nickel_scythe": "Nickel Sickle", - "item.basemetals.nickel_shard": "Nickel Shard", "item.basemetals.nickel_shears": "Nickel Shears", "item.basemetals.nickel_shield": "Nickel Shield", "item.basemetals.nickel_shovel": "Nickel Shovel", @@ -1270,12 +1245,10 @@ "item.basemetals.platinum_button": "Platinum Button", "item.basemetals.platinum_casing": "Platinum Casing", "item.basemetals.platinum_chestplate": "Platinum Chestplate", - "item.basemetals.platinum_clump": "Platinum Clump", "item.basemetals.platinum_crackhammer": "Platinum Crack Hammer", "item.basemetals.platinum_crossbow": "Platinum Crossbow", "item.basemetals.platinum_crushed": "Platinum Crushed", "item.basemetals.platinum_crushed_purified": "Platinum Crushed Purified", - "item.basemetals.platinum_crystal": "Platinum Crystal", "item.basemetals.platinum_dense_plate": "Platinum Dense Plate", "item.basemetals.platinum_door": "Platinum Door", "item.basemetals.platinum_fishing_rod": "Platinum Fishing Rod", @@ -1291,12 +1264,10 @@ "item.basemetals.platinum_pickaxe": "Platinum Pickaxe", "item.basemetals.platinum_plate": "Platinum Plate", "item.basemetals.platinum_powder": "Powdered Platinum", - "item.basemetals.platinum_powder_dirty": "Platinum Powder Dirty", "item.basemetals.platinum_pressure_plate": "Platinum Pressure Plate", "item.basemetals.platinum_raw": "Raw Platinum", "item.basemetals.platinum_rod": "Platinum Rod", "item.basemetals.platinum_scythe": "Platinum Sickle", - "item.basemetals.platinum_shard": "Platinum Shard", "item.basemetals.platinum_shears": "Platinum Shears", "item.basemetals.platinum_shield": "Platinum Shield", "item.basemetals.platinum_shovel": "Platinum Shovel", @@ -1397,12 +1368,10 @@ "item.basemetals.starsteel_button": "Starsteel Button", "item.basemetals.starsteel_casing": "Starsteel Casing", "item.basemetals.starsteel_chestplate": "Star-Steel Chestplate", - "item.basemetals.starsteel_clump": "Starsteel Clump", "item.basemetals.starsteel_crackhammer": "Star-Steel Crack Hammer", "item.basemetals.starsteel_crossbow": "Starsteel Crossbow", "item.basemetals.starsteel_crushed": "Starsteel Crushed", "item.basemetals.starsteel_crushed_purified": "Starsteel Crushed Purified", - "item.basemetals.starsteel_crystal": "Starsteel Crystal", "item.basemetals.starsteel_dense_plate": "Starsteel Dense Plate", "item.basemetals.starsteel_door": "Star-Steel Door", "item.basemetals.starsteel_fishing_rod": "Starsteel Fishing Rod", @@ -1418,12 +1387,10 @@ "item.basemetals.starsteel_pickaxe": "Star-Steel Pickaxe", "item.basemetals.starsteel_plate": "Starsteel Plate", "item.basemetals.starsteel_powder": "Powdered Star-Steel", - "item.basemetals.starsteel_powder_dirty": "Starsteel Powder Dirty", "item.basemetals.starsteel_pressure_plate": "Starsteel Pressure Plate", "item.basemetals.starsteel_raw": "Raw Starsteel", "item.basemetals.starsteel_rod": "Star-Steel Rod", "item.basemetals.starsteel_scythe": "Starsteel Sickle", - "item.basemetals.starsteel_shard": "Starsteel Shard", "item.basemetals.starsteel_shears": "Starsteel Shears", "item.basemetals.starsteel_shield": "Starsteel Shield", "item.basemetals.starsteel_shovel": "Star-Steel Shovel", @@ -1474,9 +1441,7 @@ "item.basemetals.steel_sword": "Steel Sword", "item.basemetals.steel_trapdoor": "Steel Trapdoor", "item.basemetals.steel_wall": "Steel Wall", - "item.basemetals.stone": "Stone", "item.basemetals.stone_anvil": "Stone Anvil", - "item.basemetals.stone_bucket": "Bucket of Molten Stone", "item.basemetals.stone_crackhammer": "Stone Crack Hammer", "item.basemetals.stone_gear": "Stone Gear", "item.basemetals.stone_rod": "Stone Rod", @@ -1521,8 +1486,6 @@ "item.basemetals.tin_sword": "Tin Sword", "item.basemetals.tin_trapdoor": "Tin Trapdoor", "item.basemetals.tin_wall": "Tin Wall", - "item.basemetals.wood": "Wood", - "item.basemetals.wood_bucket": "Bucket of Liquefied Wood", "item.basemetals.wood_crackhammer": "Wooden Crack Hammer", "item.basemetals.wood_gear": "Wood Gear", "item.basemetals.wood_scythe": "Wood Sickle", @@ -1538,12 +1501,10 @@ "item.basemetals.zinc_button": "Zinc Button", "item.basemetals.zinc_casing": "Zinc Casing", "item.basemetals.zinc_chestplate": "Zinc Chestplate", - "item.basemetals.zinc_clump": "Zinc Clump", "item.basemetals.zinc_crackhammer": "Zinc Crackhammer", "item.basemetals.zinc_crossbow": "Zinc Crossbow", "item.basemetals.zinc_crushed": "Zinc Crushed", "item.basemetals.zinc_crushed_purified": "Zinc Crushed Purified", - "item.basemetals.zinc_crystal": "Zinc Crystal", "item.basemetals.zinc_dense_plate": "Zinc Dense Plate", "item.basemetals.zinc_door": "Zinc Door", "item.basemetals.zinc_fishing_rod": "Zinc Fishing Rod", @@ -1559,12 +1520,10 @@ "item.basemetals.zinc_pickaxe": "Zinc Pickaxe", "item.basemetals.zinc_plate": "Zinc Plate", "item.basemetals.zinc_powder": "Powdered Zinc", - "item.basemetals.zinc_powder_dirty": "Zinc Powder Dirty", "item.basemetals.zinc_pressure_plate": "Zinc Pressure Plate", "item.basemetals.zinc_raw": "Raw Zinc", "item.basemetals.zinc_rod": "Zinc Rod", "item.basemetals.zinc_scythe": "Zinc Sickle", - "item.basemetals.zinc_shard": "Zinc Shard", "item.basemetals.zinc_shears": "Zinc Shears", "item.basemetals.zinc_shield": "Zinc Shield", "item.basemetals.zinc_shovel": "Zinc Shovel", @@ -1592,7 +1551,6 @@ "item.bucket.gold": "Bucket of Molten Gold", "item.bucket.invar": "Bucket of Molten Invar", "item.bucket.iron": "Bucket of Molten Iron", - "item.bucket.lapis": "Bucket of Molten Lapis Lazuli", "item.bucket.lead": "Bucket of Molten Lead", "item.bucket.mercury": "Bucket of Mercury", "item.bucket.mithril": "Bucket of Molten Mithril", @@ -1606,13 +1564,12 @@ "item.bucket.silver": "Bucket of Molten Silver", "item.bucket.starsteel": "Bucket of Molten Starsteel", "item.bucket.steel": "Bucket of Molten Steel", - "item.bucket.stone": "Bucket of Molten Stone", "item.bucket.tin": "Bucket of Molten Tin", - "item.bucket.wood": "Bucket of Liquefied Wood", "item.bucket.zinc": "Bucket of Molten Zinc", "itemGroup.basemetals.blocks": "Base Metals Blocks", "itemGroup.basemetals.combat": "Base Metals Combat", "itemGroup.basemetals.items": "Base Metals Items", + "itemGroup.basemetals.materials": "Base Metals Materials", "itemGroup.basemetals.tools": "Base Metals Tools", "material.basemetals.adamantine": "Adamantine", "material.basemetals.antimony": "Antimony", diff --git a/src/generated/resources/assets/basemetals/lang/en_en.json b/src/generated/resources/assets/basemetals/lang/en_en.json index aa04a59be..145660d50 100644 --- a/src/generated/resources/assets/basemetals/lang/en_en.json +++ b/src/generated/resources/assets/basemetals/lang/en_en.json @@ -44,6 +44,7 @@ "block.basemetals.adamantine_block": "Adamantine Block", "block.basemetals.adamantine_button": "Adamantine Button", "block.basemetals.adamantine_door": "Adamantine Door", + "block.basemetals.adamantine_double_slab": "Adamantine Double Slab", "block.basemetals.adamantine_lever": "Adamantine Lever", "block.basemetals.adamantine_ore": "Adamantine Ore", "block.basemetals.adamantine_plate": "Adamantine Plate", @@ -57,6 +58,7 @@ "block.basemetals.antimony_block": "Antimony Block", "block.basemetals.antimony_button": "Antimony Button", "block.basemetals.antimony_door": "Antimony Door", + "block.basemetals.antimony_double_slab": "Antimony Double Slab", "block.basemetals.antimony_lever": "Antimony Lever", "block.basemetals.antimony_ore": "Antimony Ore", "block.basemetals.antimony_plate": "Antimony Plate", @@ -70,6 +72,7 @@ "block.basemetals.aquarium_block": "Aquarium Block", "block.basemetals.aquarium_button": "Aquarium Button", "block.basemetals.aquarium_door": "Aquarium Door", + "block.basemetals.aquarium_double_slab": "Aquarium Double Slab", "block.basemetals.aquarium_lever": "Aquarium Lever", "block.basemetals.aquarium_plate": "Aquarium Plate", "block.basemetals.aquarium_pressure_plate": "Aquarium Pressure Plate", @@ -82,6 +85,7 @@ "block.basemetals.bismuth_block": "Bismuth Block", "block.basemetals.bismuth_button": "Bismuth Button", "block.basemetals.bismuth_door": "Bismuth Door", + "block.basemetals.bismuth_double_slab": "Bismuth Double Slab", "block.basemetals.bismuth_lever": "Bismuth Lever", "block.basemetals.bismuth_ore": "Bismuth Ore", "block.basemetals.bismuth_plate": "Bismuth Plate", @@ -95,6 +99,7 @@ "block.basemetals.brass_block": "Brass Block", "block.basemetals.brass_button": "Brass Button", "block.basemetals.brass_door": "Brass Door", + "block.basemetals.brass_double_slab": "Brass Double Slab", "block.basemetals.brass_lever": "Brass Lever", "block.basemetals.brass_plate": "Brass Plate", "block.basemetals.brass_pressure_plate": "Brass Pressure Plate", @@ -107,6 +112,7 @@ "block.basemetals.bronze_block": "Bronze Block", "block.basemetals.bronze_button": "Bronze Button", "block.basemetals.bronze_door": "Bronze Door", + "block.basemetals.bronze_double_slab": "Bronze Double Slab", "block.basemetals.bronze_lever": "Bronze Lever", "block.basemetals.bronze_plate": "Bronze Plate", "block.basemetals.bronze_pressure_plate": "Bronze Pressure Plate", @@ -122,6 +128,7 @@ "block.basemetals.coldiron_block": "Cold-Iron Block", "block.basemetals.coldiron_button": "Cold Iron Button", "block.basemetals.coldiron_door": "Cold-Iron Door", + "block.basemetals.coldiron_double_slab": "Cold Iron Double Slab", "block.basemetals.coldiron_lever": "Cold Iron Lever", "block.basemetals.coldiron_ore": "Cold-Iron Ore", "block.basemetals.coldiron_plate": "Cold-Iron Plate", @@ -135,6 +142,7 @@ "block.basemetals.copper_block": "Copper Block", "block.basemetals.copper_button": "Copper Button", "block.basemetals.copper_door": "Copper Door", + "block.basemetals.copper_double_slab": "Copper Double Slab", "block.basemetals.copper_lever": "Copper Lever", "block.basemetals.copper_ore": "Copper Ore", "block.basemetals.copper_plate": "Copper Plate", @@ -148,6 +156,7 @@ "block.basemetals.cupronickel_block": "Cupronickel Block", "block.basemetals.cupronickel_button": "Cupronickel Button", "block.basemetals.cupronickel_door": "Cupronickel Door", + "block.basemetals.cupronickel_double_slab": "Cupronickel Double Slab", "block.basemetals.cupronickel_lever": "Cupronickel Lever", "block.basemetals.cupronickel_plate": "Cupronickel Plate", "block.basemetals.cupronickel_pressure_plate": "Cupronickel Pressure Plate", @@ -159,43 +168,19 @@ "block.basemetals.diamond_bars": "Diamond Bars", "block.basemetals.diamond_button": "Diamond Button", "block.basemetals.diamond_door": "Diamond Door", + "block.basemetals.diamond_double_slab": "Diamond Double Slab", "block.basemetals.diamond_lever": "Diamond Lever", "block.basemetals.diamond_pressure_plate": "Diamond Pressure Plate", "block.basemetals.diamond_slab": "Diamond Slab", "block.basemetals.diamond_stairs": "Diamond Stairs", "block.basemetals.diamond_trapdoor": "Diamond Trapdoor", "block.basemetals.diamond_wall": "Diamond Wall", - "block.basemetals.double_adamantine_slab": "Double Adamantine Slab", - "block.basemetals.double_antimony_slab": "Double Antimony Slab", - "block.basemetals.double_aquarium_slab": "Double Aquarium Slab", - "block.basemetals.double_bismuth_slab": "Double Bismuth Slab", - "block.basemetals.double_brass_slab": "Double Brass Slab", - "block.basemetals.double_bronze_slab": "Double Bronze Slab", - "block.basemetals.double_coldiron_slab": "Double Cold Iron Slab", - "block.basemetals.double_copper_slab": "Double Copper Slab", - "block.basemetals.double_cupronickel_slab": "Double Cupronickel Slab", - "block.basemetals.double_diamond_slab": "Double Diamond Slab", - "block.basemetals.double_electrum_slab": "Double Electrum Slab", - "block.basemetals.double_emerald_slab": "Double Emerald Slab", - "block.basemetals.double_gold_slab": "Double Gold Slab", - "block.basemetals.double_invar_slab": "Double Invar Slab", - "block.basemetals.double_iron_slab": "Double Iron Slab", - "block.basemetals.double_lead_slab": "Double Lead Slab", - "block.basemetals.double_mithril_slab": "Double Mithril Slab", - "block.basemetals.double_nickel_slab": "Double Nickel Slab", - "block.basemetals.double_obsidian_slab": "Double Obsidian Slab", - "block.basemetals.double_pewter_slab": "Double Pewter Slab", - "block.basemetals.double_platinum_slab": "Double Platinum Slab", - "block.basemetals.double_silver_slab": "Double Silver Slab", - "block.basemetals.double_starsteel_slab": "Double Starsteel Slab", - "block.basemetals.double_steel_slab": "Double Steel Slab", - "block.basemetals.double_tin_slab": "Double Tin Slab", - "block.basemetals.double_zinc_slab": "Double Zinc Slab", "block.basemetals.electrum": "Molten Electrum", "block.basemetals.electrum_bars": "Electrum Bars", "block.basemetals.electrum_block": "Electrum Block", "block.basemetals.electrum_button": "Electrum Button", "block.basemetals.electrum_door": "Electrum Door", + "block.basemetals.electrum_double_slab": "Electrum Double Slab", "block.basemetals.electrum_lever": "Electrum Lever", "block.basemetals.electrum_plate": "Electrum Plate", "block.basemetals.electrum_pressure_plate": "Electrum Pressure Plate", @@ -207,6 +192,7 @@ "block.basemetals.emerald_bars": "Emerald Bars", "block.basemetals.emerald_button": "Emerald Button", "block.basemetals.emerald_door": "Emerald Door", + "block.basemetals.emerald_double_slab": "Emerald Double Slab", "block.basemetals.emerald_lever": "Emerald Lever", "block.basemetals.emerald_pressure_plate": "Emerald Pressure Plate", "block.basemetals.emerald_slab": "Emerald Slab", @@ -218,6 +204,7 @@ "block.basemetals.gold_bars": "Gold Bars", "block.basemetals.gold_button": "Gold Button", "block.basemetals.gold_door": "Gold Door", + "block.basemetals.gold_double_slab": "Gold Double Slab", "block.basemetals.gold_lever": "Gold Lever", "block.basemetals.gold_plate": "Gold Plate", "block.basemetals.gold_slab": "Gold Slab", @@ -230,6 +217,7 @@ "block.basemetals.invar_block": "Invar Block", "block.basemetals.invar_button": "Invar Button", "block.basemetals.invar_door": "Invar Door", + "block.basemetals.invar_double_slab": "Invar Double Slab", "block.basemetals.invar_lever": "Invar Lever", "block.basemetals.invar_plate": "Invar Plate", "block.basemetals.invar_pressure_plate": "Invar Pressure Plate", @@ -239,17 +227,18 @@ "block.basemetals.invar_wall": "Invar Wall", "block.basemetals.iron": "Molten Iron", "block.basemetals.iron_button": "Iron Button", + "block.basemetals.iron_double_slab": "Iron Double Slab", "block.basemetals.iron_lever": "Iron Lever", "block.basemetals.iron_plate": "Iron Plate", "block.basemetals.iron_slab": "Iron Slab", "block.basemetals.iron_stairs": "Iron Stairs", "block.basemetals.iron_wall": "Iron Wall", - "block.basemetals.lapis": "Molten Lapis", "block.basemetals.lead": "Molten Lead", "block.basemetals.lead_bars": "Lead Bars", "block.basemetals.lead_block": "Lead Block", "block.basemetals.lead_button": "Lead Button", "block.basemetals.lead_door": "Lead Door", + "block.basemetals.lead_double_slab": "Lead Double Slab", "block.basemetals.lead_lever": "Lead Lever", "block.basemetals.lead_ore": "Lead Ore", "block.basemetals.lead_plate": "Lead Plate", @@ -265,6 +254,7 @@ "block.basemetals.mithril_block": "Mithril Block", "block.basemetals.mithril_button": "Mithril Button", "block.basemetals.mithril_door": "Mithril Door", + "block.basemetals.mithril_double_slab": "Mithril Double Slab", "block.basemetals.mithril_lever": "Mithril Lever", "block.basemetals.mithril_plate": "Mithril Plate", "block.basemetals.mithril_pressure_plate": "Mithril Pressure Plate", @@ -277,6 +267,7 @@ "block.basemetals.nickel_block": "Nickel Block", "block.basemetals.nickel_button": "Nickel Button", "block.basemetals.nickel_door": "Nickel Door", + "block.basemetals.nickel_double_slab": "Nickel Double Slab", "block.basemetals.nickel_lever": "Nickel Lever", "block.basemetals.nickel_ore": "Nickel Ore", "block.basemetals.nickel_plate": "Nickel Plate", @@ -289,6 +280,7 @@ "block.basemetals.obsidian_bars": "Obsidian Bars", "block.basemetals.obsidian_button": "Obsidian Button", "block.basemetals.obsidian_door": "Obsidian Door", + "block.basemetals.obsidian_double_slab": "Obsidian Double Slab", "block.basemetals.obsidian_lever": "Obsidian Lever", "block.basemetals.obsidian_pressure_plate": "Obsidian Pressure Plate", "block.basemetals.obsidian_slab": "Obsidian Slab", @@ -300,6 +292,7 @@ "block.basemetals.pewter_block": "Pewter Block", "block.basemetals.pewter_button": "Pewter Button", "block.basemetals.pewter_door": "Pewter Door", + "block.basemetals.pewter_double_slab": "Pewter Double Slab", "block.basemetals.pewter_lever": "Pewter Lever", "block.basemetals.pewter_plate": "Pewter Plate", "block.basemetals.pewter_pressure_plate": "Pewter Pressure Plate", @@ -312,6 +305,7 @@ "block.basemetals.platinum_block": "Platinum Block", "block.basemetals.platinum_button": "Platinum Button", "block.basemetals.platinum_door": "Platinum Door", + "block.basemetals.platinum_double_slab": "Platinum Double Slab", "block.basemetals.platinum_lever": "Platinum Lever", "block.basemetals.platinum_ore": "Platinum Ore", "block.basemetals.platinum_plate": "Platinum Plate", @@ -335,6 +329,7 @@ "block.basemetals.silver_block": "Silver Block", "block.basemetals.silver_button": "Silver Button", "block.basemetals.silver_door": "Silver Door", + "block.basemetals.silver_double_slab": "Silver Double Slab", "block.basemetals.silver_lever": "Silver Lever", "block.basemetals.silver_ore": "Silver Ore", "block.basemetals.silver_plate": "Silver Plate", @@ -348,6 +343,7 @@ "block.basemetals.starsteel_block": "Star-Steel Block", "block.basemetals.starsteel_button": "Starsteel Button", "block.basemetals.starsteel_door": "Star-Steel Door", + "block.basemetals.starsteel_double_slab": "Starsteel Double Slab", "block.basemetals.starsteel_lever": "Starsteel Lever", "block.basemetals.starsteel_ore": "Star-Steel Ore", "block.basemetals.starsteel_plate": "Star-Steel Plate", @@ -365,6 +361,7 @@ "block.basemetals.steel_block": "Steel Block", "block.basemetals.steel_button": "Steel Button", "block.basemetals.steel_door": "Steel Door", + "block.basemetals.steel_double_slab": "Steel Double Slab", "block.basemetals.steel_lever": "Steel Lever", "block.basemetals.steel_plate": "Steel Plate", "block.basemetals.steel_pressure_plate": "Steel Pressure Plate", @@ -372,7 +369,6 @@ "block.basemetals.steel_stairs": "Steel Stairs", "block.basemetals.steel_trapdoor": "Steel Trapdoor", "block.basemetals.steel_wall": "Steel Wall", - "block.basemetals.stone": "Molten Stone", "block.basemetals.stone_anvil": "Stone Anvil", "block.basemetals.stone_anvil.intact": "Stone Anvil", "block.basemetals.stone_anvil.slightlyDamaged": "Slightly Damaged Stone Anvil", @@ -382,6 +378,7 @@ "block.basemetals.tin_block": "Tin Block", "block.basemetals.tin_button": "Tin Button", "block.basemetals.tin_door": "Tin Door", + "block.basemetals.tin_double_slab": "Tin Double Slab", "block.basemetals.tin_lever": "Tin Lever", "block.basemetals.tin_ore": "Tin Ore", "block.basemetals.tin_plate": "Tin Plate", @@ -390,12 +387,12 @@ "block.basemetals.tin_stairs": "Tin Stairs", "block.basemetals.tin_trapdoor": "Tin Trapdoor", "block.basemetals.tin_wall": "Tin Wall", - "block.basemetals.wood": "Molten Wood", "block.basemetals.zinc": "Molten Zinc", "block.basemetals.zinc_bars": "Zinc Bars", "block.basemetals.zinc_block": "Zinc Block", "block.basemetals.zinc_button": "Zinc Button", "block.basemetals.zinc_door": "Zinc Door", + "block.basemetals.zinc_double_slab": "Zinc Double Slab", "block.basemetals.zinc_lever": "Zinc Lever", "block.basemetals.zinc_ore": "Zinc Ore", "block.basemetals.zinc_plate": "Zinc Plate", @@ -457,12 +454,10 @@ "item.basemetals.adamantine_button": "Adamantine Button", "item.basemetals.adamantine_casing": "Adamantine Casing", "item.basemetals.adamantine_chestplate": "Adamantine Chestplate", - "item.basemetals.adamantine_clump": "Adamantine Clump", "item.basemetals.adamantine_crackhammer": "Adamantine Crack Hammer", "item.basemetals.adamantine_crossbow": "Adamantine Crossbow", "item.basemetals.adamantine_crushed": "Adamantine Crushed", "item.basemetals.adamantine_crushed_purified": "Adamantine Crushed Purified", - "item.basemetals.adamantine_crystal": "Adamantine Crystal", "item.basemetals.adamantine_dense_plate": "Adamantine Dense Plate", "item.basemetals.adamantine_door": "Adamantine Door", "item.basemetals.adamantine_fishing_rod": "Adamantine Fishing Rod", @@ -478,12 +473,10 @@ "item.basemetals.adamantine_pickaxe": "Adamantine Pickaxe", "item.basemetals.adamantine_plate": "Adamantine Plate", "item.basemetals.adamantine_powder": "Powdered Adamantine", - "item.basemetals.adamantine_powder_dirty": "Adamantine Powder Dirty", "item.basemetals.adamantine_pressure_plate": "Adamantine Pressure Plate", "item.basemetals.adamantine_raw": "Raw Adamantine", "item.basemetals.adamantine_rod": "Adamantine Rod", "item.basemetals.adamantine_scythe": "Adamantine Sickle", - "item.basemetals.adamantine_shard": "Adamantine Shard", "item.basemetals.adamantine_shears": "Adamantine Shears", "item.basemetals.adamantine_shield": "Adamantine Shield", "item.basemetals.adamantine_shovel": "Adamantine Shovel", @@ -505,12 +498,10 @@ "item.basemetals.antimony_button": "Antimony Button", "item.basemetals.antimony_casing": "Antimony Casing", "item.basemetals.antimony_chestplate": "Antimony Chestplate", - "item.basemetals.antimony_clump": "Antimony Clump", "item.basemetals.antimony_crackhammer": "Antimony Crackhammer", "item.basemetals.antimony_crossbow": "Antimony Crossbow", "item.basemetals.antimony_crushed": "Antimony Crushed", "item.basemetals.antimony_crushed_purified": "Antimony Crushed Purified", - "item.basemetals.antimony_crystal": "Antimony Crystal", "item.basemetals.antimony_dense_plate": "Antimony Dense Plate", "item.basemetals.antimony_door": "Antimony Door", "item.basemetals.antimony_fishing_rod": "Antimony Fishing Rod", @@ -526,12 +517,10 @@ "item.basemetals.antimony_pickaxe": "Antimony Pickaxe", "item.basemetals.antimony_plate": "Antimony Plate", "item.basemetals.antimony_powder": "Antimony Powder", - "item.basemetals.antimony_powder_dirty": "Antimony Powder Dirty", "item.basemetals.antimony_pressure_plate": "Antimony Pressure Plate", "item.basemetals.antimony_raw": "Raw Antimony", "item.basemetals.antimony_rod": "Antimony Rod", "item.basemetals.antimony_scythe": "Antimony Sickle", - "item.basemetals.antimony_shard": "Antimony Shard", "item.basemetals.antimony_shears": "Antimony Shears", "item.basemetals.antimony_shield": "Antimony Shield", "item.basemetals.antimony_shovel": "Antimony Shovel", @@ -594,12 +583,10 @@ "item.basemetals.bismuth_button": "Bismuth Button", "item.basemetals.bismuth_casing": "Bismuth Casing", "item.basemetals.bismuth_chestplate": "Bismuth Chestplate", - "item.basemetals.bismuth_clump": "Bismuth Clump", "item.basemetals.bismuth_crackhammer": "Bismuth Crackhammer", "item.basemetals.bismuth_crossbow": "Bismuth Crossbow", "item.basemetals.bismuth_crushed": "Bismuth Crushed", "item.basemetals.bismuth_crushed_purified": "Bismuth Crushed Purified", - "item.basemetals.bismuth_crystal": "Bismuth Crystal", "item.basemetals.bismuth_dense_plate": "Bismuth Dense Plate", "item.basemetals.bismuth_door": "Bismuth Door", "item.basemetals.bismuth_fishing_rod": "Bismuth Fishing Rod", @@ -615,12 +602,10 @@ "item.basemetals.bismuth_pickaxe": "Bismuth Pickaxe", "item.basemetals.bismuth_plate": "Bismuth Plate", "item.basemetals.bismuth_powder": "Bismuth Powder", - "item.basemetals.bismuth_powder_dirty": "Bismuth Powder Dirty", "item.basemetals.bismuth_pressure_plate": "Bismuth Pressure Plate", "item.basemetals.bismuth_raw": "Raw Bismuth", "item.basemetals.bismuth_rod": "Bismuth Rod", "item.basemetals.bismuth_scythe": "Bismuth Sickle", - "item.basemetals.bismuth_shard": "Bismuth Shard", "item.basemetals.bismuth_shears": "Bismuth Shears", "item.basemetals.bismuth_shield": "Bismuth Shield", "item.basemetals.bismuth_shovel": "Bismuth Shovel", @@ -734,12 +719,10 @@ "item.basemetals.coldiron_button": "Cold Iron Button", "item.basemetals.coldiron_casing": "Cold Iron Casing", "item.basemetals.coldiron_chestplate": "Cold-Iron Chestplate", - "item.basemetals.coldiron_clump": "Cold Iron Clump", "item.basemetals.coldiron_crackhammer": "Cold-Iron Crack Hammer", "item.basemetals.coldiron_crossbow": "Cold Iron Crossbow", "item.basemetals.coldiron_crushed": "Cold Iron Crushed", "item.basemetals.coldiron_crushed_purified": "Cold Iron Crushed Purified", - "item.basemetals.coldiron_crystal": "Cold Iron Crystal", "item.basemetals.coldiron_dense_plate": "Cold Iron Dense Plate", "item.basemetals.coldiron_door": "Cold-Iron Door", "item.basemetals.coldiron_fishing_rod": "Cold Iron Fishing Rod", @@ -755,12 +738,10 @@ "item.basemetals.coldiron_pickaxe": "Cold-Iron Pickaxe", "item.basemetals.coldiron_plate": "Cold Iron Plate", "item.basemetals.coldiron_powder": "Powdered Cold-Iron", - "item.basemetals.coldiron_powder_dirty": "Cold Iron Powder Dirty", "item.basemetals.coldiron_pressure_plate": "Cold Iron Pressure Plate", "item.basemetals.coldiron_raw": "Raw Cold Iron", "item.basemetals.coldiron_rod": "Cold-Iron Rod", "item.basemetals.coldiron_scythe": "Coldiron Sickle", - "item.basemetals.coldiron_shard": "Cold Iron Shard", "item.basemetals.coldiron_shears": "Cold Iron Shears", "item.basemetals.coldiron_shield": "Cold Iron Shield", "item.basemetals.coldiron_shovel": "Cold-Iron Shovel", @@ -1043,8 +1024,6 @@ "item.basemetals.iron_smallpowder": "Iron Smallpowder", "item.basemetals.iron_stairs": "Iron Stairs", "item.basemetals.iron_wall": "Iron Wall", - "item.basemetals.lapis": "Lapis", - "item.basemetals.lapis_bucket": "Bucket of Molten Lapis Lazuli", "item.basemetals.lapis_smallpowder": "Lapis Smallpowder", "item.basemetals.lead": "Lead", "item.basemetals.lead_arrow": "Lead Arrow", @@ -1146,12 +1125,10 @@ "item.basemetals.nickel_button": "Nickel Button", "item.basemetals.nickel_casing": "Nickel Casing", "item.basemetals.nickel_chestplate": "Nickel Chestplate", - "item.basemetals.nickel_clump": "Nickel Clump", "item.basemetals.nickel_crackhammer": "Nickel Crack Hammer", "item.basemetals.nickel_crossbow": "Nickel Crossbow", "item.basemetals.nickel_crushed": "Nickel Crushed", "item.basemetals.nickel_crushed_purified": "Nickel Crushed Purified", - "item.basemetals.nickel_crystal": "Nickel Crystal", "item.basemetals.nickel_dense_plate": "Nickel Dense Plate", "item.basemetals.nickel_door": "Nickel Door", "item.basemetals.nickel_fishing_rod": "Nickel Fishing Rod", @@ -1167,12 +1144,10 @@ "item.basemetals.nickel_pickaxe": "Nickel Pickaxe", "item.basemetals.nickel_plate": "Nickel Plate", "item.basemetals.nickel_powder": "Powdered Nickel", - "item.basemetals.nickel_powder_dirty": "Nickel Powder Dirty", "item.basemetals.nickel_pressure_plate": "Nickel Pressure Plate", "item.basemetals.nickel_raw": "Raw Nickel", "item.basemetals.nickel_rod": "Nickel Rod", "item.basemetals.nickel_scythe": "Nickel Sickle", - "item.basemetals.nickel_shard": "Nickel Shard", "item.basemetals.nickel_shears": "Nickel Shears", "item.basemetals.nickel_shield": "Nickel Shield", "item.basemetals.nickel_shovel": "Nickel Shovel", @@ -1270,12 +1245,10 @@ "item.basemetals.platinum_button": "Platinum Button", "item.basemetals.platinum_casing": "Platinum Casing", "item.basemetals.platinum_chestplate": "Platinum Chestplate", - "item.basemetals.platinum_clump": "Platinum Clump", "item.basemetals.platinum_crackhammer": "Platinum Crack Hammer", "item.basemetals.platinum_crossbow": "Platinum Crossbow", "item.basemetals.platinum_crushed": "Platinum Crushed", "item.basemetals.platinum_crushed_purified": "Platinum Crushed Purified", - "item.basemetals.platinum_crystal": "Platinum Crystal", "item.basemetals.platinum_dense_plate": "Platinum Dense Plate", "item.basemetals.platinum_door": "Platinum Door", "item.basemetals.platinum_fishing_rod": "Platinum Fishing Rod", @@ -1291,12 +1264,10 @@ "item.basemetals.platinum_pickaxe": "Platinum Pickaxe", "item.basemetals.platinum_plate": "Platinum Plate", "item.basemetals.platinum_powder": "Powdered Platinum", - "item.basemetals.platinum_powder_dirty": "Platinum Powder Dirty", "item.basemetals.platinum_pressure_plate": "Platinum Pressure Plate", "item.basemetals.platinum_raw": "Raw Platinum", "item.basemetals.platinum_rod": "Platinum Rod", "item.basemetals.platinum_scythe": "Platinum Sickle", - "item.basemetals.platinum_shard": "Platinum Shard", "item.basemetals.platinum_shears": "Platinum Shears", "item.basemetals.platinum_shield": "Platinum Shield", "item.basemetals.platinum_shovel": "Platinum Shovel", @@ -1397,12 +1368,10 @@ "item.basemetals.starsteel_button": "Starsteel Button", "item.basemetals.starsteel_casing": "Starsteel Casing", "item.basemetals.starsteel_chestplate": "Star-Steel Chestplate", - "item.basemetals.starsteel_clump": "Starsteel Clump", "item.basemetals.starsteel_crackhammer": "Star-Steel Crack Hammer", "item.basemetals.starsteel_crossbow": "Starsteel Crossbow", "item.basemetals.starsteel_crushed": "Starsteel Crushed", "item.basemetals.starsteel_crushed_purified": "Starsteel Crushed Purified", - "item.basemetals.starsteel_crystal": "Starsteel Crystal", "item.basemetals.starsteel_dense_plate": "Starsteel Dense Plate", "item.basemetals.starsteel_door": "Star-Steel Door", "item.basemetals.starsteel_fishing_rod": "Starsteel Fishing Rod", @@ -1418,12 +1387,10 @@ "item.basemetals.starsteel_pickaxe": "Star-Steel Pickaxe", "item.basemetals.starsteel_plate": "Starsteel Plate", "item.basemetals.starsteel_powder": "Powdered Star-Steel", - "item.basemetals.starsteel_powder_dirty": "Starsteel Powder Dirty", "item.basemetals.starsteel_pressure_plate": "Starsteel Pressure Plate", "item.basemetals.starsteel_raw": "Raw Starsteel", "item.basemetals.starsteel_rod": "Star-Steel Rod", "item.basemetals.starsteel_scythe": "Starsteel Sickle", - "item.basemetals.starsteel_shard": "Starsteel Shard", "item.basemetals.starsteel_shears": "Starsteel Shears", "item.basemetals.starsteel_shield": "Starsteel Shield", "item.basemetals.starsteel_shovel": "Star-Steel Shovel", @@ -1474,9 +1441,7 @@ "item.basemetals.steel_sword": "Steel Sword", "item.basemetals.steel_trapdoor": "Steel Trapdoor", "item.basemetals.steel_wall": "Steel Wall", - "item.basemetals.stone": "Stone", "item.basemetals.stone_anvil": "Stone Anvil", - "item.basemetals.stone_bucket": "Bucket of Molten Stone", "item.basemetals.stone_crackhammer": "Stone Crack Hammer", "item.basemetals.stone_gear": "Stone Gear", "item.basemetals.stone_rod": "Stone Rod", @@ -1521,8 +1486,6 @@ "item.basemetals.tin_sword": "Tin Sword", "item.basemetals.tin_trapdoor": "Tin Trapdoor", "item.basemetals.tin_wall": "Tin Wall", - "item.basemetals.wood": "Wood", - "item.basemetals.wood_bucket": "Bucket of Liquefied Wood", "item.basemetals.wood_crackhammer": "Wooden Crack Hammer", "item.basemetals.wood_gear": "Wood Gear", "item.basemetals.wood_scythe": "Wood Sickle", @@ -1538,12 +1501,10 @@ "item.basemetals.zinc_button": "Zinc Button", "item.basemetals.zinc_casing": "Zinc Casing", "item.basemetals.zinc_chestplate": "Zinc Chestplate", - "item.basemetals.zinc_clump": "Zinc Clump", "item.basemetals.zinc_crackhammer": "Zinc Crackhammer", "item.basemetals.zinc_crossbow": "Zinc Crossbow", "item.basemetals.zinc_crushed": "Zinc Crushed", "item.basemetals.zinc_crushed_purified": "Zinc Crushed Purified", - "item.basemetals.zinc_crystal": "Zinc Crystal", "item.basemetals.zinc_dense_plate": "Zinc Dense Plate", "item.basemetals.zinc_door": "Zinc Door", "item.basemetals.zinc_fishing_rod": "Zinc Fishing Rod", @@ -1559,12 +1520,10 @@ "item.basemetals.zinc_pickaxe": "Zinc Pickaxe", "item.basemetals.zinc_plate": "Zinc Plate", "item.basemetals.zinc_powder": "Powdered Zinc", - "item.basemetals.zinc_powder_dirty": "Zinc Powder Dirty", "item.basemetals.zinc_pressure_plate": "Zinc Pressure Plate", "item.basemetals.zinc_raw": "Raw Zinc", "item.basemetals.zinc_rod": "Zinc Rod", "item.basemetals.zinc_scythe": "Zinc Sickle", - "item.basemetals.zinc_shard": "Zinc Shard", "item.basemetals.zinc_shears": "Zinc Shears", "item.basemetals.zinc_shield": "Zinc Shield", "item.basemetals.zinc_shovel": "Zinc Shovel", @@ -1592,7 +1551,6 @@ "item.bucket.gold": "Bucket of Molten Gold", "item.bucket.invar": "Bucket of Molten Invar", "item.bucket.iron": "Bucket of Molten Iron", - "item.bucket.lapis": "Bucket of Molten Lapis Lazuli", "item.bucket.lead": "Bucket of Molten Lead", "item.bucket.mercury": "Bucket of Mercury", "item.bucket.mithril": "Bucket of Molten Mithril", @@ -1606,13 +1564,12 @@ "item.bucket.silver": "Bucket of Molten Silver", "item.bucket.starsteel": "Bucket of Molten Starsteel", "item.bucket.steel": "Bucket of Molten Steel", - "item.bucket.stone": "Bucket of Molten Stone", "item.bucket.tin": "Bucket of Molten Tin", - "item.bucket.wood": "Bucket of Liquefied Wood", "item.bucket.zinc": "Bucket of Molten Zinc", "itemGroup.basemetals.blocks": "Base Metals Blocks", "itemGroup.basemetals.combat": "Base Metals Combat", "itemGroup.basemetals.items": "Base Metals Items", + "itemGroup.basemetals.materials": "Base Metals Materials", "itemGroup.basemetals.tools": "Base Metals Tools", "material.basemetals.adamantine": "Adamantine", "material.basemetals.antimony": "Antimony", diff --git a/src/generated/resources/assets/basemetals/lang/en_gb.json b/src/generated/resources/assets/basemetals/lang/en_gb.json index aa04a59be..145660d50 100644 --- a/src/generated/resources/assets/basemetals/lang/en_gb.json +++ b/src/generated/resources/assets/basemetals/lang/en_gb.json @@ -44,6 +44,7 @@ "block.basemetals.adamantine_block": "Adamantine Block", "block.basemetals.adamantine_button": "Adamantine Button", "block.basemetals.adamantine_door": "Adamantine Door", + "block.basemetals.adamantine_double_slab": "Adamantine Double Slab", "block.basemetals.adamantine_lever": "Adamantine Lever", "block.basemetals.adamantine_ore": "Adamantine Ore", "block.basemetals.adamantine_plate": "Adamantine Plate", @@ -57,6 +58,7 @@ "block.basemetals.antimony_block": "Antimony Block", "block.basemetals.antimony_button": "Antimony Button", "block.basemetals.antimony_door": "Antimony Door", + "block.basemetals.antimony_double_slab": "Antimony Double Slab", "block.basemetals.antimony_lever": "Antimony Lever", "block.basemetals.antimony_ore": "Antimony Ore", "block.basemetals.antimony_plate": "Antimony Plate", @@ -70,6 +72,7 @@ "block.basemetals.aquarium_block": "Aquarium Block", "block.basemetals.aquarium_button": "Aquarium Button", "block.basemetals.aquarium_door": "Aquarium Door", + "block.basemetals.aquarium_double_slab": "Aquarium Double Slab", "block.basemetals.aquarium_lever": "Aquarium Lever", "block.basemetals.aquarium_plate": "Aquarium Plate", "block.basemetals.aquarium_pressure_plate": "Aquarium Pressure Plate", @@ -82,6 +85,7 @@ "block.basemetals.bismuth_block": "Bismuth Block", "block.basemetals.bismuth_button": "Bismuth Button", "block.basemetals.bismuth_door": "Bismuth Door", + "block.basemetals.bismuth_double_slab": "Bismuth Double Slab", "block.basemetals.bismuth_lever": "Bismuth Lever", "block.basemetals.bismuth_ore": "Bismuth Ore", "block.basemetals.bismuth_plate": "Bismuth Plate", @@ -95,6 +99,7 @@ "block.basemetals.brass_block": "Brass Block", "block.basemetals.brass_button": "Brass Button", "block.basemetals.brass_door": "Brass Door", + "block.basemetals.brass_double_slab": "Brass Double Slab", "block.basemetals.brass_lever": "Brass Lever", "block.basemetals.brass_plate": "Brass Plate", "block.basemetals.brass_pressure_plate": "Brass Pressure Plate", @@ -107,6 +112,7 @@ "block.basemetals.bronze_block": "Bronze Block", "block.basemetals.bronze_button": "Bronze Button", "block.basemetals.bronze_door": "Bronze Door", + "block.basemetals.bronze_double_slab": "Bronze Double Slab", "block.basemetals.bronze_lever": "Bronze Lever", "block.basemetals.bronze_plate": "Bronze Plate", "block.basemetals.bronze_pressure_plate": "Bronze Pressure Plate", @@ -122,6 +128,7 @@ "block.basemetals.coldiron_block": "Cold-Iron Block", "block.basemetals.coldiron_button": "Cold Iron Button", "block.basemetals.coldiron_door": "Cold-Iron Door", + "block.basemetals.coldiron_double_slab": "Cold Iron Double Slab", "block.basemetals.coldiron_lever": "Cold Iron Lever", "block.basemetals.coldiron_ore": "Cold-Iron Ore", "block.basemetals.coldiron_plate": "Cold-Iron Plate", @@ -135,6 +142,7 @@ "block.basemetals.copper_block": "Copper Block", "block.basemetals.copper_button": "Copper Button", "block.basemetals.copper_door": "Copper Door", + "block.basemetals.copper_double_slab": "Copper Double Slab", "block.basemetals.copper_lever": "Copper Lever", "block.basemetals.copper_ore": "Copper Ore", "block.basemetals.copper_plate": "Copper Plate", @@ -148,6 +156,7 @@ "block.basemetals.cupronickel_block": "Cupronickel Block", "block.basemetals.cupronickel_button": "Cupronickel Button", "block.basemetals.cupronickel_door": "Cupronickel Door", + "block.basemetals.cupronickel_double_slab": "Cupronickel Double Slab", "block.basemetals.cupronickel_lever": "Cupronickel Lever", "block.basemetals.cupronickel_plate": "Cupronickel Plate", "block.basemetals.cupronickel_pressure_plate": "Cupronickel Pressure Plate", @@ -159,43 +168,19 @@ "block.basemetals.diamond_bars": "Diamond Bars", "block.basemetals.diamond_button": "Diamond Button", "block.basemetals.diamond_door": "Diamond Door", + "block.basemetals.diamond_double_slab": "Diamond Double Slab", "block.basemetals.diamond_lever": "Diamond Lever", "block.basemetals.diamond_pressure_plate": "Diamond Pressure Plate", "block.basemetals.diamond_slab": "Diamond Slab", "block.basemetals.diamond_stairs": "Diamond Stairs", "block.basemetals.diamond_trapdoor": "Diamond Trapdoor", "block.basemetals.diamond_wall": "Diamond Wall", - "block.basemetals.double_adamantine_slab": "Double Adamantine Slab", - "block.basemetals.double_antimony_slab": "Double Antimony Slab", - "block.basemetals.double_aquarium_slab": "Double Aquarium Slab", - "block.basemetals.double_bismuth_slab": "Double Bismuth Slab", - "block.basemetals.double_brass_slab": "Double Brass Slab", - "block.basemetals.double_bronze_slab": "Double Bronze Slab", - "block.basemetals.double_coldiron_slab": "Double Cold Iron Slab", - "block.basemetals.double_copper_slab": "Double Copper Slab", - "block.basemetals.double_cupronickel_slab": "Double Cupronickel Slab", - "block.basemetals.double_diamond_slab": "Double Diamond Slab", - "block.basemetals.double_electrum_slab": "Double Electrum Slab", - "block.basemetals.double_emerald_slab": "Double Emerald Slab", - "block.basemetals.double_gold_slab": "Double Gold Slab", - "block.basemetals.double_invar_slab": "Double Invar Slab", - "block.basemetals.double_iron_slab": "Double Iron Slab", - "block.basemetals.double_lead_slab": "Double Lead Slab", - "block.basemetals.double_mithril_slab": "Double Mithril Slab", - "block.basemetals.double_nickel_slab": "Double Nickel Slab", - "block.basemetals.double_obsidian_slab": "Double Obsidian Slab", - "block.basemetals.double_pewter_slab": "Double Pewter Slab", - "block.basemetals.double_platinum_slab": "Double Platinum Slab", - "block.basemetals.double_silver_slab": "Double Silver Slab", - "block.basemetals.double_starsteel_slab": "Double Starsteel Slab", - "block.basemetals.double_steel_slab": "Double Steel Slab", - "block.basemetals.double_tin_slab": "Double Tin Slab", - "block.basemetals.double_zinc_slab": "Double Zinc Slab", "block.basemetals.electrum": "Molten Electrum", "block.basemetals.electrum_bars": "Electrum Bars", "block.basemetals.electrum_block": "Electrum Block", "block.basemetals.electrum_button": "Electrum Button", "block.basemetals.electrum_door": "Electrum Door", + "block.basemetals.electrum_double_slab": "Electrum Double Slab", "block.basemetals.electrum_lever": "Electrum Lever", "block.basemetals.electrum_plate": "Electrum Plate", "block.basemetals.electrum_pressure_plate": "Electrum Pressure Plate", @@ -207,6 +192,7 @@ "block.basemetals.emerald_bars": "Emerald Bars", "block.basemetals.emerald_button": "Emerald Button", "block.basemetals.emerald_door": "Emerald Door", + "block.basemetals.emerald_double_slab": "Emerald Double Slab", "block.basemetals.emerald_lever": "Emerald Lever", "block.basemetals.emerald_pressure_plate": "Emerald Pressure Plate", "block.basemetals.emerald_slab": "Emerald Slab", @@ -218,6 +204,7 @@ "block.basemetals.gold_bars": "Gold Bars", "block.basemetals.gold_button": "Gold Button", "block.basemetals.gold_door": "Gold Door", + "block.basemetals.gold_double_slab": "Gold Double Slab", "block.basemetals.gold_lever": "Gold Lever", "block.basemetals.gold_plate": "Gold Plate", "block.basemetals.gold_slab": "Gold Slab", @@ -230,6 +217,7 @@ "block.basemetals.invar_block": "Invar Block", "block.basemetals.invar_button": "Invar Button", "block.basemetals.invar_door": "Invar Door", + "block.basemetals.invar_double_slab": "Invar Double Slab", "block.basemetals.invar_lever": "Invar Lever", "block.basemetals.invar_plate": "Invar Plate", "block.basemetals.invar_pressure_plate": "Invar Pressure Plate", @@ -239,17 +227,18 @@ "block.basemetals.invar_wall": "Invar Wall", "block.basemetals.iron": "Molten Iron", "block.basemetals.iron_button": "Iron Button", + "block.basemetals.iron_double_slab": "Iron Double Slab", "block.basemetals.iron_lever": "Iron Lever", "block.basemetals.iron_plate": "Iron Plate", "block.basemetals.iron_slab": "Iron Slab", "block.basemetals.iron_stairs": "Iron Stairs", "block.basemetals.iron_wall": "Iron Wall", - "block.basemetals.lapis": "Molten Lapis", "block.basemetals.lead": "Molten Lead", "block.basemetals.lead_bars": "Lead Bars", "block.basemetals.lead_block": "Lead Block", "block.basemetals.lead_button": "Lead Button", "block.basemetals.lead_door": "Lead Door", + "block.basemetals.lead_double_slab": "Lead Double Slab", "block.basemetals.lead_lever": "Lead Lever", "block.basemetals.lead_ore": "Lead Ore", "block.basemetals.lead_plate": "Lead Plate", @@ -265,6 +254,7 @@ "block.basemetals.mithril_block": "Mithril Block", "block.basemetals.mithril_button": "Mithril Button", "block.basemetals.mithril_door": "Mithril Door", + "block.basemetals.mithril_double_slab": "Mithril Double Slab", "block.basemetals.mithril_lever": "Mithril Lever", "block.basemetals.mithril_plate": "Mithril Plate", "block.basemetals.mithril_pressure_plate": "Mithril Pressure Plate", @@ -277,6 +267,7 @@ "block.basemetals.nickel_block": "Nickel Block", "block.basemetals.nickel_button": "Nickel Button", "block.basemetals.nickel_door": "Nickel Door", + "block.basemetals.nickel_double_slab": "Nickel Double Slab", "block.basemetals.nickel_lever": "Nickel Lever", "block.basemetals.nickel_ore": "Nickel Ore", "block.basemetals.nickel_plate": "Nickel Plate", @@ -289,6 +280,7 @@ "block.basemetals.obsidian_bars": "Obsidian Bars", "block.basemetals.obsidian_button": "Obsidian Button", "block.basemetals.obsidian_door": "Obsidian Door", + "block.basemetals.obsidian_double_slab": "Obsidian Double Slab", "block.basemetals.obsidian_lever": "Obsidian Lever", "block.basemetals.obsidian_pressure_plate": "Obsidian Pressure Plate", "block.basemetals.obsidian_slab": "Obsidian Slab", @@ -300,6 +292,7 @@ "block.basemetals.pewter_block": "Pewter Block", "block.basemetals.pewter_button": "Pewter Button", "block.basemetals.pewter_door": "Pewter Door", + "block.basemetals.pewter_double_slab": "Pewter Double Slab", "block.basemetals.pewter_lever": "Pewter Lever", "block.basemetals.pewter_plate": "Pewter Plate", "block.basemetals.pewter_pressure_plate": "Pewter Pressure Plate", @@ -312,6 +305,7 @@ "block.basemetals.platinum_block": "Platinum Block", "block.basemetals.platinum_button": "Platinum Button", "block.basemetals.platinum_door": "Platinum Door", + "block.basemetals.platinum_double_slab": "Platinum Double Slab", "block.basemetals.platinum_lever": "Platinum Lever", "block.basemetals.platinum_ore": "Platinum Ore", "block.basemetals.platinum_plate": "Platinum Plate", @@ -335,6 +329,7 @@ "block.basemetals.silver_block": "Silver Block", "block.basemetals.silver_button": "Silver Button", "block.basemetals.silver_door": "Silver Door", + "block.basemetals.silver_double_slab": "Silver Double Slab", "block.basemetals.silver_lever": "Silver Lever", "block.basemetals.silver_ore": "Silver Ore", "block.basemetals.silver_plate": "Silver Plate", @@ -348,6 +343,7 @@ "block.basemetals.starsteel_block": "Star-Steel Block", "block.basemetals.starsteel_button": "Starsteel Button", "block.basemetals.starsteel_door": "Star-Steel Door", + "block.basemetals.starsteel_double_slab": "Starsteel Double Slab", "block.basemetals.starsteel_lever": "Starsteel Lever", "block.basemetals.starsteel_ore": "Star-Steel Ore", "block.basemetals.starsteel_plate": "Star-Steel Plate", @@ -365,6 +361,7 @@ "block.basemetals.steel_block": "Steel Block", "block.basemetals.steel_button": "Steel Button", "block.basemetals.steel_door": "Steel Door", + "block.basemetals.steel_double_slab": "Steel Double Slab", "block.basemetals.steel_lever": "Steel Lever", "block.basemetals.steel_plate": "Steel Plate", "block.basemetals.steel_pressure_plate": "Steel Pressure Plate", @@ -372,7 +369,6 @@ "block.basemetals.steel_stairs": "Steel Stairs", "block.basemetals.steel_trapdoor": "Steel Trapdoor", "block.basemetals.steel_wall": "Steel Wall", - "block.basemetals.stone": "Molten Stone", "block.basemetals.stone_anvil": "Stone Anvil", "block.basemetals.stone_anvil.intact": "Stone Anvil", "block.basemetals.stone_anvil.slightlyDamaged": "Slightly Damaged Stone Anvil", @@ -382,6 +378,7 @@ "block.basemetals.tin_block": "Tin Block", "block.basemetals.tin_button": "Tin Button", "block.basemetals.tin_door": "Tin Door", + "block.basemetals.tin_double_slab": "Tin Double Slab", "block.basemetals.tin_lever": "Tin Lever", "block.basemetals.tin_ore": "Tin Ore", "block.basemetals.tin_plate": "Tin Plate", @@ -390,12 +387,12 @@ "block.basemetals.tin_stairs": "Tin Stairs", "block.basemetals.tin_trapdoor": "Tin Trapdoor", "block.basemetals.tin_wall": "Tin Wall", - "block.basemetals.wood": "Molten Wood", "block.basemetals.zinc": "Molten Zinc", "block.basemetals.zinc_bars": "Zinc Bars", "block.basemetals.zinc_block": "Zinc Block", "block.basemetals.zinc_button": "Zinc Button", "block.basemetals.zinc_door": "Zinc Door", + "block.basemetals.zinc_double_slab": "Zinc Double Slab", "block.basemetals.zinc_lever": "Zinc Lever", "block.basemetals.zinc_ore": "Zinc Ore", "block.basemetals.zinc_plate": "Zinc Plate", @@ -457,12 +454,10 @@ "item.basemetals.adamantine_button": "Adamantine Button", "item.basemetals.adamantine_casing": "Adamantine Casing", "item.basemetals.adamantine_chestplate": "Adamantine Chestplate", - "item.basemetals.adamantine_clump": "Adamantine Clump", "item.basemetals.adamantine_crackhammer": "Adamantine Crack Hammer", "item.basemetals.adamantine_crossbow": "Adamantine Crossbow", "item.basemetals.adamantine_crushed": "Adamantine Crushed", "item.basemetals.adamantine_crushed_purified": "Adamantine Crushed Purified", - "item.basemetals.adamantine_crystal": "Adamantine Crystal", "item.basemetals.adamantine_dense_plate": "Adamantine Dense Plate", "item.basemetals.adamantine_door": "Adamantine Door", "item.basemetals.adamantine_fishing_rod": "Adamantine Fishing Rod", @@ -478,12 +473,10 @@ "item.basemetals.adamantine_pickaxe": "Adamantine Pickaxe", "item.basemetals.adamantine_plate": "Adamantine Plate", "item.basemetals.adamantine_powder": "Powdered Adamantine", - "item.basemetals.adamantine_powder_dirty": "Adamantine Powder Dirty", "item.basemetals.adamantine_pressure_plate": "Adamantine Pressure Plate", "item.basemetals.adamantine_raw": "Raw Adamantine", "item.basemetals.adamantine_rod": "Adamantine Rod", "item.basemetals.adamantine_scythe": "Adamantine Sickle", - "item.basemetals.adamantine_shard": "Adamantine Shard", "item.basemetals.adamantine_shears": "Adamantine Shears", "item.basemetals.adamantine_shield": "Adamantine Shield", "item.basemetals.adamantine_shovel": "Adamantine Shovel", @@ -505,12 +498,10 @@ "item.basemetals.antimony_button": "Antimony Button", "item.basemetals.antimony_casing": "Antimony Casing", "item.basemetals.antimony_chestplate": "Antimony Chestplate", - "item.basemetals.antimony_clump": "Antimony Clump", "item.basemetals.antimony_crackhammer": "Antimony Crackhammer", "item.basemetals.antimony_crossbow": "Antimony Crossbow", "item.basemetals.antimony_crushed": "Antimony Crushed", "item.basemetals.antimony_crushed_purified": "Antimony Crushed Purified", - "item.basemetals.antimony_crystal": "Antimony Crystal", "item.basemetals.antimony_dense_plate": "Antimony Dense Plate", "item.basemetals.antimony_door": "Antimony Door", "item.basemetals.antimony_fishing_rod": "Antimony Fishing Rod", @@ -526,12 +517,10 @@ "item.basemetals.antimony_pickaxe": "Antimony Pickaxe", "item.basemetals.antimony_plate": "Antimony Plate", "item.basemetals.antimony_powder": "Antimony Powder", - "item.basemetals.antimony_powder_dirty": "Antimony Powder Dirty", "item.basemetals.antimony_pressure_plate": "Antimony Pressure Plate", "item.basemetals.antimony_raw": "Raw Antimony", "item.basemetals.antimony_rod": "Antimony Rod", "item.basemetals.antimony_scythe": "Antimony Sickle", - "item.basemetals.antimony_shard": "Antimony Shard", "item.basemetals.antimony_shears": "Antimony Shears", "item.basemetals.antimony_shield": "Antimony Shield", "item.basemetals.antimony_shovel": "Antimony Shovel", @@ -594,12 +583,10 @@ "item.basemetals.bismuth_button": "Bismuth Button", "item.basemetals.bismuth_casing": "Bismuth Casing", "item.basemetals.bismuth_chestplate": "Bismuth Chestplate", - "item.basemetals.bismuth_clump": "Bismuth Clump", "item.basemetals.bismuth_crackhammer": "Bismuth Crackhammer", "item.basemetals.bismuth_crossbow": "Bismuth Crossbow", "item.basemetals.bismuth_crushed": "Bismuth Crushed", "item.basemetals.bismuth_crushed_purified": "Bismuth Crushed Purified", - "item.basemetals.bismuth_crystal": "Bismuth Crystal", "item.basemetals.bismuth_dense_plate": "Bismuth Dense Plate", "item.basemetals.bismuth_door": "Bismuth Door", "item.basemetals.bismuth_fishing_rod": "Bismuth Fishing Rod", @@ -615,12 +602,10 @@ "item.basemetals.bismuth_pickaxe": "Bismuth Pickaxe", "item.basemetals.bismuth_plate": "Bismuth Plate", "item.basemetals.bismuth_powder": "Bismuth Powder", - "item.basemetals.bismuth_powder_dirty": "Bismuth Powder Dirty", "item.basemetals.bismuth_pressure_plate": "Bismuth Pressure Plate", "item.basemetals.bismuth_raw": "Raw Bismuth", "item.basemetals.bismuth_rod": "Bismuth Rod", "item.basemetals.bismuth_scythe": "Bismuth Sickle", - "item.basemetals.bismuth_shard": "Bismuth Shard", "item.basemetals.bismuth_shears": "Bismuth Shears", "item.basemetals.bismuth_shield": "Bismuth Shield", "item.basemetals.bismuth_shovel": "Bismuth Shovel", @@ -734,12 +719,10 @@ "item.basemetals.coldiron_button": "Cold Iron Button", "item.basemetals.coldiron_casing": "Cold Iron Casing", "item.basemetals.coldiron_chestplate": "Cold-Iron Chestplate", - "item.basemetals.coldiron_clump": "Cold Iron Clump", "item.basemetals.coldiron_crackhammer": "Cold-Iron Crack Hammer", "item.basemetals.coldiron_crossbow": "Cold Iron Crossbow", "item.basemetals.coldiron_crushed": "Cold Iron Crushed", "item.basemetals.coldiron_crushed_purified": "Cold Iron Crushed Purified", - "item.basemetals.coldiron_crystal": "Cold Iron Crystal", "item.basemetals.coldiron_dense_plate": "Cold Iron Dense Plate", "item.basemetals.coldiron_door": "Cold-Iron Door", "item.basemetals.coldiron_fishing_rod": "Cold Iron Fishing Rod", @@ -755,12 +738,10 @@ "item.basemetals.coldiron_pickaxe": "Cold-Iron Pickaxe", "item.basemetals.coldiron_plate": "Cold Iron Plate", "item.basemetals.coldiron_powder": "Powdered Cold-Iron", - "item.basemetals.coldiron_powder_dirty": "Cold Iron Powder Dirty", "item.basemetals.coldiron_pressure_plate": "Cold Iron Pressure Plate", "item.basemetals.coldiron_raw": "Raw Cold Iron", "item.basemetals.coldiron_rod": "Cold-Iron Rod", "item.basemetals.coldiron_scythe": "Coldiron Sickle", - "item.basemetals.coldiron_shard": "Cold Iron Shard", "item.basemetals.coldiron_shears": "Cold Iron Shears", "item.basemetals.coldiron_shield": "Cold Iron Shield", "item.basemetals.coldiron_shovel": "Cold-Iron Shovel", @@ -1043,8 +1024,6 @@ "item.basemetals.iron_smallpowder": "Iron Smallpowder", "item.basemetals.iron_stairs": "Iron Stairs", "item.basemetals.iron_wall": "Iron Wall", - "item.basemetals.lapis": "Lapis", - "item.basemetals.lapis_bucket": "Bucket of Molten Lapis Lazuli", "item.basemetals.lapis_smallpowder": "Lapis Smallpowder", "item.basemetals.lead": "Lead", "item.basemetals.lead_arrow": "Lead Arrow", @@ -1146,12 +1125,10 @@ "item.basemetals.nickel_button": "Nickel Button", "item.basemetals.nickel_casing": "Nickel Casing", "item.basemetals.nickel_chestplate": "Nickel Chestplate", - "item.basemetals.nickel_clump": "Nickel Clump", "item.basemetals.nickel_crackhammer": "Nickel Crack Hammer", "item.basemetals.nickel_crossbow": "Nickel Crossbow", "item.basemetals.nickel_crushed": "Nickel Crushed", "item.basemetals.nickel_crushed_purified": "Nickel Crushed Purified", - "item.basemetals.nickel_crystal": "Nickel Crystal", "item.basemetals.nickel_dense_plate": "Nickel Dense Plate", "item.basemetals.nickel_door": "Nickel Door", "item.basemetals.nickel_fishing_rod": "Nickel Fishing Rod", @@ -1167,12 +1144,10 @@ "item.basemetals.nickel_pickaxe": "Nickel Pickaxe", "item.basemetals.nickel_plate": "Nickel Plate", "item.basemetals.nickel_powder": "Powdered Nickel", - "item.basemetals.nickel_powder_dirty": "Nickel Powder Dirty", "item.basemetals.nickel_pressure_plate": "Nickel Pressure Plate", "item.basemetals.nickel_raw": "Raw Nickel", "item.basemetals.nickel_rod": "Nickel Rod", "item.basemetals.nickel_scythe": "Nickel Sickle", - "item.basemetals.nickel_shard": "Nickel Shard", "item.basemetals.nickel_shears": "Nickel Shears", "item.basemetals.nickel_shield": "Nickel Shield", "item.basemetals.nickel_shovel": "Nickel Shovel", @@ -1270,12 +1245,10 @@ "item.basemetals.platinum_button": "Platinum Button", "item.basemetals.platinum_casing": "Platinum Casing", "item.basemetals.platinum_chestplate": "Platinum Chestplate", - "item.basemetals.platinum_clump": "Platinum Clump", "item.basemetals.platinum_crackhammer": "Platinum Crack Hammer", "item.basemetals.platinum_crossbow": "Platinum Crossbow", "item.basemetals.platinum_crushed": "Platinum Crushed", "item.basemetals.platinum_crushed_purified": "Platinum Crushed Purified", - "item.basemetals.platinum_crystal": "Platinum Crystal", "item.basemetals.platinum_dense_plate": "Platinum Dense Plate", "item.basemetals.platinum_door": "Platinum Door", "item.basemetals.platinum_fishing_rod": "Platinum Fishing Rod", @@ -1291,12 +1264,10 @@ "item.basemetals.platinum_pickaxe": "Platinum Pickaxe", "item.basemetals.platinum_plate": "Platinum Plate", "item.basemetals.platinum_powder": "Powdered Platinum", - "item.basemetals.platinum_powder_dirty": "Platinum Powder Dirty", "item.basemetals.platinum_pressure_plate": "Platinum Pressure Plate", "item.basemetals.platinum_raw": "Raw Platinum", "item.basemetals.platinum_rod": "Platinum Rod", "item.basemetals.platinum_scythe": "Platinum Sickle", - "item.basemetals.platinum_shard": "Platinum Shard", "item.basemetals.platinum_shears": "Platinum Shears", "item.basemetals.platinum_shield": "Platinum Shield", "item.basemetals.platinum_shovel": "Platinum Shovel", @@ -1397,12 +1368,10 @@ "item.basemetals.starsteel_button": "Starsteel Button", "item.basemetals.starsteel_casing": "Starsteel Casing", "item.basemetals.starsteel_chestplate": "Star-Steel Chestplate", - "item.basemetals.starsteel_clump": "Starsteel Clump", "item.basemetals.starsteel_crackhammer": "Star-Steel Crack Hammer", "item.basemetals.starsteel_crossbow": "Starsteel Crossbow", "item.basemetals.starsteel_crushed": "Starsteel Crushed", "item.basemetals.starsteel_crushed_purified": "Starsteel Crushed Purified", - "item.basemetals.starsteel_crystal": "Starsteel Crystal", "item.basemetals.starsteel_dense_plate": "Starsteel Dense Plate", "item.basemetals.starsteel_door": "Star-Steel Door", "item.basemetals.starsteel_fishing_rod": "Starsteel Fishing Rod", @@ -1418,12 +1387,10 @@ "item.basemetals.starsteel_pickaxe": "Star-Steel Pickaxe", "item.basemetals.starsteel_plate": "Starsteel Plate", "item.basemetals.starsteel_powder": "Powdered Star-Steel", - "item.basemetals.starsteel_powder_dirty": "Starsteel Powder Dirty", "item.basemetals.starsteel_pressure_plate": "Starsteel Pressure Plate", "item.basemetals.starsteel_raw": "Raw Starsteel", "item.basemetals.starsteel_rod": "Star-Steel Rod", "item.basemetals.starsteel_scythe": "Starsteel Sickle", - "item.basemetals.starsteel_shard": "Starsteel Shard", "item.basemetals.starsteel_shears": "Starsteel Shears", "item.basemetals.starsteel_shield": "Starsteel Shield", "item.basemetals.starsteel_shovel": "Star-Steel Shovel", @@ -1474,9 +1441,7 @@ "item.basemetals.steel_sword": "Steel Sword", "item.basemetals.steel_trapdoor": "Steel Trapdoor", "item.basemetals.steel_wall": "Steel Wall", - "item.basemetals.stone": "Stone", "item.basemetals.stone_anvil": "Stone Anvil", - "item.basemetals.stone_bucket": "Bucket of Molten Stone", "item.basemetals.stone_crackhammer": "Stone Crack Hammer", "item.basemetals.stone_gear": "Stone Gear", "item.basemetals.stone_rod": "Stone Rod", @@ -1521,8 +1486,6 @@ "item.basemetals.tin_sword": "Tin Sword", "item.basemetals.tin_trapdoor": "Tin Trapdoor", "item.basemetals.tin_wall": "Tin Wall", - "item.basemetals.wood": "Wood", - "item.basemetals.wood_bucket": "Bucket of Liquefied Wood", "item.basemetals.wood_crackhammer": "Wooden Crack Hammer", "item.basemetals.wood_gear": "Wood Gear", "item.basemetals.wood_scythe": "Wood Sickle", @@ -1538,12 +1501,10 @@ "item.basemetals.zinc_button": "Zinc Button", "item.basemetals.zinc_casing": "Zinc Casing", "item.basemetals.zinc_chestplate": "Zinc Chestplate", - "item.basemetals.zinc_clump": "Zinc Clump", "item.basemetals.zinc_crackhammer": "Zinc Crackhammer", "item.basemetals.zinc_crossbow": "Zinc Crossbow", "item.basemetals.zinc_crushed": "Zinc Crushed", "item.basemetals.zinc_crushed_purified": "Zinc Crushed Purified", - "item.basemetals.zinc_crystal": "Zinc Crystal", "item.basemetals.zinc_dense_plate": "Zinc Dense Plate", "item.basemetals.zinc_door": "Zinc Door", "item.basemetals.zinc_fishing_rod": "Zinc Fishing Rod", @@ -1559,12 +1520,10 @@ "item.basemetals.zinc_pickaxe": "Zinc Pickaxe", "item.basemetals.zinc_plate": "Zinc Plate", "item.basemetals.zinc_powder": "Powdered Zinc", - "item.basemetals.zinc_powder_dirty": "Zinc Powder Dirty", "item.basemetals.zinc_pressure_plate": "Zinc Pressure Plate", "item.basemetals.zinc_raw": "Raw Zinc", "item.basemetals.zinc_rod": "Zinc Rod", "item.basemetals.zinc_scythe": "Zinc Sickle", - "item.basemetals.zinc_shard": "Zinc Shard", "item.basemetals.zinc_shears": "Zinc Shears", "item.basemetals.zinc_shield": "Zinc Shield", "item.basemetals.zinc_shovel": "Zinc Shovel", @@ -1592,7 +1551,6 @@ "item.bucket.gold": "Bucket of Molten Gold", "item.bucket.invar": "Bucket of Molten Invar", "item.bucket.iron": "Bucket of Molten Iron", - "item.bucket.lapis": "Bucket of Molten Lapis Lazuli", "item.bucket.lead": "Bucket of Molten Lead", "item.bucket.mercury": "Bucket of Mercury", "item.bucket.mithril": "Bucket of Molten Mithril", @@ -1606,13 +1564,12 @@ "item.bucket.silver": "Bucket of Molten Silver", "item.bucket.starsteel": "Bucket of Molten Starsteel", "item.bucket.steel": "Bucket of Molten Steel", - "item.bucket.stone": "Bucket of Molten Stone", "item.bucket.tin": "Bucket of Molten Tin", - "item.bucket.wood": "Bucket of Liquefied Wood", "item.bucket.zinc": "Bucket of Molten Zinc", "itemGroup.basemetals.blocks": "Base Metals Blocks", "itemGroup.basemetals.combat": "Base Metals Combat", "itemGroup.basemetals.items": "Base Metals Items", + "itemGroup.basemetals.materials": "Base Metals Materials", "itemGroup.basemetals.tools": "Base Metals Tools", "material.basemetals.adamantine": "Adamantine", "material.basemetals.antimony": "Antimony", diff --git a/src/generated/resources/assets/basemetals/lang/en_pt.json b/src/generated/resources/assets/basemetals/lang/en_pt.json index 1e60efdc0..3b9f98bc9 100644 --- a/src/generated/resources/assets/basemetals/lang/en_pt.json +++ b/src/generated/resources/assets/basemetals/lang/en_pt.json @@ -41,6 +41,7 @@ "block.basemetals.adamantine_block": "Unbreakable Block", "block.basemetals.adamantine_button": "Adamantine Button", "block.basemetals.adamantine_door": "Unbreakable Door", + "block.basemetals.adamantine_double_slab": "Adamantine Double Slab", "block.basemetals.adamantine_lever": "Adamantine Lever", "block.basemetals.adamantine_ore": "Unbreakable Ore", "block.basemetals.adamantine_plate": "Adamantine Plate", @@ -54,6 +55,7 @@ "block.basemetals.antimony_block": "Antimony Block", "block.basemetals.antimony_button": "Antimony Button", "block.basemetals.antimony_door": "Antimony Door", + "block.basemetals.antimony_double_slab": "Antimony Double Slab", "block.basemetals.antimony_lever": "Antimony Lever", "block.basemetals.antimony_ore": "Antimony Ore", "block.basemetals.antimony_plate": "Antimony Plate", @@ -67,6 +69,7 @@ "block.basemetals.aquarium_block": "Fish-Steel Block", "block.basemetals.aquarium_button": "Aquarium Button", "block.basemetals.aquarium_door": "Fish-Steel Door", + "block.basemetals.aquarium_double_slab": "Aquarium Double Slab", "block.basemetals.aquarium_lever": "Aquarium Lever", "block.basemetals.aquarium_plate": "Plate o' Fish-Steel", "block.basemetals.aquarium_pressure_plate": "Aquarium Pressure Plate", @@ -79,6 +82,7 @@ "block.basemetals.bismuth_block": "Bismuth Block", "block.basemetals.bismuth_button": "Bismuth Button", "block.basemetals.bismuth_door": "Bismuth Door", + "block.basemetals.bismuth_double_slab": "Bismuth Double Slab", "block.basemetals.bismuth_lever": "Bismuth Lever", "block.basemetals.bismuth_ore": "Bismuth Ore", "block.basemetals.bismuth_plate": "Bismuth Plate", @@ -92,6 +96,7 @@ "block.basemetals.brass_block": "Brass Block", "block.basemetals.brass_button": "Brass Button", "block.basemetals.brass_door": "Brass Door", + "block.basemetals.brass_double_slab": "Brass Double Slab", "block.basemetals.brass_lever": "Brass Lever", "block.basemetals.brass_plate": "Plate o' Brass", "block.basemetals.brass_pressure_plate": "Brass Pressure Plate", @@ -104,6 +109,7 @@ "block.basemetals.bronze_block": "Bronze Block", "block.basemetals.bronze_button": "Bronze Button", "block.basemetals.bronze_door": "Bronze Door", + "block.basemetals.bronze_double_slab": "Bronze Double Slab", "block.basemetals.bronze_lever": "Bronze Lever", "block.basemetals.bronze_plate": "Bronze Plate o'", "block.basemetals.bronze_pressure_plate": "Bronze Pressure Plate", @@ -119,6 +125,7 @@ "block.basemetals.coldiron_block": "Devil-Iron Block", "block.basemetals.coldiron_button": "Cold Iron Button", "block.basemetals.coldiron_door": "Devil-Iron Door", + "block.basemetals.coldiron_double_slab": "Cold Iron Double Slab", "block.basemetals.coldiron_lever": "Cold Iron Lever", "block.basemetals.coldiron_ore": "Devil-Iron Ore", "block.basemetals.coldiron_plate": "Plate o' Devil-Iron", @@ -132,6 +139,7 @@ "block.basemetals.copper_block": "Copper Block", "block.basemetals.copper_button": "Copper Button", "block.basemetals.copper_door": "Copper Door", + "block.basemetals.copper_double_slab": "Copper Double Slab", "block.basemetals.copper_lever": "Copper Lever", "block.basemetals.copper_ore": "Copper Ore", "block.basemetals.copper_plate": "Plate o' Copper", @@ -145,6 +153,7 @@ "block.basemetals.cupronickel_block": "Cupronickel Block", "block.basemetals.cupronickel_button": "Cupronickel Button", "block.basemetals.cupronickel_door": "Cupronickel Door", + "block.basemetals.cupronickel_double_slab": "Cupronickel Double Slab", "block.basemetals.cupronickel_lever": "Cupronickel Lever", "block.basemetals.cupronickel_plate": "Cupronickel Plate", "block.basemetals.cupronickel_pressure_plate": "Cupronickel Pressure Plate", @@ -156,43 +165,19 @@ "block.basemetals.diamond_bars": "Diamond Bars", "block.basemetals.diamond_button": "Diamond Button", "block.basemetals.diamond_door": "Diamond Door", + "block.basemetals.diamond_double_slab": "Diamond Double Slab", "block.basemetals.diamond_lever": "Diamond Lever", "block.basemetals.diamond_pressure_plate": "Diamond Pressure Plate", "block.basemetals.diamond_slab": "Diamond Slab", "block.basemetals.diamond_stairs": "Diamond Stairs", "block.basemetals.diamond_trapdoor": "Diamond Trapdoor", "block.basemetals.diamond_wall": "Diamond Wall", - "block.basemetals.double_adamantine_slab": "Double Adamantine Slab", - "block.basemetals.double_antimony_slab": "Double Antimony Slab", - "block.basemetals.double_aquarium_slab": "Double Aquarium Slab", - "block.basemetals.double_bismuth_slab": "Double Bismuth Slab", - "block.basemetals.double_brass_slab": "Double Brass Slab", - "block.basemetals.double_bronze_slab": "Double Bronze Slab", - "block.basemetals.double_coldiron_slab": "Double Cold Iron Slab", - "block.basemetals.double_copper_slab": "Double Copper Slab", - "block.basemetals.double_cupronickel_slab": "Double Cupronickel Slab", - "block.basemetals.double_diamond_slab": "Double Diamond Slab", - "block.basemetals.double_electrum_slab": "Double Electrum Slab", - "block.basemetals.double_emerald_slab": "Double Emerald Slab", - "block.basemetals.double_gold_slab": "Double Gold Slab", - "block.basemetals.double_invar_slab": "Double Invar Slab", - "block.basemetals.double_iron_slab": "Double Iron Slab", - "block.basemetals.double_lead_slab": "Double Lead Slab", - "block.basemetals.double_mithril_slab": "Double Mithril Slab", - "block.basemetals.double_nickel_slab": "Double Nickel Slab", - "block.basemetals.double_obsidian_slab": "Double Obsidian Slab", - "block.basemetals.double_pewter_slab": "Double Pewter Slab", - "block.basemetals.double_platinum_slab": "Double Platinum Slab", - "block.basemetals.double_silver_slab": "Double Silver Slab", - "block.basemetals.double_starsteel_slab": "Double Starsteel Slab", - "block.basemetals.double_steel_slab": "Double Steel Slab", - "block.basemetals.double_tin_slab": "Double Tin Slab", - "block.basemetals.double_zinc_slab": "Double Zinc Slab", "block.basemetals.electrum": "Molten Electrum", "block.basemetals.electrum_bars": "Electrum Bars", "block.basemetals.electrum_block": "Electrum Block", "block.basemetals.electrum_button": "Electrum Button", "block.basemetals.electrum_door": "Electrum Door", + "block.basemetals.electrum_double_slab": "Electrum Double Slab", "block.basemetals.electrum_lever": "Electrum Lever", "block.basemetals.electrum_plate": "Plate o' Electrum", "block.basemetals.electrum_pressure_plate": "Electrum Pressure Plate", @@ -204,6 +189,7 @@ "block.basemetals.emerald_bars": "Emerald Bars", "block.basemetals.emerald_button": "Emerald Button", "block.basemetals.emerald_door": "Emerald Door", + "block.basemetals.emerald_double_slab": "Emerald Double Slab", "block.basemetals.emerald_lever": "Emerald Lever", "block.basemetals.emerald_pressure_plate": "Emerald Pressure Plate", "block.basemetals.emerald_slab": "Emerald Slab", @@ -215,6 +201,7 @@ "block.basemetals.gold_bars": "Gold Bars", "block.basemetals.gold_button": "Gold Button", "block.basemetals.gold_door": "Gold Door", + "block.basemetals.gold_double_slab": "Gold Double Slab", "block.basemetals.gold_lever": "Gold Lever", "block.basemetals.gold_plate": "Plate o' Gold", "block.basemetals.gold_slab": "Gold Slab", @@ -227,6 +214,7 @@ "block.basemetals.invar_block": "Invar Block", "block.basemetals.invar_button": "Invar Button", "block.basemetals.invar_door": "Invar Door", + "block.basemetals.invar_double_slab": "Invar Double Slab", "block.basemetals.invar_lever": "Invar Lever", "block.basemetals.invar_plate": "Plate o' Invar", "block.basemetals.invar_pressure_plate": "Invar Pressure Plate", @@ -236,17 +224,18 @@ "block.basemetals.invar_wall": "Invar Wall", "block.basemetals.iron": "Molten Iron", "block.basemetals.iron_button": "Iron Button", + "block.basemetals.iron_double_slab": "Iron Double Slab", "block.basemetals.iron_lever": "Iron Lever", "block.basemetals.iron_plate": "Plate o' Iron", "block.basemetals.iron_slab": "Iron Slab", "block.basemetals.iron_stairs": "Iron Stairs", "block.basemetals.iron_wall": "Iron Wall", - "block.basemetals.lapis": "Molten Lapis", "block.basemetals.lead": "Molten Lead", "block.basemetals.lead_bars": "Lead Bars", "block.basemetals.lead_block": "Lead Block", "block.basemetals.lead_button": "Lead Button", "block.basemetals.lead_door": "Lead Door", + "block.basemetals.lead_double_slab": "Lead Double Slab", "block.basemetals.lead_lever": "Lead Lever", "block.basemetals.lead_ore": "Lead Ore", "block.basemetals.lead_plate": "Plate o' Lead", @@ -262,6 +251,7 @@ "block.basemetals.mithril_block": "Ghost Silver Block", "block.basemetals.mithril_button": "Mithril Button", "block.basemetals.mithril_door": "Ghost Silver Door", + "block.basemetals.mithril_double_slab": "Mithril Double Slab", "block.basemetals.mithril_lever": "Mithril Lever", "block.basemetals.mithril_plate": "Plate o' Ghost Silver", "block.basemetals.mithril_pressure_plate": "Mithril Pressure Plate", @@ -274,6 +264,7 @@ "block.basemetals.nickel_block": "Nickel Block", "block.basemetals.nickel_button": "Nickel Button", "block.basemetals.nickel_door": "Nickel Door", + "block.basemetals.nickel_double_slab": "Nickel Double Slab", "block.basemetals.nickel_lever": "Nickel Lever", "block.basemetals.nickel_ore": "Nickel Ore", "block.basemetals.nickel_plate": "Plate o' Nickel", @@ -286,6 +277,7 @@ "block.basemetals.obsidian_bars": "Obsidian Bars", "block.basemetals.obsidian_button": "Obsidian Button", "block.basemetals.obsidian_door": "Obsidian Door", + "block.basemetals.obsidian_double_slab": "Obsidian Double Slab", "block.basemetals.obsidian_lever": "Obsidian Lever", "block.basemetals.obsidian_pressure_plate": "Obsidian Pressure Plate", "block.basemetals.obsidian_slab": "Obsidian Slab", @@ -297,6 +289,7 @@ "block.basemetals.pewter_block": "Pewter Block", "block.basemetals.pewter_button": "Pewter Button", "block.basemetals.pewter_door": "Pewter Door", + "block.basemetals.pewter_double_slab": "Pewter Double Slab", "block.basemetals.pewter_lever": "Pewter Lever", "block.basemetals.pewter_plate": "Pewter Plate", "block.basemetals.pewter_pressure_plate": "Pewter Pressure Plate", @@ -309,6 +302,7 @@ "block.basemetals.platinum_block": "Platinum Block", "block.basemetals.platinum_button": "Platinum Button", "block.basemetals.platinum_door": "Platinum Door", + "block.basemetals.platinum_double_slab": "Platinum Double Slab", "block.basemetals.platinum_lever": "Platinum Lever", "block.basemetals.platinum_ore": "Platinum Ore", "block.basemetals.platinum_plate": "Platinum Plate", @@ -332,6 +326,7 @@ "block.basemetals.silver_block": "Silver Block", "block.basemetals.silver_button": "Silver Button", "block.basemetals.silver_door": "Silver Door", + "block.basemetals.silver_double_slab": "Silver Double Slab", "block.basemetals.silver_lever": "Silver Lever", "block.basemetals.silver_ore": "Silver Ore", "block.basemetals.silver_plate": "Plate o' Silver", @@ -345,6 +340,7 @@ "block.basemetals.starsteel_block": "Star-Steel Block", "block.basemetals.starsteel_button": "Starsteel Button", "block.basemetals.starsteel_door": "Star-Steel Door", + "block.basemetals.starsteel_double_slab": "Starsteel Double Slab", "block.basemetals.starsteel_lever": "Starsteel Lever", "block.basemetals.starsteel_ore": "Star-Steel Ore", "block.basemetals.starsteel_plate": "Plate o' Starsteel", @@ -359,6 +355,7 @@ "block.basemetals.steel_block": "Steel Block", "block.basemetals.steel_button": "Steel Button", "block.basemetals.steel_door": "Steel Door", + "block.basemetals.steel_double_slab": "Steel Double Slab", "block.basemetals.steel_lever": "Steel Lever", "block.basemetals.steel_plate": "Plate o' Steel", "block.basemetals.steel_pressure_plate": "Steel Pressure Plate", @@ -366,13 +363,13 @@ "block.basemetals.steel_stairs": "Steel Stairs", "block.basemetals.steel_trapdoor": "Steel Trapdoor", "block.basemetals.steel_wall": "Steel Wall", - "block.basemetals.stone": "Molten Stone", "block.basemetals.stone_anvil": "Stone Anvil", "block.basemetals.tin": "Molten Tin", "block.basemetals.tin_bars": "Tin Bars", "block.basemetals.tin_block": "Tin Block", "block.basemetals.tin_button": "Tin Button", "block.basemetals.tin_door": "Tin Door", + "block.basemetals.tin_double_slab": "Tin Double Slab", "block.basemetals.tin_lever": "Tin Lever", "block.basemetals.tin_ore": "Tin Ore", "block.basemetals.tin_plate": "Plate o' Tin", @@ -381,12 +378,12 @@ "block.basemetals.tin_stairs": "Tin Stairs", "block.basemetals.tin_trapdoor": "Tin Trapdoor", "block.basemetals.tin_wall": "Tin Wall", - "block.basemetals.wood": "Molten Wood", "block.basemetals.zinc": "Molten Zinc", "block.basemetals.zinc_bars": "Zinc Bars", "block.basemetals.zinc_block": "Zinc Block", "block.basemetals.zinc_button": "Zinc Button", "block.basemetals.zinc_door": "Zinc Door", + "block.basemetals.zinc_double_slab": "Zinc Double Slab", "block.basemetals.zinc_lever": "Zinc Lever", "block.basemetals.zinc_ore": "Zinc Ore", "block.basemetals.zinc_plate": "Plate o' Zinc", @@ -448,12 +445,10 @@ "item.basemetals.adamantine_button": "Adamantine Button", "item.basemetals.adamantine_casing": "Adamantine Casing", "item.basemetals.adamantine_chestplate": "Unbreakable Chestplate", - "item.basemetals.adamantine_clump": "Adamantine Clump", "item.basemetals.adamantine_crackhammer": "Unbreakable Crack Hammer", "item.basemetals.adamantine_crossbow": "Adamantine Crossbow", "item.basemetals.adamantine_crushed": "Adamantine Crushed", "item.basemetals.adamantine_crushed_purified": "Adamantine Crushed Purified", - "item.basemetals.adamantine_crystal": "Adamantine Crystal", "item.basemetals.adamantine_dense_plate": "Adamantine Dense Plate", "item.basemetals.adamantine_door": "Unbreakable Door", "item.basemetals.adamantine_fishing_rod": "Adamantine Fishing Rod", @@ -469,12 +464,10 @@ "item.basemetals.adamantine_pickaxe": "Unbreakable Pickaxe", "item.basemetals.adamantine_plate": "Adamantine Plate", "item.basemetals.adamantine_powder": "Powdered Unbreakable", - "item.basemetals.adamantine_powder_dirty": "Adamantine Powder Dirty", "item.basemetals.adamantine_pressure_plate": "Adamantine Pressure Plate", "item.basemetals.adamantine_raw": "Raw Adamantine", "item.basemetals.adamantine_rod": "Adamantine Rod", "item.basemetals.adamantine_scythe": "Adamantine Scythe", - "item.basemetals.adamantine_shard": "Adamantine Shard", "item.basemetals.adamantine_shears": "Adamantine Shears", "item.basemetals.adamantine_shield": "Adamantine Shield", "item.basemetals.adamantine_shovel": "Unbreakable Shovel", @@ -496,12 +489,10 @@ "item.basemetals.antimony_button": "Antimony Button", "item.basemetals.antimony_casing": "Antimony Casing", "item.basemetals.antimony_chestplate": "Antimony Chestplate", - "item.basemetals.antimony_clump": "Antimony Clump", "item.basemetals.antimony_crackhammer": "Antimony Crackhammer", "item.basemetals.antimony_crossbow": "Antimony Crossbow", "item.basemetals.antimony_crushed": "Antimony Crushed", "item.basemetals.antimony_crushed_purified": "Antimony Crushed Purified", - "item.basemetals.antimony_crystal": "Antimony Crystal", "item.basemetals.antimony_dense_plate": "Antimony Dense Plate", "item.basemetals.antimony_door": "Antimony Door", "item.basemetals.antimony_fishing_rod": "Antimony Fishing Rod", @@ -517,12 +508,10 @@ "item.basemetals.antimony_pickaxe": "Antimony Pickaxe", "item.basemetals.antimony_plate": "Antimony Plate", "item.basemetals.antimony_powder": "Antimony Powder", - "item.basemetals.antimony_powder_dirty": "Antimony Powder Dirty", "item.basemetals.antimony_pressure_plate": "Antimony Pressure Plate", "item.basemetals.antimony_raw": "Raw Antimony", "item.basemetals.antimony_rod": "Antimony Rod", "item.basemetals.antimony_scythe": "Antimony Scythe", - "item.basemetals.antimony_shard": "Antimony Shard", "item.basemetals.antimony_shears": "Antimony Shears", "item.basemetals.antimony_shield": "Antimony Shield", "item.basemetals.antimony_shovel": "Antimony Shovel", @@ -585,12 +574,10 @@ "item.basemetals.bismuth_button": "Bismuth Button", "item.basemetals.bismuth_casing": "Bismuth Casing", "item.basemetals.bismuth_chestplate": "Bismuth Chestplate", - "item.basemetals.bismuth_clump": "Bismuth Clump", "item.basemetals.bismuth_crackhammer": "Bismuth Crackhammer", "item.basemetals.bismuth_crossbow": "Bismuth Crossbow", "item.basemetals.bismuth_crushed": "Bismuth Crushed", "item.basemetals.bismuth_crushed_purified": "Bismuth Crushed Purified", - "item.basemetals.bismuth_crystal": "Bismuth Crystal", "item.basemetals.bismuth_dense_plate": "Bismuth Dense Plate", "item.basemetals.bismuth_door": "Bismuth Door", "item.basemetals.bismuth_fishing_rod": "Bismuth Fishing Rod", @@ -606,12 +593,10 @@ "item.basemetals.bismuth_pickaxe": "Bismuth Pickaxe", "item.basemetals.bismuth_plate": "Bismuth Plate", "item.basemetals.bismuth_powder": "Bismuth Powder", - "item.basemetals.bismuth_powder_dirty": "Bismuth Powder Dirty", "item.basemetals.bismuth_pressure_plate": "Bismuth Pressure Plate", "item.basemetals.bismuth_raw": "Raw Bismuth", "item.basemetals.bismuth_rod": "Bismuth Rod", "item.basemetals.bismuth_scythe": "Bismuth Scythe", - "item.basemetals.bismuth_shard": "Bismuth Shard", "item.basemetals.bismuth_shears": "Bismuth Shears", "item.basemetals.bismuth_shield": "Bismuth Shield", "item.basemetals.bismuth_shovel": "Bismuth Shovel", @@ -725,12 +710,10 @@ "item.basemetals.coldiron_button": "Cold Iron Button", "item.basemetals.coldiron_casing": "Cold Iron Casing", "item.basemetals.coldiron_chestplate": "Devil-Iron Chestplate", - "item.basemetals.coldiron_clump": "Cold Iron Clump", "item.basemetals.coldiron_crackhammer": "Devil-Iron Crack Hammer", "item.basemetals.coldiron_crossbow": "Cold Iron Crossbow", "item.basemetals.coldiron_crushed": "Cold Iron Crushed", "item.basemetals.coldiron_crushed_purified": "Cold Iron Crushed Purified", - "item.basemetals.coldiron_crystal": "Cold Iron Crystal", "item.basemetals.coldiron_dense_plate": "Cold Iron Dense Plate", "item.basemetals.coldiron_door": "Devil-Iron Door", "item.basemetals.coldiron_fishing_rod": "Cold Iron Fishing Rod", @@ -746,12 +729,10 @@ "item.basemetals.coldiron_pickaxe": "Devil-Iron Pickaxe", "item.basemetals.coldiron_plate": "Cold Iron Plate", "item.basemetals.coldiron_powder": "Powdered Devil-Iron", - "item.basemetals.coldiron_powder_dirty": "Cold Iron Powder Dirty", "item.basemetals.coldiron_pressure_plate": "Cold Iron Pressure Plate", "item.basemetals.coldiron_raw": "Raw Cold Iron", "item.basemetals.coldiron_rod": "Cold-Iron Rod", "item.basemetals.coldiron_scythe": "Cold Iron Scythe", - "item.basemetals.coldiron_shard": "Cold Iron Shard", "item.basemetals.coldiron_shears": "Cold Iron Shears", "item.basemetals.coldiron_shield": "Cold Iron Shield", "item.basemetals.coldiron_shovel": "Devil-Iron Shovel", @@ -1034,8 +1015,6 @@ "item.basemetals.iron_smallpowder": "Iron Smallpowder", "item.basemetals.iron_stairs": "Iron Stairs", "item.basemetals.iron_wall": "Iron Wall", - "item.basemetals.lapis": "Lapis", - "item.basemetals.lapis_bucket": "Bucket of Molten Lapis Lazuli", "item.basemetals.lapis_smallpowder": "Lapis Smallpowder", "item.basemetals.lead": "Lead", "item.basemetals.lead_arrow": "Lead Arrow", @@ -1137,12 +1116,10 @@ "item.basemetals.nickel_button": "Nickel Button", "item.basemetals.nickel_casing": "Nickel Casing", "item.basemetals.nickel_chestplate": "Nickel Chestplate", - "item.basemetals.nickel_clump": "Nickel Clump", "item.basemetals.nickel_crackhammer": "Nickel Crack Hammer", "item.basemetals.nickel_crossbow": "Nickel Crossbow", "item.basemetals.nickel_crushed": "Nickel Crushed", "item.basemetals.nickel_crushed_purified": "Nickel Crushed Purified", - "item.basemetals.nickel_crystal": "Nickel Crystal", "item.basemetals.nickel_dense_plate": "Nickel Dense Plate", "item.basemetals.nickel_door": "Nickel Door", "item.basemetals.nickel_fishing_rod": "Nickel Fishing Rod", @@ -1158,12 +1135,10 @@ "item.basemetals.nickel_pickaxe": "Nickel Pickaxe", "item.basemetals.nickel_plate": "Nickel Plate", "item.basemetals.nickel_powder": "Powdered Nickel", - "item.basemetals.nickel_powder_dirty": "Nickel Powder Dirty", "item.basemetals.nickel_pressure_plate": "Nickel Pressure Plate", "item.basemetals.nickel_raw": "Raw Nickel", "item.basemetals.nickel_rod": "Nickel Rod", "item.basemetals.nickel_scythe": "Nickel Scythe", - "item.basemetals.nickel_shard": "Nickel Shard", "item.basemetals.nickel_shears": "Nickel Shears", "item.basemetals.nickel_shield": "Nickel Shield", "item.basemetals.nickel_shovel": "Nickel Shovel", @@ -1261,12 +1236,10 @@ "item.basemetals.platinum_button": "Platinum Button", "item.basemetals.platinum_casing": "Platinum Casing", "item.basemetals.platinum_chestplate": "Platinum Chestplate", - "item.basemetals.platinum_clump": "Platinum Clump", "item.basemetals.platinum_crackhammer": "Platinum Crack Hammer", "item.basemetals.platinum_crossbow": "Platinum Crossbow", "item.basemetals.platinum_crushed": "Platinum Crushed", "item.basemetals.platinum_crushed_purified": "Platinum Crushed Purified", - "item.basemetals.platinum_crystal": "Platinum Crystal", "item.basemetals.platinum_dense_plate": "Platinum Dense Plate", "item.basemetals.platinum_door": "Platinum Door", "item.basemetals.platinum_fishing_rod": "Platinum Fishing Rod", @@ -1282,12 +1255,10 @@ "item.basemetals.platinum_pickaxe": "Platinum Pickaxe", "item.basemetals.platinum_plate": "Platinum Plate", "item.basemetals.platinum_powder": "Powdered Platinum", - "item.basemetals.platinum_powder_dirty": "Platinum Powder Dirty", "item.basemetals.platinum_pressure_plate": "Platinum Pressure Plate", "item.basemetals.platinum_raw": "Raw Platinum", "item.basemetals.platinum_rod": "Platinum Rod", "item.basemetals.platinum_scythe": "Platinum Scythe", - "item.basemetals.platinum_shard": "Platinum Shard", "item.basemetals.platinum_shears": "Platinum Shears", "item.basemetals.platinum_shield": "Platinum Shield", "item.basemetals.platinum_shovel": "Platinum Shovel", @@ -1388,12 +1359,10 @@ "item.basemetals.starsteel_button": "Starsteel Button", "item.basemetals.starsteel_casing": "Starsteel Casing", "item.basemetals.starsteel_chestplate": "Star-Steel Chestplate", - "item.basemetals.starsteel_clump": "Starsteel Clump", "item.basemetals.starsteel_crackhammer": "Star-Steel Crack Hammer", "item.basemetals.starsteel_crossbow": "Starsteel Crossbow", "item.basemetals.starsteel_crushed": "Starsteel Crushed", "item.basemetals.starsteel_crushed_purified": "Starsteel Crushed Purified", - "item.basemetals.starsteel_crystal": "Starsteel Crystal", "item.basemetals.starsteel_dense_plate": "Starsteel Dense Plate", "item.basemetals.starsteel_door": "Star-Steel Door", "item.basemetals.starsteel_fishing_rod": "Starsteel Fishing Rod", @@ -1409,12 +1378,10 @@ "item.basemetals.starsteel_pickaxe": "Star-Steel Pickaxe", "item.basemetals.starsteel_plate": "Starsteel Plate", "item.basemetals.starsteel_powder": "Powdered Star-Steel", - "item.basemetals.starsteel_powder_dirty": "Starsteel Powder Dirty", "item.basemetals.starsteel_pressure_plate": "Starsteel Pressure Plate", "item.basemetals.starsteel_raw": "Raw Starsteel", "item.basemetals.starsteel_rod": "Star-Steel Rod", "item.basemetals.starsteel_scythe": "Starsteel Scythe", - "item.basemetals.starsteel_shard": "Starsteel Shard", "item.basemetals.starsteel_shears": "Starsteel Shears", "item.basemetals.starsteel_shield": "Starsteel Shield", "item.basemetals.starsteel_shovel": "Star-Steel Shovel", @@ -1465,9 +1432,7 @@ "item.basemetals.steel_sword": "Steel Sword", "item.basemetals.steel_trapdoor": "Steel Trapdoor", "item.basemetals.steel_wall": "Steel Wall", - "item.basemetals.stone": "Stone", "item.basemetals.stone_anvil": "Stone Anvil", - "item.basemetals.stone_bucket": "Bucket of Molten Stone", "item.basemetals.stone_crackhammer": "Stone Crack Hammer", "item.basemetals.stone_gear": "Stone Gear", "item.basemetals.stone_rod": "Stone Rod", @@ -1512,8 +1477,6 @@ "item.basemetals.tin_sword": "Tin Sword", "item.basemetals.tin_trapdoor": "Tin Trapdoor", "item.basemetals.tin_wall": "Tin Wall", - "item.basemetals.wood": "Wood", - "item.basemetals.wood_bucket": "Bucket of Liquefied Wood", "item.basemetals.wood_crackhammer": "Wooden Crack Hammer", "item.basemetals.wood_gear": "Wood Gear", "item.basemetals.wood_scythe": "Wood Scythe", @@ -1529,12 +1492,10 @@ "item.basemetals.zinc_button": "Zinc Button", "item.basemetals.zinc_casing": "Zinc Casing", "item.basemetals.zinc_chestplate": "Zinc Chestplate", - "item.basemetals.zinc_clump": "Zinc Clump", "item.basemetals.zinc_crackhammer": "Zinc Crackhammer", "item.basemetals.zinc_crossbow": "Zinc Crossbow", "item.basemetals.zinc_crushed": "Zinc Crushed", "item.basemetals.zinc_crushed_purified": "Zinc Crushed Purified", - "item.basemetals.zinc_crystal": "Zinc Crystal", "item.basemetals.zinc_dense_plate": "Zinc Dense Plate", "item.basemetals.zinc_door": "Zinc Door", "item.basemetals.zinc_fishing_rod": "Zinc Fishing Rod", @@ -1550,12 +1511,10 @@ "item.basemetals.zinc_pickaxe": "Zinc Pickaxe", "item.basemetals.zinc_plate": "Zinc Plate", "item.basemetals.zinc_powder": "Powdered Zinc", - "item.basemetals.zinc_powder_dirty": "Zinc Powder Dirty", "item.basemetals.zinc_pressure_plate": "Zinc Pressure Plate", "item.basemetals.zinc_raw": "Raw Zinc", "item.basemetals.zinc_rod": "Zinc Rod", "item.basemetals.zinc_scythe": "Zinc Scythe", - "item.basemetals.zinc_shard": "Zinc Shard", "item.basemetals.zinc_shears": "Zinc Shears", "item.basemetals.zinc_shield": "Zinc Shield", "item.basemetals.zinc_shovel": "Zinc Shovel", @@ -1583,7 +1542,6 @@ "item.bucket.gold": "Bucket of Molten Gold", "item.bucket.invar": "Bucket of Molten Invar", "item.bucket.iron": "Bucket of Molten Iron", - "item.bucket.lapis": "Bucket of Molten Lapis Lazuli", "item.bucket.lead": "Bucket of Molten Lead", "item.bucket.mercury": "Bucket of Mercury", "item.bucket.mithril": "Bucket of Molten Mithril", @@ -1597,13 +1555,12 @@ "item.bucket.silver": "Bucket of Molten Silver", "item.bucket.starsteel": "Bucket of Molten Starsteel", "item.bucket.steel": "Bucket of Molten Steel", - "item.bucket.stone": "Bucket of Molten Stone", "item.bucket.tin": "Bucket of Molten Tin", - "item.bucket.wood": "Bucket of Liquefied Wood", "item.bucket.zinc": "Bucket of Molten Zinc", "itemGroup.basemetals.blocks": "Base Metals Blocks", "itemGroup.basemetals.combat": "Base Metals Combat", "itemGroup.basemetals.items": "Base Metals Items", + "itemGroup.basemetals.materials": "Base Metals Materials", "itemGroup.basemetals.tools": "Base Metals Tools", "material.basemetals.adamantine": "Adamantine", "material.basemetals.antimony": "Antimony", diff --git a/src/generated/resources/assets/basemetals/lang/en_us.json b/src/generated/resources/assets/basemetals/lang/en_us.json index d42790107..816f5b41e 100644 --- a/src/generated/resources/assets/basemetals/lang/en_us.json +++ b/src/generated/resources/assets/basemetals/lang/en_us.json @@ -46,6 +46,7 @@ "block.basemetals.adamantine_button": "Adamantine Button", "block.basemetals.adamantine_dense_plate": "Dense Adamantine Plate", "block.basemetals.adamantine_door": "Adamantine Door", + "block.basemetals.adamantine_double_slab": "Adamantine Double Slab", "block.basemetals.adamantine_lever": "Adamantine Lever", "block.basemetals.adamantine_ore": "Adamantine Ore", "block.basemetals.adamantine_plate": "Adamantine Plate", @@ -60,6 +61,7 @@ "block.basemetals.antimony_button": "Antimony Button", "block.basemetals.antimony_dense_plate": "Dense Antimony Plate", "block.basemetals.antimony_door": "Antimony Door", + "block.basemetals.antimony_double_slab": "Antimony Double Slab", "block.basemetals.antimony_lever": "Antimony Lever", "block.basemetals.antimony_ore": "Antimony Ore", "block.basemetals.antimony_plate": "Antimony Plate", @@ -74,6 +76,7 @@ "block.basemetals.aquarium_button": "Aquarium Button", "block.basemetals.aquarium_dense_plate": "Dense Aquarium Plate", "block.basemetals.aquarium_door": "Aquarium Door", + "block.basemetals.aquarium_double_slab": "Aquarium Double Slab", "block.basemetals.aquarium_lever": "Aquarium Lever", "block.basemetals.aquarium_ore": "Aquarium Ore", "block.basemetals.aquarium_plate": "Aquarium Plate", @@ -88,6 +91,7 @@ "block.basemetals.bismuth_button": "Bismuth Button", "block.basemetals.bismuth_dense_plate": "Dense Bismuth Plate", "block.basemetals.bismuth_door": "Bismuth Door", + "block.basemetals.bismuth_double_slab": "Bismuth Double Slab", "block.basemetals.bismuth_lever": "Bismuth Lever", "block.basemetals.bismuth_ore": "Bismuth Ore", "block.basemetals.bismuth_plate": "Bismuth Plate", @@ -102,6 +106,7 @@ "block.basemetals.brass_button": "Brass Button", "block.basemetals.brass_dense_plate": "Dense Brass Plate", "block.basemetals.brass_door": "Brass Door", + "block.basemetals.brass_double_slab": "Brass Double Slab", "block.basemetals.brass_lever": "Brass Lever", "block.basemetals.brass_plate": "Brass Plate", "block.basemetals.brass_pressure_plate": "Brass Pressure Plate", @@ -115,6 +120,7 @@ "block.basemetals.bronze_button": "Bronze Button", "block.basemetals.bronze_dense_plate": "Dense Bronze Plate", "block.basemetals.bronze_door": "Bronze Door", + "block.basemetals.bronze_double_slab": "Bronze Double Slab", "block.basemetals.bronze_lever": "Bronze Lever", "block.basemetals.bronze_plate": "Bronze Plate", "block.basemetals.bronze_pressure_plate": "Bronze Pressure Plate", @@ -131,6 +137,7 @@ "block.basemetals.coldiron_button": "Cold-Iron Button", "block.basemetals.coldiron_dense_plate": "Dense Cold-Iron Plate", "block.basemetals.coldiron_door": "Cold-Iron Door", + "block.basemetals.coldiron_double_slab": "Cold Iron Double Slab", "block.basemetals.coldiron_lever": "Cold-Iron Lever", "block.basemetals.coldiron_ore": "Cold-Iron Ore", "block.basemetals.coldiron_plate": "Cold-Iron Plate", @@ -145,6 +152,7 @@ "block.basemetals.copper_button": "Copper Button", "block.basemetals.copper_dense_plate": "Dense Copper Plate", "block.basemetals.copper_door": "Copper Door", + "block.basemetals.copper_double_slab": "Copper Double Slab", "block.basemetals.copper_lever": "Copper Lever", "block.basemetals.copper_ore": "Copper Ore", "block.basemetals.copper_plate": "Copper Plate", @@ -159,6 +167,7 @@ "block.basemetals.cupronickel_button": "Cupronickel Button", "block.basemetals.cupronickel_dense_plate": "Dense Cupronickel Plate", "block.basemetals.cupronickel_door": "Cupronickel Door", + "block.basemetals.cupronickel_double_slab": "Cupronickel Double Slab", "block.basemetals.cupronickel_lever": "Cupronickel Lever", "block.basemetals.cupronickel_plate": "Cupronickel Plate", "block.basemetals.cupronickel_pressure_plate": "Cupronickel Pressure Plate", @@ -170,44 +179,20 @@ "block.basemetals.diamond_bars": "Diamond Bars", "block.basemetals.diamond_button": "Diamond Button", "block.basemetals.diamond_door": "Diamond Door", + "block.basemetals.diamond_double_slab": "Diamond Double Slab", "block.basemetals.diamond_lever": "Diamond Lever", "block.basemetals.diamond_pressure_plate": "Diamond Pressure Plate", "block.basemetals.diamond_slab": "Diamond Slab", "block.basemetals.diamond_stairs": "Diamond Stairs", "block.basemetals.diamond_trapdoor": "Diamond Trapdoor", "block.basemetals.diamond_wall": "Diamond Wall", - "block.basemetals.double_adamantine_slab": "Double Adamantine Slab", - "block.basemetals.double_antimony_slab": "Double Antimony Slab", - "block.basemetals.double_aquarium_slab": "Double Aquarium Slab", - "block.basemetals.double_bismuth_slab": "Double Bismuth Slab", - "block.basemetals.double_brass_slab": "Double Brass Slab", - "block.basemetals.double_bronze_slab": "Double Bronze Slab", - "block.basemetals.double_coldiron_slab": "Double Cold Iron Slab", - "block.basemetals.double_copper_slab": "Double Copper Slab", - "block.basemetals.double_cupronickel_slab": "Double Cupronickel Slab", - "block.basemetals.double_diamond_slab": "Double Diamond Slab", - "block.basemetals.double_electrum_slab": "Double Electrum Slab", - "block.basemetals.double_emerald_slab": "Double Emerald Slab", - "block.basemetals.double_gold_slab": "Double Gold Slab", - "block.basemetals.double_invar_slab": "Double Invar Slab", - "block.basemetals.double_iron_slab": "Double Iron Slab", - "block.basemetals.double_lead_slab": "Double Lead Slab", - "block.basemetals.double_mithril_slab": "Double Mithril Slab", - "block.basemetals.double_nickel_slab": "Double Nickel Slab", - "block.basemetals.double_obsidian_slab": "Double Obsidian Slab", - "block.basemetals.double_pewter_slab": "Double Pewter Slab", - "block.basemetals.double_platinum_slab": "Double Platinum Slab", - "block.basemetals.double_silver_slab": "Double Silver Slab", - "block.basemetals.double_starsteel_slab": "Double Starsteel Slab", - "block.basemetals.double_steel_slab": "Double Steel Slab", - "block.basemetals.double_tin_slab": "Double Tin Slab", - "block.basemetals.double_zinc_slab": "Double Zinc Slab", "block.basemetals.electrum": "Molten Electrum", "block.basemetals.electrum_bars": "Electrum Bars", "block.basemetals.electrum_block": "Block of Electrum", "block.basemetals.electrum_button": "Electrum Button", "block.basemetals.electrum_dense_plate": "Dense Electrum Plate", "block.basemetals.electrum_door": "Electrum Door", + "block.basemetals.electrum_double_slab": "Electrum Double Slab", "block.basemetals.electrum_lever": "Electrum Lever", "block.basemetals.electrum_plate": "Electrum Plate", "block.basemetals.electrum_pressure_plate": "Electrum Pressure Plate", @@ -219,6 +204,7 @@ "block.basemetals.emerald_bars": "Emerald Bars", "block.basemetals.emerald_button": "Emerald Button", "block.basemetals.emerald_door": "Emerald Door", + "block.basemetals.emerald_double_slab": "Emerald Double Slab", "block.basemetals.emerald_lever": "Emerald Lever", "block.basemetals.emerald_pressure_plate": "Emerald Pressure Plate", "block.basemetals.emerald_slab": "Emerald Slab", @@ -231,6 +217,7 @@ "block.basemetals.gold_button": "Gold Button", "block.basemetals.gold_dense_plate": "Dense Gold Plate", "block.basemetals.gold_door": "Gold Door", + "block.basemetals.gold_double_slab": "Gold Double Slab", "block.basemetals.gold_lever": "Gold Lever", "block.basemetals.gold_plate": "Gold Plate", "block.basemetals.gold_pressure_plate": "Gold Pressure Plate", @@ -245,6 +232,7 @@ "block.basemetals.invar_button": "Invar Button", "block.basemetals.invar_dense_dense_plate": "Dense Invar Plate", "block.basemetals.invar_door": "Invar Door", + "block.basemetals.invar_double_slab": "Invar Double Slab", "block.basemetals.invar_lever": "Invar Lever", "block.basemetals.invar_plate": "Invar Plate", "block.basemetals.invar_pressure_plate": "Invar Pressure Plate", @@ -255,19 +243,20 @@ "block.basemetals.iron": "Molten Iron", "block.basemetals.iron_button": "Iron Button", "block.basemetals.iron_dense_plate": "Dense Iron Plate", + "block.basemetals.iron_double_slab": "Iron Double Slab", "block.basemetals.iron_lever": "Iron Lever", "block.basemetals.iron_plate": "Iron Plate", "block.basemetals.iron_pressure_plate": "Iron Pressure Plate", "block.basemetals.iron_slab": "Iron Slab", "block.basemetals.iron_stairs": "Iron Stairs", "block.basemetals.iron_wall": "Iron Wall", - "block.basemetals.lapis": "Molten Lapis", "block.basemetals.lead": "Molten Lead", "block.basemetals.lead_bars": "Lead Bars", "block.basemetals.lead_block": "Block of Lead", "block.basemetals.lead_button": "Lead Button", "block.basemetals.lead_dense_plate": "Dense Lead Plate", "block.basemetals.lead_door": "Lead Door", + "block.basemetals.lead_double_slab": "Lead Double Slab", "block.basemetals.lead_lever": "Lead Lever", "block.basemetals.lead_ore": "Lead Ore", "block.basemetals.lead_plate": "Lead Plate", @@ -284,6 +273,7 @@ "block.basemetals.mithril_button": "Mithril Button", "block.basemetals.mithril_dense_plate": "Dense Mithril Plate", "block.basemetals.mithril_door": "Mithril Door", + "block.basemetals.mithril_double_slab": "Mithril Double Slab", "block.basemetals.mithril_lever": "Mithril Lever", "block.basemetals.mithril_plate": "Mithril Plate", "block.basemetals.mithril_pressure_plate": "Mithril Pressure Plate", @@ -297,6 +287,7 @@ "block.basemetals.nickel_button": "Nickel Button", "block.basemetals.nickel_dense_plate": "Dense Nickel Plate", "block.basemetals.nickel_door": "Nickel Door", + "block.basemetals.nickel_double_slab": "Nickel Double Slab", "block.basemetals.nickel_lever": "Nickel Lever", "block.basemetals.nickel_ore": "Nickel Ore", "block.basemetals.nickel_plate": "Nickel Plate", @@ -309,6 +300,7 @@ "block.basemetals.obsidian_bars": "Obsidian Bars", "block.basemetals.obsidian_button": "Obsidian Button", "block.basemetals.obsidian_door": "Obsidian Door", + "block.basemetals.obsidian_double_slab": "Obsidian Double Slab", "block.basemetals.obsidian_lever": "Obsidian Lever", "block.basemetals.obsidian_pressure_plate": "Obsidian Pressure Plate", "block.basemetals.obsidian_slab": "Obsidian Slab", @@ -321,6 +313,7 @@ "block.basemetals.pewter_button": "Pewter Button", "block.basemetals.pewter_dense_plate": "Dense Pewter Plate", "block.basemetals.pewter_door": "Pewter Door", + "block.basemetals.pewter_double_slab": "Pewter Double Slab", "block.basemetals.pewter_lever": "Pewter Lever", "block.basemetals.pewter_ore": "Pewter Ore", "block.basemetals.pewter_plate": "Pewter Plate", @@ -335,6 +328,7 @@ "block.basemetals.platinum_button": "Platinum Button", "block.basemetals.platinum_dense_plate": "Dense Platinum Plate", "block.basemetals.platinum_door": "Platinum Door", + "block.basemetals.platinum_double_slab": "Platinum Double Slab", "block.basemetals.platinum_lever": "Platinum Lever", "block.basemetals.platinum_ore": "Platinum Ore", "block.basemetals.platinum_plate": "Platinum Plate", @@ -359,6 +353,7 @@ "block.basemetals.silver_button": "Silver Button", "block.basemetals.silver_dense_plate": "Dense Silver Plate", "block.basemetals.silver_door": "Silver Door", + "block.basemetals.silver_double_slab": "Silver Double Slab", "block.basemetals.silver_lever": "Silver Lever", "block.basemetals.silver_ore": "Silver Ore", "block.basemetals.silver_plate": "Silver Plate", @@ -373,6 +368,7 @@ "block.basemetals.starsteel_button": "Star-Steel Button", "block.basemetals.starsteel_dense_plate": "Dense Star-Steel Plate", "block.basemetals.starsteel_door": "Star-Steel Door", + "block.basemetals.starsteel_double_slab": "Starsteel Double Slab", "block.basemetals.starsteel_lever": "Star-Steel Lever", "block.basemetals.starsteel_ore": "Star-Steel Ore", "block.basemetals.starsteel_plate": "Star-Steel Plate", @@ -391,6 +387,7 @@ "block.basemetals.steel_button": "Steel Button", "block.basemetals.steel_dense_plate": "Dense Steel Plate", "block.basemetals.steel_door": "Steel Door", + "block.basemetals.steel_double_slab": "Steel Double Slab", "block.basemetals.steel_lever": "Steel Lever", "block.basemetals.steel_plate": "Steel Plate", "block.basemetals.steel_pressure_plate": "Steel Pressure Plate", @@ -398,7 +395,6 @@ "block.basemetals.steel_stairs": "Steel Stairs", "block.basemetals.steel_trapdoor": "Steel Trapdoor", "block.basemetals.steel_wall": "Steel Wall", - "block.basemetals.stone": "Molten Stone", "block.basemetals.stone_anvil": "Stone Anvil", "block.basemetals.stone_anvil.intact": "Stone Anvil", "block.basemetals.stone_anvil.slightlyDamaged": "Slightly Damaged Stone Anvil", @@ -409,6 +405,7 @@ "block.basemetals.tin_button": "Tin Button", "block.basemetals.tin_dense_plate": "Dense Tin Plate", "block.basemetals.tin_door": "Tin Door", + "block.basemetals.tin_double_slab": "Tin Double Slab", "block.basemetals.tin_lever": "Tin Lever", "block.basemetals.tin_ore": "Tin Ore", "block.basemetals.tin_plate": "Tin Plate", @@ -417,13 +414,13 @@ "block.basemetals.tin_stairs": "Tin Stairs", "block.basemetals.tin_trapdoor": "Tin Trapdoor", "block.basemetals.tin_wall": "Tin Wall", - "block.basemetals.wood": "Molten Wood", "block.basemetals.zinc": "Molten Zinc", "block.basemetals.zinc_bars": "Zinc Bars", "block.basemetals.zinc_block": "Block of Zinc", "block.basemetals.zinc_button": "Zinc Button", "block.basemetals.zinc_dense_plate": "Dense Zinc Plate", "block.basemetals.zinc_door": "Zinc Door", + "block.basemetals.zinc_double_slab": "Zinc Double Slab", "block.basemetals.zinc_lever": "Zinc Lever", "block.basemetals.zinc_ore": "Zinc Ore", "block.basemetals.zinc_plate": "Zinc Plate", @@ -1188,8 +1185,6 @@ "item.basemetals.iron_smallpowder": "Tiny Pile of Iron Dust", "item.basemetals.iron_stairs": "Iron Stairs", "item.basemetals.iron_wall": "Iron Wall", - "item.basemetals.lapis": "Lapis", - "item.basemetals.lapis_bucket": "Bucket of Molten Lapis Lazuli", "item.basemetals.lapis_smallpowder": "Tiny Pile of Lapis Dust", "item.basemetals.lead": "Lead", "item.basemetals.lead_arrow": "Lead Arrow", @@ -1661,9 +1656,7 @@ "item.basemetals.steel_sword": "Steel Sword", "item.basemetals.steel_trapdoor": "Steel Trapdoor", "item.basemetals.steel_wall": "Steel Wall", - "item.basemetals.stone": "Stone", "item.basemetals.stone_anvil": "Stone Anvil", - "item.basemetals.stone_bucket": "Bucket of Molten Stone", "item.basemetals.stone_crackhammer": "Stone Crack Hammer", "item.basemetals.stone_gear": "Stone Gear", "item.basemetals.stone_rod": "Stone Rod", @@ -1716,8 +1709,6 @@ "item.basemetals.tin_sword": "Tin Sword", "item.basemetals.tin_trapdoor": "Tin Trapdoor", "item.basemetals.tin_wall": "Tin Wall", - "item.basemetals.wood": "Wood", - "item.basemetals.wood_bucket": "Bucket of Liquefied Wood", "item.basemetals.wood_crackhammer": "Wooden Crack Hammer", "item.basemetals.wood_gear": "Wooden Gear", "item.basemetals.wood_powder": "Tiny Pile of Sawdust", @@ -1788,7 +1779,6 @@ "item.bucket.gold": "Bucket of Molten Gold", "item.bucket.invar": "Bucket of Molten Invar", "item.bucket.iron": "Bucket of Molten Iron", - "item.bucket.lapis": "Bucket of Molten Lapis Lazuli", "item.bucket.lead": "Bucket of Molten Lead", "item.bucket.mercury": "Bucket of Mercury", "item.bucket.mithril": "Bucket of Molten Mithril", @@ -1802,13 +1792,12 @@ "item.bucket.silver": "Bucket of Molten Silver", "item.bucket.starsteel": "Bucket of Molten Starsteel", "item.bucket.steel": "Bucket of Molten Steel", - "item.bucket.stone": "Bucket of Molten Stone", "item.bucket.tin": "Bucket of Molten Tin", - "item.bucket.wood": "Bucket of Liquefied Wood", "item.bucket.zinc": "Bucket of Molten Zinc", "itemGroup.basemetals.blocks": "Base Metals Blocks", "itemGroup.basemetals.combat": "Base Metals Combat", "itemGroup.basemetals.items": "Base Metals Items", + "itemGroup.basemetals.materials": "Base Metals Materials", "itemGroup.basemetals.tools": "Base Metals Tools", "material.adamantine.name": "Adamantine", "material.antimony.name": "Antimony", diff --git a/src/generated/resources/assets/basemetals/lang/es_es.json b/src/generated/resources/assets/basemetals/lang/es_es.json index 3fa32d15e..a17084f39 100644 --- a/src/generated/resources/assets/basemetals/lang/es_es.json +++ b/src/generated/resources/assets/basemetals/lang/es_es.json @@ -41,6 +41,7 @@ "block.basemetals.adamantine_block": "Bloque de adamantina", "block.basemetals.adamantine_button": "Adamantine Button", "block.basemetals.adamantine_door": "Puerta de adamantina", + "block.basemetals.adamantine_double_slab": "Adamantine Double Slab", "block.basemetals.adamantine_lever": "Adamantine Lever", "block.basemetals.adamantine_ore": "Mena de adamantina", "block.basemetals.adamantine_plate": "Placa de adamantina", @@ -54,6 +55,7 @@ "block.basemetals.antimony_block": "Antimony Block", "block.basemetals.antimony_button": "Antimony Button", "block.basemetals.antimony_door": "Antimony Door", + "block.basemetals.antimony_double_slab": "Antimony Double Slab", "block.basemetals.antimony_lever": "Antimony Lever", "block.basemetals.antimony_ore": "Antimony Ore", "block.basemetals.antimony_plate": "Antimony Plate", @@ -67,6 +69,7 @@ "block.basemetals.aquarium_block": "Bloque de aquaranio", "block.basemetals.aquarium_button": "Aquarium Button", "block.basemetals.aquarium_door": "Puerta de aquaranio", + "block.basemetals.aquarium_double_slab": "Aquarium Double Slab", "block.basemetals.aquarium_lever": "Aquarium Lever", "block.basemetals.aquarium_plate": "Placa de aquaranio", "block.basemetals.aquarium_pressure_plate": "Aquarium Pressure Plate", @@ -79,6 +82,7 @@ "block.basemetals.bismuth_block": "Bismuth Block", "block.basemetals.bismuth_button": "Bismuth Button", "block.basemetals.bismuth_door": "Bismuth Door", + "block.basemetals.bismuth_double_slab": "Bismuth Double Slab", "block.basemetals.bismuth_lever": "Bismuth Lever", "block.basemetals.bismuth_ore": "Bismuth Ore", "block.basemetals.bismuth_plate": "Bismuth Plate", @@ -92,6 +96,7 @@ "block.basemetals.brass_block": "Bloque de latón", "block.basemetals.brass_button": "Brass Button", "block.basemetals.brass_door": "Puerta de latón", + "block.basemetals.brass_double_slab": "Brass Double Slab", "block.basemetals.brass_lever": "Brass Lever", "block.basemetals.brass_plate": "Placa de latón", "block.basemetals.brass_pressure_plate": "Brass Pressure Plate", @@ -104,6 +109,7 @@ "block.basemetals.bronze_block": "Bloque de bronce", "block.basemetals.bronze_button": "Bronze Button", "block.basemetals.bronze_door": "Puerta de bronce", + "block.basemetals.bronze_double_slab": "Bronze Double Slab", "block.basemetals.bronze_lever": "Bronze Lever", "block.basemetals.bronze_plate": "Placa de bronce", "block.basemetals.bronze_pressure_plate": "Bronze Pressure Plate", @@ -119,6 +125,7 @@ "block.basemetals.coldiron_block": "Bloque de glacierro", "block.basemetals.coldiron_button": "Cold Iron Button", "block.basemetals.coldiron_door": "Puerta de glacierro", + "block.basemetals.coldiron_double_slab": "Cold Iron Double Slab", "block.basemetals.coldiron_lever": "Cold Iron Lever", "block.basemetals.coldiron_ore": "Mena de glacierro", "block.basemetals.coldiron_plate": "Placa de glacierro", @@ -132,6 +139,7 @@ "block.basemetals.copper_block": "Bloque de cobre", "block.basemetals.copper_button": "Copper Button", "block.basemetals.copper_door": "Puerta de cobre", + "block.basemetals.copper_double_slab": "Copper Double Slab", "block.basemetals.copper_lever": "Copper Lever", "block.basemetals.copper_ore": "Mena de cobre", "block.basemetals.copper_plate": "Placa de cobre", @@ -145,6 +153,7 @@ "block.basemetals.cupronickel_block": "Bloque de cobreníquel", "block.basemetals.cupronickel_button": "Cupronickel Button", "block.basemetals.cupronickel_door": "Puerta de cobreníquel", + "block.basemetals.cupronickel_double_slab": "Cupronickel Double Slab", "block.basemetals.cupronickel_lever": "Cupronickel Lever", "block.basemetals.cupronickel_plate": "Cupronickel Plate", "block.basemetals.cupronickel_pressure_plate": "Cupronickel Pressure Plate", @@ -156,43 +165,19 @@ "block.basemetals.diamond_bars": "Diamond Bars", "block.basemetals.diamond_button": "Diamond Button", "block.basemetals.diamond_door": "Diamond Door", + "block.basemetals.diamond_double_slab": "Diamond Double Slab", "block.basemetals.diamond_lever": "Diamond Lever", "block.basemetals.diamond_pressure_plate": "Diamond Pressure Plate", "block.basemetals.diamond_slab": "Diamond Slab", "block.basemetals.diamond_stairs": "Diamond Stairs", "block.basemetals.diamond_trapdoor": "Diamond Trapdoor", "block.basemetals.diamond_wall": "Diamond Wall", - "block.basemetals.double_adamantine_slab": "Double Adamantine Slab", - "block.basemetals.double_antimony_slab": "Double Antimony Slab", - "block.basemetals.double_aquarium_slab": "Double Aquarium Slab", - "block.basemetals.double_bismuth_slab": "Double Bismuth Slab", - "block.basemetals.double_brass_slab": "Double Brass Slab", - "block.basemetals.double_bronze_slab": "Double Bronze Slab", - "block.basemetals.double_coldiron_slab": "Double Cold Iron Slab", - "block.basemetals.double_copper_slab": "Double Copper Slab", - "block.basemetals.double_cupronickel_slab": "Double Cupronickel Slab", - "block.basemetals.double_diamond_slab": "Double Diamond Slab", - "block.basemetals.double_electrum_slab": "Double Electrum Slab", - "block.basemetals.double_emerald_slab": "Double Emerald Slab", - "block.basemetals.double_gold_slab": "Double Gold Slab", - "block.basemetals.double_invar_slab": "Double Invar Slab", - "block.basemetals.double_iron_slab": "Double Iron Slab", - "block.basemetals.double_lead_slab": "Double Lead Slab", - "block.basemetals.double_mithril_slab": "Double Mithril Slab", - "block.basemetals.double_nickel_slab": "Double Nickel Slab", - "block.basemetals.double_obsidian_slab": "Double Obsidian Slab", - "block.basemetals.double_pewter_slab": "Double Pewter Slab", - "block.basemetals.double_platinum_slab": "Double Platinum Slab", - "block.basemetals.double_silver_slab": "Double Silver Slab", - "block.basemetals.double_starsteel_slab": "Double Starsteel Slab", - "block.basemetals.double_steel_slab": "Double Steel Slab", - "block.basemetals.double_tin_slab": "Double Tin Slab", - "block.basemetals.double_zinc_slab": "Double Zinc Slab", "block.basemetals.electrum": "Molten Electrum", "block.basemetals.electrum_bars": "Barrotes de electrio", "block.basemetals.electrum_block": "Bloque de electrio", "block.basemetals.electrum_button": "Electrum Button", "block.basemetals.electrum_door": "Puerta de electrio", + "block.basemetals.electrum_double_slab": "Electrum Double Slab", "block.basemetals.electrum_lever": "Electrum Lever", "block.basemetals.electrum_plate": "Placa de electrio", "block.basemetals.electrum_pressure_plate": "Electrum Pressure Plate", @@ -204,6 +189,7 @@ "block.basemetals.emerald_bars": "Emerald Bars", "block.basemetals.emerald_button": "Emerald Button", "block.basemetals.emerald_door": "Emerald Door", + "block.basemetals.emerald_double_slab": "Emerald Double Slab", "block.basemetals.emerald_lever": "Emerald Lever", "block.basemetals.emerald_pressure_plate": "Emerald Pressure Plate", "block.basemetals.emerald_slab": "Emerald Slab", @@ -215,6 +201,7 @@ "block.basemetals.gold_bars": "Gold Bars", "block.basemetals.gold_button": "Gold Button", "block.basemetals.gold_door": "Gold Door", + "block.basemetals.gold_double_slab": "Gold Double Slab", "block.basemetals.gold_lever": "Gold Lever", "block.basemetals.gold_plate": "Placa de oro", "block.basemetals.gold_slab": "Gold Slab", @@ -227,6 +214,7 @@ "block.basemetals.invar_block": "Bloque de invar", "block.basemetals.invar_button": "Invar Button", "block.basemetals.invar_door": "Puerta de invar", + "block.basemetals.invar_double_slab": "Invar Double Slab", "block.basemetals.invar_lever": "Invar Lever", "block.basemetals.invar_plate": "Placa de invar", "block.basemetals.invar_pressure_plate": "Invar Pressure Plate", @@ -236,17 +224,18 @@ "block.basemetals.invar_wall": "Invar Wall", "block.basemetals.iron": "Molten Iron", "block.basemetals.iron_button": "Iron Button", + "block.basemetals.iron_double_slab": "Iron Double Slab", "block.basemetals.iron_lever": "Iron Lever", "block.basemetals.iron_plate": "Placa de hierro", "block.basemetals.iron_slab": "Iron Slab", "block.basemetals.iron_stairs": "Iron Stairs", "block.basemetals.iron_wall": "Iron Wall", - "block.basemetals.lapis": "Molten Lapis", "block.basemetals.lead": "Molten Lead", "block.basemetals.lead_bars": "Barrotes de plomo", "block.basemetals.lead_block": "Bloque de plomo", "block.basemetals.lead_button": "Lead Button", "block.basemetals.lead_door": "Puerta de plomo", + "block.basemetals.lead_double_slab": "Lead Double Slab", "block.basemetals.lead_lever": "Lead Lever", "block.basemetals.lead_ore": "Mena de plomo", "block.basemetals.lead_plate": "Placa de plomo", @@ -262,6 +251,7 @@ "block.basemetals.mithril_block": "Bloque de mithril", "block.basemetals.mithril_button": "Mithril Button", "block.basemetals.mithril_door": "Puerta de mithril", + "block.basemetals.mithril_double_slab": "Mithril Double Slab", "block.basemetals.mithril_lever": "Mithril Lever", "block.basemetals.mithril_plate": "Placa de mithril", "block.basemetals.mithril_pressure_plate": "Mithril Pressure Plate", @@ -274,6 +264,7 @@ "block.basemetals.nickel_block": "Bloque de níquel", "block.basemetals.nickel_button": "Nickel Button", "block.basemetals.nickel_door": "Puerta de níquel", + "block.basemetals.nickel_double_slab": "Nickel Double Slab", "block.basemetals.nickel_lever": "Nickel Lever", "block.basemetals.nickel_ore": "Mena de níquel", "block.basemetals.nickel_plate": "Placa de níquel", @@ -286,6 +277,7 @@ "block.basemetals.obsidian_bars": "Obsidian Bars", "block.basemetals.obsidian_button": "Obsidian Button", "block.basemetals.obsidian_door": "Obsidian Door", + "block.basemetals.obsidian_double_slab": "Obsidian Double Slab", "block.basemetals.obsidian_lever": "Obsidian Lever", "block.basemetals.obsidian_pressure_plate": "Obsidian Pressure Plate", "block.basemetals.obsidian_slab": "Obsidian Slab", @@ -297,6 +289,7 @@ "block.basemetals.pewter_block": "Pewter Block", "block.basemetals.pewter_button": "Pewter Button", "block.basemetals.pewter_door": "Pewter Door", + "block.basemetals.pewter_double_slab": "Pewter Double Slab", "block.basemetals.pewter_lever": "Pewter Lever", "block.basemetals.pewter_plate": "Pewter Plate", "block.basemetals.pewter_pressure_plate": "Pewter Pressure Plate", @@ -309,6 +302,7 @@ "block.basemetals.platinum_block": "Bloque de platino", "block.basemetals.platinum_button": "Platinum Button", "block.basemetals.platinum_door": "Puerta de platino", + "block.basemetals.platinum_double_slab": "Platinum Double Slab", "block.basemetals.platinum_lever": "Platinum Lever", "block.basemetals.platinum_ore": "Mena de platino", "block.basemetals.platinum_plate": "Platinum Plate", @@ -332,6 +326,7 @@ "block.basemetals.silver_block": "Bloque de plata", "block.basemetals.silver_button": "Silver Button", "block.basemetals.silver_door": "Puerta de plata", + "block.basemetals.silver_double_slab": "Silver Double Slab", "block.basemetals.silver_lever": "Silver Lever", "block.basemetals.silver_ore": "Mena de plata", "block.basemetals.silver_plate": "Placa de plata", @@ -345,6 +340,7 @@ "block.basemetals.starsteel_block": "Bloque de estrellacero", "block.basemetals.starsteel_button": "Starsteel Button", "block.basemetals.starsteel_door": "Puerta de estrellacero", + "block.basemetals.starsteel_double_slab": "Starsteel Double Slab", "block.basemetals.starsteel_lever": "Starsteel Lever", "block.basemetals.starsteel_ore": "Mena de estrellacero", "block.basemetals.starsteel_plate": "Placa de estrellacero", @@ -359,6 +355,7 @@ "block.basemetals.steel_block": "Bloque de acero", "block.basemetals.steel_button": "Steel Button", "block.basemetals.steel_door": "Puerta de acero", + "block.basemetals.steel_double_slab": "Steel Double Slab", "block.basemetals.steel_lever": "Steel Lever", "block.basemetals.steel_plate": "Placa de acero", "block.basemetals.steel_pressure_plate": "Steel Pressure Plate", @@ -366,13 +363,13 @@ "block.basemetals.steel_stairs": "Steel Stairs", "block.basemetals.steel_trapdoor": "Trampilla de acero", "block.basemetals.steel_wall": "Steel Wall", - "block.basemetals.stone": "Molten Stone", "block.basemetals.stone_anvil": "Stone Anvil", "block.basemetals.tin": "Molten Tin", "block.basemetals.tin_bars": "Barrotes de estaño", "block.basemetals.tin_block": "Bloque de estaño", "block.basemetals.tin_button": "Tin Button", "block.basemetals.tin_door": "Puerta de estaño", + "block.basemetals.tin_double_slab": "Tin Double Slab", "block.basemetals.tin_lever": "Tin Lever", "block.basemetals.tin_ore": "Mena de estaño", "block.basemetals.tin_plate": "Placa de estaño", @@ -381,12 +378,12 @@ "block.basemetals.tin_stairs": "Tin Stairs", "block.basemetals.tin_trapdoor": "Trampilla de estaño", "block.basemetals.tin_wall": "Tin Wall", - "block.basemetals.wood": "Molten Wood", "block.basemetals.zinc": "Molten Zinc", "block.basemetals.zinc_bars": "Zinc Bars", "block.basemetals.zinc_block": "Bloque de zinc", "block.basemetals.zinc_button": "Zinc Button", "block.basemetals.zinc_door": "Zinc Door", + "block.basemetals.zinc_double_slab": "Zinc Double Slab", "block.basemetals.zinc_lever": "Zinc Lever", "block.basemetals.zinc_ore": "Mena de zinc", "block.basemetals.zinc_plate": "Placa de zinc", @@ -448,12 +445,10 @@ "item.basemetals.adamantine_button": "Adamantine Button", "item.basemetals.adamantine_casing": "Adamantine Casing", "item.basemetals.adamantine_chestplate": "Peto de adamantina", - "item.basemetals.adamantine_clump": "Adamantine Clump", "item.basemetals.adamantine_crackhammer": "Almádena de adamantina", "item.basemetals.adamantine_crossbow": "Adamantine Crossbow", "item.basemetals.adamantine_crushed": "Adamantine Crushed", "item.basemetals.adamantine_crushed_purified": "Adamantine Crushed Purified", - "item.basemetals.adamantine_crystal": "Adamantine Crystal", "item.basemetals.adamantine_dense_plate": "Adamantine Dense Plate", "item.basemetals.adamantine_door": "Puerta de adamantina", "item.basemetals.adamantine_fishing_rod": "Adamantine Fishing Rod", @@ -469,12 +464,10 @@ "item.basemetals.adamantine_pickaxe": "Pico de adamantina", "item.basemetals.adamantine_plate": "Adamantine Plate", "item.basemetals.adamantine_powder": "Polvo de adamantina", - "item.basemetals.adamantine_powder_dirty": "Adamantine Powder Dirty", "item.basemetals.adamantine_pressure_plate": "Adamantine Pressure Plate", "item.basemetals.adamantine_raw": "Adamantine en bruto", "item.basemetals.adamantine_rod": "Barra de adamantina", "item.basemetals.adamantine_scythe": "Adamantine Scythe", - "item.basemetals.adamantine_shard": "Adamantine Shard", "item.basemetals.adamantine_shears": "Adamantine Shears", "item.basemetals.adamantine_shield": "Adamantine Shield", "item.basemetals.adamantine_shovel": "Pala de adamantina", @@ -496,12 +489,10 @@ "item.basemetals.antimony_button": "Antimony Button", "item.basemetals.antimony_casing": "Antimony Casing", "item.basemetals.antimony_chestplate": "Antimony Chestplate", - "item.basemetals.antimony_clump": "Antimony Clump", "item.basemetals.antimony_crackhammer": "Antimony Crackhammer", "item.basemetals.antimony_crossbow": "Antimony Crossbow", "item.basemetals.antimony_crushed": "Antimony Crushed", "item.basemetals.antimony_crushed_purified": "Antimony Crushed Purified", - "item.basemetals.antimony_crystal": "Antimony Crystal", "item.basemetals.antimony_dense_plate": "Antimony Dense Plate", "item.basemetals.antimony_door": "Antimony Door", "item.basemetals.antimony_fishing_rod": "Antimony Fishing Rod", @@ -517,12 +508,10 @@ "item.basemetals.antimony_pickaxe": "Antimony Pickaxe", "item.basemetals.antimony_plate": "Antimony Plate", "item.basemetals.antimony_powder": "Antimony Powder", - "item.basemetals.antimony_powder_dirty": "Antimony Powder Dirty", "item.basemetals.antimony_pressure_plate": "Antimony Pressure Plate", "item.basemetals.antimony_raw": "Antimony en bruto", "item.basemetals.antimony_rod": "Antimony Rod", "item.basemetals.antimony_scythe": "Antimony Scythe", - "item.basemetals.antimony_shard": "Antimony Shard", "item.basemetals.antimony_shears": "Antimony Shears", "item.basemetals.antimony_shield": "Antimony Shield", "item.basemetals.antimony_shovel": "Antimony Shovel", @@ -585,12 +574,10 @@ "item.basemetals.bismuth_button": "Bismuth Button", "item.basemetals.bismuth_casing": "Bismuth Casing", "item.basemetals.bismuth_chestplate": "Bismuth Chestplate", - "item.basemetals.bismuth_clump": "Bismuth Clump", "item.basemetals.bismuth_crackhammer": "Bismuth Crackhammer", "item.basemetals.bismuth_crossbow": "Bismuth Crossbow", "item.basemetals.bismuth_crushed": "Bismuth Crushed", "item.basemetals.bismuth_crushed_purified": "Bismuth Crushed Purified", - "item.basemetals.bismuth_crystal": "Bismuth Crystal", "item.basemetals.bismuth_dense_plate": "Bismuth Dense Plate", "item.basemetals.bismuth_door": "Bismuth Door", "item.basemetals.bismuth_fishing_rod": "Bismuth Fishing Rod", @@ -606,12 +593,10 @@ "item.basemetals.bismuth_pickaxe": "Bismuth Pickaxe", "item.basemetals.bismuth_plate": "Bismuth Plate", "item.basemetals.bismuth_powder": "Bismuth Powder", - "item.basemetals.bismuth_powder_dirty": "Bismuth Powder Dirty", "item.basemetals.bismuth_pressure_plate": "Bismuth Pressure Plate", "item.basemetals.bismuth_raw": "Bismuth en bruto", "item.basemetals.bismuth_rod": "Bismuth Rod", "item.basemetals.bismuth_scythe": "Bismuth Scythe", - "item.basemetals.bismuth_shard": "Bismuth Shard", "item.basemetals.bismuth_shears": "Bismuth Shears", "item.basemetals.bismuth_shield": "Bismuth Shield", "item.basemetals.bismuth_shovel": "Bismuth Shovel", @@ -725,12 +710,10 @@ "item.basemetals.coldiron_button": "Cold Iron Button", "item.basemetals.coldiron_casing": "Cold Iron Casing", "item.basemetals.coldiron_chestplate": "Peto de glacierro", - "item.basemetals.coldiron_clump": "Cold Iron Clump", "item.basemetals.coldiron_crackhammer": "Almádena de glacierro", "item.basemetals.coldiron_crossbow": "Cold Iron Crossbow", "item.basemetals.coldiron_crushed": "Cold Iron Crushed", "item.basemetals.coldiron_crushed_purified": "Cold Iron Crushed Purified", - "item.basemetals.coldiron_crystal": "Cold Iron Crystal", "item.basemetals.coldiron_dense_plate": "Cold Iron Dense Plate", "item.basemetals.coldiron_door": "Puerta de glacierro", "item.basemetals.coldiron_fishing_rod": "Cold Iron Fishing Rod", @@ -746,12 +729,10 @@ "item.basemetals.coldiron_pickaxe": "Pico de glacierro", "item.basemetals.coldiron_plate": "Cold Iron Plate", "item.basemetals.coldiron_powder": "Polvo de glacierro", - "item.basemetals.coldiron_powder_dirty": "Cold Iron Powder Dirty", "item.basemetals.coldiron_pressure_plate": "Cold Iron Pressure Plate", "item.basemetals.coldiron_raw": "Cold Iron en bruto", "item.basemetals.coldiron_rod": "Barra de glacierro", "item.basemetals.coldiron_scythe": "Cold Iron Scythe", - "item.basemetals.coldiron_shard": "Cold Iron Shard", "item.basemetals.coldiron_shears": "Cold Iron Shears", "item.basemetals.coldiron_shield": "Cold Iron Shield", "item.basemetals.coldiron_shovel": "Pala de glacierro", @@ -1034,8 +1015,6 @@ "item.basemetals.iron_smallpowder": "Iron Smallpowder", "item.basemetals.iron_stairs": "Iron Stairs", "item.basemetals.iron_wall": "Iron Wall", - "item.basemetals.lapis": "Lapis", - "item.basemetals.lapis_bucket": "Cubo de lapislázuli fundido", "item.basemetals.lapis_smallpowder": "Lapis Smallpowder", "item.basemetals.lead": "Lead", "item.basemetals.lead_arrow": "Lead Arrow", @@ -1137,12 +1116,10 @@ "item.basemetals.nickel_button": "Nickel Button", "item.basemetals.nickel_casing": "Nickel Casing", "item.basemetals.nickel_chestplate": "Peto de níquel", - "item.basemetals.nickel_clump": "Nickel Clump", "item.basemetals.nickel_crackhammer": "Almádena de níquel", "item.basemetals.nickel_crossbow": "Nickel Crossbow", "item.basemetals.nickel_crushed": "Nickel Crushed", "item.basemetals.nickel_crushed_purified": "Nickel Crushed Purified", - "item.basemetals.nickel_crystal": "Nickel Crystal", "item.basemetals.nickel_dense_plate": "Nickel Dense Plate", "item.basemetals.nickel_door": "Puerta de níquel", "item.basemetals.nickel_fishing_rod": "Nickel Fishing Rod", @@ -1158,12 +1135,10 @@ "item.basemetals.nickel_pickaxe": "Pico de níquel", "item.basemetals.nickel_plate": "Nickel Plate", "item.basemetals.nickel_powder": "Polvo de níquel", - "item.basemetals.nickel_powder_dirty": "Nickel Powder Dirty", "item.basemetals.nickel_pressure_plate": "Nickel Pressure Plate", "item.basemetals.nickel_raw": "Nickel en bruto", "item.basemetals.nickel_rod": "Barra de níquel", "item.basemetals.nickel_scythe": "Nickel Scythe", - "item.basemetals.nickel_shard": "Nickel Shard", "item.basemetals.nickel_shears": "Nickel Shears", "item.basemetals.nickel_shield": "Nickel Shield", "item.basemetals.nickel_shovel": "Pala de níquel", @@ -1261,12 +1236,10 @@ "item.basemetals.platinum_button": "Platinum Button", "item.basemetals.platinum_casing": "Platinum Casing", "item.basemetals.platinum_chestplate": "Peto de platino", - "item.basemetals.platinum_clump": "Platinum Clump", "item.basemetals.platinum_crackhammer": "Almádena de platino", "item.basemetals.platinum_crossbow": "Platinum Crossbow", "item.basemetals.platinum_crushed": "Platinum Crushed", "item.basemetals.platinum_crushed_purified": "Platinum Crushed Purified", - "item.basemetals.platinum_crystal": "Platinum Crystal", "item.basemetals.platinum_dense_plate": "Platinum Dense Plate", "item.basemetals.platinum_door": "Puerta de platino", "item.basemetals.platinum_fishing_rod": "Platinum Fishing Rod", @@ -1282,12 +1255,10 @@ "item.basemetals.platinum_pickaxe": "Pico de platino", "item.basemetals.platinum_plate": "Platinum Plate", "item.basemetals.platinum_powder": "Polvo de platino", - "item.basemetals.platinum_powder_dirty": "Platinum Powder Dirty", "item.basemetals.platinum_pressure_plate": "Platinum Pressure Plate", "item.basemetals.platinum_raw": "Platinum en bruto", "item.basemetals.platinum_rod": "Barra de platino", "item.basemetals.platinum_scythe": "Platinum Scythe", - "item.basemetals.platinum_shard": "Platinum Shard", "item.basemetals.platinum_shears": "Platinum Shears", "item.basemetals.platinum_shield": "Platinum Shield", "item.basemetals.platinum_shovel": "Pala de platino", @@ -1388,12 +1359,10 @@ "item.basemetals.starsteel_button": "Starsteel Button", "item.basemetals.starsteel_casing": "Starsteel Casing", "item.basemetals.starsteel_chestplate": "Peto de estrellacero", - "item.basemetals.starsteel_clump": "Starsteel Clump", "item.basemetals.starsteel_crackhammer": "Almádena de estrellacero", "item.basemetals.starsteel_crossbow": "Starsteel Crossbow", "item.basemetals.starsteel_crushed": "Starsteel Crushed", "item.basemetals.starsteel_crushed_purified": "Starsteel Crushed Purified", - "item.basemetals.starsteel_crystal": "Starsteel Crystal", "item.basemetals.starsteel_dense_plate": "Starsteel Dense Plate", "item.basemetals.starsteel_door": "Puerta de estrellacero", "item.basemetals.starsteel_fishing_rod": "Starsteel Fishing Rod", @@ -1409,12 +1378,10 @@ "item.basemetals.starsteel_pickaxe": "Pico de estrellacero", "item.basemetals.starsteel_plate": "Starsteel Plate", "item.basemetals.starsteel_powder": "Polvo de estrellacero", - "item.basemetals.starsteel_powder_dirty": "Starsteel Powder Dirty", "item.basemetals.starsteel_pressure_plate": "Starsteel Pressure Plate", "item.basemetals.starsteel_raw": "Starsteel en bruto", "item.basemetals.starsteel_rod": "Barra de estrellacero", "item.basemetals.starsteel_scythe": "Starsteel Scythe", - "item.basemetals.starsteel_shard": "Starsteel Shard", "item.basemetals.starsteel_shears": "Starsteel Shears", "item.basemetals.starsteel_shield": "Starsteel Shield", "item.basemetals.starsteel_shovel": "Pala de estrellacero", @@ -1465,9 +1432,7 @@ "item.basemetals.steel_sword": "Espada de acero", "item.basemetals.steel_trapdoor": "Trampilla de acero", "item.basemetals.steel_wall": "Steel Wall", - "item.basemetals.stone": "Stone", "item.basemetals.stone_anvil": "Stone Anvil", - "item.basemetals.stone_bucket": "Cubo de piedra fundida", "item.basemetals.stone_crackhammer": "Almádena de piedra", "item.basemetals.stone_gear": "Stone Gear", "item.basemetals.stone_rod": "Stone Rod", @@ -1512,8 +1477,6 @@ "item.basemetals.tin_sword": "Espada de estaño", "item.basemetals.tin_trapdoor": "Trampilla de estaño", "item.basemetals.tin_wall": "Tin Wall", - "item.basemetals.wood": "Wood", - "item.basemetals.wood_bucket": "Cubo de madera licuada", "item.basemetals.wood_crackhammer": "Almádena de madera", "item.basemetals.wood_gear": "Wood Gear", "item.basemetals.wood_scythe": "Wood Scythe", @@ -1529,12 +1492,10 @@ "item.basemetals.zinc_button": "Zinc Button", "item.basemetals.zinc_casing": "Zinc Casing", "item.basemetals.zinc_chestplate": "Zinc Chestplate", - "item.basemetals.zinc_clump": "Zinc Clump", "item.basemetals.zinc_crackhammer": "Zinc Crackhammer", "item.basemetals.zinc_crossbow": "Zinc Crossbow", "item.basemetals.zinc_crushed": "Zinc Crushed", "item.basemetals.zinc_crushed_purified": "Zinc Crushed Purified", - "item.basemetals.zinc_crystal": "Zinc Crystal", "item.basemetals.zinc_dense_plate": "Zinc Dense Plate", "item.basemetals.zinc_door": "Zinc Door", "item.basemetals.zinc_fishing_rod": "Zinc Fishing Rod", @@ -1550,12 +1511,10 @@ "item.basemetals.zinc_pickaxe": "Zinc Pickaxe", "item.basemetals.zinc_plate": "Zinc Plate", "item.basemetals.zinc_powder": "Polvo de zinc", - "item.basemetals.zinc_powder_dirty": "Zinc Powder Dirty", "item.basemetals.zinc_pressure_plate": "Zinc Pressure Plate", "item.basemetals.zinc_raw": "Zinc en bruto", "item.basemetals.zinc_rod": "Barra de zinc", "item.basemetals.zinc_scythe": "Zinc Scythe", - "item.basemetals.zinc_shard": "Zinc Shard", "item.basemetals.zinc_shears": "Zinc Shears", "item.basemetals.zinc_shield": "Zinc Shield", "item.basemetals.zinc_shovel": "Zinc Shovel", @@ -1583,7 +1542,6 @@ "item.bucket.gold": "Cubo de oro fundido", "item.bucket.invar": "Cubo de invar fundido", "item.bucket.iron": "Cubo de hierro fundido", - "item.bucket.lapis": "Cubo de lapislázuli fundido", "item.bucket.lead": "Cubo de plomo fundido", "item.bucket.mercury": "Cubo de mercurio", "item.bucket.mithril": "Cubo de mithril fundido", @@ -1597,13 +1555,12 @@ "item.bucket.silver": "Cubo de plata fundida", "item.bucket.starsteel": "Cubo de acero estelar fundido", "item.bucket.steel": "Cubo de acero fundido", - "item.bucket.stone": "Cubo de piedra fundida", "item.bucket.tin": "Cubo de estaño fundido", - "item.bucket.wood": "Cubo de madera licuada", "item.bucket.zinc": "Cubo de zinc fundido", "itemGroup.basemetals.blocks": "Base Metals Blocks", "itemGroup.basemetals.combat": "Base Metals Combat", "itemGroup.basemetals.items": "Base Metals Items", + "itemGroup.basemetals.materials": "Base Metals Materials", "itemGroup.basemetals.tools": "Base Metals Tools", "language_support_goals": "english (en_US,en_EN,en_CA,en_GB, en_AU, en_PT), italian(IT_it), spanish (es_MX,es_ES), simplified chinese (zh_CN), japanese (ja_JA), portugese (pt_BR), german (de_DE)", "material.basemetals.adamantine": "Adamantine", diff --git a/src/generated/resources/assets/basemetals/lang/es_mx.json b/src/generated/resources/assets/basemetals/lang/es_mx.json index 3fa32d15e..a17084f39 100644 --- a/src/generated/resources/assets/basemetals/lang/es_mx.json +++ b/src/generated/resources/assets/basemetals/lang/es_mx.json @@ -41,6 +41,7 @@ "block.basemetals.adamantine_block": "Bloque de adamantina", "block.basemetals.adamantine_button": "Adamantine Button", "block.basemetals.adamantine_door": "Puerta de adamantina", + "block.basemetals.adamantine_double_slab": "Adamantine Double Slab", "block.basemetals.adamantine_lever": "Adamantine Lever", "block.basemetals.adamantine_ore": "Mena de adamantina", "block.basemetals.adamantine_plate": "Placa de adamantina", @@ -54,6 +55,7 @@ "block.basemetals.antimony_block": "Antimony Block", "block.basemetals.antimony_button": "Antimony Button", "block.basemetals.antimony_door": "Antimony Door", + "block.basemetals.antimony_double_slab": "Antimony Double Slab", "block.basemetals.antimony_lever": "Antimony Lever", "block.basemetals.antimony_ore": "Antimony Ore", "block.basemetals.antimony_plate": "Antimony Plate", @@ -67,6 +69,7 @@ "block.basemetals.aquarium_block": "Bloque de aquaranio", "block.basemetals.aquarium_button": "Aquarium Button", "block.basemetals.aquarium_door": "Puerta de aquaranio", + "block.basemetals.aquarium_double_slab": "Aquarium Double Slab", "block.basemetals.aquarium_lever": "Aquarium Lever", "block.basemetals.aquarium_plate": "Placa de aquaranio", "block.basemetals.aquarium_pressure_plate": "Aquarium Pressure Plate", @@ -79,6 +82,7 @@ "block.basemetals.bismuth_block": "Bismuth Block", "block.basemetals.bismuth_button": "Bismuth Button", "block.basemetals.bismuth_door": "Bismuth Door", + "block.basemetals.bismuth_double_slab": "Bismuth Double Slab", "block.basemetals.bismuth_lever": "Bismuth Lever", "block.basemetals.bismuth_ore": "Bismuth Ore", "block.basemetals.bismuth_plate": "Bismuth Plate", @@ -92,6 +96,7 @@ "block.basemetals.brass_block": "Bloque de latón", "block.basemetals.brass_button": "Brass Button", "block.basemetals.brass_door": "Puerta de latón", + "block.basemetals.brass_double_slab": "Brass Double Slab", "block.basemetals.brass_lever": "Brass Lever", "block.basemetals.brass_plate": "Placa de latón", "block.basemetals.brass_pressure_plate": "Brass Pressure Plate", @@ -104,6 +109,7 @@ "block.basemetals.bronze_block": "Bloque de bronce", "block.basemetals.bronze_button": "Bronze Button", "block.basemetals.bronze_door": "Puerta de bronce", + "block.basemetals.bronze_double_slab": "Bronze Double Slab", "block.basemetals.bronze_lever": "Bronze Lever", "block.basemetals.bronze_plate": "Placa de bronce", "block.basemetals.bronze_pressure_plate": "Bronze Pressure Plate", @@ -119,6 +125,7 @@ "block.basemetals.coldiron_block": "Bloque de glacierro", "block.basemetals.coldiron_button": "Cold Iron Button", "block.basemetals.coldiron_door": "Puerta de glacierro", + "block.basemetals.coldiron_double_slab": "Cold Iron Double Slab", "block.basemetals.coldiron_lever": "Cold Iron Lever", "block.basemetals.coldiron_ore": "Mena de glacierro", "block.basemetals.coldiron_plate": "Placa de glacierro", @@ -132,6 +139,7 @@ "block.basemetals.copper_block": "Bloque de cobre", "block.basemetals.copper_button": "Copper Button", "block.basemetals.copper_door": "Puerta de cobre", + "block.basemetals.copper_double_slab": "Copper Double Slab", "block.basemetals.copper_lever": "Copper Lever", "block.basemetals.copper_ore": "Mena de cobre", "block.basemetals.copper_plate": "Placa de cobre", @@ -145,6 +153,7 @@ "block.basemetals.cupronickel_block": "Bloque de cobreníquel", "block.basemetals.cupronickel_button": "Cupronickel Button", "block.basemetals.cupronickel_door": "Puerta de cobreníquel", + "block.basemetals.cupronickel_double_slab": "Cupronickel Double Slab", "block.basemetals.cupronickel_lever": "Cupronickel Lever", "block.basemetals.cupronickel_plate": "Cupronickel Plate", "block.basemetals.cupronickel_pressure_plate": "Cupronickel Pressure Plate", @@ -156,43 +165,19 @@ "block.basemetals.diamond_bars": "Diamond Bars", "block.basemetals.diamond_button": "Diamond Button", "block.basemetals.diamond_door": "Diamond Door", + "block.basemetals.diamond_double_slab": "Diamond Double Slab", "block.basemetals.diamond_lever": "Diamond Lever", "block.basemetals.diamond_pressure_plate": "Diamond Pressure Plate", "block.basemetals.diamond_slab": "Diamond Slab", "block.basemetals.diamond_stairs": "Diamond Stairs", "block.basemetals.diamond_trapdoor": "Diamond Trapdoor", "block.basemetals.diamond_wall": "Diamond Wall", - "block.basemetals.double_adamantine_slab": "Double Adamantine Slab", - "block.basemetals.double_antimony_slab": "Double Antimony Slab", - "block.basemetals.double_aquarium_slab": "Double Aquarium Slab", - "block.basemetals.double_bismuth_slab": "Double Bismuth Slab", - "block.basemetals.double_brass_slab": "Double Brass Slab", - "block.basemetals.double_bronze_slab": "Double Bronze Slab", - "block.basemetals.double_coldiron_slab": "Double Cold Iron Slab", - "block.basemetals.double_copper_slab": "Double Copper Slab", - "block.basemetals.double_cupronickel_slab": "Double Cupronickel Slab", - "block.basemetals.double_diamond_slab": "Double Diamond Slab", - "block.basemetals.double_electrum_slab": "Double Electrum Slab", - "block.basemetals.double_emerald_slab": "Double Emerald Slab", - "block.basemetals.double_gold_slab": "Double Gold Slab", - "block.basemetals.double_invar_slab": "Double Invar Slab", - "block.basemetals.double_iron_slab": "Double Iron Slab", - "block.basemetals.double_lead_slab": "Double Lead Slab", - "block.basemetals.double_mithril_slab": "Double Mithril Slab", - "block.basemetals.double_nickel_slab": "Double Nickel Slab", - "block.basemetals.double_obsidian_slab": "Double Obsidian Slab", - "block.basemetals.double_pewter_slab": "Double Pewter Slab", - "block.basemetals.double_platinum_slab": "Double Platinum Slab", - "block.basemetals.double_silver_slab": "Double Silver Slab", - "block.basemetals.double_starsteel_slab": "Double Starsteel Slab", - "block.basemetals.double_steel_slab": "Double Steel Slab", - "block.basemetals.double_tin_slab": "Double Tin Slab", - "block.basemetals.double_zinc_slab": "Double Zinc Slab", "block.basemetals.electrum": "Molten Electrum", "block.basemetals.electrum_bars": "Barrotes de electrio", "block.basemetals.electrum_block": "Bloque de electrio", "block.basemetals.electrum_button": "Electrum Button", "block.basemetals.electrum_door": "Puerta de electrio", + "block.basemetals.electrum_double_slab": "Electrum Double Slab", "block.basemetals.electrum_lever": "Electrum Lever", "block.basemetals.electrum_plate": "Placa de electrio", "block.basemetals.electrum_pressure_plate": "Electrum Pressure Plate", @@ -204,6 +189,7 @@ "block.basemetals.emerald_bars": "Emerald Bars", "block.basemetals.emerald_button": "Emerald Button", "block.basemetals.emerald_door": "Emerald Door", + "block.basemetals.emerald_double_slab": "Emerald Double Slab", "block.basemetals.emerald_lever": "Emerald Lever", "block.basemetals.emerald_pressure_plate": "Emerald Pressure Plate", "block.basemetals.emerald_slab": "Emerald Slab", @@ -215,6 +201,7 @@ "block.basemetals.gold_bars": "Gold Bars", "block.basemetals.gold_button": "Gold Button", "block.basemetals.gold_door": "Gold Door", + "block.basemetals.gold_double_slab": "Gold Double Slab", "block.basemetals.gold_lever": "Gold Lever", "block.basemetals.gold_plate": "Placa de oro", "block.basemetals.gold_slab": "Gold Slab", @@ -227,6 +214,7 @@ "block.basemetals.invar_block": "Bloque de invar", "block.basemetals.invar_button": "Invar Button", "block.basemetals.invar_door": "Puerta de invar", + "block.basemetals.invar_double_slab": "Invar Double Slab", "block.basemetals.invar_lever": "Invar Lever", "block.basemetals.invar_plate": "Placa de invar", "block.basemetals.invar_pressure_plate": "Invar Pressure Plate", @@ -236,17 +224,18 @@ "block.basemetals.invar_wall": "Invar Wall", "block.basemetals.iron": "Molten Iron", "block.basemetals.iron_button": "Iron Button", + "block.basemetals.iron_double_slab": "Iron Double Slab", "block.basemetals.iron_lever": "Iron Lever", "block.basemetals.iron_plate": "Placa de hierro", "block.basemetals.iron_slab": "Iron Slab", "block.basemetals.iron_stairs": "Iron Stairs", "block.basemetals.iron_wall": "Iron Wall", - "block.basemetals.lapis": "Molten Lapis", "block.basemetals.lead": "Molten Lead", "block.basemetals.lead_bars": "Barrotes de plomo", "block.basemetals.lead_block": "Bloque de plomo", "block.basemetals.lead_button": "Lead Button", "block.basemetals.lead_door": "Puerta de plomo", + "block.basemetals.lead_double_slab": "Lead Double Slab", "block.basemetals.lead_lever": "Lead Lever", "block.basemetals.lead_ore": "Mena de plomo", "block.basemetals.lead_plate": "Placa de plomo", @@ -262,6 +251,7 @@ "block.basemetals.mithril_block": "Bloque de mithril", "block.basemetals.mithril_button": "Mithril Button", "block.basemetals.mithril_door": "Puerta de mithril", + "block.basemetals.mithril_double_slab": "Mithril Double Slab", "block.basemetals.mithril_lever": "Mithril Lever", "block.basemetals.mithril_plate": "Placa de mithril", "block.basemetals.mithril_pressure_plate": "Mithril Pressure Plate", @@ -274,6 +264,7 @@ "block.basemetals.nickel_block": "Bloque de níquel", "block.basemetals.nickel_button": "Nickel Button", "block.basemetals.nickel_door": "Puerta de níquel", + "block.basemetals.nickel_double_slab": "Nickel Double Slab", "block.basemetals.nickel_lever": "Nickel Lever", "block.basemetals.nickel_ore": "Mena de níquel", "block.basemetals.nickel_plate": "Placa de níquel", @@ -286,6 +277,7 @@ "block.basemetals.obsidian_bars": "Obsidian Bars", "block.basemetals.obsidian_button": "Obsidian Button", "block.basemetals.obsidian_door": "Obsidian Door", + "block.basemetals.obsidian_double_slab": "Obsidian Double Slab", "block.basemetals.obsidian_lever": "Obsidian Lever", "block.basemetals.obsidian_pressure_plate": "Obsidian Pressure Plate", "block.basemetals.obsidian_slab": "Obsidian Slab", @@ -297,6 +289,7 @@ "block.basemetals.pewter_block": "Pewter Block", "block.basemetals.pewter_button": "Pewter Button", "block.basemetals.pewter_door": "Pewter Door", + "block.basemetals.pewter_double_slab": "Pewter Double Slab", "block.basemetals.pewter_lever": "Pewter Lever", "block.basemetals.pewter_plate": "Pewter Plate", "block.basemetals.pewter_pressure_plate": "Pewter Pressure Plate", @@ -309,6 +302,7 @@ "block.basemetals.platinum_block": "Bloque de platino", "block.basemetals.platinum_button": "Platinum Button", "block.basemetals.platinum_door": "Puerta de platino", + "block.basemetals.platinum_double_slab": "Platinum Double Slab", "block.basemetals.platinum_lever": "Platinum Lever", "block.basemetals.platinum_ore": "Mena de platino", "block.basemetals.platinum_plate": "Platinum Plate", @@ -332,6 +326,7 @@ "block.basemetals.silver_block": "Bloque de plata", "block.basemetals.silver_button": "Silver Button", "block.basemetals.silver_door": "Puerta de plata", + "block.basemetals.silver_double_slab": "Silver Double Slab", "block.basemetals.silver_lever": "Silver Lever", "block.basemetals.silver_ore": "Mena de plata", "block.basemetals.silver_plate": "Placa de plata", @@ -345,6 +340,7 @@ "block.basemetals.starsteel_block": "Bloque de estrellacero", "block.basemetals.starsteel_button": "Starsteel Button", "block.basemetals.starsteel_door": "Puerta de estrellacero", + "block.basemetals.starsteel_double_slab": "Starsteel Double Slab", "block.basemetals.starsteel_lever": "Starsteel Lever", "block.basemetals.starsteel_ore": "Mena de estrellacero", "block.basemetals.starsteel_plate": "Placa de estrellacero", @@ -359,6 +355,7 @@ "block.basemetals.steel_block": "Bloque de acero", "block.basemetals.steel_button": "Steel Button", "block.basemetals.steel_door": "Puerta de acero", + "block.basemetals.steel_double_slab": "Steel Double Slab", "block.basemetals.steel_lever": "Steel Lever", "block.basemetals.steel_plate": "Placa de acero", "block.basemetals.steel_pressure_plate": "Steel Pressure Plate", @@ -366,13 +363,13 @@ "block.basemetals.steel_stairs": "Steel Stairs", "block.basemetals.steel_trapdoor": "Trampilla de acero", "block.basemetals.steel_wall": "Steel Wall", - "block.basemetals.stone": "Molten Stone", "block.basemetals.stone_anvil": "Stone Anvil", "block.basemetals.tin": "Molten Tin", "block.basemetals.tin_bars": "Barrotes de estaño", "block.basemetals.tin_block": "Bloque de estaño", "block.basemetals.tin_button": "Tin Button", "block.basemetals.tin_door": "Puerta de estaño", + "block.basemetals.tin_double_slab": "Tin Double Slab", "block.basemetals.tin_lever": "Tin Lever", "block.basemetals.tin_ore": "Mena de estaño", "block.basemetals.tin_plate": "Placa de estaño", @@ -381,12 +378,12 @@ "block.basemetals.tin_stairs": "Tin Stairs", "block.basemetals.tin_trapdoor": "Trampilla de estaño", "block.basemetals.tin_wall": "Tin Wall", - "block.basemetals.wood": "Molten Wood", "block.basemetals.zinc": "Molten Zinc", "block.basemetals.zinc_bars": "Zinc Bars", "block.basemetals.zinc_block": "Bloque de zinc", "block.basemetals.zinc_button": "Zinc Button", "block.basemetals.zinc_door": "Zinc Door", + "block.basemetals.zinc_double_slab": "Zinc Double Slab", "block.basemetals.zinc_lever": "Zinc Lever", "block.basemetals.zinc_ore": "Mena de zinc", "block.basemetals.zinc_plate": "Placa de zinc", @@ -448,12 +445,10 @@ "item.basemetals.adamantine_button": "Adamantine Button", "item.basemetals.adamantine_casing": "Adamantine Casing", "item.basemetals.adamantine_chestplate": "Peto de adamantina", - "item.basemetals.adamantine_clump": "Adamantine Clump", "item.basemetals.adamantine_crackhammer": "Almádena de adamantina", "item.basemetals.adamantine_crossbow": "Adamantine Crossbow", "item.basemetals.adamantine_crushed": "Adamantine Crushed", "item.basemetals.adamantine_crushed_purified": "Adamantine Crushed Purified", - "item.basemetals.adamantine_crystal": "Adamantine Crystal", "item.basemetals.adamantine_dense_plate": "Adamantine Dense Plate", "item.basemetals.adamantine_door": "Puerta de adamantina", "item.basemetals.adamantine_fishing_rod": "Adamantine Fishing Rod", @@ -469,12 +464,10 @@ "item.basemetals.adamantine_pickaxe": "Pico de adamantina", "item.basemetals.adamantine_plate": "Adamantine Plate", "item.basemetals.adamantine_powder": "Polvo de adamantina", - "item.basemetals.adamantine_powder_dirty": "Adamantine Powder Dirty", "item.basemetals.adamantine_pressure_plate": "Adamantine Pressure Plate", "item.basemetals.adamantine_raw": "Adamantine en bruto", "item.basemetals.adamantine_rod": "Barra de adamantina", "item.basemetals.adamantine_scythe": "Adamantine Scythe", - "item.basemetals.adamantine_shard": "Adamantine Shard", "item.basemetals.adamantine_shears": "Adamantine Shears", "item.basemetals.adamantine_shield": "Adamantine Shield", "item.basemetals.adamantine_shovel": "Pala de adamantina", @@ -496,12 +489,10 @@ "item.basemetals.antimony_button": "Antimony Button", "item.basemetals.antimony_casing": "Antimony Casing", "item.basemetals.antimony_chestplate": "Antimony Chestplate", - "item.basemetals.antimony_clump": "Antimony Clump", "item.basemetals.antimony_crackhammer": "Antimony Crackhammer", "item.basemetals.antimony_crossbow": "Antimony Crossbow", "item.basemetals.antimony_crushed": "Antimony Crushed", "item.basemetals.antimony_crushed_purified": "Antimony Crushed Purified", - "item.basemetals.antimony_crystal": "Antimony Crystal", "item.basemetals.antimony_dense_plate": "Antimony Dense Plate", "item.basemetals.antimony_door": "Antimony Door", "item.basemetals.antimony_fishing_rod": "Antimony Fishing Rod", @@ -517,12 +508,10 @@ "item.basemetals.antimony_pickaxe": "Antimony Pickaxe", "item.basemetals.antimony_plate": "Antimony Plate", "item.basemetals.antimony_powder": "Antimony Powder", - "item.basemetals.antimony_powder_dirty": "Antimony Powder Dirty", "item.basemetals.antimony_pressure_plate": "Antimony Pressure Plate", "item.basemetals.antimony_raw": "Antimony en bruto", "item.basemetals.antimony_rod": "Antimony Rod", "item.basemetals.antimony_scythe": "Antimony Scythe", - "item.basemetals.antimony_shard": "Antimony Shard", "item.basemetals.antimony_shears": "Antimony Shears", "item.basemetals.antimony_shield": "Antimony Shield", "item.basemetals.antimony_shovel": "Antimony Shovel", @@ -585,12 +574,10 @@ "item.basemetals.bismuth_button": "Bismuth Button", "item.basemetals.bismuth_casing": "Bismuth Casing", "item.basemetals.bismuth_chestplate": "Bismuth Chestplate", - "item.basemetals.bismuth_clump": "Bismuth Clump", "item.basemetals.bismuth_crackhammer": "Bismuth Crackhammer", "item.basemetals.bismuth_crossbow": "Bismuth Crossbow", "item.basemetals.bismuth_crushed": "Bismuth Crushed", "item.basemetals.bismuth_crushed_purified": "Bismuth Crushed Purified", - "item.basemetals.bismuth_crystal": "Bismuth Crystal", "item.basemetals.bismuth_dense_plate": "Bismuth Dense Plate", "item.basemetals.bismuth_door": "Bismuth Door", "item.basemetals.bismuth_fishing_rod": "Bismuth Fishing Rod", @@ -606,12 +593,10 @@ "item.basemetals.bismuth_pickaxe": "Bismuth Pickaxe", "item.basemetals.bismuth_plate": "Bismuth Plate", "item.basemetals.bismuth_powder": "Bismuth Powder", - "item.basemetals.bismuth_powder_dirty": "Bismuth Powder Dirty", "item.basemetals.bismuth_pressure_plate": "Bismuth Pressure Plate", "item.basemetals.bismuth_raw": "Bismuth en bruto", "item.basemetals.bismuth_rod": "Bismuth Rod", "item.basemetals.bismuth_scythe": "Bismuth Scythe", - "item.basemetals.bismuth_shard": "Bismuth Shard", "item.basemetals.bismuth_shears": "Bismuth Shears", "item.basemetals.bismuth_shield": "Bismuth Shield", "item.basemetals.bismuth_shovel": "Bismuth Shovel", @@ -725,12 +710,10 @@ "item.basemetals.coldiron_button": "Cold Iron Button", "item.basemetals.coldiron_casing": "Cold Iron Casing", "item.basemetals.coldiron_chestplate": "Peto de glacierro", - "item.basemetals.coldiron_clump": "Cold Iron Clump", "item.basemetals.coldiron_crackhammer": "Almádena de glacierro", "item.basemetals.coldiron_crossbow": "Cold Iron Crossbow", "item.basemetals.coldiron_crushed": "Cold Iron Crushed", "item.basemetals.coldiron_crushed_purified": "Cold Iron Crushed Purified", - "item.basemetals.coldiron_crystal": "Cold Iron Crystal", "item.basemetals.coldiron_dense_plate": "Cold Iron Dense Plate", "item.basemetals.coldiron_door": "Puerta de glacierro", "item.basemetals.coldiron_fishing_rod": "Cold Iron Fishing Rod", @@ -746,12 +729,10 @@ "item.basemetals.coldiron_pickaxe": "Pico de glacierro", "item.basemetals.coldiron_plate": "Cold Iron Plate", "item.basemetals.coldiron_powder": "Polvo de glacierro", - "item.basemetals.coldiron_powder_dirty": "Cold Iron Powder Dirty", "item.basemetals.coldiron_pressure_plate": "Cold Iron Pressure Plate", "item.basemetals.coldiron_raw": "Cold Iron en bruto", "item.basemetals.coldiron_rod": "Barra de glacierro", "item.basemetals.coldiron_scythe": "Cold Iron Scythe", - "item.basemetals.coldiron_shard": "Cold Iron Shard", "item.basemetals.coldiron_shears": "Cold Iron Shears", "item.basemetals.coldiron_shield": "Cold Iron Shield", "item.basemetals.coldiron_shovel": "Pala de glacierro", @@ -1034,8 +1015,6 @@ "item.basemetals.iron_smallpowder": "Iron Smallpowder", "item.basemetals.iron_stairs": "Iron Stairs", "item.basemetals.iron_wall": "Iron Wall", - "item.basemetals.lapis": "Lapis", - "item.basemetals.lapis_bucket": "Cubo de lapislázuli fundido", "item.basemetals.lapis_smallpowder": "Lapis Smallpowder", "item.basemetals.lead": "Lead", "item.basemetals.lead_arrow": "Lead Arrow", @@ -1137,12 +1116,10 @@ "item.basemetals.nickel_button": "Nickel Button", "item.basemetals.nickel_casing": "Nickel Casing", "item.basemetals.nickel_chestplate": "Peto de níquel", - "item.basemetals.nickel_clump": "Nickel Clump", "item.basemetals.nickel_crackhammer": "Almádena de níquel", "item.basemetals.nickel_crossbow": "Nickel Crossbow", "item.basemetals.nickel_crushed": "Nickel Crushed", "item.basemetals.nickel_crushed_purified": "Nickel Crushed Purified", - "item.basemetals.nickel_crystal": "Nickel Crystal", "item.basemetals.nickel_dense_plate": "Nickel Dense Plate", "item.basemetals.nickel_door": "Puerta de níquel", "item.basemetals.nickel_fishing_rod": "Nickel Fishing Rod", @@ -1158,12 +1135,10 @@ "item.basemetals.nickel_pickaxe": "Pico de níquel", "item.basemetals.nickel_plate": "Nickel Plate", "item.basemetals.nickel_powder": "Polvo de níquel", - "item.basemetals.nickel_powder_dirty": "Nickel Powder Dirty", "item.basemetals.nickel_pressure_plate": "Nickel Pressure Plate", "item.basemetals.nickel_raw": "Nickel en bruto", "item.basemetals.nickel_rod": "Barra de níquel", "item.basemetals.nickel_scythe": "Nickel Scythe", - "item.basemetals.nickel_shard": "Nickel Shard", "item.basemetals.nickel_shears": "Nickel Shears", "item.basemetals.nickel_shield": "Nickel Shield", "item.basemetals.nickel_shovel": "Pala de níquel", @@ -1261,12 +1236,10 @@ "item.basemetals.platinum_button": "Platinum Button", "item.basemetals.platinum_casing": "Platinum Casing", "item.basemetals.platinum_chestplate": "Peto de platino", - "item.basemetals.platinum_clump": "Platinum Clump", "item.basemetals.platinum_crackhammer": "Almádena de platino", "item.basemetals.platinum_crossbow": "Platinum Crossbow", "item.basemetals.platinum_crushed": "Platinum Crushed", "item.basemetals.platinum_crushed_purified": "Platinum Crushed Purified", - "item.basemetals.platinum_crystal": "Platinum Crystal", "item.basemetals.platinum_dense_plate": "Platinum Dense Plate", "item.basemetals.platinum_door": "Puerta de platino", "item.basemetals.platinum_fishing_rod": "Platinum Fishing Rod", @@ -1282,12 +1255,10 @@ "item.basemetals.platinum_pickaxe": "Pico de platino", "item.basemetals.platinum_plate": "Platinum Plate", "item.basemetals.platinum_powder": "Polvo de platino", - "item.basemetals.platinum_powder_dirty": "Platinum Powder Dirty", "item.basemetals.platinum_pressure_plate": "Platinum Pressure Plate", "item.basemetals.platinum_raw": "Platinum en bruto", "item.basemetals.platinum_rod": "Barra de platino", "item.basemetals.platinum_scythe": "Platinum Scythe", - "item.basemetals.platinum_shard": "Platinum Shard", "item.basemetals.platinum_shears": "Platinum Shears", "item.basemetals.platinum_shield": "Platinum Shield", "item.basemetals.platinum_shovel": "Pala de platino", @@ -1388,12 +1359,10 @@ "item.basemetals.starsteel_button": "Starsteel Button", "item.basemetals.starsteel_casing": "Starsteel Casing", "item.basemetals.starsteel_chestplate": "Peto de estrellacero", - "item.basemetals.starsteel_clump": "Starsteel Clump", "item.basemetals.starsteel_crackhammer": "Almádena de estrellacero", "item.basemetals.starsteel_crossbow": "Starsteel Crossbow", "item.basemetals.starsteel_crushed": "Starsteel Crushed", "item.basemetals.starsteel_crushed_purified": "Starsteel Crushed Purified", - "item.basemetals.starsteel_crystal": "Starsteel Crystal", "item.basemetals.starsteel_dense_plate": "Starsteel Dense Plate", "item.basemetals.starsteel_door": "Puerta de estrellacero", "item.basemetals.starsteel_fishing_rod": "Starsteel Fishing Rod", @@ -1409,12 +1378,10 @@ "item.basemetals.starsteel_pickaxe": "Pico de estrellacero", "item.basemetals.starsteel_plate": "Starsteel Plate", "item.basemetals.starsteel_powder": "Polvo de estrellacero", - "item.basemetals.starsteel_powder_dirty": "Starsteel Powder Dirty", "item.basemetals.starsteel_pressure_plate": "Starsteel Pressure Plate", "item.basemetals.starsteel_raw": "Starsteel en bruto", "item.basemetals.starsteel_rod": "Barra de estrellacero", "item.basemetals.starsteel_scythe": "Starsteel Scythe", - "item.basemetals.starsteel_shard": "Starsteel Shard", "item.basemetals.starsteel_shears": "Starsteel Shears", "item.basemetals.starsteel_shield": "Starsteel Shield", "item.basemetals.starsteel_shovel": "Pala de estrellacero", @@ -1465,9 +1432,7 @@ "item.basemetals.steel_sword": "Espada de acero", "item.basemetals.steel_trapdoor": "Trampilla de acero", "item.basemetals.steel_wall": "Steel Wall", - "item.basemetals.stone": "Stone", "item.basemetals.stone_anvil": "Stone Anvil", - "item.basemetals.stone_bucket": "Cubo de piedra fundida", "item.basemetals.stone_crackhammer": "Almádena de piedra", "item.basemetals.stone_gear": "Stone Gear", "item.basemetals.stone_rod": "Stone Rod", @@ -1512,8 +1477,6 @@ "item.basemetals.tin_sword": "Espada de estaño", "item.basemetals.tin_trapdoor": "Trampilla de estaño", "item.basemetals.tin_wall": "Tin Wall", - "item.basemetals.wood": "Wood", - "item.basemetals.wood_bucket": "Cubo de madera licuada", "item.basemetals.wood_crackhammer": "Almádena de madera", "item.basemetals.wood_gear": "Wood Gear", "item.basemetals.wood_scythe": "Wood Scythe", @@ -1529,12 +1492,10 @@ "item.basemetals.zinc_button": "Zinc Button", "item.basemetals.zinc_casing": "Zinc Casing", "item.basemetals.zinc_chestplate": "Zinc Chestplate", - "item.basemetals.zinc_clump": "Zinc Clump", "item.basemetals.zinc_crackhammer": "Zinc Crackhammer", "item.basemetals.zinc_crossbow": "Zinc Crossbow", "item.basemetals.zinc_crushed": "Zinc Crushed", "item.basemetals.zinc_crushed_purified": "Zinc Crushed Purified", - "item.basemetals.zinc_crystal": "Zinc Crystal", "item.basemetals.zinc_dense_plate": "Zinc Dense Plate", "item.basemetals.zinc_door": "Zinc Door", "item.basemetals.zinc_fishing_rod": "Zinc Fishing Rod", @@ -1550,12 +1511,10 @@ "item.basemetals.zinc_pickaxe": "Zinc Pickaxe", "item.basemetals.zinc_plate": "Zinc Plate", "item.basemetals.zinc_powder": "Polvo de zinc", - "item.basemetals.zinc_powder_dirty": "Zinc Powder Dirty", "item.basemetals.zinc_pressure_plate": "Zinc Pressure Plate", "item.basemetals.zinc_raw": "Zinc en bruto", "item.basemetals.zinc_rod": "Barra de zinc", "item.basemetals.zinc_scythe": "Zinc Scythe", - "item.basemetals.zinc_shard": "Zinc Shard", "item.basemetals.zinc_shears": "Zinc Shears", "item.basemetals.zinc_shield": "Zinc Shield", "item.basemetals.zinc_shovel": "Zinc Shovel", @@ -1583,7 +1542,6 @@ "item.bucket.gold": "Cubo de oro fundido", "item.bucket.invar": "Cubo de invar fundido", "item.bucket.iron": "Cubo de hierro fundido", - "item.bucket.lapis": "Cubo de lapislázuli fundido", "item.bucket.lead": "Cubo de plomo fundido", "item.bucket.mercury": "Cubo de mercurio", "item.bucket.mithril": "Cubo de mithril fundido", @@ -1597,13 +1555,12 @@ "item.bucket.silver": "Cubo de plata fundida", "item.bucket.starsteel": "Cubo de acero estelar fundido", "item.bucket.steel": "Cubo de acero fundido", - "item.bucket.stone": "Cubo de piedra fundida", "item.bucket.tin": "Cubo de estaño fundido", - "item.bucket.wood": "Cubo de madera licuada", "item.bucket.zinc": "Cubo de zinc fundido", "itemGroup.basemetals.blocks": "Base Metals Blocks", "itemGroup.basemetals.combat": "Base Metals Combat", "itemGroup.basemetals.items": "Base Metals Items", + "itemGroup.basemetals.materials": "Base Metals Materials", "itemGroup.basemetals.tools": "Base Metals Tools", "language_support_goals": "english (en_US,en_EN,en_CA,en_GB, en_AU, en_PT), italian(IT_it), spanish (es_MX,es_ES), simplified chinese (zh_CN), japanese (ja_JA), portugese (pt_BR), german (de_DE)", "material.basemetals.adamantine": "Adamantine", diff --git a/src/generated/resources/assets/basemetals/lang/fr_ca.json b/src/generated/resources/assets/basemetals/lang/fr_ca.json index 1b39ff9c8..092b6ada7 100644 --- a/src/generated/resources/assets/basemetals/lang/fr_ca.json +++ b/src/generated/resources/assets/basemetals/lang/fr_ca.json @@ -41,6 +41,7 @@ "block.basemetals.adamantine_block": "Bloc d'adamantin", "block.basemetals.adamantine_button": "Adamantine Button", "block.basemetals.adamantine_door": "Porte en adamantin", + "block.basemetals.adamantine_double_slab": "Adamantine Double Slab", "block.basemetals.adamantine_lever": "Adamantine Lever", "block.basemetals.adamantine_ore": "Minerai d'adamantin", "block.basemetals.adamantine_plate": "Plaque d'adamantin", @@ -54,6 +55,7 @@ "block.basemetals.antimony_block": "Antimony Block", "block.basemetals.antimony_button": "Antimony Button", "block.basemetals.antimony_door": "Antimony Door", + "block.basemetals.antimony_double_slab": "Antimony Double Slab", "block.basemetals.antimony_lever": "Antimony Lever", "block.basemetals.antimony_ore": "Antimony Ore", "block.basemetals.antimony_plate": "Antimony Plate", @@ -67,6 +69,7 @@ "block.basemetals.aquarium_block": "Bloc d'aquarium", "block.basemetals.aquarium_button": "Aquarium Button", "block.basemetals.aquarium_door": "Porte en aquarium", + "block.basemetals.aquarium_double_slab": "Aquarium Double Slab", "block.basemetals.aquarium_lever": "Aquarium Lever", "block.basemetals.aquarium_plate": "Plaque d'aquarium", "block.basemetals.aquarium_pressure_plate": "Aquarium Pressure Plate", @@ -79,6 +82,7 @@ "block.basemetals.bismuth_block": "Bismuth Block", "block.basemetals.bismuth_button": "Bismuth Button", "block.basemetals.bismuth_door": "Bismuth Door", + "block.basemetals.bismuth_double_slab": "Bismuth Double Slab", "block.basemetals.bismuth_lever": "Bismuth Lever", "block.basemetals.bismuth_ore": "Bismuth Ore", "block.basemetals.bismuth_plate": "Bismuth Plate", @@ -92,6 +96,7 @@ "block.basemetals.brass_block": "Bloc de laiton", "block.basemetals.brass_button": "Brass Button", "block.basemetals.brass_door": "Porte en laiton", + "block.basemetals.brass_double_slab": "Brass Double Slab", "block.basemetals.brass_lever": "Brass Lever", "block.basemetals.brass_plate": "Plaque de laiton", "block.basemetals.brass_pressure_plate": "Brass Pressure Plate", @@ -104,6 +109,7 @@ "block.basemetals.bronze_block": "Bloc de bronze", "block.basemetals.bronze_button": "Bronze Button", "block.basemetals.bronze_door": "Porte en bronze", + "block.basemetals.bronze_double_slab": "Bronze Double Slab", "block.basemetals.bronze_lever": "Bronze Lever", "block.basemetals.bronze_plate": "Plaque de bronze", "block.basemetals.bronze_pressure_plate": "Bronze Pressure Plate", @@ -119,6 +125,7 @@ "block.basemetals.coldiron_block": "Bloc de fer-froid", "block.basemetals.coldiron_button": "Cold Iron Button", "block.basemetals.coldiron_door": "Porte en fer-froid", + "block.basemetals.coldiron_double_slab": "Cold Iron Double Slab", "block.basemetals.coldiron_lever": "Cold Iron Lever", "block.basemetals.coldiron_ore": "Minerai de fer-froid", "block.basemetals.coldiron_plate": "Plaque de fer-froid", @@ -132,6 +139,7 @@ "block.basemetals.copper_block": "Bloc de cuivre", "block.basemetals.copper_button": "Copper Button", "block.basemetals.copper_door": "Porte en cuivre", + "block.basemetals.copper_double_slab": "Copper Double Slab", "block.basemetals.copper_lever": "Copper Lever", "block.basemetals.copper_ore": "Minerai de cuivre", "block.basemetals.copper_plate": "Plaque de cuivre", @@ -145,6 +153,7 @@ "block.basemetals.cupronickel_block": "Bloc d'cuivre-nickel", "block.basemetals.cupronickel_button": "Cupronickel Button", "block.basemetals.cupronickel_door": "Porte en cuivre-nickel", + "block.basemetals.cupronickel_double_slab": "Cupronickel Double Slab", "block.basemetals.cupronickel_lever": "Cupronickel Lever", "block.basemetals.cupronickel_plate": "Cupronickel Plate", "block.basemetals.cupronickel_pressure_plate": "Cupronickel Pressure Plate", @@ -156,43 +165,19 @@ "block.basemetals.diamond_bars": "Diamond Bars", "block.basemetals.diamond_button": "Diamond Button", "block.basemetals.diamond_door": "Diamond Door", + "block.basemetals.diamond_double_slab": "Diamond Double Slab", "block.basemetals.diamond_lever": "Diamond Lever", "block.basemetals.diamond_pressure_plate": "Diamond Pressure Plate", "block.basemetals.diamond_slab": "Diamond Slab", "block.basemetals.diamond_stairs": "Diamond Stairs", "block.basemetals.diamond_trapdoor": "Diamond Trapdoor", "block.basemetals.diamond_wall": "Diamond Wall", - "block.basemetals.double_adamantine_slab": "Double Adamantine Slab", - "block.basemetals.double_antimony_slab": "Double Antimony Slab", - "block.basemetals.double_aquarium_slab": "Double Aquarium Slab", - "block.basemetals.double_bismuth_slab": "Double Bismuth Slab", - "block.basemetals.double_brass_slab": "Double Brass Slab", - "block.basemetals.double_bronze_slab": "Double Bronze Slab", - "block.basemetals.double_coldiron_slab": "Double Cold Iron Slab", - "block.basemetals.double_copper_slab": "Double Copper Slab", - "block.basemetals.double_cupronickel_slab": "Double Cupronickel Slab", - "block.basemetals.double_diamond_slab": "Double Diamond Slab", - "block.basemetals.double_electrum_slab": "Double Electrum Slab", - "block.basemetals.double_emerald_slab": "Double Emerald Slab", - "block.basemetals.double_gold_slab": "Double Gold Slab", - "block.basemetals.double_invar_slab": "Double Invar Slab", - "block.basemetals.double_iron_slab": "Double Iron Slab", - "block.basemetals.double_lead_slab": "Double Lead Slab", - "block.basemetals.double_mithril_slab": "Double Mithril Slab", - "block.basemetals.double_nickel_slab": "Double Nickel Slab", - "block.basemetals.double_obsidian_slab": "Double Obsidian Slab", - "block.basemetals.double_pewter_slab": "Double Pewter Slab", - "block.basemetals.double_platinum_slab": "Double Platinum Slab", - "block.basemetals.double_silver_slab": "Double Silver Slab", - "block.basemetals.double_starsteel_slab": "Double Starsteel Slab", - "block.basemetals.double_steel_slab": "Double Steel Slab", - "block.basemetals.double_tin_slab": "Double Tin Slab", - "block.basemetals.double_zinc_slab": "Double Zinc Slab", "block.basemetals.electrum": "Molten Electrum", "block.basemetals.electrum_bars": "Barres d'électrum", "block.basemetals.electrum_block": "Bloc d'électrum", "block.basemetals.electrum_button": "Electrum Button", "block.basemetals.electrum_door": "Porte en électrum", + "block.basemetals.electrum_double_slab": "Electrum Double Slab", "block.basemetals.electrum_lever": "Electrum Lever", "block.basemetals.electrum_plate": "Plaque d'électrum", "block.basemetals.electrum_pressure_plate": "Electrum Pressure Plate", @@ -204,6 +189,7 @@ "block.basemetals.emerald_bars": "Emerald Bars", "block.basemetals.emerald_button": "Emerald Button", "block.basemetals.emerald_door": "Emerald Door", + "block.basemetals.emerald_double_slab": "Emerald Double Slab", "block.basemetals.emerald_lever": "Emerald Lever", "block.basemetals.emerald_pressure_plate": "Emerald Pressure Plate", "block.basemetals.emerald_slab": "Emerald Slab", @@ -215,6 +201,7 @@ "block.basemetals.gold_bars": "Gold Bars", "block.basemetals.gold_button": "Gold Button", "block.basemetals.gold_door": "Gold Door", + "block.basemetals.gold_double_slab": "Gold Double Slab", "block.basemetals.gold_lever": "Gold Lever", "block.basemetals.gold_plate": "Plaque d'or", "block.basemetals.gold_slab": "Gold Slab", @@ -227,6 +214,7 @@ "block.basemetals.invar_block": "Bloc d'invar", "block.basemetals.invar_button": "Invar Button", "block.basemetals.invar_door": "Porte en invar", + "block.basemetals.invar_double_slab": "Invar Double Slab", "block.basemetals.invar_lever": "Invar Lever", "block.basemetals.invar_plate": "Plaque d'invar", "block.basemetals.invar_pressure_plate": "Invar Pressure Plate", @@ -236,17 +224,18 @@ "block.basemetals.invar_wall": "Invar Wall", "block.basemetals.iron": "Molten Iron", "block.basemetals.iron_button": "Iron Button", + "block.basemetals.iron_double_slab": "Iron Double Slab", "block.basemetals.iron_lever": "Iron Lever", "block.basemetals.iron_plate": "Plaque de fer", "block.basemetals.iron_slab": "Iron Slab", "block.basemetals.iron_stairs": "Iron Stairs", "block.basemetals.iron_wall": "Iron Wall", - "block.basemetals.lapis": "Molten Lapis", "block.basemetals.lead": "Molten Lead", "block.basemetals.lead_bars": "Barres de plomb", "block.basemetals.lead_block": "Bloc de plomb", "block.basemetals.lead_button": "Lead Button", "block.basemetals.lead_door": "Porte en plomb", + "block.basemetals.lead_double_slab": "Lead Double Slab", "block.basemetals.lead_lever": "Lead Lever", "block.basemetals.lead_ore": "Minerai de plomb", "block.basemetals.lead_plate": "Plaque de plomb", @@ -262,6 +251,7 @@ "block.basemetals.mithril_block": "Bloc de mithril", "block.basemetals.mithril_button": "Mithril Button", "block.basemetals.mithril_door": "Porte en mithril", + "block.basemetals.mithril_double_slab": "Mithril Double Slab", "block.basemetals.mithril_lever": "Mithril Lever", "block.basemetals.mithril_plate": "Plaque de mithril", "block.basemetals.mithril_pressure_plate": "Mithril Pressure Plate", @@ -274,6 +264,7 @@ "block.basemetals.nickel_block": "Bloc nickel", "block.basemetals.nickel_button": "Nickel Button", "block.basemetals.nickel_door": "Porte en nickel", + "block.basemetals.nickel_double_slab": "Nickel Double Slab", "block.basemetals.nickel_lever": "Nickel Lever", "block.basemetals.nickel_ore": "Minerai de nickel", "block.basemetals.nickel_plate": "Plaque de nickel", @@ -286,6 +277,7 @@ "block.basemetals.obsidian_bars": "Obsidian Bars", "block.basemetals.obsidian_button": "Obsidian Button", "block.basemetals.obsidian_door": "Obsidian Door", + "block.basemetals.obsidian_double_slab": "Obsidian Double Slab", "block.basemetals.obsidian_lever": "Obsidian Lever", "block.basemetals.obsidian_pressure_plate": "Obsidian Pressure Plate", "block.basemetals.obsidian_slab": "Obsidian Slab", @@ -297,6 +289,7 @@ "block.basemetals.pewter_block": "Pewter Block", "block.basemetals.pewter_button": "Pewter Button", "block.basemetals.pewter_door": "Pewter Door", + "block.basemetals.pewter_double_slab": "Pewter Double Slab", "block.basemetals.pewter_lever": "Pewter Lever", "block.basemetals.pewter_plate": "Pewter Plate", "block.basemetals.pewter_pressure_plate": "Pewter Pressure Plate", @@ -309,6 +302,7 @@ "block.basemetals.platinum_block": "Bloc en platine", "block.basemetals.platinum_button": "Platinum Button", "block.basemetals.platinum_door": "Porte en platine", + "block.basemetals.platinum_double_slab": "Platinum Double Slab", "block.basemetals.platinum_lever": "Platinum Lever", "block.basemetals.platinum_ore": "Minerai en platine", "block.basemetals.platinum_plate": "Platinum Plate", @@ -332,6 +326,7 @@ "block.basemetals.silver_block": "Bloc d'argent", "block.basemetals.silver_button": "Silver Button", "block.basemetals.silver_door": "Porte en argent", + "block.basemetals.silver_double_slab": "Silver Double Slab", "block.basemetals.silver_lever": "Silver Lever", "block.basemetals.silver_ore": "Minerai d'argent", "block.basemetals.silver_plate": "Plaque d'argent", @@ -345,6 +340,7 @@ "block.basemetals.starsteel_block": "Bloc d'acier-étoile", "block.basemetals.starsteel_button": "Starsteel Button", "block.basemetals.starsteel_door": "Porte en acier-étoile", + "block.basemetals.starsteel_double_slab": "Starsteel Double Slab", "block.basemetals.starsteel_lever": "Starsteel Lever", "block.basemetals.starsteel_ore": "Minerai d'acier-étoile", "block.basemetals.starsteel_plate": "Plaque d'acier-étoile", @@ -359,6 +355,7 @@ "block.basemetals.steel_block": "Bloc d'acier", "block.basemetals.steel_button": "Steel Button", "block.basemetals.steel_door": "Porte en acier", + "block.basemetals.steel_double_slab": "Steel Double Slab", "block.basemetals.steel_lever": "Steel Lever", "block.basemetals.steel_plate": "Plaque d'acier", "block.basemetals.steel_pressure_plate": "Steel Pressure Plate", @@ -366,13 +363,13 @@ "block.basemetals.steel_stairs": "Steel Stairs", "block.basemetals.steel_trapdoor": "Trappe en acier", "block.basemetals.steel_wall": "Steel Wall", - "block.basemetals.stone": "Molten Stone", "block.basemetals.stone_anvil": "Stone Anvil", "block.basemetals.tin": "Molten Tin", "block.basemetals.tin_bars": "Barres d'étain", "block.basemetals.tin_block": "Bloc d'étain", "block.basemetals.tin_button": "Tin Button", "block.basemetals.tin_door": "Porte en étain", + "block.basemetals.tin_double_slab": "Tin Double Slab", "block.basemetals.tin_lever": "Tin Lever", "block.basemetals.tin_ore": "Minerai d'étain", "block.basemetals.tin_plate": "Plaque d'étain", @@ -381,12 +378,12 @@ "block.basemetals.tin_stairs": "Tin Stairs", "block.basemetals.tin_trapdoor": "Trappe en étain", "block.basemetals.tin_wall": "Tin Wall", - "block.basemetals.wood": "Molten Wood", "block.basemetals.zinc": "Molten Zinc", "block.basemetals.zinc_bars": "Zinc Bars", "block.basemetals.zinc_block": "Bloc de zinc", "block.basemetals.zinc_button": "Zinc Button", "block.basemetals.zinc_door": "Zinc Door", + "block.basemetals.zinc_double_slab": "Zinc Double Slab", "block.basemetals.zinc_lever": "Zinc Lever", "block.basemetals.zinc_ore": "Minerai de zinc", "block.basemetals.zinc_plate": "Plaque de zinc", @@ -448,12 +445,10 @@ "item.basemetals.adamantine_button": "Adamantine Button", "item.basemetals.adamantine_casing": "Adamantine Casing", "item.basemetals.adamantine_chestplate": "Plastron en adamantin", - "item.basemetals.adamantine_clump": "Adamantine Clump", "item.basemetals.adamantine_crackhammer": "Massette en adamantin", "item.basemetals.adamantine_crossbow": "Adamantine Crossbow", "item.basemetals.adamantine_crushed": "Adamantine Crushed", "item.basemetals.adamantine_crushed_purified": "Adamantine Crushed Purified", - "item.basemetals.adamantine_crystal": "Adamantine Crystal", "item.basemetals.adamantine_dense_plate": "Adamantine Dense Plate", "item.basemetals.adamantine_door": "Porte en adamantin", "item.basemetals.adamantine_fishing_rod": "Adamantine Fishing Rod", @@ -469,12 +464,10 @@ "item.basemetals.adamantine_pickaxe": "Pioche en adamantin", "item.basemetals.adamantine_plate": "Adamantine Plate", "item.basemetals.adamantine_powder": "Adamantin en poudre", - "item.basemetals.adamantine_powder_dirty": "Adamantine Powder Dirty", "item.basemetals.adamantine_pressure_plate": "Adamantine Pressure Plate", "item.basemetals.adamantine_raw": "Adamantine brut", "item.basemetals.adamantine_rod": "Barre en adamantin", "item.basemetals.adamantine_scythe": "Adamantine Scythe", - "item.basemetals.adamantine_shard": "Adamantine Shard", "item.basemetals.adamantine_shears": "Adamantine Shears", "item.basemetals.adamantine_shield": "Adamantine Shield", "item.basemetals.adamantine_shovel": "Pelle en adamantin", @@ -496,12 +489,10 @@ "item.basemetals.antimony_button": "Antimony Button", "item.basemetals.antimony_casing": "Antimony Casing", "item.basemetals.antimony_chestplate": "Antimony Chestplate", - "item.basemetals.antimony_clump": "Antimony Clump", "item.basemetals.antimony_crackhammer": "Antimony Crackhammer", "item.basemetals.antimony_crossbow": "Antimony Crossbow", "item.basemetals.antimony_crushed": "Antimony Crushed", "item.basemetals.antimony_crushed_purified": "Antimony Crushed Purified", - "item.basemetals.antimony_crystal": "Antimony Crystal", "item.basemetals.antimony_dense_plate": "Antimony Dense Plate", "item.basemetals.antimony_door": "Antimony Door", "item.basemetals.antimony_fishing_rod": "Antimony Fishing Rod", @@ -517,12 +508,10 @@ "item.basemetals.antimony_pickaxe": "Antimony Pickaxe", "item.basemetals.antimony_plate": "Antimony Plate", "item.basemetals.antimony_powder": "Antimony Powder", - "item.basemetals.antimony_powder_dirty": "Antimony Powder Dirty", "item.basemetals.antimony_pressure_plate": "Antimony Pressure Plate", "item.basemetals.antimony_raw": "Antimony brut", "item.basemetals.antimony_rod": "Antimony Rod", "item.basemetals.antimony_scythe": "Antimony Scythe", - "item.basemetals.antimony_shard": "Antimony Shard", "item.basemetals.antimony_shears": "Antimony Shears", "item.basemetals.antimony_shield": "Antimony Shield", "item.basemetals.antimony_shovel": "Antimony Shovel", @@ -585,12 +574,10 @@ "item.basemetals.bismuth_button": "Bismuth Button", "item.basemetals.bismuth_casing": "Bismuth Casing", "item.basemetals.bismuth_chestplate": "Bismuth Chestplate", - "item.basemetals.bismuth_clump": "Bismuth Clump", "item.basemetals.bismuth_crackhammer": "Bismuth Crackhammer", "item.basemetals.bismuth_crossbow": "Bismuth Crossbow", "item.basemetals.bismuth_crushed": "Bismuth Crushed", "item.basemetals.bismuth_crushed_purified": "Bismuth Crushed Purified", - "item.basemetals.bismuth_crystal": "Bismuth Crystal", "item.basemetals.bismuth_dense_plate": "Bismuth Dense Plate", "item.basemetals.bismuth_door": "Bismuth Door", "item.basemetals.bismuth_fishing_rod": "Bismuth Fishing Rod", @@ -606,12 +593,10 @@ "item.basemetals.bismuth_pickaxe": "Bismuth Pickaxe", "item.basemetals.bismuth_plate": "Bismuth Plate", "item.basemetals.bismuth_powder": "Bismuth Powder", - "item.basemetals.bismuth_powder_dirty": "Bismuth Powder Dirty", "item.basemetals.bismuth_pressure_plate": "Bismuth Pressure Plate", "item.basemetals.bismuth_raw": "Bismuth brut", "item.basemetals.bismuth_rod": "Bismuth Rod", "item.basemetals.bismuth_scythe": "Bismuth Scythe", - "item.basemetals.bismuth_shard": "Bismuth Shard", "item.basemetals.bismuth_shears": "Bismuth Shears", "item.basemetals.bismuth_shield": "Bismuth Shield", "item.basemetals.bismuth_shovel": "Bismuth Shovel", @@ -725,12 +710,10 @@ "item.basemetals.coldiron_button": "Cold Iron Button", "item.basemetals.coldiron_casing": "Cold Iron Casing", "item.basemetals.coldiron_chestplate": "Plastron en fer-froid", - "item.basemetals.coldiron_clump": "Cold Iron Clump", "item.basemetals.coldiron_crackhammer": "Massette en fer-froid", "item.basemetals.coldiron_crossbow": "Cold Iron Crossbow", "item.basemetals.coldiron_crushed": "Cold Iron Crushed", "item.basemetals.coldiron_crushed_purified": "Cold Iron Crushed Purified", - "item.basemetals.coldiron_crystal": "Cold Iron Crystal", "item.basemetals.coldiron_dense_plate": "Cold Iron Dense Plate", "item.basemetals.coldiron_door": "Porte en fer-froid", "item.basemetals.coldiron_fishing_rod": "Cold Iron Fishing Rod", @@ -746,12 +729,10 @@ "item.basemetals.coldiron_pickaxe": "Pioche en fer-froid", "item.basemetals.coldiron_plate": "Cold Iron Plate", "item.basemetals.coldiron_powder": "Fer-froid en poudre", - "item.basemetals.coldiron_powder_dirty": "Cold Iron Powder Dirty", "item.basemetals.coldiron_pressure_plate": "Cold Iron Pressure Plate", "item.basemetals.coldiron_raw": "Cold Iron brut", "item.basemetals.coldiron_rod": "Barre de fer-froid", "item.basemetals.coldiron_scythe": "Cold Iron Scythe", - "item.basemetals.coldiron_shard": "Cold Iron Shard", "item.basemetals.coldiron_shears": "Cold Iron Shears", "item.basemetals.coldiron_shield": "Cold Iron Shield", "item.basemetals.coldiron_shovel": "Pelle en fer-froid", @@ -1034,8 +1015,6 @@ "item.basemetals.iron_smallpowder": "Iron Smallpowder", "item.basemetals.iron_stairs": "Iron Stairs", "item.basemetals.iron_wall": "Iron Wall", - "item.basemetals.lapis": "Lapis", - "item.basemetals.lapis_bucket": "Seau de lapis-lazuli fondu", "item.basemetals.lapis_smallpowder": "Lapis Smallpowder", "item.basemetals.lead": "Lead", "item.basemetals.lead_arrow": "Lead Arrow", @@ -1137,12 +1116,10 @@ "item.basemetals.nickel_button": "Nickel Button", "item.basemetals.nickel_casing": "Nickel Casing", "item.basemetals.nickel_chestplate": "Plastron en nickel", - "item.basemetals.nickel_clump": "Nickel Clump", "item.basemetals.nickel_crackhammer": "Massette en nickel", "item.basemetals.nickel_crossbow": "Nickel Crossbow", "item.basemetals.nickel_crushed": "Nickel Crushed", "item.basemetals.nickel_crushed_purified": "Nickel Crushed Purified", - "item.basemetals.nickel_crystal": "Nickel Crystal", "item.basemetals.nickel_dense_plate": "Nickel Dense Plate", "item.basemetals.nickel_door": "Porte en nickel", "item.basemetals.nickel_fishing_rod": "Nickel Fishing Rod", @@ -1158,12 +1135,10 @@ "item.basemetals.nickel_pickaxe": "Pioche en nickel", "item.basemetals.nickel_plate": "Nickel Plate", "item.basemetals.nickel_powder": "Nickel en poudre", - "item.basemetals.nickel_powder_dirty": "Nickel Powder Dirty", "item.basemetals.nickel_pressure_plate": "Nickel Pressure Plate", "item.basemetals.nickel_raw": "Nickel brut", "item.basemetals.nickel_rod": "Barre en nickel", "item.basemetals.nickel_scythe": "Nickel Scythe", - "item.basemetals.nickel_shard": "Nickel Shard", "item.basemetals.nickel_shears": "Nickel Shears", "item.basemetals.nickel_shield": "Nickel Shield", "item.basemetals.nickel_shovel": "Pelle en nickel", @@ -1261,12 +1236,10 @@ "item.basemetals.platinum_button": "Platinum Button", "item.basemetals.platinum_casing": "Platinum Casing", "item.basemetals.platinum_chestplate": "Plastron en platine", - "item.basemetals.platinum_clump": "Platinum Clump", "item.basemetals.platinum_crackhammer": "Massette en platine", "item.basemetals.platinum_crossbow": "Platinum Crossbow", "item.basemetals.platinum_crushed": "Platinum Crushed", "item.basemetals.platinum_crushed_purified": "Platinum Crushed Purified", - "item.basemetals.platinum_crystal": "Platinum Crystal", "item.basemetals.platinum_dense_plate": "Platinum Dense Plate", "item.basemetals.platinum_door": "Porte en platine", "item.basemetals.platinum_fishing_rod": "Platinum Fishing Rod", @@ -1282,12 +1255,10 @@ "item.basemetals.platinum_pickaxe": "Pioche en platine", "item.basemetals.platinum_plate": "Platinum Plate", "item.basemetals.platinum_powder": "Laiton en platine", - "item.basemetals.platinum_powder_dirty": "Platinum Powder Dirty", "item.basemetals.platinum_pressure_plate": "Platinum Pressure Plate", "item.basemetals.platinum_raw": "Platinum brut", "item.basemetals.platinum_rod": "Barre en platine", "item.basemetals.platinum_scythe": "Platinum Scythe", - "item.basemetals.platinum_shard": "Platinum Shard", "item.basemetals.platinum_shears": "Platinum Shears", "item.basemetals.platinum_shield": "Platinum Shield", "item.basemetals.platinum_shovel": "Pelle en platine", @@ -1388,12 +1359,10 @@ "item.basemetals.starsteel_button": "Starsteel Button", "item.basemetals.starsteel_casing": "Starsteel Casing", "item.basemetals.starsteel_chestplate": "Plastron en acier-étoile", - "item.basemetals.starsteel_clump": "Starsteel Clump", "item.basemetals.starsteel_crackhammer": "Massette en acier-étoile", "item.basemetals.starsteel_crossbow": "Starsteel Crossbow", "item.basemetals.starsteel_crushed": "Starsteel Crushed", "item.basemetals.starsteel_crushed_purified": "Starsteel Crushed Purified", - "item.basemetals.starsteel_crystal": "Starsteel Crystal", "item.basemetals.starsteel_dense_plate": "Starsteel Dense Plate", "item.basemetals.starsteel_door": "Porte en acier-étoile", "item.basemetals.starsteel_fishing_rod": "Starsteel Fishing Rod", @@ -1409,12 +1378,10 @@ "item.basemetals.starsteel_pickaxe": "Pioche en acier-étoile", "item.basemetals.starsteel_plate": "Starsteel Plate", "item.basemetals.starsteel_powder": "Acier-étoile en poudre", - "item.basemetals.starsteel_powder_dirty": "Starsteel Powder Dirty", "item.basemetals.starsteel_pressure_plate": "Starsteel Pressure Plate", "item.basemetals.starsteel_raw": "Starsteel brut", "item.basemetals.starsteel_rod": "Barre en acier-étoile", "item.basemetals.starsteel_scythe": "Starsteel Scythe", - "item.basemetals.starsteel_shard": "Starsteel Shard", "item.basemetals.starsteel_shears": "Starsteel Shears", "item.basemetals.starsteel_shield": "Starsteel Shield", "item.basemetals.starsteel_shovel": "Pelle en acier-étoile", @@ -1465,9 +1432,7 @@ "item.basemetals.steel_sword": "Épée en acier", "item.basemetals.steel_trapdoor": "Trappe en acier", "item.basemetals.steel_wall": "Steel Wall", - "item.basemetals.stone": "Stone", "item.basemetals.stone_anvil": "Stone Anvil", - "item.basemetals.stone_bucket": "Seau de pierre fondue", "item.basemetals.stone_crackhammer": "Massette ene pierre", "item.basemetals.stone_gear": "Stone Gear", "item.basemetals.stone_rod": "Stone Rod", @@ -1512,8 +1477,6 @@ "item.basemetals.tin_sword": "Épée en étain", "item.basemetals.tin_trapdoor": "Trappe en étain", "item.basemetals.tin_wall": "Tin Wall", - "item.basemetals.wood": "Wood", - "item.basemetals.wood_bucket": "Seau de bois liquéfié", "item.basemetals.wood_crackhammer": "Massette en bois", "item.basemetals.wood_gear": "Wood Gear", "item.basemetals.wood_scythe": "Wood Scythe", @@ -1529,12 +1492,10 @@ "item.basemetals.zinc_button": "Zinc Button", "item.basemetals.zinc_casing": "Zinc Casing", "item.basemetals.zinc_chestplate": "Zinc Chestplate", - "item.basemetals.zinc_clump": "Zinc Clump", "item.basemetals.zinc_crackhammer": "Zinc Crackhammer", "item.basemetals.zinc_crossbow": "Zinc Crossbow", "item.basemetals.zinc_crushed": "Zinc Crushed", "item.basemetals.zinc_crushed_purified": "Zinc Crushed Purified", - "item.basemetals.zinc_crystal": "Zinc Crystal", "item.basemetals.zinc_dense_plate": "Zinc Dense Plate", "item.basemetals.zinc_door": "Zinc Door", "item.basemetals.zinc_fishing_rod": "Zinc Fishing Rod", @@ -1550,12 +1511,10 @@ "item.basemetals.zinc_pickaxe": "Zinc Pickaxe", "item.basemetals.zinc_plate": "Zinc Plate", "item.basemetals.zinc_powder": "Zinc en poudre", - "item.basemetals.zinc_powder_dirty": "Zinc Powder Dirty", "item.basemetals.zinc_pressure_plate": "Zinc Pressure Plate", "item.basemetals.zinc_raw": "Zinc brut", "item.basemetals.zinc_rod": "Barre de zinc", "item.basemetals.zinc_scythe": "Zinc Scythe", - "item.basemetals.zinc_shard": "Zinc Shard", "item.basemetals.zinc_shears": "Zinc Shears", "item.basemetals.zinc_shield": "Zinc Shield", "item.basemetals.zinc_shovel": "Zinc Shovel", @@ -1583,7 +1542,6 @@ "item.bucket.gold": "Seau d’or fondu", "item.bucket.invar": "Seau d’invar fondu", "item.bucket.iron": "Seau de fer fondu", - "item.bucket.lapis": "Seau de lapis-lazuli fondu", "item.bucket.lead": "Seau de plomb fondu", "item.bucket.mercury": "Seau de mercure", "item.bucket.mithril": "Seau de mithril fondu", @@ -1597,13 +1555,12 @@ "item.bucket.silver": "Seau d’argent fondu", "item.bucket.starsteel": "Seau d’acier stellaire fondu", "item.bucket.steel": "Seau d’acier fondu", - "item.bucket.stone": "Seau de pierre fondue", "item.bucket.tin": "Seau d’étain fondu", - "item.bucket.wood": "Seau de bois liquéfié", "item.bucket.zinc": "Seau de zinc fondu", "itemGroup.basemetals.blocks": "Base Metals Blocks", "itemGroup.basemetals.combat": "Base Metals Combat", "itemGroup.basemetals.items": "Base Metals Items", + "itemGroup.basemetals.materials": "Base Metals Materials", "itemGroup.basemetals.tools": "Base Metals Tools", "material.basemetals.adamantine": "Adamantine", "material.basemetals.antimony": "Antimony", diff --git a/src/generated/resources/assets/basemetals/lang/fr_fr.json b/src/generated/resources/assets/basemetals/lang/fr_fr.json index 1b39ff9c8..092b6ada7 100644 --- a/src/generated/resources/assets/basemetals/lang/fr_fr.json +++ b/src/generated/resources/assets/basemetals/lang/fr_fr.json @@ -41,6 +41,7 @@ "block.basemetals.adamantine_block": "Bloc d'adamantin", "block.basemetals.adamantine_button": "Adamantine Button", "block.basemetals.adamantine_door": "Porte en adamantin", + "block.basemetals.adamantine_double_slab": "Adamantine Double Slab", "block.basemetals.adamantine_lever": "Adamantine Lever", "block.basemetals.adamantine_ore": "Minerai d'adamantin", "block.basemetals.adamantine_plate": "Plaque d'adamantin", @@ -54,6 +55,7 @@ "block.basemetals.antimony_block": "Antimony Block", "block.basemetals.antimony_button": "Antimony Button", "block.basemetals.antimony_door": "Antimony Door", + "block.basemetals.antimony_double_slab": "Antimony Double Slab", "block.basemetals.antimony_lever": "Antimony Lever", "block.basemetals.antimony_ore": "Antimony Ore", "block.basemetals.antimony_plate": "Antimony Plate", @@ -67,6 +69,7 @@ "block.basemetals.aquarium_block": "Bloc d'aquarium", "block.basemetals.aquarium_button": "Aquarium Button", "block.basemetals.aquarium_door": "Porte en aquarium", + "block.basemetals.aquarium_double_slab": "Aquarium Double Slab", "block.basemetals.aquarium_lever": "Aquarium Lever", "block.basemetals.aquarium_plate": "Plaque d'aquarium", "block.basemetals.aquarium_pressure_plate": "Aquarium Pressure Plate", @@ -79,6 +82,7 @@ "block.basemetals.bismuth_block": "Bismuth Block", "block.basemetals.bismuth_button": "Bismuth Button", "block.basemetals.bismuth_door": "Bismuth Door", + "block.basemetals.bismuth_double_slab": "Bismuth Double Slab", "block.basemetals.bismuth_lever": "Bismuth Lever", "block.basemetals.bismuth_ore": "Bismuth Ore", "block.basemetals.bismuth_plate": "Bismuth Plate", @@ -92,6 +96,7 @@ "block.basemetals.brass_block": "Bloc de laiton", "block.basemetals.brass_button": "Brass Button", "block.basemetals.brass_door": "Porte en laiton", + "block.basemetals.brass_double_slab": "Brass Double Slab", "block.basemetals.brass_lever": "Brass Lever", "block.basemetals.brass_plate": "Plaque de laiton", "block.basemetals.brass_pressure_plate": "Brass Pressure Plate", @@ -104,6 +109,7 @@ "block.basemetals.bronze_block": "Bloc de bronze", "block.basemetals.bronze_button": "Bronze Button", "block.basemetals.bronze_door": "Porte en bronze", + "block.basemetals.bronze_double_slab": "Bronze Double Slab", "block.basemetals.bronze_lever": "Bronze Lever", "block.basemetals.bronze_plate": "Plaque de bronze", "block.basemetals.bronze_pressure_plate": "Bronze Pressure Plate", @@ -119,6 +125,7 @@ "block.basemetals.coldiron_block": "Bloc de fer-froid", "block.basemetals.coldiron_button": "Cold Iron Button", "block.basemetals.coldiron_door": "Porte en fer-froid", + "block.basemetals.coldiron_double_slab": "Cold Iron Double Slab", "block.basemetals.coldiron_lever": "Cold Iron Lever", "block.basemetals.coldiron_ore": "Minerai de fer-froid", "block.basemetals.coldiron_plate": "Plaque de fer-froid", @@ -132,6 +139,7 @@ "block.basemetals.copper_block": "Bloc de cuivre", "block.basemetals.copper_button": "Copper Button", "block.basemetals.copper_door": "Porte en cuivre", + "block.basemetals.copper_double_slab": "Copper Double Slab", "block.basemetals.copper_lever": "Copper Lever", "block.basemetals.copper_ore": "Minerai de cuivre", "block.basemetals.copper_plate": "Plaque de cuivre", @@ -145,6 +153,7 @@ "block.basemetals.cupronickel_block": "Bloc d'cuivre-nickel", "block.basemetals.cupronickel_button": "Cupronickel Button", "block.basemetals.cupronickel_door": "Porte en cuivre-nickel", + "block.basemetals.cupronickel_double_slab": "Cupronickel Double Slab", "block.basemetals.cupronickel_lever": "Cupronickel Lever", "block.basemetals.cupronickel_plate": "Cupronickel Plate", "block.basemetals.cupronickel_pressure_plate": "Cupronickel Pressure Plate", @@ -156,43 +165,19 @@ "block.basemetals.diamond_bars": "Diamond Bars", "block.basemetals.diamond_button": "Diamond Button", "block.basemetals.diamond_door": "Diamond Door", + "block.basemetals.diamond_double_slab": "Diamond Double Slab", "block.basemetals.diamond_lever": "Diamond Lever", "block.basemetals.diamond_pressure_plate": "Diamond Pressure Plate", "block.basemetals.diamond_slab": "Diamond Slab", "block.basemetals.diamond_stairs": "Diamond Stairs", "block.basemetals.diamond_trapdoor": "Diamond Trapdoor", "block.basemetals.diamond_wall": "Diamond Wall", - "block.basemetals.double_adamantine_slab": "Double Adamantine Slab", - "block.basemetals.double_antimony_slab": "Double Antimony Slab", - "block.basemetals.double_aquarium_slab": "Double Aquarium Slab", - "block.basemetals.double_bismuth_slab": "Double Bismuth Slab", - "block.basemetals.double_brass_slab": "Double Brass Slab", - "block.basemetals.double_bronze_slab": "Double Bronze Slab", - "block.basemetals.double_coldiron_slab": "Double Cold Iron Slab", - "block.basemetals.double_copper_slab": "Double Copper Slab", - "block.basemetals.double_cupronickel_slab": "Double Cupronickel Slab", - "block.basemetals.double_diamond_slab": "Double Diamond Slab", - "block.basemetals.double_electrum_slab": "Double Electrum Slab", - "block.basemetals.double_emerald_slab": "Double Emerald Slab", - "block.basemetals.double_gold_slab": "Double Gold Slab", - "block.basemetals.double_invar_slab": "Double Invar Slab", - "block.basemetals.double_iron_slab": "Double Iron Slab", - "block.basemetals.double_lead_slab": "Double Lead Slab", - "block.basemetals.double_mithril_slab": "Double Mithril Slab", - "block.basemetals.double_nickel_slab": "Double Nickel Slab", - "block.basemetals.double_obsidian_slab": "Double Obsidian Slab", - "block.basemetals.double_pewter_slab": "Double Pewter Slab", - "block.basemetals.double_platinum_slab": "Double Platinum Slab", - "block.basemetals.double_silver_slab": "Double Silver Slab", - "block.basemetals.double_starsteel_slab": "Double Starsteel Slab", - "block.basemetals.double_steel_slab": "Double Steel Slab", - "block.basemetals.double_tin_slab": "Double Tin Slab", - "block.basemetals.double_zinc_slab": "Double Zinc Slab", "block.basemetals.electrum": "Molten Electrum", "block.basemetals.electrum_bars": "Barres d'électrum", "block.basemetals.electrum_block": "Bloc d'électrum", "block.basemetals.electrum_button": "Electrum Button", "block.basemetals.electrum_door": "Porte en électrum", + "block.basemetals.electrum_double_slab": "Electrum Double Slab", "block.basemetals.electrum_lever": "Electrum Lever", "block.basemetals.electrum_plate": "Plaque d'électrum", "block.basemetals.electrum_pressure_plate": "Electrum Pressure Plate", @@ -204,6 +189,7 @@ "block.basemetals.emerald_bars": "Emerald Bars", "block.basemetals.emerald_button": "Emerald Button", "block.basemetals.emerald_door": "Emerald Door", + "block.basemetals.emerald_double_slab": "Emerald Double Slab", "block.basemetals.emerald_lever": "Emerald Lever", "block.basemetals.emerald_pressure_plate": "Emerald Pressure Plate", "block.basemetals.emerald_slab": "Emerald Slab", @@ -215,6 +201,7 @@ "block.basemetals.gold_bars": "Gold Bars", "block.basemetals.gold_button": "Gold Button", "block.basemetals.gold_door": "Gold Door", + "block.basemetals.gold_double_slab": "Gold Double Slab", "block.basemetals.gold_lever": "Gold Lever", "block.basemetals.gold_plate": "Plaque d'or", "block.basemetals.gold_slab": "Gold Slab", @@ -227,6 +214,7 @@ "block.basemetals.invar_block": "Bloc d'invar", "block.basemetals.invar_button": "Invar Button", "block.basemetals.invar_door": "Porte en invar", + "block.basemetals.invar_double_slab": "Invar Double Slab", "block.basemetals.invar_lever": "Invar Lever", "block.basemetals.invar_plate": "Plaque d'invar", "block.basemetals.invar_pressure_plate": "Invar Pressure Plate", @@ -236,17 +224,18 @@ "block.basemetals.invar_wall": "Invar Wall", "block.basemetals.iron": "Molten Iron", "block.basemetals.iron_button": "Iron Button", + "block.basemetals.iron_double_slab": "Iron Double Slab", "block.basemetals.iron_lever": "Iron Lever", "block.basemetals.iron_plate": "Plaque de fer", "block.basemetals.iron_slab": "Iron Slab", "block.basemetals.iron_stairs": "Iron Stairs", "block.basemetals.iron_wall": "Iron Wall", - "block.basemetals.lapis": "Molten Lapis", "block.basemetals.lead": "Molten Lead", "block.basemetals.lead_bars": "Barres de plomb", "block.basemetals.lead_block": "Bloc de plomb", "block.basemetals.lead_button": "Lead Button", "block.basemetals.lead_door": "Porte en plomb", + "block.basemetals.lead_double_slab": "Lead Double Slab", "block.basemetals.lead_lever": "Lead Lever", "block.basemetals.lead_ore": "Minerai de plomb", "block.basemetals.lead_plate": "Plaque de plomb", @@ -262,6 +251,7 @@ "block.basemetals.mithril_block": "Bloc de mithril", "block.basemetals.mithril_button": "Mithril Button", "block.basemetals.mithril_door": "Porte en mithril", + "block.basemetals.mithril_double_slab": "Mithril Double Slab", "block.basemetals.mithril_lever": "Mithril Lever", "block.basemetals.mithril_plate": "Plaque de mithril", "block.basemetals.mithril_pressure_plate": "Mithril Pressure Plate", @@ -274,6 +264,7 @@ "block.basemetals.nickel_block": "Bloc nickel", "block.basemetals.nickel_button": "Nickel Button", "block.basemetals.nickel_door": "Porte en nickel", + "block.basemetals.nickel_double_slab": "Nickel Double Slab", "block.basemetals.nickel_lever": "Nickel Lever", "block.basemetals.nickel_ore": "Minerai de nickel", "block.basemetals.nickel_plate": "Plaque de nickel", @@ -286,6 +277,7 @@ "block.basemetals.obsidian_bars": "Obsidian Bars", "block.basemetals.obsidian_button": "Obsidian Button", "block.basemetals.obsidian_door": "Obsidian Door", + "block.basemetals.obsidian_double_slab": "Obsidian Double Slab", "block.basemetals.obsidian_lever": "Obsidian Lever", "block.basemetals.obsidian_pressure_plate": "Obsidian Pressure Plate", "block.basemetals.obsidian_slab": "Obsidian Slab", @@ -297,6 +289,7 @@ "block.basemetals.pewter_block": "Pewter Block", "block.basemetals.pewter_button": "Pewter Button", "block.basemetals.pewter_door": "Pewter Door", + "block.basemetals.pewter_double_slab": "Pewter Double Slab", "block.basemetals.pewter_lever": "Pewter Lever", "block.basemetals.pewter_plate": "Pewter Plate", "block.basemetals.pewter_pressure_plate": "Pewter Pressure Plate", @@ -309,6 +302,7 @@ "block.basemetals.platinum_block": "Bloc en platine", "block.basemetals.platinum_button": "Platinum Button", "block.basemetals.platinum_door": "Porte en platine", + "block.basemetals.platinum_double_slab": "Platinum Double Slab", "block.basemetals.platinum_lever": "Platinum Lever", "block.basemetals.platinum_ore": "Minerai en platine", "block.basemetals.platinum_plate": "Platinum Plate", @@ -332,6 +326,7 @@ "block.basemetals.silver_block": "Bloc d'argent", "block.basemetals.silver_button": "Silver Button", "block.basemetals.silver_door": "Porte en argent", + "block.basemetals.silver_double_slab": "Silver Double Slab", "block.basemetals.silver_lever": "Silver Lever", "block.basemetals.silver_ore": "Minerai d'argent", "block.basemetals.silver_plate": "Plaque d'argent", @@ -345,6 +340,7 @@ "block.basemetals.starsteel_block": "Bloc d'acier-étoile", "block.basemetals.starsteel_button": "Starsteel Button", "block.basemetals.starsteel_door": "Porte en acier-étoile", + "block.basemetals.starsteel_double_slab": "Starsteel Double Slab", "block.basemetals.starsteel_lever": "Starsteel Lever", "block.basemetals.starsteel_ore": "Minerai d'acier-étoile", "block.basemetals.starsteel_plate": "Plaque d'acier-étoile", @@ -359,6 +355,7 @@ "block.basemetals.steel_block": "Bloc d'acier", "block.basemetals.steel_button": "Steel Button", "block.basemetals.steel_door": "Porte en acier", + "block.basemetals.steel_double_slab": "Steel Double Slab", "block.basemetals.steel_lever": "Steel Lever", "block.basemetals.steel_plate": "Plaque d'acier", "block.basemetals.steel_pressure_plate": "Steel Pressure Plate", @@ -366,13 +363,13 @@ "block.basemetals.steel_stairs": "Steel Stairs", "block.basemetals.steel_trapdoor": "Trappe en acier", "block.basemetals.steel_wall": "Steel Wall", - "block.basemetals.stone": "Molten Stone", "block.basemetals.stone_anvil": "Stone Anvil", "block.basemetals.tin": "Molten Tin", "block.basemetals.tin_bars": "Barres d'étain", "block.basemetals.tin_block": "Bloc d'étain", "block.basemetals.tin_button": "Tin Button", "block.basemetals.tin_door": "Porte en étain", + "block.basemetals.tin_double_slab": "Tin Double Slab", "block.basemetals.tin_lever": "Tin Lever", "block.basemetals.tin_ore": "Minerai d'étain", "block.basemetals.tin_plate": "Plaque d'étain", @@ -381,12 +378,12 @@ "block.basemetals.tin_stairs": "Tin Stairs", "block.basemetals.tin_trapdoor": "Trappe en étain", "block.basemetals.tin_wall": "Tin Wall", - "block.basemetals.wood": "Molten Wood", "block.basemetals.zinc": "Molten Zinc", "block.basemetals.zinc_bars": "Zinc Bars", "block.basemetals.zinc_block": "Bloc de zinc", "block.basemetals.zinc_button": "Zinc Button", "block.basemetals.zinc_door": "Zinc Door", + "block.basemetals.zinc_double_slab": "Zinc Double Slab", "block.basemetals.zinc_lever": "Zinc Lever", "block.basemetals.zinc_ore": "Minerai de zinc", "block.basemetals.zinc_plate": "Plaque de zinc", @@ -448,12 +445,10 @@ "item.basemetals.adamantine_button": "Adamantine Button", "item.basemetals.adamantine_casing": "Adamantine Casing", "item.basemetals.adamantine_chestplate": "Plastron en adamantin", - "item.basemetals.adamantine_clump": "Adamantine Clump", "item.basemetals.adamantine_crackhammer": "Massette en adamantin", "item.basemetals.adamantine_crossbow": "Adamantine Crossbow", "item.basemetals.adamantine_crushed": "Adamantine Crushed", "item.basemetals.adamantine_crushed_purified": "Adamantine Crushed Purified", - "item.basemetals.adamantine_crystal": "Adamantine Crystal", "item.basemetals.adamantine_dense_plate": "Adamantine Dense Plate", "item.basemetals.adamantine_door": "Porte en adamantin", "item.basemetals.adamantine_fishing_rod": "Adamantine Fishing Rod", @@ -469,12 +464,10 @@ "item.basemetals.adamantine_pickaxe": "Pioche en adamantin", "item.basemetals.adamantine_plate": "Adamantine Plate", "item.basemetals.adamantine_powder": "Adamantin en poudre", - "item.basemetals.adamantine_powder_dirty": "Adamantine Powder Dirty", "item.basemetals.adamantine_pressure_plate": "Adamantine Pressure Plate", "item.basemetals.adamantine_raw": "Adamantine brut", "item.basemetals.adamantine_rod": "Barre en adamantin", "item.basemetals.adamantine_scythe": "Adamantine Scythe", - "item.basemetals.adamantine_shard": "Adamantine Shard", "item.basemetals.adamantine_shears": "Adamantine Shears", "item.basemetals.adamantine_shield": "Adamantine Shield", "item.basemetals.adamantine_shovel": "Pelle en adamantin", @@ -496,12 +489,10 @@ "item.basemetals.antimony_button": "Antimony Button", "item.basemetals.antimony_casing": "Antimony Casing", "item.basemetals.antimony_chestplate": "Antimony Chestplate", - "item.basemetals.antimony_clump": "Antimony Clump", "item.basemetals.antimony_crackhammer": "Antimony Crackhammer", "item.basemetals.antimony_crossbow": "Antimony Crossbow", "item.basemetals.antimony_crushed": "Antimony Crushed", "item.basemetals.antimony_crushed_purified": "Antimony Crushed Purified", - "item.basemetals.antimony_crystal": "Antimony Crystal", "item.basemetals.antimony_dense_plate": "Antimony Dense Plate", "item.basemetals.antimony_door": "Antimony Door", "item.basemetals.antimony_fishing_rod": "Antimony Fishing Rod", @@ -517,12 +508,10 @@ "item.basemetals.antimony_pickaxe": "Antimony Pickaxe", "item.basemetals.antimony_plate": "Antimony Plate", "item.basemetals.antimony_powder": "Antimony Powder", - "item.basemetals.antimony_powder_dirty": "Antimony Powder Dirty", "item.basemetals.antimony_pressure_plate": "Antimony Pressure Plate", "item.basemetals.antimony_raw": "Antimony brut", "item.basemetals.antimony_rod": "Antimony Rod", "item.basemetals.antimony_scythe": "Antimony Scythe", - "item.basemetals.antimony_shard": "Antimony Shard", "item.basemetals.antimony_shears": "Antimony Shears", "item.basemetals.antimony_shield": "Antimony Shield", "item.basemetals.antimony_shovel": "Antimony Shovel", @@ -585,12 +574,10 @@ "item.basemetals.bismuth_button": "Bismuth Button", "item.basemetals.bismuth_casing": "Bismuth Casing", "item.basemetals.bismuth_chestplate": "Bismuth Chestplate", - "item.basemetals.bismuth_clump": "Bismuth Clump", "item.basemetals.bismuth_crackhammer": "Bismuth Crackhammer", "item.basemetals.bismuth_crossbow": "Bismuth Crossbow", "item.basemetals.bismuth_crushed": "Bismuth Crushed", "item.basemetals.bismuth_crushed_purified": "Bismuth Crushed Purified", - "item.basemetals.bismuth_crystal": "Bismuth Crystal", "item.basemetals.bismuth_dense_plate": "Bismuth Dense Plate", "item.basemetals.bismuth_door": "Bismuth Door", "item.basemetals.bismuth_fishing_rod": "Bismuth Fishing Rod", @@ -606,12 +593,10 @@ "item.basemetals.bismuth_pickaxe": "Bismuth Pickaxe", "item.basemetals.bismuth_plate": "Bismuth Plate", "item.basemetals.bismuth_powder": "Bismuth Powder", - "item.basemetals.bismuth_powder_dirty": "Bismuth Powder Dirty", "item.basemetals.bismuth_pressure_plate": "Bismuth Pressure Plate", "item.basemetals.bismuth_raw": "Bismuth brut", "item.basemetals.bismuth_rod": "Bismuth Rod", "item.basemetals.bismuth_scythe": "Bismuth Scythe", - "item.basemetals.bismuth_shard": "Bismuth Shard", "item.basemetals.bismuth_shears": "Bismuth Shears", "item.basemetals.bismuth_shield": "Bismuth Shield", "item.basemetals.bismuth_shovel": "Bismuth Shovel", @@ -725,12 +710,10 @@ "item.basemetals.coldiron_button": "Cold Iron Button", "item.basemetals.coldiron_casing": "Cold Iron Casing", "item.basemetals.coldiron_chestplate": "Plastron en fer-froid", - "item.basemetals.coldiron_clump": "Cold Iron Clump", "item.basemetals.coldiron_crackhammer": "Massette en fer-froid", "item.basemetals.coldiron_crossbow": "Cold Iron Crossbow", "item.basemetals.coldiron_crushed": "Cold Iron Crushed", "item.basemetals.coldiron_crushed_purified": "Cold Iron Crushed Purified", - "item.basemetals.coldiron_crystal": "Cold Iron Crystal", "item.basemetals.coldiron_dense_plate": "Cold Iron Dense Plate", "item.basemetals.coldiron_door": "Porte en fer-froid", "item.basemetals.coldiron_fishing_rod": "Cold Iron Fishing Rod", @@ -746,12 +729,10 @@ "item.basemetals.coldiron_pickaxe": "Pioche en fer-froid", "item.basemetals.coldiron_plate": "Cold Iron Plate", "item.basemetals.coldiron_powder": "Fer-froid en poudre", - "item.basemetals.coldiron_powder_dirty": "Cold Iron Powder Dirty", "item.basemetals.coldiron_pressure_plate": "Cold Iron Pressure Plate", "item.basemetals.coldiron_raw": "Cold Iron brut", "item.basemetals.coldiron_rod": "Barre de fer-froid", "item.basemetals.coldiron_scythe": "Cold Iron Scythe", - "item.basemetals.coldiron_shard": "Cold Iron Shard", "item.basemetals.coldiron_shears": "Cold Iron Shears", "item.basemetals.coldiron_shield": "Cold Iron Shield", "item.basemetals.coldiron_shovel": "Pelle en fer-froid", @@ -1034,8 +1015,6 @@ "item.basemetals.iron_smallpowder": "Iron Smallpowder", "item.basemetals.iron_stairs": "Iron Stairs", "item.basemetals.iron_wall": "Iron Wall", - "item.basemetals.lapis": "Lapis", - "item.basemetals.lapis_bucket": "Seau de lapis-lazuli fondu", "item.basemetals.lapis_smallpowder": "Lapis Smallpowder", "item.basemetals.lead": "Lead", "item.basemetals.lead_arrow": "Lead Arrow", @@ -1137,12 +1116,10 @@ "item.basemetals.nickel_button": "Nickel Button", "item.basemetals.nickel_casing": "Nickel Casing", "item.basemetals.nickel_chestplate": "Plastron en nickel", - "item.basemetals.nickel_clump": "Nickel Clump", "item.basemetals.nickel_crackhammer": "Massette en nickel", "item.basemetals.nickel_crossbow": "Nickel Crossbow", "item.basemetals.nickel_crushed": "Nickel Crushed", "item.basemetals.nickel_crushed_purified": "Nickel Crushed Purified", - "item.basemetals.nickel_crystal": "Nickel Crystal", "item.basemetals.nickel_dense_plate": "Nickel Dense Plate", "item.basemetals.nickel_door": "Porte en nickel", "item.basemetals.nickel_fishing_rod": "Nickel Fishing Rod", @@ -1158,12 +1135,10 @@ "item.basemetals.nickel_pickaxe": "Pioche en nickel", "item.basemetals.nickel_plate": "Nickel Plate", "item.basemetals.nickel_powder": "Nickel en poudre", - "item.basemetals.nickel_powder_dirty": "Nickel Powder Dirty", "item.basemetals.nickel_pressure_plate": "Nickel Pressure Plate", "item.basemetals.nickel_raw": "Nickel brut", "item.basemetals.nickel_rod": "Barre en nickel", "item.basemetals.nickel_scythe": "Nickel Scythe", - "item.basemetals.nickel_shard": "Nickel Shard", "item.basemetals.nickel_shears": "Nickel Shears", "item.basemetals.nickel_shield": "Nickel Shield", "item.basemetals.nickel_shovel": "Pelle en nickel", @@ -1261,12 +1236,10 @@ "item.basemetals.platinum_button": "Platinum Button", "item.basemetals.platinum_casing": "Platinum Casing", "item.basemetals.platinum_chestplate": "Plastron en platine", - "item.basemetals.platinum_clump": "Platinum Clump", "item.basemetals.platinum_crackhammer": "Massette en platine", "item.basemetals.platinum_crossbow": "Platinum Crossbow", "item.basemetals.platinum_crushed": "Platinum Crushed", "item.basemetals.platinum_crushed_purified": "Platinum Crushed Purified", - "item.basemetals.platinum_crystal": "Platinum Crystal", "item.basemetals.platinum_dense_plate": "Platinum Dense Plate", "item.basemetals.platinum_door": "Porte en platine", "item.basemetals.platinum_fishing_rod": "Platinum Fishing Rod", @@ -1282,12 +1255,10 @@ "item.basemetals.platinum_pickaxe": "Pioche en platine", "item.basemetals.platinum_plate": "Platinum Plate", "item.basemetals.platinum_powder": "Laiton en platine", - "item.basemetals.platinum_powder_dirty": "Platinum Powder Dirty", "item.basemetals.platinum_pressure_plate": "Platinum Pressure Plate", "item.basemetals.platinum_raw": "Platinum brut", "item.basemetals.platinum_rod": "Barre en platine", "item.basemetals.platinum_scythe": "Platinum Scythe", - "item.basemetals.platinum_shard": "Platinum Shard", "item.basemetals.platinum_shears": "Platinum Shears", "item.basemetals.platinum_shield": "Platinum Shield", "item.basemetals.platinum_shovel": "Pelle en platine", @@ -1388,12 +1359,10 @@ "item.basemetals.starsteel_button": "Starsteel Button", "item.basemetals.starsteel_casing": "Starsteel Casing", "item.basemetals.starsteel_chestplate": "Plastron en acier-étoile", - "item.basemetals.starsteel_clump": "Starsteel Clump", "item.basemetals.starsteel_crackhammer": "Massette en acier-étoile", "item.basemetals.starsteel_crossbow": "Starsteel Crossbow", "item.basemetals.starsteel_crushed": "Starsteel Crushed", "item.basemetals.starsteel_crushed_purified": "Starsteel Crushed Purified", - "item.basemetals.starsteel_crystal": "Starsteel Crystal", "item.basemetals.starsteel_dense_plate": "Starsteel Dense Plate", "item.basemetals.starsteel_door": "Porte en acier-étoile", "item.basemetals.starsteel_fishing_rod": "Starsteel Fishing Rod", @@ -1409,12 +1378,10 @@ "item.basemetals.starsteel_pickaxe": "Pioche en acier-étoile", "item.basemetals.starsteel_plate": "Starsteel Plate", "item.basemetals.starsteel_powder": "Acier-étoile en poudre", - "item.basemetals.starsteel_powder_dirty": "Starsteel Powder Dirty", "item.basemetals.starsteel_pressure_plate": "Starsteel Pressure Plate", "item.basemetals.starsteel_raw": "Starsteel brut", "item.basemetals.starsteel_rod": "Barre en acier-étoile", "item.basemetals.starsteel_scythe": "Starsteel Scythe", - "item.basemetals.starsteel_shard": "Starsteel Shard", "item.basemetals.starsteel_shears": "Starsteel Shears", "item.basemetals.starsteel_shield": "Starsteel Shield", "item.basemetals.starsteel_shovel": "Pelle en acier-étoile", @@ -1465,9 +1432,7 @@ "item.basemetals.steel_sword": "Épée en acier", "item.basemetals.steel_trapdoor": "Trappe en acier", "item.basemetals.steel_wall": "Steel Wall", - "item.basemetals.stone": "Stone", "item.basemetals.stone_anvil": "Stone Anvil", - "item.basemetals.stone_bucket": "Seau de pierre fondue", "item.basemetals.stone_crackhammer": "Massette ene pierre", "item.basemetals.stone_gear": "Stone Gear", "item.basemetals.stone_rod": "Stone Rod", @@ -1512,8 +1477,6 @@ "item.basemetals.tin_sword": "Épée en étain", "item.basemetals.tin_trapdoor": "Trappe en étain", "item.basemetals.tin_wall": "Tin Wall", - "item.basemetals.wood": "Wood", - "item.basemetals.wood_bucket": "Seau de bois liquéfié", "item.basemetals.wood_crackhammer": "Massette en bois", "item.basemetals.wood_gear": "Wood Gear", "item.basemetals.wood_scythe": "Wood Scythe", @@ -1529,12 +1492,10 @@ "item.basemetals.zinc_button": "Zinc Button", "item.basemetals.zinc_casing": "Zinc Casing", "item.basemetals.zinc_chestplate": "Zinc Chestplate", - "item.basemetals.zinc_clump": "Zinc Clump", "item.basemetals.zinc_crackhammer": "Zinc Crackhammer", "item.basemetals.zinc_crossbow": "Zinc Crossbow", "item.basemetals.zinc_crushed": "Zinc Crushed", "item.basemetals.zinc_crushed_purified": "Zinc Crushed Purified", - "item.basemetals.zinc_crystal": "Zinc Crystal", "item.basemetals.zinc_dense_plate": "Zinc Dense Plate", "item.basemetals.zinc_door": "Zinc Door", "item.basemetals.zinc_fishing_rod": "Zinc Fishing Rod", @@ -1550,12 +1511,10 @@ "item.basemetals.zinc_pickaxe": "Zinc Pickaxe", "item.basemetals.zinc_plate": "Zinc Plate", "item.basemetals.zinc_powder": "Zinc en poudre", - "item.basemetals.zinc_powder_dirty": "Zinc Powder Dirty", "item.basemetals.zinc_pressure_plate": "Zinc Pressure Plate", "item.basemetals.zinc_raw": "Zinc brut", "item.basemetals.zinc_rod": "Barre de zinc", "item.basemetals.zinc_scythe": "Zinc Scythe", - "item.basemetals.zinc_shard": "Zinc Shard", "item.basemetals.zinc_shears": "Zinc Shears", "item.basemetals.zinc_shield": "Zinc Shield", "item.basemetals.zinc_shovel": "Zinc Shovel", @@ -1583,7 +1542,6 @@ "item.bucket.gold": "Seau d’or fondu", "item.bucket.invar": "Seau d’invar fondu", "item.bucket.iron": "Seau de fer fondu", - "item.bucket.lapis": "Seau de lapis-lazuli fondu", "item.bucket.lead": "Seau de plomb fondu", "item.bucket.mercury": "Seau de mercure", "item.bucket.mithril": "Seau de mithril fondu", @@ -1597,13 +1555,12 @@ "item.bucket.silver": "Seau d’argent fondu", "item.bucket.starsteel": "Seau d’acier stellaire fondu", "item.bucket.steel": "Seau d’acier fondu", - "item.bucket.stone": "Seau de pierre fondue", "item.bucket.tin": "Seau d’étain fondu", - "item.bucket.wood": "Seau de bois liquéfié", "item.bucket.zinc": "Seau de zinc fondu", "itemGroup.basemetals.blocks": "Base Metals Blocks", "itemGroup.basemetals.combat": "Base Metals Combat", "itemGroup.basemetals.items": "Base Metals Items", + "itemGroup.basemetals.materials": "Base Metals Materials", "itemGroup.basemetals.tools": "Base Metals Tools", "material.basemetals.adamantine": "Adamantine", "material.basemetals.antimony": "Antimony", diff --git a/src/generated/resources/assets/basemetals/lang/it_it.json b/src/generated/resources/assets/basemetals/lang/it_it.json index 67d14e736..ee8257590 100644 --- a/src/generated/resources/assets/basemetals/lang/it_it.json +++ b/src/generated/resources/assets/basemetals/lang/it_it.json @@ -41,6 +41,7 @@ "block.basemetals.adamantine_block": "Adamantio Cubo", "block.basemetals.adamantine_button": "Adamantine Button", "block.basemetals.adamantine_door": "Adamantio Porta", + "block.basemetals.adamantine_double_slab": "Adamantine Double Slab", "block.basemetals.adamantine_lever": "Adamantine Lever", "block.basemetals.adamantine_ore": "Adamantio Minerale", "block.basemetals.adamantine_plate": "Lastra di Adamantio", @@ -54,6 +55,7 @@ "block.basemetals.antimony_block": "Antimony Block", "block.basemetals.antimony_button": "Antimony Button", "block.basemetals.antimony_door": "Antimony Door", + "block.basemetals.antimony_double_slab": "Antimony Double Slab", "block.basemetals.antimony_lever": "Antimony Lever", "block.basemetals.antimony_ore": "Antimony Ore", "block.basemetals.antimony_plate": "Antimony Plate", @@ -67,6 +69,7 @@ "block.basemetals.aquarium_block": "Cubo Pesce-Acciaio", "block.basemetals.aquarium_button": "Aquarium Button", "block.basemetals.aquarium_door": "Porta Pesce-Acciaio", + "block.basemetals.aquarium_double_slab": "Aquarium Double Slab", "block.basemetals.aquarium_lever": "Aquarium Lever", "block.basemetals.aquarium_plate": "Lastra di Pesce-Acciaio", "block.basemetals.aquarium_pressure_plate": "Aquarium Pressure Plate", @@ -79,6 +82,7 @@ "block.basemetals.bismuth_block": "Bismuth Block", "block.basemetals.bismuth_button": "Bismuth Button", "block.basemetals.bismuth_door": "Bismuth Door", + "block.basemetals.bismuth_double_slab": "Bismuth Double Slab", "block.basemetals.bismuth_lever": "Bismuth Lever", "block.basemetals.bismuth_ore": "Bismuth Ore", "block.basemetals.bismuth_plate": "Bismuth Plate", @@ -92,6 +96,7 @@ "block.basemetals.brass_block": "Ottone Cubo", "block.basemetals.brass_button": "Brass Button", "block.basemetals.brass_door": "Ottone Porta", + "block.basemetals.brass_double_slab": "Brass Double Slab", "block.basemetals.brass_lever": "Brass Lever", "block.basemetals.brass_plate": "Lastra d'Ottone", "block.basemetals.brass_pressure_plate": "Brass Pressure Plate", @@ -104,6 +109,7 @@ "block.basemetals.bronze_block": "Bronzo Cubo", "block.basemetals.bronze_button": "Bronze Button", "block.basemetals.bronze_door": "Bronzo Porta", + "block.basemetals.bronze_double_slab": "Bronze Double Slab", "block.basemetals.bronze_lever": "Bronze Lever", "block.basemetals.bronze_plate": "Lastra di Bronzo", "block.basemetals.bronze_pressure_plate": "Bronze Pressure Plate", @@ -119,6 +125,7 @@ "block.basemetals.coldiron_block": "Ferro-Freddo Cubo", "block.basemetals.coldiron_button": "Cold Iron Button", "block.basemetals.coldiron_door": "Ferro-Freddo Porta", + "block.basemetals.coldiron_double_slab": "Cold Iron Double Slab", "block.basemetals.coldiron_lever": "Cold Iron Lever", "block.basemetals.coldiron_ore": "Ferro-Freddo Minerale", "block.basemetals.coldiron_plate": "Lastra di Ferro-Freddo", @@ -132,6 +139,7 @@ "block.basemetals.copper_block": "Rame Cubo", "block.basemetals.copper_button": "Copper Button", "block.basemetals.copper_door": "Rame Porta", + "block.basemetals.copper_double_slab": "Copper Double Slab", "block.basemetals.copper_lever": "Copper Lever", "block.basemetals.copper_ore": "Rame Minerale", "block.basemetals.copper_plate": "Lastra di Rame", @@ -145,6 +153,7 @@ "block.basemetals.cupronickel_block": "Cupronickel Block", "block.basemetals.cupronickel_button": "Cupronickel Button", "block.basemetals.cupronickel_door": "Cupronickel Door", + "block.basemetals.cupronickel_double_slab": "Cupronickel Double Slab", "block.basemetals.cupronickel_lever": "Cupronickel Lever", "block.basemetals.cupronickel_plate": "Cupronickel Plate", "block.basemetals.cupronickel_pressure_plate": "Cupronickel Pressure Plate", @@ -156,43 +165,19 @@ "block.basemetals.diamond_bars": "Diamond Bars", "block.basemetals.diamond_button": "Diamond Button", "block.basemetals.diamond_door": "Diamond Door", + "block.basemetals.diamond_double_slab": "Diamond Double Slab", "block.basemetals.diamond_lever": "Diamond Lever", "block.basemetals.diamond_pressure_plate": "Diamond Pressure Plate", "block.basemetals.diamond_slab": "Diamond Slab", "block.basemetals.diamond_stairs": "Diamond Stairs", "block.basemetals.diamond_trapdoor": "Diamond Trapdoor", "block.basemetals.diamond_wall": "Diamond Wall", - "block.basemetals.double_adamantine_slab": "Double Adamantine Slab", - "block.basemetals.double_antimony_slab": "Double Antimony Slab", - "block.basemetals.double_aquarium_slab": "Double Aquarium Slab", - "block.basemetals.double_bismuth_slab": "Double Bismuth Slab", - "block.basemetals.double_brass_slab": "Double Brass Slab", - "block.basemetals.double_bronze_slab": "Double Bronze Slab", - "block.basemetals.double_coldiron_slab": "Double Cold Iron Slab", - "block.basemetals.double_copper_slab": "Double Copper Slab", - "block.basemetals.double_cupronickel_slab": "Double Cupronickel Slab", - "block.basemetals.double_diamond_slab": "Double Diamond Slab", - "block.basemetals.double_electrum_slab": "Double Electrum Slab", - "block.basemetals.double_emerald_slab": "Double Emerald Slab", - "block.basemetals.double_gold_slab": "Double Gold Slab", - "block.basemetals.double_invar_slab": "Double Invar Slab", - "block.basemetals.double_iron_slab": "Double Iron Slab", - "block.basemetals.double_lead_slab": "Double Lead Slab", - "block.basemetals.double_mithril_slab": "Double Mithril Slab", - "block.basemetals.double_nickel_slab": "Double Nickel Slab", - "block.basemetals.double_obsidian_slab": "Double Obsidian Slab", - "block.basemetals.double_pewter_slab": "Double Pewter Slab", - "block.basemetals.double_platinum_slab": "Double Platinum Slab", - "block.basemetals.double_silver_slab": "Double Silver Slab", - "block.basemetals.double_starsteel_slab": "Double Starsteel Slab", - "block.basemetals.double_steel_slab": "Double Steel Slab", - "block.basemetals.double_tin_slab": "Double Tin Slab", - "block.basemetals.double_zinc_slab": "Double Zinc Slab", "block.basemetals.electrum": "Molten Electrum", "block.basemetals.electrum_bars": "Lega di Rame Barra", "block.basemetals.electrum_block": "Lega di Rame Cubo", "block.basemetals.electrum_button": "Electrum Button", "block.basemetals.electrum_door": "Lega di Rame Porta", + "block.basemetals.electrum_double_slab": "Electrum Double Slab", "block.basemetals.electrum_lever": "Electrum Lever", "block.basemetals.electrum_plate": "Lastra di Lega di Rame", "block.basemetals.electrum_pressure_plate": "Electrum Pressure Plate", @@ -204,6 +189,7 @@ "block.basemetals.emerald_bars": "Emerald Bars", "block.basemetals.emerald_button": "Emerald Button", "block.basemetals.emerald_door": "Emerald Door", + "block.basemetals.emerald_double_slab": "Emerald Double Slab", "block.basemetals.emerald_lever": "Emerald Lever", "block.basemetals.emerald_pressure_plate": "Emerald Pressure Plate", "block.basemetals.emerald_slab": "Emerald Slab", @@ -215,6 +201,7 @@ "block.basemetals.gold_bars": "Gold Bars", "block.basemetals.gold_button": "Gold Button", "block.basemetals.gold_door": "Gold Door", + "block.basemetals.gold_double_slab": "Gold Double Slab", "block.basemetals.gold_lever": "Gold Lever", "block.basemetals.gold_plate": "Lastra d'Oro", "block.basemetals.gold_slab": "Gold Slab", @@ -227,6 +214,7 @@ "block.basemetals.invar_block": "Invar Cubo", "block.basemetals.invar_button": "Invar Button", "block.basemetals.invar_door": "Invar Porta", + "block.basemetals.invar_double_slab": "Invar Double Slab", "block.basemetals.invar_lever": "Invar Lever", "block.basemetals.invar_plate": "Lastra di Invar", "block.basemetals.invar_pressure_plate": "Invar Pressure Plate", @@ -236,17 +224,18 @@ "block.basemetals.invar_wall": "Invar Wall", "block.basemetals.iron": "Molten Iron", "block.basemetals.iron_button": "Iron Button", + "block.basemetals.iron_double_slab": "Iron Double Slab", "block.basemetals.iron_lever": "Iron Lever", "block.basemetals.iron_plate": "Lastra di Ferro", "block.basemetals.iron_slab": "Iron Slab", "block.basemetals.iron_stairs": "Iron Stairs", "block.basemetals.iron_wall": "Iron Wall", - "block.basemetals.lapis": "Molten Lapis", "block.basemetals.lead": "Molten Lead", "block.basemetals.lead_bars": "Piombo Barra", "block.basemetals.lead_block": "Piombo Cubo", "block.basemetals.lead_button": "Lead Button", "block.basemetals.lead_door": "Piombo Porta", + "block.basemetals.lead_double_slab": "Lead Double Slab", "block.basemetals.lead_lever": "Lead Lever", "block.basemetals.lead_ore": "Piombo Minerale", "block.basemetals.lead_plate": "Lastra di Piombo", @@ -262,6 +251,7 @@ "block.basemetals.mithril_block": "Mithril Cubo", "block.basemetals.mithril_button": "Mithril Button", "block.basemetals.mithril_door": "Mithril Porta", + "block.basemetals.mithril_double_slab": "Mithril Double Slab", "block.basemetals.mithril_lever": "Mithril Lever", "block.basemetals.mithril_plate": "Lastra di Mithril", "block.basemetals.mithril_pressure_plate": "Mithril Pressure Plate", @@ -274,6 +264,7 @@ "block.basemetals.nickel_block": "Nichel Cubo", "block.basemetals.nickel_button": "Nickel Button", "block.basemetals.nickel_door": "Nichel Porta", + "block.basemetals.nickel_double_slab": "Nickel Double Slab", "block.basemetals.nickel_lever": "Nickel Lever", "block.basemetals.nickel_ore": "Nichel Minerale", "block.basemetals.nickel_plate": "Lastra di Nichel", @@ -286,6 +277,7 @@ "block.basemetals.obsidian_bars": "Obsidian Bars", "block.basemetals.obsidian_button": "Obsidian Button", "block.basemetals.obsidian_door": "Obsidian Door", + "block.basemetals.obsidian_double_slab": "Obsidian Double Slab", "block.basemetals.obsidian_lever": "Obsidian Lever", "block.basemetals.obsidian_pressure_plate": "Obsidian Pressure Plate", "block.basemetals.obsidian_slab": "Obsidian Slab", @@ -297,6 +289,7 @@ "block.basemetals.pewter_block": "Pewter Block", "block.basemetals.pewter_button": "Pewter Button", "block.basemetals.pewter_door": "Pewter Door", + "block.basemetals.pewter_double_slab": "Pewter Double Slab", "block.basemetals.pewter_lever": "Pewter Lever", "block.basemetals.pewter_plate": "Pewter Plate", "block.basemetals.pewter_pressure_plate": "Pewter Pressure Plate", @@ -309,6 +302,7 @@ "block.basemetals.platinum_block": "Platinum Block", "block.basemetals.platinum_button": "Platinum Button", "block.basemetals.platinum_door": "Platinum Door", + "block.basemetals.platinum_double_slab": "Platinum Double Slab", "block.basemetals.platinum_lever": "Platinum Lever", "block.basemetals.platinum_ore": "Platinum Ore", "block.basemetals.platinum_plate": "Platinum Plate", @@ -332,6 +326,7 @@ "block.basemetals.silver_block": "Argento Cubo", "block.basemetals.silver_button": "Silver Button", "block.basemetals.silver_door": "Argento Porta", + "block.basemetals.silver_double_slab": "Silver Double Slab", "block.basemetals.silver_lever": "Silver Lever", "block.basemetals.silver_ore": "Argento Minerale", "block.basemetals.silver_plate": "Lastra di Argento", @@ -345,6 +340,7 @@ "block.basemetals.starsteel_block": "Ferro-Stelle Cubo", "block.basemetals.starsteel_button": "Starsteel Button", "block.basemetals.starsteel_door": "Ferro-Stelle Porta", + "block.basemetals.starsteel_double_slab": "Starsteel Double Slab", "block.basemetals.starsteel_lever": "Starsteel Lever", "block.basemetals.starsteel_ore": "Ferro-Stelle Minerale", "block.basemetals.starsteel_plate": "Lastra di Ferro-Stelle", @@ -359,6 +355,7 @@ "block.basemetals.steel_block": "Acciaio Cubo", "block.basemetals.steel_button": "Steel Button", "block.basemetals.steel_door": "Acciaio Porta", + "block.basemetals.steel_double_slab": "Steel Double Slab", "block.basemetals.steel_lever": "Steel Lever", "block.basemetals.steel_plate": "Lastra di Acciaio", "block.basemetals.steel_pressure_plate": "Steel Pressure Plate", @@ -366,13 +363,13 @@ "block.basemetals.steel_stairs": "Steel Stairs", "block.basemetals.steel_trapdoor": "Acciaio Fuori Porta", "block.basemetals.steel_wall": "Steel Wall", - "block.basemetals.stone": "Molten Stone", "block.basemetals.stone_anvil": "Stone Anvil", "block.basemetals.tin": "Molten Tin", "block.basemetals.tin_bars": "Latta Barra", "block.basemetals.tin_block": "Latta Cubo", "block.basemetals.tin_button": "Tin Button", "block.basemetals.tin_door": "Latta Porta", + "block.basemetals.tin_double_slab": "Tin Double Slab", "block.basemetals.tin_lever": "Tin Lever", "block.basemetals.tin_ore": "Latta Minerale", "block.basemetals.tin_plate": "Lastra di Latta", @@ -381,12 +378,12 @@ "block.basemetals.tin_stairs": "Tin Stairs", "block.basemetals.tin_trapdoor": "Latta Fuori Porta", "block.basemetals.tin_wall": "Tin Wall", - "block.basemetals.wood": "Molten Wood", "block.basemetals.zinc": "Molten Zinc", "block.basemetals.zinc_bars": "Zinc Bars", "block.basemetals.zinc_block": "Zinco Cubo", "block.basemetals.zinc_button": "Zinc Button", "block.basemetals.zinc_door": "Zinc Door", + "block.basemetals.zinc_double_slab": "Zinc Double Slab", "block.basemetals.zinc_lever": "Zinc Lever", "block.basemetals.zinc_ore": "Zinco Minerale", "block.basemetals.zinc_plate": "Lastra di Zinco", @@ -448,12 +445,10 @@ "item.basemetals.adamantine_button": "Adamantine Button", "item.basemetals.adamantine_casing": "Adamantine Casing", "item.basemetals.adamantine_chestplate": "Adamantio Corazza", - "item.basemetals.adamantine_clump": "Adamantine Clump", "item.basemetals.adamantine_crackhammer": "Adamantio Mazza", "item.basemetals.adamantine_crossbow": "Adamantine Crossbow", "item.basemetals.adamantine_crushed": "Adamantine Crushed", "item.basemetals.adamantine_crushed_purified": "Adamantine Crushed Purified", - "item.basemetals.adamantine_crystal": "Adamantine Crystal", "item.basemetals.adamantine_dense_plate": "Adamantine Dense Plate", "item.basemetals.adamantine_door": "Adamantio Porta", "item.basemetals.adamantine_fishing_rod": "Adamantine Fishing Rod", @@ -469,12 +464,10 @@ "item.basemetals.adamantine_pickaxe": "Adamantio Piccone", "item.basemetals.adamantine_plate": "Adamantine Plate", "item.basemetals.adamantine_powder": "Polvere Adamantio", - "item.basemetals.adamantine_powder_dirty": "Adamantine Powder Dirty", "item.basemetals.adamantine_pressure_plate": "Adamantine Pressure Plate", "item.basemetals.adamantine_raw": "Adamantine grezzo", "item.basemetals.adamantine_rod": "Adamantio Asta", "item.basemetals.adamantine_scythe": "Adamantine Scythe", - "item.basemetals.adamantine_shard": "Adamantine Shard", "item.basemetals.adamantine_shears": "Adamantine Shears", "item.basemetals.adamantine_shield": "Adamantine Shield", "item.basemetals.adamantine_shovel": "Adamantio Pala", @@ -496,12 +489,10 @@ "item.basemetals.antimony_button": "Antimony Button", "item.basemetals.antimony_casing": "Antimony Casing", "item.basemetals.antimony_chestplate": "Antimony Chestplate", - "item.basemetals.antimony_clump": "Antimony Clump", "item.basemetals.antimony_crackhammer": "Antimony Crackhammer", "item.basemetals.antimony_crossbow": "Antimony Crossbow", "item.basemetals.antimony_crushed": "Antimony Crushed", "item.basemetals.antimony_crushed_purified": "Antimony Crushed Purified", - "item.basemetals.antimony_crystal": "Antimony Crystal", "item.basemetals.antimony_dense_plate": "Antimony Dense Plate", "item.basemetals.antimony_door": "Antimony Door", "item.basemetals.antimony_fishing_rod": "Antimony Fishing Rod", @@ -517,12 +508,10 @@ "item.basemetals.antimony_pickaxe": "Antimony Pickaxe", "item.basemetals.antimony_plate": "Antimony Plate", "item.basemetals.antimony_powder": "Antimony Powder", - "item.basemetals.antimony_powder_dirty": "Antimony Powder Dirty", "item.basemetals.antimony_pressure_plate": "Antimony Pressure Plate", "item.basemetals.antimony_raw": "Antimony grezzo", "item.basemetals.antimony_rod": "Antimony Rod", "item.basemetals.antimony_scythe": "Antimony Scythe", - "item.basemetals.antimony_shard": "Antimony Shard", "item.basemetals.antimony_shears": "Antimony Shears", "item.basemetals.antimony_shield": "Antimony Shield", "item.basemetals.antimony_shovel": "Antimony Shovel", @@ -585,12 +574,10 @@ "item.basemetals.bismuth_button": "Bismuth Button", "item.basemetals.bismuth_casing": "Bismuth Casing", "item.basemetals.bismuth_chestplate": "Bismuth Chestplate", - "item.basemetals.bismuth_clump": "Bismuth Clump", "item.basemetals.bismuth_crackhammer": "Bismuth Crackhammer", "item.basemetals.bismuth_crossbow": "Bismuth Crossbow", "item.basemetals.bismuth_crushed": "Bismuth Crushed", "item.basemetals.bismuth_crushed_purified": "Bismuth Crushed Purified", - "item.basemetals.bismuth_crystal": "Bismuth Crystal", "item.basemetals.bismuth_dense_plate": "Bismuth Dense Plate", "item.basemetals.bismuth_door": "Bismuth Door", "item.basemetals.bismuth_fishing_rod": "Bismuth Fishing Rod", @@ -606,12 +593,10 @@ "item.basemetals.bismuth_pickaxe": "Bismuth Pickaxe", "item.basemetals.bismuth_plate": "Bismuth Plate", "item.basemetals.bismuth_powder": "Bismuth Powder", - "item.basemetals.bismuth_powder_dirty": "Bismuth Powder Dirty", "item.basemetals.bismuth_pressure_plate": "Bismuth Pressure Plate", "item.basemetals.bismuth_raw": "Bismuth grezzo", "item.basemetals.bismuth_rod": "Bismuth Rod", "item.basemetals.bismuth_scythe": "Bismuth Scythe", - "item.basemetals.bismuth_shard": "Bismuth Shard", "item.basemetals.bismuth_shears": "Bismuth Shears", "item.basemetals.bismuth_shield": "Bismuth Shield", "item.basemetals.bismuth_shovel": "Bismuth Shovel", @@ -725,12 +710,10 @@ "item.basemetals.coldiron_button": "Cold Iron Button", "item.basemetals.coldiron_casing": "Cold Iron Casing", "item.basemetals.coldiron_chestplate": "Ferro-Freddo Corazza", - "item.basemetals.coldiron_clump": "Cold Iron Clump", "item.basemetals.coldiron_crackhammer": "Ferro-Freddo Mazza", "item.basemetals.coldiron_crossbow": "Cold Iron Crossbow", "item.basemetals.coldiron_crushed": "Cold Iron Crushed", "item.basemetals.coldiron_crushed_purified": "Cold Iron Crushed Purified", - "item.basemetals.coldiron_crystal": "Cold Iron Crystal", "item.basemetals.coldiron_dense_plate": "Cold Iron Dense Plate", "item.basemetals.coldiron_door": "Ferro-Freddo Porta", "item.basemetals.coldiron_fishing_rod": "Cold Iron Fishing Rod", @@ -746,12 +729,10 @@ "item.basemetals.coldiron_pickaxe": "Ferro-Freddo Piccone", "item.basemetals.coldiron_plate": "Cold Iron Plate", "item.basemetals.coldiron_powder": "Polvere Ferro-Freddo", - "item.basemetals.coldiron_powder_dirty": "Cold Iron Powder Dirty", "item.basemetals.coldiron_pressure_plate": "Cold Iron Pressure Plate", "item.basemetals.coldiron_raw": "Cold Iron grezzo", "item.basemetals.coldiron_rod": "Ferro-Freddo Asta", "item.basemetals.coldiron_scythe": "Cold Iron Scythe", - "item.basemetals.coldiron_shard": "Cold Iron Shard", "item.basemetals.coldiron_shears": "Cold Iron Shears", "item.basemetals.coldiron_shield": "Cold Iron Shield", "item.basemetals.coldiron_shovel": "Ferro-Freddo Pala", @@ -1052,8 +1033,6 @@ "item.basemetals.iron_smallpowder": "Iron Smallpowder", "item.basemetals.iron_stairs": "Iron Stairs", "item.basemetals.iron_wall": "Iron Wall", - "item.basemetals.lapis": "Lapis", - "item.basemetals.lapis_bucket": "Secchio di lapislazzuli fuso", "item.basemetals.lapis_smallpowder": "Lapis Smallpowder", "item.basemetals.lead": "Lead", "item.basemetals.lead_arrow": "Lead Arrow", @@ -1155,12 +1134,10 @@ "item.basemetals.nickel_button": "Nickel Button", "item.basemetals.nickel_casing": "Nickel Casing", "item.basemetals.nickel_chestplate": "Nichel Corazza", - "item.basemetals.nickel_clump": "Nickel Clump", "item.basemetals.nickel_crackhammer": "Nichel Mazza", "item.basemetals.nickel_crossbow": "Nickel Crossbow", "item.basemetals.nickel_crushed": "Nickel Crushed", "item.basemetals.nickel_crushed_purified": "Nickel Crushed Purified", - "item.basemetals.nickel_crystal": "Nickel Crystal", "item.basemetals.nickel_dense_plate": "Nickel Dense Plate", "item.basemetals.nickel_door": "Nichel Porta", "item.basemetals.nickel_fishing_rod": "Nickel Fishing Rod", @@ -1176,12 +1153,10 @@ "item.basemetals.nickel_pickaxe": "Nichel Piccone", "item.basemetals.nickel_plate": "Nickel Plate", "item.basemetals.nickel_powder": "Polvere Nichel", - "item.basemetals.nickel_powder_dirty": "Nickel Powder Dirty", "item.basemetals.nickel_pressure_plate": "Nickel Pressure Plate", "item.basemetals.nickel_raw": "Nickel grezzo", "item.basemetals.nickel_rod": "Nichel Asta", "item.basemetals.nickel_scythe": "Nickel Scythe", - "item.basemetals.nickel_shard": "Nickel Shard", "item.basemetals.nickel_shears": "Nickel Shears", "item.basemetals.nickel_shield": "Nickel Shield", "item.basemetals.nickel_shovel": "Nichel Pala", @@ -1279,12 +1254,10 @@ "item.basemetals.platinum_button": "Platinum Button", "item.basemetals.platinum_casing": "Platinum Casing", "item.basemetals.platinum_chestplate": "Platino Corazza", - "item.basemetals.platinum_clump": "Platinum Clump", "item.basemetals.platinum_crackhammer": "Platino Mazza", "item.basemetals.platinum_crossbow": "Platinum Crossbow", "item.basemetals.platinum_crushed": "Platinum Crushed", "item.basemetals.platinum_crushed_purified": "Platinum Crushed Purified", - "item.basemetals.platinum_crystal": "Platinum Crystal", "item.basemetals.platinum_dense_plate": "Platinum Dense Plate", "item.basemetals.platinum_door": "Platino Porta", "item.basemetals.platinum_fishing_rod": "Platinum Fishing Rod", @@ -1300,12 +1273,10 @@ "item.basemetals.platinum_pickaxe": "Platino Piccone", "item.basemetals.platinum_plate": "Platinum Plate", "item.basemetals.platinum_powder": "Polvere Platino", - "item.basemetals.platinum_powder_dirty": "Platinum Powder Dirty", "item.basemetals.platinum_pressure_plate": "Platinum Pressure Plate", "item.basemetals.platinum_raw": "Platinum grezzo", "item.basemetals.platinum_rod": "Platino Asta", "item.basemetals.platinum_scythe": "Platinum Scythe", - "item.basemetals.platinum_shard": "Platinum Shard", "item.basemetals.platinum_shears": "Platinum Shears", "item.basemetals.platinum_shield": "Platinum Shield", "item.basemetals.platinum_shovel": "Platino Pala", @@ -1406,12 +1377,10 @@ "item.basemetals.starsteel_button": "Starsteel Button", "item.basemetals.starsteel_casing": "Starsteel Casing", "item.basemetals.starsteel_chestplate": "Ferro-Stelle Corazza", - "item.basemetals.starsteel_clump": "Starsteel Clump", "item.basemetals.starsteel_crackhammer": "Ferro-Stelle Mazza", "item.basemetals.starsteel_crossbow": "Starsteel Crossbow", "item.basemetals.starsteel_crushed": "Starsteel Crushed", "item.basemetals.starsteel_crushed_purified": "Starsteel Crushed Purified", - "item.basemetals.starsteel_crystal": "Starsteel Crystal", "item.basemetals.starsteel_dense_plate": "Starsteel Dense Plate", "item.basemetals.starsteel_door": "Ferro-Stelle Porta", "item.basemetals.starsteel_fishing_rod": "Starsteel Fishing Rod", @@ -1427,12 +1396,10 @@ "item.basemetals.starsteel_pickaxe": "Ferro-Stelle Piccone", "item.basemetals.starsteel_plate": "Starsteel Plate", "item.basemetals.starsteel_powder": "Polvere Ferro-Stelle", - "item.basemetals.starsteel_powder_dirty": "Starsteel Powder Dirty", "item.basemetals.starsteel_pressure_plate": "Starsteel Pressure Plate", "item.basemetals.starsteel_raw": "Starsteel grezzo", "item.basemetals.starsteel_rod": "Ferro-Stelle Asta", "item.basemetals.starsteel_scythe": "Starsteel Scythe", - "item.basemetals.starsteel_shard": "Starsteel Shard", "item.basemetals.starsteel_shears": "Starsteel Shears", "item.basemetals.starsteel_shield": "Starsteel Shield", "item.basemetals.starsteel_shovel": "Ferro-Stelle Pala", @@ -1483,9 +1450,7 @@ "item.basemetals.steel_sword": "Acciaio Spada", "item.basemetals.steel_trapdoor": "Acciaio Fuori Porta", "item.basemetals.steel_wall": "Steel Wall", - "item.basemetals.stone": "Stone", "item.basemetals.stone_anvil": "Stone Anvil", - "item.basemetals.stone_bucket": "Secchio di pietra fusa", "item.basemetals.stone_crackhammer": "Mazza Stone", "item.basemetals.stone_gear": "Stone Gear", "item.basemetals.stone_rod": "Stone Rod", @@ -1530,8 +1495,6 @@ "item.basemetals.tin_sword": "Latta Spada", "item.basemetals.tin_trapdoor": "Latta Fuori Porta", "item.basemetals.tin_wall": "Tin Wall", - "item.basemetals.wood": "Wood", - "item.basemetals.wood_bucket": "Secchio di legno liquefatto", "item.basemetals.wood_crackhammer": "Mazza di Legno", "item.basemetals.wood_gear": "Wood Gear", "item.basemetals.wood_scythe": "Wood Scythe", @@ -1547,12 +1510,10 @@ "item.basemetals.zinc_button": "Zinc Button", "item.basemetals.zinc_casing": "Zinc Casing", "item.basemetals.zinc_chestplate": "Zinc Chestplate", - "item.basemetals.zinc_clump": "Zinc Clump", "item.basemetals.zinc_crackhammer": "Zinc Crackhammer", "item.basemetals.zinc_crossbow": "Zinc Crossbow", "item.basemetals.zinc_crushed": "Zinc Crushed", "item.basemetals.zinc_crushed_purified": "Zinc Crushed Purified", - "item.basemetals.zinc_crystal": "Zinc Crystal", "item.basemetals.zinc_dense_plate": "Zinc Dense Plate", "item.basemetals.zinc_door": "Zinc Door", "item.basemetals.zinc_fishing_rod": "Zinc Fishing Rod", @@ -1568,12 +1529,10 @@ "item.basemetals.zinc_pickaxe": "Zinc Pickaxe", "item.basemetals.zinc_plate": "Zinc Plate", "item.basemetals.zinc_powder": "Polvere Zinco", - "item.basemetals.zinc_powder_dirty": "Zinc Powder Dirty", "item.basemetals.zinc_pressure_plate": "Zinc Pressure Plate", "item.basemetals.zinc_raw": "Zinc grezzo", "item.basemetals.zinc_rod": "Zinco Asta", "item.basemetals.zinc_scythe": "Zinc Scythe", - "item.basemetals.zinc_shard": "Zinc Shard", "item.basemetals.zinc_shears": "Zinc Shears", "item.basemetals.zinc_shield": "Zinc Shield", "item.basemetals.zinc_shovel": "Zinc Shovel", @@ -1601,7 +1560,6 @@ "item.bucket.gold": "Secchio di oro fuso", "item.bucket.invar": "Secchio di invar fuso", "item.bucket.iron": "Secchio di ferro fuso", - "item.bucket.lapis": "Secchio di lapislazzuli fuso", "item.bucket.lead": "Secchio di piombo fuso", "item.bucket.mercury": "Secchio di mercurio", "item.bucket.mithril": "Secchio di mithril fuso", @@ -1615,13 +1573,12 @@ "item.bucket.silver": "Secchio di argento fuso", "item.bucket.starsteel": "Secchio di acciaio stellare fuso", "item.bucket.steel": "Secchio di acciaio fuso", - "item.bucket.stone": "Secchio di pietra fusa", "item.bucket.tin": "Secchio di stagno fuso", - "item.bucket.wood": "Secchio di legno liquefatto", "item.bucket.zinc": "Secchio di zinco fuso", "itemGroup.basemetals.blocks": "Base Metals Blocks", "itemGroup.basemetals.combat": "Base Metals Combat", "itemGroup.basemetals.items": "Base Metals Items", + "itemGroup.basemetals.materials": "Base Metals Materials", "itemGroup.basemetals.tools": "Base Metals Tools", "language_support_goals": "english (en_US,en_EN,en_CA,en_GB, en_AU, en_PT), italian(IT_it), spanish (es_MX,es_ES), simplified chinese (zh_CN), japanese (ja_JA), portugese (pt_BR), german (de_DE)", "material.basemetals.adamantine": "Adamantine", diff --git a/src/generated/resources/assets/basemetals/lang/ja_jp.json b/src/generated/resources/assets/basemetals/lang/ja_jp.json index 213426c4a..84fc656e6 100644 --- a/src/generated/resources/assets/basemetals/lang/ja_jp.json +++ b/src/generated/resources/assets/basemetals/lang/ja_jp.json @@ -46,6 +46,7 @@ "block.basemetals.adamantine_button": "アダマントのボタン", "block.basemetals.adamantine_dense_plate": "アダマントの高密度プレート", "block.basemetals.adamantine_door": "アダマントのドア", + "block.basemetals.adamantine_double_slab": "Adamantine Double Slab", "block.basemetals.adamantine_lever": "アダマントのレバー", "block.basemetals.adamantine_ore": "アダマント鉱石", "block.basemetals.adamantine_plate": "アダマントのプレート", @@ -60,6 +61,7 @@ "block.basemetals.antimony_button": "アンチモンのボタン", "block.basemetals.antimony_dense_plate": "アンチモンの高密度プレート", "block.basemetals.antimony_door": "アンチモンのドア", + "block.basemetals.antimony_double_slab": "Antimony Double Slab", "block.basemetals.antimony_lever": "アンチモンのレバー", "block.basemetals.antimony_ore": "アンチモン鉱石", "block.basemetals.antimony_plate": "アンチモンのプレート", @@ -74,6 +76,7 @@ "block.basemetals.aquarium_button": "アクアリウムのボタン", "block.basemetals.aquarium_dense_plate": "アクアリウムの高密度プレート", "block.basemetals.aquarium_door": "アクアリウムのドア", + "block.basemetals.aquarium_double_slab": "Aquarium Double Slab", "block.basemetals.aquarium_lever": "アクアリウムのレバー", "block.basemetals.aquarium_ore": "アクアリウム鉱石", "block.basemetals.aquarium_plate": "アクアリウムのプレート", @@ -88,6 +91,7 @@ "block.basemetals.bismuth_button": "ビスマスのボタン", "block.basemetals.bismuth_dense_plate": "ビスマスの高密度プレート", "block.basemetals.bismuth_door": "ビスマスのドア", + "block.basemetals.bismuth_double_slab": "Bismuth Double Slab", "block.basemetals.bismuth_lever": "ビスマスのレバー", "block.basemetals.bismuth_ore": "ビスマス鉱石", "block.basemetals.bismuth_plate": "ビスマスのプレート", @@ -102,6 +106,7 @@ "block.basemetals.brass_button": "黄銅のボタン", "block.basemetals.brass_dense_plate": "黄銅の高密度プレート", "block.basemetals.brass_door": "黄銅のドア", + "block.basemetals.brass_double_slab": "Brass Double Slab", "block.basemetals.brass_lever": "黄銅のレバー", "block.basemetals.brass_plate": "黄銅のプレート", "block.basemetals.brass_pressure_plate": "黄銅の感圧板", @@ -115,6 +120,7 @@ "block.basemetals.bronze_button": "青銅のボタン", "block.basemetals.bronze_dense_plate": "青銅の高密度プレート", "block.basemetals.bronze_door": "青銅のドア", + "block.basemetals.bronze_double_slab": "Bronze Double Slab", "block.basemetals.bronze_lever": "青銅のレバー", "block.basemetals.bronze_plate": "青銅のプレート", "block.basemetals.bronze_pressure_plate": "青銅の感圧板", @@ -131,6 +137,7 @@ "block.basemetals.coldiron_button": "コールドアイアンのボタン", "block.basemetals.coldiron_dense_plate": "コールドアイアンの高密度プレート", "block.basemetals.coldiron_door": "コールドアイアンのドア", + "block.basemetals.coldiron_double_slab": "Cold Iron Double Slab", "block.basemetals.coldiron_lever": "コールドアイアンのレバー", "block.basemetals.coldiron_ore": "コールドアイアン鉱石", "block.basemetals.coldiron_plate": "コールドアイアンのプレート", @@ -145,6 +152,7 @@ "block.basemetals.copper_button": "銅のボタン", "block.basemetals.copper_dense_plate": "銅の高密度プレート", "block.basemetals.copper_door": "銅のドア", + "block.basemetals.copper_double_slab": "Copper Double Slab", "block.basemetals.copper_lever": "銅のレバー", "block.basemetals.copper_ore": "銅鉱石", "block.basemetals.copper_plate": "銅のプレート", @@ -159,6 +167,7 @@ "block.basemetals.cupronickel_button": "白銅のボタン", "block.basemetals.cupronickel_dense_plate": "白銅の高密度プレート", "block.basemetals.cupronickel_door": "白銅のドア", + "block.basemetals.cupronickel_double_slab": "Cupronickel Double Slab", "block.basemetals.cupronickel_lever": "白銅のレバー", "block.basemetals.cupronickel_plate": "白銅のプレート", "block.basemetals.cupronickel_pressure_plate": "白銅の感圧板", @@ -170,44 +179,20 @@ "block.basemetals.diamond_bars": "ダイヤ格子", "block.basemetals.diamond_button": "ダイヤのボタン", "block.basemetals.diamond_door": "ダイヤのドア", + "block.basemetals.diamond_double_slab": "Diamond Double Slab", "block.basemetals.diamond_lever": "ダイヤのレバー", "block.basemetals.diamond_pressure_plate": "ダイヤの感圧板", "block.basemetals.diamond_slab": "ダイヤのハーフブロック", "block.basemetals.diamond_stairs": "ダイヤの階段", "block.basemetals.diamond_trapdoor": "ダイヤのトラップドア", "block.basemetals.diamond_wall": "ダイヤの壁", - "block.basemetals.double_adamantine_slab": "Double Adamantine Slab", - "block.basemetals.double_antimony_slab": "Double Antimony Slab", - "block.basemetals.double_aquarium_slab": "Double Aquarium Slab", - "block.basemetals.double_bismuth_slab": "Double Bismuth Slab", - "block.basemetals.double_brass_slab": "Double Brass Slab", - "block.basemetals.double_bronze_slab": "Double Bronze Slab", - "block.basemetals.double_coldiron_slab": "Double Cold Iron Slab", - "block.basemetals.double_copper_slab": "Double Copper Slab", - "block.basemetals.double_cupronickel_slab": "Double Cupronickel Slab", - "block.basemetals.double_diamond_slab": "Double Diamond Slab", - "block.basemetals.double_electrum_slab": "Double Electrum Slab", - "block.basemetals.double_emerald_slab": "Double Emerald Slab", - "block.basemetals.double_gold_slab": "Double Gold Slab", - "block.basemetals.double_invar_slab": "Double Invar Slab", - "block.basemetals.double_iron_slab": "Double Iron Slab", - "block.basemetals.double_lead_slab": "Double Lead Slab", - "block.basemetals.double_mithril_slab": "Double Mithril Slab", - "block.basemetals.double_nickel_slab": "Double Nickel Slab", - "block.basemetals.double_obsidian_slab": "Double Obsidian Slab", - "block.basemetals.double_pewter_slab": "Double Pewter Slab", - "block.basemetals.double_platinum_slab": "Double Platinum Slab", - "block.basemetals.double_silver_slab": "Double Silver Slab", - "block.basemetals.double_starsteel_slab": "Double Starsteel Slab", - "block.basemetals.double_steel_slab": "Double Steel Slab", - "block.basemetals.double_tin_slab": "Double Tin Slab", - "block.basemetals.double_zinc_slab": "Double Zinc Slab", "block.basemetals.electrum": "溶融エレクトラム", "block.basemetals.electrum_bars": "エレクトラム格子", "block.basemetals.electrum_block": "エレクトラムブロック", "block.basemetals.electrum_button": "エレクトラムのボタン", "block.basemetals.electrum_dense_plate": "エレクトラムの高密度プレート", "block.basemetals.electrum_door": "エレクトラムのドア", + "block.basemetals.electrum_double_slab": "Electrum Double Slab", "block.basemetals.electrum_lever": "エレクトラムのレバー", "block.basemetals.electrum_plate": "エレクトラムのプレート", "block.basemetals.electrum_pressure_plate": "エレクトラムの感圧板", @@ -219,6 +204,7 @@ "block.basemetals.emerald_bars": "エメラルド格子", "block.basemetals.emerald_button": "エメラルドのボタン", "block.basemetals.emerald_door": "エメラルドのドア", + "block.basemetals.emerald_double_slab": "Emerald Double Slab", "block.basemetals.emerald_lever": "エメラルドのレバー", "block.basemetals.emerald_pressure_plate": "エメラルドの感圧板", "block.basemetals.emerald_slab": "エメラルドのハーフブロック", @@ -231,6 +217,7 @@ "block.basemetals.gold_button": "金のボタン", "block.basemetals.gold_dense_plate": "金の高密度プレート", "block.basemetals.gold_door": "金のドア", + "block.basemetals.gold_double_slab": "Gold Double Slab", "block.basemetals.gold_lever": "金のレバー", "block.basemetals.gold_plate": "金のプレート", "block.basemetals.gold_pressure_plate": "金の感圧板", @@ -245,6 +232,7 @@ "block.basemetals.invar_button": "インバーのボタン", "block.basemetals.invar_dense_dense_plate": "インバーの高密度プレート", "block.basemetals.invar_door": "インバーのドア", + "block.basemetals.invar_double_slab": "Invar Double Slab", "block.basemetals.invar_lever": "インバーのレバー", "block.basemetals.invar_plate": "インバーのプレート", "block.basemetals.invar_pressure_plate": "インバーの感圧板", @@ -255,19 +243,20 @@ "block.basemetals.iron": "溶融鉄", "block.basemetals.iron_button": "鉄のボタン", "block.basemetals.iron_dense_plate": "鉄の高密度プレート", + "block.basemetals.iron_double_slab": "Iron Double Slab", "block.basemetals.iron_lever": "鉄のレバー", "block.basemetals.iron_plate": "鉄のプレート", "block.basemetals.iron_pressure_plate": "鉄の感圧板", "block.basemetals.iron_slab": "鉄のハーフブロック", "block.basemetals.iron_stairs": "鉄の階段", "block.basemetals.iron_wall": "鉄の壁", - "block.basemetals.lapis": "Molten Lapis", "block.basemetals.lead": "溶融鉛", "block.basemetals.lead_bars": "鉛格子", "block.basemetals.lead_block": "鉛ブロック", "block.basemetals.lead_button": "鉛のボタン", "block.basemetals.lead_dense_plate": "鉛の高密度プレート", "block.basemetals.lead_door": "鉛のドア", + "block.basemetals.lead_double_slab": "Lead Double Slab", "block.basemetals.lead_lever": "鉛のレバー", "block.basemetals.lead_ore": "鉛鉱石", "block.basemetals.lead_plate": "鉛のプレート", @@ -284,6 +273,7 @@ "block.basemetals.mithril_button": "ミスリルのボタン", "block.basemetals.mithril_dense_plate": "ミスリルの高密度プレート", "block.basemetals.mithril_door": "ミスリルのドア", + "block.basemetals.mithril_double_slab": "Mithril Double Slab", "block.basemetals.mithril_lever": "ミスリルのレバー", "block.basemetals.mithril_plate": "ミスリルのプレート", "block.basemetals.mithril_pressure_plate": "ミスリルの感圧板", @@ -297,6 +287,7 @@ "block.basemetals.nickel_button": "ニッケルのボタン", "block.basemetals.nickel_dense_plate": "ニッケルの高密度プレート", "block.basemetals.nickel_door": "ニッケルのドア", + "block.basemetals.nickel_double_slab": "Nickel Double Slab", "block.basemetals.nickel_lever": "ニッケルのレバー", "block.basemetals.nickel_ore": "ニッケル鉱石", "block.basemetals.nickel_plate": "ニッケルのプレート", @@ -309,6 +300,7 @@ "block.basemetals.obsidian_bars": "黒曜石格子", "block.basemetals.obsidian_button": "黒曜石のボタン", "block.basemetals.obsidian_door": "黒曜石のドア", + "block.basemetals.obsidian_double_slab": "Obsidian Double Slab", "block.basemetals.obsidian_lever": "黒曜石のレバー", "block.basemetals.obsidian_pressure_plate": "黒曜石の感圧板", "block.basemetals.obsidian_slab": "黒曜石のハーフブロック", @@ -321,6 +313,7 @@ "block.basemetals.pewter_button": "ピューターのボタン", "block.basemetals.pewter_dense_plate": "ピューターの高密度プレート", "block.basemetals.pewter_door": "ピューターのドア", + "block.basemetals.pewter_double_slab": "Pewter Double Slab", "block.basemetals.pewter_lever": "ピューターのレバー", "block.basemetals.pewter_ore": "ピューター鉱石", "block.basemetals.pewter_plate": "ピューターのプレート", @@ -335,6 +328,7 @@ "block.basemetals.platinum_button": "プラチナのボタン", "block.basemetals.platinum_dense_plate": "プラチナの高密度プレート", "block.basemetals.platinum_door": "プラチナのドア", + "block.basemetals.platinum_double_slab": "Platinum Double Slab", "block.basemetals.platinum_lever": "プラチナのレバー", "block.basemetals.platinum_ore": "プラチナ鉱石", "block.basemetals.platinum_plate": "プラチナのプレート", @@ -359,6 +353,7 @@ "block.basemetals.silver_button": "銀のボタン", "block.basemetals.silver_dense_plate": "銀の高密度プレート", "block.basemetals.silver_door": "銀のドア", + "block.basemetals.silver_double_slab": "Silver Double Slab", "block.basemetals.silver_lever": "銀のレバー", "block.basemetals.silver_ore": "銀鉱石", "block.basemetals.silver_plate": "銀のプレート", @@ -373,6 +368,7 @@ "block.basemetals.starsteel_button": "スタースチールのボタン", "block.basemetals.starsteel_dense_plate": "スタースチールの高密度プレート", "block.basemetals.starsteel_door": "スタースチールのドア", + "block.basemetals.starsteel_double_slab": "Starsteel Double Slab", "block.basemetals.starsteel_lever": "スタースチールのレバー", "block.basemetals.starsteel_ore": "スタースチール鉱石", "block.basemetals.starsteel_plate": "スタースチールのプレート", @@ -391,6 +387,7 @@ "block.basemetals.steel_button": "鋼鉄のボタン", "block.basemetals.steel_dense_plate": "鋼鉄の高密度プレート", "block.basemetals.steel_door": "鋼鉄のドア", + "block.basemetals.steel_double_slab": "Steel Double Slab", "block.basemetals.steel_lever": "鋼鉄のレバー", "block.basemetals.steel_plate": "鋼鉄のプレート", "block.basemetals.steel_pressure_plate": "鋼鉄の感圧板", @@ -398,7 +395,6 @@ "block.basemetals.steel_stairs": "鋼鉄の階段", "block.basemetals.steel_trapdoor": "鋼鉄のトラップドア", "block.basemetals.steel_wall": "鋼鉄の壁", - "block.basemetals.stone": "Molten Stone", "block.basemetals.stone_anvil": "Stone Anvil", "block.basemetals.stone_anvil.intact": "石の金床", "block.basemetals.stone_anvil.slightlyDamaged": "少し壊れた石の金床", @@ -409,6 +405,7 @@ "block.basemetals.tin_button": "錫のボタン", "block.basemetals.tin_dense_plate": "錫の高密度プレート", "block.basemetals.tin_door": "錫のドア", + "block.basemetals.tin_double_slab": "Tin Double Slab", "block.basemetals.tin_lever": "錫のレバー", "block.basemetals.tin_ore": "錫鉱石", "block.basemetals.tin_plate": "錫のプレート", @@ -417,13 +414,13 @@ "block.basemetals.tin_stairs": "錫の階段", "block.basemetals.tin_trapdoor": "錫のトラップドア", "block.basemetals.tin_wall": "錫の壁", - "block.basemetals.wood": "Molten Wood", "block.basemetals.zinc": "溶融亜鉛", "block.basemetals.zinc_bars": "亜鉛格子", "block.basemetals.zinc_block": "亜鉛ブロック", "block.basemetals.zinc_button": "亜鉛のボタン", "block.basemetals.zinc_dense_plate": "亜鉛の高密度プレート", "block.basemetals.zinc_door": "亜鉛のドア", + "block.basemetals.zinc_double_slab": "Zinc Double Slab", "block.basemetals.zinc_lever": "亜鉛のレバー", "block.basemetals.zinc_ore": "亜鉛鉱石", "block.basemetals.zinc_plate": "亜鉛のプレート", @@ -1187,8 +1184,6 @@ "item.basemetals.iron_smallpowder": "鉄の少粉末", "item.basemetals.iron_stairs": "鉄の階段", "item.basemetals.iron_wall": "鉄の壁", - "item.basemetals.lapis": "Lapis", - "item.basemetals.lapis_bucket": "溶融ラピスラズリ入りバケツ", "item.basemetals.lapis_smallpowder": "ラピスラズリの少粉末", "item.basemetals.lead": "Lead", "item.basemetals.lead_arrow": "鉛の矢", @@ -1660,9 +1655,7 @@ "item.basemetals.steel_sword": "鋼鉄の剣", "item.basemetals.steel_trapdoor": "鋼鉄のトラップドア", "item.basemetals.steel_wall": "鋼鉄の壁", - "item.basemetals.stone": "Stone", "item.basemetals.stone_anvil": "Stone Anvil", - "item.basemetals.stone_bucket": "溶融石入りバケツ", "item.basemetals.stone_crackhammer": "石のクラックハンマー", "item.basemetals.stone_gear": "石の歯車", "item.basemetals.stone_rod": "石の棒", @@ -1715,8 +1708,6 @@ "item.basemetals.tin_sword": "錫の剣", "item.basemetals.tin_trapdoor": "錫のトラップドア", "item.basemetals.tin_wall": "錫の壁", - "item.basemetals.wood": "Wood", - "item.basemetals.wood_bucket": "液化木材入りバケツ", "item.basemetals.wood_crackhammer": "木のクラックハンマー", "item.basemetals.wood_gear": "木の歯車", "item.basemetals.wood_powder": "おがくずの少粉末", @@ -1787,7 +1778,6 @@ "item.bucket.gold": "溶融金入りバケツ", "item.bucket.invar": "溶融インバー入りバケツ", "item.bucket.iron": "溶融鉄入りバケツ", - "item.bucket.lapis": "溶融ラピスラズリ入りバケツ", "item.bucket.lead": "溶融鉛入りバケツ", "item.bucket.mercury": "水銀入りバケツ", "item.bucket.mithril": "溶融ミスリル入りバケツ", @@ -1801,13 +1791,12 @@ "item.bucket.silver": "溶融銀入りバケツ", "item.bucket.starsteel": "溶融スタースチール入りバケツ", "item.bucket.steel": "溶融鋼鉄入りバケツ", - "item.bucket.stone": "溶融石入りバケツ", "item.bucket.tin": "溶融錫入りバケツ", - "item.bucket.wood": "液化木材入りバケツ", "item.bucket.zinc": "溶融亜鉛入りバケツ", "itemGroup.basemetals.blocks": "Base Metals: ブロック", "itemGroup.basemetals.combat": "Base Metals: 戦闘", "itemGroup.basemetals.items": "Base Metals: アイテム", + "itemGroup.basemetals.materials": "Base Metals Materials", "itemGroup.basemetals.tools": "Base Metals: 道具", "material.adamantine.name": "アダマント", "material.adamantine.prefix": "アダマントの%s", diff --git a/src/generated/resources/assets/basemetals/lang/nl_nl.json b/src/generated/resources/assets/basemetals/lang/nl_nl.json index 994e09a3b..e3526d71c 100644 --- a/src/generated/resources/assets/basemetals/lang/nl_nl.json +++ b/src/generated/resources/assets/basemetals/lang/nl_nl.json @@ -41,6 +41,7 @@ "block.basemetals.adamantine_block": "Adamanten Blok", "block.basemetals.adamantine_button": "Adamantine Button", "block.basemetals.adamantine_door": "Adamanten Deur", + "block.basemetals.adamantine_double_slab": "Adamantine Double Slab", "block.basemetals.adamantine_lever": "Adamantine Lever", "block.basemetals.adamantine_ore": "Adamanten Erts", "block.basemetals.adamantine_plate": "Adamanten Plaat", @@ -54,6 +55,7 @@ "block.basemetals.antimony_block": "Antimony Block", "block.basemetals.antimony_button": "Antimony Button", "block.basemetals.antimony_door": "Antimony Door", + "block.basemetals.antimony_double_slab": "Antimony Double Slab", "block.basemetals.antimony_lever": "Antimony Lever", "block.basemetals.antimony_ore": "Antimony Ore", "block.basemetals.antimony_plate": "Antimony Plate", @@ -67,6 +69,7 @@ "block.basemetals.aquarium_block": "Aquarium Blok", "block.basemetals.aquarium_button": "Aquarium Button", "block.basemetals.aquarium_door": "Aquarium Deur", + "block.basemetals.aquarium_double_slab": "Aquarium Double Slab", "block.basemetals.aquarium_lever": "Aquarium Lever", "block.basemetals.aquarium_plate": "Aquarium Plaat", "block.basemetals.aquarium_pressure_plate": "Aquarium Pressure Plate", @@ -79,6 +82,7 @@ "block.basemetals.bismuth_block": "Bismuth Block", "block.basemetals.bismuth_button": "Bismuth Button", "block.basemetals.bismuth_door": "Bismuth Door", + "block.basemetals.bismuth_double_slab": "Bismuth Double Slab", "block.basemetals.bismuth_lever": "Bismuth Lever", "block.basemetals.bismuth_ore": "Bismuth Ore", "block.basemetals.bismuth_plate": "Bismuth Plate", @@ -92,6 +96,7 @@ "block.basemetals.brass_block": "Messing Blok", "block.basemetals.brass_button": "Brass Button", "block.basemetals.brass_door": "Messing Deur", + "block.basemetals.brass_double_slab": "Brass Double Slab", "block.basemetals.brass_lever": "Brass Lever", "block.basemetals.brass_plate": "Messing Plaat", "block.basemetals.brass_pressure_plate": "Brass Pressure Plate", @@ -104,6 +109,7 @@ "block.basemetals.bronze_block": "Bronzen Blok", "block.basemetals.bronze_button": "Bronze Button", "block.basemetals.bronze_door": "Bronzen Deur", + "block.basemetals.bronze_double_slab": "Bronze Double Slab", "block.basemetals.bronze_lever": "Bronze Lever", "block.basemetals.bronze_plate": "Bronzen Plaat", "block.basemetals.bronze_pressure_plate": "Bronze Pressure Plate", @@ -119,6 +125,7 @@ "block.basemetals.coldiron_block": "Cold-Iron Blok", "block.basemetals.coldiron_button": "Cold Iron Button", "block.basemetals.coldiron_door": "Cold-Iron Deur", + "block.basemetals.coldiron_double_slab": "Cold Iron Double Slab", "block.basemetals.coldiron_lever": "Cold Iron Lever", "block.basemetals.coldiron_ore": "Cold-Iron Erts", "block.basemetals.coldiron_plate": "Cold-Iron Plaat", @@ -132,6 +139,7 @@ "block.basemetals.copper_block": "Koperen Blok", "block.basemetals.copper_button": "Copper Button", "block.basemetals.copper_door": "Koperen Deur", + "block.basemetals.copper_double_slab": "Copper Double Slab", "block.basemetals.copper_lever": "Copper Lever", "block.basemetals.copper_ore": "Koperen Erts", "block.basemetals.copper_plate": "Koperen Plaat", @@ -145,6 +153,7 @@ "block.basemetals.cupronickel_block": "Cupronickel Block", "block.basemetals.cupronickel_button": "Cupronickel Button", "block.basemetals.cupronickel_door": "Cupronickel Door", + "block.basemetals.cupronickel_double_slab": "Cupronickel Double Slab", "block.basemetals.cupronickel_lever": "Cupronickel Lever", "block.basemetals.cupronickel_plate": "Cupronickel Plate", "block.basemetals.cupronickel_pressure_plate": "Cupronickel Pressure Plate", @@ -156,43 +165,19 @@ "block.basemetals.diamond_bars": "Diamond Bars", "block.basemetals.diamond_button": "Diamond Button", "block.basemetals.diamond_door": "Diamond Door", + "block.basemetals.diamond_double_slab": "Diamond Double Slab", "block.basemetals.diamond_lever": "Diamond Lever", "block.basemetals.diamond_pressure_plate": "Diamond Pressure Plate", "block.basemetals.diamond_slab": "Diamond Slab", "block.basemetals.diamond_stairs": "Diamond Stairs", "block.basemetals.diamond_trapdoor": "Diamond Trapdoor", "block.basemetals.diamond_wall": "Diamond Wall", - "block.basemetals.double_adamantine_slab": "Double Adamantine Slab", - "block.basemetals.double_antimony_slab": "Double Antimony Slab", - "block.basemetals.double_aquarium_slab": "Double Aquarium Slab", - "block.basemetals.double_bismuth_slab": "Double Bismuth Slab", - "block.basemetals.double_brass_slab": "Double Brass Slab", - "block.basemetals.double_bronze_slab": "Double Bronze Slab", - "block.basemetals.double_coldiron_slab": "Double Cold Iron Slab", - "block.basemetals.double_copper_slab": "Double Copper Slab", - "block.basemetals.double_cupronickel_slab": "Double Cupronickel Slab", - "block.basemetals.double_diamond_slab": "Double Diamond Slab", - "block.basemetals.double_electrum_slab": "Double Electrum Slab", - "block.basemetals.double_emerald_slab": "Double Emerald Slab", - "block.basemetals.double_gold_slab": "Double Gold Slab", - "block.basemetals.double_invar_slab": "Double Invar Slab", - "block.basemetals.double_iron_slab": "Double Iron Slab", - "block.basemetals.double_lead_slab": "Double Lead Slab", - "block.basemetals.double_mithril_slab": "Double Mithril Slab", - "block.basemetals.double_nickel_slab": "Double Nickel Slab", - "block.basemetals.double_obsidian_slab": "Double Obsidian Slab", - "block.basemetals.double_pewter_slab": "Double Pewter Slab", - "block.basemetals.double_platinum_slab": "Double Platinum Slab", - "block.basemetals.double_silver_slab": "Double Silver Slab", - "block.basemetals.double_starsteel_slab": "Double Starsteel Slab", - "block.basemetals.double_steel_slab": "Double Steel Slab", - "block.basemetals.double_tin_slab": "Double Tin Slab", - "block.basemetals.double_zinc_slab": "Double Zinc Slab", "block.basemetals.electrum": "Molten Electrum", "block.basemetals.electrum_bars": "Electrum Tralies", "block.basemetals.electrum_block": "Electrum Blok", "block.basemetals.electrum_button": "Electrum Button", "block.basemetals.electrum_door": "Electrum Deur", + "block.basemetals.electrum_double_slab": "Electrum Double Slab", "block.basemetals.electrum_lever": "Electrum Lever", "block.basemetals.electrum_plate": "Electrum Plaat", "block.basemetals.electrum_pressure_plate": "Electrum Pressure Plate", @@ -204,6 +189,7 @@ "block.basemetals.emerald_bars": "Emerald Bars", "block.basemetals.emerald_button": "Emerald Button", "block.basemetals.emerald_door": "Emerald Door", + "block.basemetals.emerald_double_slab": "Emerald Double Slab", "block.basemetals.emerald_lever": "Emerald Lever", "block.basemetals.emerald_pressure_plate": "Emerald Pressure Plate", "block.basemetals.emerald_slab": "Emerald Slab", @@ -215,6 +201,7 @@ "block.basemetals.gold_bars": "Gold Bars", "block.basemetals.gold_button": "Gold Button", "block.basemetals.gold_door": "Gold Door", + "block.basemetals.gold_double_slab": "Gold Double Slab", "block.basemetals.gold_lever": "Gold Lever", "block.basemetals.gold_plate": "Goud Plaat", "block.basemetals.gold_slab": "Gold Slab", @@ -227,6 +214,7 @@ "block.basemetals.invar_block": "Invar Blok", "block.basemetals.invar_button": "Invar Button", "block.basemetals.invar_door": "Invar Deur", + "block.basemetals.invar_double_slab": "Invar Double Slab", "block.basemetals.invar_lever": "Invar Lever", "block.basemetals.invar_plate": "Invar Plaat", "block.basemetals.invar_pressure_plate": "Invar Pressure Plate", @@ -236,17 +224,18 @@ "block.basemetals.invar_wall": "Invar Wall", "block.basemetals.iron": "Molten Iron", "block.basemetals.iron_button": "Iron Button", + "block.basemetals.iron_double_slab": "Iron Double Slab", "block.basemetals.iron_lever": "Iron Lever", "block.basemetals.iron_plate": "IJzer Plaat", "block.basemetals.iron_slab": "Iron Slab", "block.basemetals.iron_stairs": "Iron Stairs", "block.basemetals.iron_wall": "Iron Wall", - "block.basemetals.lapis": "Molten Lapis", "block.basemetals.lead": "Molten Lead", "block.basemetals.lead_bars": "Loden Tralies", "block.basemetals.lead_block": "Loden Blok", "block.basemetals.lead_button": "Lead Button", "block.basemetals.lead_door": "Loden Deur", + "block.basemetals.lead_double_slab": "Lead Double Slab", "block.basemetals.lead_lever": "Lead Lever", "block.basemetals.lead_ore": "Loden Erts", "block.basemetals.lead_plate": "Loden Plaat", @@ -262,6 +251,7 @@ "block.basemetals.mithril_block": "Mithril Blok", "block.basemetals.mithril_button": "Mithril Button", "block.basemetals.mithril_door": "Mithril Deur", + "block.basemetals.mithril_double_slab": "Mithril Double Slab", "block.basemetals.mithril_lever": "Mithril Lever", "block.basemetals.mithril_plate": "Mithril Plaat", "block.basemetals.mithril_pressure_plate": "Mithril Pressure Plate", @@ -274,6 +264,7 @@ "block.basemetals.nickel_block": "Nikkel Blok", "block.basemetals.nickel_button": "Nickel Button", "block.basemetals.nickel_door": "Nikkel Deur", + "block.basemetals.nickel_double_slab": "Nickel Double Slab", "block.basemetals.nickel_lever": "Nickel Lever", "block.basemetals.nickel_ore": "Nikkel Erts", "block.basemetals.nickel_plate": "Nikkel Plaat", @@ -286,6 +277,7 @@ "block.basemetals.obsidian_bars": "Obsidian Bars", "block.basemetals.obsidian_button": "Obsidian Button", "block.basemetals.obsidian_door": "Obsidian Door", + "block.basemetals.obsidian_double_slab": "Obsidian Double Slab", "block.basemetals.obsidian_lever": "Obsidian Lever", "block.basemetals.obsidian_pressure_plate": "Obsidian Pressure Plate", "block.basemetals.obsidian_slab": "Obsidian Slab", @@ -297,6 +289,7 @@ "block.basemetals.pewter_block": "Pewter Block", "block.basemetals.pewter_button": "Pewter Button", "block.basemetals.pewter_door": "Pewter Door", + "block.basemetals.pewter_double_slab": "Pewter Double Slab", "block.basemetals.pewter_lever": "Pewter Lever", "block.basemetals.pewter_plate": "Pewter Plate", "block.basemetals.pewter_pressure_plate": "Pewter Pressure Plate", @@ -309,6 +302,7 @@ "block.basemetals.platinum_block": "Platinum Block", "block.basemetals.platinum_button": "Platinum Button", "block.basemetals.platinum_door": "Platinum Door", + "block.basemetals.platinum_double_slab": "Platinum Double Slab", "block.basemetals.platinum_lever": "Platinum Lever", "block.basemetals.platinum_ore": "Platinum Ore", "block.basemetals.platinum_plate": "Platinum Plate", @@ -332,6 +326,7 @@ "block.basemetals.silver_block": "Zilveren Blok", "block.basemetals.silver_button": "Silver Button", "block.basemetals.silver_door": "Zilveren Deur", + "block.basemetals.silver_double_slab": "Silver Double Slab", "block.basemetals.silver_lever": "Silver Lever", "block.basemetals.silver_ore": "Zilveren Erts", "block.basemetals.silver_plate": "Zilveren Plaat", @@ -345,6 +340,7 @@ "block.basemetals.starsteel_block": "Sterren-Staal Blok", "block.basemetals.starsteel_button": "Starsteel Button", "block.basemetals.starsteel_door": "Sterren-Staal Deur", + "block.basemetals.starsteel_double_slab": "Starsteel Double Slab", "block.basemetals.starsteel_lever": "Starsteel Lever", "block.basemetals.starsteel_ore": "Sterren-Staal Erts", "block.basemetals.starsteel_plate": "Sterren-Staal Plaat", @@ -359,6 +355,7 @@ "block.basemetals.steel_block": "Stalen Blok", "block.basemetals.steel_button": "Steel Button", "block.basemetals.steel_door": "Stalen Deur", + "block.basemetals.steel_double_slab": "Steel Double Slab", "block.basemetals.steel_lever": "Steel Lever", "block.basemetals.steel_plate": "Stalen Plaat", "block.basemetals.steel_pressure_plate": "Steel Pressure Plate", @@ -366,13 +363,13 @@ "block.basemetals.steel_stairs": "Steel Stairs", "block.basemetals.steel_trapdoor": "Stalen Valluik", "block.basemetals.steel_wall": "Steel Wall", - "block.basemetals.stone": "Molten Stone", "block.basemetals.stone_anvil": "Stone Anvil", "block.basemetals.tin": "Molten Tin", "block.basemetals.tin_bars": "Tinnen Tralies", "block.basemetals.tin_block": "Tinnen Blok", "block.basemetals.tin_button": "Tin Button", "block.basemetals.tin_door": "Tinnen Deur", + "block.basemetals.tin_double_slab": "Tin Double Slab", "block.basemetals.tin_lever": "Tin Lever", "block.basemetals.tin_ore": "Tinnen Erts", "block.basemetals.tin_plate": "Tinnen Plaat", @@ -381,12 +378,12 @@ "block.basemetals.tin_stairs": "Tin Stairs", "block.basemetals.tin_trapdoor": "Tinnen Valluik", "block.basemetals.tin_wall": "Tin Wall", - "block.basemetals.wood": "Molten Wood", "block.basemetals.zinc": "Molten Zinc", "block.basemetals.zinc_bars": "Zinc Bars", "block.basemetals.zinc_block": "Zinc Blok", "block.basemetals.zinc_button": "Zinc Button", "block.basemetals.zinc_door": "Zinc Door", + "block.basemetals.zinc_double_slab": "Zinc Double Slab", "block.basemetals.zinc_lever": "Zinc Lever", "block.basemetals.zinc_ore": "Zinc Erts", "block.basemetals.zinc_plate": "Zink Plaat", @@ -448,12 +445,10 @@ "item.basemetals.adamantine_button": "Adamantine Button", "item.basemetals.adamantine_casing": "Adamantine Casing", "item.basemetals.adamantine_chestplate": "Adamanten Borstplaat", - "item.basemetals.adamantine_clump": "Adamantine Clump", "item.basemetals.adamantine_crackhammer": "Adamanten Breek Hamer", "item.basemetals.adamantine_crossbow": "Adamantine Crossbow", "item.basemetals.adamantine_crushed": "Adamantine Crushed", "item.basemetals.adamantine_crushed_purified": "Adamantine Crushed Purified", - "item.basemetals.adamantine_crystal": "Adamantine Crystal", "item.basemetals.adamantine_dense_plate": "Adamantine Dense Plate", "item.basemetals.adamantine_door": "Adamanten Deur", "item.basemetals.adamantine_fishing_rod": "Adamantine Fishing Rod", @@ -469,12 +464,10 @@ "item.basemetals.adamantine_pickaxe": "Adamanten Pikhouweel", "item.basemetals.adamantine_plate": "Adamantine Plate", "item.basemetals.adamantine_powder": "Verpulverd Adamanten", - "item.basemetals.adamantine_powder_dirty": "Adamantine Powder Dirty", "item.basemetals.adamantine_pressure_plate": "Adamantine Pressure Plate", "item.basemetals.adamantine_raw": "Ruw Adamantine", "item.basemetals.adamantine_rod": "Adamantine Rod", "item.basemetals.adamantine_scythe": "Adamantine Scythe", - "item.basemetals.adamantine_shard": "Adamantine Shard", "item.basemetals.adamantine_shears": "Adamantine Shears", "item.basemetals.adamantine_shield": "Adamantine Shield", "item.basemetals.adamantine_shovel": "Adamanten Schep", @@ -496,12 +489,10 @@ "item.basemetals.antimony_button": "Antimony Button", "item.basemetals.antimony_casing": "Antimony Casing", "item.basemetals.antimony_chestplate": "Antimony Chestplate", - "item.basemetals.antimony_clump": "Antimony Clump", "item.basemetals.antimony_crackhammer": "Antimony Crackhammer", "item.basemetals.antimony_crossbow": "Antimony Crossbow", "item.basemetals.antimony_crushed": "Antimony Crushed", "item.basemetals.antimony_crushed_purified": "Antimony Crushed Purified", - "item.basemetals.antimony_crystal": "Antimony Crystal", "item.basemetals.antimony_dense_plate": "Antimony Dense Plate", "item.basemetals.antimony_door": "Antimony Door", "item.basemetals.antimony_fishing_rod": "Antimony Fishing Rod", @@ -517,12 +508,10 @@ "item.basemetals.antimony_pickaxe": "Antimony Pickaxe", "item.basemetals.antimony_plate": "Antimony Plate", "item.basemetals.antimony_powder": "Antimony Powder", - "item.basemetals.antimony_powder_dirty": "Antimony Powder Dirty", "item.basemetals.antimony_pressure_plate": "Antimony Pressure Plate", "item.basemetals.antimony_raw": "Ruw Antimony", "item.basemetals.antimony_rod": "Antimony Rod", "item.basemetals.antimony_scythe": "Antimony Scythe", - "item.basemetals.antimony_shard": "Antimony Shard", "item.basemetals.antimony_shears": "Antimony Shears", "item.basemetals.antimony_shield": "Antimony Shield", "item.basemetals.antimony_shovel": "Antimony Shovel", @@ -585,12 +574,10 @@ "item.basemetals.bismuth_button": "Bismuth Button", "item.basemetals.bismuth_casing": "Bismuth Casing", "item.basemetals.bismuth_chestplate": "Bismuth Chestplate", - "item.basemetals.bismuth_clump": "Bismuth Clump", "item.basemetals.bismuth_crackhammer": "Bismuth Crackhammer", "item.basemetals.bismuth_crossbow": "Bismuth Crossbow", "item.basemetals.bismuth_crushed": "Bismuth Crushed", "item.basemetals.bismuth_crushed_purified": "Bismuth Crushed Purified", - "item.basemetals.bismuth_crystal": "Bismuth Crystal", "item.basemetals.bismuth_dense_plate": "Bismuth Dense Plate", "item.basemetals.bismuth_door": "Bismuth Door", "item.basemetals.bismuth_fishing_rod": "Bismuth Fishing Rod", @@ -606,12 +593,10 @@ "item.basemetals.bismuth_pickaxe": "Bismuth Pickaxe", "item.basemetals.bismuth_plate": "Bismuth Plate", "item.basemetals.bismuth_powder": "Bismuth Powder", - "item.basemetals.bismuth_powder_dirty": "Bismuth Powder Dirty", "item.basemetals.bismuth_pressure_plate": "Bismuth Pressure Plate", "item.basemetals.bismuth_raw": "Ruw Bismuth", "item.basemetals.bismuth_rod": "Bismuth Rod", "item.basemetals.bismuth_scythe": "Bismuth Scythe", - "item.basemetals.bismuth_shard": "Bismuth Shard", "item.basemetals.bismuth_shears": "Bismuth Shears", "item.basemetals.bismuth_shield": "Bismuth Shield", "item.basemetals.bismuth_shovel": "Bismuth Shovel", @@ -725,12 +710,10 @@ "item.basemetals.coldiron_button": "Cold Iron Button", "item.basemetals.coldiron_casing": "Cold Iron Casing", "item.basemetals.coldiron_chestplate": "Cold-Iron Borstplaat", - "item.basemetals.coldiron_clump": "Cold Iron Clump", "item.basemetals.coldiron_crackhammer": "Cold-Iron Breek Hamer", "item.basemetals.coldiron_crossbow": "Cold Iron Crossbow", "item.basemetals.coldiron_crushed": "Cold Iron Crushed", "item.basemetals.coldiron_crushed_purified": "Cold Iron Crushed Purified", - "item.basemetals.coldiron_crystal": "Cold Iron Crystal", "item.basemetals.coldiron_dense_plate": "Cold Iron Dense Plate", "item.basemetals.coldiron_door": "Cold-Iron Deur", "item.basemetals.coldiron_fishing_rod": "Cold Iron Fishing Rod", @@ -746,12 +729,10 @@ "item.basemetals.coldiron_pickaxe": "Cold-Iron Pikhouweel", "item.basemetals.coldiron_plate": "Cold Iron Plate", "item.basemetals.coldiron_powder": "Verpulverd Cold-Iron", - "item.basemetals.coldiron_powder_dirty": "Cold Iron Powder Dirty", "item.basemetals.coldiron_pressure_plate": "Cold Iron Pressure Plate", "item.basemetals.coldiron_raw": "Ruw Cold Iron", "item.basemetals.coldiron_rod": "Cold-Iron Rod", "item.basemetals.coldiron_scythe": "Cold Iron Scythe", - "item.basemetals.coldiron_shard": "Cold Iron Shard", "item.basemetals.coldiron_shears": "Cold Iron Shears", "item.basemetals.coldiron_shield": "Cold Iron Shield", "item.basemetals.coldiron_shovel": "Cold-Iron Schep", @@ -1034,8 +1015,6 @@ "item.basemetals.iron_smallpowder": "Iron Smallpowder", "item.basemetals.iron_stairs": "Iron Stairs", "item.basemetals.iron_wall": "Iron Wall", - "item.basemetals.lapis": "Lapis", - "item.basemetals.lapis_bucket": "Emmer gesmolten lapis lazuli", "item.basemetals.lapis_smallpowder": "Lapis Smallpowder", "item.basemetals.lead": "Lead", "item.basemetals.lead_arrow": "Lead Arrow", @@ -1137,12 +1116,10 @@ "item.basemetals.nickel_button": "Nickel Button", "item.basemetals.nickel_casing": "Nickel Casing", "item.basemetals.nickel_chestplate": "Nikkel Borstplaat", - "item.basemetals.nickel_clump": "Nickel Clump", "item.basemetals.nickel_crackhammer": "Nikkel Breek Hamer", "item.basemetals.nickel_crossbow": "Nickel Crossbow", "item.basemetals.nickel_crushed": "Nickel Crushed", "item.basemetals.nickel_crushed_purified": "Nickel Crushed Purified", - "item.basemetals.nickel_crystal": "Nickel Crystal", "item.basemetals.nickel_dense_plate": "Nickel Dense Plate", "item.basemetals.nickel_door": "Nikkel Deur", "item.basemetals.nickel_fishing_rod": "Nickel Fishing Rod", @@ -1158,12 +1135,10 @@ "item.basemetals.nickel_pickaxe": "Nikkel Pikhouweel", "item.basemetals.nickel_plate": "Nickel Plate", "item.basemetals.nickel_powder": "Verpulverd Nikkel", - "item.basemetals.nickel_powder_dirty": "Nickel Powder Dirty", "item.basemetals.nickel_pressure_plate": "Nickel Pressure Plate", "item.basemetals.nickel_raw": "Ruw Nickel", "item.basemetals.nickel_rod": "Nickel Rod", "item.basemetals.nickel_scythe": "Nickel Scythe", - "item.basemetals.nickel_shard": "Nickel Shard", "item.basemetals.nickel_shears": "Nickel Shears", "item.basemetals.nickel_shield": "Nickel Shield", "item.basemetals.nickel_shovel": "Nikkel Schep", @@ -1261,12 +1236,10 @@ "item.basemetals.platinum_button": "Platinum Button", "item.basemetals.platinum_casing": "Platinum Casing", "item.basemetals.platinum_chestplate": "Platinum Chestplate", - "item.basemetals.platinum_clump": "Platinum Clump", "item.basemetals.platinum_crackhammer": "Platinum Crack Hammer", "item.basemetals.platinum_crossbow": "Platinum Crossbow", "item.basemetals.platinum_crushed": "Platinum Crushed", "item.basemetals.platinum_crushed_purified": "Platinum Crushed Purified", - "item.basemetals.platinum_crystal": "Platinum Crystal", "item.basemetals.platinum_dense_plate": "Platinum Dense Plate", "item.basemetals.platinum_door": "Platinum Door", "item.basemetals.platinum_fishing_rod": "Platinum Fishing Rod", @@ -1282,12 +1255,10 @@ "item.basemetals.platinum_pickaxe": "Platinum Pickaxe", "item.basemetals.platinum_plate": "Platinum Plate", "item.basemetals.platinum_powder": "Powdered Platinum", - "item.basemetals.platinum_powder_dirty": "Platinum Powder Dirty", "item.basemetals.platinum_pressure_plate": "Platinum Pressure Plate", "item.basemetals.platinum_raw": "Ruw Platinum", "item.basemetals.platinum_rod": "Platinum Rod", "item.basemetals.platinum_scythe": "Platinum Scythe", - "item.basemetals.platinum_shard": "Platinum Shard", "item.basemetals.platinum_shears": "Platinum Shears", "item.basemetals.platinum_shield": "Platinum Shield", "item.basemetals.platinum_shovel": "Platinum Shovel", @@ -1388,12 +1359,10 @@ "item.basemetals.starsteel_button": "Starsteel Button", "item.basemetals.starsteel_casing": "Starsteel Casing", "item.basemetals.starsteel_chestplate": "Sterren-Staal Borstplaat", - "item.basemetals.starsteel_clump": "Starsteel Clump", "item.basemetals.starsteel_crackhammer": "Sterren-Staal Breek Hamer", "item.basemetals.starsteel_crossbow": "Starsteel Crossbow", "item.basemetals.starsteel_crushed": "Starsteel Crushed", "item.basemetals.starsteel_crushed_purified": "Starsteel Crushed Purified", - "item.basemetals.starsteel_crystal": "Starsteel Crystal", "item.basemetals.starsteel_dense_plate": "Starsteel Dense Plate", "item.basemetals.starsteel_door": "Sterren-Staal Deur", "item.basemetals.starsteel_fishing_rod": "Starsteel Fishing Rod", @@ -1409,12 +1378,10 @@ "item.basemetals.starsteel_pickaxe": "Sterren-Staal Pikhouweel", "item.basemetals.starsteel_plate": "Starsteel Plate", "item.basemetals.starsteel_powder": "Verpulverd Sterren-Staal", - "item.basemetals.starsteel_powder_dirty": "Starsteel Powder Dirty", "item.basemetals.starsteel_pressure_plate": "Starsteel Pressure Plate", "item.basemetals.starsteel_raw": "Ruw Starsteel", "item.basemetals.starsteel_rod": "Star-Steel Rod", "item.basemetals.starsteel_scythe": "Starsteel Scythe", - "item.basemetals.starsteel_shard": "Starsteel Shard", "item.basemetals.starsteel_shears": "Starsteel Shears", "item.basemetals.starsteel_shield": "Starsteel Shield", "item.basemetals.starsteel_shovel": "Sterren-Staal Schep", @@ -1465,9 +1432,7 @@ "item.basemetals.steel_sword": "Stalen Zwaard", "item.basemetals.steel_trapdoor": "Stalen Valluik", "item.basemetals.steel_wall": "Steel Wall", - "item.basemetals.stone": "Stone", "item.basemetals.stone_anvil": "Stone Anvil", - "item.basemetals.stone_bucket": "Emmer gesmolten steen", "item.basemetals.stone_crackhammer": "Stenen Breek Hamer", "item.basemetals.stone_gear": "Stone Gear", "item.basemetals.stone_rod": "Stone Rod", @@ -1512,8 +1477,6 @@ "item.basemetals.tin_sword": "Tinnen Zwaard", "item.basemetals.tin_trapdoor": "Tinnen Valluik", "item.basemetals.tin_wall": "Tin Wall", - "item.basemetals.wood": "Wood", - "item.basemetals.wood_bucket": "Emmer vloeibaar hout", "item.basemetals.wood_crackhammer": "Houten Breek Hamer", "item.basemetals.wood_gear": "Wood Gear", "item.basemetals.wood_scythe": "Wood Scythe", @@ -1529,12 +1492,10 @@ "item.basemetals.zinc_button": "Zinc Button", "item.basemetals.zinc_casing": "Zinc Casing", "item.basemetals.zinc_chestplate": "Zinc Chestplate", - "item.basemetals.zinc_clump": "Zinc Clump", "item.basemetals.zinc_crackhammer": "Zinc Crackhammer", "item.basemetals.zinc_crossbow": "Zinc Crossbow", "item.basemetals.zinc_crushed": "Zinc Crushed", "item.basemetals.zinc_crushed_purified": "Zinc Crushed Purified", - "item.basemetals.zinc_crystal": "Zinc Crystal", "item.basemetals.zinc_dense_plate": "Zinc Dense Plate", "item.basemetals.zinc_door": "Zinc Door", "item.basemetals.zinc_fishing_rod": "Zinc Fishing Rod", @@ -1550,12 +1511,10 @@ "item.basemetals.zinc_pickaxe": "Zinc Pickaxe", "item.basemetals.zinc_plate": "Zinc Plate", "item.basemetals.zinc_powder": "Verpulverd Zinc", - "item.basemetals.zinc_powder_dirty": "Zinc Powder Dirty", "item.basemetals.zinc_pressure_plate": "Zinc Pressure Plate", "item.basemetals.zinc_raw": "Ruw Zinc", "item.basemetals.zinc_rod": "Zinc Rod", "item.basemetals.zinc_scythe": "Zinc Scythe", - "item.basemetals.zinc_shard": "Zinc Shard", "item.basemetals.zinc_shears": "Zinc Shears", "item.basemetals.zinc_shield": "Zinc Shield", "item.basemetals.zinc_shovel": "Zinc Shovel", @@ -1583,7 +1542,6 @@ "item.bucket.gold": "Emmer gesmolten goud", "item.bucket.invar": "Emmer gesmolten invar", "item.bucket.iron": "Emmer gesmolten ijzer", - "item.bucket.lapis": "Emmer gesmolten lapis lazuli", "item.bucket.lead": "Emmer gesmolten lood", "item.bucket.mercury": "Emmer kwik", "item.bucket.mithril": "Emmer gesmolten mithril", @@ -1597,13 +1555,12 @@ "item.bucket.silver": "Emmer gesmolten zilver", "item.bucket.starsteel": "Emmer gesmolten sterrenstaal", "item.bucket.steel": "Emmer gesmolten staal", - "item.bucket.stone": "Emmer gesmolten steen", "item.bucket.tin": "Emmer gesmolten tin", - "item.bucket.wood": "Emmer vloeibaar hout", "item.bucket.zinc": "Emmer gesmolten zink", "itemGroup.basemetals.blocks": "Base Metals Blocks", "itemGroup.basemetals.combat": "Base Metals Combat", "itemGroup.basemetals.items": "Base Metals Items", + "itemGroup.basemetals.materials": "Base Metals Materials", "itemGroup.basemetals.tools": "Base Metals Tools", "material.basemetals.adamantine": "Adamantine", "material.basemetals.antimony": "Antimony", diff --git a/src/generated/resources/assets/basemetals/lang/pt_br.json b/src/generated/resources/assets/basemetals/lang/pt_br.json index 0f3e176cf..3970ca4c2 100644 --- a/src/generated/resources/assets/basemetals/lang/pt_br.json +++ b/src/generated/resources/assets/basemetals/lang/pt_br.json @@ -41,6 +41,7 @@ "block.basemetals.adamantine_block": "Cubo de Magnetita", "block.basemetals.adamantine_button": "Adamantine Button", "block.basemetals.adamantine_door": "Porta de Magnetita", + "block.basemetals.adamantine_double_slab": "Adamantine Double Slab", "block.basemetals.adamantine_lever": "Adamantine Lever", "block.basemetals.adamantine_ore": "Minério de Magnetita", "block.basemetals.adamantine_plate": "Chapa de Magnetita", @@ -54,6 +55,7 @@ "block.basemetals.antimony_block": "Antimony Block", "block.basemetals.antimony_button": "Antimony Button", "block.basemetals.antimony_door": "Antimony Door", + "block.basemetals.antimony_double_slab": "Antimony Double Slab", "block.basemetals.antimony_lever": "Antimony Lever", "block.basemetals.antimony_ore": "Antimony Ore", "block.basemetals.antimony_plate": "Antimony Plate", @@ -67,6 +69,7 @@ "block.basemetals.aquarium_block": "Cubo de Aço-Peixe", "block.basemetals.aquarium_button": "Aquarium Button", "block.basemetals.aquarium_door": "Porta de Aço-Peixe", + "block.basemetals.aquarium_double_slab": "Aquarium Double Slab", "block.basemetals.aquarium_lever": "Aquarium Lever", "block.basemetals.aquarium_plate": "Chapa de Aço-Peixe", "block.basemetals.aquarium_pressure_plate": "Aquarium Pressure Plate", @@ -79,6 +82,7 @@ "block.basemetals.bismuth_block": "Bismuth Block", "block.basemetals.bismuth_button": "Bismuth Button", "block.basemetals.bismuth_door": "Bismuth Door", + "block.basemetals.bismuth_double_slab": "Bismuth Double Slab", "block.basemetals.bismuth_lever": "Bismuth Lever", "block.basemetals.bismuth_ore": "Bismuth Ore", "block.basemetals.bismuth_plate": "Bismuth Plate", @@ -92,6 +96,7 @@ "block.basemetals.brass_block": "Cubo de Latão", "block.basemetals.brass_button": "Brass Button", "block.basemetals.brass_door": "Porta de Latão", + "block.basemetals.brass_double_slab": "Brass Double Slab", "block.basemetals.brass_lever": "Brass Lever", "block.basemetals.brass_plate": "Chapa de Latão", "block.basemetals.brass_pressure_plate": "Brass Pressure Plate", @@ -104,6 +109,7 @@ "block.basemetals.bronze_block": "Cubo de Bronze", "block.basemetals.bronze_button": "Bronze Button", "block.basemetals.bronze_door": "Porta de Bronze", + "block.basemetals.bronze_double_slab": "Bronze Double Slab", "block.basemetals.bronze_lever": "Bronze Lever", "block.basemetals.bronze_plate": "Chapa de Bronze", "block.basemetals.bronze_pressure_plate": "Bronze Pressure Plate", @@ -119,6 +125,7 @@ "block.basemetals.coldiron_block": "Cubo de Ferro-Frio", "block.basemetals.coldiron_button": "Cold Iron Button", "block.basemetals.coldiron_door": "Porta de Ferro-Frio", + "block.basemetals.coldiron_double_slab": "Cold Iron Double Slab", "block.basemetals.coldiron_lever": "Cold Iron Lever", "block.basemetals.coldiron_ore": "Minério de Ferro-Frio", "block.basemetals.coldiron_plate": "Chapa de Ferro-Frio", @@ -132,6 +139,7 @@ "block.basemetals.copper_block": "Cubo de Cobre", "block.basemetals.copper_button": "Copper Button", "block.basemetals.copper_door": "Porta de Cobre", + "block.basemetals.copper_double_slab": "Copper Double Slab", "block.basemetals.copper_lever": "Copper Lever", "block.basemetals.copper_ore": "Minério de Cobre", "block.basemetals.copper_plate": "Chapa de Cobre", @@ -145,6 +153,7 @@ "block.basemetals.cupronickel_block": "Bloco de Cobreníquel", "block.basemetals.cupronickel_button": "Cupronickel Button", "block.basemetals.cupronickel_door": "Porta de Cobreníquel", + "block.basemetals.cupronickel_double_slab": "Cupronickel Double Slab", "block.basemetals.cupronickel_lever": "Cupronickel Lever", "block.basemetals.cupronickel_plate": "Cupronickel Plate", "block.basemetals.cupronickel_pressure_plate": "Cupronickel Pressure Plate", @@ -156,43 +165,19 @@ "block.basemetals.diamond_bars": "Diamond Bars", "block.basemetals.diamond_button": "Diamond Button", "block.basemetals.diamond_door": "Diamond Door", + "block.basemetals.diamond_double_slab": "Diamond Double Slab", "block.basemetals.diamond_lever": "Diamond Lever", "block.basemetals.diamond_pressure_plate": "Diamond Pressure Plate", "block.basemetals.diamond_slab": "Diamond Slab", "block.basemetals.diamond_stairs": "Diamond Stairs", "block.basemetals.diamond_trapdoor": "Diamond Trapdoor", "block.basemetals.diamond_wall": "Diamond Wall", - "block.basemetals.double_adamantine_slab": "Double Adamantine Slab", - "block.basemetals.double_antimony_slab": "Double Antimony Slab", - "block.basemetals.double_aquarium_slab": "Double Aquarium Slab", - "block.basemetals.double_bismuth_slab": "Double Bismuth Slab", - "block.basemetals.double_brass_slab": "Double Brass Slab", - "block.basemetals.double_bronze_slab": "Double Bronze Slab", - "block.basemetals.double_coldiron_slab": "Double Cold Iron Slab", - "block.basemetals.double_copper_slab": "Double Copper Slab", - "block.basemetals.double_cupronickel_slab": "Double Cupronickel Slab", - "block.basemetals.double_diamond_slab": "Double Diamond Slab", - "block.basemetals.double_electrum_slab": "Double Electrum Slab", - "block.basemetals.double_emerald_slab": "Double Emerald Slab", - "block.basemetals.double_gold_slab": "Double Gold Slab", - "block.basemetals.double_invar_slab": "Double Invar Slab", - "block.basemetals.double_iron_slab": "Double Iron Slab", - "block.basemetals.double_lead_slab": "Double Lead Slab", - "block.basemetals.double_mithril_slab": "Double Mithril Slab", - "block.basemetals.double_nickel_slab": "Double Nickel Slab", - "block.basemetals.double_obsidian_slab": "Double Obsidian Slab", - "block.basemetals.double_pewter_slab": "Double Pewter Slab", - "block.basemetals.double_platinum_slab": "Double Platinum Slab", - "block.basemetals.double_silver_slab": "Double Silver Slab", - "block.basemetals.double_starsteel_slab": "Double Starsteel Slab", - "block.basemetals.double_steel_slab": "Double Steel Slab", - "block.basemetals.double_tin_slab": "Double Tin Slab", - "block.basemetals.double_zinc_slab": "Double Zinc Slab", "block.basemetals.electrum": "Molten Electrum", "block.basemetals.electrum_bars": "Barras de Electrum", "block.basemetals.electrum_block": "Cubo de Electrum", "block.basemetals.electrum_button": "Electrum Button", "block.basemetals.electrum_door": "Porta de Electrum", + "block.basemetals.electrum_double_slab": "Electrum Double Slab", "block.basemetals.electrum_lever": "Electrum Lever", "block.basemetals.electrum_plate": "Chapa de Electrum", "block.basemetals.electrum_pressure_plate": "Electrum Pressure Plate", @@ -204,6 +189,7 @@ "block.basemetals.emerald_bars": "Emerald Bars", "block.basemetals.emerald_button": "Emerald Button", "block.basemetals.emerald_door": "Emerald Door", + "block.basemetals.emerald_double_slab": "Emerald Double Slab", "block.basemetals.emerald_lever": "Emerald Lever", "block.basemetals.emerald_pressure_plate": "Emerald Pressure Plate", "block.basemetals.emerald_slab": "Emerald Slab", @@ -215,6 +201,7 @@ "block.basemetals.gold_bars": "Gold Bars", "block.basemetals.gold_button": "Gold Button", "block.basemetals.gold_door": "Gold Door", + "block.basemetals.gold_double_slab": "Gold Double Slab", "block.basemetals.gold_lever": "Gold Lever", "block.basemetals.gold_plate": "Chapa de Ouro", "block.basemetals.gold_slab": "Gold Slab", @@ -227,6 +214,7 @@ "block.basemetals.invar_block": "Cubo de Invar", "block.basemetals.invar_button": "Invar Button", "block.basemetals.invar_door": "Porta de Invar", + "block.basemetals.invar_double_slab": "Invar Double Slab", "block.basemetals.invar_lever": "Invar Lever", "block.basemetals.invar_plate": "Chapa de Invar", "block.basemetals.invar_pressure_plate": "Invar Pressure Plate", @@ -236,17 +224,18 @@ "block.basemetals.invar_wall": "Invar Wall", "block.basemetals.iron": "Molten Iron", "block.basemetals.iron_button": "Iron Button", + "block.basemetals.iron_double_slab": "Iron Double Slab", "block.basemetals.iron_lever": "Iron Lever", "block.basemetals.iron_plate": "Chapa de Ferro", "block.basemetals.iron_slab": "Iron Slab", "block.basemetals.iron_stairs": "Iron Stairs", "block.basemetals.iron_wall": "Iron Wall", - "block.basemetals.lapis": "Molten Lapis", "block.basemetals.lead": "Molten Lead", "block.basemetals.lead_bars": "Barras de Chumbo", "block.basemetals.lead_block": "Cubo de Chumbo", "block.basemetals.lead_button": "Lead Button", "block.basemetals.lead_door": "Porta de Chumbo", + "block.basemetals.lead_double_slab": "Lead Double Slab", "block.basemetals.lead_lever": "Lead Lever", "block.basemetals.lead_ore": "Minério de Chumbo", "block.basemetals.lead_plate": "Chapa de Chumbo", @@ -262,6 +251,7 @@ "block.basemetals.mithril_block": "Cubo de Mithril", "block.basemetals.mithril_button": "Mithril Button", "block.basemetals.mithril_door": "Porta de Mithril", + "block.basemetals.mithril_double_slab": "Mithril Double Slab", "block.basemetals.mithril_lever": "Mithril Lever", "block.basemetals.mithril_plate": "Chapa de Mithril", "block.basemetals.mithril_pressure_plate": "Mithril Pressure Plate", @@ -274,6 +264,7 @@ "block.basemetals.nickel_block": "Cubo de Níquel", "block.basemetals.nickel_button": "Nickel Button", "block.basemetals.nickel_door": "Porta de Níquel", + "block.basemetals.nickel_double_slab": "Nickel Double Slab", "block.basemetals.nickel_lever": "Nickel Lever", "block.basemetals.nickel_ore": "Minério de Níquel", "block.basemetals.nickel_plate": "Chapa de Níquel", @@ -286,6 +277,7 @@ "block.basemetals.obsidian_bars": "Obsidian Bars", "block.basemetals.obsidian_button": "Obsidian Button", "block.basemetals.obsidian_door": "Obsidian Door", + "block.basemetals.obsidian_double_slab": "Obsidian Double Slab", "block.basemetals.obsidian_lever": "Obsidian Lever", "block.basemetals.obsidian_pressure_plate": "Obsidian Pressure Plate", "block.basemetals.obsidian_slab": "Obsidian Slab", @@ -297,6 +289,7 @@ "block.basemetals.pewter_block": "Pewter Block", "block.basemetals.pewter_button": "Pewter Button", "block.basemetals.pewter_door": "Pewter Door", + "block.basemetals.pewter_double_slab": "Pewter Double Slab", "block.basemetals.pewter_lever": "Pewter Lever", "block.basemetals.pewter_plate": "Pewter Plate", "block.basemetals.pewter_pressure_plate": "Pewter Pressure Plate", @@ -309,6 +302,7 @@ "block.basemetals.platinum_block": "Cubo de Platina", "block.basemetals.platinum_button": "Platinum Button", "block.basemetals.platinum_door": "Porta de Platina", + "block.basemetals.platinum_double_slab": "Platinum Double Slab", "block.basemetals.platinum_lever": "Platinum Lever", "block.basemetals.platinum_ore": "Minério de Platina", "block.basemetals.platinum_plate": "Platinum Plate", @@ -332,6 +326,7 @@ "block.basemetals.silver_block": "Cubo de Prata", "block.basemetals.silver_button": "Silver Button", "block.basemetals.silver_door": "Porta de Prata", + "block.basemetals.silver_double_slab": "Silver Double Slab", "block.basemetals.silver_lever": "Silver Lever", "block.basemetals.silver_ore": "Minério de Prata", "block.basemetals.silver_plate": "Chapa de Prata", @@ -345,6 +340,7 @@ "block.basemetals.starsteel_block": "Cubo de Ferro-Estrela", "block.basemetals.starsteel_button": "Starsteel Button", "block.basemetals.starsteel_door": "Porta de Ferro-Estrela", + "block.basemetals.starsteel_double_slab": "Starsteel Double Slab", "block.basemetals.starsteel_lever": "Starsteel Lever", "block.basemetals.starsteel_ore": "Minério de Ferro-Estrela", "block.basemetals.starsteel_plate": "Chapa de Ferro-Estrela", @@ -359,6 +355,7 @@ "block.basemetals.steel_block": "Cubo de Aço", "block.basemetals.steel_button": "Steel Button", "block.basemetals.steel_door": "Porta de Aço", + "block.basemetals.steel_double_slab": "Steel Double Slab", "block.basemetals.steel_lever": "Steel Lever", "block.basemetals.steel_plate": "Chapa de Aço", "block.basemetals.steel_pressure_plate": "Steel Pressure Plate", @@ -366,13 +363,13 @@ "block.basemetals.steel_stairs": "Steel Stairs", "block.basemetals.steel_trapdoor": "Alçapão de Aço", "block.basemetals.steel_wall": "Steel Wall", - "block.basemetals.stone": "Molten Stone", "block.basemetals.stone_anvil": "Stone Anvil", "block.basemetals.tin": "Molten Tin", "block.basemetals.tin_bars": "Barras de Estanho", "block.basemetals.tin_block": "Cubo de Estanho", "block.basemetals.tin_button": "Tin Button", "block.basemetals.tin_door": "Porta de Estanho", + "block.basemetals.tin_double_slab": "Tin Double Slab", "block.basemetals.tin_lever": "Tin Lever", "block.basemetals.tin_ore": "Minério de Estanho", "block.basemetals.tin_plate": "Chapa de Estanho", @@ -381,12 +378,12 @@ "block.basemetals.tin_stairs": "Tin Stairs", "block.basemetals.tin_trapdoor": "Alçapão de Estanho", "block.basemetals.tin_wall": "Tin Wall", - "block.basemetals.wood": "Molten Wood", "block.basemetals.zinc": "Molten Zinc", "block.basemetals.zinc_bars": "Zinc Bars", "block.basemetals.zinc_block": "Zinco Cubo de Zinco", "block.basemetals.zinc_button": "Zinc Button", "block.basemetals.zinc_door": "Zinc Door", + "block.basemetals.zinc_double_slab": "Zinc Double Slab", "block.basemetals.zinc_lever": "Zinc Lever", "block.basemetals.zinc_ore": "Minério de Zinco", "block.basemetals.zinc_plate": "Chapa de Zinco", @@ -448,12 +445,10 @@ "item.basemetals.adamantine_button": "Adamantine Button", "item.basemetals.adamantine_casing": "Adamantine Casing", "item.basemetals.adamantine_chestplate": "Peitoral de Magnetita", - "item.basemetals.adamantine_clump": "Adamantine Clump", "item.basemetals.adamantine_crackhammer": "Marreta de Magnetita", "item.basemetals.adamantine_crossbow": "Adamantine Crossbow", "item.basemetals.adamantine_crushed": "Adamantine Crushed", "item.basemetals.adamantine_crushed_purified": "Adamantine Crushed Purified", - "item.basemetals.adamantine_crystal": "Adamantine Crystal", "item.basemetals.adamantine_dense_plate": "Adamantine Dense Plate", "item.basemetals.adamantine_door": "Porta de Magnetita", "item.basemetals.adamantine_fishing_rod": "Adamantine Fishing Rod", @@ -469,12 +464,10 @@ "item.basemetals.adamantine_pickaxe": "Picareta de Magnetita", "item.basemetals.adamantine_plate": "Adamantine Plate", "item.basemetals.adamantine_powder": "Magnetita Pulverizado", - "item.basemetals.adamantine_powder_dirty": "Adamantine Powder Dirty", "item.basemetals.adamantine_pressure_plate": "Adamantine Pressure Plate", "item.basemetals.adamantine_raw": "Adamantine bruto", "item.basemetals.adamantine_rod": "Haste de Magnetita", "item.basemetals.adamantine_scythe": "Adamantine Scythe", - "item.basemetals.adamantine_shard": "Adamantine Shard", "item.basemetals.adamantine_shears": "Adamantine Shears", "item.basemetals.adamantine_shield": "Adamantine Shield", "item.basemetals.adamantine_shovel": "Pá de Magnetita", @@ -496,12 +489,10 @@ "item.basemetals.antimony_button": "Antimony Button", "item.basemetals.antimony_casing": "Antimony Casing", "item.basemetals.antimony_chestplate": "Antimony Chestplate", - "item.basemetals.antimony_clump": "Antimony Clump", "item.basemetals.antimony_crackhammer": "Antimony Crackhammer", "item.basemetals.antimony_crossbow": "Antimony Crossbow", "item.basemetals.antimony_crushed": "Antimony Crushed", "item.basemetals.antimony_crushed_purified": "Antimony Crushed Purified", - "item.basemetals.antimony_crystal": "Antimony Crystal", "item.basemetals.antimony_dense_plate": "Antimony Dense Plate", "item.basemetals.antimony_door": "Antimony Door", "item.basemetals.antimony_fishing_rod": "Antimony Fishing Rod", @@ -517,12 +508,10 @@ "item.basemetals.antimony_pickaxe": "Antimony Pickaxe", "item.basemetals.antimony_plate": "Antimony Plate", "item.basemetals.antimony_powder": "Antimony Powder", - "item.basemetals.antimony_powder_dirty": "Antimony Powder Dirty", "item.basemetals.antimony_pressure_plate": "Antimony Pressure Plate", "item.basemetals.antimony_raw": "Antimony bruto", "item.basemetals.antimony_rod": "Antimony Rod", "item.basemetals.antimony_scythe": "Antimony Scythe", - "item.basemetals.antimony_shard": "Antimony Shard", "item.basemetals.antimony_shears": "Antimony Shears", "item.basemetals.antimony_shield": "Antimony Shield", "item.basemetals.antimony_shovel": "Antimony Shovel", @@ -584,12 +573,10 @@ "item.basemetals.bismuth_button": "Bismuth Button", "item.basemetals.bismuth_casing": "Bismuth Casing", "item.basemetals.bismuth_chestplate": "Bismuth Chestplate", - "item.basemetals.bismuth_clump": "Bismuth Clump", "item.basemetals.bismuth_crackhammer": "Bismuth Crackhammer", "item.basemetals.bismuth_crossbow": "Bismuth Crossbow", "item.basemetals.bismuth_crushed": "Bismuth Crushed", "item.basemetals.bismuth_crushed_purified": "Bismuth Crushed Purified", - "item.basemetals.bismuth_crystal": "Bismuth Crystal", "item.basemetals.bismuth_dense_plate": "Bismuth Dense Plate", "item.basemetals.bismuth_door": "Bismuth Door", "item.basemetals.bismuth_fishing_rod": "Bismuth Fishing Rod", @@ -605,12 +592,10 @@ "item.basemetals.bismuth_pickaxe": "Bismuth Pickaxe", "item.basemetals.bismuth_plate": "Bismuth Plate", "item.basemetals.bismuth_powder": "Bismuth Powder", - "item.basemetals.bismuth_powder_dirty": "Bismuth Powder Dirty", "item.basemetals.bismuth_pressure_plate": "Bismuth Pressure Plate", "item.basemetals.bismuth_raw": "Bismuth bruto", "item.basemetals.bismuth_rod": "Bismuth Rod", "item.basemetals.bismuth_scythe": "Bismuth Scythe", - "item.basemetals.bismuth_shard": "Bismuth Shard", "item.basemetals.bismuth_shears": "Bismuth Shears", "item.basemetals.bismuth_shield": "Bismuth Shield", "item.basemetals.bismuth_shovel": "Bismuth Shovel", @@ -724,12 +709,10 @@ "item.basemetals.coldiron_button": "Cold Iron Button", "item.basemetals.coldiron_casing": "Cold Iron Casing", "item.basemetals.coldiron_chestplate": "Peitoral de Ferro-Frio", - "item.basemetals.coldiron_clump": "Cold Iron Clump", "item.basemetals.coldiron_crackhammer": "Marreta de Ferro-Frio", "item.basemetals.coldiron_crossbow": "Cold Iron Crossbow", "item.basemetals.coldiron_crushed": "Cold Iron Crushed", "item.basemetals.coldiron_crushed_purified": "Cold Iron Crushed Purified", - "item.basemetals.coldiron_crystal": "Cold Iron Crystal", "item.basemetals.coldiron_dense_plate": "Cold Iron Dense Plate", "item.basemetals.coldiron_door": "Porta de Ferro-Frio", "item.basemetals.coldiron_fishing_rod": "Cold Iron Fishing Rod", @@ -745,12 +728,10 @@ "item.basemetals.coldiron_pickaxe": "Picareta de Ferro-Frio", "item.basemetals.coldiron_plate": "Cold Iron Plate", "item.basemetals.coldiron_powder": "Ferro-Frio Pulverizado", - "item.basemetals.coldiron_powder_dirty": "Cold Iron Powder Dirty", "item.basemetals.coldiron_pressure_plate": "Cold Iron Pressure Plate", "item.basemetals.coldiron_raw": "Cold Iron bruto", "item.basemetals.coldiron_rod": "Haste de Ferro-Frio", "item.basemetals.coldiron_scythe": "Cold Iron Scythe", - "item.basemetals.coldiron_shard": "Cold Iron Shard", "item.basemetals.coldiron_shears": "Cold Iron Shears", "item.basemetals.coldiron_shield": "Cold Iron Shield", "item.basemetals.coldiron_shovel": "Pá de Ferro-Frio", @@ -1033,8 +1014,6 @@ "item.basemetals.iron_smallpowder": "Iron Smallpowder", "item.basemetals.iron_stairs": "Iron Stairs", "item.basemetals.iron_wall": "Iron Wall", - "item.basemetals.lapis": "Lapis", - "item.basemetals.lapis_bucket": "Balde de lápis-lazúli fundido", "item.basemetals.lapis_smallpowder": "Lapis Smallpowder", "item.basemetals.lead": "Lead", "item.basemetals.lead_arrow": "Lead Arrow", @@ -1137,12 +1116,10 @@ "item.basemetals.nickel_button": "Nickel Button", "item.basemetals.nickel_casing": "Nickel Casing", "item.basemetals.nickel_chestplate": "Peitoral de Níquel", - "item.basemetals.nickel_clump": "Nickel Clump", "item.basemetals.nickel_crackhammer": "Marreta de Níquel", "item.basemetals.nickel_crossbow": "Nickel Crossbow", "item.basemetals.nickel_crushed": "Nickel Crushed", "item.basemetals.nickel_crushed_purified": "Nickel Crushed Purified", - "item.basemetals.nickel_crystal": "Nickel Crystal", "item.basemetals.nickel_dense_plate": "Nickel Dense Plate", "item.basemetals.nickel_door": "Porta de Níquel", "item.basemetals.nickel_fishing_rod": "Nickel Fishing Rod", @@ -1158,12 +1135,10 @@ "item.basemetals.nickel_pickaxe": "Picareta de Níquel", "item.basemetals.nickel_plate": "Nickel Plate", "item.basemetals.nickel_powder": "Níquel Pulverizado", - "item.basemetals.nickel_powder_dirty": "Nickel Powder Dirty", "item.basemetals.nickel_pressure_plate": "Nickel Pressure Plate", "item.basemetals.nickel_raw": "Nickel bruto", "item.basemetals.nickel_rod": "Haste de Níquel", "item.basemetals.nickel_scythe": "Nickel Scythe", - "item.basemetals.nickel_shard": "Nickel Shard", "item.basemetals.nickel_shears": "Nickel Shears", "item.basemetals.nickel_shield": "Nickel Shield", "item.basemetals.nickel_shovel": "Pá de Níquel", @@ -1261,12 +1236,10 @@ "item.basemetals.platinum_button": "Platinum Button", "item.basemetals.platinum_casing": "Platinum Casing", "item.basemetals.platinum_chestplate": "Peitoral de Platina", - "item.basemetals.platinum_clump": "Platinum Clump", "item.basemetals.platinum_crackhammer": "Marreta de Platina", "item.basemetals.platinum_crossbow": "Platinum Crossbow", "item.basemetals.platinum_crushed": "Platinum Crushed", "item.basemetals.platinum_crushed_purified": "Platinum Crushed Purified", - "item.basemetals.platinum_crystal": "Platinum Crystal", "item.basemetals.platinum_dense_plate": "Platinum Dense Plate", "item.basemetals.platinum_door": "Porta de Platina", "item.basemetals.platinum_fishing_rod": "Platinum Fishing Rod", @@ -1282,12 +1255,10 @@ "item.basemetals.platinum_pickaxe": "Picareta de Platina", "item.basemetals.platinum_plate": "Platinum Plate", "item.basemetals.platinum_powder": "Platina Pulverizado", - "item.basemetals.platinum_powder_dirty": "Platinum Powder Dirty", "item.basemetals.platinum_pressure_plate": "Platinum Pressure Plate", "item.basemetals.platinum_raw": "Platinum bruto", "item.basemetals.platinum_rod": "Haste de Platina", "item.basemetals.platinum_scythe": "Platinum Scythe", - "item.basemetals.platinum_shard": "Platinum Shard", "item.basemetals.platinum_shears": "Platinum Shears", "item.basemetals.platinum_shield": "Platinum Shield", "item.basemetals.platinum_shovel": "Pá de Platina", @@ -1388,12 +1359,10 @@ "item.basemetals.starsteel_button": "Starsteel Button", "item.basemetals.starsteel_casing": "Starsteel Casing", "item.basemetals.starsteel_chestplate": "Peitoral de Ferro-Estrela", - "item.basemetals.starsteel_clump": "Starsteel Clump", "item.basemetals.starsteel_crackhammer": "Marreta de Ferro-Estrela", "item.basemetals.starsteel_crossbow": "Starsteel Crossbow", "item.basemetals.starsteel_crushed": "Starsteel Crushed", "item.basemetals.starsteel_crushed_purified": "Starsteel Crushed Purified", - "item.basemetals.starsteel_crystal": "Starsteel Crystal", "item.basemetals.starsteel_dense_plate": "Starsteel Dense Plate", "item.basemetals.starsteel_door": "Porta de Ferro-Estrela", "item.basemetals.starsteel_fishing_rod": "Starsteel Fishing Rod", @@ -1409,12 +1378,10 @@ "item.basemetals.starsteel_pickaxe": "Picareta de Ferro-Estrela", "item.basemetals.starsteel_plate": "Starsteel Plate", "item.basemetals.starsteel_powder": "Ferro-Estrela Pulverizado", - "item.basemetals.starsteel_powder_dirty": "Starsteel Powder Dirty", "item.basemetals.starsteel_pressure_plate": "Starsteel Pressure Plate", "item.basemetals.starsteel_raw": "Starsteel bruto", "item.basemetals.starsteel_rod": "Haste de Ferro-Estrela", "item.basemetals.starsteel_scythe": "Starsteel Scythe", - "item.basemetals.starsteel_shard": "Starsteel Shard", "item.basemetals.starsteel_shears": "Starsteel Shears", "item.basemetals.starsteel_shield": "Starsteel Shield", "item.basemetals.starsteel_shovel": "Pá de Ferro-Estrela", @@ -1465,9 +1432,7 @@ "item.basemetals.steel_sword": "Espada de Aço", "item.basemetals.steel_trapdoor": "Alçapão de Aço", "item.basemetals.steel_wall": "Steel Wall", - "item.basemetals.stone": "Stone", "item.basemetals.stone_anvil": "Stone Anvil", - "item.basemetals.stone_bucket": "Balde de pedra fundida", "item.basemetals.stone_crackhammer": "Marreta de Pedra", "item.basemetals.stone_gear": "Stone Gear", "item.basemetals.stone_rod": "Stone Rod", @@ -1512,8 +1477,6 @@ "item.basemetals.tin_sword": "Espada de Estanho", "item.basemetals.tin_trapdoor": "Estanho Alçapão de Estanho", "item.basemetals.tin_wall": "Tin Wall", - "item.basemetals.wood": "Wood", - "item.basemetals.wood_bucket": "Balde de madeira liquefeita", "item.basemetals.wood_crackhammer": "Marreta de Madeira", "item.basemetals.wood_gear": "Wood Gear", "item.basemetals.wood_scythe": "Wood Scythe", @@ -1529,12 +1492,10 @@ "item.basemetals.zinc_button": "Zinc Button", "item.basemetals.zinc_casing": "Zinc Casing", "item.basemetals.zinc_chestplate": "Zinc Chestplate", - "item.basemetals.zinc_clump": "Zinc Clump", "item.basemetals.zinc_crackhammer": "Zinc Crackhammer", "item.basemetals.zinc_crossbow": "Zinc Crossbow", "item.basemetals.zinc_crushed": "Zinc Crushed", "item.basemetals.zinc_crushed_purified": "Zinc Crushed Purified", - "item.basemetals.zinc_crystal": "Zinc Crystal", "item.basemetals.zinc_dense_plate": "Zinc Dense Plate", "item.basemetals.zinc_door": "Zinc Door", "item.basemetals.zinc_fishing_rod": "Zinc Fishing Rod", @@ -1550,12 +1511,10 @@ "item.basemetals.zinc_pickaxe": "Zinc Pickaxe", "item.basemetals.zinc_plate": "Zinc Plate", "item.basemetals.zinc_powder": "Zinco Pulverizado", - "item.basemetals.zinc_powder_dirty": "Zinc Powder Dirty", "item.basemetals.zinc_pressure_plate": "Zinc Pressure Plate", "item.basemetals.zinc_raw": "Zinc bruto", "item.basemetals.zinc_rod": "Haste de Zinco", "item.basemetals.zinc_scythe": "Zinc Scythe", - "item.basemetals.zinc_shard": "Zinc Shard", "item.basemetals.zinc_shears": "Zinc Shears", "item.basemetals.zinc_shield": "Zinc Shield", "item.basemetals.zinc_shovel": "Zinc Shovel", @@ -1583,7 +1542,6 @@ "item.bucket.gold": "Balde de ouro fundido", "item.bucket.invar": "Balde de invar fundido", "item.bucket.iron": "Balde de ferro fundido", - "item.bucket.lapis": "Balde de lápis-lazúli fundido", "item.bucket.lead": "Balde de chumbo fundido", "item.bucket.mercury": "Balde de mercúrio", "item.bucket.mithril": "Balde de mithril fundido", @@ -1597,13 +1555,12 @@ "item.bucket.silver": "Balde de prata fundida", "item.bucket.starsteel": "Balde de aço estelar fundido", "item.bucket.steel": "Balde de aço fundido", - "item.bucket.stone": "Balde de pedra fundida", "item.bucket.tin": "Balde de estanho fundido", - "item.bucket.wood": "Balde de madeira liquefeita", "item.bucket.zinc": "Balde de zinco fundido", "itemGroup.basemetals.blocks": "Base Metals Blocks", "itemGroup.basemetals.combat": "Base Metals Combat", "itemGroup.basemetals.items": "Base Metals Items", + "itemGroup.basemetals.materials": "Base Metals Materials", "itemGroup.basemetals.tools": "Base Metals Tools", "language_support_goals": "english (en_US,en_EN,en_CA,en_GB, en_AU, en_PT), spanish (es_MX,es_ES), simplified chinese (zh_CN), portugese(pt_BR), italian(IT_it), japanese (ja_JA), portugese (pt_BR), german (de_DE)", "material.basemetals.adamantine": "Adamantine", diff --git a/src/generated/resources/assets/basemetals/lang/ru_ru.json b/src/generated/resources/assets/basemetals/lang/ru_ru.json index 34a727e46..f06b0ab54 100644 --- a/src/generated/resources/assets/basemetals/lang/ru_ru.json +++ b/src/generated/resources/assets/basemetals/lang/ru_ru.json @@ -43,6 +43,7 @@ "block.basemetals.adamantine_button": "Адамантиновая кнопка", "block.basemetals.adamantine_dense_plate": "Адамантиновая сжатая пластина", "block.basemetals.adamantine_door": "Адамантиновая дверь", + "block.basemetals.adamantine_double_slab": "Adamantine Double Slab", "block.basemetals.adamantine_lever": "Адамантиновый рычаг", "block.basemetals.adamantine_ore": "Адамантиновая руда", "block.basemetals.adamantine_plate": "Адамантиновая пластина", @@ -57,6 +58,7 @@ "block.basemetals.antimony_button": "Сурьмяная кнопка", "block.basemetals.antimony_dense_plate": "Сурьмяная сжатая пластина", "block.basemetals.antimony_door": "Сурьмяная дверь", + "block.basemetals.antimony_double_slab": "Antimony Double Slab", "block.basemetals.antimony_lever": "Сурьмяный рычаг", "block.basemetals.antimony_ore": "Сурьмяная руда", "block.basemetals.antimony_plate": "Сурьмяная пластина", @@ -71,6 +73,7 @@ "block.basemetals.aquarium_button": "Аквариумовая кнопка", "block.basemetals.aquarium_dense_plate": "Аквариумовая сжатая пластина", "block.basemetals.aquarium_door": "Аквариумовая дверь", + "block.basemetals.aquarium_double_slab": "Aquarium Double Slab", "block.basemetals.aquarium_lever": "Аквариумовый рычаг", "block.basemetals.aquarium_ore": "Аквариумовая руда", "block.basemetals.aquarium_plate": "Аквариумовая пластина", @@ -85,6 +88,7 @@ "block.basemetals.bismuth_button": "Висмутовая кнопка", "block.basemetals.bismuth_dense_plate": "Висмутовая сжатая пластина", "block.basemetals.bismuth_door": "Висмутовая дверь", + "block.basemetals.bismuth_double_slab": "Bismuth Double Slab", "block.basemetals.bismuth_lever": "Висмутовый рычаг", "block.basemetals.bismuth_ore": "Висмутовая руда", "block.basemetals.bismuth_plate": "Висмутовая пластина", @@ -99,6 +103,7 @@ "block.basemetals.brass_button": "Латунная кнопка", "block.basemetals.brass_dense_plate": "Латунная сжатая пластина", "block.basemetals.brass_door": "Латунная дверь", + "block.basemetals.brass_double_slab": "Brass Double Slab", "block.basemetals.brass_lever": "Латунный рычаг", "block.basemetals.brass_plate": "Латунная пластина", "block.basemetals.brass_pressure_plate": "Латунная нажимная пластина", @@ -112,6 +117,7 @@ "block.basemetals.bronze_button": "Бронзовая кнопка", "block.basemetals.bronze_dense_plate": "Бронзовая сжатая пластина", "block.basemetals.bronze_door": "Бронзовая дверь", + "block.basemetals.bronze_double_slab": "Bronze Double Slab", "block.basemetals.bronze_lever": "Бронзовый рычаг", "block.basemetals.bronze_plate": "Бронзовая пластина", "block.basemetals.bronze_pressure_plate": "Бронзовая нажимная пластина", @@ -128,6 +134,7 @@ "block.basemetals.coldiron_button": "Хладо-железная кнопка", "block.basemetals.coldiron_dense_plate": "Хладо-железная сжатая пластина", "block.basemetals.coldiron_door": "Хладо-железная дверь", + "block.basemetals.coldiron_double_slab": "Cold Iron Double Slab", "block.basemetals.coldiron_lever": "Хладо-железный рычаг", "block.basemetals.coldiron_ore": "Хладо-железная руда", "block.basemetals.coldiron_plate": "Хладо-железная пластина", @@ -142,6 +149,7 @@ "block.basemetals.copper_button": "Медная кнопка", "block.basemetals.copper_dense_plate": "Медная сжатая пластина", "block.basemetals.copper_door": "Медная дверь", + "block.basemetals.copper_double_slab": "Copper Double Slab", "block.basemetals.copper_lever": "Медный рычаг", "block.basemetals.copper_ore": "Медная руда", "block.basemetals.copper_plate": "Медная пластина", @@ -156,6 +164,7 @@ "block.basemetals.cupronickel_button": "Мельхиоровая кнопка", "block.basemetals.cupronickel_dense_plate": "Мельхиоровая сжатая пластина", "block.basemetals.cupronickel_door": "Мельхиоровая дверь", + "block.basemetals.cupronickel_double_slab": "Cupronickel Double Slab", "block.basemetals.cupronickel_lever": "Мельхиоровый рычаг", "block.basemetals.cupronickel_plate": "Мельхиоровая пластина", "block.basemetals.cupronickel_pressure_plate": "Мельхиоровая нажимная пластина", @@ -167,44 +176,20 @@ "block.basemetals.diamond_bars": "Алмазные прутья", "block.basemetals.diamond_button": "Алмазная кнопка", "block.basemetals.diamond_door": "Алмазная дверь", + "block.basemetals.diamond_double_slab": "Diamond Double Slab", "block.basemetals.diamond_lever": "Алмазный рычаг", "block.basemetals.diamond_pressure_plate": "Алмазная нажимная пластина", "block.basemetals.diamond_slab": "Алмазная плита", "block.basemetals.diamond_stairs": "Алмазные ступеньки", "block.basemetals.diamond_trapdoor": "Алмазный люк", "block.basemetals.diamond_wall": "Алмазная ограда", - "block.basemetals.double_adamantine_slab": "Double Adamantine Slab", - "block.basemetals.double_antimony_slab": "Double Antimony Slab", - "block.basemetals.double_aquarium_slab": "Double Aquarium Slab", - "block.basemetals.double_bismuth_slab": "Double Bismuth Slab", - "block.basemetals.double_brass_slab": "Double Brass Slab", - "block.basemetals.double_bronze_slab": "Double Bronze Slab", - "block.basemetals.double_coldiron_slab": "Double Cold Iron Slab", - "block.basemetals.double_copper_slab": "Double Copper Slab", - "block.basemetals.double_cupronickel_slab": "Double Cupronickel Slab", - "block.basemetals.double_diamond_slab": "Double Diamond Slab", - "block.basemetals.double_electrum_slab": "Double Electrum Slab", - "block.basemetals.double_emerald_slab": "Double Emerald Slab", - "block.basemetals.double_gold_slab": "Double Gold Slab", - "block.basemetals.double_invar_slab": "Double Invar Slab", - "block.basemetals.double_iron_slab": "Double Iron Slab", - "block.basemetals.double_lead_slab": "Double Lead Slab", - "block.basemetals.double_mithril_slab": "Double Mithril Slab", - "block.basemetals.double_nickel_slab": "Double Nickel Slab", - "block.basemetals.double_obsidian_slab": "Double Obsidian Slab", - "block.basemetals.double_pewter_slab": "Double Pewter Slab", - "block.basemetals.double_platinum_slab": "Double Platinum Slab", - "block.basemetals.double_silver_slab": "Double Silver Slab", - "block.basemetals.double_starsteel_slab": "Double Starsteel Slab", - "block.basemetals.double_steel_slab": "Double Steel Slab", - "block.basemetals.double_tin_slab": "Double Tin Slab", - "block.basemetals.double_zinc_slab": "Double Zinc Slab", "block.basemetals.electrum": "Расплавленный электрум", "block.basemetals.electrum_bars": "Электрумовые прутья", "block.basemetals.electrum_block": "Блок электрума", "block.basemetals.electrum_button": "Электрумовая кнопка", "block.basemetals.electrum_dense_plate": "Электрумовая сжатая пластина", "block.basemetals.electrum_door": "Электрумовая дверь", + "block.basemetals.electrum_double_slab": "Electrum Double Slab", "block.basemetals.electrum_lever": "Электрумовый рычаг", "block.basemetals.electrum_plate": "Электрумовая пластина", "block.basemetals.electrum_pressure_plate": "Электрумовая нажимная пластина", @@ -216,6 +201,7 @@ "block.basemetals.emerald_bars": "Изумрудные прутья", "block.basemetals.emerald_button": "Изумрудная кнопка", "block.basemetals.emerald_door": "Изумрудная дверь", + "block.basemetals.emerald_double_slab": "Emerald Double Slab", "block.basemetals.emerald_lever": "Изумрудный рычаг", "block.basemetals.emerald_pressure_plate": "Изумрудная нажимная пластина", "block.basemetals.emerald_slab": "Изумрудная плита", @@ -228,6 +214,7 @@ "block.basemetals.gold_button": "Золотая кнопка", "block.basemetals.gold_dense_plate": "Золотая сжатая пластина", "block.basemetals.gold_door": "Золотой дверь", + "block.basemetals.gold_double_slab": "Gold Double Slab", "block.basemetals.gold_lever": "Золотой рычаг", "block.basemetals.gold_plate": "Золотая пластина", "block.basemetals.gold_pressure_plate": "Золотая нажимная пластина", @@ -242,6 +229,7 @@ "block.basemetals.invar_button": "Инваровая кнопка", "block.basemetals.invar_dense_dense_plate": "Инваровая сжатая пластина", "block.basemetals.invar_door": "Инваровая дверь", + "block.basemetals.invar_double_slab": "Invar Double Slab", "block.basemetals.invar_lever": "Инваровый рычаг", "block.basemetals.invar_plate": "Инваровая пластина", "block.basemetals.invar_pressure_plate": "Инваровая нажимная пластина", @@ -252,19 +240,20 @@ "block.basemetals.iron": "Расплавленное железо", "block.basemetals.iron_button": "Железная кнопка", "block.basemetals.iron_dense_plate": "Железная сжатая пластина", + "block.basemetals.iron_double_slab": "Iron Double Slab", "block.basemetals.iron_lever": "Железный рычаг", "block.basemetals.iron_plate": "Железная пластина", "block.basemetals.iron_pressure_plate": "Железная нажимная пластина", "block.basemetals.iron_slab": "Железная плита", "block.basemetals.iron_stairs": "Железные ступеньки", "block.basemetals.iron_wall": "Железная ограда", - "block.basemetals.lapis": "Molten Lapis", "block.basemetals.lead": "Расплавленный свинец", "block.basemetals.lead_bars": "Свинцовые прутья", "block.basemetals.lead_block": "Блок свинца", "block.basemetals.lead_button": "Свинцовая кнопка", "block.basemetals.lead_dense_plate": "Свинцовая сжатая пластина", "block.basemetals.lead_door": "Свинцовая дверь", + "block.basemetals.lead_double_slab": "Lead Double Slab", "block.basemetals.lead_lever": "Свинцовый рычаг", "block.basemetals.lead_ore": "Свинцовая руда", "block.basemetals.lead_plate": "Свинцовая пластина", @@ -281,6 +270,7 @@ "block.basemetals.mithril_button": "Мифриловая кнопка", "block.basemetals.mithril_dense_plate": "Мифриловая сжатая пластина", "block.basemetals.mithril_door": "Мифриловая дверь", + "block.basemetals.mithril_double_slab": "Mithril Double Slab", "block.basemetals.mithril_lever": "Мифриловый рычаг", "block.basemetals.mithril_plate": "Мифриловая пластина", "block.basemetals.mithril_pressure_plate": "Мифриловая нажимная пластина", @@ -294,6 +284,7 @@ "block.basemetals.nickel_button": "Никелевая кнопка", "block.basemetals.nickel_dense_plate": "Никелевая сжатая пластина", "block.basemetals.nickel_door": "Никелевая дверь", + "block.basemetals.nickel_double_slab": "Nickel Double Slab", "block.basemetals.nickel_lever": "Никелевый рычаг", "block.basemetals.nickel_ore": "Никелевая руда", "block.basemetals.nickel_plate": "Никелевая пластина", @@ -306,6 +297,7 @@ "block.basemetals.obsidian_bars": "Обсидиановые прутья", "block.basemetals.obsidian_button": "Обсидиановая кнопка", "block.basemetals.obsidian_door": "Обсидиановая дверь", + "block.basemetals.obsidian_double_slab": "Obsidian Double Slab", "block.basemetals.obsidian_lever": "Обсидиановый рычаг", "block.basemetals.obsidian_pressure_plate": "Обсидиановая нажимная пластина", "block.basemetals.obsidian_slab": "Обсидиановая плита", @@ -318,6 +310,7 @@ "block.basemetals.pewter_button": "Пьютеровая кнопка", "block.basemetals.pewter_dense_plate": "Пьютеровая сжатая пластина", "block.basemetals.pewter_door": "Пьютеровая дверь", + "block.basemetals.pewter_double_slab": "Pewter Double Slab", "block.basemetals.pewter_lever": "Пьютеровый рычаг", "block.basemetals.pewter_ore": "Оловянная руда", "block.basemetals.pewter_plate": "Пьютеровая пластина", @@ -332,6 +325,7 @@ "block.basemetals.platinum_button": "Платиновая кнопка", "block.basemetals.platinum_dense_plate": "Платиновая сжатая пластина", "block.basemetals.platinum_door": "Платиновая дверь", + "block.basemetals.platinum_double_slab": "Platinum Double Slab", "block.basemetals.platinum_lever": "Платиновый рычаг", "block.basemetals.platinum_ore": "Платиновая руда", "block.basemetals.platinum_plate": "Платиновая пластина", @@ -356,6 +350,7 @@ "block.basemetals.silver_button": "Серебрянная кнопка", "block.basemetals.silver_dense_plate": "Серебрянная сжатая пластина", "block.basemetals.silver_door": "Серебрянная дверь", + "block.basemetals.silver_double_slab": "Silver Double Slab", "block.basemetals.silver_lever": "Серебрянный рычаг", "block.basemetals.silver_ore": "Серебрянная руда", "block.basemetals.silver_plate": "Серебрянная пластина", @@ -370,6 +365,7 @@ "block.basemetals.starsteel_button": "Звёздно-стальная кнопка", "block.basemetals.starsteel_dense_plate": "Звёздно-стальная сжатая пластина", "block.basemetals.starsteel_door": "Звёздно-стальная дверь", + "block.basemetals.starsteel_double_slab": "Starsteel Double Slab", "block.basemetals.starsteel_lever": "Звёздно-стальной рычаг", "block.basemetals.starsteel_ore": "Звёздно-стальная руда", "block.basemetals.starsteel_plate": "Звёздно-стальная пластина", @@ -385,6 +381,7 @@ "block.basemetals.steel_button": "Стальная кнопка", "block.basemetals.steel_dense_plate": "Стальная сжатая пластина", "block.basemetals.steel_door": "Стальная дверь", + "block.basemetals.steel_double_slab": "Steel Double Slab", "block.basemetals.steel_lever": "Стальной рычаг", "block.basemetals.steel_plate": "Стальная пластина", "block.basemetals.steel_pressure_plate": "Стальная нажимная пластина", @@ -392,7 +389,6 @@ "block.basemetals.steel_stairs": "Стальные ступеньки", "block.basemetals.steel_trapdoor": "Стальной люк", "block.basemetals.steel_wall": "Стальная ограда", - "block.basemetals.stone": "Molten Stone", "block.basemetals.stone_anvil": "Stone Anvil", "block.basemetals.tin": "Расплавленное олово", "block.basemetals.tin_bars": "Оловянные прутья", @@ -400,6 +396,7 @@ "block.basemetals.tin_button": "Оловянная кнопка", "block.basemetals.tin_dense_plate": "Оловянная сжатая пластина", "block.basemetals.tin_door": "Оловянная дверь", + "block.basemetals.tin_double_slab": "Tin Double Slab", "block.basemetals.tin_lever": "Оловянный рычаг", "block.basemetals.tin_ore": "Оловянная руда", "block.basemetals.tin_plate": "Оловянная пластина", @@ -408,13 +405,13 @@ "block.basemetals.tin_stairs": "Оловянные ступеньки", "block.basemetals.tin_trapdoor": "Оловянный люк", "block.basemetals.tin_wall": "Оловянная ограда", - "block.basemetals.wood": "Molten Wood", "block.basemetals.zinc": "Расплавленный цинк", "block.basemetals.zinc_bars": "Цинковые прутья", "block.basemetals.zinc_block": "Блок цинка", "block.basemetals.zinc_button": "Цинковая кнопка", "block.basemetals.zinc_dense_plate": "Цинковая сжатая пластина", "block.basemetals.zinc_door": "Цинковая дверь", + "block.basemetals.zinc_double_slab": "Zinc Double Slab", "block.basemetals.zinc_lever": "Цинковый рычаг", "block.basemetals.zinc_ore": "Цинковая руда", "block.basemetals.zinc_plate": "Цинковая пластина", @@ -1198,8 +1195,6 @@ "item.basemetals.iron_smallpowder": "Небольшая кучка железной пыли", "item.basemetals.iron_stairs": "Железные ступеньки", "item.basemetals.iron_wall": "Железная ограда", - "item.basemetals.lapis": "Lapis", - "item.basemetals.lapis_bucket": "Ведро расплавленного лазурита", "item.basemetals.lapis_smallpowder": "Небольшая кучка лазуритовой пыли", "item.basemetals.lead": "Lead", "item.basemetals.lead_arrow": "Свинцовая стрела", @@ -1671,9 +1666,7 @@ "item.basemetals.steel_sword": "Стальной меч", "item.basemetals.steel_trapdoor": "Стальной люк", "item.basemetals.steel_wall": "Стальная ограда", - "item.basemetals.stone": "Stone", "item.basemetals.stone_anvil": "Stone Anvil", - "item.basemetals.stone_bucket": "Ведро расплавленного камня", "item.basemetals.stone_crackhammer": "Каменный измельчающий молот", "item.basemetals.stone_gear": "Каменная шестерня", "item.basemetals.stone_rod": "Каменный стержень", @@ -1726,8 +1719,6 @@ "item.basemetals.tin_sword": "Оловянный меч", "item.basemetals.tin_trapdoor": "Оловянный люк", "item.basemetals.tin_wall": "Оловянная ограда", - "item.basemetals.wood": "Wood", - "item.basemetals.wood_bucket": "Ведро жидкой древесины", "item.basemetals.wood_crackhammer": "Деревянный измельчающий молот", "item.basemetals.wood_gear": "Деревянная шестерня", "item.basemetals.wood_powder": "Небольшая кучка опилок", @@ -1798,7 +1789,6 @@ "item.bucket.gold": "Ведро расплавленного золота", "item.bucket.invar": "Ведро расплавленного инвара", "item.bucket.iron": "Ведро расплавленного железа", - "item.bucket.lapis": "Ведро расплавленного лазурита", "item.bucket.lead": "Ведро расплавленного свинца", "item.bucket.mercury": "Ведро ртути", "item.bucket.mithril": "Ведро расплавленного мифрила", @@ -1812,13 +1802,12 @@ "item.bucket.silver": "Ведро расплавленного серебра", "item.bucket.starsteel": "Ведро расплавленной звёздной стали", "item.bucket.steel": "Ведро расплавленной стали", - "item.bucket.stone": "Ведро расплавленного камня", "item.bucket.tin": "Ведро расплавленного олова", - "item.bucket.wood": "Ведро жидкой древесины", "item.bucket.zinc": "Ведро расплавленного цинка", "itemGroup.basemetals.blocks": "Base Metals: Блоки", "itemGroup.basemetals.combat": "Base Metals Combat", "itemGroup.basemetals.items": "Base Metals: Предметы", + "itemGroup.basemetals.materials": "Base Metals Materials", "itemGroup.basemetals.tools": "Base Metals: Инструменты", "material.adamantine.name": "Адамантин", "material.antimony.name": "Сурьма", diff --git a/src/generated/resources/assets/basemetals/lang/zh_cn.json b/src/generated/resources/assets/basemetals/lang/zh_cn.json index 4c511e7d2..a2354d311 100644 --- a/src/generated/resources/assets/basemetals/lang/zh_cn.json +++ b/src/generated/resources/assets/basemetals/lang/zh_cn.json @@ -43,6 +43,7 @@ "block.basemetals.adamantine_button": "艾德曼金属按钮", "block.basemetals.adamantine_dense_plate": "致密艾德曼金属板", "block.basemetals.adamantine_door": "艾德曼金属门", + "block.basemetals.adamantine_double_slab": "Adamantine Double Slab", "block.basemetals.adamantine_lever": "艾德曼金属拉杆", "block.basemetals.adamantine_ore": "艾德曼金属矿石", "block.basemetals.adamantine_plate": "艾德曼金属板", @@ -57,6 +58,7 @@ "block.basemetals.antimony_button": "锑按钮", "block.basemetals.antimony_dense_plate": "致密锑板", "block.basemetals.antimony_door": "锑门", + "block.basemetals.antimony_double_slab": "Antimony Double Slab", "block.basemetals.antimony_lever": "锑拉杆", "block.basemetals.antimony_ore": "锑矿石", "block.basemetals.antimony_plate": "锑板", @@ -71,6 +73,7 @@ "block.basemetals.aquarium_button": "海洋合金按钮", "block.basemetals.aquarium_dense_plate": "致密海洋合金板", "block.basemetals.aquarium_door": "海洋合金门", + "block.basemetals.aquarium_double_slab": "Aquarium Double Slab", "block.basemetals.aquarium_lever": "海洋合金拉杆", "block.basemetals.aquarium_ore": "海洋合金矿石", "block.basemetals.aquarium_plate": "海洋合金板", @@ -85,6 +88,7 @@ "block.basemetals.bismuth_button": "铋按钮", "block.basemetals.bismuth_dense_plate": "致密铋板", "block.basemetals.bismuth_door": "铋门", + "block.basemetals.bismuth_double_slab": "Bismuth Double Slab", "block.basemetals.bismuth_lever": "铋拉杆", "block.basemetals.bismuth_ore": "铋矿石", "block.basemetals.bismuth_plate": "铋板", @@ -99,6 +103,7 @@ "block.basemetals.brass_button": "黄铜按钮", "block.basemetals.brass_dense_plate": "致密黄铜板", "block.basemetals.brass_door": "黄铜门", + "block.basemetals.brass_double_slab": "Brass Double Slab", "block.basemetals.brass_lever": "黄铜拉杆", "block.basemetals.brass_plate": "黄铜板", "block.basemetals.brass_pressure_plate": "黄铜压力板", @@ -112,6 +117,7 @@ "block.basemetals.bronze_button": "青铜按钮", "block.basemetals.bronze_dense_plate": "致密黄铜板", "block.basemetals.bronze_door": "青铜门", + "block.basemetals.bronze_double_slab": "Bronze Double Slab", "block.basemetals.bronze_lever": "青铜拉杆", "block.basemetals.bronze_plate": "青铜板", "block.basemetals.bronze_pressure_plate": "青铜压力板", @@ -128,6 +134,7 @@ "block.basemetals.coldiron_button": "寒铁按钮", "block.basemetals.coldiron_dense_plate": "致密寒铁板", "block.basemetals.coldiron_door": "寒铁门", + "block.basemetals.coldiron_double_slab": "Cold Iron Double Slab", "block.basemetals.coldiron_lever": "寒铁拉杆", "block.basemetals.coldiron_ore": "寒铁矿石", "block.basemetals.coldiron_plate": "寒铁板", @@ -142,6 +149,7 @@ "block.basemetals.copper_button": "铜按钮", "block.basemetals.copper_dense_plate": "致密铜板", "block.basemetals.copper_door": "铜门", + "block.basemetals.copper_double_slab": "Copper Double Slab", "block.basemetals.copper_lever": "铜拉杆", "block.basemetals.copper_ore": "铜矿石", "block.basemetals.copper_plate": "铜板", @@ -156,6 +164,7 @@ "block.basemetals.cupronickel_button": "白铜按钮", "block.basemetals.cupronickel_dense_plate": "致密白铜板", "block.basemetals.cupronickel_door": "白铜门", + "block.basemetals.cupronickel_double_slab": "Cupronickel Double Slab", "block.basemetals.cupronickel_lever": "白铜拉杆", "block.basemetals.cupronickel_plate": "白铜板", "block.basemetals.cupronickel_pressure_plate": "白铜压力板", @@ -167,44 +176,20 @@ "block.basemetals.diamond_bars": "钻石栏杆", "block.basemetals.diamond_button": "钻石", "block.basemetals.diamond_door": "钻石门", + "block.basemetals.diamond_double_slab": "Diamond Double Slab", "block.basemetals.diamond_lever": "钻石拉杆", "block.basemetals.diamond_pressure_plate": "钻石压力板", "block.basemetals.diamond_slab": "钻石台阶", "block.basemetals.diamond_stairs": "钻石楼梯", "block.basemetals.diamond_trapdoor": "钻石活板门", "block.basemetals.diamond_wall": "钻石墙", - "block.basemetals.double_adamantine_slab": "Double Adamantine Slab", - "block.basemetals.double_antimony_slab": "Double Antimony Slab", - "block.basemetals.double_aquarium_slab": "Double Aquarium Slab", - "block.basemetals.double_bismuth_slab": "Double Bismuth Slab", - "block.basemetals.double_brass_slab": "Double Brass Slab", - "block.basemetals.double_bronze_slab": "Double Bronze Slab", - "block.basemetals.double_coldiron_slab": "Double Cold Iron Slab", - "block.basemetals.double_copper_slab": "Double Copper Slab", - "block.basemetals.double_cupronickel_slab": "Double Cupronickel Slab", - "block.basemetals.double_diamond_slab": "Double Diamond Slab", - "block.basemetals.double_electrum_slab": "Double Electrum Slab", - "block.basemetals.double_emerald_slab": "Double Emerald Slab", - "block.basemetals.double_gold_slab": "Double Gold Slab", - "block.basemetals.double_invar_slab": "Double Invar Slab", - "block.basemetals.double_iron_slab": "Double Iron Slab", - "block.basemetals.double_lead_slab": "Double Lead Slab", - "block.basemetals.double_mithril_slab": "Double Mithril Slab", - "block.basemetals.double_nickel_slab": "Double Nickel Slab", - "block.basemetals.double_obsidian_slab": "Double Obsidian Slab", - "block.basemetals.double_pewter_slab": "Double Pewter Slab", - "block.basemetals.double_platinum_slab": "Double Platinum Slab", - "block.basemetals.double_silver_slab": "Double Silver Slab", - "block.basemetals.double_starsteel_slab": "Double Starsteel Slab", - "block.basemetals.double_steel_slab": "Double Steel Slab", - "block.basemetals.double_tin_slab": "Double Tin Slab", - "block.basemetals.double_zinc_slab": "Double Zinc Slab", "block.basemetals.electrum": "熔融琥珀金", "block.basemetals.electrum_bars": "琥珀金栏杆", "block.basemetals.electrum_block": "琥珀金块", "block.basemetals.electrum_button": "琥珀金按钮", "block.basemetals.electrum_dense_plate": "致密琥珀金板", "block.basemetals.electrum_door": "琥珀金门", + "block.basemetals.electrum_double_slab": "Electrum Double Slab", "block.basemetals.electrum_lever": "琥珀金拉杆", "block.basemetals.electrum_plate": "琥珀金板", "block.basemetals.electrum_pressure_plate": "琥珀金压力板", @@ -216,6 +201,7 @@ "block.basemetals.emerald_bars": "绿宝石栏杆", "block.basemetals.emerald_button": "绿宝石按钮", "block.basemetals.emerald_door": "金门", + "block.basemetals.emerald_double_slab": "Emerald Double Slab", "block.basemetals.emerald_lever": "绿宝石拉杆", "block.basemetals.emerald_pressure_plate": "绿宝石压力板", "block.basemetals.emerald_slab": "绿宝石台阶", @@ -228,6 +214,7 @@ "block.basemetals.gold_button": "金按钮", "block.basemetals.gold_dense_plate": "致密金板", "block.basemetals.gold_door": "Gold Door", + "block.basemetals.gold_double_slab": "Gold Double Slab", "block.basemetals.gold_lever": "金拉杆", "block.basemetals.gold_plate": "金板", "block.basemetals.gold_pressure_plate": "金压力板", @@ -242,6 +229,7 @@ "block.basemetals.invar_button": "因瓦合金按钮", "block.basemetals.invar_dense_dense_plate": "致密因瓦合金板", "block.basemetals.invar_door": "因瓦合金门", + "block.basemetals.invar_double_slab": "Invar Double Slab", "block.basemetals.invar_lever": "因瓦合金拉杆", "block.basemetals.invar_plate": "因瓦合金板", "block.basemetals.invar_pressure_plate": "因瓦合金压力板", @@ -252,19 +240,20 @@ "block.basemetals.iron": "熔融铁", "block.basemetals.iron_button": "铁按钮", "block.basemetals.iron_dense_plate": "致密铁板", + "block.basemetals.iron_double_slab": "Iron Double Slab", "block.basemetals.iron_lever": "铁拉杆", "block.basemetals.iron_plate": "铁板", "block.basemetals.iron_pressure_plate": "铁压力板", "block.basemetals.iron_slab": "铁台阶", "block.basemetals.iron_stairs": "铁楼梯", "block.basemetals.iron_wall": "铁墙", - "block.basemetals.lapis": "Molten Lapis", "block.basemetals.lead": "熔融铅", "block.basemetals.lead_bars": "铅栏杆", "block.basemetals.lead_block": "铅块", "block.basemetals.lead_button": "铅按钮", "block.basemetals.lead_dense_plate": "致密铅板", "block.basemetals.lead_door": "铅门", + "block.basemetals.lead_double_slab": "Lead Double Slab", "block.basemetals.lead_lever": "铅拉杆", "block.basemetals.lead_ore": "铅矿石", "block.basemetals.lead_plate": "铅板", @@ -282,6 +271,7 @@ "block.basemetals.mithril_button": "秘银按钮", "block.basemetals.mithril_dense_plate": "致密秘银板", "block.basemetals.mithril_door": "秘银门", + "block.basemetals.mithril_double_slab": "Mithril Double Slab", "block.basemetals.mithril_lever": "秘银拉杆", "block.basemetals.mithril_plate": "秘银板", "block.basemetals.mithril_pressure_plate": "秘银压力板", @@ -295,6 +285,7 @@ "block.basemetals.nickel_button": "镍按钮", "block.basemetals.nickel_dense_plate": "致密镍板", "block.basemetals.nickel_door": "镍门", + "block.basemetals.nickel_double_slab": "Nickel Double Slab", "block.basemetals.nickel_lever": "镍拉杆", "block.basemetals.nickel_ore": "镍矿石", "block.basemetals.nickel_plate": "镍板", @@ -307,6 +298,7 @@ "block.basemetals.obsidian_bars": "黑曜石栏杆", "block.basemetals.obsidian_button": "黑曜石按钮", "block.basemetals.obsidian_door": "黑曜石门", + "block.basemetals.obsidian_double_slab": "Obsidian Double Slab", "block.basemetals.obsidian_lever": "黑曜石拉杆", "block.basemetals.obsidian_pressure_plate": "黑曜石压力板", "block.basemetals.obsidian_slab": "黑曜石台阶", @@ -319,6 +311,7 @@ "block.basemetals.pewter_button": "白镴按钮", "block.basemetals.pewter_dense_plate": "致密白镴板", "block.basemetals.pewter_door": "白镴门", + "block.basemetals.pewter_double_slab": "Pewter Double Slab", "block.basemetals.pewter_lever": "白镴拉杆", "block.basemetals.pewter_ore": "白镴矿石", "block.basemetals.pewter_plate": "白镴板", @@ -333,6 +326,7 @@ "block.basemetals.platinum_button": "铂按钮", "block.basemetals.platinum_dense_plate": "致密铂板", "block.basemetals.platinum_door": "铂门", + "block.basemetals.platinum_double_slab": "Platinum Double Slab", "block.basemetals.platinum_lever": "铂拉杆", "block.basemetals.platinum_ore": "铂矿石", "block.basemetals.platinum_plate": "铂板", @@ -357,6 +351,7 @@ "block.basemetals.silver_button": "银按钮", "block.basemetals.silver_dense_plate": "致密银板", "block.basemetals.silver_door": "银门", + "block.basemetals.silver_double_slab": "Silver Double Slab", "block.basemetals.silver_lever": "银拉杆", "block.basemetals.silver_ore": "银矿石", "block.basemetals.silver_plate": "银板", @@ -371,6 +366,7 @@ "block.basemetals.starsteel_button": "星钢按钮", "block.basemetals.starsteel_dense_plate": "致密星钢板", "block.basemetals.starsteel_door": "星钢门", + "block.basemetals.starsteel_double_slab": "Starsteel Double Slab", "block.basemetals.starsteel_lever": "星钢拉杆", "block.basemetals.starsteel_ore": "星钢矿石", "block.basemetals.starsteel_plate": "星钢板", @@ -386,6 +382,7 @@ "block.basemetals.steel_button": "钢按钮", "block.basemetals.steel_dense_plate": "致密钢板", "block.basemetals.steel_door": "钢门", + "block.basemetals.steel_double_slab": "Steel Double Slab", "block.basemetals.steel_lever": "钢拉杆", "block.basemetals.steel_plate": "钢板", "block.basemetals.steel_pressure_plate": "钢压力板", @@ -393,7 +390,6 @@ "block.basemetals.steel_stairs": "钢楼梯", "block.basemetals.steel_trapdoor": "钢活板门", "block.basemetals.steel_wall": "钢墙", - "block.basemetals.stone": "Molten Stone", "block.basemetals.stone_anvil": "Stone Anvil", "block.basemetals.tin": "熔融锡", "block.basemetals.tin_bars": "锡栏杆", @@ -401,6 +397,7 @@ "block.basemetals.tin_button": "锡按钮", "block.basemetals.tin_dense_plate": "致密锡板", "block.basemetals.tin_door": "锡门", + "block.basemetals.tin_double_slab": "Tin Double Slab", "block.basemetals.tin_lever": "锡拉杆", "block.basemetals.tin_ore": "锡矿石", "block.basemetals.tin_plate": "锡板", @@ -409,13 +406,13 @@ "block.basemetals.tin_stairs": "锡楼梯", "block.basemetals.tin_trapdoor": "锡活板门", "block.basemetals.tin_wall": "锡墙", - "block.basemetals.wood": "Molten Wood", "block.basemetals.zinc": "熔融锌", "block.basemetals.zinc_bars": "锌栏杆", "block.basemetals.zinc_block": "锌块", "block.basemetals.zinc_button": "锌按钮", "block.basemetals.zinc_dense_plate": "致密锌板", "block.basemetals.zinc_door": "锌门", + "block.basemetals.zinc_double_slab": "Zinc Double Slab", "block.basemetals.zinc_lever": "锌拉杆", "block.basemetals.zinc_ore": "锌矿石", "block.basemetals.zinc_plate": "锌板", @@ -1179,8 +1176,6 @@ "item.basemetals.iron_smallpowder": "小堆铁粉", "item.basemetals.iron_stairs": "铁楼梯", "item.basemetals.iron_wall": "铁墙", - "item.basemetals.lapis": "Lapis", - "item.basemetals.lapis_bucket": "熔融青金石桶", "item.basemetals.lapis_smallpowder": "小堆青金石粉", "item.basemetals.lead": "Lead", "item.basemetals.lead_arrow": "铅箭", @@ -1652,9 +1647,7 @@ "item.basemetals.steel_sword": "钢剑", "item.basemetals.steel_trapdoor": "钢活板门", "item.basemetals.steel_wall": "钢墙", - "item.basemetals.stone": "Stone", "item.basemetals.stone_anvil": "Stone Anvil", - "item.basemetals.stone_bucket": "熔融石头桶", "item.basemetals.stone_crackhammer": "石质破裂锤", "item.basemetals.stone_gear": "石齿轮", "item.basemetals.stone_rod": "石棒", @@ -1707,8 +1700,6 @@ "item.basemetals.tin_sword": "锡剑", "item.basemetals.tin_trapdoor": "锡活板门", "item.basemetals.tin_wall": "锡墙", - "item.basemetals.wood": "Wood", - "item.basemetals.wood_bucket": "液化木材桶", "item.basemetals.wood_crackhammer": "木质破裂锤", "item.basemetals.wood_gear": "木齿轮", "item.basemetals.wood_powder": "小堆锯末", @@ -1779,7 +1770,6 @@ "item.bucket.gold": "熔融金桶", "item.bucket.invar": "熔融因瓦合金桶", "item.bucket.iron": "熔融铁桶", - "item.bucket.lapis": "熔融青金石桶", "item.bucket.lead": "熔融铅桶", "item.bucket.mercury": "汞桶", "item.bucket.mithril": "熔融秘银桶", @@ -1793,13 +1783,12 @@ "item.bucket.silver": "熔融银桶", "item.bucket.starsteel": "熔融星钢桶", "item.bucket.steel": "熔融钢桶", - "item.bucket.stone": "熔融石头桶", "item.bucket.tin": "熔融锡桶", - "item.bucket.wood": "液化木材桶", "item.bucket.zinc": "熔融锌桶", "itemGroup.basemetals.blocks": "Base Metals方块", "itemGroup.basemetals.combat": "Base Metals Combat", "itemGroup.basemetals.items": "Base Metals物品", + "itemGroup.basemetals.materials": "Base Metals Materials", "itemGroup.basemetals.tools": "Base Metals工具", "litem.basemetals.obsidian_smallpowder.name": "小堆黑曜石粉", "material.adamantine.name": "艾德曼金属", diff --git a/src/generated/resources/assets/basemetals/lang/zh_tw.json b/src/generated/resources/assets/basemetals/lang/zh_tw.json index ba0e1d698..68158a67b 100644 --- a/src/generated/resources/assets/basemetals/lang/zh_tw.json +++ b/src/generated/resources/assets/basemetals/lang/zh_tw.json @@ -46,6 +46,7 @@ "block.basemetals.adamantine_button": "精金按鈕", "block.basemetals.adamantine_dense_plate": "精金緻密板", "block.basemetals.adamantine_door": "精金門", + "block.basemetals.adamantine_double_slab": "Adamantine Double Slab", "block.basemetals.adamantine_lever": "精金控制桿", "block.basemetals.adamantine_ore": "精金礦", "block.basemetals.adamantine_plate": "精金板", @@ -60,6 +61,7 @@ "block.basemetals.antimony_button": "銻按鈕", "block.basemetals.antimony_dense_plate": "銻緻密板", "block.basemetals.antimony_door": "銻門", + "block.basemetals.antimony_double_slab": "Antimony Double Slab", "block.basemetals.antimony_lever": "銻控制桿", "block.basemetals.antimony_ore": "銻礦", "block.basemetals.antimony_plate": "銻板", @@ -74,6 +76,7 @@ "block.basemetals.aquarium_button": "海洋合金按鈕", "block.basemetals.aquarium_dense_plate": "海洋合金緻密板", "block.basemetals.aquarium_door": "海洋合金門", + "block.basemetals.aquarium_double_slab": "Aquarium Double Slab", "block.basemetals.aquarium_lever": "海洋合金控制桿", "block.basemetals.aquarium_ore": "海洋合金礦", "block.basemetals.aquarium_plate": "海洋合金板", @@ -88,6 +91,7 @@ "block.basemetals.bismuth_button": "鉍按鈕", "block.basemetals.bismuth_dense_plate": "鉍緻密板", "block.basemetals.bismuth_door": "鉍門", + "block.basemetals.bismuth_double_slab": "Bismuth Double Slab", "block.basemetals.bismuth_lever": "鉍控制桿", "block.basemetals.bismuth_ore": "鉍礦", "block.basemetals.bismuth_plate": "鉍板", @@ -102,6 +106,7 @@ "block.basemetals.brass_button": "黃銅按鈕", "block.basemetals.brass_dense_plate": "黃銅緻密板", "block.basemetals.brass_door": "黃銅門", + "block.basemetals.brass_double_slab": "Brass Double Slab", "block.basemetals.brass_lever": "黃銅控制桿", "block.basemetals.brass_plate": "黃銅板", "block.basemetals.brass_pressure_plate": "黃銅壓力板", @@ -115,6 +120,7 @@ "block.basemetals.bronze_button": "青銅按鈕", "block.basemetals.bronze_dense_plate": "青銅緻密板", "block.basemetals.bronze_door": "青銅門", + "block.basemetals.bronze_double_slab": "Bronze Double Slab", "block.basemetals.bronze_lever": "青銅控制桿", "block.basemetals.bronze_plate": "青銅板", "block.basemetals.bronze_pressure_plate": "青銅壓力板", @@ -131,6 +137,7 @@ "block.basemetals.coldiron_button": "寒鐵按鈕", "block.basemetals.coldiron_dense_plate": "寒鐵緻密板", "block.basemetals.coldiron_door": "寒鐵門", + "block.basemetals.coldiron_double_slab": "Cold Iron Double Slab", "block.basemetals.coldiron_lever": "寒鐵控制桿", "block.basemetals.coldiron_ore": "寒鐵礦", "block.basemetals.coldiron_plate": "寒鐵板", @@ -145,6 +152,7 @@ "block.basemetals.copper_button": "銅按鈕", "block.basemetals.copper_dense_plate": "銅緻密板", "block.basemetals.copper_door": "銅門", + "block.basemetals.copper_double_slab": "Copper Double Slab", "block.basemetals.copper_lever": "銅控制桿", "block.basemetals.copper_ore": "銅礦", "block.basemetals.copper_plate": "銅板", @@ -159,6 +167,7 @@ "block.basemetals.cupronickel_button": "白銅按鈕", "block.basemetals.cupronickel_dense_plate": "白銅緻密板", "block.basemetals.cupronickel_door": "白銅門", + "block.basemetals.cupronickel_double_slab": "Cupronickel Double Slab", "block.basemetals.cupronickel_lever": "白銅控制桿", "block.basemetals.cupronickel_plate": "白銅板", "block.basemetals.cupronickel_pressure_plate": "白銅壓力板", @@ -170,44 +179,20 @@ "block.basemetals.diamond_bars": "鑽石桿", "block.basemetals.diamond_button": "鑽石按鈕", "block.basemetals.diamond_door": "鑽石門", + "block.basemetals.diamond_double_slab": "Diamond Double Slab", "block.basemetals.diamond_lever": "鑽石控制桿", "block.basemetals.diamond_pressure_plate": "鑽石壓力板", "block.basemetals.diamond_slab": "鑽石半磚", "block.basemetals.diamond_stairs": "鑽石階梯", "block.basemetals.diamond_trapdoor": "鑽石地板門", "block.basemetals.diamond_wall": "鑽石牆", - "block.basemetals.double_adamantine_slab": "Double Adamantine Slab", - "block.basemetals.double_antimony_slab": "Double Antimony Slab", - "block.basemetals.double_aquarium_slab": "Double Aquarium Slab", - "block.basemetals.double_bismuth_slab": "Double Bismuth Slab", - "block.basemetals.double_brass_slab": "Double Brass Slab", - "block.basemetals.double_bronze_slab": "Double Bronze Slab", - "block.basemetals.double_coldiron_slab": "Double Cold Iron Slab", - "block.basemetals.double_copper_slab": "Double Copper Slab", - "block.basemetals.double_cupronickel_slab": "Double Cupronickel Slab", - "block.basemetals.double_diamond_slab": "Double Diamond Slab", - "block.basemetals.double_electrum_slab": "Double Electrum Slab", - "block.basemetals.double_emerald_slab": "Double Emerald Slab", - "block.basemetals.double_gold_slab": "Double Gold Slab", - "block.basemetals.double_invar_slab": "Double Invar Slab", - "block.basemetals.double_iron_slab": "Double Iron Slab", - "block.basemetals.double_lead_slab": "Double Lead Slab", - "block.basemetals.double_mithril_slab": "Double Mithril Slab", - "block.basemetals.double_nickel_slab": "Double Nickel Slab", - "block.basemetals.double_obsidian_slab": "Double Obsidian Slab", - "block.basemetals.double_pewter_slab": "Double Pewter Slab", - "block.basemetals.double_platinum_slab": "Double Platinum Slab", - "block.basemetals.double_silver_slab": "Double Silver Slab", - "block.basemetals.double_starsteel_slab": "Double Starsteel Slab", - "block.basemetals.double_steel_slab": "Double Steel Slab", - "block.basemetals.double_tin_slab": "Double Tin Slab", - "block.basemetals.double_zinc_slab": "Double Zinc Slab", "block.basemetals.electrum": "熔融玫瑰金", "block.basemetals.electrum_bars": "玫瑰金桿", "block.basemetals.electrum_block": "玫瑰金磚", "block.basemetals.electrum_button": "玫瑰金按鈕", "block.basemetals.electrum_dense_plate": "玫瑰金緻密板", "block.basemetals.electrum_door": "玫瑰金門", + "block.basemetals.electrum_double_slab": "Electrum Double Slab", "block.basemetals.electrum_lever": "玫瑰金控制桿", "block.basemetals.electrum_plate": "玫瑰金板", "block.basemetals.electrum_pressure_plate": "玫瑰金壓力板", @@ -219,6 +204,7 @@ "block.basemetals.emerald_bars": "綠寶石桿", "block.basemetals.emerald_button": "綠寶石按鈕", "block.basemetals.emerald_door": "綠寶石門", + "block.basemetals.emerald_double_slab": "Emerald Double Slab", "block.basemetals.emerald_lever": "綠寶石控制桿", "block.basemetals.emerald_pressure_plate": "綠寶石壓力板", "block.basemetals.emerald_slab": "綠寶石半磚", @@ -231,6 +217,7 @@ "block.basemetals.gold_button": "金按鈕", "block.basemetals.gold_dense_plate": "金緻密板", "block.basemetals.gold_door": "金門", + "block.basemetals.gold_double_slab": "Gold Double Slab", "block.basemetals.gold_lever": "金控制桿", "block.basemetals.gold_plate": "金板", "block.basemetals.gold_pressure_plate": "金壓力板", @@ -245,6 +232,7 @@ "block.basemetals.invar_button": "殷鋼按鈕", "block.basemetals.invar_dense_dense_plate": "殷鋼緻密板", "block.basemetals.invar_door": "殷鋼門", + "block.basemetals.invar_double_slab": "Invar Double Slab", "block.basemetals.invar_lever": "殷鋼控制桿", "block.basemetals.invar_plate": "殷鋼板", "block.basemetals.invar_pressure_plate": "殷鋼壓力板", @@ -255,19 +243,20 @@ "block.basemetals.iron": "熔融鐵", "block.basemetals.iron_button": "鐵按鈕", "block.basemetals.iron_dense_plate": "鐵緻密板", + "block.basemetals.iron_double_slab": "Iron Double Slab", "block.basemetals.iron_lever": "鐵控制桿", "block.basemetals.iron_plate": "鐵板", "block.basemetals.iron_pressure_plate": "鐵壓力板", "block.basemetals.iron_slab": "鐵半磚", "block.basemetals.iron_stairs": "鐵階梯", "block.basemetals.iron_wall": "鐵牆", - "block.basemetals.lapis": "Molten Lapis", "block.basemetals.lead": "熔融鉛", "block.basemetals.lead_bars": "鉛桿", "block.basemetals.lead_block": "鉛磚", "block.basemetals.lead_button": "鉛按鈕", "block.basemetals.lead_dense_plate": "鉛緻密板", "block.basemetals.lead_door": "鉛門", + "block.basemetals.lead_double_slab": "Lead Double Slab", "block.basemetals.lead_lever": "鉛控制桿", "block.basemetals.lead_ore": "鉛礦", "block.basemetals.lead_plate": "鉛板", @@ -284,6 +273,7 @@ "block.basemetals.mithril_button": "秘銀按鈕", "block.basemetals.mithril_dense_plate": "秘銀緻密板", "block.basemetals.mithril_door": "秘銀門", + "block.basemetals.mithril_double_slab": "Mithril Double Slab", "block.basemetals.mithril_lever": "秘銀控制桿", "block.basemetals.mithril_plate": "秘銀板", "block.basemetals.mithril_pressure_plate": "秘銀壓力板", @@ -297,6 +287,7 @@ "block.basemetals.nickel_button": "鎳按鈕", "block.basemetals.nickel_dense_plate": "鎳緻密板", "block.basemetals.nickel_door": "鎳門", + "block.basemetals.nickel_double_slab": "Nickel Double Slab", "block.basemetals.nickel_lever": "鎳控制桿", "block.basemetals.nickel_ore": "鎳礦", "block.basemetals.nickel_plate": "鎳板", @@ -309,6 +300,7 @@ "block.basemetals.obsidian_bars": "黑曜石桿", "block.basemetals.obsidian_button": "黑曜石按鈕", "block.basemetals.obsidian_door": "黑曜石門", + "block.basemetals.obsidian_double_slab": "Obsidian Double Slab", "block.basemetals.obsidian_lever": "黑曜石控制桿", "block.basemetals.obsidian_pressure_plate": "黑曜石壓力板", "block.basemetals.obsidian_slab": "黑曜石半磚", @@ -321,6 +313,7 @@ "block.basemetals.pewter_button": "白鑞按鈕", "block.basemetals.pewter_dense_plate": "白鑞緻密板", "block.basemetals.pewter_door": "白鑞門", + "block.basemetals.pewter_double_slab": "Pewter Double Slab", "block.basemetals.pewter_lever": "白鑞控制桿", "block.basemetals.pewter_ore": "白鑞礦", "block.basemetals.pewter_plate": "白鑞板", @@ -335,6 +328,7 @@ "block.basemetals.platinum_button": "白金按鈕", "block.basemetals.platinum_dense_plate": "白金緻密板", "block.basemetals.platinum_door": "白金門", + "block.basemetals.platinum_double_slab": "Platinum Double Slab", "block.basemetals.platinum_lever": "白金控制桿", "block.basemetals.platinum_ore": "白金礦", "block.basemetals.platinum_plate": "白金板", @@ -359,6 +353,7 @@ "block.basemetals.silver_button": "銀按鈕", "block.basemetals.silver_dense_plate": "銀緻密板", "block.basemetals.silver_door": "銀門", + "block.basemetals.silver_double_slab": "Silver Double Slab", "block.basemetals.silver_lever": "銀控制桿", "block.basemetals.silver_ore": "銀礦", "block.basemetals.silver_plate": "銀板", @@ -373,6 +368,7 @@ "block.basemetals.starsteel_button": "星鋼按鈕", "block.basemetals.starsteel_dense_plate": "星鋼緻密板", "block.basemetals.starsteel_door": "星鋼門", + "block.basemetals.starsteel_double_slab": "Starsteel Double Slab", "block.basemetals.starsteel_lever": "星鋼控制桿", "block.basemetals.starsteel_ore": "星鋼礦", "block.basemetals.starsteel_plate": "星鋼板", @@ -391,6 +387,7 @@ "block.basemetals.steel_button": "鋼按鈕", "block.basemetals.steel_dense_plate": "鋼緻密板", "block.basemetals.steel_door": "鋼門", + "block.basemetals.steel_double_slab": "Steel Double Slab", "block.basemetals.steel_lever": "鋼控制桿", "block.basemetals.steel_plate": "鋼板", "block.basemetals.steel_pressure_plate": "鋼壓力板", @@ -398,7 +395,6 @@ "block.basemetals.steel_stairs": "鋼階梯", "block.basemetals.steel_trapdoor": "鋼地板門", "block.basemetals.steel_wall": "鋼牆", - "block.basemetals.stone": "Molten Stone", "block.basemetals.stone_anvil": "Stone Anvil", "block.basemetals.stone_anvil.intact": "Stone砧", "block.basemetals.stone_anvil.slightlyDamaged": "輕微耗損的石砧", @@ -409,6 +405,7 @@ "block.basemetals.tin_button": "錫按鈕", "block.basemetals.tin_dense_plate": "錫緻密板", "block.basemetals.tin_door": "錫門", + "block.basemetals.tin_double_slab": "Tin Double Slab", "block.basemetals.tin_lever": "錫控制桿", "block.basemetals.tin_ore": "錫礦", "block.basemetals.tin_plate": "錫板", @@ -417,13 +414,13 @@ "block.basemetals.tin_stairs": "錫階梯", "block.basemetals.tin_trapdoor": "錫地板門", "block.basemetals.tin_wall": "錫牆", - "block.basemetals.wood": "Molten Wood", "block.basemetals.zinc": "熔融鋅", "block.basemetals.zinc_bars": "鋅桿", "block.basemetals.zinc_block": "鋅磚", "block.basemetals.zinc_button": "鋅按鈕", "block.basemetals.zinc_dense_plate": "鋅緻密板", "block.basemetals.zinc_door": "鋅門", + "block.basemetals.zinc_double_slab": "Zinc Double Slab", "block.basemetals.zinc_lever": "鋅控制桿", "block.basemetals.zinc_ore": "鋅礦", "block.basemetals.zinc_plate": "鋅板", @@ -1187,8 +1184,6 @@ "item.basemetals.iron_smallpowder": "一小堆鐵粉末", "item.basemetals.iron_stairs": "鐵階梯", "item.basemetals.iron_wall": "鐵牆", - "item.basemetals.lapis": "Lapis", - "item.basemetals.lapis_bucket": "熔融青金石桶", "item.basemetals.lapis_smallpowder": "一小堆青金石粉塵", "item.basemetals.lead": "Lead", "item.basemetals.lead_arrow": "鉛箭矢", @@ -1660,9 +1655,7 @@ "item.basemetals.steel_sword": "鋼劍", "item.basemetals.steel_trapdoor": "鋼地板門", "item.basemetals.steel_wall": "鋼牆", - "item.basemetals.stone": "Stone", "item.basemetals.stone_anvil": "Stone Anvil", - "item.basemetals.stone_bucket": "熔融石頭桶", "item.basemetals.stone_crackhammer": "石榔頭", "item.basemetals.stone_gear": "石齒輪", "item.basemetals.stone_rod": "石桿", @@ -1715,8 +1708,6 @@ "item.basemetals.tin_sword": "錫劍", "item.basemetals.tin_trapdoor": "錫地板門", "item.basemetals.tin_wall": "錫牆", - "item.basemetals.wood": "Wood", - "item.basemetals.wood_bucket": "液化木材桶", "item.basemetals.wood_crackhammer": "木榔頭", "item.basemetals.wood_gear": "木齒輪", "item.basemetals.wood_powder": "一小堆木屑", @@ -1787,7 +1778,6 @@ "item.bucket.gold": "熔融金桶", "item.bucket.invar": "熔融殷鋼桶", "item.bucket.iron": "熔融鐵桶", - "item.bucket.lapis": "熔融青金石桶", "item.bucket.lead": "熔融鉛桶", "item.bucket.mercury": "汞桶", "item.bucket.mithril": "熔融秘銀桶", @@ -1801,13 +1791,12 @@ "item.bucket.silver": "熔融銀桶", "item.bucket.starsteel": "熔融星鋼桶", "item.bucket.steel": "熔融鋼桶", - "item.bucket.stone": "熔融石頭桶", "item.bucket.tin": "熔融錫桶", - "item.bucket.wood": "液化木材桶", "item.bucket.zinc": "熔融鋅桶", "itemGroup.basemetals.blocks": "Base Metals 方塊", "itemGroup.basemetals.combat": "Base Metals 戰鬥", "itemGroup.basemetals.items": "Base Metals 物品", + "itemGroup.basemetals.materials": "Base Metals Materials", "itemGroup.basemetals.tools": "Base Metals 工具", "material.adamantine.name": "精金", "material.antimony.name": "銻", diff --git a/src/generated/resources/assets/basemetals/models/block/diamond_bars_post_ends.json b/src/generated/resources/assets/basemetals/models/block/diamond_bars_post_ends.json deleted file mode 100644 index 15acdf139..000000000 --- a/src/generated/resources/assets/basemetals/models/block/diamond_bars_post_ends.json +++ /dev/null @@ -1,49 +0,0 @@ -{ - "ambientocclusion": false, - "elements": [ - { - "faces": { - "down": { - "texture": "#edge" - }, - "up": { - "texture": "#edge" - } - }, - "from": [ - 7, - 0.001, - 7 - ], - "to": [ - 9, - 0.001, - 9 - ] - }, - { - "faces": { - "down": { - "texture": "#edge" - }, - "up": { - "texture": "#edge" - } - }, - "from": [ - 7, - 15.999, - 7 - ], - "to": [ - 9, - 15.999, - 9 - ] - } - ], - "textures": { - "edge": "basemetals:block/diamond_bars", - "particle": "basemetals:block/diamond_bars" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/models/block/diamond_door_bottom_left.json b/src/generated/resources/assets/basemetals/models/block/diamond_door_bottom_left.json deleted file mode 100644 index dc64aaf68..000000000 --- a/src/generated/resources/assets/basemetals/models/block/diamond_door_bottom_left.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/door_bottom_left", - "textures": { - "bottom": "basemetals:block/diamond_door_lower", - "top": "basemetals:block/diamond_door_upper" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/models/block/diamond_door_bottom_left_open.json b/src/generated/resources/assets/basemetals/models/block/diamond_door_bottom_left_open.json deleted file mode 100644 index 270e0081c..000000000 --- a/src/generated/resources/assets/basemetals/models/block/diamond_door_bottom_left_open.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/door_bottom_left_open", - "textures": { - "bottom": "basemetals:block/diamond_door_lower", - "top": "basemetals:block/diamond_door_upper" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/models/block/diamond_door_bottom_right.json b/src/generated/resources/assets/basemetals/models/block/diamond_door_bottom_right.json deleted file mode 100644 index 524d8d1d2..000000000 --- a/src/generated/resources/assets/basemetals/models/block/diamond_door_bottom_right.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/door_bottom_right", - "textures": { - "bottom": "basemetals:block/diamond_door_lower", - "top": "basemetals:block/diamond_door_upper" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/models/block/diamond_door_bottom_right_open.json b/src/generated/resources/assets/basemetals/models/block/diamond_door_bottom_right_open.json deleted file mode 100644 index 9356a19a4..000000000 --- a/src/generated/resources/assets/basemetals/models/block/diamond_door_bottom_right_open.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/door_bottom_right_open", - "textures": { - "bottom": "basemetals:block/diamond_door_lower", - "top": "basemetals:block/diamond_door_upper" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/models/block/diamond_door_top_left.json b/src/generated/resources/assets/basemetals/models/block/diamond_door_top_left.json deleted file mode 100644 index 4ecc8dd86..000000000 --- a/src/generated/resources/assets/basemetals/models/block/diamond_door_top_left.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/door_top_left", - "textures": { - "bottom": "basemetals:block/diamond_door_lower", - "top": "basemetals:block/diamond_door_upper" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/models/block/diamond_door_top_left_open.json b/src/generated/resources/assets/basemetals/models/block/diamond_door_top_left_open.json deleted file mode 100644 index a8586edba..000000000 --- a/src/generated/resources/assets/basemetals/models/block/diamond_door_top_left_open.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/door_top_left_open", - "textures": { - "bottom": "basemetals:block/diamond_door_lower", - "top": "basemetals:block/diamond_door_upper" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/models/block/diamond_door_top_right.json b/src/generated/resources/assets/basemetals/models/block/diamond_door_top_right.json deleted file mode 100644 index a9d7070ad..000000000 --- a/src/generated/resources/assets/basemetals/models/block/diamond_door_top_right.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/door_top_right", - "textures": { - "bottom": "basemetals:block/diamond_door_lower", - "top": "basemetals:block/diamond_door_upper" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/models/block/diamond_door_top_right_open.json b/src/generated/resources/assets/basemetals/models/block/diamond_door_top_right_open.json deleted file mode 100644 index cbf1ecdaf..000000000 --- a/src/generated/resources/assets/basemetals/models/block/diamond_door_top_right_open.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/door_top_right_open", - "textures": { - "bottom": "basemetals:block/diamond_door_lower", - "top": "basemetals:block/diamond_door_upper" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/models/block/diamond_wall_side_tall.json b/src/generated/resources/assets/basemetals/models/block/diamond_wall_side_tall.json deleted file mode 100644 index abd0c498b..000000000 --- a/src/generated/resources/assets/basemetals/models/block/diamond_wall_side_tall.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/template_wall_side_tall", - "textures": { - "wall": "minecraft:block/diamond_block" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/models/block/emerald_bars_post_ends.json b/src/generated/resources/assets/basemetals/models/block/emerald_bars_post_ends.json deleted file mode 100644 index 9516065fd..000000000 --- a/src/generated/resources/assets/basemetals/models/block/emerald_bars_post_ends.json +++ /dev/null @@ -1,49 +0,0 @@ -{ - "ambientocclusion": false, - "elements": [ - { - "faces": { - "down": { - "texture": "#edge" - }, - "up": { - "texture": "#edge" - } - }, - "from": [ - 7, - 0.001, - 7 - ], - "to": [ - 9, - 0.001, - 9 - ] - }, - { - "faces": { - "down": { - "texture": "#edge" - }, - "up": { - "texture": "#edge" - } - }, - "from": [ - 7, - 15.999, - 7 - ], - "to": [ - 9, - 15.999, - 9 - ] - } - ], - "textures": { - "edge": "basemetals:block/emerald_bars", - "particle": "basemetals:block/emerald_bars" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/models/block/emerald_door_bottom_left.json b/src/generated/resources/assets/basemetals/models/block/emerald_door_bottom_left.json deleted file mode 100644 index 3ebbc530d..000000000 --- a/src/generated/resources/assets/basemetals/models/block/emerald_door_bottom_left.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/door_bottom_left", - "textures": { - "bottom": "basemetals:block/emerald_door_lower", - "top": "basemetals:block/emerald_door_upper" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/models/block/emerald_door_bottom_left_open.json b/src/generated/resources/assets/basemetals/models/block/emerald_door_bottom_left_open.json deleted file mode 100644 index e08d503da..000000000 --- a/src/generated/resources/assets/basemetals/models/block/emerald_door_bottom_left_open.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/door_bottom_left_open", - "textures": { - "bottom": "basemetals:block/emerald_door_lower", - "top": "basemetals:block/emerald_door_upper" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/models/block/emerald_door_bottom_right.json b/src/generated/resources/assets/basemetals/models/block/emerald_door_bottom_right.json deleted file mode 100644 index af494ee69..000000000 --- a/src/generated/resources/assets/basemetals/models/block/emerald_door_bottom_right.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/door_bottom_right", - "textures": { - "bottom": "basemetals:block/emerald_door_lower", - "top": "basemetals:block/emerald_door_upper" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/models/block/emerald_door_bottom_right_open.json b/src/generated/resources/assets/basemetals/models/block/emerald_door_bottom_right_open.json deleted file mode 100644 index 53de3a1a4..000000000 --- a/src/generated/resources/assets/basemetals/models/block/emerald_door_bottom_right_open.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/door_bottom_right_open", - "textures": { - "bottom": "basemetals:block/emerald_door_lower", - "top": "basemetals:block/emerald_door_upper" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/models/block/emerald_door_top_left.json b/src/generated/resources/assets/basemetals/models/block/emerald_door_top_left.json deleted file mode 100644 index 7c9fd9992..000000000 --- a/src/generated/resources/assets/basemetals/models/block/emerald_door_top_left.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/door_top_left", - "textures": { - "bottom": "basemetals:block/emerald_door_lower", - "top": "basemetals:block/emerald_door_upper" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/models/block/emerald_door_top_left_open.json b/src/generated/resources/assets/basemetals/models/block/emerald_door_top_left_open.json deleted file mode 100644 index a3c9a8ef9..000000000 --- a/src/generated/resources/assets/basemetals/models/block/emerald_door_top_left_open.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/door_top_left_open", - "textures": { - "bottom": "basemetals:block/emerald_door_lower", - "top": "basemetals:block/emerald_door_upper" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/models/block/emerald_door_top_right.json b/src/generated/resources/assets/basemetals/models/block/emerald_door_top_right.json deleted file mode 100644 index 6ff4e57df..000000000 --- a/src/generated/resources/assets/basemetals/models/block/emerald_door_top_right.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/door_top_right", - "textures": { - "bottom": "basemetals:block/emerald_door_lower", - "top": "basemetals:block/emerald_door_upper" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/models/block/emerald_door_top_right_open.json b/src/generated/resources/assets/basemetals/models/block/emerald_door_top_right_open.json deleted file mode 100644 index 56a4473da..000000000 --- a/src/generated/resources/assets/basemetals/models/block/emerald_door_top_right_open.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/door_top_right_open", - "textures": { - "bottom": "basemetals:block/emerald_door_lower", - "top": "basemetals:block/emerald_door_upper" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/models/block/emerald_wall_side_tall.json b/src/generated/resources/assets/basemetals/models/block/emerald_wall_side_tall.json deleted file mode 100644 index 8c0cfd505..000000000 --- a/src/generated/resources/assets/basemetals/models/block/emerald_wall_side_tall.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/template_wall_side_tall", - "textures": { - "wall": "minecraft:block/emerald_block" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/models/block/gold_door_bottom_left.json b/src/generated/resources/assets/basemetals/models/block/gold_door_bottom_left.json deleted file mode 100644 index 7f0d756d8..000000000 --- a/src/generated/resources/assets/basemetals/models/block/gold_door_bottom_left.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/door_bottom_left", - "textures": { - "bottom": "basemetals:block/gold_door_lower", - "top": "basemetals:block/gold_door_upper" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/models/block/gold_door_bottom_left_open.json b/src/generated/resources/assets/basemetals/models/block/gold_door_bottom_left_open.json deleted file mode 100644 index ad95574ab..000000000 --- a/src/generated/resources/assets/basemetals/models/block/gold_door_bottom_left_open.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/door_bottom_left_open", - "textures": { - "bottom": "basemetals:block/gold_door_lower", - "top": "basemetals:block/gold_door_upper" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/models/block/gold_door_bottom_right.json b/src/generated/resources/assets/basemetals/models/block/gold_door_bottom_right.json deleted file mode 100644 index 9e7372a77..000000000 --- a/src/generated/resources/assets/basemetals/models/block/gold_door_bottom_right.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/door_bottom_right", - "textures": { - "bottom": "basemetals:block/gold_door_lower", - "top": "basemetals:block/gold_door_upper" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/models/block/gold_door_bottom_right_open.json b/src/generated/resources/assets/basemetals/models/block/gold_door_bottom_right_open.json deleted file mode 100644 index 2d3f3b588..000000000 --- a/src/generated/resources/assets/basemetals/models/block/gold_door_bottom_right_open.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/door_bottom_right_open", - "textures": { - "bottom": "basemetals:block/gold_door_lower", - "top": "basemetals:block/gold_door_upper" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/models/block/gold_door_top_left.json b/src/generated/resources/assets/basemetals/models/block/gold_door_top_left.json deleted file mode 100644 index b43f11db6..000000000 --- a/src/generated/resources/assets/basemetals/models/block/gold_door_top_left.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/door_top_left", - "textures": { - "bottom": "basemetals:block/gold_door_lower", - "top": "basemetals:block/gold_door_upper" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/models/block/gold_door_top_left_open.json b/src/generated/resources/assets/basemetals/models/block/gold_door_top_left_open.json deleted file mode 100644 index fd9becd27..000000000 --- a/src/generated/resources/assets/basemetals/models/block/gold_door_top_left_open.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/door_top_left_open", - "textures": { - "bottom": "basemetals:block/gold_door_lower", - "top": "basemetals:block/gold_door_upper" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/models/block/gold_door_top_right.json b/src/generated/resources/assets/basemetals/models/block/gold_door_top_right.json deleted file mode 100644 index bd723bbf0..000000000 --- a/src/generated/resources/assets/basemetals/models/block/gold_door_top_right.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/door_top_right", - "textures": { - "bottom": "basemetals:block/gold_door_lower", - "top": "basemetals:block/gold_door_upper" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/models/block/gold_door_top_right_open.json b/src/generated/resources/assets/basemetals/models/block/gold_door_top_right_open.json deleted file mode 100644 index 531ec3b16..000000000 --- a/src/generated/resources/assets/basemetals/models/block/gold_door_top_right_open.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/door_top_right_open", - "textures": { - "bottom": "basemetals:block/gold_door_lower", - "top": "basemetals:block/gold_door_upper" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/models/block/gold_wall_side_tall.json b/src/generated/resources/assets/basemetals/models/block/gold_wall_side_tall.json deleted file mode 100644 index a3531a157..000000000 --- a/src/generated/resources/assets/basemetals/models/block/gold_wall_side_tall.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/template_wall_side_tall", - "textures": { - "wall": "minecraft:block/gold_block" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/models/block/iron_wall_side_tall.json b/src/generated/resources/assets/basemetals/models/block/iron_wall_side_tall.json deleted file mode 100644 index 59e6d0ef4..000000000 --- a/src/generated/resources/assets/basemetals/models/block/iron_wall_side_tall.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/template_wall_side_tall", - "textures": { - "wall": "minecraft:block/iron_block" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/models/block/obsidian_bars_post_ends.json b/src/generated/resources/assets/basemetals/models/block/obsidian_bars_post_ends.json deleted file mode 100644 index 610cc770e..000000000 --- a/src/generated/resources/assets/basemetals/models/block/obsidian_bars_post_ends.json +++ /dev/null @@ -1,49 +0,0 @@ -{ - "ambientocclusion": false, - "elements": [ - { - "faces": { - "down": { - "texture": "#edge" - }, - "up": { - "texture": "#edge" - } - }, - "from": [ - 7, - 0.001, - 7 - ], - "to": [ - 9, - 0.001, - 9 - ] - }, - { - "faces": { - "down": { - "texture": "#edge" - }, - "up": { - "texture": "#edge" - } - }, - "from": [ - 7, - 15.999, - 7 - ], - "to": [ - 9, - 15.999, - 9 - ] - } - ], - "textures": { - "edge": "basemetals:block/obsidian_bars", - "particle": "basemetals:block/obsidian_bars" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/models/block/obsidian_door_bottom_left.json b/src/generated/resources/assets/basemetals/models/block/obsidian_door_bottom_left.json deleted file mode 100644 index b92d97882..000000000 --- a/src/generated/resources/assets/basemetals/models/block/obsidian_door_bottom_left.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/door_bottom_left", - "textures": { - "bottom": "basemetals:block/obsidian_door_lower", - "top": "basemetals:block/obsidian_door_upper" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/models/block/obsidian_door_bottom_left_open.json b/src/generated/resources/assets/basemetals/models/block/obsidian_door_bottom_left_open.json deleted file mode 100644 index 47760e2c6..000000000 --- a/src/generated/resources/assets/basemetals/models/block/obsidian_door_bottom_left_open.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/door_bottom_left_open", - "textures": { - "bottom": "basemetals:block/obsidian_door_lower", - "top": "basemetals:block/obsidian_door_upper" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/models/block/obsidian_door_bottom_right.json b/src/generated/resources/assets/basemetals/models/block/obsidian_door_bottom_right.json deleted file mode 100644 index cf7fb1539..000000000 --- a/src/generated/resources/assets/basemetals/models/block/obsidian_door_bottom_right.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/door_bottom_right", - "textures": { - "bottom": "basemetals:block/obsidian_door_lower", - "top": "basemetals:block/obsidian_door_upper" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/models/block/obsidian_door_bottom_right_open.json b/src/generated/resources/assets/basemetals/models/block/obsidian_door_bottom_right_open.json deleted file mode 100644 index 1e556e669..000000000 --- a/src/generated/resources/assets/basemetals/models/block/obsidian_door_bottom_right_open.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/door_bottom_right_open", - "textures": { - "bottom": "basemetals:block/obsidian_door_lower", - "top": "basemetals:block/obsidian_door_upper" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/models/block/obsidian_door_top_left.json b/src/generated/resources/assets/basemetals/models/block/obsidian_door_top_left.json deleted file mode 100644 index 05a36f6fa..000000000 --- a/src/generated/resources/assets/basemetals/models/block/obsidian_door_top_left.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/door_top_left", - "textures": { - "bottom": "basemetals:block/obsidian_door_lower", - "top": "basemetals:block/obsidian_door_upper" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/models/block/obsidian_door_top_left_open.json b/src/generated/resources/assets/basemetals/models/block/obsidian_door_top_left_open.json deleted file mode 100644 index 3e94fe242..000000000 --- a/src/generated/resources/assets/basemetals/models/block/obsidian_door_top_left_open.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/door_top_left_open", - "textures": { - "bottom": "basemetals:block/obsidian_door_lower", - "top": "basemetals:block/obsidian_door_upper" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/models/block/obsidian_door_top_right.json b/src/generated/resources/assets/basemetals/models/block/obsidian_door_top_right.json deleted file mode 100644 index 40eaa0d95..000000000 --- a/src/generated/resources/assets/basemetals/models/block/obsidian_door_top_right.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/door_top_right", - "textures": { - "bottom": "basemetals:block/obsidian_door_lower", - "top": "basemetals:block/obsidian_door_upper" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/models/block/obsidian_door_top_right_open.json b/src/generated/resources/assets/basemetals/models/block/obsidian_door_top_right_open.json deleted file mode 100644 index 747b654db..000000000 --- a/src/generated/resources/assets/basemetals/models/block/obsidian_door_top_right_open.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/door_top_right_open", - "textures": { - "bottom": "basemetals:block/obsidian_door_lower", - "top": "basemetals:block/obsidian_door_upper" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/models/block/obsidian_wall_side_tall.json b/src/generated/resources/assets/basemetals/models/block/obsidian_wall_side_tall.json deleted file mode 100644 index d5111c3d9..000000000 --- a/src/generated/resources/assets/basemetals/models/block/obsidian_wall_side_tall.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/template_wall_side_tall", - "textures": { - "wall": "minecraft:block/obsidian" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/models/block/quartz_bars_post_ends.json b/src/generated/resources/assets/basemetals/models/block/quartz_bars_post_ends.json deleted file mode 100644 index 1754c75dd..000000000 --- a/src/generated/resources/assets/basemetals/models/block/quartz_bars_post_ends.json +++ /dev/null @@ -1,49 +0,0 @@ -{ - "ambientocclusion": false, - "elements": [ - { - "faces": { - "down": { - "texture": "#edge" - }, - "up": { - "texture": "#edge" - } - }, - "from": [ - 7, - 0.001, - 7 - ], - "to": [ - 9, - 0.001, - 9 - ] - }, - { - "faces": { - "down": { - "texture": "#edge" - }, - "up": { - "texture": "#edge" - } - }, - "from": [ - 7, - 15.999, - 7 - ], - "to": [ - 9, - 15.999, - 9 - ] - } - ], - "textures": { - "edge": "basemetals:block/quartz_bars", - "particle": "basemetals:block/quartz_bars" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/models/block/quartz_door_bottom_left.json b/src/generated/resources/assets/basemetals/models/block/quartz_door_bottom_left.json deleted file mode 100644 index 4089a7a58..000000000 --- a/src/generated/resources/assets/basemetals/models/block/quartz_door_bottom_left.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/door_bottom_left", - "textures": { - "bottom": "basemetals:block/quartz_door_lower", - "top": "basemetals:block/quartz_door_upper" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/models/block/quartz_door_bottom_left_open.json b/src/generated/resources/assets/basemetals/models/block/quartz_door_bottom_left_open.json deleted file mode 100644 index 6f6ec5758..000000000 --- a/src/generated/resources/assets/basemetals/models/block/quartz_door_bottom_left_open.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/door_bottom_left_open", - "textures": { - "bottom": "basemetals:block/quartz_door_lower", - "top": "basemetals:block/quartz_door_upper" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/models/block/quartz_door_bottom_right.json b/src/generated/resources/assets/basemetals/models/block/quartz_door_bottom_right.json deleted file mode 100644 index b52a9ca95..000000000 --- a/src/generated/resources/assets/basemetals/models/block/quartz_door_bottom_right.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/door_bottom_right", - "textures": { - "bottom": "basemetals:block/quartz_door_lower", - "top": "basemetals:block/quartz_door_upper" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/models/block/quartz_door_bottom_right_open.json b/src/generated/resources/assets/basemetals/models/block/quartz_door_bottom_right_open.json deleted file mode 100644 index e6409f770..000000000 --- a/src/generated/resources/assets/basemetals/models/block/quartz_door_bottom_right_open.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/door_bottom_right_open", - "textures": { - "bottom": "basemetals:block/quartz_door_lower", - "top": "basemetals:block/quartz_door_upper" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/models/block/quartz_door_top_left.json b/src/generated/resources/assets/basemetals/models/block/quartz_door_top_left.json deleted file mode 100644 index 9214a01f9..000000000 --- a/src/generated/resources/assets/basemetals/models/block/quartz_door_top_left.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/door_top_left", - "textures": { - "bottom": "basemetals:block/quartz_door_lower", - "top": "basemetals:block/quartz_door_upper" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/models/block/quartz_door_top_left_open.json b/src/generated/resources/assets/basemetals/models/block/quartz_door_top_left_open.json deleted file mode 100644 index 78699540c..000000000 --- a/src/generated/resources/assets/basemetals/models/block/quartz_door_top_left_open.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/door_top_left_open", - "textures": { - "bottom": "basemetals:block/quartz_door_lower", - "top": "basemetals:block/quartz_door_upper" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/models/block/quartz_door_top_right.json b/src/generated/resources/assets/basemetals/models/block/quartz_door_top_right.json deleted file mode 100644 index b3c00141f..000000000 --- a/src/generated/resources/assets/basemetals/models/block/quartz_door_top_right.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/door_top_right", - "textures": { - "bottom": "basemetals:block/quartz_door_lower", - "top": "basemetals:block/quartz_door_upper" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/models/block/quartz_door_top_right_open.json b/src/generated/resources/assets/basemetals/models/block/quartz_door_top_right_open.json deleted file mode 100644 index d33ee2021..000000000 --- a/src/generated/resources/assets/basemetals/models/block/quartz_door_top_right_open.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/door_top_right_open", - "textures": { - "bottom": "basemetals:block/quartz_door_lower", - "top": "basemetals:block/quartz_door_upper" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/models/block/quartz_wall_side_tall.json b/src/generated/resources/assets/basemetals/models/block/quartz_wall_side_tall.json deleted file mode 100644 index ac2f240b3..000000000 --- a/src/generated/resources/assets/basemetals/models/block/quartz_wall_side_tall.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/template_wall_side_tall", - "textures": { - "wall": "minecraft:block/quartz_block_side" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/models/item/lapis.json b/src/generated/resources/assets/basemetals/models/item/lapis.json deleted file mode 100644 index 12be895f7..000000000 --- a/src/generated/resources/assets/basemetals/models/item/lapis.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "basemetals:block/molten_metal_still" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/models/item/lapis_bucket.json b/src/generated/resources/assets/basemetals/models/item/lapis_bucket.json deleted file mode 100644 index 525dbc8a0..000000000 --- a/src/generated/resources/assets/basemetals/models/item/lapis_bucket.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "parent": "neoforge:item/bucket", - "fluid": "basemetals:lapis", - "loader": "neoforge:fluid_container" -} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/models/item/stone.json b/src/generated/resources/assets/basemetals/models/item/stone.json deleted file mode 100644 index 12be895f7..000000000 --- a/src/generated/resources/assets/basemetals/models/item/stone.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "basemetals:block/molten_metal_still" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/models/item/stone_bucket.json b/src/generated/resources/assets/basemetals/models/item/stone_bucket.json deleted file mode 100644 index 2fa26cfbe..000000000 --- a/src/generated/resources/assets/basemetals/models/item/stone_bucket.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "parent": "neoforge:item/bucket", - "fluid": "basemetals:stone", - "loader": "neoforge:fluid_container" -} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/models/item/wood.json b/src/generated/resources/assets/basemetals/models/item/wood.json deleted file mode 100644 index 12be895f7..000000000 --- a/src/generated/resources/assets/basemetals/models/item/wood.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "basemetals:block/molten_metal_still" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/models/item/wood_bucket.json b/src/generated/resources/assets/basemetals/models/item/wood_bucket.json deleted file mode 100644 index 96c9d2d89..000000000 --- a/src/generated/resources/assets/basemetals/models/item/wood_bucket.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "parent": "neoforge:item/bucket", - "fluid": "basemetals:wood", - "loader": "neoforge:fluid_container" -} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/advancement/recipes/charcoal_from_block.json b/src/generated/resources/data/basemetals/advancement/recipes/charcoal_from_block.json new file mode 100644 index 000000000..4bbeb7bb9 --- /dev/null +++ b/src/generated/resources/data/basemetals/advancement/recipes/charcoal_from_block.json @@ -0,0 +1,47 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_ingredient_1": { + "conditions": { + "items": [ + { + "items": [ + "basemetals:charcoal_block" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_material": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:charcoal" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_recipe": { + "conditions": { + "recipe": "basemetals:charcoal_from_block" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_material", + "has_recipe", + "has_ingredient_1" + ] + ], + "rewards": { + "recipes": [ + "basemetals:charcoal_from_block" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/advancement/recipes/diamond_blend.json b/src/generated/resources/data/basemetals/advancement/recipes/diamond_blend.json new file mode 100644 index 000000000..c23f7a062 --- /dev/null +++ b/src/generated/resources/data/basemetals/advancement/recipes/diamond_blend.json @@ -0,0 +1,43 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_ingredient_1": { + "conditions": { + "items": [ + { + "items": "#c:dusts/diamond" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_material": { + "conditions": { + "items": [ + { + "items": "#c:gems/diamond" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_recipe": { + "conditions": { + "recipe": "basemetals:diamond_blend" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_material", + "has_recipe", + "has_ingredient_1" + ] + ], + "rewards": { + "recipes": [ + "basemetals:diamond_blend" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/advancement/recipes/diamond_blend_from_small.json b/src/generated/resources/data/basemetals/advancement/recipes/diamond_blend_from_small.json new file mode 100644 index 000000000..7412481b4 --- /dev/null +++ b/src/generated/resources/data/basemetals/advancement/recipes/diamond_blend_from_small.json @@ -0,0 +1,43 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_ingredient_1": { + "conditions": { + "items": [ + { + "items": "#c:small_blends/diamond" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_material": { + "conditions": { + "items": [ + { + "items": "#c:gems/diamond" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_recipe": { + "conditions": { + "recipe": "basemetals:diamond_blend_from_small" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_material", + "has_recipe", + "has_ingredient_1" + ] + ], + "rewards": { + "recipes": [ + "basemetals:diamond_blend_from_small" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/advancement/recipes/diamond_ingot.json b/src/generated/resources/data/basemetals/advancement/recipes/diamond_ingot.json new file mode 100644 index 000000000..b210a24a7 --- /dev/null +++ b/src/generated/resources/data/basemetals/advancement/recipes/diamond_ingot.json @@ -0,0 +1,43 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_ingredient_1": { + "conditions": { + "items": [ + { + "items": "#c:nuggets/diamond" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_material": { + "conditions": { + "items": [ + { + "items": "#c:gems/diamond" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_recipe": { + "conditions": { + "recipe": "basemetals:diamond_ingot" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_material", + "has_recipe", + "has_ingredient_1" + ] + ], + "rewards": { + "recipes": [ + "basemetals:diamond_ingot" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/advancement/recipes/diamond_nugget.json b/src/generated/resources/data/basemetals/advancement/recipes/diamond_nugget.json new file mode 100644 index 000000000..578d05980 --- /dev/null +++ b/src/generated/resources/data/basemetals/advancement/recipes/diamond_nugget.json @@ -0,0 +1,43 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_ingredient_1": { + "conditions": { + "items": [ + { + "items": "#c:gems/diamond" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_material": { + "conditions": { + "items": [ + { + "items": "#c:gems/diamond" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_recipe": { + "conditions": { + "recipe": "basemetals:diamond_nugget" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_material", + "has_recipe", + "has_ingredient_1" + ] + ], + "rewards": { + "recipes": [ + "basemetals:diamond_nugget" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/advancement/recipes/diamond_smallblend.json b/src/generated/resources/data/basemetals/advancement/recipes/diamond_smallblend.json new file mode 100644 index 000000000..6187b41c4 --- /dev/null +++ b/src/generated/resources/data/basemetals/advancement/recipes/diamond_smallblend.json @@ -0,0 +1,43 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_ingredient_1": { + "conditions": { + "items": [ + { + "items": "#c:blends/diamond" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_material": { + "conditions": { + "items": [ + { + "items": "#c:gems/diamond" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_recipe": { + "conditions": { + "recipe": "basemetals:diamond_smallblend" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_material", + "has_recipe", + "has_ingredient_1" + ] + ], + "rewards": { + "recipes": [ + "basemetals:diamond_smallblend" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/advancement/recipes/emerald_ingot.json b/src/generated/resources/data/basemetals/advancement/recipes/emerald_ingot.json new file mode 100644 index 000000000..98069ac72 --- /dev/null +++ b/src/generated/resources/data/basemetals/advancement/recipes/emerald_ingot.json @@ -0,0 +1,43 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_ingredient_1": { + "conditions": { + "items": [ + { + "items": "#c:nuggets/emerald" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_material": { + "conditions": { + "items": [ + { + "items": "#c:gems/emerald" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_recipe": { + "conditions": { + "recipe": "basemetals:emerald_ingot" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_material", + "has_recipe", + "has_ingredient_1" + ] + ], + "rewards": { + "recipes": [ + "basemetals:emerald_ingot" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/advancement/recipes/emerald_nugget.json b/src/generated/resources/data/basemetals/advancement/recipes/emerald_nugget.json new file mode 100644 index 000000000..c7337c0d0 --- /dev/null +++ b/src/generated/resources/data/basemetals/advancement/recipes/emerald_nugget.json @@ -0,0 +1,43 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_ingredient_1": { + "conditions": { + "items": [ + { + "items": "#c:gems/emerald" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_material": { + "conditions": { + "items": [ + { + "items": "#c:gems/emerald" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_recipe": { + "conditions": { + "recipe": "basemetals:emerald_nugget" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_material", + "has_recipe", + "has_ingredient_1" + ] + ], + "rewards": { + "recipes": [ + "basemetals:emerald_nugget" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/advancement/recipes/gold_blend.json b/src/generated/resources/data/basemetals/advancement/recipes/gold_blend.json new file mode 100644 index 000000000..f4adb515e --- /dev/null +++ b/src/generated/resources/data/basemetals/advancement/recipes/gold_blend.json @@ -0,0 +1,43 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_ingredient_1": { + "conditions": { + "items": [ + { + "items": "#c:dusts/gold" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_material": { + "conditions": { + "items": [ + { + "items": "#c:ingots/gold" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_recipe": { + "conditions": { + "recipe": "basemetals:gold_blend" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_material", + "has_recipe", + "has_ingredient_1" + ] + ], + "rewards": { + "recipes": [ + "basemetals:gold_blend" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/advancement/recipes/gold_blend_from_small.json b/src/generated/resources/data/basemetals/advancement/recipes/gold_blend_from_small.json new file mode 100644 index 000000000..3bc129e79 --- /dev/null +++ b/src/generated/resources/data/basemetals/advancement/recipes/gold_blend_from_small.json @@ -0,0 +1,43 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_ingredient_1": { + "conditions": { + "items": [ + { + "items": "#c:small_blends/gold" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_material": { + "conditions": { + "items": [ + { + "items": "#c:ingots/gold" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_recipe": { + "conditions": { + "recipe": "basemetals:gold_blend_from_small" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_material", + "has_recipe", + "has_ingredient_1" + ] + ], + "rewards": { + "recipes": [ + "basemetals:gold_blend_from_small" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/advancement/recipes/gold_smallblend.json b/src/generated/resources/data/basemetals/advancement/recipes/gold_smallblend.json new file mode 100644 index 000000000..7f9c877ac --- /dev/null +++ b/src/generated/resources/data/basemetals/advancement/recipes/gold_smallblend.json @@ -0,0 +1,43 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_ingredient_1": { + "conditions": { + "items": [ + { + "items": "#c:blends/gold" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_material": { + "conditions": { + "items": [ + { + "items": "#c:ingots/gold" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_recipe": { + "conditions": { + "recipe": "basemetals:gold_smallblend" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_material", + "has_recipe", + "has_ingredient_1" + ] + ], + "rewards": { + "recipes": [ + "basemetals:gold_smallblend" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/advancement/recipes/iron_blend.json b/src/generated/resources/data/basemetals/advancement/recipes/iron_blend.json new file mode 100644 index 000000000..520e7f71a --- /dev/null +++ b/src/generated/resources/data/basemetals/advancement/recipes/iron_blend.json @@ -0,0 +1,43 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_ingredient_1": { + "conditions": { + "items": [ + { + "items": "#c:dusts/iron" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_material": { + "conditions": { + "items": [ + { + "items": "#c:ingots/iron" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_recipe": { + "conditions": { + "recipe": "basemetals:iron_blend" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_material", + "has_recipe", + "has_ingredient_1" + ] + ], + "rewards": { + "recipes": [ + "basemetals:iron_blend" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/advancement/recipes/iron_blend_from_small.json b/src/generated/resources/data/basemetals/advancement/recipes/iron_blend_from_small.json new file mode 100644 index 000000000..6afc7a9d9 --- /dev/null +++ b/src/generated/resources/data/basemetals/advancement/recipes/iron_blend_from_small.json @@ -0,0 +1,43 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_ingredient_1": { + "conditions": { + "items": [ + { + "items": "#c:small_blends/iron" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_material": { + "conditions": { + "items": [ + { + "items": "#c:ingots/iron" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_recipe": { + "conditions": { + "recipe": "basemetals:iron_blend_from_small" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_material", + "has_recipe", + "has_ingredient_1" + ] + ], + "rewards": { + "recipes": [ + "basemetals:iron_blend_from_small" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/advancement/recipes/iron_smallblend.json b/src/generated/resources/data/basemetals/advancement/recipes/iron_smallblend.json new file mode 100644 index 000000000..54efcfd1f --- /dev/null +++ b/src/generated/resources/data/basemetals/advancement/recipes/iron_smallblend.json @@ -0,0 +1,43 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_ingredient_1": { + "conditions": { + "items": [ + { + "items": "#c:blends/iron" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_material": { + "conditions": { + "items": [ + { + "items": "#c:ingots/iron" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_recipe": { + "conditions": { + "recipe": "basemetals:iron_smallblend" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_material", + "has_recipe", + "has_ingredient_1" + ] + ], + "rewards": { + "recipes": [ + "basemetals:iron_smallblend" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/advancement/recipes/lapis_from_smallpowder.json b/src/generated/resources/data/basemetals/advancement/recipes/lapis_from_smallpowder.json new file mode 100644 index 000000000..1ff5877dd --- /dev/null +++ b/src/generated/resources/data/basemetals/advancement/recipes/lapis_from_smallpowder.json @@ -0,0 +1,43 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_ingredient_1": { + "conditions": { + "items": [ + { + "items": "#c:tiny_dusts/lapis" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_material": { + "conditions": { + "items": [ + { + "items": "#c:gems/lapis" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_recipe": { + "conditions": { + "recipe": "basemetals:lapis_from_smallpowder" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_material", + "has_recipe", + "has_ingredient_1" + ] + ], + "rewards": { + "recipes": [ + "basemetals:lapis_from_smallpowder" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/advancement/recipes/lapis_smallpowder.json b/src/generated/resources/data/basemetals/advancement/recipes/lapis_smallpowder.json new file mode 100644 index 000000000..b2654d013 --- /dev/null +++ b/src/generated/resources/data/basemetals/advancement/recipes/lapis_smallpowder.json @@ -0,0 +1,43 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_ingredient_1": { + "conditions": { + "items": [ + { + "items": "#c:dusts/lapis" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_material": { + "conditions": { + "items": [ + { + "items": "#c:gems/lapis" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_recipe": { + "conditions": { + "recipe": "basemetals:lapis_smallpowder" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_material", + "has_recipe", + "has_ingredient_1" + ] + ], + "rewards": { + "recipes": [ + "basemetals:lapis_smallpowder" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/advancement/recipes/stone_gear.json b/src/generated/resources/data/basemetals/advancement/recipes/stone_gear.json new file mode 100644 index 000000000..3697068b3 --- /dev/null +++ b/src/generated/resources/data/basemetals/advancement/recipes/stone_gear.json @@ -0,0 +1,54 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_ingredient_1": { + "conditions": { + "items": [ + { + "items": "#c:rods/stone" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_ingredient_2": { + "conditions": { + "items": [ + { + "items": "#c:cobblestones" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_material": { + "conditions": { + "items": [ + { + "items": "#c:stones" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_recipe": { + "conditions": { + "recipe": "basemetals:stone_gear" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_material", + "has_recipe", + "has_ingredient_1", + "has_ingredient_2" + ] + ], + "rewards": { + "recipes": [ + "basemetals:stone_gear" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/advancement/recipes/stone_rod.json b/src/generated/resources/data/basemetals/advancement/recipes/stone_rod.json new file mode 100644 index 000000000..4371986fd --- /dev/null +++ b/src/generated/resources/data/basemetals/advancement/recipes/stone_rod.json @@ -0,0 +1,43 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_ingredient_1": { + "conditions": { + "items": [ + { + "items": "#c:cobblestones" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_material": { + "conditions": { + "items": [ + { + "items": "#c:stones" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_recipe": { + "conditions": { + "recipe": "basemetals:stone_rod" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_material", + "has_recipe", + "has_ingredient_1" + ] + ], + "rewards": { + "recipes": [ + "basemetals:stone_rod" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/advancement/recipes/wood_gear.json b/src/generated/resources/data/basemetals/advancement/recipes/wood_gear.json new file mode 100644 index 000000000..873124b0c --- /dev/null +++ b/src/generated/resources/data/basemetals/advancement/recipes/wood_gear.json @@ -0,0 +1,43 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_ingredient_1": { + "conditions": { + "items": [ + { + "items": "#minecraft:planks" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_material": { + "conditions": { + "items": [ + { + "items": "#minecraft:logs" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_recipe": { + "conditions": { + "recipe": "basemetals:wood_gear" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_material", + "has_recipe", + "has_ingredient_1" + ] + ], + "rewards": { + "recipes": [ + "basemetals:wood_gear" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/loot_table/blocks/double_adamantine_slab.json b/src/generated/resources/data/basemetals/loot_table/blocks/adamantine_double_slab.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_table/blocks/double_adamantine_slab.json rename to src/generated/resources/data/basemetals/loot_table/blocks/adamantine_double_slab.json diff --git a/src/generated/resources/data/basemetals/loot_table/blocks/double_antimony_slab.json b/src/generated/resources/data/basemetals/loot_table/blocks/antimony_double_slab.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_table/blocks/double_antimony_slab.json rename to src/generated/resources/data/basemetals/loot_table/blocks/antimony_double_slab.json diff --git a/src/generated/resources/data/basemetals/loot_table/blocks/double_aquarium_slab.json b/src/generated/resources/data/basemetals/loot_table/blocks/aquarium_double_slab.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_table/blocks/double_aquarium_slab.json rename to src/generated/resources/data/basemetals/loot_table/blocks/aquarium_double_slab.json diff --git a/src/generated/resources/data/basemetals/loot_table/blocks/double_bismuth_slab.json b/src/generated/resources/data/basemetals/loot_table/blocks/bismuth_double_slab.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_table/blocks/double_bismuth_slab.json rename to src/generated/resources/data/basemetals/loot_table/blocks/bismuth_double_slab.json diff --git a/src/generated/resources/data/basemetals/loot_table/blocks/double_brass_slab.json b/src/generated/resources/data/basemetals/loot_table/blocks/brass_double_slab.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_table/blocks/double_brass_slab.json rename to src/generated/resources/data/basemetals/loot_table/blocks/brass_double_slab.json diff --git a/src/generated/resources/data/basemetals/loot_table/blocks/double_bronze_slab.json b/src/generated/resources/data/basemetals/loot_table/blocks/bronze_double_slab.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_table/blocks/double_bronze_slab.json rename to src/generated/resources/data/basemetals/loot_table/blocks/bronze_double_slab.json diff --git a/src/generated/resources/data/basemetals/loot_table/blocks/double_coldiron_slab.json b/src/generated/resources/data/basemetals/loot_table/blocks/coldiron_double_slab.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_table/blocks/double_coldiron_slab.json rename to src/generated/resources/data/basemetals/loot_table/blocks/coldiron_double_slab.json diff --git a/src/generated/resources/data/basemetals/loot_table/blocks/double_copper_slab.json b/src/generated/resources/data/basemetals/loot_table/blocks/copper_double_slab.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_table/blocks/double_copper_slab.json rename to src/generated/resources/data/basemetals/loot_table/blocks/copper_double_slab.json diff --git a/src/generated/resources/data/basemetals/loot_table/blocks/double_cupronickel_slab.json b/src/generated/resources/data/basemetals/loot_table/blocks/cupronickel_double_slab.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_table/blocks/double_cupronickel_slab.json rename to src/generated/resources/data/basemetals/loot_table/blocks/cupronickel_double_slab.json diff --git a/src/generated/resources/data/basemetals/loot_table/blocks/double_diamond_slab.json b/src/generated/resources/data/basemetals/loot_table/blocks/diamond_double_slab.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_table/blocks/double_diamond_slab.json rename to src/generated/resources/data/basemetals/loot_table/blocks/diamond_double_slab.json diff --git a/src/generated/resources/data/basemetals/loot_table/blocks/double_electrum_slab.json b/src/generated/resources/data/basemetals/loot_table/blocks/electrum_double_slab.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_table/blocks/double_electrum_slab.json rename to src/generated/resources/data/basemetals/loot_table/blocks/electrum_double_slab.json diff --git a/src/generated/resources/data/basemetals/loot_table/blocks/double_emerald_slab.json b/src/generated/resources/data/basemetals/loot_table/blocks/emerald_double_slab.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_table/blocks/double_emerald_slab.json rename to src/generated/resources/data/basemetals/loot_table/blocks/emerald_double_slab.json diff --git a/src/generated/resources/data/basemetals/loot_table/blocks/double_gold_slab.json b/src/generated/resources/data/basemetals/loot_table/blocks/gold_double_slab.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_table/blocks/double_gold_slab.json rename to src/generated/resources/data/basemetals/loot_table/blocks/gold_double_slab.json diff --git a/src/generated/resources/data/basemetals/loot_table/blocks/double_invar_slab.json b/src/generated/resources/data/basemetals/loot_table/blocks/invar_double_slab.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_table/blocks/double_invar_slab.json rename to src/generated/resources/data/basemetals/loot_table/blocks/invar_double_slab.json diff --git a/src/generated/resources/data/basemetals/loot_table/blocks/double_iron_slab.json b/src/generated/resources/data/basemetals/loot_table/blocks/iron_double_slab.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_table/blocks/double_iron_slab.json rename to src/generated/resources/data/basemetals/loot_table/blocks/iron_double_slab.json diff --git a/src/generated/resources/data/basemetals/loot_table/blocks/double_lead_slab.json b/src/generated/resources/data/basemetals/loot_table/blocks/lead_double_slab.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_table/blocks/double_lead_slab.json rename to src/generated/resources/data/basemetals/loot_table/blocks/lead_double_slab.json diff --git a/src/generated/resources/data/basemetals/loot_table/blocks/double_mithril_slab.json b/src/generated/resources/data/basemetals/loot_table/blocks/mithril_double_slab.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_table/blocks/double_mithril_slab.json rename to src/generated/resources/data/basemetals/loot_table/blocks/mithril_double_slab.json diff --git a/src/generated/resources/data/basemetals/loot_table/blocks/double_nickel_slab.json b/src/generated/resources/data/basemetals/loot_table/blocks/nickel_double_slab.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_table/blocks/double_nickel_slab.json rename to src/generated/resources/data/basemetals/loot_table/blocks/nickel_double_slab.json diff --git a/src/generated/resources/data/basemetals/loot_table/blocks/double_obsidian_slab.json b/src/generated/resources/data/basemetals/loot_table/blocks/obsidian_double_slab.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_table/blocks/double_obsidian_slab.json rename to src/generated/resources/data/basemetals/loot_table/blocks/obsidian_double_slab.json diff --git a/src/generated/resources/data/basemetals/loot_table/blocks/double_pewter_slab.json b/src/generated/resources/data/basemetals/loot_table/blocks/pewter_double_slab.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_table/blocks/double_pewter_slab.json rename to src/generated/resources/data/basemetals/loot_table/blocks/pewter_double_slab.json diff --git a/src/generated/resources/data/basemetals/loot_table/blocks/double_platinum_slab.json b/src/generated/resources/data/basemetals/loot_table/blocks/platinum_double_slab.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_table/blocks/double_platinum_slab.json rename to src/generated/resources/data/basemetals/loot_table/blocks/platinum_double_slab.json diff --git a/src/generated/resources/data/basemetals/loot_table/blocks/double_silver_slab.json b/src/generated/resources/data/basemetals/loot_table/blocks/silver_double_slab.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_table/blocks/double_silver_slab.json rename to src/generated/resources/data/basemetals/loot_table/blocks/silver_double_slab.json diff --git a/src/generated/resources/data/basemetals/loot_table/blocks/double_starsteel_slab.json b/src/generated/resources/data/basemetals/loot_table/blocks/starsteel_double_slab.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_table/blocks/double_starsteel_slab.json rename to src/generated/resources/data/basemetals/loot_table/blocks/starsteel_double_slab.json diff --git a/src/generated/resources/data/basemetals/loot_table/blocks/double_steel_slab.json b/src/generated/resources/data/basemetals/loot_table/blocks/steel_double_slab.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_table/blocks/double_steel_slab.json rename to src/generated/resources/data/basemetals/loot_table/blocks/steel_double_slab.json diff --git a/src/generated/resources/data/basemetals/loot_table/blocks/double_tin_slab.json b/src/generated/resources/data/basemetals/loot_table/blocks/tin_double_slab.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_table/blocks/double_tin_slab.json rename to src/generated/resources/data/basemetals/loot_table/blocks/tin_double_slab.json diff --git a/src/generated/resources/data/basemetals/loot_table/blocks/double_zinc_slab.json b/src/generated/resources/data/basemetals/loot_table/blocks/zinc_double_slab.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_table/blocks/double_zinc_slab.json rename to src/generated/resources/data/basemetals/loot_table/blocks/zinc_double_slab.json diff --git a/src/generated/resources/data/basemetals/recipe/adamantine_block_crushing.json b/src/generated/resources/data/basemetals/recipe/adamantine_block_crushing.json index c3e8811d8..291146103 100644 --- a/src/generated/resources/data/basemetals/recipe/adamantine_block_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/adamantine_block_crushing.json @@ -1,10 +1,10 @@ { - "type": "basemetals:crushing", + "type": "mmdlib:crushing", "ingredient": { "tag": "c:storage_blocks/adamantine" }, "result": { "count": 9, - "id": "basemetals:adamantine_powder" + "item": "basemetals:adamantine_powder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/adamantine_ingot_crushing.json b/src/generated/resources/data/basemetals/recipe/adamantine_ingot_crushing.json index 3b1a4b1b6..fbb7d69ce 100644 --- a/src/generated/resources/data/basemetals/recipe/adamantine_ingot_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/adamantine_ingot_crushing.json @@ -1,9 +1,9 @@ { - "type": "basemetals:crushing", + "type": "mmdlib:crushing", "ingredient": { "tag": "c:ingots/adamantine" }, "result": { - "id": "basemetals:adamantine_powder" + "item": "basemetals:adamantine_powder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/adamantine_nugget_crushing.json b/src/generated/resources/data/basemetals/recipe/adamantine_nugget_crushing.json index 1c1f01ceb..9a3db9cac 100644 --- a/src/generated/resources/data/basemetals/recipe/adamantine_nugget_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/adamantine_nugget_crushing.json @@ -1,9 +1,9 @@ { - "type": "basemetals:crushing", + "type": "mmdlib:crushing", "ingredient": { "tag": "c:nuggets/adamantine" }, "result": { - "id": "basemetals:adamantine_smallpowder" + "item": "basemetals:adamantine_smallpowder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/adamantine_ore_crushing.json b/src/generated/resources/data/basemetals/recipe/adamantine_ore_crushing.json index e7bb4e364..d72781373 100644 --- a/src/generated/resources/data/basemetals/recipe/adamantine_ore_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/adamantine_ore_crushing.json @@ -1,10 +1,10 @@ { - "type": "basemetals:crushing", + "type": "mmdlib:crushing", "ingredient": { "tag": "c:ores/adamantine" }, "result": { "count": 2, - "id": "basemetals:adamantine_powder" + "item": "basemetals:adamantine_powder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/adamantine_raw_crushing.json b/src/generated/resources/data/basemetals/recipe/adamantine_raw_crushing.json index c037188d4..07c980e01 100644 --- a/src/generated/resources/data/basemetals/recipe/adamantine_raw_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/adamantine_raw_crushing.json @@ -1,9 +1,9 @@ { - "type": "basemetals:crushing", + "type": "mmdlib:crushing", "ingredient": { "tag": "c:raw_materials/adamantine" }, "result": { - "id": "basemetals:adamantine_powder" + "item": "basemetals:adamantine_powder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/ancient_debris_crushing.json b/src/generated/resources/data/basemetals/recipe/ancient_debris_crushing.json deleted file mode 100644 index ec12973ac..000000000 --- a/src/generated/resources/data/basemetals/recipe/ancient_debris_crushing.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "type": "basemetals:crushing", - "ingredient": { - "tag": "c:ores/netherite_scrap" - }, - "result": { - "count": 2, - "id": "minecraft:netherite_scrap" - } -} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/antimony_block_crushing.json b/src/generated/resources/data/basemetals/recipe/antimony_block_crushing.json index d960d2393..0ebfaebf3 100644 --- a/src/generated/resources/data/basemetals/recipe/antimony_block_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/antimony_block_crushing.json @@ -1,10 +1,10 @@ { - "type": "basemetals:crushing", + "type": "mmdlib:crushing", "ingredient": { "tag": "c:storage_blocks/antimony" }, "result": { "count": 9, - "id": "basemetals:antimony_powder" + "item": "basemetals:antimony_powder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/antimony_ingot_crushing.json b/src/generated/resources/data/basemetals/recipe/antimony_ingot_crushing.json index c1eea7f98..1cb71690e 100644 --- a/src/generated/resources/data/basemetals/recipe/antimony_ingot_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/antimony_ingot_crushing.json @@ -1,9 +1,9 @@ { - "type": "basemetals:crushing", + "type": "mmdlib:crushing", "ingredient": { "tag": "c:ingots/antimony" }, "result": { - "id": "basemetals:antimony_powder" + "item": "basemetals:antimony_powder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/antimony_nugget_crushing.json b/src/generated/resources/data/basemetals/recipe/antimony_nugget_crushing.json index f940f0a77..1b694dc17 100644 --- a/src/generated/resources/data/basemetals/recipe/antimony_nugget_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/antimony_nugget_crushing.json @@ -1,9 +1,9 @@ { - "type": "basemetals:crushing", + "type": "mmdlib:crushing", "ingredient": { "tag": "c:nuggets/antimony" }, "result": { - "id": "basemetals:antimony_smallpowder" + "item": "basemetals:antimony_smallpowder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/antimony_ore_crushing.json b/src/generated/resources/data/basemetals/recipe/antimony_ore_crushing.json index 7ba3562de..01f6523b4 100644 --- a/src/generated/resources/data/basemetals/recipe/antimony_ore_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/antimony_ore_crushing.json @@ -1,10 +1,10 @@ { - "type": "basemetals:crushing", + "type": "mmdlib:crushing", "ingredient": { "tag": "c:ores/antimony" }, "result": { "count": 2, - "id": "basemetals:antimony_powder" + "item": "basemetals:antimony_powder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/antimony_raw_crushing.json b/src/generated/resources/data/basemetals/recipe/antimony_raw_crushing.json index 73998f5e6..5905ff1ba 100644 --- a/src/generated/resources/data/basemetals/recipe/antimony_raw_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/antimony_raw_crushing.json @@ -1,9 +1,9 @@ { - "type": "basemetals:crushing", + "type": "mmdlib:crushing", "ingredient": { "tag": "c:raw_materials/antimony" }, "result": { - "id": "basemetals:antimony_powder" + "item": "basemetals:antimony_powder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/aquarium_block_crushing.json b/src/generated/resources/data/basemetals/recipe/aquarium_block_crushing.json index c2f6a4f41..cba90c8f3 100644 --- a/src/generated/resources/data/basemetals/recipe/aquarium_block_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/aquarium_block_crushing.json @@ -1,10 +1,10 @@ { - "type": "basemetals:crushing", + "type": "mmdlib:crushing", "ingredient": { "tag": "c:storage_blocks/aquarium" }, "result": { "count": 9, - "id": "basemetals:aquarium_powder" + "item": "basemetals:aquarium_powder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/aquarium_ingot_crushing.json b/src/generated/resources/data/basemetals/recipe/aquarium_ingot_crushing.json index 989a82a95..13850e8e0 100644 --- a/src/generated/resources/data/basemetals/recipe/aquarium_ingot_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/aquarium_ingot_crushing.json @@ -1,9 +1,9 @@ { - "type": "basemetals:crushing", + "type": "mmdlib:crushing", "ingredient": { "tag": "c:ingots/aquarium" }, "result": { - "id": "basemetals:aquarium_powder" + "item": "basemetals:aquarium_powder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/aquarium_nugget_crushing.json b/src/generated/resources/data/basemetals/recipe/aquarium_nugget_crushing.json index a33aa6fcf..cf59c6d35 100644 --- a/src/generated/resources/data/basemetals/recipe/aquarium_nugget_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/aquarium_nugget_crushing.json @@ -1,9 +1,9 @@ { - "type": "basemetals:crushing", + "type": "mmdlib:crushing", "ingredient": { "tag": "c:nuggets/aquarium" }, "result": { - "id": "basemetals:aquarium_smallpowder" + "item": "basemetals:aquarium_smallpowder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/bismuth_block_crushing.json b/src/generated/resources/data/basemetals/recipe/bismuth_block_crushing.json index a614dd647..7deef458f 100644 --- a/src/generated/resources/data/basemetals/recipe/bismuth_block_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/bismuth_block_crushing.json @@ -1,10 +1,10 @@ { - "type": "basemetals:crushing", + "type": "mmdlib:crushing", "ingredient": { "tag": "c:storage_blocks/bismuth" }, "result": { "count": 9, - "id": "basemetals:bismuth_powder" + "item": "basemetals:bismuth_powder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/bismuth_ingot_crushing.json b/src/generated/resources/data/basemetals/recipe/bismuth_ingot_crushing.json index f5067e0a4..ea8d5414a 100644 --- a/src/generated/resources/data/basemetals/recipe/bismuth_ingot_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/bismuth_ingot_crushing.json @@ -1,9 +1,9 @@ { - "type": "basemetals:crushing", + "type": "mmdlib:crushing", "ingredient": { "tag": "c:ingots/bismuth" }, "result": { - "id": "basemetals:bismuth_powder" + "item": "basemetals:bismuth_powder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/bismuth_nugget_crushing.json b/src/generated/resources/data/basemetals/recipe/bismuth_nugget_crushing.json index e251be112..5395133f2 100644 --- a/src/generated/resources/data/basemetals/recipe/bismuth_nugget_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/bismuth_nugget_crushing.json @@ -1,9 +1,9 @@ { - "type": "basemetals:crushing", + "type": "mmdlib:crushing", "ingredient": { "tag": "c:nuggets/bismuth" }, "result": { - "id": "basemetals:bismuth_smallpowder" + "item": "basemetals:bismuth_smallpowder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/bismuth_ore_crushing.json b/src/generated/resources/data/basemetals/recipe/bismuth_ore_crushing.json index 40a997f14..485f99740 100644 --- a/src/generated/resources/data/basemetals/recipe/bismuth_ore_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/bismuth_ore_crushing.json @@ -1,10 +1,10 @@ { - "type": "basemetals:crushing", + "type": "mmdlib:crushing", "ingredient": { "tag": "c:ores/bismuth" }, "result": { "count": 2, - "id": "basemetals:bismuth_powder" + "item": "basemetals:bismuth_powder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/bismuth_raw_crushing.json b/src/generated/resources/data/basemetals/recipe/bismuth_raw_crushing.json index 948ead4c3..5013f6c7c 100644 --- a/src/generated/resources/data/basemetals/recipe/bismuth_raw_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/bismuth_raw_crushing.json @@ -1,9 +1,9 @@ { - "type": "basemetals:crushing", + "type": "mmdlib:crushing", "ingredient": { "tag": "c:raw_materials/bismuth" }, "result": { - "id": "basemetals:bismuth_powder" + "item": "basemetals:bismuth_powder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/blaze_rod_crushing.json b/src/generated/resources/data/basemetals/recipe/blaze_rod_crushing.json deleted file mode 100644 index fdbf16163..000000000 --- a/src/generated/resources/data/basemetals/recipe/blaze_rod_crushing.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "type": "basemetals:crushing", - "ingredient": { - "item": "minecraft:blaze_rod" - }, - "result": { - "count": 2, - "id": "minecraft:blaze_powder" - } -} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/bone_block_crushing.json b/src/generated/resources/data/basemetals/recipe/bone_block_crushing.json deleted file mode 100644 index 80e403af2..000000000 --- a/src/generated/resources/data/basemetals/recipe/bone_block_crushing.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "type": "basemetals:crushing", - "ingredient": { - "item": "minecraft:bone_block" - }, - "result": { - "count": 9, - "id": "minecraft:bone_meal" - } -} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/bone_crushing.json b/src/generated/resources/data/basemetals/recipe/bone_crushing.json deleted file mode 100644 index 421c0d40c..000000000 --- a/src/generated/resources/data/basemetals/recipe/bone_crushing.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "type": "basemetals:crushing", - "ingredient": { - "item": "minecraft:bone" - }, - "result": { - "count": 3, - "id": "minecraft:bone_meal" - } -} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/brass_block_crushing.json b/src/generated/resources/data/basemetals/recipe/brass_block_crushing.json index 77b82839a..81f66b018 100644 --- a/src/generated/resources/data/basemetals/recipe/brass_block_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/brass_block_crushing.json @@ -1,10 +1,10 @@ { - "type": "basemetals:crushing", + "type": "mmdlib:crushing", "ingredient": { "tag": "c:storage_blocks/brass" }, "result": { "count": 9, - "id": "basemetals:brass_powder" + "item": "basemetals:brass_powder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/brass_ingot_crushing.json b/src/generated/resources/data/basemetals/recipe/brass_ingot_crushing.json index 3df350052..44fb100ac 100644 --- a/src/generated/resources/data/basemetals/recipe/brass_ingot_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/brass_ingot_crushing.json @@ -1,9 +1,9 @@ { - "type": "basemetals:crushing", + "type": "mmdlib:crushing", "ingredient": { "tag": "c:ingots/brass" }, "result": { - "id": "basemetals:brass_powder" + "item": "basemetals:brass_powder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/brass_nugget_crushing.json b/src/generated/resources/data/basemetals/recipe/brass_nugget_crushing.json index e1378cbd1..987bebe92 100644 --- a/src/generated/resources/data/basemetals/recipe/brass_nugget_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/brass_nugget_crushing.json @@ -1,9 +1,9 @@ { - "type": "basemetals:crushing", + "type": "mmdlib:crushing", "ingredient": { "tag": "c:nuggets/brass" }, "result": { - "id": "basemetals:brass_smallpowder" + "item": "basemetals:brass_smallpowder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/bronze_block_crushing.json b/src/generated/resources/data/basemetals/recipe/bronze_block_crushing.json index cd7df8fcd..33eb51616 100644 --- a/src/generated/resources/data/basemetals/recipe/bronze_block_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/bronze_block_crushing.json @@ -1,10 +1,10 @@ { - "type": "basemetals:crushing", + "type": "mmdlib:crushing", "ingredient": { "tag": "c:storage_blocks/bronze" }, "result": { "count": 9, - "id": "basemetals:bronze_powder" + "item": "basemetals:bronze_powder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/bronze_ingot_crushing.json b/src/generated/resources/data/basemetals/recipe/bronze_ingot_crushing.json index f4f37b46b..b1d953b62 100644 --- a/src/generated/resources/data/basemetals/recipe/bronze_ingot_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/bronze_ingot_crushing.json @@ -1,9 +1,9 @@ { - "type": "basemetals:crushing", + "type": "mmdlib:crushing", "ingredient": { "tag": "c:ingots/bronze" }, "result": { - "id": "basemetals:bronze_powder" + "item": "basemetals:bronze_powder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/bronze_nugget_crushing.json b/src/generated/resources/data/basemetals/recipe/bronze_nugget_crushing.json index 2a93c4629..1b337282b 100644 --- a/src/generated/resources/data/basemetals/recipe/bronze_nugget_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/bronze_nugget_crushing.json @@ -1,9 +1,9 @@ { - "type": "basemetals:crushing", + "type": "mmdlib:crushing", "ingredient": { "tag": "c:nuggets/bronze" }, "result": { - "id": "basemetals:bronze_smallpowder" + "item": "basemetals:bronze_smallpowder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/charcoal_block_crushing.json b/src/generated/resources/data/basemetals/recipe/charcoal_block_crushing.json index 91327788b..dfcc96d20 100644 --- a/src/generated/resources/data/basemetals/recipe/charcoal_block_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/charcoal_block_crushing.json @@ -1,10 +1,10 @@ { - "type": "basemetals:crushing", + "type": "mmdlib:crushing", "ingredient": { "tag": "c:storage_blocks/charcoal" }, "result": { "count": 9, - "id": "basemetals:charcoal_powder" + "item": "basemetals:charcoal_powder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/charcoal_crushing.json b/src/generated/resources/data/basemetals/recipe/charcoal_crushing.json index 07efc3e51..5951d0868 100644 --- a/src/generated/resources/data/basemetals/recipe/charcoal_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/charcoal_crushing.json @@ -1,9 +1,9 @@ { - "type": "basemetals:crushing", + "type": "mmdlib:crushing", "ingredient": { "item": "minecraft:charcoal" }, "result": { - "id": "basemetals:charcoal_powder" + "item": "basemetals:charcoal_powder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/charcoal_from_block.json b/src/generated/resources/data/basemetals/recipe/charcoal_from_block.json new file mode 100644 index 000000000..97dfa53ec --- /dev/null +++ b/src/generated/resources/data/basemetals/recipe/charcoal_from_block.json @@ -0,0 +1,17 @@ +{ + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shapeless", + "category": "misc", + "group": "minecraft:charcoal", + "ingredients": [ + { + "item": "basemetals:charcoal_block" + } + ], + "result": { + "count": 9, + "id": "minecraft:charcoal" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/charcoal_nugget_crushing.json b/src/generated/resources/data/basemetals/recipe/charcoal_nugget_crushing.json index 542f7c686..5f8deeccb 100644 --- a/src/generated/resources/data/basemetals/recipe/charcoal_nugget_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/charcoal_nugget_crushing.json @@ -1,9 +1,9 @@ { - "type": "basemetals:crushing", + "type": "mmdlib:crushing", "ingredient": { "tag": "c:nuggets/charcoal" }, "result": { - "id": "basemetals:charcoal_smallpowder" + "item": "basemetals:charcoal_smallpowder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/coal_block_crushing.json b/src/generated/resources/data/basemetals/recipe/coal_block_crushing.json index 08da3f676..3668c6483 100644 --- a/src/generated/resources/data/basemetals/recipe/coal_block_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/coal_block_crushing.json @@ -1,10 +1,10 @@ { - "type": "basemetals:crushing", + "type": "mmdlib:crushing", "ingredient": { "tag": "c:storage_blocks/coal" }, "result": { "count": 9, - "id": "basemetals:coal_powder" + "item": "basemetals:coal_powder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/coal_crushing.json b/src/generated/resources/data/basemetals/recipe/coal_crushing.json index b0bfcec91..6fe403f5f 100644 --- a/src/generated/resources/data/basemetals/recipe/coal_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/coal_crushing.json @@ -1,9 +1,9 @@ { - "type": "basemetals:crushing", + "type": "mmdlib:crushing", "ingredient": { "item": "minecraft:coal" }, "result": { - "id": "basemetals:coal_powder" + "item": "basemetals:coal_powder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/coal_nugget_crushing.json b/src/generated/resources/data/basemetals/recipe/coal_nugget_crushing.json index e6b12c65f..5238dc4dd 100644 --- a/src/generated/resources/data/basemetals/recipe/coal_nugget_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/coal_nugget_crushing.json @@ -1,9 +1,9 @@ { - "type": "basemetals:crushing", + "type": "mmdlib:crushing", "ingredient": { "tag": "c:nuggets/coal" }, "result": { - "id": "basemetals:coal_smallpowder" + "item": "basemetals:coal_smallpowder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/coal_ore_crushing.json b/src/generated/resources/data/basemetals/recipe/coal_ore_crushing.json index 495ec7c03..17d6622d0 100644 --- a/src/generated/resources/data/basemetals/recipe/coal_ore_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/coal_ore_crushing.json @@ -1,10 +1,10 @@ { - "type": "basemetals:crushing", + "type": "mmdlib:crushing", "ingredient": { "tag": "c:ores/coal" }, "result": { "count": 2, - "id": "basemetals:coal_powder" + "item": "basemetals:coal_powder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/cobblestone_crushing.json b/src/generated/resources/data/basemetals/recipe/cobblestone_crushing.json deleted file mode 100644 index 7d56d4a53..000000000 --- a/src/generated/resources/data/basemetals/recipe/cobblestone_crushing.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "type": "basemetals:crushing", - "ingredient": { - "tag": "c:cobblestones" - }, - "result": { - "id": "minecraft:gravel" - } -} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/cobblestone_wall_crushing.json b/src/generated/resources/data/basemetals/recipe/cobblestone_wall_crushing.json deleted file mode 100644 index b006f3e6f..000000000 --- a/src/generated/resources/data/basemetals/recipe/cobblestone_wall_crushing.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "type": "basemetals:crushing", - "ingredient": { - "item": "minecraft:cobblestone_wall" - }, - "result": { - "id": "minecraft:gravel" - } -} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/coldiron_block_crushing.json b/src/generated/resources/data/basemetals/recipe/coldiron_block_crushing.json index f645c3cd0..363a7fac2 100644 --- a/src/generated/resources/data/basemetals/recipe/coldiron_block_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/coldiron_block_crushing.json @@ -1,10 +1,10 @@ { - "type": "basemetals:crushing", + "type": "mmdlib:crushing", "ingredient": { "tag": "c:storage_blocks/coldiron" }, "result": { "count": 9, - "id": "basemetals:coldiron_powder" + "item": "basemetals:coldiron_powder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/coldiron_ingot_crushing.json b/src/generated/resources/data/basemetals/recipe/coldiron_ingot_crushing.json index a1afc94d7..f6dc8d7f8 100644 --- a/src/generated/resources/data/basemetals/recipe/coldiron_ingot_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/coldiron_ingot_crushing.json @@ -1,9 +1,9 @@ { - "type": "basemetals:crushing", + "type": "mmdlib:crushing", "ingredient": { "tag": "c:ingots/coldiron" }, "result": { - "id": "basemetals:coldiron_powder" + "item": "basemetals:coldiron_powder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/coldiron_nugget_crushing.json b/src/generated/resources/data/basemetals/recipe/coldiron_nugget_crushing.json index 077695e1f..ec0a92657 100644 --- a/src/generated/resources/data/basemetals/recipe/coldiron_nugget_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/coldiron_nugget_crushing.json @@ -1,9 +1,9 @@ { - "type": "basemetals:crushing", + "type": "mmdlib:crushing", "ingredient": { "tag": "c:nuggets/coldiron" }, "result": { - "id": "basemetals:coldiron_smallpowder" + "item": "basemetals:coldiron_smallpowder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/coldiron_ore_crushing.json b/src/generated/resources/data/basemetals/recipe/coldiron_ore_crushing.json index 581e9f64f..dc9071341 100644 --- a/src/generated/resources/data/basemetals/recipe/coldiron_ore_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/coldiron_ore_crushing.json @@ -1,10 +1,10 @@ { - "type": "basemetals:crushing", + "type": "mmdlib:crushing", "ingredient": { "tag": "c:ores/coldiron" }, "result": { "count": 2, - "id": "basemetals:coldiron_powder" + "item": "basemetals:coldiron_powder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/coldiron_raw_crushing.json b/src/generated/resources/data/basemetals/recipe/coldiron_raw_crushing.json index b73e0a1ea..c09f094b6 100644 --- a/src/generated/resources/data/basemetals/recipe/coldiron_raw_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/coldiron_raw_crushing.json @@ -1,9 +1,9 @@ { - "type": "basemetals:crushing", + "type": "mmdlib:crushing", "ingredient": { "tag": "c:raw_materials/coldiron" }, "result": { - "id": "basemetals:coldiron_powder" + "item": "basemetals:coldiron_powder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/copper_block_crushing.json b/src/generated/resources/data/basemetals/recipe/copper_block_crushing.json index b3f97838f..ec76af8d2 100644 --- a/src/generated/resources/data/basemetals/recipe/copper_block_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/copper_block_crushing.json @@ -1,10 +1,10 @@ { - "type": "basemetals:crushing", + "type": "mmdlib:crushing", "ingredient": { "tag": "c:storage_blocks/copper" }, "result": { "count": 9, - "id": "basemetals:copper_powder" + "item": "basemetals:copper_powder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/copper_ingot_crushing.json b/src/generated/resources/data/basemetals/recipe/copper_ingot_crushing.json index 8d3ee2deb..e52b49848 100644 --- a/src/generated/resources/data/basemetals/recipe/copper_ingot_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/copper_ingot_crushing.json @@ -1,9 +1,9 @@ { - "type": "basemetals:crushing", + "type": "mmdlib:crushing", "ingredient": { "tag": "c:ingots/copper" }, "result": { - "id": "basemetals:copper_powder" + "item": "basemetals:copper_powder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/copper_nugget_crushing.json b/src/generated/resources/data/basemetals/recipe/copper_nugget_crushing.json index 70521b04d..6c2a84be7 100644 --- a/src/generated/resources/data/basemetals/recipe/copper_nugget_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/copper_nugget_crushing.json @@ -1,9 +1,9 @@ { - "type": "basemetals:crushing", + "type": "mmdlib:crushing", "ingredient": { "tag": "c:nuggets/copper" }, "result": { - "id": "basemetals:copper_smallpowder" + "item": "basemetals:copper_smallpowder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/copper_ore_crushing.json b/src/generated/resources/data/basemetals/recipe/copper_ore_crushing.json index d86c57b3e..f5b370499 100644 --- a/src/generated/resources/data/basemetals/recipe/copper_ore_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/copper_ore_crushing.json @@ -1,10 +1,10 @@ { - "type": "basemetals:crushing", + "type": "mmdlib:crushing", "ingredient": { "tag": "c:ores/copper" }, "result": { "count": 2, - "id": "basemetals:copper_powder" + "item": "basemetals:copper_powder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/copper_raw_crushing.json b/src/generated/resources/data/basemetals/recipe/copper_raw_crushing.json index 7429ffb83..2dd775b57 100644 --- a/src/generated/resources/data/basemetals/recipe/copper_raw_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/copper_raw_crushing.json @@ -1,9 +1,9 @@ { - "type": "basemetals:crushing", + "type": "mmdlib:crushing", "ingredient": { "tag": "c:raw_materials/copper" }, "result": { - "id": "basemetals:copper_powder" + "item": "basemetals:copper_powder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/cupronickel_block_crushing.json b/src/generated/resources/data/basemetals/recipe/cupronickel_block_crushing.json index efdfa7ed5..32ccc81b5 100644 --- a/src/generated/resources/data/basemetals/recipe/cupronickel_block_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/cupronickel_block_crushing.json @@ -1,10 +1,10 @@ { - "type": "basemetals:crushing", + "type": "mmdlib:crushing", "ingredient": { "tag": "c:storage_blocks/cupronickel" }, "result": { "count": 9, - "id": "basemetals:cupronickel_powder" + "item": "basemetals:cupronickel_powder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/cupronickel_ingot_crushing.json b/src/generated/resources/data/basemetals/recipe/cupronickel_ingot_crushing.json index 0bda5199c..035a08467 100644 --- a/src/generated/resources/data/basemetals/recipe/cupronickel_ingot_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/cupronickel_ingot_crushing.json @@ -1,9 +1,9 @@ { - "type": "basemetals:crushing", + "type": "mmdlib:crushing", "ingredient": { "tag": "c:ingots/cupronickel" }, "result": { - "id": "basemetals:cupronickel_powder" + "item": "basemetals:cupronickel_powder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/cupronickel_nugget_crushing.json b/src/generated/resources/data/basemetals/recipe/cupronickel_nugget_crushing.json index 94c671751..156cffe7c 100644 --- a/src/generated/resources/data/basemetals/recipe/cupronickel_nugget_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/cupronickel_nugget_crushing.json @@ -1,9 +1,9 @@ { - "type": "basemetals:crushing", + "type": "mmdlib:crushing", "ingredient": { "tag": "c:nuggets/cupronickel" }, "result": { - "id": "basemetals:cupronickel_smallpowder" + "item": "basemetals:cupronickel_smallpowder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/dark_prismarine_crushing.json b/src/generated/resources/data/basemetals/recipe/dark_prismarine_crushing.json deleted file mode 100644 index 627ff36d5..000000000 --- a/src/generated/resources/data/basemetals/recipe/dark_prismarine_crushing.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "type": "basemetals:crushing", - "ingredient": { - "item": "minecraft:dark_prismarine" - }, - "result": { - "count": 8, - "id": "minecraft:prismarine_shard" - } -} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/diamond_blend.json b/src/generated/resources/data/basemetals/recipe/diamond_blend.json new file mode 100644 index 000000000..5cd899922 --- /dev/null +++ b/src/generated/resources/data/basemetals/recipe/diamond_blend.json @@ -0,0 +1,20 @@ +{ + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shapeless", + "category": "misc", + "group": "basemetals:diamond_blend", + "ingredients": [ + { + "tag": "c:dusts/diamond" + }, + { + "tag": "c:dusts/diamond" + } + ], + "result": { + "count": 2, + "id": "basemetals:diamond_blend" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/diamond_blend_from_small.json b/src/generated/resources/data/basemetals/recipe/diamond_blend_from_small.json new file mode 100644 index 000000000..8c1dbf27f --- /dev/null +++ b/src/generated/resources/data/basemetals/recipe/diamond_blend_from_small.json @@ -0,0 +1,21 @@ +{ + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "category": "misc", + "group": "basemetals:diamond_blend", + "key": { + "X": { + "tag": "c:small_blends/diamond" + } + }, + "pattern": [ + "XXX", + "XXX", + "XXX" + ], + "result": { + "id": "basemetals:diamond_blend" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/diamond_blend_smelting.json b/src/generated/resources/data/basemetals/recipe/diamond_blend_smelting.json new file mode 100644 index 000000000..f2092410e --- /dev/null +++ b/src/generated/resources/data/basemetals/recipe/diamond_blend_smelting.json @@ -0,0 +1,11 @@ +{ + "type": "minecraft:smelting", + "cookingtime": 200, + "experience": 1.0, + "ingredient": { + "tag": "c:blends/diamond" + }, + "result": { + "id": "minecraft:diamond" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/diamond_block_crushing.json b/src/generated/resources/data/basemetals/recipe/diamond_block_crushing.json index 304c77fb6..4fb64309b 100644 --- a/src/generated/resources/data/basemetals/recipe/diamond_block_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/diamond_block_crushing.json @@ -1,10 +1,10 @@ { - "type": "basemetals:crushing", + "type": "mmdlib:crushing", "ingredient": { "tag": "c:storage_blocks/diamond" }, "result": { "count": 9, - "id": "basemetals:diamond_powder" + "item": "basemetals:diamond_powder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/diamond_boots_plate_repair.json b/src/generated/resources/data/basemetals/recipe/diamond_boots_plate_repair.json deleted file mode 100644 index 6e855c238..000000000 --- a/src/generated/resources/data/basemetals/recipe/diamond_boots_plate_repair.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "type": "basemetals:plate_repair", - "plate": { - "tag": "c:plates/diamond" - }, - "target": "minecraft:diamond_boots" -} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/diamond_chestplate_plate_repair.json b/src/generated/resources/data/basemetals/recipe/diamond_chestplate_plate_repair.json deleted file mode 100644 index 90d5c7cf3..000000000 --- a/src/generated/resources/data/basemetals/recipe/diamond_chestplate_plate_repair.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "type": "basemetals:plate_repair", - "plate": { - "tag": "c:plates/diamond" - }, - "target": "minecraft:diamond_chestplate" -} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/diamond_crushing.json b/src/generated/resources/data/basemetals/recipe/diamond_crushing.json index 17ab313cb..9d3193726 100644 --- a/src/generated/resources/data/basemetals/recipe/diamond_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/diamond_crushing.json @@ -1,9 +1,9 @@ { - "type": "basemetals:crushing", + "type": "mmdlib:crushing", "ingredient": { "item": "minecraft:diamond" }, "result": { - "id": "basemetals:diamond_powder" + "item": "basemetals:diamond_powder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/diamond_helmet_plate_repair.json b/src/generated/resources/data/basemetals/recipe/diamond_helmet_plate_repair.json deleted file mode 100644 index 955310081..000000000 --- a/src/generated/resources/data/basemetals/recipe/diamond_helmet_plate_repair.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "type": "basemetals:plate_repair", - "plate": { - "tag": "c:plates/diamond" - }, - "target": "minecraft:diamond_helmet" -} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/diamond_ingot.json b/src/generated/resources/data/basemetals/recipe/diamond_ingot.json new file mode 100644 index 000000000..ddb12dad2 --- /dev/null +++ b/src/generated/resources/data/basemetals/recipe/diamond_ingot.json @@ -0,0 +1,21 @@ +{ + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "category": "misc", + "group": "minecraft:diamond", + "key": { + "X": { + "tag": "c:nuggets/diamond" + } + }, + "pattern": [ + "XXX", + "XXX", + "XXX" + ], + "result": { + "id": "minecraft:diamond" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/diamond_leggings_plate_repair.json b/src/generated/resources/data/basemetals/recipe/diamond_leggings_plate_repair.json deleted file mode 100644 index bd3edbdae..000000000 --- a/src/generated/resources/data/basemetals/recipe/diamond_leggings_plate_repair.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "type": "basemetals:plate_repair", - "plate": { - "tag": "c:plates/diamond" - }, - "target": "minecraft:diamond_leggings" -} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/diamond_nugget.json b/src/generated/resources/data/basemetals/recipe/diamond_nugget.json new file mode 100644 index 000000000..26e576ac8 --- /dev/null +++ b/src/generated/resources/data/basemetals/recipe/diamond_nugget.json @@ -0,0 +1,17 @@ +{ + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shapeless", + "category": "misc", + "group": "basemetals:diamond_nugget", + "ingredients": [ + { + "tag": "c:gems/diamond" + } + ], + "result": { + "count": 9, + "id": "basemetals:diamond_nugget" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/diamond_nugget_crushing.json b/src/generated/resources/data/basemetals/recipe/diamond_nugget_crushing.json index f29b6ebd5..6d086a9d6 100644 --- a/src/generated/resources/data/basemetals/recipe/diamond_nugget_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/diamond_nugget_crushing.json @@ -1,9 +1,9 @@ { - "type": "basemetals:crushing", + "type": "mmdlib:crushing", "ingredient": { "tag": "c:nuggets/diamond" }, "result": { - "id": "basemetals:diamond_smallpowder" + "item": "basemetals:diamond_smallpowder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/diamond_ore_crushing.json b/src/generated/resources/data/basemetals/recipe/diamond_ore_crushing.json index 51cf2db25..58bd2316a 100644 --- a/src/generated/resources/data/basemetals/recipe/diamond_ore_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/diamond_ore_crushing.json @@ -1,10 +1,10 @@ { - "type": "basemetals:crushing", + "type": "mmdlib:crushing", "ingredient": { "tag": "c:ores/diamond" }, "result": { "count": 2, - "id": "basemetals:diamond_powder" + "item": "basemetals:diamond_powder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/diamond_shield_plate_repair.json b/src/generated/resources/data/basemetals/recipe/diamond_shield_plate_repair.json deleted file mode 100644 index 0b59487cd..000000000 --- a/src/generated/resources/data/basemetals/recipe/diamond_shield_plate_repair.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "type": "basemetals:plate_repair", - "plate": { - "tag": "c:plates/diamond" - }, - "target": "basemetals:diamond_shield" -} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/diamond_smallblend.json b/src/generated/resources/data/basemetals/recipe/diamond_smallblend.json new file mode 100644 index 000000000..255e879ff --- /dev/null +++ b/src/generated/resources/data/basemetals/recipe/diamond_smallblend.json @@ -0,0 +1,17 @@ +{ + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shapeless", + "category": "misc", + "group": "basemetals:diamond_smallblend", + "ingredients": [ + { + "tag": "c:blends/diamond" + } + ], + "result": { + "count": 9, + "id": "basemetals:diamond_smallblend" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/electrum_block_crushing.json b/src/generated/resources/data/basemetals/recipe/electrum_block_crushing.json index 8561456ac..cd0f7a0b5 100644 --- a/src/generated/resources/data/basemetals/recipe/electrum_block_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/electrum_block_crushing.json @@ -1,10 +1,10 @@ { - "type": "basemetals:crushing", + "type": "mmdlib:crushing", "ingredient": { "tag": "c:storage_blocks/electrum" }, "result": { "count": 9, - "id": "basemetals:electrum_powder" + "item": "basemetals:electrum_powder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/electrum_ingot_crushing.json b/src/generated/resources/data/basemetals/recipe/electrum_ingot_crushing.json index 7194e7bfa..a1d16e85d 100644 --- a/src/generated/resources/data/basemetals/recipe/electrum_ingot_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/electrum_ingot_crushing.json @@ -1,9 +1,9 @@ { - "type": "basemetals:crushing", + "type": "mmdlib:crushing", "ingredient": { "tag": "c:ingots/electrum" }, "result": { - "id": "basemetals:electrum_powder" + "item": "basemetals:electrum_powder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/electrum_nugget_crushing.json b/src/generated/resources/data/basemetals/recipe/electrum_nugget_crushing.json index 50277886e..4d533aa1b 100644 --- a/src/generated/resources/data/basemetals/recipe/electrum_nugget_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/electrum_nugget_crushing.json @@ -1,9 +1,9 @@ { - "type": "basemetals:crushing", + "type": "mmdlib:crushing", "ingredient": { "tag": "c:nuggets/electrum" }, "result": { - "id": "basemetals:electrum_smallpowder" + "item": "basemetals:electrum_smallpowder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/emerald_block_crushing.json b/src/generated/resources/data/basemetals/recipe/emerald_block_crushing.json index 26c819902..2ec2719a8 100644 --- a/src/generated/resources/data/basemetals/recipe/emerald_block_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/emerald_block_crushing.json @@ -1,10 +1,10 @@ { - "type": "basemetals:crushing", + "type": "mmdlib:crushing", "ingredient": { "tag": "c:storage_blocks/emerald" }, "result": { "count": 9, - "id": "basemetals:emerald_powder" + "item": "basemetals:emerald_powder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/emerald_boots_plate_repair.json b/src/generated/resources/data/basemetals/recipe/emerald_boots_plate_repair.json deleted file mode 100644 index 01f11b5f4..000000000 --- a/src/generated/resources/data/basemetals/recipe/emerald_boots_plate_repair.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "type": "basemetals:plate_repair", - "plate": { - "tag": "c:plates/emerald" - }, - "target": "basemetals:emerald_boots" -} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/emerald_chestplate_plate_repair.json b/src/generated/resources/data/basemetals/recipe/emerald_chestplate_plate_repair.json deleted file mode 100644 index 2d141a2a1..000000000 --- a/src/generated/resources/data/basemetals/recipe/emerald_chestplate_plate_repair.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "type": "basemetals:plate_repair", - "plate": { - "tag": "c:plates/emerald" - }, - "target": "basemetals:emerald_chestplate" -} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/emerald_crushing.json b/src/generated/resources/data/basemetals/recipe/emerald_crushing.json index 684cb7959..cc491d34a 100644 --- a/src/generated/resources/data/basemetals/recipe/emerald_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/emerald_crushing.json @@ -1,9 +1,9 @@ { - "type": "basemetals:crushing", + "type": "mmdlib:crushing", "ingredient": { "item": "minecraft:emerald" }, "result": { - "id": "basemetals:emerald_powder" + "item": "basemetals:emerald_powder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/emerald_helmet_plate_repair.json b/src/generated/resources/data/basemetals/recipe/emerald_helmet_plate_repair.json deleted file mode 100644 index 80f1cfe8d..000000000 --- a/src/generated/resources/data/basemetals/recipe/emerald_helmet_plate_repair.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "type": "basemetals:plate_repair", - "plate": { - "tag": "c:plates/emerald" - }, - "target": "basemetals:emerald_helmet" -} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/emerald_ingot.json b/src/generated/resources/data/basemetals/recipe/emerald_ingot.json new file mode 100644 index 000000000..c26c66850 --- /dev/null +++ b/src/generated/resources/data/basemetals/recipe/emerald_ingot.json @@ -0,0 +1,21 @@ +{ + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "category": "misc", + "group": "minecraft:emerald", + "key": { + "X": { + "tag": "c:nuggets/emerald" + } + }, + "pattern": [ + "XXX", + "XXX", + "XXX" + ], + "result": { + "id": "minecraft:emerald" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/emerald_leggings_plate_repair.json b/src/generated/resources/data/basemetals/recipe/emerald_leggings_plate_repair.json deleted file mode 100644 index 6b97db179..000000000 --- a/src/generated/resources/data/basemetals/recipe/emerald_leggings_plate_repair.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "type": "basemetals:plate_repair", - "plate": { - "tag": "c:plates/emerald" - }, - "target": "basemetals:emerald_leggings" -} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/emerald_nugget.json b/src/generated/resources/data/basemetals/recipe/emerald_nugget.json new file mode 100644 index 000000000..bbea2ec86 --- /dev/null +++ b/src/generated/resources/data/basemetals/recipe/emerald_nugget.json @@ -0,0 +1,17 @@ +{ + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shapeless", + "category": "misc", + "group": "basemetals:emerald_nugget", + "ingredients": [ + { + "tag": "c:gems/emerald" + } + ], + "result": { + "count": 9, + "id": "basemetals:emerald_nugget" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/emerald_nugget_crushing.json b/src/generated/resources/data/basemetals/recipe/emerald_nugget_crushing.json index 7b7e77d44..f247da8b2 100644 --- a/src/generated/resources/data/basemetals/recipe/emerald_nugget_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/emerald_nugget_crushing.json @@ -1,9 +1,9 @@ { - "type": "basemetals:crushing", + "type": "mmdlib:crushing", "ingredient": { "tag": "c:nuggets/emerald" }, "result": { - "id": "basemetals:emerald_smallpowder" + "item": "basemetals:emerald_smallpowder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/emerald_ore_crushing.json b/src/generated/resources/data/basemetals/recipe/emerald_ore_crushing.json index 0298e1b57..30e0a11ab 100644 --- a/src/generated/resources/data/basemetals/recipe/emerald_ore_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/emerald_ore_crushing.json @@ -1,10 +1,10 @@ { - "type": "basemetals:crushing", + "type": "mmdlib:crushing", "ingredient": { "tag": "c:ores/emerald" }, "result": { "count": 2, - "id": "basemetals:emerald_powder" + "item": "basemetals:emerald_powder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/emerald_shield_plate_repair.json b/src/generated/resources/data/basemetals/recipe/emerald_shield_plate_repair.json deleted file mode 100644 index 507e4d791..000000000 --- a/src/generated/resources/data/basemetals/recipe/emerald_shield_plate_repair.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "type": "basemetals:plate_repair", - "plate": { - "tag": "c:plates/emerald" - }, - "target": "basemetals:emerald_shield" -} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/glass_crushing.json b/src/generated/resources/data/basemetals/recipe/glass_crushing.json deleted file mode 100644 index eaef557e6..000000000 --- a/src/generated/resources/data/basemetals/recipe/glass_crushing.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "type": "basemetals:crushing", - "ingredient": { - "item": "minecraft:glass" - }, - "result": { - "id": "minecraft:sand" - } -} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/glowstone_crushing.json b/src/generated/resources/data/basemetals/recipe/glowstone_crushing.json deleted file mode 100644 index 8bff73a4e..000000000 --- a/src/generated/resources/data/basemetals/recipe/glowstone_crushing.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "type": "basemetals:crushing", - "ingredient": { - "item": "minecraft:glowstone" - }, - "result": { - "count": 4, - "id": "minecraft:glowstone_dust" - } -} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/gold_blend.json b/src/generated/resources/data/basemetals/recipe/gold_blend.json new file mode 100644 index 000000000..35d845a9e --- /dev/null +++ b/src/generated/resources/data/basemetals/recipe/gold_blend.json @@ -0,0 +1,20 @@ +{ + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shapeless", + "category": "misc", + "group": "basemetals:gold_blend", + "ingredients": [ + { + "tag": "c:dusts/gold" + }, + { + "tag": "c:dusts/gold" + } + ], + "result": { + "count": 2, + "id": "basemetals:gold_blend" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/gold_blend_from_small.json b/src/generated/resources/data/basemetals/recipe/gold_blend_from_small.json new file mode 100644 index 000000000..7803fd22e --- /dev/null +++ b/src/generated/resources/data/basemetals/recipe/gold_blend_from_small.json @@ -0,0 +1,21 @@ +{ + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "category": "misc", + "group": "basemetals:gold_blend", + "key": { + "X": { + "tag": "c:small_blends/gold" + } + }, + "pattern": [ + "XXX", + "XXX", + "XXX" + ], + "result": { + "id": "basemetals:gold_blend" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/gold_blend_smelting.json b/src/generated/resources/data/basemetals/recipe/gold_blend_smelting.json new file mode 100644 index 000000000..9a18b1c1e --- /dev/null +++ b/src/generated/resources/data/basemetals/recipe/gold_blend_smelting.json @@ -0,0 +1,11 @@ +{ + "type": "minecraft:smelting", + "cookingtime": 200, + "experience": 1.0, + "ingredient": { + "tag": "c:blends/gold" + }, + "result": { + "id": "minecraft:gold_ingot" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/gold_block_crushing.json b/src/generated/resources/data/basemetals/recipe/gold_block_crushing.json index 497ba31ff..4cf350275 100644 --- a/src/generated/resources/data/basemetals/recipe/gold_block_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/gold_block_crushing.json @@ -1,10 +1,10 @@ { - "type": "basemetals:crushing", + "type": "mmdlib:crushing", "ingredient": { "tag": "c:storage_blocks/gold" }, "result": { "count": 9, - "id": "basemetals:gold_powder" + "item": "basemetals:gold_powder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/gold_ingot_crushing.json b/src/generated/resources/data/basemetals/recipe/gold_ingot_crushing.json index dd03067b9..99f58861c 100644 --- a/src/generated/resources/data/basemetals/recipe/gold_ingot_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/gold_ingot_crushing.json @@ -1,9 +1,9 @@ { - "type": "basemetals:crushing", + "type": "mmdlib:crushing", "ingredient": { "tag": "c:ingots/gold" }, "result": { - "id": "basemetals:gold_powder" + "item": "basemetals:gold_powder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/gold_nugget_crushing.json b/src/generated/resources/data/basemetals/recipe/gold_nugget_crushing.json index 6e3f82d1c..77c3b7769 100644 --- a/src/generated/resources/data/basemetals/recipe/gold_nugget_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/gold_nugget_crushing.json @@ -1,9 +1,9 @@ { - "type": "basemetals:crushing", + "type": "mmdlib:crushing", "ingredient": { "tag": "c:nuggets/gold" }, "result": { - "id": "basemetals:gold_smallpowder" + "item": "basemetals:gold_smallpowder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/gold_ore_crushing.json b/src/generated/resources/data/basemetals/recipe/gold_ore_crushing.json index e67e9b0b1..ec3902244 100644 --- a/src/generated/resources/data/basemetals/recipe/gold_ore_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/gold_ore_crushing.json @@ -1,10 +1,10 @@ { - "type": "basemetals:crushing", + "type": "mmdlib:crushing", "ingredient": { "tag": "c:ores/gold" }, "result": { "count": 2, - "id": "basemetals:gold_powder" + "item": "basemetals:gold_powder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/gold_raw_crushing.json b/src/generated/resources/data/basemetals/recipe/gold_raw_crushing.json index 37657ebde..3311bf413 100644 --- a/src/generated/resources/data/basemetals/recipe/gold_raw_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/gold_raw_crushing.json @@ -1,9 +1,9 @@ { - "type": "basemetals:crushing", + "type": "mmdlib:crushing", "ingredient": { "tag": "c:raw_materials/gold" }, "result": { - "id": "basemetals:gold_powder" + "item": "basemetals:gold_powder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/gold_smallblend.json b/src/generated/resources/data/basemetals/recipe/gold_smallblend.json new file mode 100644 index 000000000..4c00b8ee6 --- /dev/null +++ b/src/generated/resources/data/basemetals/recipe/gold_smallblend.json @@ -0,0 +1,17 @@ +{ + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shapeless", + "category": "misc", + "group": "basemetals:gold_smallblend", + "ingredients": [ + { + "tag": "c:blends/gold" + } + ], + "result": { + "count": 9, + "id": "basemetals:gold_smallblend" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/gravel_crushing.json b/src/generated/resources/data/basemetals/recipe/gravel_crushing.json deleted file mode 100644 index 662d74781..000000000 --- a/src/generated/resources/data/basemetals/recipe/gravel_crushing.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "type": "basemetals:crushing", - "ingredient": { - "tag": "c:gravels" - }, - "result": { - "id": "minecraft:sand" - } -} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/invar_block_crushing.json b/src/generated/resources/data/basemetals/recipe/invar_block_crushing.json index 252cade04..dd56db2b6 100644 --- a/src/generated/resources/data/basemetals/recipe/invar_block_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/invar_block_crushing.json @@ -1,10 +1,10 @@ { - "type": "basemetals:crushing", + "type": "mmdlib:crushing", "ingredient": { "tag": "c:storage_blocks/invar" }, "result": { "count": 9, - "id": "basemetals:invar_powder" + "item": "basemetals:invar_powder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/invar_ingot_crushing.json b/src/generated/resources/data/basemetals/recipe/invar_ingot_crushing.json index 0dc11b392..acf9624fe 100644 --- a/src/generated/resources/data/basemetals/recipe/invar_ingot_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/invar_ingot_crushing.json @@ -1,9 +1,9 @@ { - "type": "basemetals:crushing", + "type": "mmdlib:crushing", "ingredient": { "tag": "c:ingots/invar" }, "result": { - "id": "basemetals:invar_powder" + "item": "basemetals:invar_powder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/invar_nugget_crushing.json b/src/generated/resources/data/basemetals/recipe/invar_nugget_crushing.json index db468f738..eb42071fe 100644 --- a/src/generated/resources/data/basemetals/recipe/invar_nugget_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/invar_nugget_crushing.json @@ -1,9 +1,9 @@ { - "type": "basemetals:crushing", + "type": "mmdlib:crushing", "ingredient": { "tag": "c:nuggets/invar" }, "result": { - "id": "basemetals:invar_smallpowder" + "item": "basemetals:invar_smallpowder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/iron_blend.json b/src/generated/resources/data/basemetals/recipe/iron_blend.json new file mode 100644 index 000000000..11aa40302 --- /dev/null +++ b/src/generated/resources/data/basemetals/recipe/iron_blend.json @@ -0,0 +1,20 @@ +{ + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shapeless", + "category": "misc", + "group": "basemetals:iron_blend", + "ingredients": [ + { + "tag": "c:dusts/iron" + }, + { + "tag": "c:dusts/iron" + } + ], + "result": { + "count": 2, + "id": "basemetals:iron_blend" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/iron_blend_from_small.json b/src/generated/resources/data/basemetals/recipe/iron_blend_from_small.json new file mode 100644 index 000000000..86abc8c45 --- /dev/null +++ b/src/generated/resources/data/basemetals/recipe/iron_blend_from_small.json @@ -0,0 +1,21 @@ +{ + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "category": "misc", + "group": "basemetals:iron_blend", + "key": { + "X": { + "tag": "c:small_blends/iron" + } + }, + "pattern": [ + "XXX", + "XXX", + "XXX" + ], + "result": { + "id": "basemetals:iron_blend" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/iron_blend_smelting.json b/src/generated/resources/data/basemetals/recipe/iron_blend_smelting.json new file mode 100644 index 000000000..be1fdab82 --- /dev/null +++ b/src/generated/resources/data/basemetals/recipe/iron_blend_smelting.json @@ -0,0 +1,11 @@ +{ + "type": "minecraft:smelting", + "cookingtime": 200, + "experience": 0.7, + "ingredient": { + "tag": "c:blends/iron" + }, + "result": { + "id": "minecraft:iron_ingot" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/iron_block_crushing.json b/src/generated/resources/data/basemetals/recipe/iron_block_crushing.json index 7d99b3166..df728f523 100644 --- a/src/generated/resources/data/basemetals/recipe/iron_block_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/iron_block_crushing.json @@ -1,10 +1,10 @@ { - "type": "basemetals:crushing", + "type": "mmdlib:crushing", "ingredient": { "tag": "c:storage_blocks/iron" }, "result": { "count": 9, - "id": "basemetals:iron_powder" + "item": "basemetals:iron_powder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/iron_ingot_crushing.json b/src/generated/resources/data/basemetals/recipe/iron_ingot_crushing.json index 0143f1443..a28352f04 100644 --- a/src/generated/resources/data/basemetals/recipe/iron_ingot_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/iron_ingot_crushing.json @@ -1,9 +1,9 @@ { - "type": "basemetals:crushing", + "type": "mmdlib:crushing", "ingredient": { "tag": "c:ingots/iron" }, "result": { - "id": "basemetals:iron_powder" + "item": "basemetals:iron_powder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/iron_nugget_crushing.json b/src/generated/resources/data/basemetals/recipe/iron_nugget_crushing.json index fcca32e30..14aa4ed7c 100644 --- a/src/generated/resources/data/basemetals/recipe/iron_nugget_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/iron_nugget_crushing.json @@ -1,9 +1,9 @@ { - "type": "basemetals:crushing", + "type": "mmdlib:crushing", "ingredient": { "tag": "c:nuggets/iron" }, "result": { - "id": "basemetals:iron_smallpowder" + "item": "basemetals:iron_smallpowder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/iron_ore_crushing.json b/src/generated/resources/data/basemetals/recipe/iron_ore_crushing.json index 44b2a7fc2..42ea424f7 100644 --- a/src/generated/resources/data/basemetals/recipe/iron_ore_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/iron_ore_crushing.json @@ -1,10 +1,10 @@ { - "type": "basemetals:crushing", + "type": "mmdlib:crushing", "ingredient": { "tag": "c:ores/iron" }, "result": { "count": 2, - "id": "basemetals:iron_powder" + "item": "basemetals:iron_powder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/iron_raw_crushing.json b/src/generated/resources/data/basemetals/recipe/iron_raw_crushing.json index e3b5efda5..c10758fbc 100644 --- a/src/generated/resources/data/basemetals/recipe/iron_raw_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/iron_raw_crushing.json @@ -1,9 +1,9 @@ { - "type": "basemetals:crushing", + "type": "mmdlib:crushing", "ingredient": { "tag": "c:raw_materials/iron" }, "result": { - "id": "basemetals:iron_powder" + "item": "basemetals:iron_powder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/iron_smallblend.json b/src/generated/resources/data/basemetals/recipe/iron_smallblend.json new file mode 100644 index 000000000..e0b99be34 --- /dev/null +++ b/src/generated/resources/data/basemetals/recipe/iron_smallblend.json @@ -0,0 +1,17 @@ +{ + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shapeless", + "category": "misc", + "group": "basemetals:iron_smallblend", + "ingredients": [ + { + "tag": "c:blends/iron" + } + ], + "result": { + "count": 9, + "id": "basemetals:iron_smallblend" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/lapis_block_crushing.json b/src/generated/resources/data/basemetals/recipe/lapis_block_crushing.json deleted file mode 100644 index 24e6212c9..000000000 --- a/src/generated/resources/data/basemetals/recipe/lapis_block_crushing.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "type": "basemetals:crushing", - "ingredient": { - "tag": "c:storage_blocks/lapis" - }, - "result": { - "count": 9, - "id": "minecraft:lapis_lazuli" - } -} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/lapis_from_smallpowder.json b/src/generated/resources/data/basemetals/recipe/lapis_from_smallpowder.json new file mode 100644 index 000000000..fa7a51a8a --- /dev/null +++ b/src/generated/resources/data/basemetals/recipe/lapis_from_smallpowder.json @@ -0,0 +1,21 @@ +{ + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "category": "misc", + "group": "minecraft:lapis_lazuli", + "key": { + "X": { + "tag": "c:tiny_dusts/lapis" + } + }, + "pattern": [ + "XXX", + "XXX", + "XXX" + ], + "result": { + "id": "minecraft:lapis_lazuli" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/lapis_ore_crushing.json b/src/generated/resources/data/basemetals/recipe/lapis_ore_crushing.json deleted file mode 100644 index d78ceca7b..000000000 --- a/src/generated/resources/data/basemetals/recipe/lapis_ore_crushing.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "type": "basemetals:crushing", - "ingredient": { - "tag": "c:ores/lapis" - }, - "result": { - "count": 8, - "id": "minecraft:lapis_lazuli" - } -} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/lapis_smallpowder.json b/src/generated/resources/data/basemetals/recipe/lapis_smallpowder.json new file mode 100644 index 000000000..a0792a497 --- /dev/null +++ b/src/generated/resources/data/basemetals/recipe/lapis_smallpowder.json @@ -0,0 +1,17 @@ +{ + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shapeless", + "category": "misc", + "group": "basemetals:lapis_smallpowder", + "ingredients": [ + { + "tag": "c:dusts/lapis" + } + ], + "result": { + "count": 9, + "id": "basemetals:lapis_smallpowder" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/lead_block_crushing.json b/src/generated/resources/data/basemetals/recipe/lead_block_crushing.json index f2229c722..907f7c5e9 100644 --- a/src/generated/resources/data/basemetals/recipe/lead_block_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/lead_block_crushing.json @@ -1,10 +1,10 @@ { - "type": "basemetals:crushing", + "type": "mmdlib:crushing", "ingredient": { "tag": "c:storage_blocks/lead" }, "result": { "count": 9, - "id": "basemetals:lead_powder" + "item": "basemetals:lead_powder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/lead_ingot_crushing.json b/src/generated/resources/data/basemetals/recipe/lead_ingot_crushing.json index b3cf7b71a..a02e65eef 100644 --- a/src/generated/resources/data/basemetals/recipe/lead_ingot_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/lead_ingot_crushing.json @@ -1,9 +1,9 @@ { - "type": "basemetals:crushing", + "type": "mmdlib:crushing", "ingredient": { "tag": "c:ingots/lead" }, "result": { - "id": "basemetals:lead_powder" + "item": "basemetals:lead_powder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/lead_nugget_crushing.json b/src/generated/resources/data/basemetals/recipe/lead_nugget_crushing.json index a1542c12b..97efec4ec 100644 --- a/src/generated/resources/data/basemetals/recipe/lead_nugget_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/lead_nugget_crushing.json @@ -1,9 +1,9 @@ { - "type": "basemetals:crushing", + "type": "mmdlib:crushing", "ingredient": { "tag": "c:nuggets/lead" }, "result": { - "id": "basemetals:lead_smallpowder" + "item": "basemetals:lead_smallpowder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/lead_ore_crushing.json b/src/generated/resources/data/basemetals/recipe/lead_ore_crushing.json index 23fa87387..24db8deb5 100644 --- a/src/generated/resources/data/basemetals/recipe/lead_ore_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/lead_ore_crushing.json @@ -1,10 +1,10 @@ { - "type": "basemetals:crushing", + "type": "mmdlib:crushing", "ingredient": { "tag": "c:ores/lead" }, "result": { "count": 2, - "id": "basemetals:lead_powder" + "item": "basemetals:lead_powder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/lead_raw_crushing.json b/src/generated/resources/data/basemetals/recipe/lead_raw_crushing.json index 2714cff6d..3f5d53f7b 100644 --- a/src/generated/resources/data/basemetals/recipe/lead_raw_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/lead_raw_crushing.json @@ -1,9 +1,9 @@ { - "type": "basemetals:crushing", + "type": "mmdlib:crushing", "ingredient": { "tag": "c:raw_materials/lead" }, "result": { - "id": "basemetals:lead_powder" + "item": "basemetals:lead_powder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/mercury_ingot_crushing.json b/src/generated/resources/data/basemetals/recipe/mercury_ingot_crushing.json index 45cf41a63..a8241f8e8 100644 --- a/src/generated/resources/data/basemetals/recipe/mercury_ingot_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/mercury_ingot_crushing.json @@ -1,9 +1,9 @@ { - "type": "basemetals:crushing", + "type": "mmdlib:crushing", "ingredient": { "tag": "c:ingots/mercury" }, "result": { - "id": "basemetals:mercury_powder" + "item": "basemetals:mercury_powder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/mercury_nugget_crushing.json b/src/generated/resources/data/basemetals/recipe/mercury_nugget_crushing.json index dc71ab175..0a5701fa8 100644 --- a/src/generated/resources/data/basemetals/recipe/mercury_nugget_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/mercury_nugget_crushing.json @@ -1,9 +1,9 @@ { - "type": "basemetals:crushing", + "type": "mmdlib:crushing", "ingredient": { "tag": "c:nuggets/mercury" }, "result": { - "id": "basemetals:mercury_smallpowder" + "item": "basemetals:mercury_smallpowder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/mercury_ore_crushing.json b/src/generated/resources/data/basemetals/recipe/mercury_ore_crushing.json index 596400d1c..323dd4ee9 100644 --- a/src/generated/resources/data/basemetals/recipe/mercury_ore_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/mercury_ore_crushing.json @@ -1,10 +1,10 @@ { - "type": "basemetals:crushing", + "type": "mmdlib:crushing", "ingredient": { "tag": "c:ores/mercury" }, "result": { "count": 2, - "id": "basemetals:mercury_powder" + "item": "basemetals:mercury_powder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/mercury_raw_crushing.json b/src/generated/resources/data/basemetals/recipe/mercury_raw_crushing.json index 16e794cc2..4cd4d4400 100644 --- a/src/generated/resources/data/basemetals/recipe/mercury_raw_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/mercury_raw_crushing.json @@ -1,9 +1,9 @@ { - "type": "basemetals:crushing", + "type": "mmdlib:crushing", "ingredient": { "tag": "c:raw_materials/mercury" }, "result": { - "id": "basemetals:mercury_powder" + "item": "basemetals:mercury_powder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/mithril_block_crushing.json b/src/generated/resources/data/basemetals/recipe/mithril_block_crushing.json index 30f462627..eee0f0a9d 100644 --- a/src/generated/resources/data/basemetals/recipe/mithril_block_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/mithril_block_crushing.json @@ -1,10 +1,10 @@ { - "type": "basemetals:crushing", + "type": "mmdlib:crushing", "ingredient": { "tag": "c:storage_blocks/mithril" }, "result": { "count": 9, - "id": "basemetals:mithril_powder" + "item": "basemetals:mithril_powder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/mithril_ingot_crushing.json b/src/generated/resources/data/basemetals/recipe/mithril_ingot_crushing.json index d01fb267a..d193ab3cc 100644 --- a/src/generated/resources/data/basemetals/recipe/mithril_ingot_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/mithril_ingot_crushing.json @@ -1,9 +1,9 @@ { - "type": "basemetals:crushing", + "type": "mmdlib:crushing", "ingredient": { "tag": "c:ingots/mithril" }, "result": { - "id": "basemetals:mithril_powder" + "item": "basemetals:mithril_powder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/mithril_nugget_crushing.json b/src/generated/resources/data/basemetals/recipe/mithril_nugget_crushing.json index 58d82bc40..32d6625e3 100644 --- a/src/generated/resources/data/basemetals/recipe/mithril_nugget_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/mithril_nugget_crushing.json @@ -1,9 +1,9 @@ { - "type": "basemetals:crushing", + "type": "mmdlib:crushing", "ingredient": { "tag": "c:nuggets/mithril" }, "result": { - "id": "basemetals:mithril_smallpowder" + "item": "basemetals:mithril_smallpowder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/mossy_cobblestone_crushing.json b/src/generated/resources/data/basemetals/recipe/mossy_cobblestone_crushing.json deleted file mode 100644 index 3898179ed..000000000 --- a/src/generated/resources/data/basemetals/recipe/mossy_cobblestone_crushing.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "type": "basemetals:crushing", - "ingredient": { - "item": "minecraft:mossy_cobblestone" - }, - "result": { - "id": "minecraft:gravel" - } -} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/mossy_cobblestone_wall_crushing.json b/src/generated/resources/data/basemetals/recipe/mossy_cobblestone_wall_crushing.json deleted file mode 100644 index 768e33dd7..000000000 --- a/src/generated/resources/data/basemetals/recipe/mossy_cobblestone_wall_crushing.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "type": "basemetals:crushing", - "ingredient": { - "item": "minecraft:mossy_cobblestone_wall" - }, - "result": { - "id": "minecraft:gravel" - } -} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/nickel_block_crushing.json b/src/generated/resources/data/basemetals/recipe/nickel_block_crushing.json index 7f0b458ac..4a138724e 100644 --- a/src/generated/resources/data/basemetals/recipe/nickel_block_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/nickel_block_crushing.json @@ -1,10 +1,10 @@ { - "type": "basemetals:crushing", + "type": "mmdlib:crushing", "ingredient": { "tag": "c:storage_blocks/nickel" }, "result": { "count": 9, - "id": "basemetals:nickel_powder" + "item": "basemetals:nickel_powder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/nickel_ingot_crushing.json b/src/generated/resources/data/basemetals/recipe/nickel_ingot_crushing.json index 103fda411..80d3634a9 100644 --- a/src/generated/resources/data/basemetals/recipe/nickel_ingot_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/nickel_ingot_crushing.json @@ -1,9 +1,9 @@ { - "type": "basemetals:crushing", + "type": "mmdlib:crushing", "ingredient": { "tag": "c:ingots/nickel" }, "result": { - "id": "basemetals:nickel_powder" + "item": "basemetals:nickel_powder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/nickel_nugget_crushing.json b/src/generated/resources/data/basemetals/recipe/nickel_nugget_crushing.json index fba621138..b71a77568 100644 --- a/src/generated/resources/data/basemetals/recipe/nickel_nugget_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/nickel_nugget_crushing.json @@ -1,9 +1,9 @@ { - "type": "basemetals:crushing", + "type": "mmdlib:crushing", "ingredient": { "tag": "c:nuggets/nickel" }, "result": { - "id": "basemetals:nickel_smallpowder" + "item": "basemetals:nickel_smallpowder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/nickel_ore_crushing.json b/src/generated/resources/data/basemetals/recipe/nickel_ore_crushing.json index d8e8c64db..d45cc3a74 100644 --- a/src/generated/resources/data/basemetals/recipe/nickel_ore_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/nickel_ore_crushing.json @@ -1,10 +1,10 @@ { - "type": "basemetals:crushing", + "type": "mmdlib:crushing", "ingredient": { "tag": "c:ores/nickel" }, "result": { "count": 2, - "id": "basemetals:nickel_powder" + "item": "basemetals:nickel_powder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/nickel_raw_crushing.json b/src/generated/resources/data/basemetals/recipe/nickel_raw_crushing.json index e887e01cf..2a43abc47 100644 --- a/src/generated/resources/data/basemetals/recipe/nickel_raw_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/nickel_raw_crushing.json @@ -1,9 +1,9 @@ { - "type": "basemetals:crushing", + "type": "mmdlib:crushing", "ingredient": { "tag": "c:raw_materials/nickel" }, "result": { - "id": "basemetals:nickel_powder" + "item": "basemetals:nickel_powder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/obsidian_crushing.json b/src/generated/resources/data/basemetals/recipe/obsidian_crushing.json index d47fce148..0c11df81c 100644 --- a/src/generated/resources/data/basemetals/recipe/obsidian_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/obsidian_crushing.json @@ -1,10 +1,10 @@ { - "type": "basemetals:crushing", + "type": "mmdlib:crushing", "ingredient": { "item": "minecraft:obsidian" }, "result": { "count": 4, - "id": "basemetals:obsidian_powder" + "item": "basemetals:obsidian_powder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/obsidian_ingot_crushing.json b/src/generated/resources/data/basemetals/recipe/obsidian_ingot_crushing.json index 7092c4a75..8cc47dff6 100644 --- a/src/generated/resources/data/basemetals/recipe/obsidian_ingot_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/obsidian_ingot_crushing.json @@ -1,9 +1,9 @@ { - "type": "basemetals:crushing", + "type": "mmdlib:crushing", "ingredient": { "tag": "c:ingots/obsidian" }, "result": { - "id": "basemetals:obsidian_powder" + "item": "basemetals:obsidian_powder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/obsidian_nugget_crushing.json b/src/generated/resources/data/basemetals/recipe/obsidian_nugget_crushing.json index 650ee5d28..65b5411ec 100644 --- a/src/generated/resources/data/basemetals/recipe/obsidian_nugget_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/obsidian_nugget_crushing.json @@ -1,9 +1,9 @@ { - "type": "basemetals:crushing", + "type": "mmdlib:crushing", "ingredient": { "tag": "c:nuggets/obsidian" }, "result": { - "id": "basemetals:obsidian_smallpowder" + "item": "basemetals:obsidian_smallpowder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/pewter_block_crushing.json b/src/generated/resources/data/basemetals/recipe/pewter_block_crushing.json index 762a9d04a..02bce1f69 100644 --- a/src/generated/resources/data/basemetals/recipe/pewter_block_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/pewter_block_crushing.json @@ -1,10 +1,10 @@ { - "type": "basemetals:crushing", + "type": "mmdlib:crushing", "ingredient": { "tag": "c:storage_blocks/pewter" }, "result": { "count": 9, - "id": "basemetals:pewter_powder" + "item": "basemetals:pewter_powder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/pewter_ingot_crushing.json b/src/generated/resources/data/basemetals/recipe/pewter_ingot_crushing.json index b0b80fc2c..28a808faf 100644 --- a/src/generated/resources/data/basemetals/recipe/pewter_ingot_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/pewter_ingot_crushing.json @@ -1,9 +1,9 @@ { - "type": "basemetals:crushing", + "type": "mmdlib:crushing", "ingredient": { "tag": "c:ingots/pewter" }, "result": { - "id": "basemetals:pewter_powder" + "item": "basemetals:pewter_powder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/pewter_nugget_crushing.json b/src/generated/resources/data/basemetals/recipe/pewter_nugget_crushing.json index 522a672f2..81b6544cb 100644 --- a/src/generated/resources/data/basemetals/recipe/pewter_nugget_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/pewter_nugget_crushing.json @@ -1,9 +1,9 @@ { - "type": "basemetals:crushing", + "type": "mmdlib:crushing", "ingredient": { "tag": "c:nuggets/pewter" }, "result": { - "id": "basemetals:pewter_smallpowder" + "item": "basemetals:pewter_smallpowder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/platinum_block_crushing.json b/src/generated/resources/data/basemetals/recipe/platinum_block_crushing.json index a828d86f9..cc8b48861 100644 --- a/src/generated/resources/data/basemetals/recipe/platinum_block_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/platinum_block_crushing.json @@ -1,10 +1,10 @@ { - "type": "basemetals:crushing", + "type": "mmdlib:crushing", "ingredient": { "tag": "c:storage_blocks/platinum" }, "result": { "count": 9, - "id": "basemetals:platinum_powder" + "item": "basemetals:platinum_powder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/platinum_ingot_crushing.json b/src/generated/resources/data/basemetals/recipe/platinum_ingot_crushing.json index e8ea45e55..1c796bf3e 100644 --- a/src/generated/resources/data/basemetals/recipe/platinum_ingot_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/platinum_ingot_crushing.json @@ -1,9 +1,9 @@ { - "type": "basemetals:crushing", + "type": "mmdlib:crushing", "ingredient": { "tag": "c:ingots/platinum" }, "result": { - "id": "basemetals:platinum_powder" + "item": "basemetals:platinum_powder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/platinum_nugget_crushing.json b/src/generated/resources/data/basemetals/recipe/platinum_nugget_crushing.json index f8162c357..c85571084 100644 --- a/src/generated/resources/data/basemetals/recipe/platinum_nugget_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/platinum_nugget_crushing.json @@ -1,9 +1,9 @@ { - "type": "basemetals:crushing", + "type": "mmdlib:crushing", "ingredient": { "tag": "c:nuggets/platinum" }, "result": { - "id": "basemetals:platinum_smallpowder" + "item": "basemetals:platinum_smallpowder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/platinum_ore_crushing.json b/src/generated/resources/data/basemetals/recipe/platinum_ore_crushing.json index 181ebd2ea..8e88ac3ab 100644 --- a/src/generated/resources/data/basemetals/recipe/platinum_ore_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/platinum_ore_crushing.json @@ -1,10 +1,10 @@ { - "type": "basemetals:crushing", + "type": "mmdlib:crushing", "ingredient": { "tag": "c:ores/platinum" }, "result": { "count": 2, - "id": "basemetals:platinum_powder" + "item": "basemetals:platinum_powder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/platinum_raw_crushing.json b/src/generated/resources/data/basemetals/recipe/platinum_raw_crushing.json index 1ba0ab914..35c8c5894 100644 --- a/src/generated/resources/data/basemetals/recipe/platinum_raw_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/platinum_raw_crushing.json @@ -1,9 +1,9 @@ { - "type": "basemetals:crushing", + "type": "mmdlib:crushing", "ingredient": { "tag": "c:raw_materials/platinum" }, "result": { - "id": "basemetals:platinum_powder" + "item": "basemetals:platinum_powder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/prismarine_bricks_crushing.json b/src/generated/resources/data/basemetals/recipe/prismarine_bricks_crushing.json deleted file mode 100644 index 9071cd083..000000000 --- a/src/generated/resources/data/basemetals/recipe/prismarine_bricks_crushing.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "type": "basemetals:crushing", - "ingredient": { - "item": "minecraft:prismarine_bricks" - }, - "result": { - "count": 9, - "id": "minecraft:prismarine_shard" - } -} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/prismarine_crushing.json b/src/generated/resources/data/basemetals/recipe/prismarine_crushing.json deleted file mode 100644 index a60fcdf98..000000000 --- a/src/generated/resources/data/basemetals/recipe/prismarine_crushing.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "type": "basemetals:crushing", - "ingredient": { - "item": "minecraft:prismarine" - }, - "result": { - "count": 4, - "id": "minecraft:prismarine_shard" - } -} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/quartz_block_crushing.json b/src/generated/resources/data/basemetals/recipe/quartz_block_crushing.json deleted file mode 100644 index ede0137b9..000000000 --- a/src/generated/resources/data/basemetals/recipe/quartz_block_crushing.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "type": "basemetals:crushing", - "ingredient": { - "item": "minecraft:quartz_block" - }, - "result": { - "count": 4, - "id": "minecraft:quartz" - } -} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/quartz_crushing.json b/src/generated/resources/data/basemetals/recipe/quartz_crushing.json index 72de8713f..d8e5492c9 100644 --- a/src/generated/resources/data/basemetals/recipe/quartz_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/quartz_crushing.json @@ -1,9 +1,9 @@ { - "type": "basemetals:crushing", + "type": "mmdlib:crushing", "ingredient": { "item": "minecraft:quartz" }, "result": { - "id": "basemetals:quartz_powder" + "item": "basemetals:quartz_powder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/quartz_nugget_crushing.json b/src/generated/resources/data/basemetals/recipe/quartz_nugget_crushing.json index b4ebe61c1..03f84d86e 100644 --- a/src/generated/resources/data/basemetals/recipe/quartz_nugget_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/quartz_nugget_crushing.json @@ -1,9 +1,9 @@ { - "type": "basemetals:crushing", + "type": "mmdlib:crushing", "ingredient": { "tag": "c:nuggets/quartz" }, "result": { - "id": "basemetals:quartz_smallpowder" + "item": "basemetals:quartz_smallpowder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/quartz_ore_crushing.json b/src/generated/resources/data/basemetals/recipe/quartz_ore_crushing.json deleted file mode 100644 index 0c9590ae4..000000000 --- a/src/generated/resources/data/basemetals/recipe/quartz_ore_crushing.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "type": "basemetals:crushing", - "ingredient": { - "tag": "c:ores/quartz" - }, - "result": { - "count": 2, - "id": "minecraft:quartz" - } -} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/quartz_slab_crushing.json b/src/generated/resources/data/basemetals/recipe/quartz_slab_crushing.json deleted file mode 100644 index 3f0bd94a4..000000000 --- a/src/generated/resources/data/basemetals/recipe/quartz_slab_crushing.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "type": "basemetals:crushing", - "ingredient": { - "item": "minecraft:quartz_slab" - }, - "result": { - "count": 2, - "id": "minecraft:quartz" - } -} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/red_sandstone_crushing.json b/src/generated/resources/data/basemetals/recipe/red_sandstone_crushing.json deleted file mode 100644 index d96c14b85..000000000 --- a/src/generated/resources/data/basemetals/recipe/red_sandstone_crushing.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "type": "basemetals:crushing", - "ingredient": { - "item": "minecraft:red_sandstone" - }, - "result": { - "count": 4, - "id": "minecraft:red_sand" - } -} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/red_sandstone_slab_crushing.json b/src/generated/resources/data/basemetals/recipe/red_sandstone_slab_crushing.json deleted file mode 100644 index 364e94645..000000000 --- a/src/generated/resources/data/basemetals/recipe/red_sandstone_slab_crushing.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "type": "basemetals:crushing", - "ingredient": { - "item": "minecraft:red_sandstone_slab" - }, - "result": { - "count": 2, - "id": "minecraft:red_sand" - } -} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/redstone_block_crushing.json b/src/generated/resources/data/basemetals/recipe/redstone_block_crushing.json deleted file mode 100644 index 0801aa5a9..000000000 --- a/src/generated/resources/data/basemetals/recipe/redstone_block_crushing.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "type": "basemetals:crushing", - "ingredient": { - "tag": "c:storage_blocks/redstone" - }, - "result": { - "count": 9, - "id": "minecraft:redstone" - } -} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/redstone_ingot.json b/src/generated/resources/data/basemetals/recipe/redstone_ingot.json new file mode 100644 index 000000000..a3877dc9f --- /dev/null +++ b/src/generated/resources/data/basemetals/recipe/redstone_ingot.json @@ -0,0 +1,11 @@ +{ + "type": "minecraft:smelting", + "cookingtime": 200, + "experience": 0.1, + "ingredient": { + "tag": "c:dusts/redstone" + }, + "result": { + "id": "basemetals:redstone_ingot" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/redstone_ore_crushing.json b/src/generated/resources/data/basemetals/recipe/redstone_ore_crushing.json deleted file mode 100644 index 95badbd29..000000000 --- a/src/generated/resources/data/basemetals/recipe/redstone_ore_crushing.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "type": "basemetals:crushing", - "ingredient": { - "tag": "c:ores/redstone" - }, - "result": { - "count": 8, - "id": "minecraft:redstone" - } -} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/sandstone_crushing.json b/src/generated/resources/data/basemetals/recipe/sandstone_crushing.json deleted file mode 100644 index 8faa491ae..000000000 --- a/src/generated/resources/data/basemetals/recipe/sandstone_crushing.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "type": "basemetals:crushing", - "ingredient": { - "item": "minecraft:sandstone" - }, - "result": { - "count": 4, - "id": "minecraft:sand" - } -} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/sandstone_slab_crushing.json b/src/generated/resources/data/basemetals/recipe/sandstone_slab_crushing.json deleted file mode 100644 index 45a093147..000000000 --- a/src/generated/resources/data/basemetals/recipe/sandstone_slab_crushing.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "type": "basemetals:crushing", - "ingredient": { - "item": "minecraft:sandstone_slab" - }, - "result": { - "count": 2, - "id": "minecraft:sand" - } -} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/sea_lantern_crushing.json b/src/generated/resources/data/basemetals/recipe/sea_lantern_crushing.json deleted file mode 100644 index 5fa01cb86..000000000 --- a/src/generated/resources/data/basemetals/recipe/sea_lantern_crushing.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "type": "basemetals:crushing", - "ingredient": { - "item": "minecraft:sea_lantern" - }, - "result": { - "count": 5, - "id": "minecraft:prismarine_crystals" - } -} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/silver_block_crushing.json b/src/generated/resources/data/basemetals/recipe/silver_block_crushing.json index 12c9472c2..312ec51bd 100644 --- a/src/generated/resources/data/basemetals/recipe/silver_block_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/silver_block_crushing.json @@ -1,10 +1,10 @@ { - "type": "basemetals:crushing", + "type": "mmdlib:crushing", "ingredient": { "tag": "c:storage_blocks/silver" }, "result": { "count": 9, - "id": "basemetals:silver_powder" + "item": "basemetals:silver_powder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/silver_ingot_crushing.json b/src/generated/resources/data/basemetals/recipe/silver_ingot_crushing.json index a462c3232..e8903cbc3 100644 --- a/src/generated/resources/data/basemetals/recipe/silver_ingot_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/silver_ingot_crushing.json @@ -1,9 +1,9 @@ { - "type": "basemetals:crushing", + "type": "mmdlib:crushing", "ingredient": { "tag": "c:ingots/silver" }, "result": { - "id": "basemetals:silver_powder" + "item": "basemetals:silver_powder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/silver_nugget_crushing.json b/src/generated/resources/data/basemetals/recipe/silver_nugget_crushing.json index 1af65d0cb..b5212451d 100644 --- a/src/generated/resources/data/basemetals/recipe/silver_nugget_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/silver_nugget_crushing.json @@ -1,9 +1,9 @@ { - "type": "basemetals:crushing", + "type": "mmdlib:crushing", "ingredient": { "tag": "c:nuggets/silver" }, "result": { - "id": "basemetals:silver_smallpowder" + "item": "basemetals:silver_smallpowder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/silver_ore_crushing.json b/src/generated/resources/data/basemetals/recipe/silver_ore_crushing.json index 7d38344bb..21089a0f7 100644 --- a/src/generated/resources/data/basemetals/recipe/silver_ore_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/silver_ore_crushing.json @@ -1,10 +1,10 @@ { - "type": "basemetals:crushing", + "type": "mmdlib:crushing", "ingredient": { "tag": "c:ores/silver" }, "result": { "count": 2, - "id": "basemetals:silver_powder" + "item": "basemetals:silver_powder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/silver_raw_crushing.json b/src/generated/resources/data/basemetals/recipe/silver_raw_crushing.json index dc00b0426..85f21bbb9 100644 --- a/src/generated/resources/data/basemetals/recipe/silver_raw_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/silver_raw_crushing.json @@ -1,9 +1,9 @@ { - "type": "basemetals:crushing", + "type": "mmdlib:crushing", "ingredient": { "tag": "c:raw_materials/silver" }, "result": { - "id": "basemetals:silver_powder" + "item": "basemetals:silver_powder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/slime_block_crushing.json b/src/generated/resources/data/basemetals/recipe/slime_block_crushing.json deleted file mode 100644 index 5aa4ccd20..000000000 --- a/src/generated/resources/data/basemetals/recipe/slime_block_crushing.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "type": "basemetals:crushing", - "ingredient": { - "item": "minecraft:slime_block" - }, - "result": { - "count": 9, - "id": "minecraft:slime_ball" - } -} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/starsteel_block_crushing.json b/src/generated/resources/data/basemetals/recipe/starsteel_block_crushing.json index 42695c659..caaf76a0d 100644 --- a/src/generated/resources/data/basemetals/recipe/starsteel_block_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/starsteel_block_crushing.json @@ -1,10 +1,10 @@ { - "type": "basemetals:crushing", + "type": "mmdlib:crushing", "ingredient": { "tag": "c:storage_blocks/starsteel" }, "result": { "count": 9, - "id": "basemetals:starsteel_powder" + "item": "basemetals:starsteel_powder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/starsteel_ingot_crushing.json b/src/generated/resources/data/basemetals/recipe/starsteel_ingot_crushing.json index af1eb5ae1..0edb1a540 100644 --- a/src/generated/resources/data/basemetals/recipe/starsteel_ingot_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/starsteel_ingot_crushing.json @@ -1,9 +1,9 @@ { - "type": "basemetals:crushing", + "type": "mmdlib:crushing", "ingredient": { "tag": "c:ingots/starsteel" }, "result": { - "id": "basemetals:starsteel_powder" + "item": "basemetals:starsteel_powder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/starsteel_nugget_crushing.json b/src/generated/resources/data/basemetals/recipe/starsteel_nugget_crushing.json index 6be4846e4..134840867 100644 --- a/src/generated/resources/data/basemetals/recipe/starsteel_nugget_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/starsteel_nugget_crushing.json @@ -1,9 +1,9 @@ { - "type": "basemetals:crushing", + "type": "mmdlib:crushing", "ingredient": { "tag": "c:nuggets/starsteel" }, "result": { - "id": "basemetals:starsteel_smallpowder" + "item": "basemetals:starsteel_smallpowder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/starsteel_ore_crushing.json b/src/generated/resources/data/basemetals/recipe/starsteel_ore_crushing.json index 07dccedea..ccd586b26 100644 --- a/src/generated/resources/data/basemetals/recipe/starsteel_ore_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/starsteel_ore_crushing.json @@ -1,10 +1,10 @@ { - "type": "basemetals:crushing", + "type": "mmdlib:crushing", "ingredient": { "tag": "c:ores/starsteel" }, "result": { "count": 2, - "id": "basemetals:starsteel_powder" + "item": "basemetals:starsteel_powder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/starsteel_raw_crushing.json b/src/generated/resources/data/basemetals/recipe/starsteel_raw_crushing.json index 7c10c6ab4..0fb39c3a1 100644 --- a/src/generated/resources/data/basemetals/recipe/starsteel_raw_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/starsteel_raw_crushing.json @@ -1,9 +1,9 @@ { - "type": "basemetals:crushing", + "type": "mmdlib:crushing", "ingredient": { "tag": "c:raw_materials/starsteel" }, "result": { - "id": "basemetals:starsteel_powder" + "item": "basemetals:starsteel_powder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/steel_block_crushing.json b/src/generated/resources/data/basemetals/recipe/steel_block_crushing.json index 7745564a8..982c202ba 100644 --- a/src/generated/resources/data/basemetals/recipe/steel_block_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/steel_block_crushing.json @@ -1,10 +1,10 @@ { - "type": "basemetals:crushing", + "type": "mmdlib:crushing", "ingredient": { "tag": "c:storage_blocks/steel" }, "result": { "count": 9, - "id": "basemetals:steel_powder" + "item": "basemetals:steel_powder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/steel_ingot_crushing.json b/src/generated/resources/data/basemetals/recipe/steel_ingot_crushing.json index 642af9f60..945c5474e 100644 --- a/src/generated/resources/data/basemetals/recipe/steel_ingot_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/steel_ingot_crushing.json @@ -1,9 +1,9 @@ { - "type": "basemetals:crushing", + "type": "mmdlib:crushing", "ingredient": { "tag": "c:ingots/steel" }, "result": { - "id": "basemetals:steel_powder" + "item": "basemetals:steel_powder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/steel_nugget_crushing.json b/src/generated/resources/data/basemetals/recipe/steel_nugget_crushing.json index a23b734a9..ab3c7e76d 100644 --- a/src/generated/resources/data/basemetals/recipe/steel_nugget_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/steel_nugget_crushing.json @@ -1,9 +1,9 @@ { - "type": "basemetals:crushing", + "type": "mmdlib:crushing", "ingredient": { "tag": "c:nuggets/steel" }, "result": { - "id": "basemetals:steel_smallpowder" + "item": "basemetals:steel_smallpowder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/stone_brick_slab_crushing.json b/src/generated/resources/data/basemetals/recipe/stone_brick_slab_crushing.json deleted file mode 100644 index 91dc85f77..000000000 --- a/src/generated/resources/data/basemetals/recipe/stone_brick_slab_crushing.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "type": "basemetals:crushing", - "ingredient": { - "item": "minecraft:stone_brick_slab" - }, - "result": { - "id": "minecraft:cobblestone_slab" - } -} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/stone_bricks_crushing.json b/src/generated/resources/data/basemetals/recipe/stone_bricks_crushing.json deleted file mode 100644 index 06b389321..000000000 --- a/src/generated/resources/data/basemetals/recipe/stone_bricks_crushing.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "type": "basemetals:crushing", - "ingredient": { - "item": "minecraft:stone_bricks" - }, - "result": { - "id": "minecraft:cobblestone" - } -} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/stone_crushing.json b/src/generated/resources/data/basemetals/recipe/stone_crushing.json deleted file mode 100644 index fbc51835c..000000000 --- a/src/generated/resources/data/basemetals/recipe/stone_crushing.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "type": "basemetals:crushing", - "ingredient": { - "tag": "c:stones" - }, - "result": { - "id": "minecraft:cobblestone" - } -} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/stone_gear.json b/src/generated/resources/data/basemetals/recipe/stone_gear.json new file mode 100644 index 000000000..327e9d05c --- /dev/null +++ b/src/generated/resources/data/basemetals/recipe/stone_gear.json @@ -0,0 +1,25 @@ +{ + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "category": "misc", + "group": "basemetals:stone_gear", + "key": { + "R": { + "tag": "c:rods/stone" + }, + "X": { + "tag": "c:cobblestones" + } + }, + "pattern": [ + " X ", + "XRX", + " X " + ], + "result": { + "count": 4, + "id": "basemetals:stone_gear" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/stone_rod.json b/src/generated/resources/data/basemetals/recipe/stone_rod.json new file mode 100644 index 000000000..0accd24f8 --- /dev/null +++ b/src/generated/resources/data/basemetals/recipe/stone_rod.json @@ -0,0 +1,21 @@ +{ + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "category": "misc", + "group": "basemetals:stone_rod", + "key": { + "X": { + "tag": "c:cobblestones" + } + }, + "pattern": [ + "X", + "X" + ], + "result": { + "count": 4, + "id": "basemetals:stone_rod" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/stone_slab_crushing.json b/src/generated/resources/data/basemetals/recipe/stone_slab_crushing.json deleted file mode 100644 index 1f9e8f969..000000000 --- a/src/generated/resources/data/basemetals/recipe/stone_slab_crushing.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "type": "basemetals:crushing", - "ingredient": { - "item": "minecraft:stone_slab" - }, - "result": { - "id": "minecraft:cobblestone_slab" - } -} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/sugar_cane_crushing.json b/src/generated/resources/data/basemetals/recipe/sugar_cane_crushing.json deleted file mode 100644 index ac06da241..000000000 --- a/src/generated/resources/data/basemetals/recipe/sugar_cane_crushing.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "type": "basemetals:crushing", - "ingredient": { - "item": "minecraft:sugar_cane" - }, - "result": { - "count": 2, - "id": "minecraft:sugar" - } -} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/tin_block_crushing.json b/src/generated/resources/data/basemetals/recipe/tin_block_crushing.json index 18d0c2dfb..dadfe027d 100644 --- a/src/generated/resources/data/basemetals/recipe/tin_block_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/tin_block_crushing.json @@ -1,10 +1,10 @@ { - "type": "basemetals:crushing", + "type": "mmdlib:crushing", "ingredient": { "tag": "c:storage_blocks/tin" }, "result": { "count": 9, - "id": "basemetals:tin_powder" + "item": "basemetals:tin_powder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/tin_ingot_crushing.json b/src/generated/resources/data/basemetals/recipe/tin_ingot_crushing.json index ee0cc4bc9..8e5e1fe9d 100644 --- a/src/generated/resources/data/basemetals/recipe/tin_ingot_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/tin_ingot_crushing.json @@ -1,9 +1,9 @@ { - "type": "basemetals:crushing", + "type": "mmdlib:crushing", "ingredient": { "tag": "c:ingots/tin" }, "result": { - "id": "basemetals:tin_powder" + "item": "basemetals:tin_powder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/tin_nugget_crushing.json b/src/generated/resources/data/basemetals/recipe/tin_nugget_crushing.json index b990a8efb..9205e2fee 100644 --- a/src/generated/resources/data/basemetals/recipe/tin_nugget_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/tin_nugget_crushing.json @@ -1,9 +1,9 @@ { - "type": "basemetals:crushing", + "type": "mmdlib:crushing", "ingredient": { "tag": "c:nuggets/tin" }, "result": { - "id": "basemetals:tin_smallpowder" + "item": "basemetals:tin_smallpowder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/tin_ore_crushing.json b/src/generated/resources/data/basemetals/recipe/tin_ore_crushing.json index a1327d665..d6afc8335 100644 --- a/src/generated/resources/data/basemetals/recipe/tin_ore_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/tin_ore_crushing.json @@ -1,10 +1,10 @@ { - "type": "basemetals:crushing", + "type": "mmdlib:crushing", "ingredient": { "tag": "c:ores/tin" }, "result": { "count": 2, - "id": "basemetals:tin_powder" + "item": "basemetals:tin_powder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/tin_raw_crushing.json b/src/generated/resources/data/basemetals/recipe/tin_raw_crushing.json index fc7c8c4ca..33b17df7c 100644 --- a/src/generated/resources/data/basemetals/recipe/tin_raw_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/tin_raw_crushing.json @@ -1,9 +1,9 @@ { - "type": "basemetals:crushing", + "type": "mmdlib:crushing", "ingredient": { "tag": "c:raw_materials/tin" }, "result": { - "id": "basemetals:tin_powder" + "item": "basemetals:tin_powder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/wood_gear.json b/src/generated/resources/data/basemetals/recipe/wood_gear.json new file mode 100644 index 000000000..34ed0b9ae --- /dev/null +++ b/src/generated/resources/data/basemetals/recipe/wood_gear.json @@ -0,0 +1,25 @@ +{ + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "category": "misc", + "group": "basemetals:wood_gear", + "key": { + "R": { + "tag": "c:rods/wooden" + }, + "X": { + "tag": "minecraft:planks" + } + }, + "pattern": [ + " X ", + "XRX", + " X " + ], + "result": { + "count": 4, + "id": "basemetals:wood_gear" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/zinc_block_crushing.json b/src/generated/resources/data/basemetals/recipe/zinc_block_crushing.json index 7ebf9b68a..0ebf105ce 100644 --- a/src/generated/resources/data/basemetals/recipe/zinc_block_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/zinc_block_crushing.json @@ -1,10 +1,10 @@ { - "type": "basemetals:crushing", + "type": "mmdlib:crushing", "ingredient": { "tag": "c:storage_blocks/zinc" }, "result": { "count": 9, - "id": "basemetals:zinc_powder" + "item": "basemetals:zinc_powder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/zinc_ingot_crushing.json b/src/generated/resources/data/basemetals/recipe/zinc_ingot_crushing.json index 5664440a5..64f2f47d8 100644 --- a/src/generated/resources/data/basemetals/recipe/zinc_ingot_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/zinc_ingot_crushing.json @@ -1,9 +1,9 @@ { - "type": "basemetals:crushing", + "type": "mmdlib:crushing", "ingredient": { "tag": "c:ingots/zinc" }, "result": { - "id": "basemetals:zinc_powder" + "item": "basemetals:zinc_powder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/zinc_nugget_crushing.json b/src/generated/resources/data/basemetals/recipe/zinc_nugget_crushing.json index c34c0c2ce..63f8f96e0 100644 --- a/src/generated/resources/data/basemetals/recipe/zinc_nugget_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/zinc_nugget_crushing.json @@ -1,9 +1,9 @@ { - "type": "basemetals:crushing", + "type": "mmdlib:crushing", "ingredient": { "tag": "c:nuggets/zinc" }, "result": { - "id": "basemetals:zinc_smallpowder" + "item": "basemetals:zinc_smallpowder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/zinc_ore_crushing.json b/src/generated/resources/data/basemetals/recipe/zinc_ore_crushing.json index e1086ce0c..db623cf07 100644 --- a/src/generated/resources/data/basemetals/recipe/zinc_ore_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/zinc_ore_crushing.json @@ -1,10 +1,10 @@ { - "type": "basemetals:crushing", + "type": "mmdlib:crushing", "ingredient": { "tag": "c:ores/zinc" }, "result": { "count": 2, - "id": "basemetals:zinc_powder" + "item": "basemetals:zinc_powder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/zinc_raw_crushing.json b/src/generated/resources/data/basemetals/recipe/zinc_raw_crushing.json index 0d906203d..71f9365ab 100644 --- a/src/generated/resources/data/basemetals/recipe/zinc_raw_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/zinc_raw_crushing.json @@ -1,9 +1,9 @@ { - "type": "basemetals:crushing", + "type": "mmdlib:crushing", "ingredient": { "tag": "c:raw_materials/zinc" }, "result": { - "id": "basemetals:zinc_powder" + "item": "basemetals:zinc_powder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/registry_manifest.json b/src/generated/resources/data/basemetals/registry_manifest.json index 558debd3e..9f3c5931e 100644 --- a/src/generated/resources/data/basemetals/registry_manifest.json +++ b/src/generated/resources/data/basemetals/registry_manifest.json @@ -1,365 +1,362 @@ { "blocks": [ - "basemetals:adamantine_block", - "basemetals:adamantine_plate", + "basemetals:adamantine", + "basemetals:antimony", + "basemetals:aquarium", + "basemetals:bismuth", + "basemetals:brass", + "basemetals:bronze", + "basemetals:coldiron", + "basemetals:copper", + "basemetals:cupronickel", + "basemetals:electrum", + "basemetals:invar", + "basemetals:lead", + "basemetals:mercury", + "basemetals:mithril", + "basemetals:nickel", + "basemetals:pewter", + "basemetals:platinum", + "basemetals:silver", + "basemetals:starsteel", + "basemetals:steel", + "basemetals:tin", + "basemetals:zinc", + "basemetals:charcoal", + "basemetals:coal", + "basemetals:diamond", + "basemetals:emerald", + "basemetals:ender", + "basemetals:gold", + "basemetals:iron", + "basemetals:obsidian", + "basemetals:prismarine", + "basemetals:quartz", + "basemetals:redstone", + "basemetals:adamantine_anvil", "basemetals:adamantine_bars", - "basemetals:adamantine_door", - "basemetals:adamantine_trapdoor", + "basemetals:adamantine_block", "basemetals:adamantine_button", - "basemetals:adamantine_slab", + "basemetals:adamantine_door", + "basemetals:adamantine_double_slab", "basemetals:adamantine_lever", + "basemetals:adamantine_ore", + "basemetals:adamantine_plate", "basemetals:adamantine_pressure_plate", + "basemetals:adamantine_slab", "basemetals:adamantine_stairs", + "basemetals:adamantine_trapdoor", "basemetals:adamantine_wall", - "basemetals:double_adamantine_slab", - "basemetals:adamantine_ore", - "basemetals:antimony_block", - "basemetals:antimony_plate", "basemetals:antimony_bars", - "basemetals:antimony_door", - "basemetals:antimony_trapdoor", + "basemetals:antimony_block", "basemetals:antimony_button", - "basemetals:antimony_slab", + "basemetals:antimony_door", + "basemetals:antimony_double_slab", "basemetals:antimony_lever", + "basemetals:antimony_ore", + "basemetals:antimony_plate", "basemetals:antimony_pressure_plate", + "basemetals:antimony_slab", "basemetals:antimony_stairs", + "basemetals:antimony_trapdoor", "basemetals:antimony_wall", - "basemetals:double_antimony_slab", - "basemetals:antimony_ore", - "basemetals:aquarium_block", - "basemetals:aquarium_plate", "basemetals:aquarium_bars", - "basemetals:aquarium_door", - "basemetals:aquarium_trapdoor", + "basemetals:aquarium_block", "basemetals:aquarium_button", - "basemetals:aquarium_slab", + "basemetals:aquarium_door", + "basemetals:aquarium_double_slab", "basemetals:aquarium_lever", + "basemetals:aquarium_plate", "basemetals:aquarium_pressure_plate", + "basemetals:aquarium_slab", "basemetals:aquarium_stairs", + "basemetals:aquarium_trapdoor", "basemetals:aquarium_wall", - "basemetals:double_aquarium_slab", - "basemetals:bismuth_block", - "basemetals:bismuth_plate", "basemetals:bismuth_bars", - "basemetals:bismuth_door", - "basemetals:bismuth_trapdoor", + "basemetals:bismuth_block", "basemetals:bismuth_button", - "basemetals:bismuth_slab", + "basemetals:bismuth_door", + "basemetals:bismuth_double_slab", "basemetals:bismuth_lever", + "basemetals:bismuth_ore", + "basemetals:bismuth_plate", "basemetals:bismuth_pressure_plate", + "basemetals:bismuth_slab", "basemetals:bismuth_stairs", + "basemetals:bismuth_trapdoor", "basemetals:bismuth_wall", - "basemetals:double_bismuth_slab", - "basemetals:bismuth_ore", - "basemetals:brass_block", - "basemetals:brass_plate", "basemetals:brass_bars", - "basemetals:brass_door", - "basemetals:brass_trapdoor", + "basemetals:brass_block", "basemetals:brass_button", - "basemetals:brass_slab", + "basemetals:brass_door", + "basemetals:brass_double_slab", "basemetals:brass_lever", + "basemetals:brass_plate", "basemetals:brass_pressure_plate", + "basemetals:brass_slab", "basemetals:brass_stairs", + "basemetals:brass_trapdoor", "basemetals:brass_wall", - "basemetals:double_brass_slab", - "basemetals:bronze_block", - "basemetals:bronze_plate", "basemetals:bronze_bars", - "basemetals:bronze_door", - "basemetals:bronze_trapdoor", + "basemetals:bronze_block", "basemetals:bronze_button", - "basemetals:bronze_slab", + "basemetals:bronze_door", + "basemetals:bronze_double_slab", "basemetals:bronze_lever", + "basemetals:bronze_plate", "basemetals:bronze_pressure_plate", + "basemetals:bronze_slab", "basemetals:bronze_stairs", + "basemetals:bronze_trapdoor", "basemetals:bronze_wall", - "basemetals:double_bronze_slab", - "basemetals:coldiron_block", - "basemetals:coldiron_plate", + "basemetals:charcoal_block", "basemetals:coldiron_bars", - "basemetals:coldiron_door", - "basemetals:coldiron_trapdoor", + "basemetals:coldiron_block", "basemetals:coldiron_button", - "basemetals:coldiron_slab", + "basemetals:coldiron_door", + "basemetals:coldiron_double_slab", "basemetals:coldiron_lever", + "basemetals:coldiron_ore", + "basemetals:coldiron_plate", "basemetals:coldiron_pressure_plate", + "basemetals:coldiron_slab", "basemetals:coldiron_stairs", + "basemetals:coldiron_trapdoor", "basemetals:coldiron_wall", - "basemetals:double_coldiron_slab", - "basemetals:coldiron_ore", - "basemetals:copper_block", - "basemetals:copper_plate", "basemetals:copper_bars", - "basemetals:copper_door", - "basemetals:copper_trapdoor", + "basemetals:copper_block", "basemetals:copper_button", - "basemetals:copper_slab", + "basemetals:copper_door", + "basemetals:copper_double_slab", "basemetals:copper_lever", + "basemetals:copper_ore", + "basemetals:copper_plate", "basemetals:copper_pressure_plate", + "basemetals:copper_slab", "basemetals:copper_stairs", + "basemetals:copper_trapdoor", "basemetals:copper_wall", - "basemetals:double_copper_slab", - "basemetals:copper_ore", - "basemetals:cupronickel_block", - "basemetals:cupronickel_plate", "basemetals:cupronickel_bars", - "basemetals:cupronickel_door", - "basemetals:cupronickel_trapdoor", + "basemetals:cupronickel_block", "basemetals:cupronickel_button", - "basemetals:cupronickel_slab", + "basemetals:cupronickel_door", + "basemetals:cupronickel_double_slab", "basemetals:cupronickel_lever", + "basemetals:cupronickel_plate", "basemetals:cupronickel_pressure_plate", + "basemetals:cupronickel_slab", "basemetals:cupronickel_stairs", + "basemetals:cupronickel_trapdoor", "basemetals:cupronickel_wall", - "basemetals:double_cupronickel_slab", - "basemetals:electrum_block", - "basemetals:electrum_plate", + "basemetals:diamond_bars", + "basemetals:diamond_button", + "basemetals:diamond_door", + "basemetals:diamond_double_slab", + "basemetals:diamond_lever", + "basemetals:diamond_pressure_plate", + "basemetals:diamond_slab", + "basemetals:diamond_stairs", + "basemetals:diamond_trapdoor", + "basemetals:diamond_wall", "basemetals:electrum_bars", - "basemetals:electrum_door", - "basemetals:electrum_trapdoor", + "basemetals:electrum_block", "basemetals:electrum_button", - "basemetals:electrum_slab", + "basemetals:electrum_door", + "basemetals:electrum_double_slab", "basemetals:electrum_lever", + "basemetals:electrum_plate", "basemetals:electrum_pressure_plate", + "basemetals:electrum_slab", "basemetals:electrum_stairs", + "basemetals:electrum_trapdoor", "basemetals:electrum_wall", - "basemetals:double_electrum_slab", - "basemetals:invar_block", - "basemetals:invar_plate", + "basemetals:emerald_bars", + "basemetals:emerald_button", + "basemetals:emerald_door", + "basemetals:emerald_double_slab", + "basemetals:emerald_lever", + "basemetals:emerald_pressure_plate", + "basemetals:emerald_slab", + "basemetals:emerald_stairs", + "basemetals:emerald_trapdoor", + "basemetals:emerald_wall", + "basemetals:gold_bars", + "basemetals:gold_button", + "basemetals:gold_door", + "basemetals:gold_double_slab", + "basemetals:gold_lever", + "basemetals:gold_plate", + "basemetals:gold_slab", + "basemetals:gold_stairs", + "basemetals:gold_trapdoor", + "basemetals:gold_wall", "basemetals:invar_bars", - "basemetals:invar_door", - "basemetals:invar_trapdoor", + "basemetals:invar_block", "basemetals:invar_button", - "basemetals:invar_slab", + "basemetals:invar_door", + "basemetals:invar_double_slab", "basemetals:invar_lever", + "basemetals:invar_plate", "basemetals:invar_pressure_plate", + "basemetals:invar_slab", "basemetals:invar_stairs", + "basemetals:invar_trapdoor", "basemetals:invar_wall", - "basemetals:double_invar_slab", - "basemetals:lead_block", - "basemetals:lead_plate", + "basemetals:iron_button", + "basemetals:iron_double_slab", + "basemetals:iron_lever", + "basemetals:iron_plate", + "basemetals:iron_slab", + "basemetals:iron_stairs", + "basemetals:iron_wall", "basemetals:lead_bars", - "basemetals:lead_door", - "basemetals:lead_trapdoor", + "basemetals:lead_block", "basemetals:lead_button", - "basemetals:lead_slab", + "basemetals:lead_door", + "basemetals:lead_double_slab", "basemetals:lead_lever", + "basemetals:lead_ore", + "basemetals:lead_plate", "basemetals:lead_pressure_plate", + "basemetals:lead_slab", "basemetals:lead_stairs", + "basemetals:lead_trapdoor", "basemetals:lead_wall", - "basemetals:double_lead_slab", - "basemetals:lead_ore", "basemetals:mercury_ore", - "basemetals:mithril_block", - "basemetals:mithril_plate", "basemetals:mithril_bars", - "basemetals:mithril_door", - "basemetals:mithril_trapdoor", + "basemetals:mithril_block", "basemetals:mithril_button", - "basemetals:mithril_slab", + "basemetals:mithril_door", + "basemetals:mithril_double_slab", "basemetals:mithril_lever", + "basemetals:mithril_plate", "basemetals:mithril_pressure_plate", + "basemetals:mithril_slab", "basemetals:mithril_stairs", + "basemetals:mithril_trapdoor", "basemetals:mithril_wall", - "basemetals:double_mithril_slab", - "basemetals:nickel_block", - "basemetals:nickel_plate", "basemetals:nickel_bars", - "basemetals:nickel_door", - "basemetals:nickel_trapdoor", + "basemetals:nickel_block", "basemetals:nickel_button", - "basemetals:nickel_slab", + "basemetals:nickel_door", + "basemetals:nickel_double_slab", "basemetals:nickel_lever", + "basemetals:nickel_ore", + "basemetals:nickel_plate", "basemetals:nickel_pressure_plate", + "basemetals:nickel_slab", "basemetals:nickel_stairs", + "basemetals:nickel_trapdoor", "basemetals:nickel_wall", - "basemetals:double_nickel_slab", - "basemetals:nickel_ore", - "basemetals:pewter_block", - "basemetals:pewter_plate", + "basemetals:obsidian_bars", + "basemetals:obsidian_button", + "basemetals:obsidian_door", + "basemetals:obsidian_double_slab", + "basemetals:obsidian_lever", + "basemetals:obsidian_pressure_plate", + "basemetals:obsidian_slab", + "basemetals:obsidian_stairs", + "basemetals:obsidian_trapdoor", + "basemetals:obsidian_wall", "basemetals:pewter_bars", - "basemetals:pewter_door", - "basemetals:pewter_trapdoor", + "basemetals:pewter_block", "basemetals:pewter_button", - "basemetals:pewter_slab", + "basemetals:pewter_door", + "basemetals:pewter_double_slab", "basemetals:pewter_lever", + "basemetals:pewter_plate", "basemetals:pewter_pressure_plate", + "basemetals:pewter_slab", "basemetals:pewter_stairs", + "basemetals:pewter_trapdoor", "basemetals:pewter_wall", - "basemetals:double_pewter_slab", - "basemetals:platinum_block", - "basemetals:platinum_plate", "basemetals:platinum_bars", - "basemetals:platinum_door", - "basemetals:platinum_trapdoor", + "basemetals:platinum_block", "basemetals:platinum_button", - "basemetals:platinum_slab", + "basemetals:platinum_door", + "basemetals:platinum_double_slab", "basemetals:platinum_lever", + "basemetals:platinum_ore", + "basemetals:platinum_plate", "basemetals:platinum_pressure_plate", + "basemetals:platinum_slab", "basemetals:platinum_stairs", + "basemetals:platinum_trapdoor", "basemetals:platinum_wall", - "basemetals:double_platinum_slab", - "basemetals:platinum_ore", - "basemetals:silver_block", - "basemetals:silver_plate", - "basemetals:silver_bars", - "basemetals:silver_door", - "basemetals:silver_trapdoor", + "basemetals:quartz_bars", + "basemetals:quartz_button", + "basemetals:quartz_door", + "basemetals:quartz_lever", + "basemetals:quartz_pressure_plate", + "basemetals:quartz_trapdoor", + "basemetals:quartz_wall", + "basemetals:silver_bars", + "basemetals:silver_block", "basemetals:silver_button", - "basemetals:silver_slab", + "basemetals:silver_door", + "basemetals:silver_double_slab", "basemetals:silver_lever", + "basemetals:silver_ore", + "basemetals:silver_plate", "basemetals:silver_pressure_plate", + "basemetals:silver_slab", "basemetals:silver_stairs", + "basemetals:silver_trapdoor", "basemetals:silver_wall", - "basemetals:double_silver_slab", - "basemetals:silver_ore", - "basemetals:starsteel_block", - "basemetals:starsteel_plate", "basemetals:starsteel_bars", - "basemetals:starsteel_door", - "basemetals:starsteel_trapdoor", + "basemetals:starsteel_block", "basemetals:starsteel_button", - "basemetals:starsteel_slab", + "basemetals:starsteel_door", + "basemetals:starsteel_double_slab", "basemetals:starsteel_lever", + "basemetals:starsteel_ore", + "basemetals:starsteel_plate", "basemetals:starsteel_pressure_plate", + "basemetals:starsteel_slab", "basemetals:starsteel_stairs", + "basemetals:starsteel_trapdoor", "basemetals:starsteel_wall", - "basemetals:double_starsteel_slab", - "basemetals:starsteel_ore", - "basemetals:steel_block", - "basemetals:steel_plate", + "basemetals:steel_anvil", "basemetals:steel_bars", - "basemetals:steel_door", - "basemetals:steel_trapdoor", + "basemetals:steel_block", "basemetals:steel_button", - "basemetals:steel_slab", + "basemetals:steel_door", + "basemetals:steel_double_slab", "basemetals:steel_lever", + "basemetals:steel_plate", "basemetals:steel_pressure_plate", + "basemetals:steel_slab", "basemetals:steel_stairs", + "basemetals:steel_trapdoor", "basemetals:steel_wall", - "basemetals:double_steel_slab", - "basemetals:tin_block", - "basemetals:tin_plate", "basemetals:tin_bars", - "basemetals:tin_door", - "basemetals:tin_trapdoor", + "basemetals:tin_block", "basemetals:tin_button", - "basemetals:tin_slab", + "basemetals:tin_door", + "basemetals:tin_double_slab", "basemetals:tin_lever", + "basemetals:tin_ore", + "basemetals:tin_plate", "basemetals:tin_pressure_plate", + "basemetals:tin_slab", "basemetals:tin_stairs", + "basemetals:tin_trapdoor", "basemetals:tin_wall", - "basemetals:double_tin_slab", - "basemetals:tin_ore", - "basemetals:zinc_block", - "basemetals:zinc_plate", "basemetals:zinc_bars", - "basemetals:zinc_door", - "basemetals:zinc_trapdoor", + "basemetals:zinc_block", "basemetals:zinc_button", - "basemetals:zinc_slab", + "basemetals:zinc_door", + "basemetals:zinc_double_slab", "basemetals:zinc_lever", + "basemetals:zinc_ore", + "basemetals:zinc_plate", "basemetals:zinc_pressure_plate", + "basemetals:zinc_slab", "basemetals:zinc_stairs", + "basemetals:zinc_trapdoor", "basemetals:zinc_wall", - "basemetals:double_zinc_slab", - "basemetals:zinc_ore", - "basemetals:stone_anvil", - "basemetals:steel_anvil", - "basemetals:adamantine_anvil", "basemetals:human_detector", - "basemetals:charcoal_block", - "basemetals:diamond_bars", - "basemetals:diamond_door", - "basemetals:diamond_trapdoor", - "basemetals:diamond_button", - "basemetals:diamond_slab", - "basemetals:diamond_lever", - "basemetals:diamond_pressure_plate", - "basemetals:diamond_stairs", - "basemetals:diamond_wall", - "basemetals:double_diamond_slab", - "basemetals:emerald_bars", - "basemetals:emerald_door", - "basemetals:emerald_trapdoor", - "basemetals:emerald_button", - "basemetals:emerald_slab", - "basemetals:emerald_lever", - "basemetals:emerald_pressure_plate", - "basemetals:emerald_stairs", - "basemetals:emerald_wall", - "basemetals:double_emerald_slab", - "basemetals:gold_bars", - "basemetals:gold_door", - "basemetals:gold_trapdoor", - "basemetals:gold_button", - "basemetals:gold_slab", - "basemetals:gold_lever", - "basemetals:gold_stairs", - "basemetals:gold_wall", - "basemetals:double_gold_slab", - "basemetals:obsidian_bars", - "basemetals:obsidian_door", - "basemetals:obsidian_trapdoor", - "basemetals:obsidian_button", - "basemetals:obsidian_slab", - "basemetals:obsidian_lever", - "basemetals:obsidian_pressure_plate", - "basemetals:obsidian_stairs", - "basemetals:obsidian_wall", - "basemetals:double_obsidian_slab", - "basemetals:iron_button", - "basemetals:iron_slab", - "basemetals:iron_lever", - "basemetals:iron_stairs", - "basemetals:iron_wall", - "basemetals:double_iron_slab", - "basemetals:quartz_bars", - "basemetals:quartz_door", - "basemetals:quartz_trapdoor", - "basemetals:quartz_button", - "basemetals:quartz_lever", - "basemetals:quartz_pressure_plate", - "basemetals:quartz_wall", - "basemetals:gold_plate", - "basemetals:iron_plate", - "basemetals:adamantine", - "basemetals:antimony", - "basemetals:aquarium", - "basemetals:bismuth", - "basemetals:brass", - "basemetals:bronze", - "basemetals:coldiron", - "basemetals:copper", - "basemetals:cupronickel", - "basemetals:electrum", - "basemetals:invar", - "basemetals:lead", - "basemetals:mercury", - "basemetals:mithril", - "basemetals:nickel", - "basemetals:pewter", - "basemetals:platinum", - "basemetals:silver", - "basemetals:starsteel", - "basemetals:steel", - "basemetals:tin", - "basemetals:zinc", - "basemetals:charcoal", - "basemetals:coal", - "basemetals:diamond", - "basemetals:emerald", - "basemetals:ender", - "basemetals:gold", - "basemetals:iron", - "basemetals:lapis", - "basemetals:obsidian", - "basemetals:prismarine", - "basemetals:quartz", - "basemetals:wood", - "basemetals:redstone", - "basemetals:stone" + "basemetals:stone_anvil" ], "entities": [ "basemetals:custom_arrow", @@ -424,1150 +421,1106 @@ "basemetals:flowing_gold", "basemetals:iron", "basemetals:flowing_iron", - "basemetals:lapis", - "basemetals:flowing_lapis", "basemetals:obsidian", "basemetals:flowing_obsidian", "basemetals:prismarine", "basemetals:flowing_prismarine", "basemetals:quartz", "basemetals:flowing_quartz", - "basemetals:wood", - "basemetals:flowing_wood", "basemetals:redstone", - "basemetals:flowing_redstone", - "basemetals:stone", - "basemetals:flowing_stone" + "basemetals:flowing_redstone" ], "format": 1, "items": [ - "basemetals:adamantine_block", - "basemetals:adamantine_plate", + "basemetals:adamantine", + "basemetals:antimony", + "basemetals:aquarium", + "basemetals:bismuth", + "basemetals:brass", + "basemetals:bronze", + "basemetals:coldiron", + "basemetals:copper", + "basemetals:cupronickel", + "basemetals:electrum", + "basemetals:invar", + "basemetals:lead", + "basemetals:mercury", + "basemetals:mithril", + "basemetals:nickel", + "basemetals:pewter", + "basemetals:platinum", + "basemetals:silver", + "basemetals:starsteel", + "basemetals:steel", + "basemetals:tin", + "basemetals:zinc", + "basemetals:charcoal", + "basemetals:coal", + "basemetals:diamond", + "basemetals:emerald", + "basemetals:ender", + "basemetals:gold", + "basemetals:iron", + "basemetals:obsidian", + "basemetals:prismarine", + "basemetals:quartz", + "basemetals:redstone", + "basemetals:adamantine_anvil", + "basemetals:adamantine_arrow", + "basemetals:adamantine_axe", "basemetals:adamantine_bars", - "basemetals:adamantine_door", - "basemetals:adamantine_trapdoor", + "basemetals:adamantine_block", + "basemetals:adamantine_bolt", + "basemetals:adamantine_boots", + "basemetals:adamantine_bow", + "basemetals:adamantine_bucket", "basemetals:adamantine_button", - "basemetals:adamantine_slab", - "basemetals:adamantine_lever", - "basemetals:adamantine_pressure_plate", - "basemetals:adamantine_stairs", - "basemetals:adamantine_wall", - "basemetals:adamantine_ore", - "basemetals:adamantine_raw", + "basemetals:adamantine_casing", + "basemetals:adamantine_chestplate", + "basemetals:adamantine_crackhammer", + "basemetals:adamantine_crossbow", + "basemetals:adamantine_crushed", + "basemetals:adamantine_crushed_purified", + "basemetals:adamantine_dense_plate", + "basemetals:adamantine_door", + "basemetals:adamantine_fishing_rod", + "basemetals:adamantine_gear", + "basemetals:adamantine_helmet", + "basemetals:adamantine_hoe", + "basemetals:adamantine_horse_armor", "basemetals:adamantine_ingot", + "basemetals:adamantine_leggings", + "basemetals:adamantine_lever", "basemetals:adamantine_nugget", - "basemetals:adamantine_powder", - "basemetals:adamantine_smallpowder", + "basemetals:adamantine_ore", "basemetals:adamantine_pickaxe", - "basemetals:adamantine_axe", - "basemetals:adamantine_shovel", - "basemetals:adamantine_hoe", - "basemetals:adamantine_sword", - "basemetals:adamantine_crackhammer", + "basemetals:adamantine_plate", + "basemetals:adamantine_powder", + "basemetals:adamantine_pressure_plate", + "basemetals:adamantine_raw", + "basemetals:adamantine_rod", "basemetals:adamantine_scythe", "basemetals:adamantine_shears", - "basemetals:adamantine_fishing_rod", - "basemetals:adamantine_bow", - "basemetals:adamantine_crossbow", "basemetals:adamantine_shield", - "basemetals:adamantine_arrow", - "basemetals:adamantine_bolt", - "basemetals:adamantine_rod", - "basemetals:adamantine_gear", - "basemetals:adamantine_horse_armor", - "basemetals:adamantine_helmet", - "basemetals:adamantine_chestplate", - "basemetals:adamantine_leggings", - "basemetals:adamantine_boots", - "basemetals:adamantine_casing", - "basemetals:adamantine_dense_plate", - "basemetals:adamantine_crushed", - "basemetals:adamantine_crushed_purified", - "basemetals:adamantine_crystal", - "basemetals:adamantine_shard", - "basemetals:adamantine_clump", - "basemetals:adamantine_powder_dirty", + "basemetals:adamantine_shovel", + "basemetals:adamantine_slab", + "basemetals:adamantine_smallpowder", + "basemetals:adamantine_stairs", + "basemetals:adamantine_sword", + "basemetals:adamantine_trapdoor", + "basemetals:adamantine_wall", + "basemetals:antimony_arrow", + "basemetals:antimony_axe", + "basemetals:antimony_bars", "basemetals:antimony_block", - "basemetals:antimony_plate", - "basemetals:antimony_bars", - "basemetals:antimony_door", - "basemetals:antimony_trapdoor", + "basemetals:antimony_bolt", + "basemetals:antimony_boots", + "basemetals:antimony_bow", + "basemetals:antimony_bucket", "basemetals:antimony_button", - "basemetals:antimony_slab", - "basemetals:antimony_lever", - "basemetals:antimony_pressure_plate", - "basemetals:antimony_stairs", - "basemetals:antimony_wall", - "basemetals:antimony_ore", - "basemetals:antimony_raw", + "basemetals:antimony_casing", + "basemetals:antimony_chestplate", + "basemetals:antimony_crackhammer", + "basemetals:antimony_crossbow", + "basemetals:antimony_crushed", + "basemetals:antimony_crushed_purified", + "basemetals:antimony_dense_plate", + "basemetals:antimony_door", + "basemetals:antimony_fishing_rod", + "basemetals:antimony_gear", + "basemetals:antimony_helmet", + "basemetals:antimony_hoe", + "basemetals:antimony_horse_armor", "basemetals:antimony_ingot", + "basemetals:antimony_leggings", + "basemetals:antimony_lever", "basemetals:antimony_nugget", - "basemetals:antimony_powder", - "basemetals:antimony_smallpowder", + "basemetals:antimony_ore", "basemetals:antimony_pickaxe", - "basemetals:antimony_axe", - "basemetals:antimony_shovel", - "basemetals:antimony_hoe", - "basemetals:antimony_sword", - "basemetals:antimony_crackhammer", + "basemetals:antimony_plate", + "basemetals:antimony_powder", + "basemetals:antimony_pressure_plate", + "basemetals:antimony_raw", + "basemetals:antimony_rod", "basemetals:antimony_scythe", "basemetals:antimony_shears", - "basemetals:antimony_fishing_rod", - "basemetals:antimony_bow", - "basemetals:antimony_crossbow", "basemetals:antimony_shield", - "basemetals:antimony_arrow", - "basemetals:antimony_bolt", - "basemetals:antimony_rod", - "basemetals:antimony_gear", - "basemetals:antimony_horse_armor", - "basemetals:antimony_helmet", - "basemetals:antimony_chestplate", - "basemetals:antimony_leggings", - "basemetals:antimony_boots", - "basemetals:antimony_casing", - "basemetals:antimony_dense_plate", - "basemetals:antimony_crushed", - "basemetals:antimony_crushed_purified", - "basemetals:antimony_crystal", - "basemetals:antimony_shard", - "basemetals:antimony_clump", - "basemetals:antimony_powder_dirty", - "basemetals:aquarium_block", - "basemetals:aquarium_plate", + "basemetals:antimony_shovel", + "basemetals:antimony_slab", + "basemetals:antimony_smallpowder", + "basemetals:antimony_stairs", + "basemetals:antimony_sword", + "basemetals:antimony_trapdoor", + "basemetals:antimony_wall", + "basemetals:aquarium_arrow", + "basemetals:aquarium_axe", "basemetals:aquarium_bars", - "basemetals:aquarium_door", - "basemetals:aquarium_trapdoor", + "basemetals:aquarium_blend", + "basemetals:aquarium_block", + "basemetals:aquarium_bolt", + "basemetals:aquarium_boots", + "basemetals:aquarium_bow", + "basemetals:aquarium_bucket", "basemetals:aquarium_button", - "basemetals:aquarium_slab", - "basemetals:aquarium_lever", - "basemetals:aquarium_pressure_plate", - "basemetals:aquarium_stairs", - "basemetals:aquarium_wall", + "basemetals:aquarium_chestplate", + "basemetals:aquarium_crackhammer", + "basemetals:aquarium_crossbow", + "basemetals:aquarium_door", + "basemetals:aquarium_fishing_rod", + "basemetals:aquarium_gear", + "basemetals:aquarium_helmet", + "basemetals:aquarium_hoe", + "basemetals:aquarium_horse_armor", "basemetals:aquarium_ingot", + "basemetals:aquarium_leggings", + "basemetals:aquarium_lever", "basemetals:aquarium_nugget", - "basemetals:aquarium_powder", - "basemetals:aquarium_smallpowder", - "basemetals:aquarium_blend", - "basemetals:aquarium_smallblend", "basemetals:aquarium_pickaxe", - "basemetals:aquarium_axe", - "basemetals:aquarium_shovel", - "basemetals:aquarium_hoe", - "basemetals:aquarium_sword", - "basemetals:aquarium_crackhammer", + "basemetals:aquarium_plate", + "basemetals:aquarium_powder", + "basemetals:aquarium_pressure_plate", + "basemetals:aquarium_rod", "basemetals:aquarium_scythe", "basemetals:aquarium_shears", - "basemetals:aquarium_fishing_rod", - "basemetals:aquarium_bow", - "basemetals:aquarium_crossbow", "basemetals:aquarium_shield", - "basemetals:aquarium_arrow", - "basemetals:aquarium_bolt", - "basemetals:aquarium_rod", - "basemetals:aquarium_gear", - "basemetals:aquarium_horse_armor", - "basemetals:aquarium_helmet", - "basemetals:aquarium_chestplate", - "basemetals:aquarium_leggings", - "basemetals:aquarium_boots", - "basemetals:bismuth_block", - "basemetals:bismuth_plate", + "basemetals:aquarium_shovel", + "basemetals:aquarium_slab", + "basemetals:aquarium_smallblend", + "basemetals:aquarium_smallpowder", + "basemetals:aquarium_stairs", + "basemetals:aquarium_sword", + "basemetals:aquarium_trapdoor", + "basemetals:aquarium_wall", + "basemetals:bismuth_arrow", + "basemetals:bismuth_axe", "basemetals:bismuth_bars", - "basemetals:bismuth_door", - "basemetals:bismuth_trapdoor", + "basemetals:bismuth_block", + "basemetals:bismuth_bolt", + "basemetals:bismuth_boots", + "basemetals:bismuth_bow", + "basemetals:bismuth_bucket", "basemetals:bismuth_button", - "basemetals:bismuth_slab", - "basemetals:bismuth_lever", - "basemetals:bismuth_pressure_plate", - "basemetals:bismuth_stairs", - "basemetals:bismuth_wall", - "basemetals:bismuth_ore", - "basemetals:bismuth_raw", + "basemetals:bismuth_casing", + "basemetals:bismuth_chestplate", + "basemetals:bismuth_crackhammer", + "basemetals:bismuth_crossbow", + "basemetals:bismuth_crushed", + "basemetals:bismuth_crushed_purified", + "basemetals:bismuth_dense_plate", + "basemetals:bismuth_door", + "basemetals:bismuth_fishing_rod", + "basemetals:bismuth_gear", + "basemetals:bismuth_helmet", + "basemetals:bismuth_hoe", + "basemetals:bismuth_horse_armor", "basemetals:bismuth_ingot", + "basemetals:bismuth_leggings", + "basemetals:bismuth_lever", "basemetals:bismuth_nugget", - "basemetals:bismuth_powder", - "basemetals:bismuth_smallpowder", + "basemetals:bismuth_ore", "basemetals:bismuth_pickaxe", - "basemetals:bismuth_axe", - "basemetals:bismuth_shovel", - "basemetals:bismuth_hoe", - "basemetals:bismuth_sword", - "basemetals:bismuth_crackhammer", + "basemetals:bismuth_plate", + "basemetals:bismuth_powder", + "basemetals:bismuth_pressure_plate", + "basemetals:bismuth_raw", + "basemetals:bismuth_rod", "basemetals:bismuth_scythe", "basemetals:bismuth_shears", - "basemetals:bismuth_fishing_rod", - "basemetals:bismuth_bow", - "basemetals:bismuth_crossbow", "basemetals:bismuth_shield", - "basemetals:bismuth_arrow", - "basemetals:bismuth_bolt", - "basemetals:bismuth_rod", - "basemetals:bismuth_gear", - "basemetals:bismuth_horse_armor", - "basemetals:bismuth_helmet", - "basemetals:bismuth_chestplate", - "basemetals:bismuth_leggings", - "basemetals:bismuth_boots", - "basemetals:bismuth_casing", - "basemetals:bismuth_dense_plate", - "basemetals:bismuth_crushed", - "basemetals:bismuth_crushed_purified", - "basemetals:bismuth_crystal", - "basemetals:bismuth_shard", - "basemetals:bismuth_clump", - "basemetals:bismuth_powder_dirty", - "basemetals:brass_block", - "basemetals:brass_plate", + "basemetals:bismuth_shovel", + "basemetals:bismuth_slab", + "basemetals:bismuth_smallpowder", + "basemetals:bismuth_stairs", + "basemetals:bismuth_sword", + "basemetals:bismuth_trapdoor", + "basemetals:bismuth_wall", + "basemetals:brass_arrow", + "basemetals:brass_axe", "basemetals:brass_bars", - "basemetals:brass_door", - "basemetals:brass_trapdoor", + "basemetals:brass_blend", + "basemetals:brass_block", + "basemetals:brass_bolt", + "basemetals:brass_boots", + "basemetals:brass_bow", + "basemetals:brass_bucket", "basemetals:brass_button", - "basemetals:brass_slab", - "basemetals:brass_lever", - "basemetals:brass_pressure_plate", - "basemetals:brass_stairs", - "basemetals:brass_wall", + "basemetals:brass_chestplate", + "basemetals:brass_crackhammer", + "basemetals:brass_crossbow", + "basemetals:brass_door", + "basemetals:brass_fishing_rod", + "basemetals:brass_gear", + "basemetals:brass_helmet", + "basemetals:brass_hoe", + "basemetals:brass_horse_armor", "basemetals:brass_ingot", + "basemetals:brass_leggings", + "basemetals:brass_lever", "basemetals:brass_nugget", - "basemetals:brass_powder", - "basemetals:brass_smallpowder", - "basemetals:brass_blend", - "basemetals:brass_smallblend", "basemetals:brass_pickaxe", - "basemetals:brass_axe", - "basemetals:brass_shovel", - "basemetals:brass_hoe", - "basemetals:brass_sword", - "basemetals:brass_crackhammer", + "basemetals:brass_plate", + "basemetals:brass_powder", + "basemetals:brass_pressure_plate", + "basemetals:brass_rod", "basemetals:brass_scythe", "basemetals:brass_shears", - "basemetals:brass_fishing_rod", - "basemetals:brass_bow", - "basemetals:brass_crossbow", "basemetals:brass_shield", - "basemetals:brass_arrow", - "basemetals:brass_bolt", - "basemetals:brass_rod", - "basemetals:brass_gear", - "basemetals:brass_horse_armor", - "basemetals:brass_helmet", - "basemetals:brass_chestplate", - "basemetals:brass_leggings", - "basemetals:brass_boots", - "basemetals:bronze_block", - "basemetals:bronze_plate", - "basemetals:bronze_bars", - "basemetals:bronze_door", - "basemetals:bronze_trapdoor", - "basemetals:bronze_button", - "basemetals:bronze_slab", - "basemetals:bronze_lever", - "basemetals:bronze_pressure_plate", - "basemetals:bronze_stairs", - "basemetals:bronze_wall", - "basemetals:bronze_ingot", - "basemetals:bronze_nugget", - "basemetals:bronze_powder", - "basemetals:bronze_smallpowder", - "basemetals:bronze_blend", - "basemetals:bronze_smallblend", - "basemetals:bronze_pickaxe", + "basemetals:brass_shovel", + "basemetals:brass_slab", + "basemetals:brass_smallblend", + "basemetals:brass_smallpowder", + "basemetals:brass_stairs", + "basemetals:brass_sword", + "basemetals:brass_trapdoor", + "basemetals:brass_wall", + "basemetals:bronze_arrow", "basemetals:bronze_axe", - "basemetals:bronze_shovel", - "basemetals:bronze_hoe", - "basemetals:bronze_sword", - "basemetals:bronze_crackhammer", - "basemetals:bronze_scythe", - "basemetals:bronze_shears", - "basemetals:bronze_fishing_rod", + "basemetals:bronze_bars", + "basemetals:bronze_blend", + "basemetals:bronze_block", + "basemetals:bronze_bolt", + "basemetals:bronze_boots", "basemetals:bronze_bow", + "basemetals:bronze_bucket", + "basemetals:bronze_button", + "basemetals:bronze_chestplate", + "basemetals:bronze_crackhammer", "basemetals:bronze_crossbow", - "basemetals:bronze_shield", - "basemetals:bronze_arrow", - "basemetals:bronze_bolt", - "basemetals:bronze_rod", + "basemetals:bronze_door", + "basemetals:bronze_fishing_rod", "basemetals:bronze_gear", - "basemetals:bronze_horse_armor", "basemetals:bronze_helmet", - "basemetals:bronze_chestplate", + "basemetals:bronze_hoe", + "basemetals:bronze_horse_armor", + "basemetals:bronze_ingot", "basemetals:bronze_leggings", - "basemetals:bronze_boots", - "basemetals:coldiron_block", - "basemetals:coldiron_plate", + "basemetals:bronze_lever", + "basemetals:bronze_nugget", + "basemetals:bronze_pickaxe", + "basemetals:bronze_plate", + "basemetals:bronze_powder", + "basemetals:bronze_pressure_plate", + "basemetals:bronze_rod", + "basemetals:bronze_scythe", + "basemetals:bronze_shears", + "basemetals:bronze_shield", + "basemetals:bronze_shovel", + "basemetals:bronze_slab", + "basemetals:bronze_smallblend", + "basemetals:bronze_smallpowder", + "basemetals:bronze_stairs", + "basemetals:bronze_sword", + "basemetals:bronze_trapdoor", + "basemetals:bronze_wall", + "basemetals:charcoal_block", + "basemetals:charcoal_bucket", + "basemetals:charcoal_nugget", + "basemetals:charcoal_powder", + "basemetals:charcoal_smallpowder", + "basemetals:coal_bucket", + "basemetals:coal_nugget", + "basemetals:coal_powder", + "basemetals:coal_smallpowder", + "basemetals:coldiron_arrow", + "basemetals:coldiron_axe", "basemetals:coldiron_bars", - "basemetals:coldiron_door", - "basemetals:coldiron_trapdoor", + "basemetals:coldiron_block", + "basemetals:coldiron_bolt", + "basemetals:coldiron_boots", + "basemetals:coldiron_bow", + "basemetals:coldiron_bucket", "basemetals:coldiron_button", - "basemetals:coldiron_slab", - "basemetals:coldiron_lever", - "basemetals:coldiron_pressure_plate", - "basemetals:coldiron_stairs", - "basemetals:coldiron_wall", - "basemetals:coldiron_ore", - "basemetals:coldiron_raw", + "basemetals:coldiron_casing", + "basemetals:coldiron_chestplate", + "basemetals:coldiron_crackhammer", + "basemetals:coldiron_crossbow", + "basemetals:coldiron_crushed", + "basemetals:coldiron_crushed_purified", + "basemetals:coldiron_dense_plate", + "basemetals:coldiron_door", + "basemetals:coldiron_fishing_rod", + "basemetals:coldiron_gear", + "basemetals:coldiron_helmet", + "basemetals:coldiron_hoe", + "basemetals:coldiron_horse_armor", "basemetals:coldiron_ingot", + "basemetals:coldiron_leggings", + "basemetals:coldiron_lever", "basemetals:coldiron_nugget", - "basemetals:coldiron_powder", - "basemetals:coldiron_smallpowder", + "basemetals:coldiron_ore", "basemetals:coldiron_pickaxe", - "basemetals:coldiron_axe", - "basemetals:coldiron_shovel", - "basemetals:coldiron_hoe", - "basemetals:coldiron_sword", - "basemetals:coldiron_crackhammer", + "basemetals:coldiron_plate", + "basemetals:coldiron_powder", + "basemetals:coldiron_pressure_plate", + "basemetals:coldiron_raw", + "basemetals:coldiron_rod", "basemetals:coldiron_scythe", "basemetals:coldiron_shears", - "basemetals:coldiron_fishing_rod", - "basemetals:coldiron_bow", - "basemetals:coldiron_crossbow", "basemetals:coldiron_shield", - "basemetals:coldiron_arrow", - "basemetals:coldiron_bolt", - "basemetals:coldiron_rod", - "basemetals:coldiron_gear", - "basemetals:coldiron_horse_armor", - "basemetals:coldiron_helmet", - "basemetals:coldiron_chestplate", - "basemetals:coldiron_leggings", - "basemetals:coldiron_boots", - "basemetals:coldiron_casing", - "basemetals:coldiron_dense_plate", - "basemetals:coldiron_crushed", - "basemetals:coldiron_crushed_purified", - "basemetals:coldiron_crystal", - "basemetals:coldiron_shard", - "basemetals:coldiron_clump", - "basemetals:coldiron_powder_dirty", - "basemetals:copper_block", - "basemetals:copper_plate", + "basemetals:coldiron_shovel", + "basemetals:coldiron_slab", + "basemetals:coldiron_smallpowder", + "basemetals:coldiron_stairs", + "basemetals:coldiron_sword", + "basemetals:coldiron_trapdoor", + "basemetals:coldiron_wall", + "basemetals:copper_arrow", + "basemetals:copper_axe", "basemetals:copper_bars", - "basemetals:copper_door", - "basemetals:copper_trapdoor", + "basemetals:copper_block", + "basemetals:copper_bolt", + "basemetals:copper_boots", + "basemetals:copper_bow", + "basemetals:copper_bucket", "basemetals:copper_button", - "basemetals:copper_slab", - "basemetals:copper_lever", - "basemetals:copper_pressure_plate", - "basemetals:copper_stairs", - "basemetals:copper_wall", - "basemetals:copper_ore", + "basemetals:copper_chestplate", + "basemetals:copper_crackhammer", + "basemetals:copper_crossbow", + "basemetals:copper_door", + "basemetals:copper_fishing_rod", + "basemetals:copper_gear", + "basemetals:copper_helmet", + "basemetals:copper_hoe", + "basemetals:copper_horse_armor", "basemetals:copper_ingot", + "basemetals:copper_leggings", + "basemetals:copper_lever", "basemetals:copper_nugget", - "basemetals:copper_powder", - "basemetals:copper_smallpowder", + "basemetals:copper_ore", "basemetals:copper_pickaxe", - "basemetals:copper_axe", - "basemetals:copper_shovel", - "basemetals:copper_hoe", - "basemetals:copper_sword", - "basemetals:copper_crackhammer", + "basemetals:copper_plate", + "basemetals:copper_powder", + "basemetals:copper_pressure_plate", + "basemetals:copper_rod", "basemetals:copper_scythe", "basemetals:copper_shears", - "basemetals:copper_fishing_rod", - "basemetals:copper_bow", - "basemetals:copper_crossbow", "basemetals:copper_shield", - "basemetals:copper_arrow", - "basemetals:copper_bolt", - "basemetals:copper_rod", - "basemetals:copper_gear", - "basemetals:copper_horse_armor", - "basemetals:copper_helmet", - "basemetals:copper_chestplate", - "basemetals:copper_leggings", - "basemetals:copper_boots", - "basemetals:cupronickel_block", - "basemetals:cupronickel_plate", + "basemetals:copper_shovel", + "basemetals:copper_slab", + "basemetals:copper_smallpowder", + "basemetals:copper_stairs", + "basemetals:copper_sword", + "basemetals:copper_trapdoor", + "basemetals:copper_wall", + "basemetals:cupronickel_arrow", + "basemetals:cupronickel_axe", "basemetals:cupronickel_bars", - "basemetals:cupronickel_door", - "basemetals:cupronickel_trapdoor", + "basemetals:cupronickel_blend", + "basemetals:cupronickel_block", + "basemetals:cupronickel_bolt", + "basemetals:cupronickel_boots", + "basemetals:cupronickel_bow", + "basemetals:cupronickel_bucket", "basemetals:cupronickel_button", - "basemetals:cupronickel_slab", - "basemetals:cupronickel_lever", - "basemetals:cupronickel_pressure_plate", - "basemetals:cupronickel_stairs", - "basemetals:cupronickel_wall", + "basemetals:cupronickel_chestplate", + "basemetals:cupronickel_crackhammer", + "basemetals:cupronickel_crossbow", + "basemetals:cupronickel_door", + "basemetals:cupronickel_fishing_rod", + "basemetals:cupronickel_gear", + "basemetals:cupronickel_helmet", + "basemetals:cupronickel_hoe", + "basemetals:cupronickel_horse_armor", "basemetals:cupronickel_ingot", + "basemetals:cupronickel_leggings", + "basemetals:cupronickel_lever", "basemetals:cupronickel_nugget", - "basemetals:cupronickel_powder", - "basemetals:cupronickel_smallpowder", - "basemetals:cupronickel_blend", - "basemetals:cupronickel_smallblend", "basemetals:cupronickel_pickaxe", - "basemetals:cupronickel_axe", - "basemetals:cupronickel_shovel", - "basemetals:cupronickel_hoe", - "basemetals:cupronickel_sword", - "basemetals:cupronickel_crackhammer", + "basemetals:cupronickel_plate", + "basemetals:cupronickel_powder", + "basemetals:cupronickel_pressure_plate", + "basemetals:cupronickel_rod", "basemetals:cupronickel_scythe", "basemetals:cupronickel_shears", - "basemetals:cupronickel_fishing_rod", - "basemetals:cupronickel_bow", - "basemetals:cupronickel_crossbow", "basemetals:cupronickel_shield", - "basemetals:cupronickel_arrow", - "basemetals:cupronickel_bolt", - "basemetals:cupronickel_rod", - "basemetals:cupronickel_gear", - "basemetals:cupronickel_horse_armor", - "basemetals:cupronickel_helmet", - "basemetals:cupronickel_chestplate", - "basemetals:cupronickel_leggings", - "basemetals:cupronickel_boots", - "basemetals:electrum_block", - "basemetals:electrum_plate", + "basemetals:cupronickel_shovel", + "basemetals:cupronickel_slab", + "basemetals:cupronickel_smallblend", + "basemetals:cupronickel_smallpowder", + "basemetals:cupronickel_stairs", + "basemetals:cupronickel_sword", + "basemetals:cupronickel_trapdoor", + "basemetals:cupronickel_wall", + "basemetals:diamond_arrow", + "basemetals:diamond_bars", + "basemetals:diamond_blend", + "basemetals:diamond_bolt", + "basemetals:diamond_bow", + "basemetals:diamond_bucket", + "basemetals:diamond_button", + "basemetals:diamond_crackhammer", + "basemetals:diamond_crossbow", + "basemetals:diamond_door", + "basemetals:diamond_fishing_rod", + "basemetals:diamond_gear", + "basemetals:diamond_lever", + "basemetals:diamond_nugget", + "basemetals:diamond_powder", + "basemetals:diamond_pressure_plate", + "basemetals:diamond_rod", + "basemetals:diamond_scythe", + "basemetals:diamond_shears", + "basemetals:diamond_shield", + "basemetals:diamond_slab", + "basemetals:diamond_smallblend", + "basemetals:diamond_smallpowder", + "basemetals:diamond_stairs", + "basemetals:diamond_trapdoor", + "basemetals:diamond_wall", + "basemetals:electrum_arrow", + "basemetals:electrum_axe", "basemetals:electrum_bars", - "basemetals:electrum_door", - "basemetals:electrum_trapdoor", + "basemetals:electrum_blend", + "basemetals:electrum_block", + "basemetals:electrum_bolt", + "basemetals:electrum_boots", + "basemetals:electrum_bow", + "basemetals:electrum_bucket", "basemetals:electrum_button", - "basemetals:electrum_slab", - "basemetals:electrum_lever", - "basemetals:electrum_pressure_plate", - "basemetals:electrum_stairs", - "basemetals:electrum_wall", + "basemetals:electrum_chestplate", + "basemetals:electrum_crackhammer", + "basemetals:electrum_crossbow", + "basemetals:electrum_door", + "basemetals:electrum_fishing_rod", + "basemetals:electrum_gear", + "basemetals:electrum_helmet", + "basemetals:electrum_hoe", + "basemetals:electrum_horse_armor", "basemetals:electrum_ingot", + "basemetals:electrum_leggings", + "basemetals:electrum_lever", "basemetals:electrum_nugget", - "basemetals:electrum_powder", - "basemetals:electrum_smallpowder", - "basemetals:electrum_blend", - "basemetals:electrum_smallblend", "basemetals:electrum_pickaxe", - "basemetals:electrum_axe", - "basemetals:electrum_shovel", - "basemetals:electrum_hoe", - "basemetals:electrum_sword", - "basemetals:electrum_crackhammer", + "basemetals:electrum_plate", + "basemetals:electrum_powder", + "basemetals:electrum_pressure_plate", + "basemetals:electrum_rod", "basemetals:electrum_scythe", "basemetals:electrum_shears", - "basemetals:electrum_fishing_rod", - "basemetals:electrum_bow", - "basemetals:electrum_crossbow", "basemetals:electrum_shield", - "basemetals:electrum_arrow", - "basemetals:electrum_bolt", - "basemetals:electrum_rod", - "basemetals:electrum_gear", - "basemetals:electrum_horse_armor", - "basemetals:electrum_helmet", - "basemetals:electrum_chestplate", - "basemetals:electrum_leggings", - "basemetals:electrum_boots", - "basemetals:invar_block", - "basemetals:invar_plate", + "basemetals:electrum_shovel", + "basemetals:electrum_slab", + "basemetals:electrum_smallblend", + "basemetals:electrum_smallpowder", + "basemetals:electrum_stairs", + "basemetals:electrum_sword", + "basemetals:electrum_trapdoor", + "basemetals:electrum_wall", + "basemetals:emerald_arrow", + "basemetals:emerald_axe", + "basemetals:emerald_bars", + "basemetals:emerald_bolt", + "basemetals:emerald_boots", + "basemetals:emerald_bow", + "basemetals:emerald_bucket", + "basemetals:emerald_button", + "basemetals:emerald_chestplate", + "basemetals:emerald_crackhammer", + "basemetals:emerald_crossbow", + "basemetals:emerald_door", + "basemetals:emerald_fishing_rod", + "basemetals:emerald_gear", + "basemetals:emerald_helmet", + "basemetals:emerald_hoe", + "basemetals:emerald_horse_armor", + "basemetals:emerald_leggings", + "basemetals:emerald_lever", + "basemetals:emerald_nugget", + "basemetals:emerald_pickaxe", + "basemetals:emerald_powder", + "basemetals:emerald_pressure_plate", + "basemetals:emerald_rod", + "basemetals:emerald_scythe", + "basemetals:emerald_shears", + "basemetals:emerald_shield", + "basemetals:emerald_shovel", + "basemetals:emerald_slab", + "basemetals:emerald_smallpowder", + "basemetals:emerald_stairs", + "basemetals:emerald_sword", + "basemetals:emerald_trapdoor", + "basemetals:emerald_wall", + "basemetals:ender_bucket", + "basemetals:gold_arrow", + "basemetals:gold_bars", + "basemetals:gold_blend", + "basemetals:gold_bolt", + "basemetals:gold_bow", + "basemetals:gold_bucket", + "basemetals:gold_button", + "basemetals:gold_crackhammer", + "basemetals:gold_crossbow", + "basemetals:gold_door", + "basemetals:gold_fishing_rod", + "basemetals:gold_gear", + "basemetals:gold_lever", + "basemetals:gold_plate", + "basemetals:gold_powder", + "basemetals:gold_rod", + "basemetals:gold_scythe", + "basemetals:gold_shears", + "basemetals:gold_shield", + "basemetals:gold_slab", + "basemetals:gold_smallblend", + "basemetals:gold_smallpowder", + "basemetals:gold_stairs", + "basemetals:gold_trapdoor", + "basemetals:gold_wall", + "basemetals:invar_arrow", + "basemetals:invar_axe", "basemetals:invar_bars", - "basemetals:invar_door", - "basemetals:invar_trapdoor", + "basemetals:invar_blend", + "basemetals:invar_block", + "basemetals:invar_bolt", + "basemetals:invar_boots", + "basemetals:invar_bow", + "basemetals:invar_bucket", "basemetals:invar_button", - "basemetals:invar_slab", - "basemetals:invar_lever", - "basemetals:invar_pressure_plate", - "basemetals:invar_stairs", - "basemetals:invar_wall", + "basemetals:invar_chestplate", + "basemetals:invar_crackhammer", + "basemetals:invar_crossbow", + "basemetals:invar_door", + "basemetals:invar_fishing_rod", + "basemetals:invar_gear", + "basemetals:invar_helmet", + "basemetals:invar_hoe", + "basemetals:invar_horse_armor", "basemetals:invar_ingot", + "basemetals:invar_leggings", + "basemetals:invar_lever", "basemetals:invar_nugget", - "basemetals:invar_powder", - "basemetals:invar_smallpowder", - "basemetals:invar_blend", - "basemetals:invar_smallblend", "basemetals:invar_pickaxe", - "basemetals:invar_axe", - "basemetals:invar_shovel", - "basemetals:invar_hoe", - "basemetals:invar_sword", - "basemetals:invar_crackhammer", + "basemetals:invar_plate", + "basemetals:invar_powder", + "basemetals:invar_pressure_plate", + "basemetals:invar_rod", "basemetals:invar_scythe", "basemetals:invar_shears", - "basemetals:invar_fishing_rod", - "basemetals:invar_bow", - "basemetals:invar_crossbow", "basemetals:invar_shield", - "basemetals:invar_arrow", - "basemetals:invar_bolt", - "basemetals:invar_rod", - "basemetals:invar_gear", - "basemetals:invar_horse_armor", - "basemetals:invar_helmet", - "basemetals:invar_chestplate", - "basemetals:invar_leggings", - "basemetals:invar_boots", - "basemetals:lead_block", - "basemetals:lead_plate", + "basemetals:invar_shovel", + "basemetals:invar_slab", + "basemetals:invar_smallblend", + "basemetals:invar_smallpowder", + "basemetals:invar_stairs", + "basemetals:invar_sword", + "basemetals:invar_trapdoor", + "basemetals:invar_wall", + "basemetals:iron_arrow", + "basemetals:iron_blend", + "basemetals:iron_bolt", + "basemetals:iron_bow", + "basemetals:iron_bucket", + "basemetals:iron_button", + "basemetals:iron_crackhammer", + "basemetals:iron_crossbow", + "basemetals:iron_fishing_rod", + "basemetals:iron_gear", + "basemetals:iron_lever", + "basemetals:iron_plate", + "basemetals:iron_powder", + "basemetals:iron_rod", + "basemetals:iron_scythe", + "basemetals:iron_shield", + "basemetals:iron_slab", + "basemetals:iron_smallblend", + "basemetals:iron_smallpowder", + "basemetals:iron_stairs", + "basemetals:iron_wall", + "basemetals:lapis_smallpowder", + "basemetals:lead_arrow", + "basemetals:lead_axe", "basemetals:lead_bars", - "basemetals:lead_door", - "basemetals:lead_trapdoor", + "basemetals:lead_block", + "basemetals:lead_bolt", + "basemetals:lead_boots", + "basemetals:lead_bow", + "basemetals:lead_bucket", "basemetals:lead_button", - "basemetals:lead_slab", - "basemetals:lead_lever", - "basemetals:lead_pressure_plate", - "basemetals:lead_stairs", - "basemetals:lead_wall", - "basemetals:lead_ore", - "basemetals:lead_raw", + "basemetals:lead_chestplate", + "basemetals:lead_crackhammer", + "basemetals:lead_crossbow", + "basemetals:lead_door", + "basemetals:lead_fishing_rod", + "basemetals:lead_gear", + "basemetals:lead_helmet", + "basemetals:lead_hoe", + "basemetals:lead_horse_armor", "basemetals:lead_ingot", + "basemetals:lead_leggings", + "basemetals:lead_lever", "basemetals:lead_nugget", - "basemetals:lead_powder", - "basemetals:lead_smallpowder", + "basemetals:lead_ore", "basemetals:lead_pickaxe", - "basemetals:lead_axe", - "basemetals:lead_shovel", - "basemetals:lead_hoe", - "basemetals:lead_sword", - "basemetals:lead_crackhammer", + "basemetals:lead_plate", + "basemetals:lead_powder", + "basemetals:lead_pressure_plate", + "basemetals:lead_raw", + "basemetals:lead_rod", "basemetals:lead_scythe", "basemetals:lead_shears", - "basemetals:lead_fishing_rod", - "basemetals:lead_bow", - "basemetals:lead_crossbow", "basemetals:lead_shield", - "basemetals:lead_arrow", - "basemetals:lead_bolt", - "basemetals:lead_rod", - "basemetals:lead_gear", - "basemetals:lead_horse_armor", - "basemetals:lead_helmet", - "basemetals:lead_chestplate", - "basemetals:lead_leggings", - "basemetals:lead_boots", - "basemetals:mercury_ore", - "basemetals:mercury_raw", + "basemetals:lead_shovel", + "basemetals:lead_slab", + "basemetals:lead_smallpowder", + "basemetals:lead_stairs", + "basemetals:lead_sword", + "basemetals:lead_trapdoor", + "basemetals:lead_wall", + "basemetals:mercury_bucket", "basemetals:mercury_ingot", "basemetals:mercury_nugget", + "basemetals:mercury_ore", "basemetals:mercury_powder", + "basemetals:mercury_raw", "basemetals:mercury_smallpowder", - "basemetals:mithril_block", - "basemetals:mithril_plate", + "basemetals:mithril_arrow", + "basemetals:mithril_axe", "basemetals:mithril_bars", - "basemetals:mithril_door", - "basemetals:mithril_trapdoor", + "basemetals:mithril_blend", + "basemetals:mithril_block", + "basemetals:mithril_bolt", + "basemetals:mithril_boots", + "basemetals:mithril_bow", + "basemetals:mithril_bucket", "basemetals:mithril_button", - "basemetals:mithril_slab", - "basemetals:mithril_lever", - "basemetals:mithril_pressure_plate", - "basemetals:mithril_stairs", - "basemetals:mithril_wall", + "basemetals:mithril_chestplate", + "basemetals:mithril_crackhammer", + "basemetals:mithril_crossbow", + "basemetals:mithril_door", + "basemetals:mithril_fishing_rod", + "basemetals:mithril_gear", + "basemetals:mithril_helmet", + "basemetals:mithril_hoe", + "basemetals:mithril_horse_armor", "basemetals:mithril_ingot", + "basemetals:mithril_leggings", + "basemetals:mithril_lever", "basemetals:mithril_nugget", - "basemetals:mithril_powder", - "basemetals:mithril_smallpowder", - "basemetals:mithril_blend", - "basemetals:mithril_smallblend", "basemetals:mithril_pickaxe", - "basemetals:mithril_axe", - "basemetals:mithril_shovel", - "basemetals:mithril_hoe", - "basemetals:mithril_sword", - "basemetals:mithril_crackhammer", + "basemetals:mithril_plate", + "basemetals:mithril_powder", + "basemetals:mithril_pressure_plate", + "basemetals:mithril_rod", "basemetals:mithril_scythe", "basemetals:mithril_shears", - "basemetals:mithril_fishing_rod", - "basemetals:mithril_bow", - "basemetals:mithril_crossbow", "basemetals:mithril_shield", - "basemetals:mithril_arrow", - "basemetals:mithril_bolt", - "basemetals:mithril_rod", - "basemetals:mithril_gear", - "basemetals:mithril_horse_armor", - "basemetals:mithril_helmet", - "basemetals:mithril_chestplate", - "basemetals:mithril_leggings", - "basemetals:mithril_boots", - "basemetals:nickel_block", - "basemetals:nickel_plate", + "basemetals:mithril_shovel", + "basemetals:mithril_slab", + "basemetals:mithril_smallblend", + "basemetals:mithril_smallpowder", + "basemetals:mithril_stairs", + "basemetals:mithril_sword", + "basemetals:mithril_trapdoor", + "basemetals:mithril_wall", + "basemetals:nickel_arrow", + "basemetals:nickel_axe", "basemetals:nickel_bars", - "basemetals:nickel_door", - "basemetals:nickel_trapdoor", + "basemetals:nickel_block", + "basemetals:nickel_bolt", + "basemetals:nickel_boots", + "basemetals:nickel_bow", + "basemetals:nickel_bucket", "basemetals:nickel_button", - "basemetals:nickel_slab", - "basemetals:nickel_lever", - "basemetals:nickel_pressure_plate", - "basemetals:nickel_stairs", - "basemetals:nickel_wall", - "basemetals:nickel_ore", - "basemetals:nickel_raw", + "basemetals:nickel_casing", + "basemetals:nickel_chestplate", + "basemetals:nickel_crackhammer", + "basemetals:nickel_crossbow", + "basemetals:nickel_crushed", + "basemetals:nickel_crushed_purified", + "basemetals:nickel_dense_plate", + "basemetals:nickel_door", + "basemetals:nickel_fishing_rod", + "basemetals:nickel_gear", + "basemetals:nickel_helmet", + "basemetals:nickel_hoe", + "basemetals:nickel_horse_armor", "basemetals:nickel_ingot", + "basemetals:nickel_leggings", + "basemetals:nickel_lever", "basemetals:nickel_nugget", - "basemetals:nickel_powder", - "basemetals:nickel_smallpowder", + "basemetals:nickel_ore", "basemetals:nickel_pickaxe", - "basemetals:nickel_axe", - "basemetals:nickel_shovel", - "basemetals:nickel_hoe", - "basemetals:nickel_sword", - "basemetals:nickel_crackhammer", + "basemetals:nickel_plate", + "basemetals:nickel_powder", + "basemetals:nickel_pressure_plate", + "basemetals:nickel_raw", + "basemetals:nickel_rod", "basemetals:nickel_scythe", "basemetals:nickel_shears", - "basemetals:nickel_fishing_rod", - "basemetals:nickel_bow", - "basemetals:nickel_crossbow", "basemetals:nickel_shield", - "basemetals:nickel_arrow", - "basemetals:nickel_bolt", - "basemetals:nickel_rod", - "basemetals:nickel_gear", - "basemetals:nickel_horse_armor", - "basemetals:nickel_helmet", - "basemetals:nickel_chestplate", - "basemetals:nickel_leggings", - "basemetals:nickel_boots", - "basemetals:nickel_casing", - "basemetals:nickel_dense_plate", - "basemetals:nickel_crushed", - "basemetals:nickel_crushed_purified", - "basemetals:nickel_crystal", - "basemetals:nickel_shard", - "basemetals:nickel_clump", - "basemetals:nickel_powder_dirty", - "basemetals:pewter_block", - "basemetals:pewter_plate", + "basemetals:nickel_shovel", + "basemetals:nickel_slab", + "basemetals:nickel_smallpowder", + "basemetals:nickel_stairs", + "basemetals:nickel_sword", + "basemetals:nickel_trapdoor", + "basemetals:nickel_wall", + "basemetals:obsidian_arrow", + "basemetals:obsidian_axe", + "basemetals:obsidian_bars", + "basemetals:obsidian_bolt", + "basemetals:obsidian_boots", + "basemetals:obsidian_bow", + "basemetals:obsidian_bucket", + "basemetals:obsidian_button", + "basemetals:obsidian_chestplate", + "basemetals:obsidian_crackhammer", + "basemetals:obsidian_crossbow", + "basemetals:obsidian_door", + "basemetals:obsidian_fishing_rod", + "basemetals:obsidian_gear", + "basemetals:obsidian_helmet", + "basemetals:obsidian_hoe", + "basemetals:obsidian_horse_armor", + "basemetals:obsidian_ingot", + "basemetals:obsidian_leggings", + "basemetals:obsidian_lever", + "basemetals:obsidian_nugget", + "basemetals:obsidian_pickaxe", + "basemetals:obsidian_powder", + "basemetals:obsidian_pressure_plate", + "basemetals:obsidian_rod", + "basemetals:obsidian_scythe", + "basemetals:obsidian_shears", + "basemetals:obsidian_shield", + "basemetals:obsidian_shovel", + "basemetals:obsidian_slab", + "basemetals:obsidian_smallpowder", + "basemetals:obsidian_stairs", + "basemetals:obsidian_sword", + "basemetals:obsidian_trapdoor", + "basemetals:obsidian_wall", + "basemetals:pewter_arrow", + "basemetals:pewter_axe", "basemetals:pewter_bars", - "basemetals:pewter_door", - "basemetals:pewter_trapdoor", + "basemetals:pewter_blend", + "basemetals:pewter_block", + "basemetals:pewter_bolt", + "basemetals:pewter_boots", + "basemetals:pewter_bow", + "basemetals:pewter_bucket", "basemetals:pewter_button", - "basemetals:pewter_slab", - "basemetals:pewter_lever", - "basemetals:pewter_pressure_plate", - "basemetals:pewter_stairs", - "basemetals:pewter_wall", + "basemetals:pewter_chestplate", + "basemetals:pewter_crackhammer", + "basemetals:pewter_crossbow", + "basemetals:pewter_door", + "basemetals:pewter_fishing_rod", + "basemetals:pewter_gear", + "basemetals:pewter_helmet", + "basemetals:pewter_hoe", + "basemetals:pewter_horse_armor", "basemetals:pewter_ingot", + "basemetals:pewter_leggings", + "basemetals:pewter_lever", "basemetals:pewter_nugget", - "basemetals:pewter_powder", - "basemetals:pewter_smallpowder", - "basemetals:pewter_blend", - "basemetals:pewter_smallblend", "basemetals:pewter_pickaxe", - "basemetals:pewter_axe", - "basemetals:pewter_shovel", - "basemetals:pewter_hoe", - "basemetals:pewter_sword", - "basemetals:pewter_crackhammer", + "basemetals:pewter_plate", + "basemetals:pewter_powder", + "basemetals:pewter_pressure_plate", + "basemetals:pewter_rod", "basemetals:pewter_scythe", "basemetals:pewter_shears", - "basemetals:pewter_fishing_rod", - "basemetals:pewter_bow", - "basemetals:pewter_crossbow", "basemetals:pewter_shield", - "basemetals:pewter_arrow", - "basemetals:pewter_bolt", - "basemetals:pewter_rod", - "basemetals:pewter_gear", - "basemetals:pewter_horse_armor", - "basemetals:pewter_helmet", - "basemetals:pewter_chestplate", - "basemetals:pewter_leggings", - "basemetals:pewter_boots", - "basemetals:platinum_block", - "basemetals:platinum_plate", + "basemetals:pewter_shovel", + "basemetals:pewter_slab", + "basemetals:pewter_smallblend", + "basemetals:pewter_smallpowder", + "basemetals:pewter_stairs", + "basemetals:pewter_sword", + "basemetals:pewter_trapdoor", + "basemetals:pewter_wall", + "basemetals:platinum_arrow", + "basemetals:platinum_axe", "basemetals:platinum_bars", - "basemetals:platinum_door", - "basemetals:platinum_trapdoor", + "basemetals:platinum_block", + "basemetals:platinum_bolt", + "basemetals:platinum_boots", + "basemetals:platinum_bow", + "basemetals:platinum_bucket", "basemetals:platinum_button", - "basemetals:platinum_slab", - "basemetals:platinum_lever", - "basemetals:platinum_pressure_plate", - "basemetals:platinum_stairs", - "basemetals:platinum_wall", - "basemetals:platinum_ore", - "basemetals:platinum_raw", + "basemetals:platinum_casing", + "basemetals:platinum_chestplate", + "basemetals:platinum_crackhammer", + "basemetals:platinum_crossbow", + "basemetals:platinum_crushed", + "basemetals:platinum_crushed_purified", + "basemetals:platinum_dense_plate", + "basemetals:platinum_door", + "basemetals:platinum_fishing_rod", + "basemetals:platinum_gear", + "basemetals:platinum_helmet", + "basemetals:platinum_hoe", + "basemetals:platinum_horse_armor", "basemetals:platinum_ingot", + "basemetals:platinum_leggings", + "basemetals:platinum_lever", "basemetals:platinum_nugget", - "basemetals:platinum_powder", - "basemetals:platinum_smallpowder", + "basemetals:platinum_ore", "basemetals:platinum_pickaxe", - "basemetals:platinum_axe", - "basemetals:platinum_shovel", - "basemetals:platinum_hoe", - "basemetals:platinum_sword", - "basemetals:platinum_crackhammer", + "basemetals:platinum_plate", + "basemetals:platinum_powder", + "basemetals:platinum_pressure_plate", + "basemetals:platinum_raw", + "basemetals:platinum_rod", "basemetals:platinum_scythe", "basemetals:platinum_shears", - "basemetals:platinum_fishing_rod", - "basemetals:platinum_bow", - "basemetals:platinum_crossbow", "basemetals:platinum_shield", - "basemetals:platinum_arrow", - "basemetals:platinum_bolt", - "basemetals:platinum_rod", - "basemetals:platinum_gear", - "basemetals:platinum_horse_armor", - "basemetals:platinum_helmet", - "basemetals:platinum_chestplate", - "basemetals:platinum_leggings", - "basemetals:platinum_boots", - "basemetals:platinum_casing", - "basemetals:platinum_dense_plate", - "basemetals:platinum_crushed", - "basemetals:platinum_crushed_purified", - "basemetals:platinum_crystal", - "basemetals:platinum_shard", - "basemetals:platinum_clump", - "basemetals:platinum_powder_dirty", - "basemetals:silver_block", - "basemetals:silver_plate", + "basemetals:platinum_shovel", + "basemetals:platinum_slab", + "basemetals:platinum_smallpowder", + "basemetals:platinum_stairs", + "basemetals:platinum_sword", + "basemetals:platinum_trapdoor", + "basemetals:platinum_wall", + "basemetals:prismarine_bucket", + "basemetals:quartz_arrow", + "basemetals:quartz_axe", + "basemetals:quartz_bars", + "basemetals:quartz_bolt", + "basemetals:quartz_boots", + "basemetals:quartz_bow", + "basemetals:quartz_bucket", + "basemetals:quartz_button", + "basemetals:quartz_chestplate", + "basemetals:quartz_crackhammer", + "basemetals:quartz_crossbow", + "basemetals:quartz_door", + "basemetals:quartz_fishing_rod", + "basemetals:quartz_gear", + "basemetals:quartz_helmet", + "basemetals:quartz_hoe", + "basemetals:quartz_horse_armor", + "basemetals:quartz_leggings", + "basemetals:quartz_lever", + "basemetals:quartz_nugget", + "basemetals:quartz_pickaxe", + "basemetals:quartz_powder", + "basemetals:quartz_pressure_plate", + "basemetals:quartz_rod", + "basemetals:quartz_scythe", + "basemetals:quartz_shears", + "basemetals:quartz_shield", + "basemetals:quartz_shovel", + "basemetals:quartz_smallpowder", + "basemetals:quartz_sword", + "basemetals:quartz_trapdoor", + "basemetals:quartz_wall", + "basemetals:redstone_bucket", + "basemetals:redstone_ingot", + "basemetals:redstone_smallpowder", + "basemetals:silver_arrow", + "basemetals:silver_axe", "basemetals:silver_bars", - "basemetals:silver_door", - "basemetals:silver_trapdoor", + "basemetals:silver_block", + "basemetals:silver_bolt", + "basemetals:silver_boots", + "basemetals:silver_bow", + "basemetals:silver_bucket", "basemetals:silver_button", - "basemetals:silver_slab", - "basemetals:silver_lever", - "basemetals:silver_pressure_plate", - "basemetals:silver_stairs", - "basemetals:silver_wall", - "basemetals:silver_ore", - "basemetals:silver_raw", + "basemetals:silver_chestplate", + "basemetals:silver_crackhammer", + "basemetals:silver_crossbow", + "basemetals:silver_door", + "basemetals:silver_fishing_rod", + "basemetals:silver_gear", + "basemetals:silver_helmet", + "basemetals:silver_hoe", + "basemetals:silver_horse_armor", "basemetals:silver_ingot", + "basemetals:silver_leggings", + "basemetals:silver_lever", "basemetals:silver_nugget", - "basemetals:silver_powder", - "basemetals:silver_smallpowder", + "basemetals:silver_ore", "basemetals:silver_pickaxe", - "basemetals:silver_axe", - "basemetals:silver_shovel", - "basemetals:silver_hoe", - "basemetals:silver_sword", - "basemetals:silver_crackhammer", + "basemetals:silver_plate", + "basemetals:silver_powder", + "basemetals:silver_pressure_plate", + "basemetals:silver_raw", + "basemetals:silver_rod", "basemetals:silver_scythe", "basemetals:silver_shears", - "basemetals:silver_fishing_rod", - "basemetals:silver_bow", - "basemetals:silver_crossbow", "basemetals:silver_shield", - "basemetals:silver_arrow", - "basemetals:silver_bolt", - "basemetals:silver_rod", - "basemetals:silver_gear", - "basemetals:silver_horse_armor", - "basemetals:silver_helmet", - "basemetals:silver_chestplate", - "basemetals:silver_leggings", - "basemetals:silver_boots", - "basemetals:starsteel_block", - "basemetals:starsteel_plate", + "basemetals:silver_shovel", + "basemetals:silver_slab", + "basemetals:silver_smallpowder", + "basemetals:silver_stairs", + "basemetals:silver_sword", + "basemetals:silver_trapdoor", + "basemetals:silver_wall", + "basemetals:starsteel_arrow", + "basemetals:starsteel_axe", "basemetals:starsteel_bars", - "basemetals:starsteel_door", - "basemetals:starsteel_trapdoor", + "basemetals:starsteel_block", + "basemetals:starsteel_bolt", + "basemetals:starsteel_boots", + "basemetals:starsteel_bow", + "basemetals:starsteel_bucket", "basemetals:starsteel_button", - "basemetals:starsteel_slab", - "basemetals:starsteel_lever", - "basemetals:starsteel_pressure_plate", - "basemetals:starsteel_stairs", - "basemetals:starsteel_wall", - "basemetals:starsteel_ore", - "basemetals:starsteel_raw", + "basemetals:starsteel_casing", + "basemetals:starsteel_chestplate", + "basemetals:starsteel_crackhammer", + "basemetals:starsteel_crossbow", + "basemetals:starsteel_crushed", + "basemetals:starsteel_crushed_purified", + "basemetals:starsteel_dense_plate", + "basemetals:starsteel_door", + "basemetals:starsteel_fishing_rod", + "basemetals:starsteel_gear", + "basemetals:starsteel_helmet", + "basemetals:starsteel_hoe", + "basemetals:starsteel_horse_armor", "basemetals:starsteel_ingot", + "basemetals:starsteel_leggings", + "basemetals:starsteel_lever", "basemetals:starsteel_nugget", - "basemetals:starsteel_powder", - "basemetals:starsteel_smallpowder", + "basemetals:starsteel_ore", "basemetals:starsteel_pickaxe", - "basemetals:starsteel_axe", - "basemetals:starsteel_shovel", - "basemetals:starsteel_hoe", - "basemetals:starsteel_sword", - "basemetals:starsteel_crackhammer", + "basemetals:starsteel_plate", + "basemetals:starsteel_powder", + "basemetals:starsteel_pressure_plate", + "basemetals:starsteel_raw", + "basemetals:starsteel_rod", "basemetals:starsteel_scythe", "basemetals:starsteel_shears", - "basemetals:starsteel_fishing_rod", - "basemetals:starsteel_bow", - "basemetals:starsteel_crossbow", "basemetals:starsteel_shield", - "basemetals:starsteel_arrow", - "basemetals:starsteel_bolt", - "basemetals:starsteel_rod", - "basemetals:starsteel_gear", - "basemetals:starsteel_horse_armor", - "basemetals:starsteel_helmet", - "basemetals:starsteel_chestplate", - "basemetals:starsteel_leggings", - "basemetals:starsteel_boots", - "basemetals:starsteel_casing", - "basemetals:starsteel_dense_plate", - "basemetals:starsteel_crushed", - "basemetals:starsteel_crushed_purified", - "basemetals:starsteel_crystal", - "basemetals:starsteel_shard", - "basemetals:starsteel_clump", - "basemetals:starsteel_powder_dirty", - "basemetals:steel_block", - "basemetals:steel_plate", - "basemetals:steel_bars", - "basemetals:steel_door", - "basemetals:steel_trapdoor", - "basemetals:steel_button", - "basemetals:steel_slab", - "basemetals:steel_lever", - "basemetals:steel_pressure_plate", - "basemetals:steel_stairs", - "basemetals:steel_wall", - "basemetals:steel_ingot", - "basemetals:steel_nugget", - "basemetals:steel_powder", - "basemetals:steel_smallpowder", - "basemetals:steel_blend", - "basemetals:steel_smallblend", - "basemetals:steel_pickaxe", + "basemetals:starsteel_shovel", + "basemetals:starsteel_slab", + "basemetals:starsteel_smallpowder", + "basemetals:starsteel_stairs", + "basemetals:starsteel_sword", + "basemetals:starsteel_trapdoor", + "basemetals:starsteel_wall", + "basemetals:steel_anvil", + "basemetals:steel_arrow", "basemetals:steel_axe", - "basemetals:steel_shovel", - "basemetals:steel_hoe", - "basemetals:steel_sword", - "basemetals:steel_crackhammer", - "basemetals:steel_scythe", - "basemetals:steel_shears", - "basemetals:steel_fishing_rod", + "basemetals:steel_bars", + "basemetals:steel_blend", + "basemetals:steel_block", + "basemetals:steel_bolt", + "basemetals:steel_boots", "basemetals:steel_bow", + "basemetals:steel_bucket", + "basemetals:steel_button", + "basemetals:steel_chestplate", + "basemetals:steel_crackhammer", "basemetals:steel_crossbow", - "basemetals:steel_shield", - "basemetals:steel_arrow", - "basemetals:steel_bolt", - "basemetals:steel_rod", + "basemetals:steel_door", + "basemetals:steel_fishing_rod", "basemetals:steel_gear", - "basemetals:steel_horse_armor", "basemetals:steel_helmet", - "basemetals:steel_chestplate", + "basemetals:steel_hoe", + "basemetals:steel_horse_armor", + "basemetals:steel_ingot", "basemetals:steel_leggings", - "basemetals:steel_boots", - "basemetals:tin_block", - "basemetals:tin_plate", - "basemetals:tin_bars", - "basemetals:tin_door", - "basemetals:tin_trapdoor", - "basemetals:tin_button", - "basemetals:tin_slab", - "basemetals:tin_lever", - "basemetals:tin_pressure_plate", - "basemetals:tin_stairs", - "basemetals:tin_wall", - "basemetals:tin_ore", - "basemetals:tin_raw", - "basemetals:tin_ingot", - "basemetals:tin_nugget", - "basemetals:tin_powder", - "basemetals:tin_smallpowder", - "basemetals:tin_pickaxe", - "basemetals:tin_axe", - "basemetals:tin_shovel", - "basemetals:tin_hoe", - "basemetals:tin_sword", - "basemetals:tin_crackhammer", - "basemetals:tin_scythe", - "basemetals:tin_shears", - "basemetals:tin_fishing_rod", - "basemetals:tin_bow", - "basemetals:tin_crossbow", - "basemetals:tin_shield", - "basemetals:tin_arrow", - "basemetals:tin_bolt", - "basemetals:tin_rod", - "basemetals:tin_gear", - "basemetals:tin_horse_armor", - "basemetals:tin_helmet", - "basemetals:tin_chestplate", - "basemetals:tin_leggings", - "basemetals:tin_boots", - "basemetals:zinc_block", - "basemetals:zinc_plate", - "basemetals:zinc_bars", - "basemetals:zinc_door", - "basemetals:zinc_trapdoor", - "basemetals:zinc_button", - "basemetals:zinc_slab", - "basemetals:zinc_lever", - "basemetals:zinc_pressure_plate", - "basemetals:zinc_stairs", - "basemetals:zinc_wall", - "basemetals:zinc_ore", - "basemetals:zinc_raw", - "basemetals:zinc_ingot", - "basemetals:zinc_nugget", - "basemetals:zinc_powder", - "basemetals:zinc_smallpowder", - "basemetals:zinc_pickaxe", - "basemetals:zinc_axe", - "basemetals:zinc_shovel", - "basemetals:zinc_hoe", - "basemetals:zinc_sword", - "basemetals:zinc_crackhammer", - "basemetals:zinc_scythe", - "basemetals:zinc_shears", - "basemetals:zinc_fishing_rod", - "basemetals:zinc_bow", - "basemetals:zinc_crossbow", - "basemetals:zinc_shield", - "basemetals:zinc_arrow", - "basemetals:zinc_bolt", - "basemetals:zinc_rod", - "basemetals:zinc_gear", - "basemetals:zinc_horse_armor", - "basemetals:zinc_helmet", - "basemetals:zinc_chestplate", - "basemetals:zinc_leggings", - "basemetals:zinc_boots", - "basemetals:zinc_casing", - "basemetals:zinc_dense_plate", - "basemetals:zinc_crushed", - "basemetals:zinc_crushed_purified", - "basemetals:zinc_crystal", - "basemetals:zinc_shard", - "basemetals:zinc_clump", - "basemetals:zinc_powder_dirty", - "basemetals:stone_anvil", - "basemetals:steel_anvil", - "basemetals:adamantine_anvil", - "basemetals:human_detector", - "basemetals:charcoal_block", - "basemetals:diamond_bars", - "basemetals:diamond_door", - "basemetals:diamond_trapdoor", - "basemetals:diamond_button", - "basemetals:diamond_slab", - "basemetals:diamond_lever", - "basemetals:diamond_pressure_plate", - "basemetals:diamond_stairs", - "basemetals:diamond_wall", - "basemetals:emerald_bars", - "basemetals:emerald_door", - "basemetals:emerald_trapdoor", - "basemetals:emerald_button", - "basemetals:emerald_slab", - "basemetals:emerald_lever", - "basemetals:emerald_pressure_plate", - "basemetals:emerald_stairs", - "basemetals:emerald_wall", - "basemetals:gold_bars", - "basemetals:gold_door", - "basemetals:gold_trapdoor", - "basemetals:gold_button", - "basemetals:gold_slab", - "basemetals:gold_lever", - "basemetals:gold_stairs", - "basemetals:gold_wall", - "basemetals:obsidian_bars", - "basemetals:obsidian_door", - "basemetals:obsidian_trapdoor", - "basemetals:obsidian_button", - "basemetals:obsidian_slab", - "basemetals:obsidian_lever", - "basemetals:obsidian_pressure_plate", - "basemetals:obsidian_stairs", - "basemetals:obsidian_wall", - "basemetals:iron_button", - "basemetals:iron_slab", - "basemetals:iron_lever", - "basemetals:iron_stairs", - "basemetals:iron_wall", - "basemetals:quartz_bars", - "basemetals:quartz_door", - "basemetals:quartz_trapdoor", - "basemetals:quartz_button", - "basemetals:quartz_lever", - "basemetals:quartz_pressure_plate", - "basemetals:quartz_wall", - "basemetals:gold_plate", - "basemetals:iron_plate", - "basemetals:diamond_arrow", - "basemetals:diamond_bolt", - "basemetals:diamond_bow", - "basemetals:diamond_crossbow", - "basemetals:diamond_fishing_rod", - "basemetals:diamond_rod", - "basemetals:diamond_shears", - "basemetals:diamond_shield", - "basemetals:emerald_arrow", - "basemetals:emerald_bolt", - "basemetals:emerald_bow", - "basemetals:emerald_crossbow", - "basemetals:emerald_fishing_rod", - "basemetals:emerald_rod", - "basemetals:emerald_shears", - "basemetals:emerald_shield", - "basemetals:emerald_axe", - "basemetals:emerald_pickaxe", - "basemetals:emerald_shovel", - "basemetals:emerald_hoe", - "basemetals:emerald_helmet", - "basemetals:emerald_chestplate", - "basemetals:emerald_leggings", - "basemetals:emerald_boots", - "basemetals:emerald_horse_armor", - "basemetals:emerald_sword", - "basemetals:gold_arrow", - "basemetals:gold_bolt", - "basemetals:gold_bow", - "basemetals:gold_crossbow", - "basemetals:gold_fishing_rod", - "basemetals:gold_rod", - "basemetals:gold_shears", - "basemetals:gold_shield", - "basemetals:iron_arrow", - "basemetals:iron_bolt", - "basemetals:iron_bow", - "basemetals:iron_crossbow", - "basemetals:iron_fishing_rod", - "basemetals:iron_rod", - "basemetals:iron_shield", - "basemetals:obsidian_arrow", - "basemetals:obsidian_bolt", - "basemetals:obsidian_bow", - "basemetals:obsidian_crossbow", - "basemetals:obsidian_fishing_rod", - "basemetals:obsidian_rod", - "basemetals:obsidian_shears", - "basemetals:obsidian_shield", - "basemetals:obsidian_axe", - "basemetals:obsidian_pickaxe", - "basemetals:obsidian_shovel", - "basemetals:obsidian_hoe", - "basemetals:obsidian_helmet", - "basemetals:obsidian_chestplate", - "basemetals:obsidian_leggings", - "basemetals:obsidian_boots", - "basemetals:obsidian_horse_armor", - "basemetals:obsidian_sword", - "basemetals:quartz_arrow", - "basemetals:quartz_bolt", - "basemetals:quartz_bow", - "basemetals:quartz_crossbow", - "basemetals:quartz_fishing_rod", - "basemetals:quartz_rod", - "basemetals:quartz_shears", - "basemetals:quartz_shield", - "basemetals:quartz_axe", - "basemetals:quartz_pickaxe", - "basemetals:quartz_shovel", - "basemetals:quartz_hoe", - "basemetals:quartz_helmet", - "basemetals:quartz_chestplate", - "basemetals:quartz_leggings", - "basemetals:quartz_boots", - "basemetals:quartz_horse_armor", - "basemetals:quartz_sword", - "basemetals:diamond_crackhammer", - "basemetals:diamond_gear", - "basemetals:diamond_scythe", - "basemetals:emerald_crackhammer", - "basemetals:emerald_gear", - "basemetals:emerald_scythe", - "basemetals:gold_crackhammer", - "basemetals:gold_gear", - "basemetals:gold_scythe", - "basemetals:iron_crackhammer", - "basemetals:iron_gear", - "basemetals:iron_scythe", - "basemetals:obsidian_crackhammer", - "basemetals:obsidian_gear", - "basemetals:obsidian_scythe", - "basemetals:quartz_crackhammer", - "basemetals:quartz_gear", - "basemetals:quartz_scythe", + "basemetals:steel_lever", + "basemetals:steel_nugget", + "basemetals:steel_pickaxe", + "basemetals:steel_plate", + "basemetals:steel_powder", + "basemetals:steel_pressure_plate", + "basemetals:steel_rod", + "basemetals:steel_scythe", + "basemetals:steel_shears", + "basemetals:steel_shield", + "basemetals:steel_shovel", + "basemetals:steel_slab", + "basemetals:steel_smallblend", + "basemetals:steel_smallpowder", + "basemetals:steel_stairs", + "basemetals:steel_sword", + "basemetals:steel_trapdoor", + "basemetals:steel_wall", "basemetals:stone_crackhammer", "basemetals:stone_gear", + "basemetals:stone_rod", "basemetals:stone_scythe", + "basemetals:tin_arrow", + "basemetals:tin_axe", + "basemetals:tin_bars", + "basemetals:tin_block", + "basemetals:tin_bolt", + "basemetals:tin_boots", + "basemetals:tin_bow", + "basemetals:tin_bucket", + "basemetals:tin_button", + "basemetals:tin_chestplate", + "basemetals:tin_crackhammer", + "basemetals:tin_crossbow", + "basemetals:tin_door", + "basemetals:tin_fishing_rod", + "basemetals:tin_gear", + "basemetals:tin_helmet", + "basemetals:tin_hoe", + "basemetals:tin_horse_armor", + "basemetals:tin_ingot", + "basemetals:tin_leggings", + "basemetals:tin_lever", + "basemetals:tin_nugget", + "basemetals:tin_ore", + "basemetals:tin_pickaxe", + "basemetals:tin_plate", + "basemetals:tin_powder", + "basemetals:tin_pressure_plate", + "basemetals:tin_raw", + "basemetals:tin_rod", + "basemetals:tin_scythe", + "basemetals:tin_shears", + "basemetals:tin_shield", + "basemetals:tin_shovel", + "basemetals:tin_slab", + "basemetals:tin_smallpowder", + "basemetals:tin_stairs", + "basemetals:tin_sword", + "basemetals:tin_trapdoor", + "basemetals:tin_wall", "basemetals:wood_crackhammer", "basemetals:wood_gear", "basemetals:wood_scythe", - "basemetals:coal_powder", - "basemetals:coal_smallpowder", - "basemetals:charcoal_powder", - "basemetals:charcoal_smallpowder", - "basemetals:diamond_powder", - "basemetals:diamond_smallpowder", - "basemetals:emerald_powder", - "basemetals:emerald_smallpowder", - "basemetals:gold_powder", - "basemetals:gold_smallpowder", - "basemetals:iron_powder", - "basemetals:iron_smallpowder", - "basemetals:obsidian_powder", - "basemetals:obsidian_smallpowder", - "basemetals:quartz_powder", - "basemetals:quartz_smallpowder", - "basemetals:redstone_smallpowder", - "basemetals:coal_nugget", - "basemetals:charcoal_nugget", - "basemetals:diamond_nugget", - "basemetals:emerald_nugget", - "basemetals:obsidian_nugget", - "basemetals:quartz_nugget", - "basemetals:diamond_blend", - "basemetals:diamond_smallblend", - "basemetals:gold_blend", - "basemetals:gold_smallblend", - "basemetals:iron_blend", - "basemetals:iron_smallblend", - "basemetals:lapis_smallpowder", - "basemetals:obsidian_ingot", - "basemetals:redstone_ingot", - "basemetals:stone_rod", - "basemetals:adamantine", - "basemetals:adamantine_bucket", - "basemetals:antimony", - "basemetals:antimony_bucket", - "basemetals:aquarium", - "basemetals:aquarium_bucket", - "basemetals:bismuth", - "basemetals:bismuth_bucket", - "basemetals:brass", - "basemetals:brass_bucket", - "basemetals:bronze", - "basemetals:bronze_bucket", - "basemetals:coldiron", - "basemetals:coldiron_bucket", - "basemetals:copper", - "basemetals:copper_bucket", - "basemetals:cupronickel", - "basemetals:cupronickel_bucket", - "basemetals:electrum", - "basemetals:electrum_bucket", - "basemetals:invar", - "basemetals:invar_bucket", - "basemetals:lead", - "basemetals:lead_bucket", - "basemetals:mercury", - "basemetals:mercury_bucket", - "basemetals:mithril", - "basemetals:mithril_bucket", - "basemetals:nickel", - "basemetals:nickel_bucket", - "basemetals:pewter", - "basemetals:pewter_bucket", - "basemetals:platinum", - "basemetals:platinum_bucket", - "basemetals:silver", - "basemetals:silver_bucket", - "basemetals:starsteel", - "basemetals:starsteel_bucket", - "basemetals:steel", - "basemetals:steel_bucket", - "basemetals:tin", - "basemetals:tin_bucket", - "basemetals:zinc", + "basemetals:zinc_arrow", + "basemetals:zinc_axe", + "basemetals:zinc_bars", + "basemetals:zinc_block", + "basemetals:zinc_bolt", + "basemetals:zinc_boots", + "basemetals:zinc_bow", "basemetals:zinc_bucket", - "basemetals:charcoal", - "basemetals:charcoal_bucket", - "basemetals:coal", - "basemetals:coal_bucket", - "basemetals:diamond", - "basemetals:diamond_bucket", - "basemetals:emerald", - "basemetals:emerald_bucket", - "basemetals:ender", - "basemetals:ender_bucket", - "basemetals:gold", - "basemetals:gold_bucket", - "basemetals:iron", - "basemetals:iron_bucket", - "basemetals:lapis", - "basemetals:lapis_bucket", - "basemetals:obsidian", - "basemetals:obsidian_bucket", - "basemetals:prismarine", - "basemetals:prismarine_bucket", - "basemetals:quartz", - "basemetals:quartz_bucket", - "basemetals:wood", - "basemetals:wood_bucket", - "basemetals:redstone", - "basemetals:redstone_bucket", - "basemetals:stone", - "basemetals:stone_bucket" + "basemetals:zinc_button", + "basemetals:zinc_casing", + "basemetals:zinc_chestplate", + "basemetals:zinc_crackhammer", + "basemetals:zinc_crossbow", + "basemetals:zinc_crushed", + "basemetals:zinc_crushed_purified", + "basemetals:zinc_dense_plate", + "basemetals:zinc_door", + "basemetals:zinc_fishing_rod", + "basemetals:zinc_gear", + "basemetals:zinc_helmet", + "basemetals:zinc_hoe", + "basemetals:zinc_horse_armor", + "basemetals:zinc_ingot", + "basemetals:zinc_leggings", + "basemetals:zinc_lever", + "basemetals:zinc_nugget", + "basemetals:zinc_ore", + "basemetals:zinc_pickaxe", + "basemetals:zinc_plate", + "basemetals:zinc_powder", + "basemetals:zinc_pressure_plate", + "basemetals:zinc_raw", + "basemetals:zinc_rod", + "basemetals:zinc_scythe", + "basemetals:zinc_shears", + "basemetals:zinc_shield", + "basemetals:zinc_shovel", + "basemetals:zinc_slab", + "basemetals:zinc_smallpowder", + "basemetals:zinc_stairs", + "basemetals:zinc_sword", + "basemetals:zinc_trapdoor", + "basemetals:zinc_wall", + "basemetals:human_detector", + "basemetals:stone_anvil" ], "loot_modifier_serializers": [ "basemetals:add_table" @@ -1606,93 +1559,107 @@ "basemetals:flowing_ender", "basemetals:flowing_gold", "basemetals:flowing_iron", - "basemetals:flowing_lapis", "basemetals:flowing_obsidian", "basemetals:flowing_prismarine", "basemetals:flowing_quartz", - "basemetals:flowing_wood", - "basemetals:flowing_redstone", - "basemetals:flowing_stone" + "basemetals:flowing_redstone" ], "new_items": [ - "basemetals:adamantine_raw", - "basemetals:antimony_raw", - "basemetals:bismuth_raw", - "basemetals:coldiron_raw", - "basemetals:lead_raw", - "basemetals:mercury_raw", - "basemetals:nickel_raw", - "basemetals:platinum_raw", - "basemetals:silver_raw", - "basemetals:starsteel_raw", - "basemetals:tin_raw", - "basemetals:zinc_raw", "basemetals:adamantine_bucket", + "basemetals:adamantine_raw", "basemetals:antimony_bucket", + "basemetals:antimony_raw", "basemetals:aquarium_bucket", "basemetals:bismuth_bucket", + "basemetals:bismuth_raw", "basemetals:brass_bucket", "basemetals:bronze_bucket", + "basemetals:charcoal_bucket", + "basemetals:coal_bucket", "basemetals:coldiron_bucket", + "basemetals:coldiron_raw", "basemetals:copper_bucket", "basemetals:cupronickel_bucket", + "basemetals:diamond_bucket", "basemetals:electrum_bucket", + "basemetals:emerald_bucket", + "basemetals:ender_bucket", + "basemetals:gold_bucket", "basemetals:invar_bucket", + "basemetals:iron_bucket", "basemetals:lead_bucket", + "basemetals:lead_raw", "basemetals:mercury_bucket", + "basemetals:mercury_raw", "basemetals:mithril_bucket", "basemetals:nickel_bucket", + "basemetals:nickel_raw", + "basemetals:obsidian_bucket", "basemetals:pewter_bucket", "basemetals:platinum_bucket", + "basemetals:platinum_raw", + "basemetals:prismarine_bucket", + "basemetals:quartz_bucket", + "basemetals:redstone_bucket", "basemetals:silver_bucket", + "basemetals:silver_raw", "basemetals:starsteel_bucket", + "basemetals:starsteel_raw", "basemetals:steel_bucket", "basemetals:tin_bucket", + "basemetals:tin_raw", "basemetals:zinc_bucket", - "basemetals:charcoal_bucket", - "basemetals:coal_bucket", - "basemetals:diamond_bucket", - "basemetals:emerald_bucket", - "basemetals:ender_bucket", - "basemetals:gold_bucket", - "basemetals:iron_bucket", - "basemetals:lapis_bucket", - "basemetals:obsidian_bucket", - "basemetals:prismarine_bucket", - "basemetals:quartz_bucket", - "basemetals:wood_bucket", - "basemetals:redstone_bucket", - "basemetals:stone_bucket" + "basemetals:zinc_raw" ], "new_loot_modifier_serializers": [ "basemetals:add_table" ], "new_recipe_serializers": [ - "basemetals:crushing", + "mmdlib:crushing", "basemetals:legacy_smelting", "basemetals:plate_repair", "basemetals:content_crafting" ], "recipe_serializers": [ - "basemetals:crushing", + "mmdlib:crushing", "basemetals:legacy_smelting", "basemetals:plate_repair", "basemetals:content_crafting" ], "restored_blocks": [ - "basemetals:stone_anvil", - "basemetals:steel_anvil", "basemetals:adamantine_anvil", - "basemetals:lapis", - "basemetals:wood", - "basemetals:stone" - ], - "restored_fluids": [ - "basemetals:lapis", - "basemetals:wood", - "basemetals:stone" + "basemetals:adamantine_double_slab", + "basemetals:antimony_double_slab", + "basemetals:aquarium_double_slab", + "basemetals:bismuth_double_slab", + "basemetals:brass_double_slab", + "basemetals:bronze_double_slab", + "basemetals:coldiron_double_slab", + "basemetals:copper_double_slab", + "basemetals:cupronickel_double_slab", + "basemetals:diamond_double_slab", + "basemetals:electrum_double_slab", + "basemetals:emerald_double_slab", + "basemetals:gold_double_slab", + "basemetals:invar_double_slab", + "basemetals:iron_double_slab", + "basemetals:lead_double_slab", + "basemetals:mithril_double_slab", + "basemetals:nickel_double_slab", + "basemetals:obsidian_double_slab", + "basemetals:pewter_double_slab", + "basemetals:platinum_double_slab", + "basemetals:silver_double_slab", + "basemetals:starsteel_double_slab", + "basemetals:steel_anvil", + "basemetals:steel_double_slab", + "basemetals:tin_double_slab", + "basemetals:zinc_double_slab", + "basemetals:stone_anvil" ], + "restored_fluids": [], "restored_items": [ + "basemetals:adamantine_anvil", "basemetals:adamantine_scythe", "basemetals:antimony_scythe", "basemetals:aquarium_scythe", @@ -1702,38 +1669,34 @@ "basemetals:coldiron_scythe", "basemetals:copper_scythe", "basemetals:cupronickel_scythe", + "basemetals:diamond_blend", + "basemetals:diamond_scythe", + "basemetals:diamond_smallblend", "basemetals:electrum_scythe", + "basemetals:emerald_scythe", + "basemetals:gold_blend", + "basemetals:gold_scythe", + "basemetals:gold_smallblend", "basemetals:invar_scythe", + "basemetals:iron_blend", + "basemetals:iron_scythe", + "basemetals:iron_smallblend", "basemetals:lead_scythe", "basemetals:mithril_scythe", "basemetals:nickel_scythe", + "basemetals:obsidian_scythe", "basemetals:pewter_scythe", "basemetals:platinum_scythe", + "basemetals:quartz_scythe", "basemetals:silver_scythe", "basemetals:starsteel_scythe", - "basemetals:steel_scythe", - "basemetals:tin_scythe", - "basemetals:zinc_scythe", - "basemetals:stone_anvil", "basemetals:steel_anvil", - "basemetals:adamantine_anvil", - "basemetals:diamond_scythe", - "basemetals:emerald_scythe", - "basemetals:gold_scythe", - "basemetals:iron_scythe", - "basemetals:obsidian_scythe", - "basemetals:quartz_scythe", + "basemetals:steel_scythe", "basemetals:stone_scythe", + "basemetals:tin_scythe", "basemetals:wood_scythe", - "basemetals:diamond_blend", - "basemetals:diamond_smallblend", - "basemetals:gold_blend", - "basemetals:gold_smallblend", - "basemetals:iron_blend", - "basemetals:iron_smallblend", - "basemetals:lapis", - "basemetals:wood", - "basemetals:stone" + "basemetals:zinc_scythe", + "basemetals:stone_anvil" ], "source": "Base Metals 1.19.4 catalogue" } \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/fluid/molten_charcoal.json b/src/generated/resources/data/c/tags/fluid/molten_charcoal.json new file mode 100644 index 000000000..27016ee2f --- /dev/null +++ b/src/generated/resources/data/c/tags/fluid/molten_charcoal.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "basemetals:charcoal", + "basemetals:flowing_charcoal" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/fluid/molten_coal.json b/src/generated/resources/data/c/tags/fluid/molten_coal.json new file mode 100644 index 000000000..551742c4d --- /dev/null +++ b/src/generated/resources/data/c/tags/fluid/molten_coal.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "basemetals:coal", + "basemetals:flowing_coal" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/fluid/molten_diamond.json b/src/generated/resources/data/c/tags/fluid/molten_diamond.json new file mode 100644 index 000000000..3b53a7d7f --- /dev/null +++ b/src/generated/resources/data/c/tags/fluid/molten_diamond.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "basemetals:diamond", + "basemetals:flowing_diamond" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/fluid/molten_emerald.json b/src/generated/resources/data/c/tags/fluid/molten_emerald.json new file mode 100644 index 000000000..88172e189 --- /dev/null +++ b/src/generated/resources/data/c/tags/fluid/molten_emerald.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "basemetals:emerald", + "basemetals:flowing_emerald" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/fluid/molten_ender.json b/src/generated/resources/data/c/tags/fluid/molten_ender.json new file mode 100644 index 000000000..dcd994364 --- /dev/null +++ b/src/generated/resources/data/c/tags/fluid/molten_ender.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "basemetals:ender", + "basemetals:flowing_ender" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/fluid/molten_gold.json b/src/generated/resources/data/c/tags/fluid/molten_gold.json new file mode 100644 index 000000000..c44aea5a2 --- /dev/null +++ b/src/generated/resources/data/c/tags/fluid/molten_gold.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "basemetals:gold", + "basemetals:flowing_gold" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/fluid/molten_iron.json b/src/generated/resources/data/c/tags/fluid/molten_iron.json new file mode 100644 index 000000000..4c390849e --- /dev/null +++ b/src/generated/resources/data/c/tags/fluid/molten_iron.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "basemetals:iron", + "basemetals:flowing_iron" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/fluid/molten_obsidian.json b/src/generated/resources/data/c/tags/fluid/molten_obsidian.json new file mode 100644 index 000000000..974c54436 --- /dev/null +++ b/src/generated/resources/data/c/tags/fluid/molten_obsidian.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "basemetals:obsidian", + "basemetals:flowing_obsidian" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/fluid/molten_prismarine.json b/src/generated/resources/data/c/tags/fluid/molten_prismarine.json new file mode 100644 index 000000000..506c18bd9 --- /dev/null +++ b/src/generated/resources/data/c/tags/fluid/molten_prismarine.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "basemetals:prismarine", + "basemetals:flowing_prismarine" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/fluid/molten_quartz.json b/src/generated/resources/data/c/tags/fluid/molten_quartz.json new file mode 100644 index 000000000..569a525c5 --- /dev/null +++ b/src/generated/resources/data/c/tags/fluid/molten_quartz.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "basemetals:quartz", + "basemetals:flowing_quartz" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/fluid/molten_redstone.json b/src/generated/resources/data/c/tags/fluid/molten_redstone.json new file mode 100644 index 000000000..8cb59241c --- /dev/null +++ b/src/generated/resources/data/c/tags/fluid/molten_redstone.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "basemetals:redstone", + "basemetals:flowing_redstone" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/clumps/adamantine.json b/src/generated/resources/data/c/tags/item/clumps/adamantine.json index a3f36cafd..3715c1da8 100644 --- a/src/generated/resources/data/c/tags/item/clumps/adamantine.json +++ b/src/generated/resources/data/c/tags/item/clumps/adamantine.json @@ -1,6 +1,9 @@ { "replace": false, "values": [ - "basemetals:adamantine_clump" + { + "id": "basemetals:adamantine_clump", + "required": false + } ] } \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/clumps/antimony.json b/src/generated/resources/data/c/tags/item/clumps/antimony.json index 2acae9f1a..085bfe9fa 100644 --- a/src/generated/resources/data/c/tags/item/clumps/antimony.json +++ b/src/generated/resources/data/c/tags/item/clumps/antimony.json @@ -1,6 +1,9 @@ { "replace": false, "values": [ - "basemetals:antimony_clump" + { + "id": "basemetals:antimony_clump", + "required": false + } ] } \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/clumps/bismuth.json b/src/generated/resources/data/c/tags/item/clumps/bismuth.json index 8ad9832ed..56245ba25 100644 --- a/src/generated/resources/data/c/tags/item/clumps/bismuth.json +++ b/src/generated/resources/data/c/tags/item/clumps/bismuth.json @@ -1,6 +1,9 @@ { "replace": false, "values": [ - "basemetals:bismuth_clump" + { + "id": "basemetals:bismuth_clump", + "required": false + } ] } \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/clumps/coldiron.json b/src/generated/resources/data/c/tags/item/clumps/coldiron.json index 558c911b3..aab1b6f50 100644 --- a/src/generated/resources/data/c/tags/item/clumps/coldiron.json +++ b/src/generated/resources/data/c/tags/item/clumps/coldiron.json @@ -1,6 +1,9 @@ { "replace": false, "values": [ - "basemetals:coldiron_clump" + { + "id": "basemetals:coldiron_clump", + "required": false + } ] } \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/clumps/nickel.json b/src/generated/resources/data/c/tags/item/clumps/nickel.json index 503848433..35a64c67c 100644 --- a/src/generated/resources/data/c/tags/item/clumps/nickel.json +++ b/src/generated/resources/data/c/tags/item/clumps/nickel.json @@ -1,6 +1,9 @@ { "replace": false, "values": [ - "basemetals:nickel_clump" + { + "id": "basemetals:nickel_clump", + "required": false + } ] } \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/clumps/platinum.json b/src/generated/resources/data/c/tags/item/clumps/platinum.json index 628d150d6..ab0688974 100644 --- a/src/generated/resources/data/c/tags/item/clumps/platinum.json +++ b/src/generated/resources/data/c/tags/item/clumps/platinum.json @@ -1,6 +1,9 @@ { "replace": false, "values": [ - "basemetals:platinum_clump" + { + "id": "basemetals:platinum_clump", + "required": false + } ] } \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/clumps/starsteel.json b/src/generated/resources/data/c/tags/item/clumps/starsteel.json index f3ac598ea..53559bb2d 100644 --- a/src/generated/resources/data/c/tags/item/clumps/starsteel.json +++ b/src/generated/resources/data/c/tags/item/clumps/starsteel.json @@ -1,6 +1,9 @@ { "replace": false, "values": [ - "basemetals:starsteel_clump" + { + "id": "basemetals:starsteel_clump", + "required": false + } ] } \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/clumps/zinc.json b/src/generated/resources/data/c/tags/item/clumps/zinc.json index fb68cca4d..10b7179ee 100644 --- a/src/generated/resources/data/c/tags/item/clumps/zinc.json +++ b/src/generated/resources/data/c/tags/item/clumps/zinc.json @@ -1,6 +1,9 @@ { "replace": false, "values": [ - "basemetals:zinc_clump" + { + "id": "basemetals:zinc_clump", + "required": false + } ] } \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/crystals/adamantine.json b/src/generated/resources/data/c/tags/item/crystals/adamantine.json index 3ac475075..e3c519a02 100644 --- a/src/generated/resources/data/c/tags/item/crystals/adamantine.json +++ b/src/generated/resources/data/c/tags/item/crystals/adamantine.json @@ -1,6 +1,9 @@ { "replace": false, "values": [ - "basemetals:adamantine_crystal" + { + "id": "basemetals:adamantine_crystal", + "required": false + } ] } \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/crystals/antimony.json b/src/generated/resources/data/c/tags/item/crystals/antimony.json index a2744fd58..7ce0803e5 100644 --- a/src/generated/resources/data/c/tags/item/crystals/antimony.json +++ b/src/generated/resources/data/c/tags/item/crystals/antimony.json @@ -1,6 +1,9 @@ { "replace": false, "values": [ - "basemetals:antimony_crystal" + { + "id": "basemetals:antimony_crystal", + "required": false + } ] } \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/crystals/bismuth.json b/src/generated/resources/data/c/tags/item/crystals/bismuth.json index 00ee661e2..ab3f5862a 100644 --- a/src/generated/resources/data/c/tags/item/crystals/bismuth.json +++ b/src/generated/resources/data/c/tags/item/crystals/bismuth.json @@ -1,6 +1,9 @@ { "replace": false, "values": [ - "basemetals:bismuth_crystal" + { + "id": "basemetals:bismuth_crystal", + "required": false + } ] } \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/crystals/coldiron.json b/src/generated/resources/data/c/tags/item/crystals/coldiron.json index 48242f67d..ac0f1ba67 100644 --- a/src/generated/resources/data/c/tags/item/crystals/coldiron.json +++ b/src/generated/resources/data/c/tags/item/crystals/coldiron.json @@ -1,6 +1,9 @@ { "replace": false, "values": [ - "basemetals:coldiron_crystal" + { + "id": "basemetals:coldiron_crystal", + "required": false + } ] } \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/crystals/nickel.json b/src/generated/resources/data/c/tags/item/crystals/nickel.json index e8c2cd3c3..e5b44808d 100644 --- a/src/generated/resources/data/c/tags/item/crystals/nickel.json +++ b/src/generated/resources/data/c/tags/item/crystals/nickel.json @@ -1,6 +1,9 @@ { "replace": false, "values": [ - "basemetals:nickel_crystal" + { + "id": "basemetals:nickel_crystal", + "required": false + } ] } \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/crystals/platinum.json b/src/generated/resources/data/c/tags/item/crystals/platinum.json index 9e4d92ead..1f04b2f39 100644 --- a/src/generated/resources/data/c/tags/item/crystals/platinum.json +++ b/src/generated/resources/data/c/tags/item/crystals/platinum.json @@ -1,6 +1,9 @@ { "replace": false, "values": [ - "basemetals:platinum_crystal" + { + "id": "basemetals:platinum_crystal", + "required": false + } ] } \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/crystals/starsteel.json b/src/generated/resources/data/c/tags/item/crystals/starsteel.json index d292b2ba1..c519f17e5 100644 --- a/src/generated/resources/data/c/tags/item/crystals/starsteel.json +++ b/src/generated/resources/data/c/tags/item/crystals/starsteel.json @@ -1,6 +1,9 @@ { "replace": false, "values": [ - "basemetals:starsteel_crystal" + { + "id": "basemetals:starsteel_crystal", + "required": false + } ] } \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/crystals/zinc.json b/src/generated/resources/data/c/tags/item/crystals/zinc.json index 0263465c8..0eab8f804 100644 --- a/src/generated/resources/data/c/tags/item/crystals/zinc.json +++ b/src/generated/resources/data/c/tags/item/crystals/zinc.json @@ -1,6 +1,9 @@ { "replace": false, "values": [ - "basemetals:zinc_crystal" + { + "id": "basemetals:zinc_crystal", + "required": false + } ] } \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/dirty_dusts/adamantine.json b/src/generated/resources/data/c/tags/item/dirty_dusts/adamantine.json index a2a353e23..f9707b797 100644 --- a/src/generated/resources/data/c/tags/item/dirty_dusts/adamantine.json +++ b/src/generated/resources/data/c/tags/item/dirty_dusts/adamantine.json @@ -1,6 +1,9 @@ { "replace": false, "values": [ - "basemetals:adamantine_powder_dirty" + { + "id": "basemetals:adamantine_powder_dirty", + "required": false + } ] } \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/dirty_dusts/antimony.json b/src/generated/resources/data/c/tags/item/dirty_dusts/antimony.json index 7f78fe44b..6cba5e991 100644 --- a/src/generated/resources/data/c/tags/item/dirty_dusts/antimony.json +++ b/src/generated/resources/data/c/tags/item/dirty_dusts/antimony.json @@ -1,6 +1,9 @@ { "replace": false, "values": [ - "basemetals:antimony_powder_dirty" + { + "id": "basemetals:antimony_powder_dirty", + "required": false + } ] } \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/dirty_dusts/bismuth.json b/src/generated/resources/data/c/tags/item/dirty_dusts/bismuth.json index 52b5964c1..6889033ad 100644 --- a/src/generated/resources/data/c/tags/item/dirty_dusts/bismuth.json +++ b/src/generated/resources/data/c/tags/item/dirty_dusts/bismuth.json @@ -1,6 +1,9 @@ { "replace": false, "values": [ - "basemetals:bismuth_powder_dirty" + { + "id": "basemetals:bismuth_powder_dirty", + "required": false + } ] } \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/dirty_dusts/coldiron.json b/src/generated/resources/data/c/tags/item/dirty_dusts/coldiron.json index 22bc99cd1..5cd78c06a 100644 --- a/src/generated/resources/data/c/tags/item/dirty_dusts/coldiron.json +++ b/src/generated/resources/data/c/tags/item/dirty_dusts/coldiron.json @@ -1,6 +1,9 @@ { "replace": false, "values": [ - "basemetals:coldiron_powder_dirty" + { + "id": "basemetals:coldiron_powder_dirty", + "required": false + } ] } \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/dirty_dusts/nickel.json b/src/generated/resources/data/c/tags/item/dirty_dusts/nickel.json index de68b2990..d0f2bb3b2 100644 --- a/src/generated/resources/data/c/tags/item/dirty_dusts/nickel.json +++ b/src/generated/resources/data/c/tags/item/dirty_dusts/nickel.json @@ -1,6 +1,9 @@ { "replace": false, "values": [ - "basemetals:nickel_powder_dirty" + { + "id": "basemetals:nickel_powder_dirty", + "required": false + } ] } \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/dirty_dusts/platinum.json b/src/generated/resources/data/c/tags/item/dirty_dusts/platinum.json index dce15cc7f..9d1ee0512 100644 --- a/src/generated/resources/data/c/tags/item/dirty_dusts/platinum.json +++ b/src/generated/resources/data/c/tags/item/dirty_dusts/platinum.json @@ -1,6 +1,9 @@ { "replace": false, "values": [ - "basemetals:platinum_powder_dirty" + { + "id": "basemetals:platinum_powder_dirty", + "required": false + } ] } \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/dirty_dusts/starsteel.json b/src/generated/resources/data/c/tags/item/dirty_dusts/starsteel.json index ab2a35e3d..57459c527 100644 --- a/src/generated/resources/data/c/tags/item/dirty_dusts/starsteel.json +++ b/src/generated/resources/data/c/tags/item/dirty_dusts/starsteel.json @@ -1,6 +1,9 @@ { "replace": false, "values": [ - "basemetals:starsteel_powder_dirty" + { + "id": "basemetals:starsteel_powder_dirty", + "required": false + } ] } \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/dirty_dusts/zinc.json b/src/generated/resources/data/c/tags/item/dirty_dusts/zinc.json index 16087ba28..ef9146dc8 100644 --- a/src/generated/resources/data/c/tags/item/dirty_dusts/zinc.json +++ b/src/generated/resources/data/c/tags/item/dirty_dusts/zinc.json @@ -1,6 +1,9 @@ { "replace": false, "values": [ - "basemetals:zinc_powder_dirty" + { + "id": "basemetals:zinc_powder_dirty", + "required": false + } ] } \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/shards/adamantine.json b/src/generated/resources/data/c/tags/item/shards/adamantine.json index f27ac1d88..6e7ed874d 100644 --- a/src/generated/resources/data/c/tags/item/shards/adamantine.json +++ b/src/generated/resources/data/c/tags/item/shards/adamantine.json @@ -1,6 +1,9 @@ { "replace": false, "values": [ - "basemetals:adamantine_shard" + { + "id": "basemetals:adamantine_shard", + "required": false + } ] } \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/shards/antimony.json b/src/generated/resources/data/c/tags/item/shards/antimony.json index c6928626a..1a7ece4c1 100644 --- a/src/generated/resources/data/c/tags/item/shards/antimony.json +++ b/src/generated/resources/data/c/tags/item/shards/antimony.json @@ -1,6 +1,9 @@ { "replace": false, "values": [ - "basemetals:antimony_shard" + { + "id": "basemetals:antimony_shard", + "required": false + } ] } \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/shards/bismuth.json b/src/generated/resources/data/c/tags/item/shards/bismuth.json index 29ef420b4..267450169 100644 --- a/src/generated/resources/data/c/tags/item/shards/bismuth.json +++ b/src/generated/resources/data/c/tags/item/shards/bismuth.json @@ -1,6 +1,9 @@ { "replace": false, "values": [ - "basemetals:bismuth_shard" + { + "id": "basemetals:bismuth_shard", + "required": false + } ] } \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/shards/coldiron.json b/src/generated/resources/data/c/tags/item/shards/coldiron.json index 58d4a4d6e..f860a0559 100644 --- a/src/generated/resources/data/c/tags/item/shards/coldiron.json +++ b/src/generated/resources/data/c/tags/item/shards/coldiron.json @@ -1,6 +1,9 @@ { "replace": false, "values": [ - "basemetals:coldiron_shard" + { + "id": "basemetals:coldiron_shard", + "required": false + } ] } \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/shards/nickel.json b/src/generated/resources/data/c/tags/item/shards/nickel.json index dd00186b6..cbe6c63a5 100644 --- a/src/generated/resources/data/c/tags/item/shards/nickel.json +++ b/src/generated/resources/data/c/tags/item/shards/nickel.json @@ -1,6 +1,9 @@ { "replace": false, "values": [ - "basemetals:nickel_shard" + { + "id": "basemetals:nickel_shard", + "required": false + } ] } \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/shards/platinum.json b/src/generated/resources/data/c/tags/item/shards/platinum.json index b3fa11e8b..66a7e70d7 100644 --- a/src/generated/resources/data/c/tags/item/shards/platinum.json +++ b/src/generated/resources/data/c/tags/item/shards/platinum.json @@ -1,6 +1,9 @@ { "replace": false, "values": [ - "basemetals:platinum_shard" + { + "id": "basemetals:platinum_shard", + "required": false + } ] } \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/shards/starsteel.json b/src/generated/resources/data/c/tags/item/shards/starsteel.json index 0c476e76f..01d764a24 100644 --- a/src/generated/resources/data/c/tags/item/shards/starsteel.json +++ b/src/generated/resources/data/c/tags/item/shards/starsteel.json @@ -1,6 +1,9 @@ { "replace": false, "values": [ - "basemetals:starsteel_shard" + { + "id": "basemetals:starsteel_shard", + "required": false + } ] } \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/shards/zinc.json b/src/generated/resources/data/c/tags/item/shards/zinc.json index a894d790b..87fa8e30c 100644 --- a/src/generated/resources/data/c/tags/item/shards/zinc.json +++ b/src/generated/resources/data/c/tags/item/shards/zinc.json @@ -1,6 +1,9 @@ { "replace": false, "values": [ - "basemetals:zinc_shard" + { + "id": "basemetals:zinc_shard", + "required": false + } ] } \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/block/mineable/pickaxe.json b/src/generated/resources/data/minecraft/tags/block/mineable/pickaxe.json index d218b60ee..7dc8800ba 100644 --- a/src/generated/resources/data/minecraft/tags/block/mineable/pickaxe.json +++ b/src/generated/resources/data/minecraft/tags/block/mineable/pickaxe.json @@ -1,329 +1,329 @@ { "replace": false, "values": [ - "basemetals:adamantine_block", - "basemetals:adamantine_plate", + "basemetals:adamantine_anvil", "basemetals:adamantine_bars", - "basemetals:adamantine_door", - "basemetals:adamantine_trapdoor", + "basemetals:adamantine_block", "basemetals:adamantine_button", - "basemetals:adamantine_slab", + "basemetals:adamantine_door", + "basemetals:adamantine_double_slab", "basemetals:adamantine_lever", + "basemetals:adamantine_ore", + "basemetals:adamantine_plate", "basemetals:adamantine_pressure_plate", + "basemetals:adamantine_slab", "basemetals:adamantine_stairs", + "basemetals:adamantine_trapdoor", "basemetals:adamantine_wall", - "basemetals:double_adamantine_slab", - "basemetals:adamantine_ore", - "basemetals:antimony_block", - "basemetals:antimony_plate", "basemetals:antimony_bars", - "basemetals:antimony_door", - "basemetals:antimony_trapdoor", + "basemetals:antimony_block", "basemetals:antimony_button", - "basemetals:antimony_slab", + "basemetals:antimony_door", + "basemetals:antimony_double_slab", "basemetals:antimony_lever", + "basemetals:antimony_ore", + "basemetals:antimony_plate", "basemetals:antimony_pressure_plate", + "basemetals:antimony_slab", "basemetals:antimony_stairs", + "basemetals:antimony_trapdoor", "basemetals:antimony_wall", - "basemetals:double_antimony_slab", - "basemetals:antimony_ore", - "basemetals:aquarium_block", - "basemetals:aquarium_plate", "basemetals:aquarium_bars", - "basemetals:aquarium_door", - "basemetals:aquarium_trapdoor", + "basemetals:aquarium_block", "basemetals:aquarium_button", - "basemetals:aquarium_slab", + "basemetals:aquarium_door", + "basemetals:aquarium_double_slab", "basemetals:aquarium_lever", + "basemetals:aquarium_plate", "basemetals:aquarium_pressure_plate", + "basemetals:aquarium_slab", "basemetals:aquarium_stairs", + "basemetals:aquarium_trapdoor", "basemetals:aquarium_wall", - "basemetals:double_aquarium_slab", - "basemetals:bismuth_block", - "basemetals:bismuth_plate", "basemetals:bismuth_bars", - "basemetals:bismuth_door", - "basemetals:bismuth_trapdoor", + "basemetals:bismuth_block", "basemetals:bismuth_button", - "basemetals:bismuth_slab", + "basemetals:bismuth_door", + "basemetals:bismuth_double_slab", "basemetals:bismuth_lever", + "basemetals:bismuth_ore", + "basemetals:bismuth_plate", "basemetals:bismuth_pressure_plate", + "basemetals:bismuth_slab", "basemetals:bismuth_stairs", + "basemetals:bismuth_trapdoor", "basemetals:bismuth_wall", - "basemetals:double_bismuth_slab", - "basemetals:bismuth_ore", - "basemetals:brass_block", - "basemetals:brass_plate", "basemetals:brass_bars", - "basemetals:brass_door", - "basemetals:brass_trapdoor", + "basemetals:brass_block", "basemetals:brass_button", - "basemetals:brass_slab", + "basemetals:brass_door", + "basemetals:brass_double_slab", "basemetals:brass_lever", + "basemetals:brass_plate", "basemetals:brass_pressure_plate", + "basemetals:brass_slab", "basemetals:brass_stairs", + "basemetals:brass_trapdoor", "basemetals:brass_wall", - "basemetals:double_brass_slab", - "basemetals:bronze_block", - "basemetals:bronze_plate", "basemetals:bronze_bars", - "basemetals:bronze_door", - "basemetals:bronze_trapdoor", + "basemetals:bronze_block", "basemetals:bronze_button", - "basemetals:bronze_slab", + "basemetals:bronze_door", + "basemetals:bronze_double_slab", "basemetals:bronze_lever", + "basemetals:bronze_plate", "basemetals:bronze_pressure_plate", + "basemetals:bronze_slab", "basemetals:bronze_stairs", + "basemetals:bronze_trapdoor", "basemetals:bronze_wall", - "basemetals:double_bronze_slab", - "basemetals:coldiron_block", - "basemetals:coldiron_plate", + "basemetals:charcoal_block", "basemetals:coldiron_bars", - "basemetals:coldiron_door", - "basemetals:coldiron_trapdoor", + "basemetals:coldiron_block", "basemetals:coldiron_button", - "basemetals:coldiron_slab", + "basemetals:coldiron_door", + "basemetals:coldiron_double_slab", "basemetals:coldiron_lever", + "basemetals:coldiron_ore", + "basemetals:coldiron_plate", "basemetals:coldiron_pressure_plate", + "basemetals:coldiron_slab", "basemetals:coldiron_stairs", + "basemetals:coldiron_trapdoor", "basemetals:coldiron_wall", - "basemetals:double_coldiron_slab", - "basemetals:coldiron_ore", - "basemetals:copper_block", - "basemetals:copper_plate", "basemetals:copper_bars", - "basemetals:copper_door", - "basemetals:copper_trapdoor", + "basemetals:copper_block", "basemetals:copper_button", - "basemetals:copper_slab", + "basemetals:copper_door", + "basemetals:copper_double_slab", "basemetals:copper_lever", + "basemetals:copper_ore", + "basemetals:copper_plate", "basemetals:copper_pressure_plate", + "basemetals:copper_slab", "basemetals:copper_stairs", + "basemetals:copper_trapdoor", "basemetals:copper_wall", - "basemetals:double_copper_slab", - "basemetals:copper_ore", - "basemetals:cupronickel_block", - "basemetals:cupronickel_plate", "basemetals:cupronickel_bars", - "basemetals:cupronickel_door", - "basemetals:cupronickel_trapdoor", + "basemetals:cupronickel_block", "basemetals:cupronickel_button", - "basemetals:cupronickel_slab", + "basemetals:cupronickel_door", + "basemetals:cupronickel_double_slab", "basemetals:cupronickel_lever", + "basemetals:cupronickel_plate", "basemetals:cupronickel_pressure_plate", + "basemetals:cupronickel_slab", "basemetals:cupronickel_stairs", + "basemetals:cupronickel_trapdoor", "basemetals:cupronickel_wall", - "basemetals:double_cupronickel_slab", - "basemetals:electrum_block", - "basemetals:electrum_plate", + "basemetals:diamond_bars", + "basemetals:diamond_button", + "basemetals:diamond_door", + "basemetals:diamond_double_slab", + "basemetals:diamond_lever", + "basemetals:diamond_pressure_plate", + "basemetals:diamond_slab", + "basemetals:diamond_stairs", + "basemetals:diamond_trapdoor", + "basemetals:diamond_wall", "basemetals:electrum_bars", - "basemetals:electrum_door", - "basemetals:electrum_trapdoor", + "basemetals:electrum_block", "basemetals:electrum_button", - "basemetals:electrum_slab", + "basemetals:electrum_door", + "basemetals:electrum_double_slab", "basemetals:electrum_lever", + "basemetals:electrum_plate", "basemetals:electrum_pressure_plate", + "basemetals:electrum_slab", "basemetals:electrum_stairs", + "basemetals:electrum_trapdoor", "basemetals:electrum_wall", - "basemetals:double_electrum_slab", - "basemetals:invar_block", - "basemetals:invar_plate", + "basemetals:emerald_bars", + "basemetals:emerald_button", + "basemetals:emerald_door", + "basemetals:emerald_double_slab", + "basemetals:emerald_lever", + "basemetals:emerald_pressure_plate", + "basemetals:emerald_slab", + "basemetals:emerald_stairs", + "basemetals:emerald_trapdoor", + "basemetals:emerald_wall", + "basemetals:gold_bars", + "basemetals:gold_button", + "basemetals:gold_door", + "basemetals:gold_double_slab", + "basemetals:gold_lever", + "basemetals:gold_plate", + "basemetals:gold_slab", + "basemetals:gold_stairs", + "basemetals:gold_trapdoor", + "basemetals:gold_wall", "basemetals:invar_bars", - "basemetals:invar_door", - "basemetals:invar_trapdoor", + "basemetals:invar_block", "basemetals:invar_button", - "basemetals:invar_slab", + "basemetals:invar_door", + "basemetals:invar_double_slab", "basemetals:invar_lever", + "basemetals:invar_plate", "basemetals:invar_pressure_plate", + "basemetals:invar_slab", "basemetals:invar_stairs", + "basemetals:invar_trapdoor", "basemetals:invar_wall", - "basemetals:double_invar_slab", - "basemetals:lead_block", - "basemetals:lead_plate", + "basemetals:iron_button", + "basemetals:iron_double_slab", + "basemetals:iron_lever", + "basemetals:iron_plate", + "basemetals:iron_slab", + "basemetals:iron_stairs", + "basemetals:iron_wall", "basemetals:lead_bars", - "basemetals:lead_door", - "basemetals:lead_trapdoor", + "basemetals:lead_block", "basemetals:lead_button", - "basemetals:lead_slab", + "basemetals:lead_door", + "basemetals:lead_double_slab", "basemetals:lead_lever", + "basemetals:lead_ore", + "basemetals:lead_plate", "basemetals:lead_pressure_plate", + "basemetals:lead_slab", "basemetals:lead_stairs", + "basemetals:lead_trapdoor", "basemetals:lead_wall", - "basemetals:double_lead_slab", - "basemetals:lead_ore", "basemetals:mercury_ore", - "basemetals:mithril_block", - "basemetals:mithril_plate", "basemetals:mithril_bars", - "basemetals:mithril_door", - "basemetals:mithril_trapdoor", + "basemetals:mithril_block", "basemetals:mithril_button", - "basemetals:mithril_slab", + "basemetals:mithril_door", + "basemetals:mithril_double_slab", "basemetals:mithril_lever", + "basemetals:mithril_plate", "basemetals:mithril_pressure_plate", + "basemetals:mithril_slab", "basemetals:mithril_stairs", + "basemetals:mithril_trapdoor", "basemetals:mithril_wall", - "basemetals:double_mithril_slab", - "basemetals:nickel_block", - "basemetals:nickel_plate", "basemetals:nickel_bars", - "basemetals:nickel_door", - "basemetals:nickel_trapdoor", + "basemetals:nickel_block", "basemetals:nickel_button", - "basemetals:nickel_slab", + "basemetals:nickel_door", + "basemetals:nickel_double_slab", "basemetals:nickel_lever", + "basemetals:nickel_ore", + "basemetals:nickel_plate", "basemetals:nickel_pressure_plate", + "basemetals:nickel_slab", "basemetals:nickel_stairs", + "basemetals:nickel_trapdoor", "basemetals:nickel_wall", - "basemetals:double_nickel_slab", - "basemetals:nickel_ore", - "basemetals:pewter_block", - "basemetals:pewter_plate", + "basemetals:obsidian_bars", + "basemetals:obsidian_button", + "basemetals:obsidian_door", + "basemetals:obsidian_double_slab", + "basemetals:obsidian_lever", + "basemetals:obsidian_pressure_plate", + "basemetals:obsidian_slab", + "basemetals:obsidian_stairs", + "basemetals:obsidian_trapdoor", + "basemetals:obsidian_wall", "basemetals:pewter_bars", - "basemetals:pewter_door", - "basemetals:pewter_trapdoor", + "basemetals:pewter_block", "basemetals:pewter_button", - "basemetals:pewter_slab", + "basemetals:pewter_door", + "basemetals:pewter_double_slab", "basemetals:pewter_lever", + "basemetals:pewter_plate", "basemetals:pewter_pressure_plate", + "basemetals:pewter_slab", "basemetals:pewter_stairs", + "basemetals:pewter_trapdoor", "basemetals:pewter_wall", - "basemetals:double_pewter_slab", - "basemetals:platinum_block", - "basemetals:platinum_plate", "basemetals:platinum_bars", - "basemetals:platinum_door", - "basemetals:platinum_trapdoor", + "basemetals:platinum_block", "basemetals:platinum_button", - "basemetals:platinum_slab", + "basemetals:platinum_door", + "basemetals:platinum_double_slab", "basemetals:platinum_lever", + "basemetals:platinum_ore", + "basemetals:platinum_plate", "basemetals:platinum_pressure_plate", + "basemetals:platinum_slab", "basemetals:platinum_stairs", + "basemetals:platinum_trapdoor", "basemetals:platinum_wall", - "basemetals:double_platinum_slab", - "basemetals:platinum_ore", - "basemetals:silver_block", - "basemetals:silver_plate", + "basemetals:quartz_bars", + "basemetals:quartz_button", + "basemetals:quartz_door", + "basemetals:quartz_lever", + "basemetals:quartz_pressure_plate", + "basemetals:quartz_trapdoor", + "basemetals:quartz_wall", "basemetals:silver_bars", - "basemetals:silver_door", - "basemetals:silver_trapdoor", + "basemetals:silver_block", "basemetals:silver_button", - "basemetals:silver_slab", + "basemetals:silver_door", + "basemetals:silver_double_slab", "basemetals:silver_lever", + "basemetals:silver_ore", + "basemetals:silver_plate", "basemetals:silver_pressure_plate", + "basemetals:silver_slab", "basemetals:silver_stairs", + "basemetals:silver_trapdoor", "basemetals:silver_wall", - "basemetals:double_silver_slab", - "basemetals:silver_ore", - "basemetals:starsteel_block", - "basemetals:starsteel_plate", "basemetals:starsteel_bars", - "basemetals:starsteel_door", - "basemetals:starsteel_trapdoor", + "basemetals:starsteel_block", "basemetals:starsteel_button", - "basemetals:starsteel_slab", + "basemetals:starsteel_door", + "basemetals:starsteel_double_slab", "basemetals:starsteel_lever", + "basemetals:starsteel_ore", + "basemetals:starsteel_plate", "basemetals:starsteel_pressure_plate", + "basemetals:starsteel_slab", "basemetals:starsteel_stairs", + "basemetals:starsteel_trapdoor", "basemetals:starsteel_wall", - "basemetals:double_starsteel_slab", - "basemetals:starsteel_ore", - "basemetals:steel_block", - "basemetals:steel_plate", + "basemetals:steel_anvil", "basemetals:steel_bars", - "basemetals:steel_door", - "basemetals:steel_trapdoor", + "basemetals:steel_block", "basemetals:steel_button", - "basemetals:steel_slab", + "basemetals:steel_door", + "basemetals:steel_double_slab", "basemetals:steel_lever", + "basemetals:steel_plate", "basemetals:steel_pressure_plate", + "basemetals:steel_slab", "basemetals:steel_stairs", + "basemetals:steel_trapdoor", "basemetals:steel_wall", - "basemetals:double_steel_slab", - "basemetals:tin_block", - "basemetals:tin_plate", "basemetals:tin_bars", - "basemetals:tin_door", - "basemetals:tin_trapdoor", + "basemetals:tin_block", "basemetals:tin_button", - "basemetals:tin_slab", + "basemetals:tin_door", + "basemetals:tin_double_slab", "basemetals:tin_lever", + "basemetals:tin_ore", + "basemetals:tin_plate", "basemetals:tin_pressure_plate", + "basemetals:tin_slab", "basemetals:tin_stairs", + "basemetals:tin_trapdoor", "basemetals:tin_wall", - "basemetals:double_tin_slab", - "basemetals:tin_ore", - "basemetals:zinc_block", - "basemetals:zinc_plate", "basemetals:zinc_bars", - "basemetals:zinc_door", - "basemetals:zinc_trapdoor", + "basemetals:zinc_block", "basemetals:zinc_button", - "basemetals:zinc_slab", + "basemetals:zinc_door", + "basemetals:zinc_double_slab", "basemetals:zinc_lever", + "basemetals:zinc_ore", + "basemetals:zinc_plate", "basemetals:zinc_pressure_plate", + "basemetals:zinc_slab", "basemetals:zinc_stairs", + "basemetals:zinc_trapdoor", "basemetals:zinc_wall", - "basemetals:double_zinc_slab", - "basemetals:zinc_ore", - "basemetals:stone_anvil", - "basemetals:steel_anvil", - "basemetals:adamantine_anvil", "basemetals:human_detector", - "basemetals:charcoal_block", - "basemetals:diamond_bars", - "basemetals:diamond_door", - "basemetals:diamond_trapdoor", - "basemetals:diamond_button", - "basemetals:diamond_slab", - "basemetals:diamond_lever", - "basemetals:diamond_pressure_plate", - "basemetals:diamond_stairs", - "basemetals:diamond_wall", - "basemetals:double_diamond_slab", - "basemetals:emerald_bars", - "basemetals:emerald_door", - "basemetals:emerald_trapdoor", - "basemetals:emerald_button", - "basemetals:emerald_slab", - "basemetals:emerald_lever", - "basemetals:emerald_pressure_plate", - "basemetals:emerald_stairs", - "basemetals:emerald_wall", - "basemetals:double_emerald_slab", - "basemetals:gold_bars", - "basemetals:gold_door", - "basemetals:gold_trapdoor", - "basemetals:gold_button", - "basemetals:gold_slab", - "basemetals:gold_lever", - "basemetals:gold_stairs", - "basemetals:gold_wall", - "basemetals:double_gold_slab", - "basemetals:obsidian_bars", - "basemetals:obsidian_door", - "basemetals:obsidian_trapdoor", - "basemetals:obsidian_button", - "basemetals:obsidian_slab", - "basemetals:obsidian_lever", - "basemetals:obsidian_pressure_plate", - "basemetals:obsidian_stairs", - "basemetals:obsidian_wall", - "basemetals:double_obsidian_slab", - "basemetals:iron_button", - "basemetals:iron_slab", - "basemetals:iron_lever", - "basemetals:iron_stairs", - "basemetals:iron_wall", - "basemetals:double_iron_slab", - "basemetals:quartz_bars", - "basemetals:quartz_door", - "basemetals:quartz_trapdoor", - "basemetals:quartz_button", - "basemetals:quartz_lever", - "basemetals:quartz_pressure_plate", - "basemetals:quartz_wall", - "basemetals:gold_plate", - "basemetals:iron_plate" + "basemetals:stone_anvil" ] } \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/block/needs_diamond_tool.json b/src/generated/resources/data/minecraft/tags/block/needs_diamond_tool.json index 62ab10890..ad23be405 100644 --- a/src/generated/resources/data/minecraft/tags/block/needs_diamond_tool.json +++ b/src/generated/resources/data/minecraft/tags/block/needs_diamond_tool.json @@ -6,6 +6,7 @@ "basemetals:adamantine_block", "basemetals:adamantine_button", "basemetals:adamantine_door", + "basemetals:adamantine_double_slab", "basemetals:adamantine_lever", "basemetals:adamantine_ore", "basemetals:adamantine_plate", @@ -17,20 +18,17 @@ "basemetals:diamond_bars", "basemetals:diamond_button", "basemetals:diamond_door", + "basemetals:diamond_double_slab", "basemetals:diamond_lever", "basemetals:diamond_pressure_plate", "basemetals:diamond_slab", "basemetals:diamond_stairs", "basemetals:diamond_trapdoor", "basemetals:diamond_wall", - "basemetals:double_adamantine_slab", - "basemetals:double_diamond_slab", - "basemetals:double_emerald_slab", - "basemetals:double_obsidian_slab", - "basemetals:double_starsteel_slab", "basemetals:emerald_bars", "basemetals:emerald_button", "basemetals:emerald_door", + "basemetals:emerald_double_slab", "basemetals:emerald_lever", "basemetals:emerald_pressure_plate", "basemetals:emerald_slab", @@ -40,6 +38,7 @@ "basemetals:obsidian_bars", "basemetals:obsidian_button", "basemetals:obsidian_door", + "basemetals:obsidian_double_slab", "basemetals:obsidian_lever", "basemetals:obsidian_pressure_plate", "basemetals:obsidian_slab", @@ -50,6 +49,7 @@ "basemetals:starsteel_block", "basemetals:starsteel_button", "basemetals:starsteel_door", + "basemetals:starsteel_double_slab", "basemetals:starsteel_lever", "basemetals:starsteel_ore", "basemetals:starsteel_plate", diff --git a/src/generated/resources/data/minecraft/tags/block/needs_iron_tool.json b/src/generated/resources/data/minecraft/tags/block/needs_iron_tool.json index afc4f85b2..53bd80bc3 100644 --- a/src/generated/resources/data/minecraft/tags/block/needs_iron_tool.json +++ b/src/generated/resources/data/minecraft/tags/block/needs_iron_tool.json @@ -5,6 +5,7 @@ "basemetals:bronze_block", "basemetals:bronze_button", "basemetals:bronze_door", + "basemetals:bronze_double_slab", "basemetals:bronze_lever", "basemetals:bronze_plate", "basemetals:bronze_pressure_plate", @@ -16,6 +17,7 @@ "basemetals:coldiron_block", "basemetals:coldiron_button", "basemetals:coldiron_door", + "basemetals:coldiron_double_slab", "basemetals:coldiron_lever", "basemetals:coldiron_ore", "basemetals:coldiron_plate", @@ -24,16 +26,11 @@ "basemetals:coldiron_stairs", "basemetals:coldiron_trapdoor", "basemetals:coldiron_wall", - "basemetals:double_bronze_slab", - "basemetals:double_coldiron_slab", - "basemetals:double_invar_slab", - "basemetals:double_iron_slab", - "basemetals:double_mithril_slab", - "basemetals:double_steel_slab", "basemetals:invar_bars", "basemetals:invar_block", "basemetals:invar_button", "basemetals:invar_door", + "basemetals:invar_double_slab", "basemetals:invar_lever", "basemetals:invar_plate", "basemetals:invar_pressure_plate", @@ -42,6 +39,7 @@ "basemetals:invar_trapdoor", "basemetals:invar_wall", "basemetals:iron_button", + "basemetals:iron_double_slab", "basemetals:iron_lever", "basemetals:iron_plate", "basemetals:iron_slab", @@ -51,6 +49,7 @@ "basemetals:mithril_block", "basemetals:mithril_button", "basemetals:mithril_door", + "basemetals:mithril_double_slab", "basemetals:mithril_lever", "basemetals:mithril_plate", "basemetals:mithril_pressure_plate", @@ -63,6 +62,7 @@ "basemetals:steel_block", "basemetals:steel_button", "basemetals:steel_door", + "basemetals:steel_double_slab", "basemetals:steel_lever", "basemetals:steel_plate", "basemetals:steel_pressure_plate", diff --git a/src/generated/resources/data/minecraft/tags/block/needs_stone_tool.json b/src/generated/resources/data/minecraft/tags/block/needs_stone_tool.json index ecbfd47f3..635e695c0 100644 --- a/src/generated/resources/data/minecraft/tags/block/needs_stone_tool.json +++ b/src/generated/resources/data/minecraft/tags/block/needs_stone_tool.json @@ -5,6 +5,7 @@ "basemetals:aquarium_block", "basemetals:aquarium_button", "basemetals:aquarium_door", + "basemetals:aquarium_double_slab", "basemetals:aquarium_lever", "basemetals:aquarium_plate", "basemetals:aquarium_pressure_plate", @@ -16,6 +17,7 @@ "basemetals:brass_block", "basemetals:brass_button", "basemetals:brass_door", + "basemetals:brass_double_slab", "basemetals:brass_lever", "basemetals:brass_plate", "basemetals:brass_pressure_plate", @@ -28,6 +30,7 @@ "basemetals:copper_block", "basemetals:copper_button", "basemetals:copper_door", + "basemetals:copper_double_slab", "basemetals:copper_lever", "basemetals:copper_ore", "basemetals:copper_plate", @@ -40,6 +43,7 @@ "basemetals:cupronickel_block", "basemetals:cupronickel_button", "basemetals:cupronickel_door", + "basemetals:cupronickel_double_slab", "basemetals:cupronickel_lever", "basemetals:cupronickel_plate", "basemetals:cupronickel_pressure_plate", @@ -47,17 +51,11 @@ "basemetals:cupronickel_stairs", "basemetals:cupronickel_trapdoor", "basemetals:cupronickel_wall", - "basemetals:double_aquarium_slab", - "basemetals:double_brass_slab", - "basemetals:double_copper_slab", - "basemetals:double_cupronickel_slab", - "basemetals:double_electrum_slab", - "basemetals:double_nickel_slab", - "basemetals:double_silver_slab", "basemetals:electrum_bars", "basemetals:electrum_block", "basemetals:electrum_button", "basemetals:electrum_door", + "basemetals:electrum_double_slab", "basemetals:electrum_lever", "basemetals:electrum_plate", "basemetals:electrum_pressure_plate", @@ -69,6 +67,7 @@ "basemetals:nickel_block", "basemetals:nickel_button", "basemetals:nickel_door", + "basemetals:nickel_double_slab", "basemetals:nickel_lever", "basemetals:nickel_ore", "basemetals:nickel_plate", @@ -88,6 +87,7 @@ "basemetals:silver_block", "basemetals:silver_button", "basemetals:silver_door", + "basemetals:silver_double_slab", "basemetals:silver_lever", "basemetals:silver_ore", "basemetals:silver_plate", diff --git a/src/generated/resources/data/minecraft/tags/item/arrows.json b/src/generated/resources/data/minecraft/tags/item/arrows.json index a03af4ad9..52c78e964 100644 --- a/src/generated/resources/data/minecraft/tags/item/arrows.json +++ b/src/generated/resources/data/minecraft/tags/item/arrows.json @@ -2,31 +2,58 @@ "replace": false, "values": [ "basemetals:adamantine_arrow", + "basemetals:adamantine_bolt", "basemetals:antimony_arrow", + "basemetals:antimony_bolt", "basemetals:aquarium_arrow", + "basemetals:aquarium_bolt", "basemetals:bismuth_arrow", + "basemetals:bismuth_bolt", "basemetals:brass_arrow", + "basemetals:brass_bolt", "basemetals:bronze_arrow", + "basemetals:bronze_bolt", "basemetals:coldiron_arrow", + "basemetals:coldiron_bolt", "basemetals:copper_arrow", + "basemetals:copper_bolt", "basemetals:cupronickel_arrow", + "basemetals:cupronickel_bolt", "basemetals:electrum_arrow", + "basemetals:electrum_bolt", "basemetals:invar_arrow", + "basemetals:invar_bolt", "basemetals:lead_arrow", + "basemetals:lead_bolt", "basemetals:mithril_arrow", + "basemetals:mithril_bolt", "basemetals:nickel_arrow", + "basemetals:nickel_bolt", "basemetals:pewter_arrow", + "basemetals:pewter_bolt", "basemetals:platinum_arrow", + "basemetals:platinum_bolt", "basemetals:silver_arrow", + "basemetals:silver_bolt", "basemetals:starsteel_arrow", + "basemetals:starsteel_bolt", "basemetals:steel_arrow", + "basemetals:steel_bolt", "basemetals:tin_arrow", + "basemetals:tin_bolt", "basemetals:zinc_arrow", + "basemetals:zinc_bolt", "basemetals:diamond_arrow", + "basemetals:diamond_bolt", "basemetals:emerald_arrow", + "basemetals:emerald_bolt", "basemetals:gold_arrow", + "basemetals:gold_bolt", "basemetals:iron_arrow", + "basemetals:iron_bolt", "basemetals:obsidian_arrow", - "basemetals:quartz_arrow" + "basemetals:obsidian_bolt", + "basemetals:quartz_arrow", + "basemetals:quartz_bolt" ] } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/tags/block/crackhammer_crushable.json b/src/generated/resources/data/mmdlib/tags/block/crackhammer_crushable.json similarity index 100% rename from src/generated/resources/data/basemetals/tags/block/crackhammer_crushable.json rename to src/generated/resources/data/mmdlib/tags/block/crackhammer_crushable.json diff --git a/src/generated/resources/data/basemetals/tags/block/scythe_harvestable.json b/src/generated/resources/data/mmdlib/tags/block/scythe_harvestable.json similarity index 100% rename from src/generated/resources/data/basemetals/tags/block/scythe_harvestable.json rename to src/generated/resources/data/mmdlib/tags/block/scythe_harvestable.json diff --git a/src/main/java/zone/moddev/mc/basemetals/BaseMetals.java b/src/main/java/zone/moddev/mc/basemetals/BaseMetals.java index 38db8dd67..c6c245528 100644 --- a/src/main/java/zone/moddev/mc/basemetals/BaseMetals.java +++ b/src/main/java/zone/moddev/mc/basemetals/BaseMetals.java @@ -4,9 +4,10 @@ import org.apache.logging.log4j.Logger; import zone.moddev.mc.basemetals.config.BaseMetalsConfig; +import zone.moddev.mc.basemetals.content.BaseMetalBucketItem; import zone.moddev.mc.basemetals.content.ModContent; -import zone.moddev.mc.basemetals.recipe.CrushingRecipe; -import zone.moddev.mc.basemetals.entity.ModEntities; +import zone.moddev.mc.basemetals.effects.MaterialEffects; +import zone.moddev.mc.basemetals.recipe.ModRecipes; import zone.moddev.mc.basemetals.loot.ModLoot; import zone.moddev.mc.basemetals.compat.MekanismCompat; @@ -23,13 +24,14 @@ public final class BaseMetals { public static final Logger LOGGER = LogManager.getLogger(MOD_ID); public BaseMetals(IEventBus modBus, ModContainer modContainer) { - MissingMappings.registerAliases(); + // MMDLib loads mmdlib/ definitions after mod construction; the event contract + // and bucket implementation they name must already be registered. + MaterialEffects.register(); + BaseMetalBucketItem.registerImplementation(); ModContent.register(modBus); ModTabs.REGISTER.register(modBus); modBus.addListener(BaseMetalsConfig::onConfigLoading); - CrushingRecipe.TYPES.register(modBus); - CrushingRecipe.SERIALIZERS.register(modBus); - ModEntities.register(modBus); + ModRecipes.SERIALIZERS.register(modBus); ModLoot.register(modBus); modContainer.registerConfig(ModConfig.Type.COMMON, BaseMetalsConfig.SPEC); if (ModList.get().isLoaded("mekanism")) { diff --git a/src/main/java/zone/moddev/mc/basemetals/BaseMetalsAdvancements.java b/src/main/java/zone/moddev/mc/basemetals/BaseMetalsAdvancements.java index 4f7656c5d..489829a74 100644 --- a/src/main/java/zone/moddev/mc/basemetals/BaseMetalsAdvancements.java +++ b/src/main/java/zone/moddev/mc/basemetals/BaseMetalsAdvancements.java @@ -2,9 +2,8 @@ import java.util.Map; -import zone.moddev.mc.basemetals.content.CrackhammerItem; -import zone.moddev.mc.basemetals.content.MaterialBacked; -import zone.moddev.mc.basemetals.content.MaterialItems; +import zone.moddev.mc.basemetals.effects.MaterialEffects; +import zone.moddev.mc.lib.common.runtime.StandardItems; import net.minecraft.advancements.AdvancementHolder; import net.minecraft.advancements.AdvancementProgress; @@ -42,8 +41,8 @@ final class BaseMetalsAdvancements { private BaseMetalsAdvancements() {} static void onCrafted(ServerPlayer player, ItemStack result) { - if (result.getItem() instanceof CrackhammerItem) award(player, "geologist"); ResourceLocation id = BuiltInRegistries.ITEM.getKey(result.getItem()); + if (id != null && id.getPath().endsWith("_crackhammer")) award(player, "geologist"); if (id != null && id.getNamespace().equals(BaseMetals.MOD_ID) && (id.getPath().endsWith("_blend") || id.getPath().endsWith("_smallblend"))) { award(player, "metallurgy"); @@ -98,12 +97,11 @@ private static boolean fullArmor(ServerPlayer player, String material) { private static boolean mainHandSword(ServerPlayer player, String material) { ItemStack stack = player.getMainHandItem(); - return stack.getItem() instanceof MaterialItems.Sword && material(stack, material); + return stack.getItem() instanceof StandardItems.Sword && material(stack, material); } private static boolean material(ItemStack stack, String expected) { - return stack.getItem() instanceof MaterialBacked backed - && backed.baseMetalsMaterial().name().equals(expected); + return MaterialEffects.is(stack, expected); } static boolean award(ServerPlayer player, String id) { diff --git a/src/main/java/zone/moddev/mc/basemetals/BaseMetalsEvents.java b/src/main/java/zone/moddev/mc/basemetals/BaseMetalsEvents.java index 002eb6800..7785c4b6d 100644 --- a/src/main/java/zone/moddev/mc/basemetals/BaseMetalsEvents.java +++ b/src/main/java/zone/moddev/mc/basemetals/BaseMetalsEvents.java @@ -2,56 +2,32 @@ import java.util.ArrayList; import java.util.Comparator; -import java.util.EnumMap; import java.util.LinkedHashMap; import java.util.Map; -import java.util.Optional; -import zone.moddev.mc.basemetals.config.BaseMetalsConfig; -import zone.moddev.mc.basemetals.content.CrackhammerItem; -import zone.moddev.mc.basemetals.content.MaterialBacked; -import zone.moddev.mc.basemetals.content.MaterialItems; -import zone.moddev.mc.basemetals.recipe.CrushingRecipe; +import zone.moddev.mc.basemetals.content.ModContent; +import zone.moddev.mc.basemetals.material.MaterialCatalogue; +import zone.moddev.mc.basemetals.material.MaterialDefinition; +import zone.moddev.mc.basemetals.trade.BaseMetalsTrades; +import zone.moddev.mc.basemetals.migration.Legacy112WorldMigrator; +import zone.moddev.mc.lib.common.runtime.StandardItems; -import net.minecraft.core.BlockPos; -import net.minecraft.server.level.ServerLevel; import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.item.crafting.RecipeHolder; -import net.minecraft.world.item.crafting.SingleRecipeInput; -import net.minecraft.core.Holder; -import net.minecraft.tags.EntityTypeTags; import net.minecraft.core.component.DataComponents; -import net.minecraft.world.effect.MobEffectInstance; -import net.minecraft.world.effect.MobEffectCategory; -import net.minecraft.world.effect.MobEffects; -import net.minecraft.world.entity.EquipmentSlot; -import net.minecraft.world.entity.LivingEntity; -import net.minecraft.world.entity.MoverType; -import net.minecraft.world.entity.item.ItemEntity; -import net.minecraft.world.entity.player.Player; -import net.minecraft.world.item.ArmorItem; import net.minecraft.world.item.ItemStack; -import net.minecraft.world.item.TieredItem; -import net.minecraft.world.level.block.state.BlockState; import net.minecraft.resources.ResourceLocation; import net.minecraft.tags.ItemTags; import net.minecraft.world.level.storage.LevelResource; -import net.neoforged.bus.api.EventPriority; import net.neoforged.bus.api.SubscribeEvent; import net.neoforged.neoforge.event.level.BlockEvent; import net.neoforged.neoforge.event.village.VillagerTradesEvent; import net.neoforged.neoforge.event.server.ServerAboutToStartEvent; import net.neoforged.neoforge.event.tick.PlayerTickEvent; -import net.neoforged.neoforge.event.entity.living.LivingIncomingDamageEvent; import net.neoforged.neoforge.event.entity.player.PlayerEvent; import net.neoforged.neoforge.event.AnvilUpdateEvent; -import zone.moddev.mc.basemetals.content.ModContent; -import zone.moddev.mc.basemetals.material.MaterialDefinition; -import zone.moddev.mc.basemetals.trade.BaseMetalsTrades; -import zone.moddev.mc.basemetals.migration.Legacy112WorldMigrator; - /** NeoForge event handlers for Base Metals. */ public final class BaseMetalsEvents { @SubscribeEvent @@ -84,136 +60,20 @@ public void onServerAboutToStart(ServerAboutToStartEvent event) { } } - @SubscribeEvent(priority = EventPriority.LOWEST) - public void onBreak(BlockEvent.BreakEvent event) { - if (!(event.getLevel() instanceof ServerLevel level) || !(event.getPlayer() instanceof ServerPlayer player)) { - return; - } - ItemStack held = player.getMainHandItem(); - if (held.getItem() instanceof CrackhammerItem && !player.isCreative() - && event.getState().canHarvestBlock(level, event.getPos(), player)) { - Optional> recipe = level.getRecipeManager().getRecipeFor(CrushingRecipe.TYPE.get(), - new SingleRecipeInput(new ItemStack(event.getState().getBlock())), level); - if (recipe.isPresent()) { - event.setCanceled(true); - event.getState().getBlock().playerWillDestroy(level, event.getPos(), event.getState(), player); - boolean removed = event.getState().onDestroyedByPlayer(level, event.getPos(), player, - true, level.getFluidState(event.getPos())); - if (!removed) return; - event.getState().getBlock().destroy(level, event.getPos(), event.getState()); - ItemStack result = recipe.get().value().getResultItem(level.registryAccess()); - ItemEntity entity = new ItemEntity(level, event.getPos().getX() + 0.5D, - event.getPos().getY() + 0.5D, event.getPos().getZ() + 0.5D, result); - entity.setDefaultPickUpDelay(); - level.addFreshEntity(entity); - player.awardStat(net.minecraft.stats.Stats.BLOCK_MINED.get(event.getState().getBlock())); - player.causeFoodExhaustion(0.005F); - held.hurtAndBreak(1, player, EquipmentSlot.MAINHAND); - return; - } - } - } - @SubscribeEvent public void onPlayerTick(PlayerTickEvent.Post event) { - Player player = event.getEntity(); - if (player.level().isClientSide) return; - if (BaseMetalsConfig.STARSTEEL_REGENERATION.get() && player.tickCount % 200 == 0) { - repairStarsteel(player.getMainHandItem()); - repairStarsteel(player.getOffhandItem()); - } - if (player.tickCount % 20 != 0) return; - if (player instanceof ServerPlayer serverPlayer) { - BaseMetalsAdvancements.onEquipment(serverPlayer); - } - if (!BaseMetalsConfig.SPECIAL_EFFECTS.get()) return; - Map armor = armorMaterials(player); - applyArmorEffects(player, armor); - } - - private static void repairStarsteel(ItemStack stack) { - if (stack.getItem() instanceof MaterialBacked backed - && !(stack.getItem() instanceof ArmorItem) - && backed.baseMetalsMaterial().name().equals("starsteel") && stack.isDamaged()) { - stack.setDamageValue(stack.getDamageValue() - 1); - } - } - - private static Map armorMaterials(Player player) { - Map result = new EnumMap<>(EquipmentSlot.class); - for (EquipmentSlot slot : new EquipmentSlot[] { - EquipmentSlot.HEAD, EquipmentSlot.CHEST, EquipmentSlot.LEGS, EquipmentSlot.FEET}) { - ItemStack stack = player.getItemBySlot(slot); - if (stack.getItem() instanceof ArmorItem && stack.getItem() instanceof MaterialBacked backed) { - result.put(slot, backed.baseMetalsMaterial().name()); - } - } - return result; - } - - private static int count(Map armor, String material) { - return (int) armor.values().stream().filter(material::equals).count(); - } - - private static void applyArmorEffects(Player player, Map armor) { - int adamantine = count(armor, "adamantine"); - if (adamantine >= 2) add(player, MobEffects.DAMAGE_RESISTANCE, adamantine == 4 ? 1 : 0); - int lead = count(armor, "lead"); - if (lead >= 2) add(player, MobEffects.MOVEMENT_SLOWDOWN, lead == 4 ? 1 : 0); - if (count(armor, "coldiron") == 4) add(player, MobEffects.FIRE_RESISTANCE, 0); - if (count(armor, "aquarium") == 4 && player.isUnderWater()) { - add(player, MobEffects.WATER_BREATHING, 0); - add(player, MobEffects.DAMAGE_RESISTANCE, 0); - player.removeEffect(MobEffects.DIG_SLOWDOWN); - } - if (count(armor, "mithril") == 4) { - for (MobEffectInstance effect : new ArrayList<>(player.getActiveEffects())) { - if (effect.getEffect().value().getCategory() == MobEffectCategory.HARMFUL) { - player.removeEffect(effect.getEffect()); - } - } - } - int starsteel = count(armor, "starsteel"); - if (starsteel > 0) add(player, MobEffects.JUMP, starsteel - 1); - if (starsteel >= 2) add(player, MobEffects.MOVEMENT_SPEED, Math.min(2, starsteel - 2)); - } - - private static void add(Player player, Holder effect, int amplifier) { - player.addEffect(new MobEffectInstance(effect, 45, amplifier, false, false, true)); - } - - @SubscribeEvent - public void onLivingHurt(LivingIncomingDamageEvent event) { - if (!BaseMetalsConfig.SPECIAL_EFFECTS.get() || event.getEntity().level().isClientSide - || !(event.getSource().getEntity() instanceof LivingEntity attacker)) return; - ItemStack held = attacker.getMainHandItem(); - if (!(held.getItem() instanceof MaterialBacked backed) || !(held.getItem() instanceof TieredItem)) return; - LivingEntity target = event.getEntity(); - switch (backed.baseMetalsMaterial().name()) { - case "adamantine" -> { - if (target.getMaxHealth() > 20.0F) event.setAmount(event.getAmount() + 4.0F); - } - case "aquarium" -> { - if (target.canBreatheUnderwater()) event.setAmount(event.getAmount() + 4.0F); - } - case "coldiron" -> { - if (target.fireImmune()) event.setAmount(event.getAmount() + 3.0F); - } - case "mithril" -> { - if (target.getType().is(EntityTypeTags.UNDEAD)) { - target.addEffect(new MobEffectInstance(MobEffects.WITHER, 60, 3)); - target.addEffect(new MobEffectInstance(MobEffects.BLINDNESS, 60, 1)); - } - } - default -> { } + // Material effects are MMDLib player-tick handlers; see effects.MaterialEffects. + if (event.getEntity() instanceof ServerPlayer player && player.tickCount % 20 == 0) { + BaseMetalsAdvancements.onEquipment(player); } } @SubscribeEvent public void onShieldUpgrade(AnvilUpdateEvent event) { - if (!(event.getLeft().getItem() instanceof zone.moddev.mc.basemetals.content.MaterialItems.Shield shield) + if (!(event.getLeft().getItem() instanceof StandardItems.Shield shield) || event.getLeft().getCount() != 1 || event.getRight().getCount() != 1) return; - MaterialDefinition current = shield.baseMetalsMaterial(); + MaterialDefinition current = MaterialCatalogue.of(shield.material()).orElse(null); + if (current == null) return; MaterialDefinition upgrade = shieldMaterials().values().stream() .filter(candidate -> candidate.hardness() > current.hardness()) .filter(candidate -> event.getRight().is(ItemTags.create( @@ -234,10 +94,8 @@ public void onShieldUpgrade(AnvilUpdateEvent event) { private static Map shieldMaterials() { Map materials = new LinkedHashMap<>(); - ModContent.itemsById().values().forEach(reference -> { - if (reference.get() instanceof MaterialItems.Shield shield) { - materials.putIfAbsent(shield.baseMetalsMaterial().name(), shield.baseMetalsMaterial()); - } + ModContent.materials().forEach((name, content) -> { + if (content.items().containsKey("shield")) materials.put(name, content.definition()); }); return materials; } diff --git a/src/main/java/zone/moddev/mc/basemetals/MissingMappings.java b/src/main/java/zone/moddev/mc/basemetals/MissingMappings.java index b2b693793..ab4cce8ba 100644 --- a/src/main/java/zone/moddev/mc/basemetals/MissingMappings.java +++ b/src/main/java/zone/moddev/mc/basemetals/MissingMappings.java @@ -1,50 +1,67 @@ package zone.moddev.mc.basemetals; +import java.util.HashSet; import java.util.List; +import java.util.Set; import net.minecraft.resources.ResourceLocation; import net.neoforged.neoforge.registries.DeferredRegister; import zone.moddev.mc.basemetals.content.ModContent; +import zone.moddev.mc.lib.common.runtime.RuntimeContentRegistrar; /** Registry-name aliases used when loading older Minecraft and Base Metals saves. */ public final class MissingMappings { private MissingMappings() {} + /** Called once Base Metals content has been queued, before registry events. */ public static void registerAliases() { + // MMDLib 2.0 registers its own mmdlib: content; never alias over a real entry. + Set registered = new HashSet<>(); + RuntimeContentRegistrar.instances().forEach(registrar -> { + registered.addAll(registrar.items().keySet()); + registered.addAll(registrar.blocks().keySet()); + }); for (String namespace : List.of(BaseMetals.MOD_ID, "mmdlib")) { - ModContent.blocksById().keySet().forEach(path -> alias(ModContent.BLOCKS, + ModContent.blocksById().keySet().forEach(path -> alias(ModContent.BLOCKS, registered, namespace, path, id(BaseMetals.MOD_ID, path))); - ModContent.itemsById().keySet().forEach(path -> alias(ModContent.ITEMS, + ModContent.hiddenBlocks().forEach(path -> alias(ModContent.BLOCKS, registered, + namespace, legacyDoubleSlab(path), id(BaseMetals.MOD_ID, path))); + ModContent.itemsById().keySet().forEach(path -> alias(ModContent.ITEMS, registered, namespace, path, itemTargetId(path))); ModContent.itemsById().keySet().stream().filter(path -> path.endsWith("_door")) - .forEach(path -> alias(ModContent.ITEMS, namespace, path + "_item", + .forEach(path -> alias(ModContent.ITEMS, registered, namespace, path + "_item", id(BaseMetals.MOD_ID, path))); - ModContent.fluids().keySet().forEach(path -> alias(ModContent.FLUIDS, + ModContent.fluids().keySet().forEach(path -> alias(ModContent.FLUIDS, registered, namespace, path, id(BaseMetals.MOD_ID, path))); - alias(ModContent.BLOCKS, namespace, "liquid_mercury", id(BaseMetals.MOD_ID, "mercury")); - alias(ModContent.ITEMS, namespace, "liquid_mercury", id(BaseMetals.MOD_ID, "mercury_bucket")); - alias(ModContent.ITEMS, namespace, "carbon_powder", id(BaseMetals.MOD_ID, "coal_powder")); - alias(ModContent.ITEMS, namespace, "iron_nugget", id("minecraft", "iron_nugget")); - alias(ModContent.FLUIDS, namespace, "liquid_mercury", id(BaseMetals.MOD_ID, "mercury")); + alias(ModContent.BLOCKS, registered, namespace, "liquid_mercury", id(BaseMetals.MOD_ID, "mercury")); + alias(ModContent.ITEMS, registered, namespace, "liquid_mercury", id(BaseMetals.MOD_ID, "mercury_bucket")); + alias(ModContent.ITEMS, registered, namespace, "carbon_powder", itemTargetId("carbon_powder")); + alias(ModContent.ITEMS, registered, namespace, "iron_nugget", id("minecraft", "iron_nugget")); + alias(ModContent.FLUIDS, registered, namespace, "liquid_mercury", id(BaseMetals.MOD_ID, "mercury")); } for (String path : List.of("sign", "wall_sign")) { - alias(ModContent.BLOCKS, "minecraft", path, vanilla114Target(id("minecraft", path))); + alias(ModContent.BLOCKS, registered, "minecraft", path, vanilla114Target(id("minecraft", path))); } for (String path : List.of("sign", "rose_red", "cactus_green", "dandelion_yellow")) { - alias(ModContent.ITEMS, "minecraft", path, vanilla114Target(id("minecraft", path))); + alias(ModContent.ITEMS, registered, "minecraft", path, vanilla114Target(id("minecraft", path))); } } + /** Base Metals named compatibility slabs double_X_slab; MMDLib names them X_double_slab. */ + private static String legacyDoubleSlab(String path) { + return "double_" + path.substring(0, path.length() - "_double_slab".length()) + "_slab"; + } + private static ResourceLocation id(String namespace, String path) { return ResourceLocation.fromNamespaceAndPath(namespace, path); } - private static void alias(DeferredRegister registry, String namespace, - String oldPath, ResourceLocation target) { + private static void alias(DeferredRegister registry, Set registered, + String namespace, String oldPath, ResourceLocation target) { ResourceLocation oldId = id(namespace, oldPath); // Identity aliases would introduce a resolution loop. - if (!oldId.equals(target)) registry.addAlias(oldId, target); + if (!oldId.equals(target) && !registered.contains(oldId)) registry.addAlias(oldId, target); } public static ResourceLocation vanilla114Target(ResourceLocation oldName) { @@ -62,16 +79,20 @@ public static ResourceLocation vanilla114Target(ResourceLocation oldName) { } public static String blockTargetPath(String path) { + if (path.startsWith("double_") && path.endsWith("_slab")) { + return path.substring("double_".length(), path.length() - "_slab".length()) + "_double_slab"; + } return "liquid_mercury".equals(path) ? "mercury" : path; } public static String itemTargetPath(String path) { - if ("carbon_powder".equals(path)) return "coal_powder"; if ("liquid_mercury".equals(path)) return "mercury_bucket"; return path.endsWith("_door_item") ? path.substring(0, path.length() - "_item".length()) : path; } public static ResourceLocation itemTargetId(String path) { + // 1.12's carbon powder is the coal vanilla extension's powder. + if ("carbon_powder".equals(path)) return ResourceLocation.fromNamespaceAndPath(BaseMetals.MOD_ID, "coal_powder"); return "iron_nugget".equals(path) ? ResourceLocation.fromNamespaceAndPath("minecraft", "iron_nugget") : ResourceLocation.fromNamespaceAndPath(BaseMetals.MOD_ID, itemTargetPath(path)); diff --git a/src/main/java/zone/moddev/mc/basemetals/ModTabs.java b/src/main/java/zone/moddev/mc/basemetals/ModTabs.java index 183b63a39..2c2471da9 100644 --- a/src/main/java/zone/moddev/mc/basemetals/ModTabs.java +++ b/src/main/java/zone/moddev/mc/basemetals/ModTabs.java @@ -4,15 +4,13 @@ import net.minecraft.network.chat.Component; import net.minecraft.world.item.BlockItem; import net.minecraft.world.item.CreativeModeTab; -import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.Item; import net.neoforged.neoforge.registries.DeferredRegister; import net.neoforged.neoforge.registries.DeferredHolder; -import zone.moddev.mc.basemetals.content.BaseMetalAmmoItem; -import zone.moddev.mc.basemetals.content.CrackhammerItem; -import zone.moddev.mc.basemetals.content.MaterialItems; import zone.moddev.mc.basemetals.content.ModContent; -import zone.moddev.mc.basemetals.content.ScytheItem; +import zone.moddev.mc.lib.common.runtime.MaterialAmmoItem; +import zone.moddev.mc.lib.common.runtime.ScytheItem; +import zone.moddev.mc.lib.common.runtime.StandardItems; public final class ModTabs { private ModTabs() {} @@ -20,59 +18,33 @@ private ModTabs() {} public static final DeferredRegister REGISTER = DeferredRegister.create(Registries.CREATIVE_MODE_TAB, BaseMetals.MOD_ID); - public static final DeferredHolder BLOCKS = REGISTER.register("blocks", () -> - CreativeModeTab.builder() - .title(Component.translatable("itemGroup.basemetals.blocks")) - .icon(() -> ModContent.item("starsteel_block").get().getDefaultInstance()) - .displayItems((parameters, output) -> ModContent.itemsById().forEach((id, entry) -> { - // Molten block items are kept for old saves; filled buckets are shown instead. - if (!ModContent.fluids().containsKey(id) && category(entry.get()).equals("blocks")) { - output.accept(entry.get()); - } - })).build()); - public static final DeferredHolder ITEMS = REGISTER.register("items", () -> - CreativeModeTab.builder() - .title(Component.translatable("itemGroup.basemetals.items")) - .icon(() -> ModContent.item("starsteel_gear").get().getDefaultInstance()) - .displayItems((parameters, output) -> ModContent.itemsById().forEach((id, entry) -> { - // Molten block items are kept for old saves; filled buckets are shown instead. - if (!ModContent.fluids().containsKey(id) && category(entry.get()).equals("items")) { - output.accept(entry.get()); - } - })).build()); - public static final DeferredHolder TOOLS = REGISTER.register("tools", () -> - CreativeModeTab.builder() - .title(Component.translatable("itemGroup.basemetals.tools")) - .icon(() -> ModContent.item("starsteel_pickaxe").get().getDefaultInstance()) - .displayItems((parameters, output) -> ModContent.itemsById().forEach((id, entry) -> { - // Molten block items are kept for old saves; filled buckets are shown instead. - if (!ModContent.fluids().containsKey(id) && category(entry.get()).equals("tools")) { - output.accept(entry.get()); - } - })).build()); - public static final DeferredHolder COMBAT = REGISTER.register("combat", () -> - CreativeModeTab.builder() - .title(Component.translatable("itemGroup.basemetals.combat")) - .icon(() -> ModContent.item("starsteel_sword").get().getDefaultInstance()) + public static final DeferredHolder BLOCKS = tab("blocks", "starsteel_block"); + public static final DeferredHolder ITEMS = tab("items", "starsteel_gear"); + public static final DeferredHolder TOOLS = tab("tools", "starsteel_pickaxe"); + public static final DeferredHolder COMBAT = tab("combat", "starsteel_sword"); + + private static DeferredHolder tab(String category, String icon) { + return REGISTER.register(category, () -> CreativeModeTab.builder() + .title(Component.translatable("itemGroup.basemetals." + category)) + .icon(() -> ModContent.item(icon).get().getDefaultInstance()) .displayItems((parameters, output) -> ModContent.itemsById().forEach((id, entry) -> { - // Molten block items are kept for old saves; filled buckets are shown instead. - if (!ModContent.fluids().containsKey(id) && category(entry.get()).equals("combat")) { - output.accept(entry.get()); - } + // Molten block items are kept for old saves; filled buckets are shown instead. + if (!ModContent.fluids().containsKey(id) && category(entry.get()).equals(category)) { + output.accept(entry.get()); + } })).build()); + } - - public static String category(Item item) { + public static String category(Item item) { if (item instanceof BlockItem) return "blocks"; - if (item instanceof CrackhammerItem || item instanceof ScytheItem - || item instanceof MaterialItems.Pickaxe || item instanceof MaterialItems.Axe - || item instanceof MaterialItems.Shovel || item instanceof MaterialItems.Hoe - || item instanceof MaterialItems.Shears || item instanceof MaterialItems.FishingRod) return "tools"; - if (item instanceof MaterialItems.Sword || item instanceof MaterialItems.Bow - || item instanceof MaterialItems.Crossbow || item instanceof MaterialItems.Armor - || item instanceof MaterialItems.HorseArmor || item instanceof MaterialItems.Shield - || item instanceof BaseMetalAmmoItem) return "combat"; + if (item instanceof StandardItems.Tool || item instanceof ScytheItem + || item instanceof StandardItems.Pickaxe || item instanceof StandardItems.Axe + || item instanceof StandardItems.Shovel || item instanceof StandardItems.Hoe + || item instanceof StandardItems.Shears || item instanceof StandardItems.FishingRod) return "tools"; + if (item instanceof StandardItems.Sword || item instanceof StandardItems.Bow + || item instanceof StandardItems.Crossbow || item instanceof StandardItems.Armor + || item instanceof StandardItems.HorseArmor || item instanceof StandardItems.Shield + || item instanceof MaterialAmmoItem) return "combat"; return "items"; } - } diff --git a/src/main/java/zone/moddev/mc/basemetals/ModTags.java b/src/main/java/zone/moddev/mc/basemetals/ModTags.java deleted file mode 100644 index 570f62abc..000000000 --- a/src/main/java/zone/moddev/mc/basemetals/ModTags.java +++ /dev/null @@ -1,16 +0,0 @@ -package zone.moddev.mc.basemetals; - -import net.minecraft.core.Registry; -import net.minecraft.resources.ResourceLocation; -import net.minecraft.tags.BlockTags; -import net.minecraft.tags.TagKey; -import net.minecraft.world.level.block.Block; - -public final class ModTags { - public static final TagKey SCYTHE_HARVESTABLE = BlockTags.create( - ResourceLocation.fromNamespaceAndPath(BaseMetals.MOD_ID, "scythe_harvestable")); - public static final TagKey CRACKHAMMER_CRUSHABLE = BlockTags.create( - ResourceLocation.fromNamespaceAndPath(BaseMetals.MOD_ID, "crackhammer_crushable")); - - private ModTags() {} -} diff --git a/src/main/java/zone/moddev/mc/basemetals/client/ClientSetup.java b/src/main/java/zone/moddev/mc/basemetals/client/ClientSetup.java index 7163880e4..1255f5532 100644 --- a/src/main/java/zone/moddev/mc/basemetals/client/ClientSetup.java +++ b/src/main/java/zone/moddev/mc/basemetals/client/ClientSetup.java @@ -1,40 +1,30 @@ package zone.moddev.mc.basemetals.client; import zone.moddev.mc.basemetals.BaseMetals; -import zone.moddev.mc.basemetals.content.MaterialItems; import zone.moddev.mc.basemetals.content.MetalFluidType; import zone.moddev.mc.basemetals.content.ModContent; -import zone.moddev.mc.basemetals.entity.ModEntities; import net.minecraft.client.renderer.ItemBlockRenderTypes; import net.minecraft.client.renderer.RenderType; -import net.minecraft.client.renderer.item.ItemProperties; -import net.minecraft.resources.ResourceLocation; -import net.minecraft.world.entity.player.Player; -import net.minecraft.world.item.FishingRodItem; +import net.minecraft.world.item.Item; import net.minecraft.world.level.block.Block; -import net.minecraft.world.level.block.DoorBlock; -import net.minecraft.world.level.block.IronBarsBlock; -import net.minecraft.world.level.block.TrapDoorBlock; import net.neoforged.api.distmarker.Dist; -import net.neoforged.neoforge.client.event.EntityRenderersEvent; import net.neoforged.bus.api.SubscribeEvent; import net.neoforged.fml.event.lifecycle.FMLClientSetupEvent; import net.neoforged.fml.common.EventBusSubscriber; import net.neoforged.fml.ModList; +import net.neoforged.neoforge.client.event.RegisterColorHandlersEvent; import net.neoforged.neoforge.client.gui.IConfigScreenFactory; import net.neoforged.neoforge.client.extensions.common.RegisterClientExtensionsEvent; +/** + * Client hooks for Base Metals. MMDLib's runtime client registers projectile renderers, + * bow/crossbow/rod/shield item properties and cutout layers for registrar content. + */ @EventBusSubscriber(modid = BaseMetals.MOD_ID, bus = EventBusSubscriber.Bus.MOD, value = Dist.CLIENT) public final class ClientSetup { private ClientSetup() {} - @SubscribeEvent - public static void registerRenderers(EntityRenderersEvent.RegisterRenderers event) { - event.registerEntityRenderer(ModEntities.CUSTOM_ARROW.get(), MaterialProjectileRenderer::new); - event.registerEntityRenderer(ModEntities.CUSTOM_BOLT.get(), MaterialProjectileRenderer::new); - } - @SubscribeEvent public static void clientSetup(FMLClientSetupEvent event) { ModList.get().getModContainerById(BaseMetals.MOD_ID).orElseThrow() @@ -48,36 +38,23 @@ public static void clientSetup(FMLClientSetupEvent event) { ItemBlockRenderTypes.setRenderLayer(fluid.source().get(), RenderType.translucent()); ItemBlockRenderTypes.setRenderLayer(fluid.flowing().get(), RenderType.translucent()); }); - ModContent.blocksById().values().stream() - .map(entry -> entry.get()) - .forEach(ClientSetup::registerBlockRenderLayer); - - ModContent.itemsById().values().forEach(entry -> { - net.minecraft.world.item.Item item = entry.get(); - if (item instanceof MaterialItems.Bow || item instanceof MaterialItems.Crossbow) { - ItemProperties.register(item, ResourceLocation.withDefaultNamespace("pull"), (stack, level, user, seed) -> - user == null || user.getUseItem() != stack ? 0.0F - : (float) (stack.getUseDuration(user) - user.getUseItemRemainingTicks()) / 20.0F); - ItemProperties.register(item, ResourceLocation.withDefaultNamespace("pulling"), (stack, level, user, seed) -> - user != null && user.isUsingItem() && user.getUseItem() == stack ? 1.0F : 0.0F); - } - if (item instanceof MaterialItems.Shield) { - ItemProperties.register(item, ResourceLocation.withDefaultNamespace("blocking"), (stack, level, user, seed) -> - user != null && user.isUsingItem() && user.getUseItem() == stack ? 1.0F : 0.0F); - } - if (item instanceof MaterialItems.FishingRod) { - ItemProperties.register(item, ResourceLocation.withDefaultNamespace("cast"), (stack, level, user, seed) -> { - if (user == null) return 0.0F; - boolean main = user.getMainHandItem() == stack; - boolean off = user.getOffhandItem() == stack; - if (user.getMainHandItem().getItem() instanceof FishingRodItem) off = false; - return (main || off) && user instanceof Player player && player.fishing != null ? 1.0F : 0.0F; - }); - } - }); }); } + // MMDLib tints layer 0 of every registrar item and block with the material colour. + // Base Metals artwork is already coloured; this mod's handlers register after MMDLib's. + @SubscribeEvent + public static void itemColours(RegisterColorHandlersEvent.Item event) { + event.register((stack, layer) -> -1, ModContent.registrar().items().values().stream() + .map(holder -> (Item) holder.get()).toArray(Item[]::new)); + } + + @SubscribeEvent + public static void blockColours(RegisterColorHandlersEvent.Block event) { + event.register((state, level, pos, layer) -> -1, ModContent.registrar().blocks().values().stream() + .map(holder -> (Block) holder.get()).toArray(Block[]::new)); + } + @SubscribeEvent public static void registerClientExtensions(RegisterClientExtensionsEvent event) { // Register each fluid extension once through the current event API. @@ -88,12 +65,4 @@ public static void registerClientExtensions(RegisterClientExtensionsEvent event) } }); } - - private static void registerBlockRenderLayer(Block block) { - if (block instanceof IronBarsBlock) { - ItemBlockRenderTypes.setRenderLayer(block, RenderType.cutoutMipped()); - } else if (block instanceof DoorBlock || block instanceof TrapDoorBlock) { - ItemBlockRenderTypes.setRenderLayer(block, RenderType.cutout()); - } - } } diff --git a/src/main/java/zone/moddev/mc/basemetals/client/MaterialProjectileRenderer.java b/src/main/java/zone/moddev/mc/basemetals/client/MaterialProjectileRenderer.java deleted file mode 100644 index 35d76bd40..000000000 --- a/src/main/java/zone/moddev/mc/basemetals/client/MaterialProjectileRenderer.java +++ /dev/null @@ -1,51 +0,0 @@ -package zone.moddev.mc.basemetals.client; - -import com.mojang.blaze3d.vertex.PoseStack; -import com.mojang.blaze3d.vertex.VertexConsumer; -import zone.moddev.mc.basemetals.content.MaterialBacked; -import zone.moddev.mc.basemetals.entity.MaterialProjectile; - -import net.minecraft.client.renderer.MultiBufferSource; -import net.minecraft.client.renderer.entity.ArrowRenderer; -import net.minecraft.client.renderer.entity.EntityRendererProvider; -import net.minecraft.client.renderer.entity.TippableArrowRenderer; -import net.minecraft.client.renderer.texture.OverlayTexture; -import net.minecraft.resources.ResourceLocation; - -/** - * Uses vanilla's trajectory-aligned arrow geometry while tinting it from the - * exact ammunition item retained by the shared projectile entity. - */ -public final class MaterialProjectileRenderer extends ArrowRenderer { - private int colour = 0xFFFFFF; - - public MaterialProjectileRenderer(EntityRendererProvider.Context context) { - super(context); - } - - @Override - public void render(MaterialProjectile projectile, float yaw, float partialTicks, - PoseStack poses, MultiBufferSource buffers, int packedLight) { - colour = projectile.getItem().getItem() instanceof MaterialBacked backed - ? backed.baseMetalsMaterial().colour() - : 0xFFFFFF; - super.render(projectile, yaw, partialTicks, poses, buffers, packedLight); - } - - @Override - public void vertex(PoseStack.Pose pose, VertexConsumer vertices, - int x, int y, int z, float u, float v, int normalX, int normalY, - int normalZ, int packedLight) { - vertices.addVertex(pose, x, y, z) - .setColor((colour >> 16) & 0xFF, (colour >> 8) & 0xFF, colour & 0xFF, 0xFF) - .setUv(u, v) - .setOverlay(OverlayTexture.NO_OVERLAY) - .setLight(packedLight) - .setNormal(pose, normalX, normalZ, normalY); - } - - @Override - public ResourceLocation getTextureLocation(MaterialProjectile projectile) { - return TippableArrowRenderer.NORMAL_ARROW_LOCATION; - } -} diff --git a/src/main/java/zone/moddev/mc/basemetals/client/MaterialTooltips.java b/src/main/java/zone/moddev/mc/basemetals/client/MaterialTooltips.java new file mode 100644 index 000000000..ff32e18c8 --- /dev/null +++ b/src/main/java/zone/moddev/mc/basemetals/client/MaterialTooltips.java @@ -0,0 +1,48 @@ +package zone.moddev.mc.basemetals.client; + +import java.util.Map; + +import zone.moddev.mc.basemetals.BaseMetals; +import zone.moddev.mc.lib.common.runtime.MaterialBacked; + +import net.minecraft.network.chat.Component; +import net.minecraft.world.item.ArmorItem; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.ProjectileWeaponItem; +import net.minecraft.world.item.ShearsItem; +import net.minecraft.world.item.ShieldItem; +import net.minecraft.world.item.FishingRodItem; +import net.minecraft.world.item.TieredItem; +import net.neoforged.api.distmarker.Dist; +import net.neoforged.bus.api.SubscribeEvent; +import net.neoforged.fml.common.EventBusSubscriber; +import net.neoforged.neoforge.event.entity.player.ItemTooltipEvent; + +/** Describes each special material's effect on its equipment. */ +@EventBusSubscriber(modid = BaseMetals.MOD_ID, bus = EventBusSubscriber.Bus.GAME, value = Dist.CLIENT) +public final class MaterialTooltips { + // Material -> bonus shown in its tool tooltip; 0 when that tooltip takes no value. + private static final Map TOOL_BONUS = Map.of( + "adamantine", 4, "aquarium", 4, "coldiron", 3, "mithril", 0, "starsteel", 10); + + private MaterialTooltips() {} + + @SubscribeEvent + public static void tooltip(ItemTooltipEvent event) { + Item item = event.getItemStack().getItem(); + if (!(item instanceof MaterialBacked backed)) return; + String material = backed.material().name() + .filter(id -> id.getNamespace().equals(BaseMetals.MOD_ID)) + .map(id -> id.getPath()).orElse(null); + if (material == null || !TOOL_BONUS.containsKey(material)) return; + if (item instanceof ArmorItem) { + event.getToolTip().add(Component.translatable("tooltip." + material + ".armor")); + } else if (item instanceof TieredItem || item instanceof ShearsItem || item instanceof ShieldItem + || item instanceof ProjectileWeaponItem || item instanceof FishingRodItem) { + int bonus = TOOL_BONUS.get(material); + event.getToolTip().add(bonus == 0 + ? Component.translatable("tooltip." + material + ".tool") + : Component.translatable("tooltip." + material + ".tool", bonus)); + } + } +} diff --git a/src/main/java/zone/moddev/mc/basemetals/compat/MekanismCompat.java b/src/main/java/zone/moddev/mc/basemetals/compat/MekanismCompat.java index aeade3176..12915c614 100644 --- a/src/main/java/zone/moddev/mc/basemetals/compat/MekanismCompat.java +++ b/src/main/java/zone/moddev/mc/basemetals/compat/MekanismCompat.java @@ -28,17 +28,21 @@ public final class MekanismCompat { static { for (String name : PROCESSING_MATERIALS) { - int colour = MaterialCatalogue.get(name).colour(); ResourceLocation oreTag = ResourceLocation.fromNamespaceAndPath("c", "ores/" + name); DIRTY.put(name, SLURRIES.register("dirty_" + name, - () -> new Chemical(ChemicalBuilder.dirtySlurry().ore(oreTag).tint(colour)))); + () -> new Chemical(ChemicalBuilder.dirtySlurry().ore(oreTag).tint(colour(name))))); CLEAN.put(name, SLURRIES.register("clean_" + name, - () -> new Chemical(ChemicalBuilder.cleanSlurry().tint(colour).ore(oreTag)))); + () -> new Chemical(ChemicalBuilder.cleanSlurry().tint(colour(name)).ore(oreTag)))); } } private MekanismCompat() {} + // Materials load after mod construction, so colours are read when the slurry registers. + private static int colour(String name) { + return MaterialCatalogue.get(name).colour(); + } + public static void register(IEventBus modBus) { SLURRIES.register(modBus); } diff --git a/src/main/java/zone/moddev/mc/basemetals/content/BaseMetalAmmoItem.java b/src/main/java/zone/moddev/mc/basemetals/content/BaseMetalAmmoItem.java deleted file mode 100644 index 0dbc858bf..000000000 --- a/src/main/java/zone/moddev/mc/basemetals/content/BaseMetalAmmoItem.java +++ /dev/null @@ -1,46 +0,0 @@ -package zone.moddev.mc.basemetals.content; - -import java.util.function.Supplier; -import javax.annotation.Nullable; - -import zone.moddev.mc.basemetals.entity.MaterialProjectile; -import zone.moddev.mc.basemetals.material.MaterialDefinition; - -import net.minecraft.world.entity.EntityType; -import net.minecraft.world.entity.LivingEntity; -import net.minecraft.world.entity.projectile.AbstractArrow; -import net.minecraft.world.item.ArrowItem; -import net.minecraft.world.item.ItemStack; -import net.minecraft.world.level.Level; - -public final class BaseMetalAmmoItem extends ArrowItem implements MaterialBacked { - public enum Kind { ARROW, BOLT } - private final MaterialDefinition material; - private final Kind kind; - private final Supplier> entityType; - - public BaseMetalAmmoItem(MaterialDefinition material, Kind kind, - Supplier> entityType, Properties properties) { - super(properties); - this.material = material; - this.kind = kind; - this.entityType = entityType; - } - - public Kind kind() { return kind; } - @Override public MaterialDefinition baseMetalsMaterial() { return material; } - - /* - - public AbstractArrow createArrow(Level p_40513_, ItemStack p_40514_, LivingEntity p_40515_, @Nullable ItemStack p_344832_) { - return new Arrow(p_40513_, p_40515_, p_40514_.copyWithCount(1), p_344832_); - } - - */ - @Override - public AbstractArrow createArrow(Level level, ItemStack stack, LivingEntity shooter, @Nullable ItemStack firedFrom) { - MaterialProjectile projectile = new MaterialProjectile(entityType.get(), level, shooter, stack, firedFrom); - projectile.setBaseDamage(1.0D + material.baseAttackDamage()); - return projectile; - } -} diff --git a/src/main/java/zone/moddev/mc/basemetals/content/BaseMetalAnvilBlock.java b/src/main/java/zone/moddev/mc/basemetals/content/BaseMetalAnvilBlock.java deleted file mode 100644 index 7c32c691c..000000000 --- a/src/main/java/zone/moddev/mc/basemetals/content/BaseMetalAnvilBlock.java +++ /dev/null @@ -1,85 +0,0 @@ -package zone.moddev.mc.basemetals.content; - -import javax.annotation.Nullable; - -import net.minecraft.core.BlockPos; - -import net.minecraft.world.MenuProvider; -import net.minecraft.world.SimpleMenuProvider; -import net.minecraft.world.entity.player.Inventory; -import net.minecraft.world.entity.player.Player; -import net.minecraft.world.inventory.AnvilMenu; -import net.minecraft.world.inventory.ContainerLevelAccess; -import net.minecraft.world.item.ItemStack; -import net.minecraft.world.level.Level; -import net.minecraft.world.level.block.AnvilBlock; -import net.minecraft.world.level.block.Block; -import net.minecraft.world.level.block.Blocks; -import net.minecraft.world.level.block.state.BlockState; -import net.minecraft.world.level.block.state.StateDefinition; -import net.minecraft.world.level.block.state.properties.IntegerProperty; - -/** A single registry ID retaining the 1.12 anvil damage states. */ -public final class BaseMetalAnvilBlock extends AnvilBlock { - public static final IntegerProperty DAMAGE = IntegerProperty.create("damage", 0, 2); - - public BaseMetalAnvilBlock(Properties properties) { - super(properties); - registerDefaultState(defaultBlockState().setValue(DAMAGE, 0)); - } - - @Override - protected void createBlockStateDefinition(StateDefinition.Builder builder) { - super.createBlockStateDefinition(builder); - builder.add(DAMAGE); - } - - @Nullable - @Override - public MenuProvider getMenuProvider(BlockState state, Level level, BlockPos pos) { - return new SimpleMenuProvider((containerId, inventory, player) -> - new DurableAnvilMenu(containerId, inventory, level, pos), - net.minecraft.network.chat.Component.translatable(getDescriptionId())); - } - - private static final class DurableAnvilMenu extends AnvilMenu { - private final Level level; - private final BlockPos pos; - - private DurableAnvilMenu(int containerId, Inventory inventory, Level level, BlockPos pos) { - super(containerId, inventory, ContainerLevelAccess.create(level, pos)); - this.level = level; - this.pos = pos.immutable(); - } - - @Override - protected boolean isValidBlock(BlockState state) { - return state.getBlock() instanceof BaseMetalAnvilBlock; - } - - @Override - protected void onTake(Player player, ItemStack output) { - BlockState original = level.getBlockState(pos); - if (!(original.getBlock() instanceof BaseMetalAnvilBlock)) { - super.onTake(player, output); - return; - } - - int damage = original.getValue(DAMAGE); - Block placeholder = switch (damage) { - case 0 -> Blocks.ANVIL; - case 1 -> Blocks.CHIPPED_ANVIL; - default -> Blocks.DAMAGED_ANVIL; - }; - level.setBlock(pos, placeholder.defaultBlockState().setValue(FACING, original.getValue(FACING)), 2); - super.onTake(player, output); - - BlockState after = level.getBlockState(pos); - if (after.is(placeholder)) { - level.setBlock(pos, original, 2); - } else if (damage < 2 && (after.is(Blocks.CHIPPED_ANVIL) || after.is(Blocks.DAMAGED_ANVIL))) { - level.setBlock(pos, original.setValue(DAMAGE, damage + 1), 2); - } - } - } -} diff --git a/src/main/java/zone/moddev/mc/basemetals/content/BaseMetalBucketItem.java b/src/main/java/zone/moddev/mc/basemetals/content/BaseMetalBucketItem.java index 6f3f42d89..346a97bb7 100644 --- a/src/main/java/zone/moddev/mc/basemetals/content/BaseMetalBucketItem.java +++ b/src/main/java/zone/moddev/mc/basemetals/content/BaseMetalBucketItem.java @@ -5,10 +5,16 @@ import javax.annotation.Nullable; import zone.moddev.mc.basemetals.BaseMetals; +import zone.moddev.mc.lib.api.ItemContext; +import zone.moddev.mc.lib.api.ItemImplementation; +import zone.moddev.mc.lib.api.MaterialExtensions; +import zone.moddev.mc.lib.common.types.MMDItem; +import zone.moddev.mc.lib.common.types.MMDMaterial; import net.minecraft.advancements.CriteriaTriggers; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; +import net.minecraft.resources.ResourceLocation; import net.minecraft.server.level.ServerPlayer; import net.minecraft.stats.Stats; import net.minecraft.world.InteractionHand; @@ -92,6 +98,32 @@ private boolean emptyContents(@Nullable net.minecraft.world.entity.player.Player position, bucket, contents).isSuccess(); } + /** Lets the {@code basemetals:bucket} item module fill each material's molten metal. */ + public static void registerImplementation() { + MaterialExtensions.GLOBAL.registerItemImplementation( + ResourceLocation.fromNamespaceAndPath(BaseMetals.MOD_ID, "bucket"), new Implementation()); + } + + private static final class Implementation implements ItemImplementation { + @Override + public Class itemClass() { + return BaseMetalBucketItem.class; + } + + @Override + public BaseMetalBucketItem create(MMDMaterial material, MMDItem definition) { + throw new IllegalStateException("Created by the runtime registrar with an ItemContext: " + definition.name()); + } + + @Override + public BaseMetalBucketItem create(ItemContext context) { + String material = context.material().name().orElseThrow().getPath(); + FluidContent fluid = ModContent.fluids().get(material); + if (fluid == null) throw new IllegalStateException("No molten fluid for " + material); + return new BaseMetalBucketItem(fluid.source(), context.properties()); + } + } + @SubscribeEvent public static void registerCapabilities(RegisterCapabilitiesEvent event) { ModContent.fluids().values().forEach(fluid -> event.registerItem( diff --git a/src/main/java/zone/moddev/mc/basemetals/content/CompatibilityDoubleSlabBlock.java b/src/main/java/zone/moddev/mc/basemetals/content/CompatibilityDoubleSlabBlock.java deleted file mode 100644 index 06548e7db..000000000 --- a/src/main/java/zone/moddev/mc/basemetals/content/CompatibilityDoubleSlabBlock.java +++ /dev/null @@ -1,12 +0,0 @@ -package zone.moddev.mc.basemetals.content; - -import net.minecraft.world.level.block.SlabBlock; -import net.minecraft.world.level.block.state.properties.SlabType; - -/** Kept solely so 1.12 double-slab states survive registry remapping. */ -public final class CompatibilityDoubleSlabBlock extends SlabBlock { - public CompatibilityDoubleSlabBlock(Properties properties) { - super(properties); - registerDefaultState(defaultBlockState().setValue(TYPE, SlabType.DOUBLE).setValue(WATERLOGGED, false)); - } -} diff --git a/src/main/java/zone/moddev/mc/basemetals/content/CrackhammerItem.java b/src/main/java/zone/moddev/mc/basemetals/content/CrackhammerItem.java deleted file mode 100644 index ec67d4f0d..000000000 --- a/src/main/java/zone/moddev/mc/basemetals/content/CrackhammerItem.java +++ /dev/null @@ -1,122 +0,0 @@ -package zone.moddev.mc.basemetals.content; - -import java.util.List; -import java.util.Optional; - -import zone.moddev.mc.basemetals.material.MaterialDefinition; -import zone.moddev.mc.basemetals.recipe.CrushingRecipe; - -import net.minecraft.core.Direction; -import net.minecraft.world.InteractionResult; -import net.minecraft.world.entity.LivingEntity; -import net.minecraft.world.entity.item.ItemEntity; -import net.minecraft.world.item.BlockItem; -import net.minecraft.world.item.DiggerItem; -import net.minecraft.world.item.ItemStack; -import net.minecraft.world.item.crafting.RecipeHolder; -import net.minecraft.world.item.crafting.SingleRecipeInput; -import net.minecraft.world.item.context.UseOnContext; -import net.minecraft.world.level.Level; -import net.minecraft.world.level.block.state.BlockState; -import net.minecraft.world.phys.AABB; -import net.minecraft.tags.BlockTags; -import net.neoforged.neoforge.common.ItemAbility; -import net.neoforged.neoforge.common.ItemAbilities; - -public final class CrackhammerItem extends DiggerItem implements MaterialBacked { - private final MaterialDefinition material; - - public CrackhammerItem(MaterialDefinition material, Properties properties) { - super(new MaterialTier(material), - BlockTags.MINEABLE_WITH_PICKAXE, - properties - .durability(material.crackhammerDurability()) - .attributes(DiggerItem.createAttributes( - new MaterialTier(material), - 5.0F + material.baseAttackDamage(), - -3.5F))); - this.material = material; - } - - @Override public MaterialDefinition baseMetalsMaterial() { return material; } - - @Override - public float getDestroySpeed(ItemStack stack, BlockState state) { - return state.is(zone.moddev.mc.basemetals.ModTags.CRACKHAMMER_CRUSHABLE) - && canHarvest(stack, state) - ? material.crackhammerDestroySpeed() - : 1.0F; - } - - @Override - public boolean canPerformAction(ItemStack stack, ItemAbility action) { - return ItemAbilities.DEFAULT_PICKAXE_ACTIONS.contains(action); - } - - @Override - public void appendHoverText(ItemStack stack, net.minecraft.world.item.Item.TooltipContext context, - List tooltip, - net.minecraft.world.item.TooltipFlag flag) { - MaterialItems.addToolTooltip(material, tooltip); - } - - @Override - public InteractionResult useOn(UseOnContext context) { - if (context.getClickedFace() != Direction.UP || context.getLevel().isClientSide - || context.getPlayer() == null) { - return InteractionResult.PASS; - } - AABB area = new AABB(context.getClickedPos().above()); - List entities = context.getLevel().getEntitiesOfClass(ItemEntity.class, area, - entity -> entity.isAlive() && !entity.getItem().isEmpty()); - for (ItemEntity entity : entities) { - ItemStack input = entity.getItem(); - Optional> recipe = context.getLevel().getRecipeManager().getRecipeFor( - CrushingRecipe.TYPE.get(), new SingleRecipeInput(input), context.getLevel()); - if (recipe.isEmpty() || !canCrushDroppedBlock(context.getItemInHand(), input)) continue; - // Sneaking is the per-use full-stack control; ordinary use crushes - // one item and never changes a persistent config contract. - int requested = context.getPlayer().isShiftKeyDown() ? input.getCount() : 1; - ItemStack hammer = context.getItemInHand(); - int durability = hammer.isDamageableItem() - ? Math.max(0, hammer.getMaxDamage() - hammer.getDamageValue()) - : requested; - int operations = Math.min(requested, durability); - if (operations == 0) break; - ItemStack output = recipe.get().value().assemble( - new SingleRecipeInput(input), context.getLevel().registryAccess()); - input.shrink(operations); - if (input.isEmpty()) entity.discard(); else entity.setItem(input); - spawnOutputs(context.getLevel(), entity, output, operations); - hammer.hurtAndBreak(operations, context.getPlayer(), - LivingEntity.getSlotForHand(context.getHand())); - context.getLevel().playSound(null, context.getClickedPos(), - net.minecraft.sounds.SoundEvents.GRAVEL_BREAK, - net.minecraft.sounds.SoundSource.BLOCKS, 0.5F, - 0.5F + (context.getLevel().random.nextFloat() * 0.3F)); - return InteractionResult.CONSUME; - } - return InteractionResult.PASS; - } - - private static boolean canCrushDroppedBlock(ItemStack hammer, ItemStack input) { - if (!(input.getItem() instanceof BlockItem blockItem)) return true; - return canHarvest(hammer, blockItem.getBlock().defaultBlockState()); - } - - private static boolean canHarvest(ItemStack hammer, BlockState state) { - return !state.requiresCorrectToolForDrops() || hammer.isCorrectToolForDrops(state); - } - - private static void spawnOutputs(Level level, ItemEntity source, ItemStack result, int operations) { - int remaining = Math.multiplyExact(result.getCount(), operations); - while (remaining > 0) { - ItemStack output = result.copy(); - output.setCount(Math.min(output.getMaxStackSize(), remaining)); - remaining -= output.getCount(); - ItemEntity crushed = new ItemEntity(level, source.getX(), source.getY(), source.getZ(), output); - crushed.setDefaultPickUpDelay(); - level.addFreshEntity(crushed); - } - } -} diff --git a/src/main/java/zone/moddev/mc/basemetals/content/HumanDetectorBlock.java b/src/main/java/zone/moddev/mc/basemetals/content/HumanDetectorBlock.java deleted file mode 100644 index a86127e2d..000000000 --- a/src/main/java/zone/moddev/mc/basemetals/content/HumanDetectorBlock.java +++ /dev/null @@ -1,25 +0,0 @@ -package zone.moddev.mc.basemetals.content; - -import java.util.List; - -import net.minecraft.core.BlockPos; -import net.minecraft.world.entity.player.Player; -import net.minecraft.world.level.Level; -import net.minecraft.world.level.block.PressurePlateBlock; -import net.minecraft.world.level.block.state.BlockState; -import net.minecraft.world.level.block.state.properties.BlockSetType; -import net.minecraft.world.phys.AABB; - -public final class HumanDetectorBlock extends PressurePlateBlock { - public HumanDetectorBlock(Properties properties) { - super(BlockSetType.STONE, properties); - } - - @Override - protected int getSignalStrength(Level level, BlockPos pos) { - AABB box = TOUCH_AABB.move(pos); - List players = level.getEntitiesOfClass(Player.class, box, - player -> !player.isSpectator() && !player.isIgnoringBlockTriggers()); - return players.isEmpty() ? 0 : 15; - } -} diff --git a/src/main/java/zone/moddev/mc/basemetals/content/MaterialArmor.java b/src/main/java/zone/moddev/mc/basemetals/content/MaterialArmor.java deleted file mode 100644 index 825d7a88a..000000000 --- a/src/main/java/zone/moddev/mc/basemetals/content/MaterialArmor.java +++ /dev/null @@ -1,43 +0,0 @@ -package zone.moddev.mc.basemetals.content; - -import java.util.List; -import java.util.Map; - -import zone.moddev.mc.basemetals.BaseMetals; -import zone.moddev.mc.basemetals.material.MaterialDefinition; - -import net.minecraft.core.registries.Registries; -import net.minecraft.resources.ResourceLocation; -import net.minecraft.sounds.SoundEvents; -import net.minecraft.tags.ItemTags; -import net.minecraft.world.entity.EquipmentSlot; -import net.minecraft.world.item.ArmorItem; -import net.minecraft.world.item.ArmorMaterial; -import net.minecraft.world.item.crafting.Ingredient; -import net.neoforged.neoforge.registries.DeferredHolder; -import net.neoforged.neoforge.registries.DeferredRegister; - -/** Registered armor statistics shared by humanoid and horse armor items. */ -public final class MaterialArmor { - public static final DeferredRegister REGISTER = - DeferredRegister.create(Registries.ARMOR_MATERIAL, BaseMetals.MOD_ID); - - private MaterialArmor() {} - - public static DeferredHolder register(MaterialDefinition material) { - ResourceLocation id = ResourceLocation.fromNamespaceAndPath(BaseMetals.MOD_ID, material.name()); - return REGISTER.register(material.name(), () -> new ArmorMaterial( - Map.of( - ArmorItem.Type.HELMET, material.armorProtection(EquipmentSlot.HEAD), - ArmorItem.Type.CHESTPLATE, material.armorProtection(EquipmentSlot.CHEST), - ArmorItem.Type.LEGGINGS, material.armorProtection(EquipmentSlot.LEGS), - ArmorItem.Type.BOOTS, material.armorProtection(EquipmentSlot.FEET), - ArmorItem.Type.BODY, material.horseArmorProtection()), - material.enchantability(), - SoundEvents.ARMOR_EQUIP_IRON, - () -> Ingredient.of(ItemTags.create(ResourceLocation.parse(material.repairIngredientTag()))), - List.of(new ArmorMaterial.Layer(id)), - material.armorToughness(), - 0.0F)); - } -} diff --git a/src/main/java/zone/moddev/mc/basemetals/content/MaterialBacked.java b/src/main/java/zone/moddev/mc/basemetals/content/MaterialBacked.java deleted file mode 100644 index 57a49f872..000000000 --- a/src/main/java/zone/moddev/mc/basemetals/content/MaterialBacked.java +++ /dev/null @@ -1,16 +0,0 @@ -package zone.moddev.mc.basemetals.content; - -import zone.moddev.mc.basemetals.material.MaterialDefinition; - -import net.minecraft.resources.ResourceLocation; -import net.minecraft.tags.ItemTags; -import net.minecraft.world.item.ItemStack; - -public interface MaterialBacked { - MaterialDefinition baseMetalsMaterial(); - - default boolean isMaterialRepairIngredient(ItemStack repair) { - ResourceLocation ml = ResourceLocation.parse(baseMetalsMaterial().repairIngredientTag()); - return repair.is(ItemTags.create(ml)); - } -} diff --git a/src/main/java/zone/moddev/mc/basemetals/content/MaterialItems.java b/src/main/java/zone/moddev/mc/basemetals/content/MaterialItems.java deleted file mode 100644 index 67808ca11..000000000 --- a/src/main/java/zone/moddev/mc/basemetals/content/MaterialItems.java +++ /dev/null @@ -1,294 +0,0 @@ -package zone.moddev.mc.basemetals.content; - -import zone.moddev.mc.basemetals.material.MaterialDefinition; -import zone.moddev.mc.basemetals.BaseMetals; - - -import net.minecraft.resources.ResourceLocation; -import net.minecraft.core.Holder; -import net.minecraft.core.registries.Registries; -import net.minecraft.world.item.ArmorMaterial; -import net.minecraft.world.item.component.ItemAttributeModifiers; -import net.minecraft.world.entity.EquipmentSlotGroup; -import net.neoforged.neoforge.registries.DeferredHolder; -import net.minecraft.world.entity.EquipmentSlot; -import net.minecraft.world.entity.ai.attributes.AttributeModifier; -import net.minecraft.world.entity.ai.attributes.Attributes; -import net.minecraft.world.entity.projectile.AbstractArrow; -import net.minecraft.world.item.ArmorItem; -import net.minecraft.world.item.AxeItem; -import net.minecraft.world.item.BlockItem; -import net.minecraft.world.item.BowItem; -import net.minecraft.world.item.FishingRodItem; -import net.minecraft.world.item.HoeItem; -import net.minecraft.world.item.AnimalArmorItem; -import net.minecraft.world.item.Item; -import net.minecraft.world.item.PickaxeItem; -import net.minecraft.world.item.ShearsItem; -import net.minecraft.world.item.ShieldItem; -import net.minecraft.world.item.ShovelItem; -import net.minecraft.world.item.SwordItem; -import net.minecraft.world.item.TooltipFlag; -import net.minecraft.network.chat.Component; - -import javax.annotation.Nullable; -import java.util.List; -import java.util.function.Predicate; -import net.minecraft.world.item.ItemStack; - -public final class MaterialItems { - private MaterialItems() {} - - public static final class Basic extends Item implements MaterialBacked { - private final MaterialDefinition material; - private final int burnTime; - public Basic(MaterialDefinition material, int burnTime, Properties properties) { - super(properties); - this.material = material; - this.burnTime = burnTime >= 0 ? burnTime : 0; // negative burn-times are not allowed - } - @Override public MaterialDefinition baseMetalsMaterial() { return material; } - @Override public int getBurnTime(ItemStack stack, - @Nullable net.minecraft.world.item.crafting.RecipeType recipeType) { - return burnTime; - } - } - - public static final class Pickaxe extends PickaxeItem implements MaterialBacked { - private final MaterialDefinition material; - public Pickaxe(MaterialDefinition material, Properties properties) { - super(new MaterialTier(material), properties.attributes( - PickaxeItem.createAttributes(new MaterialTier(material), 1, -2.8F))); this.material = material; - } - @Override public MaterialDefinition baseMetalsMaterial() { return material; } - @Override public void appendHoverText(ItemStack stack, Item.TooltipContext context, - List tooltip, TooltipFlag flag) { addToolTooltip(material, tooltip); } - } - - public static final class Axe extends AxeItem implements MaterialBacked { - private final MaterialDefinition material; - public Axe(MaterialDefinition material, Properties properties) { - super(new MaterialTier(material), properties.attributes(AxeItem.createAttributes( - new MaterialTier(material), 4.0F + material.baseAttackDamage(), material.axeAttackSpeed()))); - this.material = material; - } - @Override public MaterialDefinition baseMetalsMaterial() { return material; } - @Override public void appendHoverText(ItemStack stack, Item.TooltipContext context, - List tooltip, TooltipFlag flag) { addToolTooltip(material, tooltip); } - } - - public static final class Shovel extends ShovelItem implements MaterialBacked { - private final MaterialDefinition material; - public Shovel(MaterialDefinition material, Properties properties) { - super(new MaterialTier(material), properties.attributes( - ShovelItem.createAttributes(new MaterialTier(material), 1.5F, -3.0F))); this.material = material; - } - @Override public MaterialDefinition baseMetalsMaterial() { return material; } - @Override public void appendHoverText(ItemStack stack, Item.TooltipContext context, - List tooltip, TooltipFlag flag) { addToolTooltip(material, tooltip); } - } - - public static final class Hoe extends HoeItem implements MaterialBacked { - private final MaterialDefinition material; - public Hoe(MaterialDefinition material, Properties properties) { - super(new MaterialTier(material), properties.attributes(ItemAttributeModifiers.builder() - // Preserve the legacy hoe's zero added attack damage. - .add(Attributes.ATTACK_DAMAGE, new AttributeModifier(BASE_ATTACK_DAMAGE_ID, - 0.0D, AttributeModifier.Operation.ADD_VALUE), EquipmentSlotGroup.MAINHAND) - .add(Attributes.ATTACK_SPEED, new AttributeModifier(BASE_ATTACK_SPEED_ID, - material.baseAttackDamage() - 3.0D, AttributeModifier.Operation.ADD_VALUE), - EquipmentSlotGroup.MAINHAND) - .build())); - this.material = material; - } - @Override public MaterialDefinition baseMetalsMaterial() { return material; } - @Override public void appendHoverText(ItemStack stack, Item.TooltipContext context, - List tooltip, TooltipFlag flag) { addToolTooltip(material, tooltip); } - } - - public static class Sword extends SwordItem implements MaterialBacked { - private final MaterialDefinition material; - public Sword(MaterialDefinition material, Properties properties) { - super(new MaterialTier(material), properties.attributes( - SwordItem.createAttributes(new MaterialTier(material), 3, -2.4F))); this.material = material; - } - @Override public MaterialDefinition baseMetalsMaterial() { return material; } - @Override public void appendHoverText(ItemStack stack, Item.TooltipContext context, - List tooltip, TooltipFlag flag) { addToolTooltip(material, tooltip); } - } - - public static final class Armor extends ArmorItem implements MaterialBacked { - private final MaterialDefinition material; - public Armor(MaterialDefinition material, EquipmentSlot slot, Properties properties) { - super(armorMaterial(material), armorType(slot), - properties.durability(armorType(slot).getDurability(material.armorDurabilityFactor()))); this.material = material; - } - @Override public MaterialDefinition baseMetalsMaterial() { return material; } - @Override - public void appendHoverText(ItemStack stack, Item.TooltipContext context, - List tooltip, TooltipFlag flag) { - addArmorTooltip(material, tooltip); - } - } - - public static final class HorseArmor extends AnimalArmorItem implements MaterialBacked { - private final MaterialDefinition material; - public HorseArmor(MaterialDefinition material, Properties properties) { - super(armorMaterial(material), AnimalArmorItem.BodyType.EQUESTRIAN, false, properties); - this.material = material; - } - @Override public MaterialDefinition baseMetalsMaterial() { return material; } - } - - // MaterialArmor must register these named materials before the item registry runs. - private static Holder armorMaterial(MaterialDefinition material) { - return DeferredHolder.create(Registries.ARMOR_MATERIAL, - ResourceLocation.fromNamespaceAndPath(BaseMetals.MOD_ID, material.name())); - } - - private static ArmorItem.Type armorType(EquipmentSlot slot) { - return switch (slot) { - case HEAD -> ArmorItem.Type.HELMET; - case CHEST -> ArmorItem.Type.CHESTPLATE; - case LEGS -> ArmorItem.Type.LEGGINGS; - case FEET -> ArmorItem.Type.BOOTS; - default -> throw new IllegalArgumentException("Not an armour slot: " + slot); - }; - } - - public static final class BurnableBlock extends BlockItem { - private final int burnTime; - public BurnableBlock(net.minecraft.world.level.block.Block block, int burnTime, Properties properties) { - super(block, properties); - this.burnTime = burnTime; - } - @Override public int getBurnTime(ItemStack stack, - @Nullable net.minecraft.world.item.crafting.RecipeType recipeType) { - return burnTime; - } - } - - public static final class Shears extends ShearsItem implements MaterialBacked { - private final MaterialDefinition material; - public Shears(MaterialDefinition material, Properties properties) { super(properties); this.material = material; } - @Override public MaterialDefinition baseMetalsMaterial() { return material; } - @Override public boolean isValidRepairItem(ItemStack toRepair, ItemStack repair) { - return isMaterialRepairIngredient(repair) || super.isValidRepairItem(toRepair, repair); - } - @Override - public void appendHoverText(ItemStack stack, Item.TooltipContext context, - List tooltip, TooltipFlag flag) { - addToolTooltip(material, tooltip); - } - } - - public static class Shield extends ShieldItem implements MaterialBacked { - private final MaterialDefinition material; - public Shield(MaterialDefinition material, Properties properties) { super(properties); this.material = material; } - @Override public MaterialDefinition baseMetalsMaterial() { return material; } - @Override public boolean isValidRepairItem(ItemStack toRepair, ItemStack repair) { - return isMaterialRepairIngredient(repair) || super.isValidRepairItem(toRepair, repair); - } - @Override - public void appendHoverText(ItemStack stack, Item.TooltipContext context, - List tooltip, TooltipFlag flag) { - addToolTooltip(material, tooltip); - } - } - - public static class Bow extends BowItem implements MaterialBacked { - private final MaterialDefinition material; - public Bow(MaterialDefinition material, Properties properties) { super(properties); this.material = material; } - @Override public MaterialDefinition baseMetalsMaterial() { return material; } - @Override public Predicate getAllSupportedProjectiles() { - return stack -> stack.getItem() instanceof net.minecraft.world.item.ArrowItem - && (!(stack.getItem() instanceof BaseMetalAmmoItem ammo) - || ammo.kind() == BaseMetalAmmoItem.Kind.ARROW); - } - - @Override public Predicate getSupportedHeldProjectiles() { - return getAllSupportedProjectiles(); - } - - @Override public AbstractArrow customArrow(AbstractArrow arrow, ItemStack projectileStack, ItemStack weaponStack) { - arrow.setBaseDamage(arrow.getBaseDamage() + material.baseAttackDamage() - 1.0D); - return arrow; - } - @Override public boolean isValidRepairItem(ItemStack toRepair, ItemStack repair) { - return isMaterialRepairIngredient(repair) || super.isValidRepairItem(toRepair, repair); - } - @Override - public void appendHoverText(ItemStack stack, Item.TooltipContext context, - List tooltip, TooltipFlag flag) { - addToolTooltip(material, tooltip); - } - } - - public static final class Crossbow extends BowItem implements MaterialBacked { - private final MaterialDefinition material; - public Crossbow(MaterialDefinition material, Properties properties) { super(properties); this.material = material; } - @Override public MaterialDefinition baseMetalsMaterial() { return material; } - @Override public Predicate getAllSupportedProjectiles() { - return stack -> stack.getItem() instanceof BaseMetalAmmoItem ammo - && ammo.kind() == BaseMetalAmmoItem.Kind.BOLT; - } - @Override public Predicate getSupportedHeldProjectiles() { - return getAllSupportedProjectiles(); - } - @Override public boolean isValidRepairItem(ItemStack toRepair, ItemStack repair) { - return isMaterialRepairIngredient(repair) || super.isValidRepairItem(toRepair, repair); - } - @Override public ItemStack getDefaultCreativeAmmo( - @Nullable net.minecraft.world.entity.player.Player player, ItemStack weaponStack) { - return ModContent.item("iron_bolt").get().getDefaultInstance(); - } - - // BowItem's firing pipeline handles ammunition, Infinity, durability and - // projectile enchantments, including the weapon stack passed to arrows. - @Override public AbstractArrow customArrow(AbstractArrow arrow, ItemStack projectileStack, - ItemStack weaponStack) { - arrow.setBaseDamage(arrow.getBaseDamage() + material.baseAttackDamage() - 1.0D); - return arrow; - } - - @Override - public void appendHoverText(ItemStack stack, Item.TooltipContext context, - List tooltip, TooltipFlag flag) { - addToolTooltip(material, tooltip); - } - } - - public static final class FishingRod extends FishingRodItem implements MaterialBacked { - private final MaterialDefinition material; - public FishingRod(MaterialDefinition material, Properties properties) { super(properties); this.material = material; } - @Override public MaterialDefinition baseMetalsMaterial() { return material; } - @Override public boolean isValidRepairItem(ItemStack toRepair, ItemStack repair) { - return isMaterialRepairIngredient(repair) || super.isValidRepairItem(toRepair, repair); - } - @Override - public void appendHoverText(ItemStack stack, Item.TooltipContext context, - List tooltip, TooltipFlag flag) { - addToolTooltip(material, tooltip); - } - } - - static void addToolTooltip(MaterialDefinition material, List tooltip) { - Component component = switch (material.name()) { - case "adamantine" -> net.minecraft.network.chat.Component.translatable("tooltip.adamantine.tool", 4); - case "aquarium" -> net.minecraft.network.chat.Component.translatable("tooltip.aquarium.tool", 4); - case "coldiron" -> net.minecraft.network.chat.Component.translatable("tooltip.coldiron.tool", 3); - case "mithril" -> net.minecraft.network.chat.Component.translatable("tooltip.mithril.tool"); - case "starsteel" -> net.minecraft.network.chat.Component.translatable("tooltip.starsteel.tool", 10); - default -> null; - }; - if (component != null) tooltip.add(component); - } - - private static void addArmorTooltip(MaterialDefinition material, List tooltip) { - if (material.name().equals("adamantine") || material.name().equals("aquarium") - || material.name().equals("coldiron") || material.name().equals("mithril") - || material.name().equals("starsteel")) { - tooltip.add(net.minecraft.network.chat.Component.translatable("tooltip." + material.name() + ".armor")); - } - } -} diff --git a/src/main/java/zone/moddev/mc/basemetals/content/MaterialTier.java b/src/main/java/zone/moddev/mc/basemetals/content/MaterialTier.java deleted file mode 100644 index 767466573..000000000 --- a/src/main/java/zone/moddev/mc/basemetals/content/MaterialTier.java +++ /dev/null @@ -1,48 +0,0 @@ -package zone.moddev.mc.basemetals.content; - -import java.util.function.Supplier; - -import zone.moddev.mc.basemetals.material.MaterialDefinition; - -import net.minecraft.resources.ResourceLocation; -import net.minecraft.tags.BlockTags; -import net.minecraft.tags.ItemTags; -import net.minecraft.tags.TagKey; -import net.minecraft.world.item.Item; -import net.minecraft.world.item.Tier; -import net.minecraft.world.item.crafting.Ingredient; -import net.minecraft.world.level.block.Block; - -public final class MaterialTier implements Tier { - private final MaterialDefinition material; - private final Supplier repair; - - public MaterialTier(MaterialDefinition material) { - this.material = material; - TagKey tag = ItemTags.create(ResourceLocation.parse(material.repairIngredientTag())); - this.repair = () -> Ingredient.of(tag); - } - - public MaterialDefinition material() { - return material; - } - - @Override public int getUses() { return material.toolDurability(); } - @Override public float getSpeed() { return material.toolEfficiency(); } - @Override public float getAttackDamageBonus() { return material.baseAttackDamage(); } - @Override - public TagKey getIncorrectBlocksForDrops() { - // Preserve the old numeric tier's harvest capability using vanilla's - // tags of blocks that each tier is unable to harvest. - return switch (material.toolLevel()) { - case 0 -> BlockTags.INCORRECT_FOR_WOODEN_TOOL; - case 1 -> BlockTags.INCORRECT_FOR_STONE_TOOL; - case 2 -> BlockTags.INCORRECT_FOR_IRON_TOOL; - case 3 -> BlockTags.INCORRECT_FOR_DIAMOND_TOOL; - case 4 -> BlockTags.INCORRECT_FOR_NETHERITE_TOOL; - default -> throw new IllegalArgumentException("Unsupported tool level: " + material.toolLevel()); - }; - } - @Override public int getEnchantmentValue() { return material.enchantability(); } - @Override public Ingredient getRepairIngredient() { return repair.get(); } -} diff --git a/src/main/java/zone/moddev/mc/basemetals/content/ModContent.java b/src/main/java/zone/moddev/mc/basemetals/content/ModContent.java index 5eec504c4..f9dce136c 100644 --- a/src/main/java/zone/moddev/mc/basemetals/content/ModContent.java +++ b/src/main/java/zone/moddev/mc/basemetals/content/ModContent.java @@ -5,46 +5,43 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.Map; -import java.util.function.Supplier; import zone.moddev.mc.basemetals.BaseMetals; +import zone.moddev.mc.basemetals.MissingMappings; import zone.moddev.mc.basemetals.material.MaterialCatalogue; import zone.moddev.mc.basemetals.material.MaterialDefinition; -import zone.moddev.mc.basemetals.entity.ModEntities; +import zone.moddev.mc.lib.MMDLib; +import zone.moddev.mc.lib.api.MaterialExtensions; +import zone.moddev.mc.lib.common.factories.MaterialFactory; +import zone.moddev.mc.lib.common.runtime.MaterialStats; +import zone.moddev.mc.lib.common.runtime.RuntimeContentRegistrar; +import zone.moddev.mc.lib.common.types.MMDBlock; -import net.minecraft.world.entity.EquipmentSlot; import net.minecraft.world.item.BlockItem; import net.minecraft.world.item.Item; -import net.minecraft.world.item.Items; import net.minecraft.world.level.block.Block; -import net.minecraft.world.level.block.ButtonBlock; -import net.minecraft.world.level.block.DoorBlock; -import net.minecraft.world.level.block.IronBarsBlock; -import net.minecraft.world.level.block.LeverBlock; -import net.minecraft.world.level.block.PressurePlateBlock; -import net.minecraft.world.level.block.SlabBlock; -import net.minecraft.world.level.block.StairBlock; -import net.minecraft.world.level.block.state.properties.BlockSetType; -import net.minecraft.world.level.block.TrapDoorBlock; -import net.minecraft.world.level.block.WallBlock; -import net.minecraft.world.level.block.LiquidBlock; -import net.minecraft.world.level.block.state.BlockBehaviour; import net.minecraft.world.level.material.Fluid; import net.minecraft.world.level.material.MapColor; import net.minecraft.resources.ResourceLocation; import net.minecraft.sounds.SoundEvents; -import net.minecraft.world.level.block.SoundType; +import net.minecraft.world.level.block.state.BlockBehaviour; import net.neoforged.bus.api.IEventBus; import net.neoforged.neoforge.fluids.FluidType; import net.neoforged.neoforge.fluids.BaseFlowingFluid; import net.neoforged.neoforge.common.SoundActions; import net.neoforged.neoforge.registries.DeferredRegister; +import net.neoforged.neoforge.registries.NewRegistryEvent; import net.minecraft.core.registries.BuiltInRegistries; import net.minecraft.core.registries.Registries; import net.neoforged.neoforge.registries.NeoForgeRegistries; import net.neoforged.neoforge.registries.DeferredHolder; -/** All content registration, generated from the immutable catalogues. */ +/** + * Base Metals content. Materials, vanilla material extensions, anvils and the human + * detector are MMDLib definitions under {@code mmdlib/}, registered through MMDLib's + * runtime registrar; molten metals stay Base Metals fluids, filled through the + * {@code basemetals:bucket} item form. + */ public final class ModContent { public static final DeferredRegister BLOCKS = DeferredRegister.create(BuiltInRegistries.BLOCK, BaseMetals.MOD_ID); public static final DeferredRegister ITEMS = DeferredRegister.create(BuiltInRegistries.ITEM, BaseMetals.MOD_ID); @@ -57,45 +54,76 @@ public final class ModContent { private static final Map FLUID_CONTENT = new LinkedHashMap<>(); private static final List HIDDEN_BLOCKS = new ArrayList<>(); - public static final DeferredHolder HUMAN_DETECTOR; - - private static final List MATERIAL_BLOCK_FORMS = List.of( - "block", "plate", "bars", "door", "trapdoor", "button", "slab", "lever", - "pressure_plate", "stairs", "wall"); - private static final List BASIC_ITEM_FORMS = List.of("ingot", "nugget", "powder", "smallpowder"); - private static final List PROCESSING_FORMS = List.of( - "casing", "dense_plate", "crushed", "crushed_purified", "crystal", "shard", "clump", "powder_dirty"); + private static final ResourceLocation BUCKET = ResourceLocation.fromNamespaceAndPath(BaseMetals.MOD_ID, "bucket"); - static { - MaterialCatalogue.ALL.forEach(ModContent::registerMaterial); - registerAnvil("stone_anvil", BlockBehaviour.Properties.of().mapColor(MapColor.STONE) - .sound(SoundType.STONE).strength(5.0F, 10.0F)); - registerAnvil("steel_anvil", metalProperties(MaterialCatalogue.get("steel"))); - registerAnvil("adamantine_anvil", metalProperties(MaterialCatalogue.get("adamantine"))); - HUMAN_DETECTOR = registerBlock("human_detector", - () -> new HumanDetectorBlock(BlockBehaviour.Properties.of().mapColor(MapColor.METAL) - .sound(SoundType.METAL).strength(5.0F).noCollission()), true); - registerVanillaBits(); - MaterialCatalogue.ALL.forEach(material -> registerFluid(material.name(), material.colour(), - material.name().equals("mercury"), material.moltenViscosity())); - Map vanillaFluids = vanillaDefinitions(); - for (String name : List.of("charcoal", "coal", "diamond", "emerald", "ender", "gold", "iron", - "lapis", "obsidian", "prismarine", "quartz", "wood", "redstone", "stone")) { - int colour = vanillaFluids.containsKey(name) ? vanillaFluids.get(name).colour() : 0xFFFFFF; - int viscosity = vanillaFluids.containsKey(name) - ? vanillaFluids.get(name).moltenViscosity() : 15000; - registerFluid(name, colour, false, viscosity); - } - } + private static RuntimeContentRegistrar registrar; private ModContent() {} public static void register(IEventBus bus) { - MaterialArmor.REGISTER.register(bus); + registrar = new RuntimeContentRegistrar(BaseMetals.MOD_ID, MaterialExtensions.GLOBAL, bus); BLOCKS.register(bus); ITEMS.register(bus); FLUIDS.register(bus); FLUID_TYPES.register(bus); + // MMDLib loads definitions in deferred construction work; registries open after that. + bus.addListener(NewRegistryEvent.class, event -> populate()); + } + + private static void populate() { + if (MMDLib.loadedMaterials().isEmpty()) { + throw new IllegalStateException("MMDLib has not loaded any material definitions"); + } + for (MaterialDefinition material : MaterialCatalogue.all()) { + registerFluid(material.name(), material.colour(), material.name().equals("mercury"), + material.moltenViscosity()); + } + // Vanilla extensions with a basemetals:bucket form melt into Base Metals fluids too. + MMDLib.loadedMaterials().forEach((id, result) -> { + var material = result.material(); + if (MaterialCatalogue.isVanillaExtension(material) && material.parts().parts().stream() + .anyMatch(part -> part.templateId().equals(BUCKET))) { + registerFluid(id.getPath(), material.properties().color() & 0xFFFFFF, false, + new MaterialStats(material).integer("viscosity", 10000, 1)); + } + }); + MMDLib.loadedMaterials().forEach((id, result) -> { + if (id.getNamespace().equals(BaseMetals.MOD_ID)) queue(result); + }); + MMDLib.standaloneBlocks().forEach((id, result) -> { + if (id.getNamespace().equals(BaseMetals.MOD_ID)) queue(result); + }); + MissingMappings.registerAliases(); + } + + private static void queue(MaterialFactory.Result result) { + registrar.queue(result); + Map> blocks = new LinkedHashMap<>(); + Map> items = new LinkedHashMap<>(); + result.content().blocks().entrySet().stream() + .sorted(Map.Entry.comparingByKey()) + .forEach(entry -> { + MMDBlock definition = entry.getValue(); + var block = registrar.blocks().get(definition.name()); + blocks.put(entry.getKey().templateId().getPath(), block); + BLOCKS_BY_ID.put(definition.name().getPath(), block); + if (entry.getKey().templateId().getPath().equals("double_slab")) { + HIDDEN_BLOCKS.add(definition.name().getPath()); + } + }); + result.content().items().entrySet().stream() + .sorted(Map.Entry.comparingByKey()) + .forEach(entry -> { + var item = registrar.items().get(entry.getValue().name()); + items.put(entry.getKey().templateId().getPath(), item); + ITEMS_BY_ID.put(entry.getValue().name().getPath(), item); + }); + MaterialCatalogue.of(result.material()).ifPresent(definition -> MATERIALS.put(definition.name(), + new MaterialContent(definition, Collections.unmodifiableMap(blocks), Collections.unmodifiableMap(items)))); + } + + public static RuntimeContentRegistrar registrar() { + return registrar; } public static Map materials() { @@ -124,298 +152,13 @@ public static Map fluids() { return item; } - private static void registerMaterial(MaterialDefinition material) { - Map> blocks = new LinkedHashMap<>(); - Map> items = new LinkedHashMap<>(); - if (material.hasEquipment()) { - for (String form : MATERIAL_BLOCK_FORMS) { - String id = material.name() + "_" + form; - DeferredHolder block = registerMaterialBlock(id, form, material, true); - blocks.put(form, block); - items.put(form, ITEMS_BY_ID.get(id)); - } - String doubleSlab = "double_" + material.name() + "_slab"; - blocks.put("double_slab", registerBlock(doubleSlab, - () -> new CompatibilityDoubleSlabBlock(metalProperties(material)), false)); - HIDDEN_BLOCKS.add(doubleSlab); - } - if (material.hasOre()) { - String id = material.name() + "_ore"; - blocks.put("ore", registerBlock(id, () -> new Block(oreProperties(material)), true)); - items.put("ore", ITEMS_BY_ID.get(id)); - if (!material.name().equals("copper")) { - items.put("raw", registerSimpleMaterialItem(material.name() + "_raw", material)); - } - } - for (String form : BASIC_ITEM_FORMS) { - items.put(form, registerSimpleMaterialItem(material.name() + "_" + form, material)); - } - if (material.isAlloy()) { - items.put("blend", registerSimpleMaterialItem(material.name() + "_blend", material)); - items.put("smallblend", registerSimpleMaterialItem(material.name() + "_smallblend", material)); - } - if (material.hasEquipment()) { - registerEquipment(material, items); - } - if (material.processingForms()) { - for (String form : PROCESSING_FORMS) { - items.put(form, registerSimpleMaterialItem(material.name() + "_" + form, material)); - } - } - MATERIALS.put(material.name(), new MaterialContent(material, - Collections.unmodifiableMap(blocks), Collections.unmodifiableMap(items))); - } - - private static DeferredHolder registerMaterialBlock(String id, String form, - MaterialDefinition material, boolean item) { - return registerMaterialBlock(id, form, material, item, - () -> metalProperties(material), - () -> MATERIALS.containsKey(material.name()) - ? MATERIALS.get(material.name()).blocks().get("block").get().defaultBlockState() - : net.minecraft.world.level.block.Blocks.IRON_BLOCK.defaultBlockState()); - } - - private static DeferredHolder registerMaterialBlock(String id, String form, - MaterialDefinition material, boolean item, Supplier properties, - Supplier stairBase) { - Supplier factory = switch (form) { - case "plate" -> () -> new PlateBlock(properties.get().noOcclusion()); - case "bars" -> () -> new IronBarsBlock(properties.get().noOcclusion().dynamicShape()); - case "door" -> () -> new DoorBlock(doorType(material), properties.get().noOcclusion().dynamicShape()); - case "trapdoor" -> () -> new TrapDoorBlock(doorType(material), properties.get().noOcclusion().dynamicShape()); - case "button" -> () -> new ButtonBlock(BlockSetType.STONE, 20, properties.get().noCollission()); - case "slab" -> () -> new SlabBlock(properties.get()); - case "lever" -> () -> new LeverBlock(properties.get().noCollission()); - case "pressure_plate" -> () -> new PressurePlateBlock( - BlockSetType.STONE, properties.get()); - case "stairs" -> () -> new StairBlock(stairBase.get(), properties.get()); - case "wall" -> () -> new WallBlock(properties.get()); - default -> () -> new Block(properties.get()); - }; - return registerBlock(id, factory, item); - } - - private static BlockSetType doorType(MaterialDefinition material) { - return material.name().equals("quartz") ? BlockSetType.STONE : BlockSetType.IRON; - } - - private static void registerEquipment(MaterialDefinition material, Map> items) { - MaterialArmor.register(material); - Item.Properties tool = new Item.Properties().durability(material.toolDurability()); - Item.Properties combat = new Item.Properties(); - items.put("pickaxe", registerItem(material.name() + "_pickaxe", () -> new MaterialItems.Pickaxe(material, tool))); - items.put("axe", registerItem(material.name() + "_axe", () -> new MaterialItems.Axe(material, - new Item.Properties()))); - items.put("shovel", registerItem(material.name() + "_shovel", () -> new MaterialItems.Shovel(material, - new Item.Properties()))); - items.put("hoe", registerItem(material.name() + "_hoe", () -> new MaterialItems.Hoe(material, - new Item.Properties()))); - items.put("sword", registerItem(material.name() + "_sword", () -> new MaterialItems.Sword(material, - new Item.Properties()))); - items.put("crackhammer", registerItem(material.name() + "_crackhammer", () -> new CrackhammerItem(material, - new Item.Properties()))); - items.put("scythe", registerItem(material.name() + "_scythe", () -> new ScytheItem(material, - new Item.Properties()))); - items.put("shears", registerItem(material.name() + "_shears", () -> new MaterialItems.Shears(material, - new Item.Properties().durability(material.toolDurability())))); - items.put("fishing_rod", registerItem(material.name() + "_fishing_rod", () -> new MaterialItems.FishingRod(material, - new Item.Properties().durability(material.toolDurability())))); - items.put("bow", registerItem(material.name() + "_bow", () -> new MaterialItems.Bow(material, - combat.durability(material.toolDurability())))); - items.put("crossbow", registerItem(material.name() + "_crossbow", () -> new MaterialItems.Crossbow(material, - new Item.Properties().durability(material.toolDurability())))); - items.put("shield", registerItem(material.name() + "_shield", () -> new MaterialItems.Shield(material, - new Item.Properties().durability(material.shieldDurability())))); - items.put("arrow", registerItem(material.name() + "_arrow", () -> new BaseMetalAmmoItem(material, - BaseMetalAmmoItem.Kind.ARROW, ModEntities.CUSTOM_ARROW::get, - new Item.Properties()))); - items.put("bolt", registerItem(material.name() + "_bolt", () -> new BaseMetalAmmoItem(material, - BaseMetalAmmoItem.Kind.BOLT, ModEntities.CUSTOM_BOLT::get, - new Item.Properties()))); - items.put("rod", registerSimpleMaterialItem(material.name() + "_rod", material)); - items.put("gear", registerSimpleMaterialItem(material.name() + "_gear", material)); - items.put("horse_armor", registerItem(material.name() + "_horse_armor", - () -> new MaterialItems.HorseArmor(material, new Item.Properties().stacksTo(1)))); - items.put("helmet", registerArmor(material, EquipmentSlot.HEAD)); - items.put("chestplate", registerArmor(material, EquipmentSlot.CHEST)); - items.put("leggings", registerArmor(material, EquipmentSlot.LEGS)); - items.put("boots", registerArmor(material, EquipmentSlot.FEET)); - } - - private static DeferredHolder registerArmor(MaterialDefinition material, EquipmentSlot slot) { - String id = material.name() + "_" + switch (slot) { - case HEAD -> "helmet"; - case CHEST -> "chestplate"; - case LEGS -> "leggings"; - case FEET -> "boots"; - default -> throw new IllegalArgumentException("Not armor: " + slot); - }; - return registerItem(id, () -> new MaterialItems.Armor(material, slot, - new Item.Properties())); - } - - private static void registerVanillaBits() { - Map vanilla = vanillaDefinitions(); - DeferredHolder charcoalBlock = registerBlock("charcoal_block", - () -> new Block(BlockBehaviour.Properties.of().mapColor(MapColor.STONE) - .sound(SoundType.SAND).requiresCorrectToolForDrops().strength(5.0F)), false); - registerItem("charcoal_block", () -> new MaterialItems.BurnableBlock( - charcoalBlock.get(), 16000, new Item.Properties())); - registerVanillaDecorative("diamond", vanilla.get("diamond"), - List.of("bars", "door", "trapdoor", "button", "slab", "lever", "pressure_plate", "stairs", "wall")); - registerVanillaDecorative("emerald", vanilla.get("emerald"), - List.of("bars", "door", "trapdoor", "button", "slab", "lever", "pressure_plate", "stairs", "wall")); - registerVanillaDecorative("gold", vanilla.get("gold"), - List.of("bars", "door", "trapdoor", "button", "slab", "lever", "stairs", "wall")); - registerVanillaDecorative("obsidian", vanilla.get("obsidian"), - List.of("bars", "door", "trapdoor", "button", "slab", "lever", "pressure_plate", "stairs", "wall")); - registerVanillaDecorative("iron", vanilla.get("iron"), - List.of("button", "slab", "lever", "stairs", "wall")); - registerVanillaDecorative("quartz", vanilla.get("quartz"), - List.of("bars", "door", "trapdoor", "button", "lever", "pressure_plate", "wall")); - registerBlock("gold_plate", () -> new PlateBlock(BlockBehaviour.Properties.ofLegacyCopy(net.minecraft.world.level.block.Blocks.GOLD_BLOCK).noOcclusion()), true); - registerBlock("iron_plate", () -> new PlateBlock(BlockBehaviour.Properties.ofLegacyCopy(net.minecraft.world.level.block.Blocks.IRON_BLOCK).noOcclusion()), true); - - for (String name : List.of("diamond", "emerald", "gold", "iron", "obsidian", "quartz")) { - registerVanillaCombatAndUtility(vanilla.get(name)); - } - for (String name : List.of("diamond", "emerald", "gold", "iron", "obsidian", "quartz", "stone", "wood")) { - MaterialDefinition material = vanilla.get(name); - registerItem(name + "_crackhammer", () -> new CrackhammerItem(material, - new Item.Properties())); - registerSimpleMaterialItem(name + "_gear", material); - registerItem(name + "_scythe", () -> new ScytheItem(material, - new Item.Properties())); - } - for (String name : List.of("coal", "charcoal", "diamond", "emerald", "gold", "iron", "obsidian", "quartz")) { - MaterialDefinition material = vanilla.get(name); - registerSimpleMaterialItem(name + "_powder", material); - registerSimpleMaterialItem(name + "_smallpowder", material); - } - registerSimpleMaterialItem("redstone_smallpowder", vanilla.get("redstone")); - for (String name : List.of("coal", "charcoal", "diamond", "emerald", "obsidian", "quartz")) { - registerSimpleMaterialItem(name + "_nugget", vanilla.get(name)); - } - for (String name : List.of("diamond", "gold", "iron")) { - registerSimpleMaterialItem(name + "_blend", vanilla.get(name)); - registerSimpleMaterialItem(name + "_smallblend", vanilla.get(name)); - } - registerSimpleMaterialItem("lapis_smallpowder", vanilla.get("lapis")); - registerSimpleMaterialItem("obsidian_ingot", vanilla.get("obsidian")); - registerSimpleMaterialItem("redstone_ingot", vanilla.get("redstone")); - registerSimpleMaterialItem("stone_rod", vanilla.get("stone")); - } - - private static void registerVanillaDecorative(String name, MaterialDefinition material, - List forms) { - for (String form : forms) { - registerMaterialBlock(name + "_" + form, form, material, true, - () -> vanillaDecorativeProperties(name, form, material), - () -> vanillaStorageBlock(name).defaultBlockState()); - } - if (forms.contains("slab")) { - String id = "double_" + name + "_slab"; - registerBlock(id, () -> new CompatibilityDoubleSlabBlock( - vanillaDecorativeProperties(name, "slab", material)), false); - HIDDEN_BLOCKS.add(id); - } - } - - private static BlockBehaviour.Properties vanillaDecorativeProperties(String name, String form, - MaterialDefinition material) { - boolean gem = name.equals("diamond") || name.equals("emerald") - || name.equals("obsidian") || name.equals("quartz"); - boolean lockedGemDoor = gem && !name.equals("quartz") - && (form.equals("door") || form.equals("trapdoor")); - MapColor mapColor = name.equals("gold") || name.equals("iron") || lockedGemDoor - ? MapColor.METAL : MapColor.STONE; - return BlockBehaviour.Properties.of().mapColor(mapColor) - .sound(gem ? SoundType.GLASS : SoundType.METAL) - .requiresCorrectToolForDrops() - .strength(material.blockHardness(), material.blastResistance()); - } - - private static Block vanillaStorageBlock(String name) { - return switch (name) { - case "diamond" -> net.minecraft.world.level.block.Blocks.DIAMOND_BLOCK; - case "emerald" -> net.minecraft.world.level.block.Blocks.EMERALD_BLOCK; - case "gold" -> net.minecraft.world.level.block.Blocks.GOLD_BLOCK; - case "iron" -> net.minecraft.world.level.block.Blocks.IRON_BLOCK; - case "obsidian" -> net.minecraft.world.level.block.Blocks.OBSIDIAN; - case "quartz" -> net.minecraft.world.level.block.Blocks.QUARTZ_BLOCK; - default -> throw new IllegalArgumentException("No vanilla storage block for " + name); - }; - } - - private static void registerVanillaCombatAndUtility(MaterialDefinition material) { - MaterialArmor.register(material); - String name = material.name(); - registerItem(name + "_arrow", () -> new BaseMetalAmmoItem(material, BaseMetalAmmoItem.Kind.ARROW, - ModEntities.CUSTOM_ARROW::get, new Item.Properties())); - registerItem(name + "_bolt", () -> new BaseMetalAmmoItem(material, BaseMetalAmmoItem.Kind.BOLT, - ModEntities.CUSTOM_BOLT::get, new Item.Properties())); - registerItem(name + "_bow", () -> new MaterialItems.Bow(material, - new Item.Properties().durability(material.toolDurability()))); - registerItem(name + "_crossbow", () -> new MaterialItems.Crossbow(material, - new Item.Properties().durability(material.toolDurability()))); - registerItem(name + "_fishing_rod", () -> new MaterialItems.FishingRod(material, - new Item.Properties().durability(material.toolDurability()))); - registerSimpleMaterialItem(name + "_rod", material); - if (!name.equals("iron")) { - registerItem(name + "_shears", () -> new MaterialItems.Shears(material, - new Item.Properties().durability(material.toolDurability()))); - } - registerItem(name + "_shield", () -> new MaterialItems.Shield(material, - new Item.Properties().durability(material.shieldDurability()))); - // Preserve IDs which were added for vanilla materials by MMDLib. The - // vanilla equipment itself remains the canonical tool/armor where present. - if (name.equals("emerald") || name.equals("obsidian") || name.equals("quartz")) { - registerItem(name + "_axe", () -> new MaterialItems.Axe(material, new Item.Properties())); - registerItem(name + "_pickaxe", () -> new MaterialItems.Pickaxe(material, new Item.Properties())); - registerItem(name + "_shovel", () -> new MaterialItems.Shovel(material, new Item.Properties())); - registerItem(name + "_hoe", () -> new MaterialItems.Hoe(material, new Item.Properties())); - registerArmor(material, EquipmentSlot.HEAD); - registerArmor(material, EquipmentSlot.CHEST); - registerArmor(material, EquipmentSlot.LEGS); - registerArmor(material, EquipmentSlot.FEET); - registerItem(name + "_horse_armor", () -> new MaterialItems.HorseArmor(material, - new Item.Properties().stacksTo(1))); - } - if (name.equals("emerald") || name.equals("obsidian") || name.equals("quartz")) { - registerItem(name + "_sword", () -> new MaterialItems.Sword(material, - new Item.Properties())); - } - } - - private static Map vanillaDefinitions() { - Map map = new LinkedHashMap<>(); - addVanilla(map, "wood", 2, 2, 6, 0x695433); - addVanilla(map, "stone", 5, 4, 2, 0x8F8F8F); - addVanilla(map, "iron", 8, 8, 4.5, 0xD8D8D8); - addVanilla(map, "gold", 1, 1, 10, 0xFFFF8B); - addVanilla(map, "diamond", 10, 15, 4, 0x8CF4E1); - addVanilla(map, "emerald", 10, 15, 4, 0x82F6AC); - addVanilla(map, "obsidian", 10, 15, 4, 0x101019); - addVanilla(map, "quartz", 5, 4, 2, 0xEAE3DB); - addVanilla(map, "coal", 4, 4, 2, 0x151515); - addVanilla(map, "charcoal", 4, 4, 2, 0x231F18); - addVanilla(map, "redstone", 1, 1, 1, 0x720000); - addVanilla(map, "lapis", 1, 1, 1, 0x26619C); - return map; - } - - private static void addVanilla(Map map, String name, - double hardness, double strength, double magic, int colour) { - map.put(name, new MaterialDefinition(name, MaterialDefinition.Kind.ALLOY, - hardness, strength, magic, colour, false)); - } - private static void registerFluid(String name, int colour, boolean mercury, int viscosity) { ResourceLocation id = ResourceLocation.fromNamespaceAndPath(BaseMetals.MOD_ID, name); DeferredHolder source = DeferredHolder.create(Registries.FLUID, id); DeferredHolder flowing = DeferredHolder.create( Registries.FLUID, id.withPrefix("flowing_")); DeferredHolder block = DeferredHolder.create(Registries.BLOCK, id); + // The basemetals:bucket item form registers this ID through MMDLib. DeferredHolder bucket = DeferredHolder.create( Registries.ITEM, id.withSuffix("_bucket")); ResourceLocation still = ResourceLocation.fromNamespaceAndPath(BaseMetals.MOD_ID, @@ -440,68 +183,13 @@ private static void registerFluid(String name, int colour, boolean mercury, int .explosionResistance(100.0F); FLUIDS.register(name, () -> new BaseFlowingFluid.Source(properties)); FLUIDS.register("flowing_" + name, () -> new BaseFlowingFluid.Flowing(properties)); - registerBlock(name, () -> new MoltenMetalBlock(source, + BLOCKS_BY_ID.put(name, BLOCKS.register(name, () -> new MoltenMetalBlock(source, BlockBehaviour.Properties.of().mapColor(mercury ? MapColor.METAL : MapColor.FIRE) .noCollission().strength(100.0F).noLootTable() - .lightLevel(state -> mercury ? 0 : 10), mercury), false); + .lightLevel(state -> mercury ? 0 : 10), mercury))); // Forge 1.12 registered an ItemBlock under every molten block ID. Keep // those hidden inventory IDs so old stacks can survive a world upgrade. - registerItem(name, () -> new BlockItem(block.get(), new Item.Properties())); - registerItem(name + "_bucket", () -> new BaseMetalBucketItem(source, - new Item.Properties().craftRemainder(Items.BUCKET).stacksTo(1))); + ITEMS_BY_ID.put(name, ITEMS.register(name, () -> new BlockItem(block.get(), new Item.Properties()))); FLUID_CONTENT.put(name, new FluidContent(source, flowing, block, bucket)); } - - private static DeferredHolder registerAnvil(String id, BlockBehaviour.Properties properties) { - return registerBlock(id, () -> new BaseMetalAnvilBlock(properties), true); - } - - private static DeferredHolder registerBlock(String id, Supplier factory, boolean hasItem) { - if (BLOCKS_BY_ID.containsKey(id)) throw new IllegalStateException("Duplicate block " + id); - DeferredHolder block = BLOCKS.register(id, factory); - BLOCKS_BY_ID.put(id, block); - if (hasItem) { - registerItem(id, () -> new BlockItem(block.get(), new Item.Properties())); - } - return block; - } - - private static DeferredHolder registerSimpleMaterialItem(String id, MaterialDefinition material) { - return registerItem(id, () -> new MaterialItems.Basic(material, burnTime(id), - new Item.Properties())); - } - - private static int burnTime(String id) { - if (id.equals("charcoal_block")) return 16000; - if (id.equals("wood_gear")) return 300; - String material = id.substring(0, id.lastIndexOf('_')); - if (!isLegacyFuelMaterial(material)) return -1; - if (id.endsWith("_powder")) return 1600; - if (id.endsWith("_nugget") || id.endsWith("_smallpowder")) return 200; - return -1; - } - - private static boolean isLegacyFuelMaterial(String name) { - if (name.equals("coal") || name.equals("charcoal")) return true; - return false; - } - - private static DeferredHolder registerItem(String id, Supplier factory) { - if (ITEMS_BY_ID.containsKey(id)) throw new IllegalStateException("Duplicate item " + id); - DeferredHolder item = ITEMS.register(id, factory); - ITEMS_BY_ID.put(id, item); - return item; - } - - private static BlockBehaviour.Properties metalProperties(MaterialDefinition material) { - return BlockBehaviour.Properties.of().mapColor(MapColor.METAL) - .sound(SoundType.METAL).requiresCorrectToolForDrops() - .strength(material.blockHardness(), material.blastResistance()); - } - - private static BlockBehaviour.Properties oreProperties(MaterialDefinition material) { - return BlockBehaviour.Properties.of().mapColor(MapColor.STONE) - .sound(SoundType.STONE).requiresCorrectToolForDrops() - .strength(material.oreHardness(), material.blastResistance()); - } } diff --git a/src/main/java/zone/moddev/mc/basemetals/content/PlateBlock.java b/src/main/java/zone/moddev/mc/basemetals/content/PlateBlock.java deleted file mode 100644 index 2c85a7171..000000000 --- a/src/main/java/zone/moddev/mc/basemetals/content/PlateBlock.java +++ /dev/null @@ -1,85 +0,0 @@ -package zone.moddev.mc.basemetals.content; - -import net.minecraft.core.BlockPos; -import net.minecraft.core.Direction; -import net.minecraft.world.item.context.BlockPlaceContext; -import net.minecraft.world.level.BlockGetter; -import net.minecraft.world.level.block.Block; -import net.minecraft.world.level.block.Mirror; -import net.minecraft.world.level.block.Rotation; -import net.minecraft.world.level.block.state.BlockState; -import net.minecraft.world.level.block.state.StateDefinition; -import net.minecraft.world.level.block.state.properties.BlockStateProperties; -import net.minecraft.world.level.block.state.properties.DirectionProperty; -import net.minecraft.world.phys.shapes.CollisionContext; -import net.minecraft.world.phys.shapes.VoxelShape; -import net.minecraft.world.phys.Vec3; -import net.minecraft.util.Mth; - -public final class PlateBlock extends Block { - public static final DirectionProperty FACING = BlockStateProperties.FACING; - private static final VoxelShape[] SHAPES = { - box(0, 15, 0, 16, 16, 16), box(0, 0, 0, 16, 1, 16), - box(0, 0, 15, 16, 16, 16), box(0, 0, 0, 16, 16, 1), - box(15, 0, 0, 16, 16, 16), box(0, 0, 0, 1, 16, 16)}; - - public PlateBlock(Properties properties) { - super(properties); - registerDefaultState(stateDefinition.any().setValue(FACING, Direction.NORTH)); - } - - @Override - public BlockState getStateForPlacement(BlockPlaceContext context) { - Direction face = context.getClickedFace(); - Vec3 click = context.getClickLocation(); - float x = (float) (click.x - Mth.floor(click.x)); - float y = (float) (click.y - Mth.floor(click.y)); - float z = (float) (click.z - Mth.floor(click.z)); - float up; - float right; - Direction.Axis upAxis; - Direction.Axis rightAxis; - switch (face) { - case UP -> { up = z - 0.5F; right = x - 0.5F; upAxis = Direction.Axis.X; rightAxis = Direction.Axis.Z; } - case EAST -> { up = y - 0.5F; right = z - 0.5F; upAxis = Direction.Axis.Z; rightAxis = Direction.Axis.Y; } - case SOUTH -> { up = 0.5F - y; right = 0.5F - x; upAxis = Direction.Axis.X; rightAxis = Direction.Axis.Y; } - case DOWN -> { up = 0.5F - z; right = 0.5F - x; upAxis = Direction.Axis.X; rightAxis = Direction.Axis.Z; } - case WEST -> { up = 0.5F - y; right = 0.5F - z; upAxis = Direction.Axis.Z; rightAxis = Direction.Axis.Y; } - case NORTH -> { up = y - 0.5F; right = x - 0.5F; upAxis = Direction.Axis.X; rightAxis = Direction.Axis.Y; } - default -> throw new IllegalStateException("Unhandled face " + face); - } - Direction facing = face; - if (Math.abs(up) >= 0.25F || Math.abs(right) >= 0.25F) { - boolean upOrRight = up + right > 0; - boolean upOrLeft = up - right > 0; - if (upOrRight) { - facing = upOrLeft ? face.getClockWise(upAxis) - : face.getClockWise(rightAxis).getOpposite(); - } else { - facing = upOrLeft ? face.getClockWise(rightAxis) - : face.getClockWise(upAxis).getOpposite(); - } - } - return defaultBlockState().setValue(FACING, facing); - } - - @Override - public VoxelShape getShape(BlockState state, BlockGetter level, BlockPos pos, CollisionContext context) { - return SHAPES[state.getValue(FACING).get3DDataValue()]; - } - - @Override - public BlockState rotate(BlockState state, Rotation rotation) { - return state.setValue(FACING, rotation.rotate(state.getValue(FACING))); - } - - @Override - public BlockState mirror(BlockState state, Mirror mirror) { - return rotate(state, mirror.getRotation(state.getValue(FACING))); - } - - @Override - protected void createBlockStateDefinition(StateDefinition.Builder builder) { - builder.add(FACING); - } -} diff --git a/src/main/java/zone/moddev/mc/basemetals/content/ScytheItem.java b/src/main/java/zone/moddev/mc/basemetals/content/ScytheItem.java deleted file mode 100644 index ba9b456d9..000000000 --- a/src/main/java/zone/moddev/mc/basemetals/content/ScytheItem.java +++ /dev/null @@ -1,68 +0,0 @@ -package zone.moddev.mc.basemetals.content; - -import zone.moddev.mc.basemetals.material.MaterialDefinition; -import zone.moddev.mc.basemetals.ModTags; - -import net.minecraft.core.BlockPos; -import net.minecraft.world.item.DiggerItem; -import net.minecraft.world.item.ItemStack; -import net.minecraft.world.item.TooltipFlag; -import net.minecraft.network.chat.Component; -import net.minecraft.server.level.ServerPlayer; -import net.minecraft.world.entity.LivingEntity; -import net.minecraft.world.level.Level; -import net.minecraft.world.level.block.state.BlockState; -import java.util.List; - -public final class ScytheItem extends DiggerItem implements MaterialBacked { - /** - * The nested calls use the ordinary server break path so every affected - * block still fires NeoForge's protection event and receives vanilla drops. - * The guard lets those nested calls complete without recursively starting - * another 3x3 harvest. - */ - private static final ThreadLocal HARVESTING = ThreadLocal.withInitial(() -> false); - private final MaterialDefinition material; - - public ScytheItem(MaterialDefinition material, Properties properties) { - super(new MaterialTier(material), ModTags.SCYTHE_HARVESTABLE, - properties.attributes(DiggerItem.createAttributes(new MaterialTier(material), 0.0F, 0.0F))); - this.material = material; - } - - @Override public MaterialDefinition baseMetalsMaterial() { return material; } - - @Override - public boolean mineBlock(ItemStack stack, Level level, BlockState state, - BlockPos position, LivingEntity miner) { - boolean result = super.mineBlock(stack, level, state, position, miner); - if (level.isClientSide || !(miner instanceof ServerPlayer player) - || HARVESTING.get() || !state.is(ModTags.SCYTHE_HARVESTABLE) || stack.isEmpty()) { - return result; - } - - HARVESTING.set(true); - try { - for (int dx = -1; dx <= 1; dx++) { - for (int dz = -1; dz <= 1; dz++) { - // The ordinary break already handled the center block. - if (dx == 0 && dz == 0) continue; - if (stack.isEmpty()) return result; - BlockPos target = position.offset(dx, 0, dz); - if (level.getBlockState(target).is(ModTags.SCYTHE_HARVESTABLE)) { - player.gameMode.destroyBlock(target); - } - } - } - } finally { - HARVESTING.remove(); - } - return result; - } - - @Override - public void appendHoverText(ItemStack stack, TooltipContext context, - List tooltip, TooltipFlag flag) { - MaterialItems.addToolTooltip(material, tooltip); - } -} diff --git a/src/main/java/zone/moddev/mc/basemetals/effects/MaterialEffects.java b/src/main/java/zone/moddev/mc/basemetals/effects/MaterialEffects.java new file mode 100644 index 000000000..061e6ca5b --- /dev/null +++ b/src/main/java/zone/moddev/mc/basemetals/effects/MaterialEffects.java @@ -0,0 +1,167 @@ +package zone.moddev.mc.basemetals.effects; + +import java.lang.invoke.MethodType; +import java.util.ArrayList; +import java.util.List; + +import zone.moddev.mc.basemetals.BaseMetals; +import zone.moddev.mc.basemetals.config.BaseMetalsConfig; +import zone.moddev.mc.lib.api.MaterialEvent; +import zone.moddev.mc.lib.api.MaterialExtensions; +import zone.moddev.mc.lib.common.runtime.MaterialBacked; +import zone.moddev.mc.lib.common.types.MMDMaterial; + +import net.minecraft.core.Holder; +import net.minecraft.tags.EntityTypeTags; +import net.minecraft.world.effect.MobEffect; +import net.minecraft.world.effect.MobEffectCategory; +import net.minecraft.world.effect.MobEffectInstance; +import net.minecraft.world.effect.MobEffects; +import net.minecraft.world.entity.EquipmentSlot; +import net.minecraft.world.entity.LivingEntity; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.entity.projectile.Projectile; +import net.minecraft.world.item.ArmorItem; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.TieredItem; +import net.neoforged.neoforge.common.NeoForge; +import net.neoforged.neoforge.event.entity.living.LivingIncomingDamageEvent; + +/** + * Material effects, declared as MMDLib handlers in {@code mmdlib/extension/effects.json} + * and bound by each material's {@code event} map. MMDLib's event bridge runs the + * {@code player-tick} handlers for a player wearing or holding the material. + */ +public final class MaterialEffects { + private static final EquipmentSlot[] ARMOR = { + EquipmentSlot.HEAD, EquipmentSlot.CHEST, EquipmentSlot.LEGS, EquipmentSlot.FEET}; + + /** + * Melee hits that can change the damage dealt. The built-in {@code weapon-hit} contract + * runs before damage is known, so Base Metals bridges its own contract from + * {@link LivingIncomingDamageEvent}, keyed by the attacker's held weapon. + */ + public static MaterialEvent MELEE_DAMAGE; + + private MaterialEffects() {} + + /** Called from the mod constructor, before MMDLib resolves {@code effects.json}. */ + public static void register() { + var events = MaterialExtensions.GLOBAL.events(); + MELEE_DAMAGE = events.registerEvent(BaseMetals.MOD_ID + ":melee-damage", LivingIncomingDamageEvent.class, + MethodType.methodType(void.class, LivingEntity.class, LivingEntity.class, LivingIncomingDamageEvent.class), + (method, event) -> { + method.invokeExact((LivingEntity) event.getSource().getEntity(), + (LivingEntity) event.getEntity(), (LivingIncomingDamageEvent) event); + }); + events.listen(NeoForge.EVENT_BUS, MELEE_DAMAGE, MaterialEffects::weaponMaterial); + } + + private static List weaponMaterial(LivingIncomingDamageEvent event) { + if (!BaseMetalsConfig.SPECIAL_EFFECTS.get() || event.getEntity().level().isClientSide + || !(event.getSource().getEntity() instanceof LivingEntity attacker)) return List.of(); + ItemStack held = attacker.getMainHandItem(); + return held.getItem() instanceof TieredItem && held.getItem() instanceof MaterialBacked backed + ? List.of(backed.material()) : List.of(); + } + + public static void adamantine(Player player) { + if (!armorTick(player)) return; + int pieces = pieces(player, "adamantine"); + if (pieces >= 2) add(player, MobEffects.DAMAGE_RESISTANCE, pieces == 4 ? 1 : 0); + } + + public static void aquarium(Player player) { + if (!armorTick(player) || pieces(player, "aquarium") != 4 || !player.isUnderWater()) return; + add(player, MobEffects.WATER_BREATHING, 0); + add(player, MobEffects.DAMAGE_RESISTANCE, 0); + player.removeEffect(MobEffects.DIG_SLOWDOWN); + } + + public static void coldiron(Player player) { + if (armorTick(player) && pieces(player, "coldiron") == 4) add(player, MobEffects.FIRE_RESISTANCE, 0); + } + + public static void lead(Player player) { + if (!armorTick(player)) return; + int pieces = pieces(player, "lead"); + if (pieces >= 2) add(player, MobEffects.MOVEMENT_SLOWDOWN, pieces == 4 ? 1 : 0); + } + + public static void mithril(Player player) { + if (!armorTick(player) || pieces(player, "mithril") != 4) return; + for (MobEffectInstance effect : new ArrayList<>(player.getActiveEffects())) { + if (effect.getEffect().value().getCategory() == MobEffectCategory.HARMFUL) { + player.removeEffect(effect.getEffect()); + } + } + } + + public static void starsteel(Player player) { + if (player.level().isClientSide) return; + if (BaseMetalsConfig.STARSTEEL_REGENERATION.get() && player.tickCount % 200 == 0) { + regenerate(player.getMainHandItem()); + regenerate(player.getOffhandItem()); + } + if (!armorTick(player)) return; + int pieces = pieces(player, "starsteel"); + if (pieces > 0) add(player, MobEffects.JUMP, pieces - 1); + if (pieces >= 2) add(player, MobEffects.MOVEMENT_SPEED, Math.min(2, pieces - 2)); + } + + public static void adamantineMelee(LivingEntity attacker, LivingEntity target, LivingIncomingDamageEvent event) { + if (target.getMaxHealth() > 20.0F) event.setAmount(event.getAmount() + 4.0F); + } + + public static void aquariumMelee(LivingEntity attacker, LivingEntity target, LivingIncomingDamageEvent event) { + if (target.canBreatheUnderwater()) event.setAmount(event.getAmount() + 4.0F); + } + + public static void coldironMelee(LivingEntity attacker, LivingEntity target, LivingIncomingDamageEvent event) { + if (target.fireImmune()) event.setAmount(event.getAmount() + 3.0F); + } + + public static void mithrilMelee(LivingEntity attacker, LivingEntity target, LivingIncomingDamageEvent event) { + if (target.getType().is(EntityTypeTags.UNDEAD)) { + target.addEffect(new MobEffectInstance(MobEffects.WITHER, 60, 3)); + target.addEffect(new MobEffectInstance(MobEffects.BLINDNESS, 60, 1)); + } + } + + /** Starsteel arrows and bolts that deal damage lift their target. */ + public static void starsteelShot(Projectile projectile, LivingEntity target, ItemStack ammo) { + if (BaseMetalsConfig.SPECIAL_EFFECTS.get()) { + target.addEffect(new MobEffectInstance(MobEffects.LEVITATION, 100)); + } + } + + private static boolean armorTick(Player player) { + return !player.level().isClientSide && player.tickCount % 20 == 0 && BaseMetalsConfig.SPECIAL_EFFECTS.get(); + } + + private static void regenerate(ItemStack stack) { + if (stack.isDamaged() && !(stack.getItem() instanceof ArmorItem) && is(stack, "starsteel")) { + stack.setDamageValue(stack.getDamageValue() - 1); + } + } + + private static int pieces(Player player, String material) { + int pieces = 0; + for (EquipmentSlot slot : ARMOR) { + ItemStack stack = player.getItemBySlot(slot); + if (stack.getItem() instanceof ArmorItem && is(stack, material)) pieces++; + } + return pieces; + } + + /** True for Base Metals items of the material, whatever their form. */ + public static boolean is(ItemStack stack, String material) { + return stack.getItem() instanceof MaterialBacked backed && backed.material().name() + .filter(id -> id.getNamespace().equals(BaseMetals.MOD_ID) && id.getPath().equals(material)) + .isPresent(); + } + + private static void add(Player player, Holder effect, int amplifier) { + player.addEffect(new MobEffectInstance(effect, 45, amplifier, false, false, true)); + } +} diff --git a/src/main/java/zone/moddev/mc/basemetals/entity/MaterialProjectile.java b/src/main/java/zone/moddev/mc/basemetals/entity/MaterialProjectile.java deleted file mode 100644 index aeb874780..000000000 --- a/src/main/java/zone/moddev/mc/basemetals/entity/MaterialProjectile.java +++ /dev/null @@ -1,82 +0,0 @@ -package zone.moddev.mc.basemetals.entity; - -import javax.annotation.Nullable; - -import com.mojang.serialization.Dynamic; - -import zone.moddev.mc.basemetals.content.ModContent; - -import net.minecraft.SharedConstants; -import net.minecraft.nbt.CompoundTag; -import net.minecraft.nbt.NbtOps; -import net.minecraft.nbt.Tag; -import net.minecraft.network.RegistryFriendlyByteBuf; -import net.minecraft.util.datafix.DataFixers; -import net.minecraft.util.datafix.fixes.References; -import net.minecraft.world.entity.EntityType; -import net.minecraft.world.entity.LivingEntity; -import net.minecraft.world.entity.projectile.AbstractArrow; -import net.minecraft.world.entity.projectile.ItemSupplier; -import net.minecraft.world.item.ItemStack; -import net.minecraft.world.level.Level; -import net.neoforged.neoforge.entity.IEntityWithComplexSpawn; - -public final class MaterialProjectile extends AbstractArrow implements IEntityWithComplexSpawn, ItemSupplier { - public MaterialProjectile(EntityType type, Level level) { - super(type, level); - } - - public MaterialProjectile(EntityType type, Level level, - LivingEntity shooter, ItemStack ammunition) { - this(type, level, shooter, ammunition, null); - } - - public MaterialProjectile(EntityType type, Level level, - LivingEntity shooter, ItemStack ammunition, @Nullable ItemStack weapon) { - super(type, shooter, level, ammunition.copyWithCount(1), weapon); - } - - @Override - protected ItemStack getDefaultPickupItem() { - String form = getType() == ModEntities.CUSTOM_BOLT.get() ? "bolt" : "arrow"; - - return ModContent.item("copper_" + form).get().getDefaultInstance(); - } - - /** Used by the renderer so arrows and bolts retain their actual ammunition appearance. */ - @Override - public ItemStack getItem() { - return getPickupItem(); - } - - @Override - public void readAdditionalSaveData(CompoundTag tag) { - super.readAdditionalSaveData(tag); - - if (tag.contains("item", Tag.TAG_COMPOUND) || !tag.contains("Ammunition", Tag.TAG_COMPOUND)) { - return; - } - - CompoundTag ammunition = tag.getCompound("Ammunition").copy(); - - // Older projectiles stored their stack outside vanilla's item conversion. - // Convert it here so names, enchantments and custom data survive the upgrade. - if (ammunition.contains("Count")) { - ammunition = (CompoundTag) DataFixers.getDataFixer().update(References.ITEM_STACK, - new Dynamic<>(NbtOps.INSTANCE, ammunition), 3465, - SharedConstants.getCurrentVersion().getDataVersion().getVersion()).getValue(); - } - - ItemStack.parse(registryAccess(), ammunition).ifPresent(this::setPickupItemStack); - } - - @Override - public void writeSpawnData(RegistryFriendlyByteBuf buffer) { - ItemStack.STREAM_CODEC.encode(buffer, getPickupItem()); - } - - @Override - public void readSpawnData(RegistryFriendlyByteBuf buffer) { - setPickupItemStack(ItemStack.STREAM_CODEC.decode(buffer)); - } -} diff --git a/src/main/java/zone/moddev/mc/basemetals/entity/ModEntities.java b/src/main/java/zone/moddev/mc/basemetals/entity/ModEntities.java deleted file mode 100644 index d10a84b43..000000000 --- a/src/main/java/zone/moddev/mc/basemetals/entity/ModEntities.java +++ /dev/null @@ -1,26 +0,0 @@ -package zone.moddev.mc.basemetals.entity; - -import zone.moddev.mc.basemetals.BaseMetals; - -import net.minecraft.world.entity.EntityType; -import net.minecraft.world.entity.MobCategory; -import net.minecraft.core.registries.Registries; -import net.neoforged.bus.api.IEventBus; -import net.neoforged.neoforge.registries.DeferredRegister; -import net.neoforged.neoforge.registries.DeferredHolder; - -public final class ModEntities { - public static final DeferredRegister> ENTITIES = DeferredRegister.create( - Registries.ENTITY_TYPE, BaseMetals.MOD_ID); - public static final DeferredHolder, EntityType> CUSTOM_ARROW = ENTITIES.register( - "custom_arrow", () -> EntityType.Builder.of(MaterialProjectile::new, MobCategory.MISC) - .sized(0.5F, 0.5F).clientTrackingRange(4).updateInterval(20) - .build(BaseMetals.MOD_ID + ":custom_arrow")); - public static final DeferredHolder, EntityType> CUSTOM_BOLT = ENTITIES.register( - "custom_bolt", () -> EntityType.Builder.of(MaterialProjectile::new, MobCategory.MISC) - .sized(0.5F, 0.5F).clientTrackingRange(4).updateInterval(20) - .build(BaseMetals.MOD_ID + ":custom_bolt")); - - private ModEntities() {} - public static void register(IEventBus bus) { ENTITIES.register(bus); } -} diff --git a/src/main/java/zone/moddev/mc/basemetals/material/MaterialCatalogue.java b/src/main/java/zone/moddev/mc/basemetals/material/MaterialCatalogue.java index 80eb814af..2cae5da8e 100644 --- a/src/main/java/zone/moddev/mc/basemetals/material/MaterialCatalogue.java +++ b/src/main/java/zone/moddev/mc/basemetals/material/MaterialCatalogue.java @@ -1,61 +1,72 @@ package zone.moddev.mc.basemetals.material; -import static zone.moddev.mc.basemetals.material.MaterialDefinition.Kind.*; - import java.util.LinkedHashMap; import java.util.List; import java.util.Map; +import java.util.Optional; + +import zone.moddev.mc.basemetals.BaseMetals; +import zone.moddev.mc.lib.MMDLib; +import zone.moddev.mc.lib.common.types.MMDMaterial; -/** Ordered catalogue used by registration, data generation, and validation. */ +/** + * Base Metals' materials, read from the MMDLib definitions in {@code mmdlib/material/}. + * Available once MMDLib has loaded definitions, before registry events. + * + *

The vanilla extensions (iron, diamond, wood, ...) are also Base Metals definitions, + * but they extend existing vanilla materials and are not part of this catalogue; see + * {@link #isVanillaExtension}. + */ public final class MaterialCatalogue { - public static final List ALL = List.of( - material("adamantine", RARE_ORE, 12, 100, 0, 0x53393F, true), - material("antimony", ORE, 1, 1, 1, 0xD8E3DE, true), - material("aquarium", RARE_ALLOY, 4, 10, 15, 0x0000FF, false), - material("bismuth", ORE, 1, 1, 1, 0xDDD7CB, true), - material("brass", ALLOY, 3.5, 3, 9, 0xFFE374, false), - material("bronze", ALLOY, 8, 4, 4.5, 0xF7A54F, false), - material("coldiron", RARE_ORE, 7, 7, 7, 0xC7CEF0, true), - material("copper", ORE, 4, 4, 5, 0xFF9F78, false), - material("cupronickel", ALLOY, 6, 6, 6, 0xC8AB6F, false), - material("electrum", ALLOY, 5, 4, 10, 0xFFF2B3, false), - material("invar", ALLOY, 9, 10, 3, 0xD2CDB8, false), - material("lead", ORE, 1, 1, 1, 0x7B7B7B, false), - material("mercury", MERCURY, 1, 1, 1, 0xE2E2E2, false), - material("mithril", RARE_ALLOY, 9, 9, 9, 0xF4FFFF, false), - material("nickel", ORE, 4, 4, 7, 0xEEFFEB, true), - material("pewter", ALLOY, 1, 1, 1, 0x92969F, false), - material("platinum", RARE_ORE, 3, 5, 15, 0xF2FFFF, true), - material("silver", ORE, 5, 4, 6, 0xFFFFFF, false), - material("starsteel", RARE_ORE, 10, 25, 12, 0x53393F, true), - material("steel", ALLOY, 8, 15, 2, 0xD5E3E5, false), - material("tin", ORE, 3, 1, 2, 0xFFF7EE, false), - material("zinc", ORE, 1, 1, 1, 0xBCBCBC, true)); - - public static final Map BY_NAME; - - static { - Map byName = new LinkedHashMap<>(); - ALL.forEach(material -> { - if (byName.put(material.name(), material) != null) { - throw new IllegalStateException("Duplicate material " + material.name()); - } - }); - BY_NAME = Map.copyOf(byName); - } + private static volatile List all; + private static volatile Map byName; private MaterialCatalogue() {} + public static List all() { + load(); + return all; + } + + public static Map byName() { + load(); + return byName; + } + public static MaterialDefinition get(String name) { - MaterialDefinition material = BY_NAME.get(name); + MaterialDefinition material = byName().get(name); if (material == null) { throw new IllegalArgumentException("Unknown Base Metals material: " + name); } return material; } - private static MaterialDefinition material(String name, MaterialDefinition.Kind kind, - double hardness, double strength, double magic, int colour, boolean processing) { - return new MaterialDefinition(name, kind, hardness, strength, magic, colour, processing); + /** The Base Metals material behind an MMDLib material, if it is one of ours. */ + public static Optional of(MMDMaterial material) { + return material.name() + .filter(id -> id.getNamespace().equals(BaseMetals.MOD_ID)) + .map(id -> byName().get(id.getPath())); + } + + /** A Base Metals extension of a vanilla material, whose type is not a Base Metals kind. */ + public static boolean isVanillaExtension(MMDMaterial material) { + return material.name().map(id -> id.getNamespace().equals(BaseMetals.MOD_ID)).orElse(false) + && MaterialDefinition.Kind.of(material.properties().type()).isEmpty(); + } + + private static synchronized void load() { + if (all != null) return; + Map materials = new LinkedHashMap<>(); + // loadedMaterials() is sorted by ID, which keeps the historical alphabetical order. + MMDLib.loadedMaterials().forEach((id, result) -> { + if (id.getNamespace().equals(BaseMetals.MOD_ID) && !isVanillaExtension(result.material())) { + materials.put(id.getPath(), MaterialDefinition.of(result.material())); + } + }); + if (materials.isEmpty()) { + throw new IllegalStateException("Base Metals materials were requested before MMDLib loaded them"); + } + byName = Map.copyOf(materials); + all = List.copyOf(materials.values()); } } diff --git a/src/main/java/zone/moddev/mc/basemetals/material/MaterialDefinition.java b/src/main/java/zone/moddev/mc/basemetals/material/MaterialDefinition.java index c42c7e4d9..caf1517dd 100644 --- a/src/main/java/zone/moddev/mc/basemetals/material/MaterialDefinition.java +++ b/src/main/java/zone/moddev/mc/basemetals/material/MaterialDefinition.java @@ -1,10 +1,13 @@ package zone.moddev.mc.basemetals.material; +import java.util.Locale; import java.util.Objects; +import net.minecraft.resources.ResourceLocation; import net.minecraft.world.entity.EquipmentSlot; +import zone.moddev.mc.lib.common.types.MMDMaterial; -/** Immutable source of truth for every Base Metals material. */ +/** Base Metals' view of one of its MMDLib materials, with the historical derived statistics. */ public record MaterialDefinition( String name, Kind kind, @@ -24,6 +27,14 @@ public boolean hasOre() { public boolean isAlloy() { return this == ALLOY || this == RARE_ALLOY; } + + /** The kind named by a material's {@code type}; vanilla extensions use other types. */ + public static java.util.Optional of(String type) { + for (Kind kind : values()) { + if (kind.name().equalsIgnoreCase(type)) return java.util.Optional.of(kind); + } + return java.util.Optional.empty(); + } } public MaterialDefinition { @@ -37,6 +48,18 @@ public boolean isAlloy() { } } + private static final ResourceLocation CASING = ResourceLocation.fromNamespaceAndPath("basemetals", "casing"); + + /** The material's {@code type} names its kind; selecting casings marks the processing chain. */ + public static MaterialDefinition of(MMDMaterial material) { + var properties = material.properties(); + return new MaterialDefinition(material.name().orElseThrow().getPath(), + Kind.valueOf(properties.type().toUpperCase(Locale.ROOT)), + properties.hardness(), properties.strength(), properties.magic(), + properties.color() & 0xFFFFFF, + material.parts().parts().stream().anyMatch(part -> part.templateId().equals(CASING))); + } + public boolean hasOre() { return kind.hasOre(); } diff --git a/src/main/java/zone/moddev/mc/basemetals/migration/Legacy112WorldMigrator.java b/src/main/java/zone/moddev/mc/basemetals/migration/Legacy112WorldMigrator.java index f8e4663dd..d0fe60cd9 100644 --- a/src/main/java/zone/moddev/mc/basemetals/migration/Legacy112WorldMigrator.java +++ b/src/main/java/zone/moddev/mc/basemetals/migration/Legacy112WorldMigrator.java @@ -30,10 +30,10 @@ import zone.moddev.mc.basemetals.BaseMetals; import zone.moddev.mc.basemetals.MissingMappings; -import zone.moddev.mc.basemetals.content.BaseMetalAnvilBlock; -import zone.moddev.mc.basemetals.content.CompatibilityDoubleSlabBlock; +import zone.moddev.mc.lib.common.runtime.MaterialAnvilBlock; +import zone.moddev.mc.lib.common.runtime.CompatibilityDoubleSlabBlock; import zone.moddev.mc.basemetals.content.ModContent; -import zone.moddev.mc.basemetals.content.PlateBlock; +import zone.moddev.mc.lib.common.runtime.PlateBlock; import com.google.gson.JsonObject; import com.google.gson.JsonParser; @@ -147,6 +147,10 @@ public static boolean migrateIfNeeded(Path worldRoot) throws IOException { * integrated server reads it before * {@link net.neoforged.neoforge.event.server.ServerAboutToStartEvent}, so it * would otherwise keep the old items until the next load. + * The integrated server reads the root Player tag before + * {@link net.neoforged.neoforge.event.server.ServerAboutToStartEvent}. Reload + * that one tag from the corrected level.dat so the first upgraded + * single-player session receives the same item migration as playerdata. */ public static void refreshLoadedSingleplayerPlayer(MinecraftServer server, Path worldRoot) throws IOException { CompoundTag loaded = server.getWorldData().getLoadedPlayerTag(); @@ -699,9 +703,9 @@ public static BlockState stateForLegacyMetadata(Block block, int metadata) { if (block instanceof CompatibilityDoubleSlabBlock) { return state.setValue(SlabBlock.TYPE, SlabType.DOUBLE).setValue(SlabBlock.WATERLOGGED, false); } - if (block instanceof BaseMetalAnvilBlock) { - return state.setValue(BaseMetalAnvilBlock.FACING, Direction.from2DDataValue(metadata & 3)) - .setValue(BaseMetalAnvilBlock.DAMAGE, Math.min(2, (metadata & 15) >> 2)); + if (block instanceof MaterialAnvilBlock) { + return state.setValue(MaterialAnvilBlock.FACING, Direction.from2DDataValue(metadata & 3)) + .setValue(MaterialAnvilBlock.DAMAGE, Math.min(2, (metadata & 15) >> 2)); } if (block instanceof DoorBlock) { if ((metadata & 8) != 0) { diff --git a/src/main/java/zone/moddev/mc/basemetals/migration/LegacyWorldDataHook.java b/src/main/java/zone/moddev/mc/basemetals/migration/LegacyWorldDataHook.java index 7fa16b5b4..a6cfaf5c1 100644 --- a/src/main/java/zone/moddev/mc/basemetals/migration/LegacyWorldDataHook.java +++ b/src/main/java/zone/moddev/mc/basemetals/migration/LegacyWorldDataHook.java @@ -32,10 +32,10 @@ import zone.moddev.mc.basemetals.BaseMetals; import zone.moddev.mc.basemetals.MissingMappings; -import zone.moddev.mc.basemetals.content.BaseMetalAnvilBlock; -import zone.moddev.mc.basemetals.content.CompatibilityDoubleSlabBlock; +import zone.moddev.mc.lib.common.runtime.MaterialAnvilBlock; +import zone.moddev.mc.lib.common.runtime.CompatibilityDoubleSlabBlock; import zone.moddev.mc.basemetals.content.ModContent; -import zone.moddev.mc.basemetals.content.PlateBlock; +import zone.moddev.mc.lib.common.runtime.PlateBlock; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.AnvilBlock; @@ -446,9 +446,9 @@ static BlockState legacyState(Block block, String path, int meta) { .setValue(TrapDoorBlock.POWERED, Boolean.FALSE) .setValue(TrapDoorBlock.WATERLOGGED, Boolean.FALSE); } - if (block instanceof BaseMetalAnvilBlock) { + if (block instanceof MaterialAnvilBlock) { return state.setValue(AnvilBlock.FACING, Direction.from2DDataValue(meta & 3)) - .setValue(BaseMetalAnvilBlock.DAMAGE, Integer.valueOf(Math.min(2, (meta & 15) >> 2))); + .setValue(MaterialAnvilBlock.DAMAGE, Integer.valueOf(Math.min(2, (meta & 15) >> 2))); } if (block instanceof ButtonBlock) return attachedState(state, meta, ButtonBlock.POWERED); if (block instanceof LeverBlock) return legacyLeverState(state, meta); diff --git a/src/main/java/zone/moddev/mc/basemetals/recipe/CrushingRecipe.java b/src/main/java/zone/moddev/mc/basemetals/recipe/CrushingRecipe.java deleted file mode 100644 index 786e0f739..000000000 --- a/src/main/java/zone/moddev/mc/basemetals/recipe/CrushingRecipe.java +++ /dev/null @@ -1,93 +0,0 @@ -package zone.moddev.mc.basemetals.recipe; - -import com.mojang.serialization.Codec; -import com.mojang.serialization.MapCodec; -import com.mojang.serialization.codecs.RecordCodecBuilder; -import zone.moddev.mc.basemetals.BaseMetals; - -import net.minecraft.core.HolderLookup; -import net.minecraft.core.NonNullList; -import net.minecraft.core.registries.BuiltInRegistries; -import net.minecraft.core.registries.Registries; -import net.minecraft.network.RegistryFriendlyByteBuf; -import net.minecraft.network.codec.StreamCodec; -import net.minecraft.world.item.ItemStack; -import net.minecraft.world.item.crafting.Ingredient; -import net.minecraft.world.item.crafting.Recipe; -import net.minecraft.world.item.crafting.RecipeSerializer; -import net.minecraft.world.item.crafting.RecipeType; -import net.minecraft.world.item.crafting.SingleRecipeInput; -import net.minecraft.world.level.Level; -import net.neoforged.neoforge.registries.DeferredRegister; -import net.neoforged.neoforge.registries.DeferredHolder; - -public final class CrushingRecipe implements Recipe { - public static final DeferredRegister> TYPES = DeferredRegister.create( - Registries.RECIPE_TYPE, BaseMetals.MOD_ID); - public static final DeferredRegister> SERIALIZERS = DeferredRegister.create( - Registries.RECIPE_SERIALIZER, BaseMetals.MOD_ID); - public static final DeferredHolder, RecipeType> TYPE = TYPES - .>register("crushing", CrushingRecipeType::new); - public static final DeferredHolder, RecipeSerializer> SERIALIZER = SERIALIZERS.register( - "crushing", Serializer::new); - public static final DeferredHolder, RecipeSerializer> LEGACY_SMELTING_SERIALIZER = - SERIALIZERS.register("legacy_smelting", LegacySmeltingRecipe.Serializer::new); - public static final DeferredHolder, RecipeSerializer> PLATE_REPAIR_SERIALIZER = - SERIALIZERS.register("plate_repair", PlateRepairRecipe.Serializer::new); - public static final DeferredHolder, RecipeSerializer>> CONTENT_CRAFTING_SERIALIZER = - SERIALIZERS.register("content_crafting", () -> ContentCraftingRecipe.SERIALIZER); - - private final Ingredient ingredient; - private final ItemStack result; - - public CrushingRecipe(Ingredient ingredient, ItemStack result) { - this.ingredient = ingredient; - this.result = result.copy(); - } - - @Override public boolean matches(SingleRecipeInput input, Level level) { return ingredient.test(input.item()); } - @Override public ItemStack assemble(SingleRecipeInput input, HolderLookup.Provider registries) { return result.copy(); } - @Override public boolean canCraftInDimensions(int width, int height) { return width * height >= 1; } - @Override public ItemStack getResultItem(HolderLookup.Provider registries) { return result.copy(); } - @Override public RecipeSerializer getSerializer() { return SERIALIZER.get(); } - @Override public RecipeType getType() { return TYPE.get(); } - @Override public NonNullList getIngredients() { return NonNullList.of(Ingredient.EMPTY, ingredient); } - @Override public boolean isSpecial() { return true; } - - private static final class CrushingRecipeType implements RecipeType { - @Override - public String toString() { - return BaseMetals.MOD_ID + ":crushing"; - } - } - - public static final class Serializer implements RecipeSerializer { - // Accept the existing generated results using "item", as well as the - // 1.21 stack format using "id" and optional data components. - private static final Codec LEGACY_RESULT_CODEC = RecordCodecBuilder.create(instance -> - instance.group( - BuiltInRegistries.ITEM.byNameCodec().fieldOf("item").forGetter(ItemStack::getItem), - Codec.intRange(1, 99).optionalFieldOf("count", 1).forGetter(ItemStack::getCount) - ).apply(instance, ItemStack::new)); - - static final Codec RESULT_CODEC = Codec.withAlternative(ItemStack.CODEC, LEGACY_RESULT_CODEC); - - private static final MapCodec CODEC = RecordCodecBuilder.mapCodec(instance -> - instance.group( - Ingredient.CODEC_NONEMPTY.fieldOf("ingredient").forGetter(recipe -> recipe.ingredient), - RESULT_CODEC - .fieldOf("result").forGetter(recipe -> recipe.result) - ).apply(instance, CrushingRecipe::new)); - - private static final StreamCodec STREAM_CODEC = - StreamCodec.composite( - Ingredient.CONTENTS_STREAM_CODEC, recipe -> recipe.ingredient, - ItemStack.STREAM_CODEC, recipe -> recipe.result, - CrushingRecipe::new); - - @Override public MapCodec codec() { return CODEC; } - @Override public StreamCodec streamCodec() { - return STREAM_CODEC; - } - } -} diff --git a/src/main/java/zone/moddev/mc/basemetals/recipe/LegacySmeltingRecipe.java b/src/main/java/zone/moddev/mc/basemetals/recipe/LegacySmeltingRecipe.java index 3ca0d870a..98763a52c 100644 --- a/src/main/java/zone/moddev/mc/basemetals/recipe/LegacySmeltingRecipe.java +++ b/src/main/java/zone/moddev/mc/basemetals/recipe/LegacySmeltingRecipe.java @@ -42,7 +42,7 @@ private boolean allowed() { } @Override public RecipeSerializer getSerializer() { - return CrushingRecipe.LEGACY_SMELTING_SERIALIZER.get(); + return ModRecipes.LEGACY_SMELTING_SERIALIZER.get(); } public static final class Serializer implements RecipeSerializer { @@ -50,7 +50,7 @@ public static final class Serializer implements RecipeSerializer recipe.input), - CrushingRecipe.Serializer.RESULT_CODEC.fieldOf("result").forGetter(recipe -> recipe.output), + ModRecipes.RESULT_CODEC.fieldOf("result").forGetter(recipe -> recipe.output), Codec.FLOAT.optionalFieldOf("experience", 0.0F).forGetter(LegacySmeltingRecipe::getExperience), Codec.intRange(1, Integer.MAX_VALUE).optionalFieldOf("cookingtime", 200) .forGetter(LegacySmeltingRecipe::getCookingTime) diff --git a/src/main/java/zone/moddev/mc/basemetals/recipe/ModRecipes.java b/src/main/java/zone/moddev/mc/basemetals/recipe/ModRecipes.java new file mode 100644 index 000000000..2616a3142 --- /dev/null +++ b/src/main/java/zone/moddev/mc/basemetals/recipe/ModRecipes.java @@ -0,0 +1,37 @@ +package zone.moddev.mc.basemetals.recipe; + +import com.mojang.serialization.Codec; +import com.mojang.serialization.codecs.RecordCodecBuilder; +import zone.moddev.mc.basemetals.BaseMetals; + +import net.minecraft.core.registries.BuiltInRegistries; +import net.minecraft.core.registries.Registries; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.crafting.Recipe; +import net.minecraft.world.item.crafting.RecipeSerializer; +import net.neoforged.neoforge.registries.DeferredHolder; +import net.neoforged.neoforge.registries.DeferredRegister; + +/** Base Metals recipe serializers. Crushing uses MMDLib's {@code mmdlib:crushing}. */ +public final class ModRecipes { + public static final DeferredRegister> SERIALIZERS = DeferredRegister.create( + Registries.RECIPE_SERIALIZER, BaseMetals.MOD_ID); + public static final DeferredHolder, RecipeSerializer> LEGACY_SMELTING_SERIALIZER = + SERIALIZERS.register("legacy_smelting", LegacySmeltingRecipe.Serializer::new); + public static final DeferredHolder, RecipeSerializer> PLATE_REPAIR_SERIALIZER = + SERIALIZERS.register("plate_repair", PlateRepairRecipe.Serializer::new); + public static final DeferredHolder, RecipeSerializer>> CONTENT_CRAFTING_SERIALIZER = + SERIALIZERS.register("content_crafting", () -> ContentCraftingRecipe.SERIALIZER); + + // Accept the existing generated results using "item", as well as the + // 1.21 stack format using "id" and optional data components. + private static final Codec LEGACY_RESULT_CODEC = RecordCodecBuilder.create(instance -> + instance.group( + BuiltInRegistries.ITEM.byNameCodec().fieldOf("item").forGetter(ItemStack::getItem), + Codec.intRange(1, 99).optionalFieldOf("count", 1).forGetter(ItemStack::getCount) + ).apply(instance, ItemStack::new)); + + static final Codec RESULT_CODEC = Codec.withAlternative(ItemStack.CODEC, LEGACY_RESULT_CODEC); + + private ModRecipes() {} +} diff --git a/src/main/java/zone/moddev/mc/basemetals/recipe/PlateRepairRecipe.java b/src/main/java/zone/moddev/mc/basemetals/recipe/PlateRepairRecipe.java index 2bd641767..4f9e71dc8 100644 --- a/src/main/java/zone/moddev/mc/basemetals/recipe/PlateRepairRecipe.java +++ b/src/main/java/zone/moddev/mc/basemetals/recipe/PlateRepairRecipe.java @@ -81,7 +81,7 @@ public NonNullList getIngredients() { @Override public RecipeSerializer getSerializer() { - return CrushingRecipe.PLATE_REPAIR_SERIALIZER.get(); + return ModRecipes.PLATE_REPAIR_SERIALIZER.get(); } public static final class Serializer implements RecipeSerializer { diff --git a/src/main/java/zone/moddev/mc/basemetals/trade/BaseMetalsTrades.java b/src/main/java/zone/moddev/mc/basemetals/trade/BaseMetalsTrades.java index 1a7552412..596fa9f38 100644 --- a/src/main/java/zone/moddev/mc/basemetals/trade/BaseMetalsTrades.java +++ b/src/main/java/zone/moddev/mc/basemetals/trade/BaseMetalsTrades.java @@ -1,5 +1,7 @@ package zone.moddev.mc.basemetals.trade; +import zone.moddev.mc.basemetals.BaseMetals; + import java.util.List; import zone.moddev.mc.basemetals.config.BaseMetalsConfig; @@ -17,6 +19,7 @@ import net.minecraft.world.item.trading.ItemCost; import net.minecraft.core.registries.BuiltInRegistries; import net.minecraft.core.registries.Registries; +import net.minecraft.resources.ResourceLocation; import net.minecraft.tags.EnchantmentTags; import net.neoforged.neoforge.event.village.VillagerTradesEvent; @@ -29,7 +32,7 @@ public static void add(VillagerTradesEvent event) { if (event.getType() != VillagerProfession.ARMORER && event.getType() != VillagerProfession.TOOLSMITH && event.getType() != VillagerProfession.WEAPONSMITH) return; - for (MaterialDefinition material : MaterialCatalogue.ALL) { + for (MaterialDefinition material : MaterialCatalogue.all()) { if (material.kind() == MaterialDefinition.Kind.RARE_ORE || material.kind() == MaterialDefinition.Kind.RARE_ALLOY) continue; int value = (int) (material.hardness() + material.strength() + material.magic() + material.toolLevel()); @@ -55,8 +58,11 @@ public static void add(VillagerTradesEvent event) { } if (event.getType() == VillagerProfession.ARMORER || event.getType() == VillagerProfession.TOOLSMITH || event.getType() == VillagerProfession.WEAPONSMITH) { - event.getTrades().get(1).add(selling(ModContent.item("coal_powder").get(), 10, 1)); - event.getTrades().get(1).add(selling(ModContent.item("charcoal_powder").get(), 10, 1)); + // Coal and charcoal powders are Base Metals' vanilla extensions. + for (String powder : List.of("coal_powder", "charcoal_powder")) { + BuiltInRegistries.ITEM.getOptional(ResourceLocation.fromNamespaceAndPath(BaseMetals.MOD_ID, powder)) + .ifPresent(item -> event.getTrades().get(1).add(selling(item, 10, 1))); + } } } diff --git a/src/main/resources/assets/basemetals/blockstates/charcoal_block.json b/src/main/resources/assets/basemetals/blockstates/charcoal_block.json new file mode 100644 index 000000000..eb735e4ed --- /dev/null +++ b/src/main/resources/assets/basemetals/blockstates/charcoal_block.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "basemetals:block/charcoal_block_coal_block" + } + } +} diff --git a/src/generated/resources/assets/basemetals/blockstates/diamond_bars.json b/src/main/resources/assets/basemetals/blockstates/diamond_bars.json similarity index 65% rename from src/generated/resources/assets/basemetals/blockstates/diamond_bars.json rename to src/main/resources/assets/basemetals/blockstates/diamond_bars.json index 41d46f1e1..7573bc737 100644 --- a/src/generated/resources/assets/basemetals/blockstates/diamond_bars.json +++ b/src/main/resources/assets/basemetals/blockstates/diamond_bars.json @@ -2,12 +2,12 @@ "multipart": [ { "apply": { - "model": "basemetals:block/diamond_bars_post_ends" + "model": "basemetals:block/diamond_bars_iron_bars_post_ends" } }, { "apply": { - "model": "basemetals:block/diamond_bars_post" + "model": "basemetals:block/diamond_bars_iron_bars_post" }, "when": { "east": "false", @@ -18,7 +18,7 @@ }, { "apply": { - "model": "basemetals:block/diamond_bars_cap" + "model": "basemetals:block/diamond_bars_iron_bars_cap" }, "when": { "east": "false", @@ -29,67 +29,67 @@ }, { "apply": { - "model": "basemetals:block/diamond_bars_side" + "model": "basemetals:block/diamond_bars_iron_bars_cap", + "y": 90 }, "when": { - "north": "true" + "east": "true", + "north": "false", + "south": "false", + "west": "false" } }, { "apply": { - "model": "basemetals:block/diamond_bars_cap", - "y": 90 + "model": "basemetals:block/diamond_bars_iron_bars_cap_alt" }, "when": { - "east": "true", + "east": "false", "north": "false", - "south": "false", + "south": "true", "west": "false" } }, { "apply": { - "model": "basemetals:block/diamond_bars_side", + "model": "basemetals:block/diamond_bars_iron_bars_cap_alt", "y": 90 }, "when": { - "east": "true" + "east": "false", + "north": "false", + "south": "false", + "west": "true" } }, { "apply": { - "model": "basemetals:block/diamond_bars_cap_alt" + "model": "basemetals:block/diamond_bars_iron_bars_side" }, "when": { - "east": "false", - "north": "false", - "south": "true", - "west": "false" + "north": "true" } }, { "apply": { - "model": "basemetals:block/diamond_bars_side_alt" + "model": "basemetals:block/diamond_bars_iron_bars_side", + "y": 90 }, "when": { - "south": "true" + "east": "true" } }, { "apply": { - "model": "basemetals:block/diamond_bars_cap_alt", - "y": 90 + "model": "basemetals:block/diamond_bars_iron_bars_side_alt" }, "when": { - "east": "false", - "north": "false", - "south": "false", - "west": "true" + "south": "true" } }, { "apply": { - "model": "basemetals:block/diamond_bars_side_alt", + "model": "basemetals:block/diamond_bars_iron_bars_side_alt", "y": 90 }, "when": { @@ -97,4 +97,4 @@ } } ] -} \ No newline at end of file +} diff --git a/src/main/resources/assets/basemetals/blockstates/diamond_button.json b/src/main/resources/assets/basemetals/blockstates/diamond_button.json new file mode 100644 index 000000000..9c61ac50e --- /dev/null +++ b/src/main/resources/assets/basemetals/blockstates/diamond_button.json @@ -0,0 +1,118 @@ +{ + "variants": { + "face=ceiling,facing=east,powered=false": { + "model": "basemetals:block/diamond_button_polished_blackstone_button", + "x": 180, + "y": 270 + }, + "face=ceiling,facing=east,powered=true": { + "model": "basemetals:block/diamond_button_polished_blackstone_button_pressed", + "x": 180, + "y": 270 + }, + "face=ceiling,facing=north,powered=false": { + "model": "basemetals:block/diamond_button_polished_blackstone_button", + "x": 180, + "y": 180 + }, + "face=ceiling,facing=north,powered=true": { + "model": "basemetals:block/diamond_button_polished_blackstone_button_pressed", + "x": 180, + "y": 180 + }, + "face=ceiling,facing=south,powered=false": { + "model": "basemetals:block/diamond_button_polished_blackstone_button", + "x": 180 + }, + "face=ceiling,facing=south,powered=true": { + "model": "basemetals:block/diamond_button_polished_blackstone_button_pressed", + "x": 180 + }, + "face=ceiling,facing=west,powered=false": { + "model": "basemetals:block/diamond_button_polished_blackstone_button", + "x": 180, + "y": 90 + }, + "face=ceiling,facing=west,powered=true": { + "model": "basemetals:block/diamond_button_polished_blackstone_button_pressed", + "x": 180, + "y": 90 + }, + "face=floor,facing=east,powered=false": { + "model": "basemetals:block/diamond_button_polished_blackstone_button", + "y": 90 + }, + "face=floor,facing=east,powered=true": { + "model": "basemetals:block/diamond_button_polished_blackstone_button_pressed", + "y": 90 + }, + "face=floor,facing=north,powered=false": { + "model": "basemetals:block/diamond_button_polished_blackstone_button" + }, + "face=floor,facing=north,powered=true": { + "model": "basemetals:block/diamond_button_polished_blackstone_button_pressed" + }, + "face=floor,facing=south,powered=false": { + "model": "basemetals:block/diamond_button_polished_blackstone_button", + "y": 180 + }, + "face=floor,facing=south,powered=true": { + "model": "basemetals:block/diamond_button_polished_blackstone_button_pressed", + "y": 180 + }, + "face=floor,facing=west,powered=false": { + "model": "basemetals:block/diamond_button_polished_blackstone_button", + "y": 270 + }, + "face=floor,facing=west,powered=true": { + "model": "basemetals:block/diamond_button_polished_blackstone_button_pressed", + "y": 270 + }, + "face=wall,facing=east,powered=false": { + "model": "basemetals:block/diamond_button_polished_blackstone_button", + "uvlock": true, + "x": 90, + "y": 90 + }, + "face=wall,facing=east,powered=true": { + "model": "basemetals:block/diamond_button_polished_blackstone_button_pressed", + "uvlock": true, + "x": 90, + "y": 90 + }, + "face=wall,facing=north,powered=false": { + "model": "basemetals:block/diamond_button_polished_blackstone_button", + "uvlock": true, + "x": 90 + }, + "face=wall,facing=north,powered=true": { + "model": "basemetals:block/diamond_button_polished_blackstone_button_pressed", + "uvlock": true, + "x": 90 + }, + "face=wall,facing=south,powered=false": { + "model": "basemetals:block/diamond_button_polished_blackstone_button", + "uvlock": true, + "x": 90, + "y": 180 + }, + "face=wall,facing=south,powered=true": { + "model": "basemetals:block/diamond_button_polished_blackstone_button_pressed", + "uvlock": true, + "x": 90, + "y": 180 + }, + "face=wall,facing=west,powered=false": { + "model": "basemetals:block/diamond_button_polished_blackstone_button", + "uvlock": true, + "x": 90, + "y": 270 + }, + "face=wall,facing=west,powered=true": { + "model": "basemetals:block/diamond_button_polished_blackstone_button_pressed", + "uvlock": true, + "x": 90, + "y": 270 + } + } +} diff --git a/src/generated/resources/assets/basemetals/blockstates/diamond_door.json b/src/main/resources/assets/basemetals/blockstates/diamond_door.json similarity index 50% rename from src/generated/resources/assets/basemetals/blockstates/diamond_door.json rename to src/main/resources/assets/basemetals/blockstates/diamond_door.json index 1e9dfb48e..9e57953e4 100644 --- a/src/generated/resources/assets/basemetals/blockstates/diamond_door.json +++ b/src/main/resources/assets/basemetals/blockstates/diamond_door.json @@ -1,124 +1,124 @@ { "variants": { "facing=east,half=lower,hinge=left,open=false": { - "model": "basemetals:block/diamond_door_bottom_left" + "model": "basemetals:block/diamond_door_iron_door_bottom_left" }, "facing=east,half=lower,hinge=left,open=true": { - "model": "basemetals:block/diamond_door_bottom_left_open", + "model": "basemetals:block/diamond_door_iron_door_bottom_left_open", "y": 90 }, "facing=east,half=lower,hinge=right,open=false": { - "model": "basemetals:block/diamond_door_bottom_right" + "model": "basemetals:block/diamond_door_iron_door_bottom_right" }, "facing=east,half=lower,hinge=right,open=true": { - "model": "basemetals:block/diamond_door_bottom_right_open", + "model": "basemetals:block/diamond_door_iron_door_bottom_right_open", "y": 270 }, "facing=east,half=upper,hinge=left,open=false": { - "model": "basemetals:block/diamond_door_top_left" + "model": "basemetals:block/diamond_door_iron_door_top_left" }, "facing=east,half=upper,hinge=left,open=true": { - "model": "basemetals:block/diamond_door_top_left_open", + "model": "basemetals:block/diamond_door_iron_door_top_left_open", "y": 90 }, "facing=east,half=upper,hinge=right,open=false": { - "model": "basemetals:block/diamond_door_top_right" + "model": "basemetals:block/diamond_door_iron_door_top_right" }, "facing=east,half=upper,hinge=right,open=true": { - "model": "basemetals:block/diamond_door_top_right_open", + "model": "basemetals:block/diamond_door_iron_door_top_right_open", "y": 270 }, "facing=north,half=lower,hinge=left,open=false": { - "model": "basemetals:block/diamond_door_bottom_left", + "model": "basemetals:block/diamond_door_iron_door_bottom_left", "y": 270 }, "facing=north,half=lower,hinge=left,open=true": { - "model": "basemetals:block/diamond_door_bottom_left_open" + "model": "basemetals:block/diamond_door_iron_door_bottom_left_open" }, "facing=north,half=lower,hinge=right,open=false": { - "model": "basemetals:block/diamond_door_bottom_right", + "model": "basemetals:block/diamond_door_iron_door_bottom_right", "y": 270 }, "facing=north,half=lower,hinge=right,open=true": { - "model": "basemetals:block/diamond_door_bottom_right_open", + "model": "basemetals:block/diamond_door_iron_door_bottom_right_open", "y": 180 }, "facing=north,half=upper,hinge=left,open=false": { - "model": "basemetals:block/diamond_door_top_left", + "model": "basemetals:block/diamond_door_iron_door_top_left", "y": 270 }, "facing=north,half=upper,hinge=left,open=true": { - "model": "basemetals:block/diamond_door_top_left_open" + "model": "basemetals:block/diamond_door_iron_door_top_left_open" }, "facing=north,half=upper,hinge=right,open=false": { - "model": "basemetals:block/diamond_door_top_right", + "model": "basemetals:block/diamond_door_iron_door_top_right", "y": 270 }, "facing=north,half=upper,hinge=right,open=true": { - "model": "basemetals:block/diamond_door_top_right_open", + "model": "basemetals:block/diamond_door_iron_door_top_right_open", "y": 180 }, "facing=south,half=lower,hinge=left,open=false": { - "model": "basemetals:block/diamond_door_bottom_left", + "model": "basemetals:block/diamond_door_iron_door_bottom_left", "y": 90 }, "facing=south,half=lower,hinge=left,open=true": { - "model": "basemetals:block/diamond_door_bottom_left_open", + "model": "basemetals:block/diamond_door_iron_door_bottom_left_open", "y": 180 }, "facing=south,half=lower,hinge=right,open=false": { - "model": "basemetals:block/diamond_door_bottom_right", + "model": "basemetals:block/diamond_door_iron_door_bottom_right", "y": 90 }, "facing=south,half=lower,hinge=right,open=true": { - "model": "basemetals:block/diamond_door_bottom_right_open" + "model": "basemetals:block/diamond_door_iron_door_bottom_right_open" }, "facing=south,half=upper,hinge=left,open=false": { - "model": "basemetals:block/diamond_door_top_left", + "model": "basemetals:block/diamond_door_iron_door_top_left", "y": 90 }, "facing=south,half=upper,hinge=left,open=true": { - "model": "basemetals:block/diamond_door_top_left_open", + "model": "basemetals:block/diamond_door_iron_door_top_left_open", "y": 180 }, "facing=south,half=upper,hinge=right,open=false": { - "model": "basemetals:block/diamond_door_top_right", + "model": "basemetals:block/diamond_door_iron_door_top_right", "y": 90 }, "facing=south,half=upper,hinge=right,open=true": { - "model": "basemetals:block/diamond_door_top_right_open" + "model": "basemetals:block/diamond_door_iron_door_top_right_open" }, "facing=west,half=lower,hinge=left,open=false": { - "model": "basemetals:block/diamond_door_bottom_left", + "model": "basemetals:block/diamond_door_iron_door_bottom_left", "y": 180 }, "facing=west,half=lower,hinge=left,open=true": { - "model": "basemetals:block/diamond_door_bottom_left_open", + "model": "basemetals:block/diamond_door_iron_door_bottom_left_open", "y": 270 }, "facing=west,half=lower,hinge=right,open=false": { - "model": "basemetals:block/diamond_door_bottom_right", + "model": "basemetals:block/diamond_door_iron_door_bottom_right", "y": 180 }, "facing=west,half=lower,hinge=right,open=true": { - "model": "basemetals:block/diamond_door_bottom_right_open", + "model": "basemetals:block/diamond_door_iron_door_bottom_right_open", "y": 90 }, "facing=west,half=upper,hinge=left,open=false": { - "model": "basemetals:block/diamond_door_top_left", + "model": "basemetals:block/diamond_door_iron_door_top_left", "y": 180 }, "facing=west,half=upper,hinge=left,open=true": { - "model": "basemetals:block/diamond_door_top_left_open", + "model": "basemetals:block/diamond_door_iron_door_top_left_open", "y": 270 }, "facing=west,half=upper,hinge=right,open=false": { - "model": "basemetals:block/diamond_door_top_right", + "model": "basemetals:block/diamond_door_iron_door_top_right", "y": 180 }, "facing=west,half=upper,hinge=right,open=true": { - "model": "basemetals:block/diamond_door_top_right_open", + "model": "basemetals:block/diamond_door_iron_door_top_right_open", "y": 90 } } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/basemetals/blockstates/diamond_double_slab.json b/src/main/resources/assets/basemetals/blockstates/diamond_double_slab.json new file mode 100644 index 000000000..46fccb765 --- /dev/null +++ b/src/main/resources/assets/basemetals/blockstates/diamond_double_slab.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "basemetals:block/diamond_double_slab" + } + } +} diff --git a/src/generated/resources/assets/basemetals/blockstates/iron_button.json b/src/main/resources/assets/basemetals/blockstates/diamond_lever.json similarity index 56% rename from src/generated/resources/assets/basemetals/blockstates/iron_button.json rename to src/main/resources/assets/basemetals/blockstates/diamond_lever.json index b37eeec85..f025f23b8 100644 --- a/src/generated/resources/assets/basemetals/blockstates/iron_button.json +++ b/src/main/resources/assets/basemetals/blockstates/diamond_lever.json @@ -1,118 +1,110 @@ { "variants": { "face=ceiling,facing=east,powered=false": { - "model": "basemetals:block/iron_button", + "model": "basemetals:block/diamond_lever_lever_on", "x": 180, "y": 270 }, "face=ceiling,facing=east,powered=true": { - "model": "basemetals:block/iron_button_pressed", + "model": "basemetals:block/diamond_lever_lever", "x": 180, "y": 270 }, "face=ceiling,facing=north,powered=false": { - "model": "basemetals:block/iron_button", + "model": "basemetals:block/diamond_lever_lever_on", "x": 180, "y": 180 }, "face=ceiling,facing=north,powered=true": { - "model": "basemetals:block/iron_button_pressed", + "model": "basemetals:block/diamond_lever_lever", "x": 180, "y": 180 }, "face=ceiling,facing=south,powered=false": { - "model": "basemetals:block/iron_button", + "model": "basemetals:block/diamond_lever_lever_on", "x": 180 }, "face=ceiling,facing=south,powered=true": { - "model": "basemetals:block/iron_button_pressed", + "model": "basemetals:block/diamond_lever_lever", "x": 180 }, "face=ceiling,facing=west,powered=false": { - "model": "basemetals:block/iron_button", + "model": "basemetals:block/diamond_lever_lever_on", "x": 180, "y": 90 }, "face=ceiling,facing=west,powered=true": { - "model": "basemetals:block/iron_button_pressed", + "model": "basemetals:block/diamond_lever_lever", "x": 180, "y": 90 }, "face=floor,facing=east,powered=false": { - "model": "basemetals:block/iron_button", + "model": "basemetals:block/diamond_lever_lever_on", "y": 90 }, "face=floor,facing=east,powered=true": { - "model": "basemetals:block/iron_button_pressed", + "model": "basemetals:block/diamond_lever_lever", "y": 90 }, "face=floor,facing=north,powered=false": { - "model": "basemetals:block/iron_button" + "model": "basemetals:block/diamond_lever_lever_on" }, "face=floor,facing=north,powered=true": { - "model": "basemetals:block/iron_button_pressed" + "model": "basemetals:block/diamond_lever_lever" }, "face=floor,facing=south,powered=false": { - "model": "basemetals:block/iron_button", + "model": "basemetals:block/diamond_lever_lever_on", "y": 180 }, "face=floor,facing=south,powered=true": { - "model": "basemetals:block/iron_button_pressed", + "model": "basemetals:block/diamond_lever_lever", "y": 180 }, "face=floor,facing=west,powered=false": { - "model": "basemetals:block/iron_button", + "model": "basemetals:block/diamond_lever_lever_on", "y": 270 }, "face=floor,facing=west,powered=true": { - "model": "basemetals:block/iron_button_pressed", + "model": "basemetals:block/diamond_lever_lever", "y": 270 }, "face=wall,facing=east,powered=false": { - "model": "basemetals:block/iron_button", - "uvlock": true, + "model": "basemetals:block/diamond_lever_lever_on", "x": 90, "y": 90 }, "face=wall,facing=east,powered=true": { - "model": "basemetals:block/iron_button_pressed", - "uvlock": true, + "model": "basemetals:block/diamond_lever_lever", "x": 90, "y": 90 }, "face=wall,facing=north,powered=false": { - "model": "basemetals:block/iron_button", - "uvlock": true, + "model": "basemetals:block/diamond_lever_lever_on", "x": 90 }, "face=wall,facing=north,powered=true": { - "model": "basemetals:block/iron_button_pressed", - "uvlock": true, + "model": "basemetals:block/diamond_lever_lever", "x": 90 }, "face=wall,facing=south,powered=false": { - "model": "basemetals:block/iron_button", - "uvlock": true, + "model": "basemetals:block/diamond_lever_lever_on", "x": 90, "y": 180 }, "face=wall,facing=south,powered=true": { - "model": "basemetals:block/iron_button_pressed", - "uvlock": true, + "model": "basemetals:block/diamond_lever_lever", "x": 90, "y": 180 }, "face=wall,facing=west,powered=false": { - "model": "basemetals:block/iron_button", - "uvlock": true, + "model": "basemetals:block/diamond_lever_lever_on", "x": 90, "y": 270 }, "face=wall,facing=west,powered=true": { - "model": "basemetals:block/iron_button_pressed", - "uvlock": true, + "model": "basemetals:block/diamond_lever_lever", "x": 90, "y": 270 } } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/basemetals/blockstates/diamond_pressure_plate.json b/src/main/resources/assets/basemetals/blockstates/diamond_pressure_plate.json new file mode 100644 index 000000000..28bca2069 --- /dev/null +++ b/src/main/resources/assets/basemetals/blockstates/diamond_pressure_plate.json @@ -0,0 +1,10 @@ +{ + "variants": { + "powered=false": { + "model": "basemetals:block/diamond_pressure_plate_polished_blackstone_pressure_plate" + }, + "powered=true": { + "model": "basemetals:block/diamond_pressure_plate_polished_blackstone_pressure_plate_down" + } + } +} diff --git a/src/main/resources/assets/basemetals/blockstates/diamond_slab.json b/src/main/resources/assets/basemetals/blockstates/diamond_slab.json new file mode 100644 index 000000000..3699c76f2 --- /dev/null +++ b/src/main/resources/assets/basemetals/blockstates/diamond_slab.json @@ -0,0 +1,13 @@ +{ + "variants": { + "type=bottom": { + "model": "basemetals:block/diamond_slab_quartz_slab" + }, + "type=double": { + "model": "basemetals:block/diamond_slab_quartz_block" + }, + "type=top": { + "model": "basemetals:block/diamond_slab_quartz_slab_top" + } + } +} diff --git a/src/generated/resources/assets/basemetals/blockstates/diamond_stairs.json b/src/main/resources/assets/basemetals/blockstates/diamond_stairs.json similarity index 57% rename from src/generated/resources/assets/basemetals/blockstates/diamond_stairs.json rename to src/main/resources/assets/basemetals/blockstates/diamond_stairs.json index 1f2bc65bd..8bb262359 100644 --- a/src/generated/resources/assets/basemetals/blockstates/diamond_stairs.json +++ b/src/main/resources/assets/basemetals/blockstates/diamond_stairs.json @@ -1,209 +1,209 @@ { "variants": { "facing=east,half=bottom,shape=inner_left": { - "model": "basemetals:block/diamond_inner_stairs", + "model": "basemetals:block/diamond_stairs_quartz_stairs_inner", "uvlock": true, "y": 270 }, "facing=east,half=bottom,shape=inner_right": { - "model": "basemetals:block/diamond_inner_stairs" + "model": "basemetals:block/diamond_stairs_quartz_stairs_inner" }, "facing=east,half=bottom,shape=outer_left": { - "model": "basemetals:block/diamond_outer_stairs", + "model": "basemetals:block/diamond_stairs_quartz_stairs_outer", "uvlock": true, "y": 270 }, "facing=east,half=bottom,shape=outer_right": { - "model": "basemetals:block/diamond_outer_stairs" + "model": "basemetals:block/diamond_stairs_quartz_stairs_outer" }, "facing=east,half=bottom,shape=straight": { - "model": "basemetals:block/diamond_stairs" + "model": "basemetals:block/diamond_stairs_quartz_stairs" }, "facing=east,half=top,shape=inner_left": { - "model": "basemetals:block/diamond_inner_stairs", + "model": "basemetals:block/diamond_stairs_quartz_stairs_inner", "uvlock": true, "x": 180 }, "facing=east,half=top,shape=inner_right": { - "model": "basemetals:block/diamond_inner_stairs", + "model": "basemetals:block/diamond_stairs_quartz_stairs_inner", "uvlock": true, "x": 180, "y": 90 }, "facing=east,half=top,shape=outer_left": { - "model": "basemetals:block/diamond_outer_stairs", + "model": "basemetals:block/diamond_stairs_quartz_stairs_outer", "uvlock": true, "x": 180 }, "facing=east,half=top,shape=outer_right": { - "model": "basemetals:block/diamond_outer_stairs", + "model": "basemetals:block/diamond_stairs_quartz_stairs_outer", "uvlock": true, "x": 180, "y": 90 }, "facing=east,half=top,shape=straight": { - "model": "basemetals:block/diamond_stairs", + "model": "basemetals:block/diamond_stairs_quartz_stairs", "uvlock": true, "x": 180 }, "facing=north,half=bottom,shape=inner_left": { - "model": "basemetals:block/diamond_inner_stairs", + "model": "basemetals:block/diamond_stairs_quartz_stairs_inner", "uvlock": true, "y": 180 }, "facing=north,half=bottom,shape=inner_right": { - "model": "basemetals:block/diamond_inner_stairs", + "model": "basemetals:block/diamond_stairs_quartz_stairs_inner", "uvlock": true, "y": 270 }, "facing=north,half=bottom,shape=outer_left": { - "model": "basemetals:block/diamond_outer_stairs", + "model": "basemetals:block/diamond_stairs_quartz_stairs_outer", "uvlock": true, "y": 180 }, "facing=north,half=bottom,shape=outer_right": { - "model": "basemetals:block/diamond_outer_stairs", + "model": "basemetals:block/diamond_stairs_quartz_stairs_outer", "uvlock": true, "y": 270 }, "facing=north,half=bottom,shape=straight": { - "model": "basemetals:block/diamond_stairs", + "model": "basemetals:block/diamond_stairs_quartz_stairs", "uvlock": true, "y": 270 }, "facing=north,half=top,shape=inner_left": { - "model": "basemetals:block/diamond_inner_stairs", + "model": "basemetals:block/diamond_stairs_quartz_stairs_inner", "uvlock": true, "x": 180, "y": 270 }, "facing=north,half=top,shape=inner_right": { - "model": "basemetals:block/diamond_inner_stairs", + "model": "basemetals:block/diamond_stairs_quartz_stairs_inner", "uvlock": true, "x": 180 }, "facing=north,half=top,shape=outer_left": { - "model": "basemetals:block/diamond_outer_stairs", + "model": "basemetals:block/diamond_stairs_quartz_stairs_outer", "uvlock": true, "x": 180, "y": 270 }, "facing=north,half=top,shape=outer_right": { - "model": "basemetals:block/diamond_outer_stairs", + "model": "basemetals:block/diamond_stairs_quartz_stairs_outer", "uvlock": true, "x": 180 }, "facing=north,half=top,shape=straight": { - "model": "basemetals:block/diamond_stairs", + "model": "basemetals:block/diamond_stairs_quartz_stairs", "uvlock": true, "x": 180, "y": 270 }, "facing=south,half=bottom,shape=inner_left": { - "model": "basemetals:block/diamond_inner_stairs" + "model": "basemetals:block/diamond_stairs_quartz_stairs_inner" }, "facing=south,half=bottom,shape=inner_right": { - "model": "basemetals:block/diamond_inner_stairs", + "model": "basemetals:block/diamond_stairs_quartz_stairs_inner", "uvlock": true, "y": 90 }, "facing=south,half=bottom,shape=outer_left": { - "model": "basemetals:block/diamond_outer_stairs" + "model": "basemetals:block/diamond_stairs_quartz_stairs_outer" }, "facing=south,half=bottom,shape=outer_right": { - "model": "basemetals:block/diamond_outer_stairs", + "model": "basemetals:block/diamond_stairs_quartz_stairs_outer", "uvlock": true, "y": 90 }, "facing=south,half=bottom,shape=straight": { - "model": "basemetals:block/diamond_stairs", + "model": "basemetals:block/diamond_stairs_quartz_stairs", "uvlock": true, "y": 90 }, "facing=south,half=top,shape=inner_left": { - "model": "basemetals:block/diamond_inner_stairs", + "model": "basemetals:block/diamond_stairs_quartz_stairs_inner", "uvlock": true, "x": 180, "y": 90 }, "facing=south,half=top,shape=inner_right": { - "model": "basemetals:block/diamond_inner_stairs", + "model": "basemetals:block/diamond_stairs_quartz_stairs_inner", "uvlock": true, "x": 180, "y": 180 }, "facing=south,half=top,shape=outer_left": { - "model": "basemetals:block/diamond_outer_stairs", + "model": "basemetals:block/diamond_stairs_quartz_stairs_outer", "uvlock": true, "x": 180, "y": 90 }, "facing=south,half=top,shape=outer_right": { - "model": "basemetals:block/diamond_outer_stairs", + "model": "basemetals:block/diamond_stairs_quartz_stairs_outer", "uvlock": true, "x": 180, "y": 180 }, "facing=south,half=top,shape=straight": { - "model": "basemetals:block/diamond_stairs", + "model": "basemetals:block/diamond_stairs_quartz_stairs", "uvlock": true, "x": 180, "y": 90 }, "facing=west,half=bottom,shape=inner_left": { - "model": "basemetals:block/diamond_inner_stairs", + "model": "basemetals:block/diamond_stairs_quartz_stairs_inner", "uvlock": true, "y": 90 }, "facing=west,half=bottom,shape=inner_right": { - "model": "basemetals:block/diamond_inner_stairs", + "model": "basemetals:block/diamond_stairs_quartz_stairs_inner", "uvlock": true, "y": 180 }, "facing=west,half=bottom,shape=outer_left": { - "model": "basemetals:block/diamond_outer_stairs", + "model": "basemetals:block/diamond_stairs_quartz_stairs_outer", "uvlock": true, "y": 90 }, "facing=west,half=bottom,shape=outer_right": { - "model": "basemetals:block/diamond_outer_stairs", + "model": "basemetals:block/diamond_stairs_quartz_stairs_outer", "uvlock": true, "y": 180 }, "facing=west,half=bottom,shape=straight": { - "model": "basemetals:block/diamond_stairs", + "model": "basemetals:block/diamond_stairs_quartz_stairs", "uvlock": true, "y": 180 }, "facing=west,half=top,shape=inner_left": { - "model": "basemetals:block/diamond_inner_stairs", + "model": "basemetals:block/diamond_stairs_quartz_stairs_inner", "uvlock": true, "x": 180, "y": 180 }, "facing=west,half=top,shape=inner_right": { - "model": "basemetals:block/diamond_inner_stairs", + "model": "basemetals:block/diamond_stairs_quartz_stairs_inner", "uvlock": true, "x": 180, "y": 270 }, "facing=west,half=top,shape=outer_left": { - "model": "basemetals:block/diamond_outer_stairs", + "model": "basemetals:block/diamond_stairs_quartz_stairs_outer", "uvlock": true, "x": 180, "y": 180 }, "facing=west,half=top,shape=outer_right": { - "model": "basemetals:block/diamond_outer_stairs", + "model": "basemetals:block/diamond_stairs_quartz_stairs_outer", "uvlock": true, "x": 180, "y": 270 }, "facing=west,half=top,shape=straight": { - "model": "basemetals:block/diamond_stairs", + "model": "basemetals:block/diamond_stairs_quartz_stairs", "uvlock": true, "x": 180, "y": 180 } } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/basemetals/blockstates/diamond_trapdoor.json b/src/main/resources/assets/basemetals/blockstates/diamond_trapdoor.json new file mode 100644 index 000000000..ce2a9503f --- /dev/null +++ b/src/main/resources/assets/basemetals/blockstates/diamond_trapdoor.json @@ -0,0 +1,58 @@ +{ + "variants": { + "facing=east,half=bottom,open=false": { + "model": "basemetals:block/diamond_trapdoor_iron_trapdoor_bottom" + }, + "facing=east,half=bottom,open=true": { + "model": "basemetals:block/diamond_trapdoor_iron_trapdoor_open", + "y": 90 + }, + "facing=east,half=top,open=false": { + "model": "basemetals:block/diamond_trapdoor_iron_trapdoor_top" + }, + "facing=east,half=top,open=true": { + "model": "basemetals:block/diamond_trapdoor_iron_trapdoor_open", + "y": 90 + }, + "facing=north,half=bottom,open=false": { + "model": "basemetals:block/diamond_trapdoor_iron_trapdoor_bottom" + }, + "facing=north,half=bottom,open=true": { + "model": "basemetals:block/diamond_trapdoor_iron_trapdoor_open" + }, + "facing=north,half=top,open=false": { + "model": "basemetals:block/diamond_trapdoor_iron_trapdoor_top" + }, + "facing=north,half=top,open=true": { + "model": "basemetals:block/diamond_trapdoor_iron_trapdoor_open" + }, + "facing=south,half=bottom,open=false": { + "model": "basemetals:block/diamond_trapdoor_iron_trapdoor_bottom" + }, + "facing=south,half=bottom,open=true": { + "model": "basemetals:block/diamond_trapdoor_iron_trapdoor_open", + "y": 180 + }, + "facing=south,half=top,open=false": { + "model": "basemetals:block/diamond_trapdoor_iron_trapdoor_top" + }, + "facing=south,half=top,open=true": { + "model": "basemetals:block/diamond_trapdoor_iron_trapdoor_open", + "y": 180 + }, + "facing=west,half=bottom,open=false": { + "model": "basemetals:block/diamond_trapdoor_iron_trapdoor_bottom" + }, + "facing=west,half=bottom,open=true": { + "model": "basemetals:block/diamond_trapdoor_iron_trapdoor_open", + "y": 270 + }, + "facing=west,half=top,open=false": { + "model": "basemetals:block/diamond_trapdoor_iron_trapdoor_top" + }, + "facing=west,half=top,open=true": { + "model": "basemetals:block/diamond_trapdoor_iron_trapdoor_open", + "y": 270 + } + } +} diff --git a/src/generated/resources/assets/basemetals/blockstates/diamond_wall.json b/src/main/resources/assets/basemetals/blockstates/diamond_wall.json similarity index 61% rename from src/generated/resources/assets/basemetals/blockstates/diamond_wall.json rename to src/main/resources/assets/basemetals/blockstates/diamond_wall.json index 96638e15e..e3acd8b0d 100644 --- a/src/generated/resources/assets/basemetals/blockstates/diamond_wall.json +++ b/src/main/resources/assets/basemetals/blockstates/diamond_wall.json @@ -2,7 +2,7 @@ "multipart": [ { "apply": { - "model": "basemetals:block/diamond_wall_post" + "model": "basemetals:block/diamond_wall_cobblestone_wall_post" }, "when": { "up": "true" @@ -10,75 +10,75 @@ }, { "apply": { - "model": "basemetals:block/diamond_wall_side", - "uvlock": true, - "y": 90 + "model": "basemetals:block/diamond_wall_cobblestone_wall_side", + "uvlock": true }, "when": { - "east": "low" + "north": "low" } }, { "apply": { - "model": "basemetals:block/diamond_wall_side_tall", + "model": "basemetals:block/diamond_wall_cobblestone_wall_side", "uvlock": true, "y": 90 }, "when": { - "east": "tall" + "east": "low" } }, { "apply": { - "model": "basemetals:block/diamond_wall_side", - "uvlock": true + "model": "basemetals:block/diamond_wall_cobblestone_wall_side", + "uvlock": true, + "y": 180 }, "when": { - "north": "low" + "south": "low" } }, { "apply": { - "model": "basemetals:block/diamond_wall_side_tall", - "uvlock": true + "model": "basemetals:block/diamond_wall_cobblestone_wall_side", + "uvlock": true, + "y": 270 }, "when": { - "north": "tall" + "west": "low" } }, { "apply": { - "model": "basemetals:block/diamond_wall_side", - "uvlock": true, - "y": 180 + "model": "basemetals:block/diamond_wall_cobblestone_wall_side_tall", + "uvlock": true }, "when": { - "south": "low" + "north": "tall" } }, { "apply": { - "model": "basemetals:block/diamond_wall_side_tall", + "model": "basemetals:block/diamond_wall_cobblestone_wall_side_tall", "uvlock": true, - "y": 180 + "y": 90 }, "when": { - "south": "tall" + "east": "tall" } }, { "apply": { - "model": "basemetals:block/diamond_wall_side", + "model": "basemetals:block/diamond_wall_cobblestone_wall_side_tall", "uvlock": true, - "y": 270 + "y": 180 }, "when": { - "west": "low" + "south": "tall" } }, { "apply": { - "model": "basemetals:block/diamond_wall_side_tall", + "model": "basemetals:block/diamond_wall_cobblestone_wall_side_tall", "uvlock": true, "y": 270 }, @@ -87,4 +87,4 @@ } } ] -} \ No newline at end of file +} diff --git a/src/generated/resources/assets/basemetals/blockstates/emerald_bars.json b/src/main/resources/assets/basemetals/blockstates/emerald_bars.json similarity index 65% rename from src/generated/resources/assets/basemetals/blockstates/emerald_bars.json rename to src/main/resources/assets/basemetals/blockstates/emerald_bars.json index c46664ef7..ea024ba79 100644 --- a/src/generated/resources/assets/basemetals/blockstates/emerald_bars.json +++ b/src/main/resources/assets/basemetals/blockstates/emerald_bars.json @@ -2,12 +2,12 @@ "multipart": [ { "apply": { - "model": "basemetals:block/emerald_bars_post_ends" + "model": "basemetals:block/emerald_bars_iron_bars_post_ends" } }, { "apply": { - "model": "basemetals:block/emerald_bars_post" + "model": "basemetals:block/emerald_bars_iron_bars_post" }, "when": { "east": "false", @@ -18,7 +18,7 @@ }, { "apply": { - "model": "basemetals:block/emerald_bars_cap" + "model": "basemetals:block/emerald_bars_iron_bars_cap" }, "when": { "east": "false", @@ -29,67 +29,67 @@ }, { "apply": { - "model": "basemetals:block/emerald_bars_side" + "model": "basemetals:block/emerald_bars_iron_bars_cap", + "y": 90 }, "when": { - "north": "true" + "east": "true", + "north": "false", + "south": "false", + "west": "false" } }, { "apply": { - "model": "basemetals:block/emerald_bars_cap", - "y": 90 + "model": "basemetals:block/emerald_bars_iron_bars_cap_alt" }, "when": { - "east": "true", + "east": "false", "north": "false", - "south": "false", + "south": "true", "west": "false" } }, { "apply": { - "model": "basemetals:block/emerald_bars_side", + "model": "basemetals:block/emerald_bars_iron_bars_cap_alt", "y": 90 }, "when": { - "east": "true" + "east": "false", + "north": "false", + "south": "false", + "west": "true" } }, { "apply": { - "model": "basemetals:block/emerald_bars_cap_alt" + "model": "basemetals:block/emerald_bars_iron_bars_side" }, "when": { - "east": "false", - "north": "false", - "south": "true", - "west": "false" + "north": "true" } }, { "apply": { - "model": "basemetals:block/emerald_bars_side_alt" + "model": "basemetals:block/emerald_bars_iron_bars_side", + "y": 90 }, "when": { - "south": "true" + "east": "true" } }, { "apply": { - "model": "basemetals:block/emerald_bars_cap_alt", - "y": 90 + "model": "basemetals:block/emerald_bars_iron_bars_side_alt" }, "when": { - "east": "false", - "north": "false", - "south": "false", - "west": "true" + "south": "true" } }, { "apply": { - "model": "basemetals:block/emerald_bars_side_alt", + "model": "basemetals:block/emerald_bars_iron_bars_side_alt", "y": 90 }, "when": { @@ -97,4 +97,4 @@ } } ] -} \ No newline at end of file +} diff --git a/src/main/resources/assets/basemetals/blockstates/emerald_button.json b/src/main/resources/assets/basemetals/blockstates/emerald_button.json new file mode 100644 index 000000000..f57090401 --- /dev/null +++ b/src/main/resources/assets/basemetals/blockstates/emerald_button.json @@ -0,0 +1,118 @@ +{ + "variants": { + "face=ceiling,facing=east,powered=false": { + "model": "basemetals:block/emerald_button_polished_blackstone_button", + "x": 180, + "y": 270 + }, + "face=ceiling,facing=east,powered=true": { + "model": "basemetals:block/emerald_button_polished_blackstone_button_pressed", + "x": 180, + "y": 270 + }, + "face=ceiling,facing=north,powered=false": { + "model": "basemetals:block/emerald_button_polished_blackstone_button", + "x": 180, + "y": 180 + }, + "face=ceiling,facing=north,powered=true": { + "model": "basemetals:block/emerald_button_polished_blackstone_button_pressed", + "x": 180, + "y": 180 + }, + "face=ceiling,facing=south,powered=false": { + "model": "basemetals:block/emerald_button_polished_blackstone_button", + "x": 180 + }, + "face=ceiling,facing=south,powered=true": { + "model": "basemetals:block/emerald_button_polished_blackstone_button_pressed", + "x": 180 + }, + "face=ceiling,facing=west,powered=false": { + "model": "basemetals:block/emerald_button_polished_blackstone_button", + "x": 180, + "y": 90 + }, + "face=ceiling,facing=west,powered=true": { + "model": "basemetals:block/emerald_button_polished_blackstone_button_pressed", + "x": 180, + "y": 90 + }, + "face=floor,facing=east,powered=false": { + "model": "basemetals:block/emerald_button_polished_blackstone_button", + "y": 90 + }, + "face=floor,facing=east,powered=true": { + "model": "basemetals:block/emerald_button_polished_blackstone_button_pressed", + "y": 90 + }, + "face=floor,facing=north,powered=false": { + "model": "basemetals:block/emerald_button_polished_blackstone_button" + }, + "face=floor,facing=north,powered=true": { + "model": "basemetals:block/emerald_button_polished_blackstone_button_pressed" + }, + "face=floor,facing=south,powered=false": { + "model": "basemetals:block/emerald_button_polished_blackstone_button", + "y": 180 + }, + "face=floor,facing=south,powered=true": { + "model": "basemetals:block/emerald_button_polished_blackstone_button_pressed", + "y": 180 + }, + "face=floor,facing=west,powered=false": { + "model": "basemetals:block/emerald_button_polished_blackstone_button", + "y": 270 + }, + "face=floor,facing=west,powered=true": { + "model": "basemetals:block/emerald_button_polished_blackstone_button_pressed", + "y": 270 + }, + "face=wall,facing=east,powered=false": { + "model": "basemetals:block/emerald_button_polished_blackstone_button", + "uvlock": true, + "x": 90, + "y": 90 + }, + "face=wall,facing=east,powered=true": { + "model": "basemetals:block/emerald_button_polished_blackstone_button_pressed", + "uvlock": true, + "x": 90, + "y": 90 + }, + "face=wall,facing=north,powered=false": { + "model": "basemetals:block/emerald_button_polished_blackstone_button", + "uvlock": true, + "x": 90 + }, + "face=wall,facing=north,powered=true": { + "model": "basemetals:block/emerald_button_polished_blackstone_button_pressed", + "uvlock": true, + "x": 90 + }, + "face=wall,facing=south,powered=false": { + "model": "basemetals:block/emerald_button_polished_blackstone_button", + "uvlock": true, + "x": 90, + "y": 180 + }, + "face=wall,facing=south,powered=true": { + "model": "basemetals:block/emerald_button_polished_blackstone_button_pressed", + "uvlock": true, + "x": 90, + "y": 180 + }, + "face=wall,facing=west,powered=false": { + "model": "basemetals:block/emerald_button_polished_blackstone_button", + "uvlock": true, + "x": 90, + "y": 270 + }, + "face=wall,facing=west,powered=true": { + "model": "basemetals:block/emerald_button_polished_blackstone_button_pressed", + "uvlock": true, + "x": 90, + "y": 270 + } + } +} diff --git a/src/generated/resources/assets/basemetals/blockstates/gold_door.json b/src/main/resources/assets/basemetals/blockstates/emerald_door.json similarity index 50% rename from src/generated/resources/assets/basemetals/blockstates/gold_door.json rename to src/main/resources/assets/basemetals/blockstates/emerald_door.json index 60b742adf..aed5ed9d9 100644 --- a/src/generated/resources/assets/basemetals/blockstates/gold_door.json +++ b/src/main/resources/assets/basemetals/blockstates/emerald_door.json @@ -1,124 +1,124 @@ { "variants": { "facing=east,half=lower,hinge=left,open=false": { - "model": "basemetals:block/gold_door_bottom_left" + "model": "basemetals:block/emerald_door_iron_door_bottom_left" }, "facing=east,half=lower,hinge=left,open=true": { - "model": "basemetals:block/gold_door_bottom_left_open", + "model": "basemetals:block/emerald_door_iron_door_bottom_left_open", "y": 90 }, "facing=east,half=lower,hinge=right,open=false": { - "model": "basemetals:block/gold_door_bottom_right" + "model": "basemetals:block/emerald_door_iron_door_bottom_right" }, "facing=east,half=lower,hinge=right,open=true": { - "model": "basemetals:block/gold_door_bottom_right_open", + "model": "basemetals:block/emerald_door_iron_door_bottom_right_open", "y": 270 }, "facing=east,half=upper,hinge=left,open=false": { - "model": "basemetals:block/gold_door_top_left" + "model": "basemetals:block/emerald_door_iron_door_top_left" }, "facing=east,half=upper,hinge=left,open=true": { - "model": "basemetals:block/gold_door_top_left_open", + "model": "basemetals:block/emerald_door_iron_door_top_left_open", "y": 90 }, "facing=east,half=upper,hinge=right,open=false": { - "model": "basemetals:block/gold_door_top_right" + "model": "basemetals:block/emerald_door_iron_door_top_right" }, "facing=east,half=upper,hinge=right,open=true": { - "model": "basemetals:block/gold_door_top_right_open", + "model": "basemetals:block/emerald_door_iron_door_top_right_open", "y": 270 }, "facing=north,half=lower,hinge=left,open=false": { - "model": "basemetals:block/gold_door_bottom_left", + "model": "basemetals:block/emerald_door_iron_door_bottom_left", "y": 270 }, "facing=north,half=lower,hinge=left,open=true": { - "model": "basemetals:block/gold_door_bottom_left_open" + "model": "basemetals:block/emerald_door_iron_door_bottom_left_open" }, "facing=north,half=lower,hinge=right,open=false": { - "model": "basemetals:block/gold_door_bottom_right", + "model": "basemetals:block/emerald_door_iron_door_bottom_right", "y": 270 }, "facing=north,half=lower,hinge=right,open=true": { - "model": "basemetals:block/gold_door_bottom_right_open", + "model": "basemetals:block/emerald_door_iron_door_bottom_right_open", "y": 180 }, "facing=north,half=upper,hinge=left,open=false": { - "model": "basemetals:block/gold_door_top_left", + "model": "basemetals:block/emerald_door_iron_door_top_left", "y": 270 }, "facing=north,half=upper,hinge=left,open=true": { - "model": "basemetals:block/gold_door_top_left_open" + "model": "basemetals:block/emerald_door_iron_door_top_left_open" }, "facing=north,half=upper,hinge=right,open=false": { - "model": "basemetals:block/gold_door_top_right", + "model": "basemetals:block/emerald_door_iron_door_top_right", "y": 270 }, "facing=north,half=upper,hinge=right,open=true": { - "model": "basemetals:block/gold_door_top_right_open", + "model": "basemetals:block/emerald_door_iron_door_top_right_open", "y": 180 }, "facing=south,half=lower,hinge=left,open=false": { - "model": "basemetals:block/gold_door_bottom_left", + "model": "basemetals:block/emerald_door_iron_door_bottom_left", "y": 90 }, "facing=south,half=lower,hinge=left,open=true": { - "model": "basemetals:block/gold_door_bottom_left_open", + "model": "basemetals:block/emerald_door_iron_door_bottom_left_open", "y": 180 }, "facing=south,half=lower,hinge=right,open=false": { - "model": "basemetals:block/gold_door_bottom_right", + "model": "basemetals:block/emerald_door_iron_door_bottom_right", "y": 90 }, "facing=south,half=lower,hinge=right,open=true": { - "model": "basemetals:block/gold_door_bottom_right_open" + "model": "basemetals:block/emerald_door_iron_door_bottom_right_open" }, "facing=south,half=upper,hinge=left,open=false": { - "model": "basemetals:block/gold_door_top_left", + "model": "basemetals:block/emerald_door_iron_door_top_left", "y": 90 }, "facing=south,half=upper,hinge=left,open=true": { - "model": "basemetals:block/gold_door_top_left_open", + "model": "basemetals:block/emerald_door_iron_door_top_left_open", "y": 180 }, "facing=south,half=upper,hinge=right,open=false": { - "model": "basemetals:block/gold_door_top_right", + "model": "basemetals:block/emerald_door_iron_door_top_right", "y": 90 }, "facing=south,half=upper,hinge=right,open=true": { - "model": "basemetals:block/gold_door_top_right_open" + "model": "basemetals:block/emerald_door_iron_door_top_right_open" }, "facing=west,half=lower,hinge=left,open=false": { - "model": "basemetals:block/gold_door_bottom_left", + "model": "basemetals:block/emerald_door_iron_door_bottom_left", "y": 180 }, "facing=west,half=lower,hinge=left,open=true": { - "model": "basemetals:block/gold_door_bottom_left_open", + "model": "basemetals:block/emerald_door_iron_door_bottom_left_open", "y": 270 }, "facing=west,half=lower,hinge=right,open=false": { - "model": "basemetals:block/gold_door_bottom_right", + "model": "basemetals:block/emerald_door_iron_door_bottom_right", "y": 180 }, "facing=west,half=lower,hinge=right,open=true": { - "model": "basemetals:block/gold_door_bottom_right_open", + "model": "basemetals:block/emerald_door_iron_door_bottom_right_open", "y": 90 }, "facing=west,half=upper,hinge=left,open=false": { - "model": "basemetals:block/gold_door_top_left", + "model": "basemetals:block/emerald_door_iron_door_top_left", "y": 180 }, "facing=west,half=upper,hinge=left,open=true": { - "model": "basemetals:block/gold_door_top_left_open", + "model": "basemetals:block/emerald_door_iron_door_top_left_open", "y": 270 }, "facing=west,half=upper,hinge=right,open=false": { - "model": "basemetals:block/gold_door_top_right", + "model": "basemetals:block/emerald_door_iron_door_top_right", "y": 180 }, "facing=west,half=upper,hinge=right,open=true": { - "model": "basemetals:block/gold_door_top_right_open", + "model": "basemetals:block/emerald_door_iron_door_top_right_open", "y": 90 } } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/basemetals/blockstates/emerald_double_slab.json b/src/main/resources/assets/basemetals/blockstates/emerald_double_slab.json new file mode 100644 index 000000000..43076fc3a --- /dev/null +++ b/src/main/resources/assets/basemetals/blockstates/emerald_double_slab.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "basemetals:block/emerald_double_slab" + } + } +} diff --git a/src/generated/resources/assets/basemetals/blockstates/gold_button.json b/src/main/resources/assets/basemetals/blockstates/emerald_lever.json similarity index 56% rename from src/generated/resources/assets/basemetals/blockstates/gold_button.json rename to src/main/resources/assets/basemetals/blockstates/emerald_lever.json index aeaf264e3..06daae0c4 100644 --- a/src/generated/resources/assets/basemetals/blockstates/gold_button.json +++ b/src/main/resources/assets/basemetals/blockstates/emerald_lever.json @@ -1,118 +1,110 @@ { "variants": { "face=ceiling,facing=east,powered=false": { - "model": "basemetals:block/gold_button", + "model": "basemetals:block/emerald_lever_lever_on", "x": 180, "y": 270 }, "face=ceiling,facing=east,powered=true": { - "model": "basemetals:block/gold_button_pressed", + "model": "basemetals:block/emerald_lever_lever", "x": 180, "y": 270 }, "face=ceiling,facing=north,powered=false": { - "model": "basemetals:block/gold_button", + "model": "basemetals:block/emerald_lever_lever_on", "x": 180, "y": 180 }, "face=ceiling,facing=north,powered=true": { - "model": "basemetals:block/gold_button_pressed", + "model": "basemetals:block/emerald_lever_lever", "x": 180, "y": 180 }, "face=ceiling,facing=south,powered=false": { - "model": "basemetals:block/gold_button", + "model": "basemetals:block/emerald_lever_lever_on", "x": 180 }, "face=ceiling,facing=south,powered=true": { - "model": "basemetals:block/gold_button_pressed", + "model": "basemetals:block/emerald_lever_lever", "x": 180 }, "face=ceiling,facing=west,powered=false": { - "model": "basemetals:block/gold_button", + "model": "basemetals:block/emerald_lever_lever_on", "x": 180, "y": 90 }, "face=ceiling,facing=west,powered=true": { - "model": "basemetals:block/gold_button_pressed", + "model": "basemetals:block/emerald_lever_lever", "x": 180, "y": 90 }, "face=floor,facing=east,powered=false": { - "model": "basemetals:block/gold_button", + "model": "basemetals:block/emerald_lever_lever_on", "y": 90 }, "face=floor,facing=east,powered=true": { - "model": "basemetals:block/gold_button_pressed", + "model": "basemetals:block/emerald_lever_lever", "y": 90 }, "face=floor,facing=north,powered=false": { - "model": "basemetals:block/gold_button" + "model": "basemetals:block/emerald_lever_lever_on" }, "face=floor,facing=north,powered=true": { - "model": "basemetals:block/gold_button_pressed" + "model": "basemetals:block/emerald_lever_lever" }, "face=floor,facing=south,powered=false": { - "model": "basemetals:block/gold_button", + "model": "basemetals:block/emerald_lever_lever_on", "y": 180 }, "face=floor,facing=south,powered=true": { - "model": "basemetals:block/gold_button_pressed", + "model": "basemetals:block/emerald_lever_lever", "y": 180 }, "face=floor,facing=west,powered=false": { - "model": "basemetals:block/gold_button", + "model": "basemetals:block/emerald_lever_lever_on", "y": 270 }, "face=floor,facing=west,powered=true": { - "model": "basemetals:block/gold_button_pressed", + "model": "basemetals:block/emerald_lever_lever", "y": 270 }, "face=wall,facing=east,powered=false": { - "model": "basemetals:block/gold_button", - "uvlock": true, + "model": "basemetals:block/emerald_lever_lever_on", "x": 90, "y": 90 }, "face=wall,facing=east,powered=true": { - "model": "basemetals:block/gold_button_pressed", - "uvlock": true, + "model": "basemetals:block/emerald_lever_lever", "x": 90, "y": 90 }, "face=wall,facing=north,powered=false": { - "model": "basemetals:block/gold_button", - "uvlock": true, + "model": "basemetals:block/emerald_lever_lever_on", "x": 90 }, "face=wall,facing=north,powered=true": { - "model": "basemetals:block/gold_button_pressed", - "uvlock": true, + "model": "basemetals:block/emerald_lever_lever", "x": 90 }, "face=wall,facing=south,powered=false": { - "model": "basemetals:block/gold_button", - "uvlock": true, + "model": "basemetals:block/emerald_lever_lever_on", "x": 90, "y": 180 }, "face=wall,facing=south,powered=true": { - "model": "basemetals:block/gold_button_pressed", - "uvlock": true, + "model": "basemetals:block/emerald_lever_lever", "x": 90, "y": 180 }, "face=wall,facing=west,powered=false": { - "model": "basemetals:block/gold_button", - "uvlock": true, + "model": "basemetals:block/emerald_lever_lever_on", "x": 90, "y": 270 }, "face=wall,facing=west,powered=true": { - "model": "basemetals:block/gold_button_pressed", - "uvlock": true, + "model": "basemetals:block/emerald_lever_lever", "x": 90, "y": 270 } } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/basemetals/blockstates/emerald_pressure_plate.json b/src/main/resources/assets/basemetals/blockstates/emerald_pressure_plate.json new file mode 100644 index 000000000..28fafc9a8 --- /dev/null +++ b/src/main/resources/assets/basemetals/blockstates/emerald_pressure_plate.json @@ -0,0 +1,10 @@ +{ + "variants": { + "powered=false": { + "model": "basemetals:block/emerald_pressure_plate_polished_blackstone_pressure_plate" + }, + "powered=true": { + "model": "basemetals:block/emerald_pressure_plate_polished_blackstone_pressure_plate_down" + } + } +} diff --git a/src/main/resources/assets/basemetals/blockstates/emerald_slab.json b/src/main/resources/assets/basemetals/blockstates/emerald_slab.json new file mode 100644 index 000000000..e48cd0798 --- /dev/null +++ b/src/main/resources/assets/basemetals/blockstates/emerald_slab.json @@ -0,0 +1,13 @@ +{ + "variants": { + "type=bottom": { + "model": "basemetals:block/emerald_slab_quartz_slab" + }, + "type=double": { + "model": "basemetals:block/emerald_slab_quartz_block" + }, + "type=top": { + "model": "basemetals:block/emerald_slab_quartz_slab_top" + } + } +} diff --git a/src/generated/resources/assets/basemetals/blockstates/emerald_stairs.json b/src/main/resources/assets/basemetals/blockstates/emerald_stairs.json similarity index 57% rename from src/generated/resources/assets/basemetals/blockstates/emerald_stairs.json rename to src/main/resources/assets/basemetals/blockstates/emerald_stairs.json index f422bcbf2..8069c4a42 100644 --- a/src/generated/resources/assets/basemetals/blockstates/emerald_stairs.json +++ b/src/main/resources/assets/basemetals/blockstates/emerald_stairs.json @@ -1,209 +1,209 @@ { "variants": { "facing=east,half=bottom,shape=inner_left": { - "model": "basemetals:block/emerald_inner_stairs", + "model": "basemetals:block/emerald_stairs_quartz_stairs_inner", "uvlock": true, "y": 270 }, "facing=east,half=bottom,shape=inner_right": { - "model": "basemetals:block/emerald_inner_stairs" + "model": "basemetals:block/emerald_stairs_quartz_stairs_inner" }, "facing=east,half=bottom,shape=outer_left": { - "model": "basemetals:block/emerald_outer_stairs", + "model": "basemetals:block/emerald_stairs_quartz_stairs_outer", "uvlock": true, "y": 270 }, "facing=east,half=bottom,shape=outer_right": { - "model": "basemetals:block/emerald_outer_stairs" + "model": "basemetals:block/emerald_stairs_quartz_stairs_outer" }, "facing=east,half=bottom,shape=straight": { - "model": "basemetals:block/emerald_stairs" + "model": "basemetals:block/emerald_stairs_quartz_stairs" }, "facing=east,half=top,shape=inner_left": { - "model": "basemetals:block/emerald_inner_stairs", + "model": "basemetals:block/emerald_stairs_quartz_stairs_inner", "uvlock": true, "x": 180 }, "facing=east,half=top,shape=inner_right": { - "model": "basemetals:block/emerald_inner_stairs", + "model": "basemetals:block/emerald_stairs_quartz_stairs_inner", "uvlock": true, "x": 180, "y": 90 }, "facing=east,half=top,shape=outer_left": { - "model": "basemetals:block/emerald_outer_stairs", + "model": "basemetals:block/emerald_stairs_quartz_stairs_outer", "uvlock": true, "x": 180 }, "facing=east,half=top,shape=outer_right": { - "model": "basemetals:block/emerald_outer_stairs", + "model": "basemetals:block/emerald_stairs_quartz_stairs_outer", "uvlock": true, "x": 180, "y": 90 }, "facing=east,half=top,shape=straight": { - "model": "basemetals:block/emerald_stairs", + "model": "basemetals:block/emerald_stairs_quartz_stairs", "uvlock": true, "x": 180 }, "facing=north,half=bottom,shape=inner_left": { - "model": "basemetals:block/emerald_inner_stairs", + "model": "basemetals:block/emerald_stairs_quartz_stairs_inner", "uvlock": true, "y": 180 }, "facing=north,half=bottom,shape=inner_right": { - "model": "basemetals:block/emerald_inner_stairs", + "model": "basemetals:block/emerald_stairs_quartz_stairs_inner", "uvlock": true, "y": 270 }, "facing=north,half=bottom,shape=outer_left": { - "model": "basemetals:block/emerald_outer_stairs", + "model": "basemetals:block/emerald_stairs_quartz_stairs_outer", "uvlock": true, "y": 180 }, "facing=north,half=bottom,shape=outer_right": { - "model": "basemetals:block/emerald_outer_stairs", + "model": "basemetals:block/emerald_stairs_quartz_stairs_outer", "uvlock": true, "y": 270 }, "facing=north,half=bottom,shape=straight": { - "model": "basemetals:block/emerald_stairs", + "model": "basemetals:block/emerald_stairs_quartz_stairs", "uvlock": true, "y": 270 }, "facing=north,half=top,shape=inner_left": { - "model": "basemetals:block/emerald_inner_stairs", + "model": "basemetals:block/emerald_stairs_quartz_stairs_inner", "uvlock": true, "x": 180, "y": 270 }, "facing=north,half=top,shape=inner_right": { - "model": "basemetals:block/emerald_inner_stairs", + "model": "basemetals:block/emerald_stairs_quartz_stairs_inner", "uvlock": true, "x": 180 }, "facing=north,half=top,shape=outer_left": { - "model": "basemetals:block/emerald_outer_stairs", + "model": "basemetals:block/emerald_stairs_quartz_stairs_outer", "uvlock": true, "x": 180, "y": 270 }, "facing=north,half=top,shape=outer_right": { - "model": "basemetals:block/emerald_outer_stairs", + "model": "basemetals:block/emerald_stairs_quartz_stairs_outer", "uvlock": true, "x": 180 }, "facing=north,half=top,shape=straight": { - "model": "basemetals:block/emerald_stairs", + "model": "basemetals:block/emerald_stairs_quartz_stairs", "uvlock": true, "x": 180, "y": 270 }, "facing=south,half=bottom,shape=inner_left": { - "model": "basemetals:block/emerald_inner_stairs" + "model": "basemetals:block/emerald_stairs_quartz_stairs_inner" }, "facing=south,half=bottom,shape=inner_right": { - "model": "basemetals:block/emerald_inner_stairs", + "model": "basemetals:block/emerald_stairs_quartz_stairs_inner", "uvlock": true, "y": 90 }, "facing=south,half=bottom,shape=outer_left": { - "model": "basemetals:block/emerald_outer_stairs" + "model": "basemetals:block/emerald_stairs_quartz_stairs_outer" }, "facing=south,half=bottom,shape=outer_right": { - "model": "basemetals:block/emerald_outer_stairs", + "model": "basemetals:block/emerald_stairs_quartz_stairs_outer", "uvlock": true, "y": 90 }, "facing=south,half=bottom,shape=straight": { - "model": "basemetals:block/emerald_stairs", + "model": "basemetals:block/emerald_stairs_quartz_stairs", "uvlock": true, "y": 90 }, "facing=south,half=top,shape=inner_left": { - "model": "basemetals:block/emerald_inner_stairs", + "model": "basemetals:block/emerald_stairs_quartz_stairs_inner", "uvlock": true, "x": 180, "y": 90 }, "facing=south,half=top,shape=inner_right": { - "model": "basemetals:block/emerald_inner_stairs", + "model": "basemetals:block/emerald_stairs_quartz_stairs_inner", "uvlock": true, "x": 180, "y": 180 }, "facing=south,half=top,shape=outer_left": { - "model": "basemetals:block/emerald_outer_stairs", + "model": "basemetals:block/emerald_stairs_quartz_stairs_outer", "uvlock": true, "x": 180, "y": 90 }, "facing=south,half=top,shape=outer_right": { - "model": "basemetals:block/emerald_outer_stairs", + "model": "basemetals:block/emerald_stairs_quartz_stairs_outer", "uvlock": true, "x": 180, "y": 180 }, "facing=south,half=top,shape=straight": { - "model": "basemetals:block/emerald_stairs", + "model": "basemetals:block/emerald_stairs_quartz_stairs", "uvlock": true, "x": 180, "y": 90 }, "facing=west,half=bottom,shape=inner_left": { - "model": "basemetals:block/emerald_inner_stairs", + "model": "basemetals:block/emerald_stairs_quartz_stairs_inner", "uvlock": true, "y": 90 }, "facing=west,half=bottom,shape=inner_right": { - "model": "basemetals:block/emerald_inner_stairs", + "model": "basemetals:block/emerald_stairs_quartz_stairs_inner", "uvlock": true, "y": 180 }, "facing=west,half=bottom,shape=outer_left": { - "model": "basemetals:block/emerald_outer_stairs", + "model": "basemetals:block/emerald_stairs_quartz_stairs_outer", "uvlock": true, "y": 90 }, "facing=west,half=bottom,shape=outer_right": { - "model": "basemetals:block/emerald_outer_stairs", + "model": "basemetals:block/emerald_stairs_quartz_stairs_outer", "uvlock": true, "y": 180 }, "facing=west,half=bottom,shape=straight": { - "model": "basemetals:block/emerald_stairs", + "model": "basemetals:block/emerald_stairs_quartz_stairs", "uvlock": true, "y": 180 }, "facing=west,half=top,shape=inner_left": { - "model": "basemetals:block/emerald_inner_stairs", + "model": "basemetals:block/emerald_stairs_quartz_stairs_inner", "uvlock": true, "x": 180, "y": 180 }, "facing=west,half=top,shape=inner_right": { - "model": "basemetals:block/emerald_inner_stairs", + "model": "basemetals:block/emerald_stairs_quartz_stairs_inner", "uvlock": true, "x": 180, "y": 270 }, "facing=west,half=top,shape=outer_left": { - "model": "basemetals:block/emerald_outer_stairs", + "model": "basemetals:block/emerald_stairs_quartz_stairs_outer", "uvlock": true, "x": 180, "y": 180 }, "facing=west,half=top,shape=outer_right": { - "model": "basemetals:block/emerald_outer_stairs", + "model": "basemetals:block/emerald_stairs_quartz_stairs_outer", "uvlock": true, "x": 180, "y": 270 }, "facing=west,half=top,shape=straight": { - "model": "basemetals:block/emerald_stairs", + "model": "basemetals:block/emerald_stairs_quartz_stairs", "uvlock": true, "x": 180, "y": 180 } } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/basemetals/blockstates/emerald_trapdoor.json b/src/main/resources/assets/basemetals/blockstates/emerald_trapdoor.json new file mode 100644 index 000000000..519830c74 --- /dev/null +++ b/src/main/resources/assets/basemetals/blockstates/emerald_trapdoor.json @@ -0,0 +1,58 @@ +{ + "variants": { + "facing=east,half=bottom,open=false": { + "model": "basemetals:block/emerald_trapdoor_iron_trapdoor_bottom" + }, + "facing=east,half=bottom,open=true": { + "model": "basemetals:block/emerald_trapdoor_iron_trapdoor_open", + "y": 90 + }, + "facing=east,half=top,open=false": { + "model": "basemetals:block/emerald_trapdoor_iron_trapdoor_top" + }, + "facing=east,half=top,open=true": { + "model": "basemetals:block/emerald_trapdoor_iron_trapdoor_open", + "y": 90 + }, + "facing=north,half=bottom,open=false": { + "model": "basemetals:block/emerald_trapdoor_iron_trapdoor_bottom" + }, + "facing=north,half=bottom,open=true": { + "model": "basemetals:block/emerald_trapdoor_iron_trapdoor_open" + }, + "facing=north,half=top,open=false": { + "model": "basemetals:block/emerald_trapdoor_iron_trapdoor_top" + }, + "facing=north,half=top,open=true": { + "model": "basemetals:block/emerald_trapdoor_iron_trapdoor_open" + }, + "facing=south,half=bottom,open=false": { + "model": "basemetals:block/emerald_trapdoor_iron_trapdoor_bottom" + }, + "facing=south,half=bottom,open=true": { + "model": "basemetals:block/emerald_trapdoor_iron_trapdoor_open", + "y": 180 + }, + "facing=south,half=top,open=false": { + "model": "basemetals:block/emerald_trapdoor_iron_trapdoor_top" + }, + "facing=south,half=top,open=true": { + "model": "basemetals:block/emerald_trapdoor_iron_trapdoor_open", + "y": 180 + }, + "facing=west,half=bottom,open=false": { + "model": "basemetals:block/emerald_trapdoor_iron_trapdoor_bottom" + }, + "facing=west,half=bottom,open=true": { + "model": "basemetals:block/emerald_trapdoor_iron_trapdoor_open", + "y": 270 + }, + "facing=west,half=top,open=false": { + "model": "basemetals:block/emerald_trapdoor_iron_trapdoor_top" + }, + "facing=west,half=top,open=true": { + "model": "basemetals:block/emerald_trapdoor_iron_trapdoor_open", + "y": 270 + } + } +} diff --git a/src/generated/resources/assets/basemetals/blockstates/emerald_wall.json b/src/main/resources/assets/basemetals/blockstates/emerald_wall.json similarity index 61% rename from src/generated/resources/assets/basemetals/blockstates/emerald_wall.json rename to src/main/resources/assets/basemetals/blockstates/emerald_wall.json index bcc3b45cb..7cabcd6b3 100644 --- a/src/generated/resources/assets/basemetals/blockstates/emerald_wall.json +++ b/src/main/resources/assets/basemetals/blockstates/emerald_wall.json @@ -2,7 +2,7 @@ "multipart": [ { "apply": { - "model": "basemetals:block/emerald_wall_post" + "model": "basemetals:block/emerald_wall_cobblestone_wall_post" }, "when": { "up": "true" @@ -10,75 +10,75 @@ }, { "apply": { - "model": "basemetals:block/emerald_wall_side", - "uvlock": true, - "y": 90 + "model": "basemetals:block/emerald_wall_cobblestone_wall_side", + "uvlock": true }, "when": { - "east": "low" + "north": "low" } }, { "apply": { - "model": "basemetals:block/emerald_wall_side_tall", + "model": "basemetals:block/emerald_wall_cobblestone_wall_side", "uvlock": true, "y": 90 }, "when": { - "east": "tall" + "east": "low" } }, { "apply": { - "model": "basemetals:block/emerald_wall_side", - "uvlock": true + "model": "basemetals:block/emerald_wall_cobblestone_wall_side", + "uvlock": true, + "y": 180 }, "when": { - "north": "low" + "south": "low" } }, { "apply": { - "model": "basemetals:block/emerald_wall_side_tall", - "uvlock": true + "model": "basemetals:block/emerald_wall_cobblestone_wall_side", + "uvlock": true, + "y": 270 }, "when": { - "north": "tall" + "west": "low" } }, { "apply": { - "model": "basemetals:block/emerald_wall_side", - "uvlock": true, - "y": 180 + "model": "basemetals:block/emerald_wall_cobblestone_wall_side_tall", + "uvlock": true }, "when": { - "south": "low" + "north": "tall" } }, { "apply": { - "model": "basemetals:block/emerald_wall_side_tall", + "model": "basemetals:block/emerald_wall_cobblestone_wall_side_tall", "uvlock": true, - "y": 180 + "y": 90 }, "when": { - "south": "tall" + "east": "tall" } }, { "apply": { - "model": "basemetals:block/emerald_wall_side", + "model": "basemetals:block/emerald_wall_cobblestone_wall_side_tall", "uvlock": true, - "y": 270 + "y": 180 }, "when": { - "west": "low" + "south": "tall" } }, { "apply": { - "model": "basemetals:block/emerald_wall_side_tall", + "model": "basemetals:block/emerald_wall_cobblestone_wall_side_tall", "uvlock": true, "y": 270 }, @@ -87,4 +87,4 @@ } } ] -} \ No newline at end of file +} diff --git a/src/generated/resources/assets/basemetals/blockstates/gold_bars.json b/src/main/resources/assets/basemetals/blockstates/gold_bars.json similarity index 67% rename from src/generated/resources/assets/basemetals/blockstates/gold_bars.json rename to src/main/resources/assets/basemetals/blockstates/gold_bars.json index d14e34506..461b497d6 100644 --- a/src/generated/resources/assets/basemetals/blockstates/gold_bars.json +++ b/src/main/resources/assets/basemetals/blockstates/gold_bars.json @@ -2,12 +2,12 @@ "multipart": [ { "apply": { - "model": "basemetals:block/gold_bars_post_ends" + "model": "basemetals:block/gold_bars_iron_bars_post_ends" } }, { "apply": { - "model": "basemetals:block/gold_bars_post" + "model": "basemetals:block/gold_bars_iron_bars_post" }, "when": { "east": "false", @@ -18,7 +18,7 @@ }, { "apply": { - "model": "basemetals:block/gold_bars_cap" + "model": "basemetals:block/gold_bars_iron_bars_cap" }, "when": { "east": "false", @@ -29,67 +29,67 @@ }, { "apply": { - "model": "basemetals:block/gold_bars_side" + "model": "basemetals:block/gold_bars_iron_bars_cap", + "y": 90 }, "when": { - "north": "true" + "east": "true", + "north": "false", + "south": "false", + "west": "false" } }, { "apply": { - "model": "basemetals:block/gold_bars_cap", - "y": 90 + "model": "basemetals:block/gold_bars_iron_bars_cap_alt" }, "when": { - "east": "true", + "east": "false", "north": "false", - "south": "false", + "south": "true", "west": "false" } }, { "apply": { - "model": "basemetals:block/gold_bars_side", + "model": "basemetals:block/gold_bars_iron_bars_cap_alt", "y": 90 }, "when": { - "east": "true" + "east": "false", + "north": "false", + "south": "false", + "west": "true" } }, { "apply": { - "model": "basemetals:block/gold_bars_cap_alt" + "model": "basemetals:block/gold_bars_iron_bars_side" }, "when": { - "east": "false", - "north": "false", - "south": "true", - "west": "false" + "north": "true" } }, { "apply": { - "model": "basemetals:block/gold_bars_side_alt" + "model": "basemetals:block/gold_bars_iron_bars_side", + "y": 90 }, "when": { - "south": "true" + "east": "true" } }, { "apply": { - "model": "basemetals:block/gold_bars_cap_alt", - "y": 90 + "model": "basemetals:block/gold_bars_iron_bars_side_alt" }, "when": { - "east": "false", - "north": "false", - "south": "false", - "west": "true" + "south": "true" } }, { "apply": { - "model": "basemetals:block/gold_bars_side_alt", + "model": "basemetals:block/gold_bars_iron_bars_side_alt", "y": 90 }, "when": { @@ -97,4 +97,4 @@ } } ] -} \ No newline at end of file +} diff --git a/src/generated/resources/assets/basemetals/blockstates/emerald_button.json b/src/main/resources/assets/basemetals/blockstates/gold_button.json similarity index 51% rename from src/generated/resources/assets/basemetals/blockstates/emerald_button.json rename to src/main/resources/assets/basemetals/blockstates/gold_button.json index b6742e779..53da731b4 100644 --- a/src/generated/resources/assets/basemetals/blockstates/emerald_button.json +++ b/src/main/resources/assets/basemetals/blockstates/gold_button.json @@ -1,118 +1,118 @@ { "variants": { "face=ceiling,facing=east,powered=false": { - "model": "basemetals:block/emerald_button", + "model": "basemetals:block/gold_button_polished_blackstone_button", "x": 180, "y": 270 }, "face=ceiling,facing=east,powered=true": { - "model": "basemetals:block/emerald_button_pressed", + "model": "basemetals:block/gold_button_polished_blackstone_button_pressed", "x": 180, "y": 270 }, "face=ceiling,facing=north,powered=false": { - "model": "basemetals:block/emerald_button", + "model": "basemetals:block/gold_button_polished_blackstone_button", "x": 180, "y": 180 }, "face=ceiling,facing=north,powered=true": { - "model": "basemetals:block/emerald_button_pressed", + "model": "basemetals:block/gold_button_polished_blackstone_button_pressed", "x": 180, "y": 180 }, "face=ceiling,facing=south,powered=false": { - "model": "basemetals:block/emerald_button", + "model": "basemetals:block/gold_button_polished_blackstone_button", "x": 180 }, "face=ceiling,facing=south,powered=true": { - "model": "basemetals:block/emerald_button_pressed", + "model": "basemetals:block/gold_button_polished_blackstone_button_pressed", "x": 180 }, "face=ceiling,facing=west,powered=false": { - "model": "basemetals:block/emerald_button", + "model": "basemetals:block/gold_button_polished_blackstone_button", "x": 180, "y": 90 }, "face=ceiling,facing=west,powered=true": { - "model": "basemetals:block/emerald_button_pressed", + "model": "basemetals:block/gold_button_polished_blackstone_button_pressed", "x": 180, "y": 90 }, "face=floor,facing=east,powered=false": { - "model": "basemetals:block/emerald_button", + "model": "basemetals:block/gold_button_polished_blackstone_button", "y": 90 }, "face=floor,facing=east,powered=true": { - "model": "basemetals:block/emerald_button_pressed", + "model": "basemetals:block/gold_button_polished_blackstone_button_pressed", "y": 90 }, "face=floor,facing=north,powered=false": { - "model": "basemetals:block/emerald_button" + "model": "basemetals:block/gold_button_polished_blackstone_button" }, "face=floor,facing=north,powered=true": { - "model": "basemetals:block/emerald_button_pressed" + "model": "basemetals:block/gold_button_polished_blackstone_button_pressed" }, "face=floor,facing=south,powered=false": { - "model": "basemetals:block/emerald_button", + "model": "basemetals:block/gold_button_polished_blackstone_button", "y": 180 }, "face=floor,facing=south,powered=true": { - "model": "basemetals:block/emerald_button_pressed", + "model": "basemetals:block/gold_button_polished_blackstone_button_pressed", "y": 180 }, "face=floor,facing=west,powered=false": { - "model": "basemetals:block/emerald_button", + "model": "basemetals:block/gold_button_polished_blackstone_button", "y": 270 }, "face=floor,facing=west,powered=true": { - "model": "basemetals:block/emerald_button_pressed", + "model": "basemetals:block/gold_button_polished_blackstone_button_pressed", "y": 270 }, "face=wall,facing=east,powered=false": { - "model": "basemetals:block/emerald_button", + "model": "basemetals:block/gold_button_polished_blackstone_button", "uvlock": true, "x": 90, "y": 90 }, "face=wall,facing=east,powered=true": { - "model": "basemetals:block/emerald_button_pressed", + "model": "basemetals:block/gold_button_polished_blackstone_button_pressed", "uvlock": true, "x": 90, "y": 90 }, "face=wall,facing=north,powered=false": { - "model": "basemetals:block/emerald_button", + "model": "basemetals:block/gold_button_polished_blackstone_button", "uvlock": true, "x": 90 }, "face=wall,facing=north,powered=true": { - "model": "basemetals:block/emerald_button_pressed", + "model": "basemetals:block/gold_button_polished_blackstone_button_pressed", "uvlock": true, "x": 90 }, "face=wall,facing=south,powered=false": { - "model": "basemetals:block/emerald_button", + "model": "basemetals:block/gold_button_polished_blackstone_button", "uvlock": true, "x": 90, "y": 180 }, "face=wall,facing=south,powered=true": { - "model": "basemetals:block/emerald_button_pressed", + "model": "basemetals:block/gold_button_polished_blackstone_button_pressed", "uvlock": true, "x": 90, "y": 180 }, "face=wall,facing=west,powered=false": { - "model": "basemetals:block/emerald_button", + "model": "basemetals:block/gold_button_polished_blackstone_button", "uvlock": true, "x": 90, "y": 270 }, "face=wall,facing=west,powered=true": { - "model": "basemetals:block/emerald_button_pressed", + "model": "basemetals:block/gold_button_polished_blackstone_button_pressed", "uvlock": true, "x": 90, "y": 270 } } -} \ No newline at end of file +} diff --git a/src/generated/resources/assets/basemetals/blockstates/obsidian_door.json b/src/main/resources/assets/basemetals/blockstates/gold_door.json similarity index 51% rename from src/generated/resources/assets/basemetals/blockstates/obsidian_door.json rename to src/main/resources/assets/basemetals/blockstates/gold_door.json index 22d531b75..44475e3a3 100644 --- a/src/generated/resources/assets/basemetals/blockstates/obsidian_door.json +++ b/src/main/resources/assets/basemetals/blockstates/gold_door.json @@ -1,124 +1,124 @@ { "variants": { "facing=east,half=lower,hinge=left,open=false": { - "model": "basemetals:block/obsidian_door_bottom_left" + "model": "basemetals:block/gold_door_iron_door_bottom_left" }, "facing=east,half=lower,hinge=left,open=true": { - "model": "basemetals:block/obsidian_door_bottom_left_open", + "model": "basemetals:block/gold_door_iron_door_bottom_left_open", "y": 90 }, "facing=east,half=lower,hinge=right,open=false": { - "model": "basemetals:block/obsidian_door_bottom_right" + "model": "basemetals:block/gold_door_iron_door_bottom_right" }, "facing=east,half=lower,hinge=right,open=true": { - "model": "basemetals:block/obsidian_door_bottom_right_open", + "model": "basemetals:block/gold_door_iron_door_bottom_right_open", "y": 270 }, "facing=east,half=upper,hinge=left,open=false": { - "model": "basemetals:block/obsidian_door_top_left" + "model": "basemetals:block/gold_door_iron_door_top_left" }, "facing=east,half=upper,hinge=left,open=true": { - "model": "basemetals:block/obsidian_door_top_left_open", + "model": "basemetals:block/gold_door_iron_door_top_left_open", "y": 90 }, "facing=east,half=upper,hinge=right,open=false": { - "model": "basemetals:block/obsidian_door_top_right" + "model": "basemetals:block/gold_door_iron_door_top_right" }, "facing=east,half=upper,hinge=right,open=true": { - "model": "basemetals:block/obsidian_door_top_right_open", + "model": "basemetals:block/gold_door_iron_door_top_right_open", "y": 270 }, "facing=north,half=lower,hinge=left,open=false": { - "model": "basemetals:block/obsidian_door_bottom_left", + "model": "basemetals:block/gold_door_iron_door_bottom_left", "y": 270 }, "facing=north,half=lower,hinge=left,open=true": { - "model": "basemetals:block/obsidian_door_bottom_left_open" + "model": "basemetals:block/gold_door_iron_door_bottom_left_open" }, "facing=north,half=lower,hinge=right,open=false": { - "model": "basemetals:block/obsidian_door_bottom_right", + "model": "basemetals:block/gold_door_iron_door_bottom_right", "y": 270 }, "facing=north,half=lower,hinge=right,open=true": { - "model": "basemetals:block/obsidian_door_bottom_right_open", + "model": "basemetals:block/gold_door_iron_door_bottom_right_open", "y": 180 }, "facing=north,half=upper,hinge=left,open=false": { - "model": "basemetals:block/obsidian_door_top_left", + "model": "basemetals:block/gold_door_iron_door_top_left", "y": 270 }, "facing=north,half=upper,hinge=left,open=true": { - "model": "basemetals:block/obsidian_door_top_left_open" + "model": "basemetals:block/gold_door_iron_door_top_left_open" }, "facing=north,half=upper,hinge=right,open=false": { - "model": "basemetals:block/obsidian_door_top_right", + "model": "basemetals:block/gold_door_iron_door_top_right", "y": 270 }, "facing=north,half=upper,hinge=right,open=true": { - "model": "basemetals:block/obsidian_door_top_right_open", + "model": "basemetals:block/gold_door_iron_door_top_right_open", "y": 180 }, "facing=south,half=lower,hinge=left,open=false": { - "model": "basemetals:block/obsidian_door_bottom_left", + "model": "basemetals:block/gold_door_iron_door_bottom_left", "y": 90 }, "facing=south,half=lower,hinge=left,open=true": { - "model": "basemetals:block/obsidian_door_bottom_left_open", + "model": "basemetals:block/gold_door_iron_door_bottom_left_open", "y": 180 }, "facing=south,half=lower,hinge=right,open=false": { - "model": "basemetals:block/obsidian_door_bottom_right", + "model": "basemetals:block/gold_door_iron_door_bottom_right", "y": 90 }, "facing=south,half=lower,hinge=right,open=true": { - "model": "basemetals:block/obsidian_door_bottom_right_open" + "model": "basemetals:block/gold_door_iron_door_bottom_right_open" }, "facing=south,half=upper,hinge=left,open=false": { - "model": "basemetals:block/obsidian_door_top_left", + "model": "basemetals:block/gold_door_iron_door_top_left", "y": 90 }, "facing=south,half=upper,hinge=left,open=true": { - "model": "basemetals:block/obsidian_door_top_left_open", + "model": "basemetals:block/gold_door_iron_door_top_left_open", "y": 180 }, "facing=south,half=upper,hinge=right,open=false": { - "model": "basemetals:block/obsidian_door_top_right", + "model": "basemetals:block/gold_door_iron_door_top_right", "y": 90 }, "facing=south,half=upper,hinge=right,open=true": { - "model": "basemetals:block/obsidian_door_top_right_open" + "model": "basemetals:block/gold_door_iron_door_top_right_open" }, "facing=west,half=lower,hinge=left,open=false": { - "model": "basemetals:block/obsidian_door_bottom_left", + "model": "basemetals:block/gold_door_iron_door_bottom_left", "y": 180 }, "facing=west,half=lower,hinge=left,open=true": { - "model": "basemetals:block/obsidian_door_bottom_left_open", + "model": "basemetals:block/gold_door_iron_door_bottom_left_open", "y": 270 }, "facing=west,half=lower,hinge=right,open=false": { - "model": "basemetals:block/obsidian_door_bottom_right", + "model": "basemetals:block/gold_door_iron_door_bottom_right", "y": 180 }, "facing=west,half=lower,hinge=right,open=true": { - "model": "basemetals:block/obsidian_door_bottom_right_open", + "model": "basemetals:block/gold_door_iron_door_bottom_right_open", "y": 90 }, "facing=west,half=upper,hinge=left,open=false": { - "model": "basemetals:block/obsidian_door_top_left", + "model": "basemetals:block/gold_door_iron_door_top_left", "y": 180 }, "facing=west,half=upper,hinge=left,open=true": { - "model": "basemetals:block/obsidian_door_top_left_open", + "model": "basemetals:block/gold_door_iron_door_top_left_open", "y": 270 }, "facing=west,half=upper,hinge=right,open=false": { - "model": "basemetals:block/obsidian_door_top_right", + "model": "basemetals:block/gold_door_iron_door_top_right", "y": 180 }, "facing=west,half=upper,hinge=right,open=true": { - "model": "basemetals:block/obsidian_door_top_right_open", + "model": "basemetals:block/gold_door_iron_door_top_right_open", "y": 90 } } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/basemetals/blockstates/gold_double_slab.json b/src/main/resources/assets/basemetals/blockstates/gold_double_slab.json new file mode 100644 index 000000000..34e581a6f --- /dev/null +++ b/src/main/resources/assets/basemetals/blockstates/gold_double_slab.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "basemetals:block/gold_double_slab" + } + } +} diff --git a/src/generated/resources/assets/basemetals/blockstates/quartz_button.json b/src/main/resources/assets/basemetals/blockstates/gold_lever.json similarity index 55% rename from src/generated/resources/assets/basemetals/blockstates/quartz_button.json rename to src/main/resources/assets/basemetals/blockstates/gold_lever.json index cb47520fe..07e7e5653 100644 --- a/src/generated/resources/assets/basemetals/blockstates/quartz_button.json +++ b/src/main/resources/assets/basemetals/blockstates/gold_lever.json @@ -1,118 +1,110 @@ { "variants": { "face=ceiling,facing=east,powered=false": { - "model": "basemetals:block/quartz_button", + "model": "basemetals:block/gold_lever_lever_on", "x": 180, "y": 270 }, "face=ceiling,facing=east,powered=true": { - "model": "basemetals:block/quartz_button_pressed", + "model": "basemetals:block/gold_lever_lever", "x": 180, "y": 270 }, "face=ceiling,facing=north,powered=false": { - "model": "basemetals:block/quartz_button", + "model": "basemetals:block/gold_lever_lever_on", "x": 180, "y": 180 }, "face=ceiling,facing=north,powered=true": { - "model": "basemetals:block/quartz_button_pressed", + "model": "basemetals:block/gold_lever_lever", "x": 180, "y": 180 }, "face=ceiling,facing=south,powered=false": { - "model": "basemetals:block/quartz_button", + "model": "basemetals:block/gold_lever_lever_on", "x": 180 }, "face=ceiling,facing=south,powered=true": { - "model": "basemetals:block/quartz_button_pressed", + "model": "basemetals:block/gold_lever_lever", "x": 180 }, "face=ceiling,facing=west,powered=false": { - "model": "basemetals:block/quartz_button", + "model": "basemetals:block/gold_lever_lever_on", "x": 180, "y": 90 }, "face=ceiling,facing=west,powered=true": { - "model": "basemetals:block/quartz_button_pressed", + "model": "basemetals:block/gold_lever_lever", "x": 180, "y": 90 }, "face=floor,facing=east,powered=false": { - "model": "basemetals:block/quartz_button", + "model": "basemetals:block/gold_lever_lever_on", "y": 90 }, "face=floor,facing=east,powered=true": { - "model": "basemetals:block/quartz_button_pressed", + "model": "basemetals:block/gold_lever_lever", "y": 90 }, "face=floor,facing=north,powered=false": { - "model": "basemetals:block/quartz_button" + "model": "basemetals:block/gold_lever_lever_on" }, "face=floor,facing=north,powered=true": { - "model": "basemetals:block/quartz_button_pressed" + "model": "basemetals:block/gold_lever_lever" }, "face=floor,facing=south,powered=false": { - "model": "basemetals:block/quartz_button", + "model": "basemetals:block/gold_lever_lever_on", "y": 180 }, "face=floor,facing=south,powered=true": { - "model": "basemetals:block/quartz_button_pressed", + "model": "basemetals:block/gold_lever_lever", "y": 180 }, "face=floor,facing=west,powered=false": { - "model": "basemetals:block/quartz_button", + "model": "basemetals:block/gold_lever_lever_on", "y": 270 }, "face=floor,facing=west,powered=true": { - "model": "basemetals:block/quartz_button_pressed", + "model": "basemetals:block/gold_lever_lever", "y": 270 }, "face=wall,facing=east,powered=false": { - "model": "basemetals:block/quartz_button", - "uvlock": true, + "model": "basemetals:block/gold_lever_lever_on", "x": 90, "y": 90 }, "face=wall,facing=east,powered=true": { - "model": "basemetals:block/quartz_button_pressed", - "uvlock": true, + "model": "basemetals:block/gold_lever_lever", "x": 90, "y": 90 }, "face=wall,facing=north,powered=false": { - "model": "basemetals:block/quartz_button", - "uvlock": true, + "model": "basemetals:block/gold_lever_lever_on", "x": 90 }, "face=wall,facing=north,powered=true": { - "model": "basemetals:block/quartz_button_pressed", - "uvlock": true, + "model": "basemetals:block/gold_lever_lever", "x": 90 }, "face=wall,facing=south,powered=false": { - "model": "basemetals:block/quartz_button", - "uvlock": true, + "model": "basemetals:block/gold_lever_lever_on", "x": 90, "y": 180 }, "face=wall,facing=south,powered=true": { - "model": "basemetals:block/quartz_button_pressed", - "uvlock": true, + "model": "basemetals:block/gold_lever_lever", "x": 90, "y": 180 }, "face=wall,facing=west,powered=false": { - "model": "basemetals:block/quartz_button", - "uvlock": true, + "model": "basemetals:block/gold_lever_lever_on", "x": 90, "y": 270 }, "face=wall,facing=west,powered=true": { - "model": "basemetals:block/quartz_button_pressed", - "uvlock": true, + "model": "basemetals:block/gold_lever_lever", "x": 90, "y": 270 } } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/basemetals/blockstates/gold_plate.json b/src/main/resources/assets/basemetals/blockstates/gold_plate.json new file mode 100644 index 000000000..b0e9e664b --- /dev/null +++ b/src/main/resources/assets/basemetals/blockstates/gold_plate.json @@ -0,0 +1,22 @@ +{ + "variants": { + "facing=down": { + "model": "basemetals:block/gold_plate_down" + }, + "facing=up": { + "model": "basemetals:block/gold_plate_up" + }, + "facing=north": { + "model": "basemetals:block/gold_plate_north" + }, + "facing=south": { + "model": "basemetals:block/gold_plate_south" + }, + "facing=west": { + "model": "basemetals:block/gold_plate_west" + }, + "facing=east": { + "model": "basemetals:block/gold_plate_east" + } + } +} diff --git a/src/main/resources/assets/basemetals/blockstates/gold_slab.json b/src/main/resources/assets/basemetals/blockstates/gold_slab.json new file mode 100644 index 000000000..c72719047 --- /dev/null +++ b/src/main/resources/assets/basemetals/blockstates/gold_slab.json @@ -0,0 +1,13 @@ +{ + "variants": { + "type=bottom": { + "model": "basemetals:block/gold_slab_quartz_slab" + }, + "type=double": { + "model": "basemetals:block/gold_slab_quartz_block" + }, + "type=top": { + "model": "basemetals:block/gold_slab_quartz_slab_top" + } + } +} diff --git a/src/generated/resources/assets/basemetals/blockstates/gold_stairs.json b/src/main/resources/assets/basemetals/blockstates/gold_stairs.json similarity index 59% rename from src/generated/resources/assets/basemetals/blockstates/gold_stairs.json rename to src/main/resources/assets/basemetals/blockstates/gold_stairs.json index 25c446c3b..890d7e54e 100644 --- a/src/generated/resources/assets/basemetals/blockstates/gold_stairs.json +++ b/src/main/resources/assets/basemetals/blockstates/gold_stairs.json @@ -1,209 +1,209 @@ { "variants": { "facing=east,half=bottom,shape=inner_left": { - "model": "basemetals:block/gold_inner_stairs", + "model": "basemetals:block/gold_stairs_quartz_stairs_inner", "uvlock": true, "y": 270 }, "facing=east,half=bottom,shape=inner_right": { - "model": "basemetals:block/gold_inner_stairs" + "model": "basemetals:block/gold_stairs_quartz_stairs_inner" }, "facing=east,half=bottom,shape=outer_left": { - "model": "basemetals:block/gold_outer_stairs", + "model": "basemetals:block/gold_stairs_quartz_stairs_outer", "uvlock": true, "y": 270 }, "facing=east,half=bottom,shape=outer_right": { - "model": "basemetals:block/gold_outer_stairs" + "model": "basemetals:block/gold_stairs_quartz_stairs_outer" }, "facing=east,half=bottom,shape=straight": { - "model": "basemetals:block/gold_stairs" + "model": "basemetals:block/gold_stairs_quartz_stairs" }, "facing=east,half=top,shape=inner_left": { - "model": "basemetals:block/gold_inner_stairs", + "model": "basemetals:block/gold_stairs_quartz_stairs_inner", "uvlock": true, "x": 180 }, "facing=east,half=top,shape=inner_right": { - "model": "basemetals:block/gold_inner_stairs", + "model": "basemetals:block/gold_stairs_quartz_stairs_inner", "uvlock": true, "x": 180, "y": 90 }, "facing=east,half=top,shape=outer_left": { - "model": "basemetals:block/gold_outer_stairs", + "model": "basemetals:block/gold_stairs_quartz_stairs_outer", "uvlock": true, "x": 180 }, "facing=east,half=top,shape=outer_right": { - "model": "basemetals:block/gold_outer_stairs", + "model": "basemetals:block/gold_stairs_quartz_stairs_outer", "uvlock": true, "x": 180, "y": 90 }, "facing=east,half=top,shape=straight": { - "model": "basemetals:block/gold_stairs", + "model": "basemetals:block/gold_stairs_quartz_stairs", "uvlock": true, "x": 180 }, "facing=north,half=bottom,shape=inner_left": { - "model": "basemetals:block/gold_inner_stairs", + "model": "basemetals:block/gold_stairs_quartz_stairs_inner", "uvlock": true, "y": 180 }, "facing=north,half=bottom,shape=inner_right": { - "model": "basemetals:block/gold_inner_stairs", + "model": "basemetals:block/gold_stairs_quartz_stairs_inner", "uvlock": true, "y": 270 }, "facing=north,half=bottom,shape=outer_left": { - "model": "basemetals:block/gold_outer_stairs", + "model": "basemetals:block/gold_stairs_quartz_stairs_outer", "uvlock": true, "y": 180 }, "facing=north,half=bottom,shape=outer_right": { - "model": "basemetals:block/gold_outer_stairs", + "model": "basemetals:block/gold_stairs_quartz_stairs_outer", "uvlock": true, "y": 270 }, "facing=north,half=bottom,shape=straight": { - "model": "basemetals:block/gold_stairs", + "model": "basemetals:block/gold_stairs_quartz_stairs", "uvlock": true, "y": 270 }, "facing=north,half=top,shape=inner_left": { - "model": "basemetals:block/gold_inner_stairs", + "model": "basemetals:block/gold_stairs_quartz_stairs_inner", "uvlock": true, "x": 180, "y": 270 }, "facing=north,half=top,shape=inner_right": { - "model": "basemetals:block/gold_inner_stairs", + "model": "basemetals:block/gold_stairs_quartz_stairs_inner", "uvlock": true, "x": 180 }, "facing=north,half=top,shape=outer_left": { - "model": "basemetals:block/gold_outer_stairs", + "model": "basemetals:block/gold_stairs_quartz_stairs_outer", "uvlock": true, "x": 180, "y": 270 }, "facing=north,half=top,shape=outer_right": { - "model": "basemetals:block/gold_outer_stairs", + "model": "basemetals:block/gold_stairs_quartz_stairs_outer", "uvlock": true, "x": 180 }, "facing=north,half=top,shape=straight": { - "model": "basemetals:block/gold_stairs", + "model": "basemetals:block/gold_stairs_quartz_stairs", "uvlock": true, "x": 180, "y": 270 }, "facing=south,half=bottom,shape=inner_left": { - "model": "basemetals:block/gold_inner_stairs" + "model": "basemetals:block/gold_stairs_quartz_stairs_inner" }, "facing=south,half=bottom,shape=inner_right": { - "model": "basemetals:block/gold_inner_stairs", + "model": "basemetals:block/gold_stairs_quartz_stairs_inner", "uvlock": true, "y": 90 }, "facing=south,half=bottom,shape=outer_left": { - "model": "basemetals:block/gold_outer_stairs" + "model": "basemetals:block/gold_stairs_quartz_stairs_outer" }, "facing=south,half=bottom,shape=outer_right": { - "model": "basemetals:block/gold_outer_stairs", + "model": "basemetals:block/gold_stairs_quartz_stairs_outer", "uvlock": true, "y": 90 }, "facing=south,half=bottom,shape=straight": { - "model": "basemetals:block/gold_stairs", + "model": "basemetals:block/gold_stairs_quartz_stairs", "uvlock": true, "y": 90 }, "facing=south,half=top,shape=inner_left": { - "model": "basemetals:block/gold_inner_stairs", + "model": "basemetals:block/gold_stairs_quartz_stairs_inner", "uvlock": true, "x": 180, "y": 90 }, "facing=south,half=top,shape=inner_right": { - "model": "basemetals:block/gold_inner_stairs", + "model": "basemetals:block/gold_stairs_quartz_stairs_inner", "uvlock": true, "x": 180, "y": 180 }, "facing=south,half=top,shape=outer_left": { - "model": "basemetals:block/gold_outer_stairs", + "model": "basemetals:block/gold_stairs_quartz_stairs_outer", "uvlock": true, "x": 180, "y": 90 }, "facing=south,half=top,shape=outer_right": { - "model": "basemetals:block/gold_outer_stairs", + "model": "basemetals:block/gold_stairs_quartz_stairs_outer", "uvlock": true, "x": 180, "y": 180 }, "facing=south,half=top,shape=straight": { - "model": "basemetals:block/gold_stairs", + "model": "basemetals:block/gold_stairs_quartz_stairs", "uvlock": true, "x": 180, "y": 90 }, "facing=west,half=bottom,shape=inner_left": { - "model": "basemetals:block/gold_inner_stairs", + "model": "basemetals:block/gold_stairs_quartz_stairs_inner", "uvlock": true, "y": 90 }, "facing=west,half=bottom,shape=inner_right": { - "model": "basemetals:block/gold_inner_stairs", + "model": "basemetals:block/gold_stairs_quartz_stairs_inner", "uvlock": true, "y": 180 }, "facing=west,half=bottom,shape=outer_left": { - "model": "basemetals:block/gold_outer_stairs", + "model": "basemetals:block/gold_stairs_quartz_stairs_outer", "uvlock": true, "y": 90 }, "facing=west,half=bottom,shape=outer_right": { - "model": "basemetals:block/gold_outer_stairs", + "model": "basemetals:block/gold_stairs_quartz_stairs_outer", "uvlock": true, "y": 180 }, "facing=west,half=bottom,shape=straight": { - "model": "basemetals:block/gold_stairs", + "model": "basemetals:block/gold_stairs_quartz_stairs", "uvlock": true, "y": 180 }, "facing=west,half=top,shape=inner_left": { - "model": "basemetals:block/gold_inner_stairs", + "model": "basemetals:block/gold_stairs_quartz_stairs_inner", "uvlock": true, "x": 180, "y": 180 }, "facing=west,half=top,shape=inner_right": { - "model": "basemetals:block/gold_inner_stairs", + "model": "basemetals:block/gold_stairs_quartz_stairs_inner", "uvlock": true, "x": 180, "y": 270 }, "facing=west,half=top,shape=outer_left": { - "model": "basemetals:block/gold_outer_stairs", + "model": "basemetals:block/gold_stairs_quartz_stairs_outer", "uvlock": true, "x": 180, "y": 180 }, "facing=west,half=top,shape=outer_right": { - "model": "basemetals:block/gold_outer_stairs", + "model": "basemetals:block/gold_stairs_quartz_stairs_outer", "uvlock": true, "x": 180, "y": 270 }, "facing=west,half=top,shape=straight": { - "model": "basemetals:block/gold_stairs", + "model": "basemetals:block/gold_stairs_quartz_stairs", "uvlock": true, "x": 180, "y": 180 } } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/basemetals/blockstates/gold_trapdoor.json b/src/main/resources/assets/basemetals/blockstates/gold_trapdoor.json new file mode 100644 index 000000000..cf5dbfe31 --- /dev/null +++ b/src/main/resources/assets/basemetals/blockstates/gold_trapdoor.json @@ -0,0 +1,58 @@ +{ + "variants": { + "facing=east,half=bottom,open=false": { + "model": "basemetals:block/gold_trapdoor_iron_trapdoor_bottom" + }, + "facing=east,half=bottom,open=true": { + "model": "basemetals:block/gold_trapdoor_iron_trapdoor_open", + "y": 90 + }, + "facing=east,half=top,open=false": { + "model": "basemetals:block/gold_trapdoor_iron_trapdoor_top" + }, + "facing=east,half=top,open=true": { + "model": "basemetals:block/gold_trapdoor_iron_trapdoor_open", + "y": 90 + }, + "facing=north,half=bottom,open=false": { + "model": "basemetals:block/gold_trapdoor_iron_trapdoor_bottom" + }, + "facing=north,half=bottom,open=true": { + "model": "basemetals:block/gold_trapdoor_iron_trapdoor_open" + }, + "facing=north,half=top,open=false": { + "model": "basemetals:block/gold_trapdoor_iron_trapdoor_top" + }, + "facing=north,half=top,open=true": { + "model": "basemetals:block/gold_trapdoor_iron_trapdoor_open" + }, + "facing=south,half=bottom,open=false": { + "model": "basemetals:block/gold_trapdoor_iron_trapdoor_bottom" + }, + "facing=south,half=bottom,open=true": { + "model": "basemetals:block/gold_trapdoor_iron_trapdoor_open", + "y": 180 + }, + "facing=south,half=top,open=false": { + "model": "basemetals:block/gold_trapdoor_iron_trapdoor_top" + }, + "facing=south,half=top,open=true": { + "model": "basemetals:block/gold_trapdoor_iron_trapdoor_open", + "y": 180 + }, + "facing=west,half=bottom,open=false": { + "model": "basemetals:block/gold_trapdoor_iron_trapdoor_bottom" + }, + "facing=west,half=bottom,open=true": { + "model": "basemetals:block/gold_trapdoor_iron_trapdoor_open", + "y": 270 + }, + "facing=west,half=top,open=false": { + "model": "basemetals:block/gold_trapdoor_iron_trapdoor_top" + }, + "facing=west,half=top,open=true": { + "model": "basemetals:block/gold_trapdoor_iron_trapdoor_open", + "y": 270 + } + } +} diff --git a/src/generated/resources/assets/basemetals/blockstates/gold_wall.json b/src/main/resources/assets/basemetals/blockstates/gold_wall.json similarity index 62% rename from src/generated/resources/assets/basemetals/blockstates/gold_wall.json rename to src/main/resources/assets/basemetals/blockstates/gold_wall.json index 7e0c4eeec..5af68d598 100644 --- a/src/generated/resources/assets/basemetals/blockstates/gold_wall.json +++ b/src/main/resources/assets/basemetals/blockstates/gold_wall.json @@ -2,7 +2,7 @@ "multipart": [ { "apply": { - "model": "basemetals:block/gold_wall_post" + "model": "basemetals:block/gold_wall_cobblestone_wall_post" }, "when": { "up": "true" @@ -10,75 +10,75 @@ }, { "apply": { - "model": "basemetals:block/gold_wall_side", - "uvlock": true, - "y": 90 + "model": "basemetals:block/gold_wall_cobblestone_wall_side", + "uvlock": true }, "when": { - "east": "low" + "north": "low" } }, { "apply": { - "model": "basemetals:block/gold_wall_side_tall", + "model": "basemetals:block/gold_wall_cobblestone_wall_side", "uvlock": true, "y": 90 }, "when": { - "east": "tall" + "east": "low" } }, { "apply": { - "model": "basemetals:block/gold_wall_side", - "uvlock": true + "model": "basemetals:block/gold_wall_cobblestone_wall_side", + "uvlock": true, + "y": 180 }, "when": { - "north": "low" + "south": "low" } }, { "apply": { - "model": "basemetals:block/gold_wall_side_tall", - "uvlock": true + "model": "basemetals:block/gold_wall_cobblestone_wall_side", + "uvlock": true, + "y": 270 }, "when": { - "north": "tall" + "west": "low" } }, { "apply": { - "model": "basemetals:block/gold_wall_side", - "uvlock": true, - "y": 180 + "model": "basemetals:block/gold_wall_cobblestone_wall_side_tall", + "uvlock": true }, "when": { - "south": "low" + "north": "tall" } }, { "apply": { - "model": "basemetals:block/gold_wall_side_tall", + "model": "basemetals:block/gold_wall_cobblestone_wall_side_tall", "uvlock": true, - "y": 180 + "y": 90 }, "when": { - "south": "tall" + "east": "tall" } }, { "apply": { - "model": "basemetals:block/gold_wall_side", + "model": "basemetals:block/gold_wall_cobblestone_wall_side_tall", "uvlock": true, - "y": 270 + "y": 180 }, "when": { - "west": "low" + "south": "tall" } }, { "apply": { - "model": "basemetals:block/gold_wall_side_tall", + "model": "basemetals:block/gold_wall_cobblestone_wall_side_tall", "uvlock": true, "y": 270 }, @@ -87,4 +87,4 @@ } } ] -} \ No newline at end of file +} diff --git a/src/main/resources/assets/basemetals/blockstates/iron_button.json b/src/main/resources/assets/basemetals/blockstates/iron_button.json new file mode 100644 index 000000000..f3c0770d6 --- /dev/null +++ b/src/main/resources/assets/basemetals/blockstates/iron_button.json @@ -0,0 +1,118 @@ +{ + "variants": { + "face=ceiling,facing=east,powered=false": { + "model": "basemetals:block/iron_button_polished_blackstone_button", + "x": 180, + "y": 270 + }, + "face=ceiling,facing=east,powered=true": { + "model": "basemetals:block/iron_button_polished_blackstone_button_pressed", + "x": 180, + "y": 270 + }, + "face=ceiling,facing=north,powered=false": { + "model": "basemetals:block/iron_button_polished_blackstone_button", + "x": 180, + "y": 180 + }, + "face=ceiling,facing=north,powered=true": { + "model": "basemetals:block/iron_button_polished_blackstone_button_pressed", + "x": 180, + "y": 180 + }, + "face=ceiling,facing=south,powered=false": { + "model": "basemetals:block/iron_button_polished_blackstone_button", + "x": 180 + }, + "face=ceiling,facing=south,powered=true": { + "model": "basemetals:block/iron_button_polished_blackstone_button_pressed", + "x": 180 + }, + "face=ceiling,facing=west,powered=false": { + "model": "basemetals:block/iron_button_polished_blackstone_button", + "x": 180, + "y": 90 + }, + "face=ceiling,facing=west,powered=true": { + "model": "basemetals:block/iron_button_polished_blackstone_button_pressed", + "x": 180, + "y": 90 + }, + "face=floor,facing=east,powered=false": { + "model": "basemetals:block/iron_button_polished_blackstone_button", + "y": 90 + }, + "face=floor,facing=east,powered=true": { + "model": "basemetals:block/iron_button_polished_blackstone_button_pressed", + "y": 90 + }, + "face=floor,facing=north,powered=false": { + "model": "basemetals:block/iron_button_polished_blackstone_button" + }, + "face=floor,facing=north,powered=true": { + "model": "basemetals:block/iron_button_polished_blackstone_button_pressed" + }, + "face=floor,facing=south,powered=false": { + "model": "basemetals:block/iron_button_polished_blackstone_button", + "y": 180 + }, + "face=floor,facing=south,powered=true": { + "model": "basemetals:block/iron_button_polished_blackstone_button_pressed", + "y": 180 + }, + "face=floor,facing=west,powered=false": { + "model": "basemetals:block/iron_button_polished_blackstone_button", + "y": 270 + }, + "face=floor,facing=west,powered=true": { + "model": "basemetals:block/iron_button_polished_blackstone_button_pressed", + "y": 270 + }, + "face=wall,facing=east,powered=false": { + "model": "basemetals:block/iron_button_polished_blackstone_button", + "uvlock": true, + "x": 90, + "y": 90 + }, + "face=wall,facing=east,powered=true": { + "model": "basemetals:block/iron_button_polished_blackstone_button_pressed", + "uvlock": true, + "x": 90, + "y": 90 + }, + "face=wall,facing=north,powered=false": { + "model": "basemetals:block/iron_button_polished_blackstone_button", + "uvlock": true, + "x": 90 + }, + "face=wall,facing=north,powered=true": { + "model": "basemetals:block/iron_button_polished_blackstone_button_pressed", + "uvlock": true, + "x": 90 + }, + "face=wall,facing=south,powered=false": { + "model": "basemetals:block/iron_button_polished_blackstone_button", + "uvlock": true, + "x": 90, + "y": 180 + }, + "face=wall,facing=south,powered=true": { + "model": "basemetals:block/iron_button_polished_blackstone_button_pressed", + "uvlock": true, + "x": 90, + "y": 180 + }, + "face=wall,facing=west,powered=false": { + "model": "basemetals:block/iron_button_polished_blackstone_button", + "uvlock": true, + "x": 90, + "y": 270 + }, + "face=wall,facing=west,powered=true": { + "model": "basemetals:block/iron_button_polished_blackstone_button_pressed", + "uvlock": true, + "x": 90, + "y": 270 + } + } +} diff --git a/src/main/resources/assets/basemetals/blockstates/iron_double_slab.json b/src/main/resources/assets/basemetals/blockstates/iron_double_slab.json new file mode 100644 index 000000000..2f43b8cb7 --- /dev/null +++ b/src/main/resources/assets/basemetals/blockstates/iron_double_slab.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "basemetals:block/iron_double_slab" + } + } +} diff --git a/src/generated/resources/assets/basemetals/blockstates/diamond_button.json b/src/main/resources/assets/basemetals/blockstates/iron_lever.json similarity index 55% rename from src/generated/resources/assets/basemetals/blockstates/diamond_button.json rename to src/main/resources/assets/basemetals/blockstates/iron_lever.json index cc5a9e402..161e746aa 100644 --- a/src/generated/resources/assets/basemetals/blockstates/diamond_button.json +++ b/src/main/resources/assets/basemetals/blockstates/iron_lever.json @@ -1,118 +1,110 @@ { "variants": { "face=ceiling,facing=east,powered=false": { - "model": "basemetals:block/diamond_button", + "model": "basemetals:block/iron_lever_lever_on", "x": 180, "y": 270 }, "face=ceiling,facing=east,powered=true": { - "model": "basemetals:block/diamond_button_pressed", + "model": "basemetals:block/iron_lever_lever", "x": 180, "y": 270 }, "face=ceiling,facing=north,powered=false": { - "model": "basemetals:block/diamond_button", + "model": "basemetals:block/iron_lever_lever_on", "x": 180, "y": 180 }, "face=ceiling,facing=north,powered=true": { - "model": "basemetals:block/diamond_button_pressed", + "model": "basemetals:block/iron_lever_lever", "x": 180, "y": 180 }, "face=ceiling,facing=south,powered=false": { - "model": "basemetals:block/diamond_button", + "model": "basemetals:block/iron_lever_lever_on", "x": 180 }, "face=ceiling,facing=south,powered=true": { - "model": "basemetals:block/diamond_button_pressed", + "model": "basemetals:block/iron_lever_lever", "x": 180 }, "face=ceiling,facing=west,powered=false": { - "model": "basemetals:block/diamond_button", + "model": "basemetals:block/iron_lever_lever_on", "x": 180, "y": 90 }, "face=ceiling,facing=west,powered=true": { - "model": "basemetals:block/diamond_button_pressed", + "model": "basemetals:block/iron_lever_lever", "x": 180, "y": 90 }, "face=floor,facing=east,powered=false": { - "model": "basemetals:block/diamond_button", + "model": "basemetals:block/iron_lever_lever_on", "y": 90 }, "face=floor,facing=east,powered=true": { - "model": "basemetals:block/diamond_button_pressed", + "model": "basemetals:block/iron_lever_lever", "y": 90 }, "face=floor,facing=north,powered=false": { - "model": "basemetals:block/diamond_button" + "model": "basemetals:block/iron_lever_lever_on" }, "face=floor,facing=north,powered=true": { - "model": "basemetals:block/diamond_button_pressed" + "model": "basemetals:block/iron_lever_lever" }, "face=floor,facing=south,powered=false": { - "model": "basemetals:block/diamond_button", + "model": "basemetals:block/iron_lever_lever_on", "y": 180 }, "face=floor,facing=south,powered=true": { - "model": "basemetals:block/diamond_button_pressed", + "model": "basemetals:block/iron_lever_lever", "y": 180 }, "face=floor,facing=west,powered=false": { - "model": "basemetals:block/diamond_button", + "model": "basemetals:block/iron_lever_lever_on", "y": 270 }, "face=floor,facing=west,powered=true": { - "model": "basemetals:block/diamond_button_pressed", + "model": "basemetals:block/iron_lever_lever", "y": 270 }, "face=wall,facing=east,powered=false": { - "model": "basemetals:block/diamond_button", - "uvlock": true, + "model": "basemetals:block/iron_lever_lever_on", "x": 90, "y": 90 }, "face=wall,facing=east,powered=true": { - "model": "basemetals:block/diamond_button_pressed", - "uvlock": true, + "model": "basemetals:block/iron_lever_lever", "x": 90, "y": 90 }, "face=wall,facing=north,powered=false": { - "model": "basemetals:block/diamond_button", - "uvlock": true, + "model": "basemetals:block/iron_lever_lever_on", "x": 90 }, "face=wall,facing=north,powered=true": { - "model": "basemetals:block/diamond_button_pressed", - "uvlock": true, + "model": "basemetals:block/iron_lever_lever", "x": 90 }, "face=wall,facing=south,powered=false": { - "model": "basemetals:block/diamond_button", - "uvlock": true, + "model": "basemetals:block/iron_lever_lever_on", "x": 90, "y": 180 }, "face=wall,facing=south,powered=true": { - "model": "basemetals:block/diamond_button_pressed", - "uvlock": true, + "model": "basemetals:block/iron_lever_lever", "x": 90, "y": 180 }, "face=wall,facing=west,powered=false": { - "model": "basemetals:block/diamond_button", - "uvlock": true, + "model": "basemetals:block/iron_lever_lever_on", "x": 90, "y": 270 }, "face=wall,facing=west,powered=true": { - "model": "basemetals:block/diamond_button_pressed", - "uvlock": true, + "model": "basemetals:block/iron_lever_lever", "x": 90, "y": 270 } } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/basemetals/blockstates/iron_plate.json b/src/main/resources/assets/basemetals/blockstates/iron_plate.json new file mode 100644 index 000000000..f07397b30 --- /dev/null +++ b/src/main/resources/assets/basemetals/blockstates/iron_plate.json @@ -0,0 +1,22 @@ +{ + "variants": { + "facing=down": { + "model": "basemetals:block/iron_plate_down" + }, + "facing=up": { + "model": "basemetals:block/iron_plate_up" + }, + "facing=north": { + "model": "basemetals:block/iron_plate_north" + }, + "facing=south": { + "model": "basemetals:block/iron_plate_south" + }, + "facing=west": { + "model": "basemetals:block/iron_plate_west" + }, + "facing=east": { + "model": "basemetals:block/iron_plate_east" + } + } +} diff --git a/src/main/resources/assets/basemetals/blockstates/iron_slab.json b/src/main/resources/assets/basemetals/blockstates/iron_slab.json new file mode 100644 index 000000000..a25312fa3 --- /dev/null +++ b/src/main/resources/assets/basemetals/blockstates/iron_slab.json @@ -0,0 +1,13 @@ +{ + "variants": { + "type=bottom": { + "model": "basemetals:block/iron_slab_quartz_slab" + }, + "type=double": { + "model": "basemetals:block/iron_slab_quartz_block" + }, + "type=top": { + "model": "basemetals:block/iron_slab_quartz_slab_top" + } + } +} diff --git a/src/generated/resources/assets/basemetals/blockstates/iron_stairs.json b/src/main/resources/assets/basemetals/blockstates/iron_stairs.json similarity index 59% rename from src/generated/resources/assets/basemetals/blockstates/iron_stairs.json rename to src/main/resources/assets/basemetals/blockstates/iron_stairs.json index 54b4bb76d..a2a6dbd0b 100644 --- a/src/generated/resources/assets/basemetals/blockstates/iron_stairs.json +++ b/src/main/resources/assets/basemetals/blockstates/iron_stairs.json @@ -1,209 +1,209 @@ { "variants": { "facing=east,half=bottom,shape=inner_left": { - "model": "basemetals:block/iron_inner_stairs", + "model": "basemetals:block/iron_stairs_quartz_stairs_inner", "uvlock": true, "y": 270 }, "facing=east,half=bottom,shape=inner_right": { - "model": "basemetals:block/iron_inner_stairs" + "model": "basemetals:block/iron_stairs_quartz_stairs_inner" }, "facing=east,half=bottom,shape=outer_left": { - "model": "basemetals:block/iron_outer_stairs", + "model": "basemetals:block/iron_stairs_quartz_stairs_outer", "uvlock": true, "y": 270 }, "facing=east,half=bottom,shape=outer_right": { - "model": "basemetals:block/iron_outer_stairs" + "model": "basemetals:block/iron_stairs_quartz_stairs_outer" }, "facing=east,half=bottom,shape=straight": { - "model": "basemetals:block/iron_stairs" + "model": "basemetals:block/iron_stairs_quartz_stairs" }, "facing=east,half=top,shape=inner_left": { - "model": "basemetals:block/iron_inner_stairs", + "model": "basemetals:block/iron_stairs_quartz_stairs_inner", "uvlock": true, "x": 180 }, "facing=east,half=top,shape=inner_right": { - "model": "basemetals:block/iron_inner_stairs", + "model": "basemetals:block/iron_stairs_quartz_stairs_inner", "uvlock": true, "x": 180, "y": 90 }, "facing=east,half=top,shape=outer_left": { - "model": "basemetals:block/iron_outer_stairs", + "model": "basemetals:block/iron_stairs_quartz_stairs_outer", "uvlock": true, "x": 180 }, "facing=east,half=top,shape=outer_right": { - "model": "basemetals:block/iron_outer_stairs", + "model": "basemetals:block/iron_stairs_quartz_stairs_outer", "uvlock": true, "x": 180, "y": 90 }, "facing=east,half=top,shape=straight": { - "model": "basemetals:block/iron_stairs", + "model": "basemetals:block/iron_stairs_quartz_stairs", "uvlock": true, "x": 180 }, "facing=north,half=bottom,shape=inner_left": { - "model": "basemetals:block/iron_inner_stairs", + "model": "basemetals:block/iron_stairs_quartz_stairs_inner", "uvlock": true, "y": 180 }, "facing=north,half=bottom,shape=inner_right": { - "model": "basemetals:block/iron_inner_stairs", + "model": "basemetals:block/iron_stairs_quartz_stairs_inner", "uvlock": true, "y": 270 }, "facing=north,half=bottom,shape=outer_left": { - "model": "basemetals:block/iron_outer_stairs", + "model": "basemetals:block/iron_stairs_quartz_stairs_outer", "uvlock": true, "y": 180 }, "facing=north,half=bottom,shape=outer_right": { - "model": "basemetals:block/iron_outer_stairs", + "model": "basemetals:block/iron_stairs_quartz_stairs_outer", "uvlock": true, "y": 270 }, "facing=north,half=bottom,shape=straight": { - "model": "basemetals:block/iron_stairs", + "model": "basemetals:block/iron_stairs_quartz_stairs", "uvlock": true, "y": 270 }, "facing=north,half=top,shape=inner_left": { - "model": "basemetals:block/iron_inner_stairs", + "model": "basemetals:block/iron_stairs_quartz_stairs_inner", "uvlock": true, "x": 180, "y": 270 }, "facing=north,half=top,shape=inner_right": { - "model": "basemetals:block/iron_inner_stairs", + "model": "basemetals:block/iron_stairs_quartz_stairs_inner", "uvlock": true, "x": 180 }, "facing=north,half=top,shape=outer_left": { - "model": "basemetals:block/iron_outer_stairs", + "model": "basemetals:block/iron_stairs_quartz_stairs_outer", "uvlock": true, "x": 180, "y": 270 }, "facing=north,half=top,shape=outer_right": { - "model": "basemetals:block/iron_outer_stairs", + "model": "basemetals:block/iron_stairs_quartz_stairs_outer", "uvlock": true, "x": 180 }, "facing=north,half=top,shape=straight": { - "model": "basemetals:block/iron_stairs", + "model": "basemetals:block/iron_stairs_quartz_stairs", "uvlock": true, "x": 180, "y": 270 }, "facing=south,half=bottom,shape=inner_left": { - "model": "basemetals:block/iron_inner_stairs" + "model": "basemetals:block/iron_stairs_quartz_stairs_inner" }, "facing=south,half=bottom,shape=inner_right": { - "model": "basemetals:block/iron_inner_stairs", + "model": "basemetals:block/iron_stairs_quartz_stairs_inner", "uvlock": true, "y": 90 }, "facing=south,half=bottom,shape=outer_left": { - "model": "basemetals:block/iron_outer_stairs" + "model": "basemetals:block/iron_stairs_quartz_stairs_outer" }, "facing=south,half=bottom,shape=outer_right": { - "model": "basemetals:block/iron_outer_stairs", + "model": "basemetals:block/iron_stairs_quartz_stairs_outer", "uvlock": true, "y": 90 }, "facing=south,half=bottom,shape=straight": { - "model": "basemetals:block/iron_stairs", + "model": "basemetals:block/iron_stairs_quartz_stairs", "uvlock": true, "y": 90 }, "facing=south,half=top,shape=inner_left": { - "model": "basemetals:block/iron_inner_stairs", + "model": "basemetals:block/iron_stairs_quartz_stairs_inner", "uvlock": true, "x": 180, "y": 90 }, "facing=south,half=top,shape=inner_right": { - "model": "basemetals:block/iron_inner_stairs", + "model": "basemetals:block/iron_stairs_quartz_stairs_inner", "uvlock": true, "x": 180, "y": 180 }, "facing=south,half=top,shape=outer_left": { - "model": "basemetals:block/iron_outer_stairs", + "model": "basemetals:block/iron_stairs_quartz_stairs_outer", "uvlock": true, "x": 180, "y": 90 }, "facing=south,half=top,shape=outer_right": { - "model": "basemetals:block/iron_outer_stairs", + "model": "basemetals:block/iron_stairs_quartz_stairs_outer", "uvlock": true, "x": 180, "y": 180 }, "facing=south,half=top,shape=straight": { - "model": "basemetals:block/iron_stairs", + "model": "basemetals:block/iron_stairs_quartz_stairs", "uvlock": true, "x": 180, "y": 90 }, "facing=west,half=bottom,shape=inner_left": { - "model": "basemetals:block/iron_inner_stairs", + "model": "basemetals:block/iron_stairs_quartz_stairs_inner", "uvlock": true, "y": 90 }, "facing=west,half=bottom,shape=inner_right": { - "model": "basemetals:block/iron_inner_stairs", + "model": "basemetals:block/iron_stairs_quartz_stairs_inner", "uvlock": true, "y": 180 }, "facing=west,half=bottom,shape=outer_left": { - "model": "basemetals:block/iron_outer_stairs", + "model": "basemetals:block/iron_stairs_quartz_stairs_outer", "uvlock": true, "y": 90 }, "facing=west,half=bottom,shape=outer_right": { - "model": "basemetals:block/iron_outer_stairs", + "model": "basemetals:block/iron_stairs_quartz_stairs_outer", "uvlock": true, "y": 180 }, "facing=west,half=bottom,shape=straight": { - "model": "basemetals:block/iron_stairs", + "model": "basemetals:block/iron_stairs_quartz_stairs", "uvlock": true, "y": 180 }, "facing=west,half=top,shape=inner_left": { - "model": "basemetals:block/iron_inner_stairs", + "model": "basemetals:block/iron_stairs_quartz_stairs_inner", "uvlock": true, "x": 180, "y": 180 }, "facing=west,half=top,shape=inner_right": { - "model": "basemetals:block/iron_inner_stairs", + "model": "basemetals:block/iron_stairs_quartz_stairs_inner", "uvlock": true, "x": 180, "y": 270 }, "facing=west,half=top,shape=outer_left": { - "model": "basemetals:block/iron_outer_stairs", + "model": "basemetals:block/iron_stairs_quartz_stairs_outer", "uvlock": true, "x": 180, "y": 180 }, "facing=west,half=top,shape=outer_right": { - "model": "basemetals:block/iron_outer_stairs", + "model": "basemetals:block/iron_stairs_quartz_stairs_outer", "uvlock": true, "x": 180, "y": 270 }, "facing=west,half=top,shape=straight": { - "model": "basemetals:block/iron_stairs", + "model": "basemetals:block/iron_stairs_quartz_stairs", "uvlock": true, "x": 180, "y": 180 } } -} \ No newline at end of file +} diff --git a/src/generated/resources/assets/basemetals/blockstates/iron_wall.json b/src/main/resources/assets/basemetals/blockstates/iron_wall.json similarity index 62% rename from src/generated/resources/assets/basemetals/blockstates/iron_wall.json rename to src/main/resources/assets/basemetals/blockstates/iron_wall.json index c4a314f50..72c389aae 100644 --- a/src/generated/resources/assets/basemetals/blockstates/iron_wall.json +++ b/src/main/resources/assets/basemetals/blockstates/iron_wall.json @@ -2,7 +2,7 @@ "multipart": [ { "apply": { - "model": "basemetals:block/iron_wall_post" + "model": "basemetals:block/iron_wall_cobblestone_wall_post" }, "when": { "up": "true" @@ -10,75 +10,75 @@ }, { "apply": { - "model": "basemetals:block/iron_wall_side", - "uvlock": true, - "y": 90 + "model": "basemetals:block/iron_wall_cobblestone_wall_side", + "uvlock": true }, "when": { - "east": "low" + "north": "low" } }, { "apply": { - "model": "basemetals:block/iron_wall_side_tall", + "model": "basemetals:block/iron_wall_cobblestone_wall_side", "uvlock": true, "y": 90 }, "when": { - "east": "tall" + "east": "low" } }, { "apply": { - "model": "basemetals:block/iron_wall_side", - "uvlock": true + "model": "basemetals:block/iron_wall_cobblestone_wall_side", + "uvlock": true, + "y": 180 }, "when": { - "north": "low" + "south": "low" } }, { "apply": { - "model": "basemetals:block/iron_wall_side_tall", - "uvlock": true + "model": "basemetals:block/iron_wall_cobblestone_wall_side", + "uvlock": true, + "y": 270 }, "when": { - "north": "tall" + "west": "low" } }, { "apply": { - "model": "basemetals:block/iron_wall_side", - "uvlock": true, - "y": 180 + "model": "basemetals:block/iron_wall_cobblestone_wall_side_tall", + "uvlock": true }, "when": { - "south": "low" + "north": "tall" } }, { "apply": { - "model": "basemetals:block/iron_wall_side_tall", + "model": "basemetals:block/iron_wall_cobblestone_wall_side_tall", "uvlock": true, - "y": 180 + "y": 90 }, "when": { - "south": "tall" + "east": "tall" } }, { "apply": { - "model": "basemetals:block/iron_wall_side", + "model": "basemetals:block/iron_wall_cobblestone_wall_side_tall", "uvlock": true, - "y": 270 + "y": 180 }, "when": { - "west": "low" + "south": "tall" } }, { "apply": { - "model": "basemetals:block/iron_wall_side_tall", + "model": "basemetals:block/iron_wall_cobblestone_wall_side_tall", "uvlock": true, "y": 270 }, @@ -87,4 +87,4 @@ } } ] -} \ No newline at end of file +} diff --git a/src/generated/resources/assets/basemetals/blockstates/obsidian_bars.json b/src/main/resources/assets/basemetals/blockstates/obsidian_bars.json similarity index 65% rename from src/generated/resources/assets/basemetals/blockstates/obsidian_bars.json rename to src/main/resources/assets/basemetals/blockstates/obsidian_bars.json index 11024a487..f7e7637c1 100644 --- a/src/generated/resources/assets/basemetals/blockstates/obsidian_bars.json +++ b/src/main/resources/assets/basemetals/blockstates/obsidian_bars.json @@ -2,12 +2,12 @@ "multipart": [ { "apply": { - "model": "basemetals:block/obsidian_bars_post_ends" + "model": "basemetals:block/obsidian_bars_iron_bars_post_ends" } }, { "apply": { - "model": "basemetals:block/obsidian_bars_post" + "model": "basemetals:block/obsidian_bars_iron_bars_post" }, "when": { "east": "false", @@ -18,7 +18,7 @@ }, { "apply": { - "model": "basemetals:block/obsidian_bars_cap" + "model": "basemetals:block/obsidian_bars_iron_bars_cap" }, "when": { "east": "false", @@ -29,67 +29,67 @@ }, { "apply": { - "model": "basemetals:block/obsidian_bars_side" + "model": "basemetals:block/obsidian_bars_iron_bars_cap", + "y": 90 }, "when": { - "north": "true" + "east": "true", + "north": "false", + "south": "false", + "west": "false" } }, { "apply": { - "model": "basemetals:block/obsidian_bars_cap", - "y": 90 + "model": "basemetals:block/obsidian_bars_iron_bars_cap_alt" }, "when": { - "east": "true", + "east": "false", "north": "false", - "south": "false", + "south": "true", "west": "false" } }, { "apply": { - "model": "basemetals:block/obsidian_bars_side", + "model": "basemetals:block/obsidian_bars_iron_bars_cap_alt", "y": 90 }, "when": { - "east": "true" + "east": "false", + "north": "false", + "south": "false", + "west": "true" } }, { "apply": { - "model": "basemetals:block/obsidian_bars_cap_alt" + "model": "basemetals:block/obsidian_bars_iron_bars_side" }, "when": { - "east": "false", - "north": "false", - "south": "true", - "west": "false" + "north": "true" } }, { "apply": { - "model": "basemetals:block/obsidian_bars_side_alt" + "model": "basemetals:block/obsidian_bars_iron_bars_side", + "y": 90 }, "when": { - "south": "true" + "east": "true" } }, { "apply": { - "model": "basemetals:block/obsidian_bars_cap_alt", - "y": 90 + "model": "basemetals:block/obsidian_bars_iron_bars_side_alt" }, "when": { - "east": "false", - "north": "false", - "south": "false", - "west": "true" + "south": "true" } }, { "apply": { - "model": "basemetals:block/obsidian_bars_side_alt", + "model": "basemetals:block/obsidian_bars_iron_bars_side_alt", "y": 90 }, "when": { @@ -97,4 +97,4 @@ } } ] -} \ No newline at end of file +} diff --git a/src/generated/resources/assets/basemetals/blockstates/obsidian_button.json b/src/main/resources/assets/basemetals/blockstates/obsidian_button.json similarity index 50% rename from src/generated/resources/assets/basemetals/blockstates/obsidian_button.json rename to src/main/resources/assets/basemetals/blockstates/obsidian_button.json index 2f4432c95..e28d4aae7 100644 --- a/src/generated/resources/assets/basemetals/blockstates/obsidian_button.json +++ b/src/main/resources/assets/basemetals/blockstates/obsidian_button.json @@ -1,118 +1,118 @@ { "variants": { "face=ceiling,facing=east,powered=false": { - "model": "basemetals:block/obsidian_button", + "model": "basemetals:block/obsidian_button_polished_blackstone_button", "x": 180, "y": 270 }, "face=ceiling,facing=east,powered=true": { - "model": "basemetals:block/obsidian_button_pressed", + "model": "basemetals:block/obsidian_button_polished_blackstone_button_pressed", "x": 180, "y": 270 }, "face=ceiling,facing=north,powered=false": { - "model": "basemetals:block/obsidian_button", + "model": "basemetals:block/obsidian_button_polished_blackstone_button", "x": 180, "y": 180 }, "face=ceiling,facing=north,powered=true": { - "model": "basemetals:block/obsidian_button_pressed", + "model": "basemetals:block/obsidian_button_polished_blackstone_button_pressed", "x": 180, "y": 180 }, "face=ceiling,facing=south,powered=false": { - "model": "basemetals:block/obsidian_button", + "model": "basemetals:block/obsidian_button_polished_blackstone_button", "x": 180 }, "face=ceiling,facing=south,powered=true": { - "model": "basemetals:block/obsidian_button_pressed", + "model": "basemetals:block/obsidian_button_polished_blackstone_button_pressed", "x": 180 }, "face=ceiling,facing=west,powered=false": { - "model": "basemetals:block/obsidian_button", + "model": "basemetals:block/obsidian_button_polished_blackstone_button", "x": 180, "y": 90 }, "face=ceiling,facing=west,powered=true": { - "model": "basemetals:block/obsidian_button_pressed", + "model": "basemetals:block/obsidian_button_polished_blackstone_button_pressed", "x": 180, "y": 90 }, "face=floor,facing=east,powered=false": { - "model": "basemetals:block/obsidian_button", + "model": "basemetals:block/obsidian_button_polished_blackstone_button", "y": 90 }, "face=floor,facing=east,powered=true": { - "model": "basemetals:block/obsidian_button_pressed", + "model": "basemetals:block/obsidian_button_polished_blackstone_button_pressed", "y": 90 }, "face=floor,facing=north,powered=false": { - "model": "basemetals:block/obsidian_button" + "model": "basemetals:block/obsidian_button_polished_blackstone_button" }, "face=floor,facing=north,powered=true": { - "model": "basemetals:block/obsidian_button_pressed" + "model": "basemetals:block/obsidian_button_polished_blackstone_button_pressed" }, "face=floor,facing=south,powered=false": { - "model": "basemetals:block/obsidian_button", + "model": "basemetals:block/obsidian_button_polished_blackstone_button", "y": 180 }, "face=floor,facing=south,powered=true": { - "model": "basemetals:block/obsidian_button_pressed", + "model": "basemetals:block/obsidian_button_polished_blackstone_button_pressed", "y": 180 }, "face=floor,facing=west,powered=false": { - "model": "basemetals:block/obsidian_button", + "model": "basemetals:block/obsidian_button_polished_blackstone_button", "y": 270 }, "face=floor,facing=west,powered=true": { - "model": "basemetals:block/obsidian_button_pressed", + "model": "basemetals:block/obsidian_button_polished_blackstone_button_pressed", "y": 270 }, "face=wall,facing=east,powered=false": { - "model": "basemetals:block/obsidian_button", + "model": "basemetals:block/obsidian_button_polished_blackstone_button", "uvlock": true, "x": 90, "y": 90 }, "face=wall,facing=east,powered=true": { - "model": "basemetals:block/obsidian_button_pressed", + "model": "basemetals:block/obsidian_button_polished_blackstone_button_pressed", "uvlock": true, "x": 90, "y": 90 }, "face=wall,facing=north,powered=false": { - "model": "basemetals:block/obsidian_button", + "model": "basemetals:block/obsidian_button_polished_blackstone_button", "uvlock": true, "x": 90 }, "face=wall,facing=north,powered=true": { - "model": "basemetals:block/obsidian_button_pressed", + "model": "basemetals:block/obsidian_button_polished_blackstone_button_pressed", "uvlock": true, "x": 90 }, "face=wall,facing=south,powered=false": { - "model": "basemetals:block/obsidian_button", + "model": "basemetals:block/obsidian_button_polished_blackstone_button", "uvlock": true, "x": 90, "y": 180 }, "face=wall,facing=south,powered=true": { - "model": "basemetals:block/obsidian_button_pressed", + "model": "basemetals:block/obsidian_button_polished_blackstone_button_pressed", "uvlock": true, "x": 90, "y": 180 }, "face=wall,facing=west,powered=false": { - "model": "basemetals:block/obsidian_button", + "model": "basemetals:block/obsidian_button_polished_blackstone_button", "uvlock": true, "x": 90, "y": 270 }, "face=wall,facing=west,powered=true": { - "model": "basemetals:block/obsidian_button_pressed", + "model": "basemetals:block/obsidian_button_polished_blackstone_button_pressed", "uvlock": true, "x": 90, "y": 270 } } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/basemetals/blockstates/obsidian_door.json b/src/main/resources/assets/basemetals/blockstates/obsidian_door.json new file mode 100644 index 000000000..53f4952d9 --- /dev/null +++ b/src/main/resources/assets/basemetals/blockstates/obsidian_door.json @@ -0,0 +1,124 @@ +{ + "variants": { + "facing=east,half=lower,hinge=left,open=false": { + "model": "basemetals:block/obsidian_door_iron_door_bottom_left" + }, + "facing=east,half=lower,hinge=left,open=true": { + "model": "basemetals:block/obsidian_door_iron_door_bottom_left_open", + "y": 90 + }, + "facing=east,half=lower,hinge=right,open=false": { + "model": "basemetals:block/obsidian_door_iron_door_bottom_right" + }, + "facing=east,half=lower,hinge=right,open=true": { + "model": "basemetals:block/obsidian_door_iron_door_bottom_right_open", + "y": 270 + }, + "facing=east,half=upper,hinge=left,open=false": { + "model": "basemetals:block/obsidian_door_iron_door_top_left" + }, + "facing=east,half=upper,hinge=left,open=true": { + "model": "basemetals:block/obsidian_door_iron_door_top_left_open", + "y": 90 + }, + "facing=east,half=upper,hinge=right,open=false": { + "model": "basemetals:block/obsidian_door_iron_door_top_right" + }, + "facing=east,half=upper,hinge=right,open=true": { + "model": "basemetals:block/obsidian_door_iron_door_top_right_open", + "y": 270 + }, + "facing=north,half=lower,hinge=left,open=false": { + "model": "basemetals:block/obsidian_door_iron_door_bottom_left", + "y": 270 + }, + "facing=north,half=lower,hinge=left,open=true": { + "model": "basemetals:block/obsidian_door_iron_door_bottom_left_open" + }, + "facing=north,half=lower,hinge=right,open=false": { + "model": "basemetals:block/obsidian_door_iron_door_bottom_right", + "y": 270 + }, + "facing=north,half=lower,hinge=right,open=true": { + "model": "basemetals:block/obsidian_door_iron_door_bottom_right_open", + "y": 180 + }, + "facing=north,half=upper,hinge=left,open=false": { + "model": "basemetals:block/obsidian_door_iron_door_top_left", + "y": 270 + }, + "facing=north,half=upper,hinge=left,open=true": { + "model": "basemetals:block/obsidian_door_iron_door_top_left_open" + }, + "facing=north,half=upper,hinge=right,open=false": { + "model": "basemetals:block/obsidian_door_iron_door_top_right", + "y": 270 + }, + "facing=north,half=upper,hinge=right,open=true": { + "model": "basemetals:block/obsidian_door_iron_door_top_right_open", + "y": 180 + }, + "facing=south,half=lower,hinge=left,open=false": { + "model": "basemetals:block/obsidian_door_iron_door_bottom_left", + "y": 90 + }, + "facing=south,half=lower,hinge=left,open=true": { + "model": "basemetals:block/obsidian_door_iron_door_bottom_left_open", + "y": 180 + }, + "facing=south,half=lower,hinge=right,open=false": { + "model": "basemetals:block/obsidian_door_iron_door_bottom_right", + "y": 90 + }, + "facing=south,half=lower,hinge=right,open=true": { + "model": "basemetals:block/obsidian_door_iron_door_bottom_right_open" + }, + "facing=south,half=upper,hinge=left,open=false": { + "model": "basemetals:block/obsidian_door_iron_door_top_left", + "y": 90 + }, + "facing=south,half=upper,hinge=left,open=true": { + "model": "basemetals:block/obsidian_door_iron_door_top_left_open", + "y": 180 + }, + "facing=south,half=upper,hinge=right,open=false": { + "model": "basemetals:block/obsidian_door_iron_door_top_right", + "y": 90 + }, + "facing=south,half=upper,hinge=right,open=true": { + "model": "basemetals:block/obsidian_door_iron_door_top_right_open" + }, + "facing=west,half=lower,hinge=left,open=false": { + "model": "basemetals:block/obsidian_door_iron_door_bottom_left", + "y": 180 + }, + "facing=west,half=lower,hinge=left,open=true": { + "model": "basemetals:block/obsidian_door_iron_door_bottom_left_open", + "y": 270 + }, + "facing=west,half=lower,hinge=right,open=false": { + "model": "basemetals:block/obsidian_door_iron_door_bottom_right", + "y": 180 + }, + "facing=west,half=lower,hinge=right,open=true": { + "model": "basemetals:block/obsidian_door_iron_door_bottom_right_open", + "y": 90 + }, + "facing=west,half=upper,hinge=left,open=false": { + "model": "basemetals:block/obsidian_door_iron_door_top_left", + "y": 180 + }, + "facing=west,half=upper,hinge=left,open=true": { + "model": "basemetals:block/obsidian_door_iron_door_top_left_open", + "y": 270 + }, + "facing=west,half=upper,hinge=right,open=false": { + "model": "basemetals:block/obsidian_door_iron_door_top_right", + "y": 180 + }, + "facing=west,half=upper,hinge=right,open=true": { + "model": "basemetals:block/obsidian_door_iron_door_top_right_open", + "y": 90 + } + } +} diff --git a/src/main/resources/assets/basemetals/blockstates/obsidian_double_slab.json b/src/main/resources/assets/basemetals/blockstates/obsidian_double_slab.json new file mode 100644 index 000000000..fda0a287d --- /dev/null +++ b/src/main/resources/assets/basemetals/blockstates/obsidian_double_slab.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "basemetals:block/obsidian_double_slab" + } + } +} diff --git a/src/main/resources/assets/basemetals/blockstates/obsidian_lever.json b/src/main/resources/assets/basemetals/blockstates/obsidian_lever.json new file mode 100644 index 000000000..2965cffbc --- /dev/null +++ b/src/main/resources/assets/basemetals/blockstates/obsidian_lever.json @@ -0,0 +1,110 @@ +{ + "variants": { + "face=ceiling,facing=east,powered=false": { + "model": "basemetals:block/obsidian_lever_lever_on", + "x": 180, + "y": 270 + }, + "face=ceiling,facing=east,powered=true": { + "model": "basemetals:block/obsidian_lever_lever", + "x": 180, + "y": 270 + }, + "face=ceiling,facing=north,powered=false": { + "model": "basemetals:block/obsidian_lever_lever_on", + "x": 180, + "y": 180 + }, + "face=ceiling,facing=north,powered=true": { + "model": "basemetals:block/obsidian_lever_lever", + "x": 180, + "y": 180 + }, + "face=ceiling,facing=south,powered=false": { + "model": "basemetals:block/obsidian_lever_lever_on", + "x": 180 + }, + "face=ceiling,facing=south,powered=true": { + "model": "basemetals:block/obsidian_lever_lever", + "x": 180 + }, + "face=ceiling,facing=west,powered=false": { + "model": "basemetals:block/obsidian_lever_lever_on", + "x": 180, + "y": 90 + }, + "face=ceiling,facing=west,powered=true": { + "model": "basemetals:block/obsidian_lever_lever", + "x": 180, + "y": 90 + }, + "face=floor,facing=east,powered=false": { + "model": "basemetals:block/obsidian_lever_lever_on", + "y": 90 + }, + "face=floor,facing=east,powered=true": { + "model": "basemetals:block/obsidian_lever_lever", + "y": 90 + }, + "face=floor,facing=north,powered=false": { + "model": "basemetals:block/obsidian_lever_lever_on" + }, + "face=floor,facing=north,powered=true": { + "model": "basemetals:block/obsidian_lever_lever" + }, + "face=floor,facing=south,powered=false": { + "model": "basemetals:block/obsidian_lever_lever_on", + "y": 180 + }, + "face=floor,facing=south,powered=true": { + "model": "basemetals:block/obsidian_lever_lever", + "y": 180 + }, + "face=floor,facing=west,powered=false": { + "model": "basemetals:block/obsidian_lever_lever_on", + "y": 270 + }, + "face=floor,facing=west,powered=true": { + "model": "basemetals:block/obsidian_lever_lever", + "y": 270 + }, + "face=wall,facing=east,powered=false": { + "model": "basemetals:block/obsidian_lever_lever_on", + "x": 90, + "y": 90 + }, + "face=wall,facing=east,powered=true": { + "model": "basemetals:block/obsidian_lever_lever", + "x": 90, + "y": 90 + }, + "face=wall,facing=north,powered=false": { + "model": "basemetals:block/obsidian_lever_lever_on", + "x": 90 + }, + "face=wall,facing=north,powered=true": { + "model": "basemetals:block/obsidian_lever_lever", + "x": 90 + }, + "face=wall,facing=south,powered=false": { + "model": "basemetals:block/obsidian_lever_lever_on", + "x": 90, + "y": 180 + }, + "face=wall,facing=south,powered=true": { + "model": "basemetals:block/obsidian_lever_lever", + "x": 90, + "y": 180 + }, + "face=wall,facing=west,powered=false": { + "model": "basemetals:block/obsidian_lever_lever_on", + "x": 90, + "y": 270 + }, + "face=wall,facing=west,powered=true": { + "model": "basemetals:block/obsidian_lever_lever", + "x": 90, + "y": 270 + } + } +} diff --git a/src/main/resources/assets/basemetals/blockstates/obsidian_pressure_plate.json b/src/main/resources/assets/basemetals/blockstates/obsidian_pressure_plate.json new file mode 100644 index 000000000..01ee5dacb --- /dev/null +++ b/src/main/resources/assets/basemetals/blockstates/obsidian_pressure_plate.json @@ -0,0 +1,10 @@ +{ + "variants": { + "powered=false": { + "model": "basemetals:block/obsidian_pressure_plate_polished_blackstone_pressure_plate" + }, + "powered=true": { + "model": "basemetals:block/obsidian_pressure_plate_polished_blackstone_pressure_plate_down" + } + } +} diff --git a/src/main/resources/assets/basemetals/blockstates/obsidian_slab.json b/src/main/resources/assets/basemetals/blockstates/obsidian_slab.json new file mode 100644 index 000000000..32c6ac8fb --- /dev/null +++ b/src/main/resources/assets/basemetals/blockstates/obsidian_slab.json @@ -0,0 +1,13 @@ +{ + "variants": { + "type=bottom": { + "model": "basemetals:block/obsidian_slab_quartz_slab" + }, + "type=double": { + "model": "basemetals:block/obsidian_slab_quartz_block" + }, + "type=top": { + "model": "basemetals:block/obsidian_slab_quartz_slab_top" + } + } +} diff --git a/src/generated/resources/assets/basemetals/blockstates/obsidian_stairs.json b/src/main/resources/assets/basemetals/blockstates/obsidian_stairs.json similarity index 57% rename from src/generated/resources/assets/basemetals/blockstates/obsidian_stairs.json rename to src/main/resources/assets/basemetals/blockstates/obsidian_stairs.json index 2b933048b..207656361 100644 --- a/src/generated/resources/assets/basemetals/blockstates/obsidian_stairs.json +++ b/src/main/resources/assets/basemetals/blockstates/obsidian_stairs.json @@ -1,209 +1,209 @@ { "variants": { "facing=east,half=bottom,shape=inner_left": { - "model": "basemetals:block/obsidian_inner_stairs", + "model": "basemetals:block/obsidian_stairs_quartz_stairs_inner", "uvlock": true, "y": 270 }, "facing=east,half=bottom,shape=inner_right": { - "model": "basemetals:block/obsidian_inner_stairs" + "model": "basemetals:block/obsidian_stairs_quartz_stairs_inner" }, "facing=east,half=bottom,shape=outer_left": { - "model": "basemetals:block/obsidian_outer_stairs", + "model": "basemetals:block/obsidian_stairs_quartz_stairs_outer", "uvlock": true, "y": 270 }, "facing=east,half=bottom,shape=outer_right": { - "model": "basemetals:block/obsidian_outer_stairs" + "model": "basemetals:block/obsidian_stairs_quartz_stairs_outer" }, "facing=east,half=bottom,shape=straight": { - "model": "basemetals:block/obsidian_stairs" + "model": "basemetals:block/obsidian_stairs_quartz_stairs" }, "facing=east,half=top,shape=inner_left": { - "model": "basemetals:block/obsidian_inner_stairs", + "model": "basemetals:block/obsidian_stairs_quartz_stairs_inner", "uvlock": true, "x": 180 }, "facing=east,half=top,shape=inner_right": { - "model": "basemetals:block/obsidian_inner_stairs", + "model": "basemetals:block/obsidian_stairs_quartz_stairs_inner", "uvlock": true, "x": 180, "y": 90 }, "facing=east,half=top,shape=outer_left": { - "model": "basemetals:block/obsidian_outer_stairs", + "model": "basemetals:block/obsidian_stairs_quartz_stairs_outer", "uvlock": true, "x": 180 }, "facing=east,half=top,shape=outer_right": { - "model": "basemetals:block/obsidian_outer_stairs", + "model": "basemetals:block/obsidian_stairs_quartz_stairs_outer", "uvlock": true, "x": 180, "y": 90 }, "facing=east,half=top,shape=straight": { - "model": "basemetals:block/obsidian_stairs", + "model": "basemetals:block/obsidian_stairs_quartz_stairs", "uvlock": true, "x": 180 }, "facing=north,half=bottom,shape=inner_left": { - "model": "basemetals:block/obsidian_inner_stairs", + "model": "basemetals:block/obsidian_stairs_quartz_stairs_inner", "uvlock": true, "y": 180 }, "facing=north,half=bottom,shape=inner_right": { - "model": "basemetals:block/obsidian_inner_stairs", + "model": "basemetals:block/obsidian_stairs_quartz_stairs_inner", "uvlock": true, "y": 270 }, "facing=north,half=bottom,shape=outer_left": { - "model": "basemetals:block/obsidian_outer_stairs", + "model": "basemetals:block/obsidian_stairs_quartz_stairs_outer", "uvlock": true, "y": 180 }, "facing=north,half=bottom,shape=outer_right": { - "model": "basemetals:block/obsidian_outer_stairs", + "model": "basemetals:block/obsidian_stairs_quartz_stairs_outer", "uvlock": true, "y": 270 }, "facing=north,half=bottom,shape=straight": { - "model": "basemetals:block/obsidian_stairs", + "model": "basemetals:block/obsidian_stairs_quartz_stairs", "uvlock": true, "y": 270 }, "facing=north,half=top,shape=inner_left": { - "model": "basemetals:block/obsidian_inner_stairs", + "model": "basemetals:block/obsidian_stairs_quartz_stairs_inner", "uvlock": true, "x": 180, "y": 270 }, "facing=north,half=top,shape=inner_right": { - "model": "basemetals:block/obsidian_inner_stairs", + "model": "basemetals:block/obsidian_stairs_quartz_stairs_inner", "uvlock": true, "x": 180 }, "facing=north,half=top,shape=outer_left": { - "model": "basemetals:block/obsidian_outer_stairs", + "model": "basemetals:block/obsidian_stairs_quartz_stairs_outer", "uvlock": true, "x": 180, "y": 270 }, "facing=north,half=top,shape=outer_right": { - "model": "basemetals:block/obsidian_outer_stairs", + "model": "basemetals:block/obsidian_stairs_quartz_stairs_outer", "uvlock": true, "x": 180 }, "facing=north,half=top,shape=straight": { - "model": "basemetals:block/obsidian_stairs", + "model": "basemetals:block/obsidian_stairs_quartz_stairs", "uvlock": true, "x": 180, "y": 270 }, "facing=south,half=bottom,shape=inner_left": { - "model": "basemetals:block/obsidian_inner_stairs" + "model": "basemetals:block/obsidian_stairs_quartz_stairs_inner" }, "facing=south,half=bottom,shape=inner_right": { - "model": "basemetals:block/obsidian_inner_stairs", + "model": "basemetals:block/obsidian_stairs_quartz_stairs_inner", "uvlock": true, "y": 90 }, "facing=south,half=bottom,shape=outer_left": { - "model": "basemetals:block/obsidian_outer_stairs" + "model": "basemetals:block/obsidian_stairs_quartz_stairs_outer" }, "facing=south,half=bottom,shape=outer_right": { - "model": "basemetals:block/obsidian_outer_stairs", + "model": "basemetals:block/obsidian_stairs_quartz_stairs_outer", "uvlock": true, "y": 90 }, "facing=south,half=bottom,shape=straight": { - "model": "basemetals:block/obsidian_stairs", + "model": "basemetals:block/obsidian_stairs_quartz_stairs", "uvlock": true, "y": 90 }, "facing=south,half=top,shape=inner_left": { - "model": "basemetals:block/obsidian_inner_stairs", + "model": "basemetals:block/obsidian_stairs_quartz_stairs_inner", "uvlock": true, "x": 180, "y": 90 }, "facing=south,half=top,shape=inner_right": { - "model": "basemetals:block/obsidian_inner_stairs", + "model": "basemetals:block/obsidian_stairs_quartz_stairs_inner", "uvlock": true, "x": 180, "y": 180 }, "facing=south,half=top,shape=outer_left": { - "model": "basemetals:block/obsidian_outer_stairs", + "model": "basemetals:block/obsidian_stairs_quartz_stairs_outer", "uvlock": true, "x": 180, "y": 90 }, "facing=south,half=top,shape=outer_right": { - "model": "basemetals:block/obsidian_outer_stairs", + "model": "basemetals:block/obsidian_stairs_quartz_stairs_outer", "uvlock": true, "x": 180, "y": 180 }, "facing=south,half=top,shape=straight": { - "model": "basemetals:block/obsidian_stairs", + "model": "basemetals:block/obsidian_stairs_quartz_stairs", "uvlock": true, "x": 180, "y": 90 }, "facing=west,half=bottom,shape=inner_left": { - "model": "basemetals:block/obsidian_inner_stairs", + "model": "basemetals:block/obsidian_stairs_quartz_stairs_inner", "uvlock": true, "y": 90 }, "facing=west,half=bottom,shape=inner_right": { - "model": "basemetals:block/obsidian_inner_stairs", + "model": "basemetals:block/obsidian_stairs_quartz_stairs_inner", "uvlock": true, "y": 180 }, "facing=west,half=bottom,shape=outer_left": { - "model": "basemetals:block/obsidian_outer_stairs", + "model": "basemetals:block/obsidian_stairs_quartz_stairs_outer", "uvlock": true, "y": 90 }, "facing=west,half=bottom,shape=outer_right": { - "model": "basemetals:block/obsidian_outer_stairs", + "model": "basemetals:block/obsidian_stairs_quartz_stairs_outer", "uvlock": true, "y": 180 }, "facing=west,half=bottom,shape=straight": { - "model": "basemetals:block/obsidian_stairs", + "model": "basemetals:block/obsidian_stairs_quartz_stairs", "uvlock": true, "y": 180 }, "facing=west,half=top,shape=inner_left": { - "model": "basemetals:block/obsidian_inner_stairs", + "model": "basemetals:block/obsidian_stairs_quartz_stairs_inner", "uvlock": true, "x": 180, "y": 180 }, "facing=west,half=top,shape=inner_right": { - "model": "basemetals:block/obsidian_inner_stairs", + "model": "basemetals:block/obsidian_stairs_quartz_stairs_inner", "uvlock": true, "x": 180, "y": 270 }, "facing=west,half=top,shape=outer_left": { - "model": "basemetals:block/obsidian_outer_stairs", + "model": "basemetals:block/obsidian_stairs_quartz_stairs_outer", "uvlock": true, "x": 180, "y": 180 }, "facing=west,half=top,shape=outer_right": { - "model": "basemetals:block/obsidian_outer_stairs", + "model": "basemetals:block/obsidian_stairs_quartz_stairs_outer", "uvlock": true, "x": 180, "y": 270 }, "facing=west,half=top,shape=straight": { - "model": "basemetals:block/obsidian_stairs", + "model": "basemetals:block/obsidian_stairs_quartz_stairs", "uvlock": true, "x": 180, "y": 180 } } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/basemetals/blockstates/obsidian_trapdoor.json b/src/main/resources/assets/basemetals/blockstates/obsidian_trapdoor.json new file mode 100644 index 000000000..3166dd4bd --- /dev/null +++ b/src/main/resources/assets/basemetals/blockstates/obsidian_trapdoor.json @@ -0,0 +1,58 @@ +{ + "variants": { + "facing=east,half=bottom,open=false": { + "model": "basemetals:block/obsidian_trapdoor_iron_trapdoor_bottom" + }, + "facing=east,half=bottom,open=true": { + "model": "basemetals:block/obsidian_trapdoor_iron_trapdoor_open", + "y": 90 + }, + "facing=east,half=top,open=false": { + "model": "basemetals:block/obsidian_trapdoor_iron_trapdoor_top" + }, + "facing=east,half=top,open=true": { + "model": "basemetals:block/obsidian_trapdoor_iron_trapdoor_open", + "y": 90 + }, + "facing=north,half=bottom,open=false": { + "model": "basemetals:block/obsidian_trapdoor_iron_trapdoor_bottom" + }, + "facing=north,half=bottom,open=true": { + "model": "basemetals:block/obsidian_trapdoor_iron_trapdoor_open" + }, + "facing=north,half=top,open=false": { + "model": "basemetals:block/obsidian_trapdoor_iron_trapdoor_top" + }, + "facing=north,half=top,open=true": { + "model": "basemetals:block/obsidian_trapdoor_iron_trapdoor_open" + }, + "facing=south,half=bottom,open=false": { + "model": "basemetals:block/obsidian_trapdoor_iron_trapdoor_bottom" + }, + "facing=south,half=bottom,open=true": { + "model": "basemetals:block/obsidian_trapdoor_iron_trapdoor_open", + "y": 180 + }, + "facing=south,half=top,open=false": { + "model": "basemetals:block/obsidian_trapdoor_iron_trapdoor_top" + }, + "facing=south,half=top,open=true": { + "model": "basemetals:block/obsidian_trapdoor_iron_trapdoor_open", + "y": 180 + }, + "facing=west,half=bottom,open=false": { + "model": "basemetals:block/obsidian_trapdoor_iron_trapdoor_bottom" + }, + "facing=west,half=bottom,open=true": { + "model": "basemetals:block/obsidian_trapdoor_iron_trapdoor_open", + "y": 270 + }, + "facing=west,half=top,open=false": { + "model": "basemetals:block/obsidian_trapdoor_iron_trapdoor_top" + }, + "facing=west,half=top,open=true": { + "model": "basemetals:block/obsidian_trapdoor_iron_trapdoor_open", + "y": 270 + } + } +} diff --git a/src/generated/resources/assets/basemetals/blockstates/obsidian_wall.json b/src/main/resources/assets/basemetals/blockstates/obsidian_wall.json similarity index 61% rename from src/generated/resources/assets/basemetals/blockstates/obsidian_wall.json rename to src/main/resources/assets/basemetals/blockstates/obsidian_wall.json index 376a87d24..2e47d67d8 100644 --- a/src/generated/resources/assets/basemetals/blockstates/obsidian_wall.json +++ b/src/main/resources/assets/basemetals/blockstates/obsidian_wall.json @@ -2,7 +2,7 @@ "multipart": [ { "apply": { - "model": "basemetals:block/obsidian_wall_post" + "model": "basemetals:block/obsidian_wall_cobblestone_wall_post" }, "when": { "up": "true" @@ -10,75 +10,75 @@ }, { "apply": { - "model": "basemetals:block/obsidian_wall_side", - "uvlock": true, - "y": 90 + "model": "basemetals:block/obsidian_wall_cobblestone_wall_side", + "uvlock": true }, "when": { - "east": "low" + "north": "low" } }, { "apply": { - "model": "basemetals:block/obsidian_wall_side_tall", + "model": "basemetals:block/obsidian_wall_cobblestone_wall_side", "uvlock": true, "y": 90 }, "when": { - "east": "tall" + "east": "low" } }, { "apply": { - "model": "basemetals:block/obsidian_wall_side", - "uvlock": true + "model": "basemetals:block/obsidian_wall_cobblestone_wall_side", + "uvlock": true, + "y": 180 }, "when": { - "north": "low" + "south": "low" } }, { "apply": { - "model": "basemetals:block/obsidian_wall_side_tall", - "uvlock": true + "model": "basemetals:block/obsidian_wall_cobblestone_wall_side", + "uvlock": true, + "y": 270 }, "when": { - "north": "tall" + "west": "low" } }, { "apply": { - "model": "basemetals:block/obsidian_wall_side", - "uvlock": true, - "y": 180 + "model": "basemetals:block/obsidian_wall_cobblestone_wall_side_tall", + "uvlock": true }, "when": { - "south": "low" + "north": "tall" } }, { "apply": { - "model": "basemetals:block/obsidian_wall_side_tall", + "model": "basemetals:block/obsidian_wall_cobblestone_wall_side_tall", "uvlock": true, - "y": 180 + "y": 90 }, "when": { - "south": "tall" + "east": "tall" } }, { "apply": { - "model": "basemetals:block/obsidian_wall_side", + "model": "basemetals:block/obsidian_wall_cobblestone_wall_side_tall", "uvlock": true, - "y": 270 + "y": 180 }, "when": { - "west": "low" + "south": "tall" } }, { "apply": { - "model": "basemetals:block/obsidian_wall_side_tall", + "model": "basemetals:block/obsidian_wall_cobblestone_wall_side_tall", "uvlock": true, "y": 270 }, @@ -87,4 +87,4 @@ } } ] -} \ No newline at end of file +} diff --git a/src/generated/resources/assets/basemetals/blockstates/quartz_bars.json b/src/main/resources/assets/basemetals/blockstates/quartz_bars.json similarity index 66% rename from src/generated/resources/assets/basemetals/blockstates/quartz_bars.json rename to src/main/resources/assets/basemetals/blockstates/quartz_bars.json index 49bc46e65..37c79a10e 100644 --- a/src/generated/resources/assets/basemetals/blockstates/quartz_bars.json +++ b/src/main/resources/assets/basemetals/blockstates/quartz_bars.json @@ -2,12 +2,12 @@ "multipart": [ { "apply": { - "model": "basemetals:block/quartz_bars_post_ends" + "model": "basemetals:block/quartz_bars_iron_bars_post_ends" } }, { "apply": { - "model": "basemetals:block/quartz_bars_post" + "model": "basemetals:block/quartz_bars_iron_bars_post" }, "when": { "east": "false", @@ -18,7 +18,7 @@ }, { "apply": { - "model": "basemetals:block/quartz_bars_cap" + "model": "basemetals:block/quartz_bars_iron_bars_cap" }, "when": { "east": "false", @@ -29,67 +29,67 @@ }, { "apply": { - "model": "basemetals:block/quartz_bars_side" + "model": "basemetals:block/quartz_bars_iron_bars_cap", + "y": 90 }, "when": { - "north": "true" + "east": "true", + "north": "false", + "south": "false", + "west": "false" } }, { "apply": { - "model": "basemetals:block/quartz_bars_cap", - "y": 90 + "model": "basemetals:block/quartz_bars_iron_bars_cap_alt" }, "when": { - "east": "true", + "east": "false", "north": "false", - "south": "false", + "south": "true", "west": "false" } }, { "apply": { - "model": "basemetals:block/quartz_bars_side", + "model": "basemetals:block/quartz_bars_iron_bars_cap_alt", "y": 90 }, "when": { - "east": "true" + "east": "false", + "north": "false", + "south": "false", + "west": "true" } }, { "apply": { - "model": "basemetals:block/quartz_bars_cap_alt" + "model": "basemetals:block/quartz_bars_iron_bars_side" }, "when": { - "east": "false", - "north": "false", - "south": "true", - "west": "false" + "north": "true" } }, { "apply": { - "model": "basemetals:block/quartz_bars_side_alt" + "model": "basemetals:block/quartz_bars_iron_bars_side", + "y": 90 }, "when": { - "south": "true" + "east": "true" } }, { "apply": { - "model": "basemetals:block/quartz_bars_cap_alt", - "y": 90 + "model": "basemetals:block/quartz_bars_iron_bars_side_alt" }, "when": { - "east": "false", - "north": "false", - "south": "false", - "west": "true" + "south": "true" } }, { "apply": { - "model": "basemetals:block/quartz_bars_side_alt", + "model": "basemetals:block/quartz_bars_iron_bars_side_alt", "y": 90 }, "when": { @@ -97,4 +97,4 @@ } } ] -} \ No newline at end of file +} diff --git a/src/main/resources/assets/basemetals/blockstates/quartz_button.json b/src/main/resources/assets/basemetals/blockstates/quartz_button.json new file mode 100644 index 000000000..3845d419c --- /dev/null +++ b/src/main/resources/assets/basemetals/blockstates/quartz_button.json @@ -0,0 +1,118 @@ +{ + "variants": { + "face=ceiling,facing=east,powered=false": { + "model": "basemetals:block/quartz_button_polished_blackstone_button", + "x": 180, + "y": 270 + }, + "face=ceiling,facing=east,powered=true": { + "model": "basemetals:block/quartz_button_polished_blackstone_button_pressed", + "x": 180, + "y": 270 + }, + "face=ceiling,facing=north,powered=false": { + "model": "basemetals:block/quartz_button_polished_blackstone_button", + "x": 180, + "y": 180 + }, + "face=ceiling,facing=north,powered=true": { + "model": "basemetals:block/quartz_button_polished_blackstone_button_pressed", + "x": 180, + "y": 180 + }, + "face=ceiling,facing=south,powered=false": { + "model": "basemetals:block/quartz_button_polished_blackstone_button", + "x": 180 + }, + "face=ceiling,facing=south,powered=true": { + "model": "basemetals:block/quartz_button_polished_blackstone_button_pressed", + "x": 180 + }, + "face=ceiling,facing=west,powered=false": { + "model": "basemetals:block/quartz_button_polished_blackstone_button", + "x": 180, + "y": 90 + }, + "face=ceiling,facing=west,powered=true": { + "model": "basemetals:block/quartz_button_polished_blackstone_button_pressed", + "x": 180, + "y": 90 + }, + "face=floor,facing=east,powered=false": { + "model": "basemetals:block/quartz_button_polished_blackstone_button", + "y": 90 + }, + "face=floor,facing=east,powered=true": { + "model": "basemetals:block/quartz_button_polished_blackstone_button_pressed", + "y": 90 + }, + "face=floor,facing=north,powered=false": { + "model": "basemetals:block/quartz_button_polished_blackstone_button" + }, + "face=floor,facing=north,powered=true": { + "model": "basemetals:block/quartz_button_polished_blackstone_button_pressed" + }, + "face=floor,facing=south,powered=false": { + "model": "basemetals:block/quartz_button_polished_blackstone_button", + "y": 180 + }, + "face=floor,facing=south,powered=true": { + "model": "basemetals:block/quartz_button_polished_blackstone_button_pressed", + "y": 180 + }, + "face=floor,facing=west,powered=false": { + "model": "basemetals:block/quartz_button_polished_blackstone_button", + "y": 270 + }, + "face=floor,facing=west,powered=true": { + "model": "basemetals:block/quartz_button_polished_blackstone_button_pressed", + "y": 270 + }, + "face=wall,facing=east,powered=false": { + "model": "basemetals:block/quartz_button_polished_blackstone_button", + "uvlock": true, + "x": 90, + "y": 90 + }, + "face=wall,facing=east,powered=true": { + "model": "basemetals:block/quartz_button_polished_blackstone_button_pressed", + "uvlock": true, + "x": 90, + "y": 90 + }, + "face=wall,facing=north,powered=false": { + "model": "basemetals:block/quartz_button_polished_blackstone_button", + "uvlock": true, + "x": 90 + }, + "face=wall,facing=north,powered=true": { + "model": "basemetals:block/quartz_button_polished_blackstone_button_pressed", + "uvlock": true, + "x": 90 + }, + "face=wall,facing=south,powered=false": { + "model": "basemetals:block/quartz_button_polished_blackstone_button", + "uvlock": true, + "x": 90, + "y": 180 + }, + "face=wall,facing=south,powered=true": { + "model": "basemetals:block/quartz_button_polished_blackstone_button_pressed", + "uvlock": true, + "x": 90, + "y": 180 + }, + "face=wall,facing=west,powered=false": { + "model": "basemetals:block/quartz_button_polished_blackstone_button", + "uvlock": true, + "x": 90, + "y": 270 + }, + "face=wall,facing=west,powered=true": { + "model": "basemetals:block/quartz_button_polished_blackstone_button_pressed", + "uvlock": true, + "x": 90, + "y": 270 + } + } +} diff --git a/src/generated/resources/assets/basemetals/blockstates/emerald_door.json b/src/main/resources/assets/basemetals/blockstates/quartz_door.json similarity index 51% rename from src/generated/resources/assets/basemetals/blockstates/emerald_door.json rename to src/main/resources/assets/basemetals/blockstates/quartz_door.json index e1bef1715..d13d2995e 100644 --- a/src/generated/resources/assets/basemetals/blockstates/emerald_door.json +++ b/src/main/resources/assets/basemetals/blockstates/quartz_door.json @@ -1,124 +1,124 @@ { "variants": { "facing=east,half=lower,hinge=left,open=false": { - "model": "basemetals:block/emerald_door_bottom_left" + "model": "basemetals:block/quartz_door_iron_door_bottom_left" }, "facing=east,half=lower,hinge=left,open=true": { - "model": "basemetals:block/emerald_door_bottom_left_open", + "model": "basemetals:block/quartz_door_iron_door_bottom_left_open", "y": 90 }, "facing=east,half=lower,hinge=right,open=false": { - "model": "basemetals:block/emerald_door_bottom_right" + "model": "basemetals:block/quartz_door_iron_door_bottom_right" }, "facing=east,half=lower,hinge=right,open=true": { - "model": "basemetals:block/emerald_door_bottom_right_open", + "model": "basemetals:block/quartz_door_iron_door_bottom_right_open", "y": 270 }, "facing=east,half=upper,hinge=left,open=false": { - "model": "basemetals:block/emerald_door_top_left" + "model": "basemetals:block/quartz_door_iron_door_top_left" }, "facing=east,half=upper,hinge=left,open=true": { - "model": "basemetals:block/emerald_door_top_left_open", + "model": "basemetals:block/quartz_door_iron_door_top_left_open", "y": 90 }, "facing=east,half=upper,hinge=right,open=false": { - "model": "basemetals:block/emerald_door_top_right" + "model": "basemetals:block/quartz_door_iron_door_top_right" }, "facing=east,half=upper,hinge=right,open=true": { - "model": "basemetals:block/emerald_door_top_right_open", + "model": "basemetals:block/quartz_door_iron_door_top_right_open", "y": 270 }, "facing=north,half=lower,hinge=left,open=false": { - "model": "basemetals:block/emerald_door_bottom_left", + "model": "basemetals:block/quartz_door_iron_door_bottom_left", "y": 270 }, "facing=north,half=lower,hinge=left,open=true": { - "model": "basemetals:block/emerald_door_bottom_left_open" + "model": "basemetals:block/quartz_door_iron_door_bottom_left_open" }, "facing=north,half=lower,hinge=right,open=false": { - "model": "basemetals:block/emerald_door_bottom_right", + "model": "basemetals:block/quartz_door_iron_door_bottom_right", "y": 270 }, "facing=north,half=lower,hinge=right,open=true": { - "model": "basemetals:block/emerald_door_bottom_right_open", + "model": "basemetals:block/quartz_door_iron_door_bottom_right_open", "y": 180 }, "facing=north,half=upper,hinge=left,open=false": { - "model": "basemetals:block/emerald_door_top_left", + "model": "basemetals:block/quartz_door_iron_door_top_left", "y": 270 }, "facing=north,half=upper,hinge=left,open=true": { - "model": "basemetals:block/emerald_door_top_left_open" + "model": "basemetals:block/quartz_door_iron_door_top_left_open" }, "facing=north,half=upper,hinge=right,open=false": { - "model": "basemetals:block/emerald_door_top_right", + "model": "basemetals:block/quartz_door_iron_door_top_right", "y": 270 }, "facing=north,half=upper,hinge=right,open=true": { - "model": "basemetals:block/emerald_door_top_right_open", + "model": "basemetals:block/quartz_door_iron_door_top_right_open", "y": 180 }, "facing=south,half=lower,hinge=left,open=false": { - "model": "basemetals:block/emerald_door_bottom_left", + "model": "basemetals:block/quartz_door_iron_door_bottom_left", "y": 90 }, "facing=south,half=lower,hinge=left,open=true": { - "model": "basemetals:block/emerald_door_bottom_left_open", + "model": "basemetals:block/quartz_door_iron_door_bottom_left_open", "y": 180 }, "facing=south,half=lower,hinge=right,open=false": { - "model": "basemetals:block/emerald_door_bottom_right", + "model": "basemetals:block/quartz_door_iron_door_bottom_right", "y": 90 }, "facing=south,half=lower,hinge=right,open=true": { - "model": "basemetals:block/emerald_door_bottom_right_open" + "model": "basemetals:block/quartz_door_iron_door_bottom_right_open" }, "facing=south,half=upper,hinge=left,open=false": { - "model": "basemetals:block/emerald_door_top_left", + "model": "basemetals:block/quartz_door_iron_door_top_left", "y": 90 }, "facing=south,half=upper,hinge=left,open=true": { - "model": "basemetals:block/emerald_door_top_left_open", + "model": "basemetals:block/quartz_door_iron_door_top_left_open", "y": 180 }, "facing=south,half=upper,hinge=right,open=false": { - "model": "basemetals:block/emerald_door_top_right", + "model": "basemetals:block/quartz_door_iron_door_top_right", "y": 90 }, "facing=south,half=upper,hinge=right,open=true": { - "model": "basemetals:block/emerald_door_top_right_open" + "model": "basemetals:block/quartz_door_iron_door_top_right_open" }, "facing=west,half=lower,hinge=left,open=false": { - "model": "basemetals:block/emerald_door_bottom_left", + "model": "basemetals:block/quartz_door_iron_door_bottom_left", "y": 180 }, "facing=west,half=lower,hinge=left,open=true": { - "model": "basemetals:block/emerald_door_bottom_left_open", + "model": "basemetals:block/quartz_door_iron_door_bottom_left_open", "y": 270 }, "facing=west,half=lower,hinge=right,open=false": { - "model": "basemetals:block/emerald_door_bottom_right", + "model": "basemetals:block/quartz_door_iron_door_bottom_right", "y": 180 }, "facing=west,half=lower,hinge=right,open=true": { - "model": "basemetals:block/emerald_door_bottom_right_open", + "model": "basemetals:block/quartz_door_iron_door_bottom_right_open", "y": 90 }, "facing=west,half=upper,hinge=left,open=false": { - "model": "basemetals:block/emerald_door_top_left", + "model": "basemetals:block/quartz_door_iron_door_top_left", "y": 180 }, "facing=west,half=upper,hinge=left,open=true": { - "model": "basemetals:block/emerald_door_top_left_open", + "model": "basemetals:block/quartz_door_iron_door_top_left_open", "y": 270 }, "facing=west,half=upper,hinge=right,open=false": { - "model": "basemetals:block/emerald_door_top_right", + "model": "basemetals:block/quartz_door_iron_door_top_right", "y": 180 }, "facing=west,half=upper,hinge=right,open=true": { - "model": "basemetals:block/emerald_door_top_right_open", + "model": "basemetals:block/quartz_door_iron_door_top_right_open", "y": 90 } } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/basemetals/blockstates/quartz_lever.json b/src/main/resources/assets/basemetals/blockstates/quartz_lever.json new file mode 100644 index 000000000..ec5de9713 --- /dev/null +++ b/src/main/resources/assets/basemetals/blockstates/quartz_lever.json @@ -0,0 +1,110 @@ +{ + "variants": { + "face=ceiling,facing=east,powered=false": { + "model": "basemetals:block/quartz_lever_lever_on", + "x": 180, + "y": 270 + }, + "face=ceiling,facing=east,powered=true": { + "model": "basemetals:block/quartz_lever_lever", + "x": 180, + "y": 270 + }, + "face=ceiling,facing=north,powered=false": { + "model": "basemetals:block/quartz_lever_lever_on", + "x": 180, + "y": 180 + }, + "face=ceiling,facing=north,powered=true": { + "model": "basemetals:block/quartz_lever_lever", + "x": 180, + "y": 180 + }, + "face=ceiling,facing=south,powered=false": { + "model": "basemetals:block/quartz_lever_lever_on", + "x": 180 + }, + "face=ceiling,facing=south,powered=true": { + "model": "basemetals:block/quartz_lever_lever", + "x": 180 + }, + "face=ceiling,facing=west,powered=false": { + "model": "basemetals:block/quartz_lever_lever_on", + "x": 180, + "y": 90 + }, + "face=ceiling,facing=west,powered=true": { + "model": "basemetals:block/quartz_lever_lever", + "x": 180, + "y": 90 + }, + "face=floor,facing=east,powered=false": { + "model": "basemetals:block/quartz_lever_lever_on", + "y": 90 + }, + "face=floor,facing=east,powered=true": { + "model": "basemetals:block/quartz_lever_lever", + "y": 90 + }, + "face=floor,facing=north,powered=false": { + "model": "basemetals:block/quartz_lever_lever_on" + }, + "face=floor,facing=north,powered=true": { + "model": "basemetals:block/quartz_lever_lever" + }, + "face=floor,facing=south,powered=false": { + "model": "basemetals:block/quartz_lever_lever_on", + "y": 180 + }, + "face=floor,facing=south,powered=true": { + "model": "basemetals:block/quartz_lever_lever", + "y": 180 + }, + "face=floor,facing=west,powered=false": { + "model": "basemetals:block/quartz_lever_lever_on", + "y": 270 + }, + "face=floor,facing=west,powered=true": { + "model": "basemetals:block/quartz_lever_lever", + "y": 270 + }, + "face=wall,facing=east,powered=false": { + "model": "basemetals:block/quartz_lever_lever_on", + "x": 90, + "y": 90 + }, + "face=wall,facing=east,powered=true": { + "model": "basemetals:block/quartz_lever_lever", + "x": 90, + "y": 90 + }, + "face=wall,facing=north,powered=false": { + "model": "basemetals:block/quartz_lever_lever_on", + "x": 90 + }, + "face=wall,facing=north,powered=true": { + "model": "basemetals:block/quartz_lever_lever", + "x": 90 + }, + "face=wall,facing=south,powered=false": { + "model": "basemetals:block/quartz_lever_lever_on", + "x": 90, + "y": 180 + }, + "face=wall,facing=south,powered=true": { + "model": "basemetals:block/quartz_lever_lever", + "x": 90, + "y": 180 + }, + "face=wall,facing=west,powered=false": { + "model": "basemetals:block/quartz_lever_lever_on", + "x": 90, + "y": 270 + }, + "face=wall,facing=west,powered=true": { + "model": "basemetals:block/quartz_lever_lever", + "x": 90, + "y": 270 + } + } +} diff --git a/src/main/resources/assets/basemetals/blockstates/quartz_pressure_plate.json b/src/main/resources/assets/basemetals/blockstates/quartz_pressure_plate.json new file mode 100644 index 000000000..ca3b65c89 --- /dev/null +++ b/src/main/resources/assets/basemetals/blockstates/quartz_pressure_plate.json @@ -0,0 +1,10 @@ +{ + "variants": { + "powered=false": { + "model": "basemetals:block/quartz_pressure_plate_polished_blackstone_pressure_plate" + }, + "powered=true": { + "model": "basemetals:block/quartz_pressure_plate_polished_blackstone_pressure_plate_down" + } + } +} diff --git a/src/main/resources/assets/basemetals/blockstates/quartz_trapdoor.json b/src/main/resources/assets/basemetals/blockstates/quartz_trapdoor.json new file mode 100644 index 000000000..e9e99a64e --- /dev/null +++ b/src/main/resources/assets/basemetals/blockstates/quartz_trapdoor.json @@ -0,0 +1,58 @@ +{ + "variants": { + "facing=east,half=bottom,open=false": { + "model": "basemetals:block/quartz_trapdoor_iron_trapdoor_bottom" + }, + "facing=east,half=bottom,open=true": { + "model": "basemetals:block/quartz_trapdoor_iron_trapdoor_open", + "y": 90 + }, + "facing=east,half=top,open=false": { + "model": "basemetals:block/quartz_trapdoor_iron_trapdoor_top" + }, + "facing=east,half=top,open=true": { + "model": "basemetals:block/quartz_trapdoor_iron_trapdoor_open", + "y": 90 + }, + "facing=north,half=bottom,open=false": { + "model": "basemetals:block/quartz_trapdoor_iron_trapdoor_bottom" + }, + "facing=north,half=bottom,open=true": { + "model": "basemetals:block/quartz_trapdoor_iron_trapdoor_open" + }, + "facing=north,half=top,open=false": { + "model": "basemetals:block/quartz_trapdoor_iron_trapdoor_top" + }, + "facing=north,half=top,open=true": { + "model": "basemetals:block/quartz_trapdoor_iron_trapdoor_open" + }, + "facing=south,half=bottom,open=false": { + "model": "basemetals:block/quartz_trapdoor_iron_trapdoor_bottom" + }, + "facing=south,half=bottom,open=true": { + "model": "basemetals:block/quartz_trapdoor_iron_trapdoor_open", + "y": 180 + }, + "facing=south,half=top,open=false": { + "model": "basemetals:block/quartz_trapdoor_iron_trapdoor_top" + }, + "facing=south,half=top,open=true": { + "model": "basemetals:block/quartz_trapdoor_iron_trapdoor_open", + "y": 180 + }, + "facing=west,half=bottom,open=false": { + "model": "basemetals:block/quartz_trapdoor_iron_trapdoor_bottom" + }, + "facing=west,half=bottom,open=true": { + "model": "basemetals:block/quartz_trapdoor_iron_trapdoor_open", + "y": 270 + }, + "facing=west,half=top,open=false": { + "model": "basemetals:block/quartz_trapdoor_iron_trapdoor_top" + }, + "facing=west,half=top,open=true": { + "model": "basemetals:block/quartz_trapdoor_iron_trapdoor_open", + "y": 270 + } + } +} diff --git a/src/generated/resources/assets/basemetals/blockstates/quartz_wall.json b/src/main/resources/assets/basemetals/blockstates/quartz_wall.json similarity index 62% rename from src/generated/resources/assets/basemetals/blockstates/quartz_wall.json rename to src/main/resources/assets/basemetals/blockstates/quartz_wall.json index c51052784..357b2fe3c 100644 --- a/src/generated/resources/assets/basemetals/blockstates/quartz_wall.json +++ b/src/main/resources/assets/basemetals/blockstates/quartz_wall.json @@ -2,7 +2,7 @@ "multipart": [ { "apply": { - "model": "basemetals:block/quartz_wall_post" + "model": "basemetals:block/quartz_wall_cobblestone_wall_post" }, "when": { "up": "true" @@ -10,75 +10,75 @@ }, { "apply": { - "model": "basemetals:block/quartz_wall_side", - "uvlock": true, - "y": 90 + "model": "basemetals:block/quartz_wall_cobblestone_wall_side", + "uvlock": true }, "when": { - "east": "low" + "north": "low" } }, { "apply": { - "model": "basemetals:block/quartz_wall_side_tall", + "model": "basemetals:block/quartz_wall_cobblestone_wall_side", "uvlock": true, "y": 90 }, "when": { - "east": "tall" + "east": "low" } }, { "apply": { - "model": "basemetals:block/quartz_wall_side", - "uvlock": true + "model": "basemetals:block/quartz_wall_cobblestone_wall_side", + "uvlock": true, + "y": 180 }, "when": { - "north": "low" + "south": "low" } }, { "apply": { - "model": "basemetals:block/quartz_wall_side_tall", - "uvlock": true + "model": "basemetals:block/quartz_wall_cobblestone_wall_side", + "uvlock": true, + "y": 270 }, "when": { - "north": "tall" + "west": "low" } }, { "apply": { - "model": "basemetals:block/quartz_wall_side", - "uvlock": true, - "y": 180 + "model": "basemetals:block/quartz_wall_cobblestone_wall_side_tall", + "uvlock": true }, "when": { - "south": "low" + "north": "tall" } }, { "apply": { - "model": "basemetals:block/quartz_wall_side_tall", + "model": "basemetals:block/quartz_wall_cobblestone_wall_side_tall", "uvlock": true, - "y": 180 + "y": 90 }, "when": { - "south": "tall" + "east": "tall" } }, { "apply": { - "model": "basemetals:block/quartz_wall_side", + "model": "basemetals:block/quartz_wall_cobblestone_wall_side_tall", "uvlock": true, - "y": 270 + "y": 180 }, "when": { - "west": "low" + "south": "tall" } }, { "apply": { - "model": "basemetals:block/quartz_wall_side_tall", + "model": "basemetals:block/quartz_wall_cobblestone_wall_side_tall", "uvlock": true, "y": 270 }, @@ -87,4 +87,4 @@ } } ] -} \ No newline at end of file +} diff --git a/src/main/resources/assets/basemetals/models/block/charcoal_block.json b/src/main/resources/assets/basemetals/models/block/charcoal_block.json index 0aac4d6bf..64becc4b9 100644 --- a/src/main/resources/assets/basemetals/models/block/charcoal_block.json +++ b/src/main/resources/assets/basemetals/models/block/charcoal_block.json @@ -1,6 +1,6 @@ { - "parent": "block/cube_all", - "textures": { - "all": "basemetals:block/charcoal_block" - } + "parent": "block/cube_all", + "textures": { + "all": "basemetals:block/charcoal_block" + } } diff --git a/src/main/resources/assets/basemetals/models/block/charcoal_block_coal_block.json b/src/main/resources/assets/basemetals/models/block/charcoal_block_coal_block.json new file mode 100644 index 000000000..62ff91e1c --- /dev/null +++ b/src/main/resources/assets/basemetals/models/block/charcoal_block_coal_block.json @@ -0,0 +1,53 @@ +{ + "parent": "minecraft:block/coal_block", + "textures": { + "particle": "basemetals:block/charcoal_block", + "down": "basemetals:block/charcoal_block", + "up": "basemetals:block/charcoal_block", + "north": "basemetals:block/charcoal_block", + "east": "basemetals:block/charcoal_block", + "south": "basemetals:block/charcoal_block", + "west": "basemetals:block/charcoal_block", + "all": "basemetals:block/charcoal_block" + }, + "elements": [ + { + "from": [ + 0, + 0, + 0 + ], + "to": [ + 16, + 16, + 16 + ], + "faces": { + "down": { + "texture": "#down", + "cullface": "down" + }, + "up": { + "texture": "#up", + "cullface": "up" + }, + "north": { + "texture": "#north", + "cullface": "north" + }, + "south": { + "texture": "#south", + "cullface": "south" + }, + "west": { + "texture": "#west", + "cullface": "west" + }, + "east": { + "texture": "#east", + "cullface": "east" + } + } + } + ] +} diff --git a/src/main/resources/assets/basemetals/models/block/diamond_bars_cap.json b/src/main/resources/assets/basemetals/models/block/diamond_bars_cap.json deleted file mode 100644 index 2b06cf889..000000000 --- a/src/main/resources/assets/basemetals/models/block/diamond_bars_cap.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "ambientocclusion": false, - "textures": { - "particle": "basemetals:block/diamond_bars", - "bars": "basemetals:block/diamond_bars", - "edge": "basemetals:block/diamond_bars" - }, - "elements": [ - { "from": [ 8, 0, 8 ], - "to": [ 8, 16, 9 ], - "faces": { - "west": { "uv": [ 8, 0, 7, 16 ], "texture": "#bars" }, - "east": { "uv": [ 7, 0, 8, 16 ], "texture": "#bars" } - } - }, - { "from": [ 7, 0, 9 ], - "to": [ 9, 16, 9 ], - "faces": { - "north": { "uv": [ 9, 0, 7, 16 ], "texture": "#bars" }, - "south": { "uv": [ 7, 0, 9, 16 ], "texture": "#bars" } - } - } - ] -} diff --git a/src/main/resources/assets/basemetals/models/block/diamond_bars_cap_alt.json b/src/main/resources/assets/basemetals/models/block/diamond_bars_cap_alt.json deleted file mode 100644 index 3fbb0af9a..000000000 --- a/src/main/resources/assets/basemetals/models/block/diamond_bars_cap_alt.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "ambientocclusion": false, - "textures": { - "particle": "basemetals:block/diamond_bars", - "bars": "basemetals:block/diamond_bars", - "edge": "basemetals:block/diamond_bars" - }, - "elements": [ - { "from": [ 8, 0, 7 ], - "to": [ 8, 16, 8 ], - "faces": { - "west": { "uv": [ 8, 0, 9, 16 ], "texture": "#bars" }, - "east": { "uv": [ 9, 0, 8, 16 ], "texture": "#bars" } - } - }, - { "from": [ 7, 0, 7 ], - "to": [ 9, 16, 7 ], - "faces": { - "north": { "uv": [ 7, 0, 9, 16 ], "texture": "#bars" }, - "south": { "uv": [ 9, 0, 7, 16 ], "texture": "#bars" } - } - } - ] -} diff --git a/src/main/resources/assets/basemetals/models/block/diamond_bars_iron_bars_cap.json b/src/main/resources/assets/basemetals/models/block/diamond_bars_iron_bars_cap.json new file mode 100644 index 000000000..2d891f2b2 --- /dev/null +++ b/src/main/resources/assets/basemetals/models/block/diamond_bars_iron_bars_cap.json @@ -0,0 +1,74 @@ +{ + "parent": "minecraft:block/iron_bars_cap", + "textures": { + "particle": "minecraft:block/diamond_block", + "bars": "basemetals:block/diamond_bars", + "edge": "basemetals:block/diamond_bars" + }, + "elements": [ + { + "from": [ + 8, + 0, + 8 + ], + "to": [ + 8, + 16, + 9 + ], + "faces": { + "west": { + "uv": [ + 8, + 0, + 7, + 16 + ], + "texture": "#bars" + }, + "east": { + "uv": [ + 7, + 0, + 8, + 16 + ], + "texture": "#bars" + } + } + }, + { + "from": [ + 7, + 0, + 9 + ], + "to": [ + 9, + 16, + 9 + ], + "faces": { + "north": { + "uv": [ + 9, + 0, + 7, + 16 + ], + "texture": "#bars" + }, + "south": { + "uv": [ + 7, + 0, + 9, + 16 + ], + "texture": "#bars" + } + } + } + ] +} diff --git a/src/main/resources/assets/basemetals/models/block/diamond_bars_iron_bars_cap_alt.json b/src/main/resources/assets/basemetals/models/block/diamond_bars_iron_bars_cap_alt.json new file mode 100644 index 000000000..75697c996 --- /dev/null +++ b/src/main/resources/assets/basemetals/models/block/diamond_bars_iron_bars_cap_alt.json @@ -0,0 +1,74 @@ +{ + "parent": "minecraft:block/iron_bars_cap_alt", + "textures": { + "particle": "minecraft:block/diamond_block", + "bars": "basemetals:block/diamond_bars", + "edge": "basemetals:block/diamond_bars" + }, + "elements": [ + { + "from": [ + 8, + 0, + 7 + ], + "to": [ + 8, + 16, + 8 + ], + "faces": { + "west": { + "uv": [ + 8, + 0, + 9, + 16 + ], + "texture": "#bars" + }, + "east": { + "uv": [ + 9, + 0, + 8, + 16 + ], + "texture": "#bars" + } + } + }, + { + "from": [ + 7, + 0, + 7 + ], + "to": [ + 9, + 16, + 7 + ], + "faces": { + "north": { + "uv": [ + 7, + 0, + 9, + 16 + ], + "texture": "#bars" + }, + "south": { + "uv": [ + 9, + 0, + 7, + 16 + ], + "texture": "#bars" + } + } + } + ] +} diff --git a/src/main/resources/assets/basemetals/models/block/diamond_bars_iron_bars_post.json b/src/main/resources/assets/basemetals/models/block/diamond_bars_iron_bars_post.json new file mode 100644 index 000000000..2ff488b23 --- /dev/null +++ b/src/main/resources/assets/basemetals/models/block/diamond_bars_iron_bars_post.json @@ -0,0 +1,73 @@ +{ + "parent": "minecraft:block/iron_bars_post", + "textures": { + "particle": "minecraft:block/diamond_block", + "bars": "basemetals:block/diamond_bars" + }, + "elements": [ + { + "from": [ + 8, + 0, + 7 + ], + "to": [ + 8, + 16, + 9 + ], + "faces": { + "west": { + "uv": [ + 7, + 0, + 9, + 16 + ], + "texture": "#bars" + }, + "east": { + "uv": [ + 9, + 0, + 7, + 16 + ], + "texture": "#bars" + } + } + }, + { + "from": [ + 7, + 0, + 8 + ], + "to": [ + 9, + 16, + 8 + ], + "faces": { + "north": { + "uv": [ + 7, + 0, + 9, + 16 + ], + "texture": "#bars" + }, + "south": { + "uv": [ + 9, + 0, + 7, + 16 + ], + "texture": "#bars" + } + } + } + ] +} diff --git a/src/main/resources/assets/basemetals/models/block/diamond_bars_iron_bars_post_ends.json b/src/main/resources/assets/basemetals/models/block/diamond_bars_iron_bars_post_ends.json new file mode 100644 index 000000000..4c64f2eff --- /dev/null +++ b/src/main/resources/assets/basemetals/models/block/diamond_bars_iron_bars_post_ends.json @@ -0,0 +1,73 @@ +{ + "parent": "minecraft:block/iron_bars_post_ends", + "textures": { + "particle": "minecraft:block/diamond_block", + "edge": "basemetals:block/diamond_bars" + }, + "elements": [ + { + "from": [ + 7, + 0.001, + 7 + ], + "to": [ + 9, + 0.001, + 9 + ], + "faces": { + "down": { + "uv": [ + 7, + 7, + 9, + 9 + ], + "texture": "#edge" + }, + "up": { + "uv": [ + 7, + 7, + 9, + 9 + ], + "texture": "#edge" + } + } + }, + { + "from": [ + 7, + 15.999, + 7 + ], + "to": [ + 9, + 15.999, + 9 + ], + "faces": { + "down": { + "uv": [ + 7, + 7, + 9, + 9 + ], + "texture": "#edge" + }, + "up": { + "uv": [ + 7, + 7, + 9, + 9 + ], + "texture": "#edge" + } + } + } + ] +} diff --git a/src/main/resources/assets/basemetals/models/block/diamond_bars_iron_bars_side.json b/src/main/resources/assets/basemetals/models/block/diamond_bars_iron_bars_side.json new file mode 100644 index 000000000..41d451b63 --- /dev/null +++ b/src/main/resources/assets/basemetals/models/block/diamond_bars_iron_bars_side.json @@ -0,0 +1,130 @@ +{ + "parent": "minecraft:block/iron_bars_side", + "textures": { + "particle": "minecraft:block/diamond_block", + "bars": "basemetals:block/diamond_bars", + "edge": "basemetals:block/diamond_bars" + }, + "elements": [ + { + "from": [ + 8, + 0, + 0 + ], + "to": [ + 8, + 16, + 8 + ], + "faces": { + "west": { + "uv": [ + 16, + 0, + 8, + 16 + ], + "texture": "#bars" + }, + "east": { + "uv": [ + 8, + 0, + 16, + 16 + ], + "texture": "#bars" + } + } + }, + { + "from": [ + 7, + 0, + 0 + ], + "to": [ + 9, + 16, + 7 + ], + "faces": { + "north": { + "uv": [ + 7, + 0, + 9, + 16 + ], + "texture": "#edge", + "cullface": "north" + } + } + }, + { + "from": [ + 7, + 0.001, + 0 + ], + "to": [ + 9, + 0.001, + 7 + ], + "faces": { + "down": { + "uv": [ + 9, + 0, + 7, + 7 + ], + "texture": "#edge" + }, + "up": { + "uv": [ + 7, + 0, + 9, + 7 + ], + "texture": "#edge" + } + } + }, + { + "from": [ + 7, + 15.999, + 0 + ], + "to": [ + 9, + 15.999, + 7 + ], + "faces": { + "down": { + "uv": [ + 9, + 0, + 7, + 7 + ], + "texture": "#edge" + }, + "up": { + "uv": [ + 7, + 0, + 9, + 7 + ], + "texture": "#edge" + } + } + } + ] +} diff --git a/src/main/resources/assets/basemetals/models/block/diamond_bars_iron_bars_side_alt.json b/src/main/resources/assets/basemetals/models/block/diamond_bars_iron_bars_side_alt.json new file mode 100644 index 000000000..07b347c30 --- /dev/null +++ b/src/main/resources/assets/basemetals/models/block/diamond_bars_iron_bars_side_alt.json @@ -0,0 +1,148 @@ +{ + "parent": "minecraft:block/iron_bars_side_alt", + "textures": { + "particle": "minecraft:block/diamond_block", + "bars": "basemetals:block/diamond_bars", + "edge": "basemetals:block/diamond_bars" + }, + "elements": [ + { + "from": [ + 8, + 0, + 8 + ], + "to": [ + 8, + 16, + 16 + ], + "faces": { + "west": { + "uv": [ + 8, + 0, + 0, + 16 + ], + "texture": "#bars" + }, + "east": { + "uv": [ + 0, + 0, + 8, + 16 + ], + "texture": "#bars" + } + } + }, + { + "from": [ + 7, + 0, + 9 + ], + "to": [ + 9, + 16, + 16 + ], + "faces": { + "south": { + "uv": [ + 7, + 0, + 9, + 16 + ], + "texture": "#edge", + "cullface": "south" + }, + "down": { + "uv": [ + 9, + 9, + 7, + 16 + ], + "texture": "#edge" + }, + "up": { + "uv": [ + 7, + 9, + 9, + 16 + ], + "texture": "#edge" + } + } + }, + { + "from": [ + 7, + 0.001, + 9 + ], + "to": [ + 9, + 0.001, + 16 + ], + "faces": { + "down": { + "uv": [ + 9, + 9, + 7, + 16 + ], + "texture": "#edge" + }, + "up": { + "uv": [ + 7, + 9, + 9, + 16 + ], + "texture": "#edge" + } + } + }, + { + "from": [ + 7, + 15.999, + 9 + ], + "to": [ + 9, + 15.999, + 16 + ], + "faces": { + "down": { + "uv": [ + 9, + 9, + 7, + 16 + ], + "texture": "#edge" + }, + "up": { + "uv": [ + 7, + 9, + 9, + 16 + ], + "texture": "#edge" + } + } + } + ] +} diff --git a/src/main/resources/assets/basemetals/models/block/diamond_bars_post.json b/src/main/resources/assets/basemetals/models/block/diamond_bars_post.json deleted file mode 100644 index 5df52b4a4..000000000 --- a/src/main/resources/assets/basemetals/models/block/diamond_bars_post.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "ambientocclusion": false, - "textures": { - "particle": "basemetals:block/diamond_bars", - "bars": "basemetals:block/diamond_bars" - }, - "elements": [ - { "from": [ 8, 0, 7 ], - "to": [ 8, 16, 9 ], - "faces": { - "west": { "uv": [ 7, 0, 9, 16 ], "texture": "#bars" }, - "east": { "uv": [ 9, 0, 7, 16 ], "texture": "#bars" } - } - }, - { "from": [ 7, 0, 8 ], - "to": [ 9, 16, 8 ], - "faces": { - "north": { "uv": [ 7, 0, 9, 16 ], "texture": "#bars" }, - "south": { "uv": [ 9, 0, 7, 16 ], "texture": "#bars" } - } - } - ] -} diff --git a/src/main/resources/assets/basemetals/models/block/diamond_bars_side.json b/src/main/resources/assets/basemetals/models/block/diamond_bars_side.json deleted file mode 100644 index bacdf220f..000000000 --- a/src/main/resources/assets/basemetals/models/block/diamond_bars_side.json +++ /dev/null @@ -1,37 +0,0 @@ -{ - "ambientocclusion": false, - "textures": { - "particle": "basemetals:block/diamond_bars", - "bars": "basemetals:block/diamond_bars", - "edge": "basemetals:block/diamond_bars" - }, - "elements": [ - { "from": [ 8, 0, 0 ], - "to": [ 8, 16, 8 ], - "faces": { - "west": { "uv": [ 16, 0, 8, 16 ], "texture": "#bars" }, - "east": { "uv": [ 8, 0, 16, 16 ], "texture": "#bars" } - } - }, - { "from": [ 7, 0, 0 ], - "to": [ 9, 16, 7 ], - "faces": { - "north": { "uv": [ 7, 0, 9, 16 ], "texture": "#edge", "cullface": "north" } - } - }, - { "from": [ 7, 0.001, 0 ], - "to": [ 9, 0.001, 7 ], - "faces": { - "down": { "uv": [ 9, 0, 7, 7 ], "texture": "#edge" }, - "up": { "uv": [ 7, 0, 9, 7 ], "texture": "#edge" } - } - }, - { "from": [ 7, 15.999, 0 ], - "to": [ 9, 15.999, 7 ], - "faces": { - "down": { "uv": [ 9, 0, 7, 7 ], "texture": "#edge" }, - "up": { "uv": [ 7, 0, 9, 7 ], "texture": "#edge" } - } - } - ] -} diff --git a/src/main/resources/assets/basemetals/models/block/diamond_bars_side_alt.json b/src/main/resources/assets/basemetals/models/block/diamond_bars_side_alt.json deleted file mode 100644 index 60f14cdd6..000000000 --- a/src/main/resources/assets/basemetals/models/block/diamond_bars_side_alt.json +++ /dev/null @@ -1,37 +0,0 @@ -{ - "ambientocclusion": false, - "textures": { - "particle": "basemetals:block/diamond_bars", - "bars": "basemetals:block/diamond_bars", - "edge": "basemetals:block/diamond_bars" - }, - "elements": [ - { "from": [ 8, 0, 8 ], - "to": [ 8, 16, 16 ], - "faces": { - "west": { "uv": [ 8, 0, 0, 16 ], "texture": "#bars" }, - "east": { "uv": [ 0, 0, 8, 16 ], "texture": "#bars" } - } - }, - { "from": [ 7, 0, 9 ], - "to": [ 9, 16, 16 ], - "faces": { - "south": { "uv": [ 7, 0, 9, 16 ], "texture": "#edge", "cullface": "south" } - } - }, - { "from": [ 7, 0.001, 9 ], - "to": [ 9, 0.001, 16 ], - "faces": { - "down": { "uv": [ 9, 9, 7, 16 ], "texture": "#edge" }, - "up": { "uv": [ 7, 9, 9, 16 ], "texture": "#edge" } - } - }, - { "from": [ 7, 15.999, 9 ], - "to": [ 9, 15.999, 16 ], - "faces": { - "down": { "uv": [ 9, 9, 7, 16 ], "texture": "#edge" }, - "up": { "uv": [ 7, 9, 9, 16 ], "texture": "#edge" } - } - } - ] -} diff --git a/src/main/resources/assets/basemetals/models/block/diamond_button.json b/src/main/resources/assets/basemetals/models/block/diamond_button.json deleted file mode 100644 index 26a2706ec..000000000 --- a/src/main/resources/assets/basemetals/models/block/diamond_button.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/button", - "textures": { - "texture": "minecraft:block/diamond_block" - } -} diff --git a/src/main/resources/assets/basemetals/models/block/diamond_button_inventory.json b/src/main/resources/assets/basemetals/models/block/diamond_button_inventory.json index 732fea4f7..e9a43dfa8 100644 --- a/src/main/resources/assets/basemetals/models/block/diamond_button_inventory.json +++ b/src/main/resources/assets/basemetals/models/block/diamond_button_inventory.json @@ -1,6 +1,6 @@ { - "parent": "block/button_inventory", - "textures": { - "texture": "minecraft:block/diamond_block" - } + "parent": "block/button_inventory", + "textures": { + "texture": "minecraft:block/diamond_block" + } } diff --git a/src/main/resources/assets/basemetals/models/block/diamond_button_polished_blackstone_button.json b/src/main/resources/assets/basemetals/models/block/diamond_button_polished_blackstone_button.json new file mode 100644 index 000000000..d8274bdfb --- /dev/null +++ b/src/main/resources/assets/basemetals/models/block/diamond_button_polished_blackstone_button.json @@ -0,0 +1,78 @@ +{ + "parent": "minecraft:block/polished_blackstone_button", + "textures": { + "particle": "minecraft:block/diamond_block", + "texture": "minecraft:block/diamond_block" + }, + "elements": [ + { + "from": [ + 5, + 0, + 6 + ], + "to": [ + 11, + 2, + 10 + ], + "faces": { + "down": { + "uv": [ + 5, + 6, + 11, + 10 + ], + "texture": "#texture", + "cullface": "down" + }, + "up": { + "uv": [ + 5, + 6, + 11, + 10 + ], + "texture": "#texture" + }, + "north": { + "uv": [ + 5, + 14, + 11, + 16 + ], + "texture": "#texture" + }, + "south": { + "uv": [ + 5, + 14, + 11, + 16 + ], + "texture": "#texture" + }, + "west": { + "uv": [ + 6, + 14, + 10, + 16 + ], + "texture": "#texture" + }, + "east": { + "uv": [ + 6, + 14, + 10, + 16 + ], + "texture": "#texture" + } + } + } + ] +} diff --git a/src/main/resources/assets/basemetals/models/block/diamond_button_polished_blackstone_button_pressed.json b/src/main/resources/assets/basemetals/models/block/diamond_button_polished_blackstone_button_pressed.json new file mode 100644 index 000000000..35fb08e18 --- /dev/null +++ b/src/main/resources/assets/basemetals/models/block/diamond_button_polished_blackstone_button_pressed.json @@ -0,0 +1,78 @@ +{ + "parent": "minecraft:block/polished_blackstone_button_pressed", + "textures": { + "particle": "minecraft:block/diamond_block", + "texture": "minecraft:block/diamond_block" + }, + "elements": [ + { + "from": [ + 5, + 0, + 6 + ], + "to": [ + 11, + 1.02, + 10 + ], + "faces": { + "down": { + "uv": [ + 5, + 6, + 11, + 10 + ], + "texture": "#texture", + "cullface": "down" + }, + "up": { + "uv": [ + 5, + 6, + 11, + 10 + ], + "texture": "#texture" + }, + "north": { + "uv": [ + 5, + 14, + 11, + 15 + ], + "texture": "#texture" + }, + "south": { + "uv": [ + 5, + 14, + 11, + 15 + ], + "texture": "#texture" + }, + "west": { + "uv": [ + 6, + 14, + 10, + 15 + ], + "texture": "#texture" + }, + "east": { + "uv": [ + 6, + 14, + 10, + 15 + ], + "texture": "#texture" + } + } + } + ] +} diff --git a/src/main/resources/assets/basemetals/models/block/diamond_button_pressed.json b/src/main/resources/assets/basemetals/models/block/diamond_button_pressed.json deleted file mode 100644 index 277b3aa96..000000000 --- a/src/main/resources/assets/basemetals/models/block/diamond_button_pressed.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/button_pressed", - "textures": { - "texture": "minecraft:block/diamond_block" - } -} diff --git a/src/main/resources/assets/basemetals/models/block/diamond_door_bottom.json b/src/main/resources/assets/basemetals/models/block/diamond_door_bottom.json deleted file mode 100644 index 526b3f217..000000000 --- a/src/main/resources/assets/basemetals/models/block/diamond_door_bottom.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/door_bottom_left", - "textures": { - "bottom": "basemetals:block/diamond_door_lower", - "top": "basemetals:block/diamond_door_upper" - } -} diff --git a/src/main/resources/assets/basemetals/models/block/diamond_door_bottom_rh.json b/src/main/resources/assets/basemetals/models/block/diamond_door_bottom_rh.json deleted file mode 100644 index 360dd5287..000000000 --- a/src/main/resources/assets/basemetals/models/block/diamond_door_bottom_rh.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/door_bottom_right", - "textures": { - "bottom": "basemetals:block/diamond_door_lower", - "top": "basemetals:block/diamond_door_upper" - } -} diff --git a/src/main/resources/assets/basemetals/models/block/diamond_door_iron_door_bottom_left.json b/src/main/resources/assets/basemetals/models/block/diamond_door_iron_door_bottom_left.json new file mode 100644 index 000000000..553d87173 --- /dev/null +++ b/src/main/resources/assets/basemetals/models/block/diamond_door_iron_door_bottom_left.json @@ -0,0 +1,74 @@ +{ + "parent": "minecraft:block/iron_door_bottom_left", + "textures": { + "particle": "minecraft:block/diamond_block", + "bottom": "basemetals:block/diamond_door_lower", + "top": "basemetals:block/diamond_door_upper" + }, + "elements": [ + { + "from": [ + 0, + 0, + 0 + ], + "to": [ + 3, + 16, + 16 + ], + "faces": { + "down": { + "uv": [ + 16, + 13, + 0, + 16 + ], + "texture": "#bottom", + "cullface": "down", + "rotation": 90 + }, + "north": { + "uv": [ + 3, + 0, + 0, + 16 + ], + "texture": "#bottom", + "cullface": "north" + }, + "south": { + "uv": [ + 0, + 0, + 3, + 16 + ], + "texture": "#bottom", + "cullface": "south" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#bottom", + "cullface": "west" + }, + "east": { + "uv": [ + 16, + 0, + 0, + 16 + ], + "texture": "#bottom" + } + } + } + ] +} diff --git a/src/main/resources/assets/basemetals/models/block/diamond_door_iron_door_bottom_left_open.json b/src/main/resources/assets/basemetals/models/block/diamond_door_iron_door_bottom_left_open.json new file mode 100644 index 000000000..c34faa994 --- /dev/null +++ b/src/main/resources/assets/basemetals/models/block/diamond_door_iron_door_bottom_left_open.json @@ -0,0 +1,74 @@ +{ + "parent": "minecraft:block/iron_door_bottom_left_open", + "textures": { + "particle": "minecraft:block/diamond_block", + "bottom": "basemetals:block/diamond_door_lower", + "top": "basemetals:block/diamond_door_upper" + }, + "elements": [ + { + "from": [ + 0, + 0, + 0 + ], + "to": [ + 3, + 16, + 16 + ], + "faces": { + "down": { + "uv": [ + 0, + 16, + 16, + 13 + ], + "texture": "#bottom", + "cullface": "down", + "rotation": 90 + }, + "north": { + "uv": [ + 0, + 0, + 3, + 16 + ], + "texture": "#bottom", + "cullface": "north" + }, + "south": { + "uv": [ + 0, + 0, + 3, + 16 + ], + "texture": "#bottom", + "cullface": "south" + }, + "west": { + "uv": [ + 16, + 0, + 0, + 16 + ], + "texture": "#bottom", + "cullface": "west" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#bottom" + } + } + } + ] +} diff --git a/src/main/resources/assets/basemetals/models/block/diamond_door_iron_door_bottom_right.json b/src/main/resources/assets/basemetals/models/block/diamond_door_iron_door_bottom_right.json new file mode 100644 index 000000000..850a761af --- /dev/null +++ b/src/main/resources/assets/basemetals/models/block/diamond_door_iron_door_bottom_right.json @@ -0,0 +1,74 @@ +{ + "parent": "minecraft:block/iron_door_bottom_right", + "textures": { + "particle": "minecraft:block/diamond_block", + "bottom": "basemetals:block/diamond_door_lower", + "top": "basemetals:block/diamond_door_upper" + }, + "elements": [ + { + "from": [ + 0, + 0, + 0 + ], + "to": [ + 3, + 16, + 16 + ], + "faces": { + "down": { + "uv": [ + 0, + 13, + 16, + 16 + ], + "texture": "#bottom", + "cullface": "down", + "rotation": 90 + }, + "north": { + "uv": [ + 3, + 0, + 0, + 16 + ], + "texture": "#bottom", + "cullface": "north" + }, + "south": { + "uv": [ + 0, + 0, + 3, + 16 + ], + "texture": "#bottom", + "cullface": "south" + }, + "west": { + "uv": [ + 16, + 0, + 0, + 16 + ], + "texture": "#bottom", + "cullface": "west" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#bottom" + } + } + } + ] +} diff --git a/src/main/resources/assets/basemetals/models/block/diamond_door_iron_door_bottom_right_open.json b/src/main/resources/assets/basemetals/models/block/diamond_door_iron_door_bottom_right_open.json new file mode 100644 index 000000000..dba76d106 --- /dev/null +++ b/src/main/resources/assets/basemetals/models/block/diamond_door_iron_door_bottom_right_open.json @@ -0,0 +1,74 @@ +{ + "parent": "minecraft:block/iron_door_bottom_right_open", + "textures": { + "particle": "minecraft:block/diamond_block", + "bottom": "basemetals:block/diamond_door_lower", + "top": "basemetals:block/diamond_door_upper" + }, + "elements": [ + { + "from": [ + 0, + 0, + 0 + ], + "to": [ + 3, + 16, + 16 + ], + "faces": { + "down": { + "uv": [ + 16, + 16, + 0, + 13 + ], + "texture": "#bottom", + "cullface": "down", + "rotation": 90 + }, + "north": { + "uv": [ + 3, + 0, + 0, + 16 + ], + "texture": "#bottom", + "cullface": "north" + }, + "south": { + "uv": [ + 3, + 0, + 0, + 16 + ], + "texture": "#bottom", + "cullface": "south" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#bottom", + "cullface": "west" + }, + "east": { + "uv": [ + 16, + 0, + 0, + 16 + ], + "texture": "#bottom" + } + } + } + ] +} diff --git a/src/main/resources/assets/basemetals/models/block/diamond_door_iron_door_top_left.json b/src/main/resources/assets/basemetals/models/block/diamond_door_iron_door_top_left.json new file mode 100644 index 000000000..082a08bee --- /dev/null +++ b/src/main/resources/assets/basemetals/models/block/diamond_door_iron_door_top_left.json @@ -0,0 +1,74 @@ +{ + "parent": "minecraft:block/iron_door_top_left", + "textures": { + "particle": "minecraft:block/diamond_block", + "bottom": "basemetals:block/diamond_door_lower", + "top": "basemetals:block/diamond_door_upper" + }, + "elements": [ + { + "from": [ + 0, + 0, + 0 + ], + "to": [ + 3, + 16, + 16 + ], + "faces": { + "up": { + "uv": [ + 0, + 3, + 16, + 0 + ], + "texture": "#top", + "cullface": "up", + "rotation": 90 + }, + "north": { + "uv": [ + 3, + 0, + 0, + 16 + ], + "texture": "#top", + "cullface": "north" + }, + "south": { + "uv": [ + 0, + 0, + 3, + 16 + ], + "texture": "#top", + "cullface": "south" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#top", + "cullface": "west" + }, + "east": { + "uv": [ + 16, + 0, + 0, + 16 + ], + "texture": "#top" + } + } + } + ] +} diff --git a/src/main/resources/assets/basemetals/models/block/diamond_door_iron_door_top_left_open.json b/src/main/resources/assets/basemetals/models/block/diamond_door_iron_door_top_left_open.json new file mode 100644 index 000000000..3acc714ad --- /dev/null +++ b/src/main/resources/assets/basemetals/models/block/diamond_door_iron_door_top_left_open.json @@ -0,0 +1,74 @@ +{ + "parent": "minecraft:block/iron_door_top_left_open", + "textures": { + "particle": "minecraft:block/diamond_block", + "bottom": "basemetals:block/diamond_door_lower", + "top": "basemetals:block/diamond_door_upper" + }, + "elements": [ + { + "from": [ + 0, + 0, + 0 + ], + "to": [ + 3, + 16, + 16 + ], + "faces": { + "up": { + "uv": [ + 0, + 3, + 16, + 0 + ], + "texture": "#top", + "cullface": "up", + "rotation": 270 + }, + "north": { + "uv": [ + 0, + 0, + 3, + 16 + ], + "texture": "#top", + "cullface": "north" + }, + "south": { + "uv": [ + 0, + 0, + 3, + 16 + ], + "texture": "#top", + "cullface": "south" + }, + "west": { + "uv": [ + 16, + 0, + 0, + 16 + ], + "texture": "#top", + "cullface": "west" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#top" + } + } + } + ] +} diff --git a/src/main/resources/assets/basemetals/models/block/diamond_door_iron_door_top_right.json b/src/main/resources/assets/basemetals/models/block/diamond_door_iron_door_top_right.json new file mode 100644 index 000000000..655883ffe --- /dev/null +++ b/src/main/resources/assets/basemetals/models/block/diamond_door_iron_door_top_right.json @@ -0,0 +1,74 @@ +{ + "parent": "minecraft:block/iron_door_top_right", + "textures": { + "particle": "minecraft:block/diamond_block", + "bottom": "basemetals:block/diamond_door_lower", + "top": "basemetals:block/diamond_door_upper" + }, + "elements": [ + { + "from": [ + 0, + 0, + 0 + ], + "to": [ + 3, + 16, + 16 + ], + "faces": { + "up": { + "uv": [ + 0, + 0, + 16, + 3 + ], + "texture": "#top", + "cullface": "up", + "rotation": 270 + }, + "north": { + "uv": [ + 3, + 0, + 0, + 16 + ], + "texture": "#top", + "cullface": "north" + }, + "south": { + "uv": [ + 0, + 0, + 3, + 16 + ], + "texture": "#top", + "cullface": "south" + }, + "west": { + "uv": [ + 16, + 0, + 0, + 16 + ], + "texture": "#top", + "cullface": "west" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#top" + } + } + } + ] +} diff --git a/src/main/resources/assets/basemetals/models/block/diamond_door_iron_door_top_right_open.json b/src/main/resources/assets/basemetals/models/block/diamond_door_iron_door_top_right_open.json new file mode 100644 index 000000000..91c5883ff --- /dev/null +++ b/src/main/resources/assets/basemetals/models/block/diamond_door_iron_door_top_right_open.json @@ -0,0 +1,74 @@ +{ + "parent": "minecraft:block/iron_door_top_right_open", + "textures": { + "particle": "minecraft:block/diamond_block", + "bottom": "basemetals:block/diamond_door_lower", + "top": "basemetals:block/diamond_door_upper" + }, + "elements": [ + { + "from": [ + 0, + 0, + 0 + ], + "to": [ + 3, + 16, + 16 + ], + "faces": { + "up": { + "uv": [ + 0, + 0, + 16, + 3 + ], + "texture": "#top", + "cullface": "up", + "rotation": 90 + }, + "north": { + "uv": [ + 3, + 0, + 0, + 16 + ], + "texture": "#top", + "cullface": "north" + }, + "south": { + "uv": [ + 3, + 0, + 0, + 16 + ], + "texture": "#top", + "cullface": "south" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#top", + "cullface": "west" + }, + "east": { + "uv": [ + 16, + 0, + 0, + 16 + ], + "texture": "#top" + } + } + } + ] +} diff --git a/src/main/resources/assets/basemetals/models/block/diamond_door_top.json b/src/main/resources/assets/basemetals/models/block/diamond_door_top.json deleted file mode 100644 index 1eb5a7c58..000000000 --- a/src/main/resources/assets/basemetals/models/block/diamond_door_top.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/door_top_left", - "textures": { - "bottom": "basemetals:block/diamond_door_lower", - "top": "basemetals:block/diamond_door_upper" - } -} diff --git a/src/main/resources/assets/basemetals/models/block/diamond_door_top_rh.json b/src/main/resources/assets/basemetals/models/block/diamond_door_top_rh.json deleted file mode 100644 index 8995512f0..000000000 --- a/src/main/resources/assets/basemetals/models/block/diamond_door_top_rh.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/door_top_right", - "textures": { - "bottom": "basemetals:block/diamond_door_lower", - "top": "basemetals:block/diamond_door_upper" - } -} diff --git a/src/main/resources/assets/basemetals/models/block/diamond_double_slab.json b/src/main/resources/assets/basemetals/models/block/diamond_double_slab.json new file mode 100644 index 000000000..df3e1c48d --- /dev/null +++ b/src/main/resources/assets/basemetals/models/block/diamond_double_slab.json @@ -0,0 +1,54 @@ +{ + "parent": "minecraft:block/quartz_block", + "textures": { + "particle": "minecraft:block/diamond_block", + "down": "minecraft:block/diamond_block", + "up": "minecraft:block/diamond_block", + "north": "minecraft:block/diamond_block", + "east": "minecraft:block/diamond_block", + "south": "minecraft:block/diamond_block", + "west": "minecraft:block/diamond_block", + "end": "minecraft:block/diamond_block", + "side": "minecraft:block/diamond_block" + }, + "elements": [ + { + "from": [ + 0, + 0, + 0 + ], + "to": [ + 16, + 16, + 16 + ], + "faces": { + "down": { + "texture": "#down", + "cullface": "down" + }, + "up": { + "texture": "#up", + "cullface": "up" + }, + "north": { + "texture": "#north", + "cullface": "north" + }, + "south": { + "texture": "#south", + "cullface": "south" + }, + "west": { + "texture": "#west", + "cullface": "west" + }, + "east": { + "texture": "#east", + "cullface": "east" + } + } + } + ] +} diff --git a/src/main/resources/assets/basemetals/models/block/diamond_inner_stairs.json b/src/main/resources/assets/basemetals/models/block/diamond_inner_stairs.json deleted file mode 100644 index cb4f16e3f..000000000 --- a/src/main/resources/assets/basemetals/models/block/diamond_inner_stairs.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/inner_stairs", - "textures": { - "bottom": "minecraft:block/diamond_block", - "top": "minecraft:block/diamond_block", - "side": "minecraft:block/diamond_block" - } -} diff --git a/src/main/resources/assets/basemetals/models/block/diamond_lever.json b/src/main/resources/assets/basemetals/models/block/diamond_lever.json deleted file mode 100644 index 0a37d218f..000000000 --- a/src/main/resources/assets/basemetals/models/block/diamond_lever.json +++ /dev/null @@ -1,33 +0,0 @@ -{ - "ambientocclusion": false, - "textures": { - "particle": "minecraft:block/diamond_block", - "base": "minecraft:block/diamond_block", - "lever": "minecraft:block/lever" - }, - "elements": [ - { "from": [ 5, 0, 4 ], - "to": [ 11, 3, 12 ], - "faces": { - "down": { "uv": [ 5, 4, 11, 12 ], "texture": "#base" }, - "up": { "uv": [ 5, 4, 11, 12 ], "texture": "#base" }, - "north": { "uv": [ 5, 0, 11, 3 ], "texture": "#base" }, - "south": { "uv": [ 5, 0, 11, 3 ], "texture": "#base" }, - "west": { "uv": [ 4, 0, 12, 3 ], "texture": "#base" }, - "east": { "uv": [ 4, 0, 12, 3 ], "texture": "#base" } - } - }, - { "from": [ 7, 1, 7 ], - "to": [ 9, 11, 9 ], - "rotation": { "origin": [ 8, 1, 8 ], "axis": "x", "angle": -45 }, - "faces": { - "down": { "uv": [ 7, 6, 9, 8 ], "texture": "#lever" }, - "up": { "uv": [ 7, 6, 9, 8 ], "texture": "#lever" }, - "north": { "uv": [ 7, 6, 9, 16 ], "texture": "#lever" }, - "south": { "uv": [ 7, 6, 9, 16 ], "texture": "#lever" }, - "west": { "uv": [ 7, 6, 9, 16 ], "texture": "#lever" }, - "east": { "uv": [ 7, 6, 9, 16 ], "texture": "#lever" } - } - } - ] -} diff --git a/src/main/resources/assets/basemetals/models/block/diamond_lever_lever.json b/src/main/resources/assets/basemetals/models/block/diamond_lever_lever.json new file mode 100644 index 000000000..c56d76c03 --- /dev/null +++ b/src/main/resources/assets/basemetals/models/block/diamond_lever_lever.json @@ -0,0 +1,147 @@ +{ + "parent": "minecraft:block/lever", + "textures": { + "particle": "minecraft:block/diamond_block", + "base": "minecraft:block/diamond_block", + "lever": "block/lever" + }, + "elements": [ + { + "from": [ + 5, + -0.02, + 4 + ], + "to": [ + 11, + 2.98, + 12 + ], + "faces": { + "down": { + "uv": [ + 5, + 4, + 11, + 12 + ], + "texture": "#base", + "cullface": "down" + }, + "up": { + "uv": [ + 5, + 4, + 11, + 12 + ], + "texture": "#base" + }, + "north": { + "uv": [ + 5, + 0, + 11, + 3 + ], + "texture": "#base" + }, + "south": { + "uv": [ + 5, + 0, + 11, + 3 + ], + "texture": "#base" + }, + "west": { + "uv": [ + 4, + 0, + 12, + 3 + ], + "texture": "#base" + }, + "east": { + "uv": [ + 4, + 0, + 12, + 3 + ], + "texture": "#base" + } + } + }, + { + "from": [ + 7, + 1, + 7 + ], + "to": [ + 9, + 11, + 9 + ], + "rotation": { + "origin": [ + 8, + 1, + 8 + ], + "axis": "x", + "angle": -45 + }, + "faces": { + "up": { + "uv": [ + 7, + 6, + 9, + 8 + ], + "texture": "#lever" + }, + "north": { + "uv": [ + 7, + 6, + 9, + 16 + ], + "texture": "#lever" + }, + "south": { + "uv": [ + 7, + 6, + 9, + 16 + ], + "texture": "#lever" + }, + "west": { + "uv": [ + 7, + 6, + 9, + 16 + ], + "texture": "#lever" + }, + "east": { + "uv": [ + 7, + 6, + 9, + 16 + ], + "texture": "#lever" + } + } + } + ] +} diff --git a/src/main/resources/assets/basemetals/models/block/diamond_lever_lever_on.json b/src/main/resources/assets/basemetals/models/block/diamond_lever_lever_on.json new file mode 100644 index 000000000..59a5ff9fc --- /dev/null +++ b/src/main/resources/assets/basemetals/models/block/diamond_lever_lever_on.json @@ -0,0 +1,147 @@ +{ + "parent": "minecraft:block/lever_on", + "textures": { + "particle": "minecraft:block/diamond_block", + "base": "minecraft:block/diamond_block", + "lever": "block/lever" + }, + "elements": [ + { + "from": [ + 5, + -0.02, + 4 + ], + "to": [ + 11, + 2.98, + 12 + ], + "faces": { + "down": { + "uv": [ + 5, + 4, + 11, + 12 + ], + "texture": "#base", + "cullface": "down" + }, + "up": { + "uv": [ + 5, + 4, + 11, + 12 + ], + "texture": "#base" + }, + "north": { + "uv": [ + 5, + 0, + 11, + 3 + ], + "texture": "#base" + }, + "south": { + "uv": [ + 5, + 0, + 11, + 3 + ], + "texture": "#base" + }, + "west": { + "uv": [ + 4, + 0, + 12, + 3 + ], + "texture": "#base" + }, + "east": { + "uv": [ + 4, + 0, + 12, + 3 + ], + "texture": "#base" + } + } + }, + { + "from": [ + 7, + 1, + 7 + ], + "to": [ + 9, + 11, + 9 + ], + "rotation": { + "origin": [ + 8, + 1, + 8 + ], + "axis": "x", + "angle": 45 + }, + "faces": { + "up": { + "uv": [ + 7, + 6, + 9, + 8 + ], + "texture": "#lever" + }, + "north": { + "uv": [ + 7, + 6, + 9, + 16 + ], + "texture": "#lever" + }, + "south": { + "uv": [ + 7, + 6, + 9, + 16 + ], + "texture": "#lever" + }, + "west": { + "uv": [ + 7, + 6, + 9, + 16 + ], + "texture": "#lever" + }, + "east": { + "uv": [ + 7, + 6, + 9, + 16 + ], + "texture": "#lever" + } + } + } + ] +} diff --git a/src/main/resources/assets/basemetals/models/block/diamond_lever_off.json b/src/main/resources/assets/basemetals/models/block/diamond_lever_off.json deleted file mode 100644 index f18a34344..000000000 --- a/src/main/resources/assets/basemetals/models/block/diamond_lever_off.json +++ /dev/null @@ -1,33 +0,0 @@ -{ - "ambientocclusion": false, - "textures": { - "particle": "minecraft:block/diamond_block", - "base": "minecraft:block/diamond_block", - "lever": "minecraft:block/lever" - }, - "elements": [ - { "from": [ 5, 0, 4 ], - "to": [ 11, 3, 12 ], - "faces": { - "down": { "uv": [ 5, 4, 11, 12 ], "texture": "#base" }, - "up": { "uv": [ 5, 4, 11, 12 ], "texture": "#base" }, - "north": { "uv": [ 5, 0, 11, 3 ], "texture": "#base" }, - "south": { "uv": [ 5, 0, 11, 3 ], "texture": "#base" }, - "west": { "uv": [ 4, 0, 12, 3 ], "texture": "#base" }, - "east": { "uv": [ 4, 0, 12, 3 ], "texture": "#base" } - } - }, - { "from": [ 7, 1, 7 ], - "to": [ 9, 11, 9 ], - "rotation": { "origin": [ 8, 1, 8 ], "axis": "x", "angle": 45 }, - "faces": { - "down": { "uv": [ 7, 6, 9, 8 ], "texture": "#lever" }, - "up": { "uv": [ 7, 6, 9, 8 ], "texture": "#lever" }, - "north": { "uv": [ 7, 6, 9, 16 ], "texture": "#lever" }, - "south": { "uv": [ 7, 6, 9, 16 ], "texture": "#lever" }, - "west": { "uv": [ 7, 6, 9, 16 ], "texture": "#lever" }, - "east": { "uv": [ 7, 6, 9, 16 ], "texture": "#lever" } - } - } - ] -} diff --git a/src/main/resources/assets/basemetals/models/block/diamond_outer_stairs.json b/src/main/resources/assets/basemetals/models/block/diamond_outer_stairs.json deleted file mode 100644 index 775b2f291..000000000 --- a/src/main/resources/assets/basemetals/models/block/diamond_outer_stairs.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/outer_stairs", - "textures": { - "bottom": "minecraft:block/diamond_block", - "top": "minecraft:block/diamond_block", - "side": "minecraft:block/diamond_block" - } -} diff --git a/src/main/resources/assets/basemetals/models/block/diamond_pressure_plate_down.json b/src/main/resources/assets/basemetals/models/block/diamond_pressure_plate_down.json deleted file mode 100644 index fa30de228..000000000 --- a/src/main/resources/assets/basemetals/models/block/diamond_pressure_plate_down.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/pressure_plate_down", - "textures": { - "texture": "minecraft:block/diamond_block" - } -} diff --git a/src/main/resources/assets/basemetals/models/block/diamond_pressure_plate_polished_blackstone_pressure_plate.json b/src/main/resources/assets/basemetals/models/block/diamond_pressure_plate_polished_blackstone_pressure_plate.json new file mode 100644 index 000000000..753def44b --- /dev/null +++ b/src/main/resources/assets/basemetals/models/block/diamond_pressure_plate_polished_blackstone_pressure_plate.json @@ -0,0 +1,78 @@ +{ + "parent": "minecraft:block/polished_blackstone_pressure_plate", + "textures": { + "particle": "minecraft:block/diamond_block", + "texture": "minecraft:block/diamond_block" + }, + "elements": [ + { + "from": [ + 1, + 0, + 1 + ], + "to": [ + 15, + 1, + 15 + ], + "faces": { + "down": { + "uv": [ + 1, + 1, + 15, + 15 + ], + "texture": "#texture", + "cullface": "down" + }, + "up": { + "uv": [ + 1, + 1, + 15, + 15 + ], + "texture": "#texture" + }, + "north": { + "uv": [ + 1, + 15, + 15, + 16 + ], + "texture": "#texture" + }, + "south": { + "uv": [ + 1, + 15, + 15, + 16 + ], + "texture": "#texture" + }, + "west": { + "uv": [ + 1, + 15, + 15, + 16 + ], + "texture": "#texture" + }, + "east": { + "uv": [ + 1, + 15, + 15, + 16 + ], + "texture": "#texture" + } + } + } + ] +} diff --git a/src/main/resources/assets/basemetals/models/block/diamond_pressure_plate_polished_blackstone_pressure_plate_down.json b/src/main/resources/assets/basemetals/models/block/diamond_pressure_plate_polished_blackstone_pressure_plate_down.json new file mode 100644 index 000000000..fd04051e1 --- /dev/null +++ b/src/main/resources/assets/basemetals/models/block/diamond_pressure_plate_polished_blackstone_pressure_plate_down.json @@ -0,0 +1,78 @@ +{ + "parent": "minecraft:block/polished_blackstone_pressure_plate_down", + "textures": { + "particle": "minecraft:block/diamond_block", + "texture": "minecraft:block/diamond_block" + }, + "elements": [ + { + "from": [ + 1, + 0, + 1 + ], + "to": [ + 15, + 0.5, + 15 + ], + "faces": { + "down": { + "uv": [ + 1, + 1, + 15, + 15 + ], + "texture": "#texture", + "cullface": "down" + }, + "up": { + "uv": [ + 1, + 1, + 15, + 15 + ], + "texture": "#texture" + }, + "north": { + "uv": [ + 1, + 15, + 15, + 15.5 + ], + "texture": "#texture" + }, + "south": { + "uv": [ + 1, + 15, + 15, + 15.5 + ], + "texture": "#texture" + }, + "west": { + "uv": [ + 1, + 15, + 15, + 15.5 + ], + "texture": "#texture" + }, + "east": { + "uv": [ + 1, + 15, + 15, + 15.5 + ], + "texture": "#texture" + } + } + } + ] +} diff --git a/src/main/resources/assets/basemetals/models/block/diamond_pressure_plate_up.json b/src/main/resources/assets/basemetals/models/block/diamond_pressure_plate_up.json index 0879c4094..6863b84b3 100644 --- a/src/main/resources/assets/basemetals/models/block/diamond_pressure_plate_up.json +++ b/src/main/resources/assets/basemetals/models/block/diamond_pressure_plate_up.json @@ -1,6 +1,6 @@ { - "parent": "block/pressure_plate_up", - "textures": { - "texture": "minecraft:block/diamond_block" - } + "parent": "block/pressure_plate_up", + "textures": { + "texture": "minecraft:block/diamond_block" + } } diff --git a/src/main/resources/assets/basemetals/models/block/diamond_slab_quartz_block.json b/src/main/resources/assets/basemetals/models/block/diamond_slab_quartz_block.json new file mode 100644 index 000000000..df3e1c48d --- /dev/null +++ b/src/main/resources/assets/basemetals/models/block/diamond_slab_quartz_block.json @@ -0,0 +1,54 @@ +{ + "parent": "minecraft:block/quartz_block", + "textures": { + "particle": "minecraft:block/diamond_block", + "down": "minecraft:block/diamond_block", + "up": "minecraft:block/diamond_block", + "north": "minecraft:block/diamond_block", + "east": "minecraft:block/diamond_block", + "south": "minecraft:block/diamond_block", + "west": "minecraft:block/diamond_block", + "end": "minecraft:block/diamond_block", + "side": "minecraft:block/diamond_block" + }, + "elements": [ + { + "from": [ + 0, + 0, + 0 + ], + "to": [ + 16, + 16, + 16 + ], + "faces": { + "down": { + "texture": "#down", + "cullface": "down" + }, + "up": { + "texture": "#up", + "cullface": "up" + }, + "north": { + "texture": "#north", + "cullface": "north" + }, + "south": { + "texture": "#south", + "cullface": "south" + }, + "west": { + "texture": "#west", + "cullface": "west" + }, + "east": { + "texture": "#east", + "cullface": "east" + } + } + } + ] +} diff --git a/src/main/resources/assets/basemetals/models/block/diamond_slab_quartz_slab.json b/src/main/resources/assets/basemetals/models/block/diamond_slab_quartz_slab.json new file mode 100644 index 000000000..877e09958 --- /dev/null +++ b/src/main/resources/assets/basemetals/models/block/diamond_slab_quartz_slab.json @@ -0,0 +1,84 @@ +{ + "parent": "minecraft:block/quartz_slab", + "textures": { + "particle": "minecraft:block/diamond_block", + "bottom": "minecraft:block/diamond_block", + "side": "minecraft:block/diamond_block", + "top": "minecraft:block/diamond_block" + }, + "elements": [ + { + "from": [ + 0, + 0, + 0 + ], + "to": [ + 16, + 8, + 16 + ], + "faces": { + "down": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#bottom", + "cullface": "down" + }, + "up": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#top" + }, + "north": { + "uv": [ + 0, + 8, + 16, + 16 + ], + "texture": "#side", + "cullface": "north" + }, + "south": { + "uv": [ + 0, + 8, + 16, + 16 + ], + "texture": "#side", + "cullface": "south" + }, + "west": { + "uv": [ + 0, + 8, + 16, + 16 + ], + "texture": "#side", + "cullface": "west" + }, + "east": { + "uv": [ + 0, + 8, + 16, + 16 + ], + "texture": "#side", + "cullface": "east" + } + } + } + ] +} diff --git a/src/main/resources/assets/basemetals/models/block/diamond_slab_quartz_slab_top.json b/src/main/resources/assets/basemetals/models/block/diamond_slab_quartz_slab_top.json new file mode 100644 index 000000000..32d95d5c4 --- /dev/null +++ b/src/main/resources/assets/basemetals/models/block/diamond_slab_quartz_slab_top.json @@ -0,0 +1,84 @@ +{ + "parent": "minecraft:block/quartz_slab_top", + "textures": { + "particle": "minecraft:block/diamond_block", + "bottom": "minecraft:block/diamond_block", + "side": "minecraft:block/diamond_block", + "top": "minecraft:block/diamond_block" + }, + "elements": [ + { + "from": [ + 0, + 8, + 0 + ], + "to": [ + 16, + 16, + 16 + ], + "faces": { + "down": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#bottom" + }, + "up": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#top", + "cullface": "up" + }, + "north": { + "uv": [ + 0, + 0, + 16, + 8 + ], + "texture": "#side", + "cullface": "north" + }, + "south": { + "uv": [ + 0, + 0, + 16, + 8 + ], + "texture": "#side", + "cullface": "south" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 8 + ], + "texture": "#side", + "cullface": "west" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 8 + ], + "texture": "#side", + "cullface": "east" + } + } + } + ] +} diff --git a/src/main/resources/assets/basemetals/models/block/diamond_stairs.json b/src/main/resources/assets/basemetals/models/block/diamond_stairs.json index d73965e10..a99b2d107 100644 --- a/src/main/resources/assets/basemetals/models/block/diamond_stairs.json +++ b/src/main/resources/assets/basemetals/models/block/diamond_stairs.json @@ -1,8 +1,8 @@ { - "parent": "block/stairs", - "textures": { - "bottom": "minecraft:block/diamond_block", - "top": "minecraft:block/diamond_block", - "side": "minecraft:block/diamond_block" - } + "parent": "block/stairs", + "textures": { + "bottom": "minecraft:block/diamond_block", + "top": "minecraft:block/diamond_block", + "side": "minecraft:block/diamond_block" + } } diff --git a/src/main/resources/assets/basemetals/models/block/diamond_stairs_quartz_stairs.json b/src/main/resources/assets/basemetals/models/block/diamond_stairs_quartz_stairs.json new file mode 100644 index 000000000..5e07939c7 --- /dev/null +++ b/src/main/resources/assets/basemetals/models/block/diamond_stairs_quartz_stairs.json @@ -0,0 +1,147 @@ +{ + "parent": "minecraft:block/quartz_stairs", + "textures": { + "particle": "minecraft:block/diamond_block", + "bottom": "minecraft:block/diamond_block", + "side": "minecraft:block/diamond_block", + "top": "minecraft:block/diamond_block" + }, + "elements": [ + { + "from": [ + 0, + 0, + 0 + ], + "to": [ + 16, + 8, + 16 + ], + "faces": { + "down": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#bottom", + "cullface": "down" + }, + "up": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#top" + }, + "north": { + "uv": [ + 0, + 8, + 16, + 16 + ], + "texture": "#side", + "cullface": "north" + }, + "south": { + "uv": [ + 0, + 8, + 16, + 16 + ], + "texture": "#side", + "cullface": "south" + }, + "west": { + "uv": [ + 0, + 8, + 16, + 16 + ], + "texture": "#side", + "cullface": "west" + }, + "east": { + "uv": [ + 0, + 8, + 16, + 16 + ], + "texture": "#side", + "cullface": "east" + } + } + }, + { + "from": [ + 8, + 8, + 0 + ], + "to": [ + 16, + 16, + 16 + ], + "faces": { + "up": { + "uv": [ + 8, + 0, + 16, + 16 + ], + "texture": "#top", + "cullface": "up" + }, + "north": { + "uv": [ + 0, + 0, + 8, + 8 + ], + "texture": "#side", + "cullface": "north" + }, + "south": { + "uv": [ + 8, + 0, + 16, + 8 + ], + "texture": "#side", + "cullface": "south" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 8 + ], + "texture": "#side" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 8 + ], + "texture": "#side", + "cullface": "east" + } + } + } + ] +} diff --git a/src/main/resources/assets/basemetals/models/block/diamond_stairs_quartz_stairs_inner.json b/src/main/resources/assets/basemetals/models/block/diamond_stairs_quartz_stairs_inner.json new file mode 100644 index 000000000..d37d10003 --- /dev/null +++ b/src/main/resources/assets/basemetals/models/block/diamond_stairs_quartz_stairs_inner.json @@ -0,0 +1,200 @@ +{ + "parent": "minecraft:block/quartz_stairs_inner", + "textures": { + "particle": "minecraft:block/diamond_block", + "bottom": "minecraft:block/diamond_block", + "side": "minecraft:block/diamond_block", + "top": "minecraft:block/diamond_block" + }, + "elements": [ + { + "from": [ + 0, + 0, + 0 + ], + "to": [ + 16, + 8, + 16 + ], + "faces": { + "down": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#bottom", + "cullface": "down" + }, + "up": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#top" + }, + "north": { + "uv": [ + 0, + 8, + 16, + 16 + ], + "texture": "#side", + "cullface": "north" + }, + "south": { + "uv": [ + 0, + 8, + 16, + 16 + ], + "texture": "#side", + "cullface": "south" + }, + "west": { + "uv": [ + 0, + 8, + 16, + 16 + ], + "texture": "#side", + "cullface": "west" + }, + "east": { + "uv": [ + 0, + 8, + 16, + 16 + ], + "texture": "#side", + "cullface": "east" + } + } + }, + { + "from": [ + 8, + 8, + 0 + ], + "to": [ + 16, + 16, + 16 + ], + "faces": { + "up": { + "uv": [ + 8, + 0, + 16, + 16 + ], + "texture": "#top", + "cullface": "up" + }, + "north": { + "uv": [ + 0, + 0, + 8, + 8 + ], + "texture": "#side", + "cullface": "north" + }, + "south": { + "uv": [ + 8, + 0, + 16, + 8 + ], + "texture": "#side", + "cullface": "south" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 8 + ], + "texture": "#side" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 8 + ], + "texture": "#side", + "cullface": "east" + } + } + }, + { + "from": [ + 0, + 8, + 8 + ], + "to": [ + 8, + 16, + 16 + ], + "faces": { + "up": { + "uv": [ + 0, + 8, + 8, + 16 + ], + "texture": "#top", + "cullface": "up" + }, + "north": { + "uv": [ + 8, + 0, + 16, + 8 + ], + "texture": "#side" + }, + "south": { + "uv": [ + 0, + 0, + 8, + 8 + ], + "texture": "#side", + "cullface": "south" + }, + "west": { + "uv": [ + 8, + 0, + 16, + 8 + ], + "texture": "#side", + "cullface": "west" + } + } + } + ] +} diff --git a/src/main/resources/assets/basemetals/models/block/diamond_stairs_quartz_stairs_outer.json b/src/main/resources/assets/basemetals/models/block/diamond_stairs_quartz_stairs_outer.json new file mode 100644 index 000000000..d021d965f --- /dev/null +++ b/src/main/resources/assets/basemetals/models/block/diamond_stairs_quartz_stairs_outer.json @@ -0,0 +1,146 @@ +{ + "parent": "minecraft:block/quartz_stairs_outer", + "textures": { + "particle": "minecraft:block/diamond_block", + "bottom": "minecraft:block/diamond_block", + "side": "minecraft:block/diamond_block", + "top": "minecraft:block/diamond_block" + }, + "elements": [ + { + "from": [ + 0, + 0, + 0 + ], + "to": [ + 16, + 8, + 16 + ], + "faces": { + "down": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#bottom", + "cullface": "down" + }, + "up": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#top" + }, + "north": { + "uv": [ + 0, + 8, + 16, + 16 + ], + "texture": "#side", + "cullface": "north" + }, + "south": { + "uv": [ + 0, + 8, + 16, + 16 + ], + "texture": "#side", + "cullface": "south" + }, + "west": { + "uv": [ + 0, + 8, + 16, + 16 + ], + "texture": "#side", + "cullface": "west" + }, + "east": { + "uv": [ + 0, + 8, + 16, + 16 + ], + "texture": "#side", + "cullface": "east" + } + } + }, + { + "from": [ + 8, + 8, + 8 + ], + "to": [ + 16, + 16, + 16 + ], + "faces": { + "up": { + "uv": [ + 8, + 8, + 16, + 16 + ], + "texture": "#top", + "cullface": "up" + }, + "north": { + "uv": [ + 0, + 0, + 8, + 8 + ], + "texture": "#side" + }, + "south": { + "uv": [ + 8, + 0, + 16, + 8 + ], + "texture": "#side", + "cullface": "south" + }, + "west": { + "uv": [ + 8, + 0, + 16, + 8 + ], + "texture": "#side" + }, + "east": { + "uv": [ + 0, + 0, + 8, + 8 + ], + "texture": "#side", + "cullface": "east" + } + } + } + ] +} diff --git a/src/main/resources/assets/basemetals/models/block/diamond_trapdoor_bottom.json b/src/main/resources/assets/basemetals/models/block/diamond_trapdoor_bottom.json index 91e83c9f2..f9af53443 100644 --- a/src/main/resources/assets/basemetals/models/block/diamond_trapdoor_bottom.json +++ b/src/main/resources/assets/basemetals/models/block/diamond_trapdoor_bottom.json @@ -1,6 +1,6 @@ { - "parent": "minecraft:block/template_orientable_trapdoor_bottom", - "textures": { - "texture": "basemetals:block/diamond_trapdoor" - } + "parent": "minecraft:block/template_orientable_trapdoor_bottom", + "textures": { + "texture": "basemetals:block/diamond_trapdoor" + } } diff --git a/src/main/resources/assets/basemetals/models/block/diamond_trapdoor_iron_trapdoor_bottom.json b/src/main/resources/assets/basemetals/models/block/diamond_trapdoor_iron_trapdoor_bottom.json new file mode 100644 index 000000000..b93dfc8aa --- /dev/null +++ b/src/main/resources/assets/basemetals/models/block/diamond_trapdoor_iron_trapdoor_bottom.json @@ -0,0 +1,82 @@ +{ + "parent": "minecraft:block/iron_trapdoor_bottom", + "textures": { + "particle": "minecraft:block/diamond_block", + "texture": "basemetals:block/diamond_trapdoor" + }, + "elements": [ + { + "from": [ + 0, + 0, + 0 + ], + "to": [ + 16, + 3, + 16 + ], + "faces": { + "down": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#texture", + "cullface": "down" + }, + "up": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#texture" + }, + "north": { + "uv": [ + 0, + 16, + 16, + 13 + ], + "texture": "#texture", + "cullface": "north" + }, + "south": { + "uv": [ + 0, + 16, + 16, + 13 + ], + "texture": "#texture", + "cullface": "south" + }, + "west": { + "uv": [ + 0, + 16, + 16, + 13 + ], + "texture": "#texture", + "cullface": "west" + }, + "east": { + "uv": [ + 0, + 16, + 16, + 13 + ], + "texture": "#texture", + "cullface": "east" + } + } + } + ] +} diff --git a/src/main/resources/assets/basemetals/models/block/diamond_trapdoor_iron_trapdoor_open.json b/src/main/resources/assets/basemetals/models/block/diamond_trapdoor_iron_trapdoor_open.json new file mode 100644 index 000000000..f28a22821 --- /dev/null +++ b/src/main/resources/assets/basemetals/models/block/diamond_trapdoor_iron_trapdoor_open.json @@ -0,0 +1,82 @@ +{ + "parent": "minecraft:block/iron_trapdoor_open", + "textures": { + "particle": "minecraft:block/diamond_block", + "texture": "basemetals:block/diamond_trapdoor" + }, + "elements": [ + { + "from": [ + 0, + 0, + 13 + ], + "to": [ + 16, + 16, + 16 + ], + "faces": { + "down": { + "uv": [ + 0, + 13, + 16, + 16 + ], + "texture": "#texture", + "cullface": "down" + }, + "up": { + "uv": [ + 0, + 16, + 16, + 13 + ], + "texture": "#texture", + "cullface": "up" + }, + "north": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#texture" + }, + "south": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#texture", + "cullface": "south" + }, + "west": { + "uv": [ + 16, + 0, + 13, + 16 + ], + "texture": "#texture", + "cullface": "west" + }, + "east": { + "uv": [ + 13, + 0, + 16, + 16 + ], + "texture": "#texture", + "cullface": "east" + } + } + } + ] +} diff --git a/src/main/resources/assets/basemetals/models/block/diamond_trapdoor_iron_trapdoor_top.json b/src/main/resources/assets/basemetals/models/block/diamond_trapdoor_iron_trapdoor_top.json new file mode 100644 index 000000000..05a6da646 --- /dev/null +++ b/src/main/resources/assets/basemetals/models/block/diamond_trapdoor_iron_trapdoor_top.json @@ -0,0 +1,82 @@ +{ + "parent": "minecraft:block/iron_trapdoor_top", + "textures": { + "particle": "minecraft:block/diamond_block", + "texture": "basemetals:block/diamond_trapdoor" + }, + "elements": [ + { + "from": [ + 0, + 13, + 0 + ], + "to": [ + 16, + 16, + 16 + ], + "faces": { + "down": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#texture" + }, + "up": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#texture", + "cullface": "up" + }, + "north": { + "uv": [ + 0, + 16, + 16, + 13 + ], + "texture": "#texture", + "cullface": "north" + }, + "south": { + "uv": [ + 0, + 16, + 16, + 13 + ], + "texture": "#texture", + "cullface": "south" + }, + "west": { + "uv": [ + 0, + 16, + 16, + 13 + ], + "texture": "#texture", + "cullface": "west" + }, + "east": { + "uv": [ + 0, + 16, + 16, + 13 + ], + "texture": "#texture", + "cullface": "east" + } + } + } + ] +} diff --git a/src/main/resources/assets/basemetals/models/block/diamond_trapdoor_open.json b/src/main/resources/assets/basemetals/models/block/diamond_trapdoor_open.json deleted file mode 100644 index 843d1bf62..000000000 --- a/src/main/resources/assets/basemetals/models/block/diamond_trapdoor_open.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/template_orientable_trapdoor_open", - "textures": { - "texture": "basemetals:block/diamond_trapdoor" - } -} diff --git a/src/main/resources/assets/basemetals/models/block/diamond_trapdoor_top.json b/src/main/resources/assets/basemetals/models/block/diamond_trapdoor_top.json deleted file mode 100644 index 8c5a1c114..000000000 --- a/src/main/resources/assets/basemetals/models/block/diamond_trapdoor_top.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/template_orientable_trapdoor_top", - "textures": { - "texture": "basemetals:block/diamond_trapdoor" - } -} diff --git a/src/main/resources/assets/basemetals/models/block/diamond_wall_cobblestone_wall_post.json b/src/main/resources/assets/basemetals/models/block/diamond_wall_cobblestone_wall_post.json new file mode 100644 index 000000000..0e00ec78e --- /dev/null +++ b/src/main/resources/assets/basemetals/models/block/diamond_wall_cobblestone_wall_post.json @@ -0,0 +1,44 @@ +{ + "parent": "minecraft:block/cobblestone_wall_post", + "textures": { + "particle": "minecraft:block/diamond_block", + "wall": "minecraft:block/diamond_block" + }, + "elements": [ + { + "from": [ + 4, + 0, + 4 + ], + "to": [ + 12, + 16, + 12 + ], + "faces": { + "down": { + "texture": "#wall", + "cullface": "down" + }, + "up": { + "texture": "#wall", + "cullface": "up" + }, + "north": { + "texture": "#wall" + }, + "south": { + "texture": "#wall" + }, + "west": { + "texture": "#wall" + }, + "east": { + "texture": "#wall" + } + }, + "__comment": "Center post" + } + ] +} diff --git a/src/main/resources/assets/basemetals/models/block/diamond_wall_cobblestone_wall_side.json b/src/main/resources/assets/basemetals/models/block/diamond_wall_cobblestone_wall_side.json new file mode 100644 index 000000000..9bce2501b --- /dev/null +++ b/src/main/resources/assets/basemetals/models/block/diamond_wall_cobblestone_wall_side.json @@ -0,0 +1,41 @@ +{ + "parent": "minecraft:block/cobblestone_wall_side", + "textures": { + "particle": "minecraft:block/diamond_block", + "wall": "minecraft:block/diamond_block" + }, + "elements": [ + { + "from": [ + 5, + 0, + 0 + ], + "to": [ + 11, + 14, + 8 + ], + "faces": { + "down": { + "texture": "#wall", + "cullface": "down" + }, + "up": { + "texture": "#wall" + }, + "north": { + "texture": "#wall", + "cullface": "north" + }, + "west": { + "texture": "#wall" + }, + "east": { + "texture": "#wall" + } + }, + "__comment": "wall" + } + ] +} diff --git a/src/main/resources/assets/basemetals/models/block/diamond_wall_cobblestone_wall_side_tall.json b/src/main/resources/assets/basemetals/models/block/diamond_wall_cobblestone_wall_side_tall.json new file mode 100644 index 000000000..5edab3711 --- /dev/null +++ b/src/main/resources/assets/basemetals/models/block/diamond_wall_cobblestone_wall_side_tall.json @@ -0,0 +1,41 @@ +{ + "parent": "minecraft:block/cobblestone_wall_side_tall", + "textures": { + "particle": "minecraft:block/diamond_block", + "wall": "minecraft:block/diamond_block" + }, + "elements": [ + { + "from": [ + 5, + 0, + 0 + ], + "to": [ + 11, + 16, + 8 + ], + "faces": { + "down": { + "texture": "#wall", + "cullface": "down" + }, + "up": { + "texture": "#wall", + "cullface": "up" + }, + "north": { + "texture": "#wall", + "cullface": "north" + }, + "west": { + "texture": "#wall" + }, + "east": { + "texture": "#wall" + } + } + } + ] +} diff --git a/src/main/resources/assets/basemetals/models/block/diamond_wall_inventory.json b/src/main/resources/assets/basemetals/models/block/diamond_wall_inventory.json index 63964ddcd..632723e5b 100644 --- a/src/main/resources/assets/basemetals/models/block/diamond_wall_inventory.json +++ b/src/main/resources/assets/basemetals/models/block/diamond_wall_inventory.json @@ -1,6 +1,6 @@ { - "parent": "block/wall_inventory", - "textures": { - "wall": "minecraft:block/diamond_block" - } + "parent": "block/wall_inventory", + "textures": { + "wall": "minecraft:block/diamond_block" + } } diff --git a/src/main/resources/assets/basemetals/models/block/diamond_wall_post.json b/src/main/resources/assets/basemetals/models/block/diamond_wall_post.json deleted file mode 100644 index 00214b9af..000000000 --- a/src/main/resources/assets/basemetals/models/block/diamond_wall_post.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/template_wall_post", - "textures": { - "wall": "minecraft:block/diamond_block" - } -} diff --git a/src/main/resources/assets/basemetals/models/block/diamond_wall_side.json b/src/main/resources/assets/basemetals/models/block/diamond_wall_side.json deleted file mode 100644 index 84f6910a8..000000000 --- a/src/main/resources/assets/basemetals/models/block/diamond_wall_side.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/template_wall_side", - "textures": { - "wall": "minecraft:block/diamond_block" - } -} diff --git a/src/main/resources/assets/basemetals/models/block/emerald_bars_cap.json b/src/main/resources/assets/basemetals/models/block/emerald_bars_cap.json deleted file mode 100644 index 78897b457..000000000 --- a/src/main/resources/assets/basemetals/models/block/emerald_bars_cap.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "ambientocclusion": false, - "textures": { - "particle": "basemetals:block/emerald_bars", - "bars": "basemetals:block/emerald_bars", - "edge": "basemetals:block/emerald_bars" - }, - "elements": [ - { "from": [ 8, 0, 8 ], - "to": [ 8, 16, 9 ], - "faces": { - "west": { "uv": [ 8, 0, 7, 16 ], "texture": "#bars" }, - "east": { "uv": [ 7, 0, 8, 16 ], "texture": "#bars" } - } - }, - { "from": [ 7, 0, 9 ], - "to": [ 9, 16, 9 ], - "faces": { - "north": { "uv": [ 9, 0, 7, 16 ], "texture": "#bars" }, - "south": { "uv": [ 7, 0, 9, 16 ], "texture": "#bars" } - } - } - ] -} diff --git a/src/main/resources/assets/basemetals/models/block/emerald_bars_cap_alt.json b/src/main/resources/assets/basemetals/models/block/emerald_bars_cap_alt.json deleted file mode 100644 index 6b82f689e..000000000 --- a/src/main/resources/assets/basemetals/models/block/emerald_bars_cap_alt.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "ambientocclusion": false, - "textures": { - "particle": "basemetals:block/emerald_bars", - "bars": "basemetals:block/emerald_bars", - "edge": "basemetals:block/emerald_bars" - }, - "elements": [ - { "from": [ 8, 0, 7 ], - "to": [ 8, 16, 8 ], - "faces": { - "west": { "uv": [ 8, 0, 9, 16 ], "texture": "#bars" }, - "east": { "uv": [ 9, 0, 8, 16 ], "texture": "#bars" } - } - }, - { "from": [ 7, 0, 7 ], - "to": [ 9, 16, 7 ], - "faces": { - "north": { "uv": [ 7, 0, 9, 16 ], "texture": "#bars" }, - "south": { "uv": [ 9, 0, 7, 16 ], "texture": "#bars" } - } - } - ] -} diff --git a/src/main/resources/assets/basemetals/models/block/emerald_bars_iron_bars_cap.json b/src/main/resources/assets/basemetals/models/block/emerald_bars_iron_bars_cap.json new file mode 100644 index 000000000..72f9d9762 --- /dev/null +++ b/src/main/resources/assets/basemetals/models/block/emerald_bars_iron_bars_cap.json @@ -0,0 +1,74 @@ +{ + "parent": "minecraft:block/iron_bars_cap", + "textures": { + "particle": "minecraft:block/emerald_block", + "bars": "basemetals:block/emerald_bars", + "edge": "basemetals:block/emerald_bars" + }, + "elements": [ + { + "from": [ + 8, + 0, + 8 + ], + "to": [ + 8, + 16, + 9 + ], + "faces": { + "west": { + "uv": [ + 8, + 0, + 7, + 16 + ], + "texture": "#bars" + }, + "east": { + "uv": [ + 7, + 0, + 8, + 16 + ], + "texture": "#bars" + } + } + }, + { + "from": [ + 7, + 0, + 9 + ], + "to": [ + 9, + 16, + 9 + ], + "faces": { + "north": { + "uv": [ + 9, + 0, + 7, + 16 + ], + "texture": "#bars" + }, + "south": { + "uv": [ + 7, + 0, + 9, + 16 + ], + "texture": "#bars" + } + } + } + ] +} diff --git a/src/main/resources/assets/basemetals/models/block/emerald_bars_iron_bars_cap_alt.json b/src/main/resources/assets/basemetals/models/block/emerald_bars_iron_bars_cap_alt.json new file mode 100644 index 000000000..a50d84d29 --- /dev/null +++ b/src/main/resources/assets/basemetals/models/block/emerald_bars_iron_bars_cap_alt.json @@ -0,0 +1,74 @@ +{ + "parent": "minecraft:block/iron_bars_cap_alt", + "textures": { + "particle": "minecraft:block/emerald_block", + "bars": "basemetals:block/emerald_bars", + "edge": "basemetals:block/emerald_bars" + }, + "elements": [ + { + "from": [ + 8, + 0, + 7 + ], + "to": [ + 8, + 16, + 8 + ], + "faces": { + "west": { + "uv": [ + 8, + 0, + 9, + 16 + ], + "texture": "#bars" + }, + "east": { + "uv": [ + 9, + 0, + 8, + 16 + ], + "texture": "#bars" + } + } + }, + { + "from": [ + 7, + 0, + 7 + ], + "to": [ + 9, + 16, + 7 + ], + "faces": { + "north": { + "uv": [ + 7, + 0, + 9, + 16 + ], + "texture": "#bars" + }, + "south": { + "uv": [ + 9, + 0, + 7, + 16 + ], + "texture": "#bars" + } + } + } + ] +} diff --git a/src/main/resources/assets/basemetals/models/block/emerald_bars_iron_bars_post.json b/src/main/resources/assets/basemetals/models/block/emerald_bars_iron_bars_post.json new file mode 100644 index 000000000..d6ee5b292 --- /dev/null +++ b/src/main/resources/assets/basemetals/models/block/emerald_bars_iron_bars_post.json @@ -0,0 +1,73 @@ +{ + "parent": "minecraft:block/iron_bars_post", + "textures": { + "particle": "minecraft:block/emerald_block", + "bars": "basemetals:block/emerald_bars" + }, + "elements": [ + { + "from": [ + 8, + 0, + 7 + ], + "to": [ + 8, + 16, + 9 + ], + "faces": { + "west": { + "uv": [ + 7, + 0, + 9, + 16 + ], + "texture": "#bars" + }, + "east": { + "uv": [ + 9, + 0, + 7, + 16 + ], + "texture": "#bars" + } + } + }, + { + "from": [ + 7, + 0, + 8 + ], + "to": [ + 9, + 16, + 8 + ], + "faces": { + "north": { + "uv": [ + 7, + 0, + 9, + 16 + ], + "texture": "#bars" + }, + "south": { + "uv": [ + 9, + 0, + 7, + 16 + ], + "texture": "#bars" + } + } + } + ] +} diff --git a/src/main/resources/assets/basemetals/models/block/emerald_bars_iron_bars_post_ends.json b/src/main/resources/assets/basemetals/models/block/emerald_bars_iron_bars_post_ends.json new file mode 100644 index 000000000..09fc1929d --- /dev/null +++ b/src/main/resources/assets/basemetals/models/block/emerald_bars_iron_bars_post_ends.json @@ -0,0 +1,73 @@ +{ + "parent": "minecraft:block/iron_bars_post_ends", + "textures": { + "particle": "minecraft:block/emerald_block", + "edge": "basemetals:block/emerald_bars" + }, + "elements": [ + { + "from": [ + 7, + 0.001, + 7 + ], + "to": [ + 9, + 0.001, + 9 + ], + "faces": { + "down": { + "uv": [ + 7, + 7, + 9, + 9 + ], + "texture": "#edge" + }, + "up": { + "uv": [ + 7, + 7, + 9, + 9 + ], + "texture": "#edge" + } + } + }, + { + "from": [ + 7, + 15.999, + 7 + ], + "to": [ + 9, + 15.999, + 9 + ], + "faces": { + "down": { + "uv": [ + 7, + 7, + 9, + 9 + ], + "texture": "#edge" + }, + "up": { + "uv": [ + 7, + 7, + 9, + 9 + ], + "texture": "#edge" + } + } + } + ] +} diff --git a/src/main/resources/assets/basemetals/models/block/emerald_bars_iron_bars_side.json b/src/main/resources/assets/basemetals/models/block/emerald_bars_iron_bars_side.json new file mode 100644 index 000000000..b06a880f2 --- /dev/null +++ b/src/main/resources/assets/basemetals/models/block/emerald_bars_iron_bars_side.json @@ -0,0 +1,130 @@ +{ + "parent": "minecraft:block/iron_bars_side", + "textures": { + "particle": "minecraft:block/emerald_block", + "bars": "basemetals:block/emerald_bars", + "edge": "basemetals:block/emerald_bars" + }, + "elements": [ + { + "from": [ + 8, + 0, + 0 + ], + "to": [ + 8, + 16, + 8 + ], + "faces": { + "west": { + "uv": [ + 16, + 0, + 8, + 16 + ], + "texture": "#bars" + }, + "east": { + "uv": [ + 8, + 0, + 16, + 16 + ], + "texture": "#bars" + } + } + }, + { + "from": [ + 7, + 0, + 0 + ], + "to": [ + 9, + 16, + 7 + ], + "faces": { + "north": { + "uv": [ + 7, + 0, + 9, + 16 + ], + "texture": "#edge", + "cullface": "north" + } + } + }, + { + "from": [ + 7, + 0.001, + 0 + ], + "to": [ + 9, + 0.001, + 7 + ], + "faces": { + "down": { + "uv": [ + 9, + 0, + 7, + 7 + ], + "texture": "#edge" + }, + "up": { + "uv": [ + 7, + 0, + 9, + 7 + ], + "texture": "#edge" + } + } + }, + { + "from": [ + 7, + 15.999, + 0 + ], + "to": [ + 9, + 15.999, + 7 + ], + "faces": { + "down": { + "uv": [ + 9, + 0, + 7, + 7 + ], + "texture": "#edge" + }, + "up": { + "uv": [ + 7, + 0, + 9, + 7 + ], + "texture": "#edge" + } + } + } + ] +} diff --git a/src/main/resources/assets/basemetals/models/block/emerald_bars_iron_bars_side_alt.json b/src/main/resources/assets/basemetals/models/block/emerald_bars_iron_bars_side_alt.json new file mode 100644 index 000000000..6d80bec65 --- /dev/null +++ b/src/main/resources/assets/basemetals/models/block/emerald_bars_iron_bars_side_alt.json @@ -0,0 +1,148 @@ +{ + "parent": "minecraft:block/iron_bars_side_alt", + "textures": { + "particle": "minecraft:block/emerald_block", + "bars": "basemetals:block/emerald_bars", + "edge": "basemetals:block/emerald_bars" + }, + "elements": [ + { + "from": [ + 8, + 0, + 8 + ], + "to": [ + 8, + 16, + 16 + ], + "faces": { + "west": { + "uv": [ + 8, + 0, + 0, + 16 + ], + "texture": "#bars" + }, + "east": { + "uv": [ + 0, + 0, + 8, + 16 + ], + "texture": "#bars" + } + } + }, + { + "from": [ + 7, + 0, + 9 + ], + "to": [ + 9, + 16, + 16 + ], + "faces": { + "south": { + "uv": [ + 7, + 0, + 9, + 16 + ], + "texture": "#edge", + "cullface": "south" + }, + "down": { + "uv": [ + 9, + 9, + 7, + 16 + ], + "texture": "#edge" + }, + "up": { + "uv": [ + 7, + 9, + 9, + 16 + ], + "texture": "#edge" + } + } + }, + { + "from": [ + 7, + 0.001, + 9 + ], + "to": [ + 9, + 0.001, + 16 + ], + "faces": { + "down": { + "uv": [ + 9, + 9, + 7, + 16 + ], + "texture": "#edge" + }, + "up": { + "uv": [ + 7, + 9, + 9, + 16 + ], + "texture": "#edge" + } + } + }, + { + "from": [ + 7, + 15.999, + 9 + ], + "to": [ + 9, + 15.999, + 16 + ], + "faces": { + "down": { + "uv": [ + 9, + 9, + 7, + 16 + ], + "texture": "#edge" + }, + "up": { + "uv": [ + 7, + 9, + 9, + 16 + ], + "texture": "#edge" + } + } + } + ] +} diff --git a/src/main/resources/assets/basemetals/models/block/emerald_bars_post.json b/src/main/resources/assets/basemetals/models/block/emerald_bars_post.json deleted file mode 100644 index 706232cea..000000000 --- a/src/main/resources/assets/basemetals/models/block/emerald_bars_post.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "ambientocclusion": false, - "textures": { - "particle": "basemetals:block/emerald_bars", - "bars": "basemetals:block/emerald_bars" - }, - "elements": [ - { "from": [ 8, 0, 7 ], - "to": [ 8, 16, 9 ], - "faces": { - "west": { "uv": [ 7, 0, 9, 16 ], "texture": "#bars" }, - "east": { "uv": [ 9, 0, 7, 16 ], "texture": "#bars" } - } - }, - { "from": [ 7, 0, 8 ], - "to": [ 9, 16, 8 ], - "faces": { - "north": { "uv": [ 7, 0, 9, 16 ], "texture": "#bars" }, - "south": { "uv": [ 9, 0, 7, 16 ], "texture": "#bars" } - } - } - ] -} diff --git a/src/main/resources/assets/basemetals/models/block/emerald_bars_side.json b/src/main/resources/assets/basemetals/models/block/emerald_bars_side.json deleted file mode 100644 index 1ee3297c4..000000000 --- a/src/main/resources/assets/basemetals/models/block/emerald_bars_side.json +++ /dev/null @@ -1,37 +0,0 @@ -{ - "ambientocclusion": false, - "textures": { - "particle": "basemetals:block/emerald_bars", - "bars": "basemetals:block/emerald_bars", - "edge": "basemetals:block/emerald_bars" - }, - "elements": [ - { "from": [ 8, 0, 0 ], - "to": [ 8, 16, 8 ], - "faces": { - "west": { "uv": [ 16, 0, 8, 16 ], "texture": "#bars" }, - "east": { "uv": [ 8, 0, 16, 16 ], "texture": "#bars" } - } - }, - { "from": [ 7, 0, 0 ], - "to": [ 9, 16, 7 ], - "faces": { - "north": { "uv": [ 7, 0, 9, 16 ], "texture": "#edge", "cullface": "north" } - } - }, - { "from": [ 7, 0.001, 0 ], - "to": [ 9, 0.001, 7 ], - "faces": { - "down": { "uv": [ 9, 0, 7, 7 ], "texture": "#edge" }, - "up": { "uv": [ 7, 0, 9, 7 ], "texture": "#edge" } - } - }, - { "from": [ 7, 15.999, 0 ], - "to": [ 9, 15.999, 7 ], - "faces": { - "down": { "uv": [ 9, 0, 7, 7 ], "texture": "#edge" }, - "up": { "uv": [ 7, 0, 9, 7 ], "texture": "#edge" } - } - } - ] -} diff --git a/src/main/resources/assets/basemetals/models/block/emerald_bars_side_alt.json b/src/main/resources/assets/basemetals/models/block/emerald_bars_side_alt.json deleted file mode 100644 index 72bbc6f72..000000000 --- a/src/main/resources/assets/basemetals/models/block/emerald_bars_side_alt.json +++ /dev/null @@ -1,37 +0,0 @@ -{ - "ambientocclusion": false, - "textures": { - "particle": "basemetals:block/emerald_bars", - "bars": "basemetals:block/emerald_bars", - "edge": "basemetals:block/emerald_bars" - }, - "elements": [ - { "from": [ 8, 0, 8 ], - "to": [ 8, 16, 16 ], - "faces": { - "west": { "uv": [ 8, 0, 0, 16 ], "texture": "#bars" }, - "east": { "uv": [ 0, 0, 8, 16 ], "texture": "#bars" } - } - }, - { "from": [ 7, 0, 9 ], - "to": [ 9, 16, 16 ], - "faces": { - "south": { "uv": [ 7, 0, 9, 16 ], "texture": "#edge", "cullface": "south" } - } - }, - { "from": [ 7, 0.001, 9 ], - "to": [ 9, 0.001, 16 ], - "faces": { - "down": { "uv": [ 9, 9, 7, 16 ], "texture": "#edge" }, - "up": { "uv": [ 7, 9, 9, 16 ], "texture": "#edge" } - } - }, - { "from": [ 7, 15.999, 9 ], - "to": [ 9, 15.999, 16 ], - "faces": { - "down": { "uv": [ 9, 9, 7, 16 ], "texture": "#edge" }, - "up": { "uv": [ 7, 9, 9, 16 ], "texture": "#edge" } - } - } - ] -} diff --git a/src/main/resources/assets/basemetals/models/block/emerald_button.json b/src/main/resources/assets/basemetals/models/block/emerald_button.json deleted file mode 100644 index c80501ec6..000000000 --- a/src/main/resources/assets/basemetals/models/block/emerald_button.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/button", - "textures": { - "texture": "minecraft:block/emerald_block" - } -} diff --git a/src/main/resources/assets/basemetals/models/block/emerald_button_inventory.json b/src/main/resources/assets/basemetals/models/block/emerald_button_inventory.json index 0449db1da..58ea57c73 100644 --- a/src/main/resources/assets/basemetals/models/block/emerald_button_inventory.json +++ b/src/main/resources/assets/basemetals/models/block/emerald_button_inventory.json @@ -1,6 +1,6 @@ { - "parent": "block/button_inventory", - "textures": { - "texture": "minecraft:block/emerald_block" - } + "parent": "block/button_inventory", + "textures": { + "texture": "minecraft:block/emerald_block" + } } diff --git a/src/main/resources/assets/basemetals/models/block/emerald_button_polished_blackstone_button.json b/src/main/resources/assets/basemetals/models/block/emerald_button_polished_blackstone_button.json new file mode 100644 index 000000000..0f49d51fb --- /dev/null +++ b/src/main/resources/assets/basemetals/models/block/emerald_button_polished_blackstone_button.json @@ -0,0 +1,78 @@ +{ + "parent": "minecraft:block/polished_blackstone_button", + "textures": { + "particle": "minecraft:block/emerald_block", + "texture": "minecraft:block/emerald_block" + }, + "elements": [ + { + "from": [ + 5, + 0, + 6 + ], + "to": [ + 11, + 2, + 10 + ], + "faces": { + "down": { + "uv": [ + 5, + 6, + 11, + 10 + ], + "texture": "#texture", + "cullface": "down" + }, + "up": { + "uv": [ + 5, + 6, + 11, + 10 + ], + "texture": "#texture" + }, + "north": { + "uv": [ + 5, + 14, + 11, + 16 + ], + "texture": "#texture" + }, + "south": { + "uv": [ + 5, + 14, + 11, + 16 + ], + "texture": "#texture" + }, + "west": { + "uv": [ + 6, + 14, + 10, + 16 + ], + "texture": "#texture" + }, + "east": { + "uv": [ + 6, + 14, + 10, + 16 + ], + "texture": "#texture" + } + } + } + ] +} diff --git a/src/main/resources/assets/basemetals/models/block/emerald_button_polished_blackstone_button_pressed.json b/src/main/resources/assets/basemetals/models/block/emerald_button_polished_blackstone_button_pressed.json new file mode 100644 index 000000000..afae730c8 --- /dev/null +++ b/src/main/resources/assets/basemetals/models/block/emerald_button_polished_blackstone_button_pressed.json @@ -0,0 +1,78 @@ +{ + "parent": "minecraft:block/polished_blackstone_button_pressed", + "textures": { + "particle": "minecraft:block/emerald_block", + "texture": "minecraft:block/emerald_block" + }, + "elements": [ + { + "from": [ + 5, + 0, + 6 + ], + "to": [ + 11, + 1.02, + 10 + ], + "faces": { + "down": { + "uv": [ + 5, + 6, + 11, + 10 + ], + "texture": "#texture", + "cullface": "down" + }, + "up": { + "uv": [ + 5, + 6, + 11, + 10 + ], + "texture": "#texture" + }, + "north": { + "uv": [ + 5, + 14, + 11, + 15 + ], + "texture": "#texture" + }, + "south": { + "uv": [ + 5, + 14, + 11, + 15 + ], + "texture": "#texture" + }, + "west": { + "uv": [ + 6, + 14, + 10, + 15 + ], + "texture": "#texture" + }, + "east": { + "uv": [ + 6, + 14, + 10, + 15 + ], + "texture": "#texture" + } + } + } + ] +} diff --git a/src/main/resources/assets/basemetals/models/block/emerald_button_pressed.json b/src/main/resources/assets/basemetals/models/block/emerald_button_pressed.json deleted file mode 100644 index 7f0c62fc4..000000000 --- a/src/main/resources/assets/basemetals/models/block/emerald_button_pressed.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/button_pressed", - "textures": { - "texture": "minecraft:block/emerald_block" - } -} diff --git a/src/main/resources/assets/basemetals/models/block/emerald_door_bottom.json b/src/main/resources/assets/basemetals/models/block/emerald_door_bottom.json deleted file mode 100644 index 8fa97b9b2..000000000 --- a/src/main/resources/assets/basemetals/models/block/emerald_door_bottom.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/door_bottom_left", - "textures": { - "bottom": "basemetals:block/emerald_door_lower", - "top": "basemetals:block/emerald_door_upper" - } -} diff --git a/src/main/resources/assets/basemetals/models/block/emerald_door_bottom_rh.json b/src/main/resources/assets/basemetals/models/block/emerald_door_bottom_rh.json deleted file mode 100644 index a4689de95..000000000 --- a/src/main/resources/assets/basemetals/models/block/emerald_door_bottom_rh.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/door_bottom_right", - "textures": { - "bottom": "basemetals:block/emerald_door_lower", - "top": "basemetals:block/emerald_door_upper" - } -} diff --git a/src/main/resources/assets/basemetals/models/block/emerald_door_iron_door_bottom_left.json b/src/main/resources/assets/basemetals/models/block/emerald_door_iron_door_bottom_left.json new file mode 100644 index 000000000..013564864 --- /dev/null +++ b/src/main/resources/assets/basemetals/models/block/emerald_door_iron_door_bottom_left.json @@ -0,0 +1,74 @@ +{ + "parent": "minecraft:block/iron_door_bottom_left", + "textures": { + "particle": "minecraft:block/emerald_block", + "bottom": "basemetals:block/emerald_door_lower", + "top": "basemetals:block/emerald_door_upper" + }, + "elements": [ + { + "from": [ + 0, + 0, + 0 + ], + "to": [ + 3, + 16, + 16 + ], + "faces": { + "down": { + "uv": [ + 16, + 13, + 0, + 16 + ], + "texture": "#bottom", + "cullface": "down", + "rotation": 90 + }, + "north": { + "uv": [ + 3, + 0, + 0, + 16 + ], + "texture": "#bottom", + "cullface": "north" + }, + "south": { + "uv": [ + 0, + 0, + 3, + 16 + ], + "texture": "#bottom", + "cullface": "south" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#bottom", + "cullface": "west" + }, + "east": { + "uv": [ + 16, + 0, + 0, + 16 + ], + "texture": "#bottom" + } + } + } + ] +} diff --git a/src/main/resources/assets/basemetals/models/block/emerald_door_iron_door_bottom_left_open.json b/src/main/resources/assets/basemetals/models/block/emerald_door_iron_door_bottom_left_open.json new file mode 100644 index 000000000..04c8cd758 --- /dev/null +++ b/src/main/resources/assets/basemetals/models/block/emerald_door_iron_door_bottom_left_open.json @@ -0,0 +1,74 @@ +{ + "parent": "minecraft:block/iron_door_bottom_left_open", + "textures": { + "particle": "minecraft:block/emerald_block", + "bottom": "basemetals:block/emerald_door_lower", + "top": "basemetals:block/emerald_door_upper" + }, + "elements": [ + { + "from": [ + 0, + 0, + 0 + ], + "to": [ + 3, + 16, + 16 + ], + "faces": { + "down": { + "uv": [ + 0, + 16, + 16, + 13 + ], + "texture": "#bottom", + "cullface": "down", + "rotation": 90 + }, + "north": { + "uv": [ + 0, + 0, + 3, + 16 + ], + "texture": "#bottom", + "cullface": "north" + }, + "south": { + "uv": [ + 0, + 0, + 3, + 16 + ], + "texture": "#bottom", + "cullface": "south" + }, + "west": { + "uv": [ + 16, + 0, + 0, + 16 + ], + "texture": "#bottom", + "cullface": "west" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#bottom" + } + } + } + ] +} diff --git a/src/main/resources/assets/basemetals/models/block/emerald_door_iron_door_bottom_right.json b/src/main/resources/assets/basemetals/models/block/emerald_door_iron_door_bottom_right.json new file mode 100644 index 000000000..df68b5b41 --- /dev/null +++ b/src/main/resources/assets/basemetals/models/block/emerald_door_iron_door_bottom_right.json @@ -0,0 +1,74 @@ +{ + "parent": "minecraft:block/iron_door_bottom_right", + "textures": { + "particle": "minecraft:block/emerald_block", + "bottom": "basemetals:block/emerald_door_lower", + "top": "basemetals:block/emerald_door_upper" + }, + "elements": [ + { + "from": [ + 0, + 0, + 0 + ], + "to": [ + 3, + 16, + 16 + ], + "faces": { + "down": { + "uv": [ + 0, + 13, + 16, + 16 + ], + "texture": "#bottom", + "cullface": "down", + "rotation": 90 + }, + "north": { + "uv": [ + 3, + 0, + 0, + 16 + ], + "texture": "#bottom", + "cullface": "north" + }, + "south": { + "uv": [ + 0, + 0, + 3, + 16 + ], + "texture": "#bottom", + "cullface": "south" + }, + "west": { + "uv": [ + 16, + 0, + 0, + 16 + ], + "texture": "#bottom", + "cullface": "west" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#bottom" + } + } + } + ] +} diff --git a/src/main/resources/assets/basemetals/models/block/emerald_door_iron_door_bottom_right_open.json b/src/main/resources/assets/basemetals/models/block/emerald_door_iron_door_bottom_right_open.json new file mode 100644 index 000000000..9e1bf996b --- /dev/null +++ b/src/main/resources/assets/basemetals/models/block/emerald_door_iron_door_bottom_right_open.json @@ -0,0 +1,74 @@ +{ + "parent": "minecraft:block/iron_door_bottom_right_open", + "textures": { + "particle": "minecraft:block/emerald_block", + "bottom": "basemetals:block/emerald_door_lower", + "top": "basemetals:block/emerald_door_upper" + }, + "elements": [ + { + "from": [ + 0, + 0, + 0 + ], + "to": [ + 3, + 16, + 16 + ], + "faces": { + "down": { + "uv": [ + 16, + 16, + 0, + 13 + ], + "texture": "#bottom", + "cullface": "down", + "rotation": 90 + }, + "north": { + "uv": [ + 3, + 0, + 0, + 16 + ], + "texture": "#bottom", + "cullface": "north" + }, + "south": { + "uv": [ + 3, + 0, + 0, + 16 + ], + "texture": "#bottom", + "cullface": "south" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#bottom", + "cullface": "west" + }, + "east": { + "uv": [ + 16, + 0, + 0, + 16 + ], + "texture": "#bottom" + } + } + } + ] +} diff --git a/src/main/resources/assets/basemetals/models/block/emerald_door_iron_door_top_left.json b/src/main/resources/assets/basemetals/models/block/emerald_door_iron_door_top_left.json new file mode 100644 index 000000000..1adea89cf --- /dev/null +++ b/src/main/resources/assets/basemetals/models/block/emerald_door_iron_door_top_left.json @@ -0,0 +1,74 @@ +{ + "parent": "minecraft:block/iron_door_top_left", + "textures": { + "particle": "minecraft:block/emerald_block", + "bottom": "basemetals:block/emerald_door_lower", + "top": "basemetals:block/emerald_door_upper" + }, + "elements": [ + { + "from": [ + 0, + 0, + 0 + ], + "to": [ + 3, + 16, + 16 + ], + "faces": { + "up": { + "uv": [ + 0, + 3, + 16, + 0 + ], + "texture": "#top", + "cullface": "up", + "rotation": 90 + }, + "north": { + "uv": [ + 3, + 0, + 0, + 16 + ], + "texture": "#top", + "cullface": "north" + }, + "south": { + "uv": [ + 0, + 0, + 3, + 16 + ], + "texture": "#top", + "cullface": "south" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#top", + "cullface": "west" + }, + "east": { + "uv": [ + 16, + 0, + 0, + 16 + ], + "texture": "#top" + } + } + } + ] +} diff --git a/src/main/resources/assets/basemetals/models/block/emerald_door_iron_door_top_left_open.json b/src/main/resources/assets/basemetals/models/block/emerald_door_iron_door_top_left_open.json new file mode 100644 index 000000000..2317ca420 --- /dev/null +++ b/src/main/resources/assets/basemetals/models/block/emerald_door_iron_door_top_left_open.json @@ -0,0 +1,74 @@ +{ + "parent": "minecraft:block/iron_door_top_left_open", + "textures": { + "particle": "minecraft:block/emerald_block", + "bottom": "basemetals:block/emerald_door_lower", + "top": "basemetals:block/emerald_door_upper" + }, + "elements": [ + { + "from": [ + 0, + 0, + 0 + ], + "to": [ + 3, + 16, + 16 + ], + "faces": { + "up": { + "uv": [ + 0, + 3, + 16, + 0 + ], + "texture": "#top", + "cullface": "up", + "rotation": 270 + }, + "north": { + "uv": [ + 0, + 0, + 3, + 16 + ], + "texture": "#top", + "cullface": "north" + }, + "south": { + "uv": [ + 0, + 0, + 3, + 16 + ], + "texture": "#top", + "cullface": "south" + }, + "west": { + "uv": [ + 16, + 0, + 0, + 16 + ], + "texture": "#top", + "cullface": "west" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#top" + } + } + } + ] +} diff --git a/src/main/resources/assets/basemetals/models/block/emerald_door_iron_door_top_right.json b/src/main/resources/assets/basemetals/models/block/emerald_door_iron_door_top_right.json new file mode 100644 index 000000000..0bcc57f60 --- /dev/null +++ b/src/main/resources/assets/basemetals/models/block/emerald_door_iron_door_top_right.json @@ -0,0 +1,74 @@ +{ + "parent": "minecraft:block/iron_door_top_right", + "textures": { + "particle": "minecraft:block/emerald_block", + "bottom": "basemetals:block/emerald_door_lower", + "top": "basemetals:block/emerald_door_upper" + }, + "elements": [ + { + "from": [ + 0, + 0, + 0 + ], + "to": [ + 3, + 16, + 16 + ], + "faces": { + "up": { + "uv": [ + 0, + 0, + 16, + 3 + ], + "texture": "#top", + "cullface": "up", + "rotation": 270 + }, + "north": { + "uv": [ + 3, + 0, + 0, + 16 + ], + "texture": "#top", + "cullface": "north" + }, + "south": { + "uv": [ + 0, + 0, + 3, + 16 + ], + "texture": "#top", + "cullface": "south" + }, + "west": { + "uv": [ + 16, + 0, + 0, + 16 + ], + "texture": "#top", + "cullface": "west" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#top" + } + } + } + ] +} diff --git a/src/main/resources/assets/basemetals/models/block/emerald_door_iron_door_top_right_open.json b/src/main/resources/assets/basemetals/models/block/emerald_door_iron_door_top_right_open.json new file mode 100644 index 000000000..57daecdd0 --- /dev/null +++ b/src/main/resources/assets/basemetals/models/block/emerald_door_iron_door_top_right_open.json @@ -0,0 +1,74 @@ +{ + "parent": "minecraft:block/iron_door_top_right_open", + "textures": { + "particle": "minecraft:block/emerald_block", + "bottom": "basemetals:block/emerald_door_lower", + "top": "basemetals:block/emerald_door_upper" + }, + "elements": [ + { + "from": [ + 0, + 0, + 0 + ], + "to": [ + 3, + 16, + 16 + ], + "faces": { + "up": { + "uv": [ + 0, + 0, + 16, + 3 + ], + "texture": "#top", + "cullface": "up", + "rotation": 90 + }, + "north": { + "uv": [ + 3, + 0, + 0, + 16 + ], + "texture": "#top", + "cullface": "north" + }, + "south": { + "uv": [ + 3, + 0, + 0, + 16 + ], + "texture": "#top", + "cullface": "south" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#top", + "cullface": "west" + }, + "east": { + "uv": [ + 16, + 0, + 0, + 16 + ], + "texture": "#top" + } + } + } + ] +} diff --git a/src/main/resources/assets/basemetals/models/block/emerald_door_top.json b/src/main/resources/assets/basemetals/models/block/emerald_door_top.json deleted file mode 100644 index 40099ef1f..000000000 --- a/src/main/resources/assets/basemetals/models/block/emerald_door_top.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/door_top_left", - "textures": { - "bottom": "basemetals:block/emerald_door_lower", - "top": "basemetals:block/emerald_door_upper" - } -} diff --git a/src/main/resources/assets/basemetals/models/block/emerald_door_top_rh.json b/src/main/resources/assets/basemetals/models/block/emerald_door_top_rh.json deleted file mode 100644 index 3b9a8dd61..000000000 --- a/src/main/resources/assets/basemetals/models/block/emerald_door_top_rh.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/door_top_right", - "textures": { - "bottom": "basemetals:block/emerald_door_lower", - "top": "basemetals:block/emerald_door_upper" - } -} diff --git a/src/main/resources/assets/basemetals/models/block/emerald_double_slab.json b/src/main/resources/assets/basemetals/models/block/emerald_double_slab.json new file mode 100644 index 000000000..92f0cb969 --- /dev/null +++ b/src/main/resources/assets/basemetals/models/block/emerald_double_slab.json @@ -0,0 +1,54 @@ +{ + "parent": "minecraft:block/quartz_block", + "textures": { + "particle": "minecraft:block/emerald_block", + "down": "minecraft:block/emerald_block", + "up": "minecraft:block/emerald_block", + "north": "minecraft:block/emerald_block", + "east": "minecraft:block/emerald_block", + "south": "minecraft:block/emerald_block", + "west": "minecraft:block/emerald_block", + "end": "minecraft:block/emerald_block", + "side": "minecraft:block/emerald_block" + }, + "elements": [ + { + "from": [ + 0, + 0, + 0 + ], + "to": [ + 16, + 16, + 16 + ], + "faces": { + "down": { + "texture": "#down", + "cullface": "down" + }, + "up": { + "texture": "#up", + "cullface": "up" + }, + "north": { + "texture": "#north", + "cullface": "north" + }, + "south": { + "texture": "#south", + "cullface": "south" + }, + "west": { + "texture": "#west", + "cullface": "west" + }, + "east": { + "texture": "#east", + "cullface": "east" + } + } + } + ] +} diff --git a/src/main/resources/assets/basemetals/models/block/emerald_inner_stairs.json b/src/main/resources/assets/basemetals/models/block/emerald_inner_stairs.json deleted file mode 100644 index 1cd41375e..000000000 --- a/src/main/resources/assets/basemetals/models/block/emerald_inner_stairs.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/inner_stairs", - "textures": { - "bottom": "minecraft:block/emerald_block", - "top": "minecraft:block/emerald_block", - "side": "minecraft:block/emerald_block" - } -} diff --git a/src/main/resources/assets/basemetals/models/block/emerald_lever.json b/src/main/resources/assets/basemetals/models/block/emerald_lever.json deleted file mode 100644 index 0f17256a7..000000000 --- a/src/main/resources/assets/basemetals/models/block/emerald_lever.json +++ /dev/null @@ -1,33 +0,0 @@ -{ - "ambientocclusion": false, - "textures": { - "particle": "minecraft:block/emerald_block", - "base": "minecraft:block/emerald_block", - "lever": "minecraft:block/lever" - }, - "elements": [ - { "from": [ 5, 0, 4 ], - "to": [ 11, 3, 12 ], - "faces": { - "down": { "uv": [ 5, 4, 11, 12 ], "texture": "#base" }, - "up": { "uv": [ 5, 4, 11, 12 ], "texture": "#base" }, - "north": { "uv": [ 5, 0, 11, 3 ], "texture": "#base" }, - "south": { "uv": [ 5, 0, 11, 3 ], "texture": "#base" }, - "west": { "uv": [ 4, 0, 12, 3 ], "texture": "#base" }, - "east": { "uv": [ 4, 0, 12, 3 ], "texture": "#base" } - } - }, - { "from": [ 7, 1, 7 ], - "to": [ 9, 11, 9 ], - "rotation": { "origin": [ 8, 1, 8 ], "axis": "x", "angle": -45 }, - "faces": { - "down": { "uv": [ 7, 6, 9, 8 ], "texture": "#lever" }, - "up": { "uv": [ 7, 6, 9, 8 ], "texture": "#lever" }, - "north": { "uv": [ 7, 6, 9, 16 ], "texture": "#lever" }, - "south": { "uv": [ 7, 6, 9, 16 ], "texture": "#lever" }, - "west": { "uv": [ 7, 6, 9, 16 ], "texture": "#lever" }, - "east": { "uv": [ 7, 6, 9, 16 ], "texture": "#lever" } - } - } - ] -} diff --git a/src/main/resources/assets/basemetals/models/block/emerald_lever_lever.json b/src/main/resources/assets/basemetals/models/block/emerald_lever_lever.json new file mode 100644 index 000000000..007c3f5f1 --- /dev/null +++ b/src/main/resources/assets/basemetals/models/block/emerald_lever_lever.json @@ -0,0 +1,147 @@ +{ + "parent": "minecraft:block/lever", + "textures": { + "particle": "minecraft:block/emerald_block", + "base": "minecraft:block/emerald_block", + "lever": "block/lever" + }, + "elements": [ + { + "from": [ + 5, + -0.02, + 4 + ], + "to": [ + 11, + 2.98, + 12 + ], + "faces": { + "down": { + "uv": [ + 5, + 4, + 11, + 12 + ], + "texture": "#base", + "cullface": "down" + }, + "up": { + "uv": [ + 5, + 4, + 11, + 12 + ], + "texture": "#base" + }, + "north": { + "uv": [ + 5, + 0, + 11, + 3 + ], + "texture": "#base" + }, + "south": { + "uv": [ + 5, + 0, + 11, + 3 + ], + "texture": "#base" + }, + "west": { + "uv": [ + 4, + 0, + 12, + 3 + ], + "texture": "#base" + }, + "east": { + "uv": [ + 4, + 0, + 12, + 3 + ], + "texture": "#base" + } + } + }, + { + "from": [ + 7, + 1, + 7 + ], + "to": [ + 9, + 11, + 9 + ], + "rotation": { + "origin": [ + 8, + 1, + 8 + ], + "axis": "x", + "angle": -45 + }, + "faces": { + "up": { + "uv": [ + 7, + 6, + 9, + 8 + ], + "texture": "#lever" + }, + "north": { + "uv": [ + 7, + 6, + 9, + 16 + ], + "texture": "#lever" + }, + "south": { + "uv": [ + 7, + 6, + 9, + 16 + ], + "texture": "#lever" + }, + "west": { + "uv": [ + 7, + 6, + 9, + 16 + ], + "texture": "#lever" + }, + "east": { + "uv": [ + 7, + 6, + 9, + 16 + ], + "texture": "#lever" + } + } + } + ] +} diff --git a/src/main/resources/assets/basemetals/models/block/emerald_lever_lever_on.json b/src/main/resources/assets/basemetals/models/block/emerald_lever_lever_on.json new file mode 100644 index 000000000..2a61218ea --- /dev/null +++ b/src/main/resources/assets/basemetals/models/block/emerald_lever_lever_on.json @@ -0,0 +1,147 @@ +{ + "parent": "minecraft:block/lever_on", + "textures": { + "particle": "minecraft:block/emerald_block", + "base": "minecraft:block/emerald_block", + "lever": "block/lever" + }, + "elements": [ + { + "from": [ + 5, + -0.02, + 4 + ], + "to": [ + 11, + 2.98, + 12 + ], + "faces": { + "down": { + "uv": [ + 5, + 4, + 11, + 12 + ], + "texture": "#base", + "cullface": "down" + }, + "up": { + "uv": [ + 5, + 4, + 11, + 12 + ], + "texture": "#base" + }, + "north": { + "uv": [ + 5, + 0, + 11, + 3 + ], + "texture": "#base" + }, + "south": { + "uv": [ + 5, + 0, + 11, + 3 + ], + "texture": "#base" + }, + "west": { + "uv": [ + 4, + 0, + 12, + 3 + ], + "texture": "#base" + }, + "east": { + "uv": [ + 4, + 0, + 12, + 3 + ], + "texture": "#base" + } + } + }, + { + "from": [ + 7, + 1, + 7 + ], + "to": [ + 9, + 11, + 9 + ], + "rotation": { + "origin": [ + 8, + 1, + 8 + ], + "axis": "x", + "angle": 45 + }, + "faces": { + "up": { + "uv": [ + 7, + 6, + 9, + 8 + ], + "texture": "#lever" + }, + "north": { + "uv": [ + 7, + 6, + 9, + 16 + ], + "texture": "#lever" + }, + "south": { + "uv": [ + 7, + 6, + 9, + 16 + ], + "texture": "#lever" + }, + "west": { + "uv": [ + 7, + 6, + 9, + 16 + ], + "texture": "#lever" + }, + "east": { + "uv": [ + 7, + 6, + 9, + 16 + ], + "texture": "#lever" + } + } + } + ] +} diff --git a/src/main/resources/assets/basemetals/models/block/emerald_lever_off.json b/src/main/resources/assets/basemetals/models/block/emerald_lever_off.json deleted file mode 100644 index 1e6996802..000000000 --- a/src/main/resources/assets/basemetals/models/block/emerald_lever_off.json +++ /dev/null @@ -1,33 +0,0 @@ -{ - "ambientocclusion": false, - "textures": { - "particle": "minecraft:block/emerald_block", - "base": "minecraft:block/emerald_block", - "lever": "minecraft:block/lever" - }, - "elements": [ - { "from": [ 5, 0, 4 ], - "to": [ 11, 3, 12 ], - "faces": { - "down": { "uv": [ 5, 4, 11, 12 ], "texture": "#base" }, - "up": { "uv": [ 5, 4, 11, 12 ], "texture": "#base" }, - "north": { "uv": [ 5, 0, 11, 3 ], "texture": "#base" }, - "south": { "uv": [ 5, 0, 11, 3 ], "texture": "#base" }, - "west": { "uv": [ 4, 0, 12, 3 ], "texture": "#base" }, - "east": { "uv": [ 4, 0, 12, 3 ], "texture": "#base" } - } - }, - { "from": [ 7, 1, 7 ], - "to": [ 9, 11, 9 ], - "rotation": { "origin": [ 8, 1, 8 ], "axis": "x", "angle": 45 }, - "faces": { - "down": { "uv": [ 7, 6, 9, 8 ], "texture": "#lever" }, - "up": { "uv": [ 7, 6, 9, 8 ], "texture": "#lever" }, - "north": { "uv": [ 7, 6, 9, 16 ], "texture": "#lever" }, - "south": { "uv": [ 7, 6, 9, 16 ], "texture": "#lever" }, - "west": { "uv": [ 7, 6, 9, 16 ], "texture": "#lever" }, - "east": { "uv": [ 7, 6, 9, 16 ], "texture": "#lever" } - } - } - ] -} diff --git a/src/main/resources/assets/basemetals/models/block/emerald_outer_stairs.json b/src/main/resources/assets/basemetals/models/block/emerald_outer_stairs.json deleted file mode 100644 index 660c0ad57..000000000 --- a/src/main/resources/assets/basemetals/models/block/emerald_outer_stairs.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/outer_stairs", - "textures": { - "bottom": "minecraft:block/emerald_block", - "top": "minecraft:block/emerald_block", - "side": "minecraft:block/emerald_block" - } -} diff --git a/src/main/resources/assets/basemetals/models/block/emerald_pressure_plate_down.json b/src/main/resources/assets/basemetals/models/block/emerald_pressure_plate_down.json deleted file mode 100644 index 0efe8d5b6..000000000 --- a/src/main/resources/assets/basemetals/models/block/emerald_pressure_plate_down.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/pressure_plate_down", - "textures": { - "texture": "minecraft:block/emerald_block" - } -} diff --git a/src/main/resources/assets/basemetals/models/block/emerald_pressure_plate_polished_blackstone_pressure_plate.json b/src/main/resources/assets/basemetals/models/block/emerald_pressure_plate_polished_blackstone_pressure_plate.json new file mode 100644 index 000000000..9eb05e84d --- /dev/null +++ b/src/main/resources/assets/basemetals/models/block/emerald_pressure_plate_polished_blackstone_pressure_plate.json @@ -0,0 +1,78 @@ +{ + "parent": "minecraft:block/polished_blackstone_pressure_plate", + "textures": { + "particle": "minecraft:block/emerald_block", + "texture": "minecraft:block/emerald_block" + }, + "elements": [ + { + "from": [ + 1, + 0, + 1 + ], + "to": [ + 15, + 1, + 15 + ], + "faces": { + "down": { + "uv": [ + 1, + 1, + 15, + 15 + ], + "texture": "#texture", + "cullface": "down" + }, + "up": { + "uv": [ + 1, + 1, + 15, + 15 + ], + "texture": "#texture" + }, + "north": { + "uv": [ + 1, + 15, + 15, + 16 + ], + "texture": "#texture" + }, + "south": { + "uv": [ + 1, + 15, + 15, + 16 + ], + "texture": "#texture" + }, + "west": { + "uv": [ + 1, + 15, + 15, + 16 + ], + "texture": "#texture" + }, + "east": { + "uv": [ + 1, + 15, + 15, + 16 + ], + "texture": "#texture" + } + } + } + ] +} diff --git a/src/main/resources/assets/basemetals/models/block/emerald_pressure_plate_polished_blackstone_pressure_plate_down.json b/src/main/resources/assets/basemetals/models/block/emerald_pressure_plate_polished_blackstone_pressure_plate_down.json new file mode 100644 index 000000000..292883b36 --- /dev/null +++ b/src/main/resources/assets/basemetals/models/block/emerald_pressure_plate_polished_blackstone_pressure_plate_down.json @@ -0,0 +1,78 @@ +{ + "parent": "minecraft:block/polished_blackstone_pressure_plate_down", + "textures": { + "particle": "minecraft:block/emerald_block", + "texture": "minecraft:block/emerald_block" + }, + "elements": [ + { + "from": [ + 1, + 0, + 1 + ], + "to": [ + 15, + 0.5, + 15 + ], + "faces": { + "down": { + "uv": [ + 1, + 1, + 15, + 15 + ], + "texture": "#texture", + "cullface": "down" + }, + "up": { + "uv": [ + 1, + 1, + 15, + 15 + ], + "texture": "#texture" + }, + "north": { + "uv": [ + 1, + 15, + 15, + 15.5 + ], + "texture": "#texture" + }, + "south": { + "uv": [ + 1, + 15, + 15, + 15.5 + ], + "texture": "#texture" + }, + "west": { + "uv": [ + 1, + 15, + 15, + 15.5 + ], + "texture": "#texture" + }, + "east": { + "uv": [ + 1, + 15, + 15, + 15.5 + ], + "texture": "#texture" + } + } + } + ] +} diff --git a/src/main/resources/assets/basemetals/models/block/emerald_pressure_plate_up.json b/src/main/resources/assets/basemetals/models/block/emerald_pressure_plate_up.json index e731dd7dd..0de94d7f7 100644 --- a/src/main/resources/assets/basemetals/models/block/emerald_pressure_plate_up.json +++ b/src/main/resources/assets/basemetals/models/block/emerald_pressure_plate_up.json @@ -1,6 +1,6 @@ { - "parent": "block/pressure_plate_up", - "textures": { - "texture": "minecraft:block/emerald_block" - } + "parent": "block/pressure_plate_up", + "textures": { + "texture": "minecraft:block/emerald_block" + } } diff --git a/src/main/resources/assets/basemetals/models/block/emerald_slab_quartz_block.json b/src/main/resources/assets/basemetals/models/block/emerald_slab_quartz_block.json new file mode 100644 index 000000000..92f0cb969 --- /dev/null +++ b/src/main/resources/assets/basemetals/models/block/emerald_slab_quartz_block.json @@ -0,0 +1,54 @@ +{ + "parent": "minecraft:block/quartz_block", + "textures": { + "particle": "minecraft:block/emerald_block", + "down": "minecraft:block/emerald_block", + "up": "minecraft:block/emerald_block", + "north": "minecraft:block/emerald_block", + "east": "minecraft:block/emerald_block", + "south": "minecraft:block/emerald_block", + "west": "minecraft:block/emerald_block", + "end": "minecraft:block/emerald_block", + "side": "minecraft:block/emerald_block" + }, + "elements": [ + { + "from": [ + 0, + 0, + 0 + ], + "to": [ + 16, + 16, + 16 + ], + "faces": { + "down": { + "texture": "#down", + "cullface": "down" + }, + "up": { + "texture": "#up", + "cullface": "up" + }, + "north": { + "texture": "#north", + "cullface": "north" + }, + "south": { + "texture": "#south", + "cullface": "south" + }, + "west": { + "texture": "#west", + "cullface": "west" + }, + "east": { + "texture": "#east", + "cullface": "east" + } + } + } + ] +} diff --git a/src/main/resources/assets/basemetals/models/block/emerald_slab_quartz_slab.json b/src/main/resources/assets/basemetals/models/block/emerald_slab_quartz_slab.json new file mode 100644 index 000000000..81522d402 --- /dev/null +++ b/src/main/resources/assets/basemetals/models/block/emerald_slab_quartz_slab.json @@ -0,0 +1,84 @@ +{ + "parent": "minecraft:block/quartz_slab", + "textures": { + "particle": "minecraft:block/emerald_block", + "bottom": "minecraft:block/emerald_block", + "side": "minecraft:block/emerald_block", + "top": "minecraft:block/emerald_block" + }, + "elements": [ + { + "from": [ + 0, + 0, + 0 + ], + "to": [ + 16, + 8, + 16 + ], + "faces": { + "down": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#bottom", + "cullface": "down" + }, + "up": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#top" + }, + "north": { + "uv": [ + 0, + 8, + 16, + 16 + ], + "texture": "#side", + "cullface": "north" + }, + "south": { + "uv": [ + 0, + 8, + 16, + 16 + ], + "texture": "#side", + "cullface": "south" + }, + "west": { + "uv": [ + 0, + 8, + 16, + 16 + ], + "texture": "#side", + "cullface": "west" + }, + "east": { + "uv": [ + 0, + 8, + 16, + 16 + ], + "texture": "#side", + "cullface": "east" + } + } + } + ] +} diff --git a/src/main/resources/assets/basemetals/models/block/emerald_slab_quartz_slab_top.json b/src/main/resources/assets/basemetals/models/block/emerald_slab_quartz_slab_top.json new file mode 100644 index 000000000..1badc4e09 --- /dev/null +++ b/src/main/resources/assets/basemetals/models/block/emerald_slab_quartz_slab_top.json @@ -0,0 +1,84 @@ +{ + "parent": "minecraft:block/quartz_slab_top", + "textures": { + "particle": "minecraft:block/emerald_block", + "bottom": "minecraft:block/emerald_block", + "side": "minecraft:block/emerald_block", + "top": "minecraft:block/emerald_block" + }, + "elements": [ + { + "from": [ + 0, + 8, + 0 + ], + "to": [ + 16, + 16, + 16 + ], + "faces": { + "down": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#bottom" + }, + "up": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#top", + "cullface": "up" + }, + "north": { + "uv": [ + 0, + 0, + 16, + 8 + ], + "texture": "#side", + "cullface": "north" + }, + "south": { + "uv": [ + 0, + 0, + 16, + 8 + ], + "texture": "#side", + "cullface": "south" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 8 + ], + "texture": "#side", + "cullface": "west" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 8 + ], + "texture": "#side", + "cullface": "east" + } + } + } + ] +} diff --git a/src/main/resources/assets/basemetals/models/block/emerald_stairs.json b/src/main/resources/assets/basemetals/models/block/emerald_stairs.json index 26a8337af..7fcef3176 100644 --- a/src/main/resources/assets/basemetals/models/block/emerald_stairs.json +++ b/src/main/resources/assets/basemetals/models/block/emerald_stairs.json @@ -1,8 +1,8 @@ { - "parent": "block/stairs", - "textures": { - "bottom": "minecraft:block/emerald_block", - "top": "minecraft:block/emerald_block", - "side": "minecraft:block/emerald_block" - } + "parent": "block/stairs", + "textures": { + "bottom": "minecraft:block/emerald_block", + "top": "minecraft:block/emerald_block", + "side": "minecraft:block/emerald_block" + } } diff --git a/src/main/resources/assets/basemetals/models/block/emerald_stairs_quartz_stairs.json b/src/main/resources/assets/basemetals/models/block/emerald_stairs_quartz_stairs.json new file mode 100644 index 000000000..acdd02bc4 --- /dev/null +++ b/src/main/resources/assets/basemetals/models/block/emerald_stairs_quartz_stairs.json @@ -0,0 +1,147 @@ +{ + "parent": "minecraft:block/quartz_stairs", + "textures": { + "particle": "minecraft:block/emerald_block", + "bottom": "minecraft:block/emerald_block", + "side": "minecraft:block/emerald_block", + "top": "minecraft:block/emerald_block" + }, + "elements": [ + { + "from": [ + 0, + 0, + 0 + ], + "to": [ + 16, + 8, + 16 + ], + "faces": { + "down": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#bottom", + "cullface": "down" + }, + "up": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#top" + }, + "north": { + "uv": [ + 0, + 8, + 16, + 16 + ], + "texture": "#side", + "cullface": "north" + }, + "south": { + "uv": [ + 0, + 8, + 16, + 16 + ], + "texture": "#side", + "cullface": "south" + }, + "west": { + "uv": [ + 0, + 8, + 16, + 16 + ], + "texture": "#side", + "cullface": "west" + }, + "east": { + "uv": [ + 0, + 8, + 16, + 16 + ], + "texture": "#side", + "cullface": "east" + } + } + }, + { + "from": [ + 8, + 8, + 0 + ], + "to": [ + 16, + 16, + 16 + ], + "faces": { + "up": { + "uv": [ + 8, + 0, + 16, + 16 + ], + "texture": "#top", + "cullface": "up" + }, + "north": { + "uv": [ + 0, + 0, + 8, + 8 + ], + "texture": "#side", + "cullface": "north" + }, + "south": { + "uv": [ + 8, + 0, + 16, + 8 + ], + "texture": "#side", + "cullface": "south" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 8 + ], + "texture": "#side" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 8 + ], + "texture": "#side", + "cullface": "east" + } + } + } + ] +} diff --git a/src/main/resources/assets/basemetals/models/block/emerald_stairs_quartz_stairs_inner.json b/src/main/resources/assets/basemetals/models/block/emerald_stairs_quartz_stairs_inner.json new file mode 100644 index 000000000..e1a42ec21 --- /dev/null +++ b/src/main/resources/assets/basemetals/models/block/emerald_stairs_quartz_stairs_inner.json @@ -0,0 +1,200 @@ +{ + "parent": "minecraft:block/quartz_stairs_inner", + "textures": { + "particle": "minecraft:block/emerald_block", + "bottom": "minecraft:block/emerald_block", + "side": "minecraft:block/emerald_block", + "top": "minecraft:block/emerald_block" + }, + "elements": [ + { + "from": [ + 0, + 0, + 0 + ], + "to": [ + 16, + 8, + 16 + ], + "faces": { + "down": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#bottom", + "cullface": "down" + }, + "up": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#top" + }, + "north": { + "uv": [ + 0, + 8, + 16, + 16 + ], + "texture": "#side", + "cullface": "north" + }, + "south": { + "uv": [ + 0, + 8, + 16, + 16 + ], + "texture": "#side", + "cullface": "south" + }, + "west": { + "uv": [ + 0, + 8, + 16, + 16 + ], + "texture": "#side", + "cullface": "west" + }, + "east": { + "uv": [ + 0, + 8, + 16, + 16 + ], + "texture": "#side", + "cullface": "east" + } + } + }, + { + "from": [ + 8, + 8, + 0 + ], + "to": [ + 16, + 16, + 16 + ], + "faces": { + "up": { + "uv": [ + 8, + 0, + 16, + 16 + ], + "texture": "#top", + "cullface": "up" + }, + "north": { + "uv": [ + 0, + 0, + 8, + 8 + ], + "texture": "#side", + "cullface": "north" + }, + "south": { + "uv": [ + 8, + 0, + 16, + 8 + ], + "texture": "#side", + "cullface": "south" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 8 + ], + "texture": "#side" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 8 + ], + "texture": "#side", + "cullface": "east" + } + } + }, + { + "from": [ + 0, + 8, + 8 + ], + "to": [ + 8, + 16, + 16 + ], + "faces": { + "up": { + "uv": [ + 0, + 8, + 8, + 16 + ], + "texture": "#top", + "cullface": "up" + }, + "north": { + "uv": [ + 8, + 0, + 16, + 8 + ], + "texture": "#side" + }, + "south": { + "uv": [ + 0, + 0, + 8, + 8 + ], + "texture": "#side", + "cullface": "south" + }, + "west": { + "uv": [ + 8, + 0, + 16, + 8 + ], + "texture": "#side", + "cullface": "west" + } + } + } + ] +} diff --git a/src/main/resources/assets/basemetals/models/block/emerald_stairs_quartz_stairs_outer.json b/src/main/resources/assets/basemetals/models/block/emerald_stairs_quartz_stairs_outer.json new file mode 100644 index 000000000..8a5e84547 --- /dev/null +++ b/src/main/resources/assets/basemetals/models/block/emerald_stairs_quartz_stairs_outer.json @@ -0,0 +1,146 @@ +{ + "parent": "minecraft:block/quartz_stairs_outer", + "textures": { + "particle": "minecraft:block/emerald_block", + "bottom": "minecraft:block/emerald_block", + "side": "minecraft:block/emerald_block", + "top": "minecraft:block/emerald_block" + }, + "elements": [ + { + "from": [ + 0, + 0, + 0 + ], + "to": [ + 16, + 8, + 16 + ], + "faces": { + "down": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#bottom", + "cullface": "down" + }, + "up": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#top" + }, + "north": { + "uv": [ + 0, + 8, + 16, + 16 + ], + "texture": "#side", + "cullface": "north" + }, + "south": { + "uv": [ + 0, + 8, + 16, + 16 + ], + "texture": "#side", + "cullface": "south" + }, + "west": { + "uv": [ + 0, + 8, + 16, + 16 + ], + "texture": "#side", + "cullface": "west" + }, + "east": { + "uv": [ + 0, + 8, + 16, + 16 + ], + "texture": "#side", + "cullface": "east" + } + } + }, + { + "from": [ + 8, + 8, + 8 + ], + "to": [ + 16, + 16, + 16 + ], + "faces": { + "up": { + "uv": [ + 8, + 8, + 16, + 16 + ], + "texture": "#top", + "cullface": "up" + }, + "north": { + "uv": [ + 0, + 0, + 8, + 8 + ], + "texture": "#side" + }, + "south": { + "uv": [ + 8, + 0, + 16, + 8 + ], + "texture": "#side", + "cullface": "south" + }, + "west": { + "uv": [ + 8, + 0, + 16, + 8 + ], + "texture": "#side" + }, + "east": { + "uv": [ + 0, + 0, + 8, + 8 + ], + "texture": "#side", + "cullface": "east" + } + } + } + ] +} diff --git a/src/main/resources/assets/basemetals/models/block/emerald_trapdoor_bottom.json b/src/main/resources/assets/basemetals/models/block/emerald_trapdoor_bottom.json index ecc0c7937..89fc003bb 100644 --- a/src/main/resources/assets/basemetals/models/block/emerald_trapdoor_bottom.json +++ b/src/main/resources/assets/basemetals/models/block/emerald_trapdoor_bottom.json @@ -1,6 +1,6 @@ { - "parent": "minecraft:block/template_orientable_trapdoor_bottom", - "textures": { - "texture": "basemetals:block/emerald_trapdoor" - } + "parent": "minecraft:block/template_orientable_trapdoor_bottom", + "textures": { + "texture": "basemetals:block/emerald_trapdoor" + } } diff --git a/src/main/resources/assets/basemetals/models/block/emerald_trapdoor_iron_trapdoor_bottom.json b/src/main/resources/assets/basemetals/models/block/emerald_trapdoor_iron_trapdoor_bottom.json new file mode 100644 index 000000000..ee0618f2f --- /dev/null +++ b/src/main/resources/assets/basemetals/models/block/emerald_trapdoor_iron_trapdoor_bottom.json @@ -0,0 +1,82 @@ +{ + "parent": "minecraft:block/iron_trapdoor_bottom", + "textures": { + "particle": "minecraft:block/emerald_block", + "texture": "basemetals:block/emerald_trapdoor" + }, + "elements": [ + { + "from": [ + 0, + 0, + 0 + ], + "to": [ + 16, + 3, + 16 + ], + "faces": { + "down": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#texture", + "cullface": "down" + }, + "up": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#texture" + }, + "north": { + "uv": [ + 0, + 16, + 16, + 13 + ], + "texture": "#texture", + "cullface": "north" + }, + "south": { + "uv": [ + 0, + 16, + 16, + 13 + ], + "texture": "#texture", + "cullface": "south" + }, + "west": { + "uv": [ + 0, + 16, + 16, + 13 + ], + "texture": "#texture", + "cullface": "west" + }, + "east": { + "uv": [ + 0, + 16, + 16, + 13 + ], + "texture": "#texture", + "cullface": "east" + } + } + } + ] +} diff --git a/src/main/resources/assets/basemetals/models/block/emerald_trapdoor_iron_trapdoor_open.json b/src/main/resources/assets/basemetals/models/block/emerald_trapdoor_iron_trapdoor_open.json new file mode 100644 index 000000000..53abd5390 --- /dev/null +++ b/src/main/resources/assets/basemetals/models/block/emerald_trapdoor_iron_trapdoor_open.json @@ -0,0 +1,82 @@ +{ + "parent": "minecraft:block/iron_trapdoor_open", + "textures": { + "particle": "minecraft:block/emerald_block", + "texture": "basemetals:block/emerald_trapdoor" + }, + "elements": [ + { + "from": [ + 0, + 0, + 13 + ], + "to": [ + 16, + 16, + 16 + ], + "faces": { + "down": { + "uv": [ + 0, + 13, + 16, + 16 + ], + "texture": "#texture", + "cullface": "down" + }, + "up": { + "uv": [ + 0, + 16, + 16, + 13 + ], + "texture": "#texture", + "cullface": "up" + }, + "north": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#texture" + }, + "south": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#texture", + "cullface": "south" + }, + "west": { + "uv": [ + 16, + 0, + 13, + 16 + ], + "texture": "#texture", + "cullface": "west" + }, + "east": { + "uv": [ + 13, + 0, + 16, + 16 + ], + "texture": "#texture", + "cullface": "east" + } + } + } + ] +} diff --git a/src/main/resources/assets/basemetals/models/block/emerald_trapdoor_iron_trapdoor_top.json b/src/main/resources/assets/basemetals/models/block/emerald_trapdoor_iron_trapdoor_top.json new file mode 100644 index 000000000..bbfecac77 --- /dev/null +++ b/src/main/resources/assets/basemetals/models/block/emerald_trapdoor_iron_trapdoor_top.json @@ -0,0 +1,82 @@ +{ + "parent": "minecraft:block/iron_trapdoor_top", + "textures": { + "particle": "minecraft:block/emerald_block", + "texture": "basemetals:block/emerald_trapdoor" + }, + "elements": [ + { + "from": [ + 0, + 13, + 0 + ], + "to": [ + 16, + 16, + 16 + ], + "faces": { + "down": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#texture" + }, + "up": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#texture", + "cullface": "up" + }, + "north": { + "uv": [ + 0, + 16, + 16, + 13 + ], + "texture": "#texture", + "cullface": "north" + }, + "south": { + "uv": [ + 0, + 16, + 16, + 13 + ], + "texture": "#texture", + "cullface": "south" + }, + "west": { + "uv": [ + 0, + 16, + 16, + 13 + ], + "texture": "#texture", + "cullface": "west" + }, + "east": { + "uv": [ + 0, + 16, + 16, + 13 + ], + "texture": "#texture", + "cullface": "east" + } + } + } + ] +} diff --git a/src/main/resources/assets/basemetals/models/block/emerald_trapdoor_open.json b/src/main/resources/assets/basemetals/models/block/emerald_trapdoor_open.json deleted file mode 100644 index 3892c9282..000000000 --- a/src/main/resources/assets/basemetals/models/block/emerald_trapdoor_open.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/template_orientable_trapdoor_open", - "textures": { - "texture": "basemetals:block/emerald_trapdoor" - } -} diff --git a/src/main/resources/assets/basemetals/models/block/emerald_trapdoor_top.json b/src/main/resources/assets/basemetals/models/block/emerald_trapdoor_top.json deleted file mode 100644 index e40fbe16b..000000000 --- a/src/main/resources/assets/basemetals/models/block/emerald_trapdoor_top.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/template_orientable_trapdoor_top", - "textures": { - "texture": "basemetals:block/emerald_trapdoor" - } -} diff --git a/src/main/resources/assets/basemetals/models/block/emerald_wall_cobblestone_wall_post.json b/src/main/resources/assets/basemetals/models/block/emerald_wall_cobblestone_wall_post.json new file mode 100644 index 000000000..141ddac98 --- /dev/null +++ b/src/main/resources/assets/basemetals/models/block/emerald_wall_cobblestone_wall_post.json @@ -0,0 +1,44 @@ +{ + "parent": "minecraft:block/cobblestone_wall_post", + "textures": { + "particle": "minecraft:block/emerald_block", + "wall": "minecraft:block/emerald_block" + }, + "elements": [ + { + "from": [ + 4, + 0, + 4 + ], + "to": [ + 12, + 16, + 12 + ], + "faces": { + "down": { + "texture": "#wall", + "cullface": "down" + }, + "up": { + "texture": "#wall", + "cullface": "up" + }, + "north": { + "texture": "#wall" + }, + "south": { + "texture": "#wall" + }, + "west": { + "texture": "#wall" + }, + "east": { + "texture": "#wall" + } + }, + "__comment": "Center post" + } + ] +} diff --git a/src/main/resources/assets/basemetals/models/block/emerald_wall_cobblestone_wall_side.json b/src/main/resources/assets/basemetals/models/block/emerald_wall_cobblestone_wall_side.json new file mode 100644 index 000000000..1cb7057c3 --- /dev/null +++ b/src/main/resources/assets/basemetals/models/block/emerald_wall_cobblestone_wall_side.json @@ -0,0 +1,41 @@ +{ + "parent": "minecraft:block/cobblestone_wall_side", + "textures": { + "particle": "minecraft:block/emerald_block", + "wall": "minecraft:block/emerald_block" + }, + "elements": [ + { + "from": [ + 5, + 0, + 0 + ], + "to": [ + 11, + 14, + 8 + ], + "faces": { + "down": { + "texture": "#wall", + "cullface": "down" + }, + "up": { + "texture": "#wall" + }, + "north": { + "texture": "#wall", + "cullface": "north" + }, + "west": { + "texture": "#wall" + }, + "east": { + "texture": "#wall" + } + }, + "__comment": "wall" + } + ] +} diff --git a/src/main/resources/assets/basemetals/models/block/emerald_wall_cobblestone_wall_side_tall.json b/src/main/resources/assets/basemetals/models/block/emerald_wall_cobblestone_wall_side_tall.json new file mode 100644 index 000000000..006533e45 --- /dev/null +++ b/src/main/resources/assets/basemetals/models/block/emerald_wall_cobblestone_wall_side_tall.json @@ -0,0 +1,41 @@ +{ + "parent": "minecraft:block/cobblestone_wall_side_tall", + "textures": { + "particle": "minecraft:block/emerald_block", + "wall": "minecraft:block/emerald_block" + }, + "elements": [ + { + "from": [ + 5, + 0, + 0 + ], + "to": [ + 11, + 16, + 8 + ], + "faces": { + "down": { + "texture": "#wall", + "cullface": "down" + }, + "up": { + "texture": "#wall", + "cullface": "up" + }, + "north": { + "texture": "#wall", + "cullface": "north" + }, + "west": { + "texture": "#wall" + }, + "east": { + "texture": "#wall" + } + } + } + ] +} diff --git a/src/main/resources/assets/basemetals/models/block/emerald_wall_inventory.json b/src/main/resources/assets/basemetals/models/block/emerald_wall_inventory.json index 6a37fb416..d32ccd107 100644 --- a/src/main/resources/assets/basemetals/models/block/emerald_wall_inventory.json +++ b/src/main/resources/assets/basemetals/models/block/emerald_wall_inventory.json @@ -1,6 +1,6 @@ { - "parent": "block/wall_inventory", - "textures": { - "wall": "minecraft:block/emerald_block" - } + "parent": "block/wall_inventory", + "textures": { + "wall": "minecraft:block/emerald_block" + } } diff --git a/src/main/resources/assets/basemetals/models/block/emerald_wall_post.json b/src/main/resources/assets/basemetals/models/block/emerald_wall_post.json deleted file mode 100644 index eeed93f0c..000000000 --- a/src/main/resources/assets/basemetals/models/block/emerald_wall_post.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/template_wall_post", - "textures": { - "wall": "minecraft:block/emerald_block" - } -} diff --git a/src/main/resources/assets/basemetals/models/block/emerald_wall_side.json b/src/main/resources/assets/basemetals/models/block/emerald_wall_side.json deleted file mode 100644 index 159b73665..000000000 --- a/src/main/resources/assets/basemetals/models/block/emerald_wall_side.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/template_wall_side", - "textures": { - "wall": "minecraft:block/emerald_block" - } -} diff --git a/src/main/resources/assets/basemetals/models/block/gold_bars_cap.json b/src/main/resources/assets/basemetals/models/block/gold_bars_cap.json deleted file mode 100644 index 39dbed3a2..000000000 --- a/src/main/resources/assets/basemetals/models/block/gold_bars_cap.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "ambientocclusion": false, - "textures": { - "particle": "basemetals:block/gold_bars", - "bars": "basemetals:block/gold_bars", - "edge": "basemetals:block/gold_bars" - }, - "elements": [ - { "from": [ 8, 0, 8 ], - "to": [ 8, 16, 9 ], - "faces": { - "west": { "uv": [ 8, 0, 7, 16 ], "texture": "#bars" }, - "east": { "uv": [ 7, 0, 8, 16 ], "texture": "#bars" } - } - }, - { "from": [ 7, 0, 9 ], - "to": [ 9, 16, 9 ], - "faces": { - "north": { "uv": [ 9, 0, 7, 16 ], "texture": "#bars" }, - "south": { "uv": [ 7, 0, 9, 16 ], "texture": "#bars" } - } - } - ] -} diff --git a/src/main/resources/assets/basemetals/models/block/gold_bars_cap_alt.json b/src/main/resources/assets/basemetals/models/block/gold_bars_cap_alt.json deleted file mode 100644 index 52bb67cef..000000000 --- a/src/main/resources/assets/basemetals/models/block/gold_bars_cap_alt.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "ambientocclusion": false, - "textures": { - "particle": "basemetals:block/gold_bars", - "bars": "basemetals:block/gold_bars", - "edge": "basemetals:block/gold_bars" - }, - "elements": [ - { "from": [ 8, 0, 7 ], - "to": [ 8, 16, 8 ], - "faces": { - "west": { "uv": [ 8, 0, 9, 16 ], "texture": "#bars" }, - "east": { "uv": [ 9, 0, 8, 16 ], "texture": "#bars" } - } - }, - { "from": [ 7, 0, 7 ], - "to": [ 9, 16, 7 ], - "faces": { - "north": { "uv": [ 7, 0, 9, 16 ], "texture": "#bars" }, - "south": { "uv": [ 9, 0, 7, 16 ], "texture": "#bars" } - } - } - ] -} diff --git a/src/main/resources/assets/basemetals/models/block/gold_bars_iron_bars_cap.json b/src/main/resources/assets/basemetals/models/block/gold_bars_iron_bars_cap.json new file mode 100644 index 000000000..3d0a216ed --- /dev/null +++ b/src/main/resources/assets/basemetals/models/block/gold_bars_iron_bars_cap.json @@ -0,0 +1,74 @@ +{ + "parent": "minecraft:block/iron_bars_cap", + "textures": { + "particle": "minecraft:block/gold_block", + "bars": "basemetals:block/gold_bars", + "edge": "basemetals:block/gold_bars" + }, + "elements": [ + { + "from": [ + 8, + 0, + 8 + ], + "to": [ + 8, + 16, + 9 + ], + "faces": { + "west": { + "uv": [ + 8, + 0, + 7, + 16 + ], + "texture": "#bars" + }, + "east": { + "uv": [ + 7, + 0, + 8, + 16 + ], + "texture": "#bars" + } + } + }, + { + "from": [ + 7, + 0, + 9 + ], + "to": [ + 9, + 16, + 9 + ], + "faces": { + "north": { + "uv": [ + 9, + 0, + 7, + 16 + ], + "texture": "#bars" + }, + "south": { + "uv": [ + 7, + 0, + 9, + 16 + ], + "texture": "#bars" + } + } + } + ] +} diff --git a/src/main/resources/assets/basemetals/models/block/gold_bars_iron_bars_cap_alt.json b/src/main/resources/assets/basemetals/models/block/gold_bars_iron_bars_cap_alt.json new file mode 100644 index 000000000..d5f8fa9e9 --- /dev/null +++ b/src/main/resources/assets/basemetals/models/block/gold_bars_iron_bars_cap_alt.json @@ -0,0 +1,74 @@ +{ + "parent": "minecraft:block/iron_bars_cap_alt", + "textures": { + "particle": "minecraft:block/gold_block", + "bars": "basemetals:block/gold_bars", + "edge": "basemetals:block/gold_bars" + }, + "elements": [ + { + "from": [ + 8, + 0, + 7 + ], + "to": [ + 8, + 16, + 8 + ], + "faces": { + "west": { + "uv": [ + 8, + 0, + 9, + 16 + ], + "texture": "#bars" + }, + "east": { + "uv": [ + 9, + 0, + 8, + 16 + ], + "texture": "#bars" + } + } + }, + { + "from": [ + 7, + 0, + 7 + ], + "to": [ + 9, + 16, + 7 + ], + "faces": { + "north": { + "uv": [ + 7, + 0, + 9, + 16 + ], + "texture": "#bars" + }, + "south": { + "uv": [ + 9, + 0, + 7, + 16 + ], + "texture": "#bars" + } + } + } + ] +} diff --git a/src/main/resources/assets/basemetals/models/block/gold_bars_iron_bars_post.json b/src/main/resources/assets/basemetals/models/block/gold_bars_iron_bars_post.json new file mode 100644 index 000000000..92fbabb25 --- /dev/null +++ b/src/main/resources/assets/basemetals/models/block/gold_bars_iron_bars_post.json @@ -0,0 +1,73 @@ +{ + "parent": "minecraft:block/iron_bars_post", + "textures": { + "particle": "minecraft:block/gold_block", + "bars": "basemetals:block/gold_bars" + }, + "elements": [ + { + "from": [ + 8, + 0, + 7 + ], + "to": [ + 8, + 16, + 9 + ], + "faces": { + "west": { + "uv": [ + 7, + 0, + 9, + 16 + ], + "texture": "#bars" + }, + "east": { + "uv": [ + 9, + 0, + 7, + 16 + ], + "texture": "#bars" + } + } + }, + { + "from": [ + 7, + 0, + 8 + ], + "to": [ + 9, + 16, + 8 + ], + "faces": { + "north": { + "uv": [ + 7, + 0, + 9, + 16 + ], + "texture": "#bars" + }, + "south": { + "uv": [ + 9, + 0, + 7, + 16 + ], + "texture": "#bars" + } + } + } + ] +} diff --git a/src/generated/resources/assets/basemetals/models/block/gold_bars_post_ends.json b/src/main/resources/assets/basemetals/models/block/gold_bars_iron_bars_post_ends.json similarity index 50% rename from src/generated/resources/assets/basemetals/models/block/gold_bars_post_ends.json rename to src/main/resources/assets/basemetals/models/block/gold_bars_iron_bars_post_ends.json index e2f460700..95a71e07a 100644 --- a/src/generated/resources/assets/basemetals/models/block/gold_bars_post_ends.json +++ b/src/main/resources/assets/basemetals/models/block/gold_bars_iron_bars_post_ends.json @@ -1,15 +1,11 @@ { - "ambientocclusion": false, + "parent": "minecraft:block/iron_bars_post_ends", + "textures": { + "particle": "minecraft:block/gold_block", + "edge": "basemetals:block/gold_bars" + }, "elements": [ { - "faces": { - "down": { - "texture": "#edge" - }, - "up": { - "texture": "#edge" - } - }, "from": [ 7, 0.001, @@ -19,17 +15,29 @@ 9, 0.001, 9 - ] - }, - { + ], "faces": { "down": { + "uv": [ + 7, + 7, + 9, + 9 + ], "texture": "#edge" }, "up": { + "uv": [ + 7, + 7, + 9, + 9 + ], "texture": "#edge" } - }, + } + }, + { "from": [ 7, 15.999, @@ -39,11 +47,27 @@ 9, 15.999, 9 - ] + ], + "faces": { + "down": { + "uv": [ + 7, + 7, + 9, + 9 + ], + "texture": "#edge" + }, + "up": { + "uv": [ + 7, + 7, + 9, + 9 + ], + "texture": "#edge" + } + } } - ], - "textures": { - "edge": "basemetals:block/gold_bars", - "particle": "basemetals:block/gold_bars" - } -} \ No newline at end of file + ] +} diff --git a/src/main/resources/assets/basemetals/models/block/gold_bars_iron_bars_side.json b/src/main/resources/assets/basemetals/models/block/gold_bars_iron_bars_side.json new file mode 100644 index 000000000..ca8bf43d7 --- /dev/null +++ b/src/main/resources/assets/basemetals/models/block/gold_bars_iron_bars_side.json @@ -0,0 +1,130 @@ +{ + "parent": "minecraft:block/iron_bars_side", + "textures": { + "particle": "minecraft:block/gold_block", + "bars": "basemetals:block/gold_bars", + "edge": "basemetals:block/gold_bars" + }, + "elements": [ + { + "from": [ + 8, + 0, + 0 + ], + "to": [ + 8, + 16, + 8 + ], + "faces": { + "west": { + "uv": [ + 16, + 0, + 8, + 16 + ], + "texture": "#bars" + }, + "east": { + "uv": [ + 8, + 0, + 16, + 16 + ], + "texture": "#bars" + } + } + }, + { + "from": [ + 7, + 0, + 0 + ], + "to": [ + 9, + 16, + 7 + ], + "faces": { + "north": { + "uv": [ + 7, + 0, + 9, + 16 + ], + "texture": "#edge", + "cullface": "north" + } + } + }, + { + "from": [ + 7, + 0.001, + 0 + ], + "to": [ + 9, + 0.001, + 7 + ], + "faces": { + "down": { + "uv": [ + 9, + 0, + 7, + 7 + ], + "texture": "#edge" + }, + "up": { + "uv": [ + 7, + 0, + 9, + 7 + ], + "texture": "#edge" + } + } + }, + { + "from": [ + 7, + 15.999, + 0 + ], + "to": [ + 9, + 15.999, + 7 + ], + "faces": { + "down": { + "uv": [ + 9, + 0, + 7, + 7 + ], + "texture": "#edge" + }, + "up": { + "uv": [ + 7, + 0, + 9, + 7 + ], + "texture": "#edge" + } + } + } + ] +} diff --git a/src/main/resources/assets/basemetals/models/block/gold_bars_iron_bars_side_alt.json b/src/main/resources/assets/basemetals/models/block/gold_bars_iron_bars_side_alt.json new file mode 100644 index 000000000..7a9c03c64 --- /dev/null +++ b/src/main/resources/assets/basemetals/models/block/gold_bars_iron_bars_side_alt.json @@ -0,0 +1,148 @@ +{ + "parent": "minecraft:block/iron_bars_side_alt", + "textures": { + "particle": "minecraft:block/gold_block", + "bars": "basemetals:block/gold_bars", + "edge": "basemetals:block/gold_bars" + }, + "elements": [ + { + "from": [ + 8, + 0, + 8 + ], + "to": [ + 8, + 16, + 16 + ], + "faces": { + "west": { + "uv": [ + 8, + 0, + 0, + 16 + ], + "texture": "#bars" + }, + "east": { + "uv": [ + 0, + 0, + 8, + 16 + ], + "texture": "#bars" + } + } + }, + { + "from": [ + 7, + 0, + 9 + ], + "to": [ + 9, + 16, + 16 + ], + "faces": { + "south": { + "uv": [ + 7, + 0, + 9, + 16 + ], + "texture": "#edge", + "cullface": "south" + }, + "down": { + "uv": [ + 9, + 9, + 7, + 16 + ], + "texture": "#edge" + }, + "up": { + "uv": [ + 7, + 9, + 9, + 16 + ], + "texture": "#edge" + } + } + }, + { + "from": [ + 7, + 0.001, + 9 + ], + "to": [ + 9, + 0.001, + 16 + ], + "faces": { + "down": { + "uv": [ + 9, + 9, + 7, + 16 + ], + "texture": "#edge" + }, + "up": { + "uv": [ + 7, + 9, + 9, + 16 + ], + "texture": "#edge" + } + } + }, + { + "from": [ + 7, + 15.999, + 9 + ], + "to": [ + 9, + 15.999, + 16 + ], + "faces": { + "down": { + "uv": [ + 9, + 9, + 7, + 16 + ], + "texture": "#edge" + }, + "up": { + "uv": [ + 7, + 9, + 9, + 16 + ], + "texture": "#edge" + } + } + } + ] +} diff --git a/src/main/resources/assets/basemetals/models/block/gold_bars_post.json b/src/main/resources/assets/basemetals/models/block/gold_bars_post.json deleted file mode 100644 index f535ccf18..000000000 --- a/src/main/resources/assets/basemetals/models/block/gold_bars_post.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "ambientocclusion": false, - "textures": { - "particle": "basemetals:block/gold_bars", - "bars": "basemetals:block/gold_bars" - }, - "elements": [ - { "from": [ 8, 0, 7 ], - "to": [ 8, 16, 9 ], - "faces": { - "west": { "uv": [ 7, 0, 9, 16 ], "texture": "#bars" }, - "east": { "uv": [ 9, 0, 7, 16 ], "texture": "#bars" } - } - }, - { "from": [ 7, 0, 8 ], - "to": [ 9, 16, 8 ], - "faces": { - "north": { "uv": [ 7, 0, 9, 16 ], "texture": "#bars" }, - "south": { "uv": [ 9, 0, 7, 16 ], "texture": "#bars" } - } - } - ] -} diff --git a/src/main/resources/assets/basemetals/models/block/gold_bars_side.json b/src/main/resources/assets/basemetals/models/block/gold_bars_side.json deleted file mode 100644 index 2186ceb08..000000000 --- a/src/main/resources/assets/basemetals/models/block/gold_bars_side.json +++ /dev/null @@ -1,37 +0,0 @@ -{ - "ambientocclusion": false, - "textures": { - "particle": "basemetals:block/gold_bars", - "bars": "basemetals:block/gold_bars", - "edge": "basemetals:block/gold_bars" - }, - "elements": [ - { "from": [ 8, 0, 0 ], - "to": [ 8, 16, 8 ], - "faces": { - "west": { "uv": [ 16, 0, 8, 16 ], "texture": "#bars" }, - "east": { "uv": [ 8, 0, 16, 16 ], "texture": "#bars" } - } - }, - { "from": [ 7, 0, 0 ], - "to": [ 9, 16, 7 ], - "faces": { - "north": { "uv": [ 7, 0, 9, 16 ], "texture": "#edge", "cullface": "north" } - } - }, - { "from": [ 7, 0.001, 0 ], - "to": [ 9, 0.001, 7 ], - "faces": { - "down": { "uv": [ 9, 0, 7, 7 ], "texture": "#edge" }, - "up": { "uv": [ 7, 0, 9, 7 ], "texture": "#edge" } - } - }, - { "from": [ 7, 15.999, 0 ], - "to": [ 9, 15.999, 7 ], - "faces": { - "down": { "uv": [ 9, 0, 7, 7 ], "texture": "#edge" }, - "up": { "uv": [ 7, 0, 9, 7 ], "texture": "#edge" } - } - } - ] -} diff --git a/src/main/resources/assets/basemetals/models/block/gold_bars_side_alt.json b/src/main/resources/assets/basemetals/models/block/gold_bars_side_alt.json deleted file mode 100644 index b32c0598f..000000000 --- a/src/main/resources/assets/basemetals/models/block/gold_bars_side_alt.json +++ /dev/null @@ -1,37 +0,0 @@ -{ - "ambientocclusion": false, - "textures": { - "particle": "basemetals:block/gold_bars", - "bars": "basemetals:block/gold_bars", - "edge": "basemetals:block/gold_bars" - }, - "elements": [ - { "from": [ 8, 0, 8 ], - "to": [ 8, 16, 16 ], - "faces": { - "west": { "uv": [ 8, 0, 0, 16 ], "texture": "#bars" }, - "east": { "uv": [ 0, 0, 8, 16 ], "texture": "#bars" } - } - }, - { "from": [ 7, 0, 9 ], - "to": [ 9, 16, 16 ], - "faces": { - "south": { "uv": [ 7, 0, 9, 16 ], "texture": "#edge", "cullface": "south" } - } - }, - { "from": [ 7, 0.001, 9 ], - "to": [ 9, 0.001, 16 ], - "faces": { - "down": { "uv": [ 9, 9, 7, 16 ], "texture": "#edge" }, - "up": { "uv": [ 7, 9, 9, 16 ], "texture": "#edge" } - } - }, - { "from": [ 7, 15.999, 9 ], - "to": [ 9, 15.999, 16 ], - "faces": { - "down": { "uv": [ 9, 9, 7, 16 ], "texture": "#edge" }, - "up": { "uv": [ 7, 9, 9, 16 ], "texture": "#edge" } - } - } - ] -} diff --git a/src/main/resources/assets/basemetals/models/block/gold_button.json b/src/main/resources/assets/basemetals/models/block/gold_button.json deleted file mode 100644 index 32bd435da..000000000 --- a/src/main/resources/assets/basemetals/models/block/gold_button.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/button", - "textures": { - "texture": "minecraft:block/gold_block" - } -} diff --git a/src/main/resources/assets/basemetals/models/block/gold_button_inventory.json b/src/main/resources/assets/basemetals/models/block/gold_button_inventory.json index 6ccae5ebb..d93508356 100644 --- a/src/main/resources/assets/basemetals/models/block/gold_button_inventory.json +++ b/src/main/resources/assets/basemetals/models/block/gold_button_inventory.json @@ -1,6 +1,6 @@ { - "parent": "block/button_inventory", - "textures": { - "texture": "minecraft:block/gold_block" - } + "parent": "block/button_inventory", + "textures": { + "texture": "minecraft:block/gold_block" + } } diff --git a/src/main/resources/assets/basemetals/models/block/gold_button_polished_blackstone_button.json b/src/main/resources/assets/basemetals/models/block/gold_button_polished_blackstone_button.json new file mode 100644 index 000000000..7095d0a0f --- /dev/null +++ b/src/main/resources/assets/basemetals/models/block/gold_button_polished_blackstone_button.json @@ -0,0 +1,78 @@ +{ + "parent": "minecraft:block/polished_blackstone_button", + "textures": { + "particle": "minecraft:block/gold_block", + "texture": "minecraft:block/gold_block" + }, + "elements": [ + { + "from": [ + 5, + 0, + 6 + ], + "to": [ + 11, + 2, + 10 + ], + "faces": { + "down": { + "uv": [ + 5, + 6, + 11, + 10 + ], + "texture": "#texture", + "cullface": "down" + }, + "up": { + "uv": [ + 5, + 6, + 11, + 10 + ], + "texture": "#texture" + }, + "north": { + "uv": [ + 5, + 14, + 11, + 16 + ], + "texture": "#texture" + }, + "south": { + "uv": [ + 5, + 14, + 11, + 16 + ], + "texture": "#texture" + }, + "west": { + "uv": [ + 6, + 14, + 10, + 16 + ], + "texture": "#texture" + }, + "east": { + "uv": [ + 6, + 14, + 10, + 16 + ], + "texture": "#texture" + } + } + } + ] +} diff --git a/src/main/resources/assets/basemetals/models/block/gold_button_polished_blackstone_button_pressed.json b/src/main/resources/assets/basemetals/models/block/gold_button_polished_blackstone_button_pressed.json new file mode 100644 index 000000000..3abdeb0b5 --- /dev/null +++ b/src/main/resources/assets/basemetals/models/block/gold_button_polished_blackstone_button_pressed.json @@ -0,0 +1,78 @@ +{ + "parent": "minecraft:block/polished_blackstone_button_pressed", + "textures": { + "particle": "minecraft:block/gold_block", + "texture": "minecraft:block/gold_block" + }, + "elements": [ + { + "from": [ + 5, + 0, + 6 + ], + "to": [ + 11, + 1.02, + 10 + ], + "faces": { + "down": { + "uv": [ + 5, + 6, + 11, + 10 + ], + "texture": "#texture", + "cullface": "down" + }, + "up": { + "uv": [ + 5, + 6, + 11, + 10 + ], + "texture": "#texture" + }, + "north": { + "uv": [ + 5, + 14, + 11, + 15 + ], + "texture": "#texture" + }, + "south": { + "uv": [ + 5, + 14, + 11, + 15 + ], + "texture": "#texture" + }, + "west": { + "uv": [ + 6, + 14, + 10, + 15 + ], + "texture": "#texture" + }, + "east": { + "uv": [ + 6, + 14, + 10, + 15 + ], + "texture": "#texture" + } + } + } + ] +} diff --git a/src/main/resources/assets/basemetals/models/block/gold_button_pressed.json b/src/main/resources/assets/basemetals/models/block/gold_button_pressed.json deleted file mode 100644 index e8edf2bce..000000000 --- a/src/main/resources/assets/basemetals/models/block/gold_button_pressed.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/button_pressed", - "textures": { - "texture": "minecraft:block/gold_block" - } -} diff --git a/src/main/resources/assets/basemetals/models/block/gold_door_bottom.json b/src/main/resources/assets/basemetals/models/block/gold_door_bottom.json deleted file mode 100644 index 575287d3a..000000000 --- a/src/main/resources/assets/basemetals/models/block/gold_door_bottom.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/door_bottom_left", - "textures": { - "bottom": "basemetals:block/gold_door_lower", - "top": "basemetals:block/gold_door_upper" - } -} diff --git a/src/main/resources/assets/basemetals/models/block/gold_door_bottom_rh.json b/src/main/resources/assets/basemetals/models/block/gold_door_bottom_rh.json deleted file mode 100644 index b1ab2360d..000000000 --- a/src/main/resources/assets/basemetals/models/block/gold_door_bottom_rh.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/door_bottom_right", - "textures": { - "bottom": "basemetals:block/gold_door_lower", - "top": "basemetals:block/gold_door_upper" - } -} diff --git a/src/main/resources/assets/basemetals/models/block/gold_door_iron_door_bottom_left.json b/src/main/resources/assets/basemetals/models/block/gold_door_iron_door_bottom_left.json new file mode 100644 index 000000000..8aa6c4d9b --- /dev/null +++ b/src/main/resources/assets/basemetals/models/block/gold_door_iron_door_bottom_left.json @@ -0,0 +1,74 @@ +{ + "parent": "minecraft:block/iron_door_bottom_left", + "textures": { + "particle": "minecraft:block/gold_block", + "bottom": "basemetals:block/gold_door_lower", + "top": "basemetals:block/gold_door_upper" + }, + "elements": [ + { + "from": [ + 0, + 0, + 0 + ], + "to": [ + 3, + 16, + 16 + ], + "faces": { + "down": { + "uv": [ + 16, + 13, + 0, + 16 + ], + "texture": "#bottom", + "cullface": "down", + "rotation": 90 + }, + "north": { + "uv": [ + 3, + 0, + 0, + 16 + ], + "texture": "#bottom", + "cullface": "north" + }, + "south": { + "uv": [ + 0, + 0, + 3, + 16 + ], + "texture": "#bottom", + "cullface": "south" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#bottom", + "cullface": "west" + }, + "east": { + "uv": [ + 16, + 0, + 0, + 16 + ], + "texture": "#bottom" + } + } + } + ] +} diff --git a/src/main/resources/assets/basemetals/models/block/gold_door_iron_door_bottom_left_open.json b/src/main/resources/assets/basemetals/models/block/gold_door_iron_door_bottom_left_open.json new file mode 100644 index 000000000..57c1889fd --- /dev/null +++ b/src/main/resources/assets/basemetals/models/block/gold_door_iron_door_bottom_left_open.json @@ -0,0 +1,74 @@ +{ + "parent": "minecraft:block/iron_door_bottom_left_open", + "textures": { + "particle": "minecraft:block/gold_block", + "bottom": "basemetals:block/gold_door_lower", + "top": "basemetals:block/gold_door_upper" + }, + "elements": [ + { + "from": [ + 0, + 0, + 0 + ], + "to": [ + 3, + 16, + 16 + ], + "faces": { + "down": { + "uv": [ + 0, + 16, + 16, + 13 + ], + "texture": "#bottom", + "cullface": "down", + "rotation": 90 + }, + "north": { + "uv": [ + 0, + 0, + 3, + 16 + ], + "texture": "#bottom", + "cullface": "north" + }, + "south": { + "uv": [ + 0, + 0, + 3, + 16 + ], + "texture": "#bottom", + "cullface": "south" + }, + "west": { + "uv": [ + 16, + 0, + 0, + 16 + ], + "texture": "#bottom", + "cullface": "west" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#bottom" + } + } + } + ] +} diff --git a/src/main/resources/assets/basemetals/models/block/gold_door_iron_door_bottom_right.json b/src/main/resources/assets/basemetals/models/block/gold_door_iron_door_bottom_right.json new file mode 100644 index 000000000..1898aca88 --- /dev/null +++ b/src/main/resources/assets/basemetals/models/block/gold_door_iron_door_bottom_right.json @@ -0,0 +1,74 @@ +{ + "parent": "minecraft:block/iron_door_bottom_right", + "textures": { + "particle": "minecraft:block/gold_block", + "bottom": "basemetals:block/gold_door_lower", + "top": "basemetals:block/gold_door_upper" + }, + "elements": [ + { + "from": [ + 0, + 0, + 0 + ], + "to": [ + 3, + 16, + 16 + ], + "faces": { + "down": { + "uv": [ + 0, + 13, + 16, + 16 + ], + "texture": "#bottom", + "cullface": "down", + "rotation": 90 + }, + "north": { + "uv": [ + 3, + 0, + 0, + 16 + ], + "texture": "#bottom", + "cullface": "north" + }, + "south": { + "uv": [ + 0, + 0, + 3, + 16 + ], + "texture": "#bottom", + "cullface": "south" + }, + "west": { + "uv": [ + 16, + 0, + 0, + 16 + ], + "texture": "#bottom", + "cullface": "west" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#bottom" + } + } + } + ] +} diff --git a/src/main/resources/assets/basemetals/models/block/gold_door_iron_door_bottom_right_open.json b/src/main/resources/assets/basemetals/models/block/gold_door_iron_door_bottom_right_open.json new file mode 100644 index 000000000..408b36227 --- /dev/null +++ b/src/main/resources/assets/basemetals/models/block/gold_door_iron_door_bottom_right_open.json @@ -0,0 +1,74 @@ +{ + "parent": "minecraft:block/iron_door_bottom_right_open", + "textures": { + "particle": "minecraft:block/gold_block", + "bottom": "basemetals:block/gold_door_lower", + "top": "basemetals:block/gold_door_upper" + }, + "elements": [ + { + "from": [ + 0, + 0, + 0 + ], + "to": [ + 3, + 16, + 16 + ], + "faces": { + "down": { + "uv": [ + 16, + 16, + 0, + 13 + ], + "texture": "#bottom", + "cullface": "down", + "rotation": 90 + }, + "north": { + "uv": [ + 3, + 0, + 0, + 16 + ], + "texture": "#bottom", + "cullface": "north" + }, + "south": { + "uv": [ + 3, + 0, + 0, + 16 + ], + "texture": "#bottom", + "cullface": "south" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#bottom", + "cullface": "west" + }, + "east": { + "uv": [ + 16, + 0, + 0, + 16 + ], + "texture": "#bottom" + } + } + } + ] +} diff --git a/src/main/resources/assets/basemetals/models/block/gold_door_iron_door_top_left.json b/src/main/resources/assets/basemetals/models/block/gold_door_iron_door_top_left.json new file mode 100644 index 000000000..39febf207 --- /dev/null +++ b/src/main/resources/assets/basemetals/models/block/gold_door_iron_door_top_left.json @@ -0,0 +1,74 @@ +{ + "parent": "minecraft:block/iron_door_top_left", + "textures": { + "particle": "minecraft:block/gold_block", + "bottom": "basemetals:block/gold_door_lower", + "top": "basemetals:block/gold_door_upper" + }, + "elements": [ + { + "from": [ + 0, + 0, + 0 + ], + "to": [ + 3, + 16, + 16 + ], + "faces": { + "up": { + "uv": [ + 0, + 3, + 16, + 0 + ], + "texture": "#top", + "cullface": "up", + "rotation": 90 + }, + "north": { + "uv": [ + 3, + 0, + 0, + 16 + ], + "texture": "#top", + "cullface": "north" + }, + "south": { + "uv": [ + 0, + 0, + 3, + 16 + ], + "texture": "#top", + "cullface": "south" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#top", + "cullface": "west" + }, + "east": { + "uv": [ + 16, + 0, + 0, + 16 + ], + "texture": "#top" + } + } + } + ] +} diff --git a/src/main/resources/assets/basemetals/models/block/gold_door_iron_door_top_left_open.json b/src/main/resources/assets/basemetals/models/block/gold_door_iron_door_top_left_open.json new file mode 100644 index 000000000..82cf85f04 --- /dev/null +++ b/src/main/resources/assets/basemetals/models/block/gold_door_iron_door_top_left_open.json @@ -0,0 +1,74 @@ +{ + "parent": "minecraft:block/iron_door_top_left_open", + "textures": { + "particle": "minecraft:block/gold_block", + "bottom": "basemetals:block/gold_door_lower", + "top": "basemetals:block/gold_door_upper" + }, + "elements": [ + { + "from": [ + 0, + 0, + 0 + ], + "to": [ + 3, + 16, + 16 + ], + "faces": { + "up": { + "uv": [ + 0, + 3, + 16, + 0 + ], + "texture": "#top", + "cullface": "up", + "rotation": 270 + }, + "north": { + "uv": [ + 0, + 0, + 3, + 16 + ], + "texture": "#top", + "cullface": "north" + }, + "south": { + "uv": [ + 0, + 0, + 3, + 16 + ], + "texture": "#top", + "cullface": "south" + }, + "west": { + "uv": [ + 16, + 0, + 0, + 16 + ], + "texture": "#top", + "cullface": "west" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#top" + } + } + } + ] +} diff --git a/src/main/resources/assets/basemetals/models/block/gold_door_iron_door_top_right.json b/src/main/resources/assets/basemetals/models/block/gold_door_iron_door_top_right.json new file mode 100644 index 000000000..d9ad73344 --- /dev/null +++ b/src/main/resources/assets/basemetals/models/block/gold_door_iron_door_top_right.json @@ -0,0 +1,74 @@ +{ + "parent": "minecraft:block/iron_door_top_right", + "textures": { + "particle": "minecraft:block/gold_block", + "bottom": "basemetals:block/gold_door_lower", + "top": "basemetals:block/gold_door_upper" + }, + "elements": [ + { + "from": [ + 0, + 0, + 0 + ], + "to": [ + 3, + 16, + 16 + ], + "faces": { + "up": { + "uv": [ + 0, + 0, + 16, + 3 + ], + "texture": "#top", + "cullface": "up", + "rotation": 270 + }, + "north": { + "uv": [ + 3, + 0, + 0, + 16 + ], + "texture": "#top", + "cullface": "north" + }, + "south": { + "uv": [ + 0, + 0, + 3, + 16 + ], + "texture": "#top", + "cullface": "south" + }, + "west": { + "uv": [ + 16, + 0, + 0, + 16 + ], + "texture": "#top", + "cullface": "west" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#top" + } + } + } + ] +} diff --git a/src/main/resources/assets/basemetals/models/block/gold_door_iron_door_top_right_open.json b/src/main/resources/assets/basemetals/models/block/gold_door_iron_door_top_right_open.json new file mode 100644 index 000000000..47b241fed --- /dev/null +++ b/src/main/resources/assets/basemetals/models/block/gold_door_iron_door_top_right_open.json @@ -0,0 +1,74 @@ +{ + "parent": "minecraft:block/iron_door_top_right_open", + "textures": { + "particle": "minecraft:block/gold_block", + "bottom": "basemetals:block/gold_door_lower", + "top": "basemetals:block/gold_door_upper" + }, + "elements": [ + { + "from": [ + 0, + 0, + 0 + ], + "to": [ + 3, + 16, + 16 + ], + "faces": { + "up": { + "uv": [ + 0, + 0, + 16, + 3 + ], + "texture": "#top", + "cullface": "up", + "rotation": 90 + }, + "north": { + "uv": [ + 3, + 0, + 0, + 16 + ], + "texture": "#top", + "cullface": "north" + }, + "south": { + "uv": [ + 3, + 0, + 0, + 16 + ], + "texture": "#top", + "cullface": "south" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#top", + "cullface": "west" + }, + "east": { + "uv": [ + 16, + 0, + 0, + 16 + ], + "texture": "#top" + } + } + } + ] +} diff --git a/src/main/resources/assets/basemetals/models/block/gold_door_top.json b/src/main/resources/assets/basemetals/models/block/gold_door_top.json deleted file mode 100644 index 2cd00189f..000000000 --- a/src/main/resources/assets/basemetals/models/block/gold_door_top.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/door_top_left", - "textures": { - "bottom": "basemetals:block/gold_door_lower", - "top": "basemetals:block/gold_door_upper" - } -} diff --git a/src/main/resources/assets/basemetals/models/block/gold_door_top_rh.json b/src/main/resources/assets/basemetals/models/block/gold_door_top_rh.json deleted file mode 100644 index 177181654..000000000 --- a/src/main/resources/assets/basemetals/models/block/gold_door_top_rh.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/door_top_right", - "textures": { - "bottom": "basemetals:block/gold_door_lower", - "top": "basemetals:block/gold_door_upper" - } -} diff --git a/src/main/resources/assets/basemetals/models/block/gold_double_slab.json b/src/main/resources/assets/basemetals/models/block/gold_double_slab.json new file mode 100644 index 000000000..b2021340e --- /dev/null +++ b/src/main/resources/assets/basemetals/models/block/gold_double_slab.json @@ -0,0 +1,54 @@ +{ + "parent": "minecraft:block/quartz_block", + "textures": { + "particle": "minecraft:block/gold_block", + "down": "minecraft:block/gold_block", + "up": "minecraft:block/gold_block", + "north": "minecraft:block/gold_block", + "east": "minecraft:block/gold_block", + "south": "minecraft:block/gold_block", + "west": "minecraft:block/gold_block", + "end": "minecraft:block/gold_block", + "side": "minecraft:block/gold_block" + }, + "elements": [ + { + "from": [ + 0, + 0, + 0 + ], + "to": [ + 16, + 16, + 16 + ], + "faces": { + "down": { + "texture": "#down", + "cullface": "down" + }, + "up": { + "texture": "#up", + "cullface": "up" + }, + "north": { + "texture": "#north", + "cullface": "north" + }, + "south": { + "texture": "#south", + "cullface": "south" + }, + "west": { + "texture": "#west", + "cullface": "west" + }, + "east": { + "texture": "#east", + "cullface": "east" + } + } + } + ] +} diff --git a/src/main/resources/assets/basemetals/models/block/gold_inner_stairs.json b/src/main/resources/assets/basemetals/models/block/gold_inner_stairs.json deleted file mode 100644 index bc7437c9d..000000000 --- a/src/main/resources/assets/basemetals/models/block/gold_inner_stairs.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/inner_stairs", - "textures": { - "bottom": "minecraft:block/gold_block", - "top": "minecraft:block/gold_block", - "side": "minecraft:block/gold_block" - } -} diff --git a/src/main/resources/assets/basemetals/models/block/gold_lever.json b/src/main/resources/assets/basemetals/models/block/gold_lever.json deleted file mode 100644 index c28053c27..000000000 --- a/src/main/resources/assets/basemetals/models/block/gold_lever.json +++ /dev/null @@ -1,33 +0,0 @@ -{ - "ambientocclusion": false, - "textures": { - "particle": "minecraft:block/gold_block", - "base": "minecraft:block/gold_block", - "lever": "minecraft:block/lever" - }, - "elements": [ - { "from": [ 5, 0, 4 ], - "to": [ 11, 3, 12 ], - "faces": { - "down": { "uv": [ 5, 4, 11, 12 ], "texture": "#base" }, - "up": { "uv": [ 5, 4, 11, 12 ], "texture": "#base" }, - "north": { "uv": [ 5, 0, 11, 3 ], "texture": "#base" }, - "south": { "uv": [ 5, 0, 11, 3 ], "texture": "#base" }, - "west": { "uv": [ 4, 0, 12, 3 ], "texture": "#base" }, - "east": { "uv": [ 4, 0, 12, 3 ], "texture": "#base" } - } - }, - { "from": [ 7, 1, 7 ], - "to": [ 9, 11, 9 ], - "rotation": { "origin": [ 8, 1, 8 ], "axis": "x", "angle": -45 }, - "faces": { - "down": { "uv": [ 7, 6, 9, 8 ], "texture": "#lever" }, - "up": { "uv": [ 7, 6, 9, 8 ], "texture": "#lever" }, - "north": { "uv": [ 7, 6, 9, 16 ], "texture": "#lever" }, - "south": { "uv": [ 7, 6, 9, 16 ], "texture": "#lever" }, - "west": { "uv": [ 7, 6, 9, 16 ], "texture": "#lever" }, - "east": { "uv": [ 7, 6, 9, 16 ], "texture": "#lever" } - } - } - ] -} diff --git a/src/main/resources/assets/basemetals/models/block/gold_lever_lever.json b/src/main/resources/assets/basemetals/models/block/gold_lever_lever.json new file mode 100644 index 000000000..42e592463 --- /dev/null +++ b/src/main/resources/assets/basemetals/models/block/gold_lever_lever.json @@ -0,0 +1,147 @@ +{ + "parent": "minecraft:block/lever", + "textures": { + "particle": "minecraft:block/gold_block", + "base": "minecraft:block/gold_block", + "lever": "block/lever" + }, + "elements": [ + { + "from": [ + 5, + -0.02, + 4 + ], + "to": [ + 11, + 2.98, + 12 + ], + "faces": { + "down": { + "uv": [ + 5, + 4, + 11, + 12 + ], + "texture": "#base", + "cullface": "down" + }, + "up": { + "uv": [ + 5, + 4, + 11, + 12 + ], + "texture": "#base" + }, + "north": { + "uv": [ + 5, + 0, + 11, + 3 + ], + "texture": "#base" + }, + "south": { + "uv": [ + 5, + 0, + 11, + 3 + ], + "texture": "#base" + }, + "west": { + "uv": [ + 4, + 0, + 12, + 3 + ], + "texture": "#base" + }, + "east": { + "uv": [ + 4, + 0, + 12, + 3 + ], + "texture": "#base" + } + } + }, + { + "from": [ + 7, + 1, + 7 + ], + "to": [ + 9, + 11, + 9 + ], + "rotation": { + "origin": [ + 8, + 1, + 8 + ], + "axis": "x", + "angle": -45 + }, + "faces": { + "up": { + "uv": [ + 7, + 6, + 9, + 8 + ], + "texture": "#lever" + }, + "north": { + "uv": [ + 7, + 6, + 9, + 16 + ], + "texture": "#lever" + }, + "south": { + "uv": [ + 7, + 6, + 9, + 16 + ], + "texture": "#lever" + }, + "west": { + "uv": [ + 7, + 6, + 9, + 16 + ], + "texture": "#lever" + }, + "east": { + "uv": [ + 7, + 6, + 9, + 16 + ], + "texture": "#lever" + } + } + } + ] +} diff --git a/src/main/resources/assets/basemetals/models/block/gold_lever_lever_on.json b/src/main/resources/assets/basemetals/models/block/gold_lever_lever_on.json new file mode 100644 index 000000000..e85ea7553 --- /dev/null +++ b/src/main/resources/assets/basemetals/models/block/gold_lever_lever_on.json @@ -0,0 +1,147 @@ +{ + "parent": "minecraft:block/lever_on", + "textures": { + "particle": "minecraft:block/gold_block", + "base": "minecraft:block/gold_block", + "lever": "block/lever" + }, + "elements": [ + { + "from": [ + 5, + -0.02, + 4 + ], + "to": [ + 11, + 2.98, + 12 + ], + "faces": { + "down": { + "uv": [ + 5, + 4, + 11, + 12 + ], + "texture": "#base", + "cullface": "down" + }, + "up": { + "uv": [ + 5, + 4, + 11, + 12 + ], + "texture": "#base" + }, + "north": { + "uv": [ + 5, + 0, + 11, + 3 + ], + "texture": "#base" + }, + "south": { + "uv": [ + 5, + 0, + 11, + 3 + ], + "texture": "#base" + }, + "west": { + "uv": [ + 4, + 0, + 12, + 3 + ], + "texture": "#base" + }, + "east": { + "uv": [ + 4, + 0, + 12, + 3 + ], + "texture": "#base" + } + } + }, + { + "from": [ + 7, + 1, + 7 + ], + "to": [ + 9, + 11, + 9 + ], + "rotation": { + "origin": [ + 8, + 1, + 8 + ], + "axis": "x", + "angle": 45 + }, + "faces": { + "up": { + "uv": [ + 7, + 6, + 9, + 8 + ], + "texture": "#lever" + }, + "north": { + "uv": [ + 7, + 6, + 9, + 16 + ], + "texture": "#lever" + }, + "south": { + "uv": [ + 7, + 6, + 9, + 16 + ], + "texture": "#lever" + }, + "west": { + "uv": [ + 7, + 6, + 9, + 16 + ], + "texture": "#lever" + }, + "east": { + "uv": [ + 7, + 6, + 9, + 16 + ], + "texture": "#lever" + } + } + } + ] +} diff --git a/src/main/resources/assets/basemetals/models/block/gold_lever_off.json b/src/main/resources/assets/basemetals/models/block/gold_lever_off.json deleted file mode 100644 index adab3ea20..000000000 --- a/src/main/resources/assets/basemetals/models/block/gold_lever_off.json +++ /dev/null @@ -1,33 +0,0 @@ -{ - "ambientocclusion": false, - "textures": { - "particle": "minecraft:block/gold_block", - "base": "minecraft:block/gold_block", - "lever": "minecraft:block/lever" - }, - "elements": [ - { "from": [ 5, 0, 4 ], - "to": [ 11, 3, 12 ], - "faces": { - "down": { "uv": [ 5, 4, 11, 12 ], "texture": "#base" }, - "up": { "uv": [ 5, 4, 11, 12 ], "texture": "#base" }, - "north": { "uv": [ 5, 0, 11, 3 ], "texture": "#base" }, - "south": { "uv": [ 5, 0, 11, 3 ], "texture": "#base" }, - "west": { "uv": [ 4, 0, 12, 3 ], "texture": "#base" }, - "east": { "uv": [ 4, 0, 12, 3 ], "texture": "#base" } - } - }, - { "from": [ 7, 1, 7 ], - "to": [ 9, 11, 9 ], - "rotation": { "origin": [ 8, 1, 8 ], "axis": "x", "angle": 45 }, - "faces": { - "down": { "uv": [ 7, 6, 9, 8 ], "texture": "#lever" }, - "up": { "uv": [ 7, 6, 9, 8 ], "texture": "#lever" }, - "north": { "uv": [ 7, 6, 9, 16 ], "texture": "#lever" }, - "south": { "uv": [ 7, 6, 9, 16 ], "texture": "#lever" }, - "west": { "uv": [ 7, 6, 9, 16 ], "texture": "#lever" }, - "east": { "uv": [ 7, 6, 9, 16 ], "texture": "#lever" } - } - } - ] -} diff --git a/src/main/resources/assets/basemetals/models/block/gold_outer_stairs.json b/src/main/resources/assets/basemetals/models/block/gold_outer_stairs.json deleted file mode 100644 index d7fa8051f..000000000 --- a/src/main/resources/assets/basemetals/models/block/gold_outer_stairs.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/outer_stairs", - "textures": { - "bottom": "minecraft:block/gold_block", - "top": "minecraft:block/gold_block", - "side": "minecraft:block/gold_block" - } -} diff --git a/src/main/resources/assets/basemetals/models/block/gold_plate.json b/src/main/resources/assets/basemetals/models/block/gold_plate.json index 395de6541..d920793c5 100644 --- a/src/main/resources/assets/basemetals/models/block/gold_plate.json +++ b/src/main/resources/assets/basemetals/models/block/gold_plate.json @@ -1,8 +1,8 @@ { - "parent": "basemetals:block/plate", - "textures": { - "top": "minecraft:block/gold_block", - "side": "minecraft:block/gold_block", - "bottom": "minecraft:block/gold_block" - } + "parent": "basemetals:block/plate", + "textures": { + "top": "minecraft:block/gold_block", + "side": "minecraft:block/gold_block", + "bottom": "minecraft:block/gold_block" + } } diff --git a/src/main/resources/assets/basemetals/models/block/gold_plate_down.json b/src/main/resources/assets/basemetals/models/block/gold_plate_down.json new file mode 100644 index 000000000..c66af1ccc --- /dev/null +++ b/src/main/resources/assets/basemetals/models/block/gold_plate_down.json @@ -0,0 +1,41 @@ +{ + "parent": "minecraft:block/block", + "textures": { + "all": "minecraft:block/gold_block", + "particle": "minecraft:block/gold_block" + }, + "elements": [ + { + "from": [ + 0, + 15, + 0 + ], + "to": [ + 16, + 16, + 16 + ], + "faces": { + "up": { + "texture": "#all" + }, + "down": { + "texture": "#all" + }, + "north": { + "texture": "#all" + }, + "south": { + "texture": "#all" + }, + "east": { + "texture": "#all" + }, + "west": { + "texture": "#all" + } + } + } + ] +} diff --git a/src/main/resources/assets/basemetals/models/block/gold_plate_east.json b/src/main/resources/assets/basemetals/models/block/gold_plate_east.json new file mode 100644 index 000000000..8f3991c16 --- /dev/null +++ b/src/main/resources/assets/basemetals/models/block/gold_plate_east.json @@ -0,0 +1,41 @@ +{ + "parent": "minecraft:block/block", + "textures": { + "all": "minecraft:block/gold_block", + "particle": "minecraft:block/gold_block" + }, + "elements": [ + { + "from": [ + 0, + 0, + 0 + ], + "to": [ + 1, + 16, + 16 + ], + "faces": { + "up": { + "texture": "#all" + }, + "down": { + "texture": "#all" + }, + "north": { + "texture": "#all" + }, + "south": { + "texture": "#all" + }, + "east": { + "texture": "#all" + }, + "west": { + "texture": "#all" + } + } + } + ] +} diff --git a/src/main/resources/assets/basemetals/models/block/gold_plate_north.json b/src/main/resources/assets/basemetals/models/block/gold_plate_north.json new file mode 100644 index 000000000..acb4cdd49 --- /dev/null +++ b/src/main/resources/assets/basemetals/models/block/gold_plate_north.json @@ -0,0 +1,41 @@ +{ + "parent": "minecraft:block/block", + "textures": { + "all": "minecraft:block/gold_block", + "particle": "minecraft:block/gold_block" + }, + "elements": [ + { + "from": [ + 0, + 0, + 15 + ], + "to": [ + 16, + 16, + 16 + ], + "faces": { + "up": { + "texture": "#all" + }, + "down": { + "texture": "#all" + }, + "north": { + "texture": "#all" + }, + "south": { + "texture": "#all" + }, + "east": { + "texture": "#all" + }, + "west": { + "texture": "#all" + } + } + } + ] +} diff --git a/src/main/resources/assets/basemetals/models/block/gold_plate_south.json b/src/main/resources/assets/basemetals/models/block/gold_plate_south.json new file mode 100644 index 000000000..dc89097aa --- /dev/null +++ b/src/main/resources/assets/basemetals/models/block/gold_plate_south.json @@ -0,0 +1,41 @@ +{ + "parent": "minecraft:block/block", + "textures": { + "all": "minecraft:block/gold_block", + "particle": "minecraft:block/gold_block" + }, + "elements": [ + { + "from": [ + 0, + 0, + 0 + ], + "to": [ + 16, + 16, + 1 + ], + "faces": { + "up": { + "texture": "#all" + }, + "down": { + "texture": "#all" + }, + "north": { + "texture": "#all" + }, + "south": { + "texture": "#all" + }, + "east": { + "texture": "#all" + }, + "west": { + "texture": "#all" + } + } + } + ] +} diff --git a/src/main/resources/assets/basemetals/models/block/gold_plate_up.json b/src/main/resources/assets/basemetals/models/block/gold_plate_up.json new file mode 100644 index 000000000..9259291d5 --- /dev/null +++ b/src/main/resources/assets/basemetals/models/block/gold_plate_up.json @@ -0,0 +1,41 @@ +{ + "parent": "minecraft:block/block", + "textures": { + "all": "minecraft:block/gold_block", + "particle": "minecraft:block/gold_block" + }, + "elements": [ + { + "from": [ + 0, + 0, + 0 + ], + "to": [ + 16, + 1, + 16 + ], + "faces": { + "up": { + "texture": "#all" + }, + "down": { + "texture": "#all" + }, + "north": { + "texture": "#all" + }, + "south": { + "texture": "#all" + }, + "east": { + "texture": "#all" + }, + "west": { + "texture": "#all" + } + } + } + ] +} diff --git a/src/main/resources/assets/basemetals/models/block/gold_plate_west.json b/src/main/resources/assets/basemetals/models/block/gold_plate_west.json new file mode 100644 index 000000000..278cfd433 --- /dev/null +++ b/src/main/resources/assets/basemetals/models/block/gold_plate_west.json @@ -0,0 +1,41 @@ +{ + "parent": "minecraft:block/block", + "textures": { + "all": "minecraft:block/gold_block", + "particle": "minecraft:block/gold_block" + }, + "elements": [ + { + "from": [ + 15, + 0, + 0 + ], + "to": [ + 16, + 16, + 16 + ], + "faces": { + "up": { + "texture": "#all" + }, + "down": { + "texture": "#all" + }, + "north": { + "texture": "#all" + }, + "south": { + "texture": "#all" + }, + "east": { + "texture": "#all" + }, + "west": { + "texture": "#all" + } + } + } + ] +} diff --git a/src/main/resources/assets/basemetals/models/block/gold_slab_quartz_block.json b/src/main/resources/assets/basemetals/models/block/gold_slab_quartz_block.json new file mode 100644 index 000000000..b2021340e --- /dev/null +++ b/src/main/resources/assets/basemetals/models/block/gold_slab_quartz_block.json @@ -0,0 +1,54 @@ +{ + "parent": "minecraft:block/quartz_block", + "textures": { + "particle": "minecraft:block/gold_block", + "down": "minecraft:block/gold_block", + "up": "minecraft:block/gold_block", + "north": "minecraft:block/gold_block", + "east": "minecraft:block/gold_block", + "south": "minecraft:block/gold_block", + "west": "minecraft:block/gold_block", + "end": "minecraft:block/gold_block", + "side": "minecraft:block/gold_block" + }, + "elements": [ + { + "from": [ + 0, + 0, + 0 + ], + "to": [ + 16, + 16, + 16 + ], + "faces": { + "down": { + "texture": "#down", + "cullface": "down" + }, + "up": { + "texture": "#up", + "cullface": "up" + }, + "north": { + "texture": "#north", + "cullface": "north" + }, + "south": { + "texture": "#south", + "cullface": "south" + }, + "west": { + "texture": "#west", + "cullface": "west" + }, + "east": { + "texture": "#east", + "cullface": "east" + } + } + } + ] +} diff --git a/src/main/resources/assets/basemetals/models/block/gold_slab_quartz_slab.json b/src/main/resources/assets/basemetals/models/block/gold_slab_quartz_slab.json new file mode 100644 index 000000000..99218cbe9 --- /dev/null +++ b/src/main/resources/assets/basemetals/models/block/gold_slab_quartz_slab.json @@ -0,0 +1,84 @@ +{ + "parent": "minecraft:block/quartz_slab", + "textures": { + "particle": "minecraft:block/gold_block", + "bottom": "minecraft:block/gold_block", + "side": "minecraft:block/gold_block", + "top": "minecraft:block/gold_block" + }, + "elements": [ + { + "from": [ + 0, + 0, + 0 + ], + "to": [ + 16, + 8, + 16 + ], + "faces": { + "down": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#bottom", + "cullface": "down" + }, + "up": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#top" + }, + "north": { + "uv": [ + 0, + 8, + 16, + 16 + ], + "texture": "#side", + "cullface": "north" + }, + "south": { + "uv": [ + 0, + 8, + 16, + 16 + ], + "texture": "#side", + "cullface": "south" + }, + "west": { + "uv": [ + 0, + 8, + 16, + 16 + ], + "texture": "#side", + "cullface": "west" + }, + "east": { + "uv": [ + 0, + 8, + 16, + 16 + ], + "texture": "#side", + "cullface": "east" + } + } + } + ] +} diff --git a/src/main/resources/assets/basemetals/models/block/gold_slab_quartz_slab_top.json b/src/main/resources/assets/basemetals/models/block/gold_slab_quartz_slab_top.json new file mode 100644 index 000000000..86c1b52e9 --- /dev/null +++ b/src/main/resources/assets/basemetals/models/block/gold_slab_quartz_slab_top.json @@ -0,0 +1,84 @@ +{ + "parent": "minecraft:block/quartz_slab_top", + "textures": { + "particle": "minecraft:block/gold_block", + "bottom": "minecraft:block/gold_block", + "side": "minecraft:block/gold_block", + "top": "minecraft:block/gold_block" + }, + "elements": [ + { + "from": [ + 0, + 8, + 0 + ], + "to": [ + 16, + 16, + 16 + ], + "faces": { + "down": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#bottom" + }, + "up": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#top", + "cullface": "up" + }, + "north": { + "uv": [ + 0, + 0, + 16, + 8 + ], + "texture": "#side", + "cullface": "north" + }, + "south": { + "uv": [ + 0, + 0, + 16, + 8 + ], + "texture": "#side", + "cullface": "south" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 8 + ], + "texture": "#side", + "cullface": "west" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 8 + ], + "texture": "#side", + "cullface": "east" + } + } + } + ] +} diff --git a/src/main/resources/assets/basemetals/models/block/gold_stairs.json b/src/main/resources/assets/basemetals/models/block/gold_stairs.json index 872292fd7..f3572e86e 100644 --- a/src/main/resources/assets/basemetals/models/block/gold_stairs.json +++ b/src/main/resources/assets/basemetals/models/block/gold_stairs.json @@ -1,8 +1,8 @@ { - "parent": "block/stairs", - "textures": { - "bottom": "minecraft:block/gold_block", - "top": "minecraft:block/gold_block", - "side": "minecraft:block/gold_block" - } + "parent": "block/stairs", + "textures": { + "bottom": "minecraft:block/gold_block", + "top": "minecraft:block/gold_block", + "side": "minecraft:block/gold_block" + } } diff --git a/src/main/resources/assets/basemetals/models/block/gold_stairs_quartz_stairs.json b/src/main/resources/assets/basemetals/models/block/gold_stairs_quartz_stairs.json new file mode 100644 index 000000000..55bc2ab6b --- /dev/null +++ b/src/main/resources/assets/basemetals/models/block/gold_stairs_quartz_stairs.json @@ -0,0 +1,147 @@ +{ + "parent": "minecraft:block/quartz_stairs", + "textures": { + "particle": "minecraft:block/gold_block", + "bottom": "minecraft:block/gold_block", + "side": "minecraft:block/gold_block", + "top": "minecraft:block/gold_block" + }, + "elements": [ + { + "from": [ + 0, + 0, + 0 + ], + "to": [ + 16, + 8, + 16 + ], + "faces": { + "down": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#bottom", + "cullface": "down" + }, + "up": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#top" + }, + "north": { + "uv": [ + 0, + 8, + 16, + 16 + ], + "texture": "#side", + "cullface": "north" + }, + "south": { + "uv": [ + 0, + 8, + 16, + 16 + ], + "texture": "#side", + "cullface": "south" + }, + "west": { + "uv": [ + 0, + 8, + 16, + 16 + ], + "texture": "#side", + "cullface": "west" + }, + "east": { + "uv": [ + 0, + 8, + 16, + 16 + ], + "texture": "#side", + "cullface": "east" + } + } + }, + { + "from": [ + 8, + 8, + 0 + ], + "to": [ + 16, + 16, + 16 + ], + "faces": { + "up": { + "uv": [ + 8, + 0, + 16, + 16 + ], + "texture": "#top", + "cullface": "up" + }, + "north": { + "uv": [ + 0, + 0, + 8, + 8 + ], + "texture": "#side", + "cullface": "north" + }, + "south": { + "uv": [ + 8, + 0, + 16, + 8 + ], + "texture": "#side", + "cullface": "south" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 8 + ], + "texture": "#side" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 8 + ], + "texture": "#side", + "cullface": "east" + } + } + } + ] +} diff --git a/src/main/resources/assets/basemetals/models/block/gold_stairs_quartz_stairs_inner.json b/src/main/resources/assets/basemetals/models/block/gold_stairs_quartz_stairs_inner.json new file mode 100644 index 000000000..d954c6b8c --- /dev/null +++ b/src/main/resources/assets/basemetals/models/block/gold_stairs_quartz_stairs_inner.json @@ -0,0 +1,200 @@ +{ + "parent": "minecraft:block/quartz_stairs_inner", + "textures": { + "particle": "minecraft:block/gold_block", + "bottom": "minecraft:block/gold_block", + "side": "minecraft:block/gold_block", + "top": "minecraft:block/gold_block" + }, + "elements": [ + { + "from": [ + 0, + 0, + 0 + ], + "to": [ + 16, + 8, + 16 + ], + "faces": { + "down": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#bottom", + "cullface": "down" + }, + "up": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#top" + }, + "north": { + "uv": [ + 0, + 8, + 16, + 16 + ], + "texture": "#side", + "cullface": "north" + }, + "south": { + "uv": [ + 0, + 8, + 16, + 16 + ], + "texture": "#side", + "cullface": "south" + }, + "west": { + "uv": [ + 0, + 8, + 16, + 16 + ], + "texture": "#side", + "cullface": "west" + }, + "east": { + "uv": [ + 0, + 8, + 16, + 16 + ], + "texture": "#side", + "cullface": "east" + } + } + }, + { + "from": [ + 8, + 8, + 0 + ], + "to": [ + 16, + 16, + 16 + ], + "faces": { + "up": { + "uv": [ + 8, + 0, + 16, + 16 + ], + "texture": "#top", + "cullface": "up" + }, + "north": { + "uv": [ + 0, + 0, + 8, + 8 + ], + "texture": "#side", + "cullface": "north" + }, + "south": { + "uv": [ + 8, + 0, + 16, + 8 + ], + "texture": "#side", + "cullface": "south" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 8 + ], + "texture": "#side" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 8 + ], + "texture": "#side", + "cullface": "east" + } + } + }, + { + "from": [ + 0, + 8, + 8 + ], + "to": [ + 8, + 16, + 16 + ], + "faces": { + "up": { + "uv": [ + 0, + 8, + 8, + 16 + ], + "texture": "#top", + "cullface": "up" + }, + "north": { + "uv": [ + 8, + 0, + 16, + 8 + ], + "texture": "#side" + }, + "south": { + "uv": [ + 0, + 0, + 8, + 8 + ], + "texture": "#side", + "cullface": "south" + }, + "west": { + "uv": [ + 8, + 0, + 16, + 8 + ], + "texture": "#side", + "cullface": "west" + } + } + } + ] +} diff --git a/src/main/resources/assets/basemetals/models/block/gold_stairs_quartz_stairs_outer.json b/src/main/resources/assets/basemetals/models/block/gold_stairs_quartz_stairs_outer.json new file mode 100644 index 000000000..ece0ad968 --- /dev/null +++ b/src/main/resources/assets/basemetals/models/block/gold_stairs_quartz_stairs_outer.json @@ -0,0 +1,146 @@ +{ + "parent": "minecraft:block/quartz_stairs_outer", + "textures": { + "particle": "minecraft:block/gold_block", + "bottom": "minecraft:block/gold_block", + "side": "minecraft:block/gold_block", + "top": "minecraft:block/gold_block" + }, + "elements": [ + { + "from": [ + 0, + 0, + 0 + ], + "to": [ + 16, + 8, + 16 + ], + "faces": { + "down": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#bottom", + "cullface": "down" + }, + "up": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#top" + }, + "north": { + "uv": [ + 0, + 8, + 16, + 16 + ], + "texture": "#side", + "cullface": "north" + }, + "south": { + "uv": [ + 0, + 8, + 16, + 16 + ], + "texture": "#side", + "cullface": "south" + }, + "west": { + "uv": [ + 0, + 8, + 16, + 16 + ], + "texture": "#side", + "cullface": "west" + }, + "east": { + "uv": [ + 0, + 8, + 16, + 16 + ], + "texture": "#side", + "cullface": "east" + } + } + }, + { + "from": [ + 8, + 8, + 8 + ], + "to": [ + 16, + 16, + 16 + ], + "faces": { + "up": { + "uv": [ + 8, + 8, + 16, + 16 + ], + "texture": "#top", + "cullface": "up" + }, + "north": { + "uv": [ + 0, + 0, + 8, + 8 + ], + "texture": "#side" + }, + "south": { + "uv": [ + 8, + 0, + 16, + 8 + ], + "texture": "#side", + "cullface": "south" + }, + "west": { + "uv": [ + 8, + 0, + 16, + 8 + ], + "texture": "#side" + }, + "east": { + "uv": [ + 0, + 0, + 8, + 8 + ], + "texture": "#side", + "cullface": "east" + } + } + } + ] +} diff --git a/src/main/resources/assets/basemetals/models/block/gold_trapdoor_bottom.json b/src/main/resources/assets/basemetals/models/block/gold_trapdoor_bottom.json index 47f1c0c79..74c04dd5f 100644 --- a/src/main/resources/assets/basemetals/models/block/gold_trapdoor_bottom.json +++ b/src/main/resources/assets/basemetals/models/block/gold_trapdoor_bottom.json @@ -1,6 +1,6 @@ { - "parent": "minecraft:block/template_orientable_trapdoor_bottom", - "textures": { - "texture": "basemetals:block/gold_trapdoor" - } + "parent": "minecraft:block/template_orientable_trapdoor_bottom", + "textures": { + "texture": "basemetals:block/gold_trapdoor" + } } diff --git a/src/main/resources/assets/basemetals/models/block/gold_trapdoor_iron_trapdoor_bottom.json b/src/main/resources/assets/basemetals/models/block/gold_trapdoor_iron_trapdoor_bottom.json new file mode 100644 index 000000000..ce41c9ac1 --- /dev/null +++ b/src/main/resources/assets/basemetals/models/block/gold_trapdoor_iron_trapdoor_bottom.json @@ -0,0 +1,82 @@ +{ + "parent": "minecraft:block/iron_trapdoor_bottom", + "textures": { + "particle": "minecraft:block/gold_block", + "texture": "basemetals:block/gold_trapdoor" + }, + "elements": [ + { + "from": [ + 0, + 0, + 0 + ], + "to": [ + 16, + 3, + 16 + ], + "faces": { + "down": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#texture", + "cullface": "down" + }, + "up": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#texture" + }, + "north": { + "uv": [ + 0, + 16, + 16, + 13 + ], + "texture": "#texture", + "cullface": "north" + }, + "south": { + "uv": [ + 0, + 16, + 16, + 13 + ], + "texture": "#texture", + "cullface": "south" + }, + "west": { + "uv": [ + 0, + 16, + 16, + 13 + ], + "texture": "#texture", + "cullface": "west" + }, + "east": { + "uv": [ + 0, + 16, + 16, + 13 + ], + "texture": "#texture", + "cullface": "east" + } + } + } + ] +} diff --git a/src/main/resources/assets/basemetals/models/block/gold_trapdoor_iron_trapdoor_open.json b/src/main/resources/assets/basemetals/models/block/gold_trapdoor_iron_trapdoor_open.json new file mode 100644 index 000000000..8f23f92ca --- /dev/null +++ b/src/main/resources/assets/basemetals/models/block/gold_trapdoor_iron_trapdoor_open.json @@ -0,0 +1,82 @@ +{ + "parent": "minecraft:block/iron_trapdoor_open", + "textures": { + "particle": "minecraft:block/gold_block", + "texture": "basemetals:block/gold_trapdoor" + }, + "elements": [ + { + "from": [ + 0, + 0, + 13 + ], + "to": [ + 16, + 16, + 16 + ], + "faces": { + "down": { + "uv": [ + 0, + 13, + 16, + 16 + ], + "texture": "#texture", + "cullface": "down" + }, + "up": { + "uv": [ + 0, + 16, + 16, + 13 + ], + "texture": "#texture", + "cullface": "up" + }, + "north": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#texture" + }, + "south": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#texture", + "cullface": "south" + }, + "west": { + "uv": [ + 16, + 0, + 13, + 16 + ], + "texture": "#texture", + "cullface": "west" + }, + "east": { + "uv": [ + 13, + 0, + 16, + 16 + ], + "texture": "#texture", + "cullface": "east" + } + } + } + ] +} diff --git a/src/main/resources/assets/basemetals/models/block/gold_trapdoor_iron_trapdoor_top.json b/src/main/resources/assets/basemetals/models/block/gold_trapdoor_iron_trapdoor_top.json new file mode 100644 index 000000000..6e06796db --- /dev/null +++ b/src/main/resources/assets/basemetals/models/block/gold_trapdoor_iron_trapdoor_top.json @@ -0,0 +1,82 @@ +{ + "parent": "minecraft:block/iron_trapdoor_top", + "textures": { + "particle": "minecraft:block/gold_block", + "texture": "basemetals:block/gold_trapdoor" + }, + "elements": [ + { + "from": [ + 0, + 13, + 0 + ], + "to": [ + 16, + 16, + 16 + ], + "faces": { + "down": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#texture" + }, + "up": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#texture", + "cullface": "up" + }, + "north": { + "uv": [ + 0, + 16, + 16, + 13 + ], + "texture": "#texture", + "cullface": "north" + }, + "south": { + "uv": [ + 0, + 16, + 16, + 13 + ], + "texture": "#texture", + "cullface": "south" + }, + "west": { + "uv": [ + 0, + 16, + 16, + 13 + ], + "texture": "#texture", + "cullface": "west" + }, + "east": { + "uv": [ + 0, + 16, + 16, + 13 + ], + "texture": "#texture", + "cullface": "east" + } + } + } + ] +} diff --git a/src/main/resources/assets/basemetals/models/block/gold_trapdoor_open.json b/src/main/resources/assets/basemetals/models/block/gold_trapdoor_open.json deleted file mode 100644 index 66f675d81..000000000 --- a/src/main/resources/assets/basemetals/models/block/gold_trapdoor_open.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/template_orientable_trapdoor_open", - "textures": { - "texture": "basemetals:block/gold_trapdoor" - } -} diff --git a/src/main/resources/assets/basemetals/models/block/gold_trapdoor_top.json b/src/main/resources/assets/basemetals/models/block/gold_trapdoor_top.json deleted file mode 100644 index 552705585..000000000 --- a/src/main/resources/assets/basemetals/models/block/gold_trapdoor_top.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/template_orientable_trapdoor_top", - "textures": { - "texture": "basemetals:block/gold_trapdoor" - } -} diff --git a/src/main/resources/assets/basemetals/models/block/gold_wall_cobblestone_wall_post.json b/src/main/resources/assets/basemetals/models/block/gold_wall_cobblestone_wall_post.json new file mode 100644 index 000000000..735c42619 --- /dev/null +++ b/src/main/resources/assets/basemetals/models/block/gold_wall_cobblestone_wall_post.json @@ -0,0 +1,44 @@ +{ + "parent": "minecraft:block/cobblestone_wall_post", + "textures": { + "particle": "minecraft:block/gold_block", + "wall": "minecraft:block/gold_block" + }, + "elements": [ + { + "from": [ + 4, + 0, + 4 + ], + "to": [ + 12, + 16, + 12 + ], + "faces": { + "down": { + "texture": "#wall", + "cullface": "down" + }, + "up": { + "texture": "#wall", + "cullface": "up" + }, + "north": { + "texture": "#wall" + }, + "south": { + "texture": "#wall" + }, + "west": { + "texture": "#wall" + }, + "east": { + "texture": "#wall" + } + }, + "__comment": "Center post" + } + ] +} diff --git a/src/main/resources/assets/basemetals/models/block/gold_wall_cobblestone_wall_side.json b/src/main/resources/assets/basemetals/models/block/gold_wall_cobblestone_wall_side.json new file mode 100644 index 000000000..63c529ff7 --- /dev/null +++ b/src/main/resources/assets/basemetals/models/block/gold_wall_cobblestone_wall_side.json @@ -0,0 +1,41 @@ +{ + "parent": "minecraft:block/cobblestone_wall_side", + "textures": { + "particle": "minecraft:block/gold_block", + "wall": "minecraft:block/gold_block" + }, + "elements": [ + { + "from": [ + 5, + 0, + 0 + ], + "to": [ + 11, + 14, + 8 + ], + "faces": { + "down": { + "texture": "#wall", + "cullface": "down" + }, + "up": { + "texture": "#wall" + }, + "north": { + "texture": "#wall", + "cullface": "north" + }, + "west": { + "texture": "#wall" + }, + "east": { + "texture": "#wall" + } + }, + "__comment": "wall" + } + ] +} diff --git a/src/main/resources/assets/basemetals/models/block/gold_wall_cobblestone_wall_side_tall.json b/src/main/resources/assets/basemetals/models/block/gold_wall_cobblestone_wall_side_tall.json new file mode 100644 index 000000000..6126d8bfc --- /dev/null +++ b/src/main/resources/assets/basemetals/models/block/gold_wall_cobblestone_wall_side_tall.json @@ -0,0 +1,41 @@ +{ + "parent": "minecraft:block/cobblestone_wall_side_tall", + "textures": { + "particle": "minecraft:block/gold_block", + "wall": "minecraft:block/gold_block" + }, + "elements": [ + { + "from": [ + 5, + 0, + 0 + ], + "to": [ + 11, + 16, + 8 + ], + "faces": { + "down": { + "texture": "#wall", + "cullface": "down" + }, + "up": { + "texture": "#wall", + "cullface": "up" + }, + "north": { + "texture": "#wall", + "cullface": "north" + }, + "west": { + "texture": "#wall" + }, + "east": { + "texture": "#wall" + } + } + } + ] +} diff --git a/src/main/resources/assets/basemetals/models/block/gold_wall_inventory.json b/src/main/resources/assets/basemetals/models/block/gold_wall_inventory.json index 5875d23bf..c81b04aed 100644 --- a/src/main/resources/assets/basemetals/models/block/gold_wall_inventory.json +++ b/src/main/resources/assets/basemetals/models/block/gold_wall_inventory.json @@ -1,6 +1,6 @@ { - "parent": "block/wall_inventory", - "textures": { - "wall": "minecraft:block/gold_block" - } + "parent": "block/wall_inventory", + "textures": { + "wall": "minecraft:block/gold_block" + } } diff --git a/src/main/resources/assets/basemetals/models/block/gold_wall_post.json b/src/main/resources/assets/basemetals/models/block/gold_wall_post.json deleted file mode 100644 index cc97a2ce7..000000000 --- a/src/main/resources/assets/basemetals/models/block/gold_wall_post.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/template_wall_post", - "textures": { - "wall": "minecraft:block/gold_block" - } -} diff --git a/src/main/resources/assets/basemetals/models/block/gold_wall_side.json b/src/main/resources/assets/basemetals/models/block/gold_wall_side.json deleted file mode 100644 index dac769ef3..000000000 --- a/src/main/resources/assets/basemetals/models/block/gold_wall_side.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/template_wall_side", - "textures": { - "wall": "minecraft:block/gold_block" - } -} diff --git a/src/main/resources/assets/basemetals/models/block/half_slab_diamond.json b/src/main/resources/assets/basemetals/models/block/half_slab_diamond.json index f3925f5f1..49352acb6 100644 --- a/src/main/resources/assets/basemetals/models/block/half_slab_diamond.json +++ b/src/main/resources/assets/basemetals/models/block/half_slab_diamond.json @@ -1,8 +1,8 @@ { - "parent": "minecraft:block/slab", - "textures": { - "bottom": "minecraft:block/diamond_block", - "top": "minecraft:block/diamond_block", - "side": "minecraft:block/diamond_block" - } + "parent": "minecraft:block/slab", + "textures": { + "bottom": "minecraft:block/diamond_block", + "top": "minecraft:block/diamond_block", + "side": "minecraft:block/diamond_block" + } } diff --git a/src/main/resources/assets/basemetals/models/block/half_slab_emerald.json b/src/main/resources/assets/basemetals/models/block/half_slab_emerald.json index ab2c7f452..51a13f1be 100644 --- a/src/main/resources/assets/basemetals/models/block/half_slab_emerald.json +++ b/src/main/resources/assets/basemetals/models/block/half_slab_emerald.json @@ -1,8 +1,8 @@ { - "parent": "minecraft:block/slab", - "textures": { - "bottom": "minecraft:block/emerald_block", - "top": "minecraft:block/emerald_block", - "side": "minecraft:block/emerald_block" - } + "parent": "minecraft:block/slab", + "textures": { + "bottom": "minecraft:block/emerald_block", + "top": "minecraft:block/emerald_block", + "side": "minecraft:block/emerald_block" + } } diff --git a/src/main/resources/assets/basemetals/models/block/half_slab_gold.json b/src/main/resources/assets/basemetals/models/block/half_slab_gold.json index b6cafee29..2bfaa5b5a 100644 --- a/src/main/resources/assets/basemetals/models/block/half_slab_gold.json +++ b/src/main/resources/assets/basemetals/models/block/half_slab_gold.json @@ -1,8 +1,8 @@ { - "parent": "minecraft:block/slab", - "textures": { - "bottom": "minecraft:block/gold_block", - "top": "minecraft:block/gold_block", - "side": "minecraft:block/gold_block" - } + "parent": "minecraft:block/slab", + "textures": { + "bottom": "minecraft:block/gold_block", + "top": "minecraft:block/gold_block", + "side": "minecraft:block/gold_block" + } } diff --git a/src/main/resources/assets/basemetals/models/block/half_slab_iron.json b/src/main/resources/assets/basemetals/models/block/half_slab_iron.json index 1a9b07641..f4bb1ee3e 100644 --- a/src/main/resources/assets/basemetals/models/block/half_slab_iron.json +++ b/src/main/resources/assets/basemetals/models/block/half_slab_iron.json @@ -1,8 +1,8 @@ { - "parent": "minecraft:block/slab", - "textures": { - "bottom": "minecraft:block/iron_block", - "top": "minecraft:block/iron_block", - "side": "minecraft:block/iron_block" - } + "parent": "minecraft:block/slab", + "textures": { + "bottom": "minecraft:block/iron_block", + "top": "minecraft:block/iron_block", + "side": "minecraft:block/iron_block" + } } diff --git a/src/main/resources/assets/basemetals/models/block/half_slab_obsidian.json b/src/main/resources/assets/basemetals/models/block/half_slab_obsidian.json index e96b5c097..257e98957 100644 --- a/src/main/resources/assets/basemetals/models/block/half_slab_obsidian.json +++ b/src/main/resources/assets/basemetals/models/block/half_slab_obsidian.json @@ -1,8 +1,8 @@ { - "parent": "minecraft:block/slab", - "textures": { - "bottom": "minecraft:block/obsidian", - "top": "minecraft:block/obsidian", - "side": "minecraft:block/obsidian" - } + "parent": "minecraft:block/slab", + "textures": { + "bottom": "minecraft:block/obsidian", + "top": "minecraft:block/obsidian", + "side": "minecraft:block/obsidian" + } } diff --git a/src/main/resources/assets/basemetals/models/block/iron_button.json b/src/main/resources/assets/basemetals/models/block/iron_button.json deleted file mode 100644 index f3c7f2111..000000000 --- a/src/main/resources/assets/basemetals/models/block/iron_button.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/button", - "textures": { - "texture": "minecraft:block/iron_block" - } -} diff --git a/src/main/resources/assets/basemetals/models/block/iron_button_inventory.json b/src/main/resources/assets/basemetals/models/block/iron_button_inventory.json index e00410605..f04ea5993 100644 --- a/src/main/resources/assets/basemetals/models/block/iron_button_inventory.json +++ b/src/main/resources/assets/basemetals/models/block/iron_button_inventory.json @@ -1,6 +1,6 @@ { - "parent": "block/button_inventory", - "textures": { - "texture": "minecraft:block/iron_block" - } + "parent": "block/button_inventory", + "textures": { + "texture": "minecraft:block/iron_block" + } } diff --git a/src/main/resources/assets/basemetals/models/block/iron_button_polished_blackstone_button.json b/src/main/resources/assets/basemetals/models/block/iron_button_polished_blackstone_button.json new file mode 100644 index 000000000..b2bb20356 --- /dev/null +++ b/src/main/resources/assets/basemetals/models/block/iron_button_polished_blackstone_button.json @@ -0,0 +1,78 @@ +{ + "parent": "minecraft:block/polished_blackstone_button", + "textures": { + "particle": "minecraft:block/iron_block", + "texture": "minecraft:block/iron_block" + }, + "elements": [ + { + "from": [ + 5, + 0, + 6 + ], + "to": [ + 11, + 2, + 10 + ], + "faces": { + "down": { + "uv": [ + 5, + 6, + 11, + 10 + ], + "texture": "#texture", + "cullface": "down" + }, + "up": { + "uv": [ + 5, + 6, + 11, + 10 + ], + "texture": "#texture" + }, + "north": { + "uv": [ + 5, + 14, + 11, + 16 + ], + "texture": "#texture" + }, + "south": { + "uv": [ + 5, + 14, + 11, + 16 + ], + "texture": "#texture" + }, + "west": { + "uv": [ + 6, + 14, + 10, + 16 + ], + "texture": "#texture" + }, + "east": { + "uv": [ + 6, + 14, + 10, + 16 + ], + "texture": "#texture" + } + } + } + ] +} diff --git a/src/main/resources/assets/basemetals/models/block/iron_button_polished_blackstone_button_pressed.json b/src/main/resources/assets/basemetals/models/block/iron_button_polished_blackstone_button_pressed.json new file mode 100644 index 000000000..8ed792516 --- /dev/null +++ b/src/main/resources/assets/basemetals/models/block/iron_button_polished_blackstone_button_pressed.json @@ -0,0 +1,78 @@ +{ + "parent": "minecraft:block/polished_blackstone_button_pressed", + "textures": { + "particle": "minecraft:block/iron_block", + "texture": "minecraft:block/iron_block" + }, + "elements": [ + { + "from": [ + 5, + 0, + 6 + ], + "to": [ + 11, + 1.02, + 10 + ], + "faces": { + "down": { + "uv": [ + 5, + 6, + 11, + 10 + ], + "texture": "#texture", + "cullface": "down" + }, + "up": { + "uv": [ + 5, + 6, + 11, + 10 + ], + "texture": "#texture" + }, + "north": { + "uv": [ + 5, + 14, + 11, + 15 + ], + "texture": "#texture" + }, + "south": { + "uv": [ + 5, + 14, + 11, + 15 + ], + "texture": "#texture" + }, + "west": { + "uv": [ + 6, + 14, + 10, + 15 + ], + "texture": "#texture" + }, + "east": { + "uv": [ + 6, + 14, + 10, + 15 + ], + "texture": "#texture" + } + } + } + ] +} diff --git a/src/main/resources/assets/basemetals/models/block/iron_button_pressed.json b/src/main/resources/assets/basemetals/models/block/iron_button_pressed.json deleted file mode 100644 index 3668b8d4c..000000000 --- a/src/main/resources/assets/basemetals/models/block/iron_button_pressed.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/button_pressed", - "textures": { - "texture": "minecraft:block/iron_block" - } -} diff --git a/src/main/resources/assets/basemetals/models/block/iron_double_slab.json b/src/main/resources/assets/basemetals/models/block/iron_double_slab.json new file mode 100644 index 000000000..70cf788e9 --- /dev/null +++ b/src/main/resources/assets/basemetals/models/block/iron_double_slab.json @@ -0,0 +1,54 @@ +{ + "parent": "minecraft:block/quartz_block", + "textures": { + "particle": "minecraft:block/iron_block", + "down": "minecraft:block/iron_block", + "up": "minecraft:block/iron_block", + "north": "minecraft:block/iron_block", + "east": "minecraft:block/iron_block", + "south": "minecraft:block/iron_block", + "west": "minecraft:block/iron_block", + "end": "minecraft:block/iron_block", + "side": "minecraft:block/iron_block" + }, + "elements": [ + { + "from": [ + 0, + 0, + 0 + ], + "to": [ + 16, + 16, + 16 + ], + "faces": { + "down": { + "texture": "#down", + "cullface": "down" + }, + "up": { + "texture": "#up", + "cullface": "up" + }, + "north": { + "texture": "#north", + "cullface": "north" + }, + "south": { + "texture": "#south", + "cullface": "south" + }, + "west": { + "texture": "#west", + "cullface": "west" + }, + "east": { + "texture": "#east", + "cullface": "east" + } + } + } + ] +} diff --git a/src/main/resources/assets/basemetals/models/block/iron_inner_stairs.json b/src/main/resources/assets/basemetals/models/block/iron_inner_stairs.json deleted file mode 100644 index 60bdabc45..000000000 --- a/src/main/resources/assets/basemetals/models/block/iron_inner_stairs.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/inner_stairs", - "textures": { - "bottom": "minecraft:block/iron_block", - "top": "minecraft:block/iron_block", - "side": "minecraft:block/iron_block" - } -} diff --git a/src/main/resources/assets/basemetals/models/block/iron_lever.json b/src/main/resources/assets/basemetals/models/block/iron_lever.json deleted file mode 100644 index c9c955aab..000000000 --- a/src/main/resources/assets/basemetals/models/block/iron_lever.json +++ /dev/null @@ -1,33 +0,0 @@ -{ - "ambientocclusion": false, - "textures": { - "particle": "minecraft:block/iron_block", - "base": "minecraft:block/iron_block", - "lever": "minecraft:block/lever" - }, - "elements": [ - { "from": [ 5, 0, 4 ], - "to": [ 11, 3, 12 ], - "faces": { - "down": { "uv": [ 5, 4, 11, 12 ], "texture": "#base" }, - "up": { "uv": [ 5, 4, 11, 12 ], "texture": "#base" }, - "north": { "uv": [ 5, 0, 11, 3 ], "texture": "#base" }, - "south": { "uv": [ 5, 0, 11, 3 ], "texture": "#base" }, - "west": { "uv": [ 4, 0, 12, 3 ], "texture": "#base" }, - "east": { "uv": [ 4, 0, 12, 3 ], "texture": "#base" } - } - }, - { "from": [ 7, 1, 7 ], - "to": [ 9, 11, 9 ], - "rotation": { "origin": [ 8, 1, 8 ], "axis": "x", "angle": -45 }, - "faces": { - "down": { "uv": [ 7, 6, 9, 8 ], "texture": "#lever" }, - "up": { "uv": [ 7, 6, 9, 8 ], "texture": "#lever" }, - "north": { "uv": [ 7, 6, 9, 16 ], "texture": "#lever" }, - "south": { "uv": [ 7, 6, 9, 16 ], "texture": "#lever" }, - "west": { "uv": [ 7, 6, 9, 16 ], "texture": "#lever" }, - "east": { "uv": [ 7, 6, 9, 16 ], "texture": "#lever" } - } - } - ] -} diff --git a/src/main/resources/assets/basemetals/models/block/iron_lever_lever.json b/src/main/resources/assets/basemetals/models/block/iron_lever_lever.json new file mode 100644 index 000000000..9d4456178 --- /dev/null +++ b/src/main/resources/assets/basemetals/models/block/iron_lever_lever.json @@ -0,0 +1,147 @@ +{ + "parent": "minecraft:block/lever", + "textures": { + "particle": "minecraft:block/iron_block", + "base": "minecraft:block/iron_block", + "lever": "block/lever" + }, + "elements": [ + { + "from": [ + 5, + -0.02, + 4 + ], + "to": [ + 11, + 2.98, + 12 + ], + "faces": { + "down": { + "uv": [ + 5, + 4, + 11, + 12 + ], + "texture": "#base", + "cullface": "down" + }, + "up": { + "uv": [ + 5, + 4, + 11, + 12 + ], + "texture": "#base" + }, + "north": { + "uv": [ + 5, + 0, + 11, + 3 + ], + "texture": "#base" + }, + "south": { + "uv": [ + 5, + 0, + 11, + 3 + ], + "texture": "#base" + }, + "west": { + "uv": [ + 4, + 0, + 12, + 3 + ], + "texture": "#base" + }, + "east": { + "uv": [ + 4, + 0, + 12, + 3 + ], + "texture": "#base" + } + } + }, + { + "from": [ + 7, + 1, + 7 + ], + "to": [ + 9, + 11, + 9 + ], + "rotation": { + "origin": [ + 8, + 1, + 8 + ], + "axis": "x", + "angle": -45 + }, + "faces": { + "up": { + "uv": [ + 7, + 6, + 9, + 8 + ], + "texture": "#lever" + }, + "north": { + "uv": [ + 7, + 6, + 9, + 16 + ], + "texture": "#lever" + }, + "south": { + "uv": [ + 7, + 6, + 9, + 16 + ], + "texture": "#lever" + }, + "west": { + "uv": [ + 7, + 6, + 9, + 16 + ], + "texture": "#lever" + }, + "east": { + "uv": [ + 7, + 6, + 9, + 16 + ], + "texture": "#lever" + } + } + } + ] +} diff --git a/src/main/resources/assets/basemetals/models/block/iron_lever_lever_on.json b/src/main/resources/assets/basemetals/models/block/iron_lever_lever_on.json new file mode 100644 index 000000000..fe2d0a183 --- /dev/null +++ b/src/main/resources/assets/basemetals/models/block/iron_lever_lever_on.json @@ -0,0 +1,147 @@ +{ + "parent": "minecraft:block/lever_on", + "textures": { + "particle": "minecraft:block/iron_block", + "base": "minecraft:block/iron_block", + "lever": "block/lever" + }, + "elements": [ + { + "from": [ + 5, + -0.02, + 4 + ], + "to": [ + 11, + 2.98, + 12 + ], + "faces": { + "down": { + "uv": [ + 5, + 4, + 11, + 12 + ], + "texture": "#base", + "cullface": "down" + }, + "up": { + "uv": [ + 5, + 4, + 11, + 12 + ], + "texture": "#base" + }, + "north": { + "uv": [ + 5, + 0, + 11, + 3 + ], + "texture": "#base" + }, + "south": { + "uv": [ + 5, + 0, + 11, + 3 + ], + "texture": "#base" + }, + "west": { + "uv": [ + 4, + 0, + 12, + 3 + ], + "texture": "#base" + }, + "east": { + "uv": [ + 4, + 0, + 12, + 3 + ], + "texture": "#base" + } + } + }, + { + "from": [ + 7, + 1, + 7 + ], + "to": [ + 9, + 11, + 9 + ], + "rotation": { + "origin": [ + 8, + 1, + 8 + ], + "axis": "x", + "angle": 45 + }, + "faces": { + "up": { + "uv": [ + 7, + 6, + 9, + 8 + ], + "texture": "#lever" + }, + "north": { + "uv": [ + 7, + 6, + 9, + 16 + ], + "texture": "#lever" + }, + "south": { + "uv": [ + 7, + 6, + 9, + 16 + ], + "texture": "#lever" + }, + "west": { + "uv": [ + 7, + 6, + 9, + 16 + ], + "texture": "#lever" + }, + "east": { + "uv": [ + 7, + 6, + 9, + 16 + ], + "texture": "#lever" + } + } + } + ] +} diff --git a/src/main/resources/assets/basemetals/models/block/iron_lever_off.json b/src/main/resources/assets/basemetals/models/block/iron_lever_off.json deleted file mode 100644 index b36be0746..000000000 --- a/src/main/resources/assets/basemetals/models/block/iron_lever_off.json +++ /dev/null @@ -1,33 +0,0 @@ -{ - "ambientocclusion": false, - "textures": { - "particle": "minecraft:block/iron_block", - "base": "minecraft:block/iron_block", - "lever": "minecraft:block/lever" - }, - "elements": [ - { "from": [ 5, 0, 4 ], - "to": [ 11, 3, 12 ], - "faces": { - "down": { "uv": [ 5, 4, 11, 12 ], "texture": "#base" }, - "up": { "uv": [ 5, 4, 11, 12 ], "texture": "#base" }, - "north": { "uv": [ 5, 0, 11, 3 ], "texture": "#base" }, - "south": { "uv": [ 5, 0, 11, 3 ], "texture": "#base" }, - "west": { "uv": [ 4, 0, 12, 3 ], "texture": "#base" }, - "east": { "uv": [ 4, 0, 12, 3 ], "texture": "#base" } - } - }, - { "from": [ 7, 1, 7 ], - "to": [ 9, 11, 9 ], - "rotation": { "origin": [ 8, 1, 8 ], "axis": "x", "angle": 45 }, - "faces": { - "down": { "uv": [ 7, 6, 9, 8 ], "texture": "#lever" }, - "up": { "uv": [ 7, 6, 9, 8 ], "texture": "#lever" }, - "north": { "uv": [ 7, 6, 9, 16 ], "texture": "#lever" }, - "south": { "uv": [ 7, 6, 9, 16 ], "texture": "#lever" }, - "west": { "uv": [ 7, 6, 9, 16 ], "texture": "#lever" }, - "east": { "uv": [ 7, 6, 9, 16 ], "texture": "#lever" } - } - } - ] -} diff --git a/src/main/resources/assets/basemetals/models/block/iron_outer_stairs.json b/src/main/resources/assets/basemetals/models/block/iron_outer_stairs.json deleted file mode 100644 index cb97bcf02..000000000 --- a/src/main/resources/assets/basemetals/models/block/iron_outer_stairs.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/outer_stairs", - "textures": { - "bottom": "minecraft:block/iron_block", - "top": "minecraft:block/iron_block", - "side": "minecraft:block/iron_block" - } -} diff --git a/src/main/resources/assets/basemetals/models/block/iron_plate.json b/src/main/resources/assets/basemetals/models/block/iron_plate.json index 82c958b5c..4f865b52f 100644 --- a/src/main/resources/assets/basemetals/models/block/iron_plate.json +++ b/src/main/resources/assets/basemetals/models/block/iron_plate.json @@ -1,8 +1,8 @@ { - "parent": "basemetals:block/plate", - "textures": { - "top": "minecraft:block/iron_block", - "side": "minecraft:block/iron_block", - "bottom": "minecraft:block/iron_block" - } + "parent": "basemetals:block/plate", + "textures": { + "top": "minecraft:block/iron_block", + "side": "minecraft:block/iron_block", + "bottom": "minecraft:block/iron_block" + } } diff --git a/src/main/resources/assets/basemetals/models/block/iron_plate_down.json b/src/main/resources/assets/basemetals/models/block/iron_plate_down.json new file mode 100644 index 000000000..f93abdcd1 --- /dev/null +++ b/src/main/resources/assets/basemetals/models/block/iron_plate_down.json @@ -0,0 +1,41 @@ +{ + "parent": "minecraft:block/block", + "textures": { + "all": "minecraft:block/iron_block", + "particle": "minecraft:block/iron_block" + }, + "elements": [ + { + "from": [ + 0, + 15, + 0 + ], + "to": [ + 16, + 16, + 16 + ], + "faces": { + "up": { + "texture": "#all" + }, + "down": { + "texture": "#all" + }, + "north": { + "texture": "#all" + }, + "south": { + "texture": "#all" + }, + "east": { + "texture": "#all" + }, + "west": { + "texture": "#all" + } + } + } + ] +} diff --git a/src/main/resources/assets/basemetals/models/block/iron_plate_east.json b/src/main/resources/assets/basemetals/models/block/iron_plate_east.json new file mode 100644 index 000000000..d824bb556 --- /dev/null +++ b/src/main/resources/assets/basemetals/models/block/iron_plate_east.json @@ -0,0 +1,41 @@ +{ + "parent": "minecraft:block/block", + "textures": { + "all": "minecraft:block/iron_block", + "particle": "minecraft:block/iron_block" + }, + "elements": [ + { + "from": [ + 0, + 0, + 0 + ], + "to": [ + 1, + 16, + 16 + ], + "faces": { + "up": { + "texture": "#all" + }, + "down": { + "texture": "#all" + }, + "north": { + "texture": "#all" + }, + "south": { + "texture": "#all" + }, + "east": { + "texture": "#all" + }, + "west": { + "texture": "#all" + } + } + } + ] +} diff --git a/src/main/resources/assets/basemetals/models/block/iron_plate_north.json b/src/main/resources/assets/basemetals/models/block/iron_plate_north.json new file mode 100644 index 000000000..8b3206b3e --- /dev/null +++ b/src/main/resources/assets/basemetals/models/block/iron_plate_north.json @@ -0,0 +1,41 @@ +{ + "parent": "minecraft:block/block", + "textures": { + "all": "minecraft:block/iron_block", + "particle": "minecraft:block/iron_block" + }, + "elements": [ + { + "from": [ + 0, + 0, + 15 + ], + "to": [ + 16, + 16, + 16 + ], + "faces": { + "up": { + "texture": "#all" + }, + "down": { + "texture": "#all" + }, + "north": { + "texture": "#all" + }, + "south": { + "texture": "#all" + }, + "east": { + "texture": "#all" + }, + "west": { + "texture": "#all" + } + } + } + ] +} diff --git a/src/main/resources/assets/basemetals/models/block/iron_plate_south.json b/src/main/resources/assets/basemetals/models/block/iron_plate_south.json new file mode 100644 index 000000000..6908da5fa --- /dev/null +++ b/src/main/resources/assets/basemetals/models/block/iron_plate_south.json @@ -0,0 +1,41 @@ +{ + "parent": "minecraft:block/block", + "textures": { + "all": "minecraft:block/iron_block", + "particle": "minecraft:block/iron_block" + }, + "elements": [ + { + "from": [ + 0, + 0, + 0 + ], + "to": [ + 16, + 16, + 1 + ], + "faces": { + "up": { + "texture": "#all" + }, + "down": { + "texture": "#all" + }, + "north": { + "texture": "#all" + }, + "south": { + "texture": "#all" + }, + "east": { + "texture": "#all" + }, + "west": { + "texture": "#all" + } + } + } + ] +} diff --git a/src/main/resources/assets/basemetals/models/block/iron_plate_up.json b/src/main/resources/assets/basemetals/models/block/iron_plate_up.json new file mode 100644 index 000000000..47bc21a90 --- /dev/null +++ b/src/main/resources/assets/basemetals/models/block/iron_plate_up.json @@ -0,0 +1,41 @@ +{ + "parent": "minecraft:block/block", + "textures": { + "all": "minecraft:block/iron_block", + "particle": "minecraft:block/iron_block" + }, + "elements": [ + { + "from": [ + 0, + 0, + 0 + ], + "to": [ + 16, + 1, + 16 + ], + "faces": { + "up": { + "texture": "#all" + }, + "down": { + "texture": "#all" + }, + "north": { + "texture": "#all" + }, + "south": { + "texture": "#all" + }, + "east": { + "texture": "#all" + }, + "west": { + "texture": "#all" + } + } + } + ] +} diff --git a/src/main/resources/assets/basemetals/models/block/iron_plate_west.json b/src/main/resources/assets/basemetals/models/block/iron_plate_west.json new file mode 100644 index 000000000..5f18340e8 --- /dev/null +++ b/src/main/resources/assets/basemetals/models/block/iron_plate_west.json @@ -0,0 +1,41 @@ +{ + "parent": "minecraft:block/block", + "textures": { + "all": "minecraft:block/iron_block", + "particle": "minecraft:block/iron_block" + }, + "elements": [ + { + "from": [ + 15, + 0, + 0 + ], + "to": [ + 16, + 16, + 16 + ], + "faces": { + "up": { + "texture": "#all" + }, + "down": { + "texture": "#all" + }, + "north": { + "texture": "#all" + }, + "south": { + "texture": "#all" + }, + "east": { + "texture": "#all" + }, + "west": { + "texture": "#all" + } + } + } + ] +} diff --git a/src/main/resources/assets/basemetals/models/block/iron_slab_quartz_block.json b/src/main/resources/assets/basemetals/models/block/iron_slab_quartz_block.json new file mode 100644 index 000000000..70cf788e9 --- /dev/null +++ b/src/main/resources/assets/basemetals/models/block/iron_slab_quartz_block.json @@ -0,0 +1,54 @@ +{ + "parent": "minecraft:block/quartz_block", + "textures": { + "particle": "minecraft:block/iron_block", + "down": "minecraft:block/iron_block", + "up": "minecraft:block/iron_block", + "north": "minecraft:block/iron_block", + "east": "minecraft:block/iron_block", + "south": "minecraft:block/iron_block", + "west": "minecraft:block/iron_block", + "end": "minecraft:block/iron_block", + "side": "minecraft:block/iron_block" + }, + "elements": [ + { + "from": [ + 0, + 0, + 0 + ], + "to": [ + 16, + 16, + 16 + ], + "faces": { + "down": { + "texture": "#down", + "cullface": "down" + }, + "up": { + "texture": "#up", + "cullface": "up" + }, + "north": { + "texture": "#north", + "cullface": "north" + }, + "south": { + "texture": "#south", + "cullface": "south" + }, + "west": { + "texture": "#west", + "cullface": "west" + }, + "east": { + "texture": "#east", + "cullface": "east" + } + } + } + ] +} diff --git a/src/main/resources/assets/basemetals/models/block/iron_slab_quartz_slab.json b/src/main/resources/assets/basemetals/models/block/iron_slab_quartz_slab.json new file mode 100644 index 000000000..598129bb5 --- /dev/null +++ b/src/main/resources/assets/basemetals/models/block/iron_slab_quartz_slab.json @@ -0,0 +1,84 @@ +{ + "parent": "minecraft:block/quartz_slab", + "textures": { + "particle": "minecraft:block/iron_block", + "bottom": "minecraft:block/iron_block", + "side": "minecraft:block/iron_block", + "top": "minecraft:block/iron_block" + }, + "elements": [ + { + "from": [ + 0, + 0, + 0 + ], + "to": [ + 16, + 8, + 16 + ], + "faces": { + "down": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#bottom", + "cullface": "down" + }, + "up": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#top" + }, + "north": { + "uv": [ + 0, + 8, + 16, + 16 + ], + "texture": "#side", + "cullface": "north" + }, + "south": { + "uv": [ + 0, + 8, + 16, + 16 + ], + "texture": "#side", + "cullface": "south" + }, + "west": { + "uv": [ + 0, + 8, + 16, + 16 + ], + "texture": "#side", + "cullface": "west" + }, + "east": { + "uv": [ + 0, + 8, + 16, + 16 + ], + "texture": "#side", + "cullface": "east" + } + } + } + ] +} diff --git a/src/main/resources/assets/basemetals/models/block/iron_slab_quartz_slab_top.json b/src/main/resources/assets/basemetals/models/block/iron_slab_quartz_slab_top.json new file mode 100644 index 000000000..7e26fea0d --- /dev/null +++ b/src/main/resources/assets/basemetals/models/block/iron_slab_quartz_slab_top.json @@ -0,0 +1,84 @@ +{ + "parent": "minecraft:block/quartz_slab_top", + "textures": { + "particle": "minecraft:block/iron_block", + "bottom": "minecraft:block/iron_block", + "side": "minecraft:block/iron_block", + "top": "minecraft:block/iron_block" + }, + "elements": [ + { + "from": [ + 0, + 8, + 0 + ], + "to": [ + 16, + 16, + 16 + ], + "faces": { + "down": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#bottom" + }, + "up": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#top", + "cullface": "up" + }, + "north": { + "uv": [ + 0, + 0, + 16, + 8 + ], + "texture": "#side", + "cullface": "north" + }, + "south": { + "uv": [ + 0, + 0, + 16, + 8 + ], + "texture": "#side", + "cullface": "south" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 8 + ], + "texture": "#side", + "cullface": "west" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 8 + ], + "texture": "#side", + "cullface": "east" + } + } + } + ] +} diff --git a/src/main/resources/assets/basemetals/models/block/iron_stairs.json b/src/main/resources/assets/basemetals/models/block/iron_stairs.json index 2aa26921c..e5a971a99 100644 --- a/src/main/resources/assets/basemetals/models/block/iron_stairs.json +++ b/src/main/resources/assets/basemetals/models/block/iron_stairs.json @@ -1,8 +1,8 @@ { - "parent": "block/stairs", - "textures": { - "bottom": "minecraft:block/iron_block", - "top": "minecraft:block/iron_block", - "side": "minecraft:block/iron_block" - } + "parent": "block/stairs", + "textures": { + "bottom": "minecraft:block/iron_block", + "top": "minecraft:block/iron_block", + "side": "minecraft:block/iron_block" + } } diff --git a/src/main/resources/assets/basemetals/models/block/iron_stairs_quartz_stairs.json b/src/main/resources/assets/basemetals/models/block/iron_stairs_quartz_stairs.json new file mode 100644 index 000000000..f187665da --- /dev/null +++ b/src/main/resources/assets/basemetals/models/block/iron_stairs_quartz_stairs.json @@ -0,0 +1,147 @@ +{ + "parent": "minecraft:block/quartz_stairs", + "textures": { + "particle": "minecraft:block/iron_block", + "bottom": "minecraft:block/iron_block", + "side": "minecraft:block/iron_block", + "top": "minecraft:block/iron_block" + }, + "elements": [ + { + "from": [ + 0, + 0, + 0 + ], + "to": [ + 16, + 8, + 16 + ], + "faces": { + "down": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#bottom", + "cullface": "down" + }, + "up": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#top" + }, + "north": { + "uv": [ + 0, + 8, + 16, + 16 + ], + "texture": "#side", + "cullface": "north" + }, + "south": { + "uv": [ + 0, + 8, + 16, + 16 + ], + "texture": "#side", + "cullface": "south" + }, + "west": { + "uv": [ + 0, + 8, + 16, + 16 + ], + "texture": "#side", + "cullface": "west" + }, + "east": { + "uv": [ + 0, + 8, + 16, + 16 + ], + "texture": "#side", + "cullface": "east" + } + } + }, + { + "from": [ + 8, + 8, + 0 + ], + "to": [ + 16, + 16, + 16 + ], + "faces": { + "up": { + "uv": [ + 8, + 0, + 16, + 16 + ], + "texture": "#top", + "cullface": "up" + }, + "north": { + "uv": [ + 0, + 0, + 8, + 8 + ], + "texture": "#side", + "cullface": "north" + }, + "south": { + "uv": [ + 8, + 0, + 16, + 8 + ], + "texture": "#side", + "cullface": "south" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 8 + ], + "texture": "#side" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 8 + ], + "texture": "#side", + "cullface": "east" + } + } + } + ] +} diff --git a/src/main/resources/assets/basemetals/models/block/iron_stairs_quartz_stairs_inner.json b/src/main/resources/assets/basemetals/models/block/iron_stairs_quartz_stairs_inner.json new file mode 100644 index 000000000..71ace24d9 --- /dev/null +++ b/src/main/resources/assets/basemetals/models/block/iron_stairs_quartz_stairs_inner.json @@ -0,0 +1,200 @@ +{ + "parent": "minecraft:block/quartz_stairs_inner", + "textures": { + "particle": "minecraft:block/iron_block", + "bottom": "minecraft:block/iron_block", + "side": "minecraft:block/iron_block", + "top": "minecraft:block/iron_block" + }, + "elements": [ + { + "from": [ + 0, + 0, + 0 + ], + "to": [ + 16, + 8, + 16 + ], + "faces": { + "down": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#bottom", + "cullface": "down" + }, + "up": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#top" + }, + "north": { + "uv": [ + 0, + 8, + 16, + 16 + ], + "texture": "#side", + "cullface": "north" + }, + "south": { + "uv": [ + 0, + 8, + 16, + 16 + ], + "texture": "#side", + "cullface": "south" + }, + "west": { + "uv": [ + 0, + 8, + 16, + 16 + ], + "texture": "#side", + "cullface": "west" + }, + "east": { + "uv": [ + 0, + 8, + 16, + 16 + ], + "texture": "#side", + "cullface": "east" + } + } + }, + { + "from": [ + 8, + 8, + 0 + ], + "to": [ + 16, + 16, + 16 + ], + "faces": { + "up": { + "uv": [ + 8, + 0, + 16, + 16 + ], + "texture": "#top", + "cullface": "up" + }, + "north": { + "uv": [ + 0, + 0, + 8, + 8 + ], + "texture": "#side", + "cullface": "north" + }, + "south": { + "uv": [ + 8, + 0, + 16, + 8 + ], + "texture": "#side", + "cullface": "south" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 8 + ], + "texture": "#side" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 8 + ], + "texture": "#side", + "cullface": "east" + } + } + }, + { + "from": [ + 0, + 8, + 8 + ], + "to": [ + 8, + 16, + 16 + ], + "faces": { + "up": { + "uv": [ + 0, + 8, + 8, + 16 + ], + "texture": "#top", + "cullface": "up" + }, + "north": { + "uv": [ + 8, + 0, + 16, + 8 + ], + "texture": "#side" + }, + "south": { + "uv": [ + 0, + 0, + 8, + 8 + ], + "texture": "#side", + "cullface": "south" + }, + "west": { + "uv": [ + 8, + 0, + 16, + 8 + ], + "texture": "#side", + "cullface": "west" + } + } + } + ] +} diff --git a/src/main/resources/assets/basemetals/models/block/iron_stairs_quartz_stairs_outer.json b/src/main/resources/assets/basemetals/models/block/iron_stairs_quartz_stairs_outer.json new file mode 100644 index 000000000..484544991 --- /dev/null +++ b/src/main/resources/assets/basemetals/models/block/iron_stairs_quartz_stairs_outer.json @@ -0,0 +1,146 @@ +{ + "parent": "minecraft:block/quartz_stairs_outer", + "textures": { + "particle": "minecraft:block/iron_block", + "bottom": "minecraft:block/iron_block", + "side": "minecraft:block/iron_block", + "top": "minecraft:block/iron_block" + }, + "elements": [ + { + "from": [ + 0, + 0, + 0 + ], + "to": [ + 16, + 8, + 16 + ], + "faces": { + "down": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#bottom", + "cullface": "down" + }, + "up": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#top" + }, + "north": { + "uv": [ + 0, + 8, + 16, + 16 + ], + "texture": "#side", + "cullface": "north" + }, + "south": { + "uv": [ + 0, + 8, + 16, + 16 + ], + "texture": "#side", + "cullface": "south" + }, + "west": { + "uv": [ + 0, + 8, + 16, + 16 + ], + "texture": "#side", + "cullface": "west" + }, + "east": { + "uv": [ + 0, + 8, + 16, + 16 + ], + "texture": "#side", + "cullface": "east" + } + } + }, + { + "from": [ + 8, + 8, + 8 + ], + "to": [ + 16, + 16, + 16 + ], + "faces": { + "up": { + "uv": [ + 8, + 8, + 16, + 16 + ], + "texture": "#top", + "cullface": "up" + }, + "north": { + "uv": [ + 0, + 0, + 8, + 8 + ], + "texture": "#side" + }, + "south": { + "uv": [ + 8, + 0, + 16, + 8 + ], + "texture": "#side", + "cullface": "south" + }, + "west": { + "uv": [ + 8, + 0, + 16, + 8 + ], + "texture": "#side" + }, + "east": { + "uv": [ + 0, + 0, + 8, + 8 + ], + "texture": "#side", + "cullface": "east" + } + } + } + ] +} diff --git a/src/main/resources/assets/basemetals/models/block/iron_wall_cobblestone_wall_post.json b/src/main/resources/assets/basemetals/models/block/iron_wall_cobblestone_wall_post.json new file mode 100644 index 000000000..b647c42ae --- /dev/null +++ b/src/main/resources/assets/basemetals/models/block/iron_wall_cobblestone_wall_post.json @@ -0,0 +1,44 @@ +{ + "parent": "minecraft:block/cobblestone_wall_post", + "textures": { + "particle": "minecraft:block/iron_block", + "wall": "minecraft:block/iron_block" + }, + "elements": [ + { + "from": [ + 4, + 0, + 4 + ], + "to": [ + 12, + 16, + 12 + ], + "faces": { + "down": { + "texture": "#wall", + "cullface": "down" + }, + "up": { + "texture": "#wall", + "cullface": "up" + }, + "north": { + "texture": "#wall" + }, + "south": { + "texture": "#wall" + }, + "west": { + "texture": "#wall" + }, + "east": { + "texture": "#wall" + } + }, + "__comment": "Center post" + } + ] +} diff --git a/src/main/resources/assets/basemetals/models/block/iron_wall_cobblestone_wall_side.json b/src/main/resources/assets/basemetals/models/block/iron_wall_cobblestone_wall_side.json new file mode 100644 index 000000000..98ab3a616 --- /dev/null +++ b/src/main/resources/assets/basemetals/models/block/iron_wall_cobblestone_wall_side.json @@ -0,0 +1,41 @@ +{ + "parent": "minecraft:block/cobblestone_wall_side", + "textures": { + "particle": "minecraft:block/iron_block", + "wall": "minecraft:block/iron_block" + }, + "elements": [ + { + "from": [ + 5, + 0, + 0 + ], + "to": [ + 11, + 14, + 8 + ], + "faces": { + "down": { + "texture": "#wall", + "cullface": "down" + }, + "up": { + "texture": "#wall" + }, + "north": { + "texture": "#wall", + "cullface": "north" + }, + "west": { + "texture": "#wall" + }, + "east": { + "texture": "#wall" + } + }, + "__comment": "wall" + } + ] +} diff --git a/src/main/resources/assets/basemetals/models/block/iron_wall_cobblestone_wall_side_tall.json b/src/main/resources/assets/basemetals/models/block/iron_wall_cobblestone_wall_side_tall.json new file mode 100644 index 000000000..10dd9c3d0 --- /dev/null +++ b/src/main/resources/assets/basemetals/models/block/iron_wall_cobblestone_wall_side_tall.json @@ -0,0 +1,41 @@ +{ + "parent": "minecraft:block/cobblestone_wall_side_tall", + "textures": { + "particle": "minecraft:block/iron_block", + "wall": "minecraft:block/iron_block" + }, + "elements": [ + { + "from": [ + 5, + 0, + 0 + ], + "to": [ + 11, + 16, + 8 + ], + "faces": { + "down": { + "texture": "#wall", + "cullface": "down" + }, + "up": { + "texture": "#wall", + "cullface": "up" + }, + "north": { + "texture": "#wall", + "cullface": "north" + }, + "west": { + "texture": "#wall" + }, + "east": { + "texture": "#wall" + } + } + } + ] +} diff --git a/src/main/resources/assets/basemetals/models/block/iron_wall_inventory.json b/src/main/resources/assets/basemetals/models/block/iron_wall_inventory.json index 7137ac6c9..b533ffd9c 100644 --- a/src/main/resources/assets/basemetals/models/block/iron_wall_inventory.json +++ b/src/main/resources/assets/basemetals/models/block/iron_wall_inventory.json @@ -1,6 +1,6 @@ { - "parent": "block/wall_inventory", - "textures": { - "wall": "minecraft:block/iron_block" - } + "parent": "block/wall_inventory", + "textures": { + "wall": "minecraft:block/iron_block" + } } diff --git a/src/main/resources/assets/basemetals/models/block/iron_wall_post.json b/src/main/resources/assets/basemetals/models/block/iron_wall_post.json deleted file mode 100644 index 625559a98..000000000 --- a/src/main/resources/assets/basemetals/models/block/iron_wall_post.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/template_wall_post", - "textures": { - "wall": "minecraft:block/iron_block" - } -} diff --git a/src/main/resources/assets/basemetals/models/block/iron_wall_side.json b/src/main/resources/assets/basemetals/models/block/iron_wall_side.json deleted file mode 100644 index c1f16e7b2..000000000 --- a/src/main/resources/assets/basemetals/models/block/iron_wall_side.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/template_wall_side", - "textures": { - "wall": "minecraft:block/iron_block" - } -} diff --git a/src/main/resources/assets/basemetals/models/block/obsidian_bars_cap.json b/src/main/resources/assets/basemetals/models/block/obsidian_bars_cap.json deleted file mode 100644 index a01a90bd9..000000000 --- a/src/main/resources/assets/basemetals/models/block/obsidian_bars_cap.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "ambientocclusion": false, - "textures": { - "particle": "basemetals:block/obsidian_bars", - "bars": "basemetals:block/obsidian_bars", - "edge": "basemetals:block/obsidian_bars" - }, - "elements": [ - { "from": [ 8, 0, 8 ], - "to": [ 8, 16, 9 ], - "faces": { - "west": { "uv": [ 8, 0, 7, 16 ], "texture": "#bars" }, - "east": { "uv": [ 7, 0, 8, 16 ], "texture": "#bars" } - } - }, - { "from": [ 7, 0, 9 ], - "to": [ 9, 16, 9 ], - "faces": { - "north": { "uv": [ 9, 0, 7, 16 ], "texture": "#bars" }, - "south": { "uv": [ 7, 0, 9, 16 ], "texture": "#bars" } - } - } - ] -} diff --git a/src/main/resources/assets/basemetals/models/block/obsidian_bars_cap_alt.json b/src/main/resources/assets/basemetals/models/block/obsidian_bars_cap_alt.json deleted file mode 100644 index 71bac03a7..000000000 --- a/src/main/resources/assets/basemetals/models/block/obsidian_bars_cap_alt.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "ambientocclusion": false, - "textures": { - "particle": "basemetals:block/obsidian_bars", - "bars": "basemetals:block/obsidian_bars", - "edge": "basemetals:block/obsidian_bars" - }, - "elements": [ - { "from": [ 8, 0, 7 ], - "to": [ 8, 16, 8 ], - "faces": { - "west": { "uv": [ 8, 0, 9, 16 ], "texture": "#bars" }, - "east": { "uv": [ 9, 0, 8, 16 ], "texture": "#bars" } - } - }, - { "from": [ 7, 0, 7 ], - "to": [ 9, 16, 7 ], - "faces": { - "north": { "uv": [ 7, 0, 9, 16 ], "texture": "#bars" }, - "south": { "uv": [ 9, 0, 7, 16 ], "texture": "#bars" } - } - } - ] -} diff --git a/src/main/resources/assets/basemetals/models/block/obsidian_bars_iron_bars_cap.json b/src/main/resources/assets/basemetals/models/block/obsidian_bars_iron_bars_cap.json new file mode 100644 index 000000000..b47f498cc --- /dev/null +++ b/src/main/resources/assets/basemetals/models/block/obsidian_bars_iron_bars_cap.json @@ -0,0 +1,74 @@ +{ + "parent": "minecraft:block/iron_bars_cap", + "textures": { + "particle": "minecraft:block/obsidian", + "bars": "basemetals:block/obsidian_bars", + "edge": "basemetals:block/obsidian_bars" + }, + "elements": [ + { + "from": [ + 8, + 0, + 8 + ], + "to": [ + 8, + 16, + 9 + ], + "faces": { + "west": { + "uv": [ + 8, + 0, + 7, + 16 + ], + "texture": "#bars" + }, + "east": { + "uv": [ + 7, + 0, + 8, + 16 + ], + "texture": "#bars" + } + } + }, + { + "from": [ + 7, + 0, + 9 + ], + "to": [ + 9, + 16, + 9 + ], + "faces": { + "north": { + "uv": [ + 9, + 0, + 7, + 16 + ], + "texture": "#bars" + }, + "south": { + "uv": [ + 7, + 0, + 9, + 16 + ], + "texture": "#bars" + } + } + } + ] +} diff --git a/src/main/resources/assets/basemetals/models/block/obsidian_bars_iron_bars_cap_alt.json b/src/main/resources/assets/basemetals/models/block/obsidian_bars_iron_bars_cap_alt.json new file mode 100644 index 000000000..1b2cdf30d --- /dev/null +++ b/src/main/resources/assets/basemetals/models/block/obsidian_bars_iron_bars_cap_alt.json @@ -0,0 +1,74 @@ +{ + "parent": "minecraft:block/iron_bars_cap_alt", + "textures": { + "particle": "minecraft:block/obsidian", + "bars": "basemetals:block/obsidian_bars", + "edge": "basemetals:block/obsidian_bars" + }, + "elements": [ + { + "from": [ + 8, + 0, + 7 + ], + "to": [ + 8, + 16, + 8 + ], + "faces": { + "west": { + "uv": [ + 8, + 0, + 9, + 16 + ], + "texture": "#bars" + }, + "east": { + "uv": [ + 9, + 0, + 8, + 16 + ], + "texture": "#bars" + } + } + }, + { + "from": [ + 7, + 0, + 7 + ], + "to": [ + 9, + 16, + 7 + ], + "faces": { + "north": { + "uv": [ + 7, + 0, + 9, + 16 + ], + "texture": "#bars" + }, + "south": { + "uv": [ + 9, + 0, + 7, + 16 + ], + "texture": "#bars" + } + } + } + ] +} diff --git a/src/main/resources/assets/basemetals/models/block/obsidian_bars_iron_bars_post.json b/src/main/resources/assets/basemetals/models/block/obsidian_bars_iron_bars_post.json new file mode 100644 index 000000000..430413042 --- /dev/null +++ b/src/main/resources/assets/basemetals/models/block/obsidian_bars_iron_bars_post.json @@ -0,0 +1,73 @@ +{ + "parent": "minecraft:block/iron_bars_post", + "textures": { + "particle": "minecraft:block/obsidian", + "bars": "basemetals:block/obsidian_bars" + }, + "elements": [ + { + "from": [ + 8, + 0, + 7 + ], + "to": [ + 8, + 16, + 9 + ], + "faces": { + "west": { + "uv": [ + 7, + 0, + 9, + 16 + ], + "texture": "#bars" + }, + "east": { + "uv": [ + 9, + 0, + 7, + 16 + ], + "texture": "#bars" + } + } + }, + { + "from": [ + 7, + 0, + 8 + ], + "to": [ + 9, + 16, + 8 + ], + "faces": { + "north": { + "uv": [ + 7, + 0, + 9, + 16 + ], + "texture": "#bars" + }, + "south": { + "uv": [ + 9, + 0, + 7, + 16 + ], + "texture": "#bars" + } + } + } + ] +} diff --git a/src/main/resources/assets/basemetals/models/block/obsidian_bars_iron_bars_post_ends.json b/src/main/resources/assets/basemetals/models/block/obsidian_bars_iron_bars_post_ends.json new file mode 100644 index 000000000..5856680ff --- /dev/null +++ b/src/main/resources/assets/basemetals/models/block/obsidian_bars_iron_bars_post_ends.json @@ -0,0 +1,73 @@ +{ + "parent": "minecraft:block/iron_bars_post_ends", + "textures": { + "particle": "minecraft:block/obsidian", + "edge": "basemetals:block/obsidian_bars" + }, + "elements": [ + { + "from": [ + 7, + 0.001, + 7 + ], + "to": [ + 9, + 0.001, + 9 + ], + "faces": { + "down": { + "uv": [ + 7, + 7, + 9, + 9 + ], + "texture": "#edge" + }, + "up": { + "uv": [ + 7, + 7, + 9, + 9 + ], + "texture": "#edge" + } + } + }, + { + "from": [ + 7, + 15.999, + 7 + ], + "to": [ + 9, + 15.999, + 9 + ], + "faces": { + "down": { + "uv": [ + 7, + 7, + 9, + 9 + ], + "texture": "#edge" + }, + "up": { + "uv": [ + 7, + 7, + 9, + 9 + ], + "texture": "#edge" + } + } + } + ] +} diff --git a/src/main/resources/assets/basemetals/models/block/obsidian_bars_iron_bars_side.json b/src/main/resources/assets/basemetals/models/block/obsidian_bars_iron_bars_side.json new file mode 100644 index 000000000..ebaea8d6a --- /dev/null +++ b/src/main/resources/assets/basemetals/models/block/obsidian_bars_iron_bars_side.json @@ -0,0 +1,130 @@ +{ + "parent": "minecraft:block/iron_bars_side", + "textures": { + "particle": "minecraft:block/obsidian", + "bars": "basemetals:block/obsidian_bars", + "edge": "basemetals:block/obsidian_bars" + }, + "elements": [ + { + "from": [ + 8, + 0, + 0 + ], + "to": [ + 8, + 16, + 8 + ], + "faces": { + "west": { + "uv": [ + 16, + 0, + 8, + 16 + ], + "texture": "#bars" + }, + "east": { + "uv": [ + 8, + 0, + 16, + 16 + ], + "texture": "#bars" + } + } + }, + { + "from": [ + 7, + 0, + 0 + ], + "to": [ + 9, + 16, + 7 + ], + "faces": { + "north": { + "uv": [ + 7, + 0, + 9, + 16 + ], + "texture": "#edge", + "cullface": "north" + } + } + }, + { + "from": [ + 7, + 0.001, + 0 + ], + "to": [ + 9, + 0.001, + 7 + ], + "faces": { + "down": { + "uv": [ + 9, + 0, + 7, + 7 + ], + "texture": "#edge" + }, + "up": { + "uv": [ + 7, + 0, + 9, + 7 + ], + "texture": "#edge" + } + } + }, + { + "from": [ + 7, + 15.999, + 0 + ], + "to": [ + 9, + 15.999, + 7 + ], + "faces": { + "down": { + "uv": [ + 9, + 0, + 7, + 7 + ], + "texture": "#edge" + }, + "up": { + "uv": [ + 7, + 0, + 9, + 7 + ], + "texture": "#edge" + } + } + } + ] +} diff --git a/src/main/resources/assets/basemetals/models/block/obsidian_bars_iron_bars_side_alt.json b/src/main/resources/assets/basemetals/models/block/obsidian_bars_iron_bars_side_alt.json new file mode 100644 index 000000000..71755a75f --- /dev/null +++ b/src/main/resources/assets/basemetals/models/block/obsidian_bars_iron_bars_side_alt.json @@ -0,0 +1,148 @@ +{ + "parent": "minecraft:block/iron_bars_side_alt", + "textures": { + "particle": "minecraft:block/obsidian", + "bars": "basemetals:block/obsidian_bars", + "edge": "basemetals:block/obsidian_bars" + }, + "elements": [ + { + "from": [ + 8, + 0, + 8 + ], + "to": [ + 8, + 16, + 16 + ], + "faces": { + "west": { + "uv": [ + 8, + 0, + 0, + 16 + ], + "texture": "#bars" + }, + "east": { + "uv": [ + 0, + 0, + 8, + 16 + ], + "texture": "#bars" + } + } + }, + { + "from": [ + 7, + 0, + 9 + ], + "to": [ + 9, + 16, + 16 + ], + "faces": { + "south": { + "uv": [ + 7, + 0, + 9, + 16 + ], + "texture": "#edge", + "cullface": "south" + }, + "down": { + "uv": [ + 9, + 9, + 7, + 16 + ], + "texture": "#edge" + }, + "up": { + "uv": [ + 7, + 9, + 9, + 16 + ], + "texture": "#edge" + } + } + }, + { + "from": [ + 7, + 0.001, + 9 + ], + "to": [ + 9, + 0.001, + 16 + ], + "faces": { + "down": { + "uv": [ + 9, + 9, + 7, + 16 + ], + "texture": "#edge" + }, + "up": { + "uv": [ + 7, + 9, + 9, + 16 + ], + "texture": "#edge" + } + } + }, + { + "from": [ + 7, + 15.999, + 9 + ], + "to": [ + 9, + 15.999, + 16 + ], + "faces": { + "down": { + "uv": [ + 9, + 9, + 7, + 16 + ], + "texture": "#edge" + }, + "up": { + "uv": [ + 7, + 9, + 9, + 16 + ], + "texture": "#edge" + } + } + } + ] +} diff --git a/src/main/resources/assets/basemetals/models/block/obsidian_bars_post.json b/src/main/resources/assets/basemetals/models/block/obsidian_bars_post.json deleted file mode 100644 index 06e296857..000000000 --- a/src/main/resources/assets/basemetals/models/block/obsidian_bars_post.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "ambientocclusion": false, - "textures": { - "particle": "basemetals:block/obsidian_bars", - "bars": "basemetals:block/obsidian_bars" - }, - "elements": [ - { "from": [ 8, 0, 7 ], - "to": [ 8, 16, 9 ], - "faces": { - "west": { "uv": [ 7, 0, 9, 16 ], "texture": "#bars" }, - "east": { "uv": [ 9, 0, 7, 16 ], "texture": "#bars" } - } - }, - { "from": [ 7, 0, 8 ], - "to": [ 9, 16, 8 ], - "faces": { - "north": { "uv": [ 7, 0, 9, 16 ], "texture": "#bars" }, - "south": { "uv": [ 9, 0, 7, 16 ], "texture": "#bars" } - } - } - ] -} diff --git a/src/main/resources/assets/basemetals/models/block/obsidian_bars_side.json b/src/main/resources/assets/basemetals/models/block/obsidian_bars_side.json deleted file mode 100644 index 13784557b..000000000 --- a/src/main/resources/assets/basemetals/models/block/obsidian_bars_side.json +++ /dev/null @@ -1,37 +0,0 @@ -{ - "ambientocclusion": false, - "textures": { - "particle": "basemetals:block/obsidian_bars", - "bars": "basemetals:block/obsidian_bars", - "edge": "basemetals:block/obsidian_bars" - }, - "elements": [ - { "from": [ 8, 0, 0 ], - "to": [ 8, 16, 8 ], - "faces": { - "west": { "uv": [ 16, 0, 8, 16 ], "texture": "#bars" }, - "east": { "uv": [ 8, 0, 16, 16 ], "texture": "#bars" } - } - }, - { "from": [ 7, 0, 0 ], - "to": [ 9, 16, 7 ], - "faces": { - "north": { "uv": [ 7, 0, 9, 16 ], "texture": "#edge", "cullface": "north" } - } - }, - { "from": [ 7, 0.001, 0 ], - "to": [ 9, 0.001, 7 ], - "faces": { - "down": { "uv": [ 9, 0, 7, 7 ], "texture": "#edge" }, - "up": { "uv": [ 7, 0, 9, 7 ], "texture": "#edge" } - } - }, - { "from": [ 7, 15.999, 0 ], - "to": [ 9, 15.999, 7 ], - "faces": { - "down": { "uv": [ 9, 0, 7, 7 ], "texture": "#edge" }, - "up": { "uv": [ 7, 0, 9, 7 ], "texture": "#edge" } - } - } - ] -} diff --git a/src/main/resources/assets/basemetals/models/block/obsidian_bars_side_alt.json b/src/main/resources/assets/basemetals/models/block/obsidian_bars_side_alt.json deleted file mode 100644 index 650379395..000000000 --- a/src/main/resources/assets/basemetals/models/block/obsidian_bars_side_alt.json +++ /dev/null @@ -1,37 +0,0 @@ -{ - "ambientocclusion": false, - "textures": { - "particle": "basemetals:block/obsidian_bars", - "bars": "basemetals:block/obsidian_bars", - "edge": "basemetals:block/obsidian_bars" - }, - "elements": [ - { "from": [ 8, 0, 8 ], - "to": [ 8, 16, 16 ], - "faces": { - "west": { "uv": [ 8, 0, 0, 16 ], "texture": "#bars" }, - "east": { "uv": [ 0, 0, 8, 16 ], "texture": "#bars" } - } - }, - { "from": [ 7, 0, 9 ], - "to": [ 9, 16, 16 ], - "faces": { - "south": { "uv": [ 7, 0, 9, 16 ], "texture": "#edge", "cullface": "south" } - } - }, - { "from": [ 7, 0.001, 9 ], - "to": [ 9, 0.001, 16 ], - "faces": { - "down": { "uv": [ 9, 9, 7, 16 ], "texture": "#edge" }, - "up": { "uv": [ 7, 9, 9, 16 ], "texture": "#edge" } - } - }, - { "from": [ 7, 15.999, 9 ], - "to": [ 9, 15.999, 16 ], - "faces": { - "down": { "uv": [ 9, 9, 7, 16 ], "texture": "#edge" }, - "up": { "uv": [ 7, 9, 9, 16 ], "texture": "#edge" } - } - } - ] -} diff --git a/src/main/resources/assets/basemetals/models/block/obsidian_button.json b/src/main/resources/assets/basemetals/models/block/obsidian_button.json deleted file mode 100644 index 0f21b0553..000000000 --- a/src/main/resources/assets/basemetals/models/block/obsidian_button.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/button", - "textures": { - "texture": "minecraft:block/obsidian" - } -} diff --git a/src/main/resources/assets/basemetals/models/block/obsidian_button_inventory.json b/src/main/resources/assets/basemetals/models/block/obsidian_button_inventory.json index 4156baa06..a1bf6350e 100644 --- a/src/main/resources/assets/basemetals/models/block/obsidian_button_inventory.json +++ b/src/main/resources/assets/basemetals/models/block/obsidian_button_inventory.json @@ -1,6 +1,6 @@ { - "parent": "block/button_inventory", - "textures": { - "texture": "minecraft:block/obsidian" - } + "parent": "block/button_inventory", + "textures": { + "texture": "minecraft:block/obsidian" + } } diff --git a/src/main/resources/assets/basemetals/models/block/obsidian_button_polished_blackstone_button.json b/src/main/resources/assets/basemetals/models/block/obsidian_button_polished_blackstone_button.json new file mode 100644 index 000000000..2edfb8444 --- /dev/null +++ b/src/main/resources/assets/basemetals/models/block/obsidian_button_polished_blackstone_button.json @@ -0,0 +1,78 @@ +{ + "parent": "minecraft:block/polished_blackstone_button", + "textures": { + "particle": "minecraft:block/obsidian", + "texture": "minecraft:block/obsidian" + }, + "elements": [ + { + "from": [ + 5, + 0, + 6 + ], + "to": [ + 11, + 2, + 10 + ], + "faces": { + "down": { + "uv": [ + 5, + 6, + 11, + 10 + ], + "texture": "#texture", + "cullface": "down" + }, + "up": { + "uv": [ + 5, + 6, + 11, + 10 + ], + "texture": "#texture" + }, + "north": { + "uv": [ + 5, + 14, + 11, + 16 + ], + "texture": "#texture" + }, + "south": { + "uv": [ + 5, + 14, + 11, + 16 + ], + "texture": "#texture" + }, + "west": { + "uv": [ + 6, + 14, + 10, + 16 + ], + "texture": "#texture" + }, + "east": { + "uv": [ + 6, + 14, + 10, + 16 + ], + "texture": "#texture" + } + } + } + ] +} diff --git a/src/main/resources/assets/basemetals/models/block/obsidian_button_polished_blackstone_button_pressed.json b/src/main/resources/assets/basemetals/models/block/obsidian_button_polished_blackstone_button_pressed.json new file mode 100644 index 000000000..88b96f49d --- /dev/null +++ b/src/main/resources/assets/basemetals/models/block/obsidian_button_polished_blackstone_button_pressed.json @@ -0,0 +1,78 @@ +{ + "parent": "minecraft:block/polished_blackstone_button_pressed", + "textures": { + "particle": "minecraft:block/obsidian", + "texture": "minecraft:block/obsidian" + }, + "elements": [ + { + "from": [ + 5, + 0, + 6 + ], + "to": [ + 11, + 1.02, + 10 + ], + "faces": { + "down": { + "uv": [ + 5, + 6, + 11, + 10 + ], + "texture": "#texture", + "cullface": "down" + }, + "up": { + "uv": [ + 5, + 6, + 11, + 10 + ], + "texture": "#texture" + }, + "north": { + "uv": [ + 5, + 14, + 11, + 15 + ], + "texture": "#texture" + }, + "south": { + "uv": [ + 5, + 14, + 11, + 15 + ], + "texture": "#texture" + }, + "west": { + "uv": [ + 6, + 14, + 10, + 15 + ], + "texture": "#texture" + }, + "east": { + "uv": [ + 6, + 14, + 10, + 15 + ], + "texture": "#texture" + } + } + } + ] +} diff --git a/src/main/resources/assets/basemetals/models/block/obsidian_button_pressed.json b/src/main/resources/assets/basemetals/models/block/obsidian_button_pressed.json deleted file mode 100644 index 5ba73270c..000000000 --- a/src/main/resources/assets/basemetals/models/block/obsidian_button_pressed.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/button_pressed", - "textures": { - "texture": "minecraft:block/obsidian" - } -} diff --git a/src/main/resources/assets/basemetals/models/block/obsidian_door_bottom.json b/src/main/resources/assets/basemetals/models/block/obsidian_door_bottom.json deleted file mode 100644 index fbf5a60af..000000000 --- a/src/main/resources/assets/basemetals/models/block/obsidian_door_bottom.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/door_bottom_left", - "textures": { - "bottom": "basemetals:block/obsidian_door_lower", - "top": "basemetals:block/obsidian_door_upper" - } -} diff --git a/src/main/resources/assets/basemetals/models/block/obsidian_door_bottom_rh.json b/src/main/resources/assets/basemetals/models/block/obsidian_door_bottom_rh.json deleted file mode 100644 index 17c184374..000000000 --- a/src/main/resources/assets/basemetals/models/block/obsidian_door_bottom_rh.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/door_bottom_right", - "textures": { - "bottom": "basemetals:block/obsidian_door_lower", - "top": "basemetals:block/obsidian_door_upper" - } -} diff --git a/src/main/resources/assets/basemetals/models/block/obsidian_door_iron_door_bottom_left.json b/src/main/resources/assets/basemetals/models/block/obsidian_door_iron_door_bottom_left.json new file mode 100644 index 000000000..b8581f427 --- /dev/null +++ b/src/main/resources/assets/basemetals/models/block/obsidian_door_iron_door_bottom_left.json @@ -0,0 +1,74 @@ +{ + "parent": "minecraft:block/iron_door_bottom_left", + "textures": { + "particle": "minecraft:block/obsidian", + "bottom": "basemetals:block/obsidian_door_lower", + "top": "basemetals:block/obsidian_door_upper" + }, + "elements": [ + { + "from": [ + 0, + 0, + 0 + ], + "to": [ + 3, + 16, + 16 + ], + "faces": { + "down": { + "uv": [ + 16, + 13, + 0, + 16 + ], + "texture": "#bottom", + "cullface": "down", + "rotation": 90 + }, + "north": { + "uv": [ + 3, + 0, + 0, + 16 + ], + "texture": "#bottom", + "cullface": "north" + }, + "south": { + "uv": [ + 0, + 0, + 3, + 16 + ], + "texture": "#bottom", + "cullface": "south" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#bottom", + "cullface": "west" + }, + "east": { + "uv": [ + 16, + 0, + 0, + 16 + ], + "texture": "#bottom" + } + } + } + ] +} diff --git a/src/main/resources/assets/basemetals/models/block/obsidian_door_iron_door_bottom_left_open.json b/src/main/resources/assets/basemetals/models/block/obsidian_door_iron_door_bottom_left_open.json new file mode 100644 index 000000000..f4ca72527 --- /dev/null +++ b/src/main/resources/assets/basemetals/models/block/obsidian_door_iron_door_bottom_left_open.json @@ -0,0 +1,74 @@ +{ + "parent": "minecraft:block/iron_door_bottom_left_open", + "textures": { + "particle": "minecraft:block/obsidian", + "bottom": "basemetals:block/obsidian_door_lower", + "top": "basemetals:block/obsidian_door_upper" + }, + "elements": [ + { + "from": [ + 0, + 0, + 0 + ], + "to": [ + 3, + 16, + 16 + ], + "faces": { + "down": { + "uv": [ + 0, + 16, + 16, + 13 + ], + "texture": "#bottom", + "cullface": "down", + "rotation": 90 + }, + "north": { + "uv": [ + 0, + 0, + 3, + 16 + ], + "texture": "#bottom", + "cullface": "north" + }, + "south": { + "uv": [ + 0, + 0, + 3, + 16 + ], + "texture": "#bottom", + "cullface": "south" + }, + "west": { + "uv": [ + 16, + 0, + 0, + 16 + ], + "texture": "#bottom", + "cullface": "west" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#bottom" + } + } + } + ] +} diff --git a/src/main/resources/assets/basemetals/models/block/obsidian_door_iron_door_bottom_right.json b/src/main/resources/assets/basemetals/models/block/obsidian_door_iron_door_bottom_right.json new file mode 100644 index 000000000..f553d9ea4 --- /dev/null +++ b/src/main/resources/assets/basemetals/models/block/obsidian_door_iron_door_bottom_right.json @@ -0,0 +1,74 @@ +{ + "parent": "minecraft:block/iron_door_bottom_right", + "textures": { + "particle": "minecraft:block/obsidian", + "bottom": "basemetals:block/obsidian_door_lower", + "top": "basemetals:block/obsidian_door_upper" + }, + "elements": [ + { + "from": [ + 0, + 0, + 0 + ], + "to": [ + 3, + 16, + 16 + ], + "faces": { + "down": { + "uv": [ + 0, + 13, + 16, + 16 + ], + "texture": "#bottom", + "cullface": "down", + "rotation": 90 + }, + "north": { + "uv": [ + 3, + 0, + 0, + 16 + ], + "texture": "#bottom", + "cullface": "north" + }, + "south": { + "uv": [ + 0, + 0, + 3, + 16 + ], + "texture": "#bottom", + "cullface": "south" + }, + "west": { + "uv": [ + 16, + 0, + 0, + 16 + ], + "texture": "#bottom", + "cullface": "west" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#bottom" + } + } + } + ] +} diff --git a/src/main/resources/assets/basemetals/models/block/obsidian_door_iron_door_bottom_right_open.json b/src/main/resources/assets/basemetals/models/block/obsidian_door_iron_door_bottom_right_open.json new file mode 100644 index 000000000..bb3d44766 --- /dev/null +++ b/src/main/resources/assets/basemetals/models/block/obsidian_door_iron_door_bottom_right_open.json @@ -0,0 +1,74 @@ +{ + "parent": "minecraft:block/iron_door_bottom_right_open", + "textures": { + "particle": "minecraft:block/obsidian", + "bottom": "basemetals:block/obsidian_door_lower", + "top": "basemetals:block/obsidian_door_upper" + }, + "elements": [ + { + "from": [ + 0, + 0, + 0 + ], + "to": [ + 3, + 16, + 16 + ], + "faces": { + "down": { + "uv": [ + 16, + 16, + 0, + 13 + ], + "texture": "#bottom", + "cullface": "down", + "rotation": 90 + }, + "north": { + "uv": [ + 3, + 0, + 0, + 16 + ], + "texture": "#bottom", + "cullface": "north" + }, + "south": { + "uv": [ + 3, + 0, + 0, + 16 + ], + "texture": "#bottom", + "cullface": "south" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#bottom", + "cullface": "west" + }, + "east": { + "uv": [ + 16, + 0, + 0, + 16 + ], + "texture": "#bottom" + } + } + } + ] +} diff --git a/src/main/resources/assets/basemetals/models/block/obsidian_door_iron_door_top_left.json b/src/main/resources/assets/basemetals/models/block/obsidian_door_iron_door_top_left.json new file mode 100644 index 000000000..301e30e32 --- /dev/null +++ b/src/main/resources/assets/basemetals/models/block/obsidian_door_iron_door_top_left.json @@ -0,0 +1,74 @@ +{ + "parent": "minecraft:block/iron_door_top_left", + "textures": { + "particle": "minecraft:block/obsidian", + "bottom": "basemetals:block/obsidian_door_lower", + "top": "basemetals:block/obsidian_door_upper" + }, + "elements": [ + { + "from": [ + 0, + 0, + 0 + ], + "to": [ + 3, + 16, + 16 + ], + "faces": { + "up": { + "uv": [ + 0, + 3, + 16, + 0 + ], + "texture": "#top", + "cullface": "up", + "rotation": 90 + }, + "north": { + "uv": [ + 3, + 0, + 0, + 16 + ], + "texture": "#top", + "cullface": "north" + }, + "south": { + "uv": [ + 0, + 0, + 3, + 16 + ], + "texture": "#top", + "cullface": "south" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#top", + "cullface": "west" + }, + "east": { + "uv": [ + 16, + 0, + 0, + 16 + ], + "texture": "#top" + } + } + } + ] +} diff --git a/src/main/resources/assets/basemetals/models/block/obsidian_door_iron_door_top_left_open.json b/src/main/resources/assets/basemetals/models/block/obsidian_door_iron_door_top_left_open.json new file mode 100644 index 000000000..0262a9831 --- /dev/null +++ b/src/main/resources/assets/basemetals/models/block/obsidian_door_iron_door_top_left_open.json @@ -0,0 +1,74 @@ +{ + "parent": "minecraft:block/iron_door_top_left_open", + "textures": { + "particle": "minecraft:block/obsidian", + "bottom": "basemetals:block/obsidian_door_lower", + "top": "basemetals:block/obsidian_door_upper" + }, + "elements": [ + { + "from": [ + 0, + 0, + 0 + ], + "to": [ + 3, + 16, + 16 + ], + "faces": { + "up": { + "uv": [ + 0, + 3, + 16, + 0 + ], + "texture": "#top", + "cullface": "up", + "rotation": 270 + }, + "north": { + "uv": [ + 0, + 0, + 3, + 16 + ], + "texture": "#top", + "cullface": "north" + }, + "south": { + "uv": [ + 0, + 0, + 3, + 16 + ], + "texture": "#top", + "cullface": "south" + }, + "west": { + "uv": [ + 16, + 0, + 0, + 16 + ], + "texture": "#top", + "cullface": "west" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#top" + } + } + } + ] +} diff --git a/src/main/resources/assets/basemetals/models/block/obsidian_door_iron_door_top_right.json b/src/main/resources/assets/basemetals/models/block/obsidian_door_iron_door_top_right.json new file mode 100644 index 000000000..9e226b6dd --- /dev/null +++ b/src/main/resources/assets/basemetals/models/block/obsidian_door_iron_door_top_right.json @@ -0,0 +1,74 @@ +{ + "parent": "minecraft:block/iron_door_top_right", + "textures": { + "particle": "minecraft:block/obsidian", + "bottom": "basemetals:block/obsidian_door_lower", + "top": "basemetals:block/obsidian_door_upper" + }, + "elements": [ + { + "from": [ + 0, + 0, + 0 + ], + "to": [ + 3, + 16, + 16 + ], + "faces": { + "up": { + "uv": [ + 0, + 0, + 16, + 3 + ], + "texture": "#top", + "cullface": "up", + "rotation": 270 + }, + "north": { + "uv": [ + 3, + 0, + 0, + 16 + ], + "texture": "#top", + "cullface": "north" + }, + "south": { + "uv": [ + 0, + 0, + 3, + 16 + ], + "texture": "#top", + "cullface": "south" + }, + "west": { + "uv": [ + 16, + 0, + 0, + 16 + ], + "texture": "#top", + "cullface": "west" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#top" + } + } + } + ] +} diff --git a/src/main/resources/assets/basemetals/models/block/obsidian_door_iron_door_top_right_open.json b/src/main/resources/assets/basemetals/models/block/obsidian_door_iron_door_top_right_open.json new file mode 100644 index 000000000..452a3b60e --- /dev/null +++ b/src/main/resources/assets/basemetals/models/block/obsidian_door_iron_door_top_right_open.json @@ -0,0 +1,74 @@ +{ + "parent": "minecraft:block/iron_door_top_right_open", + "textures": { + "particle": "minecraft:block/obsidian", + "bottom": "basemetals:block/obsidian_door_lower", + "top": "basemetals:block/obsidian_door_upper" + }, + "elements": [ + { + "from": [ + 0, + 0, + 0 + ], + "to": [ + 3, + 16, + 16 + ], + "faces": { + "up": { + "uv": [ + 0, + 0, + 16, + 3 + ], + "texture": "#top", + "cullface": "up", + "rotation": 90 + }, + "north": { + "uv": [ + 3, + 0, + 0, + 16 + ], + "texture": "#top", + "cullface": "north" + }, + "south": { + "uv": [ + 3, + 0, + 0, + 16 + ], + "texture": "#top", + "cullface": "south" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#top", + "cullface": "west" + }, + "east": { + "uv": [ + 16, + 0, + 0, + 16 + ], + "texture": "#top" + } + } + } + ] +} diff --git a/src/main/resources/assets/basemetals/models/block/obsidian_door_top.json b/src/main/resources/assets/basemetals/models/block/obsidian_door_top.json deleted file mode 100644 index 66609c186..000000000 --- a/src/main/resources/assets/basemetals/models/block/obsidian_door_top.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/door_top_left", - "textures": { - "bottom": "basemetals:block/obsidian_door_lower", - "top": "basemetals:block/obsidian_door_upper" - } -} diff --git a/src/main/resources/assets/basemetals/models/block/obsidian_door_top_rh.json b/src/main/resources/assets/basemetals/models/block/obsidian_door_top_rh.json deleted file mode 100644 index 6494a20ac..000000000 --- a/src/main/resources/assets/basemetals/models/block/obsidian_door_top_rh.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/door_top_right", - "textures": { - "bottom": "basemetals:block/obsidian_door_lower", - "top": "basemetals:block/obsidian_door_upper" - } -} diff --git a/src/main/resources/assets/basemetals/models/block/obsidian_double_slab.json b/src/main/resources/assets/basemetals/models/block/obsidian_double_slab.json new file mode 100644 index 000000000..6638b74cb --- /dev/null +++ b/src/main/resources/assets/basemetals/models/block/obsidian_double_slab.json @@ -0,0 +1,54 @@ +{ + "parent": "minecraft:block/quartz_block", + "textures": { + "particle": "minecraft:block/obsidian", + "down": "minecraft:block/obsidian", + "up": "minecraft:block/obsidian", + "north": "minecraft:block/obsidian", + "east": "minecraft:block/obsidian", + "south": "minecraft:block/obsidian", + "west": "minecraft:block/obsidian", + "end": "minecraft:block/obsidian", + "side": "minecraft:block/obsidian" + }, + "elements": [ + { + "from": [ + 0, + 0, + 0 + ], + "to": [ + 16, + 16, + 16 + ], + "faces": { + "down": { + "texture": "#down", + "cullface": "down" + }, + "up": { + "texture": "#up", + "cullface": "up" + }, + "north": { + "texture": "#north", + "cullface": "north" + }, + "south": { + "texture": "#south", + "cullface": "south" + }, + "west": { + "texture": "#west", + "cullface": "west" + }, + "east": { + "texture": "#east", + "cullface": "east" + } + } + } + ] +} diff --git a/src/main/resources/assets/basemetals/models/block/obsidian_inner_stairs.json b/src/main/resources/assets/basemetals/models/block/obsidian_inner_stairs.json deleted file mode 100644 index 700013a1b..000000000 --- a/src/main/resources/assets/basemetals/models/block/obsidian_inner_stairs.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/inner_stairs", - "textures": { - "bottom": "minecraft:block/obsidian", - "top": "minecraft:block/obsidian", - "side": "minecraft:block/obsidian" - } -} diff --git a/src/main/resources/assets/basemetals/models/block/obsidian_lever.json b/src/main/resources/assets/basemetals/models/block/obsidian_lever.json deleted file mode 100644 index f51fb5795..000000000 --- a/src/main/resources/assets/basemetals/models/block/obsidian_lever.json +++ /dev/null @@ -1,33 +0,0 @@ -{ - "ambientocclusion": false, - "textures": { - "particle": "minecraft:block/obsidian", - "base": "minecraft:block/obsidian", - "lever": "minecraft:block/lever" - }, - "elements": [ - { "from": [ 5, 0, 4 ], - "to": [ 11, 3, 12 ], - "faces": { - "down": { "uv": [ 5, 4, 11, 12 ], "texture": "#base" }, - "up": { "uv": [ 5, 4, 11, 12 ], "texture": "#base" }, - "north": { "uv": [ 5, 0, 11, 3 ], "texture": "#base" }, - "south": { "uv": [ 5, 0, 11, 3 ], "texture": "#base" }, - "west": { "uv": [ 4, 0, 12, 3 ], "texture": "#base" }, - "east": { "uv": [ 4, 0, 12, 3 ], "texture": "#base" } - } - }, - { "from": [ 7, 1, 7 ], - "to": [ 9, 11, 9 ], - "rotation": { "origin": [ 8, 1, 8 ], "axis": "x", "angle": -45 }, - "faces": { - "down": { "uv": [ 7, 6, 9, 8 ], "texture": "#lever" }, - "up": { "uv": [ 7, 6, 9, 8 ], "texture": "#lever" }, - "north": { "uv": [ 7, 6, 9, 16 ], "texture": "#lever" }, - "south": { "uv": [ 7, 6, 9, 16 ], "texture": "#lever" }, - "west": { "uv": [ 7, 6, 9, 16 ], "texture": "#lever" }, - "east": { "uv": [ 7, 6, 9, 16 ], "texture": "#lever" } - } - } - ] -} diff --git a/src/main/resources/assets/basemetals/models/block/obsidian_lever_lever.json b/src/main/resources/assets/basemetals/models/block/obsidian_lever_lever.json new file mode 100644 index 000000000..a1e80f958 --- /dev/null +++ b/src/main/resources/assets/basemetals/models/block/obsidian_lever_lever.json @@ -0,0 +1,147 @@ +{ + "parent": "minecraft:block/lever", + "textures": { + "particle": "minecraft:block/obsidian", + "base": "minecraft:block/obsidian", + "lever": "block/lever" + }, + "elements": [ + { + "from": [ + 5, + -0.02, + 4 + ], + "to": [ + 11, + 2.98, + 12 + ], + "faces": { + "down": { + "uv": [ + 5, + 4, + 11, + 12 + ], + "texture": "#base", + "cullface": "down" + }, + "up": { + "uv": [ + 5, + 4, + 11, + 12 + ], + "texture": "#base" + }, + "north": { + "uv": [ + 5, + 0, + 11, + 3 + ], + "texture": "#base" + }, + "south": { + "uv": [ + 5, + 0, + 11, + 3 + ], + "texture": "#base" + }, + "west": { + "uv": [ + 4, + 0, + 12, + 3 + ], + "texture": "#base" + }, + "east": { + "uv": [ + 4, + 0, + 12, + 3 + ], + "texture": "#base" + } + } + }, + { + "from": [ + 7, + 1, + 7 + ], + "to": [ + 9, + 11, + 9 + ], + "rotation": { + "origin": [ + 8, + 1, + 8 + ], + "axis": "x", + "angle": -45 + }, + "faces": { + "up": { + "uv": [ + 7, + 6, + 9, + 8 + ], + "texture": "#lever" + }, + "north": { + "uv": [ + 7, + 6, + 9, + 16 + ], + "texture": "#lever" + }, + "south": { + "uv": [ + 7, + 6, + 9, + 16 + ], + "texture": "#lever" + }, + "west": { + "uv": [ + 7, + 6, + 9, + 16 + ], + "texture": "#lever" + }, + "east": { + "uv": [ + 7, + 6, + 9, + 16 + ], + "texture": "#lever" + } + } + } + ] +} diff --git a/src/main/resources/assets/basemetals/models/block/obsidian_lever_lever_on.json b/src/main/resources/assets/basemetals/models/block/obsidian_lever_lever_on.json new file mode 100644 index 000000000..66ae931ba --- /dev/null +++ b/src/main/resources/assets/basemetals/models/block/obsidian_lever_lever_on.json @@ -0,0 +1,147 @@ +{ + "parent": "minecraft:block/lever_on", + "textures": { + "particle": "minecraft:block/obsidian", + "base": "minecraft:block/obsidian", + "lever": "block/lever" + }, + "elements": [ + { + "from": [ + 5, + -0.02, + 4 + ], + "to": [ + 11, + 2.98, + 12 + ], + "faces": { + "down": { + "uv": [ + 5, + 4, + 11, + 12 + ], + "texture": "#base", + "cullface": "down" + }, + "up": { + "uv": [ + 5, + 4, + 11, + 12 + ], + "texture": "#base" + }, + "north": { + "uv": [ + 5, + 0, + 11, + 3 + ], + "texture": "#base" + }, + "south": { + "uv": [ + 5, + 0, + 11, + 3 + ], + "texture": "#base" + }, + "west": { + "uv": [ + 4, + 0, + 12, + 3 + ], + "texture": "#base" + }, + "east": { + "uv": [ + 4, + 0, + 12, + 3 + ], + "texture": "#base" + } + } + }, + { + "from": [ + 7, + 1, + 7 + ], + "to": [ + 9, + 11, + 9 + ], + "rotation": { + "origin": [ + 8, + 1, + 8 + ], + "axis": "x", + "angle": 45 + }, + "faces": { + "up": { + "uv": [ + 7, + 6, + 9, + 8 + ], + "texture": "#lever" + }, + "north": { + "uv": [ + 7, + 6, + 9, + 16 + ], + "texture": "#lever" + }, + "south": { + "uv": [ + 7, + 6, + 9, + 16 + ], + "texture": "#lever" + }, + "west": { + "uv": [ + 7, + 6, + 9, + 16 + ], + "texture": "#lever" + }, + "east": { + "uv": [ + 7, + 6, + 9, + 16 + ], + "texture": "#lever" + } + } + } + ] +} diff --git a/src/main/resources/assets/basemetals/models/block/obsidian_lever_off.json b/src/main/resources/assets/basemetals/models/block/obsidian_lever_off.json deleted file mode 100644 index b89c62bdd..000000000 --- a/src/main/resources/assets/basemetals/models/block/obsidian_lever_off.json +++ /dev/null @@ -1,33 +0,0 @@ -{ - "ambientocclusion": false, - "textures": { - "particle": "minecraft:block/obsidian", - "base": "minecraft:block/obsidian", - "lever": "minecraft:block/lever" - }, - "elements": [ - { "from": [ 5, 0, 4 ], - "to": [ 11, 3, 12 ], - "faces": { - "down": { "uv": [ 5, 4, 11, 12 ], "texture": "#base" }, - "up": { "uv": [ 5, 4, 11, 12 ], "texture": "#base" }, - "north": { "uv": [ 5, 0, 11, 3 ], "texture": "#base" }, - "south": { "uv": [ 5, 0, 11, 3 ], "texture": "#base" }, - "west": { "uv": [ 4, 0, 12, 3 ], "texture": "#base" }, - "east": { "uv": [ 4, 0, 12, 3 ], "texture": "#base" } - } - }, - { "from": [ 7, 1, 7 ], - "to": [ 9, 11, 9 ], - "rotation": { "origin": [ 8, 1, 8 ], "axis": "x", "angle": 45 }, - "faces": { - "down": { "uv": [ 7, 6, 9, 8 ], "texture": "#lever" }, - "up": { "uv": [ 7, 6, 9, 8 ], "texture": "#lever" }, - "north": { "uv": [ 7, 6, 9, 16 ], "texture": "#lever" }, - "south": { "uv": [ 7, 6, 9, 16 ], "texture": "#lever" }, - "west": { "uv": [ 7, 6, 9, 16 ], "texture": "#lever" }, - "east": { "uv": [ 7, 6, 9, 16 ], "texture": "#lever" } - } - } - ] -} diff --git a/src/main/resources/assets/basemetals/models/block/obsidian_outer_stairs.json b/src/main/resources/assets/basemetals/models/block/obsidian_outer_stairs.json deleted file mode 100644 index 80d675538..000000000 --- a/src/main/resources/assets/basemetals/models/block/obsidian_outer_stairs.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/outer_stairs", - "textures": { - "bottom": "minecraft:block/obsidian", - "top": "minecraft:block/obsidian", - "side": "minecraft:block/obsidian" - } -} diff --git a/src/main/resources/assets/basemetals/models/block/obsidian_pressure_plate_down.json b/src/main/resources/assets/basemetals/models/block/obsidian_pressure_plate_down.json deleted file mode 100644 index 041ccbe3a..000000000 --- a/src/main/resources/assets/basemetals/models/block/obsidian_pressure_plate_down.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/pressure_plate_down", - "textures": { - "texture": "minecraft:block/obsidian" - } -} diff --git a/src/main/resources/assets/basemetals/models/block/obsidian_pressure_plate_polished_blackstone_pressure_plate.json b/src/main/resources/assets/basemetals/models/block/obsidian_pressure_plate_polished_blackstone_pressure_plate.json new file mode 100644 index 000000000..b79cb2d77 --- /dev/null +++ b/src/main/resources/assets/basemetals/models/block/obsidian_pressure_plate_polished_blackstone_pressure_plate.json @@ -0,0 +1,78 @@ +{ + "parent": "minecraft:block/polished_blackstone_pressure_plate", + "textures": { + "particle": "minecraft:block/obsidian", + "texture": "minecraft:block/obsidian" + }, + "elements": [ + { + "from": [ + 1, + 0, + 1 + ], + "to": [ + 15, + 1, + 15 + ], + "faces": { + "down": { + "uv": [ + 1, + 1, + 15, + 15 + ], + "texture": "#texture", + "cullface": "down" + }, + "up": { + "uv": [ + 1, + 1, + 15, + 15 + ], + "texture": "#texture" + }, + "north": { + "uv": [ + 1, + 15, + 15, + 16 + ], + "texture": "#texture" + }, + "south": { + "uv": [ + 1, + 15, + 15, + 16 + ], + "texture": "#texture" + }, + "west": { + "uv": [ + 1, + 15, + 15, + 16 + ], + "texture": "#texture" + }, + "east": { + "uv": [ + 1, + 15, + 15, + 16 + ], + "texture": "#texture" + } + } + } + ] +} diff --git a/src/main/resources/assets/basemetals/models/block/obsidian_pressure_plate_polished_blackstone_pressure_plate_down.json b/src/main/resources/assets/basemetals/models/block/obsidian_pressure_plate_polished_blackstone_pressure_plate_down.json new file mode 100644 index 000000000..904416de6 --- /dev/null +++ b/src/main/resources/assets/basemetals/models/block/obsidian_pressure_plate_polished_blackstone_pressure_plate_down.json @@ -0,0 +1,78 @@ +{ + "parent": "minecraft:block/polished_blackstone_pressure_plate_down", + "textures": { + "particle": "minecraft:block/obsidian", + "texture": "minecraft:block/obsidian" + }, + "elements": [ + { + "from": [ + 1, + 0, + 1 + ], + "to": [ + 15, + 0.5, + 15 + ], + "faces": { + "down": { + "uv": [ + 1, + 1, + 15, + 15 + ], + "texture": "#texture", + "cullface": "down" + }, + "up": { + "uv": [ + 1, + 1, + 15, + 15 + ], + "texture": "#texture" + }, + "north": { + "uv": [ + 1, + 15, + 15, + 15.5 + ], + "texture": "#texture" + }, + "south": { + "uv": [ + 1, + 15, + 15, + 15.5 + ], + "texture": "#texture" + }, + "west": { + "uv": [ + 1, + 15, + 15, + 15.5 + ], + "texture": "#texture" + }, + "east": { + "uv": [ + 1, + 15, + 15, + 15.5 + ], + "texture": "#texture" + } + } + } + ] +} diff --git a/src/main/resources/assets/basemetals/models/block/obsidian_pressure_plate_up.json b/src/main/resources/assets/basemetals/models/block/obsidian_pressure_plate_up.json index 2a659c14c..75af10446 100644 --- a/src/main/resources/assets/basemetals/models/block/obsidian_pressure_plate_up.json +++ b/src/main/resources/assets/basemetals/models/block/obsidian_pressure_plate_up.json @@ -1,6 +1,6 @@ { - "parent": "block/pressure_plate_up", - "textures": { - "texture": "minecraft:block/obsidian" - } + "parent": "block/pressure_plate_up", + "textures": { + "texture": "minecraft:block/obsidian" + } } diff --git a/src/main/resources/assets/basemetals/models/block/obsidian_slab_quartz_block.json b/src/main/resources/assets/basemetals/models/block/obsidian_slab_quartz_block.json new file mode 100644 index 000000000..6638b74cb --- /dev/null +++ b/src/main/resources/assets/basemetals/models/block/obsidian_slab_quartz_block.json @@ -0,0 +1,54 @@ +{ + "parent": "minecraft:block/quartz_block", + "textures": { + "particle": "minecraft:block/obsidian", + "down": "minecraft:block/obsidian", + "up": "minecraft:block/obsidian", + "north": "minecraft:block/obsidian", + "east": "minecraft:block/obsidian", + "south": "minecraft:block/obsidian", + "west": "minecraft:block/obsidian", + "end": "minecraft:block/obsidian", + "side": "minecraft:block/obsidian" + }, + "elements": [ + { + "from": [ + 0, + 0, + 0 + ], + "to": [ + 16, + 16, + 16 + ], + "faces": { + "down": { + "texture": "#down", + "cullface": "down" + }, + "up": { + "texture": "#up", + "cullface": "up" + }, + "north": { + "texture": "#north", + "cullface": "north" + }, + "south": { + "texture": "#south", + "cullface": "south" + }, + "west": { + "texture": "#west", + "cullface": "west" + }, + "east": { + "texture": "#east", + "cullface": "east" + } + } + } + ] +} diff --git a/src/main/resources/assets/basemetals/models/block/obsidian_slab_quartz_slab.json b/src/main/resources/assets/basemetals/models/block/obsidian_slab_quartz_slab.json new file mode 100644 index 000000000..377da6309 --- /dev/null +++ b/src/main/resources/assets/basemetals/models/block/obsidian_slab_quartz_slab.json @@ -0,0 +1,84 @@ +{ + "parent": "minecraft:block/quartz_slab", + "textures": { + "particle": "minecraft:block/obsidian", + "bottom": "minecraft:block/obsidian", + "side": "minecraft:block/obsidian", + "top": "minecraft:block/obsidian" + }, + "elements": [ + { + "from": [ + 0, + 0, + 0 + ], + "to": [ + 16, + 8, + 16 + ], + "faces": { + "down": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#bottom", + "cullface": "down" + }, + "up": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#top" + }, + "north": { + "uv": [ + 0, + 8, + 16, + 16 + ], + "texture": "#side", + "cullface": "north" + }, + "south": { + "uv": [ + 0, + 8, + 16, + 16 + ], + "texture": "#side", + "cullface": "south" + }, + "west": { + "uv": [ + 0, + 8, + 16, + 16 + ], + "texture": "#side", + "cullface": "west" + }, + "east": { + "uv": [ + 0, + 8, + 16, + 16 + ], + "texture": "#side", + "cullface": "east" + } + } + } + ] +} diff --git a/src/main/resources/assets/basemetals/models/block/obsidian_slab_quartz_slab_top.json b/src/main/resources/assets/basemetals/models/block/obsidian_slab_quartz_slab_top.json new file mode 100644 index 000000000..8b362ecf8 --- /dev/null +++ b/src/main/resources/assets/basemetals/models/block/obsidian_slab_quartz_slab_top.json @@ -0,0 +1,84 @@ +{ + "parent": "minecraft:block/quartz_slab_top", + "textures": { + "particle": "minecraft:block/obsidian", + "bottom": "minecraft:block/obsidian", + "side": "minecraft:block/obsidian", + "top": "minecraft:block/obsidian" + }, + "elements": [ + { + "from": [ + 0, + 8, + 0 + ], + "to": [ + 16, + 16, + 16 + ], + "faces": { + "down": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#bottom" + }, + "up": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#top", + "cullface": "up" + }, + "north": { + "uv": [ + 0, + 0, + 16, + 8 + ], + "texture": "#side", + "cullface": "north" + }, + "south": { + "uv": [ + 0, + 0, + 16, + 8 + ], + "texture": "#side", + "cullface": "south" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 8 + ], + "texture": "#side", + "cullface": "west" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 8 + ], + "texture": "#side", + "cullface": "east" + } + } + } + ] +} diff --git a/src/main/resources/assets/basemetals/models/block/obsidian_stairs.json b/src/main/resources/assets/basemetals/models/block/obsidian_stairs.json index 3d93bf8ce..c49010c61 100644 --- a/src/main/resources/assets/basemetals/models/block/obsidian_stairs.json +++ b/src/main/resources/assets/basemetals/models/block/obsidian_stairs.json @@ -1,8 +1,8 @@ { - "parent": "block/stairs", - "textures": { - "bottom": "minecraft:block/obsidian", - "top": "minecraft:block/obsidian", - "side": "minecraft:block/obsidian" - } + "parent": "block/stairs", + "textures": { + "bottom": "minecraft:block/obsidian", + "top": "minecraft:block/obsidian", + "side": "minecraft:block/obsidian" + } } diff --git a/src/main/resources/assets/basemetals/models/block/obsidian_stairs_quartz_stairs.json b/src/main/resources/assets/basemetals/models/block/obsidian_stairs_quartz_stairs.json new file mode 100644 index 000000000..7d4fa74b9 --- /dev/null +++ b/src/main/resources/assets/basemetals/models/block/obsidian_stairs_quartz_stairs.json @@ -0,0 +1,147 @@ +{ + "parent": "minecraft:block/quartz_stairs", + "textures": { + "particle": "minecraft:block/obsidian", + "bottom": "minecraft:block/obsidian", + "side": "minecraft:block/obsidian", + "top": "minecraft:block/obsidian" + }, + "elements": [ + { + "from": [ + 0, + 0, + 0 + ], + "to": [ + 16, + 8, + 16 + ], + "faces": { + "down": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#bottom", + "cullface": "down" + }, + "up": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#top" + }, + "north": { + "uv": [ + 0, + 8, + 16, + 16 + ], + "texture": "#side", + "cullface": "north" + }, + "south": { + "uv": [ + 0, + 8, + 16, + 16 + ], + "texture": "#side", + "cullface": "south" + }, + "west": { + "uv": [ + 0, + 8, + 16, + 16 + ], + "texture": "#side", + "cullface": "west" + }, + "east": { + "uv": [ + 0, + 8, + 16, + 16 + ], + "texture": "#side", + "cullface": "east" + } + } + }, + { + "from": [ + 8, + 8, + 0 + ], + "to": [ + 16, + 16, + 16 + ], + "faces": { + "up": { + "uv": [ + 8, + 0, + 16, + 16 + ], + "texture": "#top", + "cullface": "up" + }, + "north": { + "uv": [ + 0, + 0, + 8, + 8 + ], + "texture": "#side", + "cullface": "north" + }, + "south": { + "uv": [ + 8, + 0, + 16, + 8 + ], + "texture": "#side", + "cullface": "south" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 8 + ], + "texture": "#side" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 8 + ], + "texture": "#side", + "cullface": "east" + } + } + } + ] +} diff --git a/src/main/resources/assets/basemetals/models/block/obsidian_stairs_quartz_stairs_inner.json b/src/main/resources/assets/basemetals/models/block/obsidian_stairs_quartz_stairs_inner.json new file mode 100644 index 000000000..263bfa4f8 --- /dev/null +++ b/src/main/resources/assets/basemetals/models/block/obsidian_stairs_quartz_stairs_inner.json @@ -0,0 +1,200 @@ +{ + "parent": "minecraft:block/quartz_stairs_inner", + "textures": { + "particle": "minecraft:block/obsidian", + "bottom": "minecraft:block/obsidian", + "side": "minecraft:block/obsidian", + "top": "minecraft:block/obsidian" + }, + "elements": [ + { + "from": [ + 0, + 0, + 0 + ], + "to": [ + 16, + 8, + 16 + ], + "faces": { + "down": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#bottom", + "cullface": "down" + }, + "up": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#top" + }, + "north": { + "uv": [ + 0, + 8, + 16, + 16 + ], + "texture": "#side", + "cullface": "north" + }, + "south": { + "uv": [ + 0, + 8, + 16, + 16 + ], + "texture": "#side", + "cullface": "south" + }, + "west": { + "uv": [ + 0, + 8, + 16, + 16 + ], + "texture": "#side", + "cullface": "west" + }, + "east": { + "uv": [ + 0, + 8, + 16, + 16 + ], + "texture": "#side", + "cullface": "east" + } + } + }, + { + "from": [ + 8, + 8, + 0 + ], + "to": [ + 16, + 16, + 16 + ], + "faces": { + "up": { + "uv": [ + 8, + 0, + 16, + 16 + ], + "texture": "#top", + "cullface": "up" + }, + "north": { + "uv": [ + 0, + 0, + 8, + 8 + ], + "texture": "#side", + "cullface": "north" + }, + "south": { + "uv": [ + 8, + 0, + 16, + 8 + ], + "texture": "#side", + "cullface": "south" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 8 + ], + "texture": "#side" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 8 + ], + "texture": "#side", + "cullface": "east" + } + } + }, + { + "from": [ + 0, + 8, + 8 + ], + "to": [ + 8, + 16, + 16 + ], + "faces": { + "up": { + "uv": [ + 0, + 8, + 8, + 16 + ], + "texture": "#top", + "cullface": "up" + }, + "north": { + "uv": [ + 8, + 0, + 16, + 8 + ], + "texture": "#side" + }, + "south": { + "uv": [ + 0, + 0, + 8, + 8 + ], + "texture": "#side", + "cullface": "south" + }, + "west": { + "uv": [ + 8, + 0, + 16, + 8 + ], + "texture": "#side", + "cullface": "west" + } + } + } + ] +} diff --git a/src/main/resources/assets/basemetals/models/block/obsidian_stairs_quartz_stairs_outer.json b/src/main/resources/assets/basemetals/models/block/obsidian_stairs_quartz_stairs_outer.json new file mode 100644 index 000000000..7e7f51a94 --- /dev/null +++ b/src/main/resources/assets/basemetals/models/block/obsidian_stairs_quartz_stairs_outer.json @@ -0,0 +1,146 @@ +{ + "parent": "minecraft:block/quartz_stairs_outer", + "textures": { + "particle": "minecraft:block/obsidian", + "bottom": "minecraft:block/obsidian", + "side": "minecraft:block/obsidian", + "top": "minecraft:block/obsidian" + }, + "elements": [ + { + "from": [ + 0, + 0, + 0 + ], + "to": [ + 16, + 8, + 16 + ], + "faces": { + "down": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#bottom", + "cullface": "down" + }, + "up": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#top" + }, + "north": { + "uv": [ + 0, + 8, + 16, + 16 + ], + "texture": "#side", + "cullface": "north" + }, + "south": { + "uv": [ + 0, + 8, + 16, + 16 + ], + "texture": "#side", + "cullface": "south" + }, + "west": { + "uv": [ + 0, + 8, + 16, + 16 + ], + "texture": "#side", + "cullface": "west" + }, + "east": { + "uv": [ + 0, + 8, + 16, + 16 + ], + "texture": "#side", + "cullface": "east" + } + } + }, + { + "from": [ + 8, + 8, + 8 + ], + "to": [ + 16, + 16, + 16 + ], + "faces": { + "up": { + "uv": [ + 8, + 8, + 16, + 16 + ], + "texture": "#top", + "cullface": "up" + }, + "north": { + "uv": [ + 0, + 0, + 8, + 8 + ], + "texture": "#side" + }, + "south": { + "uv": [ + 8, + 0, + 16, + 8 + ], + "texture": "#side", + "cullface": "south" + }, + "west": { + "uv": [ + 8, + 0, + 16, + 8 + ], + "texture": "#side" + }, + "east": { + "uv": [ + 0, + 0, + 8, + 8 + ], + "texture": "#side", + "cullface": "east" + } + } + } + ] +} diff --git a/src/main/resources/assets/basemetals/models/block/obsidian_trapdoor_bottom.json b/src/main/resources/assets/basemetals/models/block/obsidian_trapdoor_bottom.json index f21ce2305..f100e6777 100644 --- a/src/main/resources/assets/basemetals/models/block/obsidian_trapdoor_bottom.json +++ b/src/main/resources/assets/basemetals/models/block/obsidian_trapdoor_bottom.json @@ -1,6 +1,6 @@ { - "parent": "minecraft:block/template_orientable_trapdoor_bottom", - "textures": { - "texture": "basemetals:block/obsidian_trapdoor" - } + "parent": "minecraft:block/template_orientable_trapdoor_bottom", + "textures": { + "texture": "basemetals:block/obsidian_trapdoor" + } } diff --git a/src/main/resources/assets/basemetals/models/block/obsidian_trapdoor_iron_trapdoor_bottom.json b/src/main/resources/assets/basemetals/models/block/obsidian_trapdoor_iron_trapdoor_bottom.json new file mode 100644 index 000000000..77a7712aa --- /dev/null +++ b/src/main/resources/assets/basemetals/models/block/obsidian_trapdoor_iron_trapdoor_bottom.json @@ -0,0 +1,82 @@ +{ + "parent": "minecraft:block/iron_trapdoor_bottom", + "textures": { + "particle": "minecraft:block/obsidian", + "texture": "basemetals:block/obsidian_trapdoor" + }, + "elements": [ + { + "from": [ + 0, + 0, + 0 + ], + "to": [ + 16, + 3, + 16 + ], + "faces": { + "down": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#texture", + "cullface": "down" + }, + "up": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#texture" + }, + "north": { + "uv": [ + 0, + 16, + 16, + 13 + ], + "texture": "#texture", + "cullface": "north" + }, + "south": { + "uv": [ + 0, + 16, + 16, + 13 + ], + "texture": "#texture", + "cullface": "south" + }, + "west": { + "uv": [ + 0, + 16, + 16, + 13 + ], + "texture": "#texture", + "cullface": "west" + }, + "east": { + "uv": [ + 0, + 16, + 16, + 13 + ], + "texture": "#texture", + "cullface": "east" + } + } + } + ] +} diff --git a/src/main/resources/assets/basemetals/models/block/obsidian_trapdoor_iron_trapdoor_open.json b/src/main/resources/assets/basemetals/models/block/obsidian_trapdoor_iron_trapdoor_open.json new file mode 100644 index 000000000..40f5aef8d --- /dev/null +++ b/src/main/resources/assets/basemetals/models/block/obsidian_trapdoor_iron_trapdoor_open.json @@ -0,0 +1,82 @@ +{ + "parent": "minecraft:block/iron_trapdoor_open", + "textures": { + "particle": "minecraft:block/obsidian", + "texture": "basemetals:block/obsidian_trapdoor" + }, + "elements": [ + { + "from": [ + 0, + 0, + 13 + ], + "to": [ + 16, + 16, + 16 + ], + "faces": { + "down": { + "uv": [ + 0, + 13, + 16, + 16 + ], + "texture": "#texture", + "cullface": "down" + }, + "up": { + "uv": [ + 0, + 16, + 16, + 13 + ], + "texture": "#texture", + "cullface": "up" + }, + "north": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#texture" + }, + "south": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#texture", + "cullface": "south" + }, + "west": { + "uv": [ + 16, + 0, + 13, + 16 + ], + "texture": "#texture", + "cullface": "west" + }, + "east": { + "uv": [ + 13, + 0, + 16, + 16 + ], + "texture": "#texture", + "cullface": "east" + } + } + } + ] +} diff --git a/src/main/resources/assets/basemetals/models/block/obsidian_trapdoor_iron_trapdoor_top.json b/src/main/resources/assets/basemetals/models/block/obsidian_trapdoor_iron_trapdoor_top.json new file mode 100644 index 000000000..0e08f8fec --- /dev/null +++ b/src/main/resources/assets/basemetals/models/block/obsidian_trapdoor_iron_trapdoor_top.json @@ -0,0 +1,82 @@ +{ + "parent": "minecraft:block/iron_trapdoor_top", + "textures": { + "particle": "minecraft:block/obsidian", + "texture": "basemetals:block/obsidian_trapdoor" + }, + "elements": [ + { + "from": [ + 0, + 13, + 0 + ], + "to": [ + 16, + 16, + 16 + ], + "faces": { + "down": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#texture" + }, + "up": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#texture", + "cullface": "up" + }, + "north": { + "uv": [ + 0, + 16, + 16, + 13 + ], + "texture": "#texture", + "cullface": "north" + }, + "south": { + "uv": [ + 0, + 16, + 16, + 13 + ], + "texture": "#texture", + "cullface": "south" + }, + "west": { + "uv": [ + 0, + 16, + 16, + 13 + ], + "texture": "#texture", + "cullface": "west" + }, + "east": { + "uv": [ + 0, + 16, + 16, + 13 + ], + "texture": "#texture", + "cullface": "east" + } + } + } + ] +} diff --git a/src/main/resources/assets/basemetals/models/block/obsidian_trapdoor_open.json b/src/main/resources/assets/basemetals/models/block/obsidian_trapdoor_open.json deleted file mode 100644 index 6c116d293..000000000 --- a/src/main/resources/assets/basemetals/models/block/obsidian_trapdoor_open.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/template_orientable_trapdoor_open", - "textures": { - "texture": "basemetals:block/obsidian_trapdoor" - } -} diff --git a/src/main/resources/assets/basemetals/models/block/obsidian_trapdoor_top.json b/src/main/resources/assets/basemetals/models/block/obsidian_trapdoor_top.json deleted file mode 100644 index 193c42baa..000000000 --- a/src/main/resources/assets/basemetals/models/block/obsidian_trapdoor_top.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/template_orientable_trapdoor_top", - "textures": { - "texture": "basemetals:block/obsidian_trapdoor" - } -} diff --git a/src/main/resources/assets/basemetals/models/block/obsidian_wall_cobblestone_wall_post.json b/src/main/resources/assets/basemetals/models/block/obsidian_wall_cobblestone_wall_post.json new file mode 100644 index 000000000..aed595a61 --- /dev/null +++ b/src/main/resources/assets/basemetals/models/block/obsidian_wall_cobblestone_wall_post.json @@ -0,0 +1,44 @@ +{ + "parent": "minecraft:block/cobblestone_wall_post", + "textures": { + "particle": "minecraft:block/obsidian", + "wall": "minecraft:block/obsidian" + }, + "elements": [ + { + "from": [ + 4, + 0, + 4 + ], + "to": [ + 12, + 16, + 12 + ], + "faces": { + "down": { + "texture": "#wall", + "cullface": "down" + }, + "up": { + "texture": "#wall", + "cullface": "up" + }, + "north": { + "texture": "#wall" + }, + "south": { + "texture": "#wall" + }, + "west": { + "texture": "#wall" + }, + "east": { + "texture": "#wall" + } + }, + "__comment": "Center post" + } + ] +} diff --git a/src/main/resources/assets/basemetals/models/block/obsidian_wall_cobblestone_wall_side.json b/src/main/resources/assets/basemetals/models/block/obsidian_wall_cobblestone_wall_side.json new file mode 100644 index 000000000..8cd3eb3c1 --- /dev/null +++ b/src/main/resources/assets/basemetals/models/block/obsidian_wall_cobblestone_wall_side.json @@ -0,0 +1,41 @@ +{ + "parent": "minecraft:block/cobblestone_wall_side", + "textures": { + "particle": "minecraft:block/obsidian", + "wall": "minecraft:block/obsidian" + }, + "elements": [ + { + "from": [ + 5, + 0, + 0 + ], + "to": [ + 11, + 14, + 8 + ], + "faces": { + "down": { + "texture": "#wall", + "cullface": "down" + }, + "up": { + "texture": "#wall" + }, + "north": { + "texture": "#wall", + "cullface": "north" + }, + "west": { + "texture": "#wall" + }, + "east": { + "texture": "#wall" + } + }, + "__comment": "wall" + } + ] +} diff --git a/src/main/resources/assets/basemetals/models/block/obsidian_wall_cobblestone_wall_side_tall.json b/src/main/resources/assets/basemetals/models/block/obsidian_wall_cobblestone_wall_side_tall.json new file mode 100644 index 000000000..0c322a22c --- /dev/null +++ b/src/main/resources/assets/basemetals/models/block/obsidian_wall_cobblestone_wall_side_tall.json @@ -0,0 +1,41 @@ +{ + "parent": "minecraft:block/cobblestone_wall_side_tall", + "textures": { + "particle": "minecraft:block/obsidian", + "wall": "minecraft:block/obsidian" + }, + "elements": [ + { + "from": [ + 5, + 0, + 0 + ], + "to": [ + 11, + 16, + 8 + ], + "faces": { + "down": { + "texture": "#wall", + "cullface": "down" + }, + "up": { + "texture": "#wall", + "cullface": "up" + }, + "north": { + "texture": "#wall", + "cullface": "north" + }, + "west": { + "texture": "#wall" + }, + "east": { + "texture": "#wall" + } + } + } + ] +} diff --git a/src/main/resources/assets/basemetals/models/block/obsidian_wall_inventory.json b/src/main/resources/assets/basemetals/models/block/obsidian_wall_inventory.json index be586ddef..128f4d346 100644 --- a/src/main/resources/assets/basemetals/models/block/obsidian_wall_inventory.json +++ b/src/main/resources/assets/basemetals/models/block/obsidian_wall_inventory.json @@ -1,6 +1,6 @@ { - "parent": "block/wall_inventory", - "textures": { - "wall": "minecraft:block/obsidian" - } + "parent": "block/wall_inventory", + "textures": { + "wall": "minecraft:block/obsidian" + } } diff --git a/src/main/resources/assets/basemetals/models/block/obsidian_wall_post.json b/src/main/resources/assets/basemetals/models/block/obsidian_wall_post.json deleted file mode 100644 index 35374c3da..000000000 --- a/src/main/resources/assets/basemetals/models/block/obsidian_wall_post.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/template_wall_post", - "textures": { - "wall": "minecraft:block/obsidian" - } -} diff --git a/src/main/resources/assets/basemetals/models/block/obsidian_wall_side.json b/src/main/resources/assets/basemetals/models/block/obsidian_wall_side.json deleted file mode 100644 index e29b7296a..000000000 --- a/src/main/resources/assets/basemetals/models/block/obsidian_wall_side.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/template_wall_side", - "textures": { - "wall": "minecraft:block/obsidian" - } -} diff --git a/src/main/resources/assets/basemetals/models/block/quartz_bars_cap.json b/src/main/resources/assets/basemetals/models/block/quartz_bars_cap.json deleted file mode 100644 index 8fd8d1aee..000000000 --- a/src/main/resources/assets/basemetals/models/block/quartz_bars_cap.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "ambientocclusion": false, - "textures": { - "particle": "basemetals:block/quartz_bars", - "bars": "basemetals:block/quartz_bars", - "edge": "basemetals:block/quartz_bars" - }, - "elements": [ - { "from": [ 8, 0, 8 ], - "to": [ 8, 16, 9 ], - "faces": { - "west": { "uv": [ 8, 0, 7, 16 ], "texture": "#bars" }, - "east": { "uv": [ 7, 0, 8, 16 ], "texture": "#bars" } - } - }, - { "from": [ 7, 0, 9 ], - "to": [ 9, 16, 9 ], - "faces": { - "north": { "uv": [ 9, 0, 7, 16 ], "texture": "#bars" }, - "south": { "uv": [ 7, 0, 9, 16 ], "texture": "#bars" } - } - } - ] -} diff --git a/src/main/resources/assets/basemetals/models/block/quartz_bars_cap_alt.json b/src/main/resources/assets/basemetals/models/block/quartz_bars_cap_alt.json deleted file mode 100644 index 4dac742bf..000000000 --- a/src/main/resources/assets/basemetals/models/block/quartz_bars_cap_alt.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "ambientocclusion": false, - "textures": { - "particle": "basemetals:block/quartz_bars", - "bars": "basemetals:block/quartz_bars", - "edge": "basemetals:block/quartz_bars" - }, - "elements": [ - { "from": [ 8, 0, 7 ], - "to": [ 8, 16, 8 ], - "faces": { - "west": { "uv": [ 8, 0, 9, 16 ], "texture": "#bars" }, - "east": { "uv": [ 9, 0, 8, 16 ], "texture": "#bars" } - } - }, - { "from": [ 7, 0, 7 ], - "to": [ 9, 16, 7 ], - "faces": { - "north": { "uv": [ 7, 0, 9, 16 ], "texture": "#bars" }, - "south": { "uv": [ 9, 0, 7, 16 ], "texture": "#bars" } - } - } - ] -} diff --git a/src/main/resources/assets/basemetals/models/block/quartz_bars_iron_bars_cap.json b/src/main/resources/assets/basemetals/models/block/quartz_bars_iron_bars_cap.json new file mode 100644 index 000000000..fa6d9a22e --- /dev/null +++ b/src/main/resources/assets/basemetals/models/block/quartz_bars_iron_bars_cap.json @@ -0,0 +1,74 @@ +{ + "parent": "minecraft:block/iron_bars_cap", + "textures": { + "particle": "minecraft:block/quartz_block_side", + "bars": "basemetals:block/quartz_bars", + "edge": "basemetals:block/quartz_bars" + }, + "elements": [ + { + "from": [ + 8, + 0, + 8 + ], + "to": [ + 8, + 16, + 9 + ], + "faces": { + "west": { + "uv": [ + 8, + 0, + 7, + 16 + ], + "texture": "#bars" + }, + "east": { + "uv": [ + 7, + 0, + 8, + 16 + ], + "texture": "#bars" + } + } + }, + { + "from": [ + 7, + 0, + 9 + ], + "to": [ + 9, + 16, + 9 + ], + "faces": { + "north": { + "uv": [ + 9, + 0, + 7, + 16 + ], + "texture": "#bars" + }, + "south": { + "uv": [ + 7, + 0, + 9, + 16 + ], + "texture": "#bars" + } + } + } + ] +} diff --git a/src/main/resources/assets/basemetals/models/block/quartz_bars_iron_bars_cap_alt.json b/src/main/resources/assets/basemetals/models/block/quartz_bars_iron_bars_cap_alt.json new file mode 100644 index 000000000..8de6e9f2d --- /dev/null +++ b/src/main/resources/assets/basemetals/models/block/quartz_bars_iron_bars_cap_alt.json @@ -0,0 +1,74 @@ +{ + "parent": "minecraft:block/iron_bars_cap_alt", + "textures": { + "particle": "minecraft:block/quartz_block_side", + "bars": "basemetals:block/quartz_bars", + "edge": "basemetals:block/quartz_bars" + }, + "elements": [ + { + "from": [ + 8, + 0, + 7 + ], + "to": [ + 8, + 16, + 8 + ], + "faces": { + "west": { + "uv": [ + 8, + 0, + 9, + 16 + ], + "texture": "#bars" + }, + "east": { + "uv": [ + 9, + 0, + 8, + 16 + ], + "texture": "#bars" + } + } + }, + { + "from": [ + 7, + 0, + 7 + ], + "to": [ + 9, + 16, + 7 + ], + "faces": { + "north": { + "uv": [ + 7, + 0, + 9, + 16 + ], + "texture": "#bars" + }, + "south": { + "uv": [ + 9, + 0, + 7, + 16 + ], + "texture": "#bars" + } + } + } + ] +} diff --git a/src/main/resources/assets/basemetals/models/block/quartz_bars_iron_bars_post.json b/src/main/resources/assets/basemetals/models/block/quartz_bars_iron_bars_post.json new file mode 100644 index 000000000..aac780773 --- /dev/null +++ b/src/main/resources/assets/basemetals/models/block/quartz_bars_iron_bars_post.json @@ -0,0 +1,73 @@ +{ + "parent": "minecraft:block/iron_bars_post", + "textures": { + "particle": "minecraft:block/quartz_block_side", + "bars": "basemetals:block/quartz_bars" + }, + "elements": [ + { + "from": [ + 8, + 0, + 7 + ], + "to": [ + 8, + 16, + 9 + ], + "faces": { + "west": { + "uv": [ + 7, + 0, + 9, + 16 + ], + "texture": "#bars" + }, + "east": { + "uv": [ + 9, + 0, + 7, + 16 + ], + "texture": "#bars" + } + } + }, + { + "from": [ + 7, + 0, + 8 + ], + "to": [ + 9, + 16, + 8 + ], + "faces": { + "north": { + "uv": [ + 7, + 0, + 9, + 16 + ], + "texture": "#bars" + }, + "south": { + "uv": [ + 9, + 0, + 7, + 16 + ], + "texture": "#bars" + } + } + } + ] +} diff --git a/src/main/resources/assets/basemetals/models/block/quartz_bars_iron_bars_post_ends.json b/src/main/resources/assets/basemetals/models/block/quartz_bars_iron_bars_post_ends.json new file mode 100644 index 000000000..4c8f28bac --- /dev/null +++ b/src/main/resources/assets/basemetals/models/block/quartz_bars_iron_bars_post_ends.json @@ -0,0 +1,73 @@ +{ + "parent": "minecraft:block/iron_bars_post_ends", + "textures": { + "particle": "minecraft:block/quartz_block_side", + "edge": "basemetals:block/quartz_bars" + }, + "elements": [ + { + "from": [ + 7, + 0.001, + 7 + ], + "to": [ + 9, + 0.001, + 9 + ], + "faces": { + "down": { + "uv": [ + 7, + 7, + 9, + 9 + ], + "texture": "#edge" + }, + "up": { + "uv": [ + 7, + 7, + 9, + 9 + ], + "texture": "#edge" + } + } + }, + { + "from": [ + 7, + 15.999, + 7 + ], + "to": [ + 9, + 15.999, + 9 + ], + "faces": { + "down": { + "uv": [ + 7, + 7, + 9, + 9 + ], + "texture": "#edge" + }, + "up": { + "uv": [ + 7, + 7, + 9, + 9 + ], + "texture": "#edge" + } + } + } + ] +} diff --git a/src/main/resources/assets/basemetals/models/block/quartz_bars_iron_bars_side.json b/src/main/resources/assets/basemetals/models/block/quartz_bars_iron_bars_side.json new file mode 100644 index 000000000..5ba202107 --- /dev/null +++ b/src/main/resources/assets/basemetals/models/block/quartz_bars_iron_bars_side.json @@ -0,0 +1,130 @@ +{ + "parent": "minecraft:block/iron_bars_side", + "textures": { + "particle": "minecraft:block/quartz_block_side", + "bars": "basemetals:block/quartz_bars", + "edge": "basemetals:block/quartz_bars" + }, + "elements": [ + { + "from": [ + 8, + 0, + 0 + ], + "to": [ + 8, + 16, + 8 + ], + "faces": { + "west": { + "uv": [ + 16, + 0, + 8, + 16 + ], + "texture": "#bars" + }, + "east": { + "uv": [ + 8, + 0, + 16, + 16 + ], + "texture": "#bars" + } + } + }, + { + "from": [ + 7, + 0, + 0 + ], + "to": [ + 9, + 16, + 7 + ], + "faces": { + "north": { + "uv": [ + 7, + 0, + 9, + 16 + ], + "texture": "#edge", + "cullface": "north" + } + } + }, + { + "from": [ + 7, + 0.001, + 0 + ], + "to": [ + 9, + 0.001, + 7 + ], + "faces": { + "down": { + "uv": [ + 9, + 0, + 7, + 7 + ], + "texture": "#edge" + }, + "up": { + "uv": [ + 7, + 0, + 9, + 7 + ], + "texture": "#edge" + } + } + }, + { + "from": [ + 7, + 15.999, + 0 + ], + "to": [ + 9, + 15.999, + 7 + ], + "faces": { + "down": { + "uv": [ + 9, + 0, + 7, + 7 + ], + "texture": "#edge" + }, + "up": { + "uv": [ + 7, + 0, + 9, + 7 + ], + "texture": "#edge" + } + } + } + ] +} diff --git a/src/main/resources/assets/basemetals/models/block/quartz_bars_iron_bars_side_alt.json b/src/main/resources/assets/basemetals/models/block/quartz_bars_iron_bars_side_alt.json new file mode 100644 index 000000000..e666287af --- /dev/null +++ b/src/main/resources/assets/basemetals/models/block/quartz_bars_iron_bars_side_alt.json @@ -0,0 +1,148 @@ +{ + "parent": "minecraft:block/iron_bars_side_alt", + "textures": { + "particle": "minecraft:block/quartz_block_side", + "bars": "basemetals:block/quartz_bars", + "edge": "basemetals:block/quartz_bars" + }, + "elements": [ + { + "from": [ + 8, + 0, + 8 + ], + "to": [ + 8, + 16, + 16 + ], + "faces": { + "west": { + "uv": [ + 8, + 0, + 0, + 16 + ], + "texture": "#bars" + }, + "east": { + "uv": [ + 0, + 0, + 8, + 16 + ], + "texture": "#bars" + } + } + }, + { + "from": [ + 7, + 0, + 9 + ], + "to": [ + 9, + 16, + 16 + ], + "faces": { + "south": { + "uv": [ + 7, + 0, + 9, + 16 + ], + "texture": "#edge", + "cullface": "south" + }, + "down": { + "uv": [ + 9, + 9, + 7, + 16 + ], + "texture": "#edge" + }, + "up": { + "uv": [ + 7, + 9, + 9, + 16 + ], + "texture": "#edge" + } + } + }, + { + "from": [ + 7, + 0.001, + 9 + ], + "to": [ + 9, + 0.001, + 16 + ], + "faces": { + "down": { + "uv": [ + 9, + 9, + 7, + 16 + ], + "texture": "#edge" + }, + "up": { + "uv": [ + 7, + 9, + 9, + 16 + ], + "texture": "#edge" + } + } + }, + { + "from": [ + 7, + 15.999, + 9 + ], + "to": [ + 9, + 15.999, + 16 + ], + "faces": { + "down": { + "uv": [ + 9, + 9, + 7, + 16 + ], + "texture": "#edge" + }, + "up": { + "uv": [ + 7, + 9, + 9, + 16 + ], + "texture": "#edge" + } + } + } + ] +} diff --git a/src/main/resources/assets/basemetals/models/block/quartz_bars_post.json b/src/main/resources/assets/basemetals/models/block/quartz_bars_post.json deleted file mode 100644 index 9ff65e8ce..000000000 --- a/src/main/resources/assets/basemetals/models/block/quartz_bars_post.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "ambientocclusion": false, - "textures": { - "particle": "basemetals:block/quartz_bars", - "bars": "basemetals:block/quartz_bars" - }, - "elements": [ - { "from": [ 8, 0, 7 ], - "to": [ 8, 16, 9 ], - "faces": { - "west": { "uv": [ 7, 0, 9, 16 ], "texture": "#bars" }, - "east": { "uv": [ 9, 0, 7, 16 ], "texture": "#bars" } - } - }, - { "from": [ 7, 0, 8 ], - "to": [ 9, 16, 8 ], - "faces": { - "north": { "uv": [ 7, 0, 9, 16 ], "texture": "#bars" }, - "south": { "uv": [ 9, 0, 7, 16 ], "texture": "#bars" } - } - } - ] -} diff --git a/src/main/resources/assets/basemetals/models/block/quartz_bars_side.json b/src/main/resources/assets/basemetals/models/block/quartz_bars_side.json deleted file mode 100644 index c8c1b4ac0..000000000 --- a/src/main/resources/assets/basemetals/models/block/quartz_bars_side.json +++ /dev/null @@ -1,37 +0,0 @@ -{ - "ambientocclusion": false, - "textures": { - "particle": "basemetals:block/quartz_bars", - "bars": "basemetals:block/quartz_bars", - "edge": "basemetals:block/quartz_bars" - }, - "elements": [ - { "from": [ 8, 0, 0 ], - "to": [ 8, 16, 8 ], - "faces": { - "west": { "uv": [ 16, 0, 8, 16 ], "texture": "#bars" }, - "east": { "uv": [ 8, 0, 16, 16 ], "texture": "#bars" } - } - }, - { "from": [ 7, 0, 0 ], - "to": [ 9, 16, 7 ], - "faces": { - "north": { "uv": [ 7, 0, 9, 16 ], "texture": "#edge", "cullface": "north" } - } - }, - { "from": [ 7, 0.001, 0 ], - "to": [ 9, 0.001, 7 ], - "faces": { - "down": { "uv": [ 9, 0, 7, 7 ], "texture": "#edge" }, - "up": { "uv": [ 7, 0, 9, 7 ], "texture": "#edge" } - } - }, - { "from": [ 7, 15.999, 0 ], - "to": [ 9, 15.999, 7 ], - "faces": { - "down": { "uv": [ 9, 0, 7, 7 ], "texture": "#edge" }, - "up": { "uv": [ 7, 0, 9, 7 ], "texture": "#edge" } - } - } - ] -} diff --git a/src/main/resources/assets/basemetals/models/block/quartz_bars_side_alt.json b/src/main/resources/assets/basemetals/models/block/quartz_bars_side_alt.json deleted file mode 100644 index 3415c15f6..000000000 --- a/src/main/resources/assets/basemetals/models/block/quartz_bars_side_alt.json +++ /dev/null @@ -1,37 +0,0 @@ -{ - "ambientocclusion": false, - "textures": { - "particle": "basemetals:block/quartz_bars", - "bars": "basemetals:block/quartz_bars", - "edge": "basemetals:block/quartz_bars" - }, - "elements": [ - { "from": [ 8, 0, 8 ], - "to": [ 8, 16, 16 ], - "faces": { - "west": { "uv": [ 8, 0, 0, 16 ], "texture": "#bars" }, - "east": { "uv": [ 0, 0, 8, 16 ], "texture": "#bars" } - } - }, - { "from": [ 7, 0, 9 ], - "to": [ 9, 16, 16 ], - "faces": { - "south": { "uv": [ 7, 0, 9, 16 ], "texture": "#edge", "cullface": "south" } - } - }, - { "from": [ 7, 0.001, 9 ], - "to": [ 9, 0.001, 16 ], - "faces": { - "down": { "uv": [ 9, 9, 7, 16 ], "texture": "#edge" }, - "up": { "uv": [ 7, 9, 9, 16 ], "texture": "#edge" } - } - }, - { "from": [ 7, 15.999, 9 ], - "to": [ 9, 15.999, 16 ], - "faces": { - "down": { "uv": [ 9, 9, 7, 16 ], "texture": "#edge" }, - "up": { "uv": [ 7, 9, 9, 16 ], "texture": "#edge" } - } - } - ] -} diff --git a/src/main/resources/assets/basemetals/models/block/quartz_button.json b/src/main/resources/assets/basemetals/models/block/quartz_button.json deleted file mode 100644 index a0b58b2f1..000000000 --- a/src/main/resources/assets/basemetals/models/block/quartz_button.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/button", - "textures": { - "texture": "minecraft:block/quartz_block_side" - } -} diff --git a/src/main/resources/assets/basemetals/models/block/quartz_button_inventory.json b/src/main/resources/assets/basemetals/models/block/quartz_button_inventory.json index 7d9f5e213..16fc05439 100644 --- a/src/main/resources/assets/basemetals/models/block/quartz_button_inventory.json +++ b/src/main/resources/assets/basemetals/models/block/quartz_button_inventory.json @@ -1,6 +1,6 @@ { - "parent": "block/button_inventory", - "textures": { - "texture": "minecraft:block/quartz_block_side" - } + "parent": "block/button_inventory", + "textures": { + "texture": "minecraft:block/quartz_block_side" + } } diff --git a/src/main/resources/assets/basemetals/models/block/quartz_button_polished_blackstone_button.json b/src/main/resources/assets/basemetals/models/block/quartz_button_polished_blackstone_button.json new file mode 100644 index 000000000..d1320b9a0 --- /dev/null +++ b/src/main/resources/assets/basemetals/models/block/quartz_button_polished_blackstone_button.json @@ -0,0 +1,78 @@ +{ + "parent": "minecraft:block/polished_blackstone_button", + "textures": { + "particle": "minecraft:block/quartz_block_side", + "texture": "minecraft:block/quartz_block_side" + }, + "elements": [ + { + "from": [ + 5, + 0, + 6 + ], + "to": [ + 11, + 2, + 10 + ], + "faces": { + "down": { + "uv": [ + 5, + 6, + 11, + 10 + ], + "texture": "#texture", + "cullface": "down" + }, + "up": { + "uv": [ + 5, + 6, + 11, + 10 + ], + "texture": "#texture" + }, + "north": { + "uv": [ + 5, + 14, + 11, + 16 + ], + "texture": "#texture" + }, + "south": { + "uv": [ + 5, + 14, + 11, + 16 + ], + "texture": "#texture" + }, + "west": { + "uv": [ + 6, + 14, + 10, + 16 + ], + "texture": "#texture" + }, + "east": { + "uv": [ + 6, + 14, + 10, + 16 + ], + "texture": "#texture" + } + } + } + ] +} diff --git a/src/main/resources/assets/basemetals/models/block/quartz_button_polished_blackstone_button_pressed.json b/src/main/resources/assets/basemetals/models/block/quartz_button_polished_blackstone_button_pressed.json new file mode 100644 index 000000000..6bed5963d --- /dev/null +++ b/src/main/resources/assets/basemetals/models/block/quartz_button_polished_blackstone_button_pressed.json @@ -0,0 +1,78 @@ +{ + "parent": "minecraft:block/polished_blackstone_button_pressed", + "textures": { + "particle": "minecraft:block/quartz_block_side", + "texture": "minecraft:block/quartz_block_side" + }, + "elements": [ + { + "from": [ + 5, + 0, + 6 + ], + "to": [ + 11, + 1.02, + 10 + ], + "faces": { + "down": { + "uv": [ + 5, + 6, + 11, + 10 + ], + "texture": "#texture", + "cullface": "down" + }, + "up": { + "uv": [ + 5, + 6, + 11, + 10 + ], + "texture": "#texture" + }, + "north": { + "uv": [ + 5, + 14, + 11, + 15 + ], + "texture": "#texture" + }, + "south": { + "uv": [ + 5, + 14, + 11, + 15 + ], + "texture": "#texture" + }, + "west": { + "uv": [ + 6, + 14, + 10, + 15 + ], + "texture": "#texture" + }, + "east": { + "uv": [ + 6, + 14, + 10, + 15 + ], + "texture": "#texture" + } + } + } + ] +} diff --git a/src/main/resources/assets/basemetals/models/block/quartz_button_pressed.json b/src/main/resources/assets/basemetals/models/block/quartz_button_pressed.json deleted file mode 100644 index 07d722220..000000000 --- a/src/main/resources/assets/basemetals/models/block/quartz_button_pressed.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/button_pressed", - "textures": { - "texture": "minecraft:block/quartz_block_side" - } -} diff --git a/src/main/resources/assets/basemetals/models/block/quartz_door_bottom.json b/src/main/resources/assets/basemetals/models/block/quartz_door_bottom.json deleted file mode 100644 index bbc79ad27..000000000 --- a/src/main/resources/assets/basemetals/models/block/quartz_door_bottom.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/door_bottom_left", - "textures": { - "bottom": "basemetals:block/quartz_door_lower", - "top": "basemetals:block/quartz_door_upper" - } -} diff --git a/src/main/resources/assets/basemetals/models/block/quartz_door_bottom_rh.json b/src/main/resources/assets/basemetals/models/block/quartz_door_bottom_rh.json deleted file mode 100644 index 06e6fbd35..000000000 --- a/src/main/resources/assets/basemetals/models/block/quartz_door_bottom_rh.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/door_bottom_right", - "textures": { - "bottom": "basemetals:block/quartz_door_lower", - "top": "basemetals:block/quartz_door_upper" - } -} diff --git a/src/main/resources/assets/basemetals/models/block/quartz_door_iron_door_bottom_left.json b/src/main/resources/assets/basemetals/models/block/quartz_door_iron_door_bottom_left.json new file mode 100644 index 000000000..7cdf5859a --- /dev/null +++ b/src/main/resources/assets/basemetals/models/block/quartz_door_iron_door_bottom_left.json @@ -0,0 +1,74 @@ +{ + "parent": "minecraft:block/iron_door_bottom_left", + "textures": { + "particle": "minecraft:block/quartz_block_side", + "bottom": "basemetals:block/quartz_door_lower", + "top": "basemetals:block/quartz_door_upper" + }, + "elements": [ + { + "from": [ + 0, + 0, + 0 + ], + "to": [ + 3, + 16, + 16 + ], + "faces": { + "down": { + "uv": [ + 16, + 13, + 0, + 16 + ], + "texture": "#bottom", + "cullface": "down", + "rotation": 90 + }, + "north": { + "uv": [ + 3, + 0, + 0, + 16 + ], + "texture": "#bottom", + "cullface": "north" + }, + "south": { + "uv": [ + 0, + 0, + 3, + 16 + ], + "texture": "#bottom", + "cullface": "south" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#bottom", + "cullface": "west" + }, + "east": { + "uv": [ + 16, + 0, + 0, + 16 + ], + "texture": "#bottom" + } + } + } + ] +} diff --git a/src/main/resources/assets/basemetals/models/block/quartz_door_iron_door_bottom_left_open.json b/src/main/resources/assets/basemetals/models/block/quartz_door_iron_door_bottom_left_open.json new file mode 100644 index 000000000..6215704f1 --- /dev/null +++ b/src/main/resources/assets/basemetals/models/block/quartz_door_iron_door_bottom_left_open.json @@ -0,0 +1,74 @@ +{ + "parent": "minecraft:block/iron_door_bottom_left_open", + "textures": { + "particle": "minecraft:block/quartz_block_side", + "bottom": "basemetals:block/quartz_door_lower", + "top": "basemetals:block/quartz_door_upper" + }, + "elements": [ + { + "from": [ + 0, + 0, + 0 + ], + "to": [ + 3, + 16, + 16 + ], + "faces": { + "down": { + "uv": [ + 0, + 16, + 16, + 13 + ], + "texture": "#bottom", + "cullface": "down", + "rotation": 90 + }, + "north": { + "uv": [ + 0, + 0, + 3, + 16 + ], + "texture": "#bottom", + "cullface": "north" + }, + "south": { + "uv": [ + 0, + 0, + 3, + 16 + ], + "texture": "#bottom", + "cullface": "south" + }, + "west": { + "uv": [ + 16, + 0, + 0, + 16 + ], + "texture": "#bottom", + "cullface": "west" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#bottom" + } + } + } + ] +} diff --git a/src/main/resources/assets/basemetals/models/block/quartz_door_iron_door_bottom_right.json b/src/main/resources/assets/basemetals/models/block/quartz_door_iron_door_bottom_right.json new file mode 100644 index 000000000..a6b617fce --- /dev/null +++ b/src/main/resources/assets/basemetals/models/block/quartz_door_iron_door_bottom_right.json @@ -0,0 +1,74 @@ +{ + "parent": "minecraft:block/iron_door_bottom_right", + "textures": { + "particle": "minecraft:block/quartz_block_side", + "bottom": "basemetals:block/quartz_door_lower", + "top": "basemetals:block/quartz_door_upper" + }, + "elements": [ + { + "from": [ + 0, + 0, + 0 + ], + "to": [ + 3, + 16, + 16 + ], + "faces": { + "down": { + "uv": [ + 0, + 13, + 16, + 16 + ], + "texture": "#bottom", + "cullface": "down", + "rotation": 90 + }, + "north": { + "uv": [ + 3, + 0, + 0, + 16 + ], + "texture": "#bottom", + "cullface": "north" + }, + "south": { + "uv": [ + 0, + 0, + 3, + 16 + ], + "texture": "#bottom", + "cullface": "south" + }, + "west": { + "uv": [ + 16, + 0, + 0, + 16 + ], + "texture": "#bottom", + "cullface": "west" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#bottom" + } + } + } + ] +} diff --git a/src/main/resources/assets/basemetals/models/block/quartz_door_iron_door_bottom_right_open.json b/src/main/resources/assets/basemetals/models/block/quartz_door_iron_door_bottom_right_open.json new file mode 100644 index 000000000..da3b55838 --- /dev/null +++ b/src/main/resources/assets/basemetals/models/block/quartz_door_iron_door_bottom_right_open.json @@ -0,0 +1,74 @@ +{ + "parent": "minecraft:block/iron_door_bottom_right_open", + "textures": { + "particle": "minecraft:block/quartz_block_side", + "bottom": "basemetals:block/quartz_door_lower", + "top": "basemetals:block/quartz_door_upper" + }, + "elements": [ + { + "from": [ + 0, + 0, + 0 + ], + "to": [ + 3, + 16, + 16 + ], + "faces": { + "down": { + "uv": [ + 16, + 16, + 0, + 13 + ], + "texture": "#bottom", + "cullface": "down", + "rotation": 90 + }, + "north": { + "uv": [ + 3, + 0, + 0, + 16 + ], + "texture": "#bottom", + "cullface": "north" + }, + "south": { + "uv": [ + 3, + 0, + 0, + 16 + ], + "texture": "#bottom", + "cullface": "south" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#bottom", + "cullface": "west" + }, + "east": { + "uv": [ + 16, + 0, + 0, + 16 + ], + "texture": "#bottom" + } + } + } + ] +} diff --git a/src/main/resources/assets/basemetals/models/block/quartz_door_iron_door_top_left.json b/src/main/resources/assets/basemetals/models/block/quartz_door_iron_door_top_left.json new file mode 100644 index 000000000..964213879 --- /dev/null +++ b/src/main/resources/assets/basemetals/models/block/quartz_door_iron_door_top_left.json @@ -0,0 +1,74 @@ +{ + "parent": "minecraft:block/iron_door_top_left", + "textures": { + "particle": "minecraft:block/quartz_block_side", + "bottom": "basemetals:block/quartz_door_lower", + "top": "basemetals:block/quartz_door_upper" + }, + "elements": [ + { + "from": [ + 0, + 0, + 0 + ], + "to": [ + 3, + 16, + 16 + ], + "faces": { + "up": { + "uv": [ + 0, + 3, + 16, + 0 + ], + "texture": "#top", + "cullface": "up", + "rotation": 90 + }, + "north": { + "uv": [ + 3, + 0, + 0, + 16 + ], + "texture": "#top", + "cullface": "north" + }, + "south": { + "uv": [ + 0, + 0, + 3, + 16 + ], + "texture": "#top", + "cullface": "south" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#top", + "cullface": "west" + }, + "east": { + "uv": [ + 16, + 0, + 0, + 16 + ], + "texture": "#top" + } + } + } + ] +} diff --git a/src/main/resources/assets/basemetals/models/block/quartz_door_iron_door_top_left_open.json b/src/main/resources/assets/basemetals/models/block/quartz_door_iron_door_top_left_open.json new file mode 100644 index 000000000..e52779605 --- /dev/null +++ b/src/main/resources/assets/basemetals/models/block/quartz_door_iron_door_top_left_open.json @@ -0,0 +1,74 @@ +{ + "parent": "minecraft:block/iron_door_top_left_open", + "textures": { + "particle": "minecraft:block/quartz_block_side", + "bottom": "basemetals:block/quartz_door_lower", + "top": "basemetals:block/quartz_door_upper" + }, + "elements": [ + { + "from": [ + 0, + 0, + 0 + ], + "to": [ + 3, + 16, + 16 + ], + "faces": { + "up": { + "uv": [ + 0, + 3, + 16, + 0 + ], + "texture": "#top", + "cullface": "up", + "rotation": 270 + }, + "north": { + "uv": [ + 0, + 0, + 3, + 16 + ], + "texture": "#top", + "cullface": "north" + }, + "south": { + "uv": [ + 0, + 0, + 3, + 16 + ], + "texture": "#top", + "cullface": "south" + }, + "west": { + "uv": [ + 16, + 0, + 0, + 16 + ], + "texture": "#top", + "cullface": "west" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#top" + } + } + } + ] +} diff --git a/src/main/resources/assets/basemetals/models/block/quartz_door_iron_door_top_right.json b/src/main/resources/assets/basemetals/models/block/quartz_door_iron_door_top_right.json new file mode 100644 index 000000000..f242a303d --- /dev/null +++ b/src/main/resources/assets/basemetals/models/block/quartz_door_iron_door_top_right.json @@ -0,0 +1,74 @@ +{ + "parent": "minecraft:block/iron_door_top_right", + "textures": { + "particle": "minecraft:block/quartz_block_side", + "bottom": "basemetals:block/quartz_door_lower", + "top": "basemetals:block/quartz_door_upper" + }, + "elements": [ + { + "from": [ + 0, + 0, + 0 + ], + "to": [ + 3, + 16, + 16 + ], + "faces": { + "up": { + "uv": [ + 0, + 0, + 16, + 3 + ], + "texture": "#top", + "cullface": "up", + "rotation": 270 + }, + "north": { + "uv": [ + 3, + 0, + 0, + 16 + ], + "texture": "#top", + "cullface": "north" + }, + "south": { + "uv": [ + 0, + 0, + 3, + 16 + ], + "texture": "#top", + "cullface": "south" + }, + "west": { + "uv": [ + 16, + 0, + 0, + 16 + ], + "texture": "#top", + "cullface": "west" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#top" + } + } + } + ] +} diff --git a/src/main/resources/assets/basemetals/models/block/quartz_door_iron_door_top_right_open.json b/src/main/resources/assets/basemetals/models/block/quartz_door_iron_door_top_right_open.json new file mode 100644 index 000000000..0a25f1abf --- /dev/null +++ b/src/main/resources/assets/basemetals/models/block/quartz_door_iron_door_top_right_open.json @@ -0,0 +1,74 @@ +{ + "parent": "minecraft:block/iron_door_top_right_open", + "textures": { + "particle": "minecraft:block/quartz_block_side", + "bottom": "basemetals:block/quartz_door_lower", + "top": "basemetals:block/quartz_door_upper" + }, + "elements": [ + { + "from": [ + 0, + 0, + 0 + ], + "to": [ + 3, + 16, + 16 + ], + "faces": { + "up": { + "uv": [ + 0, + 0, + 16, + 3 + ], + "texture": "#top", + "cullface": "up", + "rotation": 90 + }, + "north": { + "uv": [ + 3, + 0, + 0, + 16 + ], + "texture": "#top", + "cullface": "north" + }, + "south": { + "uv": [ + 3, + 0, + 0, + 16 + ], + "texture": "#top", + "cullface": "south" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#top", + "cullface": "west" + }, + "east": { + "uv": [ + 16, + 0, + 0, + 16 + ], + "texture": "#top" + } + } + } + ] +} diff --git a/src/main/resources/assets/basemetals/models/block/quartz_door_top.json b/src/main/resources/assets/basemetals/models/block/quartz_door_top.json deleted file mode 100644 index 3d259da27..000000000 --- a/src/main/resources/assets/basemetals/models/block/quartz_door_top.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/door_top_left", - "textures": { - "bottom": "basemetals:block/quartz_door_lower", - "top": "basemetals:block/quartz_door_upper" - } -} diff --git a/src/main/resources/assets/basemetals/models/block/quartz_door_top_rh.json b/src/main/resources/assets/basemetals/models/block/quartz_door_top_rh.json deleted file mode 100644 index aafd2efad..000000000 --- a/src/main/resources/assets/basemetals/models/block/quartz_door_top_rh.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/door_top_right", - "textures": { - "bottom": "basemetals:block/quartz_door_lower", - "top": "basemetals:block/quartz_door_upper" - } -} diff --git a/src/main/resources/assets/basemetals/models/block/quartz_lever.json b/src/main/resources/assets/basemetals/models/block/quartz_lever.json deleted file mode 100644 index c80d0d05b..000000000 --- a/src/main/resources/assets/basemetals/models/block/quartz_lever.json +++ /dev/null @@ -1,33 +0,0 @@ -{ - "ambientocclusion": false, - "textures": { - "particle": "minecraft:block/quartz_block_side", - "base": "minecraft:block/quartz_block_side", - "lever": "minecraft:block/lever" - }, - "elements": [ - { "from": [ 5, 0, 4 ], - "to": [ 11, 3, 12 ], - "faces": { - "down": { "uv": [ 5, 4, 11, 12 ], "texture": "#base" }, - "up": { "uv": [ 5, 4, 11, 12 ], "texture": "#base" }, - "north": { "uv": [ 5, 0, 11, 3 ], "texture": "#base" }, - "south": { "uv": [ 5, 0, 11, 3 ], "texture": "#base" }, - "west": { "uv": [ 4, 0, 12, 3 ], "texture": "#base" }, - "east": { "uv": [ 4, 0, 12, 3 ], "texture": "#base" } - } - }, - { "from": [ 7, 1, 7 ], - "to": [ 9, 11, 9 ], - "rotation": { "origin": [ 8, 1, 8 ], "axis": "x", "angle": -45 }, - "faces": { - "down": { "uv": [ 7, 6, 9, 8 ], "texture": "#lever" }, - "up": { "uv": [ 7, 6, 9, 8 ], "texture": "#lever" }, - "north": { "uv": [ 7, 6, 9, 16 ], "texture": "#lever" }, - "south": { "uv": [ 7, 6, 9, 16 ], "texture": "#lever" }, - "west": { "uv": [ 7, 6, 9, 16 ], "texture": "#lever" }, - "east": { "uv": [ 7, 6, 9, 16 ], "texture": "#lever" } - } - } - ] -} diff --git a/src/main/resources/assets/basemetals/models/block/quartz_lever_lever.json b/src/main/resources/assets/basemetals/models/block/quartz_lever_lever.json new file mode 100644 index 000000000..1dd40e9b9 --- /dev/null +++ b/src/main/resources/assets/basemetals/models/block/quartz_lever_lever.json @@ -0,0 +1,147 @@ +{ + "parent": "minecraft:block/lever", + "textures": { + "particle": "minecraft:block/quartz_block_side", + "base": "minecraft:block/quartz_block_side", + "lever": "block/lever" + }, + "elements": [ + { + "from": [ + 5, + -0.02, + 4 + ], + "to": [ + 11, + 2.98, + 12 + ], + "faces": { + "down": { + "uv": [ + 5, + 4, + 11, + 12 + ], + "texture": "#base", + "cullface": "down" + }, + "up": { + "uv": [ + 5, + 4, + 11, + 12 + ], + "texture": "#base" + }, + "north": { + "uv": [ + 5, + 0, + 11, + 3 + ], + "texture": "#base" + }, + "south": { + "uv": [ + 5, + 0, + 11, + 3 + ], + "texture": "#base" + }, + "west": { + "uv": [ + 4, + 0, + 12, + 3 + ], + "texture": "#base" + }, + "east": { + "uv": [ + 4, + 0, + 12, + 3 + ], + "texture": "#base" + } + } + }, + { + "from": [ + 7, + 1, + 7 + ], + "to": [ + 9, + 11, + 9 + ], + "rotation": { + "origin": [ + 8, + 1, + 8 + ], + "axis": "x", + "angle": -45 + }, + "faces": { + "up": { + "uv": [ + 7, + 6, + 9, + 8 + ], + "texture": "#lever" + }, + "north": { + "uv": [ + 7, + 6, + 9, + 16 + ], + "texture": "#lever" + }, + "south": { + "uv": [ + 7, + 6, + 9, + 16 + ], + "texture": "#lever" + }, + "west": { + "uv": [ + 7, + 6, + 9, + 16 + ], + "texture": "#lever" + }, + "east": { + "uv": [ + 7, + 6, + 9, + 16 + ], + "texture": "#lever" + } + } + } + ] +} diff --git a/src/main/resources/assets/basemetals/models/block/quartz_lever_lever_on.json b/src/main/resources/assets/basemetals/models/block/quartz_lever_lever_on.json new file mode 100644 index 000000000..732b967bb --- /dev/null +++ b/src/main/resources/assets/basemetals/models/block/quartz_lever_lever_on.json @@ -0,0 +1,147 @@ +{ + "parent": "minecraft:block/lever_on", + "textures": { + "particle": "minecraft:block/quartz_block_side", + "base": "minecraft:block/quartz_block_side", + "lever": "block/lever" + }, + "elements": [ + { + "from": [ + 5, + -0.02, + 4 + ], + "to": [ + 11, + 2.98, + 12 + ], + "faces": { + "down": { + "uv": [ + 5, + 4, + 11, + 12 + ], + "texture": "#base", + "cullface": "down" + }, + "up": { + "uv": [ + 5, + 4, + 11, + 12 + ], + "texture": "#base" + }, + "north": { + "uv": [ + 5, + 0, + 11, + 3 + ], + "texture": "#base" + }, + "south": { + "uv": [ + 5, + 0, + 11, + 3 + ], + "texture": "#base" + }, + "west": { + "uv": [ + 4, + 0, + 12, + 3 + ], + "texture": "#base" + }, + "east": { + "uv": [ + 4, + 0, + 12, + 3 + ], + "texture": "#base" + } + } + }, + { + "from": [ + 7, + 1, + 7 + ], + "to": [ + 9, + 11, + 9 + ], + "rotation": { + "origin": [ + 8, + 1, + 8 + ], + "axis": "x", + "angle": 45 + }, + "faces": { + "up": { + "uv": [ + 7, + 6, + 9, + 8 + ], + "texture": "#lever" + }, + "north": { + "uv": [ + 7, + 6, + 9, + 16 + ], + "texture": "#lever" + }, + "south": { + "uv": [ + 7, + 6, + 9, + 16 + ], + "texture": "#lever" + }, + "west": { + "uv": [ + 7, + 6, + 9, + 16 + ], + "texture": "#lever" + }, + "east": { + "uv": [ + 7, + 6, + 9, + 16 + ], + "texture": "#lever" + } + } + } + ] +} diff --git a/src/main/resources/assets/basemetals/models/block/quartz_lever_off.json b/src/main/resources/assets/basemetals/models/block/quartz_lever_off.json deleted file mode 100644 index a8029fa80..000000000 --- a/src/main/resources/assets/basemetals/models/block/quartz_lever_off.json +++ /dev/null @@ -1,33 +0,0 @@ -{ - "ambientocclusion": false, - "textures": { - "particle": "minecraft:block/quartz_block_side", - "base": "minecraft:block/quartz_block_side", - "lever": "minecraft:block/lever" - }, - "elements": [ - { "from": [ 5, 0, 4 ], - "to": [ 11, 3, 12 ], - "faces": { - "down": { "uv": [ 5, 4, 11, 12 ], "texture": "#base" }, - "up": { "uv": [ 5, 4, 11, 12 ], "texture": "#base" }, - "north": { "uv": [ 5, 0, 11, 3 ], "texture": "#base" }, - "south": { "uv": [ 5, 0, 11, 3 ], "texture": "#base" }, - "west": { "uv": [ 4, 0, 12, 3 ], "texture": "#base" }, - "east": { "uv": [ 4, 0, 12, 3 ], "texture": "#base" } - } - }, - { "from": [ 7, 1, 7 ], - "to": [ 9, 11, 9 ], - "rotation": { "origin": [ 8, 1, 8 ], "axis": "x", "angle": 45 }, - "faces": { - "down": { "uv": [ 7, 6, 9, 8 ], "texture": "#lever" }, - "up": { "uv": [ 7, 6, 9, 8 ], "texture": "#lever" }, - "north": { "uv": [ 7, 6, 9, 16 ], "texture": "#lever" }, - "south": { "uv": [ 7, 6, 9, 16 ], "texture": "#lever" }, - "west": { "uv": [ 7, 6, 9, 16 ], "texture": "#lever" }, - "east": { "uv": [ 7, 6, 9, 16 ], "texture": "#lever" } - } - } - ] -} diff --git a/src/main/resources/assets/basemetals/models/block/quartz_pressure_plate_down.json b/src/main/resources/assets/basemetals/models/block/quartz_pressure_plate_down.json deleted file mode 100644 index 81b9cd6f8..000000000 --- a/src/main/resources/assets/basemetals/models/block/quartz_pressure_plate_down.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/pressure_plate_down", - "textures": { - "texture": "minecraft:block/quartz_block_side" - } -} diff --git a/src/main/resources/assets/basemetals/models/block/quartz_pressure_plate_polished_blackstone_pressure_plate.json b/src/main/resources/assets/basemetals/models/block/quartz_pressure_plate_polished_blackstone_pressure_plate.json new file mode 100644 index 000000000..cbfee77d3 --- /dev/null +++ b/src/main/resources/assets/basemetals/models/block/quartz_pressure_plate_polished_blackstone_pressure_plate.json @@ -0,0 +1,78 @@ +{ + "parent": "minecraft:block/polished_blackstone_pressure_plate", + "textures": { + "particle": "minecraft:block/quartz_block_side", + "texture": "minecraft:block/quartz_block_side" + }, + "elements": [ + { + "from": [ + 1, + 0, + 1 + ], + "to": [ + 15, + 1, + 15 + ], + "faces": { + "down": { + "uv": [ + 1, + 1, + 15, + 15 + ], + "texture": "#texture", + "cullface": "down" + }, + "up": { + "uv": [ + 1, + 1, + 15, + 15 + ], + "texture": "#texture" + }, + "north": { + "uv": [ + 1, + 15, + 15, + 16 + ], + "texture": "#texture" + }, + "south": { + "uv": [ + 1, + 15, + 15, + 16 + ], + "texture": "#texture" + }, + "west": { + "uv": [ + 1, + 15, + 15, + 16 + ], + "texture": "#texture" + }, + "east": { + "uv": [ + 1, + 15, + 15, + 16 + ], + "texture": "#texture" + } + } + } + ] +} diff --git a/src/main/resources/assets/basemetals/models/block/quartz_pressure_plate_polished_blackstone_pressure_plate_down.json b/src/main/resources/assets/basemetals/models/block/quartz_pressure_plate_polished_blackstone_pressure_plate_down.json new file mode 100644 index 000000000..398e9d8df --- /dev/null +++ b/src/main/resources/assets/basemetals/models/block/quartz_pressure_plate_polished_blackstone_pressure_plate_down.json @@ -0,0 +1,78 @@ +{ + "parent": "minecraft:block/polished_blackstone_pressure_plate_down", + "textures": { + "particle": "minecraft:block/quartz_block_side", + "texture": "minecraft:block/quartz_block_side" + }, + "elements": [ + { + "from": [ + 1, + 0, + 1 + ], + "to": [ + 15, + 0.5, + 15 + ], + "faces": { + "down": { + "uv": [ + 1, + 1, + 15, + 15 + ], + "texture": "#texture", + "cullface": "down" + }, + "up": { + "uv": [ + 1, + 1, + 15, + 15 + ], + "texture": "#texture" + }, + "north": { + "uv": [ + 1, + 15, + 15, + 15.5 + ], + "texture": "#texture" + }, + "south": { + "uv": [ + 1, + 15, + 15, + 15.5 + ], + "texture": "#texture" + }, + "west": { + "uv": [ + 1, + 15, + 15, + 15.5 + ], + "texture": "#texture" + }, + "east": { + "uv": [ + 1, + 15, + 15, + 15.5 + ], + "texture": "#texture" + } + } + } + ] +} diff --git a/src/main/resources/assets/basemetals/models/block/quartz_pressure_plate_up.json b/src/main/resources/assets/basemetals/models/block/quartz_pressure_plate_up.json index 57e9eb493..6dda1dc4e 100644 --- a/src/main/resources/assets/basemetals/models/block/quartz_pressure_plate_up.json +++ b/src/main/resources/assets/basemetals/models/block/quartz_pressure_plate_up.json @@ -1,6 +1,6 @@ { - "parent": "block/pressure_plate_up", - "textures": { - "texture": "minecraft:block/quartz_block_side" - } + "parent": "block/pressure_plate_up", + "textures": { + "texture": "minecraft:block/quartz_block_side" + } } diff --git a/src/main/resources/assets/basemetals/models/block/quartz_trapdoor_bottom.json b/src/main/resources/assets/basemetals/models/block/quartz_trapdoor_bottom.json index 8c67b4f5c..55014d66c 100644 --- a/src/main/resources/assets/basemetals/models/block/quartz_trapdoor_bottom.json +++ b/src/main/resources/assets/basemetals/models/block/quartz_trapdoor_bottom.json @@ -1,6 +1,6 @@ { - "parent": "minecraft:block/template_orientable_trapdoor_bottom", - "textures": { - "texture": "basemetals:block/quartz_trapdoor" - } + "parent": "minecraft:block/template_orientable_trapdoor_bottom", + "textures": { + "texture": "basemetals:block/quartz_trapdoor" + } } diff --git a/src/main/resources/assets/basemetals/models/block/quartz_trapdoor_iron_trapdoor_bottom.json b/src/main/resources/assets/basemetals/models/block/quartz_trapdoor_iron_trapdoor_bottom.json new file mode 100644 index 000000000..0d75560f7 --- /dev/null +++ b/src/main/resources/assets/basemetals/models/block/quartz_trapdoor_iron_trapdoor_bottom.json @@ -0,0 +1,82 @@ +{ + "parent": "minecraft:block/iron_trapdoor_bottom", + "textures": { + "particle": "minecraft:block/quartz_block_side", + "texture": "basemetals:block/quartz_trapdoor" + }, + "elements": [ + { + "from": [ + 0, + 0, + 0 + ], + "to": [ + 16, + 3, + 16 + ], + "faces": { + "down": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#texture", + "cullface": "down" + }, + "up": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#texture" + }, + "north": { + "uv": [ + 0, + 16, + 16, + 13 + ], + "texture": "#texture", + "cullface": "north" + }, + "south": { + "uv": [ + 0, + 16, + 16, + 13 + ], + "texture": "#texture", + "cullface": "south" + }, + "west": { + "uv": [ + 0, + 16, + 16, + 13 + ], + "texture": "#texture", + "cullface": "west" + }, + "east": { + "uv": [ + 0, + 16, + 16, + 13 + ], + "texture": "#texture", + "cullface": "east" + } + } + } + ] +} diff --git a/src/main/resources/assets/basemetals/models/block/quartz_trapdoor_iron_trapdoor_open.json b/src/main/resources/assets/basemetals/models/block/quartz_trapdoor_iron_trapdoor_open.json new file mode 100644 index 000000000..3655e56b7 --- /dev/null +++ b/src/main/resources/assets/basemetals/models/block/quartz_trapdoor_iron_trapdoor_open.json @@ -0,0 +1,82 @@ +{ + "parent": "minecraft:block/iron_trapdoor_open", + "textures": { + "particle": "minecraft:block/quartz_block_side", + "texture": "basemetals:block/quartz_trapdoor" + }, + "elements": [ + { + "from": [ + 0, + 0, + 13 + ], + "to": [ + 16, + 16, + 16 + ], + "faces": { + "down": { + "uv": [ + 0, + 13, + 16, + 16 + ], + "texture": "#texture", + "cullface": "down" + }, + "up": { + "uv": [ + 0, + 16, + 16, + 13 + ], + "texture": "#texture", + "cullface": "up" + }, + "north": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#texture" + }, + "south": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#texture", + "cullface": "south" + }, + "west": { + "uv": [ + 16, + 0, + 13, + 16 + ], + "texture": "#texture", + "cullface": "west" + }, + "east": { + "uv": [ + 13, + 0, + 16, + 16 + ], + "texture": "#texture", + "cullface": "east" + } + } + } + ] +} diff --git a/src/main/resources/assets/basemetals/models/block/quartz_trapdoor_iron_trapdoor_top.json b/src/main/resources/assets/basemetals/models/block/quartz_trapdoor_iron_trapdoor_top.json new file mode 100644 index 000000000..f1ca375bc --- /dev/null +++ b/src/main/resources/assets/basemetals/models/block/quartz_trapdoor_iron_trapdoor_top.json @@ -0,0 +1,82 @@ +{ + "parent": "minecraft:block/iron_trapdoor_top", + "textures": { + "particle": "minecraft:block/quartz_block_side", + "texture": "basemetals:block/quartz_trapdoor" + }, + "elements": [ + { + "from": [ + 0, + 13, + 0 + ], + "to": [ + 16, + 16, + 16 + ], + "faces": { + "down": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#texture" + }, + "up": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#texture", + "cullface": "up" + }, + "north": { + "uv": [ + 0, + 16, + 16, + 13 + ], + "texture": "#texture", + "cullface": "north" + }, + "south": { + "uv": [ + 0, + 16, + 16, + 13 + ], + "texture": "#texture", + "cullface": "south" + }, + "west": { + "uv": [ + 0, + 16, + 16, + 13 + ], + "texture": "#texture", + "cullface": "west" + }, + "east": { + "uv": [ + 0, + 16, + 16, + 13 + ], + "texture": "#texture", + "cullface": "east" + } + } + } + ] +} diff --git a/src/main/resources/assets/basemetals/models/block/quartz_trapdoor_open.json b/src/main/resources/assets/basemetals/models/block/quartz_trapdoor_open.json deleted file mode 100644 index d80cf469b..000000000 --- a/src/main/resources/assets/basemetals/models/block/quartz_trapdoor_open.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/template_orientable_trapdoor_open", - "textures": { - "texture": "basemetals:block/quartz_trapdoor" - } -} diff --git a/src/main/resources/assets/basemetals/models/block/quartz_trapdoor_top.json b/src/main/resources/assets/basemetals/models/block/quartz_trapdoor_top.json deleted file mode 100644 index 7f06e6265..000000000 --- a/src/main/resources/assets/basemetals/models/block/quartz_trapdoor_top.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/template_orientable_trapdoor_top", - "textures": { - "texture": "basemetals:block/quartz_trapdoor" - } -} diff --git a/src/main/resources/assets/basemetals/models/block/quartz_wall_cobblestone_wall_post.json b/src/main/resources/assets/basemetals/models/block/quartz_wall_cobblestone_wall_post.json new file mode 100644 index 000000000..0f541c807 --- /dev/null +++ b/src/main/resources/assets/basemetals/models/block/quartz_wall_cobblestone_wall_post.json @@ -0,0 +1,44 @@ +{ + "parent": "minecraft:block/cobblestone_wall_post", + "textures": { + "particle": "minecraft:block/quartz_block_side", + "wall": "minecraft:block/quartz_block_side" + }, + "elements": [ + { + "from": [ + 4, + 0, + 4 + ], + "to": [ + 12, + 16, + 12 + ], + "faces": { + "down": { + "texture": "#wall", + "cullface": "down" + }, + "up": { + "texture": "#wall", + "cullface": "up" + }, + "north": { + "texture": "#wall" + }, + "south": { + "texture": "#wall" + }, + "west": { + "texture": "#wall" + }, + "east": { + "texture": "#wall" + } + }, + "__comment": "Center post" + } + ] +} diff --git a/src/main/resources/assets/basemetals/models/block/quartz_wall_cobblestone_wall_side.json b/src/main/resources/assets/basemetals/models/block/quartz_wall_cobblestone_wall_side.json new file mode 100644 index 000000000..983ec6114 --- /dev/null +++ b/src/main/resources/assets/basemetals/models/block/quartz_wall_cobblestone_wall_side.json @@ -0,0 +1,41 @@ +{ + "parent": "minecraft:block/cobblestone_wall_side", + "textures": { + "particle": "minecraft:block/quartz_block_side", + "wall": "minecraft:block/quartz_block_side" + }, + "elements": [ + { + "from": [ + 5, + 0, + 0 + ], + "to": [ + 11, + 14, + 8 + ], + "faces": { + "down": { + "texture": "#wall", + "cullface": "down" + }, + "up": { + "texture": "#wall" + }, + "north": { + "texture": "#wall", + "cullface": "north" + }, + "west": { + "texture": "#wall" + }, + "east": { + "texture": "#wall" + } + }, + "__comment": "wall" + } + ] +} diff --git a/src/main/resources/assets/basemetals/models/block/quartz_wall_cobblestone_wall_side_tall.json b/src/main/resources/assets/basemetals/models/block/quartz_wall_cobblestone_wall_side_tall.json new file mode 100644 index 000000000..68094d229 --- /dev/null +++ b/src/main/resources/assets/basemetals/models/block/quartz_wall_cobblestone_wall_side_tall.json @@ -0,0 +1,41 @@ +{ + "parent": "minecraft:block/cobblestone_wall_side_tall", + "textures": { + "particle": "minecraft:block/quartz_block_side", + "wall": "minecraft:block/quartz_block_side" + }, + "elements": [ + { + "from": [ + 5, + 0, + 0 + ], + "to": [ + 11, + 16, + 8 + ], + "faces": { + "down": { + "texture": "#wall", + "cullface": "down" + }, + "up": { + "texture": "#wall", + "cullface": "up" + }, + "north": { + "texture": "#wall", + "cullface": "north" + }, + "west": { + "texture": "#wall" + }, + "east": { + "texture": "#wall" + } + } + } + ] +} diff --git a/src/main/resources/assets/basemetals/models/block/quartz_wall_inventory.json b/src/main/resources/assets/basemetals/models/block/quartz_wall_inventory.json index a9e5910c8..37b52b0d3 100644 --- a/src/main/resources/assets/basemetals/models/block/quartz_wall_inventory.json +++ b/src/main/resources/assets/basemetals/models/block/quartz_wall_inventory.json @@ -1,6 +1,6 @@ { - "parent": "block/wall_inventory", - "textures": { - "wall": "minecraft:block/quartz_block_side" - } + "parent": "block/wall_inventory", + "textures": { + "wall": "minecraft:block/quartz_block_side" + } } diff --git a/src/main/resources/assets/basemetals/models/block/quartz_wall_post.json b/src/main/resources/assets/basemetals/models/block/quartz_wall_post.json deleted file mode 100644 index 07c202bdf..000000000 --- a/src/main/resources/assets/basemetals/models/block/quartz_wall_post.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/template_wall_post", - "textures": { - "wall": "minecraft:block/quartz_block_side" - } -} diff --git a/src/main/resources/assets/basemetals/models/block/quartz_wall_side.json b/src/main/resources/assets/basemetals/models/block/quartz_wall_side.json deleted file mode 100644 index da7c0aa04..000000000 --- a/src/main/resources/assets/basemetals/models/block/quartz_wall_side.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/template_wall_side", - "textures": { - "wall": "minecraft:block/quartz_block_side" - } -} diff --git a/src/main/resources/assets/basemetals/models/block/upper_slab_diamond.json b/src/main/resources/assets/basemetals/models/block/upper_slab_diamond.json deleted file mode 100644 index 8ee9c5ccb..000000000 --- a/src/main/resources/assets/basemetals/models/block/upper_slab_diamond.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/slab_top", - "textures": { - "bottom": "minecraft:block/diamond_block", - "top": "minecraft:block/diamond_block", - "side": "minecraft:block/diamond_block" - } -} diff --git a/src/main/resources/assets/basemetals/models/block/upper_slab_emerald.json b/src/main/resources/assets/basemetals/models/block/upper_slab_emerald.json deleted file mode 100644 index 11879bf4a..000000000 --- a/src/main/resources/assets/basemetals/models/block/upper_slab_emerald.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/slab_top", - "textures": { - "bottom": "minecraft:block/emerald_block", - "top": "minecraft:block/emerald_block", - "side": "minecraft:block/emerald_block" - } -} diff --git a/src/main/resources/assets/basemetals/models/block/upper_slab_gold.json b/src/main/resources/assets/basemetals/models/block/upper_slab_gold.json deleted file mode 100644 index 728505a09..000000000 --- a/src/main/resources/assets/basemetals/models/block/upper_slab_gold.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/slab_top", - "textures": { - "bottom": "minecraft:block/gold_block", - "top": "minecraft:block/gold_block", - "side": "minecraft:block/gold_block" - } -} diff --git a/src/main/resources/assets/basemetals/models/block/upper_slab_iron.json b/src/main/resources/assets/basemetals/models/block/upper_slab_iron.json deleted file mode 100644 index c22293e59..000000000 --- a/src/main/resources/assets/basemetals/models/block/upper_slab_iron.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/slab_top", - "textures": { - "bottom": "minecraft:block/iron_block", - "top": "minecraft:block/iron_block", - "side": "minecraft:block/iron_block" - } -} diff --git a/src/main/resources/assets/basemetals/models/block/upper_slab_obsidian.json b/src/main/resources/assets/basemetals/models/block/upper_slab_obsidian.json deleted file mode 100644 index d0de7135f..000000000 --- a/src/main/resources/assets/basemetals/models/block/upper_slab_obsidian.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/slab_top", - "textures": { - "bottom": "minecraft:block/obsidian", - "top": "minecraft:block/obsidian", - "side": "minecraft:block/obsidian" - } -} diff --git a/src/main/resources/assets/basemetals/models/item/charcoal_block.json b/src/main/resources/assets/basemetals/models/item/charcoal_block.json index 2956aebc0..f8c719dde 100644 --- a/src/main/resources/assets/basemetals/models/item/charcoal_block.json +++ b/src/main/resources/assets/basemetals/models/item/charcoal_block.json @@ -1,3 +1,3 @@ { - "parent": "basemetals:block/charcoal_block" + "parent": "basemetals:block/charcoal_block" } diff --git a/src/main/resources/assets/basemetals/models/item/charcoal_nugget.json b/src/main/resources/assets/basemetals/models/item/charcoal_nugget.json index e15a3f948..6059f8371 100644 --- a/src/main/resources/assets/basemetals/models/item/charcoal_nugget.json +++ b/src/main/resources/assets/basemetals/models/item/charcoal_nugget.json @@ -1,6 +1,6 @@ { "parent": "item/generated", - "textures": { - "layer0": "basemetals:item/charcoal_nugget" - } -} \ No newline at end of file + "textures": { + "layer0": "basemetals:item/charcoal_nugget" + } +} diff --git a/src/main/resources/assets/basemetals/models/item/charcoal_powder.json b/src/main/resources/assets/basemetals/models/item/charcoal_powder.json index ac54cd958..04ec1ee7f 100644 --- a/src/main/resources/assets/basemetals/models/item/charcoal_powder.json +++ b/src/main/resources/assets/basemetals/models/item/charcoal_powder.json @@ -1,6 +1,6 @@ { "parent": "item/generated", - "textures": { - "layer0": "basemetals:item/carbon_powder" - } -} \ No newline at end of file + "textures": { + "layer0": "basemetals:item/carbon_dust" + } +} diff --git a/src/main/resources/assets/basemetals/models/item/charcoal_smallpowder.json b/src/main/resources/assets/basemetals/models/item/charcoal_smallpowder.json index cb989709d..5c9200696 100644 --- a/src/main/resources/assets/basemetals/models/item/charcoal_smallpowder.json +++ b/src/main/resources/assets/basemetals/models/item/charcoal_smallpowder.json @@ -1,6 +1,6 @@ { "parent": "item/generated", - "textures": { - "layer0": "basemetals:item/coal_smallpowder" - } + "textures": { + "layer0": "basemetals:item/coal_smallpowder" + } } diff --git a/src/main/resources/assets/basemetals/models/item/coal_nugget.json b/src/main/resources/assets/basemetals/models/item/coal_nugget.json index 296ea1304..6c1c8f5a9 100644 --- a/src/main/resources/assets/basemetals/models/item/coal_nugget.json +++ b/src/main/resources/assets/basemetals/models/item/coal_nugget.json @@ -1,6 +1,6 @@ { "parent": "item/generated", - "textures": { - "layer0": "basemetals:item/coal_nugget" - } -} \ No newline at end of file + "textures": { + "layer0": "basemetals:item/coal_nugget" + } +} diff --git a/src/main/resources/assets/basemetals/models/item/coal_powder.json b/src/main/resources/assets/basemetals/models/item/coal_powder.json index ac54cd958..04ec1ee7f 100644 --- a/src/main/resources/assets/basemetals/models/item/coal_powder.json +++ b/src/main/resources/assets/basemetals/models/item/coal_powder.json @@ -1,6 +1,6 @@ { "parent": "item/generated", - "textures": { - "layer0": "basemetals:item/carbon_powder" - } -} \ No newline at end of file + "textures": { + "layer0": "basemetals:item/carbon_dust" + } +} diff --git a/src/main/resources/assets/basemetals/models/item/coal_smallpowder.json b/src/main/resources/assets/basemetals/models/item/coal_smallpowder.json index cb989709d..5c9200696 100644 --- a/src/main/resources/assets/basemetals/models/item/coal_smallpowder.json +++ b/src/main/resources/assets/basemetals/models/item/coal_smallpowder.json @@ -1,6 +1,6 @@ { "parent": "item/generated", - "textures": { - "layer0": "basemetals:item/coal_smallpowder" - } + "textures": { + "layer0": "basemetals:item/coal_smallpowder" + } } diff --git a/src/main/resources/assets/basemetals/models/item/diamond_arrow.json b/src/main/resources/assets/basemetals/models/item/diamond_arrow.json index dac74e520..b444e3ef2 100644 --- a/src/main/resources/assets/basemetals/models/item/diamond_arrow.json +++ b/src/main/resources/assets/basemetals/models/item/diamond_arrow.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", - "textures": { - "layer0": "basemetals:item/diamond_arrow" - } + "parent": "item/generated", + "textures": { + "layer0": "basemetals:item/diamond_arrow" + } } diff --git a/src/main/resources/assets/basemetals/models/item/diamond_bars.json b/src/main/resources/assets/basemetals/models/item/diamond_bars.json index 49614032e..973a74737 100644 --- a/src/main/resources/assets/basemetals/models/item/diamond_bars.json +++ b/src/main/resources/assets/basemetals/models/item/diamond_bars.json @@ -1,6 +1,6 @@ { "parent": "item/generated", - "textures": { - "layer0": "basemetals:block/diamond_bars" - } + "textures": { + "layer0": "basemetals:block/diamond_bars" + } } diff --git a/src/generated/resources/assets/basemetals/models/item/diamond_blend.json b/src/main/resources/assets/basemetals/models/item/diamond_blend.json similarity index 98% rename from src/generated/resources/assets/basemetals/models/item/diamond_blend.json rename to src/main/resources/assets/basemetals/models/item/diamond_blend.json index 699ef47ee..d9baf07ee 100644 --- a/src/generated/resources/assets/basemetals/models/item/diamond_blend.json +++ b/src/main/resources/assets/basemetals/models/item/diamond_blend.json @@ -3,4 +3,4 @@ "textures": { "layer0": "basemetals:item/diamond_powder" } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/basemetals/models/item/diamond_bolt.json b/src/main/resources/assets/basemetals/models/item/diamond_bolt.json index 3294f54a7..ada05d605 100644 --- a/src/main/resources/assets/basemetals/models/item/diamond_bolt.json +++ b/src/main/resources/assets/basemetals/models/item/diamond_bolt.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", - "textures": { - "layer0": "basemetals:item/diamond_bolt" - } + "parent": "item/generated", + "textures": { + "layer0": "basemetals:item/diamond_bolt" + } } diff --git a/src/main/resources/assets/basemetals/models/item/diamond_bow.json b/src/main/resources/assets/basemetals/models/item/diamond_bow.json index d3470e82a..78cdd23b8 100644 --- a/src/main/resources/assets/basemetals/models/item/diamond_bow.json +++ b/src/main/resources/assets/basemetals/models/item/diamond_bow.json @@ -1,28 +1,28 @@ { - "parent": "item/bow", - "textures": { - "layer0": "basemetals:item/diamond_bow_standby" + "parent": "item/bow", + "textures": { + "layer0": "basemetals:item/diamond_bow_standby" + }, + "overrides": [ + { + "predicate": { + "pulling": 1 + }, + "model": "basemetals:item/diamond_bow_pulling_0" }, - "overrides": [ - { - "predicate": { - "pulling": 1 - }, - "model": "basemetals:item/diamond_bow_pulling_0" - }, - { - "predicate": { - "pulling": 1, - "pull": 0.65 - }, - "model": "basemetals:item/diamond_bow_pulling_1" - }, - { - "predicate": { - "pulling": 1, - "pull": 0.9 - }, - "model": "basemetals:item/diamond_bow_pulling_2" - } - ] + { + "predicate": { + "pulling": 1, + "pull": 0.65 + }, + "model": "basemetals:item/diamond_bow_pulling_1" + }, + { + "predicate": { + "pulling": 1, + "pull": 0.9 + }, + "model": "basemetals:item/diamond_bow_pulling_2" + } + ] } diff --git a/src/main/resources/assets/basemetals/models/item/diamond_bow_pulling_0.json b/src/main/resources/assets/basemetals/models/item/diamond_bow_pulling_0.json index 881616364..6965146fa 100644 --- a/src/main/resources/assets/basemetals/models/item/diamond_bow_pulling_0.json +++ b/src/main/resources/assets/basemetals/models/item/diamond_bow_pulling_0.json @@ -1,6 +1,6 @@ { - "parent": "basemetals:item/diamond_bow", - "textures": { - "layer0": "basemetals:item/diamond_bow_pulling_0" - } + "parent": "basemetals:item/diamond_bow", + "textures": { + "layer0": "basemetals:item/diamond_bow_pulling_0" + } } diff --git a/src/main/resources/assets/basemetals/models/item/diamond_bow_pulling_1.json b/src/main/resources/assets/basemetals/models/item/diamond_bow_pulling_1.json index fc45ed932..9f7373717 100644 --- a/src/main/resources/assets/basemetals/models/item/diamond_bow_pulling_1.json +++ b/src/main/resources/assets/basemetals/models/item/diamond_bow_pulling_1.json @@ -1,6 +1,6 @@ { - "parent": "basemetals:item/diamond_bow", - "textures": { - "layer0": "basemetals:item/diamond_bow_pulling_1" - } + "parent": "basemetals:item/diamond_bow", + "textures": { + "layer0": "basemetals:item/diamond_bow_pulling_1" + } } diff --git a/src/main/resources/assets/basemetals/models/item/diamond_bow_pulling_2.json b/src/main/resources/assets/basemetals/models/item/diamond_bow_pulling_2.json index 78c0de0d7..867813ec0 100644 --- a/src/main/resources/assets/basemetals/models/item/diamond_bow_pulling_2.json +++ b/src/main/resources/assets/basemetals/models/item/diamond_bow_pulling_2.json @@ -1,6 +1,6 @@ { - "parent": "basemetals:item/diamond_bow", - "textures": { - "layer0": "basemetals:item/diamond_bow_pulling_2" - } + "parent": "basemetals:item/diamond_bow", + "textures": { + "layer0": "basemetals:item/diamond_bow_pulling_2" + } } diff --git a/src/main/resources/assets/basemetals/models/item/diamond_button.json b/src/main/resources/assets/basemetals/models/item/diamond_button.json index 5daa03634..61d8e3ccd 100644 --- a/src/main/resources/assets/basemetals/models/item/diamond_button.json +++ b/src/main/resources/assets/basemetals/models/item/diamond_button.json @@ -1,3 +1,3 @@ { - "parent": "basemetals:block/diamond_button_inventory" + "parent": "basemetals:block/diamond_button_inventory" } diff --git a/src/main/resources/assets/basemetals/models/item/diamond_crackhammer.json b/src/main/resources/assets/basemetals/models/item/diamond_crackhammer.json index 7fbe07453..77b48bca8 100644 --- a/src/main/resources/assets/basemetals/models/item/diamond_crackhammer.json +++ b/src/main/resources/assets/basemetals/models/item/diamond_crackhammer.json @@ -1,6 +1,6 @@ { "parent": "item/handheld", - "textures": { - "layer0": "basemetals:item/diamond_crackhammer" - } + "textures": { + "layer0": "basemetals:item/diamond_crackhammer" + } } diff --git a/src/main/resources/assets/basemetals/models/item/diamond_crossbow.json b/src/main/resources/assets/basemetals/models/item/diamond_crossbow.json index ca0571817..db609aab9 100644 --- a/src/main/resources/assets/basemetals/models/item/diamond_crossbow.json +++ b/src/main/resources/assets/basemetals/models/item/diamond_crossbow.json @@ -1,28 +1,41 @@ { - "parent": "item/bow", - "textures": { - "layer0": "basemetals:item/diamond_crossbow_standby" + "parent": "minecraft:item/crossbow", + "textures": { + "layer0": "basemetals:item/diamond_crossbow_standby" + }, + "overrides": [ + { + "predicate": { + "pulling": 1 + }, + "model": "basemetals:item/diamond_crossbow_pulling_0" }, - "overrides": [ - { - "predicate": { - "pulling": 1 - }, - "model": "basemetals:item/diamond_crossbow_pulling_0" - }, - { - "predicate": { - "pulling": 1, - "pull": 0.65 - }, - "model": "basemetals:item/diamond_crossbow_pulling_1" - }, - { - "predicate": { - "pulling": 1, - "pull": 0.9 - }, - "model": "basemetals:item/diamond_crossbow_pulling_2" - } - ] + { + "predicate": { + "pulling": 1, + "pull": 0.65 + }, + "model": "basemetals:item/diamond_crossbow_pulling_1" + }, + { + "predicate": { + "pulling": 1, + "pull": 0.9 + }, + "model": "basemetals:item/diamond_crossbow_pulling_2" + }, + { + "predicate": { + "charged": 1 + }, + "model": "basemetals:item/diamond_crossbow_arrow" + }, + { + "predicate": { + "charged": 1, + "firework": 1 + }, + "model": "basemetals:item/diamond_crossbow_firework" + } + ] } diff --git a/src/main/resources/assets/basemetals/models/item/diamond_crossbow_arrow.json b/src/main/resources/assets/basemetals/models/item/diamond_crossbow_arrow.json new file mode 100644 index 000000000..cda992ed8 --- /dev/null +++ b/src/main/resources/assets/basemetals/models/item/diamond_crossbow_arrow.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/crossbow", + "textures": { + "layer0": "basemetals:item/diamond_crossbow_pulling_2" + } +} diff --git a/src/main/resources/assets/basemetals/models/item/diamond_crossbow_firework.json b/src/main/resources/assets/basemetals/models/item/diamond_crossbow_firework.json new file mode 100644 index 000000000..cda992ed8 --- /dev/null +++ b/src/main/resources/assets/basemetals/models/item/diamond_crossbow_firework.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/crossbow", + "textures": { + "layer0": "basemetals:item/diamond_crossbow_pulling_2" + } +} diff --git a/src/main/resources/assets/basemetals/models/item/diamond_crossbow_pulling_0.json b/src/main/resources/assets/basemetals/models/item/diamond_crossbow_pulling_0.json index b611b1b49..deb4be965 100644 --- a/src/main/resources/assets/basemetals/models/item/diamond_crossbow_pulling_0.json +++ b/src/main/resources/assets/basemetals/models/item/diamond_crossbow_pulling_0.json @@ -1,6 +1,6 @@ { - "parent": "basemetals:item/diamond_crossbow", - "textures": { - "layer0": "basemetals:item/diamond_crossbow_pulling_0" - } + "parent": "basemetals:item/diamond_crossbow", + "textures": { + "layer0": "basemetals:item/diamond_crossbow_pulling_0" + } } diff --git a/src/main/resources/assets/basemetals/models/item/diamond_crossbow_pulling_1.json b/src/main/resources/assets/basemetals/models/item/diamond_crossbow_pulling_1.json index f058d77c5..f15589e28 100644 --- a/src/main/resources/assets/basemetals/models/item/diamond_crossbow_pulling_1.json +++ b/src/main/resources/assets/basemetals/models/item/diamond_crossbow_pulling_1.json @@ -1,6 +1,6 @@ { - "parent": "basemetals:item/diamond_crossbow", - "textures": { - "layer0": "basemetals:item/diamond_crossbow_pulling_1" - } + "parent": "basemetals:item/diamond_crossbow", + "textures": { + "layer0": "basemetals:item/diamond_crossbow_pulling_1" + } } diff --git a/src/main/resources/assets/basemetals/models/item/diamond_crossbow_pulling_2.json b/src/main/resources/assets/basemetals/models/item/diamond_crossbow_pulling_2.json index 0bc1184d2..a96ddc735 100644 --- a/src/main/resources/assets/basemetals/models/item/diamond_crossbow_pulling_2.json +++ b/src/main/resources/assets/basemetals/models/item/diamond_crossbow_pulling_2.json @@ -1,6 +1,6 @@ { - "parent": "basemetals:item/diamond_crossbow", - "textures": { - "layer0": "basemetals:item/diamond_crossbow_pulling_2" - } + "parent": "basemetals:item/diamond_crossbow", + "textures": { + "layer0": "basemetals:item/diamond_crossbow_pulling_2" + } } diff --git a/src/main/resources/assets/basemetals/models/item/diamond_door.json b/src/main/resources/assets/basemetals/models/item/diamond_door.json index 33b018b8b..97098d8ba 100644 --- a/src/main/resources/assets/basemetals/models/item/diamond_door.json +++ b/src/main/resources/assets/basemetals/models/item/diamond_door.json @@ -1,7 +1,7 @@ { - "parent": "basemetals:item/door_item", - "textures": { - "bottom": "basemetals:block/diamond_door_lower", - "top": "basemetals:block/diamond_door_upper" - } + "parent": "basemetals:item/door_item", + "textures": { + "bottom": "basemetals:block/diamond_door_lower", + "top": "basemetals:block/diamond_door_upper" + } } diff --git a/src/main/resources/assets/basemetals/models/item/diamond_fishing_rod.json b/src/main/resources/assets/basemetals/models/item/diamond_fishing_rod.json index c91cd3296..1d0036542 100644 --- a/src/main/resources/assets/basemetals/models/item/diamond_fishing_rod.json +++ b/src/main/resources/assets/basemetals/models/item/diamond_fishing_rod.json @@ -1,14 +1,14 @@ { - "parent": "item/handheld_rod", - "textures": { - "layer0": "basemetals:item/diamond_fishing_rod_uncast" - }, - "overrides": [ - { - "predicate": { - "cast": 1 - }, - "model": "basemetals:item/diamond_fishing_rod_cast" - } - ] + "parent": "item/handheld_rod", + "textures": { + "layer0": "basemetals:item/diamond_fishing_rod_uncast" + }, + "overrides": [ + { + "predicate": { + "cast": 1 + }, + "model": "basemetals:item/diamond_fishing_rod_cast" + } + ] } diff --git a/src/main/resources/assets/basemetals/models/item/diamond_fishing_rod_cast.json b/src/main/resources/assets/basemetals/models/item/diamond_fishing_rod_cast.json index 7dd029b04..ec420e5c7 100644 --- a/src/main/resources/assets/basemetals/models/item/diamond_fishing_rod_cast.json +++ b/src/main/resources/assets/basemetals/models/item/diamond_fishing_rod_cast.json @@ -1,6 +1,6 @@ { - "parent": "item/fishing_rod", - "textures": { - "layer0": "basemetals:item/diamond_fishing_rod_cast" - } + "parent": "item/fishing_rod", + "textures": { + "layer0": "basemetals:item/diamond_fishing_rod_cast" + } } diff --git a/src/main/resources/assets/basemetals/models/item/diamond_gear.json b/src/main/resources/assets/basemetals/models/item/diamond_gear.json index 138f69923..0571d8ba1 100644 --- a/src/main/resources/assets/basemetals/models/item/diamond_gear.json +++ b/src/main/resources/assets/basemetals/models/item/diamond_gear.json @@ -1,6 +1,6 @@ { "parent": "item/generated", - "textures": { - "layer0": "basemetals:item/diamond_gear" - } + "textures": { + "layer0": "basemetals:item/diamond_gear" + } } diff --git a/src/main/resources/assets/basemetals/models/item/diamond_lever.json b/src/main/resources/assets/basemetals/models/item/diamond_lever.json index 48424b112..917be899f 100644 --- a/src/main/resources/assets/basemetals/models/item/diamond_lever.json +++ b/src/main/resources/assets/basemetals/models/item/diamond_lever.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", - "textures": { - "layer0": "minecraft:block/lever" - } + "parent": "item/generated", + "textures": { + "layer0": "minecraft:block/lever" + } } diff --git a/src/main/resources/assets/basemetals/models/item/diamond_nugget.json b/src/main/resources/assets/basemetals/models/item/diamond_nugget.json index c5c013138..416e5b44a 100644 --- a/src/main/resources/assets/basemetals/models/item/diamond_nugget.json +++ b/src/main/resources/assets/basemetals/models/item/diamond_nugget.json @@ -1,6 +1,6 @@ { "parent": "item/generated", - "textures": { - "layer0": "basemetals:item/diamond_nugget" - } + "textures": { + "layer0": "basemetals:item/diamond_nugget" + } } diff --git a/src/main/resources/assets/basemetals/models/item/diamond_powder.json b/src/main/resources/assets/basemetals/models/item/diamond_powder.json index 677eeac25..3a18dd8bf 100644 --- a/src/main/resources/assets/basemetals/models/item/diamond_powder.json +++ b/src/main/resources/assets/basemetals/models/item/diamond_powder.json @@ -1,6 +1,6 @@ { "parent": "item/generated", - "textures": { - "layer0": "basemetals:item/diamond_powder" - } + "textures": { + "layer0": "basemetals:item/diamond_powder" + } } diff --git a/src/main/resources/assets/basemetals/models/item/diamond_pressure_plate.json b/src/main/resources/assets/basemetals/models/item/diamond_pressure_plate.json index 4e447cda4..dc30195c3 100644 --- a/src/main/resources/assets/basemetals/models/item/diamond_pressure_plate.json +++ b/src/main/resources/assets/basemetals/models/item/diamond_pressure_plate.json @@ -1,3 +1,3 @@ { - "parent": "basemetals:block/diamond_pressure_plate_up" + "parent": "basemetals:block/diamond_pressure_plate_up" } diff --git a/src/main/resources/assets/basemetals/models/item/diamond_rod.json b/src/main/resources/assets/basemetals/models/item/diamond_rod.json index e7ea59876..8c2211359 100644 --- a/src/main/resources/assets/basemetals/models/item/diamond_rod.json +++ b/src/main/resources/assets/basemetals/models/item/diamond_rod.json @@ -1,6 +1,6 @@ { "parent": "item/generated", - "textures": { - "layer0": "basemetals:item/diamond_rod" - } + "textures": { + "layer0": "basemetals:item/diamond_rod" + } } diff --git a/src/main/resources/assets/basemetals/models/item/diamond_scythe.json b/src/main/resources/assets/basemetals/models/item/diamond_scythe.json index 61a9f1134..831782686 100644 --- a/src/main/resources/assets/basemetals/models/item/diamond_scythe.json +++ b/src/main/resources/assets/basemetals/models/item/diamond_scythe.json @@ -1,6 +1,6 @@ { "parent": "item/generated", - "textures": { - "layer0": "basemetals:item/diamond_scythe" - } + "textures": { + "layer0": "basemetals:item/diamond_scythe" + } } diff --git a/src/main/resources/assets/basemetals/models/item/diamond_shears.json b/src/main/resources/assets/basemetals/models/item/diamond_shears.json index ba4ece789..1401275c6 100644 --- a/src/main/resources/assets/basemetals/models/item/diamond_shears.json +++ b/src/main/resources/assets/basemetals/models/item/diamond_shears.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", - "textures": { - "layer0": "basemetals:item/diamond_shears" - } + "parent": "item/generated", + "textures": { + "layer0": "basemetals:item/diamond_shears" + } } diff --git a/src/main/resources/assets/basemetals/models/item/diamond_shield.json b/src/main/resources/assets/basemetals/models/item/diamond_shield.json index 1b402f2c5..0620075f1 100644 --- a/src/main/resources/assets/basemetals/models/item/diamond_shield.json +++ b/src/main/resources/assets/basemetals/models/item/diamond_shield.json @@ -3,12 +3,12 @@ "textures": { "shield": "minecraft:block/diamond_block" }, - "overrides": [ - { - "predicate": { - "blocking": 1 - }, - "model": "basemetals:item/diamond_shield_blocking" - } - ] -} \ No newline at end of file + "overrides": [ + { + "predicate": { + "blocking": 1 + }, + "model": "basemetals:item/diamond_shield_blocking" + } + ] +} diff --git a/src/main/resources/assets/basemetals/models/item/diamond_shield_blocking.json b/src/main/resources/assets/basemetals/models/item/diamond_shield_blocking.json index 0bfdf6e39..c8dd66cd6 100644 --- a/src/main/resources/assets/basemetals/models/item/diamond_shield_blocking.json +++ b/src/main/resources/assets/basemetals/models/item/diamond_shield_blocking.json @@ -2,5 +2,5 @@ "parent": "basemetals:item/shield_blocking", "textures": { "shield": "minecraft:block/diamond_block" - } -} \ No newline at end of file + } +} diff --git a/src/main/resources/assets/basemetals/models/item/diamond_slab.json b/src/main/resources/assets/basemetals/models/item/diamond_slab.json index c55a06506..a8a95205a 100644 --- a/src/main/resources/assets/basemetals/models/item/diamond_slab.json +++ b/src/main/resources/assets/basemetals/models/item/diamond_slab.json @@ -1,3 +1,3 @@ { - "parent": "basemetals:block/half_slab_diamond" + "parent": "basemetals:block/half_slab_diamond" } diff --git a/src/generated/resources/assets/basemetals/models/item/diamond_smallblend.json b/src/main/resources/assets/basemetals/models/item/diamond_smallblend.json similarity index 98% rename from src/generated/resources/assets/basemetals/models/item/diamond_smallblend.json rename to src/main/resources/assets/basemetals/models/item/diamond_smallblend.json index bb7cbb65b..cbebfc471 100644 --- a/src/generated/resources/assets/basemetals/models/item/diamond_smallblend.json +++ b/src/main/resources/assets/basemetals/models/item/diamond_smallblend.json @@ -3,4 +3,4 @@ "textures": { "layer0": "basemetals:item/diamond_smallpowder" } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/basemetals/models/item/diamond_smallpowder.json b/src/main/resources/assets/basemetals/models/item/diamond_smallpowder.json index d42230e65..803b3de85 100644 --- a/src/main/resources/assets/basemetals/models/item/diamond_smallpowder.json +++ b/src/main/resources/assets/basemetals/models/item/diamond_smallpowder.json @@ -1,6 +1,6 @@ { "parent": "item/generated", - "textures": { - "layer0": "basemetals:item/diamond_smallpowder" - } + "textures": { + "layer0": "basemetals:item/diamond_smallpowder" + } } diff --git a/src/main/resources/assets/basemetals/models/item/diamond_stairs.json b/src/main/resources/assets/basemetals/models/item/diamond_stairs.json index a14c50a2e..0c69c01dd 100644 --- a/src/main/resources/assets/basemetals/models/item/diamond_stairs.json +++ b/src/main/resources/assets/basemetals/models/item/diamond_stairs.json @@ -1,3 +1,3 @@ { - "parent": "basemetals:block/diamond_stairs" + "parent": "basemetals:block/diamond_stairs" } diff --git a/src/main/resources/assets/basemetals/models/item/diamond_trapdoor.json b/src/main/resources/assets/basemetals/models/item/diamond_trapdoor.json index fb5dc27d7..cfd6527d2 100644 --- a/src/main/resources/assets/basemetals/models/item/diamond_trapdoor.json +++ b/src/main/resources/assets/basemetals/models/item/diamond_trapdoor.json @@ -1,3 +1,3 @@ { - "parent": "basemetals:block/diamond_trapdoor_bottom" + "parent": "basemetals:block/diamond_trapdoor_bottom" } diff --git a/src/main/resources/assets/basemetals/models/item/diamond_wall.json b/src/main/resources/assets/basemetals/models/item/diamond_wall.json index 4e59a4e62..9f3ed2c09 100644 --- a/src/main/resources/assets/basemetals/models/item/diamond_wall.json +++ b/src/main/resources/assets/basemetals/models/item/diamond_wall.json @@ -1,3 +1,3 @@ { - "parent": "basemetals:block/diamond_wall_inventory" + "parent": "basemetals:block/diamond_wall_inventory" } diff --git a/src/main/resources/assets/basemetals/models/item/emerald_arrow.json b/src/main/resources/assets/basemetals/models/item/emerald_arrow.json index a036e2018..657ed6d80 100644 --- a/src/main/resources/assets/basemetals/models/item/emerald_arrow.json +++ b/src/main/resources/assets/basemetals/models/item/emerald_arrow.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", - "textures": { - "layer0": "basemetals:item/emerald_arrow" - } + "parent": "item/generated", + "textures": { + "layer0": "basemetals:item/emerald_arrow" + } } diff --git a/src/main/resources/assets/basemetals/models/item/emerald_axe.json b/src/main/resources/assets/basemetals/models/item/emerald_axe.json index e05011dc4..b90ab9cb1 100644 --- a/src/main/resources/assets/basemetals/models/item/emerald_axe.json +++ b/src/main/resources/assets/basemetals/models/item/emerald_axe.json @@ -1,6 +1,6 @@ { "parent": "item/handheld", - "textures": { - "layer0": "basemetals:item/emerald_axe" - } + "textures": { + "layer0": "basemetals:item/emerald_axe" + } } diff --git a/src/main/resources/assets/basemetals/models/item/emerald_bars.json b/src/main/resources/assets/basemetals/models/item/emerald_bars.json index 8c5ee380b..91e263c5d 100644 --- a/src/main/resources/assets/basemetals/models/item/emerald_bars.json +++ b/src/main/resources/assets/basemetals/models/item/emerald_bars.json @@ -1,6 +1,6 @@ { "parent": "item/generated", - "textures": { - "layer0": "basemetals:block/emerald_bars" - } + "textures": { + "layer0": "basemetals:block/emerald_bars" + } } diff --git a/src/main/resources/assets/basemetals/models/item/emerald_bolt.json b/src/main/resources/assets/basemetals/models/item/emerald_bolt.json index 4705f8172..d4fedd395 100644 --- a/src/main/resources/assets/basemetals/models/item/emerald_bolt.json +++ b/src/main/resources/assets/basemetals/models/item/emerald_bolt.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", - "textures": { - "layer0": "basemetals:item/emerald_bolt" - } + "parent": "item/generated", + "textures": { + "layer0": "basemetals:item/emerald_bolt" + } } diff --git a/src/main/resources/assets/basemetals/models/item/emerald_boots.json b/src/main/resources/assets/basemetals/models/item/emerald_boots.json index cfad70e27..7681a5d7d 100644 --- a/src/main/resources/assets/basemetals/models/item/emerald_boots.json +++ b/src/main/resources/assets/basemetals/models/item/emerald_boots.json @@ -1,6 +1,6 @@ { "parent": "item/generated", - "textures": { - "layer0": "basemetals:item/emerald_boots" - } + "textures": { + "layer0": "basemetals:item/emerald_boots" + } } diff --git a/src/main/resources/assets/basemetals/models/item/emerald_bow.json b/src/main/resources/assets/basemetals/models/item/emerald_bow.json index a882f28ca..c2c6fff42 100644 --- a/src/main/resources/assets/basemetals/models/item/emerald_bow.json +++ b/src/main/resources/assets/basemetals/models/item/emerald_bow.json @@ -1,28 +1,28 @@ { - "parent": "item/bow", - "textures": { - "layer0": "basemetals:item/emerald_bow_standby" + "parent": "item/bow", + "textures": { + "layer0": "basemetals:item/emerald_bow_standby" + }, + "overrides": [ + { + "predicate": { + "pulling": 1 + }, + "model": "basemetals:item/emerald_bow_pulling_0" }, - "overrides": [ - { - "predicate": { - "pulling": 1 - }, - "model": "basemetals:item/emerald_bow_pulling_0" - }, - { - "predicate": { - "pulling": 1, - "pull": 0.65 - }, - "model": "basemetals:item/emerald_bow_pulling_1" - }, - { - "predicate": { - "pulling": 1, - "pull": 0.9 - }, - "model": "basemetals:item/emerald_bow_pulling_2" - } - ] + { + "predicate": { + "pulling": 1, + "pull": 0.65 + }, + "model": "basemetals:item/emerald_bow_pulling_1" + }, + { + "predicate": { + "pulling": 1, + "pull": 0.9 + }, + "model": "basemetals:item/emerald_bow_pulling_2" + } + ] } diff --git a/src/main/resources/assets/basemetals/models/item/emerald_bow_pulling_0.json b/src/main/resources/assets/basemetals/models/item/emerald_bow_pulling_0.json index 4fad8f844..364d3a295 100644 --- a/src/main/resources/assets/basemetals/models/item/emerald_bow_pulling_0.json +++ b/src/main/resources/assets/basemetals/models/item/emerald_bow_pulling_0.json @@ -1,6 +1,6 @@ { - "parent": "basemetals:item/emerald_bow", - "textures": { - "layer0": "basemetals:item/emerald_bow_pulling_0" - } + "parent": "basemetals:item/emerald_bow", + "textures": { + "layer0": "basemetals:item/emerald_bow_pulling_0" + } } diff --git a/src/main/resources/assets/basemetals/models/item/emerald_bow_pulling_1.json b/src/main/resources/assets/basemetals/models/item/emerald_bow_pulling_1.json index b928eaf78..a8e5da6e9 100644 --- a/src/main/resources/assets/basemetals/models/item/emerald_bow_pulling_1.json +++ b/src/main/resources/assets/basemetals/models/item/emerald_bow_pulling_1.json @@ -1,6 +1,6 @@ { - "parent": "basemetals:item/emerald_bow", - "textures": { - "layer0": "basemetals:item/emerald_bow_pulling_1" - } + "parent": "basemetals:item/emerald_bow", + "textures": { + "layer0": "basemetals:item/emerald_bow_pulling_1" + } } diff --git a/src/main/resources/assets/basemetals/models/item/emerald_bow_pulling_2.json b/src/main/resources/assets/basemetals/models/item/emerald_bow_pulling_2.json index d7b06ed6d..0226a28ab 100644 --- a/src/main/resources/assets/basemetals/models/item/emerald_bow_pulling_2.json +++ b/src/main/resources/assets/basemetals/models/item/emerald_bow_pulling_2.json @@ -1,6 +1,6 @@ { - "parent": "basemetals:item/emerald_bow", - "textures": { - "layer0": "basemetals:item/emerald_bow_pulling_2" - } + "parent": "basemetals:item/emerald_bow", + "textures": { + "layer0": "basemetals:item/emerald_bow_pulling_2" + } } diff --git a/src/main/resources/assets/basemetals/models/item/emerald_button.json b/src/main/resources/assets/basemetals/models/item/emerald_button.json index ff3e07526..aa3819582 100644 --- a/src/main/resources/assets/basemetals/models/item/emerald_button.json +++ b/src/main/resources/assets/basemetals/models/item/emerald_button.json @@ -1,3 +1,3 @@ { - "parent": "basemetals:block/emerald_button_inventory" + "parent": "basemetals:block/emerald_button_inventory" } diff --git a/src/main/resources/assets/basemetals/models/item/emerald_chestplate.json b/src/main/resources/assets/basemetals/models/item/emerald_chestplate.json index f2f08fdc0..aaf909a09 100644 --- a/src/main/resources/assets/basemetals/models/item/emerald_chestplate.json +++ b/src/main/resources/assets/basemetals/models/item/emerald_chestplate.json @@ -1,6 +1,6 @@ { "parent": "item/generated", - "textures": { - "layer0": "basemetals:item/emerald_chestplate" - } + "textures": { + "layer0": "basemetals:item/emerald_chestplate" + } } diff --git a/src/main/resources/assets/basemetals/models/item/emerald_crackhammer.json b/src/main/resources/assets/basemetals/models/item/emerald_crackhammer.json index bf3c21718..d53a3ba00 100644 --- a/src/main/resources/assets/basemetals/models/item/emerald_crackhammer.json +++ b/src/main/resources/assets/basemetals/models/item/emerald_crackhammer.json @@ -1,6 +1,6 @@ { "parent": "item/handheld", - "textures": { - "layer0": "basemetals:item/emerald_crackhammer" - } + "textures": { + "layer0": "basemetals:item/emerald_crackhammer" + } } diff --git a/src/main/resources/assets/basemetals/models/item/emerald_crossbow.json b/src/main/resources/assets/basemetals/models/item/emerald_crossbow.json index 446e6ec73..6b50a089a 100644 --- a/src/main/resources/assets/basemetals/models/item/emerald_crossbow.json +++ b/src/main/resources/assets/basemetals/models/item/emerald_crossbow.json @@ -1,28 +1,41 @@ { - "parent": "item/bow", - "textures": { - "layer0": "basemetals:item/emerald_crossbow_standby" + "parent": "minecraft:item/crossbow", + "textures": { + "layer0": "basemetals:item/emerald_crossbow_standby" + }, + "overrides": [ + { + "predicate": { + "pulling": 1 + }, + "model": "basemetals:item/emerald_crossbow_pulling_0" }, - "overrides": [ - { - "predicate": { - "pulling": 1 - }, - "model": "basemetals:item/emerald_crossbow_pulling_0" - }, - { - "predicate": { - "pulling": 1, - "pull": 0.65 - }, - "model": "basemetals:item/emerald_crossbow_pulling_1" - }, - { - "predicate": { - "pulling": 1, - "pull": 0.9 - }, - "model": "basemetals:item/emerald_crossbow_pulling_2" - } - ] + { + "predicate": { + "pulling": 1, + "pull": 0.65 + }, + "model": "basemetals:item/emerald_crossbow_pulling_1" + }, + { + "predicate": { + "pulling": 1, + "pull": 0.9 + }, + "model": "basemetals:item/emerald_crossbow_pulling_2" + }, + { + "predicate": { + "charged": 1 + }, + "model": "basemetals:item/emerald_crossbow_arrow" + }, + { + "predicate": { + "charged": 1, + "firework": 1 + }, + "model": "basemetals:item/emerald_crossbow_firework" + } + ] } diff --git a/src/main/resources/assets/basemetals/models/item/emerald_crossbow_arrow.json b/src/main/resources/assets/basemetals/models/item/emerald_crossbow_arrow.json new file mode 100644 index 000000000..7097e9230 --- /dev/null +++ b/src/main/resources/assets/basemetals/models/item/emerald_crossbow_arrow.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/crossbow", + "textures": { + "layer0": "basemetals:item/emerald_crossbow_pulling_2" + } +} diff --git a/src/main/resources/assets/basemetals/models/item/emerald_crossbow_firework.json b/src/main/resources/assets/basemetals/models/item/emerald_crossbow_firework.json new file mode 100644 index 000000000..7097e9230 --- /dev/null +++ b/src/main/resources/assets/basemetals/models/item/emerald_crossbow_firework.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/crossbow", + "textures": { + "layer0": "basemetals:item/emerald_crossbow_pulling_2" + } +} diff --git a/src/main/resources/assets/basemetals/models/item/emerald_crossbow_pulling_0.json b/src/main/resources/assets/basemetals/models/item/emerald_crossbow_pulling_0.json index fcb0739f5..be1728c84 100644 --- a/src/main/resources/assets/basemetals/models/item/emerald_crossbow_pulling_0.json +++ b/src/main/resources/assets/basemetals/models/item/emerald_crossbow_pulling_0.json @@ -1,6 +1,6 @@ { - "parent": "basemetals:item/emerald_crossbow", - "textures": { - "layer0": "basemetals:item/emerald_crossbow_pulling_0" - } + "parent": "basemetals:item/emerald_crossbow", + "textures": { + "layer0": "basemetals:item/emerald_crossbow_pulling_0" + } } diff --git a/src/main/resources/assets/basemetals/models/item/emerald_crossbow_pulling_1.json b/src/main/resources/assets/basemetals/models/item/emerald_crossbow_pulling_1.json index 283c6523b..686928d42 100644 --- a/src/main/resources/assets/basemetals/models/item/emerald_crossbow_pulling_1.json +++ b/src/main/resources/assets/basemetals/models/item/emerald_crossbow_pulling_1.json @@ -1,6 +1,6 @@ { - "parent": "basemetals:item/emerald_crossbow", - "textures": { - "layer0": "basemetals:item/emerald_crossbow_pulling_1" - } + "parent": "basemetals:item/emerald_crossbow", + "textures": { + "layer0": "basemetals:item/emerald_crossbow_pulling_1" + } } diff --git a/src/main/resources/assets/basemetals/models/item/emerald_crossbow_pulling_2.json b/src/main/resources/assets/basemetals/models/item/emerald_crossbow_pulling_2.json index 257b042cc..6ec32efc3 100644 --- a/src/main/resources/assets/basemetals/models/item/emerald_crossbow_pulling_2.json +++ b/src/main/resources/assets/basemetals/models/item/emerald_crossbow_pulling_2.json @@ -1,6 +1,6 @@ { - "parent": "basemetals:item/emerald_crossbow", - "textures": { - "layer0": "basemetals:item/emerald_crossbow_pulling_2" - } + "parent": "basemetals:item/emerald_crossbow", + "textures": { + "layer0": "basemetals:item/emerald_crossbow_pulling_2" + } } diff --git a/src/main/resources/assets/basemetals/models/item/emerald_door.json b/src/main/resources/assets/basemetals/models/item/emerald_door.json index ece836f39..053010e31 100644 --- a/src/main/resources/assets/basemetals/models/item/emerald_door.json +++ b/src/main/resources/assets/basemetals/models/item/emerald_door.json @@ -1,7 +1,7 @@ { - "parent": "basemetals:item/door_item", - "textures": { - "bottom": "basemetals:block/emerald_door_lower", - "top": "basemetals:block/emerald_door_upper" - } + "parent": "basemetals:item/door_item", + "textures": { + "bottom": "basemetals:block/emerald_door_lower", + "top": "basemetals:block/emerald_door_upper" + } } diff --git a/src/main/resources/assets/basemetals/models/item/emerald_fishing_rod.json b/src/main/resources/assets/basemetals/models/item/emerald_fishing_rod.json index cdffb7363..529858375 100644 --- a/src/main/resources/assets/basemetals/models/item/emerald_fishing_rod.json +++ b/src/main/resources/assets/basemetals/models/item/emerald_fishing_rod.json @@ -1,14 +1,14 @@ { - "parent": "item/handheld_rod", - "textures": { - "layer0": "basemetals:item/emerald_fishing_rod_uncast" - }, - "overrides": [ - { - "predicate": { - "cast": 1 - }, - "model": "basemetals:item/emerald_fishing_rod_cast" - } - ] + "parent": "item/handheld_rod", + "textures": { + "layer0": "basemetals:item/emerald_fishing_rod_uncast" + }, + "overrides": [ + { + "predicate": { + "cast": 1 + }, + "model": "basemetals:item/emerald_fishing_rod_cast" + } + ] } diff --git a/src/main/resources/assets/basemetals/models/item/emerald_fishing_rod_cast.json b/src/main/resources/assets/basemetals/models/item/emerald_fishing_rod_cast.json index 128d477be..b629bfcda 100644 --- a/src/main/resources/assets/basemetals/models/item/emerald_fishing_rod_cast.json +++ b/src/main/resources/assets/basemetals/models/item/emerald_fishing_rod_cast.json @@ -1,6 +1,6 @@ { - "parent": "item/fishing_rod", - "textures": { - "layer0": "basemetals:item/emerald_fishing_rod_cast" - } + "parent": "item/fishing_rod", + "textures": { + "layer0": "basemetals:item/emerald_fishing_rod_cast" + } } diff --git a/src/main/resources/assets/basemetals/models/item/emerald_gear.json b/src/main/resources/assets/basemetals/models/item/emerald_gear.json index 255def359..3bf380b3b 100644 --- a/src/main/resources/assets/basemetals/models/item/emerald_gear.json +++ b/src/main/resources/assets/basemetals/models/item/emerald_gear.json @@ -1,6 +1,6 @@ { "parent": "item/generated", - "textures": { - "layer0": "basemetals:item/emerald_gear" - } + "textures": { + "layer0": "basemetals:item/emerald_gear" + } } diff --git a/src/main/resources/assets/basemetals/models/item/emerald_helmet.json b/src/main/resources/assets/basemetals/models/item/emerald_helmet.json index 5c21418f6..d16a1bb73 100644 --- a/src/main/resources/assets/basemetals/models/item/emerald_helmet.json +++ b/src/main/resources/assets/basemetals/models/item/emerald_helmet.json @@ -1,6 +1,6 @@ { "parent": "item/generated", - "textures": { - "layer0": "basemetals:item/emerald_helmet" - } + "textures": { + "layer0": "basemetals:item/emerald_helmet" + } } diff --git a/src/main/resources/assets/basemetals/models/item/emerald_hoe.json b/src/main/resources/assets/basemetals/models/item/emerald_hoe.json index 6f319acd3..0a99cb78e 100644 --- a/src/main/resources/assets/basemetals/models/item/emerald_hoe.json +++ b/src/main/resources/assets/basemetals/models/item/emerald_hoe.json @@ -1,6 +1,6 @@ { "parent": "item/handheld", - "textures": { - "layer0": "basemetals:item/emerald_hoe" - } + "textures": { + "layer0": "basemetals:item/emerald_hoe" + } } diff --git a/src/main/resources/assets/basemetals/models/item/emerald_horse_armor.json b/src/main/resources/assets/basemetals/models/item/emerald_horse_armor.json index b14e8b16e..7bcefdc9f 100644 --- a/src/main/resources/assets/basemetals/models/item/emerald_horse_armor.json +++ b/src/main/resources/assets/basemetals/models/item/emerald_horse_armor.json @@ -1,6 +1,6 @@ { "parent": "item/generated", - "textures": { - "layer0": "basemetals:item/emerald_horse_armor" - } + "textures": { + "layer0": "basemetals:item/emerald_horse_armor" + } } diff --git a/src/main/resources/assets/basemetals/models/item/emerald_leggings.json b/src/main/resources/assets/basemetals/models/item/emerald_leggings.json index 4b603a624..5ea752008 100644 --- a/src/main/resources/assets/basemetals/models/item/emerald_leggings.json +++ b/src/main/resources/assets/basemetals/models/item/emerald_leggings.json @@ -1,6 +1,6 @@ { "parent": "item/generated", - "textures": { - "layer0": "basemetals:item/emerald_leggings" - } + "textures": { + "layer0": "basemetals:item/emerald_leggings" + } } diff --git a/src/main/resources/assets/basemetals/models/item/emerald_lever.json b/src/main/resources/assets/basemetals/models/item/emerald_lever.json index 48424b112..917be899f 100644 --- a/src/main/resources/assets/basemetals/models/item/emerald_lever.json +++ b/src/main/resources/assets/basemetals/models/item/emerald_lever.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", - "textures": { - "layer0": "minecraft:block/lever" - } + "parent": "item/generated", + "textures": { + "layer0": "minecraft:block/lever" + } } diff --git a/src/main/resources/assets/basemetals/models/item/emerald_nugget.json b/src/main/resources/assets/basemetals/models/item/emerald_nugget.json index f36bf1432..17f32fc6a 100644 --- a/src/main/resources/assets/basemetals/models/item/emerald_nugget.json +++ b/src/main/resources/assets/basemetals/models/item/emerald_nugget.json @@ -1,6 +1,6 @@ { "parent": "item/generated", - "textures": { - "layer0": "basemetals:item/emerald_nugget" - } + "textures": { + "layer0": "basemetals:item/emerald_nugget" + } } diff --git a/src/main/resources/assets/basemetals/models/item/emerald_pickaxe.json b/src/main/resources/assets/basemetals/models/item/emerald_pickaxe.json index 5e4d208e9..02227c750 100644 --- a/src/main/resources/assets/basemetals/models/item/emerald_pickaxe.json +++ b/src/main/resources/assets/basemetals/models/item/emerald_pickaxe.json @@ -1,6 +1,6 @@ { "parent": "item/handheld", - "textures": { - "layer0": "basemetals:item/emerald_pickaxe" - } + "textures": { + "layer0": "basemetals:item/emerald_pickaxe" + } } diff --git a/src/main/resources/assets/basemetals/models/item/emerald_powder.json b/src/main/resources/assets/basemetals/models/item/emerald_powder.json index 64c4fc0c8..81cfa865b 100644 --- a/src/main/resources/assets/basemetals/models/item/emerald_powder.json +++ b/src/main/resources/assets/basemetals/models/item/emerald_powder.json @@ -1,6 +1,6 @@ { "parent": "item/generated", - "textures": { - "layer0": "basemetals:item/emerald_powder" - } + "textures": { + "layer0": "basemetals:item/emerald_powder" + } } diff --git a/src/main/resources/assets/basemetals/models/item/emerald_pressure_plate.json b/src/main/resources/assets/basemetals/models/item/emerald_pressure_plate.json index 7e3b1c318..8cc39dac8 100644 --- a/src/main/resources/assets/basemetals/models/item/emerald_pressure_plate.json +++ b/src/main/resources/assets/basemetals/models/item/emerald_pressure_plate.json @@ -1,3 +1,3 @@ { - "parent": "basemetals:block/emerald_pressure_plate_up" + "parent": "basemetals:block/emerald_pressure_plate_up" } diff --git a/src/main/resources/assets/basemetals/models/item/emerald_rod.json b/src/main/resources/assets/basemetals/models/item/emerald_rod.json index d04441970..f1d1c42c5 100644 --- a/src/main/resources/assets/basemetals/models/item/emerald_rod.json +++ b/src/main/resources/assets/basemetals/models/item/emerald_rod.json @@ -1,6 +1,6 @@ { "parent": "item/generated", - "textures": { - "layer0": "basemetals:item/emerald_rod" - } + "textures": { + "layer0": "basemetals:item/emerald_rod" + } } diff --git a/src/main/resources/assets/basemetals/models/item/emerald_scythe.json b/src/main/resources/assets/basemetals/models/item/emerald_scythe.json index ec1547b24..5165724f8 100644 --- a/src/main/resources/assets/basemetals/models/item/emerald_scythe.json +++ b/src/main/resources/assets/basemetals/models/item/emerald_scythe.json @@ -1,6 +1,6 @@ { "parent": "item/generated", - "textures": { - "layer0": "basemetals:item/emerald_scythe" - } + "textures": { + "layer0": "basemetals:item/emerald_scythe" + } } diff --git a/src/main/resources/assets/basemetals/models/item/emerald_shears.json b/src/main/resources/assets/basemetals/models/item/emerald_shears.json index ea91e3ef6..9e924f3c8 100644 --- a/src/main/resources/assets/basemetals/models/item/emerald_shears.json +++ b/src/main/resources/assets/basemetals/models/item/emerald_shears.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", - "textures": { - "layer0": "basemetals:item/emerald_shears" - } + "parent": "item/generated", + "textures": { + "layer0": "basemetals:item/emerald_shears" + } } diff --git a/src/main/resources/assets/basemetals/models/item/emerald_shield.json b/src/main/resources/assets/basemetals/models/item/emerald_shield.json index 512079985..6d4e11399 100644 --- a/src/main/resources/assets/basemetals/models/item/emerald_shield.json +++ b/src/main/resources/assets/basemetals/models/item/emerald_shield.json @@ -3,12 +3,12 @@ "textures": { "shield": "minecraft:block/emerald_block" }, - "overrides": [ - { - "predicate": { - "blocking": 1 - }, - "model": "basemetals:item/emerald_shield_blocking" - } - ] + "overrides": [ + { + "predicate": { + "blocking": 1 + }, + "model": "basemetals:item/emerald_shield_blocking" + } + ] } diff --git a/src/main/resources/assets/basemetals/models/item/emerald_shield_blocking.json b/src/main/resources/assets/basemetals/models/item/emerald_shield_blocking.json index d9da38ba4..7ebd38a70 100644 --- a/src/main/resources/assets/basemetals/models/item/emerald_shield_blocking.json +++ b/src/main/resources/assets/basemetals/models/item/emerald_shield_blocking.json @@ -2,5 +2,5 @@ "parent": "basemetals:item/shield_blocking", "textures": { "shield": "minecraft:block/emerald_block" - } + } } diff --git a/src/main/resources/assets/basemetals/models/item/emerald_shovel.json b/src/main/resources/assets/basemetals/models/item/emerald_shovel.json index 3fe32ae25..45541c642 100644 --- a/src/main/resources/assets/basemetals/models/item/emerald_shovel.json +++ b/src/main/resources/assets/basemetals/models/item/emerald_shovel.json @@ -1,6 +1,6 @@ { "parent": "item/handheld", - "textures": { - "layer0": "basemetals:item/emerald_shovel" - } + "textures": { + "layer0": "basemetals:item/emerald_shovel" + } } diff --git a/src/main/resources/assets/basemetals/models/item/emerald_slab.json b/src/main/resources/assets/basemetals/models/item/emerald_slab.json index be3a04b44..234dea8a8 100644 --- a/src/main/resources/assets/basemetals/models/item/emerald_slab.json +++ b/src/main/resources/assets/basemetals/models/item/emerald_slab.json @@ -1,3 +1,3 @@ { - "parent": "basemetals:block/half_slab_emerald" + "parent": "basemetals:block/half_slab_emerald" } diff --git a/src/main/resources/assets/basemetals/models/item/emerald_smallpowder.json b/src/main/resources/assets/basemetals/models/item/emerald_smallpowder.json index 690276cd8..6bea28145 100644 --- a/src/main/resources/assets/basemetals/models/item/emerald_smallpowder.json +++ b/src/main/resources/assets/basemetals/models/item/emerald_smallpowder.json @@ -1,6 +1,6 @@ { "parent": "item/generated", - "textures": { - "layer0": "basemetals:item/emerald_smallpowder" - } + "textures": { + "layer0": "basemetals:item/emerald_smallpowder" + } } diff --git a/src/main/resources/assets/basemetals/models/item/emerald_stairs.json b/src/main/resources/assets/basemetals/models/item/emerald_stairs.json index 14f852e93..ae63235d1 100644 --- a/src/main/resources/assets/basemetals/models/item/emerald_stairs.json +++ b/src/main/resources/assets/basemetals/models/item/emerald_stairs.json @@ -1,3 +1,3 @@ { - "parent": "basemetals:block/emerald_stairs" + "parent": "basemetals:block/emerald_stairs" } diff --git a/src/main/resources/assets/basemetals/models/item/emerald_sword.json b/src/main/resources/assets/basemetals/models/item/emerald_sword.json index 739eef336..c111408ac 100644 --- a/src/main/resources/assets/basemetals/models/item/emerald_sword.json +++ b/src/main/resources/assets/basemetals/models/item/emerald_sword.json @@ -1,6 +1,6 @@ { "parent": "item/handheld", - "textures": { - "layer0": "basemetals:item/emerald_sword" - } + "textures": { + "layer0": "basemetals:item/emerald_sword" + } } diff --git a/src/main/resources/assets/basemetals/models/item/emerald_trapdoor.json b/src/main/resources/assets/basemetals/models/item/emerald_trapdoor.json index 8d5ca984a..3b7a3f382 100644 --- a/src/main/resources/assets/basemetals/models/item/emerald_trapdoor.json +++ b/src/main/resources/assets/basemetals/models/item/emerald_trapdoor.json @@ -1,3 +1,3 @@ { - "parent": "basemetals:block/emerald_trapdoor_bottom" + "parent": "basemetals:block/emerald_trapdoor_bottom" } diff --git a/src/main/resources/assets/basemetals/models/item/emerald_wall.json b/src/main/resources/assets/basemetals/models/item/emerald_wall.json index a32495ead..4886b0f05 100644 --- a/src/main/resources/assets/basemetals/models/item/emerald_wall.json +++ b/src/main/resources/assets/basemetals/models/item/emerald_wall.json @@ -1,3 +1,3 @@ { - "parent": "basemetals:block/emerald_wall_inventory" + "parent": "basemetals:block/emerald_wall_inventory" } diff --git a/src/main/resources/assets/basemetals/models/item/gold_arrow.json b/src/main/resources/assets/basemetals/models/item/gold_arrow.json index feafc2d8b..4e90111dc 100644 --- a/src/main/resources/assets/basemetals/models/item/gold_arrow.json +++ b/src/main/resources/assets/basemetals/models/item/gold_arrow.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", - "textures": { - "layer0": "basemetals:item/gold_arrow" - } + "parent": "item/generated", + "textures": { + "layer0": "basemetals:item/gold_arrow" + } } diff --git a/src/main/resources/assets/basemetals/models/item/gold_bars.json b/src/main/resources/assets/basemetals/models/item/gold_bars.json index e205a7fe2..b2832cab2 100644 --- a/src/main/resources/assets/basemetals/models/item/gold_bars.json +++ b/src/main/resources/assets/basemetals/models/item/gold_bars.json @@ -1,6 +1,6 @@ { "parent": "item/generated", - "textures": { - "layer0": "basemetals:block/gold_bars" - } + "textures": { + "layer0": "basemetals:block/gold_bars" + } } diff --git a/src/generated/resources/assets/basemetals/models/item/gold_blend.json b/src/main/resources/assets/basemetals/models/item/gold_blend.json similarity index 98% rename from src/generated/resources/assets/basemetals/models/item/gold_blend.json rename to src/main/resources/assets/basemetals/models/item/gold_blend.json index 403b7c92a..6e8276c62 100644 --- a/src/generated/resources/assets/basemetals/models/item/gold_blend.json +++ b/src/main/resources/assets/basemetals/models/item/gold_blend.json @@ -3,4 +3,4 @@ "textures": { "layer0": "basemetals:item/gold_powder" } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/basemetals/models/item/gold_bolt.json b/src/main/resources/assets/basemetals/models/item/gold_bolt.json index 06c26e1ae..cf13d34eb 100644 --- a/src/main/resources/assets/basemetals/models/item/gold_bolt.json +++ b/src/main/resources/assets/basemetals/models/item/gold_bolt.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", - "textures": { - "layer0": "basemetals:item/gold_bolt" - } + "parent": "item/generated", + "textures": { + "layer0": "basemetals:item/gold_bolt" + } } diff --git a/src/main/resources/assets/basemetals/models/item/gold_bow.json b/src/main/resources/assets/basemetals/models/item/gold_bow.json index 35d5bf29c..aba0f2758 100644 --- a/src/main/resources/assets/basemetals/models/item/gold_bow.json +++ b/src/main/resources/assets/basemetals/models/item/gold_bow.json @@ -1,28 +1,28 @@ { - "parent": "item/bow", - "textures": { - "layer0": "basemetals:item/gold_bow_standby" + "parent": "item/bow", + "textures": { + "layer0": "basemetals:item/gold_bow_standby" + }, + "overrides": [ + { + "predicate": { + "pulling": 1 + }, + "model": "basemetals:item/gold_bow_pulling_0" }, - "overrides": [ - { - "predicate": { - "pulling": 1 - }, - "model": "basemetals:item/gold_bow_pulling_0" - }, - { - "predicate": { - "pulling": 1, - "pull": 0.65 - }, - "model": "basemetals:item/gold_bow_pulling_1" - }, - { - "predicate": { - "pulling": 1, - "pull": 0.9 - }, - "model": "basemetals:item/gold_bow_pulling_2" - } - ] + { + "predicate": { + "pulling": 1, + "pull": 0.65 + }, + "model": "basemetals:item/gold_bow_pulling_1" + }, + { + "predicate": { + "pulling": 1, + "pull": 0.9 + }, + "model": "basemetals:item/gold_bow_pulling_2" + } + ] } diff --git a/src/main/resources/assets/basemetals/models/item/gold_bow_pulling_0.json b/src/main/resources/assets/basemetals/models/item/gold_bow_pulling_0.json index b86ce8ce1..71741dae5 100644 --- a/src/main/resources/assets/basemetals/models/item/gold_bow_pulling_0.json +++ b/src/main/resources/assets/basemetals/models/item/gold_bow_pulling_0.json @@ -1,6 +1,6 @@ { - "parent": "basemetals:item/gold_bow", - "textures": { - "layer0": "basemetals:item/gold_bow_pulling_0" - } + "parent": "basemetals:item/gold_bow", + "textures": { + "layer0": "basemetals:item/gold_bow_pulling_0" + } } diff --git a/src/main/resources/assets/basemetals/models/item/gold_bow_pulling_1.json b/src/main/resources/assets/basemetals/models/item/gold_bow_pulling_1.json index a2489dbef..f3e01759e 100644 --- a/src/main/resources/assets/basemetals/models/item/gold_bow_pulling_1.json +++ b/src/main/resources/assets/basemetals/models/item/gold_bow_pulling_1.json @@ -1,6 +1,6 @@ { - "parent": "basemetals:item/gold_bow", - "textures": { - "layer0": "basemetals:item/gold_bow_pulling_1" - } + "parent": "basemetals:item/gold_bow", + "textures": { + "layer0": "basemetals:item/gold_bow_pulling_1" + } } diff --git a/src/main/resources/assets/basemetals/models/item/gold_bow_pulling_2.json b/src/main/resources/assets/basemetals/models/item/gold_bow_pulling_2.json index cd95c1ee3..d00256ad8 100644 --- a/src/main/resources/assets/basemetals/models/item/gold_bow_pulling_2.json +++ b/src/main/resources/assets/basemetals/models/item/gold_bow_pulling_2.json @@ -1,6 +1,6 @@ { - "parent": "basemetals:item/gold_bow", - "textures": { - "layer0": "basemetals:item/gold_bow_pulling_2" - } + "parent": "basemetals:item/gold_bow", + "textures": { + "layer0": "basemetals:item/gold_bow_pulling_2" + } } diff --git a/src/main/resources/assets/basemetals/models/item/gold_button.json b/src/main/resources/assets/basemetals/models/item/gold_button.json index 83b22bdda..57319d4e2 100644 --- a/src/main/resources/assets/basemetals/models/item/gold_button.json +++ b/src/main/resources/assets/basemetals/models/item/gold_button.json @@ -1,3 +1,3 @@ { - "parent": "basemetals:block/gold_button_inventory" + "parent": "basemetals:block/gold_button_inventory" } diff --git a/src/main/resources/assets/basemetals/models/item/gold_crackhammer.json b/src/main/resources/assets/basemetals/models/item/gold_crackhammer.json index 5de0fef80..587f95680 100644 --- a/src/main/resources/assets/basemetals/models/item/gold_crackhammer.json +++ b/src/main/resources/assets/basemetals/models/item/gold_crackhammer.json @@ -1,6 +1,6 @@ { "parent": "item/handheld", - "textures": { - "layer0": "basemetals:item/gold_crackhammer" - } + "textures": { + "layer0": "basemetals:item/gold_crackhammer" + } } diff --git a/src/main/resources/assets/basemetals/models/item/gold_crossbow.json b/src/main/resources/assets/basemetals/models/item/gold_crossbow.json index 9e6f8db16..12409da29 100644 --- a/src/main/resources/assets/basemetals/models/item/gold_crossbow.json +++ b/src/main/resources/assets/basemetals/models/item/gold_crossbow.json @@ -1,28 +1,41 @@ { - "parent": "item/bow", - "textures": { - "layer0": "basemetals:item/gold_crossbow_standby" + "parent": "minecraft:item/crossbow", + "textures": { + "layer0": "basemetals:item/gold_crossbow_standby" + }, + "overrides": [ + { + "predicate": { + "pulling": 1 + }, + "model": "basemetals:item/gold_crossbow_pulling_0" }, - "overrides": [ - { - "predicate": { - "pulling": 1 - }, - "model": "basemetals:item/gold_crossbow_pulling_0" - }, - { - "predicate": { - "pulling": 1, - "pull": 0.65 - }, - "model": "basemetals:item/gold_crossbow_pulling_1" - }, - { - "predicate": { - "pulling": 1, - "pull": 0.9 - }, - "model": "basemetals:item/gold_crossbow_pulling_2" - } - ] + { + "predicate": { + "pulling": 1, + "pull": 0.65 + }, + "model": "basemetals:item/gold_crossbow_pulling_1" + }, + { + "predicate": { + "pulling": 1, + "pull": 0.9 + }, + "model": "basemetals:item/gold_crossbow_pulling_2" + }, + { + "predicate": { + "charged": 1 + }, + "model": "basemetals:item/gold_crossbow_arrow" + }, + { + "predicate": { + "charged": 1, + "firework": 1 + }, + "model": "basemetals:item/gold_crossbow_firework" + } + ] } diff --git a/src/main/resources/assets/basemetals/models/item/gold_crossbow_arrow.json b/src/main/resources/assets/basemetals/models/item/gold_crossbow_arrow.json new file mode 100644 index 000000000..b8f2ae382 --- /dev/null +++ b/src/main/resources/assets/basemetals/models/item/gold_crossbow_arrow.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/crossbow", + "textures": { + "layer0": "basemetals:item/gold_crossbow_pulling_2" + } +} diff --git a/src/main/resources/assets/basemetals/models/item/gold_crossbow_firework.json b/src/main/resources/assets/basemetals/models/item/gold_crossbow_firework.json new file mode 100644 index 000000000..b8f2ae382 --- /dev/null +++ b/src/main/resources/assets/basemetals/models/item/gold_crossbow_firework.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/crossbow", + "textures": { + "layer0": "basemetals:item/gold_crossbow_pulling_2" + } +} diff --git a/src/main/resources/assets/basemetals/models/item/gold_crossbow_pulling_0.json b/src/main/resources/assets/basemetals/models/item/gold_crossbow_pulling_0.json index 4b2d4156b..c2b2e1954 100644 --- a/src/main/resources/assets/basemetals/models/item/gold_crossbow_pulling_0.json +++ b/src/main/resources/assets/basemetals/models/item/gold_crossbow_pulling_0.json @@ -1,6 +1,6 @@ { - "parent": "basemetals:item/gold_crossbow", - "textures": { - "layer0": "basemetals:item/gold_crossbow_pulling_0" - } + "parent": "basemetals:item/gold_crossbow", + "textures": { + "layer0": "basemetals:item/gold_crossbow_pulling_0" + } } diff --git a/src/main/resources/assets/basemetals/models/item/gold_crossbow_pulling_1.json b/src/main/resources/assets/basemetals/models/item/gold_crossbow_pulling_1.json index 37d2bf9be..7e14aeb79 100644 --- a/src/main/resources/assets/basemetals/models/item/gold_crossbow_pulling_1.json +++ b/src/main/resources/assets/basemetals/models/item/gold_crossbow_pulling_1.json @@ -1,6 +1,6 @@ { - "parent": "basemetals:item/gold_crossbow", - "textures": { - "layer0": "basemetals:item/gold_crossbow_pulling_1" - } + "parent": "basemetals:item/gold_crossbow", + "textures": { + "layer0": "basemetals:item/gold_crossbow_pulling_1" + } } diff --git a/src/main/resources/assets/basemetals/models/item/gold_crossbow_pulling_2.json b/src/main/resources/assets/basemetals/models/item/gold_crossbow_pulling_2.json index 488a69cdb..0c651e554 100644 --- a/src/main/resources/assets/basemetals/models/item/gold_crossbow_pulling_2.json +++ b/src/main/resources/assets/basemetals/models/item/gold_crossbow_pulling_2.json @@ -1,6 +1,6 @@ { - "parent": "basemetals:item/gold_crossbow", - "textures": { - "layer0": "basemetals:item/gold_crossbow_pulling_2" - } + "parent": "basemetals:item/gold_crossbow", + "textures": { + "layer0": "basemetals:item/gold_crossbow_pulling_2" + } } diff --git a/src/main/resources/assets/basemetals/models/item/gold_door.json b/src/main/resources/assets/basemetals/models/item/gold_door.json index c666c1738..a3b57096c 100644 --- a/src/main/resources/assets/basemetals/models/item/gold_door.json +++ b/src/main/resources/assets/basemetals/models/item/gold_door.json @@ -1,7 +1,7 @@ { - "parent": "basemetals:item/door_item", - "textures": { - "bottom": "basemetals:block/gold_door_lower", - "top": "basemetals:block/gold_door_upper" - } + "parent": "basemetals:item/door_item", + "textures": { + "bottom": "basemetals:block/gold_door_lower", + "top": "basemetals:block/gold_door_upper" + } } diff --git a/src/main/resources/assets/basemetals/models/item/gold_fishing_rod.json b/src/main/resources/assets/basemetals/models/item/gold_fishing_rod.json index 252de1c25..00055fdfa 100644 --- a/src/main/resources/assets/basemetals/models/item/gold_fishing_rod.json +++ b/src/main/resources/assets/basemetals/models/item/gold_fishing_rod.json @@ -1,14 +1,14 @@ { - "parent": "item/handheld_rod", - "textures": { - "layer0": "basemetals:item/gold_fishing_rod_uncast" - }, - "overrides": [ - { - "predicate": { - "cast": 1 - }, - "model": "basemetals:item/gold_fishing_rod_cast" - } - ] + "parent": "item/handheld_rod", + "textures": { + "layer0": "basemetals:item/gold_fishing_rod_uncast" + }, + "overrides": [ + { + "predicate": { + "cast": 1 + }, + "model": "basemetals:item/gold_fishing_rod_cast" + } + ] } diff --git a/src/main/resources/assets/basemetals/models/item/gold_fishing_rod_cast.json b/src/main/resources/assets/basemetals/models/item/gold_fishing_rod_cast.json index 5a31686e0..b848dde5a 100644 --- a/src/main/resources/assets/basemetals/models/item/gold_fishing_rod_cast.json +++ b/src/main/resources/assets/basemetals/models/item/gold_fishing_rod_cast.json @@ -1,6 +1,6 @@ { - "parent": "item/fishing_rod", - "textures": { - "layer0": "basemetals:item/gold_fishing_rod_cast" - } + "parent": "item/fishing_rod", + "textures": { + "layer0": "basemetals:item/gold_fishing_rod_cast" + } } diff --git a/src/main/resources/assets/basemetals/models/item/gold_gear.json b/src/main/resources/assets/basemetals/models/item/gold_gear.json index 2140d21b2..62fe7eaef 100644 --- a/src/main/resources/assets/basemetals/models/item/gold_gear.json +++ b/src/main/resources/assets/basemetals/models/item/gold_gear.json @@ -1,6 +1,6 @@ { "parent": "item/generated", - "textures": { - "layer0": "basemetals:item/gold_gear" - } + "textures": { + "layer0": "basemetals:item/gold_gear" + } } diff --git a/src/main/resources/assets/basemetals/models/item/gold_lever.json b/src/main/resources/assets/basemetals/models/item/gold_lever.json index 48424b112..917be899f 100644 --- a/src/main/resources/assets/basemetals/models/item/gold_lever.json +++ b/src/main/resources/assets/basemetals/models/item/gold_lever.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", - "textures": { - "layer0": "minecraft:block/lever" - } + "parent": "item/generated", + "textures": { + "layer0": "minecraft:block/lever" + } } diff --git a/src/main/resources/assets/basemetals/models/item/gold_plate.json b/src/main/resources/assets/basemetals/models/item/gold_plate.json index b5b73118d..6b6e6d3b8 100644 --- a/src/main/resources/assets/basemetals/models/item/gold_plate.json +++ b/src/main/resources/assets/basemetals/models/item/gold_plate.json @@ -1,3 +1,3 @@ { - "parent": "basemetals:block/gold_plate" + "parent": "basemetals:block/gold_plate" } diff --git a/src/main/resources/assets/basemetals/models/item/gold_powder.json b/src/main/resources/assets/basemetals/models/item/gold_powder.json index 35b1d21e6..971f31b01 100644 --- a/src/main/resources/assets/basemetals/models/item/gold_powder.json +++ b/src/main/resources/assets/basemetals/models/item/gold_powder.json @@ -1,6 +1,6 @@ { "parent": "item/generated", - "textures": { - "layer0": "basemetals:item/gold_powder" - } + "textures": { + "layer0": "basemetals:item/gold_powder" + } } diff --git a/src/main/resources/assets/basemetals/models/item/gold_rod.json b/src/main/resources/assets/basemetals/models/item/gold_rod.json index 014acb899..a68dca6ea 100644 --- a/src/main/resources/assets/basemetals/models/item/gold_rod.json +++ b/src/main/resources/assets/basemetals/models/item/gold_rod.json @@ -1,6 +1,6 @@ { "parent": "item/generated", - "textures": { - "layer0": "basemetals:item/gold_rod" - } + "textures": { + "layer0": "basemetals:item/gold_rod" + } } diff --git a/src/main/resources/assets/basemetals/models/item/gold_scythe.json b/src/main/resources/assets/basemetals/models/item/gold_scythe.json index 08cfdc740..89fcb7758 100644 --- a/src/main/resources/assets/basemetals/models/item/gold_scythe.json +++ b/src/main/resources/assets/basemetals/models/item/gold_scythe.json @@ -1,6 +1,6 @@ { "parent": "item/generated", - "textures": { - "layer0": "basemetals:item/gold_scythe" - } + "textures": { + "layer0": "basemetals:item/gold_scythe" + } } diff --git a/src/main/resources/assets/basemetals/models/item/gold_shears.json b/src/main/resources/assets/basemetals/models/item/gold_shears.json index b98556d0e..6efdffb88 100644 --- a/src/main/resources/assets/basemetals/models/item/gold_shears.json +++ b/src/main/resources/assets/basemetals/models/item/gold_shears.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", - "textures": { - "layer0": "basemetals:item/gold_shears" - } + "parent": "item/generated", + "textures": { + "layer0": "basemetals:item/gold_shears" + } } diff --git a/src/main/resources/assets/basemetals/models/item/gold_shield.json b/src/main/resources/assets/basemetals/models/item/gold_shield.json index d614499af..c68fc88e3 100644 --- a/src/main/resources/assets/basemetals/models/item/gold_shield.json +++ b/src/main/resources/assets/basemetals/models/item/gold_shield.json @@ -3,12 +3,12 @@ "textures": { "shield": "minecraft:block/gold_block" }, - "overrides": [ - { - "predicate": { - "blocking": 1 - }, - "model": "basemetals:item/gold_shield_blocking" - } - ] -} \ No newline at end of file + "overrides": [ + { + "predicate": { + "blocking": 1 + }, + "model": "basemetals:item/gold_shield_blocking" + } + ] +} diff --git a/src/main/resources/assets/basemetals/models/item/gold_shield_blocking.json b/src/main/resources/assets/basemetals/models/item/gold_shield_blocking.json index ec5b6b660..63347ed5a 100644 --- a/src/main/resources/assets/basemetals/models/item/gold_shield_blocking.json +++ b/src/main/resources/assets/basemetals/models/item/gold_shield_blocking.json @@ -2,5 +2,5 @@ "parent": "basemetals:item/shield_blocking", "textures": { "shield": "minecraft:block/gold_block" - } -} \ No newline at end of file + } +} diff --git a/src/main/resources/assets/basemetals/models/item/gold_slab.json b/src/main/resources/assets/basemetals/models/item/gold_slab.json index 221687d6b..b2b9dc1c9 100644 --- a/src/main/resources/assets/basemetals/models/item/gold_slab.json +++ b/src/main/resources/assets/basemetals/models/item/gold_slab.json @@ -1,3 +1,3 @@ { - "parent": "basemetals:block/half_slab_gold" + "parent": "basemetals:block/half_slab_gold" } diff --git a/src/generated/resources/assets/basemetals/models/item/gold_smallblend.json b/src/main/resources/assets/basemetals/models/item/gold_smallblend.json similarity index 98% rename from src/generated/resources/assets/basemetals/models/item/gold_smallblend.json rename to src/main/resources/assets/basemetals/models/item/gold_smallblend.json index 92485cdf3..554d04194 100644 --- a/src/generated/resources/assets/basemetals/models/item/gold_smallblend.json +++ b/src/main/resources/assets/basemetals/models/item/gold_smallblend.json @@ -3,4 +3,4 @@ "textures": { "layer0": "basemetals:item/gold_smallpowder" } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/basemetals/models/item/gold_smallpowder.json b/src/main/resources/assets/basemetals/models/item/gold_smallpowder.json index 094c52c8c..d78a61b81 100644 --- a/src/main/resources/assets/basemetals/models/item/gold_smallpowder.json +++ b/src/main/resources/assets/basemetals/models/item/gold_smallpowder.json @@ -1,6 +1,6 @@ { "parent": "item/generated", - "textures": { - "layer0": "basemetals:item/gold_smallpowder" - } + "textures": { + "layer0": "basemetals:item/gold_smallpowder" + } } diff --git a/src/main/resources/assets/basemetals/models/item/gold_stairs.json b/src/main/resources/assets/basemetals/models/item/gold_stairs.json index 3569d52f4..a5738dded 100644 --- a/src/main/resources/assets/basemetals/models/item/gold_stairs.json +++ b/src/main/resources/assets/basemetals/models/item/gold_stairs.json @@ -1,3 +1,3 @@ { - "parent": "basemetals:block/gold_stairs" + "parent": "basemetals:block/gold_stairs" } diff --git a/src/main/resources/assets/basemetals/models/item/gold_trapdoor.json b/src/main/resources/assets/basemetals/models/item/gold_trapdoor.json index 9fb01d570..3e176d38f 100644 --- a/src/main/resources/assets/basemetals/models/item/gold_trapdoor.json +++ b/src/main/resources/assets/basemetals/models/item/gold_trapdoor.json @@ -1,3 +1,3 @@ { - "parent": "basemetals:block/gold_trapdoor_bottom" + "parent": "basemetals:block/gold_trapdoor_bottom" } diff --git a/src/main/resources/assets/basemetals/models/item/gold_wall.json b/src/main/resources/assets/basemetals/models/item/gold_wall.json index c6dc97cf3..d046a55a6 100644 --- a/src/main/resources/assets/basemetals/models/item/gold_wall.json +++ b/src/main/resources/assets/basemetals/models/item/gold_wall.json @@ -1,3 +1,3 @@ { - "parent": "basemetals:block/gold_wall_inventory" + "parent": "basemetals:block/gold_wall_inventory" } diff --git a/src/main/resources/assets/basemetals/models/item/iron_arrow.json b/src/main/resources/assets/basemetals/models/item/iron_arrow.json index c0bcf7e74..cf49f2a22 100644 --- a/src/main/resources/assets/basemetals/models/item/iron_arrow.json +++ b/src/main/resources/assets/basemetals/models/item/iron_arrow.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", - "textures": { - "layer0": "basemetals:item/iron_arrow" - } + "parent": "item/generated", + "textures": { + "layer0": "basemetals:item/iron_arrow" + } } diff --git a/src/generated/resources/assets/basemetals/models/item/iron_blend.json b/src/main/resources/assets/basemetals/models/item/iron_blend.json similarity index 98% rename from src/generated/resources/assets/basemetals/models/item/iron_blend.json rename to src/main/resources/assets/basemetals/models/item/iron_blend.json index 525fa12fd..5dcabf6b0 100644 --- a/src/generated/resources/assets/basemetals/models/item/iron_blend.json +++ b/src/main/resources/assets/basemetals/models/item/iron_blend.json @@ -3,4 +3,4 @@ "textures": { "layer0": "basemetals:item/iron_powder" } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/basemetals/models/item/iron_bolt.json b/src/main/resources/assets/basemetals/models/item/iron_bolt.json index 0ea6ebaaf..64dd1c9cf 100644 --- a/src/main/resources/assets/basemetals/models/item/iron_bolt.json +++ b/src/main/resources/assets/basemetals/models/item/iron_bolt.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", - "textures": { - "layer0": "basemetals:item/iron_bolt" - } + "parent": "item/generated", + "textures": { + "layer0": "basemetals:item/iron_bolt" + } } diff --git a/src/main/resources/assets/basemetals/models/item/iron_bow.json b/src/main/resources/assets/basemetals/models/item/iron_bow.json index 6ab1824b2..d55b14088 100644 --- a/src/main/resources/assets/basemetals/models/item/iron_bow.json +++ b/src/main/resources/assets/basemetals/models/item/iron_bow.json @@ -1,28 +1,28 @@ { - "parent": "item/bow", - "textures": { - "layer0": "basemetals:item/iron_bow_standby" + "parent": "item/bow", + "textures": { + "layer0": "basemetals:item/iron_bow_standby" + }, + "overrides": [ + { + "predicate": { + "pulling": 1 + }, + "model": "basemetals:item/iron_bow_pulling_0" }, - "overrides": [ - { - "predicate": { - "pulling": 1 - }, - "model": "basemetals:item/iron_bow_pulling_0" - }, - { - "predicate": { - "pulling": 1, - "pull": 0.65 - }, - "model": "basemetals:item/iron_bow_pulling_1" - }, - { - "predicate": { - "pulling": 1, - "pull": 0.9 - }, - "model": "basemetals:item/iron_bow_pulling_2" - } - ] + { + "predicate": { + "pulling": 1, + "pull": 0.65 + }, + "model": "basemetals:item/iron_bow_pulling_1" + }, + { + "predicate": { + "pulling": 1, + "pull": 0.9 + }, + "model": "basemetals:item/iron_bow_pulling_2" + } + ] } diff --git a/src/main/resources/assets/basemetals/models/item/iron_bow_pulling_0.json b/src/main/resources/assets/basemetals/models/item/iron_bow_pulling_0.json index 346f2237b..4dd88a3a0 100644 --- a/src/main/resources/assets/basemetals/models/item/iron_bow_pulling_0.json +++ b/src/main/resources/assets/basemetals/models/item/iron_bow_pulling_0.json @@ -1,6 +1,6 @@ { - "parent": "basemetals:item/iron_bow", - "textures": { - "layer0": "basemetals:item/iron_bow_pulling_0" - } + "parent": "basemetals:item/iron_bow", + "textures": { + "layer0": "basemetals:item/iron_bow_pulling_0" + } } diff --git a/src/main/resources/assets/basemetals/models/item/iron_bow_pulling_1.json b/src/main/resources/assets/basemetals/models/item/iron_bow_pulling_1.json index 57c070799..0d3634dba 100644 --- a/src/main/resources/assets/basemetals/models/item/iron_bow_pulling_1.json +++ b/src/main/resources/assets/basemetals/models/item/iron_bow_pulling_1.json @@ -1,6 +1,6 @@ { - "parent": "basemetals:item/iron_bow", - "textures": { - "layer0": "basemetals:item/iron_bow_pulling_1" - } + "parent": "basemetals:item/iron_bow", + "textures": { + "layer0": "basemetals:item/iron_bow_pulling_1" + } } diff --git a/src/main/resources/assets/basemetals/models/item/iron_bow_pulling_2.json b/src/main/resources/assets/basemetals/models/item/iron_bow_pulling_2.json index f1c5280ad..88703d410 100644 --- a/src/main/resources/assets/basemetals/models/item/iron_bow_pulling_2.json +++ b/src/main/resources/assets/basemetals/models/item/iron_bow_pulling_2.json @@ -1,6 +1,6 @@ { - "parent": "basemetals:item/iron_bow", - "textures": { - "layer0": "basemetals:item/iron_bow_pulling_2" - } + "parent": "basemetals:item/iron_bow", + "textures": { + "layer0": "basemetals:item/iron_bow_pulling_2" + } } diff --git a/src/main/resources/assets/basemetals/models/item/iron_button.json b/src/main/resources/assets/basemetals/models/item/iron_button.json index f9ebe3d58..fdbc4dccf 100644 --- a/src/main/resources/assets/basemetals/models/item/iron_button.json +++ b/src/main/resources/assets/basemetals/models/item/iron_button.json @@ -1,3 +1,3 @@ { - "parent": "basemetals:block/iron_button_inventory" + "parent": "basemetals:block/iron_button_inventory" } diff --git a/src/main/resources/assets/basemetals/models/item/iron_crackhammer.json b/src/main/resources/assets/basemetals/models/item/iron_crackhammer.json index 40074ce20..dd1626290 100644 --- a/src/main/resources/assets/basemetals/models/item/iron_crackhammer.json +++ b/src/main/resources/assets/basemetals/models/item/iron_crackhammer.json @@ -1,6 +1,6 @@ { "parent": "item/handheld", - "textures": { - "layer0": "basemetals:item/iron_crackhammer" - } + "textures": { + "layer0": "basemetals:item/iron_crackhammer" + } } diff --git a/src/main/resources/assets/basemetals/models/item/iron_crossbow.json b/src/main/resources/assets/basemetals/models/item/iron_crossbow.json index 7a17ff20e..93f905702 100644 --- a/src/main/resources/assets/basemetals/models/item/iron_crossbow.json +++ b/src/main/resources/assets/basemetals/models/item/iron_crossbow.json @@ -1,28 +1,41 @@ { - "parent": "item/bow", - "textures": { - "layer0": "basemetals:item/iron_crossbow_standby" + "parent": "minecraft:item/crossbow", + "textures": { + "layer0": "basemetals:item/iron_crossbow_standby" + }, + "overrides": [ + { + "predicate": { + "pulling": 1 + }, + "model": "basemetals:item/iron_crossbow_pulling_0" }, - "overrides": [ - { - "predicate": { - "pulling": 1 - }, - "model": "basemetals:item/iron_crossbow_pulling_0" - }, - { - "predicate": { - "pulling": 1, - "pull": 0.65 - }, - "model": "basemetals:item/iron_crossbow_pulling_1" - }, - { - "predicate": { - "pulling": 1, - "pull": 0.9 - }, - "model": "basemetals:item/iron_crossbow_pulling_2" - } - ] + { + "predicate": { + "pulling": 1, + "pull": 0.65 + }, + "model": "basemetals:item/iron_crossbow_pulling_1" + }, + { + "predicate": { + "pulling": 1, + "pull": 0.9 + }, + "model": "basemetals:item/iron_crossbow_pulling_2" + }, + { + "predicate": { + "charged": 1 + }, + "model": "basemetals:item/iron_crossbow_arrow" + }, + { + "predicate": { + "charged": 1, + "firework": 1 + }, + "model": "basemetals:item/iron_crossbow_firework" + } + ] } diff --git a/src/main/resources/assets/basemetals/models/item/iron_crossbow_arrow.json b/src/main/resources/assets/basemetals/models/item/iron_crossbow_arrow.json new file mode 100644 index 000000000..9496dc534 --- /dev/null +++ b/src/main/resources/assets/basemetals/models/item/iron_crossbow_arrow.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/crossbow", + "textures": { + "layer0": "basemetals:item/iron_crossbow_pulling_2" + } +} diff --git a/src/main/resources/assets/basemetals/models/item/iron_crossbow_firework.json b/src/main/resources/assets/basemetals/models/item/iron_crossbow_firework.json new file mode 100644 index 000000000..9496dc534 --- /dev/null +++ b/src/main/resources/assets/basemetals/models/item/iron_crossbow_firework.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/crossbow", + "textures": { + "layer0": "basemetals:item/iron_crossbow_pulling_2" + } +} diff --git a/src/main/resources/assets/basemetals/models/item/iron_crossbow_pulling_0.json b/src/main/resources/assets/basemetals/models/item/iron_crossbow_pulling_0.json index a1ae010a0..78a99be07 100644 --- a/src/main/resources/assets/basemetals/models/item/iron_crossbow_pulling_0.json +++ b/src/main/resources/assets/basemetals/models/item/iron_crossbow_pulling_0.json @@ -1,6 +1,6 @@ { - "parent": "basemetals:item/iron_crossbow", - "textures": { - "layer0": "basemetals:item/iron_crossbow_pulling_0" - } + "parent": "basemetals:item/iron_crossbow", + "textures": { + "layer0": "basemetals:item/iron_crossbow_pulling_0" + } } diff --git a/src/main/resources/assets/basemetals/models/item/iron_crossbow_pulling_1.json b/src/main/resources/assets/basemetals/models/item/iron_crossbow_pulling_1.json index fb5ba79c7..347d2b928 100644 --- a/src/main/resources/assets/basemetals/models/item/iron_crossbow_pulling_1.json +++ b/src/main/resources/assets/basemetals/models/item/iron_crossbow_pulling_1.json @@ -1,6 +1,6 @@ { - "parent": "basemetals:item/iron_crossbow", - "textures": { - "layer0": "basemetals:item/iron_crossbow_pulling_1" - } + "parent": "basemetals:item/iron_crossbow", + "textures": { + "layer0": "basemetals:item/iron_crossbow_pulling_1" + } } diff --git a/src/main/resources/assets/basemetals/models/item/iron_crossbow_pulling_2.json b/src/main/resources/assets/basemetals/models/item/iron_crossbow_pulling_2.json index c867dd5aa..a3d7ee2ac 100644 --- a/src/main/resources/assets/basemetals/models/item/iron_crossbow_pulling_2.json +++ b/src/main/resources/assets/basemetals/models/item/iron_crossbow_pulling_2.json @@ -1,6 +1,6 @@ { - "parent": "basemetals:item/iron_crossbow", - "textures": { - "layer0": "basemetals:item/iron_crossbow_pulling_2" - } + "parent": "basemetals:item/iron_crossbow", + "textures": { + "layer0": "basemetals:item/iron_crossbow_pulling_2" + } } diff --git a/src/main/resources/assets/basemetals/models/item/iron_fishing_rod.json b/src/main/resources/assets/basemetals/models/item/iron_fishing_rod.json index 4ebb787b7..de9da6b1a 100644 --- a/src/main/resources/assets/basemetals/models/item/iron_fishing_rod.json +++ b/src/main/resources/assets/basemetals/models/item/iron_fishing_rod.json @@ -1,14 +1,14 @@ { - "parent": "item/handheld_rod", - "textures": { - "layer0": "basemetals:item/iron_fishing_rod_uncast" - }, - "overrides": [ - { - "predicate": { - "cast": 1 - }, - "model": "basemetals:item/iron_fishing_rod_cast" - } - ] + "parent": "item/handheld_rod", + "textures": { + "layer0": "basemetals:item/iron_fishing_rod_uncast" + }, + "overrides": [ + { + "predicate": { + "cast": 1 + }, + "model": "basemetals:item/iron_fishing_rod_cast" + } + ] } diff --git a/src/main/resources/assets/basemetals/models/item/iron_fishing_rod_cast.json b/src/main/resources/assets/basemetals/models/item/iron_fishing_rod_cast.json index 01610d955..179f4644c 100644 --- a/src/main/resources/assets/basemetals/models/item/iron_fishing_rod_cast.json +++ b/src/main/resources/assets/basemetals/models/item/iron_fishing_rod_cast.json @@ -1,6 +1,6 @@ { - "parent": "item/fishing_rod", - "textures": { - "layer0": "basemetals:item/iron_fishing_rod_cast" - } + "parent": "item/fishing_rod", + "textures": { + "layer0": "basemetals:item/iron_fishing_rod_cast" + } } diff --git a/src/main/resources/assets/basemetals/models/item/iron_gear.json b/src/main/resources/assets/basemetals/models/item/iron_gear.json index a8912fd1f..d1729dfe2 100644 --- a/src/main/resources/assets/basemetals/models/item/iron_gear.json +++ b/src/main/resources/assets/basemetals/models/item/iron_gear.json @@ -1,6 +1,6 @@ { "parent": "item/generated", - "textures": { - "layer0": "basemetals:item/iron_gear" - } + "textures": { + "layer0": "basemetals:item/iron_gear" + } } diff --git a/src/main/resources/assets/basemetals/models/item/iron_lever.json b/src/main/resources/assets/basemetals/models/item/iron_lever.json index 48424b112..917be899f 100644 --- a/src/main/resources/assets/basemetals/models/item/iron_lever.json +++ b/src/main/resources/assets/basemetals/models/item/iron_lever.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", - "textures": { - "layer0": "minecraft:block/lever" - } + "parent": "item/generated", + "textures": { + "layer0": "minecraft:block/lever" + } } diff --git a/src/main/resources/assets/basemetals/models/item/iron_plate.json b/src/main/resources/assets/basemetals/models/item/iron_plate.json index 06831a4b2..f7dd86026 100644 --- a/src/main/resources/assets/basemetals/models/item/iron_plate.json +++ b/src/main/resources/assets/basemetals/models/item/iron_plate.json @@ -1,3 +1,3 @@ { - "parent": "basemetals:block/iron_plate" + "parent": "basemetals:block/iron_plate" } diff --git a/src/main/resources/assets/basemetals/models/item/iron_powder.json b/src/main/resources/assets/basemetals/models/item/iron_powder.json index c16fc3707..81b15c802 100644 --- a/src/main/resources/assets/basemetals/models/item/iron_powder.json +++ b/src/main/resources/assets/basemetals/models/item/iron_powder.json @@ -1,6 +1,6 @@ { "parent": "item/generated", - "textures": { - "layer0": "basemetals:item/iron_powder" - } + "textures": { + "layer0": "basemetals:item/iron_powder" + } } diff --git a/src/main/resources/assets/basemetals/models/item/iron_rod.json b/src/main/resources/assets/basemetals/models/item/iron_rod.json index 19b0e5fef..b5cb38d72 100644 --- a/src/main/resources/assets/basemetals/models/item/iron_rod.json +++ b/src/main/resources/assets/basemetals/models/item/iron_rod.json @@ -1,6 +1,6 @@ { "parent": "item/generated", - "textures": { - "layer0": "basemetals:item/iron_rod" - } + "textures": { + "layer0": "basemetals:item/iron_rod" + } } diff --git a/src/main/resources/assets/basemetals/models/item/iron_scythe.json b/src/main/resources/assets/basemetals/models/item/iron_scythe.json index 4e04e73df..07198ce2a 100644 --- a/src/main/resources/assets/basemetals/models/item/iron_scythe.json +++ b/src/main/resources/assets/basemetals/models/item/iron_scythe.json @@ -1,6 +1,6 @@ { "parent": "item/generated", - "textures": { - "layer0": "basemetals:item/iron_scythe" - } + "textures": { + "layer0": "basemetals:item/iron_scythe" + } } diff --git a/src/main/resources/assets/basemetals/models/item/iron_shield.json b/src/main/resources/assets/basemetals/models/item/iron_shield.json index 5f197b318..cb89d0ae8 100644 --- a/src/main/resources/assets/basemetals/models/item/iron_shield.json +++ b/src/main/resources/assets/basemetals/models/item/iron_shield.json @@ -3,12 +3,12 @@ "textures": { "shield": "minecraft:block/iron_block" }, - "overrides": [ - { - "predicate": { - "blocking": 1 - }, - "model": "basemetals:item/iron_shield_blocking" - } - ] -} \ No newline at end of file + "overrides": [ + { + "predicate": { + "blocking": 1 + }, + "model": "basemetals:item/iron_shield_blocking" + } + ] +} diff --git a/src/main/resources/assets/basemetals/models/item/iron_shield_blocking.json b/src/main/resources/assets/basemetals/models/item/iron_shield_blocking.json index 3c469095f..02d52f57c 100644 --- a/src/main/resources/assets/basemetals/models/item/iron_shield_blocking.json +++ b/src/main/resources/assets/basemetals/models/item/iron_shield_blocking.json @@ -2,5 +2,5 @@ "parent": "basemetals:item/shield_blocking", "textures": { "shield": "minecraft:block/iron_block" - } -} \ No newline at end of file + } +} diff --git a/src/main/resources/assets/basemetals/models/item/iron_slab.json b/src/main/resources/assets/basemetals/models/item/iron_slab.json index d06cba443..35951886b 100644 --- a/src/main/resources/assets/basemetals/models/item/iron_slab.json +++ b/src/main/resources/assets/basemetals/models/item/iron_slab.json @@ -1,3 +1,3 @@ { - "parent": "basemetals:block/half_slab_iron" + "parent": "basemetals:block/half_slab_iron" } diff --git a/src/generated/resources/assets/basemetals/models/item/iron_smallblend.json b/src/main/resources/assets/basemetals/models/item/iron_smallblend.json similarity index 98% rename from src/generated/resources/assets/basemetals/models/item/iron_smallblend.json rename to src/main/resources/assets/basemetals/models/item/iron_smallblend.json index b949dd1b4..a84e4ffdc 100644 --- a/src/generated/resources/assets/basemetals/models/item/iron_smallblend.json +++ b/src/main/resources/assets/basemetals/models/item/iron_smallblend.json @@ -3,4 +3,4 @@ "textures": { "layer0": "basemetals:item/iron_smallpowder" } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/basemetals/models/item/iron_smallpowder.json b/src/main/resources/assets/basemetals/models/item/iron_smallpowder.json index ffd47c7e3..eb5014258 100644 --- a/src/main/resources/assets/basemetals/models/item/iron_smallpowder.json +++ b/src/main/resources/assets/basemetals/models/item/iron_smallpowder.json @@ -1,6 +1,6 @@ { "parent": "item/generated", - "textures": { - "layer0": "basemetals:item/iron_smallpowder" - } + "textures": { + "layer0": "basemetals:item/iron_smallpowder" + } } diff --git a/src/main/resources/assets/basemetals/models/item/iron_stairs.json b/src/main/resources/assets/basemetals/models/item/iron_stairs.json index af2ef16b9..fb3f11705 100644 --- a/src/main/resources/assets/basemetals/models/item/iron_stairs.json +++ b/src/main/resources/assets/basemetals/models/item/iron_stairs.json @@ -1,3 +1,3 @@ { - "parent": "basemetals:block/iron_stairs" + "parent": "basemetals:block/iron_stairs" } diff --git a/src/main/resources/assets/basemetals/models/item/iron_wall.json b/src/main/resources/assets/basemetals/models/item/iron_wall.json index 57b32047d..b3931d8ea 100644 --- a/src/main/resources/assets/basemetals/models/item/iron_wall.json +++ b/src/main/resources/assets/basemetals/models/item/iron_wall.json @@ -1,3 +1,3 @@ { - "parent": "basemetals:block/iron_wall_inventory" + "parent": "basemetals:block/iron_wall_inventory" } diff --git a/src/main/resources/assets/basemetals/models/item/lapis_smallpowder.json b/src/main/resources/assets/basemetals/models/item/lapis_smallpowder.json index fd35be706..adb54c4c7 100644 --- a/src/main/resources/assets/basemetals/models/item/lapis_smallpowder.json +++ b/src/main/resources/assets/basemetals/models/item/lapis_smallpowder.json @@ -1,6 +1,6 @@ { "parent": "item/generated", - "textures": { - "layer0": "basemetals:item/lapis_smallpowder" - } + "textures": { + "layer0": "basemetals:item/lapis_smallpowder" + } } diff --git a/src/main/resources/assets/basemetals/models/item/obsidian_arrow.json b/src/main/resources/assets/basemetals/models/item/obsidian_arrow.json index 814ba5964..5ba8abb5e 100644 --- a/src/main/resources/assets/basemetals/models/item/obsidian_arrow.json +++ b/src/main/resources/assets/basemetals/models/item/obsidian_arrow.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", - "textures": { - "layer0": "basemetals:item/obsidian_arrow" - } + "parent": "item/generated", + "textures": { + "layer0": "basemetals:item/obsidian_arrow" + } } diff --git a/src/main/resources/assets/basemetals/models/item/obsidian_axe.json b/src/main/resources/assets/basemetals/models/item/obsidian_axe.json index b7b059ed7..6b90a251f 100644 --- a/src/main/resources/assets/basemetals/models/item/obsidian_axe.json +++ b/src/main/resources/assets/basemetals/models/item/obsidian_axe.json @@ -1,6 +1,6 @@ { "parent": "item/handheld", - "textures": { - "layer0": "basemetals:item/obsidian_axe" - } + "textures": { + "layer0": "basemetals:item/obsidian_axe" + } } diff --git a/src/main/resources/assets/basemetals/models/item/obsidian_bars.json b/src/main/resources/assets/basemetals/models/item/obsidian_bars.json index 6691683ed..914742232 100644 --- a/src/main/resources/assets/basemetals/models/item/obsidian_bars.json +++ b/src/main/resources/assets/basemetals/models/item/obsidian_bars.json @@ -1,6 +1,6 @@ { "parent": "item/generated", - "textures": { - "layer0": "basemetals:block/obsidian_bars" - } + "textures": { + "layer0": "basemetals:block/obsidian_bars" + } } diff --git a/src/main/resources/assets/basemetals/models/item/obsidian_bolt.json b/src/main/resources/assets/basemetals/models/item/obsidian_bolt.json index 5f2e491b4..c685b80d9 100644 --- a/src/main/resources/assets/basemetals/models/item/obsidian_bolt.json +++ b/src/main/resources/assets/basemetals/models/item/obsidian_bolt.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", - "textures": { - "layer0": "basemetals:item/obsidian_bolt" - } + "parent": "item/generated", + "textures": { + "layer0": "basemetals:item/obsidian_bolt" + } } diff --git a/src/main/resources/assets/basemetals/models/item/obsidian_boots.json b/src/main/resources/assets/basemetals/models/item/obsidian_boots.json index 77caa595d..e61cd1efa 100644 --- a/src/main/resources/assets/basemetals/models/item/obsidian_boots.json +++ b/src/main/resources/assets/basemetals/models/item/obsidian_boots.json @@ -1,6 +1,6 @@ { "parent": "item/generated", - "textures": { - "layer0": "basemetals:item/obsidian_boots" - } + "textures": { + "layer0": "basemetals:item/obsidian_boots" + } } diff --git a/src/main/resources/assets/basemetals/models/item/obsidian_bow.json b/src/main/resources/assets/basemetals/models/item/obsidian_bow.json index f7e9cd6fb..3adf9295b 100644 --- a/src/main/resources/assets/basemetals/models/item/obsidian_bow.json +++ b/src/main/resources/assets/basemetals/models/item/obsidian_bow.json @@ -1,28 +1,28 @@ { - "parent": "item/bow", - "textures": { - "layer0": "basemetals:item/obsidian_bow_standby" + "parent": "item/bow", + "textures": { + "layer0": "basemetals:item/obsidian_bow_standby" + }, + "overrides": [ + { + "predicate": { + "pulling": 1 + }, + "model": "basemetals:item/obsidian_bow_pulling_0" }, - "overrides": [ - { - "predicate": { - "pulling": 1 - }, - "model": "basemetals:item/obsidian_bow_pulling_0" - }, - { - "predicate": { - "pulling": 1, - "pull": 0.65 - }, - "model": "basemetals:item/obsidian_bow_pulling_1" - }, - { - "predicate": { - "pulling": 1, - "pull": 0.9 - }, - "model": "basemetals:item/obsidian_bow_pulling_2" - } - ] + { + "predicate": { + "pulling": 1, + "pull": 0.65 + }, + "model": "basemetals:item/obsidian_bow_pulling_1" + }, + { + "predicate": { + "pulling": 1, + "pull": 0.9 + }, + "model": "basemetals:item/obsidian_bow_pulling_2" + } + ] } diff --git a/src/main/resources/assets/basemetals/models/item/obsidian_bow_pulling_0.json b/src/main/resources/assets/basemetals/models/item/obsidian_bow_pulling_0.json index f15bd9e0d..729a33d1c 100644 --- a/src/main/resources/assets/basemetals/models/item/obsidian_bow_pulling_0.json +++ b/src/main/resources/assets/basemetals/models/item/obsidian_bow_pulling_0.json @@ -1,6 +1,6 @@ { - "parent": "basemetals:item/obsidian_bow", - "textures": { - "layer0": "basemetals:item/obsidian_bow_pulling_0" - } + "parent": "basemetals:item/obsidian_bow", + "textures": { + "layer0": "basemetals:item/obsidian_bow_pulling_0" + } } diff --git a/src/main/resources/assets/basemetals/models/item/obsidian_bow_pulling_1.json b/src/main/resources/assets/basemetals/models/item/obsidian_bow_pulling_1.json index b0d807cf8..cfef62e73 100644 --- a/src/main/resources/assets/basemetals/models/item/obsidian_bow_pulling_1.json +++ b/src/main/resources/assets/basemetals/models/item/obsidian_bow_pulling_1.json @@ -1,6 +1,6 @@ { - "parent": "basemetals:item/obsidian_bow", - "textures": { - "layer0": "basemetals:item/obsidian_bow_pulling_1" - } + "parent": "basemetals:item/obsidian_bow", + "textures": { + "layer0": "basemetals:item/obsidian_bow_pulling_1" + } } diff --git a/src/main/resources/assets/basemetals/models/item/obsidian_bow_pulling_2.json b/src/main/resources/assets/basemetals/models/item/obsidian_bow_pulling_2.json index d2ddedd5e..af6e81a08 100644 --- a/src/main/resources/assets/basemetals/models/item/obsidian_bow_pulling_2.json +++ b/src/main/resources/assets/basemetals/models/item/obsidian_bow_pulling_2.json @@ -1,6 +1,6 @@ { - "parent": "basemetals:item/obsidian_bow", - "textures": { - "layer0": "basemetals:item/obsidian_bow_pulling_2" - } + "parent": "basemetals:item/obsidian_bow", + "textures": { + "layer0": "basemetals:item/obsidian_bow_pulling_2" + } } diff --git a/src/main/resources/assets/basemetals/models/item/obsidian_button.json b/src/main/resources/assets/basemetals/models/item/obsidian_button.json index 82dc35693..894db89dc 100644 --- a/src/main/resources/assets/basemetals/models/item/obsidian_button.json +++ b/src/main/resources/assets/basemetals/models/item/obsidian_button.json @@ -1,3 +1,3 @@ { - "parent": "basemetals:block/obsidian_button_inventory" + "parent": "basemetals:block/obsidian_button_inventory" } diff --git a/src/main/resources/assets/basemetals/models/item/obsidian_chestplate.json b/src/main/resources/assets/basemetals/models/item/obsidian_chestplate.json index c87c8fa91..952f98a3d 100644 --- a/src/main/resources/assets/basemetals/models/item/obsidian_chestplate.json +++ b/src/main/resources/assets/basemetals/models/item/obsidian_chestplate.json @@ -1,6 +1,6 @@ { "parent": "item/generated", - "textures": { - "layer0": "basemetals:item/obsidian_chestplate" - } + "textures": { + "layer0": "basemetals:item/obsidian_chestplate" + } } diff --git a/src/main/resources/assets/basemetals/models/item/obsidian_crackhammer.json b/src/main/resources/assets/basemetals/models/item/obsidian_crackhammer.json index 5842492ba..e94cc0ecd 100644 --- a/src/main/resources/assets/basemetals/models/item/obsidian_crackhammer.json +++ b/src/main/resources/assets/basemetals/models/item/obsidian_crackhammer.json @@ -1,6 +1,6 @@ { "parent": "item/handheld", - "textures": { - "layer0": "basemetals:item/obsidian_crackhammer" - } + "textures": { + "layer0": "basemetals:item/obsidian_crackhammer" + } } diff --git a/src/main/resources/assets/basemetals/models/item/obsidian_crossbow.json b/src/main/resources/assets/basemetals/models/item/obsidian_crossbow.json index d41cbe9a0..79ad95db3 100644 --- a/src/main/resources/assets/basemetals/models/item/obsidian_crossbow.json +++ b/src/main/resources/assets/basemetals/models/item/obsidian_crossbow.json @@ -1,28 +1,41 @@ { - "parent": "item/bow", - "textures": { - "layer0": "basemetals:item/obsidian_crossbow_standby" + "parent": "minecraft:item/crossbow", + "textures": { + "layer0": "basemetals:item/obsidian_crossbow_standby" + }, + "overrides": [ + { + "predicate": { + "pulling": 1 + }, + "model": "basemetals:item/obsidian_crossbow_pulling_0" }, - "overrides": [ - { - "predicate": { - "pulling": 1 - }, - "model": "basemetals:item/obsidian_crossbow_pulling_0" - }, - { - "predicate": { - "pulling": 1, - "pull": 0.65 - }, - "model": "basemetals:item/obsidian_crossbow_pulling_1" - }, - { - "predicate": { - "pulling": 1, - "pull": 0.9 - }, - "model": "basemetals:item/obsidian_crossbow_pulling_2" - } - ] + { + "predicate": { + "pulling": 1, + "pull": 0.65 + }, + "model": "basemetals:item/obsidian_crossbow_pulling_1" + }, + { + "predicate": { + "pulling": 1, + "pull": 0.9 + }, + "model": "basemetals:item/obsidian_crossbow_pulling_2" + }, + { + "predicate": { + "charged": 1 + }, + "model": "basemetals:item/obsidian_crossbow_arrow" + }, + { + "predicate": { + "charged": 1, + "firework": 1 + }, + "model": "basemetals:item/obsidian_crossbow_firework" + } + ] } diff --git a/src/main/resources/assets/basemetals/models/item/obsidian_crossbow_arrow.json b/src/main/resources/assets/basemetals/models/item/obsidian_crossbow_arrow.json new file mode 100644 index 000000000..dd2917d37 --- /dev/null +++ b/src/main/resources/assets/basemetals/models/item/obsidian_crossbow_arrow.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/crossbow", + "textures": { + "layer0": "basemetals:item/obsidian_crossbow_pulling_2" + } +} diff --git a/src/main/resources/assets/basemetals/models/item/obsidian_crossbow_firework.json b/src/main/resources/assets/basemetals/models/item/obsidian_crossbow_firework.json new file mode 100644 index 000000000..dd2917d37 --- /dev/null +++ b/src/main/resources/assets/basemetals/models/item/obsidian_crossbow_firework.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/crossbow", + "textures": { + "layer0": "basemetals:item/obsidian_crossbow_pulling_2" + } +} diff --git a/src/main/resources/assets/basemetals/models/item/obsidian_crossbow_pulling_0.json b/src/main/resources/assets/basemetals/models/item/obsidian_crossbow_pulling_0.json index 53ea3285d..709f57751 100644 --- a/src/main/resources/assets/basemetals/models/item/obsidian_crossbow_pulling_0.json +++ b/src/main/resources/assets/basemetals/models/item/obsidian_crossbow_pulling_0.json @@ -1,6 +1,6 @@ { - "parent": "basemetals:item/obsidian_crossbow", - "textures": { - "layer0": "basemetals:item/obsidian_crossbow_pulling_0" - } + "parent": "basemetals:item/obsidian_crossbow", + "textures": { + "layer0": "basemetals:item/obsidian_crossbow_pulling_0" + } } diff --git a/src/main/resources/assets/basemetals/models/item/obsidian_crossbow_pulling_1.json b/src/main/resources/assets/basemetals/models/item/obsidian_crossbow_pulling_1.json index 111d00b0f..470664029 100644 --- a/src/main/resources/assets/basemetals/models/item/obsidian_crossbow_pulling_1.json +++ b/src/main/resources/assets/basemetals/models/item/obsidian_crossbow_pulling_1.json @@ -1,6 +1,6 @@ { - "parent": "basemetals:item/obsidian_crossbow", - "textures": { - "layer0": "basemetals:item/obsidian_crossbow_pulling_1" - } + "parent": "basemetals:item/obsidian_crossbow", + "textures": { + "layer0": "basemetals:item/obsidian_crossbow_pulling_1" + } } diff --git a/src/main/resources/assets/basemetals/models/item/obsidian_crossbow_pulling_2.json b/src/main/resources/assets/basemetals/models/item/obsidian_crossbow_pulling_2.json index 7176ef368..9615c5ba1 100644 --- a/src/main/resources/assets/basemetals/models/item/obsidian_crossbow_pulling_2.json +++ b/src/main/resources/assets/basemetals/models/item/obsidian_crossbow_pulling_2.json @@ -1,6 +1,6 @@ { - "parent": "basemetals:item/obsidian_crossbow", - "textures": { - "layer0": "basemetals:item/obsidian_crossbow_pulling_2" - } + "parent": "basemetals:item/obsidian_crossbow", + "textures": { + "layer0": "basemetals:item/obsidian_crossbow_pulling_2" + } } diff --git a/src/main/resources/assets/basemetals/models/item/obsidian_door.json b/src/main/resources/assets/basemetals/models/item/obsidian_door.json index 01a7e0df0..e4ecb2c30 100644 --- a/src/main/resources/assets/basemetals/models/item/obsidian_door.json +++ b/src/main/resources/assets/basemetals/models/item/obsidian_door.json @@ -1,7 +1,7 @@ { - "parent": "basemetals:item/door_item", - "textures": { - "bottom": "basemetals:block/obsidian_door_lower", - "top": "basemetals:block/obsidian_door_upper" - } + "parent": "basemetals:item/door_item", + "textures": { + "bottom": "basemetals:block/obsidian_door_lower", + "top": "basemetals:block/obsidian_door_upper" + } } diff --git a/src/main/resources/assets/basemetals/models/item/obsidian_fishing_rod.json b/src/main/resources/assets/basemetals/models/item/obsidian_fishing_rod.json index 32ac0e6a7..004bd0fc1 100644 --- a/src/main/resources/assets/basemetals/models/item/obsidian_fishing_rod.json +++ b/src/main/resources/assets/basemetals/models/item/obsidian_fishing_rod.json @@ -1,14 +1,14 @@ { - "parent": "item/handheld_rod", - "textures": { - "layer0": "basemetals:item/obsidian_fishing_rod_uncast" - }, - "overrides": [ - { - "predicate": { - "cast": 1 - }, - "model": "basemetals:item/obsidian_fishing_rod_cast" - } - ] + "parent": "item/handheld_rod", + "textures": { + "layer0": "basemetals:item/obsidian_fishing_rod_uncast" + }, + "overrides": [ + { + "predicate": { + "cast": 1 + }, + "model": "basemetals:item/obsidian_fishing_rod_cast" + } + ] } diff --git a/src/main/resources/assets/basemetals/models/item/obsidian_fishing_rod_cast.json b/src/main/resources/assets/basemetals/models/item/obsidian_fishing_rod_cast.json index d85635cb2..e5c625c6a 100644 --- a/src/main/resources/assets/basemetals/models/item/obsidian_fishing_rod_cast.json +++ b/src/main/resources/assets/basemetals/models/item/obsidian_fishing_rod_cast.json @@ -1,6 +1,6 @@ { - "parent": "item/fishing_rod", - "textures": { - "layer0": "basemetals:item/obsidian_fishing_rod_cast" - } + "parent": "item/fishing_rod", + "textures": { + "layer0": "basemetals:item/obsidian_fishing_rod_cast" + } } diff --git a/src/main/resources/assets/basemetals/models/item/obsidian_gear.json b/src/main/resources/assets/basemetals/models/item/obsidian_gear.json index c8bb90892..f263b5385 100644 --- a/src/main/resources/assets/basemetals/models/item/obsidian_gear.json +++ b/src/main/resources/assets/basemetals/models/item/obsidian_gear.json @@ -1,6 +1,6 @@ { "parent": "item/generated", - "textures": { - "layer0": "basemetals:item/obsidian_gear" - } + "textures": { + "layer0": "basemetals:item/obsidian_gear" + } } diff --git a/src/main/resources/assets/basemetals/models/item/obsidian_helmet.json b/src/main/resources/assets/basemetals/models/item/obsidian_helmet.json index 58bc89859..03fa548cb 100644 --- a/src/main/resources/assets/basemetals/models/item/obsidian_helmet.json +++ b/src/main/resources/assets/basemetals/models/item/obsidian_helmet.json @@ -1,6 +1,6 @@ { "parent": "item/generated", - "textures": { - "layer0": "basemetals:item/obsidian_helmet" - } + "textures": { + "layer0": "basemetals:item/obsidian_helmet" + } } diff --git a/src/main/resources/assets/basemetals/models/item/obsidian_hoe.json b/src/main/resources/assets/basemetals/models/item/obsidian_hoe.json index 01d1b11fa..2a2576628 100644 --- a/src/main/resources/assets/basemetals/models/item/obsidian_hoe.json +++ b/src/main/resources/assets/basemetals/models/item/obsidian_hoe.json @@ -1,6 +1,6 @@ { "parent": "item/handheld", - "textures": { - "layer0": "basemetals:item/obsidian_hoe" - } + "textures": { + "layer0": "basemetals:item/obsidian_hoe" + } } diff --git a/src/main/resources/assets/basemetals/models/item/obsidian_horse_armor.json b/src/main/resources/assets/basemetals/models/item/obsidian_horse_armor.json index 05182b68d..455d176dc 100644 --- a/src/main/resources/assets/basemetals/models/item/obsidian_horse_armor.json +++ b/src/main/resources/assets/basemetals/models/item/obsidian_horse_armor.json @@ -1,6 +1,6 @@ { "parent": "item/generated", - "textures": { - "layer0": "basemetals:item/obsidian_horse_armor" - } + "textures": { + "layer0": "basemetals:item/obsidian_horse_armor" + } } diff --git a/src/main/resources/assets/basemetals/models/item/obsidian_ingot.json b/src/main/resources/assets/basemetals/models/item/obsidian_ingot.json index 173502431..c66ffcff8 100644 --- a/src/main/resources/assets/basemetals/models/item/obsidian_ingot.json +++ b/src/main/resources/assets/basemetals/models/item/obsidian_ingot.json @@ -1,6 +1,6 @@ { "parent": "item/generated", - "textures": { - "layer0": "basemetals:item/obsidian_ingot" - } + "textures": { + "layer0": "basemetals:item/obsidian_ingot" + } } diff --git a/src/main/resources/assets/basemetals/models/item/obsidian_leggings.json b/src/main/resources/assets/basemetals/models/item/obsidian_leggings.json index 8e15ef30e..b1fb001b3 100644 --- a/src/main/resources/assets/basemetals/models/item/obsidian_leggings.json +++ b/src/main/resources/assets/basemetals/models/item/obsidian_leggings.json @@ -1,6 +1,6 @@ { "parent": "item/generated", - "textures": { - "layer0": "basemetals:item/obsidian_leggings" - } + "textures": { + "layer0": "basemetals:item/obsidian_leggings" + } } diff --git a/src/main/resources/assets/basemetals/models/item/obsidian_lever.json b/src/main/resources/assets/basemetals/models/item/obsidian_lever.json index 48424b112..917be899f 100644 --- a/src/main/resources/assets/basemetals/models/item/obsidian_lever.json +++ b/src/main/resources/assets/basemetals/models/item/obsidian_lever.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", - "textures": { - "layer0": "minecraft:block/lever" - } + "parent": "item/generated", + "textures": { + "layer0": "minecraft:block/lever" + } } diff --git a/src/main/resources/assets/basemetals/models/item/obsidian_nugget.json b/src/main/resources/assets/basemetals/models/item/obsidian_nugget.json index 65e912085..ccf45f0ed 100644 --- a/src/main/resources/assets/basemetals/models/item/obsidian_nugget.json +++ b/src/main/resources/assets/basemetals/models/item/obsidian_nugget.json @@ -1,6 +1,6 @@ { "parent": "item/generated", - "textures": { - "layer0": "basemetals:item/obsidian_nugget" - } + "textures": { + "layer0": "basemetals:item/obsidian_nugget" + } } diff --git a/src/main/resources/assets/basemetals/models/item/obsidian_pickaxe.json b/src/main/resources/assets/basemetals/models/item/obsidian_pickaxe.json index f0b10a0ab..36bee62ba 100644 --- a/src/main/resources/assets/basemetals/models/item/obsidian_pickaxe.json +++ b/src/main/resources/assets/basemetals/models/item/obsidian_pickaxe.json @@ -1,6 +1,6 @@ { "parent": "item/handheld", - "textures": { - "layer0": "basemetals:item/obsidian_pickaxe" - } + "textures": { + "layer0": "basemetals:item/obsidian_pickaxe" + } } diff --git a/src/main/resources/assets/basemetals/models/item/obsidian_powder.json b/src/main/resources/assets/basemetals/models/item/obsidian_powder.json index 603e442fd..8dad98ef1 100644 --- a/src/main/resources/assets/basemetals/models/item/obsidian_powder.json +++ b/src/main/resources/assets/basemetals/models/item/obsidian_powder.json @@ -1,6 +1,6 @@ { "parent": "item/generated", - "textures": { - "layer0": "basemetals:item/obsidian_powder" - } + "textures": { + "layer0": "basemetals:item/obsidian_powder" + } } diff --git a/src/main/resources/assets/basemetals/models/item/obsidian_pressure_plate.json b/src/main/resources/assets/basemetals/models/item/obsidian_pressure_plate.json index 889791c38..b60e89927 100644 --- a/src/main/resources/assets/basemetals/models/item/obsidian_pressure_plate.json +++ b/src/main/resources/assets/basemetals/models/item/obsidian_pressure_plate.json @@ -1,3 +1,3 @@ { - "parent": "basemetals:block/obsidian_pressure_plate_up" + "parent": "basemetals:block/obsidian_pressure_plate_up" } diff --git a/src/main/resources/assets/basemetals/models/item/obsidian_rod.json b/src/main/resources/assets/basemetals/models/item/obsidian_rod.json index ccc0ecd44..19fdf025d 100644 --- a/src/main/resources/assets/basemetals/models/item/obsidian_rod.json +++ b/src/main/resources/assets/basemetals/models/item/obsidian_rod.json @@ -1,6 +1,6 @@ { "parent": "item/generated", - "textures": { - "layer0": "basemetals:item/obsidian_rod" - } + "textures": { + "layer0": "basemetals:item/obsidian_rod" + } } diff --git a/src/main/resources/assets/basemetals/models/item/obsidian_scythe.json b/src/main/resources/assets/basemetals/models/item/obsidian_scythe.json index 12734740f..adeadc739 100644 --- a/src/main/resources/assets/basemetals/models/item/obsidian_scythe.json +++ b/src/main/resources/assets/basemetals/models/item/obsidian_scythe.json @@ -1,6 +1,6 @@ { "parent": "item/generated", - "textures": { - "layer0": "basemetals:item/obsidian_scythe" - } + "textures": { + "layer0": "basemetals:item/obsidian_scythe" + } } diff --git a/src/main/resources/assets/basemetals/models/item/obsidian_shears.json b/src/main/resources/assets/basemetals/models/item/obsidian_shears.json index 4eaea44bc..8d8b79f48 100644 --- a/src/main/resources/assets/basemetals/models/item/obsidian_shears.json +++ b/src/main/resources/assets/basemetals/models/item/obsidian_shears.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", - "textures": { - "layer0": "basemetals:item/obsidian_shears" - } + "parent": "item/generated", + "textures": { + "layer0": "basemetals:item/obsidian_shears" + } } diff --git a/src/main/resources/assets/basemetals/models/item/obsidian_shield.json b/src/main/resources/assets/basemetals/models/item/obsidian_shield.json index a02bb5c33..2ed80f1a8 100644 --- a/src/main/resources/assets/basemetals/models/item/obsidian_shield.json +++ b/src/main/resources/assets/basemetals/models/item/obsidian_shield.json @@ -3,12 +3,12 @@ "textures": { "shield": "minecraft:block/obsidian" }, - "overrides": [ - { - "predicate": { - "blocking": 1 - }, - "model": "basemetals:item/obsidian_shield_blocking" - } - ] + "overrides": [ + { + "predicate": { + "blocking": 1 + }, + "model": "basemetals:item/obsidian_shield_blocking" + } + ] } diff --git a/src/main/resources/assets/basemetals/models/item/obsidian_shield_blocking.json b/src/main/resources/assets/basemetals/models/item/obsidian_shield_blocking.json index dad12918f..e4bfeda01 100644 --- a/src/main/resources/assets/basemetals/models/item/obsidian_shield_blocking.json +++ b/src/main/resources/assets/basemetals/models/item/obsidian_shield_blocking.json @@ -2,5 +2,5 @@ "parent": "basemetals:item/shield_blocking", "textures": { "shield": "minecraft:block/obsidian" - } + } } diff --git a/src/main/resources/assets/basemetals/models/item/obsidian_shovel.json b/src/main/resources/assets/basemetals/models/item/obsidian_shovel.json index 425a1c77d..76713015b 100644 --- a/src/main/resources/assets/basemetals/models/item/obsidian_shovel.json +++ b/src/main/resources/assets/basemetals/models/item/obsidian_shovel.json @@ -1,6 +1,6 @@ { "parent": "item/handheld", - "textures": { - "layer0": "basemetals:item/obsidian_shovel" - } + "textures": { + "layer0": "basemetals:item/obsidian_shovel" + } } diff --git a/src/main/resources/assets/basemetals/models/item/obsidian_slab.json b/src/main/resources/assets/basemetals/models/item/obsidian_slab.json index 7dc85e920..07b71b0f3 100644 --- a/src/main/resources/assets/basemetals/models/item/obsidian_slab.json +++ b/src/main/resources/assets/basemetals/models/item/obsidian_slab.json @@ -1,3 +1,3 @@ { - "parent": "basemetals:block/half_slab_obsidian" + "parent": "basemetals:block/half_slab_obsidian" } diff --git a/src/main/resources/assets/basemetals/models/item/obsidian_smallpowder.json b/src/main/resources/assets/basemetals/models/item/obsidian_smallpowder.json index a050a6f7e..d578d4bfe 100644 --- a/src/main/resources/assets/basemetals/models/item/obsidian_smallpowder.json +++ b/src/main/resources/assets/basemetals/models/item/obsidian_smallpowder.json @@ -1,6 +1,6 @@ { "parent": "item/generated", - "textures": { - "layer0": "basemetals:item/obsidian_smallpowder" - } + "textures": { + "layer0": "basemetals:item/obsidian_smallpowder" + } } diff --git a/src/main/resources/assets/basemetals/models/item/obsidian_stairs.json b/src/main/resources/assets/basemetals/models/item/obsidian_stairs.json index 72570a87e..4a5df5b3f 100644 --- a/src/main/resources/assets/basemetals/models/item/obsidian_stairs.json +++ b/src/main/resources/assets/basemetals/models/item/obsidian_stairs.json @@ -1,3 +1,3 @@ { - "parent": "basemetals:block/obsidian_stairs" + "parent": "basemetals:block/obsidian_stairs" } diff --git a/src/main/resources/assets/basemetals/models/item/obsidian_sword.json b/src/main/resources/assets/basemetals/models/item/obsidian_sword.json index d18dfb1d8..641265afe 100644 --- a/src/main/resources/assets/basemetals/models/item/obsidian_sword.json +++ b/src/main/resources/assets/basemetals/models/item/obsidian_sword.json @@ -1,6 +1,6 @@ { "parent": "item/handheld", - "textures": { - "layer0": "basemetals:item/obsidian_sword" - } + "textures": { + "layer0": "basemetals:item/obsidian_sword" + } } diff --git a/src/main/resources/assets/basemetals/models/item/obsidian_trapdoor.json b/src/main/resources/assets/basemetals/models/item/obsidian_trapdoor.json index 979bfdf58..f5ec70502 100644 --- a/src/main/resources/assets/basemetals/models/item/obsidian_trapdoor.json +++ b/src/main/resources/assets/basemetals/models/item/obsidian_trapdoor.json @@ -1,3 +1,3 @@ { - "parent": "basemetals:block/obsidian_trapdoor_bottom" + "parent": "basemetals:block/obsidian_trapdoor_bottom" } diff --git a/src/main/resources/assets/basemetals/models/item/obsidian_wall.json b/src/main/resources/assets/basemetals/models/item/obsidian_wall.json index c935162db..daad68bed 100644 --- a/src/main/resources/assets/basemetals/models/item/obsidian_wall.json +++ b/src/main/resources/assets/basemetals/models/item/obsidian_wall.json @@ -1,3 +1,3 @@ { - "parent": "basemetals:block/obsidian_wall_inventory" + "parent": "basemetals:block/obsidian_wall_inventory" } diff --git a/src/main/resources/assets/basemetals/models/item/quartz_arrow.json b/src/main/resources/assets/basemetals/models/item/quartz_arrow.json index 238537bb8..fbb0e6c8a 100644 --- a/src/main/resources/assets/basemetals/models/item/quartz_arrow.json +++ b/src/main/resources/assets/basemetals/models/item/quartz_arrow.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", - "textures": { - "layer0": "basemetals:item/quartz_arrow" - } + "parent": "item/generated", + "textures": { + "layer0": "basemetals:item/quartz_arrow" + } } diff --git a/src/main/resources/assets/basemetals/models/item/quartz_axe.json b/src/main/resources/assets/basemetals/models/item/quartz_axe.json index 4f15ba47a..2483eed85 100644 --- a/src/main/resources/assets/basemetals/models/item/quartz_axe.json +++ b/src/main/resources/assets/basemetals/models/item/quartz_axe.json @@ -1,6 +1,6 @@ { "parent": "item/handheld", - "textures": { - "layer0": "basemetals:item/quartz_axe" - } + "textures": { + "layer0": "basemetals:item/quartz_axe" + } } diff --git a/src/main/resources/assets/basemetals/models/item/quartz_bars.json b/src/main/resources/assets/basemetals/models/item/quartz_bars.json index 90a6886ca..d4a87f67e 100644 --- a/src/main/resources/assets/basemetals/models/item/quartz_bars.json +++ b/src/main/resources/assets/basemetals/models/item/quartz_bars.json @@ -1,6 +1,6 @@ { "parent": "item/generated", - "textures": { - "layer0": "basemetals:block/quartz_bars" - } + "textures": { + "layer0": "basemetals:block/quartz_bars" + } } diff --git a/src/main/resources/assets/basemetals/models/item/quartz_bolt.json b/src/main/resources/assets/basemetals/models/item/quartz_bolt.json index 35b1eabdb..8e839f4e8 100644 --- a/src/main/resources/assets/basemetals/models/item/quartz_bolt.json +++ b/src/main/resources/assets/basemetals/models/item/quartz_bolt.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", - "textures": { - "layer0": "basemetals:item/quartz_bolt" - } + "parent": "item/generated", + "textures": { + "layer0": "basemetals:item/quartz_bolt" + } } diff --git a/src/main/resources/assets/basemetals/models/item/quartz_boots.json b/src/main/resources/assets/basemetals/models/item/quartz_boots.json index 027d5a96a..67311448e 100644 --- a/src/main/resources/assets/basemetals/models/item/quartz_boots.json +++ b/src/main/resources/assets/basemetals/models/item/quartz_boots.json @@ -1,6 +1,6 @@ { "parent": "item/generated", - "textures": { - "layer0": "basemetals:item/quartz_boots" - } + "textures": { + "layer0": "basemetals:item/quartz_boots" + } } diff --git a/src/main/resources/assets/basemetals/models/item/quartz_bow.json b/src/main/resources/assets/basemetals/models/item/quartz_bow.json index d2703441e..e4a7ce898 100644 --- a/src/main/resources/assets/basemetals/models/item/quartz_bow.json +++ b/src/main/resources/assets/basemetals/models/item/quartz_bow.json @@ -1,28 +1,28 @@ { - "parent": "item/bow", - "textures": { - "layer0": "basemetals:item/quartz_bow_standby" + "parent": "item/bow", + "textures": { + "layer0": "basemetals:item/quartz_bow_standby" + }, + "overrides": [ + { + "predicate": { + "pulling": 1 + }, + "model": "basemetals:item/quartz_bow_pulling_0" }, - "overrides": [ - { - "predicate": { - "pulling": 1 - }, - "model": "basemetals:item/quartz_bow_pulling_0" - }, - { - "predicate": { - "pulling": 1, - "pull": 0.65 - }, - "model": "basemetals:item/quartz_bow_pulling_1" - }, - { - "predicate": { - "pulling": 1, - "pull": 0.9 - }, - "model": "basemetals:item/quartz_bow_pulling_2" - } - ] + { + "predicate": { + "pulling": 1, + "pull": 0.65 + }, + "model": "basemetals:item/quartz_bow_pulling_1" + }, + { + "predicate": { + "pulling": 1, + "pull": 0.9 + }, + "model": "basemetals:item/quartz_bow_pulling_2" + } + ] } diff --git a/src/main/resources/assets/basemetals/models/item/quartz_bow_pulling_0.json b/src/main/resources/assets/basemetals/models/item/quartz_bow_pulling_0.json index a8bbcd690..feff58b73 100644 --- a/src/main/resources/assets/basemetals/models/item/quartz_bow_pulling_0.json +++ b/src/main/resources/assets/basemetals/models/item/quartz_bow_pulling_0.json @@ -1,6 +1,6 @@ { - "parent": "basemetals:item/quartz_bow", - "textures": { - "layer0": "basemetals:item/quartz_bow_pulling_0" - } + "parent": "basemetals:item/quartz_bow", + "textures": { + "layer0": "basemetals:item/quartz_bow_pulling_0" + } } diff --git a/src/main/resources/assets/basemetals/models/item/quartz_bow_pulling_1.json b/src/main/resources/assets/basemetals/models/item/quartz_bow_pulling_1.json index 0898b1f75..8c1c19eb4 100644 --- a/src/main/resources/assets/basemetals/models/item/quartz_bow_pulling_1.json +++ b/src/main/resources/assets/basemetals/models/item/quartz_bow_pulling_1.json @@ -1,6 +1,6 @@ { - "parent": "basemetals:item/quartz_bow", - "textures": { - "layer0": "basemetals:item/quartz_bow_pulling_1" - } + "parent": "basemetals:item/quartz_bow", + "textures": { + "layer0": "basemetals:item/quartz_bow_pulling_1" + } } diff --git a/src/main/resources/assets/basemetals/models/item/quartz_bow_pulling_2.json b/src/main/resources/assets/basemetals/models/item/quartz_bow_pulling_2.json index 0da88fef8..7e8c02c2a 100644 --- a/src/main/resources/assets/basemetals/models/item/quartz_bow_pulling_2.json +++ b/src/main/resources/assets/basemetals/models/item/quartz_bow_pulling_2.json @@ -1,6 +1,6 @@ { - "parent": "basemetals:item/quartz_bow", - "textures": { - "layer0": "basemetals:item/quartz_bow_pulling_2" - } + "parent": "basemetals:item/quartz_bow", + "textures": { + "layer0": "basemetals:item/quartz_bow_pulling_2" + } } diff --git a/src/main/resources/assets/basemetals/models/item/quartz_button.json b/src/main/resources/assets/basemetals/models/item/quartz_button.json index 1072e850f..92dd069b3 100644 --- a/src/main/resources/assets/basemetals/models/item/quartz_button.json +++ b/src/main/resources/assets/basemetals/models/item/quartz_button.json @@ -1,3 +1,3 @@ { - "parent": "basemetals:block/quartz_button_inventory" + "parent": "basemetals:block/quartz_button_inventory" } diff --git a/src/main/resources/assets/basemetals/models/item/quartz_chestplate.json b/src/main/resources/assets/basemetals/models/item/quartz_chestplate.json index 7e5ee8570..d5008c409 100644 --- a/src/main/resources/assets/basemetals/models/item/quartz_chestplate.json +++ b/src/main/resources/assets/basemetals/models/item/quartz_chestplate.json @@ -1,6 +1,6 @@ { "parent": "item/generated", - "textures": { - "layer0": "basemetals:item/quartz_chestplate" - } + "textures": { + "layer0": "basemetals:item/quartz_chestplate" + } } diff --git a/src/main/resources/assets/basemetals/models/item/quartz_crackhammer.json b/src/main/resources/assets/basemetals/models/item/quartz_crackhammer.json index 3133a41cb..672df7d28 100644 --- a/src/main/resources/assets/basemetals/models/item/quartz_crackhammer.json +++ b/src/main/resources/assets/basemetals/models/item/quartz_crackhammer.json @@ -1,6 +1,6 @@ { "parent": "item/handheld", - "textures": { - "layer0": "basemetals:item/quartz_crackhammer" - } + "textures": { + "layer0": "basemetals:item/quartz_crackhammer" + } } diff --git a/src/main/resources/assets/basemetals/models/item/quartz_crossbow.json b/src/main/resources/assets/basemetals/models/item/quartz_crossbow.json index 4c95b694a..7372b38c0 100644 --- a/src/main/resources/assets/basemetals/models/item/quartz_crossbow.json +++ b/src/main/resources/assets/basemetals/models/item/quartz_crossbow.json @@ -1,28 +1,41 @@ { - "parent": "item/bow", - "textures": { - "layer0": "basemetals:item/quartz_crossbow_standby" + "parent": "minecraft:item/crossbow", + "textures": { + "layer0": "basemetals:item/quartz_crossbow_standby" + }, + "overrides": [ + { + "predicate": { + "pulling": 1 + }, + "model": "basemetals:item/quartz_crossbow_pulling_0" }, - "overrides": [ - { - "predicate": { - "pulling": 1 - }, - "model": "basemetals:item/quartz_crossbow_pulling_0" - }, - { - "predicate": { - "pulling": 1, - "pull": 0.65 - }, - "model": "basemetals:item/quartz_crossbow_pulling_1" - }, - { - "predicate": { - "pulling": 1, - "pull": 0.9 - }, - "model": "basemetals:item/quartz_crossbow_pulling_2" - } - ] + { + "predicate": { + "pulling": 1, + "pull": 0.65 + }, + "model": "basemetals:item/quartz_crossbow_pulling_1" + }, + { + "predicate": { + "pulling": 1, + "pull": 0.9 + }, + "model": "basemetals:item/quartz_crossbow_pulling_2" + }, + { + "predicate": { + "charged": 1 + }, + "model": "basemetals:item/quartz_crossbow_arrow" + }, + { + "predicate": { + "charged": 1, + "firework": 1 + }, + "model": "basemetals:item/quartz_crossbow_firework" + } + ] } diff --git a/src/main/resources/assets/basemetals/models/item/quartz_crossbow_arrow.json b/src/main/resources/assets/basemetals/models/item/quartz_crossbow_arrow.json new file mode 100644 index 000000000..565625b5a --- /dev/null +++ b/src/main/resources/assets/basemetals/models/item/quartz_crossbow_arrow.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/crossbow", + "textures": { + "layer0": "basemetals:item/quartz_crossbow_pulling_2" + } +} diff --git a/src/main/resources/assets/basemetals/models/item/quartz_crossbow_firework.json b/src/main/resources/assets/basemetals/models/item/quartz_crossbow_firework.json new file mode 100644 index 000000000..565625b5a --- /dev/null +++ b/src/main/resources/assets/basemetals/models/item/quartz_crossbow_firework.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/crossbow", + "textures": { + "layer0": "basemetals:item/quartz_crossbow_pulling_2" + } +} diff --git a/src/main/resources/assets/basemetals/models/item/quartz_crossbow_pulling_0.json b/src/main/resources/assets/basemetals/models/item/quartz_crossbow_pulling_0.json index 702d72dd5..815d98536 100644 --- a/src/main/resources/assets/basemetals/models/item/quartz_crossbow_pulling_0.json +++ b/src/main/resources/assets/basemetals/models/item/quartz_crossbow_pulling_0.json @@ -1,6 +1,6 @@ { - "parent": "basemetals:item/quartz_crossbow", - "textures": { - "layer0": "basemetals:item/quartz_crossbow_pulling_0" - } + "parent": "basemetals:item/quartz_crossbow", + "textures": { + "layer0": "basemetals:item/quartz_crossbow_pulling_0" + } } diff --git a/src/main/resources/assets/basemetals/models/item/quartz_crossbow_pulling_1.json b/src/main/resources/assets/basemetals/models/item/quartz_crossbow_pulling_1.json index fd82aa7b4..e29696494 100644 --- a/src/main/resources/assets/basemetals/models/item/quartz_crossbow_pulling_1.json +++ b/src/main/resources/assets/basemetals/models/item/quartz_crossbow_pulling_1.json @@ -1,6 +1,6 @@ { - "parent": "basemetals:item/quartz_crossbow", - "textures": { - "layer0": "basemetals:item/quartz_crossbow_pulling_1" - } + "parent": "basemetals:item/quartz_crossbow", + "textures": { + "layer0": "basemetals:item/quartz_crossbow_pulling_1" + } } diff --git a/src/main/resources/assets/basemetals/models/item/quartz_crossbow_pulling_2.json b/src/main/resources/assets/basemetals/models/item/quartz_crossbow_pulling_2.json index 84629d4fe..f7a6dfcd8 100644 --- a/src/main/resources/assets/basemetals/models/item/quartz_crossbow_pulling_2.json +++ b/src/main/resources/assets/basemetals/models/item/quartz_crossbow_pulling_2.json @@ -1,6 +1,6 @@ { - "parent": "basemetals:item/quartz_crossbow", - "textures": { - "layer0": "basemetals:item/quartz_crossbow_pulling_2" - } + "parent": "basemetals:item/quartz_crossbow", + "textures": { + "layer0": "basemetals:item/quartz_crossbow_pulling_2" + } } diff --git a/src/main/resources/assets/basemetals/models/item/quartz_door.json b/src/main/resources/assets/basemetals/models/item/quartz_door.json index 69de7d211..dfbd2cc89 100644 --- a/src/main/resources/assets/basemetals/models/item/quartz_door.json +++ b/src/main/resources/assets/basemetals/models/item/quartz_door.json @@ -1,7 +1,7 @@ { - "parent": "basemetals:item/door_item", - "textures": { - "bottom": "basemetals:block/quartz_door_lower", - "top": "basemetals:block/quartz_door_upper" - } + "parent": "basemetals:item/door_item", + "textures": { + "bottom": "basemetals:block/quartz_door_lower", + "top": "basemetals:block/quartz_door_upper" + } } diff --git a/src/main/resources/assets/basemetals/models/item/quartz_fishing_rod.json b/src/main/resources/assets/basemetals/models/item/quartz_fishing_rod.json index f0d88a854..a21dbe143 100644 --- a/src/main/resources/assets/basemetals/models/item/quartz_fishing_rod.json +++ b/src/main/resources/assets/basemetals/models/item/quartz_fishing_rod.json @@ -1,14 +1,14 @@ { - "parent": "item/handheld_rod", - "textures": { - "layer0": "basemetals:item/quartz_fishing_rod_uncast" - }, - "overrides": [ - { - "predicate": { - "cast": 1 - }, - "model": "basemetals:item/quartz_fishing_rod_cast" - } - ] + "parent": "item/handheld_rod", + "textures": { + "layer0": "basemetals:item/quartz_fishing_rod_uncast" + }, + "overrides": [ + { + "predicate": { + "cast": 1 + }, + "model": "basemetals:item/quartz_fishing_rod_cast" + } + ] } diff --git a/src/main/resources/assets/basemetals/models/item/quartz_fishing_rod_cast.json b/src/main/resources/assets/basemetals/models/item/quartz_fishing_rod_cast.json index b97a4a43d..52c52dfb3 100644 --- a/src/main/resources/assets/basemetals/models/item/quartz_fishing_rod_cast.json +++ b/src/main/resources/assets/basemetals/models/item/quartz_fishing_rod_cast.json @@ -1,6 +1,6 @@ { - "parent": "item/fishing_rod", - "textures": { - "layer0": "basemetals:item/quartz_fishing_rod_cast" - } + "parent": "item/fishing_rod", + "textures": { + "layer0": "basemetals:item/quartz_fishing_rod_cast" + } } diff --git a/src/main/resources/assets/basemetals/models/item/quartz_gear.json b/src/main/resources/assets/basemetals/models/item/quartz_gear.json index 2cd9c2345..44287f413 100644 --- a/src/main/resources/assets/basemetals/models/item/quartz_gear.json +++ b/src/main/resources/assets/basemetals/models/item/quartz_gear.json @@ -1,6 +1,6 @@ { "parent": "item/generated", - "textures": { - "layer0": "basemetals:item/quartz_gear" - } + "textures": { + "layer0": "basemetals:item/quartz_gear" + } } diff --git a/src/main/resources/assets/basemetals/models/item/quartz_helmet.json b/src/main/resources/assets/basemetals/models/item/quartz_helmet.json index 8ccfe1b3a..084ca4b87 100644 --- a/src/main/resources/assets/basemetals/models/item/quartz_helmet.json +++ b/src/main/resources/assets/basemetals/models/item/quartz_helmet.json @@ -1,6 +1,6 @@ { "parent": "item/generated", - "textures": { - "layer0": "basemetals:item/quartz_helmet" - } + "textures": { + "layer0": "basemetals:item/quartz_helmet" + } } diff --git a/src/main/resources/assets/basemetals/models/item/quartz_hoe.json b/src/main/resources/assets/basemetals/models/item/quartz_hoe.json index 4c15aa01d..6ef831c87 100644 --- a/src/main/resources/assets/basemetals/models/item/quartz_hoe.json +++ b/src/main/resources/assets/basemetals/models/item/quartz_hoe.json @@ -1,6 +1,6 @@ { "parent": "item/handheld", - "textures": { - "layer0": "basemetals:item/quartz_hoe" - } + "textures": { + "layer0": "basemetals:item/quartz_hoe" + } } diff --git a/src/main/resources/assets/basemetals/models/item/quartz_horse_armor.json b/src/main/resources/assets/basemetals/models/item/quartz_horse_armor.json index a626fcc50..2ee87d927 100644 --- a/src/main/resources/assets/basemetals/models/item/quartz_horse_armor.json +++ b/src/main/resources/assets/basemetals/models/item/quartz_horse_armor.json @@ -1,6 +1,6 @@ { "parent": "item/generated", - "textures": { - "layer0": "basemetals:item/quartz_horse_armor" - } + "textures": { + "layer0": "basemetals:item/quartz_horse_armor" + } } diff --git a/src/main/resources/assets/basemetals/models/item/quartz_leggings.json b/src/main/resources/assets/basemetals/models/item/quartz_leggings.json index 3c0094ea3..93c129044 100644 --- a/src/main/resources/assets/basemetals/models/item/quartz_leggings.json +++ b/src/main/resources/assets/basemetals/models/item/quartz_leggings.json @@ -1,6 +1,6 @@ { "parent": "item/generated", - "textures": { - "layer0": "basemetals:item/quartz_leggings" - } + "textures": { + "layer0": "basemetals:item/quartz_leggings" + } } diff --git a/src/main/resources/assets/basemetals/models/item/quartz_lever.json b/src/main/resources/assets/basemetals/models/item/quartz_lever.json index 48424b112..917be899f 100644 --- a/src/main/resources/assets/basemetals/models/item/quartz_lever.json +++ b/src/main/resources/assets/basemetals/models/item/quartz_lever.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", - "textures": { - "layer0": "minecraft:block/lever" - } + "parent": "item/generated", + "textures": { + "layer0": "minecraft:block/lever" + } } diff --git a/src/main/resources/assets/basemetals/models/item/quartz_nugget.json b/src/main/resources/assets/basemetals/models/item/quartz_nugget.json index f173b1d16..15343d0e7 100644 --- a/src/main/resources/assets/basemetals/models/item/quartz_nugget.json +++ b/src/main/resources/assets/basemetals/models/item/quartz_nugget.json @@ -1,6 +1,6 @@ { "parent": "item/generated", - "textures": { - "layer0": "basemetals:item/quartz_nugget" - } + "textures": { + "layer0": "basemetals:item/quartz_nugget" + } } diff --git a/src/main/resources/assets/basemetals/models/item/quartz_pickaxe.json b/src/main/resources/assets/basemetals/models/item/quartz_pickaxe.json index 8985859fd..e7076bc45 100644 --- a/src/main/resources/assets/basemetals/models/item/quartz_pickaxe.json +++ b/src/main/resources/assets/basemetals/models/item/quartz_pickaxe.json @@ -1,6 +1,6 @@ { "parent": "item/handheld", - "textures": { - "layer0": "basemetals:item/quartz_pickaxe" - } + "textures": { + "layer0": "basemetals:item/quartz_pickaxe" + } } diff --git a/src/main/resources/assets/basemetals/models/item/quartz_powder.json b/src/main/resources/assets/basemetals/models/item/quartz_powder.json index 66faef155..0aa496ca1 100644 --- a/src/main/resources/assets/basemetals/models/item/quartz_powder.json +++ b/src/main/resources/assets/basemetals/models/item/quartz_powder.json @@ -1,6 +1,6 @@ { "parent": "item/generated", - "textures": { - "layer0": "basemetals:item/quartz_powder" - } + "textures": { + "layer0": "basemetals:item/quartz_powder" + } } diff --git a/src/main/resources/assets/basemetals/models/item/quartz_pressure_plate.json b/src/main/resources/assets/basemetals/models/item/quartz_pressure_plate.json index 39c5e6e7a..cea30d695 100644 --- a/src/main/resources/assets/basemetals/models/item/quartz_pressure_plate.json +++ b/src/main/resources/assets/basemetals/models/item/quartz_pressure_plate.json @@ -1,3 +1,3 @@ { - "parent": "basemetals:block/quartz_pressure_plate_up" + "parent": "basemetals:block/quartz_pressure_plate_up" } diff --git a/src/main/resources/assets/basemetals/models/item/quartz_rod.json b/src/main/resources/assets/basemetals/models/item/quartz_rod.json index e8af17d88..d55d8bcbd 100644 --- a/src/main/resources/assets/basemetals/models/item/quartz_rod.json +++ b/src/main/resources/assets/basemetals/models/item/quartz_rod.json @@ -1,6 +1,6 @@ { "parent": "item/generated", - "textures": { - "layer0": "basemetals:item/quartz_rod" - } + "textures": { + "layer0": "basemetals:item/quartz_rod" + } } diff --git a/src/main/resources/assets/basemetals/models/item/quartz_scythe.json b/src/main/resources/assets/basemetals/models/item/quartz_scythe.json index cdd473973..539c1cfe4 100644 --- a/src/main/resources/assets/basemetals/models/item/quartz_scythe.json +++ b/src/main/resources/assets/basemetals/models/item/quartz_scythe.json @@ -1,6 +1,6 @@ { "parent": "item/generated", - "textures": { - "layer0": "basemetals:item/quartz_scythe" - } + "textures": { + "layer0": "basemetals:item/quartz_scythe" + } } diff --git a/src/main/resources/assets/basemetals/models/item/quartz_shears.json b/src/main/resources/assets/basemetals/models/item/quartz_shears.json index b18589b6f..1a6f5c0d3 100644 --- a/src/main/resources/assets/basemetals/models/item/quartz_shears.json +++ b/src/main/resources/assets/basemetals/models/item/quartz_shears.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", - "textures": { - "layer0": "basemetals:item/quartz_shears" - } + "parent": "item/generated", + "textures": { + "layer0": "basemetals:item/quartz_shears" + } } diff --git a/src/main/resources/assets/basemetals/models/item/quartz_shield.json b/src/main/resources/assets/basemetals/models/item/quartz_shield.json index b0f5204f2..b7b50e561 100644 --- a/src/main/resources/assets/basemetals/models/item/quartz_shield.json +++ b/src/main/resources/assets/basemetals/models/item/quartz_shield.json @@ -3,12 +3,12 @@ "textures": { "shield": "minecraft:block/quartz_block_side" }, - "overrides": [ - { - "predicate": { - "blocking": 1 - }, - "model": "basemetals:item/quartz_shield_blocking" - } - ] + "overrides": [ + { + "predicate": { + "blocking": 1 + }, + "model": "basemetals:item/quartz_shield_blocking" + } + ] } diff --git a/src/main/resources/assets/basemetals/models/item/quartz_shield_blocking.json b/src/main/resources/assets/basemetals/models/item/quartz_shield_blocking.json index c08098658..148014844 100644 --- a/src/main/resources/assets/basemetals/models/item/quartz_shield_blocking.json +++ b/src/main/resources/assets/basemetals/models/item/quartz_shield_blocking.json @@ -2,5 +2,5 @@ "parent": "basemetals:item/shield_blocking", "textures": { "shield": "minecraft:block/quartz_block_side" - } + } } diff --git a/src/main/resources/assets/basemetals/models/item/quartz_shovel.json b/src/main/resources/assets/basemetals/models/item/quartz_shovel.json index 7b0c8ab55..d76d89a68 100644 --- a/src/main/resources/assets/basemetals/models/item/quartz_shovel.json +++ b/src/main/resources/assets/basemetals/models/item/quartz_shovel.json @@ -1,6 +1,6 @@ { "parent": "item/handheld", - "textures": { - "layer0": "basemetals:item/quartz_shovel" - } + "textures": { + "layer0": "basemetals:item/quartz_shovel" + } } diff --git a/src/main/resources/assets/basemetals/models/item/quartz_smallpowder.json b/src/main/resources/assets/basemetals/models/item/quartz_smallpowder.json index ebbd7d35e..2298ed127 100644 --- a/src/main/resources/assets/basemetals/models/item/quartz_smallpowder.json +++ b/src/main/resources/assets/basemetals/models/item/quartz_smallpowder.json @@ -1,6 +1,6 @@ { "parent": "item/generated", - "textures": { - "layer0": "basemetals:item/quartz_smallpowder" - } + "textures": { + "layer0": "basemetals:item/quartz_smallpowder" + } } diff --git a/src/main/resources/assets/basemetals/models/item/quartz_sword.json b/src/main/resources/assets/basemetals/models/item/quartz_sword.json index 63955d91c..29c4b9921 100644 --- a/src/main/resources/assets/basemetals/models/item/quartz_sword.json +++ b/src/main/resources/assets/basemetals/models/item/quartz_sword.json @@ -1,6 +1,6 @@ { "parent": "item/handheld", - "textures": { - "layer0": "basemetals:item/quartz_sword" - } + "textures": { + "layer0": "basemetals:item/quartz_sword" + } } diff --git a/src/main/resources/assets/basemetals/models/item/quartz_trapdoor.json b/src/main/resources/assets/basemetals/models/item/quartz_trapdoor.json index 839002c43..e590b19d2 100644 --- a/src/main/resources/assets/basemetals/models/item/quartz_trapdoor.json +++ b/src/main/resources/assets/basemetals/models/item/quartz_trapdoor.json @@ -1,3 +1,3 @@ { - "parent": "basemetals:block/quartz_trapdoor_bottom" + "parent": "basemetals:block/quartz_trapdoor_bottom" } diff --git a/src/main/resources/assets/basemetals/models/item/quartz_wall.json b/src/main/resources/assets/basemetals/models/item/quartz_wall.json index 15850f01f..1feb2ff64 100644 --- a/src/main/resources/assets/basemetals/models/item/quartz_wall.json +++ b/src/main/resources/assets/basemetals/models/item/quartz_wall.json @@ -1,3 +1,3 @@ { - "parent": "basemetals:block/quartz_wall_inventory" + "parent": "basemetals:block/quartz_wall_inventory" } diff --git a/src/main/resources/assets/basemetals/models/item/redstone_ingot.json b/src/main/resources/assets/basemetals/models/item/redstone_ingot.json index b999dc825..33d7b0ea5 100644 --- a/src/main/resources/assets/basemetals/models/item/redstone_ingot.json +++ b/src/main/resources/assets/basemetals/models/item/redstone_ingot.json @@ -1,6 +1,6 @@ { "parent": "item/generated", - "textures": { - "layer0": "basemetals:item/redstone_ingot" - } -} \ No newline at end of file + "textures": { + "layer0": "basemetals:item/redstone_ingot" + } +} diff --git a/src/main/resources/assets/basemetals/models/item/redstone_smallpowder.json b/src/main/resources/assets/basemetals/models/item/redstone_smallpowder.json index 408c8177c..ad0773c17 100644 --- a/src/main/resources/assets/basemetals/models/item/redstone_smallpowder.json +++ b/src/main/resources/assets/basemetals/models/item/redstone_smallpowder.json @@ -1,6 +1,6 @@ { "parent": "item/generated", - "textures": { - "layer0": "basemetals:item/redstone_smallpowder" - } + "textures": { + "layer0": "basemetals:item/redstone_smallpowder" + } } diff --git a/src/main/resources/assets/basemetals/models/item/stone_crackhammer.json b/src/main/resources/assets/basemetals/models/item/stone_crackhammer.json index b20af00b0..8d4447cb3 100644 --- a/src/main/resources/assets/basemetals/models/item/stone_crackhammer.json +++ b/src/main/resources/assets/basemetals/models/item/stone_crackhammer.json @@ -1,6 +1,6 @@ { "parent": "item/handheld", - "textures": { - "layer0": "basemetals:item/stone_crackhammer" - } + "textures": { + "layer0": "basemetals:item/stone_crackhammer" + } } diff --git a/src/main/resources/assets/basemetals/models/item/stone_gear.json b/src/main/resources/assets/basemetals/models/item/stone_gear.json index 69ad6db87..c1e4162c6 100644 --- a/src/main/resources/assets/basemetals/models/item/stone_gear.json +++ b/src/main/resources/assets/basemetals/models/item/stone_gear.json @@ -1,6 +1,6 @@ { "parent": "item/generated", - "textures": { - "layer0": "basemetals:item/stone_gear" - } + "textures": { + "layer0": "basemetals:item/stone_gear" + } } diff --git a/src/main/resources/assets/basemetals/models/item/stone_rod.json b/src/main/resources/assets/basemetals/models/item/stone_rod.json index 7a3959b49..84022e542 100644 --- a/src/main/resources/assets/basemetals/models/item/stone_rod.json +++ b/src/main/resources/assets/basemetals/models/item/stone_rod.json @@ -1,6 +1,6 @@ { "parent": "item/generated", - "textures": { - "layer0": "basemetals:item/stone_rod" - } -} \ No newline at end of file + "textures": { + "layer0": "basemetals:item/stone_rod" + } +} diff --git a/src/main/resources/assets/basemetals/models/item/stone_scythe.json b/src/main/resources/assets/basemetals/models/item/stone_scythe.json index 2001374c9..1eaa27ed5 100644 --- a/src/main/resources/assets/basemetals/models/item/stone_scythe.json +++ b/src/main/resources/assets/basemetals/models/item/stone_scythe.json @@ -1,6 +1,6 @@ { "parent": "item/generated", - "textures": { - "layer0": "basemetals:item/stone_scythe" - } + "textures": { + "layer0": "basemetals:item/stone_scythe" + } } diff --git a/src/main/resources/assets/basemetals/models/item/wood_crackhammer.json b/src/main/resources/assets/basemetals/models/item/wood_crackhammer.json index 5b866d73a..f0598411b 100644 --- a/src/main/resources/assets/basemetals/models/item/wood_crackhammer.json +++ b/src/main/resources/assets/basemetals/models/item/wood_crackhammer.json @@ -1,6 +1,6 @@ { "parent": "item/handheld", - "textures": { - "layer0": "basemetals:item/wood_crackhammer" - } + "textures": { + "layer0": "basemetals:item/wood_crackhammer" + } } diff --git a/src/main/resources/assets/basemetals/models/item/wood_gear.json b/src/main/resources/assets/basemetals/models/item/wood_gear.json index 0f4467cd0..cd6e9cc52 100644 --- a/src/main/resources/assets/basemetals/models/item/wood_gear.json +++ b/src/main/resources/assets/basemetals/models/item/wood_gear.json @@ -1,6 +1,6 @@ { "parent": "item/generated", - "textures": { - "layer0": "basemetals:item/wood_gear" - } + "textures": { + "layer0": "basemetals:item/wood_gear" + } } diff --git a/src/main/resources/assets/basemetals/models/item/wood_scythe.json b/src/main/resources/assets/basemetals/models/item/wood_scythe.json index 51a36541e..4b1c74e10 100644 --- a/src/main/resources/assets/basemetals/models/item/wood_scythe.json +++ b/src/main/resources/assets/basemetals/models/item/wood_scythe.json @@ -1,6 +1,6 @@ { "parent": "item/generated", - "textures": { - "layer0": "basemetals:item/wooden_scythe" - } + "textures": { + "layer0": "basemetals:item/wooden_scythe" + } } diff --git a/src/main/resources/assets/basemetals/textures/block/iron_block.png b/src/main/resources/assets/basemetals/textures/block/iron_block.png deleted file mode 100644 index b3dd4bd32..000000000 Binary files a/src/main/resources/assets/basemetals/textures/block/iron_block.png and /dev/null differ diff --git a/src/main/resources/assets/basemetals/textures/item/coal_powder.png b/src/main/resources/assets/basemetals/textures/item/carbon_dust.png similarity index 100% rename from src/main/resources/assets/basemetals/textures/item/coal_powder.png rename to src/main/resources/assets/basemetals/textures/item/carbon_dust.png diff --git a/src/main/resources/assets/basemetals/textures/item/charcoal_powder.png b/src/main/resources/assets/basemetals/textures/item/charcoal_powder.png deleted file mode 100644 index 5d79ddbd8..000000000 Binary files a/src/main/resources/assets/basemetals/textures/item/charcoal_powder.png and /dev/null differ diff --git a/src/main/resources/assets/basemetals/textures/item/charcoal_powder_alt.png b/src/main/resources/assets/basemetals/textures/item/charcoal_powder_alt.png deleted file mode 100644 index 9b2e63bcf..000000000 Binary files a/src/main/resources/assets/basemetals/textures/item/charcoal_powder_alt.png and /dev/null differ diff --git a/src/main/resources/assets/basemetals/textures/item/charcoal_smallpowder.png b/src/main/resources/assets/basemetals/textures/item/charcoal_smallpowder.png deleted file mode 100644 index 6e357d6bd..000000000 Binary files a/src/main/resources/assets/basemetals/textures/item/charcoal_smallpowder.png and /dev/null differ diff --git a/src/main/resources/assets/basemetals/textures/item/coal_powder_alt.png b/src/main/resources/assets/basemetals/textures/item/coal_powder_alt.png deleted file mode 100644 index 6cb499cca..000000000 Binary files a/src/main/resources/assets/basemetals/textures/item/coal_powder_alt.png and /dev/null differ diff --git a/src/main/resources/assets/basemetals/textures/item/emerald_bars.png b/src/main/resources/assets/basemetals/textures/item/emerald_bars.png deleted file mode 100644 index fb92fce56..000000000 Binary files a/src/main/resources/assets/basemetals/textures/item/emerald_bars.png and /dev/null differ diff --git a/src/main/resources/assets/basemetals/textures/item/gold_powder_alt.png b/src/main/resources/assets/basemetals/textures/item/gold_powder_alt.png deleted file mode 100644 index f45cdf3bb..000000000 Binary files a/src/main/resources/assets/basemetals/textures/item/gold_powder_alt.png and /dev/null differ diff --git a/src/main/resources/assets/basemetals/textures/item/iron_axe.png b/src/main/resources/assets/basemetals/textures/item/iron_axe.png deleted file mode 100644 index 2217429b3..000000000 Binary files a/src/main/resources/assets/basemetals/textures/item/iron_axe.png and /dev/null differ diff --git a/src/main/resources/assets/basemetals/textures/item/iron_boots.png b/src/main/resources/assets/basemetals/textures/item/iron_boots.png deleted file mode 100644 index b5f9ada3a..000000000 Binary files a/src/main/resources/assets/basemetals/textures/item/iron_boots.png and /dev/null differ diff --git a/src/main/resources/assets/basemetals/textures/item/iron_chestplate.png b/src/main/resources/assets/basemetals/textures/item/iron_chestplate.png deleted file mode 100644 index 62e62f47e..000000000 Binary files a/src/main/resources/assets/basemetals/textures/item/iron_chestplate.png and /dev/null differ diff --git a/src/main/resources/assets/basemetals/textures/item/iron_helmet.png b/src/main/resources/assets/basemetals/textures/item/iron_helmet.png deleted file mode 100644 index 01605eb40..000000000 Binary files a/src/main/resources/assets/basemetals/textures/item/iron_helmet.png and /dev/null differ diff --git a/src/main/resources/assets/basemetals/textures/item/iron_hoe.png b/src/main/resources/assets/basemetals/textures/item/iron_hoe.png deleted file mode 100644 index 0899064a1..000000000 Binary files a/src/main/resources/assets/basemetals/textures/item/iron_hoe.png and /dev/null differ diff --git a/src/main/resources/assets/basemetals/textures/item/iron_ingot.png b/src/main/resources/assets/basemetals/textures/item/iron_ingot.png deleted file mode 100644 index 404a2d274..000000000 Binary files a/src/main/resources/assets/basemetals/textures/item/iron_ingot.png and /dev/null differ diff --git a/src/main/resources/assets/basemetals/textures/item/iron_leggings.png b/src/main/resources/assets/basemetals/textures/item/iron_leggings.png deleted file mode 100644 index aebf7094d..000000000 Binary files a/src/main/resources/assets/basemetals/textures/item/iron_leggings.png and /dev/null differ diff --git a/src/main/resources/assets/basemetals/textures/item/iron_nugget.png b/src/main/resources/assets/basemetals/textures/item/iron_nugget.png deleted file mode 100644 index 4807a1228..000000000 Binary files a/src/main/resources/assets/basemetals/textures/item/iron_nugget.png and /dev/null differ diff --git a/src/main/resources/assets/basemetals/textures/item/iron_pickaxe.png b/src/main/resources/assets/basemetals/textures/item/iron_pickaxe.png deleted file mode 100644 index 39f1d8039..000000000 Binary files a/src/main/resources/assets/basemetals/textures/item/iron_pickaxe.png and /dev/null differ diff --git a/src/main/resources/assets/basemetals/textures/item/iron_powder_alt.png b/src/main/resources/assets/basemetals/textures/item/iron_powder_alt.png deleted file mode 100644 index 57a3b69bb..000000000 Binary files a/src/main/resources/assets/basemetals/textures/item/iron_powder_alt.png and /dev/null differ diff --git a/src/main/resources/assets/basemetals/textures/item/iron_shovel.png b/src/main/resources/assets/basemetals/textures/item/iron_shovel.png deleted file mode 100644 index d40cb46c4..000000000 Binary files a/src/main/resources/assets/basemetals/textures/item/iron_shovel.png and /dev/null differ diff --git a/src/main/resources/assets/basemetals/textures/item/iron_sword.png b/src/main/resources/assets/basemetals/textures/item/iron_sword.png deleted file mode 100644 index 51aa55eef..000000000 Binary files a/src/main/resources/assets/basemetals/textures/item/iron_sword.png and /dev/null differ diff --git a/src/main/resources/assets/basemetals/textures/item/quartz_bars.png b/src/main/resources/assets/basemetals/textures/item/quartz_bars.png deleted file mode 100644 index 13df50c38..000000000 Binary files a/src/main/resources/assets/basemetals/textures/item/quartz_bars.png and /dev/null differ diff --git a/src/main/resources/assets/basemetals/textures/models/armor/iron_layer_1.png b/src/main/resources/assets/basemetals/textures/models/armor/iron_layer_1.png deleted file mode 100644 index 7fe0c21a0..000000000 Binary files a/src/main/resources/assets/basemetals/textures/models/armor/iron_layer_1.png and /dev/null differ diff --git a/src/main/resources/assets/basemetals/textures/models/armor/iron_layer_2.png b/src/main/resources/assets/basemetals/textures/models/armor/iron_layer_2.png deleted file mode 100644 index f82f52c8f..000000000 Binary files a/src/main/resources/assets/basemetals/textures/models/armor/iron_layer_2.png and /dev/null differ diff --git a/src/main/resources/data/minecraft/tags/item/axes.json b/src/main/resources/data/minecraft/tags/item/axes.json index dae39eec7..dfe95878c 100644 --- a/src/main/resources/data/minecraft/tags/item/axes.json +++ b/src/main/resources/data/minecraft/tags/item/axes.json @@ -11,15 +11,12 @@ "basemetals:copper_axe", "basemetals:cupronickel_axe", "basemetals:electrum_axe", - "basemetals:emerald_axe", "basemetals:invar_axe", "basemetals:lead_axe", "basemetals:mithril_axe", "basemetals:nickel_axe", - "basemetals:obsidian_axe", "basemetals:pewter_axe", "basemetals:platinum_axe", - "basemetals:quartz_axe", "basemetals:silver_axe", "basemetals:starsteel_axe", "basemetals:steel_axe", diff --git a/src/main/resources/data/minecraft/tags/item/chest_armor.json b/src/main/resources/data/minecraft/tags/item/chest_armor.json index cdd0ad82c..9e1b90b59 100644 --- a/src/main/resources/data/minecraft/tags/item/chest_armor.json +++ b/src/main/resources/data/minecraft/tags/item/chest_armor.json @@ -11,15 +11,12 @@ "basemetals:copper_chestplate", "basemetals:cupronickel_chestplate", "basemetals:electrum_chestplate", - "basemetals:emerald_chestplate", "basemetals:invar_chestplate", "basemetals:lead_chestplate", "basemetals:mithril_chestplate", "basemetals:nickel_chestplate", - "basemetals:obsidian_chestplate", "basemetals:pewter_chestplate", "basemetals:platinum_chestplate", - "basemetals:quartz_chestplate", "basemetals:silver_chestplate", "basemetals:starsteel_chestplate", "basemetals:steel_chestplate", diff --git a/src/main/resources/data/minecraft/tags/item/enchantable/bow.json b/src/main/resources/data/minecraft/tags/item/enchantable/bow.json index e3c9eb22c..9dcf98892 100644 --- a/src/main/resources/data/minecraft/tags/item/enchantable/bow.json +++ b/src/main/resources/data/minecraft/tags/item/enchantable/bow.json @@ -10,19 +10,13 @@ "basemetals:coldiron_bow", "basemetals:copper_bow", "basemetals:cupronickel_bow", - "basemetals:diamond_bow", "basemetals:electrum_bow", - "basemetals:emerald_bow", - "basemetals:gold_bow", "basemetals:invar_bow", - "basemetals:iron_bow", "basemetals:lead_bow", "basemetals:mithril_bow", "basemetals:nickel_bow", - "basemetals:obsidian_bow", "basemetals:pewter_bow", "basemetals:platinum_bow", - "basemetals:quartz_bow", "basemetals:silver_bow", "basemetals:starsteel_bow", "basemetals:steel_bow", diff --git a/src/main/resources/data/minecraft/tags/item/enchantable/crossbow.json b/src/main/resources/data/minecraft/tags/item/enchantable/crossbow.json index 8a0408c4e..df12db65d 100644 --- a/src/main/resources/data/minecraft/tags/item/enchantable/crossbow.json +++ b/src/main/resources/data/minecraft/tags/item/enchantable/crossbow.json @@ -10,19 +10,13 @@ "basemetals:coldiron_crossbow", "basemetals:copper_crossbow", "basemetals:cupronickel_crossbow", - "basemetals:diamond_crossbow", "basemetals:electrum_crossbow", - "basemetals:emerald_crossbow", - "basemetals:gold_crossbow", "basemetals:invar_crossbow", - "basemetals:iron_crossbow", "basemetals:lead_crossbow", "basemetals:mithril_crossbow", "basemetals:nickel_crossbow", - "basemetals:obsidian_crossbow", "basemetals:pewter_crossbow", "basemetals:platinum_crossbow", - "basemetals:quartz_crossbow", "basemetals:silver_crossbow", "basemetals:starsteel_crossbow", "basemetals:steel_crossbow", diff --git a/src/main/resources/data/minecraft/tags/item/enchantable/durability.json b/src/main/resources/data/minecraft/tags/item/enchantable/durability.json index a36fb782b..7b4845edc 100644 --- a/src/main/resources/data/minecraft/tags/item/enchantable/durability.json +++ b/src/main/resources/data/minecraft/tags/item/enchantable/durability.json @@ -46,35 +46,16 @@ "basemetals:cupronickel_fishing_rod", "basemetals:cupronickel_shears", "basemetals:cupronickel_shield", - "basemetals:diamond_bow", - "basemetals:diamond_crossbow", - "basemetals:diamond_fishing_rod", - "basemetals:diamond_shears", - "basemetals:diamond_shield", "basemetals:electrum_bow", "basemetals:electrum_crossbow", "basemetals:electrum_fishing_rod", "basemetals:electrum_shears", "basemetals:electrum_shield", - "basemetals:emerald_bow", - "basemetals:emerald_crossbow", - "basemetals:emerald_fishing_rod", - "basemetals:emerald_shears", - "basemetals:emerald_shield", - "basemetals:gold_bow", - "basemetals:gold_crossbow", - "basemetals:gold_fishing_rod", - "basemetals:gold_shears", - "basemetals:gold_shield", "basemetals:invar_bow", "basemetals:invar_crossbow", "basemetals:invar_fishing_rod", "basemetals:invar_shears", "basemetals:invar_shield", - "basemetals:iron_bow", - "basemetals:iron_crossbow", - "basemetals:iron_fishing_rod", - "basemetals:iron_shield", "basemetals:lead_bow", "basemetals:lead_crossbow", "basemetals:lead_fishing_rod", @@ -90,11 +71,6 @@ "basemetals:nickel_fishing_rod", "basemetals:nickel_shears", "basemetals:nickel_shield", - "basemetals:obsidian_bow", - "basemetals:obsidian_crossbow", - "basemetals:obsidian_fishing_rod", - "basemetals:obsidian_shears", - "basemetals:obsidian_shield", "basemetals:pewter_bow", "basemetals:pewter_crossbow", "basemetals:pewter_fishing_rod", @@ -105,11 +81,6 @@ "basemetals:platinum_fishing_rod", "basemetals:platinum_shears", "basemetals:platinum_shield", - "basemetals:quartz_bow", - "basemetals:quartz_crossbow", - "basemetals:quartz_fishing_rod", - "basemetals:quartz_shears", - "basemetals:quartz_shield", "basemetals:silver_bow", "basemetals:silver_crossbow", "basemetals:silver_fishing_rod", diff --git a/src/main/resources/data/minecraft/tags/item/enchantable/fishing.json b/src/main/resources/data/minecraft/tags/item/enchantable/fishing.json index e061f14c1..0924db4d3 100644 --- a/src/main/resources/data/minecraft/tags/item/enchantable/fishing.json +++ b/src/main/resources/data/minecraft/tags/item/enchantable/fishing.json @@ -10,19 +10,13 @@ "basemetals:coldiron_fishing_rod", "basemetals:copper_fishing_rod", "basemetals:cupronickel_fishing_rod", - "basemetals:diamond_fishing_rod", "basemetals:electrum_fishing_rod", - "basemetals:emerald_fishing_rod", - "basemetals:gold_fishing_rod", "basemetals:invar_fishing_rod", - "basemetals:iron_fishing_rod", "basemetals:lead_fishing_rod", "basemetals:mithril_fishing_rod", "basemetals:nickel_fishing_rod", - "basemetals:obsidian_fishing_rod", "basemetals:pewter_fishing_rod", "basemetals:platinum_fishing_rod", - "basemetals:quartz_fishing_rod", "basemetals:silver_fishing_rod", "basemetals:starsteel_fishing_rod", "basemetals:steel_fishing_rod", diff --git a/src/main/resources/data/minecraft/tags/item/enchantable/mining.json b/src/main/resources/data/minecraft/tags/item/enchantable/mining.json index 162a04591..7c907de33 100644 --- a/src/main/resources/data/minecraft/tags/item/enchantable/mining.json +++ b/src/main/resources/data/minecraft/tags/item/enchantable/mining.json @@ -10,18 +10,13 @@ "basemetals:coldiron_shears", "basemetals:copper_shears", "basemetals:cupronickel_shears", - "basemetals:diamond_shears", "basemetals:electrum_shears", - "basemetals:emerald_shears", - "basemetals:gold_shears", "basemetals:invar_shears", "basemetals:lead_shears", "basemetals:mithril_shears", "basemetals:nickel_shears", - "basemetals:obsidian_shears", "basemetals:pewter_shears", "basemetals:platinum_shears", - "basemetals:quartz_shears", "basemetals:silver_shears", "basemetals:starsteel_shears", "basemetals:steel_shears", diff --git a/src/main/resources/data/minecraft/tags/item/foot_armor.json b/src/main/resources/data/minecraft/tags/item/foot_armor.json index 1da7c64e1..a01ac1c6b 100644 --- a/src/main/resources/data/minecraft/tags/item/foot_armor.json +++ b/src/main/resources/data/minecraft/tags/item/foot_armor.json @@ -11,15 +11,12 @@ "basemetals:copper_boots", "basemetals:cupronickel_boots", "basemetals:electrum_boots", - "basemetals:emerald_boots", "basemetals:invar_boots", "basemetals:lead_boots", "basemetals:mithril_boots", "basemetals:nickel_boots", - "basemetals:obsidian_boots", "basemetals:pewter_boots", "basemetals:platinum_boots", - "basemetals:quartz_boots", "basemetals:silver_boots", "basemetals:starsteel_boots", "basemetals:steel_boots", diff --git a/src/main/resources/data/minecraft/tags/item/head_armor.json b/src/main/resources/data/minecraft/tags/item/head_armor.json index 93d6a4049..8d8067e55 100644 --- a/src/main/resources/data/minecraft/tags/item/head_armor.json +++ b/src/main/resources/data/minecraft/tags/item/head_armor.json @@ -11,15 +11,12 @@ "basemetals:copper_helmet", "basemetals:cupronickel_helmet", "basemetals:electrum_helmet", - "basemetals:emerald_helmet", "basemetals:invar_helmet", "basemetals:lead_helmet", "basemetals:mithril_helmet", "basemetals:nickel_helmet", - "basemetals:obsidian_helmet", "basemetals:pewter_helmet", "basemetals:platinum_helmet", - "basemetals:quartz_helmet", "basemetals:silver_helmet", "basemetals:starsteel_helmet", "basemetals:steel_helmet", diff --git a/src/main/resources/data/minecraft/tags/item/hoes.json b/src/main/resources/data/minecraft/tags/item/hoes.json index cd1d9cee0..729ac860e 100644 --- a/src/main/resources/data/minecraft/tags/item/hoes.json +++ b/src/main/resources/data/minecraft/tags/item/hoes.json @@ -19,39 +19,28 @@ "basemetals:copper_scythe", "basemetals:cupronickel_hoe", "basemetals:cupronickel_scythe", - "basemetals:diamond_scythe", "basemetals:electrum_hoe", "basemetals:electrum_scythe", - "basemetals:emerald_hoe", - "basemetals:emerald_scythe", - "basemetals:gold_scythe", "basemetals:invar_hoe", "basemetals:invar_scythe", - "basemetals:iron_scythe", "basemetals:lead_hoe", "basemetals:lead_scythe", "basemetals:mithril_hoe", "basemetals:mithril_scythe", "basemetals:nickel_hoe", "basemetals:nickel_scythe", - "basemetals:obsidian_hoe", - "basemetals:obsidian_scythe", "basemetals:pewter_hoe", "basemetals:pewter_scythe", "basemetals:platinum_hoe", "basemetals:platinum_scythe", - "basemetals:quartz_hoe", - "basemetals:quartz_scythe", "basemetals:silver_hoe", "basemetals:silver_scythe", "basemetals:starsteel_hoe", "basemetals:starsteel_scythe", "basemetals:steel_hoe", "basemetals:steel_scythe", - "basemetals:stone_scythe", "basemetals:tin_hoe", "basemetals:tin_scythe", - "basemetals:wood_scythe", "basemetals:zinc_hoe", "basemetals:zinc_scythe" ] diff --git a/src/main/resources/data/minecraft/tags/item/leg_armor.json b/src/main/resources/data/minecraft/tags/item/leg_armor.json index a65b063aa..732ff385b 100644 --- a/src/main/resources/data/minecraft/tags/item/leg_armor.json +++ b/src/main/resources/data/minecraft/tags/item/leg_armor.json @@ -11,15 +11,12 @@ "basemetals:copper_leggings", "basemetals:cupronickel_leggings", "basemetals:electrum_leggings", - "basemetals:emerald_leggings", "basemetals:invar_leggings", "basemetals:lead_leggings", "basemetals:mithril_leggings", "basemetals:nickel_leggings", - "basemetals:obsidian_leggings", "basemetals:pewter_leggings", "basemetals:platinum_leggings", - "basemetals:quartz_leggings", "basemetals:silver_leggings", "basemetals:starsteel_leggings", "basemetals:steel_leggings", diff --git a/src/main/resources/data/minecraft/tags/item/pickaxes.json b/src/main/resources/data/minecraft/tags/item/pickaxes.json index bd80ac3cf..a82b5a433 100644 --- a/src/main/resources/data/minecraft/tags/item/pickaxes.json +++ b/src/main/resources/data/minecraft/tags/item/pickaxes.json @@ -19,39 +19,28 @@ "basemetals:copper_pickaxe", "basemetals:cupronickel_crackhammer", "basemetals:cupronickel_pickaxe", - "basemetals:diamond_crackhammer", "basemetals:electrum_crackhammer", "basemetals:electrum_pickaxe", - "basemetals:emerald_crackhammer", - "basemetals:emerald_pickaxe", - "basemetals:gold_crackhammer", "basemetals:invar_crackhammer", "basemetals:invar_pickaxe", - "basemetals:iron_crackhammer", "basemetals:lead_crackhammer", "basemetals:lead_pickaxe", "basemetals:mithril_crackhammer", "basemetals:mithril_pickaxe", "basemetals:nickel_crackhammer", "basemetals:nickel_pickaxe", - "basemetals:obsidian_crackhammer", - "basemetals:obsidian_pickaxe", "basemetals:pewter_crackhammer", "basemetals:pewter_pickaxe", "basemetals:platinum_crackhammer", "basemetals:platinum_pickaxe", - "basemetals:quartz_crackhammer", - "basemetals:quartz_pickaxe", "basemetals:silver_crackhammer", "basemetals:silver_pickaxe", "basemetals:starsteel_crackhammer", "basemetals:starsteel_pickaxe", "basemetals:steel_crackhammer", "basemetals:steel_pickaxe", - "basemetals:stone_crackhammer", "basemetals:tin_crackhammer", "basemetals:tin_pickaxe", - "basemetals:wood_crackhammer", "basemetals:zinc_crackhammer", "basemetals:zinc_pickaxe" ] diff --git a/src/main/resources/data/minecraft/tags/item/shovels.json b/src/main/resources/data/minecraft/tags/item/shovels.json index 9437085fa..e0271eeba 100644 --- a/src/main/resources/data/minecraft/tags/item/shovels.json +++ b/src/main/resources/data/minecraft/tags/item/shovels.json @@ -11,15 +11,12 @@ "basemetals:copper_shovel", "basemetals:cupronickel_shovel", "basemetals:electrum_shovel", - "basemetals:emerald_shovel", "basemetals:invar_shovel", "basemetals:lead_shovel", "basemetals:mithril_shovel", "basemetals:nickel_shovel", - "basemetals:obsidian_shovel", "basemetals:pewter_shovel", "basemetals:platinum_shovel", - "basemetals:quartz_shovel", "basemetals:silver_shovel", "basemetals:starsteel_shovel", "basemetals:steel_shovel", diff --git a/src/main/resources/data/minecraft/tags/item/swords.json b/src/main/resources/data/minecraft/tags/item/swords.json index 186b650bb..64ef9d0d5 100644 --- a/src/main/resources/data/minecraft/tags/item/swords.json +++ b/src/main/resources/data/minecraft/tags/item/swords.json @@ -11,15 +11,12 @@ "basemetals:copper_sword", "basemetals:cupronickel_sword", "basemetals:electrum_sword", - "basemetals:emerald_sword", "basemetals:invar_sword", "basemetals:lead_sword", "basemetals:mithril_sword", "basemetals:nickel_sword", - "basemetals:obsidian_sword", "basemetals:pewter_sword", "basemetals:platinum_sword", - "basemetals:quartz_sword", "basemetals:silver_sword", "basemetals:starsteel_sword", "basemetals:steel_sword", diff --git a/src/main/resources/mmdlib/extension/effects.json b/src/main/resources/mmdlib/extension/effects.json new file mode 100644 index 000000000..9e4e60d59 --- /dev/null +++ b/src/main/resources/mmdlib/extension/effects.json @@ -0,0 +1,26 @@ +{ + "events": [ + {"type": "player-tick", "id": "basemetals:adamantine_effects", "name": "Adamantine armor", + "handler": "zone.moddev.mc.basemetals.effects.MaterialEffects#adamantine"}, + {"type": "player-tick", "id": "basemetals:aquarium_effects", "name": "Aquarium armor", + "handler": "zone.moddev.mc.basemetals.effects.MaterialEffects#aquarium"}, + {"type": "player-tick", "id": "basemetals:coldiron_effects", "name": "Cold-iron armor", + "handler": "zone.moddev.mc.basemetals.effects.MaterialEffects#coldiron"}, + {"type": "player-tick", "id": "basemetals:lead_effects", "name": "Lead armor", + "handler": "zone.moddev.mc.basemetals.effects.MaterialEffects#lead"}, + {"type": "player-tick", "id": "basemetals:mithril_effects", "name": "Mithril armor", + "handler": "zone.moddev.mc.basemetals.effects.MaterialEffects#mithril"}, + {"type": "player-tick", "id": "basemetals:starsteel_effects", "name": "Starsteel armor and regeneration", + "handler": "zone.moddev.mc.basemetals.effects.MaterialEffects#starsteel"}, + {"type": "basemetals:melee-damage", "id": "basemetals:adamantine_melee", "name": "Adamantine weapons", + "handler": "zone.moddev.mc.basemetals.effects.MaterialEffects#adamantineMelee"}, + {"type": "basemetals:melee-damage", "id": "basemetals:aquarium_melee", "name": "Aquarium weapons", + "handler": "zone.moddev.mc.basemetals.effects.MaterialEffects#aquariumMelee"}, + {"type": "basemetals:melee-damage", "id": "basemetals:coldiron_melee", "name": "Cold-iron weapons", + "handler": "zone.moddev.mc.basemetals.effects.MaterialEffects#coldironMelee"}, + {"type": "basemetals:melee-damage", "id": "basemetals:mithril_melee", "name": "Mithril weapons", + "handler": "zone.moddev.mc.basemetals.effects.MaterialEffects#mithrilMelee"}, + {"type": "projectile-hit", "id": "basemetals:starsteel_shot", "name": "Starsteel ammunition", + "handler": "zone.moddev.mc.basemetals.effects.MaterialEffects#starsteelShot"} + ] +} diff --git a/src/main/resources/mmdlib/item/bucket.json b/src/main/resources/mmdlib/item/bucket.json new file mode 100644 index 000000000..900f8d0e0 --- /dev/null +++ b/src/main/resources/mmdlib/item/bucket.json @@ -0,0 +1,8 @@ +{ + "factory": "basemetals:bucket", + "template": { + "max_stack_size": 1, + "fire_resistant": false, + "container": "minecraft:bucket" + } +} diff --git a/src/main/resources/mmdlib/item/casing.json b/src/main/resources/mmdlib/item/casing.json new file mode 100644 index 000000000..d03d9e894 --- /dev/null +++ b/src/main/resources/mmdlib/item/casing.json @@ -0,0 +1,7 @@ +{ + "factory": "mmdlib:basic_item", + "template": { + "max_stack_size": 64, + "fire_resistant": false + } +} diff --git a/src/main/resources/mmdlib/item/crushed.json b/src/main/resources/mmdlib/item/crushed.json new file mode 100644 index 000000000..d03d9e894 --- /dev/null +++ b/src/main/resources/mmdlib/item/crushed.json @@ -0,0 +1,7 @@ +{ + "factory": "mmdlib:basic_item", + "template": { + "max_stack_size": 64, + "fire_resistant": false + } +} diff --git a/src/main/resources/mmdlib/item/crushed_purified.json b/src/main/resources/mmdlib/item/crushed_purified.json new file mode 100644 index 000000000..d03d9e894 --- /dev/null +++ b/src/main/resources/mmdlib/item/crushed_purified.json @@ -0,0 +1,7 @@ +{ + "factory": "mmdlib:basic_item", + "template": { + "max_stack_size": 64, + "fire_resistant": false + } +} diff --git a/src/main/resources/mmdlib/item/dense_plate.json b/src/main/resources/mmdlib/item/dense_plate.json new file mode 100644 index 000000000..d03d9e894 --- /dev/null +++ b/src/main/resources/mmdlib/item/dense_plate.json @@ -0,0 +1,7 @@ +{ + "factory": "mmdlib:basic_item", + "template": { + "max_stack_size": 64, + "fire_resistant": false + } +} diff --git a/src/main/resources/mmdlib/item/powder.json b/src/main/resources/mmdlib/item/powder.json new file mode 100644 index 000000000..d03d9e894 --- /dev/null +++ b/src/main/resources/mmdlib/item/powder.json @@ -0,0 +1,7 @@ +{ + "factory": "mmdlib:basic_item", + "template": { + "max_stack_size": 64, + "fire_resistant": false + } +} diff --git a/src/main/resources/mmdlib/item/raw.json b/src/main/resources/mmdlib/item/raw.json new file mode 100644 index 000000000..d03d9e894 --- /dev/null +++ b/src/main/resources/mmdlib/item/raw.json @@ -0,0 +1,7 @@ +{ + "factory": "mmdlib:basic_item", + "template": { + "max_stack_size": 64, + "fire_resistant": false + } +} diff --git a/src/main/resources/mmdlib/material/adamantine.json b/src/main/resources/mmdlib/material/adamantine.json new file mode 100644 index 000000000..235aa76ef --- /dev/null +++ b/src/main/resources/mmdlib/material/adamantine.json @@ -0,0 +1,33 @@ +{ + "type": "rare_ore", + "color": -11323073, + "hardness": 12, + "strength": 100, + "magic": 0, + "damage": 3, + "items": "ingot nugget basemetals:powder smallpowder basemetals:bucket basemetals:raw pickaxe axe shovel hoe sword crackhammer scythe shears fishing_rod bow crossbow shield arrow bolt rod gear horse_armor helmet chestplate leggings boots basemetals:casing basemetals:dense_plate basemetals:crushed basemetals:crushed_purified crystal shard clump powder_dirty", + "blocks": "block plate bars door trapdoor button slab double_slab lever pressure_plate stairs wall ore anvil", + "entities": "arrow bolt", + "has_fluid": false, + "special": { + "block_hardness": 24, + "blast_resistance": 2000 + }, + "runtime": { + "repair_item": "basemetals:adamantine_ingot", + "base_block": "basemetals:adamantine_block", + "incorrect_blocks": "minecraft:incorrect_for_netherite_tool", + "armor_texture": "basemetals:adamantine", + "block_set_type": "minecraft:iron", + "block_sound": "metal", + "map_color": "metal" + }, + "harvest_tags": [ + "minecraft:mineable/pickaxe", + "minecraft:needs_diamond_tool" + ], + "event": { + "player-tick": "basemetals:adamantine_effects", + "basemetals:melee-damage": "basemetals:adamantine_melee" + } +} diff --git a/src/main/resources/mmdlib/material/antimony.json b/src/main/resources/mmdlib/material/antimony.json new file mode 100644 index 000000000..0ea332c9c --- /dev/null +++ b/src/main/resources/mmdlib/material/antimony.json @@ -0,0 +1,28 @@ +{ + "type": "ore", + "color": -2563106, + "hardness": 1, + "strength": 1, + "magic": 1, + "damage": 0.3, + "items": "ingot nugget basemetals:powder smallpowder basemetals:bucket basemetals:raw pickaxe axe shovel hoe sword crackhammer scythe shears fishing_rod bow crossbow shield arrow bolt rod gear horse_armor helmet chestplate leggings boots basemetals:casing basemetals:dense_plate basemetals:crushed basemetals:crushed_purified crystal shard clump powder_dirty", + "blocks": "block plate bars door trapdoor button slab double_slab lever pressure_plate stairs wall ore", + "entities": "arrow bolt", + "has_fluid": false, + "special": { + "block_hardness": 2, + "blast_resistance": 2.5 + }, + "runtime": { + "repair_item": "basemetals:antimony_ingot", + "base_block": "basemetals:antimony_block", + "incorrect_blocks": "minecraft:incorrect_for_wooden_tool", + "armor_texture": "basemetals:antimony", + "block_set_type": "minecraft:iron", + "block_sound": "metal", + "map_color": "metal" + }, + "harvest_tags": [ + "minecraft:mineable/pickaxe" + ] +} diff --git a/src/main/resources/mmdlib/material/aquarium.json b/src/main/resources/mmdlib/material/aquarium.json new file mode 100644 index 000000000..a6fc494cf --- /dev/null +++ b/src/main/resources/mmdlib/material/aquarium.json @@ -0,0 +1,33 @@ +{ + "type": "rare_alloy", + "color": -16776961, + "hardness": 4, + "strength": 10, + "magic": 15, + "damage": 1, + "items": "ingot nugget basemetals:powder smallpowder basemetals:bucket blend smallblend pickaxe axe shovel hoe sword crackhammer scythe shears fishing_rod bow crossbow shield arrow bolt rod gear horse_armor helmet chestplate leggings boots", + "blocks": "block plate bars door trapdoor button slab double_slab lever pressure_plate stairs wall", + "entities": "arrow bolt", + "has_fluid": false, + "special": { + "block_hardness": 8, + "blast_resistance": 25 + }, + "runtime": { + "repair_item": "basemetals:aquarium_ingot", + "base_block": "basemetals:aquarium_block", + "incorrect_blocks": "minecraft:incorrect_for_stone_tool", + "armor_texture": "basemetals:aquarium", + "block_set_type": "minecraft:iron", + "block_sound": "metal", + "map_color": "metal" + }, + "harvest_tags": [ + "minecraft:mineable/pickaxe", + "minecraft:needs_stone_tool" + ], + "event": { + "player-tick": "basemetals:aquarium_effects", + "basemetals:melee-damage": "basemetals:aquarium_melee" + } +} diff --git a/src/main/resources/mmdlib/material/bismuth.json b/src/main/resources/mmdlib/material/bismuth.json new file mode 100644 index 000000000..3229ef20d --- /dev/null +++ b/src/main/resources/mmdlib/material/bismuth.json @@ -0,0 +1,28 @@ +{ + "type": "ore", + "color": -2238517, + "hardness": 1, + "strength": 1, + "magic": 1, + "damage": 0.3, + "items": "ingot nugget basemetals:powder smallpowder basemetals:bucket basemetals:raw pickaxe axe shovel hoe sword crackhammer scythe shears fishing_rod bow crossbow shield arrow bolt rod gear horse_armor helmet chestplate leggings boots basemetals:casing basemetals:dense_plate basemetals:crushed basemetals:crushed_purified crystal shard clump powder_dirty", + "blocks": "block plate bars door trapdoor button slab double_slab lever pressure_plate stairs wall ore", + "entities": "arrow bolt", + "has_fluid": false, + "special": { + "block_hardness": 2, + "blast_resistance": 2.5 + }, + "runtime": { + "repair_item": "basemetals:bismuth_ingot", + "base_block": "basemetals:bismuth_block", + "incorrect_blocks": "minecraft:incorrect_for_wooden_tool", + "armor_texture": "basemetals:bismuth", + "block_set_type": "minecraft:iron", + "block_sound": "metal", + "map_color": "metal" + }, + "harvest_tags": [ + "minecraft:mineable/pickaxe" + ] +} diff --git a/src/main/resources/mmdlib/material/brass.json b/src/main/resources/mmdlib/material/brass.json new file mode 100644 index 000000000..66d8c1ce0 --- /dev/null +++ b/src/main/resources/mmdlib/material/brass.json @@ -0,0 +1,29 @@ +{ + "type": "alloy", + "color": -7308, + "hardness": 3.5, + "strength": 3, + "magic": 9, + "damage": 0.9, + "items": "ingot nugget basemetals:powder smallpowder basemetals:bucket blend smallblend pickaxe axe shovel hoe sword crackhammer scythe shears fishing_rod bow crossbow shield arrow bolt rod gear horse_armor helmet chestplate leggings boots", + "blocks": "block plate bars door trapdoor button slab double_slab lever pressure_plate stairs wall", + "entities": "arrow bolt", + "has_fluid": false, + "special": { + "block_hardness": 7, + "blast_resistance": 7.5 + }, + "runtime": { + "repair_item": "basemetals:brass_ingot", + "base_block": "basemetals:brass_block", + "incorrect_blocks": "minecraft:incorrect_for_stone_tool", + "armor_texture": "basemetals:brass", + "block_set_type": "minecraft:iron", + "block_sound": "metal", + "map_color": "metal" + }, + "harvest_tags": [ + "minecraft:mineable/pickaxe", + "minecraft:needs_stone_tool" + ] +} diff --git a/src/main/resources/mmdlib/material/bronze.json b/src/main/resources/mmdlib/material/bronze.json new file mode 100644 index 000000000..6e2186750 --- /dev/null +++ b/src/main/resources/mmdlib/material/bronze.json @@ -0,0 +1,29 @@ +{ + "type": "alloy", + "color": -547505, + "hardness": 8, + "strength": 4, + "magic": 4.5, + "damage": 2, + "items": "ingot nugget basemetals:powder smallpowder basemetals:bucket blend smallblend pickaxe axe shovel hoe sword crackhammer scythe shears fishing_rod bow crossbow shield arrow bolt rod gear horse_armor helmet chestplate leggings boots", + "blocks": "block plate bars door trapdoor button slab double_slab lever pressure_plate stairs wall", + "entities": "arrow bolt", + "has_fluid": false, + "special": { + "block_hardness": 16, + "blast_resistance": 10 + }, + "runtime": { + "repair_item": "basemetals:bronze_ingot", + "base_block": "basemetals:bronze_block", + "incorrect_blocks": "minecraft:incorrect_for_iron_tool", + "armor_texture": "basemetals:bronze", + "block_set_type": "minecraft:iron", + "block_sound": "metal", + "map_color": "metal" + }, + "harvest_tags": [ + "minecraft:mineable/pickaxe", + "minecraft:needs_iron_tool" + ] +} diff --git a/src/main/resources/mmdlib/material/charcoal.json b/src/main/resources/mmdlib/material/charcoal.json new file mode 100644 index 000000000..24c3bf420 --- /dev/null +++ b/src/main/resources/mmdlib/material/charcoal.json @@ -0,0 +1,35 @@ +{ + "type": "mineral", + "color": -14475496, + "hardness": 4, + "strength": 4, + "magic": 2, + "damage": 1.0, + "items": "basemetals:powder nugget smallpowder basemetals:bucket", + "blocks": "block", + "entities": "", + "has_fluid": false, + "special": { + "viscosity": 13500, + "temperature": 1300, + "density": 2000, + "block_burn_time": 16000, + "block_hardness": 5, + "blast_resistance": 10.0, + "fuel_powder": 1600, + "fuel_smallpowder": 200, + "fuel_nugget": 200 + }, + "runtime": { + "repair_item": "minecraft:charcoal", + "base_block": "minecraft:coal_block", + "incorrect_blocks": "minecraft:incorrect_for_stone_tool", + "armor_texture": "minecraft:iron", + "block_set_type": "minecraft:iron", + "block_sound": "sand", + "map_color": "stone" + }, + "harvest_tags": [ + "minecraft:mineable/pickaxe" + ] +} diff --git a/src/main/resources/mmdlib/material/coal.json b/src/main/resources/mmdlib/material/coal.json new file mode 100644 index 000000000..1faa4e2be --- /dev/null +++ b/src/main/resources/mmdlib/material/coal.json @@ -0,0 +1,31 @@ +{ + "type": "mineral", + "color": -15395563, + "hardness": 4, + "strength": 4, + "magic": 2, + "damage": 1.0, + "items": "basemetals:powder nugget smallpowder basemetals:bucket", + "blocks": "", + "entities": "", + "has_fluid": false, + "special": { + "viscosity": 13500, + "temperature": 1300, + "density": 2000, + "block_hardness": 8, + "blast_resistance": 10.0, + "fuel_powder": 1600, + "fuel_smallpowder": 200, + "fuel_nugget": 200 + }, + "runtime": { + "repair_item": "minecraft:coal", + "base_block": "minecraft:coal_block", + "incorrect_blocks": "minecraft:incorrect_for_stone_tool", + "armor_texture": "minecraft:iron", + "block_set_type": "minecraft:iron", + "block_sound": "metal", + "map_color": "stone" + } +} diff --git a/src/main/resources/mmdlib/material/coldiron.json b/src/main/resources/mmdlib/material/coldiron.json new file mode 100644 index 000000000..e76354ae3 --- /dev/null +++ b/src/main/resources/mmdlib/material/coldiron.json @@ -0,0 +1,33 @@ +{ + "type": "rare_ore", + "color": -3682576, + "hardness": 7, + "strength": 7, + "magic": 7, + "damage": 1.8, + "items": "ingot nugget basemetals:powder smallpowder basemetals:bucket basemetals:raw pickaxe axe shovel hoe sword crackhammer scythe shears fishing_rod bow crossbow shield arrow bolt rod gear horse_armor helmet chestplate leggings boots basemetals:casing basemetals:dense_plate basemetals:crushed basemetals:crushed_purified crystal shard clump powder_dirty", + "blocks": "block plate bars door trapdoor button slab double_slab lever pressure_plate stairs wall ore", + "entities": "arrow bolt", + "has_fluid": false, + "special": { + "block_hardness": 14, + "blast_resistance": 17.5 + }, + "runtime": { + "repair_item": "basemetals:coldiron_ingot", + "base_block": "basemetals:coldiron_block", + "incorrect_blocks": "minecraft:incorrect_for_iron_tool", + "armor_texture": "basemetals:coldiron", + "block_set_type": "minecraft:iron", + "block_sound": "metal", + "map_color": "metal" + }, + "harvest_tags": [ + "minecraft:mineable/pickaxe", + "minecraft:needs_iron_tool" + ], + "event": { + "player-tick": "basemetals:coldiron_effects", + "basemetals:melee-damage": "basemetals:coldiron_melee" + } +} diff --git a/src/main/resources/mmdlib/material/copper.json b/src/main/resources/mmdlib/material/copper.json new file mode 100644 index 000000000..0ab827ced --- /dev/null +++ b/src/main/resources/mmdlib/material/copper.json @@ -0,0 +1,29 @@ +{ + "type": "ore", + "color": -24712, + "hardness": 4, + "strength": 4, + "magic": 5, + "damage": 1, + "items": "ingot nugget basemetals:powder smallpowder basemetals:bucket pickaxe axe shovel hoe sword crackhammer scythe shears fishing_rod bow crossbow shield arrow bolt rod gear horse_armor helmet chestplate leggings boots", + "blocks": "block plate bars door trapdoor button slab double_slab lever pressure_plate stairs wall ore", + "entities": "arrow bolt", + "has_fluid": false, + "special": { + "block_hardness": 8, + "blast_resistance": 10 + }, + "runtime": { + "repair_item": "basemetals:copper_ingot", + "base_block": "basemetals:copper_block", + "incorrect_blocks": "minecraft:incorrect_for_stone_tool", + "armor_texture": "basemetals:copper", + "block_set_type": "minecraft:iron", + "block_sound": "metal", + "map_color": "metal" + }, + "harvest_tags": [ + "minecraft:mineable/pickaxe", + "minecraft:needs_stone_tool" + ] +} diff --git a/src/main/resources/mmdlib/material/cupronickel.json b/src/main/resources/mmdlib/material/cupronickel.json new file mode 100644 index 000000000..9225216ae --- /dev/null +++ b/src/main/resources/mmdlib/material/cupronickel.json @@ -0,0 +1,29 @@ +{ + "type": "alloy", + "color": -3626129, + "hardness": 6, + "strength": 6, + "magic": 6, + "damage": 1.5, + "items": "ingot nugget basemetals:powder smallpowder basemetals:bucket blend smallblend pickaxe axe shovel hoe sword crackhammer scythe shears fishing_rod bow crossbow shield arrow bolt rod gear horse_armor helmet chestplate leggings boots", + "blocks": "block plate bars door trapdoor button slab double_slab lever pressure_plate stairs wall", + "entities": "arrow bolt", + "has_fluid": false, + "special": { + "block_hardness": 12, + "blast_resistance": 15 + }, + "runtime": { + "repair_item": "basemetals:cupronickel_ingot", + "base_block": "basemetals:cupronickel_block", + "incorrect_blocks": "minecraft:incorrect_for_iron_tool", + "armor_texture": "basemetals:cupronickel", + "block_set_type": "minecraft:iron", + "block_sound": "metal", + "map_color": "metal" + }, + "harvest_tags": [ + "minecraft:mineable/pickaxe", + "minecraft:needs_stone_tool" + ] +} diff --git a/src/main/resources/mmdlib/material/diamond.json b/src/main/resources/mmdlib/material/diamond.json new file mode 100644 index 000000000..e193b6794 --- /dev/null +++ b/src/main/resources/mmdlib/material/diamond.json @@ -0,0 +1,31 @@ +{ + "type": "gem", + "color": -7539487, + "hardness": 10, + "strength": 15, + "magic": 4, + "damage": 2.5, + "items": "arrow blend bolt bow crackhammer crossbow basemetals:powder fishing_rod gear nugget rod scythe shears shield smallblend smallpowder basemetals:bucket", + "blocks": "bars button door double_slab lever pressure_plate slab stairs trapdoor wall", + "entities": "arrow bolt", + "has_fluid": false, + "special": { + "viscosity": 19500, + "temperature": 1300, + "density": 2000, + "block_hardness": 20, + "blast_resistance": 37.5 + }, + "runtime": { + "repair_item": "minecraft:diamond", + "base_block": "minecraft:diamond_block", + "incorrect_blocks": "minecraft:incorrect_for_diamond_tool", + "armor_texture": "minecraft:iron", + "block_set_type": "minecraft:iron", + "block_sound": "glass", + "map_color": "stone" + }, + "harvest_tags": [ + "minecraft:mineable/pickaxe" + ] +} diff --git a/src/main/resources/mmdlib/material/electrum.json b/src/main/resources/mmdlib/material/electrum.json new file mode 100644 index 000000000..a4f8d7bc9 --- /dev/null +++ b/src/main/resources/mmdlib/material/electrum.json @@ -0,0 +1,29 @@ +{ + "type": "alloy", + "color": -3405, + "hardness": 5, + "strength": 4, + "magic": 10, + "damage": 1.3, + "items": "ingot nugget basemetals:powder smallpowder basemetals:bucket blend smallblend pickaxe axe shovel hoe sword crackhammer scythe shears fishing_rod bow crossbow shield arrow bolt rod gear horse_armor helmet chestplate leggings boots", + "blocks": "block plate bars door trapdoor button slab double_slab lever pressure_plate stairs wall", + "entities": "arrow bolt", + "has_fluid": false, + "special": { + "block_hardness": 10, + "blast_resistance": 10 + }, + "runtime": { + "repair_item": "basemetals:electrum_ingot", + "base_block": "basemetals:electrum_block", + "incorrect_blocks": "minecraft:incorrect_for_stone_tool", + "armor_texture": "basemetals:electrum", + "block_set_type": "minecraft:iron", + "block_sound": "metal", + "map_color": "metal" + }, + "harvest_tags": [ + "minecraft:mineable/pickaxe", + "minecraft:needs_stone_tool" + ] +} diff --git a/src/main/resources/mmdlib/material/emerald.json b/src/main/resources/mmdlib/material/emerald.json new file mode 100644 index 000000000..48f0849ce --- /dev/null +++ b/src/main/resources/mmdlib/material/emerald.json @@ -0,0 +1,33 @@ +{ + "type": "gem", + "color": -8194388, + "hardness": 10, + "strength": 15, + "magic": 4, + "damage": 2.5, + "items": "arrow axe bolt boots bow chestplate crackhammer crossbow basemetals:powder fishing_rod gear helmet hoe horse_armor leggings nugget pickaxe rod scythe shears shield shovel smallpowder sword basemetals:bucket", + "blocks": "bars button door double_slab lever pressure_plate slab stairs trapdoor wall", + "entities": "arrow bolt", + "has_fluid": false, + "special": { + "tool_durability": 660, + "viscosity": 19500, + "temperature": 1300, + "density": 2000, + "block_hardness": 20, + "blast_resistance": 37.5 + }, + "runtime": { + "repair_item": "minecraft:emerald", + "base_block": "minecraft:emerald_block", + "incorrect_blocks": "minecraft:incorrect_for_diamond_tool", + "armor_texture": "basemetals:emerald", + "block_set_type": "minecraft:iron", + "block_sound": "glass", + "map_color": "stone", + "tinted_armor": false + }, + "harvest_tags": [ + "minecraft:mineable/pickaxe" + ] +} diff --git a/src/main/resources/mmdlib/material/ender.json b/src/main/resources/mmdlib/material/ender.json new file mode 100644 index 000000000..5f66bc006 --- /dev/null +++ b/src/main/resources/mmdlib/material/ender.json @@ -0,0 +1,28 @@ +{ + "type": "gem", + "color": -16369359, + "hardness": 2, + "strength": 2, + "magic": 6, + "damage": 0.5, + "items": "basemetals:bucket", + "blocks": "", + "entities": "", + "has_fluid": false, + "special": { + "viscosity": 11000, + "temperature": 1300, + "density": 2000, + "block_hardness": 4, + "blast_resistance": 5.0 + }, + "runtime": { + "repair_item": "minecraft:ender_pearl", + "base_block": "minecraft:end_stone", + "incorrect_blocks": "minecraft:incorrect_for_wooden_tool", + "armor_texture": "minecraft:iron", + "block_set_type": "minecraft:iron", + "block_sound": "metal", + "map_color": "stone" + } +} diff --git a/src/main/resources/mmdlib/material/gold.json b/src/main/resources/mmdlib/material/gold.json new file mode 100644 index 000000000..ec86ce67b --- /dev/null +++ b/src/main/resources/mmdlib/material/gold.json @@ -0,0 +1,31 @@ +{ + "type": "metal", + "color": -117, + "hardness": 1, + "strength": 1, + "magic": 10, + "damage": 0.3, + "items": "arrow blend bolt bow crackhammer crossbow basemetals:powder fishing_rod gear rod scythe shears shield smallblend smallpowder basemetals:bucket", + "blocks": "bars button door double_slab lever plate slab stairs trapdoor wall", + "entities": "arrow bolt", + "has_fluid": false, + "special": { + "viscosity": 10500, + "temperature": 1300, + "density": 2000, + "block_hardness": 2, + "blast_resistance": 2.5 + }, + "runtime": { + "repair_item": "minecraft:gold_ingot", + "base_block": "minecraft:gold_block", + "incorrect_blocks": "minecraft:incorrect_for_wooden_tool", + "armor_texture": "minecraft:iron", + "block_set_type": "minecraft:iron", + "block_sound": "metal", + "map_color": "metal" + }, + "harvest_tags": [ + "minecraft:mineable/pickaxe" + ] +} diff --git a/src/main/resources/mmdlib/material/invar.json b/src/main/resources/mmdlib/material/invar.json new file mode 100644 index 000000000..29ae79177 --- /dev/null +++ b/src/main/resources/mmdlib/material/invar.json @@ -0,0 +1,29 @@ +{ + "type": "alloy", + "color": -2961992, + "hardness": 9, + "strength": 10, + "magic": 3, + "damage": 2.3, + "items": "ingot nugget basemetals:powder smallpowder basemetals:bucket blend smallblend pickaxe axe shovel hoe sword crackhammer scythe shears fishing_rod bow crossbow shield arrow bolt rod gear horse_armor helmet chestplate leggings boots", + "blocks": "block plate bars door trapdoor button slab double_slab lever pressure_plate stairs wall", + "entities": "arrow bolt", + "has_fluid": false, + "special": { + "block_hardness": 18, + "blast_resistance": 25 + }, + "runtime": { + "repair_item": "basemetals:invar_ingot", + "base_block": "basemetals:invar_block", + "incorrect_blocks": "minecraft:incorrect_for_diamond_tool", + "armor_texture": "basemetals:invar", + "block_set_type": "minecraft:iron", + "block_sound": "metal", + "map_color": "metal" + }, + "harvest_tags": [ + "minecraft:mineable/pickaxe", + "minecraft:needs_iron_tool" + ] +} diff --git a/src/main/resources/mmdlib/material/iron.json b/src/main/resources/mmdlib/material/iron.json new file mode 100644 index 000000000..c4d01be51 --- /dev/null +++ b/src/main/resources/mmdlib/material/iron.json @@ -0,0 +1,31 @@ +{ + "type": "metal", + "color": -2565928, + "hardness": 8, + "strength": 8, + "magic": 4.5, + "damage": 2.0, + "items": "arrow blend bolt bow crackhammer crossbow basemetals:powder fishing_rod gear rod scythe shield smallblend smallpowder basemetals:bucket", + "blocks": "button double_slab lever plate slab stairs wall", + "entities": "arrow bolt", + "has_fluid": false, + "special": { + "viscosity": 17000, + "temperature": 1300, + "density": 2000, + "block_hardness": 16, + "blast_resistance": 20.0 + }, + "runtime": { + "repair_item": "minecraft:iron_ingot", + "base_block": "minecraft:iron_block", + "incorrect_blocks": "minecraft:incorrect_for_iron_tool", + "armor_texture": "minecraft:iron", + "block_set_type": "minecraft:iron", + "block_sound": "metal", + "map_color": "metal" + }, + "harvest_tags": [ + "minecraft:mineable/pickaxe" + ] +} diff --git a/src/main/resources/mmdlib/material/lapis.json b/src/main/resources/mmdlib/material/lapis.json new file mode 100644 index 000000000..78958182b --- /dev/null +++ b/src/main/resources/mmdlib/material/lapis.json @@ -0,0 +1,25 @@ +{ + "type": "mineral", + "color": -14261860, + "hardness": 1, + "strength": 1, + "magic": 1, + "damage": 0.3, + "items": "smallpowder", + "blocks": "", + "entities": "", + "has_fluid": false, + "special": { + "block_hardness": 2, + "blast_resistance": 2.5 + }, + "runtime": { + "repair_item": "minecraft:lapis_lazuli", + "base_block": "minecraft:lapis_block", + "incorrect_blocks": "minecraft:incorrect_for_wooden_tool", + "armor_texture": "minecraft:iron", + "block_set_type": "minecraft:iron", + "block_sound": "metal", + "map_color": "stone" + } +} diff --git a/src/main/resources/mmdlib/material/lead.json b/src/main/resources/mmdlib/material/lead.json new file mode 100644 index 000000000..89f277cab --- /dev/null +++ b/src/main/resources/mmdlib/material/lead.json @@ -0,0 +1,31 @@ +{ + "type": "ore", + "color": -8684677, + "hardness": 1, + "strength": 1, + "magic": 1, + "damage": 0.3, + "items": "ingot nugget basemetals:powder smallpowder basemetals:bucket basemetals:raw pickaxe axe shovel hoe sword crackhammer scythe shears fishing_rod bow crossbow shield arrow bolt rod gear horse_armor helmet chestplate leggings boots", + "blocks": "block plate bars door trapdoor button slab double_slab lever pressure_plate stairs wall ore", + "entities": "arrow bolt", + "has_fluid": false, + "special": { + "block_hardness": 2, + "blast_resistance": 2.5 + }, + "runtime": { + "repair_item": "basemetals:lead_ingot", + "base_block": "basemetals:lead_block", + "incorrect_blocks": "minecraft:incorrect_for_wooden_tool", + "armor_texture": "basemetals:lead", + "block_set_type": "minecraft:iron", + "block_sound": "metal", + "map_color": "metal" + }, + "harvest_tags": [ + "minecraft:mineable/pickaxe" + ], + "event": { + "player-tick": "basemetals:lead_effects" + } +} diff --git a/src/main/resources/mmdlib/material/mercury.json b/src/main/resources/mmdlib/material/mercury.json new file mode 100644 index 000000000..871fb1ff7 --- /dev/null +++ b/src/main/resources/mmdlib/material/mercury.json @@ -0,0 +1,28 @@ +{ + "type": "mercury", + "color": -1907998, + "hardness": 1, + "strength": 1, + "magic": 1, + "damage": 0.3, + "items": "ingot nugget basemetals:powder smallpowder basemetals:bucket basemetals:raw", + "blocks": "ore", + "entities": "", + "has_fluid": false, + "special": { + "block_hardness": 2, + "blast_resistance": 2.5 + }, + "runtime": { + "repair_item": "basemetals:mercury_ingot", + "base_block": "minecraft:iron_block", + "incorrect_blocks": "minecraft:incorrect_for_wooden_tool", + "armor_texture": "basemetals:mercury", + "block_set_type": "minecraft:iron", + "block_sound": "metal", + "map_color": "metal" + }, + "harvest_tags": [ + "minecraft:mineable/pickaxe" + ] +} diff --git a/src/main/resources/mmdlib/material/mithril.json b/src/main/resources/mmdlib/material/mithril.json new file mode 100644 index 000000000..ba3499b47 --- /dev/null +++ b/src/main/resources/mmdlib/material/mithril.json @@ -0,0 +1,33 @@ +{ + "type": "rare_alloy", + "color": -720897, + "hardness": 9, + "strength": 9, + "magic": 9, + "damage": 2.3, + "items": "ingot nugget basemetals:powder smallpowder basemetals:bucket blend smallblend pickaxe axe shovel hoe sword crackhammer scythe shears fishing_rod bow crossbow shield arrow bolt rod gear horse_armor helmet chestplate leggings boots", + "blocks": "block plate bars door trapdoor button slab double_slab lever pressure_plate stairs wall", + "entities": "arrow bolt", + "has_fluid": false, + "special": { + "block_hardness": 18, + "blast_resistance": 22.5 + }, + "runtime": { + "repair_item": "basemetals:mithril_ingot", + "base_block": "basemetals:mithril_block", + "incorrect_blocks": "minecraft:incorrect_for_diamond_tool", + "armor_texture": "basemetals:mithril", + "block_set_type": "minecraft:iron", + "block_sound": "metal", + "map_color": "metal" + }, + "harvest_tags": [ + "minecraft:mineable/pickaxe", + "minecraft:needs_iron_tool" + ], + "event": { + "player-tick": "basemetals:mithril_effects", + "basemetals:melee-damage": "basemetals:mithril_melee" + } +} diff --git a/src/main/resources/mmdlib/material/nickel.json b/src/main/resources/mmdlib/material/nickel.json new file mode 100644 index 000000000..3064d08ba --- /dev/null +++ b/src/main/resources/mmdlib/material/nickel.json @@ -0,0 +1,29 @@ +{ + "type": "ore", + "color": -1114133, + "hardness": 4, + "strength": 4, + "magic": 7, + "damage": 1, + "items": "ingot nugget basemetals:powder smallpowder basemetals:bucket basemetals:raw pickaxe axe shovel hoe sword crackhammer scythe shears fishing_rod bow crossbow shield arrow bolt rod gear horse_armor helmet chestplate leggings boots basemetals:casing basemetals:dense_plate basemetals:crushed basemetals:crushed_purified crystal shard clump powder_dirty", + "blocks": "block plate bars door trapdoor button slab double_slab lever pressure_plate stairs wall ore", + "entities": "arrow bolt", + "has_fluid": false, + "special": { + "block_hardness": 8, + "blast_resistance": 10 + }, + "runtime": { + "repair_item": "basemetals:nickel_ingot", + "base_block": "basemetals:nickel_block", + "incorrect_blocks": "minecraft:incorrect_for_stone_tool", + "armor_texture": "basemetals:nickel", + "block_set_type": "minecraft:iron", + "block_sound": "metal", + "map_color": "metal" + }, + "harvest_tags": [ + "minecraft:mineable/pickaxe", + "minecraft:needs_stone_tool" + ] +} diff --git a/src/main/resources/mmdlib/material/obsidian.json b/src/main/resources/mmdlib/material/obsidian.json new file mode 100644 index 000000000..3a2bae03a --- /dev/null +++ b/src/main/resources/mmdlib/material/obsidian.json @@ -0,0 +1,32 @@ +{ + "type": "rock", + "color": -15724519, + "hardness": 10, + "strength": 15, + "magic": 4, + "damage": 2.5, + "items": "arrow axe bolt boots bow chestplate crackhammer crossbow basemetals:powder fishing_rod gear helmet hoe horse_armor ingot leggings nugget pickaxe rod scythe shears shield shovel smallpowder sword basemetals:bucket", + "blocks": "bars button door double_slab lever pressure_plate slab stairs trapdoor wall", + "entities": "arrow bolt", + "has_fluid": false, + "special": { + "viscosity": 19500, + "temperature": 1300, + "density": 2000, + "block_hardness": 20, + "blast_resistance": 37.5 + }, + "runtime": { + "repair_item": "minecraft:obsidian", + "base_block": "minecraft:obsidian", + "incorrect_blocks": "minecraft:incorrect_for_diamond_tool", + "armor_texture": "basemetals:obsidian", + "block_set_type": "minecraft:iron", + "block_sound": "glass", + "map_color": "stone", + "tinted_armor": false + }, + "harvest_tags": [ + "minecraft:mineable/pickaxe" + ] +} diff --git a/src/main/resources/mmdlib/material/pewter.json b/src/main/resources/mmdlib/material/pewter.json new file mode 100644 index 000000000..67b593805 --- /dev/null +++ b/src/main/resources/mmdlib/material/pewter.json @@ -0,0 +1,28 @@ +{ + "type": "alloy", + "color": -7170401, + "hardness": 1, + "strength": 1, + "magic": 1, + "damage": 0.3, + "items": "ingot nugget basemetals:powder smallpowder basemetals:bucket blend smallblend pickaxe axe shovel hoe sword crackhammer scythe shears fishing_rod bow crossbow shield arrow bolt rod gear horse_armor helmet chestplate leggings boots", + "blocks": "block plate bars door trapdoor button slab double_slab lever pressure_plate stairs wall", + "entities": "arrow bolt", + "has_fluid": false, + "special": { + "block_hardness": 2, + "blast_resistance": 2.5 + }, + "runtime": { + "repair_item": "basemetals:pewter_ingot", + "base_block": "basemetals:pewter_block", + "incorrect_blocks": "minecraft:incorrect_for_wooden_tool", + "armor_texture": "basemetals:pewter", + "block_set_type": "minecraft:iron", + "block_sound": "metal", + "map_color": "metal" + }, + "harvest_tags": [ + "minecraft:mineable/pickaxe" + ] +} diff --git a/src/main/resources/mmdlib/material/platinum.json b/src/main/resources/mmdlib/material/platinum.json new file mode 100644 index 000000000..4f899e292 --- /dev/null +++ b/src/main/resources/mmdlib/material/platinum.json @@ -0,0 +1,28 @@ +{ + "type": "rare_ore", + "color": -851969, + "hardness": 3, + "strength": 5, + "magic": 15, + "damage": 0.8, + "items": "ingot nugget basemetals:powder smallpowder basemetals:bucket basemetals:raw pickaxe axe shovel hoe sword crackhammer scythe shears fishing_rod bow crossbow shield arrow bolt rod gear horse_armor helmet chestplate leggings boots basemetals:casing basemetals:dense_plate basemetals:crushed basemetals:crushed_purified crystal shard clump powder_dirty", + "blocks": "block plate bars door trapdoor button slab double_slab lever pressure_plate stairs wall ore", + "entities": "arrow bolt", + "has_fluid": false, + "special": { + "block_hardness": 6, + "blast_resistance": 12.5 + }, + "runtime": { + "repair_item": "basemetals:platinum_ingot", + "base_block": "basemetals:platinum_block", + "incorrect_blocks": "minecraft:incorrect_for_stone_tool", + "armor_texture": "basemetals:platinum", + "block_set_type": "minecraft:iron", + "block_sound": "metal", + "map_color": "metal" + }, + "harvest_tags": [ + "minecraft:mineable/pickaxe" + ] +} diff --git a/src/main/resources/mmdlib/material/prismarine.json b/src/main/resources/mmdlib/material/prismarine.json new file mode 100644 index 000000000..265760d8b --- /dev/null +++ b/src/main/resources/mmdlib/material/prismarine.json @@ -0,0 +1,28 @@ +{ + "type": "mineral", + "color": -8406876, + "hardness": 1, + "strength": 1, + "magic": 1, + "damage": 0.3, + "items": "basemetals:bucket", + "blocks": "", + "entities": "", + "has_fluid": false, + "special": { + "viscosity": 10500, + "temperature": 1300, + "density": 2000, + "block_hardness": 2, + "blast_resistance": 2.5 + }, + "runtime": { + "repair_item": "minecraft:prismarine_shard", + "base_block": "minecraft:prismarine", + "incorrect_blocks": "minecraft:incorrect_for_wooden_tool", + "armor_texture": "minecraft:iron", + "block_set_type": "minecraft:iron", + "block_sound": "metal", + "map_color": "stone" + } +} diff --git a/src/main/resources/mmdlib/material/quartz.json b/src/main/resources/mmdlib/material/quartz.json new file mode 100644 index 000000000..97795fccd --- /dev/null +++ b/src/main/resources/mmdlib/material/quartz.json @@ -0,0 +1,33 @@ +{ + "type": "gem", + "color": -1383461, + "hardness": 5, + "strength": 4, + "magic": 2, + "damage": 1.3, + "items": "arrow axe bolt boots bow chestplate crackhammer crossbow basemetals:powder fishing_rod gear helmet hoe horse_armor leggings nugget pickaxe rod scythe shears shield shovel smallpowder sword basemetals:bucket", + "blocks": "bars button door lever pressure_plate trapdoor wall", + "entities": "arrow bolt", + "has_fluid": false, + "special": { + "viscosity": 14000, + "temperature": 1300, + "density": 2000, + "block_hardness": 10, + "blast_resistance": 10.0, + "storage_block_dust": 4 + }, + "runtime": { + "repair_item": "minecraft:quartz", + "base_block": "minecraft:quartz_block", + "incorrect_blocks": "minecraft:incorrect_for_stone_tool", + "armor_texture": "basemetals:quartz", + "block_set_type": "minecraft:stone", + "block_sound": "glass", + "map_color": "stone", + "tinted_armor": false + }, + "harvest_tags": [ + "minecraft:mineable/pickaxe" + ] +} diff --git a/src/main/resources/mmdlib/material/redstone.json b/src/main/resources/mmdlib/material/redstone.json new file mode 100644 index 000000000..cb203c965 --- /dev/null +++ b/src/main/resources/mmdlib/material/redstone.json @@ -0,0 +1,28 @@ +{ + "type": "mineral", + "color": -9306112, + "hardness": 1, + "strength": 1, + "magic": 1, + "damage": 0.3, + "items": "ingot smallpowder basemetals:bucket", + "blocks": "", + "entities": "", + "has_fluid": false, + "special": { + "viscosity": 10500, + "temperature": 1300, + "density": 2000, + "block_hardness": 2, + "blast_resistance": 2.5 + }, + "runtime": { + "repair_item": "minecraft:redstone", + "base_block": "minecraft:redstone_block", + "incorrect_blocks": "minecraft:incorrect_for_wooden_tool", + "armor_texture": "minecraft:iron", + "block_set_type": "minecraft:iron", + "block_sound": "metal", + "map_color": "stone" + } +} diff --git a/src/main/resources/mmdlib/material/silver.json b/src/main/resources/mmdlib/material/silver.json new file mode 100644 index 000000000..da33af5f9 --- /dev/null +++ b/src/main/resources/mmdlib/material/silver.json @@ -0,0 +1,29 @@ +{ + "type": "ore", + "color": -1, + "hardness": 5, + "strength": 4, + "magic": 6, + "damage": 1.3, + "items": "ingot nugget basemetals:powder smallpowder basemetals:bucket basemetals:raw pickaxe axe shovel hoe sword crackhammer scythe shears fishing_rod bow crossbow shield arrow bolt rod gear horse_armor helmet chestplate leggings boots", + "blocks": "block plate bars door trapdoor button slab double_slab lever pressure_plate stairs wall ore", + "entities": "arrow bolt", + "has_fluid": false, + "special": { + "block_hardness": 10, + "blast_resistance": 10 + }, + "runtime": { + "repair_item": "basemetals:silver_ingot", + "base_block": "basemetals:silver_block", + "incorrect_blocks": "minecraft:incorrect_for_stone_tool", + "armor_texture": "basemetals:silver", + "block_set_type": "minecraft:iron", + "block_sound": "metal", + "map_color": "metal" + }, + "harvest_tags": [ + "minecraft:mineable/pickaxe", + "minecraft:needs_stone_tool" + ] +} diff --git a/src/main/resources/mmdlib/material/starsteel.json b/src/main/resources/mmdlib/material/starsteel.json new file mode 100644 index 000000000..b78c079b2 --- /dev/null +++ b/src/main/resources/mmdlib/material/starsteel.json @@ -0,0 +1,33 @@ +{ + "type": "rare_ore", + "color": -11323073, + "hardness": 10, + "strength": 25, + "magic": 12, + "damage": 2.5, + "items": "ingot nugget basemetals:powder smallpowder basemetals:bucket basemetals:raw pickaxe axe shovel hoe sword crackhammer scythe shears fishing_rod bow crossbow shield arrow bolt rod gear horse_armor helmet chestplate leggings boots basemetals:casing basemetals:dense_plate basemetals:crushed basemetals:crushed_purified crystal shard clump powder_dirty", + "blocks": "block plate bars door trapdoor button slab double_slab lever pressure_plate stairs wall ore", + "entities": "arrow bolt", + "has_fluid": false, + "special": { + "block_hardness": 20, + "blast_resistance": 2000 + }, + "runtime": { + "repair_item": "basemetals:starsteel_ingot", + "base_block": "basemetals:starsteel_block", + "incorrect_blocks": "minecraft:incorrect_for_diamond_tool", + "armor_texture": "basemetals:starsteel", + "block_set_type": "minecraft:iron", + "block_sound": "metal", + "map_color": "metal" + }, + "harvest_tags": [ + "minecraft:mineable/pickaxe", + "minecraft:needs_diamond_tool" + ], + "event": { + "player-tick": "basemetals:starsteel_effects", + "projectile-hit": "basemetals:starsteel_shot" + } +} diff --git a/src/main/resources/mmdlib/material/steel.json b/src/main/resources/mmdlib/material/steel.json new file mode 100644 index 000000000..9261f1e4e --- /dev/null +++ b/src/main/resources/mmdlib/material/steel.json @@ -0,0 +1,29 @@ +{ + "type": "alloy", + "color": -2759707, + "hardness": 8, + "strength": 15, + "magic": 2, + "damage": 2, + "items": "ingot nugget basemetals:powder smallpowder basemetals:bucket blend smallblend pickaxe axe shovel hoe sword crackhammer scythe shears fishing_rod bow crossbow shield arrow bolt rod gear horse_armor helmet chestplate leggings boots", + "blocks": "block plate bars door trapdoor button slab double_slab lever pressure_plate stairs wall anvil", + "entities": "arrow bolt", + "has_fluid": false, + "special": { + "block_hardness": 16, + "blast_resistance": 37.5 + }, + "runtime": { + "repair_item": "basemetals:steel_ingot", + "base_block": "basemetals:steel_block", + "incorrect_blocks": "minecraft:incorrect_for_iron_tool", + "armor_texture": "basemetals:steel", + "block_set_type": "minecraft:iron", + "block_sound": "metal", + "map_color": "metal" + }, + "harvest_tags": [ + "minecraft:mineable/pickaxe", + "minecraft:needs_iron_tool" + ] +} diff --git a/src/main/resources/mmdlib/material/stone.json b/src/main/resources/mmdlib/material/stone.json new file mode 100644 index 000000000..f840b85c1 --- /dev/null +++ b/src/main/resources/mmdlib/material/stone.json @@ -0,0 +1,25 @@ +{ + "type": "rock", + "color": -7368817, + "hardness": 5, + "strength": 4, + "magic": 2, + "damage": 1.3, + "items": "crackhammer gear rod scythe", + "blocks": "", + "entities": "", + "has_fluid": false, + "special": { + "block_hardness": 10, + "blast_resistance": 10.0 + }, + "runtime": { + "repair_item": "minecraft:cobblestone", + "base_block": "minecraft:stone", + "incorrect_blocks": "minecraft:incorrect_for_stone_tool", + "armor_texture": "minecraft:iron", + "block_set_type": "minecraft:iron", + "block_sound": "metal", + "map_color": "stone" + } +} diff --git a/src/main/resources/mmdlib/material/tin.json b/src/main/resources/mmdlib/material/tin.json new file mode 100644 index 000000000..7674bc4e4 --- /dev/null +++ b/src/main/resources/mmdlib/material/tin.json @@ -0,0 +1,28 @@ +{ + "type": "ore", + "color": -2066, + "hardness": 3, + "strength": 1, + "magic": 2, + "damage": 0.8, + "items": "ingot nugget basemetals:powder smallpowder basemetals:bucket basemetals:raw pickaxe axe shovel hoe sword crackhammer scythe shears fishing_rod bow crossbow shield arrow bolt rod gear horse_armor helmet chestplate leggings boots", + "blocks": "block plate bars door trapdoor button slab double_slab lever pressure_plate stairs wall ore", + "entities": "arrow bolt", + "has_fluid": false, + "special": { + "block_hardness": 6, + "blast_resistance": 2.5 + }, + "runtime": { + "repair_item": "basemetals:tin_ingot", + "base_block": "basemetals:tin_block", + "incorrect_blocks": "minecraft:incorrect_for_stone_tool", + "armor_texture": "basemetals:tin", + "block_set_type": "minecraft:iron", + "block_sound": "metal", + "map_color": "metal" + }, + "harvest_tags": [ + "minecraft:mineable/pickaxe" + ] +} diff --git a/src/main/resources/mmdlib/material/wood.json b/src/main/resources/mmdlib/material/wood.json new file mode 100644 index 000000000..48ee93c7a --- /dev/null +++ b/src/main/resources/mmdlib/material/wood.json @@ -0,0 +1,26 @@ +{ + "type": "wood", + "color": -9874381, + "hardness": 2, + "strength": 2, + "magic": 6, + "damage": 0.5, + "items": "crackhammer gear scythe", + "blocks": "", + "entities": "", + "has_fluid": false, + "special": { + "item_burn_time": 300, + "block_hardness": 4, + "blast_resistance": 5.0 + }, + "runtime": { + "repair_item": "minecraft:oak_planks", + "base_block": "minecraft:oak_planks", + "incorrect_blocks": "minecraft:incorrect_for_wooden_tool", + "armor_texture": "minecraft:iron", + "block_set_type": "minecraft:iron", + "block_sound": "metal", + "map_color": "stone" + } +} diff --git a/src/main/resources/mmdlib/material/zinc.json b/src/main/resources/mmdlib/material/zinc.json new file mode 100644 index 000000000..c92af9a25 --- /dev/null +++ b/src/main/resources/mmdlib/material/zinc.json @@ -0,0 +1,28 @@ +{ + "type": "ore", + "color": -4408132, + "hardness": 1, + "strength": 1, + "magic": 1, + "damage": 0.3, + "items": "ingot nugget basemetals:powder smallpowder basemetals:bucket basemetals:raw pickaxe axe shovel hoe sword crackhammer scythe shears fishing_rod bow crossbow shield arrow bolt rod gear horse_armor helmet chestplate leggings boots basemetals:casing basemetals:dense_plate basemetals:crushed basemetals:crushed_purified crystal shard clump powder_dirty", + "blocks": "block plate bars door trapdoor button slab double_slab lever pressure_plate stairs wall ore", + "entities": "arrow bolt", + "has_fluid": false, + "special": { + "block_hardness": 2, + "blast_resistance": 2.5 + }, + "runtime": { + "repair_item": "basemetals:zinc_ingot", + "base_block": "basemetals:zinc_block", + "incorrect_blocks": "minecraft:incorrect_for_wooden_tool", + "armor_texture": "basemetals:zinc", + "block_set_type": "minecraft:iron", + "block_sound": "metal", + "map_color": "metal" + }, + "harvest_tags": [ + "minecraft:mineable/pickaxe" + ] +} diff --git a/src/main/resources/mmdlib/standalone/block/human_detector.json b/src/main/resources/mmdlib/standalone/block/human_detector.json new file mode 100644 index 000000000..bb73c386a --- /dev/null +++ b/src/main/resources/mmdlib/standalone/block/human_detector.json @@ -0,0 +1,26 @@ +{ + "module": "mmdlib:pressure_plate", + "factory_data": { + "detects": "players", + "block_set_type": "minecraft:stone" + }, + "template": { + "properties": { + "hardness": 5.0, + "blast_resistance": 5.0, + "requires_correct_tool": false, + "collision": false, + "occlusion": false, + "sound": "metal", + "map_color": "metal" + }, + "tags": [ + "minecraft:pressure_plates", + "minecraft:mineable/pickaxe" + ] + }, + "runtime": { + "base_block": "minecraft:bricks", + "block_set_type": "minecraft:stone" + } +} diff --git a/src/main/resources/mmdlib/standalone/block/stone_anvil.json b/src/main/resources/mmdlib/standalone/block/stone_anvil.json new file mode 100644 index 000000000..08fdd6f19 --- /dev/null +++ b/src/main/resources/mmdlib/standalone/block/stone_anvil.json @@ -0,0 +1,24 @@ +{ + "module": "mmdlib:anvil", + "template": { + "properties": { + "hardness": 5.0, + "blast_resistance": 10.0, + "requires_correct_tool": true, + "sound": "stone", + "map_color": "stone" + }, + "has_item": true, + "tags": [ + "minecraft:anvil", + "minecraft:mineable/pickaxe", + "minecraft:needs_stone_tool" + ], + "events": { + "block-right-click": "mmdlib:open_menu" + } + }, + "runtime": { + "base_block": "minecraft:stone" + } +} diff --git a/src/main/resources/META-INF/neoforge.mods.toml b/src/main/templates/META-INF/neoforge.mods.toml similarity index 86% rename from src/main/resources/META-INF/neoforge.mods.toml rename to src/main/templates/META-INF/neoforge.mods.toml index 81467cb24..1e114e9a2 100644 --- a/src/main/resources/META-INF/neoforge.mods.toml +++ b/src/main/templates/META-INF/neoforge.mods.toml @@ -1,5 +1,5 @@ modLoader="javafml" -loaderVersion="${loader_version_range}" +loaderVersion="*" license="${mod_license}" issueTrackerURL="https://github.com/MinecraftModDevelopmentMods/BaseMetals/issues" @@ -18,17 +18,24 @@ versionRange="[4.0.16.121012,5.0.0)" ordering="AFTER" side="BOTH" +[[dependencies.${mod_id}]] +modId="mmdlib" +type="required" +versionRange="[2.0.1,)" +ordering="AFTER" +side="BOTH" + [[dependencies.${mod_id}]] modId="neoforge" type="required" -versionRange="${neo_version_range}" +versionRange="[${neo_version},)" ordering="NONE" side="BOTH" [[dependencies.${mod_id}]] modId="minecraft" type="required" -versionRange="${minecraft_version_range}" +versionRange="[${minecraft_version},)" ordering="NONE" side="BOTH" diff --git a/tools/import_mmdlib_vanilla.py b/tools/import_mmdlib_vanilla.py new file mode 100644 index 000000000..a8b576284 --- /dev/null +++ b/tools/import_mmdlib_vanilla.py @@ -0,0 +1,203 @@ +#!/usr/bin/env python3 +"""Import MMDLib's vanilla material extensions into Base Metals. + +MMDLib carried the vanilla extensions (iron crackhammers, diamond doors, emerald +armour and so on) while its 2.0 API was being dogfooded. They are Base Metals +content, so this copies them back: + +* material definitions from ``src/main/resources/mmdlib/material`` (copper is + skipped: Base Metals defines its own full copper material); +* the static blockstates, models and textures they use, from + ``src/main/resources/assets/mmdlib``. + +While copying, ``mmdlib:`` resource locations become ``basemetals:``, MMDLib's +``dust`` form becomes Base Metals' ``powder`` (the 1.12 IDs), and molten metal +moves to Base Metals' own fluids (``has_fluid`` false plus the +``basemetals:bucket`` item form) for the 11 materials 1.12 melted; lapis, stone +and wood have no molten form. Recipes, tags, loot and names are produced by +Base Metals' datagen, not copied. + +Usage: python3 tools/import_mmdlib_vanilla.py [--mmdlib ../MMDLib] [--check] +""" +import argparse +import json +import re +import shutil +import sys +from pathlib import Path + +SKIPPED_MATERIALS = {"copper"} +# 1.12 Base Metals never had these molten; MMDLib's example gave every material a fluid. +NOT_MOLTEN = {"lapis", "stone", "wood"} +BLOCK_STATE_KEYS = ("model",) + + +def main(): + repo = Path(__file__).resolve().parents[1] + parser = argparse.ArgumentParser(description=__doc__, formatter_class=argparse.RawDescriptionHelpFormatter) + parser.add_argument("--mmdlib", type=Path, default=repo.parent / "MMDLib", help="MMDLib checkout") + parser.add_argument("--check", action="store_true", help="report differences without writing") + args = parser.parse_args() + + source = args.mmdlib / "src/main/resources" + target = repo / "src/main/resources" + materials = sorted(p.stem for p in (source / "mmdlib/material").glob("*.json") + if p.stem not in SKIPPED_MATERIALS) + dust = re.compile(r"\b(" + "|".join(materials) + r")_dust\b") + + def rename_path(path): + return dust.sub(r"\1_powder", path) + + def rename_location(value): + if not isinstance(value, str) or not value.startswith("mmdlib:"): + return value + return "basemetals:" + rename_path(value[len("mmdlib:"):]) + + def rewrite(value): + if isinstance(value, dict): + return {key: rewrite(item) for key, item in value.items()} + if isinstance(value, list): + return [rewrite(item) for item in value] + return rename_location(value) + + writes = {} # target path -> bytes + problems = [] + + def emit(relative, data): + writes[target / relative] = data + + # Material definitions. + for name in materials: + definition = json.loads((source / f"mmdlib/material/{name}.json").read_text()) + items = definition.get("items", "").split() + items = ["basemetals:powder" if item in ("dust", "powder") else item for item in items] + if definition.get("has_fluid", True) and name not in NOT_MOLTEN: + items.append("basemetals:bucket") + definition["items"] = " ".join(items) + definition["has_fluid"] = False + special = definition.get("special", {}) + if name in NOT_MOLTEN: + special = {key: value for key, value in special.items() + if key not in ("viscosity", "temperature", "density")} + definition["special"] = special + if "fuel_dust" in special: + special = {("fuel_powder" if key == "fuel_dust" else key): value for key, value in special.items()} + definition["special"] = special + definition = rewrite(definition) + emit(f"mmdlib/material/{name}.json", (json.dumps(definition, indent=2) + "\n").encode()) + + # Client assets: walk blockstates and item models of the materials' content. + assets = source / "assets/mmdlib" + pending = [] + for state in sorted((assets / "blockstates").glob("*.json")): + if owner(state.stem, materials) and not state.stem.endswith("_molten"): + pending.append(("blockstates", state.stem)) + for model in sorted((assets / "models/item").glob("*.json")): + stem = model.stem + if owner(stem, materials) and "_molten" not in stem: + pending.append(("models", "item/" + stem)) + for name in materials: + for layer in (1, 2): + if (assets / f"textures/models/armor/{name}_layer_{layer}.png").exists(): + pending.append(("textures", f"models/armor/{name}_layer_{layer}")) + if (assets / f"textures/entity/horse/armor/horse_armor_{name}.png").exists(): + pending.append(("textures", f"entity/horse/armor/horse_armor_{name}")) + + seen = set() + while pending: + kind, path = pending.pop() + if (kind, path) in seen: + continue + seen.add((kind, path)) + if kind == "textures": + png = assets / f"textures/{path}.png" + if not png.exists(): + problems.append(f"missing texture mmdlib:{path}") + continue + emit(f"assets/basemetals/textures/{rename_path(path)}.png", png.read_bytes()) + meta = png.with_name(png.name + ".mcmeta") + if meta.exists(): + emit(f"assets/basemetals/textures/{rename_path(path)}.png.mcmeta", meta.read_bytes()) + continue + file = assets / f"{kind}/{path}.json" + if not file.exists(): + problems.append(f"missing {kind} mmdlib:{path}") + continue + data = json.loads(file.read_text()) + for reference_kind, reference in references(kind, data): + if reference.startswith("mmdlib:"): + pending.append((reference_kind, reference[len("mmdlib:"):])) + emit(f"assets/basemetals/{kind}/{rename_path(path)}.json", + (json.dumps(rewrite(data), indent=2) + "\n").encode()) + + # Never overwrite Base Metals' own files with different content. + for path, data in sorted(writes.items()): + if path.exists() and not same(path, data) and not path.relative_to(target).parts[0] == "mmdlib": + problems.append(f"would overwrite different file {path.relative_to(repo)}") + + if problems: + print("\n".join(problems), file=sys.stderr) + raise SystemExit(1) + + changed = [path for path, data in writes.items() if not path.exists() or not same(path, data)] + if args.check: + for path in sorted(changed): + print(f"out of date: {path.relative_to(repo)}") + raise SystemExit(1 if changed else 0) + for path in changed: + path.parent.mkdir(parents=True, exist_ok=True) + path.write_bytes(writes[path]) + print(f"{len(materials)} materials, {len(writes)} files ({len(changed)} written)") + + +def same(path, data): + """Equal content; JSON is compared by value so formatting alone is no change.""" + existing = path.read_bytes() + if existing == data: + return True + if path.suffix == ".json": + return json.loads(existing) == json.loads(data) + return False + + +def owner(stem, materials): + """The material a resource belongs to, by its leading name.""" + for name in materials: + if stem.startswith(name + "_") or stem.startswith("half_slab_" + name) \ + or stem.startswith("upper_slab_" + name): + return name + return None + + +def references(kind, data): + """Models and textures named by a blockstate or model.""" + found = [] + + def walk(value): + if isinstance(value, dict): + for key, item in value.items(): + if key == "model" and isinstance(item, str): + found.append(("models", item)) + else: + walk(item) + elif isinstance(value, list): + for item in value: + walk(item) + + if kind == "blockstates": + walk(data) + return found + parent = data.get("parent") + if isinstance(parent, str): + found.append(("models", parent)) + for texture in data.get("textures", {}).values(): + if isinstance(texture, str) and ":" in texture and not texture.startswith("#"): + found.append(("textures", texture)) + for override in data.get("overrides", []): + if isinstance(override.get("model"), str): + found.append(("models", override["model"])) + return found + + +if __name__ == "__main__": + main() diff --git a/update.json b/update.json index 2a0f339ba..1502f18e2 100644 --- a/update.json +++ b/update.json @@ -1,5 +1,5 @@ { - "homepage": "http://minecraft.curseforge.com/projects/base-metals", + "homepage": "https://curseforge.com/minecraft/mc-mods/base-metals", "promos": { "1.11.2-latest": "0.0.0", "1.11-latest": "0.0.0",