diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4297c86a..e871d480 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,230 +1,72 @@ -name: Modern Metals 1.12 CI +name: Modern Metals 1.13.2 CI on: push: - branches: - - master-1.12 - - 'feature/**' + branches: [master-1.13.2, 'feature/**'] pull_request: - branches: - - master-1.12 + branches: [master-1.13.2] permissions: contents: read concurrency: - group: modernmetals-1.12-${{ github.workflow }}-${{ github.ref }} + group: modernmetals-113-${{ github.workflow }}-${{ github.ref }} cancel-in-progress: true jobs: - cold-forge-bootstrap: - name: Cold Forge bootstrap - runs-on: ubuntu-latest - timeout-minutes: 75 - - steps: - - name: Check out source - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7 - - - name: Install pinned Java 25 ForgeGradle Mavenizer runtime - uses: actions/setup-java@b6effb05e454b25005698d916606bdc6ffcbf961 # v5 - with: - distribution: temurin - java-version: '25.0.3+9.0.LTS' - - - name: Install pinned Java 8 compilation toolchain - uses: actions/setup-java@b6effb05e454b25005698d916606bdc6ffcbf961 # v5 - with: - distribution: temurin - java-version: '8.0.502+7' - - - name: Install pinned Java 17 Gradle runtime - uses: actions/setup-java@b6effb05e454b25005698d916606bdc6ffcbf961 # v5 - with: - distribution: temurin - java-version: '17.0.1+12' - - - name: Stage checksum-verified legacy dependencies - id: dependencies - shell: bash - run: | - set -euo pipefail - mirror="$RUNNER_TEMP/legacy-dependency-mirror" - bash gradle/stage-legacy-dependencies.sh "$mirror" - echo "repository=$mirror" >> "$GITHUB_OUTPUT" - - - name: Bootstrap Forge from an empty cache - shell: bash - env: - GRADLE_USER_HOME: ${{ runner.temp }}/modernmetals-cold-gradle - run: | - set -euo pipefail - test ! -e .gradle - test ! -e "$GRADLE_USER_HOME" - mkdir -p "$GRADLE_USER_HOME" - chmod +x ./gradlew - gradle_args=( - classes verifyReleaseDependencies - -PlegacyDependencyVerificationRepository="${{ steps.dependencies.outputs.repository }}" - --no-daemon --no-build-cache --stacktrace --max-workers=2 - -Porg.gradle.java.installations.paths="$JAVA_HOME,$JAVA_HOME_8_X64,$JAVA_HOME_25_X64" - -Porg.gradle.java.installations.auto-detect=false - -Porg.gradle.java.installations.auto-download=false - ) - ./gradlew "${gradle_args[@]}" - - - name: Verify same-cache bootstrap offline - shell: bash - env: - GRADLE_USER_HOME: ${{ runner.temp }}/modernmetals-cold-gradle - run: | - set -euo pipefail - gradle_args=( - classes verifyReleaseDependencies - -PlegacyDependencyVerificationRepository="${{ steps.dependencies.outputs.repository }}" - --rerun-tasks --offline --no-daemon --no-build-cache --stacktrace --max-workers=2 - -Porg.gradle.java.installations.paths="$JAVA_HOME,$JAVA_HOME_8_X64,$JAVA_HOME_25_X64" - -Porg.gradle.java.installations.auto-detect=false - -Porg.gradle.java.installations.auto-download=false - ) - ./gradlew "${gradle_args[@]}" - build: name: Build, test, and audit runs-on: ubuntu-latest - timeout-minutes: 90 - + timeout-minutes: 35 steps: - name: Check out source uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7 - - - name: Install pinned Java 25 ForgeGradle Mavenizer runtime + - name: Validate the Gradle wrapper + uses: gradle/actions/wrapper-validation@9c971963bec38e04b3d30dcc455b5382be2fdbfb # v6 + - name: Install Java 25 for Mavenizer uses: actions/setup-java@b6effb05e454b25005698d916606bdc6ffcbf961 # v5 with: distribution: temurin java-version: '25.0.3+9.0.LTS' - - - name: Install pinned Java 8 compilation and runtime toolchain + - name: Install Java 8 for compilation uses: actions/setup-java@b6effb05e454b25005698d916606bdc6ffcbf961 # v5 with: distribution: temurin java-version: '8.0.502+7' - - - name: Install pinned Java 17 Gradle runtime + - name: Install Java 17 for Gradle uses: actions/setup-java@b6effb05e454b25005698d916606bdc6ffcbf961 # v5 with: distribution: temurin java-version: '17.0.1+12' - - name: Set up Gradle uses: gradle/actions/setup-gradle@9c971963bec38e04b3d30dcc455b5382be2fdbfb # v6 - - - name: Stage checksum-verified dependencies - id: dependencies - shell: bash - run: | - set -euo pipefail - mirror="$RUNNER_TEMP/legacy-dependency-mirror" - bash gradle/stage-legacy-dependencies.sh "$mirror" - echo "repository=$mirror" >> "$GITHUB_OUTPUT" - - - name: Prepare clean packaged Forge runtime - id: forge - shell: bash + - name: Stage checksum-verified published dependencies + run: bash gradle/stage-orespawn-release.sh .gradle/release-dependencies + - name: Build, audit and generate Eclipse launches run: | - set -euo pipefail - runtime="$RUNNER_TEMP/forge-1.12.2-2859-runtime" - bash gradle/prepare-packaged-forge-runtime.sh "$runtime" "$JAVA_HOME_8_X64/bin/java" - echo "runtime=$runtime" >> "$GITHUB_OUTPUT" - - - name: Set up Python for the provider audit - uses: actions/setup-python@ece7cb06caefa5fff74198d8649806c4678c61a1 # v6 - with: - python-version: '3.12' - - - name: Install the pinned provider schema validator - run: python -m pip install -r tools/validation/requirements.txt - - - name: Build, test, audit, qualify runtimes, and generate Eclipse launches - shell: bash - run: | - set -euo pipefail - chmod +x ./gradlew - gradle_args=( - clean check build javadoc verifyReleaseDependencies verifyReleaseArtifacts - writeReleaseChecksums prepareEclipse verifyProjectResources packagedForgeRuntimeTest - -PpythonExecutable=python3 - -PpackagedForgeRuntimeOutput="$RUNNER_TEMP/modernmetals-packaged-checks" - -PreleaseBuild=true - -PlegacyDependencyVerificationRepository="${{ steps.dependencies.outputs.repository }}" - -PpackagedForgeRuntimeRoot="${{ steps.forge.outputs.runtime }}" - --no-daemon --stacktrace --max-workers=2 - -Porg.gradle.java.installations.paths="$JAVA_HOME,$JAVA_HOME_8_X64,$JAVA_HOME_25_X64" - -Porg.gradle.java.installations.auto-detect=false - -Porg.gradle.java.installations.auto-download=false - ) - ./gradlew "${gradle_args[@]}" - cp build/release/SHA256SUMS "$RUNNER_TEMP/first-SHA256SUMS" - - - name: Verify the prepared release bundle - shell: bash - run: | - set -euo pipefail - bundle="$RUNNER_TEMP/release-input" - mkdir -p "$bundle" - cp build/libs/ModernMetals-2.5.2.112021{,-sources,-javadoc}.jar "$bundle/" - cp build/release/SHA256SUMS CHANGELOG.txt "$bundle/" - ./gradlew verifyPreparedReleaseArtifacts verifyMavenCoordinates \ - -PpreparedReleaseDir="$bundle" \ - -PlegacyDependencyVerificationRepository="${{ steps.dependencies.outputs.repository }}" \ - -Porg.gradle.java.installations.paths="$JAVA_HOME,$JAVA_HOME_8_X64,$JAVA_HOME_25_X64" \ - -Porg.gradle.java.installations.auto-detect=false \ - -Porg.gradle.java.installations.auto-download=false \ - --offline --no-daemon --stacktrace --max-workers=2 - - - name: Verify reproducible release archives - shell: bash - run: | - set -euo pipefail - gradle_args=( - clean build javadoc verifyReleaseArtifacts writeReleaseChecksums - -PreleaseBuild=true - -PlegacyDependencyVerificationRepository="${{ steps.dependencies.outputs.repository }}" - --offline --no-daemon --no-build-cache --stacktrace --max-workers=2 - -Porg.gradle.java.installations.paths="$JAVA_HOME,$JAVA_HOME_8_X64,$JAVA_HOME_25_X64" - -Porg.gradle.java.installations.auto-detect=false - -Porg.gradle.java.installations.auto-download=false - ) - ./gradlew "${gradle_args[@]}" - cmp "$RUNNER_TEMP/first-SHA256SUMS" build/release/SHA256SUMS - + bash ./gradlew clean check build javadoc verify113ReleaseArtifacts write113ReleaseChecksums genEclipseRuns eclipse \ + -PreleaseBuild=true -PdependencyMirror="$PWD/.gradle/release-dependencies" \ + --no-daemon --stacktrace --max-workers=2 \ + "-Dorg.gradle.java.installations.paths=$JAVA_HOME,$JAVA_HOME_8_X64,$JAVA_HOME_25_X64" \ + -Dorg.gradle.java.installations.auto-detect=false \ + -Dorg.gradle.java.installations.auto-download=false - name: Upload audited release candidate uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7 with: - name: ModernMetals-1.12.2-${{ github.sha }} + name: ModernMetals-1.13.2-${{ github.sha }} if-no-files-found: error retention-days: 30 path: | - build/libs/ModernMetals-2.5.2.112021.jar - build/libs/ModernMetals-2.5.2.112021-sources.jar - build/libs/ModernMetals-2.5.2.112021-javadoc.jar + build/libs/*.jar build/release/SHA256SUMS CHANGELOG.txt - - - name: Upload bounded diagnostics on failure + - name: Retain failure diagnostics if: failure() uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7 with: - name: ModernMetals-1.12.2-diagnostics-${{ github.sha }} + name: ModernMetals-1.13.2-diagnostics-${{ github.sha }} if-no-files-found: ignore retention-days: 14 path: | build/test-results/** build/reports/** - ${{ runner.temp }}/modernmetals-packaged-checks/**/*-console.log - ${{ runner.temp }}/modernmetals-packaged-checks/**/logs/*.log - ${{ runner.temp }}/modernmetals-packaged-checks/**/crash-reports/*.txt - ${{ runner.temp }}/modernmetals-packaged-checks/**/*-modern.json - ${{ runner.temp }}/modernmetals-packaged-checks/**/*-review.json - ${{ runner.temp }}/modernmetals-packaged-checks/**/*-launch.json - build/problems/** diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 1b38e932..595d198e 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -3,11 +3,11 @@ name: CodeQL on: push: branches: - - master-1.12 + - master-1.13.2 - 'feature/**' pull_request: branches: - - master-1.12 + - master-1.13.2 schedule: - cron: '47 7 * * 4' @@ -58,7 +58,7 @@ jobs: run: | set -euo pipefail mirror="$RUNNER_TEMP/legacy-dependency-mirror" - bash gradle/stage-legacy-dependencies.sh "$mirror" + bash gradle/stage-orespawn-release.sh "$mirror" echo "repository=$mirror" >> "$GITHUB_OUTPUT" - name: Compile production code @@ -68,7 +68,7 @@ jobs: chmod +x ./gradlew gradle_args=( clean classes - -PlegacyDependencyVerificationRepository="${{ steps.dependencies.outputs.repository }}" + -PdependencyMirror="${{ steps.dependencies.outputs.repository }}" --no-daemon --no-build-cache --stacktrace --max-workers=2 -Porg.gradle.java.installations.paths="$JAVA_HOME,$JAVA_HOME_8_X64,$JAVA_HOME_25_X64" -Porg.gradle.java.installations.auto-detect=false diff --git a/.github/workflows/deploy-release.yml b/.github/workflows/deploy-release.yml index 8b698848..db953724 100644 --- a/.github/workflows/deploy-release.yml +++ b/.github/workflows/deploy-release.yml @@ -1,33 +1,29 @@ -name: Release Modern Metals - -run-name: Release Modern Metals ${{ inputs.release_version }} (CurseForge ${{ inputs.curseforge_release_level }}) +name: Release Modern Metals 1.13.2 +run-name: Modern Metals ${{ inputs.release_version }} (${{ inputs.confirm_live_publication && 'publish' || 'verify' }}) on: workflow_dispatch: inputs: release_version: - description: Four-component Modern Metals version; the target branch is derived from its fourth component. + description: Four-part version for Minecraft 1.13.2 required: true type: string release_commit: - description: Full commit SHA of the checked MMD target branch. + description: Full SHA of the checked MMD master-1.13.2 commit required: true type: string tested_jar_sha256: - description: SHA-256 of the verified Modern Metals game jar. + description: SHA-256 of the qualified game jar required: true type: string curseforge_release_level: - description: CurseForge release level only; this does not change the GitHub Release type. + description: CurseForge release level required: true default: release type: choice - options: - - release - - beta - - alpha + options: [release, beta, alpha] confirm_live_publication: - description: Confirm publication to Maven, CurseForge, and GitHub after the build passes. + description: Publish the verified CI files to Maven, CurseForge and GitHub required: true default: false type: boolean @@ -37,767 +33,206 @@ permissions: contents: read concurrency: - group: modernmetals-release-${{ inputs.release_version }} + group: modernmetals-release-113 cancel-in-progress: false jobs: - preflight: - name: Validate release request + qualify: + name: Verify merged CI candidate + if: github.repository == 'MinecraftModDevelopmentMods/ModernMetals' && github.ref == 'refs/heads/master-1.13.2' runs-on: ubuntu-latest timeout-minutes: 10 + permissions: + actions: read + contents: write outputs: - target_branch: ${{ steps.route.outputs.target_branch }} - release_sha: ${{ steps.validate.outputs.release_sha }} - release_version: ${{ steps.validate.outputs.release_version }} - release_tag: ${{ steps.validate.outputs.release_tag }} - minecraft_version: ${{ steps.validate.outputs.minecraft_version }} - loader_name: ${{ steps.validate.outputs.loader_name }} - loader_display: ${{ steps.validate.outputs.loader_display }} - java_version: ${{ steps.validate.outputs.java_version }} - java_toolchain_version: ${{ steps.validate.outputs.java_toolchain_version }} - java_setup_version: ${{ steps.validate.outputs.java_setup_version }} - gradle_java_version: ${{ steps.validate.outputs.gradle_java_version }} - gradle_java_setup_version: ${{ steps.validate.outputs.gradle_java_setup_version }} - install_gradle_java: ${{ steps.validate.outputs.install_gradle_java }} - curseforge_project_id: ${{ steps.validate.outputs.curseforge_project_id }} - curseforge_dependencies: ${{ steps.validate.outputs.curseforge_dependencies }} - main_jar: ${{ steps.validate.outputs.main_jar }} - sources_jar: ${{ steps.validate.outputs.sources_jar }} - javadoc_jar: ${{ steps.validate.outputs.javadoc_jar }} - + ci_run: ${{ steps.candidate.outputs.ci_run }} steps: - - name: Resolve target branch from version - id: route - env: - GH_TOKEN: ${{ github.token }} - RELEASE_VERSION: ${{ inputs.release_version }} - run: | - set -euo pipefail - - if [[ "$GITHUB_REPOSITORY" != "MinecraftModDevelopmentMods/ModernMetals" ]]; then - echo "Releases can only run in MinecraftModDevelopmentMods/ModernMetals" >&2 - exit 1 - fi - if [[ ! "$RELEASE_VERSION" =~ ^[0-9]+\.[0-9]+\.[0-9]+\.([0-9]+)$ ]]; then - echo "release_version must contain four numeric components" >&2 - exit 1 - fi - - target_suffix="${BASH_REMATCH[1]}" - if (( ${#target_suffix} < 6 )); then - echo "Invalid target suffix $target_suffix" >&2 - exit 1 - fi - - if [[ "$target_suffix" != 110021 && "$target_suffix" != 111021 && "$target_suffix" != 112021 ]]; then - echo 'Only the Minecraft 1.10.2, 1.11.2 and 1.12.2 Forge targets are supported by this dispatcher' >&2; exit 1 - fi - - loader_code="${target_suffix: -1}" - target_digits="${target_suffix::-1}" - mc_patch_padded="${target_digits: -2}" - without_patch="${target_digits::-2}" - mc_minor_padded="${without_patch: -2}" - mc_major="${without_patch::-2}" - - if [[ -z "$mc_major" || ! "$mc_major" =~ ^[0-9]+$ ]]; then - echo "Invalid Minecraft major version in target suffix $target_suffix" >&2 - exit 1 - fi - mc_minor="$((10#$mc_minor_padded))" - mc_patch="$((10#$mc_patch_padded))" - case "$loader_code" in - 1) loader_suffix= ;; - 2) loader_suffix=-neo ;; - *) echo "Unknown loader code $loader_code in target suffix $target_suffix" >&2; exit 1 ;; - esac - - candidates=( - "master-$mc_major.$mc_minor.$mc_patch$loader_suffix" - "master-$mc_major.$mc_minor$loader_suffix" - ) - target_branch= - for candidate in "${candidates[@]}"; do - if gh api "repos/$GITHUB_REPOSITORY/branches/$candidate" >/dev/null 2>&1; then - target_branch="$candidate" - break - fi - done - if [[ -z "$target_branch" ]]; then - echo "No MMD release branch matches target suffix $target_suffix" >&2 - printf 'Checked branch %s\n' "${candidates[@]}" >&2 - exit 1 - fi - - echo "target_branch=$target_branch" >> "$GITHUB_OUTPUT" - echo "Resolved $RELEASE_VERSION to $target_branch" - - - name: Check out derived release branch - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7 + - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7 with: - ref: ${{ steps.route.outputs.target_branch }} + ref: ${{ inputs.release_commit }} fetch-depth: 0 - - - name: Validate version, target, tag, and prior CI - id: validate + - name: Verify branch, version and successful merged CI + id: candidate env: GH_TOKEN: ${{ github.token }} - REQUESTED_VERSION: ${{ inputs.release_version }} - REQUESTED_COMMIT: ${{ inputs.release_commit }} - TESTED_JAR_SHA256: ${{ inputs.tested_jar_sha256 }} - 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)" - java_version="$(value java_version)" - java_toolchain_version="$(value java_toolchain_version)" - java_setup_version="$(value java_setup_version)" - gradle_java_version="$(value gradle_java_version)" - gradle_java_setup_version="$(value gradle_java_setup_version)" - curseforge_project_id="$(value curseforge_project_id)" - cf_requirements="$(value cf_requirements)" - orespawn_project_id="$(value orespawn_curse_project_id)" - - for required in release_version minecraft_version loader_name loader_code \ - java_version gradle_java_version curseforge_project_id; do - if [[ -z "${!required}" ]]; then - echo "Selected ref is missing required release metadata: $required" >&2 - exit 1 - fi - done - java_toolchain_version="${java_toolchain_version:-$java_version}" - java_setup_version="${java_setup_version:-$java_toolchain_version}" - - java_major() { - local version="$1" - if [[ ! "$version" =~ ^([0-9]+)([._+-].*)?$ ]]; then - echo "Invalid Java toolchain version $version" >&2 - return 1 - fi - printf '%s' "${BASH_REMATCH[1]}" - } - requires_separate_gradle_java() { - local toolchain_major - toolchain_major="$(java_major "$1")" - [[ "$toolchain_major" != "$2" ]] - } - - if [[ "$(java_major "$java_setup_version")" != "$(java_major "$java_toolchain_version")" ]]; then - echo "Hosted Java selector $java_setup_version does not match toolchain $java_toolchain_version" >&2 - exit 1 - fi - - java_setup_contracts=( - '8.0.502+7 17 true' - '16.0.2+7 17 true' - '17.0.1+12 17 false' - '17 17 false' - '21.0.8+9 21 false' - ) - for contract in "${java_setup_contracts[@]}"; do - read -r contract_toolchain contract_gradle expected <<<"$contract" - actual=false - if requires_separate_gradle_java "$contract_toolchain" "$contract_gradle"; then - actual=true - fi - if [[ "$actual" != "$expected" ]]; then - echo "Java setup contract failed for toolchain $contract_toolchain and Gradle $contract_gradle" >&2 - exit 1 - fi - done - - install_gradle_java=false - if requires_separate_gradle_java "$java_toolchain_version" "$gradle_java_version"; then - install_gradle_java=true - echo "Gradle Java $gradle_java_version will be installed separately from toolchain $java_toolchain_version" - else - echo "Pinned toolchain $java_toolchain_version also satisfies Gradle Java $gradle_java_version" - fi - - 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) loader_display=Forge ;; - neoforge:2) loader_display=NeoForge ;; - *) echo "Invalid loader metadata $loader_name/$loader_code" >&2; exit 1 ;; - esac - if [[ ! "$java_version" =~ ^[0-9]+$ || ! "$gradle_java_version" =~ ^[0-9]+$ ]]; then - echo "Invalid Java metadata $java_version/$gradle_java_version" >&2 - exit 1 - fi - if [[ "$curseforge_project_id" != "244357" ]]; then - echo "Unexpected Modern Metals CurseForge project $curseforge_project_id" >&2 - exit 1 - fi - - printf -v minor_padded '%02d' "$((10#$mc_minor))" - printf -v patch_padded '%02d' "$((10#$mc_patch))" - target_suffix="${mc_major}${minor_padded}${patch_padded}${loader_code}" - if [[ ! "$release_version" =~ ^[0-9]+\.[0-9]+\.[0-9]+\.${target_suffix}$ ]]; then - echo "mod_version $release_version does not match $minecraft_version $loader_display target $target_suffix" >&2 - exit 1 - fi - if [[ "$REQUESTED_VERSION" != "$release_version" ]]; then - echo "Requested version $REQUESTED_VERSION does not match ${{ steps.route.outputs.target_branch }} mod_version $release_version" >&2 - exit 1 - fi - if [[ -z "$gradle_java_setup_version" ]]; then - if [[ "$install_gradle_java" == false ]]; then - gradle_java_setup_version="$java_setup_version" - elif [[ "$gradle_java_version" == 17 ]]; then - # Legacy targets keep the same pinned Gradle JDK as their CI builds. - gradle_java_setup_version=17.0.1+12 - else - gradle_java_setup_version="$gradle_java_version" - fi - fi - if [[ "$(java_major "$java_toolchain_version")" != "$java_version" \ - || "$(java_major "$gradle_java_setup_version")" != "$gradle_java_version" ]]; then - echo "Java setup selectors do not match the declared game and Gradle Java versions" >&2 - exit 1 - fi - - if [[ -n "$orespawn_project_id" && "$orespawn_project_id" != 245586 ]]; then - echo "Unexpected OreSpawn CurseForge project $orespawn_project_id" >&2 - exit 1 - fi - if [[ -z "$cf_requirements" && "$orespawn_project_id" == 245586 ]]; then - # MMDLib-free ports declare their required OreSpawn dependency directly. - cf_requirements=mmd-orespawn - fi - - curseforge_dependencies=() - IFS=',' read -ra requirement_slugs <<<"$cf_requirements" - for slug in "${requirement_slugs[@]}"; do - case "$slug" in - mmd-orespawn) curseforge_dependencies+=('245586(required)') ;; - base-metals) curseforge_dependencies+=('240967(required)') ;; - mmdlib) curseforge_dependencies+=('261744(required)') ;; - '') ;; - *) echo "Unsupported required CurseForge relation $slug" >&2; exit 1 ;; - esac - done - if [[ " ${curseforge_dependencies[*]} " != *' 245586(required) '* ]]; then - echo "The required OreSpawn CurseForge relation was not declared" >&2 - exit 1 - fi - - curseforge_dependencies+=('243157(optional)') - if [[ "$target_suffix" == 112021 ]]; then - if [[ " ${curseforge_dependencies[*]} " != *' 261744(required) '* ]]; then - echo 'MMDLib must be a required relation for the Minecraft 1.12.2 release' >&2; exit 1 - fi - elif [[ " ${curseforge_dependencies[*]} " != *' 240967(required) '* ]]; then - echo 'Base Metals must be a required relation for this target' >&2; exit 1 - fi - - release_sha="$(git rev-parse HEAD)" - if [[ ! "$REQUESTED_COMMIT" =~ ^[0-9a-f]{40}$ || "$REQUESTED_COMMIT" != "$release_sha" ]]; then - echo 'The target branch no longer points at the checked release commit' >&2 - exit 1 - fi - if [[ ! "$TESTED_JAR_SHA256" =~ ^[0-9a-f]{64}$ ]]; then - echo 'Supply the lowercase SHA-256 of the verified game jar' >&2 - exit 1 - fi - release_tag="$release_version" - echo "release_sha=$release_sha" >> "$GITHUB_OUTPUT" - echo "release_version=$release_version" >> "$GITHUB_OUTPUT" - echo "release_tag=$release_tag" >> "$GITHUB_OUTPUT" - echo "minecraft_version=$minecraft_version" >> "$GITHUB_OUTPUT" - echo "loader_name=$loader_name" >> "$GITHUB_OUTPUT" - echo "loader_display=$loader_display" >> "$GITHUB_OUTPUT" - echo "java_version=$java_version" >> "$GITHUB_OUTPUT" - echo "java_toolchain_version=$java_toolchain_version" >> "$GITHUB_OUTPUT" - echo "java_setup_version=$java_setup_version" >> "$GITHUB_OUTPUT" - echo "gradle_java_version=$gradle_java_version" >> "$GITHUB_OUTPUT" - echo "gradle_java_setup_version=$gradle_java_setup_version" >> "$GITHUB_OUTPUT" - echo "install_gradle_java=$install_gradle_java" >> "$GITHUB_OUTPUT" - echo "curseforge_project_id=$curseforge_project_id" >> "$GITHUB_OUTPUT" - { - echo 'curseforge_dependencies<> "$GITHUB_OUTPUT" - echo "main_jar=ModernMetals-$release_version.jar" >> "$GITHUB_OUTPUT" - echo "sources_jar=ModernMetals-$release_version-sources.jar" >> "$GITHUB_OUTPUT" - echo "javadoc_jar=ModernMetals-$release_version-javadoc.jar" >> "$GITHUB_OUTPUT" - - successful_ci="$(gh api \ - "repos/$GITHUB_REPOSITORY/commits/$release_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 selected commit has no successful Build, test, and audit check" >&2 - exit 1 - fi - - if tag_json="$(gh api "repos/$GITHUB_REPOSITORY/git/ref/tags/$release_tag" 2>/dev/null)"; then - tag_sha="$(jq -r '.object.sha' <<<"$tag_json")" - if [[ "$tag_sha" != "$release_sha" ]]; then - echo "Existing tag $release_tag resolves to $tag_sha instead of $release_sha" >&2 - exit 1 - fi - fi - - build: - name: Build immutable release artifact - needs: preflight - runs-on: ubuntu-latest - timeout-minutes: 60 - env: - MAIN_JAR: ${{ needs.preflight.outputs.main_jar }} - SOURCES_JAR: ${{ needs.preflight.outputs.sources_jar }} - JAVADOC_JAR: ${{ needs.preflight.outputs.javadoc_jar }} - outputs: - artifact_name: ${{ steps.artifact.outputs.name }} - - steps: - - name: Check out validated release ref - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7 - with: - ref: ${{ needs.preflight.outputs.release_sha }} - - - name: Install pinned Java 25 Mavenizer runtime - uses: actions/setup-java@b6effb05e454b25005698d916606bdc6ffcbf961 # v5 - with: - distribution: temurin - java-version: '25.0.3+9.0.LTS' - - - name: Install pinned Java 8 launcher toolchain - uses: actions/setup-java@b6effb05e454b25005698d916606bdc6ffcbf961 # v5 - with: - distribution: temurin - java-version: '8.0.502+7' - - - name: Install target Java toolchain - uses: actions/setup-java@b6effb05e454b25005698d916606bdc6ffcbf961 # v5 - with: - distribution: temurin - java-version: ${{ needs.preflight.outputs.java_setup_version }} - - - name: Record target Java toolchain path - shell: bash - run: echo "MODERNMETALS_TARGET_JAVA_HOME=$JAVA_HOME" >> "$GITHUB_ENV" - - - name: Install separate Java for Gradle - if: needs.preflight.outputs.install_gradle_java == 'true' - uses: actions/setup-java@b6effb05e454b25005698d916606bdc6ffcbf961 # v5 - with: - distribution: temurin - java-version: ${{ needs.preflight.outputs.gradle_java_setup_version }} - - - name: Set up Gradle - uses: gradle/actions/setup-gradle@9c971963bec38e04b3d30dcc455b5382be2fdbfb # v6 - - - name: Resolve explicit Gradle Java installations - id: java-paths - shell: bash - run: | - set -euo pipefail - candidates=( - "$JAVA_HOME_25_X64" - "$JAVA_HOME_8_X64" - "$MODERNMETALS_TARGET_JAVA_HOME" - "$JAVA_HOME" - ) - paths= - for candidate in "${candidates[@]}"; do - test -x "$candidate/bin/java" - canonical="$(cd "$candidate" && pwd -P)" - if [[ ",$paths," != *",$canonical,"* ]]; then - paths="${paths:+$paths,}$canonical" - fi - done - echo "paths=$paths" >> "$GITHUB_OUTPUT" - - - name: Stage exact target dependencies - id: dependencies - run: | - set -euo pipefail - mirror="$RUNNER_TEMP/dependency-mirror" - if [[ -f gradle/stage-legacy-dependencies.sh ]]; then - bash gradle/stage-legacy-dependencies.sh "$mirror" - property=legacyDependencyVerificationRepository - elif [[ -f gradle/stage-orespawn-release.sh ]]; then - bash gradle/stage-orespawn-release.sh "$mirror" - property=orespawnVerificationRepository - else - echo "Selected target has no checksum-sealed dependency staging script" >&2 - exit 1 - fi - echo "repository=$mirror" >> "$GITHUB_OUTPUT" - echo "property=$property" >> "$GITHUB_OUTPUT" - - - name: Build, test, and audit once - env: - LOADER_NAME: ${{ needs.preflight.outputs.loader_name }} + RELEASE_VERSION: ${{ inputs.release_version }} + RELEASE_SHA: ${{ inputs.release_commit }} + TESTED_SHA: ${{ inputs.tested_jar_sha256 }} run: | set -euo pipefail - chmod +x ./gradlew - java_args=( - "-Dorg.gradle.java.installations.paths=${{ steps.java-paths.outputs.paths }}" - -Dorg.gradle.java.installations.auto-detect=false - -Dorg.gradle.java.installations.auto-download=false - ) - dependency_argument="-P${{ steps.dependencies.outputs.property }}=${{ steps.dependencies.outputs.repository }}" - if [[ "$LOADER_NAME" == neoforge ]]; then - # NeoGradle prepares inputs in build/tmp during configuration. Clean first. - ./gradlew clean "$dependency_argument" \ - --no-daemon --stacktrace --max-workers=2 "${java_args[@]}" - ./gradlew check build javadoc verifyReleaseArtifacts writeReleaseChecksums \ - "$dependency_argument" \ - --no-daemon --stacktrace --max-workers=2 "${java_args[@]}" - else - ./gradlew clean check build javadoc verifyReleaseArtifacts writeReleaseChecksums \ - "$dependency_argument" \ - --no-daemon --stacktrace "${java_args[@]}" - fi - - - name: Stage the immutable release artifact - id: artifact + [[ "$RELEASE_VERSION" =~ ^[0-9]+\.[0-9]+\.[0-9]+\.113021$ ]] + [[ "$RELEASE_SHA" =~ ^[[:xdigit:]]{40}$ ]] + [[ "$TESTED_SHA" =~ ^[[:xdigit:]]{64}$ ]] + test "$(git rev-parse HEAD)" = "$RELEASE_SHA" + test "$(gh api "repos/$GITHUB_REPOSITORY/branches/master-1.13.2" --jq .commit.sha)" = "$RELEASE_SHA" + grep -Fxq "mod_version=$RELEASE_VERSION" gradle.properties + grep -Fxq 'minecraft_version=1.13.2' gradle.properties + ci_run="$(gh api --method GET "repos/$GITHUB_REPOSITORY/actions/workflows/ci.yml/runs" \ + -f branch=master-1.13.2 -f head_sha="$RELEASE_SHA" -f event=push -f status=success \ + --jq '.workflow_runs[0].id // empty')" + test -n "$ci_run" + echo "ci_run=$ci_run" >> "$GITHUB_OUTPUT" + - uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8 + with: + name: ModernMetals-1.13.2-${{ inputs.release_commit }} + run-id: ${{ steps.candidate.outputs.ci_run }} + github-token: ${{ github.token }} + path: ${{ runner.temp }}/release-input + - name: Verify sealed files and tested game jar + working-directory: ${{ runner.temp }}/release-input env: - TESTED_JAR_SHA256: ${{ inputs.tested_jar_sha256 }} + RELEASE_VERSION: ${{ inputs.release_version }} + TESTED_SHA: ${{ inputs.tested_jar_sha256 }} run: | set -euo pipefail - bundle="$RUNNER_TEMP/release-bundle" - mkdir -p "$bundle" - cp "build/libs/$MAIN_JAR" "$bundle/" - cp "build/libs/$SOURCES_JAR" "$bundle/" - cp "build/libs/$JAVADOC_JAR" "$bundle/" - cp build/release/SHA256SUMS "$bundle/" - cp CHANGELOG.txt "$bundle/" - (cd "$bundle" && sha256sum --check SHA256SUMS) - printf '%s %s\n' "$TESTED_JAR_SHA256" "$bundle/$MAIN_JAR" | sha256sum --check - - echo "name=ModernMetals-${{ needs.preflight.outputs.minecraft_version }}-${{ needs.preflight.outputs.loader_name }}-${{ needs.preflight.outputs.release_sha }}-${GITHUB_RUN_ID}-${GITHUB_RUN_ATTEMPT}" >> "$GITHUB_OUTPUT" - - - name: Upload immutable release artifact - uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7 - with: - name: ${{ steps.artifact.outputs.name }} - if-no-files-found: error - retention-days: 90 - path: ${{ runner.temp }}/release-bundle/* - - - name: Summarize the prepared release candidate + python3 - "$RELEASE_VERSION" "$TESTED_SHA" <<'PY' + from pathlib import Path + import hashlib, sys + version, tested = sys.argv[1:] + names = [f'ModernMetals-{version}{suffix}.jar' for suffix in ('', '-sources', '-javadoc')] + assert {p.name for p in Path('.').iterdir()} == set(names + ['SHA256SUMS', 'CHANGELOG.txt']) + actual = {name: hashlib.sha256(Path(name).read_bytes()).hexdigest() for name in names} + declared = dict((name, sha) for sha, name in (line.split(' ', 1) for line in Path('SHA256SUMS').read_text().splitlines())) + assert actual == declared + assert actual[names[0]] == tested.lower() + assert version in Path('CHANGELOG.txt').read_text().splitlines()[0] + PY + - name: Verify live publication credentials + if: inputs.confirm_live_publication env: - RELEASE_BRANCH: ${{ needs.preflight.outputs.target_branch }} - RELEASE_LEVEL: ${{ inputs.curseforge_release_level }} - RELEASE_SHA: ${{ needs.preflight.outputs.release_sha }} - RELEASE_VERSION: ${{ needs.preflight.outputs.release_version }} - run: | - { - echo "## Prepared release candidate" - echo - echo "- Version: \`$RELEASE_VERSION\`" - echo "- Target branch: \`$RELEASE_BRANCH\`" - echo "- Commit: \`$RELEASE_SHA\`" - echo "- CurseForge release level: \`$RELEASE_LEVEL\`" - echo "- GitHub Release type: ordinary release" - echo - echo "### Public artifact checksums" - echo '```text' - cat build/release/SHA256SUMS - echo '```' - } >> "$GITHUB_STEP_SUMMARY" - - release_confirmation: - name: Confirm ${{ inputs.release_version }} live publication - needs: - - preflight - - build - runs-on: ubuntu-latest - timeout-minutes: 10 - steps: - - name: Confirm publication and release-secret access - env: - CONFIRM_LIVE_PUBLICATION: ${{ inputs.confirm_live_publication }} CURSEFORGE_TOKEN: ${{ secrets.CURSEFORGE_TOKEN }} MAVEN_UPLOAD_URL: ${{ secrets.MAVEN_UPLOAD_URL }} MAVEN_UPLOAD_USERNAME: ${{ secrets.MAVEN_UPLOAD_USERNAME }} MAVEN_UPLOAD_PASSWORD: ${{ secrets.MAVEN_UPLOAD_PASSWORD }} run: | set -euo pipefail - if [[ "$CONFIRM_LIVE_PUBLICATION" != "true" ]]; then - echo "Confirm live publication in the workflow form before releasing ${{ needs.preflight.outputs.release_tag }}" >&2 - exit 1 - fi - echo "Live publication confirmed for ${{ needs.preflight.outputs.release_tag }}" - missing=() for name in CURSEFORGE_TOKEN MAVEN_UPLOAD_URL MAVEN_UPLOAD_USERNAME MAVEN_UPLOAD_PASSWORD; do - if [[ -z "${!name:-}" ]]; then - missing+=("$name") - fi + test -n "${!name}" || { echo "Configure $name for this repository" >&2; exit 1; } done - if (( ${#missing[@]} > 0 )); then - printf 'Required release secret is unavailable: %s\n' "${missing[@]}" >&2 - exit 1 - fi - echo "All four required release secrets are available." - - create_release_tag: - name: Create validated release tag - needs: - - preflight - - build - - release_confirmation - runs-on: ubuntu-latest - timeout-minutes: 10 - permissions: - actions: read - contents: write - - steps: - - name: Create or verify the exact tag + [[ "$MAVEN_UPLOAD_URL" == https://* ]] + curl --fail --silent --show-error --max-time 30 \ + -H "X-Api-Token: $CURSEFORGE_TOKEN" https://minecraft.curseforge.com/api/game/versions >/dev/null + - name: Reserve the version for this commit + if: inputs.confirm_live_publication env: GH_TOKEN: ${{ github.token }} - RELEASE_SHA: ${{ needs.preflight.outputs.release_sha }} - RELEASE_TAG: ${{ needs.preflight.outputs.release_tag }} + RELEASE_VERSION: ${{ inputs.release_version }} + RELEASE_SHA: ${{ inputs.release_commit }} run: | set -euo pipefail - - if tag_json="$(gh api "repos/$GITHUB_REPOSITORY/git/ref/tags/$RELEASE_TAG" 2>/dev/null)"; then - tag_sha="$(jq -r '.object.sha' <<<"$tag_json")" - if [[ "$tag_sha" != "$RELEASE_SHA" ]]; then - echo "Existing tag $RELEASE_TAG resolves to $tag_sha instead of $RELEASE_SHA" >&2 - exit 1 - fi - echo "Existing tag $RELEASE_TAG already points to $RELEASE_SHA" + if existing="$(gh api "repos/$GITHUB_REPOSITORY/git/ref/tags/$RELEASE_VERSION" --jq .object.sha 2>/dev/null)"; then + test "$existing" = "$RELEASE_SHA" else - gh api --method POST "repos/$GITHUB_REPOSITORY/git/refs" \ - -f ref="refs/tags/$RELEASE_TAG" \ - -f sha="$RELEASE_SHA" >/dev/null - echo "Created tag $RELEASE_TAG at $RELEASE_SHA" - fi - - created_sha="$(gh api "repos/$GITHUB_REPOSITORY/git/ref/tags/$RELEASE_TAG" --jq '.object.sha')" - if [[ "$created_sha" != "$RELEASE_SHA" ]]; then - echo "Tag verification returned $created_sha instead of $RELEASE_SHA" >&2 - exit 1 + gh api --method POST "repos/$GITHUB_REPOSITORY/git/refs" -f ref="refs/tags/$RELEASE_VERSION" -f sha="$RELEASE_SHA" >/dev/null fi publish_maven: - name: Publish Maven - needs: - - preflight - - build - - create_release_tag + name: Publish MMD Maven + needs: qualify + if: inputs.confirm_live_publication runs-on: ubuntu-latest - timeout-minutes: 30 - + timeout-minutes: 25 steps: - - name: Check out the tagged publication definition - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7 + - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7 with: - ref: ${{ needs.preflight.outputs.release_sha }} - - - name: Install pinned Java 25 Mavenizer runtime - uses: actions/setup-java@b6effb05e454b25005698d916606bdc6ffcbf961 # v5 + ref: ${{ inputs.release_commit }} + - uses: actions/setup-java@b6effb05e454b25005698d916606bdc6ffcbf961 # v5 with: distribution: temurin java-version: '25.0.3+9.0.LTS' - - - name: Install pinned Java 8 launcher toolchain - uses: actions/setup-java@b6effb05e454b25005698d916606bdc6ffcbf961 # v5 + - uses: actions/setup-java@b6effb05e454b25005698d916606bdc6ffcbf961 # v5 with: distribution: temurin java-version: '8.0.502+7' - - - name: Install target Java toolchain - uses: actions/setup-java@b6effb05e454b25005698d916606bdc6ffcbf961 # v5 + - uses: actions/setup-java@b6effb05e454b25005698d916606bdc6ffcbf961 # v5 with: distribution: temurin - java-version: ${{ needs.preflight.outputs.java_setup_version }} - - - name: Record target Java toolchain path - shell: bash - run: echo "MODERNMETALS_TARGET_JAVA_HOME=$JAVA_HOME" >> "$GITHUB_ENV" - - - name: Install separate Java for Gradle - if: needs.preflight.outputs.install_gradle_java == 'true' - uses: actions/setup-java@b6effb05e454b25005698d916606bdc6ffcbf961 # v5 + java-version: '17.0.1+12' + - uses: gradle/actions/setup-gradle@9c971963bec38e04b3d30dcc455b5382be2fdbfb # v6 + - uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8 with: - distribution: temurin - java-version: ${{ needs.preflight.outputs.gradle_java_setup_version }} - - - name: Set up Gradle - uses: gradle/actions/setup-gradle@9c971963bec38e04b3d30dcc455b5382be2fdbfb # v6 - - - name: Resolve explicit Gradle Java installations - id: java-paths - shell: bash - run: | - set -euo pipefail - candidates=( - "$JAVA_HOME_25_X64" - "$JAVA_HOME_8_X64" - "$MODERNMETALS_TARGET_JAVA_HOME" - "$JAVA_HOME" - ) - paths= - for candidate in "${candidates[@]}"; do - test -x "$candidate/bin/java" - canonical="$(cd "$candidate" && pwd -P)" - if [[ ",$paths," != *",$canonical,"* ]]; then - paths="${paths:+$paths,}$canonical" - fi - done - echo "paths=$paths" >> "$GITHUB_OUTPUT" - - - name: Download immutable release artifact - uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8 - with: - name: ${{ needs.build.outputs.artifact_name }} + name: ModernMetals-1.13.2-${{ inputs.release_commit }} + run-id: ${{ needs.qualify.outputs.ci_run }} + github-token: ${{ github.token }} path: ${{ runner.temp }}/release-input - - - name: Stage exact target dependencies - id: dependencies - shell: bash - run: | - set -euo pipefail - mirror="$RUNNER_TEMP/dependency-mirror" - if [[ -f gradle/stage-legacy-dependencies.sh ]]; then - bash gradle/stage-legacy-dependencies.sh "$mirror" - property=legacyDependencyVerificationRepository - elif [[ -f gradle/stage-orespawn-release.sh ]]; then - bash gradle/stage-orespawn-release.sh "$mirror" - property=orespawnVerificationRepository - else - echo "Selected target has no checksum-sealed dependency staging script" >&2 - exit 1 - fi - echo "repository=$mirror" >> "$GITHUB_OUTPUT" - echo "property=$property" >> "$GITHUB_OUTPUT" - - - name: Verify artifact and Maven credentials + - name: Stage checksum-verified published dependencies + run: bash gradle/stage-orespawn-release.sh .gradle/release-dependencies + - name: Publish the sealed Maven jars env: MAVEN_UPLOAD_URL: ${{ secrets.MAVEN_UPLOAD_URL }} MAVEN_UPLOAD_USERNAME: ${{ secrets.MAVEN_UPLOAD_USERNAME }} MAVEN_UPLOAD_PASSWORD: ${{ secrets.MAVEN_UPLOAD_PASSWORD }} run: | - set -euo pipefail - (cd "$RUNNER_TEMP/release-input" && sha256sum --check SHA256SUMS) - if [[ -z "$MAVEN_UPLOAD_URL" || -z "$MAVEN_UPLOAD_USERNAME" || -z "$MAVEN_UPLOAD_PASSWORD" ]]; then - echo "Maven upload URL and credentials must all be configured" >&2 - exit 1 - fi - if [[ "$MAVEN_UPLOAD_URL" == file:* ]]; then - echo "Maven publication cannot target a runner-local repository" >&2 - exit 1 - fi - - - name: Publish the prepared Maven artifacts - env: - MAVEN_UPLOAD_URL: ${{ secrets.MAVEN_UPLOAD_URL }} - MAVEN_UPLOAD_USERNAME: ${{ secrets.MAVEN_UPLOAD_USERNAME }} - MAVEN_UPLOAD_PASSWORD: ${{ secrets.MAVEN_UPLOAD_PASSWORD }} - run: | - chmod +x ./gradlew - dependency_argument="-P${{ steps.dependencies.outputs.property }}=${{ steps.dependencies.outputs.repository }}" - ./gradlew publishMavenJavaPublicationToReleaseRepository \ - -PpreparedReleaseDir="$RUNNER_TEMP/release-input" \ - "$dependency_argument" \ - --no-daemon --stacktrace \ - -Dorg.gradle.java.installations.paths="${{ steps.java-paths.outputs.paths }}" \ - -Dorg.gradle.java.installations.auto-detect=false \ - -Dorg.gradle.java.installations.auto-download=false + bash ./gradlew publishMavenJavaPublicationToReleaseRepository \ + -PpreparedReleaseDir="${{ runner.temp }}/release-input" -PdependencyMirror="$PWD/.gradle/release-dependencies" \ + --no-daemon --stacktrace --max-workers=2 \ + "-Dorg.gradle.java.installations.paths=$JAVA_HOME,$JAVA_HOME_8_X64,$JAVA_HOME_25_X64" \ + -Dorg.gradle.java.installations.auto-detect=false -Dorg.gradle.java.installations.auto-download=false publish_curseforge: name: Publish CurseForge - needs: - - preflight - - build - - publish_maven + needs: [qualify, publish_maven] + if: inputs.confirm_live_publication runs-on: ubuntu-latest - timeout-minutes: 20 - + timeout-minutes: 15 steps: - - name: Download immutable release artifact - uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8 + - uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8 with: - name: ${{ needs.build.outputs.artifact_name }} + name: ModernMetals-1.13.2-${{ inputs.release_commit }} + run-id: ${{ needs.qualify.outputs.ci_run }} + github-token: ${{ github.token }} path: ${{ runner.temp }}/release-input - - - name: Verify artifact and CurseForge credential - env: - CURSEFORGE_TOKEN: ${{ secrets.CURSEFORGE_TOKEN }} - run: | - set -euo pipefail - (cd "$RUNNER_TEMP/release-input" && sha256sum --check SHA256SUMS) - if [[ -z "$CURSEFORGE_TOKEN" ]]; then - echo "CURSEFORGE_TOKEN must be configured" >&2 - exit 1 - fi - + - name: Verify the sealed jars + working-directory: ${{ runner.temp }}/release-input + run: sha256sum --check --strict SHA256SUMS - name: Publish Modern Metals uses: Kira-NT/mc-publish@52307b03863581dec6b652b83e597aec02ebb075 # v3.3.1 with: curseforge-token: ${{ secrets.CURSEFORGE_TOKEN }} - curseforge-id: ${{ needs.preflight.outputs.curseforge_project_id }} - name: Modern Metals ${{ needs.preflight.outputs.release_version }} for Minecraft ${{ needs.preflight.outputs.minecraft_version }} (${{ needs.preflight.outputs.loader_display }}) - version: ${{ needs.preflight.outputs.release_version }} + curseforge-id: '244357' + name: Modern Metals ${{ inputs.release_version }} for Minecraft 1.13.2 (Forge) + version: ${{ inputs.release_version }} version-type: ${{ inputs.curseforge_release_level }} changelog-file: ${{ runner.temp }}/release-input/CHANGELOG.txt - loaders: ${{ needs.preflight.outputs.loader_name }} - game-versions: ${{ needs.preflight.outputs.minecraft_version }} + loaders: forge + game-versions: '1.13.2' game-version-filter: none environment: client | server - java: Java ${{ needs.preflight.outputs.java_version }} - curseforge-dependencies: ${{ needs.preflight.outputs.curseforge_dependencies }} + java: Java 8 + curseforge-dependencies: | + 245586(required) + 240967(optional) fail-mode: fail files: | - ${{ runner.temp }}/release-input/${{ needs.preflight.outputs.main_jar }} - ${{ runner.temp }}/release-input/${{ needs.preflight.outputs.sources_jar }} - ${{ runner.temp }}/release-input/${{ needs.preflight.outputs.javadoc_jar }} + ${{ runner.temp }}/release-input/ModernMetals-${{ inputs.release_version }}.jar + ${{ runner.temp }}/release-input/ModernMetals-${{ inputs.release_version }}-sources.jar + ${{ runner.temp }}/release-input/ModernMetals-${{ inputs.release_version }}-javadoc.jar publish_github: name: Publish GitHub Release - needs: - - preflight - - build - - publish_curseforge + needs: [qualify, publish_curseforge] + if: inputs.confirm_live_publication runs-on: ubuntu-latest - timeout-minutes: 20 + timeout-minutes: 10 permissions: actions: read contents: write - steps: - - name: Download immutable release artifact - uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8 - with: - name: ${{ needs.build.outputs.artifact_name }} - path: ${{ runner.temp }}/release-input - - - name: Verify artifact - run: (cd "$RUNNER_TEMP/release-input" && sha256sum --check SHA256SUMS) - - - name: Publish GitHub Release last - uses: Kira-NT/mc-publish@52307b03863581dec6b652b83e597aec02ebb075 # v3.3.1 + - uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8 with: + name: ModernMetals-1.13.2-${{ inputs.release_commit }} + run-id: ${{ needs.qualify.outputs.ci_run }} github-token: ${{ github.token }} - github-tag: ${{ needs.preflight.outputs.release_tag }} - github-commitish: ${{ needs.preflight.outputs.release_sha }} - github-draft: false - github-prerelease: false - name: Modern Metals ${{ needs.preflight.outputs.release_version }} for Minecraft ${{ needs.preflight.outputs.minecraft_version }} (${{ needs.preflight.outputs.loader_display }}) - version: ${{ needs.preflight.outputs.release_version }} - version-type: release - changelog-file: ${{ runner.temp }}/release-input/CHANGELOG.txt - fail-mode: fail - files: | - ${{ runner.temp }}/release-input/${{ needs.preflight.outputs.main_jar }} - ${{ runner.temp }}/release-input/${{ needs.preflight.outputs.sources_jar }} - ${{ runner.temp }}/release-input/${{ needs.preflight.outputs.javadoc_jar }} - ${{ runner.temp }}/release-input/SHA256SUMS + path: ${{ runner.temp }}/release-input + - name: Create the GitHub release from the sealed files + working-directory: ${{ runner.temp }}/release-input + env: + GH_TOKEN: ${{ github.token }} + RELEASE_VERSION: ${{ inputs.release_version }} + run: | + set -euo pipefail + sha256sum --check --strict SHA256SUMS + gh release create "$RELEASE_VERSION" --repo "$GITHUB_REPOSITORY" --verify-tag \ + --title "Modern Metals $RELEASE_VERSION for Minecraft 1.13.2 (Forge)" \ + --notes-file CHANGELOG.txt "ModernMetals-$RELEASE_VERSION"{,-sources,-javadoc}.jar SHA256SUMS diff --git a/.github/workflows/release-on-tag.yml b/.github/workflows/release-on-tag.yml index 718b4afa..e57126f2 100644 --- a/.github/workflows/release-on-tag.yml +++ b/.github/workflows/release-on-tag.yml @@ -1,89 +1,20 @@ -name: Start Modern Metals release from tag - +name: Validate Modern Metals 1.13.2 tag on: push: - tags: - - '*.*.*.*' - + tags: ['*.*.*.113021'] permissions: - actions: read contents: read - -concurrency: - group: modernmetals-release-starter-${{ github.ref_name }} - cancel-in-progress: false - + actions: read jobs: - validate-release-tag: - name: Validate tag for manual release confirmation + validate: if: github.repository == 'MinecraftModDevelopmentMods/ModernMetals' runs-on: ubuntu-latest timeout-minutes: 10 - steps: - - name: Check out tagged source - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7 - with: - fetch-depth: 0 - - - name: Validate release tag, target metadata, and prior CI - env: - GH_TOKEN: ${{ github.token }} - shell: bash + - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7 + - name: Check the tag against the release metadata 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" - mc_patch="${mc_patch:-0}" - if [[ -n "${extra:-}" || ! "$mc_major" =~ ^[0-9]+$ || ! "$mc_minor" =~ ^[0-9]+$ \ - || ! "$mc_patch" =~ ^[0-9]+$ || "$loader_name:$loader_code" != 'forge:1' ]]; then - echo "Invalid target metadata $minecraft_version/$loader_name/$loader_code" >&2 - exit 1 - fi - 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: Record the required manual publication step - env: - RELEASE_WORKFLOW_URL: https://github.com/${{ github.repository }}/actions/workflows/deploy-release.yml - shell: bash - run: | - { - echo "## Release candidate validated" - echo - echo "Tag \`$GITHUB_REF_NAME\` matches the selected target and has a successful Build, test, and audit check." - echo - echo "**Nothing has been published.**" - echo - echo "To continue, open [Release Modern Metals]($RELEASE_WORKFLOW_URL), select **Run workflow**, and enter:" - echo - echo "- release_version: \`$GITHUB_REF_NAME\`" - echo "- release_commit: \`$GITHUB_SHA\`" - echo "- tested_jar_sha256: SHA-256 of the tested game jar" - echo "- curseforge_release_level: \`release\`, \`beta\`, or \`alpha\`" - echo "- confirm_live_publication: \`true\`" - } >> "$GITHUB_STEP_SUMMARY" + test "$GITHUB_REF_NAME" = "$(sed -n 's/^mod_version=//p' gradle.properties)" + grep -Fxq 'minecraft_version=1.13.2' gradle.properties + echo 'Tag validated. Publication uses deploy-release.yml with explicit confirmation.' >> "$GITHUB_STEP_SUMMARY" diff --git a/.github/workflows/validate-gradle-build.yml b/.github/workflows/validate-gradle-build.yml index cc6223df..d4d55ba3 100644 --- a/.github/workflows/validate-gradle-build.yml +++ b/.github/workflows/validate-gradle-build.yml @@ -3,11 +3,11 @@ name: Validate Gradle Wrapper on: push: branches: - - master-1.12 + - master-1.13.2 - 'feature/**' pull_request: branches: - - master-1.12 + - master-1.13.2 permissions: contents: read diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 3378cd5b..a7d92c68 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -1,3 +1,26 @@ +3.0.0.113021 for 1.13.2 + +- Use Base Metals 3.0.3 or later when installed together, with its shared processing and mining fixes. +- Review mining levels for every metal. Galvanized steel now matches steel and iron. +- Give tools, solid metals and rock-hosted ores separate mining levels; document the material assumptions. +- Use the normal hammer mining speed for ores and storage blocks from other mods. +- Use released OreSpawn 4.1.7 in normal development and game launches. +- Fix a startup hang with other fluid-adding mods, without disabling parallel loading. +- Support a checked local OreSpawn fix in Eclipse and Gradle development launches. +- Allow steel blend directly in galvanized steel and stainless steel recipes, keeping the same yields. +- Added crafting and furnace recipe discovery, including powders already held in a saved inventory. +- Restored small-powder and small-blend smelting, storage-block crushing, recycling and plate repairs. +- Added the standalone coal-dust block cycle. Base Metals supplies the shared coal recipes when installed. +- Kept the five alloy formulas and restored material aliases, including Chrome ingredients in mixed-mod blends. +- Kept earned recipe progress through resource reloads and Fantasy Level changes. +- Fixed a startup race that could crash while reading or saving worlds with Base Metals installed. +- Fixed crackhammer mining so coal ore drops coal dust and other ores use their crushing recipes. +- Ported Modern Metals to Forge 25 and the native OreSpawn 4 provider. +- Converted old block metadata to named states, including both halves of doors and double slabs. +- Kept Modern Metals IDs and converted old filled buckets and worn equipment when loading legacy worlds. +- Converted recipes, translations and ore models to the Minecraft 1.13.2 formats. +- Kept the Forge and OreSpawn settings screens and Base Metals Fantasy Level inheritance. + 2.5.2.112021 for 1.12.2 Use the published MMDLib 1.0.0-rc3 and MMD OreSpawn 4.1.6.112021. diff --git a/README.md b/README.md index f623e251..c3843599 100644 --- a/README.md +++ b/README.md @@ -1,44 +1,112 @@ -# Modern Metals for Minecraft 1.12.2 - -Modern Metals adds industrial metals and alloys, including aluminum, chromium, -osmium and titanium. It adds their ores and molten forms, equipment, building -blocks and Crack Hammer processing. - -For Modern Metals 2.5.2.112021, install Forge 14.23.5.2859, -[MMDLib 1.0.0-rc3][mmdlib] and -[OreSpawn 4.1.6.112021][orespawn]. Modern Metals also works alongside -[Base Metals 2.6.2.112021][basemetals]. Base Metals supplies additional -ingredients for alloys that use its steel, zinc, brass or nickel. - -The Modern Metals settings are available from Forge's Mods list and OreSpawn's -Mods list. Fantasy Level comes from a compatible Base Metals installation. -When running Modern Metals by itself, set Fantasy Level in -`config/ModernMetals.cfg` or in the settings screen. Low Fantasy restricts -implausible gear and building recipes. Existing items remain usable. Restart -Minecraft after changing the setting. - -Titanium is made from rutile and magnesium by default. The optional titanium -ore rule can be enabled in OreSpawn. Existing chunks keep their ores. OreSpawn -uses its native profile for new chunks and can import supported legacy files. -Back up a world and its configs before upgrading from OreSpawn 3. -Raw OreSpawn 1 files need to be converted on 1.10.2 or 1.11.2 before -moving the saved OreSpawn 4 profile to 1.12.2. - -[mmdlib]: https://www.curseforge.com/minecraft/mc-mods/mmdlib/files/9414723 -[orespawn]: https://www.curseforge.com/minecraft/mc-mods/mmd-orespawn/files/9527784 -[basemetals]: https://www.curseforge.com/minecraft/mc-mods/base-metals/files/9532211 +# Modern Metals for Minecraft 1.13.2 + +Modern Metals adds 21 metals and alloys, including boron, beryllium, thorium +and titanium. Crush and smelt ores, blend alloys, or make tools, armour and +building blocks. + +## Installation + +Use Java 8 and Forge **25.0.223** for Minecraft **1.13.2**. Install Modern +Metals and [OreSpawn 4.1.7.113021](https://www.curseforge.com/minecraft/mc-mods/mmd-orespawn/files/9611746) +on both the client and server. [Base Metals 3.0.3.113021](https://github.com/MinecraftModDevelopmentMods/BaseMetals/releases/tag/3.0.3.113021) +is optional for new worlds. Its powders supply the ingredients for several +alloys, and its crusher recipes work alongside Modern Metals recipes. + +Use Base Metals 3.0.3.113021 or a later compatible 1.13.2 build when installing +the two together. That release includes the shared processing and mining fixes. + +OreSpawn places the ores. Titanium ore is off by default. You can still make +titanium from rutile and magnesium. Existing chunks keep their ores. + +Open **Mods → Modern Metals → Config**, or choose Modern Metals from the +OreSpawn settings screen. High Fantasy allows the full set of recipes. Low +Fantasy restricts equipment and decorative recipes by material. Modern +Metals uses Base Metals' setting when Base Metals is installed. Restart the +game or server after changing Fantasy Level, and use the same mode on both +ends of a multiplayer connection. + +## Processing and recipe discovery + +Pick up a material to discover its crafting recipes. Powders, small powders +and blends reveal their processing recipes, including entries in the furnace +book. Existing inventories are checked when joining a world and after a data +pack reload. + +Nine coal dust make a vanilla coal block, which you can craft back into nine +coal. Crackhammers also crush coal and coal blocks. Base Metals supplies those +shared recipes when installed. + +Galvanized steel and stainless steel accept steel blend directly in place of +steel dust. One whole blend replaces one dust, keeping the usual output. + +Small powders and small blends smelt into nuggets. Metal blocks crush into +nine powders. You can recycle equipment and components in a furnace, and +repair armour and shields with a matching plate. Named and enchanted equipment +keeps its saved data when repaired. + +See [processing and alloy recipes](docs/PROCESSING.md) for the five blend +formulas and the forms retained for optional integrations. + +## Crushing recipes for add-ons + +Crackhammers need the same mining level as a pickaxe. Galvanized steel, +stainless steel and titanium have iron-level mining and can mine Base Gems' +jasper. Ores and storage blocks in the shared Forge block tags +use the normal hammer mining speed when the hammer is strong enough. + +[The material audit](docs/MINING_LEVELS.md) lists the reviewed tool, solid-metal +and ore requirements for every metal. Tool capability accounts for material +type rather than treating one hardness score as a complete tool specification. +New smith offers also follow the reviewed tiers through the existing pricing formula. + +On 1.13.2, a mod or data pack can add a recipe under its own +`data//recipes/` directory with type `modernmetals:crushing`. +Use a Minecraft `ingredient` and a `result` object with the output `item` +and `count`, just as with `basemetals:crushing`. If Modern Metals is optional, +use a `forge:mod_loaded` condition for `modernmetals`. + +Read the recipes from the world's recipe manager. With Modern Metals alone +they use `CrushingRecipe.TYPE`. With Base Metals installed they keep their +recipe IDs and use the Base Metals type, so Base Metals tools and crushers +can find them too. + +## Upgrading a world + +Keep the original world intact and open a separate copy in 1.13.2. Keep the +original Forge registry data in `level.dat`. Minecraft 1.13.2 uses block +states and named item IDs, so the migration needs the old world’s saved +numeric IDs to find the right blocks. Install compatible 1.13.2 versions of +the other mods that supplied blocks or items to the world. +[World migration](docs/MIGRATION.md) ## Building -The Gradle wrapper runs on Java 17, ForgeGradle's Mavenizer uses Java 25, and -the game and compiler use Java 8. Before importing into Eclipse or building, -run `python gradle/stage-legacy-dependencies.py .gradle/legacy-dependencies` -from the project root. Then run `./gradlew check build -verifyProjectResources writeReleaseChecksums prepareEclipse`. To stage a -local mirror first, run `python gradle/stage-legacy-dependencies.py ` -and pass `-PlegacyDependencyVerificationRepository=` to Gradle. -The runtime jar, sources and Javadocs are written to `build/libs`. - -CI builds from the pinned jars, audits the package and checks disposable Forge -servers. The release workflow takes an explicitly confirmed version, commit -and game jar checksum. The update feed should be advanced after publication. +Gradle uses Java 17, Mavenizer uses Java 25, and the mod compiles and runs +on Java 8. Run `gradlew build genEclipseRuns eclipse` from this checkout. +The build checks the OreSpawn jar against the published SHA-256. To stage a +local copy, run `bash gradle/stage-orespawn-release.sh ` and pass +`-PdependencyMirror=` to Gradle. + +In Eclipse, use **Gradle → Refresh Gradle Project** to rebuild the +development output and regenerate the launches. Run `runClient.launch` +from the project. + +To test add-ons from Eclipse, stage their 1.13.2 `*-deobf.jar` files from +`build/libs-dev` in `run/compatibility-jars` as `basemetals-dev.jar`, +`basegems-dev.jar` and `baseminerals-dev.jar`. Run +`gradlew prepareCompatibilityLaunches` or refresh the Gradle project once +the jars are staged. In **Run → Run Configurations → Java Application**, +choose a **Modern Metals - …** launch. Each combination has its own saves, +config and mods in `run/compatibility`. + +For a local OreSpawn fix, stage its published-format jar as +`run/compatibility-jars/orespawn-development.jar` and put its SHA-256 in +`orespawn-development.sha256` alongside it. Enable `-PuseDevelopmentOreSpawn=true` +when generating the client, server and combination launches. The development engine must +keep the pinned version and public API. Compilation and release dependency +checks use the published jar. Normal launches use the published runtime even +if the old local files are still present. + +The [changelog](CHANGELOG.txt) and [migration checks](docs/MIGRATION.md) +cover the differences from 1.12.2. The port uses artwork and code from +Modern Metals and the Forge 25 Base Metals port. See [artwork credits](LICENSE-ART.txt). diff --git a/build.gradle b/build.gradle index c82efaa5..8fb0031c 100644 --- a/build.gradle +++ b/build.gradle @@ -1,174 +1,222 @@ -import org.apache.tools.ant.filters.FixCrLfFilter +import groovy.xml.XmlParser +import groovy.xml.XmlUtil plugins { id 'java' - id 'eclipse' - id 'idea' id 'maven-publish' + id 'eclipse' id 'net.minecraftforge.renamer' version '1.1.5' id 'net.minecraftforge.gradle' version '7.0.34' } -group = project.mod_group -version = project.mod_version +group = mod_group +version = mod_version base.archivesName = 'ModernMetals' -if (!(project.version ==~ /\d+\.\d+\.\d+\.112021/)) { - throw new GradleException('Use Major.Minor.Patch.112021 for Minecraft 1.12.2 on Forge.') -} - -// Gradle and Mavenizer use modern JDKs; the mod and game still use Java 8. java { toolchain.languageVersion = JavaLanguageVersion.of(8) withSourcesJar() withJavadocJar() } -tasks.withType(JavaCompile).configureEach { - options.encoding = 'UTF-8' - sourceCompatibility = targetCompatibility = '1.8' - options.compilerArgs.addAll(['-Xmaxerrs', '1000']) -} -tasks.named('compileTestJava', JavaCompile) { options.compilerArgs.add('-proc:none') } -tasks.withType(Test).configureEach { useJUnitPlatform() } + +tasks.withType(JavaCompile).configureEach { options.encoding = 'UTF-8' } + +def compileMiningLevelChecks = tasks.register('compileMiningLevelChecks', JavaCompile) { + dependsOn 'classes' + source fileTree('tools/validation/port113/mining-levels') { include '*.java' } + classpath = sourceSets.main.output + sourceSets.main.compileClasspath + destinationDirectory = layout.buildDirectory.dir('classes/mining-level-checks') + javaCompiler = javaToolchains.compilerFor { languageVersion = JavaLanguageVersion.of(8) } +} +tasks.register('verifyMiningLevels', JavaExec) { + dependsOn compileMiningLevelChecks + classpath = files(compileMiningLevelChecks.flatMap { it.destinationDirectory }) + sourceSets.main.runtimeClasspath + mainClass = 'validation.MiningLevelChecks' + javaLauncher = javaToolchains.launcherFor { languageVersion = JavaLanguageVersion.of(8) } +} +tasks.named('check') { dependsOn 'verifyMiningLevels' } tasks.withType(Javadoc).configureEach { - failOnError = false options.encoding = 'UTF-8' options.addStringOption('Xdoclint:none', '-quiet') - options.addStringOption('docencoding', 'UTF-8') - options.addStringOption('charset', 'UTF-8') options.addBooleanOption('notimestamp', true) } tasks.withType(AbstractArchiveTask).configureEach { preserveFileTimestamps = false reproducibleFileOrder = true - includeEmptyDirs = false - exclude '**/desktop.ini', '**/Thumbs.db', '**/.DS_Store' -} -// Mapped dependency bytes no longer match their original signatures. Keep the -// verified downloads intact and strip signatures only from renamed copies. -tasks.withType(net.minecraftforge.renamer.gradle.RenameJar).configureEach { - additionalArgs.addAll('--strip-sigs', 'ALL', '--disable-abstract-param') -} - -def textPatterns = ['cfg', 'css', 'html', 'info', 'java', 'js', 'json', 'lang', 'mcmeta', 'md', 'properties', 'txt', 'xml'] - .collect { "**/*.${it}".toString() } -def normalizeText = { details -> - details.filter(FixCrLfFilter, eol: FixCrLfFilter.CrLf.newInstance('lf'), - eof: FixCrLfFilter.AddAsisRemove.newInstance('asis')) -} - -// Preserve the tested game jar's line endings for this compatibility list. -def legacyApiList = 'META-INF/modernmetals-legacy-api.list' -def normalizeLegacyApi = { details -> - details.filter(FixCrLfFilter, eol: FixCrLfFilter.CrLf.newInstance('crlf'), - eof: FixCrLfFilter.AddAsisRemove.newInstance('asis')) } -def developmentOutput = layout.buildDirectory.dir('forge12-development/main') -def prepareDevelopmentMod = tasks.register('prepareDevelopmentMod', Sync) { - group = 'ide' - description = 'Merges production classes and processed resources for Forge 1.12 launches.' +def runClasses = layout.buildDirectory.dir('forge-run-mod-classes/main') +def prepareRunClasses = tasks.register('prepareForgeRunModClasses', Sync) { dependsOn tasks.named('classes') - from tasks.named('compileJava', JavaCompile).flatMap { it.destinationDirectory } - from sourceSets.main.output.resourcesDir - into developmentOutput + from sourceSets.main.output + into runClasses } minecraft { - mappings channel: project.mappings_channel, version: project.mappings_version - if (gradle.startParameter.offline) mavenizerArguments.add('--offline') + mappings channel: mapping_channel, version: mapping_version runs { configureEach { - workingDir.convention layout.projectDirectory.dir( - providers.gradleProperty('modernMetalsRunDirectory').getOrElse('run')) - environment 'MC_VERSION', project.minecraft_version - environment 'MOD_CLASSES', developmentOutput.get().asFile.absolutePath - systemProperty 'fml.coreMods.load', project.coreplugin - systemProperty 'log4j.skipJansi', 'true' - systemProperty 'forge.logging.console.level', 'info' - systemProperty 'log4j.configurationFile', file('gradle/ide/log4j2.xml').toURI().toString() - if (providers.gradleProperty('modernMetalsLaunchProbePhase').isPresent()) { - systemProperty 'launch.phase', providers.gradleProperty('modernMetalsLaunchProbePhase').get() - } + mainClass = 'net.minecraftforge.userdev.LaunchTesting' + workingDir.convention layout.projectDirectory.dir('run') + mods { modernmetals { source sourceSets.main } } + environment 'target', 'fmluserdev' + name + environment 'MCP_MAPPINGS', "${mapping_channel}_${mapping_version}" + environment 'MCP_VERSION', mcp_version + environment 'FORGE_VERSION', forge_version + environment 'FORGE_GROUP', 'net.minecraftforge' + environment 'MC_VERSION', minecraft_version + def output = runClasses.get().asFile.absolutePath + environment 'MOD_CLASSES', "modernmetals%%${output}${File.pathSeparator}modernmetals%%${output}" } register('client') - register('server') { args 'nogui' } + register('server') { args '--nogui' } + } +} + +tasks.withType(JavaExec).configureEach { + if (name in ['runClient', 'runServer']) { + dependsOn prepareRunClasses + javaLauncher = javaToolchains.launcherFor { languageVersion = JavaLanguageVersion.of(8) } + doFirst { new File(workingDir, 'mods').mkdirs() } } } -tasks.matching { it.name in ['runClient', 'runServer'] }.configureEach { - dependsOn prepareDevelopmentMod - dependsOn 'prepareJava8Launcher' - doFirst { - Set splitOutputs = sourceSets.main.output.files.collect { it.canonicalFile } as Set - classpath = files(developmentOutput, tasks.named('prepareJava8Launcher'), classpath.filter { - !splitOutputs.contains(it.canonicalFile) && it.name != 'slime-launcher-0.2.2.jar' - }) - environment 'MC_VERSION', project.minecraft_version - environment 'MOD_CLASSES', developmentOutput.get().asFile.absolutePath +// ForgeGradle writes Slime Launcher's paths as bare Eclipse program arguments. +def eclipseLauncherPath = ~/(--(?:cache|metadata|to-srg|to-obf) )("[^"]*"|.+?)(?= (?:--metadata |--to-srg |--to-obf |--(?: |$)))/ +tasks.matching { it.name.startsWith('genEclipseRun') && it.name.endsWith('ForForge') }.configureEach { + dependsOn prepareRunClasses + String launchName = name.replaceFirst('^genEclipseRun', 'run').replaceFirst('ForForge$', '') + '.launch' + File launch = layout.projectDirectory.file(launchName).asFile + doLast { + Node configuration = new XmlParser().parse(launch) + Node programArguments = configuration.stringAttribute.find { + it.attribute('key') == 'org.eclipse.jdt.launching.PROGRAM_ARGUMENTS' + } + String arguments = programArguments.attribute('value') + String quoted = arguments.replaceAll(eclipseLauncherPath) { match, option, path -> + path.startsWith('"') ? match : option + '"' + path + '"' + } + if (quoted != arguments) { + programArguments.attributes().put('value', quoted) + launch.setText(XmlUtil.serialize(configuration), 'UTF-8') + } } } -def legacyMirror = file(providers.gradleProperty('legacyDependencyVerificationRepository') - .orElse(providers.gradleProperty('legacyDependencyRepository')) - .getOrElse('.gradle/legacy-dependencies')) -def legacyRepository = { String remote -> legacyMirror.isDirectory() ? legacyMirror.toURI() : uri(remote) } +eclipse { + synchronizationTasks 'genEclipseRuns' +} + +tasks.named('eclipse') { dependsOn 'genEclipseRuns' } +apply from: 'gradle/eclipse-compatibility.gradle' + +def oreSpawnModule = 'mmd-orespawn-245586' +def oreSpawnCoordinate = "curse.maven:${oreSpawnModule}:${orespawn_curse_file}" +def dependencyMirror = providers.gradleProperty('dependencyMirror').orElse('https://www.cursemaven.com') repositories { minecraft.mavenizer(it) maven fg.forgeMaven maven fg.minecraftLibsMaven - maven { - name = 'VerifiedLegacyMirror' - url = legacyMirror.toURI() - metadataSources { artifact() } - } + mavenCentral() + maven { url = 'https://libraries.minecraft.net/' } exclusiveContent { - forRepository { maven { url = legacyRepository('https://www.cursemaven.com'); metadataSources { artifact() } } } - filter { includeGroup 'curse.maven' } + forRepository { maven { url = 'https://repo.spongepowered.org/repository/maven-public' } } + filter { includeGroupAndSubgroups('org.spongepowered') } } exclusiveContent { - forRepository { maven { url = legacyRepository('https://maven.moddev.zone/releases'); metadataSources { artifact() } } } - filter { includeGroup 'zone.moddev.mc.basemetals'; includeGroup 'zone.moddev.mc.orespawn' } + forRepository { + maven { + url = uri(dependencyMirror.get()) + metadataSources { artifact() } + } + } + filter { includeModule('curse.maven', oreSpawnModule) } } - mavenCentral() } -apply from: 'gradle/dependencies.gradle' +configurations { + oreSpawnRelease +} + +dependencies { + implementation minecraft.dependency("net.minecraftforge:forge:${minecraft_version}-${forge_version}") + implementation renamer.dependency(oreSpawnCoordinate) + oreSpawnRelease oreSpawnCoordinate +} + renamer.mappings.from minecraft.dependency.toSrgFile -tasks.named('processResources', ProcessResources) { - filteringCharset = 'UTF-8' - exclude '**/desktop.ini', '**/Thumbs.db', '**/.DS_Store' - inputs.property 'version', project.version - inputs.property 'mcversion', project.minecraft_version - filesMatching('mcmod.info') { expand version: project.version, mcversion: project.minecraft_version } - rename '(.+_at.cfg)', 'META-INF/$1' - filesMatching('**/*.lang') { details -> details.name = details.name.toLowerCase(Locale.ROOT) } - filesMatching(textPatterns, normalizeText) - filesMatching(legacyApiList, normalizeLegacyApi) +tasks.register('verifyReleaseDependencies') { + inputs.files(configurations.oreSpawnRelease) + inputs.property('orespawnSha256', orespawn_sha256) + doLast { + def digest = java.security.MessageDigest.getInstance('SHA-256') + configurations.oreSpawnRelease.singleFile.withInputStream { input -> + byte[] buffer = new byte[8192] + for (int count = input.read(buffer); count != -1; count = input.read(buffer)) { + digest.update(buffer, 0, count) + } + } + if (digest.digest().encodeHex().toString() != orespawn_sha256) { + throw new GradleException('OreSpawn 1.13.2 release checksum mismatch') + } + } +} + +sourceSets.main.resources.srcDir('src/generated/resources') + +def recipeData = layout.buildDirectory.dir('generated/recipe-data') +def generateRecipeData = tasks.register('generateRecipeData', Exec) { + group = 'data generation' + inputs.file 'tools/generate_113_recipe_data.js' + inputs.file 'src/main/java/zone/moddev/mc/modernmetals/material/MaterialCatalogue.java' + inputs.files(fileTree('src/main/resources/data'), fileTree('src/generated/resources/data')) + outputs.dir recipeData + commandLine 'node', 'tools/generate_113_recipe_data.js' +} +sourceSets.main.resources.srcDir(recipeData) +tasks.named('processResources') { dependsOn generateRecipeData } +tasks.named('sourcesJar') { dependsOn generateRecipeData } + +def verifyFluidRegistration = tasks.register('verifyFluidRegistration', Exec) { + group = 'verification' + description = 'Checks that shared fluid registries are only written during sequential registration.' + commandLine 'node', '--test', 'tools/test_fluid_registration.js' +} +tasks.named('check') { dependsOn verifyFluidRegistration } + +def verifyRecipeData = tasks.register('verifyRecipeData', Exec) { + group = 'verification' + dependsOn generateRecipeData + commandLine 'node', '--test', 'tools/test_113_recipe_data.js' +} +tasks.named('check') { dependsOn verifyRecipeData } + +tasks.named('processResources') { + inputs.property('modVersion', mod_version) + filesMatching('META-INF/mods.toml') { expand mod_version: mod_version } + exclude 'mcmod.info', 'assets/modernmetals/recipes/**', 'assets/modernmetals/alt/**', + 'assets/modernmetals/materials/**', 'assets/modernmetals/lang/*.lang', + 'META-INF/modernmetals-legacy-api.list' } tasks.named('jar', Jar) { archiveClassifier = 'deobf' destinationDirectory = layout.buildDirectory.dir('libs-dev') - manifest.attributes( - 'Implementation-Title': 'ModernMetals', 'Implementation-Version': project.version, - 'Maven-Artifact': "${project.group}:ModernMetals:${project.version}", - 'Built-On-Java': '8', 'Built-On': "${project.minecraft_version}-${project.forge_version}", - 'FMLCorePluginContainsFMLMod': 'true', 'FMLCorePlugin': project.coreplugin) -} -['sourcesJar', 'javadocJar'].each { name -> - tasks.named(name, Jar) { - filteringCharset = 'UTF-8' - filesMatching(textPatterns, normalizeText) - filesMatching(legacyApiList, normalizeLegacyApi) - } } -ext.modernMetalsBuild = [developmentOutput: developmentOutput].asImmutable() -apply from: 'gradle/ore-models.gradle' -apply from: 'gradle/release/artifacts.gradle' -apply from: 'gradle/release/publishing.gradle' -apply from: 'gradle/verification/runtime.gradle' -apply from: 'gradle/ide/eclipse.gradle' +def releaseJar = renamer.classes(tasks.named('jar', Jar)) { + map.from minecraft.dependency.toSrgFile + archiveClassifier = null + output = layout.buildDirectory.file("libs/ModernMetals-${project.version}.jar") +} + +tasks.named('assemble') { dependsOn releaseJar } +tasks.named('check') { dependsOn 'verifyReleaseDependencies' } + +apply from: 'gradle/development-orespawn.gradle' + +apply from: 'gradle/release-113.gradle' + +apply from: 'gradle/normalize-javadoc-trees.gradle' diff --git a/docs/MIGRATION.md b/docs/MIGRATION.md new file mode 100644 index 00000000..4c9bef9c --- /dev/null +++ b/docs/MIGRATION.md @@ -0,0 +1,45 @@ +# Upgrading a Modern Metals world to Minecraft 1.13.2 + +Make a complete copy of the world. Keep the source outside the test instance. +Install Forge 25.0.223, Modern Metals 3.0.0.113021 and OreSpawn 4.1.7.113021. +Install the Forge 25 Base Metals version when upgrading a world that used +Base Metals or placed MMDLib's vanilla-extension blocks. Other add-ons need +their own compatible versions and migration support. + +The port uses the source world's Forge registry snapshot to resolve numeric +block IDs. Those numbers can differ between two saves made with the same +version. The mod retains the Modern Metals namespace and translates historical +registry names, including older door, fishing rod, horse armour and aluminum +brass IDs. Double slabs now use the `type=double` state of the material's +ordinary slab. Stair, door, trapdoor, button, lever, plate and liquid metadata +is restored as named properties. + +Modern Metals reads the old registry before Minecraft converts the world. +On save, it carries the registry forward for chunks you have yet to visit. It converts legacy universal buckets +into named metal buckets and preserves item counts, slots, tool wear and +extra NBT. If it has to rewrite a loose player file or `level.dat`, it first +writes a sibling `*.modernmetals-legacy-backup`. The original copy is still +needed to go back to the old Minecraft version. + +Normal loading upgrades chunks as you visit them. On a dedicated server you +can use `--forceUpgrade` to convert all of the copied world's existing chunks +before checking it. Save, close and reload the copy to check that the +converted data survives another start. + +## Configuration + +The port keeps all known registry entries available for old saves. It reads +the former `contentMode` setting from `ModernMetals.cfg` as the default for +the new `modernmetals-common.toml`. Base Metals supplies Fantasy Level when +installed. The old per-material registration switches and the 1.12.2 +integration adapters have not been carried over. Ore selection, placement +and retrogen are managed through OreSpawn. + +## Comparing worlds + +Install the Python dependency `nbtlib==2.0.4` and run +`python tools/validation/port113/verify_legacy_world.py `. +The tool reads both saves and compares each Modern Metals block at its +original coordinates, checks named states derived from metadata, and compares +saved stack counts, slots, durability and extra tags. It uses the source +world's actual numeric registry and never writes to either save. diff --git a/docs/MINING_LEVELS.md b/docs/MINING_LEVELS.md new file mode 100644 index 00000000..f1ff9cf2 --- /dev/null +++ b/docs/MINING_LEVELS.md @@ -0,0 +1,128 @@ +# Reviewed mining levels for Minecraft 1.13.2 + +This audit covers all 21 Modern Metals and 22 Base Metals materials, plus the +vanilla iron/gold and non-metal tool references. It changes mining capability +and harvest requirements; the other legacy statistics remain separate. + +The numbers are an engineering-informed game policy, not measured physical +units or a unique scientific ranking. Tool geometry, purity, heat treatment, +fracture toughness and wear matter. There is no physical conversion from a +Mohs-style scratch-hardness number to a Minecraft harvest level. + +## Policy and assumptions + +- Tier 0 is the vanilla wood/gold class, tier 1 stone, tier 2 iron and tier 3 + diamond. Tier 4 remains a fictional-material capability. Bare hands do not + qualify as a pickaxe, even on a tier-0 solid metal block. +- Galvanized steel uses a steel core: galvanizing does not significantly change + steel's mechanical properties. Give it the same harvest capability as steel + and vanilla iron, tier 2. This does not claim zinc coating makes tool steel + harder. [Galvanizing evidence](https://galvanizeit.org/knowledgebase/article/mechanical-properties-of-galvanized-steel) +- Treat named steel, stainless steel, bronze, Invar, Nichrome and titanium as + useful engineering materials at tier 2. Exact grades are not specified by the + mod; this is a coarse capability class, not a hardness comparison between them. +- Soft metals stay in low-duty tiers. Hard but brittle standalone materials do + not inherit the properties of their carbides, binders, alloys or coatings. + Tungsten is not tungsten carbide, boron is not boron carbide/CBN, and pure + chromium is not chromium-alloyed tool steel. [Tool-material context](https://www.sandvik.coromant.com/en-gb/materials), + [tungsten and carbide distinction](https://periodic-table.rsc.org/element/74/tungsten) +- Solid metal and ore have separate requirements. These providers' ordinary + metal ores represent minerals dispersed in rock, so their baseline is a + stone-level pickaxe, tier 1. This is a host-rock gameplay rule, not a claim + that every ore mineral has the same hardness. It is independent of refined + metal properties. [USGS mineral/host distinctions](https://pubs.usgs.gov/bul/b1693/html/bull5n38.htm) +- Keep the existing fictional tool/block/active-ore tiers deliberately. There + is no physical evidence for Adamantine, Aquarium, Cold Iron, Mithril or + Starsteel as these mods define them. +- Existing alloy recipes are gameplay abstractions and retain their ingredients + and yields. In particular, the historical Al-Cu `aluminumbrass` recipe is not + the composition of commercial aluminum brass, and the galvanized-steel + recipe does not describe a literal 50-percent-zinc tool. The named product, + rather than fictional recipe mass fractions, determines the interpretation. +- Keep Fantasy Level availability and the Base Metals inheritance unchanged. + Elemental tools retained for High Fantasy are not recommendations for real + toolmaking. Base Gems' mineral progression is a separate policy. + +## Complete audit + +Columns show old -> reviewed tiers. Solid requirements apply to the storage +block and its registered solid forms. `—` means that form is not registered. +A dagger marks a retained historical alloy ore; it still does not generate. +Titanium ore stays disabled by default, with rutile processing available. + +### Modern Metals + +| Material | Tool | Solid | Ore | Scientific context and disposition | +| --- | ---: | ---: | ---: | --- | +| `aluminum` | 0 -> 0 | 0 -> 0 | 0 -> 1 | Soft elemental aluminium, not a strengthened aircraft alloy. [Source](https://periodic-table.rsc.org/element/13/aluminium) | +| `aluminumbrass` | 0 -> 1 | 0 -> 1 | — | Legacy Al-Cu blend, not commercial Cu-Zn-Al brass. Limited alloy tier; recipe retained. [Source](https://alloys.copper.org/alloy/C68700) | +| `beryllium` | 1 -> 1 | 1 -> 1 | 1 -> 1 | Elemental Be, not copper-beryllium tool alloy. No engineered alloy properties assumed. [Source](https://periodic-table.rsc.org/element/4/beryllium) | +| `boron` | 3 -> 1 | 2 -> 2 | 2 -> 1 | Elemental/metalloid form; not boron carbide or cubic boron nitride tooling. [Source](https://periodic-table.rsc.org/element/5/boron) | +| `cadmium` | 0 -> 0 | 0 -> 0 | 0 -> 1 | Low-duty elemental metal; no hardened alloy assumed. [Source](https://periodic-table.rsc.org/element/48/cadmium) | +| `chromium` | 3 -> 1 | 2 -> 2 | 2 -> 1 | Hard constituent for alloys and coatings; pure-metal hardness is not whole-tool toughness. [Source](https://periodic-table.rsc.org/element/24/chromium) | +| `galvanizedsteel` | 1 -> 2 | 1 -> 2 | 1 -> 1 † | Steel core with a protective zinc coating; same mining capability as steel. [Source](https://galvanizeit.org/knowledgebase/article/mechanical-properties-of-galvanized-steel) | +| `iridium` | 2 -> 1 | 1 -> 2 | 1 -> 1 | Hard, brittle element; no toughened alloy or composite grade assumed. [Source](https://pubchem.ncbi.nlm.nih.gov/element/77) | +| `magnesium` | 0 -> 0 | 0 -> 0 | 0 -> 1 | Light elemental metal, not a structural magnesium alloy. [Source](https://periodic-table.rsc.org/element/12/magnesium) | +| `manganese` | 1 -> 1 | 1 -> 1 | 1 -> 1 | Brittle elemental Mn, distinct from impact-resistant manganese steel. [Source](https://periodic-table.rsc.org/element/25/manganese) | +| `nichrome` | 2 -> 2 | 1 -> 2 | 1 -> 1 † | Ductile Ni-Cr engineering alloy; not a superhard carbide grade. [Source](https://www.kanthal.com/produkte-und-dienstleistungen/datasheets/materialdatenbl%C3%A4tter/band-flachdraht/nikrothal-80/) | +| `osmium` | 2 -> 1 | 2 -> 2 | 2 -> 1 | Hard, brittle element; density does not imply impact-tool performance. [Source](https://periodic-table.rsc.org/element/76/osmium) | +| `plutonium` | 1 -> 1 | 1 -> 1 | 1 -> 1 | Unspecified elemental/phase grade; conservative compatibility tier, no nuclear-property mining bonus. [Source](https://periodic-table.rsc.org/element/94/plutonium) | +| `rutile` | 2 -> 1 | 1 -> 2 | 1 -> 1 | Titanium dioxide feed mineral, not metallic titanium; retained High Fantasy tool is a compatibility abstraction. [Source](https://periodic-table.rsc.org/element/22/titanium) | +| `stainlesssteel` | 2 -> 2 | 1 -> 2 | 1 -> 1 † | Steel family; iron-tier capability without assuming a particular hardened stainless grade. [Source](https://periodic-table.rsc.org/element/24/chromium) | +| `tantalum` | 2 -> 1 | 1 -> 1 | 1 -> 1 | Corrosion-resistant elemental metal, not an engineered high-strength tantalum alloy. [Source](https://periodic-table.rsc.org/element/73/tantalum) | +| `thorium` | 1 -> 1 | 0 -> 1 | 0 -> 1 | Unspecified elemental grade; retained limited tool tier, no nuclear-property mining bonus. [Source](https://periodic-table.rsc.org/element/90/thorium) | +| `titanium` | 2 -> 2 | 1 -> 2 | 1 -> 1 | Strong engineering metal; iron-tier capability does not mean titanium-carbide tooling. [Source](https://periodic-table.rsc.org/element/22/titanium) | +| `tungsten` | 2 -> 1 | 2 -> 2 | 2 -> 1 | Unalloyed tungsten is not cemented WC-Co; room-temperature brittleness limits impact-tool interpretation. [Source](https://www.sciencedirect.com/science/article/pii/S0921509318306440) | +| `uranium` | 2 -> 1 | 1 -> 1 | 1 -> 1 | Unspecified elemental grade; limited tool tier, not a cutting-tool alloy. [Source](https://periodic-table.rsc.org/element/92/uranium) | +| `zirconium` | 1 -> 1 | 1 -> 1 | 1 -> 1 | Corrosion-resistant metal, not zirconia ceramic or a tool alloy. [Source](https://periodic-table.rsc.org/element/40/zirconium) | + +### Base Metals + +| Material | Tool | Solid | Ore | Scientific context and disposition | +| --- | ---: | ---: | ---: | --- | +| `adamantine` | 4 -> 4 | 3 -> 3 | 3 -> 3 | Fictional: preserve the established active-material rules; no scientific rating. | +| `antimony` | 0 -> 0 | 0 -> 0 | 0 -> 1 | Brittle elemental material, not an antimony-strengthened alloy. [Source](https://periodic-table.rsc.org/element/51/antimony) | +| `aquarium` | 1 -> 1 | 1 -> 1 | — | Fictional: preserve the established active-material rules; no scientific rating. | +| `bismuth` | 0 -> 0 | 0 -> 0 | 0 -> 1 | Brittle elemental material; no useful impact-tool alloy assumed. [Source](https://periodic-table.rsc.org/element/83/bismuth) | +| `brass` | 1 -> 1 | 1 -> 1 | — | Copper-zinc engineering alloy; distinguish it from pure copper. [Source](https://www.copper.org/applications/marine/cuni/alloys/pub-206-copper-alloys-for-marine-environments.pdf) | +| `bronze` | 2 -> 2 | 2 -> 2 | — | Copper-tin tool alloy; useful work-hardened tooling rather than a soft-metal average. [Source](https://periodic-table.rsc.org/element/29/copper) | +| `coldiron` | 2 -> 2 | 2 -> 2 | 2 -> 2 | Fictional: preserve the established active-material rules; no scientific rating. | +| `copper` | 1 -> 1 | 1 -> 1 | 1 -> 1 | Workable elemental copper; bronze remains the stronger tool progression. [Source](https://periodic-table.rsc.org/element/29/copper) | +| `cupronickel` | 2 -> 1 | 1 -> 1 | — | Copper-nickel corrosion-resistant alloy; no hardened steel or carbide grade assumed. [Source](https://www.copper.org/applications/marine/cuni/alloys/pub-206-copper-alloys-for-marine-environments.pdf) | +| `electrum` | 1 -> 0 | 1 -> 0 | — | Gold-silver alloy; precious-metal content does not imply a stronger mining tool. [Source](https://periodic-table.rsc.org/element/79/gold) | +| `invar` | 3 -> 2 | 2 -> 2 | — | Fe-Ni engineering alloy valued for low expansion; no diamond-level cutting grade. [Source](https://www.carpentertechnology.com/hubfs/7407324/Material%20Saftey%20Data%20Sheets/Invar%2036.pdf) | +| `lead` | 0 -> 0 | 0 -> 0 | 0 -> 1 | Soft elemental metal. [Source](https://periodic-table.rsc.org/element/82/lead) | +| `mercury` | — | — | 0 -> 1 | Liquid at room temperature; no equipment is registered. Ore is separately rock-hosted. [Source](https://periodic-table.rsc.org/element/80/mercury) | +| `mithril` | 3 -> 3 | 2 -> 2 | — | Fictional: preserve the established active-material rules; no scientific rating. | +| `nickel` | 1 -> 1 | 1 -> 1 | 1 -> 1 | Elemental nickel, distinct from nickel-based engineered alloys. [Source](https://periodic-table.rsc.org/element/28/nickel) | +| `pewter` | 0 -> 0 | 0 -> 0 | — | Soft tin-based alloy; no tool-steel properties assumed. [Source](https://periodic-table.rsc.org/element/50/tin) | +| `platinum` | 1 -> 0 | 0 -> 0 | 0 -> 1 | Precious elemental metal; corrosion resistance is not a hardened tool grade. [Source](https://periodic-table.rsc.org/element/78/platinum) | +| `silver` | 1 -> 0 | 1 -> 0 | 1 -> 1 | Soft precious elemental metal. [Source](https://periodic-table.rsc.org/element/47/silver) | +| `starsteel` | 3 -> 3 | 3 -> 3 | 3 -> 3 | Fictional: preserve the established active-material rules; no scientific rating. | +| `steel` | 2 -> 2 | 2 -> 2 | — | Generic steel tool baseline; no high-speed, carbide or specially heat-treated grade assumed. [Source](https://periodic-table.rsc.org/element/26/iron) | +| `tin` | 1 -> 0 | 0 -> 0 | 0 -> 1 | Soft, pliable elemental tin, distinct from bronze. [Source](https://periodic-table.rsc.org/element/50/tin) | +| `zinc` | 0 -> 0 | 0 -> 0 | 0 -> 1 | Elemental zinc, distinct from zinc-coated steel. [Source](https://periodic-table.rsc.org/element/30/zinc) | + +## Vanilla references and compatibility + +Vanilla-reference tool tiers remain wood/gold 0, stone 1, iron 2 and diamond 3. +Base Metals' emerald/obsidian/quartz and other legacy non-metal equipment keep +their existing rules. No vanilla block requirement is overridden. + +Mining tiers are explicit constructor data. `toolLevel()` supplies all material +tools; `requiredHarvestLevel()` supplies solid forms and +`requiredOreHarvestLevel()` supplies ores. The original constructor remains for +binary/source compatibility and legacy custom-material defaults. Registered +metal catalogues use the explicit constructor, avoiding accidental changes +when an unrelated hardness statistic is edited. + +Existing block/item names, stack NBT, damage, recipe quantities, ore placements +and generation switches retain their identities. A saved tool receives its +reviewed capability from its registered item; its NBT does not need conversion. + +Run each project's `check build` and Eclipse tasks. Modern Metals' lightweight +`verifyMiningLevels` checks all 21 profiles without adding test libraries to +production launches; Base Metals' tests cover all 22 profiles, constructor +validation and legacy compatibility. The isolated packaged mining probe checks +registered tools, all solid block states, ore requirements, saved stacks and +real survival harvesting, including galvanized-steel Jasper crushing. diff --git a/docs/PROCESSING.md b/docs/PROCESSING.md new file mode 100644 index 00000000..edda688f --- /dev/null +++ b/docs/PROCESSING.md @@ -0,0 +1,83 @@ +# Processing and alloy recipes on 1.13.2 + +Crackhammers turn an ore into two powders, an ingot into one powder, a nugget +into one small powder, and a metal storage block into nine powders. Nine small +powders make one powder. A powder splits back into nine small powders. + +Ores and powders smelt into ingots. Small powders smelt into nuggets. Blends +and small blends follow the same ingot and nugget sizes. + +## Blends + +| Blend | Ingredients | Output | +| --- | --- | --- | +| Aluminum brass | Three aluminum dust and one copper dust | Four blends | +| Galvanized steel | One steel dust or steel blend, and one zinc dust | Two blends | +| Nichrome | One nickel dust and one chromium dust | Two blends | +| Stainless steel | One steel dust or steel blend, and one chromium dust | Two blends | +| Titanium | One rutile dust and one magnesium dust | One blend | + +These are the modernized 1.12 formulas. Base Metals can supply copper, steel, +zinc and nickel. Other mods can supply them through the matching Forge dust +tags. Recipes requiring those ingredients become available when the tags +contain items. Chromium and Chrome ingredients both work for the two +chromium alloys. + +Whole steel blends can go straight into galvanized steel or stainless steel. +Dust and blend inputs share the same recipe. Base Metals also accepts whole +iron blends in steel and invar, and whole gold blends in electrum. Each whole +blend replaces one matching dust; small blends keep their existing processing. + +Titanium's rutile and magnesium route works with titanium ore generation off. +OreSpawn controls placement through its provider rules. + +## Coal and shared recipes + +Nine coal dust make a vanilla coal block. Craft that block into nine coal. +Crackhammers turn coal into one dust and coal blocks into nine dust. +Coal dust uses this processing route to recover ordinary furnace fuel. + +Modern Metals supplies these recipes when running on its own. With Base +Metals installed, its shared recipes accept both mods' coal dust. Modern +Metals keeps its recipe IDs when contributing crushing recipes to Base +Metals' recipe type. + +## Equipment and materials + +Equipment and components can be recycled in a furnace. Outputs are bounded +by their actual crafting cost, including rods and gears used in a recipe. +Buttons recycle into two nuggets. Levers and ranged items retain their +earlier recycling losses. Armour and shields can be repaired with a matching plate. Repairs +preserve names, enchantments and other saved item data. + +Every material has powder, small powder, ingot, nugget, storage, component, +equipment and bucket forms. The ordinary ore-processing materials are +aluminum, beryllium, boron, cadmium, chromium, iridium, magnesium, manganese, +osmium, plutonium, rutile, tantalum, thorium, tungsten, uranium and zirconium. +Titanium has its optional ore as well as its blend. + +Aluminum brass, galvanized steel, nichrome and stainless steel use blends. +The old galvanized steel, nichrome and stainless steel ore blocks are +retained for saved worlds. + +The catalogue also retains 138 processing forms from optional integrations, +including crushed and purified ores, crystals, shards, clumps, dirty powders, +casings and dense plates. Their mod-specific processing belongs to those +integrations. The 21 old fluid block items remain readable in saved +inventories. Filled buckets collect and place the corresponding molten +fluids. + +## Recipe discovery + +Picking up an ingot reveals its material's allowed crafting recipes. +Picking up a recipe ingredient also reveals the recipes using it. This +includes furnace recipes for powders, small powders, blends and recycling. + +Existing inventories are checked on login and after a data pack reload. +Earned advancement progress is kept when changing Fantasy Level. High +Fantasy enables the full crafting catalogue. Low Fantasy applies the +material restrictions from the config, including the inherited Base Metals +setting when it is installed. + +Crushing and plate repairs use their normal gameplay entry points. The +recipe books display crafting and furnace recipes. diff --git a/docs/RELEASING.md b/docs/RELEASING.md new file mode 100644 index 00000000..d9e99bee --- /dev/null +++ b/docs/RELEASING.md @@ -0,0 +1,28 @@ +# Releasing Modern Metals for Minecraft 1.13.2 + +Build with Java 17, Temurin 8u502-b07 for compilation and Java 25 for +Mavenizer. Run check, build, verify113ReleaseArtifacts, +write113ReleaseChecksums, genEclipseRuns and eclipse. Keep the packaged +gameplay and saved-world checks local, then complete manual testing. + +Open a PR from the fork to MMD's master-1.13.2. After merging, wait for the +successful push CI run and download ModernMetals-1.13.2-. Compare +all three jars with the locally qualified bundle. The CI bundle contains +the player, sources and Javadoc jars, SHA256SUMS and CHANGELOG.txt. + +Run deploy-release.yml on master-1.13.2 with the release version, full merged +commit and qualified game-jar SHA-256. Leave confirm_live_publication false +for verification. Set it true only when publication is authorised. The +workflow checks the branch tip, successful merged CI and bundle hashes, +then publishes those exact files to MMD Maven, CurseForge and GitHub. +It does not rebuild the jars during publication. + +MMD needs CURSEFORGE_TOKEN, MAVEN_UPLOAD_URL, MAVEN_UPLOAD_USERNAME and +MAVEN_UPLOAD_PASSWORD as repository or shared organisation secrets. Maven +publication requires HTTPS and validates the prepared bundle again. + +Verify anonymous downloads and hashes on all three services, including the +CurseForge dependency metadata. If a publication job fails, preserve its +logs and retry only the failed job; do not duplicate an accepted upload. +Base Metals is optional and OreSpawn is required. Publish Base Metals first +and keep the compatibility pin on its public 1.13.2 release. diff --git a/gradle.properties b/gradle.properties index 42e18c70..cdcb064c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,33 +1,15 @@ 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 - -minecraft_version=1.12.2 -forge_version=14.23.5.2859 -mappings_channel=stable -mappings_version=39-1.12 - +minecraft_version=1.13.2 +forge_version=25.0.223 +mapping_channel=snapshot +mapping_version=20180921-1.13 +mcp_version=20190213.203750 mod_id=modernmetals +mod_version=3.0.0.113021 mod_group=zone.moddev.mc.modernmetals -mod_version=2.5.2.112021 -mod_artifact=ModernMetals -loader_name=forge -loader_code=1 -java_version=8 -java_toolchain_version=8.0.502+7 -java_setup_version=8.0.502+7 -gradle_java_version=17 -gradle_java_setup_version=17.0.1+12 -mavenizer_java_version=25.0.3+9 -curseforge_project_id=244357 -cf_requirements=mmd-orespawn,mmdlib -orespawn_curse_project_id=245586 -coreplugin=zone.moddev.mc.modernmetals.compat.ModernMetalsLoadingPlugin -orespawn_version=4.1.6.112021 -orespawn_version_range=[4.1.6.112021,5.0.0) - -mmdlib_version=1.0.0-rc3 -forge_installer_sha256=DBBA1CD1BF34A4B82148BAC50A6150F63FFCB2D5DC7D88A0508C27FDCFF15B76 +orespawn_curse_file=9611746 +orespawn_sha256=e65dcca0623a20111c40779cb0fe2078e98c618faa68f79c9a28e1e53c63957e diff --git a/gradle/development-orespawn.gradle b/gradle/development-orespawn.gradle new file mode 100644 index 00000000..4fe34518 --- /dev/null +++ b/gradle/development-orespawn.gradle @@ -0,0 +1,100 @@ +import groovy.xml.XmlParser +import groovy.xml.XmlUtil +import java.security.MessageDigest +import java.util.jar.JarFile + +// An optional manual-test engine. Compilation and publication still use the release pin. +File candidate = layout.projectDirectory.file('run/compatibility-jars/orespawn-development.jar').asFile +boolean enabled = candidate.isFile() && providers.gradleProperty('useDevelopmentOreSpawn') + .map { it.toBoolean() }.getOrElse(false) +tasks.matching { it.name in ['genEclipseRunClientForForge', 'genEclipseRunServerForForge'] }.configureEach { + inputs.property('usesDevelopmentOreSpawn', enabled) +} +if (!enabled) return +File checksum = new File(candidate.parentFile, 'orespawn-development.sha256') +String publishedName = "mmd-orespawn-245586-${orespawn_curse_file}-renamed.jar" + +def verifyCandidate = tasks.register('verifyDevelopmentOreSpawn') { + inputs.file candidate + inputs.file checksum + inputs.files configurations.oreSpawnRelease + doLast { + String expected = checksum.text.trim().toLowerCase(Locale.ROOT) + String actual = MessageDigest.getInstance('SHA-256').digest(candidate.bytes).encodeHex().toString() + if (!(expected ==~ /[0-9a-f]{64}/) || actual != expected) { + throw new GradleException('The development OreSpawn jar does not match its recorded checksum.') + } + new JarFile(configurations.oreSpawnRelease.singleFile).withCloseable { release -> + new JarFile(candidate).withCloseable { development -> + String version = release.manifest.mainAttributes.getValue('Implementation-Version') + if (development.manifest.mainAttributes.getValue('Implementation-Version') != version) { + throw new GradleException('The development OreSpawn jar targets a different release. Update or disable it.') + } + def api = release.entries().toList().findAll { + it.name.startsWith('zone/moddev/mc/orespawn/api/') && it.name.endsWith('.class') + } + if (api.empty) throw new GradleException('The pinned OreSpawn public API is missing.') + api.each { entry -> + def replacement = development.getJarEntry(entry.name) + if (replacement == null || !Arrays.equals(release.getInputStream(entry).bytes, + development.getInputStream(replacement).bytes)) { + throw new GradleException("The development engine changes the pinned public API: ${entry.name}") + } + } + } + } + } +} + +def renameJarType = renamer.class.classLoader.loadClass('net.minecraftforge.renamer.gradle.RenameJar') +def mappedCandidate = tasks.register('mapDevelopmentOreSpawn', renameJarType, renamer) +mappedCandidate.configure { + dependsOn verifyCandidate + input.set(candidate) + output.set(layout.buildDirectory.file('development/OreSpawn-development-mapped.jar')) + map.from minecraft.dependency.toSrgFile + reverse.set(true) + // Published Forge 1.13 jars retain named classes with SRG member names. + naiveSrg.set(true) + accessTransformers.set(true) + libraries.from(sourceSets.main.compileClasspath.filter { it.name != publishedName }) +} + +def developmentClasspath = { JavaExec run -> + def original = run.classpath.files.toList() + if (original.count { it.name == publishedName } != 1) { + throw new GradleException('Expected one published OreSpawn entry in the normal development runtime.') + } + original.findAll { it.name != publishedName } + mappedCandidate.get().output.get().asFile +} + +tasks.withType(JavaExec).configureEach { + if (name in ['runClient', 'runServer']) { + dependsOn mappedCandidate + doFirst { JavaExec run -> run.classpath = project.files(developmentClasspath(run)) } + } +} + +tasks.matching { it.name in ['genEclipseRunClientForForge', 'genEclipseRunServerForForge'] }.configureEach { + dependsOn mappedCandidate + doLast { + String runName = name.replaceFirst('^genEclipseRun', 'run').replaceFirst('ForForge$', '') + File launch = layout.projectDirectory.file(runName + '.launch').asFile + Node configuration = new XmlParser().parse(launch) + Node entries = configuration.listAttribute.find { + it.attribute('key') == 'org.eclipse.jdt.launching.CLASSPATH' + } + def jre = entries.listEntry.findAll { + new XmlParser().parseText(it.attribute('value')).attribute('containerPath')?.startsWith( + 'org.eclipse.jdt.launching.JRE_CONTAINER/') + }.collect { it.attribute('value') } + entries.children().clear() + developmentClasspath(tasks.named(runName, JavaExec).get()).each { File entry -> + Node runtimeEntry = new Node(null, 'runtimeClasspathEntry', + [externalArchive: entry.absolutePath, type: '2', path: '5']) + new Node(entries, 'listEntry', [value: XmlUtil.serialize(runtimeEntry)]) + } + jre.each { new Node(entries, 'listEntry', [value: it]) } + launch.setText(XmlUtil.serialize(configuration), 'UTF-8') + } +} diff --git a/gradle/eclipse-compatibility.gradle b/gradle/eclipse-compatibility.gradle new file mode 100644 index 00000000..082c8dff --- /dev/null +++ b/gradle/eclipse-compatibility.gradle @@ -0,0 +1,53 @@ +import groovy.xml.XmlParser +import groovy.xml.XmlUtil + +def compatibilityJars = layout.projectDirectory.dir('run/compatibility-jars').asFile +def profiles = [ + 'Standalone': [], + 'Base Metals': ['basemetals'], + 'Base Gems': ['basegems'], + 'Base Minerals': ['baseminerals'], + 'Base Metals + Base Gems': ['basemetals', 'basegems'], + 'Base Metals + Base Minerals': ['basemetals', 'baseminerals'], + 'Base Gems + Base Minerals': ['basegems', 'baseminerals'], + 'All Add-ons': ['basemetals', 'basegems', 'baseminerals'] +] + +def prepareLaunches = tasks.register('prepareCompatibilityLaunches') { + group = 'ide' + description = 'Stages local add-on development jars and generates isolated Eclipse clients.' + dependsOn 'genEclipseRunClientForForge' + doLast { + def jars = profiles.values().flatten().unique().collectEntries { mod -> + File jar = new File(compatibilityJars, "${mod}-dev.jar") + if (!jar.isFile()) throw new GradleException("Missing ${jar}. Stage the add-on's deobf jar as described in README.md.") + [(mod): jar] + } + File client = layout.projectDirectory.file('runClient.launch').asFile + profiles.each { label, mods -> + String folder = mods ? mods.join('-') : 'standalone' + File gameDir = layout.projectDirectory.dir("run/compatibility/${folder}").asFile + File modsDir = new File(gameDir, 'mods') + if (!modsDir.isDirectory() && !modsDir.mkdirs()) { + throw new GradleException("Could not create ${modsDir}") + } + mods.each { mod -> + File jar = jars[mod] + java.nio.file.Files.copy(jar.toPath(), new File(modsDir, jar.name).toPath(), + java.nio.file.StandardCopyOption.REPLACE_EXISTING) + } + + Node launch = new XmlParser().parse(client) + Node workingDirectory = launch.stringAttribute.find { + it.attribute('key') == 'org.eclipse.jdt.launching.WORKING_DIRECTORY' + } + workingDirectory.attributes().put('value', gameDir.absolutePath) + layout.projectDirectory.file("Modern Metals - ${label}.launch").asFile + .setText(XmlUtil.serialize(launch), 'UTF-8') + } + } +} + +if (compatibilityJars.isDirectory()) { + tasks.named('genEclipseRuns') { dependsOn prepareLaunches } +} diff --git a/gradle/normalize-javadoc-trees.gradle b/gradle/normalize-javadoc-trees.gradle new file mode 100644 index 00000000..13238bb2 --- /dev/null +++ b/gradle/normalize-javadoc-trees.gradle @@ -0,0 +1,16 @@ +// Java 8's doclet leaves enum siblings in platform-dependent order. +// Keep the full hierarchy while giving leaf-only sibling lists a stable order. +tasks.withType(Javadoc).configureEach { + inputs.property('javadocTreeOrder', 'lexical leaf siblings 1') + doLast { + fileTree(destinationDir) { include '**/*-tree.html' }.files.each { page -> + String original = page.getText('UTF-8') + String ordered = original.replaceAll( + /(
    \r?\n)((?:
  • [^\r\n]*<\/li>\r?\n){2,})(<\/ul>)/) { + all, opening, siblings, closing -> + opening + siblings.readLines().sort().join('\n') + '\n' + closing + } + if (ordered != original) page.setText(ordered, 'UTF-8') + } + } +} diff --git a/gradle/release-113.gradle b/gradle/release-113.gradle new file mode 100644 index 00000000..46d3c1b3 --- /dev/null +++ b/gradle/release-113.gradle @@ -0,0 +1,190 @@ +import org.apache.tools.ant.filters.FixCrLfFilter +import java.security.MessageDigest +import java.util.jar.Manifest +import java.util.zip.ZipFile +import groovy.xml.XmlSlurper + +// Publish the same audited files that were built and tested by merged-source CI. +def archiveName = 'ModernMetals' +def modId = 'modernmetals' +def expectedGroup = 'zone.moddev.mc.' + modId +def playerJar = tasks.named('renameJar') +def releaseNames = ['', '-sources', '-javadoc'].collect { "${archiveName}-${project.version}${it}.jar".toString() } +def preparedDirectory = providers.gradleProperty('preparedReleaseDir') +def textPatterns = ['cfg', 'css', 'html', 'info', 'java', 'js', 'json', 'lang', 'mcmeta', 'md', 'properties', 'txt', 'xml', 'toml', 'list'] + .collect { "**/*.${it}".toString() } + ['**/package-list', '**/element-list'] + +tasks.withType(AbstractArchiveTask).configureEach { + inputs.property('releaseArchiveTextFormat', 'UTF-8 LF 2') + preserveFileTimestamps = false + reproducibleFileOrder = true + includeEmptyDirs = false + exclude '**/desktop.ini', '**/Thumbs.db', '**/.DS_Store' + filesMatching(textPatterns) { + filter(FixCrLfFilter, eol: FixCrLfFilter.CrLf.newInstance('lf')) + } +} +tasks.withType(Jar).configureEach { filteringCharset = 'UTF-8' } +tasks.withType(Javadoc).configureEach { + inputs.property('releaseJavadocFormat', 'UTF-8 sorted sources 1') + setSource(files(project.providers.provider { + project.sourceSets.main.allJava.files.sort { project.relativePath(it).replace('\\', '/') } + })) + options.addStringOption('docencoding', 'UTF-8') + options.addStringOption('charset', 'UTF-8') + options.addBooleanOption('notimestamp', true) +} +tasks.named('jar', Jar) { + manifest.attributes('Implementation-Title': archiveName, 'Implementation-Version': project.version, + 'Maven-Artifact': "${expectedGroup}:${archiveName}:${project.version}".toString(), + 'Build-Target': 'minecraft-1.13.2-forge-25.0.223-java-8') +} +tasks.named('assemble') { dependsOn playerJar, tasks.named('sourcesJar'), tasks.named('javadocJar') } + +def sha256 = { File file -> MessageDigest.getInstance('SHA-256').digest(file.bytes).encodeHex().toString() } +def audit = { File directory -> + if (project.group.toString() != expectedGroup || !(project.version.toString() ==~ /\d+\.\d+\.\d+\.113021/)) { + throw new GradleException('Wrong Maven or Minecraft release identity') + } + if (directory.listFiles().findAll { it.name.endsWith('.jar') }.collect { it.name }.sort() != releaseNames.sort(false)) { + throw new GradleException('The release directory must contain exactly the three current jars') + } + releaseNames.each { name -> + File file = new File(directory, name) + if (!file.isFile() || file.length() == 0) throw new GradleException("Missing ${name}") + new ZipFile(file).withCloseable { zip -> + zip.entries().each { entry -> + String path = entry.name.toLowerCase(Locale.ROOT) + if (path.contains('agent-notes') || path.contains('agents.md') || path.contains('.codex') + || path.startsWith('tools/') || path.startsWith('reference/') || path.contains('/testmod/') + || path.startsWith('com/mcmoddev/lib/') || path.startsWith('zone/moddev/mc/mmdlib/') + || path.startsWith('zone/moddev/mc/basemetals/') || path.startsWith('com/mcmoddev/orespawn/') + || path.startsWith('net/minecraft/') || path.startsWith('org/junit/')) { + throw new GradleException("Non-production entry in ${name}: ${entry.name}") + } + if (entry.name.endsWith('.class')) { + byte[] bytes = zip.getInputStream(entry).bytes + int major = ((bytes[6] & 255) << 8) | (bytes[7] & 255) + if (major != 52) throw new GradleException("Non-Java-8 class: ${entry.name}") + } + } + if (name == releaseNames[0]) { + def manifest = new Manifest(zip.getInputStream(zip.getEntry('META-INF/MANIFEST.MF'))).mainAttributes + if (manifest.getValue('Maven-Artifact') != "${expectedGroup}:${archiveName}:${project.version}") { + throw new GradleException('Wrong release manifest') + } + String metadata = zip.getInputStream(zip.getEntry('META-INF/mods.toml')).getText('UTF-8') + if (metadata.contains('${') || !metadata.contains('modId="' + modId + '"') + || !metadata.contains('version="' + project.version + '"') + || !metadata.contains('versionRange="[1.13.2]"') + || !metadata.contains('versionRange="[4.1.7.113021,5.0.0)"')) { + throw new GradleException('Wrong or unresolved release mod metadata') + } + } + } + } +} + +tasks.register('verify113ReleaseArtifacts') { + group = 'verification' + dependsOn tasks.named('assemble'), tasks.named('check') + doLast { audit(layout.buildDirectory.dir('libs').get().asFile) } +} +tasks.register('write113ReleaseChecksums') { + group = 'verification' + dependsOn tasks.named('verify113ReleaseArtifacts') + doLast { + File output = layout.buildDirectory.file('release/SHA256SUMS').get().asFile + output.parentFile.mkdirs() + output.setText(releaseNames.sort(false).collect { name -> + sha256(layout.buildDirectory.file('libs/' + name).get().asFile) + ' ' + name + }.join('\n') + '\n', 'UTF-8') + } +} +tasks.register('verify113PreparedReleaseArtifacts') { + group = 'verification' + doLast { + if (!preparedDirectory.isPresent()) throw new GradleException('preparedReleaseDir is required') + File directory = file(preparedDirectory.get()) + if (directory.listFiles().collect { it.name }.sort() != (releaseNames + ['SHA256SUMS', 'CHANGELOG.txt']).sort(false)) { + throw new GradleException('Unexpected prepared bundle contents') + } + audit(directory) + Map checksums = [:] + new File(directory, 'SHA256SUMS').readLines('UTF-8').each { line -> + def match = line =~ /^([0-9a-f]{64}) (.+)$/ + if (!match.matches()) throw new GradleException('Invalid prepared checksum entry') + if (checksums.containsKey(match[0][2])) throw new GradleException('Duplicate prepared checksum entry') + checksums[match[0][2]] = match[0][1] + } + if (checksums.keySet().sort() != releaseNames.sort(false)) throw new GradleException('Wrong prepared jar inventory') + checksums.each { name, hash -> + if (sha256(new File(directory, name)) != hash) throw new GradleException("Checksum mismatch: ${name}") + } + if (!new File(directory, 'CHANGELOG.txt').readLines('UTF-8')[0].contains(project.version.toString())) { + throw new GradleException('Prepared changelog belongs to another release') + } + } +} + +publishing { + publications { + mavenJava(MavenPublication) { + groupId = expectedGroup + artifactId = archiveName + version = project.version.toString() + setArtifacts([]) + if (preparedDirectory.isPresent()) { + artifact new File(preparedDirectory.get(), releaseNames[0]) + artifact(new File(preparedDirectory.get(), releaseNames[1])) { classifier = 'sources' } + artifact(new File(preparedDirectory.get(), releaseNames[2])) { classifier = 'javadoc' } + } else { + artifact playerJar + artifact tasks.named('sourcesJar') + artifact tasks.named('javadocJar') + } + pom { + name = 'Modern Metals' + description = 'Modern Metals for Minecraft 1.13.2, using Forge 25 and OreSpawn 4.' + url = 'https://github.com/MinecraftModDevelopmentMods/ModernMetals' + licenses { + license { + name = 'GNU Lesser General Public License, Version 2.1' + url = 'https://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt' + } + } + } + } + } + repositories { + maven { + name = 'release' + url = uri(providers.environmentVariable('MAVEN_UPLOAD_URL').getOrElse('https://invalid.invalid/missing-upload-url')) + credentials { + username = providers.environmentVariable('MAVEN_UPLOAD_USERNAME').getOrElse('') + password = providers.environmentVariable('MAVEN_UPLOAD_PASSWORD').getOrElse('') + } + } + } +} +tasks.register('verify113MavenCoordinates') { + dependsOn 'generatePomFileForMavenJavaPublication' + doLast { + def pom = new XmlSlurper(false, false).parse(layout.buildDirectory.file('publications/mavenJava/pom-default.xml').get().asFile) + if ([pom.groupId.text(), pom.artifactId.text(), pom.version.text()] != [expectedGroup, archiveName, project.version.toString()]) { + throw new GradleException('Wrong Maven publication coordinates') + } + } +} +tasks.withType(PublishToMavenRepository).configureEach { + dependsOn 'verify113MavenCoordinates' + dependsOn preparedDirectory.isPresent() ? 'verify113PreparedReleaseArtifacts' : 'verify113ReleaseArtifacts' + doFirst { + def url = providers.environmentVariable('MAVEN_UPLOAD_URL').getOrElse('') + if (!url.startsWith('https://') || url.startsWith('https://invalid.invalid') + || !providers.environmentVariable('MAVEN_UPLOAD_USERNAME').getOrElse('').trim() + || !providers.environmentVariable('MAVEN_UPLOAD_PASSWORD').getOrElse('').trim()) { + throw new GradleException('Configure the HTTPS Maven upload URL, username and password') + } + } +} diff --git a/gradle/stage-orespawn-release.sh b/gradle/stage-orespawn-release.sh new file mode 100644 index 00000000..082ba705 --- /dev/null +++ b/gradle/stage-orespawn-release.sh @@ -0,0 +1,16 @@ +#!/usr/bin/env bash +set -euo pipefail + +mirror="${1:?Supply a local dependency mirror}" +file_id=9611746 +archive="$mirror/curse/maven/mmd-orespawn-245586/$file_id/mmd-orespawn-245586-$file_id.jar" +mkdir -p "$(dirname "$archive")" +if [[ ! -f "$archive" ]]; then + temporary="$(mktemp "$(dirname "$archive")/orespawn.XXXXXX")" + trap 'rm -f "$temporary"' EXIT + curl --fail --silent --show-error --location --retry 3 --max-time 60 \ + 'https://mediafilez.forgecdn.net/files/9611/746/OreSpawn-4.1.7.113021.jar' -o "$temporary" + printf '%s %s\n' e65dcca0623a20111c40779cb0fe2078e98c618faa68f79c9a28e1e53c63957e "$temporary" | sha256sum --check + mv "$temporary" "$archive" +fi +printf '%s %s\n' e65dcca0623a20111c40779cb0fe2078e98c618faa68f79c9a28e1e53c63957e "$archive" | sha256sum --check diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index b1b8ef56..0d4a9516 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 dbe66e1d..2c68b418 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,10 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionSha256Sum=9c0f7faeeb306cb14e4279a3e084ca6b596894089a0638e68a07c945a32c9e14 distributionUrl=https\://services.gradle.org/distributions/gradle-9.6.1-bin.zip -networkTimeout=10000 -retries=0 -retryBackOffMs=500 -validateDistributionUrl=true +distributionSha256Sum=9c0f7faeeb306cb14e4279a3e084ca6b596894089a0638e68a07c945a32c9e14 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 249efbb0..cccdd3d5 100755 --- a/gradlew +++ b/gradlew @@ -1,128 +1,78 @@ -#!/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 -# +#!/usr/bin/env sh ############################################################################## -# -# 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/. -# +## +## Gradle start up script for UN*X +## ############################################################################## # Attempt to set APP_HOME - # Resolve links: $0 may be a link -app_path=$0 - -# Need this for daisy-chained symlinks. -while - APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path - [ -h "$app_path" ] -do - ls=$( ls -ld "$app_path" ) - link=${ls#*' -> '} - case $link in #( - /*) app_path=$link ;; #( - *) app_path=$APP_HOME$link ;; - esac +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` -# 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 +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS="" # Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD=maximum +MAX_FD="maximum" warn () { echo "$*" -} >&2 +} die () { echo echo "$*" echo exit 1 -} >&2 +} # OS specific support (must be 'true' or 'false'). cygwin=false msys=false darwin=false nonstop=false -case "$( uname )" in #( - CYGWIN* ) cygwin=true ;; #( - Darwin* ) darwin=true ;; #( - MSYS* | MINGW* ) msys=true ;; #( - NONSTOP* ) nonstop=true ;; +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; + NONSTOP* ) + nonstop=true + ;; esac - +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar # Determine the Java command to use to start the JVM. if [ -n "$JAVA_HOME" ] ; then if [ -x "$JAVA_HOME/jre/sh/java" ] ; then # IBM's JDK on AIX uses strange locations for the executables - JAVACMD=$JAVA_HOME/jre/sh/java + JAVACMD="$JAVA_HOME/jre/sh/java" else - JAVACMD=$JAVA_HOME/bin/java + JAVACMD="$JAVA_HOME/bin/java" fi if [ ! -x "$JAVACMD" ] ; then die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME @@ -131,118 +81,92 @@ Please set the JAVA_HOME variable in your environment to match the location of your Java installation." fi else - 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. + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the location of your Java installation." - fi fi # Increase the maximum file descriptors if we can. -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 +if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi fi -# Collect all arguments for the java command, stacking in reverse order: -# * args from the command line -# * the main class name -# * -classpath -# * -D...appname settings -# * --module-path (only if needed) -# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. - -# For Cygwin or MSYS, switch paths to Windows format before running java -if "$cygwin" || "$msys" ; then - APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) - - JAVACMD=$( cygpath --unix "$JAVACMD" ) +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi +# For Cygwin, switch paths to Windows format before running java +if $cygwin ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + JAVACMD=`cygpath --unix "$JAVACMD"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi # Now convert the arguments - kludge to limit ourselves to /bin/sh - for arg do - if - case $arg in #( - -*) false ;; # don't mess with options #( - /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath - [ -e "$t" ] ;; #( - *) false ;; - esac - then - arg=$( cygpath --path --ignore --mixed "$arg" ) + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" fi - # Roll the args list around exactly as many times as the number of - # args, so each arg winds up back in the position where it started, but - # possibly modified. - # - # NB: a `for` loop captures its iteration list before it begins, so - # changing the positional parameters here affects neither the number of - # iterations, nor the values presented in `arg`. - shift # remove old arg - set -- "$@" "$arg" # push replacement arg + i=$((i+1)) done + case $i in + (0) set -- ;; + (1) set -- "$args0" ;; + (2) set -- "$args0" "$args1" ;; + (3) set -- "$args0" "$args1" "$args2" ;; + (4) set -- "$args0" "$args1" "$args2" "$args3" ;; + (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac fi +# Escape application args +save () { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " +} +APP_ARGS=$(save "$@") -# 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 +# 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" -# 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' ' ' - )" '"$@"' +# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong +if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then + cd "$(dirname "$0")" +fi exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat index a51ec4f5..f9553162 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -1,82 +1,84 @@ -@rem -@rem Copyright 2015 the original author or authors. -@rem -@rem Licensed under the Apache License, Version 2.0 (the "License"); -@rem you may not use this file except in compliance with the License. -@rem You may obtain a copy of the License at -@rem -@rem https://www.apache.org/licenses/LICENSE-2.0 -@rem -@rem Unless required by applicable law or agreed to in writing, software -@rem distributed under the License is distributed on an "AS IS" BASIS, -@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -@rem See the License for the specific language governing permissions and -@rem limitations under the License. -@rem -@rem SPDX-License-Identifier: Apache-2.0 -@rem - -@if "%DEBUG%"=="" @echo off +@if "%DEBUG%" == "" @echo off @rem ########################################################################## @rem -@rem gradlew startup script for Windows +@rem Gradle startup script for Windows @rem @rem ########################################################################## -@rem Set local scope for the variables, and ensure extensions are enabled -setlocal EnableExtensions +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 -if "%DIRNAME%"=="" set DIRNAME=. -@rem This is normally unused +if "%DIRNAME%" == "" set DIRNAME=. set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% -@rem Resolve any "." and ".." in APP_HOME to make it shorter. -for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi - @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" +set DEFAULT_JVM_OPTS= @rem Find java.exe if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if %ERRORLEVEL% equ 0 goto execute +if "%ERRORLEVEL%" == "0" goto init -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. 1>&2 +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. -"%COMSPEC%" /c exit 1 +goto fail :findJavaFromJavaHome set JAVA_HOME=%JAVA_HOME:"=% set JAVA_EXE=%JAVA_HOME%/bin/java.exe -if exist "%JAVA_EXE%" goto execute +if exist "%JAVA_EXE%" goto init -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. 1>&2 +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. -"%COMSPEC%" /c exit 1 +goto fail + +:init +@rem Get command-line arguments, handling Windows variants + +if not "%OS%" == "Windows_NT" goto win9xME_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* :execute @rem Setup the command line +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 -@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 +:mainEnd +if "%OS%"=="Windows_NT" endlocal -:exitWithErrorLevel -@rem Use "%COMSPEC%" /c exit to allow operators to work properly in scripts -"%COMSPEC%" /c exit %ERRORLEVEL% +:omega diff --git a/settings.gradle b/settings.gradle index c4091f15..833c2085 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,3 +1,13 @@ +pluginManagement { + repositories { + gradlePluginPortal() + maven { + name = 'MinecraftForge' + url = 'https://maven.minecraftforge.net/' + } + } +} + plugins { id 'org.gradle.toolchains.foojay-resolver-convention' version '1.0.0' } diff --git a/src/generated/resources/data/forge/tags/blocks/ores/aluminum.json b/src/generated/resources/data/forge/tags/blocks/ores/aluminum.json new file mode 100644 index 00000000..d614d1e9 --- /dev/null +++ b/src/generated/resources/data/forge/tags/blocks/ores/aluminum.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "modernmetals:aluminum_ore" + ] +} diff --git a/src/generated/resources/data/forge/tags/blocks/ores/beryllium.json b/src/generated/resources/data/forge/tags/blocks/ores/beryllium.json new file mode 100644 index 00000000..eb68c4a3 --- /dev/null +++ b/src/generated/resources/data/forge/tags/blocks/ores/beryllium.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "modernmetals:beryllium_ore" + ] +} diff --git a/src/generated/resources/data/forge/tags/blocks/ores/boron.json b/src/generated/resources/data/forge/tags/blocks/ores/boron.json new file mode 100644 index 00000000..6b47f7c1 --- /dev/null +++ b/src/generated/resources/data/forge/tags/blocks/ores/boron.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "modernmetals:boron_ore" + ] +} diff --git a/src/generated/resources/data/forge/tags/blocks/ores/cadmium.json b/src/generated/resources/data/forge/tags/blocks/ores/cadmium.json new file mode 100644 index 00000000..5dd4413d --- /dev/null +++ b/src/generated/resources/data/forge/tags/blocks/ores/cadmium.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "modernmetals:cadmium_ore" + ] +} diff --git a/src/generated/resources/data/forge/tags/blocks/ores/chrome.json b/src/generated/resources/data/forge/tags/blocks/ores/chrome.json new file mode 100644 index 00000000..dfe19d68 --- /dev/null +++ b/src/generated/resources/data/forge/tags/blocks/ores/chrome.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "modernmetals:chromium_ore" + ] +} diff --git a/src/generated/resources/data/forge/tags/blocks/ores/chromium.json b/src/generated/resources/data/forge/tags/blocks/ores/chromium.json new file mode 100644 index 00000000..dfe19d68 --- /dev/null +++ b/src/generated/resources/data/forge/tags/blocks/ores/chromium.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "modernmetals:chromium_ore" + ] +} diff --git a/src/generated/resources/data/forge/tags/blocks/ores/galvanizedsteel.json b/src/generated/resources/data/forge/tags/blocks/ores/galvanizedsteel.json new file mode 100644 index 00000000..570bde08 --- /dev/null +++ b/src/generated/resources/data/forge/tags/blocks/ores/galvanizedsteel.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "modernmetals:galvanizedsteel_ore" + ] +} diff --git a/src/generated/resources/data/forge/tags/blocks/ores/iridium.json b/src/generated/resources/data/forge/tags/blocks/ores/iridium.json new file mode 100644 index 00000000..a6c87fdd --- /dev/null +++ b/src/generated/resources/data/forge/tags/blocks/ores/iridium.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "modernmetals:iridium_ore" + ] +} diff --git a/src/generated/resources/data/forge/tags/blocks/ores/magnesium.json b/src/generated/resources/data/forge/tags/blocks/ores/magnesium.json new file mode 100644 index 00000000..cf3a7eb3 --- /dev/null +++ b/src/generated/resources/data/forge/tags/blocks/ores/magnesium.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "modernmetals:magnesium_ore" + ] +} diff --git a/src/generated/resources/data/forge/tags/blocks/ores/manganese.json b/src/generated/resources/data/forge/tags/blocks/ores/manganese.json new file mode 100644 index 00000000..c60b54be --- /dev/null +++ b/src/generated/resources/data/forge/tags/blocks/ores/manganese.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "modernmetals:manganese_ore" + ] +} diff --git a/src/generated/resources/data/forge/tags/blocks/ores/nichrome.json b/src/generated/resources/data/forge/tags/blocks/ores/nichrome.json new file mode 100644 index 00000000..d0795865 --- /dev/null +++ b/src/generated/resources/data/forge/tags/blocks/ores/nichrome.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "modernmetals:nichrome_ore" + ] +} diff --git a/src/generated/resources/data/forge/tags/blocks/ores/osmium.json b/src/generated/resources/data/forge/tags/blocks/ores/osmium.json new file mode 100644 index 00000000..544542bc --- /dev/null +++ b/src/generated/resources/data/forge/tags/blocks/ores/osmium.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "modernmetals:osmium_ore" + ] +} diff --git a/src/generated/resources/data/forge/tags/blocks/ores/plutonium.json b/src/generated/resources/data/forge/tags/blocks/ores/plutonium.json new file mode 100644 index 00000000..9046bf3e --- /dev/null +++ b/src/generated/resources/data/forge/tags/blocks/ores/plutonium.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "modernmetals:plutonium_ore" + ] +} diff --git a/src/generated/resources/data/forge/tags/blocks/ores/rutile.json b/src/generated/resources/data/forge/tags/blocks/ores/rutile.json new file mode 100644 index 00000000..780b477e --- /dev/null +++ b/src/generated/resources/data/forge/tags/blocks/ores/rutile.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "modernmetals:rutile_ore" + ] +} diff --git a/src/generated/resources/data/forge/tags/blocks/ores/stainlesssteel.json b/src/generated/resources/data/forge/tags/blocks/ores/stainlesssteel.json new file mode 100644 index 00000000..70277044 --- /dev/null +++ b/src/generated/resources/data/forge/tags/blocks/ores/stainlesssteel.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "modernmetals:stainlesssteel_ore" + ] +} diff --git a/src/generated/resources/data/forge/tags/blocks/ores/tantalum.json b/src/generated/resources/data/forge/tags/blocks/ores/tantalum.json new file mode 100644 index 00000000..9231a033 --- /dev/null +++ b/src/generated/resources/data/forge/tags/blocks/ores/tantalum.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "modernmetals:tantalum_ore" + ] +} diff --git a/src/generated/resources/data/forge/tags/blocks/ores/thorium.json b/src/generated/resources/data/forge/tags/blocks/ores/thorium.json new file mode 100644 index 00000000..9f0b0fbe --- /dev/null +++ b/src/generated/resources/data/forge/tags/blocks/ores/thorium.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "modernmetals:thorium_ore" + ] +} diff --git a/src/generated/resources/data/forge/tags/blocks/ores/titanium.json b/src/generated/resources/data/forge/tags/blocks/ores/titanium.json new file mode 100644 index 00000000..60f610ff --- /dev/null +++ b/src/generated/resources/data/forge/tags/blocks/ores/titanium.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "modernmetals:titanium_ore" + ] +} diff --git a/src/generated/resources/data/forge/tags/blocks/ores/tungsten.json b/src/generated/resources/data/forge/tags/blocks/ores/tungsten.json new file mode 100644 index 00000000..eb3b3746 --- /dev/null +++ b/src/generated/resources/data/forge/tags/blocks/ores/tungsten.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "modernmetals:tungsten_ore" + ] +} diff --git a/src/generated/resources/data/forge/tags/blocks/ores/uranium.json b/src/generated/resources/data/forge/tags/blocks/ores/uranium.json new file mode 100644 index 00000000..e621d290 --- /dev/null +++ b/src/generated/resources/data/forge/tags/blocks/ores/uranium.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "modernmetals:uranium_ore" + ] +} diff --git a/src/generated/resources/data/forge/tags/blocks/ores/zirconium.json b/src/generated/resources/data/forge/tags/blocks/ores/zirconium.json new file mode 100644 index 00000000..7702e00a --- /dev/null +++ b/src/generated/resources/data/forge/tags/blocks/ores/zirconium.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "modernmetals:zirconium_ore" + ] +} diff --git a/src/generated/resources/data/forge/tags/items/blends/aluminumbrass.json b/src/generated/resources/data/forge/tags/items/blends/aluminumbrass.json new file mode 100644 index 00000000..99789420 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/blends/aluminumbrass.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "modernmetals:aluminumbrass_blend" + ] +} diff --git a/src/generated/resources/data/forge/tags/items/blends/galvanizedsteel.json b/src/generated/resources/data/forge/tags/items/blends/galvanizedsteel.json new file mode 100644 index 00000000..6824c9f3 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/blends/galvanizedsteel.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "modernmetals:galvanizedsteel_blend" + ] +} diff --git a/src/generated/resources/data/forge/tags/items/blends/nichrome.json b/src/generated/resources/data/forge/tags/items/blends/nichrome.json new file mode 100644 index 00000000..c399edd6 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/blends/nichrome.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "modernmetals:nichrome_blend" + ] +} diff --git a/src/generated/resources/data/forge/tags/items/blends/stainlesssteel.json b/src/generated/resources/data/forge/tags/items/blends/stainlesssteel.json new file mode 100644 index 00000000..f7a701f6 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/blends/stainlesssteel.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "modernmetals:stainlesssteel_blend" + ] +} diff --git a/src/generated/resources/data/forge/tags/items/blends/titanium.json b/src/generated/resources/data/forge/tags/items/blends/titanium.json new file mode 100644 index 00000000..58a3fe45 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/blends/titanium.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "modernmetals:titanium_blend" + ] +} diff --git a/src/generated/resources/data/forge/tags/items/dusts/aluminum.json b/src/generated/resources/data/forge/tags/items/dusts/aluminum.json new file mode 100644 index 00000000..5a1e06da --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/dusts/aluminum.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "modernmetals:aluminum_powder" + ] +} diff --git a/src/generated/resources/data/forge/tags/items/dusts/aluminumbrass.json b/src/generated/resources/data/forge/tags/items/dusts/aluminumbrass.json new file mode 100644 index 00000000..ba070664 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/dusts/aluminumbrass.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "modernmetals:aluminumbrass_powder" + ] +} diff --git a/src/generated/resources/data/forge/tags/items/dusts/beryllium.json b/src/generated/resources/data/forge/tags/items/dusts/beryllium.json new file mode 100644 index 00000000..013d4df5 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/dusts/beryllium.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "modernmetals:beryllium_powder" + ] +} diff --git a/src/generated/resources/data/forge/tags/items/dusts/boron.json b/src/generated/resources/data/forge/tags/items/dusts/boron.json new file mode 100644 index 00000000..5880676a --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/dusts/boron.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "modernmetals:boron_powder" + ] +} diff --git a/src/generated/resources/data/forge/tags/items/dusts/cadmium.json b/src/generated/resources/data/forge/tags/items/dusts/cadmium.json new file mode 100644 index 00000000..6bd3a591 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/dusts/cadmium.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "modernmetals:cadmium_powder" + ] +} diff --git a/src/generated/resources/data/forge/tags/items/dusts/chrome.json b/src/generated/resources/data/forge/tags/items/dusts/chrome.json new file mode 100644 index 00000000..73ce7a04 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/dusts/chrome.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "modernmetals:chromium_powder" + ] +} diff --git a/src/generated/resources/data/forge/tags/items/dusts/chromium.json b/src/generated/resources/data/forge/tags/items/dusts/chromium.json new file mode 100644 index 00000000..73ce7a04 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/dusts/chromium.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "modernmetals:chromium_powder" + ] +} diff --git a/src/generated/resources/data/forge/tags/items/dusts/copper.json b/src/generated/resources/data/forge/tags/items/dusts/copper.json new file mode 100644 index 00000000..5d341ba2 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/dusts/copper.json @@ -0,0 +1,4 @@ +{ + "replace": false, + "values": [] +} diff --git a/src/generated/resources/data/forge/tags/items/dusts/galvanizedsteel.json b/src/generated/resources/data/forge/tags/items/dusts/galvanizedsteel.json new file mode 100644 index 00000000..8aae41ed --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/dusts/galvanizedsteel.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "modernmetals:galvanizedsteel_powder" + ] +} diff --git a/src/generated/resources/data/forge/tags/items/dusts/iridium.json b/src/generated/resources/data/forge/tags/items/dusts/iridium.json new file mode 100644 index 00000000..acb0136e --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/dusts/iridium.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "modernmetals:iridium_powder" + ] +} diff --git a/src/generated/resources/data/forge/tags/items/dusts/magnesium.json b/src/generated/resources/data/forge/tags/items/dusts/magnesium.json new file mode 100644 index 00000000..cfa4dc94 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/dusts/magnesium.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "modernmetals:magnesium_powder" + ] +} diff --git a/src/generated/resources/data/forge/tags/items/dusts/manganese.json b/src/generated/resources/data/forge/tags/items/dusts/manganese.json new file mode 100644 index 00000000..11339794 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/dusts/manganese.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "modernmetals:manganese_powder" + ] +} diff --git a/src/generated/resources/data/forge/tags/items/dusts/nichrome.json b/src/generated/resources/data/forge/tags/items/dusts/nichrome.json new file mode 100644 index 00000000..22b8c516 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/dusts/nichrome.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "modernmetals:nichrome_powder" + ] +} diff --git a/src/generated/resources/data/forge/tags/items/dusts/nickel.json b/src/generated/resources/data/forge/tags/items/dusts/nickel.json new file mode 100644 index 00000000..5d341ba2 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/dusts/nickel.json @@ -0,0 +1,4 @@ +{ + "replace": false, + "values": [] +} diff --git a/src/generated/resources/data/forge/tags/items/dusts/osmium.json b/src/generated/resources/data/forge/tags/items/dusts/osmium.json new file mode 100644 index 00000000..5c8668c7 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/dusts/osmium.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "modernmetals:osmium_powder" + ] +} diff --git a/src/generated/resources/data/forge/tags/items/dusts/plutonium.json b/src/generated/resources/data/forge/tags/items/dusts/plutonium.json new file mode 100644 index 00000000..9a4d1772 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/dusts/plutonium.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "modernmetals:plutonium_powder" + ] +} diff --git a/src/generated/resources/data/forge/tags/items/dusts/rutile.json b/src/generated/resources/data/forge/tags/items/dusts/rutile.json new file mode 100644 index 00000000..3e230963 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/dusts/rutile.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "modernmetals:rutile_powder" + ] +} diff --git a/src/generated/resources/data/forge/tags/items/dusts/stainlesssteel.json b/src/generated/resources/data/forge/tags/items/dusts/stainlesssteel.json new file mode 100644 index 00000000..401baa66 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/dusts/stainlesssteel.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "modernmetals:stainlesssteel_powder" + ] +} diff --git a/src/generated/resources/data/forge/tags/items/dusts/steel.json b/src/generated/resources/data/forge/tags/items/dusts/steel.json new file mode 100644 index 00000000..5d341ba2 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/dusts/steel.json @@ -0,0 +1,4 @@ +{ + "replace": false, + "values": [] +} diff --git a/src/generated/resources/data/forge/tags/items/dusts/tantalum.json b/src/generated/resources/data/forge/tags/items/dusts/tantalum.json new file mode 100644 index 00000000..9e41777f --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/dusts/tantalum.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "modernmetals:tantalum_powder" + ] +} diff --git a/src/generated/resources/data/forge/tags/items/dusts/thorium.json b/src/generated/resources/data/forge/tags/items/dusts/thorium.json new file mode 100644 index 00000000..b2a5d3f6 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/dusts/thorium.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "modernmetals:thorium_powder" + ] +} diff --git a/src/generated/resources/data/forge/tags/items/dusts/titanium.json b/src/generated/resources/data/forge/tags/items/dusts/titanium.json new file mode 100644 index 00000000..119829d4 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/dusts/titanium.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "modernmetals:titanium_powder" + ] +} diff --git a/src/generated/resources/data/forge/tags/items/dusts/tungsten.json b/src/generated/resources/data/forge/tags/items/dusts/tungsten.json new file mode 100644 index 00000000..aa4c5cfe --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/dusts/tungsten.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "modernmetals:tungsten_powder" + ] +} diff --git a/src/generated/resources/data/forge/tags/items/dusts/uranium.json b/src/generated/resources/data/forge/tags/items/dusts/uranium.json new file mode 100644 index 00000000..de1285c0 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/dusts/uranium.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "modernmetals:uranium_powder" + ] +} diff --git a/src/generated/resources/data/forge/tags/items/dusts/zinc.json b/src/generated/resources/data/forge/tags/items/dusts/zinc.json new file mode 100644 index 00000000..5d341ba2 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/dusts/zinc.json @@ -0,0 +1,4 @@ +{ + "replace": false, + "values": [] +} diff --git a/src/generated/resources/data/forge/tags/items/dusts/zirconium.json b/src/generated/resources/data/forge/tags/items/dusts/zirconium.json new file mode 100644 index 00000000..509b171f --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/dusts/zirconium.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "modernmetals:zirconium_powder" + ] +} diff --git a/src/generated/resources/data/forge/tags/items/gears/aluminum.json b/src/generated/resources/data/forge/tags/items/gears/aluminum.json new file mode 100644 index 00000000..3250aee6 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/gears/aluminum.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "modernmetals:aluminum_gear" + ] +} diff --git a/src/generated/resources/data/forge/tags/items/gears/aluminumbrass.json b/src/generated/resources/data/forge/tags/items/gears/aluminumbrass.json new file mode 100644 index 00000000..cb3a7ffa --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/gears/aluminumbrass.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "modernmetals:aluminumbrass_gear" + ] +} diff --git a/src/generated/resources/data/forge/tags/items/gears/beryllium.json b/src/generated/resources/data/forge/tags/items/gears/beryllium.json new file mode 100644 index 00000000..00e6a19f --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/gears/beryllium.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "modernmetals:beryllium_gear" + ] +} diff --git a/src/generated/resources/data/forge/tags/items/gears/boron.json b/src/generated/resources/data/forge/tags/items/gears/boron.json new file mode 100644 index 00000000..1c789f97 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/gears/boron.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "modernmetals:boron_gear" + ] +} diff --git a/src/generated/resources/data/forge/tags/items/gears/cadmium.json b/src/generated/resources/data/forge/tags/items/gears/cadmium.json new file mode 100644 index 00000000..de31a78f --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/gears/cadmium.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "modernmetals:cadmium_gear" + ] +} diff --git a/src/generated/resources/data/forge/tags/items/gears/chrome.json b/src/generated/resources/data/forge/tags/items/gears/chrome.json new file mode 100644 index 00000000..bac4e6e2 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/gears/chrome.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "modernmetals:chromium_gear" + ] +} diff --git a/src/generated/resources/data/forge/tags/items/gears/chromium.json b/src/generated/resources/data/forge/tags/items/gears/chromium.json new file mode 100644 index 00000000..bac4e6e2 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/gears/chromium.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "modernmetals:chromium_gear" + ] +} diff --git a/src/generated/resources/data/forge/tags/items/gears/galvanizedsteel.json b/src/generated/resources/data/forge/tags/items/gears/galvanizedsteel.json new file mode 100644 index 00000000..66f5fec7 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/gears/galvanizedsteel.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "modernmetals:galvanizedsteel_gear" + ] +} diff --git a/src/generated/resources/data/forge/tags/items/gears/iridium.json b/src/generated/resources/data/forge/tags/items/gears/iridium.json new file mode 100644 index 00000000..6b2e723f --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/gears/iridium.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "modernmetals:iridium_gear" + ] +} diff --git a/src/generated/resources/data/forge/tags/items/gears/magnesium.json b/src/generated/resources/data/forge/tags/items/gears/magnesium.json new file mode 100644 index 00000000..f379951b --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/gears/magnesium.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "modernmetals:magnesium_gear" + ] +} diff --git a/src/generated/resources/data/forge/tags/items/gears/manganese.json b/src/generated/resources/data/forge/tags/items/gears/manganese.json new file mode 100644 index 00000000..6d985571 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/gears/manganese.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "modernmetals:manganese_gear" + ] +} diff --git a/src/generated/resources/data/forge/tags/items/gears/nichrome.json b/src/generated/resources/data/forge/tags/items/gears/nichrome.json new file mode 100644 index 00000000..1c1a1054 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/gears/nichrome.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "modernmetals:nichrome_gear" + ] +} diff --git a/src/generated/resources/data/forge/tags/items/gears/osmium.json b/src/generated/resources/data/forge/tags/items/gears/osmium.json new file mode 100644 index 00000000..17c80f90 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/gears/osmium.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "modernmetals:osmium_gear" + ] +} diff --git a/src/generated/resources/data/forge/tags/items/gears/plutonium.json b/src/generated/resources/data/forge/tags/items/gears/plutonium.json new file mode 100644 index 00000000..63e8b566 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/gears/plutonium.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "modernmetals:plutonium_gear" + ] +} diff --git a/src/generated/resources/data/forge/tags/items/gears/rutile.json b/src/generated/resources/data/forge/tags/items/gears/rutile.json new file mode 100644 index 00000000..7efad874 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/gears/rutile.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "modernmetals:rutile_gear" + ] +} diff --git a/src/generated/resources/data/forge/tags/items/gears/stainlesssteel.json b/src/generated/resources/data/forge/tags/items/gears/stainlesssteel.json new file mode 100644 index 00000000..71f71c81 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/gears/stainlesssteel.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "modernmetals:stainlesssteel_gear" + ] +} diff --git a/src/generated/resources/data/forge/tags/items/gears/tantalum.json b/src/generated/resources/data/forge/tags/items/gears/tantalum.json new file mode 100644 index 00000000..e1744e0b --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/gears/tantalum.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "modernmetals:tantalum_gear" + ] +} diff --git a/src/generated/resources/data/forge/tags/items/gears/thorium.json b/src/generated/resources/data/forge/tags/items/gears/thorium.json new file mode 100644 index 00000000..f4e2991b --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/gears/thorium.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "modernmetals:thorium_gear" + ] +} diff --git a/src/generated/resources/data/forge/tags/items/gears/titanium.json b/src/generated/resources/data/forge/tags/items/gears/titanium.json new file mode 100644 index 00000000..ad659095 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/gears/titanium.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "modernmetals:titanium_gear" + ] +} diff --git a/src/generated/resources/data/forge/tags/items/gears/tungsten.json b/src/generated/resources/data/forge/tags/items/gears/tungsten.json new file mode 100644 index 00000000..3385337f --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/gears/tungsten.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "modernmetals:tungsten_gear" + ] +} diff --git a/src/generated/resources/data/forge/tags/items/gears/uranium.json b/src/generated/resources/data/forge/tags/items/gears/uranium.json new file mode 100644 index 00000000..bcca11d2 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/gears/uranium.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "modernmetals:uranium_gear" + ] +} diff --git a/src/generated/resources/data/forge/tags/items/gears/zirconium.json b/src/generated/resources/data/forge/tags/items/gears/zirconium.json new file mode 100644 index 00000000..b38a235b --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/gears/zirconium.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "modernmetals:zirconium_gear" + ] +} diff --git a/src/generated/resources/data/forge/tags/items/ingots/aluminum.json b/src/generated/resources/data/forge/tags/items/ingots/aluminum.json new file mode 100644 index 00000000..e18bd6bd --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/ingots/aluminum.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "modernmetals:aluminum_ingot" + ] +} diff --git a/src/generated/resources/data/forge/tags/items/ingots/aluminumbrass.json b/src/generated/resources/data/forge/tags/items/ingots/aluminumbrass.json new file mode 100644 index 00000000..995e7d9c --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/ingots/aluminumbrass.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "modernmetals:aluminumbrass_ingot" + ] +} diff --git a/src/generated/resources/data/forge/tags/items/ingots/beryllium.json b/src/generated/resources/data/forge/tags/items/ingots/beryllium.json new file mode 100644 index 00000000..43461a9a --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/ingots/beryllium.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "modernmetals:beryllium_ingot" + ] +} diff --git a/src/generated/resources/data/forge/tags/items/ingots/boron.json b/src/generated/resources/data/forge/tags/items/ingots/boron.json new file mode 100644 index 00000000..ddc45fa6 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/ingots/boron.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "modernmetals:boron_ingot" + ] +} diff --git a/src/generated/resources/data/forge/tags/items/ingots/cadmium.json b/src/generated/resources/data/forge/tags/items/ingots/cadmium.json new file mode 100644 index 00000000..ae1acd7a --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/ingots/cadmium.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "modernmetals:cadmium_ingot" + ] +} diff --git a/src/generated/resources/data/forge/tags/items/ingots/chrome.json b/src/generated/resources/data/forge/tags/items/ingots/chrome.json new file mode 100644 index 00000000..9d6cc51d --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/ingots/chrome.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "modernmetals:chromium_ingot" + ] +} diff --git a/src/generated/resources/data/forge/tags/items/ingots/chromium.json b/src/generated/resources/data/forge/tags/items/ingots/chromium.json new file mode 100644 index 00000000..9d6cc51d --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/ingots/chromium.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "modernmetals:chromium_ingot" + ] +} diff --git a/src/generated/resources/data/forge/tags/items/ingots/galvanizedsteel.json b/src/generated/resources/data/forge/tags/items/ingots/galvanizedsteel.json new file mode 100644 index 00000000..955bdc5e --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/ingots/galvanizedsteel.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "modernmetals:galvanizedsteel_ingot" + ] +} diff --git a/src/generated/resources/data/forge/tags/items/ingots/iridium.json b/src/generated/resources/data/forge/tags/items/ingots/iridium.json new file mode 100644 index 00000000..b6eb2c90 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/ingots/iridium.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "modernmetals:iridium_ingot" + ] +} diff --git a/src/generated/resources/data/forge/tags/items/ingots/magnesium.json b/src/generated/resources/data/forge/tags/items/ingots/magnesium.json new file mode 100644 index 00000000..6112e461 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/ingots/magnesium.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "modernmetals:magnesium_ingot" + ] +} diff --git a/src/generated/resources/data/forge/tags/items/ingots/manganese.json b/src/generated/resources/data/forge/tags/items/ingots/manganese.json new file mode 100644 index 00000000..926a3c86 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/ingots/manganese.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "modernmetals:manganese_ingot" + ] +} diff --git a/src/generated/resources/data/forge/tags/items/ingots/nichrome.json b/src/generated/resources/data/forge/tags/items/ingots/nichrome.json new file mode 100644 index 00000000..1358a5dc --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/ingots/nichrome.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "modernmetals:nichrome_ingot" + ] +} diff --git a/src/generated/resources/data/forge/tags/items/ingots/osmium.json b/src/generated/resources/data/forge/tags/items/ingots/osmium.json new file mode 100644 index 00000000..a94dbc69 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/ingots/osmium.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "modernmetals:osmium_ingot" + ] +} diff --git a/src/generated/resources/data/forge/tags/items/ingots/plutonium.json b/src/generated/resources/data/forge/tags/items/ingots/plutonium.json new file mode 100644 index 00000000..a064c7ec --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/ingots/plutonium.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "modernmetals:plutonium_ingot" + ] +} diff --git a/src/generated/resources/data/forge/tags/items/ingots/rutile.json b/src/generated/resources/data/forge/tags/items/ingots/rutile.json new file mode 100644 index 00000000..9ff9a5e5 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/ingots/rutile.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "modernmetals:rutile_ingot" + ] +} diff --git a/src/generated/resources/data/forge/tags/items/ingots/stainlesssteel.json b/src/generated/resources/data/forge/tags/items/ingots/stainlesssteel.json new file mode 100644 index 00000000..1cc91e78 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/ingots/stainlesssteel.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "modernmetals:stainlesssteel_ingot" + ] +} diff --git a/src/generated/resources/data/forge/tags/items/ingots/tantalum.json b/src/generated/resources/data/forge/tags/items/ingots/tantalum.json new file mode 100644 index 00000000..b6ba2ae2 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/ingots/tantalum.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "modernmetals:tantalum_ingot" + ] +} diff --git a/src/generated/resources/data/forge/tags/items/ingots/thorium.json b/src/generated/resources/data/forge/tags/items/ingots/thorium.json new file mode 100644 index 00000000..8e0cb85a --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/ingots/thorium.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "modernmetals:thorium_ingot" + ] +} diff --git a/src/generated/resources/data/forge/tags/items/ingots/titanium.json b/src/generated/resources/data/forge/tags/items/ingots/titanium.json new file mode 100644 index 00000000..1396df34 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/ingots/titanium.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "modernmetals:titanium_ingot" + ] +} diff --git a/src/generated/resources/data/forge/tags/items/ingots/tungsten.json b/src/generated/resources/data/forge/tags/items/ingots/tungsten.json new file mode 100644 index 00000000..6c9f4ec4 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/ingots/tungsten.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "modernmetals:tungsten_ingot" + ] +} diff --git a/src/generated/resources/data/forge/tags/items/ingots/uranium.json b/src/generated/resources/data/forge/tags/items/ingots/uranium.json new file mode 100644 index 00000000..d389ab77 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/ingots/uranium.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "modernmetals:uranium_ingot" + ] +} diff --git a/src/generated/resources/data/forge/tags/items/ingots/zirconium.json b/src/generated/resources/data/forge/tags/items/ingots/zirconium.json new file mode 100644 index 00000000..1bf6e834 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/ingots/zirconium.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "modernmetals:zirconium_ingot" + ] +} diff --git a/src/generated/resources/data/forge/tags/items/nuggets/aluminum.json b/src/generated/resources/data/forge/tags/items/nuggets/aluminum.json new file mode 100644 index 00000000..49ee82a0 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/nuggets/aluminum.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "modernmetals:aluminum_nugget" + ] +} diff --git a/src/generated/resources/data/forge/tags/items/nuggets/aluminumbrass.json b/src/generated/resources/data/forge/tags/items/nuggets/aluminumbrass.json new file mode 100644 index 00000000..239f7cbe --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/nuggets/aluminumbrass.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "modernmetals:aluminumbrass_nugget" + ] +} diff --git a/src/generated/resources/data/forge/tags/items/nuggets/beryllium.json b/src/generated/resources/data/forge/tags/items/nuggets/beryllium.json new file mode 100644 index 00000000..1cbd57af --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/nuggets/beryllium.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "modernmetals:beryllium_nugget" + ] +} diff --git a/src/generated/resources/data/forge/tags/items/nuggets/boron.json b/src/generated/resources/data/forge/tags/items/nuggets/boron.json new file mode 100644 index 00000000..49387d73 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/nuggets/boron.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "modernmetals:boron_nugget" + ] +} diff --git a/src/generated/resources/data/forge/tags/items/nuggets/cadmium.json b/src/generated/resources/data/forge/tags/items/nuggets/cadmium.json new file mode 100644 index 00000000..8ead7dd0 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/nuggets/cadmium.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "modernmetals:cadmium_nugget" + ] +} diff --git a/src/generated/resources/data/forge/tags/items/nuggets/chrome.json b/src/generated/resources/data/forge/tags/items/nuggets/chrome.json new file mode 100644 index 00000000..0d194bb7 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/nuggets/chrome.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "modernmetals:chromium_nugget" + ] +} diff --git a/src/generated/resources/data/forge/tags/items/nuggets/chromium.json b/src/generated/resources/data/forge/tags/items/nuggets/chromium.json new file mode 100644 index 00000000..0d194bb7 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/nuggets/chromium.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "modernmetals:chromium_nugget" + ] +} diff --git a/src/generated/resources/data/forge/tags/items/nuggets/galvanizedsteel.json b/src/generated/resources/data/forge/tags/items/nuggets/galvanizedsteel.json new file mode 100644 index 00000000..49bc22bf --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/nuggets/galvanizedsteel.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "modernmetals:galvanizedsteel_nugget" + ] +} diff --git a/src/generated/resources/data/forge/tags/items/nuggets/iridium.json b/src/generated/resources/data/forge/tags/items/nuggets/iridium.json new file mode 100644 index 00000000..cce54580 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/nuggets/iridium.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "modernmetals:iridium_nugget" + ] +} diff --git a/src/generated/resources/data/forge/tags/items/nuggets/magnesium.json b/src/generated/resources/data/forge/tags/items/nuggets/magnesium.json new file mode 100644 index 00000000..f40f1664 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/nuggets/magnesium.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "modernmetals:magnesium_nugget" + ] +} diff --git a/src/generated/resources/data/forge/tags/items/nuggets/manganese.json b/src/generated/resources/data/forge/tags/items/nuggets/manganese.json new file mode 100644 index 00000000..26384d8d --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/nuggets/manganese.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "modernmetals:manganese_nugget" + ] +} diff --git a/src/generated/resources/data/forge/tags/items/nuggets/nichrome.json b/src/generated/resources/data/forge/tags/items/nuggets/nichrome.json new file mode 100644 index 00000000..ed3ddf9e --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/nuggets/nichrome.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "modernmetals:nichrome_nugget" + ] +} diff --git a/src/generated/resources/data/forge/tags/items/nuggets/osmium.json b/src/generated/resources/data/forge/tags/items/nuggets/osmium.json new file mode 100644 index 00000000..66e2119d --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/nuggets/osmium.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "modernmetals:osmium_nugget" + ] +} diff --git a/src/generated/resources/data/forge/tags/items/nuggets/plutonium.json b/src/generated/resources/data/forge/tags/items/nuggets/plutonium.json new file mode 100644 index 00000000..87eb7049 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/nuggets/plutonium.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "modernmetals:plutonium_nugget" + ] +} diff --git a/src/generated/resources/data/forge/tags/items/nuggets/rutile.json b/src/generated/resources/data/forge/tags/items/nuggets/rutile.json new file mode 100644 index 00000000..1069c511 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/nuggets/rutile.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "modernmetals:rutile_nugget" + ] +} diff --git a/src/generated/resources/data/forge/tags/items/nuggets/stainlesssteel.json b/src/generated/resources/data/forge/tags/items/nuggets/stainlesssteel.json new file mode 100644 index 00000000..488f49ca --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/nuggets/stainlesssteel.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "modernmetals:stainlesssteel_nugget" + ] +} diff --git a/src/generated/resources/data/forge/tags/items/nuggets/tantalum.json b/src/generated/resources/data/forge/tags/items/nuggets/tantalum.json new file mode 100644 index 00000000..e94a411e --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/nuggets/tantalum.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "modernmetals:tantalum_nugget" + ] +} diff --git a/src/generated/resources/data/forge/tags/items/nuggets/thorium.json b/src/generated/resources/data/forge/tags/items/nuggets/thorium.json new file mode 100644 index 00000000..9956ce3d --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/nuggets/thorium.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "modernmetals:thorium_nugget" + ] +} diff --git a/src/generated/resources/data/forge/tags/items/nuggets/titanium.json b/src/generated/resources/data/forge/tags/items/nuggets/titanium.json new file mode 100644 index 00000000..b56aaef2 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/nuggets/titanium.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "modernmetals:titanium_nugget" + ] +} diff --git a/src/generated/resources/data/forge/tags/items/nuggets/tungsten.json b/src/generated/resources/data/forge/tags/items/nuggets/tungsten.json new file mode 100644 index 00000000..2281a58a --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/nuggets/tungsten.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "modernmetals:tungsten_nugget" + ] +} diff --git a/src/generated/resources/data/forge/tags/items/nuggets/uranium.json b/src/generated/resources/data/forge/tags/items/nuggets/uranium.json new file mode 100644 index 00000000..8ec186f4 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/nuggets/uranium.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "modernmetals:uranium_nugget" + ] +} diff --git a/src/generated/resources/data/forge/tags/items/nuggets/zirconium.json b/src/generated/resources/data/forge/tags/items/nuggets/zirconium.json new file mode 100644 index 00000000..dce72b19 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/nuggets/zirconium.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "modernmetals:zirconium_nugget" + ] +} diff --git a/src/generated/resources/data/forge/tags/items/ores/aluminum.json b/src/generated/resources/data/forge/tags/items/ores/aluminum.json new file mode 100644 index 00000000..d614d1e9 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/ores/aluminum.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "modernmetals:aluminum_ore" + ] +} diff --git a/src/generated/resources/data/forge/tags/items/ores/beryllium.json b/src/generated/resources/data/forge/tags/items/ores/beryllium.json new file mode 100644 index 00000000..eb68c4a3 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/ores/beryllium.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "modernmetals:beryllium_ore" + ] +} diff --git a/src/generated/resources/data/forge/tags/items/ores/boron.json b/src/generated/resources/data/forge/tags/items/ores/boron.json new file mode 100644 index 00000000..6b47f7c1 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/ores/boron.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "modernmetals:boron_ore" + ] +} diff --git a/src/generated/resources/data/forge/tags/items/ores/cadmium.json b/src/generated/resources/data/forge/tags/items/ores/cadmium.json new file mode 100644 index 00000000..5dd4413d --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/ores/cadmium.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "modernmetals:cadmium_ore" + ] +} diff --git a/src/generated/resources/data/forge/tags/items/ores/chrome.json b/src/generated/resources/data/forge/tags/items/ores/chrome.json new file mode 100644 index 00000000..dfe19d68 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/ores/chrome.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "modernmetals:chromium_ore" + ] +} diff --git a/src/generated/resources/data/forge/tags/items/ores/chromium.json b/src/generated/resources/data/forge/tags/items/ores/chromium.json new file mode 100644 index 00000000..dfe19d68 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/ores/chromium.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "modernmetals:chromium_ore" + ] +} diff --git a/src/generated/resources/data/forge/tags/items/ores/galvanizedsteel.json b/src/generated/resources/data/forge/tags/items/ores/galvanizedsteel.json new file mode 100644 index 00000000..570bde08 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/ores/galvanizedsteel.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "modernmetals:galvanizedsteel_ore" + ] +} diff --git a/src/generated/resources/data/forge/tags/items/ores/iridium.json b/src/generated/resources/data/forge/tags/items/ores/iridium.json new file mode 100644 index 00000000..a6c87fdd --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/ores/iridium.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "modernmetals:iridium_ore" + ] +} diff --git a/src/generated/resources/data/forge/tags/items/ores/magnesium.json b/src/generated/resources/data/forge/tags/items/ores/magnesium.json new file mode 100644 index 00000000..cf3a7eb3 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/ores/magnesium.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "modernmetals:magnesium_ore" + ] +} diff --git a/src/generated/resources/data/forge/tags/items/ores/manganese.json b/src/generated/resources/data/forge/tags/items/ores/manganese.json new file mode 100644 index 00000000..c60b54be --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/ores/manganese.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "modernmetals:manganese_ore" + ] +} diff --git a/src/generated/resources/data/forge/tags/items/ores/nichrome.json b/src/generated/resources/data/forge/tags/items/ores/nichrome.json new file mode 100644 index 00000000..d0795865 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/ores/nichrome.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "modernmetals:nichrome_ore" + ] +} diff --git a/src/generated/resources/data/forge/tags/items/ores/osmium.json b/src/generated/resources/data/forge/tags/items/ores/osmium.json new file mode 100644 index 00000000..544542bc --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/ores/osmium.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "modernmetals:osmium_ore" + ] +} diff --git a/src/generated/resources/data/forge/tags/items/ores/plutonium.json b/src/generated/resources/data/forge/tags/items/ores/plutonium.json new file mode 100644 index 00000000..9046bf3e --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/ores/plutonium.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "modernmetals:plutonium_ore" + ] +} diff --git a/src/generated/resources/data/forge/tags/items/ores/rutile.json b/src/generated/resources/data/forge/tags/items/ores/rutile.json new file mode 100644 index 00000000..780b477e --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/ores/rutile.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "modernmetals:rutile_ore" + ] +} diff --git a/src/generated/resources/data/forge/tags/items/ores/stainlesssteel.json b/src/generated/resources/data/forge/tags/items/ores/stainlesssteel.json new file mode 100644 index 00000000..70277044 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/ores/stainlesssteel.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "modernmetals:stainlesssteel_ore" + ] +} diff --git a/src/generated/resources/data/forge/tags/items/ores/tantalum.json b/src/generated/resources/data/forge/tags/items/ores/tantalum.json new file mode 100644 index 00000000..9231a033 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/ores/tantalum.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "modernmetals:tantalum_ore" + ] +} diff --git a/src/generated/resources/data/forge/tags/items/ores/thorium.json b/src/generated/resources/data/forge/tags/items/ores/thorium.json new file mode 100644 index 00000000..9f0b0fbe --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/ores/thorium.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "modernmetals:thorium_ore" + ] +} diff --git a/src/generated/resources/data/forge/tags/items/ores/titanium.json b/src/generated/resources/data/forge/tags/items/ores/titanium.json new file mode 100644 index 00000000..60f610ff --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/ores/titanium.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "modernmetals:titanium_ore" + ] +} diff --git a/src/generated/resources/data/forge/tags/items/ores/tungsten.json b/src/generated/resources/data/forge/tags/items/ores/tungsten.json new file mode 100644 index 00000000..eb3b3746 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/ores/tungsten.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "modernmetals:tungsten_ore" + ] +} diff --git a/src/generated/resources/data/forge/tags/items/ores/uranium.json b/src/generated/resources/data/forge/tags/items/ores/uranium.json new file mode 100644 index 00000000..e621d290 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/ores/uranium.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "modernmetals:uranium_ore" + ] +} diff --git a/src/generated/resources/data/forge/tags/items/ores/zirconium.json b/src/generated/resources/data/forge/tags/items/ores/zirconium.json new file mode 100644 index 00000000..7702e00a --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/ores/zirconium.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "modernmetals:zirconium_ore" + ] +} diff --git a/src/generated/resources/data/forge/tags/items/rods/aluminum.json b/src/generated/resources/data/forge/tags/items/rods/aluminum.json new file mode 100644 index 00000000..4ddda1ba --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/rods/aluminum.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "modernmetals:aluminum_rod" + ] +} diff --git a/src/generated/resources/data/forge/tags/items/rods/aluminumbrass.json b/src/generated/resources/data/forge/tags/items/rods/aluminumbrass.json new file mode 100644 index 00000000..87c502b8 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/rods/aluminumbrass.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "modernmetals:aluminumbrass_rod" + ] +} diff --git a/src/generated/resources/data/forge/tags/items/rods/beryllium.json b/src/generated/resources/data/forge/tags/items/rods/beryllium.json new file mode 100644 index 00000000..89a9b7bb --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/rods/beryllium.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "modernmetals:beryllium_rod" + ] +} diff --git a/src/generated/resources/data/forge/tags/items/rods/boron.json b/src/generated/resources/data/forge/tags/items/rods/boron.json new file mode 100644 index 00000000..865c72df --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/rods/boron.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "modernmetals:boron_rod" + ] +} diff --git a/src/generated/resources/data/forge/tags/items/rods/cadmium.json b/src/generated/resources/data/forge/tags/items/rods/cadmium.json new file mode 100644 index 00000000..ee1b4234 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/rods/cadmium.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "modernmetals:cadmium_rod" + ] +} diff --git a/src/generated/resources/data/forge/tags/items/rods/chrome.json b/src/generated/resources/data/forge/tags/items/rods/chrome.json new file mode 100644 index 00000000..05206c09 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/rods/chrome.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "modernmetals:chromium_rod" + ] +} diff --git a/src/generated/resources/data/forge/tags/items/rods/chromium.json b/src/generated/resources/data/forge/tags/items/rods/chromium.json new file mode 100644 index 00000000..05206c09 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/rods/chromium.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "modernmetals:chromium_rod" + ] +} diff --git a/src/generated/resources/data/forge/tags/items/rods/galvanizedsteel.json b/src/generated/resources/data/forge/tags/items/rods/galvanizedsteel.json new file mode 100644 index 00000000..8594824d --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/rods/galvanizedsteel.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "modernmetals:galvanizedsteel_rod" + ] +} diff --git a/src/generated/resources/data/forge/tags/items/rods/iridium.json b/src/generated/resources/data/forge/tags/items/rods/iridium.json new file mode 100644 index 00000000..3ce0006e --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/rods/iridium.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "modernmetals:iridium_rod" + ] +} diff --git a/src/generated/resources/data/forge/tags/items/rods/magnesium.json b/src/generated/resources/data/forge/tags/items/rods/magnesium.json new file mode 100644 index 00000000..e522b64d --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/rods/magnesium.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "modernmetals:magnesium_rod" + ] +} diff --git a/src/generated/resources/data/forge/tags/items/rods/manganese.json b/src/generated/resources/data/forge/tags/items/rods/manganese.json new file mode 100644 index 00000000..3a02a719 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/rods/manganese.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "modernmetals:manganese_rod" + ] +} diff --git a/src/generated/resources/data/forge/tags/items/rods/nichrome.json b/src/generated/resources/data/forge/tags/items/rods/nichrome.json new file mode 100644 index 00000000..8e63be95 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/rods/nichrome.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "modernmetals:nichrome_rod" + ] +} diff --git a/src/generated/resources/data/forge/tags/items/rods/osmium.json b/src/generated/resources/data/forge/tags/items/rods/osmium.json new file mode 100644 index 00000000..44cd934a --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/rods/osmium.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "modernmetals:osmium_rod" + ] +} diff --git a/src/generated/resources/data/forge/tags/items/rods/plutonium.json b/src/generated/resources/data/forge/tags/items/rods/plutonium.json new file mode 100644 index 00000000..0742223b --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/rods/plutonium.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "modernmetals:plutonium_rod" + ] +} diff --git a/src/generated/resources/data/forge/tags/items/rods/rutile.json b/src/generated/resources/data/forge/tags/items/rods/rutile.json new file mode 100644 index 00000000..d0f25273 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/rods/rutile.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "modernmetals:rutile_rod" + ] +} diff --git a/src/generated/resources/data/forge/tags/items/rods/stainlesssteel.json b/src/generated/resources/data/forge/tags/items/rods/stainlesssteel.json new file mode 100644 index 00000000..57bba54f --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/rods/stainlesssteel.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "modernmetals:stainlesssteel_rod" + ] +} diff --git a/src/generated/resources/data/forge/tags/items/rods/tantalum.json b/src/generated/resources/data/forge/tags/items/rods/tantalum.json new file mode 100644 index 00000000..17902eb7 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/rods/tantalum.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "modernmetals:tantalum_rod" + ] +} diff --git a/src/generated/resources/data/forge/tags/items/rods/thorium.json b/src/generated/resources/data/forge/tags/items/rods/thorium.json new file mode 100644 index 00000000..e07e0128 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/rods/thorium.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "modernmetals:thorium_rod" + ] +} diff --git a/src/generated/resources/data/forge/tags/items/rods/titanium.json b/src/generated/resources/data/forge/tags/items/rods/titanium.json new file mode 100644 index 00000000..b1eef3e6 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/rods/titanium.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "modernmetals:titanium_rod" + ] +} diff --git a/src/generated/resources/data/forge/tags/items/rods/tungsten.json b/src/generated/resources/data/forge/tags/items/rods/tungsten.json new file mode 100644 index 00000000..e23daf07 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/rods/tungsten.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "modernmetals:tungsten_rod" + ] +} diff --git a/src/generated/resources/data/forge/tags/items/rods/uranium.json b/src/generated/resources/data/forge/tags/items/rods/uranium.json new file mode 100644 index 00000000..2c8f52db --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/rods/uranium.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "modernmetals:uranium_rod" + ] +} diff --git a/src/generated/resources/data/forge/tags/items/rods/zirconium.json b/src/generated/resources/data/forge/tags/items/rods/zirconium.json new file mode 100644 index 00000000..72f06603 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/rods/zirconium.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "modernmetals:zirconium_rod" + ] +} diff --git a/src/generated/resources/data/forge/tags/items/small_blends/aluminumbrass.json b/src/generated/resources/data/forge/tags/items/small_blends/aluminumbrass.json new file mode 100644 index 00000000..5856c9ff --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/small_blends/aluminumbrass.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "modernmetals:aluminumbrass_smallblend" + ] +} diff --git a/src/generated/resources/data/forge/tags/items/small_blends/galvanizedsteel.json b/src/generated/resources/data/forge/tags/items/small_blends/galvanizedsteel.json new file mode 100644 index 00000000..99525cc7 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/small_blends/galvanizedsteel.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "modernmetals:galvanizedsteel_smallblend" + ] +} diff --git a/src/generated/resources/data/forge/tags/items/small_blends/nichrome.json b/src/generated/resources/data/forge/tags/items/small_blends/nichrome.json new file mode 100644 index 00000000..22c3015f --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/small_blends/nichrome.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "modernmetals:nichrome_smallblend" + ] +} diff --git a/src/generated/resources/data/forge/tags/items/small_blends/stainlesssteel.json b/src/generated/resources/data/forge/tags/items/small_blends/stainlesssteel.json new file mode 100644 index 00000000..715ef5c2 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/small_blends/stainlesssteel.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "modernmetals:stainlesssteel_smallblend" + ] +} diff --git a/src/generated/resources/data/forge/tags/items/small_blends/titanium.json b/src/generated/resources/data/forge/tags/items/small_blends/titanium.json new file mode 100644 index 00000000..f891573b --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/small_blends/titanium.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "modernmetals:titanium_smallblend" + ] +} diff --git a/src/generated/resources/data/forge/tags/items/storage_blocks/aluminum.json b/src/generated/resources/data/forge/tags/items/storage_blocks/aluminum.json new file mode 100644 index 00000000..90b56270 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/storage_blocks/aluminum.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "modernmetals:aluminum_block" + ] +} diff --git a/src/generated/resources/data/forge/tags/items/storage_blocks/aluminumbrass.json b/src/generated/resources/data/forge/tags/items/storage_blocks/aluminumbrass.json new file mode 100644 index 00000000..d6c1512d --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/storage_blocks/aluminumbrass.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "modernmetals:aluminumbrass_block" + ] +} diff --git a/src/generated/resources/data/forge/tags/items/storage_blocks/beryllium.json b/src/generated/resources/data/forge/tags/items/storage_blocks/beryllium.json new file mode 100644 index 00000000..1dc4291f --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/storage_blocks/beryllium.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "modernmetals:beryllium_block" + ] +} diff --git a/src/generated/resources/data/forge/tags/items/storage_blocks/boron.json b/src/generated/resources/data/forge/tags/items/storage_blocks/boron.json new file mode 100644 index 00000000..867caf9c --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/storage_blocks/boron.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "modernmetals:boron_block" + ] +} diff --git a/src/generated/resources/data/forge/tags/items/storage_blocks/cadmium.json b/src/generated/resources/data/forge/tags/items/storage_blocks/cadmium.json new file mode 100644 index 00000000..d266f8e9 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/storage_blocks/cadmium.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "modernmetals:cadmium_block" + ] +} diff --git a/src/generated/resources/data/forge/tags/items/storage_blocks/chrome.json b/src/generated/resources/data/forge/tags/items/storage_blocks/chrome.json new file mode 100644 index 00000000..33a7b474 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/storage_blocks/chrome.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "modernmetals:chromium_block" + ] +} diff --git a/src/generated/resources/data/forge/tags/items/storage_blocks/chromium.json b/src/generated/resources/data/forge/tags/items/storage_blocks/chromium.json new file mode 100644 index 00000000..33a7b474 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/storage_blocks/chromium.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "modernmetals:chromium_block" + ] +} diff --git a/src/generated/resources/data/forge/tags/items/storage_blocks/galvanizedsteel.json b/src/generated/resources/data/forge/tags/items/storage_blocks/galvanizedsteel.json new file mode 100644 index 00000000..8c247d50 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/storage_blocks/galvanizedsteel.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "modernmetals:galvanizedsteel_block" + ] +} diff --git a/src/generated/resources/data/forge/tags/items/storage_blocks/iridium.json b/src/generated/resources/data/forge/tags/items/storage_blocks/iridium.json new file mode 100644 index 00000000..fe30dd40 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/storage_blocks/iridium.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "modernmetals:iridium_block" + ] +} diff --git a/src/generated/resources/data/forge/tags/items/storage_blocks/magnesium.json b/src/generated/resources/data/forge/tags/items/storage_blocks/magnesium.json new file mode 100644 index 00000000..6315c259 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/storage_blocks/magnesium.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "modernmetals:magnesium_block" + ] +} diff --git a/src/generated/resources/data/forge/tags/items/storage_blocks/manganese.json b/src/generated/resources/data/forge/tags/items/storage_blocks/manganese.json new file mode 100644 index 00000000..a46e9c38 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/storage_blocks/manganese.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "modernmetals:manganese_block" + ] +} diff --git a/src/generated/resources/data/forge/tags/items/storage_blocks/nichrome.json b/src/generated/resources/data/forge/tags/items/storage_blocks/nichrome.json new file mode 100644 index 00000000..59904302 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/storage_blocks/nichrome.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "modernmetals:nichrome_block" + ] +} diff --git a/src/generated/resources/data/forge/tags/items/storage_blocks/osmium.json b/src/generated/resources/data/forge/tags/items/storage_blocks/osmium.json new file mode 100644 index 00000000..1dbafc06 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/storage_blocks/osmium.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "modernmetals:osmium_block" + ] +} diff --git a/src/generated/resources/data/forge/tags/items/storage_blocks/plutonium.json b/src/generated/resources/data/forge/tags/items/storage_blocks/plutonium.json new file mode 100644 index 00000000..12c4b6b6 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/storage_blocks/plutonium.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "modernmetals:plutonium_block" + ] +} diff --git a/src/generated/resources/data/forge/tags/items/storage_blocks/rutile.json b/src/generated/resources/data/forge/tags/items/storage_blocks/rutile.json new file mode 100644 index 00000000..9115214c --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/storage_blocks/rutile.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "modernmetals:rutile_block" + ] +} diff --git a/src/generated/resources/data/forge/tags/items/storage_blocks/stainlesssteel.json b/src/generated/resources/data/forge/tags/items/storage_blocks/stainlesssteel.json new file mode 100644 index 00000000..d2c38f3c --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/storage_blocks/stainlesssteel.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "modernmetals:stainlesssteel_block" + ] +} diff --git a/src/generated/resources/data/forge/tags/items/storage_blocks/tantalum.json b/src/generated/resources/data/forge/tags/items/storage_blocks/tantalum.json new file mode 100644 index 00000000..00958686 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/storage_blocks/tantalum.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "modernmetals:tantalum_block" + ] +} diff --git a/src/generated/resources/data/forge/tags/items/storage_blocks/thorium.json b/src/generated/resources/data/forge/tags/items/storage_blocks/thorium.json new file mode 100644 index 00000000..63d9ff63 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/storage_blocks/thorium.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "modernmetals:thorium_block" + ] +} diff --git a/src/generated/resources/data/forge/tags/items/storage_blocks/titanium.json b/src/generated/resources/data/forge/tags/items/storage_blocks/titanium.json new file mode 100644 index 00000000..f634ac24 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/storage_blocks/titanium.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "modernmetals:titanium_block" + ] +} diff --git a/src/generated/resources/data/forge/tags/items/storage_blocks/tungsten.json b/src/generated/resources/data/forge/tags/items/storage_blocks/tungsten.json new file mode 100644 index 00000000..95840993 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/storage_blocks/tungsten.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "modernmetals:tungsten_block" + ] +} diff --git a/src/generated/resources/data/forge/tags/items/storage_blocks/uranium.json b/src/generated/resources/data/forge/tags/items/storage_blocks/uranium.json new file mode 100644 index 00000000..d1b302bd --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/storage_blocks/uranium.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "modernmetals:uranium_block" + ] +} diff --git a/src/generated/resources/data/forge/tags/items/storage_blocks/zirconium.json b/src/generated/resources/data/forge/tags/items/storage_blocks/zirconium.json new file mode 100644 index 00000000..0cfabc3e --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/storage_blocks/zirconium.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "modernmetals:zirconium_block" + ] +} diff --git a/src/generated/resources/data/forge/tags/items/tiny_dusts/aluminum.json b/src/generated/resources/data/forge/tags/items/tiny_dusts/aluminum.json new file mode 100644 index 00000000..9af101ee --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/tiny_dusts/aluminum.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "modernmetals:aluminum_smallpowder" + ] +} diff --git a/src/generated/resources/data/forge/tags/items/tiny_dusts/aluminumbrass.json b/src/generated/resources/data/forge/tags/items/tiny_dusts/aluminumbrass.json new file mode 100644 index 00000000..a9245fc3 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/tiny_dusts/aluminumbrass.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "modernmetals:aluminumbrass_smallpowder" + ] +} diff --git a/src/generated/resources/data/forge/tags/items/tiny_dusts/beryllium.json b/src/generated/resources/data/forge/tags/items/tiny_dusts/beryllium.json new file mode 100644 index 00000000..81bfb967 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/tiny_dusts/beryllium.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "modernmetals:beryllium_smallpowder" + ] +} diff --git a/src/generated/resources/data/forge/tags/items/tiny_dusts/boron.json b/src/generated/resources/data/forge/tags/items/tiny_dusts/boron.json new file mode 100644 index 00000000..38854af9 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/tiny_dusts/boron.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "modernmetals:boron_smallpowder" + ] +} diff --git a/src/generated/resources/data/forge/tags/items/tiny_dusts/cadmium.json b/src/generated/resources/data/forge/tags/items/tiny_dusts/cadmium.json new file mode 100644 index 00000000..6a690c62 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/tiny_dusts/cadmium.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "modernmetals:cadmium_smallpowder" + ] +} diff --git a/src/generated/resources/data/forge/tags/items/tiny_dusts/chrome.json b/src/generated/resources/data/forge/tags/items/tiny_dusts/chrome.json new file mode 100644 index 00000000..cf74ed57 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/tiny_dusts/chrome.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "modernmetals:chromium_smallpowder" + ] +} diff --git a/src/generated/resources/data/forge/tags/items/tiny_dusts/chromium.json b/src/generated/resources/data/forge/tags/items/tiny_dusts/chromium.json new file mode 100644 index 00000000..cf74ed57 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/tiny_dusts/chromium.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "modernmetals:chromium_smallpowder" + ] +} diff --git a/src/generated/resources/data/forge/tags/items/tiny_dusts/galvanizedsteel.json b/src/generated/resources/data/forge/tags/items/tiny_dusts/galvanizedsteel.json new file mode 100644 index 00000000..162f664d --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/tiny_dusts/galvanizedsteel.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "modernmetals:galvanizedsteel_smallpowder" + ] +} diff --git a/src/generated/resources/data/forge/tags/items/tiny_dusts/iridium.json b/src/generated/resources/data/forge/tags/items/tiny_dusts/iridium.json new file mode 100644 index 00000000..9d8e8382 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/tiny_dusts/iridium.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "modernmetals:iridium_smallpowder" + ] +} diff --git a/src/generated/resources/data/forge/tags/items/tiny_dusts/magnesium.json b/src/generated/resources/data/forge/tags/items/tiny_dusts/magnesium.json new file mode 100644 index 00000000..e193df10 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/tiny_dusts/magnesium.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "modernmetals:magnesium_smallpowder" + ] +} diff --git a/src/generated/resources/data/forge/tags/items/tiny_dusts/manganese.json b/src/generated/resources/data/forge/tags/items/tiny_dusts/manganese.json new file mode 100644 index 00000000..209cefd4 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/tiny_dusts/manganese.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "modernmetals:manganese_smallpowder" + ] +} diff --git a/src/generated/resources/data/forge/tags/items/tiny_dusts/nichrome.json b/src/generated/resources/data/forge/tags/items/tiny_dusts/nichrome.json new file mode 100644 index 00000000..19b37c61 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/tiny_dusts/nichrome.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "modernmetals:nichrome_smallpowder" + ] +} diff --git a/src/generated/resources/data/forge/tags/items/tiny_dusts/osmium.json b/src/generated/resources/data/forge/tags/items/tiny_dusts/osmium.json new file mode 100644 index 00000000..db440c11 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/tiny_dusts/osmium.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "modernmetals:osmium_smallpowder" + ] +} diff --git a/src/generated/resources/data/forge/tags/items/tiny_dusts/plutonium.json b/src/generated/resources/data/forge/tags/items/tiny_dusts/plutonium.json new file mode 100644 index 00000000..4797a654 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/tiny_dusts/plutonium.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "modernmetals:plutonium_smallpowder" + ] +} diff --git a/src/generated/resources/data/forge/tags/items/tiny_dusts/rutile.json b/src/generated/resources/data/forge/tags/items/tiny_dusts/rutile.json new file mode 100644 index 00000000..a6339a1e --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/tiny_dusts/rutile.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "modernmetals:rutile_smallpowder" + ] +} diff --git a/src/generated/resources/data/forge/tags/items/tiny_dusts/stainlesssteel.json b/src/generated/resources/data/forge/tags/items/tiny_dusts/stainlesssteel.json new file mode 100644 index 00000000..e006f132 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/tiny_dusts/stainlesssteel.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "modernmetals:stainlesssteel_smallpowder" + ] +} diff --git a/src/generated/resources/data/forge/tags/items/tiny_dusts/tantalum.json b/src/generated/resources/data/forge/tags/items/tiny_dusts/tantalum.json new file mode 100644 index 00000000..ac995f1e --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/tiny_dusts/tantalum.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "modernmetals:tantalum_smallpowder" + ] +} diff --git a/src/generated/resources/data/forge/tags/items/tiny_dusts/thorium.json b/src/generated/resources/data/forge/tags/items/tiny_dusts/thorium.json new file mode 100644 index 00000000..f764b83b --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/tiny_dusts/thorium.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "modernmetals:thorium_smallpowder" + ] +} diff --git a/src/generated/resources/data/forge/tags/items/tiny_dusts/titanium.json b/src/generated/resources/data/forge/tags/items/tiny_dusts/titanium.json new file mode 100644 index 00000000..8f6acce7 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/tiny_dusts/titanium.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "modernmetals:titanium_smallpowder" + ] +} diff --git a/src/generated/resources/data/forge/tags/items/tiny_dusts/tungsten.json b/src/generated/resources/data/forge/tags/items/tiny_dusts/tungsten.json new file mode 100644 index 00000000..665b0647 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/tiny_dusts/tungsten.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "modernmetals:tungsten_smallpowder" + ] +} diff --git a/src/generated/resources/data/forge/tags/items/tiny_dusts/uranium.json b/src/generated/resources/data/forge/tags/items/tiny_dusts/uranium.json new file mode 100644 index 00000000..0c1619ea --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/tiny_dusts/uranium.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "modernmetals:uranium_smallpowder" + ] +} diff --git a/src/generated/resources/data/forge/tags/items/tiny_dusts/zirconium.json b/src/generated/resources/data/forge/tags/items/tiny_dusts/zirconium.json new file mode 100644 index 00000000..c4156be4 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/tiny_dusts/zirconium.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "modernmetals:zirconium_smallpowder" + ] +} diff --git a/src/generated/resources/data/modernmetals/recipes/aluminum_arrow.json b/src/generated/resources/data/modernmetals/recipes/aluminum_arrow.json new file mode 100644 index 00000000..0b5c88af --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/aluminum_arrow.json @@ -0,0 +1,26 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:aluminum_arrow", + "count": 4 + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "y", + "z" + ], + "key": { + "x": { + "tag": "forge:nuggets/aluminum" + }, + "y": { + "tag": "forge:rods/aluminum" + }, + "z": { + "item": "minecraft:feather" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/aluminum_axe.json b/src/generated/resources/data/modernmetals/recipes/aluminum_axe.json new file mode 100644 index 00000000..82c742ac --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/aluminum_axe.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:aluminum_axe" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xs", + " s" + ], + "key": { + "x": { + "tag": "forge:ingots/aluminum" + }, + "s": { + "item": "minecraft:stick" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/aluminum_bars_1.json b/src/generated/resources/data/modernmetals/recipes/aluminum_bars_1.json new file mode 100644 index 00000000..c19af541 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/aluminum_bars_1.json @@ -0,0 +1,19 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:aluminum_bars", + "count": 16 + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "forge:ingots/aluminum" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/aluminum_bars_2.json b/src/generated/resources/data/modernmetals/recipes/aluminum_bars_2.json new file mode 100644 index 00000000..7ac55a8d --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/aluminum_bars_2.json @@ -0,0 +1,18 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:aluminum_bars", + "count": 4 + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "tag": "forge:rods/aluminum" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/aluminum_block.json b/src/generated/resources/data/modernmetals/recipes/aluminum_block.json new file mode 100644 index 00000000..9e6f1346 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/aluminum_block.json @@ -0,0 +1,19 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:aluminum_block" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "forge:ingots/aluminum" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/aluminum_block_ingot.json b/src/generated/resources/data/modernmetals/recipes/aluminum_block_ingot.json new file mode 100644 index 00000000..183f9f92 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/aluminum_block_ingot.json @@ -0,0 +1,15 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:aluminum_ingot", + "count": 9 + }, + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "forge:storage_blocks/aluminum" + } + ] + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/aluminum_bolt.json b/src/generated/resources/data/modernmetals/recipes/aluminum_bolt.json new file mode 100644 index 00000000..a3ad39b5 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/aluminum_bolt.json @@ -0,0 +1,23 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:aluminum_bolt", + "count": 4 + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "x", + "y" + ], + "key": { + "x": { + "tag": "forge:rods/aluminum" + }, + "y": { + "item": "minecraft:feather" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/aluminum_boots.json b/src/generated/resources/data/modernmetals/recipes/aluminum_boots.json new file mode 100644 index 00000000..123a12c6 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/aluminum_boots.json @@ -0,0 +1,18 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:aluminum_boots" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "x x", + "x x" + ], + "key": { + "x": { + "tag": "forge:ingots/aluminum" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/aluminum_bow.json b/src/generated/resources/data/modernmetals/recipes/aluminum_bow.json new file mode 100644 index 00000000..8272dc39 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/aluminum_bow.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:aluminum_bow" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + " xs", + "x s", + " xs" + ], + "key": { + "x": { + "tag": "forge:rods/aluminum" + }, + "s": { + "item": "minecraft:string" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/aluminum_button.json b/src/generated/resources/data/modernmetals/recipes/aluminum_button.json new file mode 100644 index 00000000..6bc9a684 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/aluminum_button.json @@ -0,0 +1,18 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:aluminum_button" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "x" + ], + "key": { + "x": { + "tag": "forge:nuggets/aluminum" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/aluminum_chestplate.json b/src/generated/resources/data/modernmetals/recipes/aluminum_chestplate.json new file mode 100644 index 00000000..07dd554f --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/aluminum_chestplate.json @@ -0,0 +1,19 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:aluminum_chestplate" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "x x", + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "forge:ingots/aluminum" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/aluminum_crackhammer.json b/src/generated/resources/data/modernmetals/recipes/aluminum_crackhammer.json new file mode 100644 index 00000000..77aaa296 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/aluminum_crackhammer.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:aluminum_crackhammer" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "y", + "y" + ], + "key": { + "x": { + "tag": "forge:storage_blocks/aluminum" + }, + "y": { + "item": "minecraft:stick" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/aluminum_crossbow.json b/src/generated/resources/data/modernmetals/recipes/aluminum_crossbow.json new file mode 100644 index 00000000..d7c94677 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/aluminum_crossbow.json @@ -0,0 +1,25 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:aluminum_crossbow" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "zxx", + " yx", + "x z" + ], + "key": { + "x": { + "tag": "forge:rods/aluminum" + }, + "y": { + "item": "minecraft:string" + }, + "z": { + "tag": "forge:gears/aluminum" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/aluminum_door.json b/src/generated/resources/data/modernmetals/recipes/aluminum_door.json new file mode 100644 index 00000000..e001c0d6 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/aluminum_door.json @@ -0,0 +1,20 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:aluminum_door", + "count": 3 + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx", + "xx" + ], + "key": { + "x": { + "tag": "forge:ingots/aluminum" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/aluminum_fishingrod.json b/src/generated/resources/data/modernmetals/recipes/aluminum_fishingrod.json new file mode 100644 index 00000000..b78dad14 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/aluminum_fishingrod.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:aluminum_fishing_rod" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + " x", + " xy", + "x y" + ], + "key": { + "x": { + "tag": "forge:rods/aluminum" + }, + "y": { + "item": "minecraft:string" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/aluminum_gear.json b/src/generated/resources/data/modernmetals/recipes/aluminum_gear.json new file mode 100644 index 00000000..753f026f --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/aluminum_gear.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:aluminum_gear" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + " x ", + "xrx", + " x " + ], + "key": { + "x": { + "tag": "forge:ingots/aluminum" + }, + "r": { + "tag": "forge:rods/aluminum" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/aluminum_helmet.json b/src/generated/resources/data/modernmetals/recipes/aluminum_helmet.json new file mode 100644 index 00000000..0082fbe7 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/aluminum_helmet.json @@ -0,0 +1,18 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:aluminum_helmet" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "x x" + ], + "key": { + "x": { + "tag": "forge:ingots/aluminum" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/aluminum_hoe.json b/src/generated/resources/data/modernmetals/recipes/aluminum_hoe.json new file mode 100644 index 00000000..2f22eef8 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/aluminum_hoe.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:aluminum_hoe" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + " s", + " s" + ], + "key": { + "x": { + "tag": "forge:ingots/aluminum" + }, + "s": { + "item": "minecraft:stick" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/aluminum_horsearmor.json b/src/generated/resources/data/modernmetals/recipes/aluminum_horsearmor.json new file mode 100644 index 00000000..7a6c34f2 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/aluminum_horsearmor.json @@ -0,0 +1,69 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:aluminum_horse_armor" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + " x", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "forge:ingots/aluminum" + }, + "y": [ + { + "item": "minecraft:white_wool" + }, + { + "item": "minecraft:orange_wool" + }, + { + "item": "minecraft:magenta_wool" + }, + { + "item": "minecraft:light_blue_wool" + }, + { + "item": "minecraft:yellow_wool" + }, + { + "item": "minecraft:lime_wool" + }, + { + "item": "minecraft:pink_wool" + }, + { + "item": "minecraft:gray_wool" + }, + { + "item": "minecraft:light_gray_wool" + }, + { + "item": "minecraft:cyan_wool" + }, + { + "item": "minecraft:purple_wool" + }, + { + "item": "minecraft:blue_wool" + }, + { + "item": "minecraft:brown_wool" + }, + { + "item": "minecraft:green_wool" + }, + { + "item": "minecraft:red_wool" + }, + { + "item": "minecraft:black_wool" + } + ] + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/aluminum_ingot.json b/src/generated/resources/data/modernmetals/recipes/aluminum_ingot.json new file mode 100644 index 00000000..7cc770ed --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/aluminum_ingot.json @@ -0,0 +1,19 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:aluminum_ingot" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "forge:nuggets/aluminum" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/aluminum_leggings.json b/src/generated/resources/data/modernmetals/recipes/aluminum_leggings.json new file mode 100644 index 00000000..0c876da0 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/aluminum_leggings.json @@ -0,0 +1,19 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:aluminum_leggings" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "x x", + "x x" + ], + "key": { + "x": { + "tag": "forge:ingots/aluminum" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/aluminum_lever.json b/src/generated/resources/data/modernmetals/recipes/aluminum_lever.json new file mode 100644 index 00000000..4f61a0f4 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/aluminum_lever.json @@ -0,0 +1,21 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:aluminum_lever" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "y" + ], + "key": { + "x": { + "tag": "forge:rods/aluminum" + }, + "y": { + "tag": "forge:ingots/aluminum" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/aluminum_nugget.json b/src/generated/resources/data/modernmetals/recipes/aluminum_nugget.json new file mode 100644 index 00000000..874907ba --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/aluminum_nugget.json @@ -0,0 +1,15 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:aluminum_nugget", + "count": 9 + }, + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "forge:ingots/aluminum" + } + ] + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/aluminum_pickaxe.json b/src/generated/resources/data/modernmetals/recipes/aluminum_pickaxe.json new file mode 100644 index 00000000..b126fa30 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/aluminum_pickaxe.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:aluminum_pickaxe" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + " s ", + " s " + ], + "key": { + "x": { + "tag": "forge:ingots/aluminum" + }, + "s": { + "item": "minecraft:stick" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/aluminum_plate.json b/src/generated/resources/data/modernmetals/recipes/aluminum_plate.json new file mode 100644 index 00000000..4902e20b --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/aluminum_plate.json @@ -0,0 +1,17 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:aluminum_plate" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "tag": "forge:ingots/aluminum" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/aluminum_powder.json b/src/generated/resources/data/modernmetals/recipes/aluminum_powder.json new file mode 100644 index 00000000..c5f5a61c --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/aluminum_powder.json @@ -0,0 +1,19 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:aluminum_powder" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "forge:tiny_dusts/aluminum" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/aluminum_pressureplate.json b/src/generated/resources/data/modernmetals/recipes/aluminum_pressureplate.json new file mode 100644 index 00000000..24291a3a --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/aluminum_pressureplate.json @@ -0,0 +1,17 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:aluminum_pressure_plate" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx" + ], + "key": { + "x": { + "tag": "forge:ingots/aluminum" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/aluminum_rod.json b/src/generated/resources/data/modernmetals/recipes/aluminum_rod.json new file mode 100644 index 00000000..18b0aae3 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/aluminum_rod.json @@ -0,0 +1,18 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:aluminum_rod" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + " x ", + " x " + ], + "key": { + "x": { + "tag": "forge:ingots/aluminum" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/aluminum_scythe.json b/src/generated/resources/data/modernmetals/recipes/aluminum_scythe.json new file mode 100644 index 00000000..6b7422d8 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/aluminum_scythe.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:aluminum_scythe" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "ii ", + " i", + " s " + ], + "key": { + "i": { + "tag": "forge:ingots/aluminum" + }, + "s": { + "item": "minecraft:stick" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/aluminum_shears.json b/src/generated/resources/data/modernmetals/recipes/aluminum_shears.json new file mode 100644 index 00000000..f0a6d74f --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/aluminum_shears.json @@ -0,0 +1,18 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:aluminum_shears" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + " x", + "x " + ], + "key": { + "x": { + "tag": "forge:ingots/aluminum" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/aluminum_shield.json b/src/generated/resources/data/modernmetals/recipes/aluminum_shield.json new file mode 100644 index 00000000..13708606 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/aluminum_shield.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:aluminum_shield" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xyx", + "xxx", + " x " + ], + "key": { + "x": { + "tag": "forge:ingots/aluminum" + }, + "y": { + "tag": "minecraft:planks" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/aluminum_shovel.json b/src/generated/resources/data/modernmetals/recipes/aluminum_shovel.json new file mode 100644 index 00000000..17e75dea --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/aluminum_shovel.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:aluminum_shovel" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "s", + "s" + ], + "key": { + "x": { + "tag": "forge:ingots/aluminum" + }, + "s": { + "item": "minecraft:stick" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/aluminum_slab.json b/src/generated/resources/data/modernmetals/recipes/aluminum_slab.json new file mode 100644 index 00000000..a1e62ee5 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/aluminum_slab.json @@ -0,0 +1,18 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:aluminum_slab", + "count": 6 + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "tag": "forge:storage_blocks/aluminum" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/aluminum_smallpowder.json b/src/generated/resources/data/modernmetals/recipes/aluminum_smallpowder.json new file mode 100644 index 00000000..1dd39f4a --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/aluminum_smallpowder.json @@ -0,0 +1,15 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:aluminum_smallpowder", + "count": 9 + }, + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "forge:dusts/aluminum" + } + ] + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/aluminum_stairs.json b/src/generated/resources/data/modernmetals/recipes/aluminum_stairs.json new file mode 100644 index 00000000..3d68e313 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/aluminum_stairs.json @@ -0,0 +1,20 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:aluminum_stairs", + "count": 4 + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "forge:storage_blocks/aluminum" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/aluminum_sword.json b/src/generated/resources/data/modernmetals/recipes/aluminum_sword.json new file mode 100644 index 00000000..5bd8b5e5 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/aluminum_sword.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:aluminum_sword" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "x", + "s" + ], + "key": { + "x": { + "tag": "forge:ingots/aluminum" + }, + "s": { + "item": "minecraft:stick" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/aluminum_trapdoor.json b/src/generated/resources/data/modernmetals/recipes/aluminum_trapdoor.json new file mode 100644 index 00000000..c3b51e3a --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/aluminum_trapdoor.json @@ -0,0 +1,18 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:aluminum_trapdoor" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "tag": "forge:ingots/aluminum" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/aluminum_wall.json b/src/generated/resources/data/modernmetals/recipes/aluminum_wall.json new file mode 100644 index 00000000..bc2e49e2 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/aluminum_wall.json @@ -0,0 +1,19 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:aluminum_wall", + "count": 6 + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "forge:storage_blocks/aluminum" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/aluminumbrass_arrow.json b/src/generated/resources/data/modernmetals/recipes/aluminumbrass_arrow.json new file mode 100644 index 00000000..0283a87f --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/aluminumbrass_arrow.json @@ -0,0 +1,26 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:aluminumbrass_arrow", + "count": 4 + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "y", + "z" + ], + "key": { + "x": { + "tag": "forge:nuggets/aluminumbrass" + }, + "y": { + "tag": "forge:rods/aluminumbrass" + }, + "z": { + "item": "minecraft:feather" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/aluminumbrass_axe.json b/src/generated/resources/data/modernmetals/recipes/aluminumbrass_axe.json new file mode 100644 index 00000000..9eccf350 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/aluminumbrass_axe.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:aluminumbrass_axe" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xs", + " s" + ], + "key": { + "x": { + "tag": "forge:ingots/aluminumbrass" + }, + "s": { + "item": "minecraft:stick" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/aluminumbrass_bars_1.json b/src/generated/resources/data/modernmetals/recipes/aluminumbrass_bars_1.json new file mode 100644 index 00000000..02ddf174 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/aluminumbrass_bars_1.json @@ -0,0 +1,19 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:aluminumbrass_bars", + "count": 16 + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "forge:ingots/aluminumbrass" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/aluminumbrass_bars_2.json b/src/generated/resources/data/modernmetals/recipes/aluminumbrass_bars_2.json new file mode 100644 index 00000000..40cdb1ff --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/aluminumbrass_bars_2.json @@ -0,0 +1,18 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:aluminumbrass_bars", + "count": 4 + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "tag": "forge:rods/aluminumbrass" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/aluminumbrass_blend_base.json b/src/generated/resources/data/modernmetals/recipes/aluminumbrass_blend_base.json new file mode 100644 index 00000000..9229eb97 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/aluminumbrass_blend_base.json @@ -0,0 +1,30 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:aluminumbrass_blend", + "count": 4 + }, + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "forge:dusts/aluminum" + }, + { + "tag": "forge:dusts/aluminum" + }, + { + "tag": "forge:dusts/aluminum" + }, + { + "tag": "forge:dusts/copper" + } + ] + }, + "conditions": [ + { + "type": "modernmetals:non_empty_tag", + "tag": "forge:dusts/copper" + } + ] +} diff --git a/src/generated/resources/data/modernmetals/recipes/aluminumbrass_blend_smallblend.json b/src/generated/resources/data/modernmetals/recipes/aluminumbrass_blend_smallblend.json new file mode 100644 index 00000000..abfdc798 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/aluminumbrass_blend_smallblend.json @@ -0,0 +1,19 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:aluminumbrass_blend" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "forge:small_blends/aluminumbrass" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/aluminumbrass_block.json b/src/generated/resources/data/modernmetals/recipes/aluminumbrass_block.json new file mode 100644 index 00000000..70cf7181 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/aluminumbrass_block.json @@ -0,0 +1,19 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:aluminumbrass_block" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "forge:ingots/aluminumbrass" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/aluminumbrass_block_ingot.json b/src/generated/resources/data/modernmetals/recipes/aluminumbrass_block_ingot.json new file mode 100644 index 00000000..d7a4b70a --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/aluminumbrass_block_ingot.json @@ -0,0 +1,15 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:aluminumbrass_ingot", + "count": 9 + }, + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "forge:storage_blocks/aluminumbrass" + } + ] + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/aluminumbrass_bolt.json b/src/generated/resources/data/modernmetals/recipes/aluminumbrass_bolt.json new file mode 100644 index 00000000..675962e9 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/aluminumbrass_bolt.json @@ -0,0 +1,23 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:aluminumbrass_bolt", + "count": 4 + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "x", + "y" + ], + "key": { + "x": { + "tag": "forge:rods/aluminumbrass" + }, + "y": { + "item": "minecraft:feather" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/aluminumbrass_boots.json b/src/generated/resources/data/modernmetals/recipes/aluminumbrass_boots.json new file mode 100644 index 00000000..344a919a --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/aluminumbrass_boots.json @@ -0,0 +1,18 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:aluminumbrass_boots" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "x x", + "x x" + ], + "key": { + "x": { + "tag": "forge:ingots/aluminumbrass" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/aluminumbrass_bow.json b/src/generated/resources/data/modernmetals/recipes/aluminumbrass_bow.json new file mode 100644 index 00000000..1146f198 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/aluminumbrass_bow.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:aluminumbrass_bow" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + " xs", + "x s", + " xs" + ], + "key": { + "x": { + "tag": "forge:rods/aluminumbrass" + }, + "s": { + "item": "minecraft:string" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/aluminumbrass_button.json b/src/generated/resources/data/modernmetals/recipes/aluminumbrass_button.json new file mode 100644 index 00000000..4d08621f --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/aluminumbrass_button.json @@ -0,0 +1,18 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:aluminumbrass_button" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "x" + ], + "key": { + "x": { + "tag": "forge:nuggets/aluminumbrass" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/aluminumbrass_chestplate.json b/src/generated/resources/data/modernmetals/recipes/aluminumbrass_chestplate.json new file mode 100644 index 00000000..3f00a27a --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/aluminumbrass_chestplate.json @@ -0,0 +1,19 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:aluminumbrass_chestplate" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "x x", + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "forge:ingots/aluminumbrass" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/aluminumbrass_crackhammer.json b/src/generated/resources/data/modernmetals/recipes/aluminumbrass_crackhammer.json new file mode 100644 index 00000000..429da784 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/aluminumbrass_crackhammer.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:aluminumbrass_crackhammer" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "y", + "y" + ], + "key": { + "x": { + "tag": "forge:storage_blocks/aluminumbrass" + }, + "y": { + "item": "minecraft:stick" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/aluminumbrass_crossbow.json b/src/generated/resources/data/modernmetals/recipes/aluminumbrass_crossbow.json new file mode 100644 index 00000000..98346278 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/aluminumbrass_crossbow.json @@ -0,0 +1,25 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:aluminumbrass_crossbow" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "zxx", + " yx", + "x z" + ], + "key": { + "x": { + "tag": "forge:rods/aluminumbrass" + }, + "y": { + "item": "minecraft:string" + }, + "z": { + "tag": "forge:gears/aluminumbrass" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/aluminumbrass_door.json b/src/generated/resources/data/modernmetals/recipes/aluminumbrass_door.json new file mode 100644 index 00000000..b8d43fbb --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/aluminumbrass_door.json @@ -0,0 +1,20 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:aluminumbrass_door", + "count": 3 + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx", + "xx" + ], + "key": { + "x": { + "tag": "forge:ingots/aluminumbrass" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/aluminumbrass_fishingrod.json b/src/generated/resources/data/modernmetals/recipes/aluminumbrass_fishingrod.json new file mode 100644 index 00000000..e7311dba --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/aluminumbrass_fishingrod.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:aluminumbrass_fishing_rod" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + " x", + " xy", + "x y" + ], + "key": { + "x": { + "tag": "forge:rods/aluminumbrass" + }, + "y": { + "item": "minecraft:string" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/aluminumbrass_gear.json b/src/generated/resources/data/modernmetals/recipes/aluminumbrass_gear.json new file mode 100644 index 00000000..474537c4 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/aluminumbrass_gear.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:aluminumbrass_gear" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + " x ", + "xrx", + " x " + ], + "key": { + "x": { + "tag": "forge:ingots/aluminumbrass" + }, + "r": { + "tag": "forge:rods/aluminumbrass" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/aluminumbrass_helmet.json b/src/generated/resources/data/modernmetals/recipes/aluminumbrass_helmet.json new file mode 100644 index 00000000..4460eda1 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/aluminumbrass_helmet.json @@ -0,0 +1,18 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:aluminumbrass_helmet" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "x x" + ], + "key": { + "x": { + "tag": "forge:ingots/aluminumbrass" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/aluminumbrass_hoe.json b/src/generated/resources/data/modernmetals/recipes/aluminumbrass_hoe.json new file mode 100644 index 00000000..d0a421a2 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/aluminumbrass_hoe.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:aluminumbrass_hoe" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + " s", + " s" + ], + "key": { + "x": { + "tag": "forge:ingots/aluminumbrass" + }, + "s": { + "item": "minecraft:stick" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/aluminumbrass_horsearmor.json b/src/generated/resources/data/modernmetals/recipes/aluminumbrass_horsearmor.json new file mode 100644 index 00000000..d781b998 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/aluminumbrass_horsearmor.json @@ -0,0 +1,69 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:aluminumbrass_horse_armor" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + " x", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "forge:ingots/aluminumbrass" + }, + "y": [ + { + "item": "minecraft:white_wool" + }, + { + "item": "minecraft:orange_wool" + }, + { + "item": "minecraft:magenta_wool" + }, + { + "item": "minecraft:light_blue_wool" + }, + { + "item": "minecraft:yellow_wool" + }, + { + "item": "minecraft:lime_wool" + }, + { + "item": "minecraft:pink_wool" + }, + { + "item": "minecraft:gray_wool" + }, + { + "item": "minecraft:light_gray_wool" + }, + { + "item": "minecraft:cyan_wool" + }, + { + "item": "minecraft:purple_wool" + }, + { + "item": "minecraft:blue_wool" + }, + { + "item": "minecraft:brown_wool" + }, + { + "item": "minecraft:green_wool" + }, + { + "item": "minecraft:red_wool" + }, + { + "item": "minecraft:black_wool" + } + ] + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/aluminumbrass_ingot.json b/src/generated/resources/data/modernmetals/recipes/aluminumbrass_ingot.json new file mode 100644 index 00000000..fffbb26a --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/aluminumbrass_ingot.json @@ -0,0 +1,19 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:aluminumbrass_ingot" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "forge:nuggets/aluminumbrass" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/aluminumbrass_leggings.json b/src/generated/resources/data/modernmetals/recipes/aluminumbrass_leggings.json new file mode 100644 index 00000000..f7cb4c44 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/aluminumbrass_leggings.json @@ -0,0 +1,19 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:aluminumbrass_leggings" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "x x", + "x x" + ], + "key": { + "x": { + "tag": "forge:ingots/aluminumbrass" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/aluminumbrass_lever.json b/src/generated/resources/data/modernmetals/recipes/aluminumbrass_lever.json new file mode 100644 index 00000000..b86d3814 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/aluminumbrass_lever.json @@ -0,0 +1,21 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:aluminumbrass_lever" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "y" + ], + "key": { + "x": { + "tag": "forge:rods/aluminumbrass" + }, + "y": { + "tag": "forge:ingots/aluminumbrass" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/aluminumbrass_nugget.json b/src/generated/resources/data/modernmetals/recipes/aluminumbrass_nugget.json new file mode 100644 index 00000000..ef802cd8 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/aluminumbrass_nugget.json @@ -0,0 +1,15 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:aluminumbrass_nugget", + "count": 9 + }, + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "forge:ingots/aluminumbrass" + } + ] + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/aluminumbrass_pickaxe.json b/src/generated/resources/data/modernmetals/recipes/aluminumbrass_pickaxe.json new file mode 100644 index 00000000..3774dbc1 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/aluminumbrass_pickaxe.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:aluminumbrass_pickaxe" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + " s ", + " s " + ], + "key": { + "x": { + "tag": "forge:ingots/aluminumbrass" + }, + "s": { + "item": "minecraft:stick" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/aluminumbrass_plate.json b/src/generated/resources/data/modernmetals/recipes/aluminumbrass_plate.json new file mode 100644 index 00000000..cbb68166 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/aluminumbrass_plate.json @@ -0,0 +1,17 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:aluminumbrass_plate" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "tag": "forge:ingots/aluminumbrass" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/aluminumbrass_powder.json b/src/generated/resources/data/modernmetals/recipes/aluminumbrass_powder.json new file mode 100644 index 00000000..90cd72bb --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/aluminumbrass_powder.json @@ -0,0 +1,19 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:aluminumbrass_powder" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "forge:tiny_dusts/aluminumbrass" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/aluminumbrass_pressureplate.json b/src/generated/resources/data/modernmetals/recipes/aluminumbrass_pressureplate.json new file mode 100644 index 00000000..dbdc9b74 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/aluminumbrass_pressureplate.json @@ -0,0 +1,17 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:aluminumbrass_pressure_plate" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx" + ], + "key": { + "x": { + "tag": "forge:ingots/aluminumbrass" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/aluminumbrass_rod.json b/src/generated/resources/data/modernmetals/recipes/aluminumbrass_rod.json new file mode 100644 index 00000000..1b23d4ba --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/aluminumbrass_rod.json @@ -0,0 +1,18 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:aluminumbrass_rod" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + " x ", + " x " + ], + "key": { + "x": { + "tag": "forge:ingots/aluminumbrass" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/aluminumbrass_scythe.json b/src/generated/resources/data/modernmetals/recipes/aluminumbrass_scythe.json new file mode 100644 index 00000000..541bab7d --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/aluminumbrass_scythe.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:aluminumbrass_scythe" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "ii ", + " i", + " s " + ], + "key": { + "i": { + "tag": "forge:ingots/aluminumbrass" + }, + "s": { + "item": "minecraft:stick" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/aluminumbrass_shears.json b/src/generated/resources/data/modernmetals/recipes/aluminumbrass_shears.json new file mode 100644 index 00000000..fe3d8f1b --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/aluminumbrass_shears.json @@ -0,0 +1,18 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:aluminumbrass_shears" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + " x", + "x " + ], + "key": { + "x": { + "tag": "forge:ingots/aluminumbrass" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/aluminumbrass_shield.json b/src/generated/resources/data/modernmetals/recipes/aluminumbrass_shield.json new file mode 100644 index 00000000..bd783807 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/aluminumbrass_shield.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:aluminumbrass_shield" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xyx", + "xxx", + " x " + ], + "key": { + "x": { + "tag": "forge:ingots/aluminumbrass" + }, + "y": { + "tag": "minecraft:planks" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/aluminumbrass_shovel.json b/src/generated/resources/data/modernmetals/recipes/aluminumbrass_shovel.json new file mode 100644 index 00000000..a6e2252d --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/aluminumbrass_shovel.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:aluminumbrass_shovel" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "s", + "s" + ], + "key": { + "x": { + "tag": "forge:ingots/aluminumbrass" + }, + "s": { + "item": "minecraft:stick" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/aluminumbrass_slab.json b/src/generated/resources/data/modernmetals/recipes/aluminumbrass_slab.json new file mode 100644 index 00000000..25c57830 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/aluminumbrass_slab.json @@ -0,0 +1,18 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:aluminumbrass_slab", + "count": 6 + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "tag": "forge:storage_blocks/aluminumbrass" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/aluminumbrass_smallblend_blend.json b/src/generated/resources/data/modernmetals/recipes/aluminumbrass_smallblend_blend.json new file mode 100644 index 00000000..32674882 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/aluminumbrass_smallblend_blend.json @@ -0,0 +1,15 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:aluminumbrass_smallblend", + "count": 9 + }, + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "forge:blends/aluminumbrass" + } + ] + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/aluminumbrass_smallpowder.json b/src/generated/resources/data/modernmetals/recipes/aluminumbrass_smallpowder.json new file mode 100644 index 00000000..bc60ca9e --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/aluminumbrass_smallpowder.json @@ -0,0 +1,15 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:aluminumbrass_smallpowder", + "count": 9 + }, + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "forge:dusts/aluminumbrass" + } + ] + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/aluminumbrass_stairs.json b/src/generated/resources/data/modernmetals/recipes/aluminumbrass_stairs.json new file mode 100644 index 00000000..c09e672d --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/aluminumbrass_stairs.json @@ -0,0 +1,20 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:aluminumbrass_stairs", + "count": 4 + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "forge:storage_blocks/aluminumbrass" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/aluminumbrass_sword.json b/src/generated/resources/data/modernmetals/recipes/aluminumbrass_sword.json new file mode 100644 index 00000000..dde10dc0 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/aluminumbrass_sword.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:aluminumbrass_sword" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "x", + "s" + ], + "key": { + "x": { + "tag": "forge:ingots/aluminumbrass" + }, + "s": { + "item": "minecraft:stick" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/aluminumbrass_trapdoor.json b/src/generated/resources/data/modernmetals/recipes/aluminumbrass_trapdoor.json new file mode 100644 index 00000000..ab9f9d08 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/aluminumbrass_trapdoor.json @@ -0,0 +1,18 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:aluminumbrass_trapdoor" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "tag": "forge:ingots/aluminumbrass" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/aluminumbrass_wall.json b/src/generated/resources/data/modernmetals/recipes/aluminumbrass_wall.json new file mode 100644 index 00000000..ab2f2a31 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/aluminumbrass_wall.json @@ -0,0 +1,19 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:aluminumbrass_wall", + "count": 6 + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "forge:storage_blocks/aluminumbrass" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/beryllium_arrow.json b/src/generated/resources/data/modernmetals/recipes/beryllium_arrow.json new file mode 100644 index 00000000..bcca766c --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/beryllium_arrow.json @@ -0,0 +1,26 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:beryllium_arrow", + "count": 4 + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "y", + "z" + ], + "key": { + "x": { + "tag": "forge:nuggets/beryllium" + }, + "y": { + "tag": "forge:rods/beryllium" + }, + "z": { + "item": "minecraft:feather" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/beryllium_axe.json b/src/generated/resources/data/modernmetals/recipes/beryllium_axe.json new file mode 100644 index 00000000..142cf95f --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/beryllium_axe.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:beryllium_axe" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xs", + " s" + ], + "key": { + "x": { + "tag": "forge:ingots/beryllium" + }, + "s": { + "item": "minecraft:stick" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/beryllium_bars_1.json b/src/generated/resources/data/modernmetals/recipes/beryllium_bars_1.json new file mode 100644 index 00000000..69863a6c --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/beryllium_bars_1.json @@ -0,0 +1,19 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:beryllium_bars", + "count": 16 + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "forge:ingots/beryllium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/beryllium_bars_2.json b/src/generated/resources/data/modernmetals/recipes/beryllium_bars_2.json new file mode 100644 index 00000000..275c51ec --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/beryllium_bars_2.json @@ -0,0 +1,18 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:beryllium_bars", + "count": 4 + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "tag": "forge:rods/beryllium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/beryllium_block.json b/src/generated/resources/data/modernmetals/recipes/beryllium_block.json new file mode 100644 index 00000000..25b6dd6e --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/beryllium_block.json @@ -0,0 +1,19 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:beryllium_block" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "forge:ingots/beryllium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/beryllium_block_ingot.json b/src/generated/resources/data/modernmetals/recipes/beryllium_block_ingot.json new file mode 100644 index 00000000..d24e1f37 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/beryllium_block_ingot.json @@ -0,0 +1,15 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:beryllium_ingot", + "count": 9 + }, + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "forge:storage_blocks/beryllium" + } + ] + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/beryllium_bolt.json b/src/generated/resources/data/modernmetals/recipes/beryllium_bolt.json new file mode 100644 index 00000000..645e9952 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/beryllium_bolt.json @@ -0,0 +1,23 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:beryllium_bolt", + "count": 4 + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "x", + "y" + ], + "key": { + "x": { + "tag": "forge:rods/beryllium" + }, + "y": { + "item": "minecraft:feather" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/beryllium_boots.json b/src/generated/resources/data/modernmetals/recipes/beryllium_boots.json new file mode 100644 index 00000000..82c93713 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/beryllium_boots.json @@ -0,0 +1,18 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:beryllium_boots" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "x x", + "x x" + ], + "key": { + "x": { + "tag": "forge:ingots/beryllium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/beryllium_bow.json b/src/generated/resources/data/modernmetals/recipes/beryllium_bow.json new file mode 100644 index 00000000..64bed9b1 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/beryllium_bow.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:beryllium_bow" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + " xs", + "x s", + " xs" + ], + "key": { + "x": { + "tag": "forge:rods/beryllium" + }, + "s": { + "item": "minecraft:string" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/beryllium_button.json b/src/generated/resources/data/modernmetals/recipes/beryllium_button.json new file mode 100644 index 00000000..fffa212a --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/beryllium_button.json @@ -0,0 +1,18 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:beryllium_button" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "x" + ], + "key": { + "x": { + "tag": "forge:nuggets/beryllium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/beryllium_chestplate.json b/src/generated/resources/data/modernmetals/recipes/beryllium_chestplate.json new file mode 100644 index 00000000..134bae83 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/beryllium_chestplate.json @@ -0,0 +1,19 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:beryllium_chestplate" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "x x", + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "forge:ingots/beryllium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/beryllium_crackhammer.json b/src/generated/resources/data/modernmetals/recipes/beryllium_crackhammer.json new file mode 100644 index 00000000..43781e71 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/beryllium_crackhammer.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:beryllium_crackhammer" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "y", + "y" + ], + "key": { + "x": { + "tag": "forge:storage_blocks/beryllium" + }, + "y": { + "item": "minecraft:stick" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/beryllium_crossbow.json b/src/generated/resources/data/modernmetals/recipes/beryllium_crossbow.json new file mode 100644 index 00000000..a7471b1d --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/beryllium_crossbow.json @@ -0,0 +1,25 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:beryllium_crossbow" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "zxx", + " yx", + "x z" + ], + "key": { + "x": { + "tag": "forge:rods/beryllium" + }, + "y": { + "item": "minecraft:string" + }, + "z": { + "tag": "forge:gears/beryllium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/beryllium_door.json b/src/generated/resources/data/modernmetals/recipes/beryllium_door.json new file mode 100644 index 00000000..0a5b7dd4 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/beryllium_door.json @@ -0,0 +1,20 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:beryllium_door", + "count": 3 + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx", + "xx" + ], + "key": { + "x": { + "tag": "forge:ingots/beryllium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/beryllium_fishingrod.json b/src/generated/resources/data/modernmetals/recipes/beryllium_fishingrod.json new file mode 100644 index 00000000..5f0003f3 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/beryllium_fishingrod.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:beryllium_fishing_rod" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + " x", + " xy", + "x y" + ], + "key": { + "x": { + "tag": "forge:rods/beryllium" + }, + "y": { + "item": "minecraft:string" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/beryllium_gear.json b/src/generated/resources/data/modernmetals/recipes/beryllium_gear.json new file mode 100644 index 00000000..c1f16020 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/beryllium_gear.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:beryllium_gear" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + " x ", + "xrx", + " x " + ], + "key": { + "x": { + "tag": "forge:ingots/beryllium" + }, + "r": { + "tag": "forge:rods/beryllium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/beryllium_helmet.json b/src/generated/resources/data/modernmetals/recipes/beryllium_helmet.json new file mode 100644 index 00000000..1a5a5160 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/beryllium_helmet.json @@ -0,0 +1,18 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:beryllium_helmet" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "x x" + ], + "key": { + "x": { + "tag": "forge:ingots/beryllium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/beryllium_hoe.json b/src/generated/resources/data/modernmetals/recipes/beryllium_hoe.json new file mode 100644 index 00000000..c0704ea8 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/beryllium_hoe.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:beryllium_hoe" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + " s", + " s" + ], + "key": { + "x": { + "tag": "forge:ingots/beryllium" + }, + "s": { + "item": "minecraft:stick" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/beryllium_horsearmor.json b/src/generated/resources/data/modernmetals/recipes/beryllium_horsearmor.json new file mode 100644 index 00000000..0547e33e --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/beryllium_horsearmor.json @@ -0,0 +1,69 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:beryllium_horse_armor" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + " x", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "forge:ingots/beryllium" + }, + "y": [ + { + "item": "minecraft:white_wool" + }, + { + "item": "minecraft:orange_wool" + }, + { + "item": "minecraft:magenta_wool" + }, + { + "item": "minecraft:light_blue_wool" + }, + { + "item": "minecraft:yellow_wool" + }, + { + "item": "minecraft:lime_wool" + }, + { + "item": "minecraft:pink_wool" + }, + { + "item": "minecraft:gray_wool" + }, + { + "item": "minecraft:light_gray_wool" + }, + { + "item": "minecraft:cyan_wool" + }, + { + "item": "minecraft:purple_wool" + }, + { + "item": "minecraft:blue_wool" + }, + { + "item": "minecraft:brown_wool" + }, + { + "item": "minecraft:green_wool" + }, + { + "item": "minecraft:red_wool" + }, + { + "item": "minecraft:black_wool" + } + ] + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/beryllium_ingot.json b/src/generated/resources/data/modernmetals/recipes/beryllium_ingot.json new file mode 100644 index 00000000..9197ad8d --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/beryllium_ingot.json @@ -0,0 +1,19 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:beryllium_ingot" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "forge:nuggets/beryllium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/beryllium_leggings.json b/src/generated/resources/data/modernmetals/recipes/beryllium_leggings.json new file mode 100644 index 00000000..d13bae39 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/beryllium_leggings.json @@ -0,0 +1,19 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:beryllium_leggings" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "x x", + "x x" + ], + "key": { + "x": { + "tag": "forge:ingots/beryllium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/beryllium_lever.json b/src/generated/resources/data/modernmetals/recipes/beryllium_lever.json new file mode 100644 index 00000000..b5fc134e --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/beryllium_lever.json @@ -0,0 +1,21 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:beryllium_lever" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "y" + ], + "key": { + "x": { + "tag": "forge:rods/beryllium" + }, + "y": { + "tag": "forge:ingots/beryllium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/beryllium_nugget.json b/src/generated/resources/data/modernmetals/recipes/beryllium_nugget.json new file mode 100644 index 00000000..c265f9ed --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/beryllium_nugget.json @@ -0,0 +1,15 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:beryllium_nugget", + "count": 9 + }, + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "forge:ingots/beryllium" + } + ] + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/beryllium_pickaxe.json b/src/generated/resources/data/modernmetals/recipes/beryllium_pickaxe.json new file mode 100644 index 00000000..6ca7b54e --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/beryllium_pickaxe.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:beryllium_pickaxe" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + " s ", + " s " + ], + "key": { + "x": { + "tag": "forge:ingots/beryllium" + }, + "s": { + "item": "minecraft:stick" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/beryllium_plate.json b/src/generated/resources/data/modernmetals/recipes/beryllium_plate.json new file mode 100644 index 00000000..bd1057fa --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/beryllium_plate.json @@ -0,0 +1,17 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:beryllium_plate" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "tag": "forge:ingots/beryllium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/beryllium_powder.json b/src/generated/resources/data/modernmetals/recipes/beryllium_powder.json new file mode 100644 index 00000000..e1253c60 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/beryllium_powder.json @@ -0,0 +1,19 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:beryllium_powder" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "forge:tiny_dusts/beryllium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/beryllium_pressureplate.json b/src/generated/resources/data/modernmetals/recipes/beryllium_pressureplate.json new file mode 100644 index 00000000..6e125cf9 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/beryllium_pressureplate.json @@ -0,0 +1,17 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:beryllium_pressure_plate" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx" + ], + "key": { + "x": { + "tag": "forge:ingots/beryllium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/beryllium_rod.json b/src/generated/resources/data/modernmetals/recipes/beryllium_rod.json new file mode 100644 index 00000000..b6a7124a --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/beryllium_rod.json @@ -0,0 +1,18 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:beryllium_rod" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + " x ", + " x " + ], + "key": { + "x": { + "tag": "forge:ingots/beryllium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/beryllium_scythe.json b/src/generated/resources/data/modernmetals/recipes/beryllium_scythe.json new file mode 100644 index 00000000..0c23cb35 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/beryllium_scythe.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:beryllium_scythe" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "ii ", + " i", + " s " + ], + "key": { + "i": { + "tag": "forge:ingots/beryllium" + }, + "s": { + "item": "minecraft:stick" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/beryllium_shears.json b/src/generated/resources/data/modernmetals/recipes/beryllium_shears.json new file mode 100644 index 00000000..9842de2e --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/beryllium_shears.json @@ -0,0 +1,18 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:beryllium_shears" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + " x", + "x " + ], + "key": { + "x": { + "tag": "forge:ingots/beryllium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/beryllium_shield.json b/src/generated/resources/data/modernmetals/recipes/beryllium_shield.json new file mode 100644 index 00000000..44fd33de --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/beryllium_shield.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:beryllium_shield" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xyx", + "xxx", + " x " + ], + "key": { + "x": { + "tag": "forge:ingots/beryllium" + }, + "y": { + "tag": "minecraft:planks" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/beryllium_shovel.json b/src/generated/resources/data/modernmetals/recipes/beryllium_shovel.json new file mode 100644 index 00000000..10ac4f15 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/beryllium_shovel.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:beryllium_shovel" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "s", + "s" + ], + "key": { + "x": { + "tag": "forge:ingots/beryllium" + }, + "s": { + "item": "minecraft:stick" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/beryllium_slab.json b/src/generated/resources/data/modernmetals/recipes/beryllium_slab.json new file mode 100644 index 00000000..c4999525 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/beryllium_slab.json @@ -0,0 +1,18 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:beryllium_slab", + "count": 6 + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "tag": "forge:storage_blocks/beryllium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/beryllium_smallpowder.json b/src/generated/resources/data/modernmetals/recipes/beryllium_smallpowder.json new file mode 100644 index 00000000..148cd52d --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/beryllium_smallpowder.json @@ -0,0 +1,15 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:beryllium_smallpowder", + "count": 9 + }, + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "forge:dusts/beryllium" + } + ] + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/beryllium_stairs.json b/src/generated/resources/data/modernmetals/recipes/beryllium_stairs.json new file mode 100644 index 00000000..bd90bc26 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/beryllium_stairs.json @@ -0,0 +1,20 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:beryllium_stairs", + "count": 4 + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "forge:storage_blocks/beryllium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/beryllium_sword.json b/src/generated/resources/data/modernmetals/recipes/beryllium_sword.json new file mode 100644 index 00000000..a71de17f --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/beryllium_sword.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:beryllium_sword" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "x", + "s" + ], + "key": { + "x": { + "tag": "forge:ingots/beryllium" + }, + "s": { + "item": "minecraft:stick" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/beryllium_trapdoor.json b/src/generated/resources/data/modernmetals/recipes/beryllium_trapdoor.json new file mode 100644 index 00000000..f2f8a763 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/beryllium_trapdoor.json @@ -0,0 +1,18 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:beryllium_trapdoor" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "tag": "forge:ingots/beryllium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/beryllium_wall.json b/src/generated/resources/data/modernmetals/recipes/beryllium_wall.json new file mode 100644 index 00000000..4613ea7f --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/beryllium_wall.json @@ -0,0 +1,19 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:beryllium_wall", + "count": 6 + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "forge:storage_blocks/beryllium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/boron_arrow.json b/src/generated/resources/data/modernmetals/recipes/boron_arrow.json new file mode 100644 index 00000000..12cf0d4d --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/boron_arrow.json @@ -0,0 +1,26 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:boron_arrow", + "count": 4 + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "y", + "z" + ], + "key": { + "x": { + "tag": "forge:nuggets/boron" + }, + "y": { + "tag": "forge:rods/boron" + }, + "z": { + "item": "minecraft:feather" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/boron_axe.json b/src/generated/resources/data/modernmetals/recipes/boron_axe.json new file mode 100644 index 00000000..81d2d7e9 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/boron_axe.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:boron_axe" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xs", + " s" + ], + "key": { + "x": { + "tag": "forge:ingots/boron" + }, + "s": { + "item": "minecraft:stick" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/boron_bars_1.json b/src/generated/resources/data/modernmetals/recipes/boron_bars_1.json new file mode 100644 index 00000000..cd1c2151 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/boron_bars_1.json @@ -0,0 +1,19 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:boron_bars", + "count": 16 + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "forge:ingots/boron" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/boron_bars_2.json b/src/generated/resources/data/modernmetals/recipes/boron_bars_2.json new file mode 100644 index 00000000..c069e235 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/boron_bars_2.json @@ -0,0 +1,18 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:boron_bars", + "count": 4 + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "tag": "forge:rods/boron" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/boron_block.json b/src/generated/resources/data/modernmetals/recipes/boron_block.json new file mode 100644 index 00000000..fd540508 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/boron_block.json @@ -0,0 +1,19 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:boron_block" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "forge:ingots/boron" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/boron_block_ingot.json b/src/generated/resources/data/modernmetals/recipes/boron_block_ingot.json new file mode 100644 index 00000000..0885c41c --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/boron_block_ingot.json @@ -0,0 +1,15 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:boron_ingot", + "count": 9 + }, + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "forge:storage_blocks/boron" + } + ] + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/boron_bolt.json b/src/generated/resources/data/modernmetals/recipes/boron_bolt.json new file mode 100644 index 00000000..76549e89 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/boron_bolt.json @@ -0,0 +1,23 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:boron_bolt", + "count": 4 + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "x", + "y" + ], + "key": { + "x": { + "tag": "forge:rods/boron" + }, + "y": { + "item": "minecraft:feather" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/boron_boots.json b/src/generated/resources/data/modernmetals/recipes/boron_boots.json new file mode 100644 index 00000000..35346007 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/boron_boots.json @@ -0,0 +1,18 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:boron_boots" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "x x", + "x x" + ], + "key": { + "x": { + "tag": "forge:ingots/boron" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/boron_bow.json b/src/generated/resources/data/modernmetals/recipes/boron_bow.json new file mode 100644 index 00000000..3f156797 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/boron_bow.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:boron_bow" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + " xs", + "x s", + " xs" + ], + "key": { + "x": { + "tag": "forge:rods/boron" + }, + "s": { + "item": "minecraft:string" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/boron_button.json b/src/generated/resources/data/modernmetals/recipes/boron_button.json new file mode 100644 index 00000000..d9291b36 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/boron_button.json @@ -0,0 +1,18 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:boron_button" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "x" + ], + "key": { + "x": { + "tag": "forge:nuggets/boron" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/boron_chestplate.json b/src/generated/resources/data/modernmetals/recipes/boron_chestplate.json new file mode 100644 index 00000000..738079c6 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/boron_chestplate.json @@ -0,0 +1,19 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:boron_chestplate" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "x x", + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "forge:ingots/boron" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/boron_crackhammer.json b/src/generated/resources/data/modernmetals/recipes/boron_crackhammer.json new file mode 100644 index 00000000..6fddbb98 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/boron_crackhammer.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:boron_crackhammer" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "y", + "y" + ], + "key": { + "x": { + "tag": "forge:storage_blocks/boron" + }, + "y": { + "item": "minecraft:stick" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/boron_crossbow.json b/src/generated/resources/data/modernmetals/recipes/boron_crossbow.json new file mode 100644 index 00000000..a8101170 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/boron_crossbow.json @@ -0,0 +1,25 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:boron_crossbow" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "zxx", + " yx", + "x z" + ], + "key": { + "x": { + "tag": "forge:rods/boron" + }, + "y": { + "item": "minecraft:string" + }, + "z": { + "tag": "forge:gears/boron" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/boron_door.json b/src/generated/resources/data/modernmetals/recipes/boron_door.json new file mode 100644 index 00000000..27379e53 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/boron_door.json @@ -0,0 +1,20 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:boron_door", + "count": 3 + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx", + "xx" + ], + "key": { + "x": { + "tag": "forge:ingots/boron" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/boron_fishingrod.json b/src/generated/resources/data/modernmetals/recipes/boron_fishingrod.json new file mode 100644 index 00000000..5fdb2fc1 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/boron_fishingrod.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:boron_fishing_rod" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + " x", + " xy", + "x y" + ], + "key": { + "x": { + "tag": "forge:rods/boron" + }, + "y": { + "item": "minecraft:string" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/boron_gear.json b/src/generated/resources/data/modernmetals/recipes/boron_gear.json new file mode 100644 index 00000000..22755023 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/boron_gear.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:boron_gear" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + " x ", + "xrx", + " x " + ], + "key": { + "x": { + "tag": "forge:ingots/boron" + }, + "r": { + "tag": "forge:rods/boron" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/boron_helmet.json b/src/generated/resources/data/modernmetals/recipes/boron_helmet.json new file mode 100644 index 00000000..d1e8dc32 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/boron_helmet.json @@ -0,0 +1,18 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:boron_helmet" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "x x" + ], + "key": { + "x": { + "tag": "forge:ingots/boron" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/boron_hoe.json b/src/generated/resources/data/modernmetals/recipes/boron_hoe.json new file mode 100644 index 00000000..1320bfb3 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/boron_hoe.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:boron_hoe" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + " s", + " s" + ], + "key": { + "x": { + "tag": "forge:ingots/boron" + }, + "s": { + "item": "minecraft:stick" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/boron_horsearmor.json b/src/generated/resources/data/modernmetals/recipes/boron_horsearmor.json new file mode 100644 index 00000000..def76d12 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/boron_horsearmor.json @@ -0,0 +1,69 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:boron_horse_armor" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + " x", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "forge:ingots/boron" + }, + "y": [ + { + "item": "minecraft:white_wool" + }, + { + "item": "minecraft:orange_wool" + }, + { + "item": "minecraft:magenta_wool" + }, + { + "item": "minecraft:light_blue_wool" + }, + { + "item": "minecraft:yellow_wool" + }, + { + "item": "minecraft:lime_wool" + }, + { + "item": "minecraft:pink_wool" + }, + { + "item": "minecraft:gray_wool" + }, + { + "item": "minecraft:light_gray_wool" + }, + { + "item": "minecraft:cyan_wool" + }, + { + "item": "minecraft:purple_wool" + }, + { + "item": "minecraft:blue_wool" + }, + { + "item": "minecraft:brown_wool" + }, + { + "item": "minecraft:green_wool" + }, + { + "item": "minecraft:red_wool" + }, + { + "item": "minecraft:black_wool" + } + ] + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/boron_ingot.json b/src/generated/resources/data/modernmetals/recipes/boron_ingot.json new file mode 100644 index 00000000..8c43b00e --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/boron_ingot.json @@ -0,0 +1,19 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:boron_ingot" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "forge:nuggets/boron" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/boron_leggings.json b/src/generated/resources/data/modernmetals/recipes/boron_leggings.json new file mode 100644 index 00000000..a1d6c906 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/boron_leggings.json @@ -0,0 +1,19 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:boron_leggings" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "x x", + "x x" + ], + "key": { + "x": { + "tag": "forge:ingots/boron" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/boron_lever.json b/src/generated/resources/data/modernmetals/recipes/boron_lever.json new file mode 100644 index 00000000..67776499 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/boron_lever.json @@ -0,0 +1,21 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:boron_lever" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "y" + ], + "key": { + "x": { + "tag": "forge:rods/boron" + }, + "y": { + "tag": "forge:ingots/boron" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/boron_nugget.json b/src/generated/resources/data/modernmetals/recipes/boron_nugget.json new file mode 100644 index 00000000..b479ce22 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/boron_nugget.json @@ -0,0 +1,15 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:boron_nugget", + "count": 9 + }, + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "forge:ingots/boron" + } + ] + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/boron_pickaxe.json b/src/generated/resources/data/modernmetals/recipes/boron_pickaxe.json new file mode 100644 index 00000000..98b03285 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/boron_pickaxe.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:boron_pickaxe" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + " s ", + " s " + ], + "key": { + "x": { + "tag": "forge:ingots/boron" + }, + "s": { + "item": "minecraft:stick" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/boron_plate.json b/src/generated/resources/data/modernmetals/recipes/boron_plate.json new file mode 100644 index 00000000..8896f086 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/boron_plate.json @@ -0,0 +1,17 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:boron_plate" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "tag": "forge:ingots/boron" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/boron_powder.json b/src/generated/resources/data/modernmetals/recipes/boron_powder.json new file mode 100644 index 00000000..55811cf4 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/boron_powder.json @@ -0,0 +1,19 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:boron_powder" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "forge:tiny_dusts/boron" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/boron_pressureplate.json b/src/generated/resources/data/modernmetals/recipes/boron_pressureplate.json new file mode 100644 index 00000000..cbb06788 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/boron_pressureplate.json @@ -0,0 +1,17 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:boron_pressure_plate" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx" + ], + "key": { + "x": { + "tag": "forge:ingots/boron" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/boron_rod.json b/src/generated/resources/data/modernmetals/recipes/boron_rod.json new file mode 100644 index 00000000..871533f5 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/boron_rod.json @@ -0,0 +1,18 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:boron_rod" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + " x ", + " x " + ], + "key": { + "x": { + "tag": "forge:ingots/boron" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/boron_scythe.json b/src/generated/resources/data/modernmetals/recipes/boron_scythe.json new file mode 100644 index 00000000..59955134 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/boron_scythe.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:boron_scythe" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "ii ", + " i", + " s " + ], + "key": { + "i": { + "tag": "forge:ingots/boron" + }, + "s": { + "item": "minecraft:stick" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/boron_shears.json b/src/generated/resources/data/modernmetals/recipes/boron_shears.json new file mode 100644 index 00000000..0ce509e2 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/boron_shears.json @@ -0,0 +1,18 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:boron_shears" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + " x", + "x " + ], + "key": { + "x": { + "tag": "forge:ingots/boron" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/boron_shield.json b/src/generated/resources/data/modernmetals/recipes/boron_shield.json new file mode 100644 index 00000000..8678d627 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/boron_shield.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:boron_shield" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xyx", + "xxx", + " x " + ], + "key": { + "x": { + "tag": "forge:ingots/boron" + }, + "y": { + "tag": "minecraft:planks" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/boron_shovel.json b/src/generated/resources/data/modernmetals/recipes/boron_shovel.json new file mode 100644 index 00000000..02a78ad2 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/boron_shovel.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:boron_shovel" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "s", + "s" + ], + "key": { + "x": { + "tag": "forge:ingots/boron" + }, + "s": { + "item": "minecraft:stick" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/boron_slab.json b/src/generated/resources/data/modernmetals/recipes/boron_slab.json new file mode 100644 index 00000000..b4f891db --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/boron_slab.json @@ -0,0 +1,18 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:boron_slab", + "count": 6 + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "tag": "forge:storage_blocks/boron" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/boron_smallpowder.json b/src/generated/resources/data/modernmetals/recipes/boron_smallpowder.json new file mode 100644 index 00000000..30009d74 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/boron_smallpowder.json @@ -0,0 +1,15 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:boron_smallpowder", + "count": 9 + }, + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "forge:dusts/boron" + } + ] + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/boron_stairs.json b/src/generated/resources/data/modernmetals/recipes/boron_stairs.json new file mode 100644 index 00000000..30382814 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/boron_stairs.json @@ -0,0 +1,20 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:boron_stairs", + "count": 4 + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "forge:storage_blocks/boron" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/boron_sword.json b/src/generated/resources/data/modernmetals/recipes/boron_sword.json new file mode 100644 index 00000000..1cf490c7 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/boron_sword.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:boron_sword" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "x", + "s" + ], + "key": { + "x": { + "tag": "forge:ingots/boron" + }, + "s": { + "item": "minecraft:stick" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/boron_trapdoor.json b/src/generated/resources/data/modernmetals/recipes/boron_trapdoor.json new file mode 100644 index 00000000..35ffae2a --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/boron_trapdoor.json @@ -0,0 +1,18 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:boron_trapdoor" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "tag": "forge:ingots/boron" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/boron_wall.json b/src/generated/resources/data/modernmetals/recipes/boron_wall.json new file mode 100644 index 00000000..6b3f8320 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/boron_wall.json @@ -0,0 +1,19 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:boron_wall", + "count": 6 + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "forge:storage_blocks/boron" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/cadmium_arrow.json b/src/generated/resources/data/modernmetals/recipes/cadmium_arrow.json new file mode 100644 index 00000000..4ede3970 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/cadmium_arrow.json @@ -0,0 +1,26 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:cadmium_arrow", + "count": 4 + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "y", + "z" + ], + "key": { + "x": { + "tag": "forge:nuggets/cadmium" + }, + "y": { + "tag": "forge:rods/cadmium" + }, + "z": { + "item": "minecraft:feather" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/cadmium_axe.json b/src/generated/resources/data/modernmetals/recipes/cadmium_axe.json new file mode 100644 index 00000000..b8ed809d --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/cadmium_axe.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:cadmium_axe" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xs", + " s" + ], + "key": { + "x": { + "tag": "forge:ingots/cadmium" + }, + "s": { + "item": "minecraft:stick" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/cadmium_bars_1.json b/src/generated/resources/data/modernmetals/recipes/cadmium_bars_1.json new file mode 100644 index 00000000..56cc796b --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/cadmium_bars_1.json @@ -0,0 +1,19 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:cadmium_bars", + "count": 16 + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "forge:ingots/cadmium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/cadmium_bars_2.json b/src/generated/resources/data/modernmetals/recipes/cadmium_bars_2.json new file mode 100644 index 00000000..fe996efd --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/cadmium_bars_2.json @@ -0,0 +1,18 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:cadmium_bars", + "count": 4 + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "tag": "forge:rods/cadmium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/cadmium_block.json b/src/generated/resources/data/modernmetals/recipes/cadmium_block.json new file mode 100644 index 00000000..3bd8a6da --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/cadmium_block.json @@ -0,0 +1,19 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:cadmium_block" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "forge:ingots/cadmium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/cadmium_block_ingot.json b/src/generated/resources/data/modernmetals/recipes/cadmium_block_ingot.json new file mode 100644 index 00000000..6cc365b4 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/cadmium_block_ingot.json @@ -0,0 +1,15 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:cadmium_ingot", + "count": 9 + }, + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "forge:storage_blocks/cadmium" + } + ] + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/cadmium_bolt.json b/src/generated/resources/data/modernmetals/recipes/cadmium_bolt.json new file mode 100644 index 00000000..cdb02053 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/cadmium_bolt.json @@ -0,0 +1,23 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:cadmium_bolt", + "count": 4 + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "x", + "y" + ], + "key": { + "x": { + "tag": "forge:rods/cadmium" + }, + "y": { + "item": "minecraft:feather" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/cadmium_boots.json b/src/generated/resources/data/modernmetals/recipes/cadmium_boots.json new file mode 100644 index 00000000..15b2f2a3 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/cadmium_boots.json @@ -0,0 +1,18 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:cadmium_boots" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "x x", + "x x" + ], + "key": { + "x": { + "tag": "forge:ingots/cadmium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/cadmium_bow.json b/src/generated/resources/data/modernmetals/recipes/cadmium_bow.json new file mode 100644 index 00000000..d65203cd --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/cadmium_bow.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:cadmium_bow" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + " xs", + "x s", + " xs" + ], + "key": { + "x": { + "tag": "forge:rods/cadmium" + }, + "s": { + "item": "minecraft:string" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/cadmium_button.json b/src/generated/resources/data/modernmetals/recipes/cadmium_button.json new file mode 100644 index 00000000..02fec8e1 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/cadmium_button.json @@ -0,0 +1,18 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:cadmium_button" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "x" + ], + "key": { + "x": { + "tag": "forge:nuggets/cadmium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/cadmium_chestplate.json b/src/generated/resources/data/modernmetals/recipes/cadmium_chestplate.json new file mode 100644 index 00000000..9ff65bcc --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/cadmium_chestplate.json @@ -0,0 +1,19 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:cadmium_chestplate" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "x x", + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "forge:ingots/cadmium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/cadmium_crackhammer.json b/src/generated/resources/data/modernmetals/recipes/cadmium_crackhammer.json new file mode 100644 index 00000000..6270b2b8 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/cadmium_crackhammer.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:cadmium_crackhammer" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "y", + "y" + ], + "key": { + "x": { + "tag": "forge:storage_blocks/cadmium" + }, + "y": { + "item": "minecraft:stick" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/cadmium_crossbow.json b/src/generated/resources/data/modernmetals/recipes/cadmium_crossbow.json new file mode 100644 index 00000000..9afc861d --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/cadmium_crossbow.json @@ -0,0 +1,25 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:cadmium_crossbow" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "zxx", + " yx", + "x z" + ], + "key": { + "x": { + "tag": "forge:rods/cadmium" + }, + "y": { + "item": "minecraft:string" + }, + "z": { + "tag": "forge:gears/cadmium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/cadmium_door.json b/src/generated/resources/data/modernmetals/recipes/cadmium_door.json new file mode 100644 index 00000000..b4f40198 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/cadmium_door.json @@ -0,0 +1,20 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:cadmium_door", + "count": 3 + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx", + "xx" + ], + "key": { + "x": { + "tag": "forge:ingots/cadmium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/cadmium_fishingrod.json b/src/generated/resources/data/modernmetals/recipes/cadmium_fishingrod.json new file mode 100644 index 00000000..2c2db256 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/cadmium_fishingrod.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:cadmium_fishing_rod" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + " x", + " xy", + "x y" + ], + "key": { + "x": { + "tag": "forge:rods/cadmium" + }, + "y": { + "item": "minecraft:string" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/cadmium_gear.json b/src/generated/resources/data/modernmetals/recipes/cadmium_gear.json new file mode 100644 index 00000000..2a958d8a --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/cadmium_gear.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:cadmium_gear" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + " x ", + "xrx", + " x " + ], + "key": { + "x": { + "tag": "forge:ingots/cadmium" + }, + "r": { + "tag": "forge:rods/cadmium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/cadmium_helmet.json b/src/generated/resources/data/modernmetals/recipes/cadmium_helmet.json new file mode 100644 index 00000000..b1663154 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/cadmium_helmet.json @@ -0,0 +1,18 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:cadmium_helmet" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "x x" + ], + "key": { + "x": { + "tag": "forge:ingots/cadmium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/cadmium_hoe.json b/src/generated/resources/data/modernmetals/recipes/cadmium_hoe.json new file mode 100644 index 00000000..9f47941a --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/cadmium_hoe.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:cadmium_hoe" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + " s", + " s" + ], + "key": { + "x": { + "tag": "forge:ingots/cadmium" + }, + "s": { + "item": "minecraft:stick" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/cadmium_horsearmor.json b/src/generated/resources/data/modernmetals/recipes/cadmium_horsearmor.json new file mode 100644 index 00000000..e19e78d8 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/cadmium_horsearmor.json @@ -0,0 +1,69 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:cadmium_horse_armor" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + " x", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "forge:ingots/cadmium" + }, + "y": [ + { + "item": "minecraft:white_wool" + }, + { + "item": "minecraft:orange_wool" + }, + { + "item": "minecraft:magenta_wool" + }, + { + "item": "minecraft:light_blue_wool" + }, + { + "item": "minecraft:yellow_wool" + }, + { + "item": "minecraft:lime_wool" + }, + { + "item": "minecraft:pink_wool" + }, + { + "item": "minecraft:gray_wool" + }, + { + "item": "minecraft:light_gray_wool" + }, + { + "item": "minecraft:cyan_wool" + }, + { + "item": "minecraft:purple_wool" + }, + { + "item": "minecraft:blue_wool" + }, + { + "item": "minecraft:brown_wool" + }, + { + "item": "minecraft:green_wool" + }, + { + "item": "minecraft:red_wool" + }, + { + "item": "minecraft:black_wool" + } + ] + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/cadmium_ingot.json b/src/generated/resources/data/modernmetals/recipes/cadmium_ingot.json new file mode 100644 index 00000000..96a6d9c2 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/cadmium_ingot.json @@ -0,0 +1,19 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:cadmium_ingot" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "forge:nuggets/cadmium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/cadmium_leggings.json b/src/generated/resources/data/modernmetals/recipes/cadmium_leggings.json new file mode 100644 index 00000000..5f19b45e --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/cadmium_leggings.json @@ -0,0 +1,19 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:cadmium_leggings" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "x x", + "x x" + ], + "key": { + "x": { + "tag": "forge:ingots/cadmium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/cadmium_lever.json b/src/generated/resources/data/modernmetals/recipes/cadmium_lever.json new file mode 100644 index 00000000..687abca6 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/cadmium_lever.json @@ -0,0 +1,21 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:cadmium_lever" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "y" + ], + "key": { + "x": { + "tag": "forge:rods/cadmium" + }, + "y": { + "tag": "forge:ingots/cadmium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/cadmium_nugget.json b/src/generated/resources/data/modernmetals/recipes/cadmium_nugget.json new file mode 100644 index 00000000..f85b7ad6 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/cadmium_nugget.json @@ -0,0 +1,15 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:cadmium_nugget", + "count": 9 + }, + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "forge:ingots/cadmium" + } + ] + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/cadmium_pickaxe.json b/src/generated/resources/data/modernmetals/recipes/cadmium_pickaxe.json new file mode 100644 index 00000000..ab940d31 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/cadmium_pickaxe.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:cadmium_pickaxe" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + " s ", + " s " + ], + "key": { + "x": { + "tag": "forge:ingots/cadmium" + }, + "s": { + "item": "minecraft:stick" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/cadmium_plate.json b/src/generated/resources/data/modernmetals/recipes/cadmium_plate.json new file mode 100644 index 00000000..3986dc12 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/cadmium_plate.json @@ -0,0 +1,17 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:cadmium_plate" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "tag": "forge:ingots/cadmium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/cadmium_powder.json b/src/generated/resources/data/modernmetals/recipes/cadmium_powder.json new file mode 100644 index 00000000..924d58fa --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/cadmium_powder.json @@ -0,0 +1,19 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:cadmium_powder" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "forge:tiny_dusts/cadmium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/cadmium_pressureplate.json b/src/generated/resources/data/modernmetals/recipes/cadmium_pressureplate.json new file mode 100644 index 00000000..53a0b8a2 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/cadmium_pressureplate.json @@ -0,0 +1,17 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:cadmium_pressure_plate" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx" + ], + "key": { + "x": { + "tag": "forge:ingots/cadmium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/cadmium_rod.json b/src/generated/resources/data/modernmetals/recipes/cadmium_rod.json new file mode 100644 index 00000000..0e4adc38 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/cadmium_rod.json @@ -0,0 +1,18 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:cadmium_rod" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + " x ", + " x " + ], + "key": { + "x": { + "tag": "forge:ingots/cadmium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/cadmium_scythe.json b/src/generated/resources/data/modernmetals/recipes/cadmium_scythe.json new file mode 100644 index 00000000..dbc2969f --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/cadmium_scythe.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:cadmium_scythe" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "ii ", + " i", + " s " + ], + "key": { + "i": { + "tag": "forge:ingots/cadmium" + }, + "s": { + "item": "minecraft:stick" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/cadmium_shears.json b/src/generated/resources/data/modernmetals/recipes/cadmium_shears.json new file mode 100644 index 00000000..061a5597 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/cadmium_shears.json @@ -0,0 +1,18 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:cadmium_shears" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + " x", + "x " + ], + "key": { + "x": { + "tag": "forge:ingots/cadmium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/cadmium_shield.json b/src/generated/resources/data/modernmetals/recipes/cadmium_shield.json new file mode 100644 index 00000000..69acb14f --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/cadmium_shield.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:cadmium_shield" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xyx", + "xxx", + " x " + ], + "key": { + "x": { + "tag": "forge:ingots/cadmium" + }, + "y": { + "tag": "minecraft:planks" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/cadmium_shovel.json b/src/generated/resources/data/modernmetals/recipes/cadmium_shovel.json new file mode 100644 index 00000000..3a605032 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/cadmium_shovel.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:cadmium_shovel" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "s", + "s" + ], + "key": { + "x": { + "tag": "forge:ingots/cadmium" + }, + "s": { + "item": "minecraft:stick" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/cadmium_slab.json b/src/generated/resources/data/modernmetals/recipes/cadmium_slab.json new file mode 100644 index 00000000..b2a7bb6b --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/cadmium_slab.json @@ -0,0 +1,18 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:cadmium_slab", + "count": 6 + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "tag": "forge:storage_blocks/cadmium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/cadmium_smallpowder.json b/src/generated/resources/data/modernmetals/recipes/cadmium_smallpowder.json new file mode 100644 index 00000000..f073c5f1 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/cadmium_smallpowder.json @@ -0,0 +1,15 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:cadmium_smallpowder", + "count": 9 + }, + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "forge:dusts/cadmium" + } + ] + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/cadmium_stairs.json b/src/generated/resources/data/modernmetals/recipes/cadmium_stairs.json new file mode 100644 index 00000000..284d1643 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/cadmium_stairs.json @@ -0,0 +1,20 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:cadmium_stairs", + "count": 4 + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "forge:storage_blocks/cadmium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/cadmium_sword.json b/src/generated/resources/data/modernmetals/recipes/cadmium_sword.json new file mode 100644 index 00000000..9d3ef057 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/cadmium_sword.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:cadmium_sword" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "x", + "s" + ], + "key": { + "x": { + "tag": "forge:ingots/cadmium" + }, + "s": { + "item": "minecraft:stick" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/cadmium_trapdoor.json b/src/generated/resources/data/modernmetals/recipes/cadmium_trapdoor.json new file mode 100644 index 00000000..772d6a87 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/cadmium_trapdoor.json @@ -0,0 +1,18 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:cadmium_trapdoor" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "tag": "forge:ingots/cadmium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/cadmium_wall.json b/src/generated/resources/data/modernmetals/recipes/cadmium_wall.json new file mode 100644 index 00000000..ec079677 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/cadmium_wall.json @@ -0,0 +1,19 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:cadmium_wall", + "count": 6 + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "forge:storage_blocks/cadmium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/chromium_arrow.json b/src/generated/resources/data/modernmetals/recipes/chromium_arrow.json new file mode 100644 index 00000000..daeaa360 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/chromium_arrow.json @@ -0,0 +1,26 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:chromium_arrow", + "count": 4 + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "y", + "z" + ], + "key": { + "x": { + "tag": "forge:nuggets/chromium" + }, + "y": { + "tag": "forge:rods/chromium" + }, + "z": { + "item": "minecraft:feather" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/chromium_axe.json b/src/generated/resources/data/modernmetals/recipes/chromium_axe.json new file mode 100644 index 00000000..3936e143 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/chromium_axe.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:chromium_axe" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xs", + " s" + ], + "key": { + "x": { + "tag": "forge:ingots/chromium" + }, + "s": { + "item": "minecraft:stick" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/chromium_bars_1.json b/src/generated/resources/data/modernmetals/recipes/chromium_bars_1.json new file mode 100644 index 00000000..697daa2c --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/chromium_bars_1.json @@ -0,0 +1,19 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:chromium_bars", + "count": 16 + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "forge:ingots/chromium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/chromium_bars_2.json b/src/generated/resources/data/modernmetals/recipes/chromium_bars_2.json new file mode 100644 index 00000000..d1c92037 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/chromium_bars_2.json @@ -0,0 +1,18 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:chromium_bars", + "count": 4 + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "tag": "forge:rods/chromium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/chromium_block.json b/src/generated/resources/data/modernmetals/recipes/chromium_block.json new file mode 100644 index 00000000..d0c4374b --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/chromium_block.json @@ -0,0 +1,19 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:chromium_block" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "forge:ingots/chromium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/chromium_block_ingot.json b/src/generated/resources/data/modernmetals/recipes/chromium_block_ingot.json new file mode 100644 index 00000000..078eee3a --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/chromium_block_ingot.json @@ -0,0 +1,15 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:chromium_ingot", + "count": 9 + }, + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "forge:storage_blocks/chromium" + } + ] + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/chromium_bolt.json b/src/generated/resources/data/modernmetals/recipes/chromium_bolt.json new file mode 100644 index 00000000..eb6fbaba --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/chromium_bolt.json @@ -0,0 +1,23 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:chromium_bolt", + "count": 4 + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "x", + "y" + ], + "key": { + "x": { + "tag": "forge:rods/chromium" + }, + "y": { + "item": "minecraft:feather" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/chromium_boots.json b/src/generated/resources/data/modernmetals/recipes/chromium_boots.json new file mode 100644 index 00000000..c0dcccbc --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/chromium_boots.json @@ -0,0 +1,18 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:chromium_boots" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "x x", + "x x" + ], + "key": { + "x": { + "tag": "forge:ingots/chromium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/chromium_bow.json b/src/generated/resources/data/modernmetals/recipes/chromium_bow.json new file mode 100644 index 00000000..3aba339d --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/chromium_bow.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:chromium_bow" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + " xs", + "x s", + " xs" + ], + "key": { + "x": { + "tag": "forge:rods/chromium" + }, + "s": { + "item": "minecraft:string" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/chromium_button.json b/src/generated/resources/data/modernmetals/recipes/chromium_button.json new file mode 100644 index 00000000..1f824eea --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/chromium_button.json @@ -0,0 +1,18 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:chromium_button" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "x" + ], + "key": { + "x": { + "tag": "forge:nuggets/chromium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/chromium_chestplate.json b/src/generated/resources/data/modernmetals/recipes/chromium_chestplate.json new file mode 100644 index 00000000..1924d76e --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/chromium_chestplate.json @@ -0,0 +1,19 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:chromium_chestplate" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "x x", + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "forge:ingots/chromium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/chromium_crackhammer.json b/src/generated/resources/data/modernmetals/recipes/chromium_crackhammer.json new file mode 100644 index 00000000..2ffb14fc --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/chromium_crackhammer.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:chromium_crackhammer" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "y", + "y" + ], + "key": { + "x": { + "tag": "forge:storage_blocks/chromium" + }, + "y": { + "item": "minecraft:stick" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/chromium_crossbow.json b/src/generated/resources/data/modernmetals/recipes/chromium_crossbow.json new file mode 100644 index 00000000..5660ebd0 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/chromium_crossbow.json @@ -0,0 +1,25 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:chromium_crossbow" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "zxx", + " yx", + "x z" + ], + "key": { + "x": { + "tag": "forge:rods/chromium" + }, + "y": { + "item": "minecraft:string" + }, + "z": { + "tag": "forge:gears/chromium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/chromium_door.json b/src/generated/resources/data/modernmetals/recipes/chromium_door.json new file mode 100644 index 00000000..cacee41b --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/chromium_door.json @@ -0,0 +1,20 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:chromium_door", + "count": 3 + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx", + "xx" + ], + "key": { + "x": { + "tag": "forge:ingots/chromium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/chromium_fishingrod.json b/src/generated/resources/data/modernmetals/recipes/chromium_fishingrod.json new file mode 100644 index 00000000..19591877 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/chromium_fishingrod.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:chromium_fishing_rod" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + " x", + " xy", + "x y" + ], + "key": { + "x": { + "tag": "forge:rods/chromium" + }, + "y": { + "item": "minecraft:string" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/chromium_gear.json b/src/generated/resources/data/modernmetals/recipes/chromium_gear.json new file mode 100644 index 00000000..1a193d05 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/chromium_gear.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:chromium_gear" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + " x ", + "xrx", + " x " + ], + "key": { + "x": { + "tag": "forge:ingots/chromium" + }, + "r": { + "tag": "forge:rods/chromium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/chromium_helmet.json b/src/generated/resources/data/modernmetals/recipes/chromium_helmet.json new file mode 100644 index 00000000..7582e617 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/chromium_helmet.json @@ -0,0 +1,18 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:chromium_helmet" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "x x" + ], + "key": { + "x": { + "tag": "forge:ingots/chromium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/chromium_hoe.json b/src/generated/resources/data/modernmetals/recipes/chromium_hoe.json new file mode 100644 index 00000000..150763e7 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/chromium_hoe.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:chromium_hoe" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + " s", + " s" + ], + "key": { + "x": { + "tag": "forge:ingots/chromium" + }, + "s": { + "item": "minecraft:stick" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/chromium_horsearmor.json b/src/generated/resources/data/modernmetals/recipes/chromium_horsearmor.json new file mode 100644 index 00000000..020aa1c1 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/chromium_horsearmor.json @@ -0,0 +1,69 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:chromium_horse_armor" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + " x", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "forge:ingots/chromium" + }, + "y": [ + { + "item": "minecraft:white_wool" + }, + { + "item": "minecraft:orange_wool" + }, + { + "item": "minecraft:magenta_wool" + }, + { + "item": "minecraft:light_blue_wool" + }, + { + "item": "minecraft:yellow_wool" + }, + { + "item": "minecraft:lime_wool" + }, + { + "item": "minecraft:pink_wool" + }, + { + "item": "minecraft:gray_wool" + }, + { + "item": "minecraft:light_gray_wool" + }, + { + "item": "minecraft:cyan_wool" + }, + { + "item": "minecraft:purple_wool" + }, + { + "item": "minecraft:blue_wool" + }, + { + "item": "minecraft:brown_wool" + }, + { + "item": "minecraft:green_wool" + }, + { + "item": "minecraft:red_wool" + }, + { + "item": "minecraft:black_wool" + } + ] + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/chromium_ingot.json b/src/generated/resources/data/modernmetals/recipes/chromium_ingot.json new file mode 100644 index 00000000..3865f8eb --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/chromium_ingot.json @@ -0,0 +1,19 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:chromium_ingot" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "forge:nuggets/chromium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/chromium_leggings.json b/src/generated/resources/data/modernmetals/recipes/chromium_leggings.json new file mode 100644 index 00000000..a6e094a5 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/chromium_leggings.json @@ -0,0 +1,19 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:chromium_leggings" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "x x", + "x x" + ], + "key": { + "x": { + "tag": "forge:ingots/chromium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/chromium_lever.json b/src/generated/resources/data/modernmetals/recipes/chromium_lever.json new file mode 100644 index 00000000..fe59f8ef --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/chromium_lever.json @@ -0,0 +1,21 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:chromium_lever" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "y" + ], + "key": { + "x": { + "tag": "forge:rods/chromium" + }, + "y": { + "tag": "forge:ingots/chromium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/chromium_nugget.json b/src/generated/resources/data/modernmetals/recipes/chromium_nugget.json new file mode 100644 index 00000000..07282569 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/chromium_nugget.json @@ -0,0 +1,15 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:chromium_nugget", + "count": 9 + }, + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "forge:ingots/chromium" + } + ] + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/chromium_pickaxe.json b/src/generated/resources/data/modernmetals/recipes/chromium_pickaxe.json new file mode 100644 index 00000000..dadf803a --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/chromium_pickaxe.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:chromium_pickaxe" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + " s ", + " s " + ], + "key": { + "x": { + "tag": "forge:ingots/chromium" + }, + "s": { + "item": "minecraft:stick" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/chromium_plate.json b/src/generated/resources/data/modernmetals/recipes/chromium_plate.json new file mode 100644 index 00000000..8c2192b4 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/chromium_plate.json @@ -0,0 +1,17 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:chromium_plate" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "tag": "forge:ingots/chromium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/chromium_powder.json b/src/generated/resources/data/modernmetals/recipes/chromium_powder.json new file mode 100644 index 00000000..7942b60f --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/chromium_powder.json @@ -0,0 +1,19 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:chromium_powder" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "forge:tiny_dusts/chromium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/chromium_pressureplate.json b/src/generated/resources/data/modernmetals/recipes/chromium_pressureplate.json new file mode 100644 index 00000000..fe135e5b --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/chromium_pressureplate.json @@ -0,0 +1,17 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:chromium_pressure_plate" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx" + ], + "key": { + "x": { + "tag": "forge:ingots/chromium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/chromium_rod.json b/src/generated/resources/data/modernmetals/recipes/chromium_rod.json new file mode 100644 index 00000000..95d40892 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/chromium_rod.json @@ -0,0 +1,18 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:chromium_rod" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + " x ", + " x " + ], + "key": { + "x": { + "tag": "forge:ingots/chromium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/chromium_scythe.json b/src/generated/resources/data/modernmetals/recipes/chromium_scythe.json new file mode 100644 index 00000000..a297f55d --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/chromium_scythe.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:chromium_scythe" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "ii ", + " i", + " s " + ], + "key": { + "i": { + "tag": "forge:ingots/chromium" + }, + "s": { + "item": "minecraft:stick" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/chromium_shears.json b/src/generated/resources/data/modernmetals/recipes/chromium_shears.json new file mode 100644 index 00000000..a9dd028f --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/chromium_shears.json @@ -0,0 +1,18 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:chromium_shears" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + " x", + "x " + ], + "key": { + "x": { + "tag": "forge:ingots/chromium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/chromium_shield.json b/src/generated/resources/data/modernmetals/recipes/chromium_shield.json new file mode 100644 index 00000000..c1b71bb8 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/chromium_shield.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:chromium_shield" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xyx", + "xxx", + " x " + ], + "key": { + "x": { + "tag": "forge:ingots/chromium" + }, + "y": { + "tag": "minecraft:planks" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/chromium_shovel.json b/src/generated/resources/data/modernmetals/recipes/chromium_shovel.json new file mode 100644 index 00000000..a86d53a3 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/chromium_shovel.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:chromium_shovel" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "s", + "s" + ], + "key": { + "x": { + "tag": "forge:ingots/chromium" + }, + "s": { + "item": "minecraft:stick" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/chromium_slab.json b/src/generated/resources/data/modernmetals/recipes/chromium_slab.json new file mode 100644 index 00000000..6f18c832 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/chromium_slab.json @@ -0,0 +1,18 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:chromium_slab", + "count": 6 + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "tag": "forge:storage_blocks/chromium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/chromium_smallpowder.json b/src/generated/resources/data/modernmetals/recipes/chromium_smallpowder.json new file mode 100644 index 00000000..72716441 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/chromium_smallpowder.json @@ -0,0 +1,15 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:chromium_smallpowder", + "count": 9 + }, + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "forge:dusts/chromium" + } + ] + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/chromium_stairs.json b/src/generated/resources/data/modernmetals/recipes/chromium_stairs.json new file mode 100644 index 00000000..75adcf16 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/chromium_stairs.json @@ -0,0 +1,20 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:chromium_stairs", + "count": 4 + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "forge:storage_blocks/chromium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/chromium_sword.json b/src/generated/resources/data/modernmetals/recipes/chromium_sword.json new file mode 100644 index 00000000..494fba28 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/chromium_sword.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:chromium_sword" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "x", + "s" + ], + "key": { + "x": { + "tag": "forge:ingots/chromium" + }, + "s": { + "item": "minecraft:stick" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/chromium_trapdoor.json b/src/generated/resources/data/modernmetals/recipes/chromium_trapdoor.json new file mode 100644 index 00000000..24939b98 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/chromium_trapdoor.json @@ -0,0 +1,18 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:chromium_trapdoor" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "tag": "forge:ingots/chromium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/chromium_wall.json b/src/generated/resources/data/modernmetals/recipes/chromium_wall.json new file mode 100644 index 00000000..f2cab1ce --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/chromium_wall.json @@ -0,0 +1,19 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:chromium_wall", + "count": 6 + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "forge:storage_blocks/chromium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/crushing/aluminum_ingot.json b/src/generated/resources/data/modernmetals/recipes/crushing/aluminum_ingot.json new file mode 100644 index 00000000..08e34307 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/crushing/aluminum_ingot.json @@ -0,0 +1,10 @@ +{ + "type": "modernmetals:crushing", + "ingredient": { + "item": "modernmetals:aluminum_ingot" + }, + "result": { + "item": "modernmetals:aluminum_powder", + "count": 1 + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/crushing/aluminum_nugget.json b/src/generated/resources/data/modernmetals/recipes/crushing/aluminum_nugget.json new file mode 100644 index 00000000..f77846c1 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/crushing/aluminum_nugget.json @@ -0,0 +1,10 @@ +{ + "type": "modernmetals:crushing", + "ingredient": { + "item": "modernmetals:aluminum_nugget" + }, + "result": { + "item": "modernmetals:aluminum_smallpowder", + "count": 1 + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/crushing/aluminum_ore.json b/src/generated/resources/data/modernmetals/recipes/crushing/aluminum_ore.json new file mode 100644 index 00000000..7f9f49fa --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/crushing/aluminum_ore.json @@ -0,0 +1,10 @@ +{ + "type": "modernmetals:crushing", + "ingredient": { + "item": "modernmetals:aluminum_ore" + }, + "result": { + "item": "modernmetals:aluminum_powder", + "count": 2 + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/crushing/aluminumbrass_ingot.json b/src/generated/resources/data/modernmetals/recipes/crushing/aluminumbrass_ingot.json new file mode 100644 index 00000000..340dbf8a --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/crushing/aluminumbrass_ingot.json @@ -0,0 +1,10 @@ +{ + "type": "modernmetals:crushing", + "ingredient": { + "item": "modernmetals:aluminumbrass_ingot" + }, + "result": { + "item": "modernmetals:aluminumbrass_powder", + "count": 1 + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/crushing/aluminumbrass_nugget.json b/src/generated/resources/data/modernmetals/recipes/crushing/aluminumbrass_nugget.json new file mode 100644 index 00000000..3b65c31e --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/crushing/aluminumbrass_nugget.json @@ -0,0 +1,10 @@ +{ + "type": "modernmetals:crushing", + "ingredient": { + "item": "modernmetals:aluminumbrass_nugget" + }, + "result": { + "item": "modernmetals:aluminumbrass_smallpowder", + "count": 1 + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/crushing/beryllium_ingot.json b/src/generated/resources/data/modernmetals/recipes/crushing/beryllium_ingot.json new file mode 100644 index 00000000..3e926228 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/crushing/beryllium_ingot.json @@ -0,0 +1,10 @@ +{ + "type": "modernmetals:crushing", + "ingredient": { + "item": "modernmetals:beryllium_ingot" + }, + "result": { + "item": "modernmetals:beryllium_powder", + "count": 1 + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/crushing/beryllium_nugget.json b/src/generated/resources/data/modernmetals/recipes/crushing/beryllium_nugget.json new file mode 100644 index 00000000..481916f2 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/crushing/beryllium_nugget.json @@ -0,0 +1,10 @@ +{ + "type": "modernmetals:crushing", + "ingredient": { + "item": "modernmetals:beryllium_nugget" + }, + "result": { + "item": "modernmetals:beryllium_smallpowder", + "count": 1 + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/crushing/beryllium_ore.json b/src/generated/resources/data/modernmetals/recipes/crushing/beryllium_ore.json new file mode 100644 index 00000000..18ebfdbd --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/crushing/beryllium_ore.json @@ -0,0 +1,10 @@ +{ + "type": "modernmetals:crushing", + "ingredient": { + "item": "modernmetals:beryllium_ore" + }, + "result": { + "item": "modernmetals:beryllium_powder", + "count": 2 + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/crushing/boron_ingot.json b/src/generated/resources/data/modernmetals/recipes/crushing/boron_ingot.json new file mode 100644 index 00000000..7fcd6bdc --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/crushing/boron_ingot.json @@ -0,0 +1,10 @@ +{ + "type": "modernmetals:crushing", + "ingredient": { + "item": "modernmetals:boron_ingot" + }, + "result": { + "item": "modernmetals:boron_powder", + "count": 1 + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/crushing/boron_nugget.json b/src/generated/resources/data/modernmetals/recipes/crushing/boron_nugget.json new file mode 100644 index 00000000..fae1dc59 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/crushing/boron_nugget.json @@ -0,0 +1,10 @@ +{ + "type": "modernmetals:crushing", + "ingredient": { + "item": "modernmetals:boron_nugget" + }, + "result": { + "item": "modernmetals:boron_smallpowder", + "count": 1 + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/crushing/boron_ore.json b/src/generated/resources/data/modernmetals/recipes/crushing/boron_ore.json new file mode 100644 index 00000000..0cafccb7 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/crushing/boron_ore.json @@ -0,0 +1,10 @@ +{ + "type": "modernmetals:crushing", + "ingredient": { + "item": "modernmetals:boron_ore" + }, + "result": { + "item": "modernmetals:boron_powder", + "count": 2 + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/crushing/cadmium_ingot.json b/src/generated/resources/data/modernmetals/recipes/crushing/cadmium_ingot.json new file mode 100644 index 00000000..e7182c57 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/crushing/cadmium_ingot.json @@ -0,0 +1,10 @@ +{ + "type": "modernmetals:crushing", + "ingredient": { + "item": "modernmetals:cadmium_ingot" + }, + "result": { + "item": "modernmetals:cadmium_powder", + "count": 1 + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/crushing/cadmium_nugget.json b/src/generated/resources/data/modernmetals/recipes/crushing/cadmium_nugget.json new file mode 100644 index 00000000..fd1f81c4 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/crushing/cadmium_nugget.json @@ -0,0 +1,10 @@ +{ + "type": "modernmetals:crushing", + "ingredient": { + "item": "modernmetals:cadmium_nugget" + }, + "result": { + "item": "modernmetals:cadmium_smallpowder", + "count": 1 + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/crushing/cadmium_ore.json b/src/generated/resources/data/modernmetals/recipes/crushing/cadmium_ore.json new file mode 100644 index 00000000..d18d0665 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/crushing/cadmium_ore.json @@ -0,0 +1,10 @@ +{ + "type": "modernmetals:crushing", + "ingredient": { + "item": "modernmetals:cadmium_ore" + }, + "result": { + "item": "modernmetals:cadmium_powder", + "count": 2 + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/crushing/chromium_ingot.json b/src/generated/resources/data/modernmetals/recipes/crushing/chromium_ingot.json new file mode 100644 index 00000000..09a2a25c --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/crushing/chromium_ingot.json @@ -0,0 +1,10 @@ +{ + "type": "modernmetals:crushing", + "ingredient": { + "item": "modernmetals:chromium_ingot" + }, + "result": { + "item": "modernmetals:chromium_powder", + "count": 1 + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/crushing/chromium_nugget.json b/src/generated/resources/data/modernmetals/recipes/crushing/chromium_nugget.json new file mode 100644 index 00000000..52bc81e8 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/crushing/chromium_nugget.json @@ -0,0 +1,10 @@ +{ + "type": "modernmetals:crushing", + "ingredient": { + "item": "modernmetals:chromium_nugget" + }, + "result": { + "item": "modernmetals:chromium_smallpowder", + "count": 1 + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/crushing/chromium_ore.json b/src/generated/resources/data/modernmetals/recipes/crushing/chromium_ore.json new file mode 100644 index 00000000..0518ce1e --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/crushing/chromium_ore.json @@ -0,0 +1,10 @@ +{ + "type": "modernmetals:crushing", + "ingredient": { + "item": "modernmetals:chromium_ore" + }, + "result": { + "item": "modernmetals:chromium_powder", + "count": 2 + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/crushing/galvanizedsteel_ingot.json b/src/generated/resources/data/modernmetals/recipes/crushing/galvanizedsteel_ingot.json new file mode 100644 index 00000000..dfcb97bb --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/crushing/galvanizedsteel_ingot.json @@ -0,0 +1,10 @@ +{ + "type": "modernmetals:crushing", + "ingredient": { + "item": "modernmetals:galvanizedsteel_ingot" + }, + "result": { + "item": "modernmetals:galvanizedsteel_powder", + "count": 1 + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/crushing/galvanizedsteel_nugget.json b/src/generated/resources/data/modernmetals/recipes/crushing/galvanizedsteel_nugget.json new file mode 100644 index 00000000..37cd1cb5 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/crushing/galvanizedsteel_nugget.json @@ -0,0 +1,10 @@ +{ + "type": "modernmetals:crushing", + "ingredient": { + "item": "modernmetals:galvanizedsteel_nugget" + }, + "result": { + "item": "modernmetals:galvanizedsteel_smallpowder", + "count": 1 + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/crushing/iridium_ingot.json b/src/generated/resources/data/modernmetals/recipes/crushing/iridium_ingot.json new file mode 100644 index 00000000..4b6ce53c --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/crushing/iridium_ingot.json @@ -0,0 +1,10 @@ +{ + "type": "modernmetals:crushing", + "ingredient": { + "item": "modernmetals:iridium_ingot" + }, + "result": { + "item": "modernmetals:iridium_powder", + "count": 1 + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/crushing/iridium_nugget.json b/src/generated/resources/data/modernmetals/recipes/crushing/iridium_nugget.json new file mode 100644 index 00000000..1786f5e5 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/crushing/iridium_nugget.json @@ -0,0 +1,10 @@ +{ + "type": "modernmetals:crushing", + "ingredient": { + "item": "modernmetals:iridium_nugget" + }, + "result": { + "item": "modernmetals:iridium_smallpowder", + "count": 1 + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/crushing/iridium_ore.json b/src/generated/resources/data/modernmetals/recipes/crushing/iridium_ore.json new file mode 100644 index 00000000..e777b2ef --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/crushing/iridium_ore.json @@ -0,0 +1,10 @@ +{ + "type": "modernmetals:crushing", + "ingredient": { + "item": "modernmetals:iridium_ore" + }, + "result": { + "item": "modernmetals:iridium_powder", + "count": 2 + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/crushing/magnesium_ingot.json b/src/generated/resources/data/modernmetals/recipes/crushing/magnesium_ingot.json new file mode 100644 index 00000000..0f01953c --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/crushing/magnesium_ingot.json @@ -0,0 +1,10 @@ +{ + "type": "modernmetals:crushing", + "ingredient": { + "item": "modernmetals:magnesium_ingot" + }, + "result": { + "item": "modernmetals:magnesium_powder", + "count": 1 + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/crushing/magnesium_nugget.json b/src/generated/resources/data/modernmetals/recipes/crushing/magnesium_nugget.json new file mode 100644 index 00000000..59ff85f0 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/crushing/magnesium_nugget.json @@ -0,0 +1,10 @@ +{ + "type": "modernmetals:crushing", + "ingredient": { + "item": "modernmetals:magnesium_nugget" + }, + "result": { + "item": "modernmetals:magnesium_smallpowder", + "count": 1 + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/crushing/magnesium_ore.json b/src/generated/resources/data/modernmetals/recipes/crushing/magnesium_ore.json new file mode 100644 index 00000000..e328d407 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/crushing/magnesium_ore.json @@ -0,0 +1,10 @@ +{ + "type": "modernmetals:crushing", + "ingredient": { + "item": "modernmetals:magnesium_ore" + }, + "result": { + "item": "modernmetals:magnesium_powder", + "count": 2 + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/crushing/manganese_ingot.json b/src/generated/resources/data/modernmetals/recipes/crushing/manganese_ingot.json new file mode 100644 index 00000000..ab67ea45 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/crushing/manganese_ingot.json @@ -0,0 +1,10 @@ +{ + "type": "modernmetals:crushing", + "ingredient": { + "item": "modernmetals:manganese_ingot" + }, + "result": { + "item": "modernmetals:manganese_powder", + "count": 1 + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/crushing/manganese_nugget.json b/src/generated/resources/data/modernmetals/recipes/crushing/manganese_nugget.json new file mode 100644 index 00000000..0ad81138 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/crushing/manganese_nugget.json @@ -0,0 +1,10 @@ +{ + "type": "modernmetals:crushing", + "ingredient": { + "item": "modernmetals:manganese_nugget" + }, + "result": { + "item": "modernmetals:manganese_smallpowder", + "count": 1 + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/crushing/manganese_ore.json b/src/generated/resources/data/modernmetals/recipes/crushing/manganese_ore.json new file mode 100644 index 00000000..e1ba57c4 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/crushing/manganese_ore.json @@ -0,0 +1,10 @@ +{ + "type": "modernmetals:crushing", + "ingredient": { + "item": "modernmetals:manganese_ore" + }, + "result": { + "item": "modernmetals:manganese_powder", + "count": 2 + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/crushing/nichrome_ingot.json b/src/generated/resources/data/modernmetals/recipes/crushing/nichrome_ingot.json new file mode 100644 index 00000000..cdaaea05 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/crushing/nichrome_ingot.json @@ -0,0 +1,10 @@ +{ + "type": "modernmetals:crushing", + "ingredient": { + "item": "modernmetals:nichrome_ingot" + }, + "result": { + "item": "modernmetals:nichrome_powder", + "count": 1 + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/crushing/nichrome_nugget.json b/src/generated/resources/data/modernmetals/recipes/crushing/nichrome_nugget.json new file mode 100644 index 00000000..87c1e7b7 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/crushing/nichrome_nugget.json @@ -0,0 +1,10 @@ +{ + "type": "modernmetals:crushing", + "ingredient": { + "item": "modernmetals:nichrome_nugget" + }, + "result": { + "item": "modernmetals:nichrome_smallpowder", + "count": 1 + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/crushing/osmium_ingot.json b/src/generated/resources/data/modernmetals/recipes/crushing/osmium_ingot.json new file mode 100644 index 00000000..63076ce5 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/crushing/osmium_ingot.json @@ -0,0 +1,10 @@ +{ + "type": "modernmetals:crushing", + "ingredient": { + "item": "modernmetals:osmium_ingot" + }, + "result": { + "item": "modernmetals:osmium_powder", + "count": 1 + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/crushing/osmium_nugget.json b/src/generated/resources/data/modernmetals/recipes/crushing/osmium_nugget.json new file mode 100644 index 00000000..8ca67899 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/crushing/osmium_nugget.json @@ -0,0 +1,10 @@ +{ + "type": "modernmetals:crushing", + "ingredient": { + "item": "modernmetals:osmium_nugget" + }, + "result": { + "item": "modernmetals:osmium_smallpowder", + "count": 1 + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/crushing/osmium_ore.json b/src/generated/resources/data/modernmetals/recipes/crushing/osmium_ore.json new file mode 100644 index 00000000..2492b34e --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/crushing/osmium_ore.json @@ -0,0 +1,10 @@ +{ + "type": "modernmetals:crushing", + "ingredient": { + "item": "modernmetals:osmium_ore" + }, + "result": { + "item": "modernmetals:osmium_powder", + "count": 2 + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/crushing/plutonium_ingot.json b/src/generated/resources/data/modernmetals/recipes/crushing/plutonium_ingot.json new file mode 100644 index 00000000..b63d8ccf --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/crushing/plutonium_ingot.json @@ -0,0 +1,10 @@ +{ + "type": "modernmetals:crushing", + "ingredient": { + "item": "modernmetals:plutonium_ingot" + }, + "result": { + "item": "modernmetals:plutonium_powder", + "count": 1 + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/crushing/plutonium_nugget.json b/src/generated/resources/data/modernmetals/recipes/crushing/plutonium_nugget.json new file mode 100644 index 00000000..495eb0e3 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/crushing/plutonium_nugget.json @@ -0,0 +1,10 @@ +{ + "type": "modernmetals:crushing", + "ingredient": { + "item": "modernmetals:plutonium_nugget" + }, + "result": { + "item": "modernmetals:plutonium_smallpowder", + "count": 1 + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/crushing/plutonium_ore.json b/src/generated/resources/data/modernmetals/recipes/crushing/plutonium_ore.json new file mode 100644 index 00000000..f9dd77c8 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/crushing/plutonium_ore.json @@ -0,0 +1,10 @@ +{ + "type": "modernmetals:crushing", + "ingredient": { + "item": "modernmetals:plutonium_ore" + }, + "result": { + "item": "modernmetals:plutonium_powder", + "count": 2 + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/crushing/rutile_ingot.json b/src/generated/resources/data/modernmetals/recipes/crushing/rutile_ingot.json new file mode 100644 index 00000000..48cf5762 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/crushing/rutile_ingot.json @@ -0,0 +1,10 @@ +{ + "type": "modernmetals:crushing", + "ingredient": { + "item": "modernmetals:rutile_ingot" + }, + "result": { + "item": "modernmetals:rutile_powder", + "count": 1 + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/crushing/rutile_nugget.json b/src/generated/resources/data/modernmetals/recipes/crushing/rutile_nugget.json new file mode 100644 index 00000000..9652184f --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/crushing/rutile_nugget.json @@ -0,0 +1,10 @@ +{ + "type": "modernmetals:crushing", + "ingredient": { + "item": "modernmetals:rutile_nugget" + }, + "result": { + "item": "modernmetals:rutile_smallpowder", + "count": 1 + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/crushing/rutile_ore.json b/src/generated/resources/data/modernmetals/recipes/crushing/rutile_ore.json new file mode 100644 index 00000000..cf12203b --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/crushing/rutile_ore.json @@ -0,0 +1,10 @@ +{ + "type": "modernmetals:crushing", + "ingredient": { + "item": "modernmetals:rutile_ore" + }, + "result": { + "item": "modernmetals:rutile_powder", + "count": 2 + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/crushing/stainlesssteel_ingot.json b/src/generated/resources/data/modernmetals/recipes/crushing/stainlesssteel_ingot.json new file mode 100644 index 00000000..92e50e5a --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/crushing/stainlesssteel_ingot.json @@ -0,0 +1,10 @@ +{ + "type": "modernmetals:crushing", + "ingredient": { + "item": "modernmetals:stainlesssteel_ingot" + }, + "result": { + "item": "modernmetals:stainlesssteel_powder", + "count": 1 + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/crushing/stainlesssteel_nugget.json b/src/generated/resources/data/modernmetals/recipes/crushing/stainlesssteel_nugget.json new file mode 100644 index 00000000..c9273d11 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/crushing/stainlesssteel_nugget.json @@ -0,0 +1,10 @@ +{ + "type": "modernmetals:crushing", + "ingredient": { + "item": "modernmetals:stainlesssteel_nugget" + }, + "result": { + "item": "modernmetals:stainlesssteel_smallpowder", + "count": 1 + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/crushing/tantalum_ingot.json b/src/generated/resources/data/modernmetals/recipes/crushing/tantalum_ingot.json new file mode 100644 index 00000000..5f3a2b2c --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/crushing/tantalum_ingot.json @@ -0,0 +1,10 @@ +{ + "type": "modernmetals:crushing", + "ingredient": { + "item": "modernmetals:tantalum_ingot" + }, + "result": { + "item": "modernmetals:tantalum_powder", + "count": 1 + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/crushing/tantalum_nugget.json b/src/generated/resources/data/modernmetals/recipes/crushing/tantalum_nugget.json new file mode 100644 index 00000000..a091ed0b --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/crushing/tantalum_nugget.json @@ -0,0 +1,10 @@ +{ + "type": "modernmetals:crushing", + "ingredient": { + "item": "modernmetals:tantalum_nugget" + }, + "result": { + "item": "modernmetals:tantalum_smallpowder", + "count": 1 + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/crushing/tantalum_ore.json b/src/generated/resources/data/modernmetals/recipes/crushing/tantalum_ore.json new file mode 100644 index 00000000..66ca10e0 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/crushing/tantalum_ore.json @@ -0,0 +1,10 @@ +{ + "type": "modernmetals:crushing", + "ingredient": { + "item": "modernmetals:tantalum_ore" + }, + "result": { + "item": "modernmetals:tantalum_powder", + "count": 2 + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/crushing/thorium_ingot.json b/src/generated/resources/data/modernmetals/recipes/crushing/thorium_ingot.json new file mode 100644 index 00000000..2a95e574 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/crushing/thorium_ingot.json @@ -0,0 +1,10 @@ +{ + "type": "modernmetals:crushing", + "ingredient": { + "item": "modernmetals:thorium_ingot" + }, + "result": { + "item": "modernmetals:thorium_powder", + "count": 1 + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/crushing/thorium_nugget.json b/src/generated/resources/data/modernmetals/recipes/crushing/thorium_nugget.json new file mode 100644 index 00000000..72930dd1 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/crushing/thorium_nugget.json @@ -0,0 +1,10 @@ +{ + "type": "modernmetals:crushing", + "ingredient": { + "item": "modernmetals:thorium_nugget" + }, + "result": { + "item": "modernmetals:thorium_smallpowder", + "count": 1 + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/crushing/thorium_ore.json b/src/generated/resources/data/modernmetals/recipes/crushing/thorium_ore.json new file mode 100644 index 00000000..07d8e29c --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/crushing/thorium_ore.json @@ -0,0 +1,10 @@ +{ + "type": "modernmetals:crushing", + "ingredient": { + "item": "modernmetals:thorium_ore" + }, + "result": { + "item": "modernmetals:thorium_powder", + "count": 2 + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/crushing/titanium_ingot.json b/src/generated/resources/data/modernmetals/recipes/crushing/titanium_ingot.json new file mode 100644 index 00000000..d14a1510 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/crushing/titanium_ingot.json @@ -0,0 +1,10 @@ +{ + "type": "modernmetals:crushing", + "ingredient": { + "item": "modernmetals:titanium_ingot" + }, + "result": { + "item": "modernmetals:titanium_powder", + "count": 1 + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/crushing/titanium_nugget.json b/src/generated/resources/data/modernmetals/recipes/crushing/titanium_nugget.json new file mode 100644 index 00000000..253c48cc --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/crushing/titanium_nugget.json @@ -0,0 +1,10 @@ +{ + "type": "modernmetals:crushing", + "ingredient": { + "item": "modernmetals:titanium_nugget" + }, + "result": { + "item": "modernmetals:titanium_smallpowder", + "count": 1 + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/crushing/titanium_ore.json b/src/generated/resources/data/modernmetals/recipes/crushing/titanium_ore.json new file mode 100644 index 00000000..6f8685fe --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/crushing/titanium_ore.json @@ -0,0 +1,10 @@ +{ + "type": "modernmetals:crushing", + "ingredient": { + "item": "modernmetals:titanium_ore" + }, + "result": { + "item": "modernmetals:titanium_powder", + "count": 2 + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/crushing/tungsten_ingot.json b/src/generated/resources/data/modernmetals/recipes/crushing/tungsten_ingot.json new file mode 100644 index 00000000..2c7ed4f6 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/crushing/tungsten_ingot.json @@ -0,0 +1,10 @@ +{ + "type": "modernmetals:crushing", + "ingredient": { + "item": "modernmetals:tungsten_ingot" + }, + "result": { + "item": "modernmetals:tungsten_powder", + "count": 1 + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/crushing/tungsten_nugget.json b/src/generated/resources/data/modernmetals/recipes/crushing/tungsten_nugget.json new file mode 100644 index 00000000..d43e2be9 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/crushing/tungsten_nugget.json @@ -0,0 +1,10 @@ +{ + "type": "modernmetals:crushing", + "ingredient": { + "item": "modernmetals:tungsten_nugget" + }, + "result": { + "item": "modernmetals:tungsten_smallpowder", + "count": 1 + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/crushing/tungsten_ore.json b/src/generated/resources/data/modernmetals/recipes/crushing/tungsten_ore.json new file mode 100644 index 00000000..29d9d9b5 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/crushing/tungsten_ore.json @@ -0,0 +1,10 @@ +{ + "type": "modernmetals:crushing", + "ingredient": { + "item": "modernmetals:tungsten_ore" + }, + "result": { + "item": "modernmetals:tungsten_powder", + "count": 2 + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/crushing/uranium_ingot.json b/src/generated/resources/data/modernmetals/recipes/crushing/uranium_ingot.json new file mode 100644 index 00000000..f077d5ea --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/crushing/uranium_ingot.json @@ -0,0 +1,10 @@ +{ + "type": "modernmetals:crushing", + "ingredient": { + "item": "modernmetals:uranium_ingot" + }, + "result": { + "item": "modernmetals:uranium_powder", + "count": 1 + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/crushing/uranium_nugget.json b/src/generated/resources/data/modernmetals/recipes/crushing/uranium_nugget.json new file mode 100644 index 00000000..a768820c --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/crushing/uranium_nugget.json @@ -0,0 +1,10 @@ +{ + "type": "modernmetals:crushing", + "ingredient": { + "item": "modernmetals:uranium_nugget" + }, + "result": { + "item": "modernmetals:uranium_smallpowder", + "count": 1 + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/crushing/uranium_ore.json b/src/generated/resources/data/modernmetals/recipes/crushing/uranium_ore.json new file mode 100644 index 00000000..e080672f --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/crushing/uranium_ore.json @@ -0,0 +1,10 @@ +{ + "type": "modernmetals:crushing", + "ingredient": { + "item": "modernmetals:uranium_ore" + }, + "result": { + "item": "modernmetals:uranium_powder", + "count": 2 + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/crushing/zirconium_ingot.json b/src/generated/resources/data/modernmetals/recipes/crushing/zirconium_ingot.json new file mode 100644 index 00000000..bcde475f --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/crushing/zirconium_ingot.json @@ -0,0 +1,10 @@ +{ + "type": "modernmetals:crushing", + "ingredient": { + "item": "modernmetals:zirconium_ingot" + }, + "result": { + "item": "modernmetals:zirconium_powder", + "count": 1 + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/crushing/zirconium_nugget.json b/src/generated/resources/data/modernmetals/recipes/crushing/zirconium_nugget.json new file mode 100644 index 00000000..ff030946 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/crushing/zirconium_nugget.json @@ -0,0 +1,10 @@ +{ + "type": "modernmetals:crushing", + "ingredient": { + "item": "modernmetals:zirconium_nugget" + }, + "result": { + "item": "modernmetals:zirconium_smallpowder", + "count": 1 + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/crushing/zirconium_ore.json b/src/generated/resources/data/modernmetals/recipes/crushing/zirconium_ore.json new file mode 100644 index 00000000..eace7840 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/crushing/zirconium_ore.json @@ -0,0 +1,10 @@ +{ + "type": "modernmetals:crushing", + "ingredient": { + "item": "modernmetals:zirconium_ore" + }, + "result": { + "item": "modernmetals:zirconium_powder", + "count": 2 + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/galvanizedsteel_arrow.json b/src/generated/resources/data/modernmetals/recipes/galvanizedsteel_arrow.json new file mode 100644 index 00000000..cd55cde2 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/galvanizedsteel_arrow.json @@ -0,0 +1,26 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:galvanizedsteel_arrow", + "count": 4 + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "y", + "z" + ], + "key": { + "x": { + "tag": "forge:nuggets/galvanizedsteel" + }, + "y": { + "tag": "forge:rods/galvanizedsteel" + }, + "z": { + "item": "minecraft:feather" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/galvanizedsteel_axe.json b/src/generated/resources/data/modernmetals/recipes/galvanizedsteel_axe.json new file mode 100644 index 00000000..34fb3ad5 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/galvanizedsteel_axe.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:galvanizedsteel_axe" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xs", + " s" + ], + "key": { + "x": { + "tag": "forge:ingots/galvanizedsteel" + }, + "s": { + "item": "minecraft:stick" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/galvanizedsteel_bars_1.json b/src/generated/resources/data/modernmetals/recipes/galvanizedsteel_bars_1.json new file mode 100644 index 00000000..7eedfb84 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/galvanizedsteel_bars_1.json @@ -0,0 +1,19 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:galvanizedsteel_bars", + "count": 16 + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "forge:ingots/galvanizedsteel" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/galvanizedsteel_bars_2.json b/src/generated/resources/data/modernmetals/recipes/galvanizedsteel_bars_2.json new file mode 100644 index 00000000..171a7b64 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/galvanizedsteel_bars_2.json @@ -0,0 +1,18 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:galvanizedsteel_bars", + "count": 4 + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "tag": "forge:rods/galvanizedsteel" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/galvanizedsteel_blend_base.json b/src/generated/resources/data/modernmetals/recipes/galvanizedsteel_blend_base.json new file mode 100644 index 00000000..b90b1c4b --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/galvanizedsteel_blend_base.json @@ -0,0 +1,32 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:galvanizedsteel_blend", + "count": 2 + }, + "type": "minecraft:crafting_shapeless", + "ingredients": [ + [ + { "tag": "forge:dusts/steel" }, + { "tag": "forge:blends/steel" } + ], + { + "tag": "forge:dusts/zinc" + } + ] + }, + "conditions": [ + { + "type": "forge:or", + "values": [ + { "type": "modernmetals:non_empty_tag", "tag": "forge:dusts/steel" }, + { "type": "modernmetals:non_empty_tag", "tag": "forge:blends/steel" } + ] + }, + { + "type": "modernmetals:non_empty_tag", + "tag": "forge:dusts/zinc" + } + ] +} diff --git a/src/generated/resources/data/modernmetals/recipes/galvanizedsteel_blend_smallblend.json b/src/generated/resources/data/modernmetals/recipes/galvanizedsteel_blend_smallblend.json new file mode 100644 index 00000000..26baf37c --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/galvanizedsteel_blend_smallblend.json @@ -0,0 +1,19 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:galvanizedsteel_blend" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "forge:small_blends/galvanizedsteel" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/galvanizedsteel_block.json b/src/generated/resources/data/modernmetals/recipes/galvanizedsteel_block.json new file mode 100644 index 00000000..e4f2f2f2 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/galvanizedsteel_block.json @@ -0,0 +1,19 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:galvanizedsteel_block" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "forge:ingots/galvanizedsteel" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/galvanizedsteel_block_ingot.json b/src/generated/resources/data/modernmetals/recipes/galvanizedsteel_block_ingot.json new file mode 100644 index 00000000..38521189 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/galvanizedsteel_block_ingot.json @@ -0,0 +1,15 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:galvanizedsteel_ingot", + "count": 9 + }, + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "forge:storage_blocks/galvanizedsteel" + } + ] + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/galvanizedsteel_bolt.json b/src/generated/resources/data/modernmetals/recipes/galvanizedsteel_bolt.json new file mode 100644 index 00000000..64a728bb --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/galvanizedsteel_bolt.json @@ -0,0 +1,23 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:galvanizedsteel_bolt", + "count": 4 + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "x", + "y" + ], + "key": { + "x": { + "tag": "forge:rods/galvanizedsteel" + }, + "y": { + "item": "minecraft:feather" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/galvanizedsteel_boots.json b/src/generated/resources/data/modernmetals/recipes/galvanizedsteel_boots.json new file mode 100644 index 00000000..a78fe4c6 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/galvanizedsteel_boots.json @@ -0,0 +1,18 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:galvanizedsteel_boots" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "x x", + "x x" + ], + "key": { + "x": { + "tag": "forge:ingots/galvanizedsteel" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/galvanizedsteel_bow.json b/src/generated/resources/data/modernmetals/recipes/galvanizedsteel_bow.json new file mode 100644 index 00000000..b368602b --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/galvanizedsteel_bow.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:galvanizedsteel_bow" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + " xs", + "x s", + " xs" + ], + "key": { + "x": { + "tag": "forge:rods/galvanizedsteel" + }, + "s": { + "item": "minecraft:string" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/galvanizedsteel_button.json b/src/generated/resources/data/modernmetals/recipes/galvanizedsteel_button.json new file mode 100644 index 00000000..fda087b6 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/galvanizedsteel_button.json @@ -0,0 +1,18 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:galvanizedsteel_button" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "x" + ], + "key": { + "x": { + "tag": "forge:nuggets/galvanizedsteel" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/galvanizedsteel_chestplate.json b/src/generated/resources/data/modernmetals/recipes/galvanizedsteel_chestplate.json new file mode 100644 index 00000000..e9019807 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/galvanizedsteel_chestplate.json @@ -0,0 +1,19 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:galvanizedsteel_chestplate" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "x x", + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "forge:ingots/galvanizedsteel" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/galvanizedsteel_crackhammer.json b/src/generated/resources/data/modernmetals/recipes/galvanizedsteel_crackhammer.json new file mode 100644 index 00000000..b195e16d --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/galvanizedsteel_crackhammer.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:galvanizedsteel_crackhammer" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "y", + "y" + ], + "key": { + "x": { + "tag": "forge:storage_blocks/galvanizedsteel" + }, + "y": { + "item": "minecraft:stick" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/galvanizedsteel_crossbow.json b/src/generated/resources/data/modernmetals/recipes/galvanizedsteel_crossbow.json new file mode 100644 index 00000000..c3a9e0ba --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/galvanizedsteel_crossbow.json @@ -0,0 +1,25 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:galvanizedsteel_crossbow" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "zxx", + " yx", + "x z" + ], + "key": { + "x": { + "tag": "forge:rods/galvanizedsteel" + }, + "y": { + "item": "minecraft:string" + }, + "z": { + "tag": "forge:gears/galvanizedsteel" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/galvanizedsteel_door.json b/src/generated/resources/data/modernmetals/recipes/galvanizedsteel_door.json new file mode 100644 index 00000000..015a3ba9 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/galvanizedsteel_door.json @@ -0,0 +1,20 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:galvanizedsteel_door", + "count": 3 + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx", + "xx" + ], + "key": { + "x": { + "tag": "forge:ingots/galvanizedsteel" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/galvanizedsteel_fishingrod.json b/src/generated/resources/data/modernmetals/recipes/galvanizedsteel_fishingrod.json new file mode 100644 index 00000000..f648c323 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/galvanizedsteel_fishingrod.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:galvanizedsteel_fishing_rod" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + " x", + " xy", + "x y" + ], + "key": { + "x": { + "tag": "forge:rods/galvanizedsteel" + }, + "y": { + "item": "minecraft:string" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/galvanizedsteel_gear.json b/src/generated/resources/data/modernmetals/recipes/galvanizedsteel_gear.json new file mode 100644 index 00000000..43ae86bf --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/galvanizedsteel_gear.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:galvanizedsteel_gear" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + " x ", + "xrx", + " x " + ], + "key": { + "x": { + "tag": "forge:ingots/galvanizedsteel" + }, + "r": { + "tag": "forge:rods/galvanizedsteel" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/galvanizedsteel_helmet.json b/src/generated/resources/data/modernmetals/recipes/galvanizedsteel_helmet.json new file mode 100644 index 00000000..e9ee3445 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/galvanizedsteel_helmet.json @@ -0,0 +1,18 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:galvanizedsteel_helmet" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "x x" + ], + "key": { + "x": { + "tag": "forge:ingots/galvanizedsteel" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/galvanizedsteel_hoe.json b/src/generated/resources/data/modernmetals/recipes/galvanizedsteel_hoe.json new file mode 100644 index 00000000..a7167afe --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/galvanizedsteel_hoe.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:galvanizedsteel_hoe" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + " s", + " s" + ], + "key": { + "x": { + "tag": "forge:ingots/galvanizedsteel" + }, + "s": { + "item": "minecraft:stick" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/galvanizedsteel_horsearmor.json b/src/generated/resources/data/modernmetals/recipes/galvanizedsteel_horsearmor.json new file mode 100644 index 00000000..854fc760 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/galvanizedsteel_horsearmor.json @@ -0,0 +1,69 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:galvanizedsteel_horse_armor" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + " x", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "forge:ingots/galvanizedsteel" + }, + "y": [ + { + "item": "minecraft:white_wool" + }, + { + "item": "minecraft:orange_wool" + }, + { + "item": "minecraft:magenta_wool" + }, + { + "item": "minecraft:light_blue_wool" + }, + { + "item": "minecraft:yellow_wool" + }, + { + "item": "minecraft:lime_wool" + }, + { + "item": "minecraft:pink_wool" + }, + { + "item": "minecraft:gray_wool" + }, + { + "item": "minecraft:light_gray_wool" + }, + { + "item": "minecraft:cyan_wool" + }, + { + "item": "minecraft:purple_wool" + }, + { + "item": "minecraft:blue_wool" + }, + { + "item": "minecraft:brown_wool" + }, + { + "item": "minecraft:green_wool" + }, + { + "item": "minecraft:red_wool" + }, + { + "item": "minecraft:black_wool" + } + ] + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/galvanizedsteel_ingot.json b/src/generated/resources/data/modernmetals/recipes/galvanizedsteel_ingot.json new file mode 100644 index 00000000..c6bbbc51 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/galvanizedsteel_ingot.json @@ -0,0 +1,19 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:galvanizedsteel_ingot" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "forge:nuggets/galvanizedsteel" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/galvanizedsteel_leggings.json b/src/generated/resources/data/modernmetals/recipes/galvanizedsteel_leggings.json new file mode 100644 index 00000000..60ac83c7 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/galvanizedsteel_leggings.json @@ -0,0 +1,19 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:galvanizedsteel_leggings" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "x x", + "x x" + ], + "key": { + "x": { + "tag": "forge:ingots/galvanizedsteel" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/galvanizedsteel_lever.json b/src/generated/resources/data/modernmetals/recipes/galvanizedsteel_lever.json new file mode 100644 index 00000000..fe30b6af --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/galvanizedsteel_lever.json @@ -0,0 +1,21 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:galvanizedsteel_lever" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "y" + ], + "key": { + "x": { + "tag": "forge:rods/galvanizedsteel" + }, + "y": { + "tag": "forge:ingots/galvanizedsteel" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/galvanizedsteel_nugget.json b/src/generated/resources/data/modernmetals/recipes/galvanizedsteel_nugget.json new file mode 100644 index 00000000..f8132e4c --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/galvanizedsteel_nugget.json @@ -0,0 +1,15 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:galvanizedsteel_nugget", + "count": 9 + }, + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "forge:ingots/galvanizedsteel" + } + ] + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/galvanizedsteel_pickaxe.json b/src/generated/resources/data/modernmetals/recipes/galvanizedsteel_pickaxe.json new file mode 100644 index 00000000..c5cb9b80 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/galvanizedsteel_pickaxe.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:galvanizedsteel_pickaxe" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + " s ", + " s " + ], + "key": { + "x": { + "tag": "forge:ingots/galvanizedsteel" + }, + "s": { + "item": "minecraft:stick" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/galvanizedsteel_plate.json b/src/generated/resources/data/modernmetals/recipes/galvanizedsteel_plate.json new file mode 100644 index 00000000..5a77b0a9 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/galvanizedsteel_plate.json @@ -0,0 +1,17 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:galvanizedsteel_plate" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "tag": "forge:ingots/galvanizedsteel" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/galvanizedsteel_powder.json b/src/generated/resources/data/modernmetals/recipes/galvanizedsteel_powder.json new file mode 100644 index 00000000..ab9518a0 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/galvanizedsteel_powder.json @@ -0,0 +1,19 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:galvanizedsteel_powder" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "forge:tiny_dusts/galvanizedsteel" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/galvanizedsteel_pressureplate.json b/src/generated/resources/data/modernmetals/recipes/galvanizedsteel_pressureplate.json new file mode 100644 index 00000000..682228f5 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/galvanizedsteel_pressureplate.json @@ -0,0 +1,17 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:galvanizedsteel_pressure_plate" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx" + ], + "key": { + "x": { + "tag": "forge:ingots/galvanizedsteel" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/galvanizedsteel_rod.json b/src/generated/resources/data/modernmetals/recipes/galvanizedsteel_rod.json new file mode 100644 index 00000000..334ea686 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/galvanizedsteel_rod.json @@ -0,0 +1,18 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:galvanizedsteel_rod" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + " x ", + " x " + ], + "key": { + "x": { + "tag": "forge:ingots/galvanizedsteel" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/galvanizedsteel_scythe.json b/src/generated/resources/data/modernmetals/recipes/galvanizedsteel_scythe.json new file mode 100644 index 00000000..a61f3873 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/galvanizedsteel_scythe.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:galvanizedsteel_scythe" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "ii ", + " i", + " s " + ], + "key": { + "i": { + "tag": "forge:ingots/galvanizedsteel" + }, + "s": { + "item": "minecraft:stick" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/galvanizedsteel_shears.json b/src/generated/resources/data/modernmetals/recipes/galvanizedsteel_shears.json new file mode 100644 index 00000000..ab2cdae0 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/galvanizedsteel_shears.json @@ -0,0 +1,18 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:galvanizedsteel_shears" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + " x", + "x " + ], + "key": { + "x": { + "tag": "forge:ingots/galvanizedsteel" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/galvanizedsteel_shield.json b/src/generated/resources/data/modernmetals/recipes/galvanizedsteel_shield.json new file mode 100644 index 00000000..ab077ff8 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/galvanizedsteel_shield.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:galvanizedsteel_shield" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xyx", + "xxx", + " x " + ], + "key": { + "x": { + "tag": "forge:ingots/galvanizedsteel" + }, + "y": { + "tag": "minecraft:planks" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/galvanizedsteel_shovel.json b/src/generated/resources/data/modernmetals/recipes/galvanizedsteel_shovel.json new file mode 100644 index 00000000..0f565ae8 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/galvanizedsteel_shovel.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:galvanizedsteel_shovel" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "s", + "s" + ], + "key": { + "x": { + "tag": "forge:ingots/galvanizedsteel" + }, + "s": { + "item": "minecraft:stick" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/galvanizedsteel_slab.json b/src/generated/resources/data/modernmetals/recipes/galvanizedsteel_slab.json new file mode 100644 index 00000000..75f20292 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/galvanizedsteel_slab.json @@ -0,0 +1,18 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:galvanizedsteel_slab", + "count": 6 + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "tag": "forge:storage_blocks/galvanizedsteel" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/galvanizedsteel_smallblend_blend.json b/src/generated/resources/data/modernmetals/recipes/galvanizedsteel_smallblend_blend.json new file mode 100644 index 00000000..ba263e34 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/galvanizedsteel_smallblend_blend.json @@ -0,0 +1,15 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:galvanizedsteel_smallblend", + "count": 9 + }, + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "forge:blends/galvanizedsteel" + } + ] + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/galvanizedsteel_smallpowder.json b/src/generated/resources/data/modernmetals/recipes/galvanizedsteel_smallpowder.json new file mode 100644 index 00000000..497124d9 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/galvanizedsteel_smallpowder.json @@ -0,0 +1,15 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:galvanizedsteel_smallpowder", + "count": 9 + }, + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "forge:dusts/galvanizedsteel" + } + ] + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/galvanizedsteel_stairs.json b/src/generated/resources/data/modernmetals/recipes/galvanizedsteel_stairs.json new file mode 100644 index 00000000..8e0bbad9 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/galvanizedsteel_stairs.json @@ -0,0 +1,20 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:galvanizedsteel_stairs", + "count": 4 + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "forge:storage_blocks/galvanizedsteel" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/galvanizedsteel_sword.json b/src/generated/resources/data/modernmetals/recipes/galvanizedsteel_sword.json new file mode 100644 index 00000000..e94be8e3 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/galvanizedsteel_sword.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:galvanizedsteel_sword" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "x", + "s" + ], + "key": { + "x": { + "tag": "forge:ingots/galvanizedsteel" + }, + "s": { + "item": "minecraft:stick" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/galvanizedsteel_trapdoor.json b/src/generated/resources/data/modernmetals/recipes/galvanizedsteel_trapdoor.json new file mode 100644 index 00000000..c9ba913d --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/galvanizedsteel_trapdoor.json @@ -0,0 +1,18 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:galvanizedsteel_trapdoor" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "tag": "forge:ingots/galvanizedsteel" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/galvanizedsteel_wall.json b/src/generated/resources/data/modernmetals/recipes/galvanizedsteel_wall.json new file mode 100644 index 00000000..d2339b34 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/galvanizedsteel_wall.json @@ -0,0 +1,19 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:galvanizedsteel_wall", + "count": 6 + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "forge:storage_blocks/galvanizedsteel" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/iridium_arrow.json b/src/generated/resources/data/modernmetals/recipes/iridium_arrow.json new file mode 100644 index 00000000..e0030d31 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/iridium_arrow.json @@ -0,0 +1,26 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:iridium_arrow", + "count": 4 + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "y", + "z" + ], + "key": { + "x": { + "tag": "forge:nuggets/iridium" + }, + "y": { + "tag": "forge:rods/iridium" + }, + "z": { + "item": "minecraft:feather" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/iridium_axe.json b/src/generated/resources/data/modernmetals/recipes/iridium_axe.json new file mode 100644 index 00000000..fdd74dda --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/iridium_axe.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:iridium_axe" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xs", + " s" + ], + "key": { + "x": { + "tag": "forge:ingots/iridium" + }, + "s": { + "item": "minecraft:stick" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/iridium_bars_1.json b/src/generated/resources/data/modernmetals/recipes/iridium_bars_1.json new file mode 100644 index 00000000..ffb0c13a --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/iridium_bars_1.json @@ -0,0 +1,19 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:iridium_bars", + "count": 16 + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "forge:ingots/iridium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/iridium_bars_2.json b/src/generated/resources/data/modernmetals/recipes/iridium_bars_2.json new file mode 100644 index 00000000..47ac0b47 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/iridium_bars_2.json @@ -0,0 +1,18 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:iridium_bars", + "count": 4 + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "tag": "forge:rods/iridium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/iridium_block.json b/src/generated/resources/data/modernmetals/recipes/iridium_block.json new file mode 100644 index 00000000..7bf91555 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/iridium_block.json @@ -0,0 +1,19 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:iridium_block" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "forge:ingots/iridium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/iridium_block_ingot.json b/src/generated/resources/data/modernmetals/recipes/iridium_block_ingot.json new file mode 100644 index 00000000..82f4e3c2 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/iridium_block_ingot.json @@ -0,0 +1,15 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:iridium_ingot", + "count": 9 + }, + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "forge:storage_blocks/iridium" + } + ] + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/iridium_bolt.json b/src/generated/resources/data/modernmetals/recipes/iridium_bolt.json new file mode 100644 index 00000000..2661ddf9 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/iridium_bolt.json @@ -0,0 +1,23 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:iridium_bolt", + "count": 4 + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "x", + "y" + ], + "key": { + "x": { + "tag": "forge:rods/iridium" + }, + "y": { + "item": "minecraft:feather" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/iridium_boots.json b/src/generated/resources/data/modernmetals/recipes/iridium_boots.json new file mode 100644 index 00000000..64f358e8 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/iridium_boots.json @@ -0,0 +1,18 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:iridium_boots" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "x x", + "x x" + ], + "key": { + "x": { + "tag": "forge:ingots/iridium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/iridium_bow.json b/src/generated/resources/data/modernmetals/recipes/iridium_bow.json new file mode 100644 index 00000000..1df7fa73 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/iridium_bow.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:iridium_bow" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + " xs", + "x s", + " xs" + ], + "key": { + "x": { + "tag": "forge:rods/iridium" + }, + "s": { + "item": "minecraft:string" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/iridium_button.json b/src/generated/resources/data/modernmetals/recipes/iridium_button.json new file mode 100644 index 00000000..eed72eea --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/iridium_button.json @@ -0,0 +1,18 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:iridium_button" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "x" + ], + "key": { + "x": { + "tag": "forge:nuggets/iridium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/iridium_chestplate.json b/src/generated/resources/data/modernmetals/recipes/iridium_chestplate.json new file mode 100644 index 00000000..c59c7ddf --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/iridium_chestplate.json @@ -0,0 +1,19 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:iridium_chestplate" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "x x", + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "forge:ingots/iridium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/iridium_crackhammer.json b/src/generated/resources/data/modernmetals/recipes/iridium_crackhammer.json new file mode 100644 index 00000000..b7220d76 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/iridium_crackhammer.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:iridium_crackhammer" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "y", + "y" + ], + "key": { + "x": { + "tag": "forge:storage_blocks/iridium" + }, + "y": { + "item": "minecraft:stick" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/iridium_crossbow.json b/src/generated/resources/data/modernmetals/recipes/iridium_crossbow.json new file mode 100644 index 00000000..2783ea8c --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/iridium_crossbow.json @@ -0,0 +1,25 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:iridium_crossbow" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "zxx", + " yx", + "x z" + ], + "key": { + "x": { + "tag": "forge:rods/iridium" + }, + "y": { + "item": "minecraft:string" + }, + "z": { + "tag": "forge:gears/iridium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/iridium_door.json b/src/generated/resources/data/modernmetals/recipes/iridium_door.json new file mode 100644 index 00000000..90cd88e1 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/iridium_door.json @@ -0,0 +1,20 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:iridium_door", + "count": 3 + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx", + "xx" + ], + "key": { + "x": { + "tag": "forge:ingots/iridium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/iridium_fishingrod.json b/src/generated/resources/data/modernmetals/recipes/iridium_fishingrod.json new file mode 100644 index 00000000..3ca7a015 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/iridium_fishingrod.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:iridium_fishing_rod" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + " x", + " xy", + "x y" + ], + "key": { + "x": { + "tag": "forge:rods/iridium" + }, + "y": { + "item": "minecraft:string" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/iridium_gear.json b/src/generated/resources/data/modernmetals/recipes/iridium_gear.json new file mode 100644 index 00000000..aede63b3 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/iridium_gear.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:iridium_gear" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + " x ", + "xrx", + " x " + ], + "key": { + "x": { + "tag": "forge:ingots/iridium" + }, + "r": { + "tag": "forge:rods/iridium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/iridium_helmet.json b/src/generated/resources/data/modernmetals/recipes/iridium_helmet.json new file mode 100644 index 00000000..455a818a --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/iridium_helmet.json @@ -0,0 +1,18 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:iridium_helmet" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "x x" + ], + "key": { + "x": { + "tag": "forge:ingots/iridium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/iridium_hoe.json b/src/generated/resources/data/modernmetals/recipes/iridium_hoe.json new file mode 100644 index 00000000..cf55decc --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/iridium_hoe.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:iridium_hoe" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + " s", + " s" + ], + "key": { + "x": { + "tag": "forge:ingots/iridium" + }, + "s": { + "item": "minecraft:stick" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/iridium_horsearmor.json b/src/generated/resources/data/modernmetals/recipes/iridium_horsearmor.json new file mode 100644 index 00000000..856c6609 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/iridium_horsearmor.json @@ -0,0 +1,69 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:iridium_horse_armor" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + " x", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "forge:ingots/iridium" + }, + "y": [ + { + "item": "minecraft:white_wool" + }, + { + "item": "minecraft:orange_wool" + }, + { + "item": "minecraft:magenta_wool" + }, + { + "item": "minecraft:light_blue_wool" + }, + { + "item": "minecraft:yellow_wool" + }, + { + "item": "minecraft:lime_wool" + }, + { + "item": "minecraft:pink_wool" + }, + { + "item": "minecraft:gray_wool" + }, + { + "item": "minecraft:light_gray_wool" + }, + { + "item": "minecraft:cyan_wool" + }, + { + "item": "minecraft:purple_wool" + }, + { + "item": "minecraft:blue_wool" + }, + { + "item": "minecraft:brown_wool" + }, + { + "item": "minecraft:green_wool" + }, + { + "item": "minecraft:red_wool" + }, + { + "item": "minecraft:black_wool" + } + ] + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/iridium_ingot.json b/src/generated/resources/data/modernmetals/recipes/iridium_ingot.json new file mode 100644 index 00000000..f17c2575 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/iridium_ingot.json @@ -0,0 +1,19 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:iridium_ingot" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "forge:nuggets/iridium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/iridium_leggings.json b/src/generated/resources/data/modernmetals/recipes/iridium_leggings.json new file mode 100644 index 00000000..b173c342 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/iridium_leggings.json @@ -0,0 +1,19 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:iridium_leggings" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "x x", + "x x" + ], + "key": { + "x": { + "tag": "forge:ingots/iridium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/iridium_lever.json b/src/generated/resources/data/modernmetals/recipes/iridium_lever.json new file mode 100644 index 00000000..b79a2730 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/iridium_lever.json @@ -0,0 +1,21 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:iridium_lever" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "y" + ], + "key": { + "x": { + "tag": "forge:rods/iridium" + }, + "y": { + "tag": "forge:ingots/iridium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/iridium_nugget.json b/src/generated/resources/data/modernmetals/recipes/iridium_nugget.json new file mode 100644 index 00000000..4f1a5d96 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/iridium_nugget.json @@ -0,0 +1,15 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:iridium_nugget", + "count": 9 + }, + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "forge:ingots/iridium" + } + ] + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/iridium_pickaxe.json b/src/generated/resources/data/modernmetals/recipes/iridium_pickaxe.json new file mode 100644 index 00000000..259e7eb1 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/iridium_pickaxe.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:iridium_pickaxe" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + " s ", + " s " + ], + "key": { + "x": { + "tag": "forge:ingots/iridium" + }, + "s": { + "item": "minecraft:stick" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/iridium_plate.json b/src/generated/resources/data/modernmetals/recipes/iridium_plate.json new file mode 100644 index 00000000..145f2543 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/iridium_plate.json @@ -0,0 +1,17 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:iridium_plate" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "tag": "forge:ingots/iridium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/iridium_powder.json b/src/generated/resources/data/modernmetals/recipes/iridium_powder.json new file mode 100644 index 00000000..fd7d481b --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/iridium_powder.json @@ -0,0 +1,19 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:iridium_powder" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "forge:tiny_dusts/iridium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/iridium_pressureplate.json b/src/generated/resources/data/modernmetals/recipes/iridium_pressureplate.json new file mode 100644 index 00000000..de407bb2 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/iridium_pressureplate.json @@ -0,0 +1,17 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:iridium_pressure_plate" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx" + ], + "key": { + "x": { + "tag": "forge:ingots/iridium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/iridium_rod.json b/src/generated/resources/data/modernmetals/recipes/iridium_rod.json new file mode 100644 index 00000000..6c384a0d --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/iridium_rod.json @@ -0,0 +1,18 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:iridium_rod" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + " x ", + " x " + ], + "key": { + "x": { + "tag": "forge:ingots/iridium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/iridium_scythe.json b/src/generated/resources/data/modernmetals/recipes/iridium_scythe.json new file mode 100644 index 00000000..7b374ac4 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/iridium_scythe.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:iridium_scythe" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "ii ", + " i", + " s " + ], + "key": { + "i": { + "tag": "forge:ingots/iridium" + }, + "s": { + "item": "minecraft:stick" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/iridium_shears.json b/src/generated/resources/data/modernmetals/recipes/iridium_shears.json new file mode 100644 index 00000000..cbaa70a6 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/iridium_shears.json @@ -0,0 +1,18 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:iridium_shears" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + " x", + "x " + ], + "key": { + "x": { + "tag": "forge:ingots/iridium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/iridium_shield.json b/src/generated/resources/data/modernmetals/recipes/iridium_shield.json new file mode 100644 index 00000000..e3e15cab --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/iridium_shield.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:iridium_shield" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xyx", + "xxx", + " x " + ], + "key": { + "x": { + "tag": "forge:ingots/iridium" + }, + "y": { + "tag": "minecraft:planks" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/iridium_shovel.json b/src/generated/resources/data/modernmetals/recipes/iridium_shovel.json new file mode 100644 index 00000000..7c43c41f --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/iridium_shovel.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:iridium_shovel" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "s", + "s" + ], + "key": { + "x": { + "tag": "forge:ingots/iridium" + }, + "s": { + "item": "minecraft:stick" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/iridium_slab.json b/src/generated/resources/data/modernmetals/recipes/iridium_slab.json new file mode 100644 index 00000000..33b80d6d --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/iridium_slab.json @@ -0,0 +1,18 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:iridium_slab", + "count": 6 + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "tag": "forge:storage_blocks/iridium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/iridium_smallpowder.json b/src/generated/resources/data/modernmetals/recipes/iridium_smallpowder.json new file mode 100644 index 00000000..7ab779d6 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/iridium_smallpowder.json @@ -0,0 +1,15 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:iridium_smallpowder", + "count": 9 + }, + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "forge:dusts/iridium" + } + ] + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/iridium_stairs.json b/src/generated/resources/data/modernmetals/recipes/iridium_stairs.json new file mode 100644 index 00000000..19e3878a --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/iridium_stairs.json @@ -0,0 +1,20 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:iridium_stairs", + "count": 4 + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "forge:storage_blocks/iridium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/iridium_sword.json b/src/generated/resources/data/modernmetals/recipes/iridium_sword.json new file mode 100644 index 00000000..d61c47d9 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/iridium_sword.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:iridium_sword" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "x", + "s" + ], + "key": { + "x": { + "tag": "forge:ingots/iridium" + }, + "s": { + "item": "minecraft:stick" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/iridium_trapdoor.json b/src/generated/resources/data/modernmetals/recipes/iridium_trapdoor.json new file mode 100644 index 00000000..548ab0f2 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/iridium_trapdoor.json @@ -0,0 +1,18 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:iridium_trapdoor" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "tag": "forge:ingots/iridium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/iridium_wall.json b/src/generated/resources/data/modernmetals/recipes/iridium_wall.json new file mode 100644 index 00000000..f97758d8 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/iridium_wall.json @@ -0,0 +1,19 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:iridium_wall", + "count": 6 + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "forge:storage_blocks/iridium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/magnesium_arrow.json b/src/generated/resources/data/modernmetals/recipes/magnesium_arrow.json new file mode 100644 index 00000000..09b0bfb2 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/magnesium_arrow.json @@ -0,0 +1,26 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:magnesium_arrow", + "count": 4 + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "y", + "z" + ], + "key": { + "x": { + "tag": "forge:nuggets/magnesium" + }, + "y": { + "tag": "forge:rods/magnesium" + }, + "z": { + "item": "minecraft:feather" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/magnesium_axe.json b/src/generated/resources/data/modernmetals/recipes/magnesium_axe.json new file mode 100644 index 00000000..530c564e --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/magnesium_axe.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:magnesium_axe" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xs", + " s" + ], + "key": { + "x": { + "tag": "forge:ingots/magnesium" + }, + "s": { + "item": "minecraft:stick" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/magnesium_bars_1.json b/src/generated/resources/data/modernmetals/recipes/magnesium_bars_1.json new file mode 100644 index 00000000..3236822f --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/magnesium_bars_1.json @@ -0,0 +1,19 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:magnesium_bars", + "count": 16 + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "forge:ingots/magnesium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/magnesium_bars_2.json b/src/generated/resources/data/modernmetals/recipes/magnesium_bars_2.json new file mode 100644 index 00000000..0d74f679 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/magnesium_bars_2.json @@ -0,0 +1,18 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:magnesium_bars", + "count": 4 + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "tag": "forge:rods/magnesium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/magnesium_block.json b/src/generated/resources/data/modernmetals/recipes/magnesium_block.json new file mode 100644 index 00000000..43b04541 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/magnesium_block.json @@ -0,0 +1,19 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:magnesium_block" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "forge:ingots/magnesium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/magnesium_block_ingot.json b/src/generated/resources/data/modernmetals/recipes/magnesium_block_ingot.json new file mode 100644 index 00000000..affc28f8 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/magnesium_block_ingot.json @@ -0,0 +1,15 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:magnesium_ingot", + "count": 9 + }, + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "forge:storage_blocks/magnesium" + } + ] + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/magnesium_bolt.json b/src/generated/resources/data/modernmetals/recipes/magnesium_bolt.json new file mode 100644 index 00000000..f04917ee --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/magnesium_bolt.json @@ -0,0 +1,23 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:magnesium_bolt", + "count": 4 + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "x", + "y" + ], + "key": { + "x": { + "tag": "forge:rods/magnesium" + }, + "y": { + "item": "minecraft:feather" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/magnesium_boots.json b/src/generated/resources/data/modernmetals/recipes/magnesium_boots.json new file mode 100644 index 00000000..66124cfd --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/magnesium_boots.json @@ -0,0 +1,18 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:magnesium_boots" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "x x", + "x x" + ], + "key": { + "x": { + "tag": "forge:ingots/magnesium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/magnesium_bow.json b/src/generated/resources/data/modernmetals/recipes/magnesium_bow.json new file mode 100644 index 00000000..49d2ed1c --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/magnesium_bow.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:magnesium_bow" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + " xs", + "x s", + " xs" + ], + "key": { + "x": { + "tag": "forge:rods/magnesium" + }, + "s": { + "item": "minecraft:string" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/magnesium_button.json b/src/generated/resources/data/modernmetals/recipes/magnesium_button.json new file mode 100644 index 00000000..18354e1f --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/magnesium_button.json @@ -0,0 +1,18 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:magnesium_button" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "x" + ], + "key": { + "x": { + "tag": "forge:nuggets/magnesium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/magnesium_chestplate.json b/src/generated/resources/data/modernmetals/recipes/magnesium_chestplate.json new file mode 100644 index 00000000..97c33933 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/magnesium_chestplate.json @@ -0,0 +1,19 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:magnesium_chestplate" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "x x", + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "forge:ingots/magnesium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/magnesium_crackhammer.json b/src/generated/resources/data/modernmetals/recipes/magnesium_crackhammer.json new file mode 100644 index 00000000..aa08af23 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/magnesium_crackhammer.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:magnesium_crackhammer" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "y", + "y" + ], + "key": { + "x": { + "tag": "forge:storage_blocks/magnesium" + }, + "y": { + "item": "minecraft:stick" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/magnesium_crossbow.json b/src/generated/resources/data/modernmetals/recipes/magnesium_crossbow.json new file mode 100644 index 00000000..5d80688c --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/magnesium_crossbow.json @@ -0,0 +1,25 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:magnesium_crossbow" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "zxx", + " yx", + "x z" + ], + "key": { + "x": { + "tag": "forge:rods/magnesium" + }, + "y": { + "item": "minecraft:string" + }, + "z": { + "tag": "forge:gears/magnesium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/magnesium_door.json b/src/generated/resources/data/modernmetals/recipes/magnesium_door.json new file mode 100644 index 00000000..442e880e --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/magnesium_door.json @@ -0,0 +1,20 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:magnesium_door", + "count": 3 + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx", + "xx" + ], + "key": { + "x": { + "tag": "forge:ingots/magnesium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/magnesium_fishingrod.json b/src/generated/resources/data/modernmetals/recipes/magnesium_fishingrod.json new file mode 100644 index 00000000..350c0868 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/magnesium_fishingrod.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:magnesium_fishing_rod" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + " x", + " xy", + "x y" + ], + "key": { + "x": { + "tag": "forge:rods/magnesium" + }, + "y": { + "item": "minecraft:string" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/magnesium_gear.json b/src/generated/resources/data/modernmetals/recipes/magnesium_gear.json new file mode 100644 index 00000000..95480fe8 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/magnesium_gear.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:magnesium_gear" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + " x ", + "xrx", + " x " + ], + "key": { + "x": { + "tag": "forge:ingots/magnesium" + }, + "r": { + "tag": "forge:rods/magnesium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/magnesium_helmet.json b/src/generated/resources/data/modernmetals/recipes/magnesium_helmet.json new file mode 100644 index 00000000..1f3f48e9 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/magnesium_helmet.json @@ -0,0 +1,18 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:magnesium_helmet" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "x x" + ], + "key": { + "x": { + "tag": "forge:ingots/magnesium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/magnesium_hoe.json b/src/generated/resources/data/modernmetals/recipes/magnesium_hoe.json new file mode 100644 index 00000000..b23180a9 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/magnesium_hoe.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:magnesium_hoe" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + " s", + " s" + ], + "key": { + "x": { + "tag": "forge:ingots/magnesium" + }, + "s": { + "item": "minecraft:stick" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/magnesium_horsearmor.json b/src/generated/resources/data/modernmetals/recipes/magnesium_horsearmor.json new file mode 100644 index 00000000..0a5b45b8 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/magnesium_horsearmor.json @@ -0,0 +1,69 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:magnesium_horse_armor" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + " x", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "forge:ingots/magnesium" + }, + "y": [ + { + "item": "minecraft:white_wool" + }, + { + "item": "minecraft:orange_wool" + }, + { + "item": "minecraft:magenta_wool" + }, + { + "item": "minecraft:light_blue_wool" + }, + { + "item": "minecraft:yellow_wool" + }, + { + "item": "minecraft:lime_wool" + }, + { + "item": "minecraft:pink_wool" + }, + { + "item": "minecraft:gray_wool" + }, + { + "item": "minecraft:light_gray_wool" + }, + { + "item": "minecraft:cyan_wool" + }, + { + "item": "minecraft:purple_wool" + }, + { + "item": "minecraft:blue_wool" + }, + { + "item": "minecraft:brown_wool" + }, + { + "item": "minecraft:green_wool" + }, + { + "item": "minecraft:red_wool" + }, + { + "item": "minecraft:black_wool" + } + ] + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/magnesium_ingot.json b/src/generated/resources/data/modernmetals/recipes/magnesium_ingot.json new file mode 100644 index 00000000..d717d054 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/magnesium_ingot.json @@ -0,0 +1,19 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:magnesium_ingot" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "forge:nuggets/magnesium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/magnesium_leggings.json b/src/generated/resources/data/modernmetals/recipes/magnesium_leggings.json new file mode 100644 index 00000000..af156a73 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/magnesium_leggings.json @@ -0,0 +1,19 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:magnesium_leggings" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "x x", + "x x" + ], + "key": { + "x": { + "tag": "forge:ingots/magnesium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/magnesium_lever.json b/src/generated/resources/data/modernmetals/recipes/magnesium_lever.json new file mode 100644 index 00000000..2a511599 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/magnesium_lever.json @@ -0,0 +1,21 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:magnesium_lever" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "y" + ], + "key": { + "x": { + "tag": "forge:rods/magnesium" + }, + "y": { + "tag": "forge:ingots/magnesium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/magnesium_nugget.json b/src/generated/resources/data/modernmetals/recipes/magnesium_nugget.json new file mode 100644 index 00000000..294c168f --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/magnesium_nugget.json @@ -0,0 +1,15 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:magnesium_nugget", + "count": 9 + }, + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "forge:ingots/magnesium" + } + ] + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/magnesium_pickaxe.json b/src/generated/resources/data/modernmetals/recipes/magnesium_pickaxe.json new file mode 100644 index 00000000..44cf5008 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/magnesium_pickaxe.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:magnesium_pickaxe" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + " s ", + " s " + ], + "key": { + "x": { + "tag": "forge:ingots/magnesium" + }, + "s": { + "item": "minecraft:stick" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/magnesium_plate.json b/src/generated/resources/data/modernmetals/recipes/magnesium_plate.json new file mode 100644 index 00000000..ab910180 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/magnesium_plate.json @@ -0,0 +1,17 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:magnesium_plate" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "tag": "forge:ingots/magnesium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/magnesium_powder.json b/src/generated/resources/data/modernmetals/recipes/magnesium_powder.json new file mode 100644 index 00000000..c2e92e2c --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/magnesium_powder.json @@ -0,0 +1,19 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:magnesium_powder" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "forge:tiny_dusts/magnesium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/magnesium_pressureplate.json b/src/generated/resources/data/modernmetals/recipes/magnesium_pressureplate.json new file mode 100644 index 00000000..cc7fa924 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/magnesium_pressureplate.json @@ -0,0 +1,17 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:magnesium_pressure_plate" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx" + ], + "key": { + "x": { + "tag": "forge:ingots/magnesium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/magnesium_rod.json b/src/generated/resources/data/modernmetals/recipes/magnesium_rod.json new file mode 100644 index 00000000..d50da003 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/magnesium_rod.json @@ -0,0 +1,18 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:magnesium_rod" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + " x ", + " x " + ], + "key": { + "x": { + "tag": "forge:ingots/magnesium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/magnesium_scythe.json b/src/generated/resources/data/modernmetals/recipes/magnesium_scythe.json new file mode 100644 index 00000000..a0cfa79b --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/magnesium_scythe.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:magnesium_scythe" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "ii ", + " i", + " s " + ], + "key": { + "i": { + "tag": "forge:ingots/magnesium" + }, + "s": { + "item": "minecraft:stick" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/magnesium_shears.json b/src/generated/resources/data/modernmetals/recipes/magnesium_shears.json new file mode 100644 index 00000000..cce76672 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/magnesium_shears.json @@ -0,0 +1,18 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:magnesium_shears" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + " x", + "x " + ], + "key": { + "x": { + "tag": "forge:ingots/magnesium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/magnesium_shield.json b/src/generated/resources/data/modernmetals/recipes/magnesium_shield.json new file mode 100644 index 00000000..21b9662a --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/magnesium_shield.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:magnesium_shield" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xyx", + "xxx", + " x " + ], + "key": { + "x": { + "tag": "forge:ingots/magnesium" + }, + "y": { + "tag": "minecraft:planks" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/magnesium_shovel.json b/src/generated/resources/data/modernmetals/recipes/magnesium_shovel.json new file mode 100644 index 00000000..3026ee40 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/magnesium_shovel.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:magnesium_shovel" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "s", + "s" + ], + "key": { + "x": { + "tag": "forge:ingots/magnesium" + }, + "s": { + "item": "minecraft:stick" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/magnesium_slab.json b/src/generated/resources/data/modernmetals/recipes/magnesium_slab.json new file mode 100644 index 00000000..e35e3d83 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/magnesium_slab.json @@ -0,0 +1,18 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:magnesium_slab", + "count": 6 + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "tag": "forge:storage_blocks/magnesium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/magnesium_smallpowder.json b/src/generated/resources/data/modernmetals/recipes/magnesium_smallpowder.json new file mode 100644 index 00000000..13c7414c --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/magnesium_smallpowder.json @@ -0,0 +1,15 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:magnesium_smallpowder", + "count": 9 + }, + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "forge:dusts/magnesium" + } + ] + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/magnesium_stairs.json b/src/generated/resources/data/modernmetals/recipes/magnesium_stairs.json new file mode 100644 index 00000000..f4f458c9 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/magnesium_stairs.json @@ -0,0 +1,20 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:magnesium_stairs", + "count": 4 + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "forge:storage_blocks/magnesium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/magnesium_sword.json b/src/generated/resources/data/modernmetals/recipes/magnesium_sword.json new file mode 100644 index 00000000..ea939829 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/magnesium_sword.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:magnesium_sword" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "x", + "s" + ], + "key": { + "x": { + "tag": "forge:ingots/magnesium" + }, + "s": { + "item": "minecraft:stick" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/magnesium_trapdoor.json b/src/generated/resources/data/modernmetals/recipes/magnesium_trapdoor.json new file mode 100644 index 00000000..012c40d0 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/magnesium_trapdoor.json @@ -0,0 +1,18 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:magnesium_trapdoor" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "tag": "forge:ingots/magnesium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/magnesium_wall.json b/src/generated/resources/data/modernmetals/recipes/magnesium_wall.json new file mode 100644 index 00000000..2b8f0daa --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/magnesium_wall.json @@ -0,0 +1,19 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:magnesium_wall", + "count": 6 + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "forge:storage_blocks/magnesium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/manganese_arrow.json b/src/generated/resources/data/modernmetals/recipes/manganese_arrow.json new file mode 100644 index 00000000..1eea96e9 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/manganese_arrow.json @@ -0,0 +1,26 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:manganese_arrow", + "count": 4 + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "y", + "z" + ], + "key": { + "x": { + "tag": "forge:nuggets/manganese" + }, + "y": { + "tag": "forge:rods/manganese" + }, + "z": { + "item": "minecraft:feather" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/manganese_axe.json b/src/generated/resources/data/modernmetals/recipes/manganese_axe.json new file mode 100644 index 00000000..7a23c729 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/manganese_axe.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:manganese_axe" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xs", + " s" + ], + "key": { + "x": { + "tag": "forge:ingots/manganese" + }, + "s": { + "item": "minecraft:stick" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/manganese_bars_1.json b/src/generated/resources/data/modernmetals/recipes/manganese_bars_1.json new file mode 100644 index 00000000..82410f5d --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/manganese_bars_1.json @@ -0,0 +1,19 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:manganese_bars", + "count": 16 + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "forge:ingots/manganese" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/manganese_bars_2.json b/src/generated/resources/data/modernmetals/recipes/manganese_bars_2.json new file mode 100644 index 00000000..eadfa79c --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/manganese_bars_2.json @@ -0,0 +1,18 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:manganese_bars", + "count": 4 + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "tag": "forge:rods/manganese" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/manganese_block.json b/src/generated/resources/data/modernmetals/recipes/manganese_block.json new file mode 100644 index 00000000..89c0d336 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/manganese_block.json @@ -0,0 +1,19 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:manganese_block" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "forge:ingots/manganese" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/manganese_block_ingot.json b/src/generated/resources/data/modernmetals/recipes/manganese_block_ingot.json new file mode 100644 index 00000000..32a6fae4 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/manganese_block_ingot.json @@ -0,0 +1,15 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:manganese_ingot", + "count": 9 + }, + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "forge:storage_blocks/manganese" + } + ] + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/manganese_bolt.json b/src/generated/resources/data/modernmetals/recipes/manganese_bolt.json new file mode 100644 index 00000000..875047b4 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/manganese_bolt.json @@ -0,0 +1,23 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:manganese_bolt", + "count": 4 + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "x", + "y" + ], + "key": { + "x": { + "tag": "forge:rods/manganese" + }, + "y": { + "item": "minecraft:feather" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/manganese_boots.json b/src/generated/resources/data/modernmetals/recipes/manganese_boots.json new file mode 100644 index 00000000..4e3c82b7 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/manganese_boots.json @@ -0,0 +1,18 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:manganese_boots" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "x x", + "x x" + ], + "key": { + "x": { + "tag": "forge:ingots/manganese" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/manganese_bow.json b/src/generated/resources/data/modernmetals/recipes/manganese_bow.json new file mode 100644 index 00000000..73f3a369 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/manganese_bow.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:manganese_bow" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + " xs", + "x s", + " xs" + ], + "key": { + "x": { + "tag": "forge:rods/manganese" + }, + "s": { + "item": "minecraft:string" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/manganese_button.json b/src/generated/resources/data/modernmetals/recipes/manganese_button.json new file mode 100644 index 00000000..eda81ec2 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/manganese_button.json @@ -0,0 +1,18 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:manganese_button" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "x" + ], + "key": { + "x": { + "tag": "forge:nuggets/manganese" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/manganese_chestplate.json b/src/generated/resources/data/modernmetals/recipes/manganese_chestplate.json new file mode 100644 index 00000000..9b634f49 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/manganese_chestplate.json @@ -0,0 +1,19 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:manganese_chestplate" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "x x", + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "forge:ingots/manganese" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/manganese_crackhammer.json b/src/generated/resources/data/modernmetals/recipes/manganese_crackhammer.json new file mode 100644 index 00000000..262f2545 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/manganese_crackhammer.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:manganese_crackhammer" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "y", + "y" + ], + "key": { + "x": { + "tag": "forge:storage_blocks/manganese" + }, + "y": { + "item": "minecraft:stick" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/manganese_crossbow.json b/src/generated/resources/data/modernmetals/recipes/manganese_crossbow.json new file mode 100644 index 00000000..ac6fcd14 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/manganese_crossbow.json @@ -0,0 +1,25 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:manganese_crossbow" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "zxx", + " yx", + "x z" + ], + "key": { + "x": { + "tag": "forge:rods/manganese" + }, + "y": { + "item": "minecraft:string" + }, + "z": { + "tag": "forge:gears/manganese" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/manganese_door.json b/src/generated/resources/data/modernmetals/recipes/manganese_door.json new file mode 100644 index 00000000..27e93ee5 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/manganese_door.json @@ -0,0 +1,20 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:manganese_door", + "count": 3 + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx", + "xx" + ], + "key": { + "x": { + "tag": "forge:ingots/manganese" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/manganese_fishingrod.json b/src/generated/resources/data/modernmetals/recipes/manganese_fishingrod.json new file mode 100644 index 00000000..9c36e1df --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/manganese_fishingrod.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:manganese_fishing_rod" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + " x", + " xy", + "x y" + ], + "key": { + "x": { + "tag": "forge:rods/manganese" + }, + "y": { + "item": "minecraft:string" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/manganese_gear.json b/src/generated/resources/data/modernmetals/recipes/manganese_gear.json new file mode 100644 index 00000000..f4e553e7 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/manganese_gear.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:manganese_gear" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + " x ", + "xrx", + " x " + ], + "key": { + "x": { + "tag": "forge:ingots/manganese" + }, + "r": { + "tag": "forge:rods/manganese" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/manganese_helmet.json b/src/generated/resources/data/modernmetals/recipes/manganese_helmet.json new file mode 100644 index 00000000..8d601bce --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/manganese_helmet.json @@ -0,0 +1,18 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:manganese_helmet" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "x x" + ], + "key": { + "x": { + "tag": "forge:ingots/manganese" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/manganese_hoe.json b/src/generated/resources/data/modernmetals/recipes/manganese_hoe.json new file mode 100644 index 00000000..ebce2f3c --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/manganese_hoe.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:manganese_hoe" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + " s", + " s" + ], + "key": { + "x": { + "tag": "forge:ingots/manganese" + }, + "s": { + "item": "minecraft:stick" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/manganese_horsearmor.json b/src/generated/resources/data/modernmetals/recipes/manganese_horsearmor.json new file mode 100644 index 00000000..1e5d4c4d --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/manganese_horsearmor.json @@ -0,0 +1,69 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:manganese_horse_armor" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + " x", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "forge:ingots/manganese" + }, + "y": [ + { + "item": "minecraft:white_wool" + }, + { + "item": "minecraft:orange_wool" + }, + { + "item": "minecraft:magenta_wool" + }, + { + "item": "minecraft:light_blue_wool" + }, + { + "item": "minecraft:yellow_wool" + }, + { + "item": "minecraft:lime_wool" + }, + { + "item": "minecraft:pink_wool" + }, + { + "item": "minecraft:gray_wool" + }, + { + "item": "minecraft:light_gray_wool" + }, + { + "item": "minecraft:cyan_wool" + }, + { + "item": "minecraft:purple_wool" + }, + { + "item": "minecraft:blue_wool" + }, + { + "item": "minecraft:brown_wool" + }, + { + "item": "minecraft:green_wool" + }, + { + "item": "minecraft:red_wool" + }, + { + "item": "minecraft:black_wool" + } + ] + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/manganese_ingot.json b/src/generated/resources/data/modernmetals/recipes/manganese_ingot.json new file mode 100644 index 00000000..f81be369 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/manganese_ingot.json @@ -0,0 +1,19 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:manganese_ingot" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "forge:nuggets/manganese" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/manganese_leggings.json b/src/generated/resources/data/modernmetals/recipes/manganese_leggings.json new file mode 100644 index 00000000..9d515a54 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/manganese_leggings.json @@ -0,0 +1,19 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:manganese_leggings" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "x x", + "x x" + ], + "key": { + "x": { + "tag": "forge:ingots/manganese" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/manganese_lever.json b/src/generated/resources/data/modernmetals/recipes/manganese_lever.json new file mode 100644 index 00000000..14765eca --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/manganese_lever.json @@ -0,0 +1,21 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:manganese_lever" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "y" + ], + "key": { + "x": { + "tag": "forge:rods/manganese" + }, + "y": { + "tag": "forge:ingots/manganese" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/manganese_nugget.json b/src/generated/resources/data/modernmetals/recipes/manganese_nugget.json new file mode 100644 index 00000000..4519544a --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/manganese_nugget.json @@ -0,0 +1,15 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:manganese_nugget", + "count": 9 + }, + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "forge:ingots/manganese" + } + ] + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/manganese_pickaxe.json b/src/generated/resources/data/modernmetals/recipes/manganese_pickaxe.json new file mode 100644 index 00000000..22b46741 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/manganese_pickaxe.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:manganese_pickaxe" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + " s ", + " s " + ], + "key": { + "x": { + "tag": "forge:ingots/manganese" + }, + "s": { + "item": "minecraft:stick" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/manganese_plate.json b/src/generated/resources/data/modernmetals/recipes/manganese_plate.json new file mode 100644 index 00000000..2ba387e9 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/manganese_plate.json @@ -0,0 +1,17 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:manganese_plate" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "tag": "forge:ingots/manganese" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/manganese_powder.json b/src/generated/resources/data/modernmetals/recipes/manganese_powder.json new file mode 100644 index 00000000..9ed5c186 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/manganese_powder.json @@ -0,0 +1,19 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:manganese_powder" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "forge:tiny_dusts/manganese" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/manganese_pressureplate.json b/src/generated/resources/data/modernmetals/recipes/manganese_pressureplate.json new file mode 100644 index 00000000..9abe031c --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/manganese_pressureplate.json @@ -0,0 +1,17 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:manganese_pressure_plate" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx" + ], + "key": { + "x": { + "tag": "forge:ingots/manganese" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/manganese_rod.json b/src/generated/resources/data/modernmetals/recipes/manganese_rod.json new file mode 100644 index 00000000..9f5ef3a4 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/manganese_rod.json @@ -0,0 +1,18 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:manganese_rod" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + " x ", + " x " + ], + "key": { + "x": { + "tag": "forge:ingots/manganese" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/manganese_scythe.json b/src/generated/resources/data/modernmetals/recipes/manganese_scythe.json new file mode 100644 index 00000000..d7ea1668 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/manganese_scythe.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:manganese_scythe" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "ii ", + " i", + " s " + ], + "key": { + "i": { + "tag": "forge:ingots/manganese" + }, + "s": { + "item": "minecraft:stick" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/manganese_shears.json b/src/generated/resources/data/modernmetals/recipes/manganese_shears.json new file mode 100644 index 00000000..0828397a --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/manganese_shears.json @@ -0,0 +1,18 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:manganese_shears" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + " x", + "x " + ], + "key": { + "x": { + "tag": "forge:ingots/manganese" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/manganese_shield.json b/src/generated/resources/data/modernmetals/recipes/manganese_shield.json new file mode 100644 index 00000000..0205ebcf --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/manganese_shield.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:manganese_shield" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xyx", + "xxx", + " x " + ], + "key": { + "x": { + "tag": "forge:ingots/manganese" + }, + "y": { + "tag": "minecraft:planks" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/manganese_shovel.json b/src/generated/resources/data/modernmetals/recipes/manganese_shovel.json new file mode 100644 index 00000000..79633922 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/manganese_shovel.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:manganese_shovel" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "s", + "s" + ], + "key": { + "x": { + "tag": "forge:ingots/manganese" + }, + "s": { + "item": "minecraft:stick" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/manganese_slab.json b/src/generated/resources/data/modernmetals/recipes/manganese_slab.json new file mode 100644 index 00000000..cae84918 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/manganese_slab.json @@ -0,0 +1,18 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:manganese_slab", + "count": 6 + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "tag": "forge:storage_blocks/manganese" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/manganese_smallpowder.json b/src/generated/resources/data/modernmetals/recipes/manganese_smallpowder.json new file mode 100644 index 00000000..a3d2cb59 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/manganese_smallpowder.json @@ -0,0 +1,15 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:manganese_smallpowder", + "count": 9 + }, + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "forge:dusts/manganese" + } + ] + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/manganese_stairs.json b/src/generated/resources/data/modernmetals/recipes/manganese_stairs.json new file mode 100644 index 00000000..cc91978c --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/manganese_stairs.json @@ -0,0 +1,20 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:manganese_stairs", + "count": 4 + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "forge:storage_blocks/manganese" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/manganese_sword.json b/src/generated/resources/data/modernmetals/recipes/manganese_sword.json new file mode 100644 index 00000000..b56064fb --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/manganese_sword.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:manganese_sword" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "x", + "s" + ], + "key": { + "x": { + "tag": "forge:ingots/manganese" + }, + "s": { + "item": "minecraft:stick" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/manganese_trapdoor.json b/src/generated/resources/data/modernmetals/recipes/manganese_trapdoor.json new file mode 100644 index 00000000..7f349de3 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/manganese_trapdoor.json @@ -0,0 +1,18 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:manganese_trapdoor" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "tag": "forge:ingots/manganese" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/manganese_wall.json b/src/generated/resources/data/modernmetals/recipes/manganese_wall.json new file mode 100644 index 00000000..4b6998e4 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/manganese_wall.json @@ -0,0 +1,19 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:manganese_wall", + "count": 6 + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "forge:storage_blocks/manganese" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/nichrome_arrow.json b/src/generated/resources/data/modernmetals/recipes/nichrome_arrow.json new file mode 100644 index 00000000..8c7583a6 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/nichrome_arrow.json @@ -0,0 +1,26 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:nichrome_arrow", + "count": 4 + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "y", + "z" + ], + "key": { + "x": { + "tag": "forge:nuggets/nichrome" + }, + "y": { + "tag": "forge:rods/nichrome" + }, + "z": { + "item": "minecraft:feather" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/nichrome_axe.json b/src/generated/resources/data/modernmetals/recipes/nichrome_axe.json new file mode 100644 index 00000000..d1868077 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/nichrome_axe.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:nichrome_axe" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xs", + " s" + ], + "key": { + "x": { + "tag": "forge:ingots/nichrome" + }, + "s": { + "item": "minecraft:stick" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/nichrome_bars_1.json b/src/generated/resources/data/modernmetals/recipes/nichrome_bars_1.json new file mode 100644 index 00000000..92c6fcc1 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/nichrome_bars_1.json @@ -0,0 +1,19 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:nichrome_bars", + "count": 16 + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "forge:ingots/nichrome" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/nichrome_bars_2.json b/src/generated/resources/data/modernmetals/recipes/nichrome_bars_2.json new file mode 100644 index 00000000..4ea55c42 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/nichrome_bars_2.json @@ -0,0 +1,18 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:nichrome_bars", + "count": 4 + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "tag": "forge:rods/nichrome" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/nichrome_blend_base.json b/src/generated/resources/data/modernmetals/recipes/nichrome_blend_base.json new file mode 100644 index 00000000..47c01534 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/nichrome_blend_base.json @@ -0,0 +1,25 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:nichrome_blend", + "count": 2 + }, + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "forge:dusts/nickel" + }, + [ + { "tag": "forge:dusts/chromium" }, + { "tag": "forge:dusts/chrome" } + ] + ] + }, + "conditions": [ + { + "type": "modernmetals:non_empty_tag", + "tag": "forge:dusts/nickel" + } + ] +} diff --git a/src/generated/resources/data/modernmetals/recipes/nichrome_blend_smallblend.json b/src/generated/resources/data/modernmetals/recipes/nichrome_blend_smallblend.json new file mode 100644 index 00000000..235299da --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/nichrome_blend_smallblend.json @@ -0,0 +1,19 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:nichrome_blend" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "forge:small_blends/nichrome" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/nichrome_block.json b/src/generated/resources/data/modernmetals/recipes/nichrome_block.json new file mode 100644 index 00000000..c30e9598 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/nichrome_block.json @@ -0,0 +1,19 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:nichrome_block" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "forge:ingots/nichrome" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/nichrome_block_ingot.json b/src/generated/resources/data/modernmetals/recipes/nichrome_block_ingot.json new file mode 100644 index 00000000..7e72d2d1 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/nichrome_block_ingot.json @@ -0,0 +1,15 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:nichrome_ingot", + "count": 9 + }, + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "forge:storage_blocks/nichrome" + } + ] + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/nichrome_bolt.json b/src/generated/resources/data/modernmetals/recipes/nichrome_bolt.json new file mode 100644 index 00000000..8c20c47b --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/nichrome_bolt.json @@ -0,0 +1,23 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:nichrome_bolt", + "count": 4 + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "x", + "y" + ], + "key": { + "x": { + "tag": "forge:rods/nichrome" + }, + "y": { + "item": "minecraft:feather" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/nichrome_boots.json b/src/generated/resources/data/modernmetals/recipes/nichrome_boots.json new file mode 100644 index 00000000..6bbc2e33 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/nichrome_boots.json @@ -0,0 +1,18 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:nichrome_boots" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "x x", + "x x" + ], + "key": { + "x": { + "tag": "forge:ingots/nichrome" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/nichrome_bow.json b/src/generated/resources/data/modernmetals/recipes/nichrome_bow.json new file mode 100644 index 00000000..30a22b2d --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/nichrome_bow.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:nichrome_bow" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + " xs", + "x s", + " xs" + ], + "key": { + "x": { + "tag": "forge:rods/nichrome" + }, + "s": { + "item": "minecraft:string" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/nichrome_button.json b/src/generated/resources/data/modernmetals/recipes/nichrome_button.json new file mode 100644 index 00000000..1afbedf2 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/nichrome_button.json @@ -0,0 +1,18 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:nichrome_button" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "x" + ], + "key": { + "x": { + "tag": "forge:nuggets/nichrome" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/nichrome_chestplate.json b/src/generated/resources/data/modernmetals/recipes/nichrome_chestplate.json new file mode 100644 index 00000000..b12fdf08 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/nichrome_chestplate.json @@ -0,0 +1,19 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:nichrome_chestplate" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "x x", + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "forge:ingots/nichrome" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/nichrome_crackhammer.json b/src/generated/resources/data/modernmetals/recipes/nichrome_crackhammer.json new file mode 100644 index 00000000..eccec6f3 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/nichrome_crackhammer.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:nichrome_crackhammer" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "y", + "y" + ], + "key": { + "x": { + "tag": "forge:storage_blocks/nichrome" + }, + "y": { + "item": "minecraft:stick" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/nichrome_crossbow.json b/src/generated/resources/data/modernmetals/recipes/nichrome_crossbow.json new file mode 100644 index 00000000..266e7c43 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/nichrome_crossbow.json @@ -0,0 +1,25 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:nichrome_crossbow" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "zxx", + " yx", + "x z" + ], + "key": { + "x": { + "tag": "forge:rods/nichrome" + }, + "y": { + "item": "minecraft:string" + }, + "z": { + "tag": "forge:gears/nichrome" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/nichrome_door.json b/src/generated/resources/data/modernmetals/recipes/nichrome_door.json new file mode 100644 index 00000000..ad9c11d4 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/nichrome_door.json @@ -0,0 +1,20 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:nichrome_door", + "count": 3 + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx", + "xx" + ], + "key": { + "x": { + "tag": "forge:ingots/nichrome" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/nichrome_fishingrod.json b/src/generated/resources/data/modernmetals/recipes/nichrome_fishingrod.json new file mode 100644 index 00000000..1bbab149 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/nichrome_fishingrod.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:nichrome_fishing_rod" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + " x", + " xy", + "x y" + ], + "key": { + "x": { + "tag": "forge:rods/nichrome" + }, + "y": { + "item": "minecraft:string" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/nichrome_gear.json b/src/generated/resources/data/modernmetals/recipes/nichrome_gear.json new file mode 100644 index 00000000..7b176893 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/nichrome_gear.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:nichrome_gear" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + " x ", + "xrx", + " x " + ], + "key": { + "x": { + "tag": "forge:ingots/nichrome" + }, + "r": { + "tag": "forge:rods/nichrome" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/nichrome_helmet.json b/src/generated/resources/data/modernmetals/recipes/nichrome_helmet.json new file mode 100644 index 00000000..4474254a --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/nichrome_helmet.json @@ -0,0 +1,18 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:nichrome_helmet" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "x x" + ], + "key": { + "x": { + "tag": "forge:ingots/nichrome" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/nichrome_hoe.json b/src/generated/resources/data/modernmetals/recipes/nichrome_hoe.json new file mode 100644 index 00000000..43895404 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/nichrome_hoe.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:nichrome_hoe" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + " s", + " s" + ], + "key": { + "x": { + "tag": "forge:ingots/nichrome" + }, + "s": { + "item": "minecraft:stick" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/nichrome_horsearmor.json b/src/generated/resources/data/modernmetals/recipes/nichrome_horsearmor.json new file mode 100644 index 00000000..1d22bf14 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/nichrome_horsearmor.json @@ -0,0 +1,69 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:nichrome_horse_armor" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + " x", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "forge:ingots/nichrome" + }, + "y": [ + { + "item": "minecraft:white_wool" + }, + { + "item": "minecraft:orange_wool" + }, + { + "item": "minecraft:magenta_wool" + }, + { + "item": "minecraft:light_blue_wool" + }, + { + "item": "minecraft:yellow_wool" + }, + { + "item": "minecraft:lime_wool" + }, + { + "item": "minecraft:pink_wool" + }, + { + "item": "minecraft:gray_wool" + }, + { + "item": "minecraft:light_gray_wool" + }, + { + "item": "minecraft:cyan_wool" + }, + { + "item": "minecraft:purple_wool" + }, + { + "item": "minecraft:blue_wool" + }, + { + "item": "minecraft:brown_wool" + }, + { + "item": "minecraft:green_wool" + }, + { + "item": "minecraft:red_wool" + }, + { + "item": "minecraft:black_wool" + } + ] + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/nichrome_ingot.json b/src/generated/resources/data/modernmetals/recipes/nichrome_ingot.json new file mode 100644 index 00000000..263f190f --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/nichrome_ingot.json @@ -0,0 +1,19 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:nichrome_ingot" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "forge:nuggets/nichrome" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/nichrome_leggings.json b/src/generated/resources/data/modernmetals/recipes/nichrome_leggings.json new file mode 100644 index 00000000..bdd5ef72 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/nichrome_leggings.json @@ -0,0 +1,19 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:nichrome_leggings" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "x x", + "x x" + ], + "key": { + "x": { + "tag": "forge:ingots/nichrome" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/nichrome_lever.json b/src/generated/resources/data/modernmetals/recipes/nichrome_lever.json new file mode 100644 index 00000000..06798747 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/nichrome_lever.json @@ -0,0 +1,21 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:nichrome_lever" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "y" + ], + "key": { + "x": { + "tag": "forge:rods/nichrome" + }, + "y": { + "tag": "forge:ingots/nichrome" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/nichrome_nugget.json b/src/generated/resources/data/modernmetals/recipes/nichrome_nugget.json new file mode 100644 index 00000000..e73a0aeb --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/nichrome_nugget.json @@ -0,0 +1,15 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:nichrome_nugget", + "count": 9 + }, + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "forge:ingots/nichrome" + } + ] + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/nichrome_pickaxe.json b/src/generated/resources/data/modernmetals/recipes/nichrome_pickaxe.json new file mode 100644 index 00000000..4ab31194 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/nichrome_pickaxe.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:nichrome_pickaxe" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + " s ", + " s " + ], + "key": { + "x": { + "tag": "forge:ingots/nichrome" + }, + "s": { + "item": "minecraft:stick" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/nichrome_plate.json b/src/generated/resources/data/modernmetals/recipes/nichrome_plate.json new file mode 100644 index 00000000..ffbfa6a3 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/nichrome_plate.json @@ -0,0 +1,17 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:nichrome_plate" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "tag": "forge:ingots/nichrome" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/nichrome_powder.json b/src/generated/resources/data/modernmetals/recipes/nichrome_powder.json new file mode 100644 index 00000000..899a71ac --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/nichrome_powder.json @@ -0,0 +1,19 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:nichrome_powder" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "forge:tiny_dusts/nichrome" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/nichrome_pressureplate.json b/src/generated/resources/data/modernmetals/recipes/nichrome_pressureplate.json new file mode 100644 index 00000000..31048cec --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/nichrome_pressureplate.json @@ -0,0 +1,17 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:nichrome_pressure_plate" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx" + ], + "key": { + "x": { + "tag": "forge:ingots/nichrome" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/nichrome_rod.json b/src/generated/resources/data/modernmetals/recipes/nichrome_rod.json new file mode 100644 index 00000000..496c96b9 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/nichrome_rod.json @@ -0,0 +1,18 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:nichrome_rod" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + " x ", + " x " + ], + "key": { + "x": { + "tag": "forge:ingots/nichrome" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/nichrome_scythe.json b/src/generated/resources/data/modernmetals/recipes/nichrome_scythe.json new file mode 100644 index 00000000..74dc0044 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/nichrome_scythe.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:nichrome_scythe" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "ii ", + " i", + " s " + ], + "key": { + "i": { + "tag": "forge:ingots/nichrome" + }, + "s": { + "item": "minecraft:stick" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/nichrome_shears.json b/src/generated/resources/data/modernmetals/recipes/nichrome_shears.json new file mode 100644 index 00000000..00c0dcd2 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/nichrome_shears.json @@ -0,0 +1,18 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:nichrome_shears" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + " x", + "x " + ], + "key": { + "x": { + "tag": "forge:ingots/nichrome" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/nichrome_shield.json b/src/generated/resources/data/modernmetals/recipes/nichrome_shield.json new file mode 100644 index 00000000..bc009d9e --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/nichrome_shield.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:nichrome_shield" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xyx", + "xxx", + " x " + ], + "key": { + "x": { + "tag": "forge:ingots/nichrome" + }, + "y": { + "tag": "minecraft:planks" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/nichrome_shovel.json b/src/generated/resources/data/modernmetals/recipes/nichrome_shovel.json new file mode 100644 index 00000000..cf854e9f --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/nichrome_shovel.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:nichrome_shovel" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "s", + "s" + ], + "key": { + "x": { + "tag": "forge:ingots/nichrome" + }, + "s": { + "item": "minecraft:stick" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/nichrome_slab.json b/src/generated/resources/data/modernmetals/recipes/nichrome_slab.json new file mode 100644 index 00000000..4f41af33 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/nichrome_slab.json @@ -0,0 +1,18 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:nichrome_slab", + "count": 6 + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "tag": "forge:storage_blocks/nichrome" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/nichrome_smallblend_blend.json b/src/generated/resources/data/modernmetals/recipes/nichrome_smallblend_blend.json new file mode 100644 index 00000000..21d2223b --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/nichrome_smallblend_blend.json @@ -0,0 +1,15 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:nichrome_smallblend", + "count": 9 + }, + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "forge:blends/nichrome" + } + ] + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/nichrome_smallpowder.json b/src/generated/resources/data/modernmetals/recipes/nichrome_smallpowder.json new file mode 100644 index 00000000..90b7a831 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/nichrome_smallpowder.json @@ -0,0 +1,15 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:nichrome_smallpowder", + "count": 9 + }, + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "forge:dusts/nichrome" + } + ] + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/nichrome_stairs.json b/src/generated/resources/data/modernmetals/recipes/nichrome_stairs.json new file mode 100644 index 00000000..d8094d5a --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/nichrome_stairs.json @@ -0,0 +1,20 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:nichrome_stairs", + "count": 4 + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "forge:storage_blocks/nichrome" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/nichrome_sword.json b/src/generated/resources/data/modernmetals/recipes/nichrome_sword.json new file mode 100644 index 00000000..df4b74cb --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/nichrome_sword.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:nichrome_sword" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "x", + "s" + ], + "key": { + "x": { + "tag": "forge:ingots/nichrome" + }, + "s": { + "item": "minecraft:stick" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/nichrome_trapdoor.json b/src/generated/resources/data/modernmetals/recipes/nichrome_trapdoor.json new file mode 100644 index 00000000..a10e754c --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/nichrome_trapdoor.json @@ -0,0 +1,18 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:nichrome_trapdoor" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "tag": "forge:ingots/nichrome" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/nichrome_wall.json b/src/generated/resources/data/modernmetals/recipes/nichrome_wall.json new file mode 100644 index 00000000..9eb4a279 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/nichrome_wall.json @@ -0,0 +1,19 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:nichrome_wall", + "count": 6 + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "forge:storage_blocks/nichrome" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/osmium_arrow.json b/src/generated/resources/data/modernmetals/recipes/osmium_arrow.json new file mode 100644 index 00000000..865638c9 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/osmium_arrow.json @@ -0,0 +1,26 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:osmium_arrow", + "count": 4 + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "y", + "z" + ], + "key": { + "x": { + "tag": "forge:nuggets/osmium" + }, + "y": { + "tag": "forge:rods/osmium" + }, + "z": { + "item": "minecraft:feather" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/osmium_axe.json b/src/generated/resources/data/modernmetals/recipes/osmium_axe.json new file mode 100644 index 00000000..4af57f85 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/osmium_axe.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:osmium_axe" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xs", + " s" + ], + "key": { + "x": { + "tag": "forge:ingots/osmium" + }, + "s": { + "item": "minecraft:stick" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/osmium_bars_1.json b/src/generated/resources/data/modernmetals/recipes/osmium_bars_1.json new file mode 100644 index 00000000..2283ce00 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/osmium_bars_1.json @@ -0,0 +1,19 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:osmium_bars", + "count": 16 + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "forge:ingots/osmium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/osmium_bars_2.json b/src/generated/resources/data/modernmetals/recipes/osmium_bars_2.json new file mode 100644 index 00000000..783f256d --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/osmium_bars_2.json @@ -0,0 +1,18 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:osmium_bars", + "count": 4 + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "tag": "forge:rods/osmium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/osmium_block.json b/src/generated/resources/data/modernmetals/recipes/osmium_block.json new file mode 100644 index 00000000..dc9f71c1 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/osmium_block.json @@ -0,0 +1,19 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:osmium_block" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "forge:ingots/osmium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/osmium_block_ingot.json b/src/generated/resources/data/modernmetals/recipes/osmium_block_ingot.json new file mode 100644 index 00000000..a4b3fe20 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/osmium_block_ingot.json @@ -0,0 +1,15 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:osmium_ingot", + "count": 9 + }, + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "forge:storage_blocks/osmium" + } + ] + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/osmium_bolt.json b/src/generated/resources/data/modernmetals/recipes/osmium_bolt.json new file mode 100644 index 00000000..09938563 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/osmium_bolt.json @@ -0,0 +1,23 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:osmium_bolt", + "count": 4 + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "x", + "y" + ], + "key": { + "x": { + "tag": "forge:rods/osmium" + }, + "y": { + "item": "minecraft:feather" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/osmium_boots.json b/src/generated/resources/data/modernmetals/recipes/osmium_boots.json new file mode 100644 index 00000000..8c5ac332 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/osmium_boots.json @@ -0,0 +1,18 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:osmium_boots" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "x x", + "x x" + ], + "key": { + "x": { + "tag": "forge:ingots/osmium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/osmium_bow.json b/src/generated/resources/data/modernmetals/recipes/osmium_bow.json new file mode 100644 index 00000000..e23c6287 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/osmium_bow.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:osmium_bow" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + " xs", + "x s", + " xs" + ], + "key": { + "x": { + "tag": "forge:rods/osmium" + }, + "s": { + "item": "minecraft:string" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/osmium_button.json b/src/generated/resources/data/modernmetals/recipes/osmium_button.json new file mode 100644 index 00000000..4a456781 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/osmium_button.json @@ -0,0 +1,18 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:osmium_button" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "x" + ], + "key": { + "x": { + "tag": "forge:nuggets/osmium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/osmium_chestplate.json b/src/generated/resources/data/modernmetals/recipes/osmium_chestplate.json new file mode 100644 index 00000000..101ff82e --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/osmium_chestplate.json @@ -0,0 +1,19 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:osmium_chestplate" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "x x", + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "forge:ingots/osmium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/osmium_crackhammer.json b/src/generated/resources/data/modernmetals/recipes/osmium_crackhammer.json new file mode 100644 index 00000000..846c575a --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/osmium_crackhammer.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:osmium_crackhammer" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "y", + "y" + ], + "key": { + "x": { + "tag": "forge:storage_blocks/osmium" + }, + "y": { + "item": "minecraft:stick" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/osmium_crossbow.json b/src/generated/resources/data/modernmetals/recipes/osmium_crossbow.json new file mode 100644 index 00000000..2f9b5fde --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/osmium_crossbow.json @@ -0,0 +1,25 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:osmium_crossbow" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "zxx", + " yx", + "x z" + ], + "key": { + "x": { + "tag": "forge:rods/osmium" + }, + "y": { + "item": "minecraft:string" + }, + "z": { + "tag": "forge:gears/osmium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/osmium_door.json b/src/generated/resources/data/modernmetals/recipes/osmium_door.json new file mode 100644 index 00000000..c0676196 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/osmium_door.json @@ -0,0 +1,20 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:osmium_door", + "count": 3 + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx", + "xx" + ], + "key": { + "x": { + "tag": "forge:ingots/osmium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/osmium_fishingrod.json b/src/generated/resources/data/modernmetals/recipes/osmium_fishingrod.json new file mode 100644 index 00000000..67b06fe3 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/osmium_fishingrod.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:osmium_fishing_rod" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + " x", + " xy", + "x y" + ], + "key": { + "x": { + "tag": "forge:rods/osmium" + }, + "y": { + "item": "minecraft:string" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/osmium_gear.json b/src/generated/resources/data/modernmetals/recipes/osmium_gear.json new file mode 100644 index 00000000..63226c52 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/osmium_gear.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:osmium_gear" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + " x ", + "xrx", + " x " + ], + "key": { + "x": { + "tag": "forge:ingots/osmium" + }, + "r": { + "tag": "forge:rods/osmium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/osmium_helmet.json b/src/generated/resources/data/modernmetals/recipes/osmium_helmet.json new file mode 100644 index 00000000..ae5b115c --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/osmium_helmet.json @@ -0,0 +1,18 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:osmium_helmet" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "x x" + ], + "key": { + "x": { + "tag": "forge:ingots/osmium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/osmium_hoe.json b/src/generated/resources/data/modernmetals/recipes/osmium_hoe.json new file mode 100644 index 00000000..c66cffd0 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/osmium_hoe.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:osmium_hoe" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + " s", + " s" + ], + "key": { + "x": { + "tag": "forge:ingots/osmium" + }, + "s": { + "item": "minecraft:stick" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/osmium_horsearmor.json b/src/generated/resources/data/modernmetals/recipes/osmium_horsearmor.json new file mode 100644 index 00000000..c8b6e906 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/osmium_horsearmor.json @@ -0,0 +1,69 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:osmium_horse_armor" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + " x", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "forge:ingots/osmium" + }, + "y": [ + { + "item": "minecraft:white_wool" + }, + { + "item": "minecraft:orange_wool" + }, + { + "item": "minecraft:magenta_wool" + }, + { + "item": "minecraft:light_blue_wool" + }, + { + "item": "minecraft:yellow_wool" + }, + { + "item": "minecraft:lime_wool" + }, + { + "item": "minecraft:pink_wool" + }, + { + "item": "minecraft:gray_wool" + }, + { + "item": "minecraft:light_gray_wool" + }, + { + "item": "minecraft:cyan_wool" + }, + { + "item": "minecraft:purple_wool" + }, + { + "item": "minecraft:blue_wool" + }, + { + "item": "minecraft:brown_wool" + }, + { + "item": "minecraft:green_wool" + }, + { + "item": "minecraft:red_wool" + }, + { + "item": "minecraft:black_wool" + } + ] + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/osmium_ingot.json b/src/generated/resources/data/modernmetals/recipes/osmium_ingot.json new file mode 100644 index 00000000..5927c04a --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/osmium_ingot.json @@ -0,0 +1,19 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:osmium_ingot" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "forge:nuggets/osmium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/osmium_leggings.json b/src/generated/resources/data/modernmetals/recipes/osmium_leggings.json new file mode 100644 index 00000000..9e443ed3 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/osmium_leggings.json @@ -0,0 +1,19 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:osmium_leggings" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "x x", + "x x" + ], + "key": { + "x": { + "tag": "forge:ingots/osmium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/osmium_lever.json b/src/generated/resources/data/modernmetals/recipes/osmium_lever.json new file mode 100644 index 00000000..cbedbd3d --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/osmium_lever.json @@ -0,0 +1,21 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:osmium_lever" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "y" + ], + "key": { + "x": { + "tag": "forge:rods/osmium" + }, + "y": { + "tag": "forge:ingots/osmium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/osmium_nugget.json b/src/generated/resources/data/modernmetals/recipes/osmium_nugget.json new file mode 100644 index 00000000..5eb0a1b9 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/osmium_nugget.json @@ -0,0 +1,15 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:osmium_nugget", + "count": 9 + }, + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "forge:ingots/osmium" + } + ] + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/osmium_pickaxe.json b/src/generated/resources/data/modernmetals/recipes/osmium_pickaxe.json new file mode 100644 index 00000000..57103220 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/osmium_pickaxe.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:osmium_pickaxe" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + " s ", + " s " + ], + "key": { + "x": { + "tag": "forge:ingots/osmium" + }, + "s": { + "item": "minecraft:stick" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/osmium_plate.json b/src/generated/resources/data/modernmetals/recipes/osmium_plate.json new file mode 100644 index 00000000..83cf7e55 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/osmium_plate.json @@ -0,0 +1,17 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:osmium_plate" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "tag": "forge:ingots/osmium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/osmium_powder.json b/src/generated/resources/data/modernmetals/recipes/osmium_powder.json new file mode 100644 index 00000000..eb64afbc --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/osmium_powder.json @@ -0,0 +1,19 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:osmium_powder" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "forge:tiny_dusts/osmium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/osmium_pressureplate.json b/src/generated/resources/data/modernmetals/recipes/osmium_pressureplate.json new file mode 100644 index 00000000..6eea3e83 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/osmium_pressureplate.json @@ -0,0 +1,17 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:osmium_pressure_plate" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx" + ], + "key": { + "x": { + "tag": "forge:ingots/osmium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/osmium_rod.json b/src/generated/resources/data/modernmetals/recipes/osmium_rod.json new file mode 100644 index 00000000..29107414 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/osmium_rod.json @@ -0,0 +1,18 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:osmium_rod" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + " x ", + " x " + ], + "key": { + "x": { + "tag": "forge:ingots/osmium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/osmium_scythe.json b/src/generated/resources/data/modernmetals/recipes/osmium_scythe.json new file mode 100644 index 00000000..26b2edbe --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/osmium_scythe.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:osmium_scythe" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "ii ", + " i", + " s " + ], + "key": { + "i": { + "tag": "forge:ingots/osmium" + }, + "s": { + "item": "minecraft:stick" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/osmium_shears.json b/src/generated/resources/data/modernmetals/recipes/osmium_shears.json new file mode 100644 index 00000000..6976caba --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/osmium_shears.json @@ -0,0 +1,18 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:osmium_shears" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + " x", + "x " + ], + "key": { + "x": { + "tag": "forge:ingots/osmium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/osmium_shield.json b/src/generated/resources/data/modernmetals/recipes/osmium_shield.json new file mode 100644 index 00000000..3bb0823f --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/osmium_shield.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:osmium_shield" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xyx", + "xxx", + " x " + ], + "key": { + "x": { + "tag": "forge:ingots/osmium" + }, + "y": { + "tag": "minecraft:planks" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/osmium_shovel.json b/src/generated/resources/data/modernmetals/recipes/osmium_shovel.json new file mode 100644 index 00000000..a62471b7 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/osmium_shovel.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:osmium_shovel" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "s", + "s" + ], + "key": { + "x": { + "tag": "forge:ingots/osmium" + }, + "s": { + "item": "minecraft:stick" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/osmium_slab.json b/src/generated/resources/data/modernmetals/recipes/osmium_slab.json new file mode 100644 index 00000000..8dbcfdf5 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/osmium_slab.json @@ -0,0 +1,18 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:osmium_slab", + "count": 6 + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "tag": "forge:storage_blocks/osmium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/osmium_smallpowder.json b/src/generated/resources/data/modernmetals/recipes/osmium_smallpowder.json new file mode 100644 index 00000000..d5172aff --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/osmium_smallpowder.json @@ -0,0 +1,15 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:osmium_smallpowder", + "count": 9 + }, + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "forge:dusts/osmium" + } + ] + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/osmium_stairs.json b/src/generated/resources/data/modernmetals/recipes/osmium_stairs.json new file mode 100644 index 00000000..dc509e8d --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/osmium_stairs.json @@ -0,0 +1,20 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:osmium_stairs", + "count": 4 + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "forge:storage_blocks/osmium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/osmium_sword.json b/src/generated/resources/data/modernmetals/recipes/osmium_sword.json new file mode 100644 index 00000000..d146206c --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/osmium_sword.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:osmium_sword" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "x", + "s" + ], + "key": { + "x": { + "tag": "forge:ingots/osmium" + }, + "s": { + "item": "minecraft:stick" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/osmium_trapdoor.json b/src/generated/resources/data/modernmetals/recipes/osmium_trapdoor.json new file mode 100644 index 00000000..65dd2075 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/osmium_trapdoor.json @@ -0,0 +1,18 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:osmium_trapdoor" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "tag": "forge:ingots/osmium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/osmium_wall.json b/src/generated/resources/data/modernmetals/recipes/osmium_wall.json new file mode 100644 index 00000000..0965cf72 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/osmium_wall.json @@ -0,0 +1,19 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:osmium_wall", + "count": 6 + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "forge:storage_blocks/osmium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/plutonium_arrow.json b/src/generated/resources/data/modernmetals/recipes/plutonium_arrow.json new file mode 100644 index 00000000..192d3300 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/plutonium_arrow.json @@ -0,0 +1,26 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:plutonium_arrow", + "count": 4 + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "y", + "z" + ], + "key": { + "x": { + "tag": "forge:nuggets/plutonium" + }, + "y": { + "tag": "forge:rods/plutonium" + }, + "z": { + "item": "minecraft:feather" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/plutonium_axe.json b/src/generated/resources/data/modernmetals/recipes/plutonium_axe.json new file mode 100644 index 00000000..b54edd70 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/plutonium_axe.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:plutonium_axe" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xs", + " s" + ], + "key": { + "x": { + "tag": "forge:ingots/plutonium" + }, + "s": { + "item": "minecraft:stick" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/plutonium_bars_1.json b/src/generated/resources/data/modernmetals/recipes/plutonium_bars_1.json new file mode 100644 index 00000000..4aa539c5 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/plutonium_bars_1.json @@ -0,0 +1,19 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:plutonium_bars", + "count": 16 + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "forge:ingots/plutonium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/plutonium_bars_2.json b/src/generated/resources/data/modernmetals/recipes/plutonium_bars_2.json new file mode 100644 index 00000000..81be211b --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/plutonium_bars_2.json @@ -0,0 +1,18 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:plutonium_bars", + "count": 4 + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "tag": "forge:rods/plutonium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/plutonium_block.json b/src/generated/resources/data/modernmetals/recipes/plutonium_block.json new file mode 100644 index 00000000..b931708a --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/plutonium_block.json @@ -0,0 +1,19 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:plutonium_block" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "forge:ingots/plutonium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/plutonium_block_ingot.json b/src/generated/resources/data/modernmetals/recipes/plutonium_block_ingot.json new file mode 100644 index 00000000..6ee6d0bc --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/plutonium_block_ingot.json @@ -0,0 +1,15 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:plutonium_ingot", + "count": 9 + }, + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "forge:storage_blocks/plutonium" + } + ] + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/plutonium_bolt.json b/src/generated/resources/data/modernmetals/recipes/plutonium_bolt.json new file mode 100644 index 00000000..21805c3f --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/plutonium_bolt.json @@ -0,0 +1,23 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:plutonium_bolt", + "count": 4 + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "x", + "y" + ], + "key": { + "x": { + "tag": "forge:rods/plutonium" + }, + "y": { + "item": "minecraft:feather" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/plutonium_boots.json b/src/generated/resources/data/modernmetals/recipes/plutonium_boots.json new file mode 100644 index 00000000..82f27f1a --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/plutonium_boots.json @@ -0,0 +1,18 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:plutonium_boots" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "x x", + "x x" + ], + "key": { + "x": { + "tag": "forge:ingots/plutonium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/plutonium_bow.json b/src/generated/resources/data/modernmetals/recipes/plutonium_bow.json new file mode 100644 index 00000000..25382ff8 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/plutonium_bow.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:plutonium_bow" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + " xs", + "x s", + " xs" + ], + "key": { + "x": { + "tag": "forge:rods/plutonium" + }, + "s": { + "item": "minecraft:string" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/plutonium_button.json b/src/generated/resources/data/modernmetals/recipes/plutonium_button.json new file mode 100644 index 00000000..c40df4b0 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/plutonium_button.json @@ -0,0 +1,18 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:plutonium_button" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "x" + ], + "key": { + "x": { + "tag": "forge:nuggets/plutonium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/plutonium_chestplate.json b/src/generated/resources/data/modernmetals/recipes/plutonium_chestplate.json new file mode 100644 index 00000000..24bba856 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/plutonium_chestplate.json @@ -0,0 +1,19 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:plutonium_chestplate" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "x x", + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "forge:ingots/plutonium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/plutonium_crackhammer.json b/src/generated/resources/data/modernmetals/recipes/plutonium_crackhammer.json new file mode 100644 index 00000000..4ab2a0b3 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/plutonium_crackhammer.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:plutonium_crackhammer" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "y", + "y" + ], + "key": { + "x": { + "tag": "forge:storage_blocks/plutonium" + }, + "y": { + "item": "minecraft:stick" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/plutonium_crossbow.json b/src/generated/resources/data/modernmetals/recipes/plutonium_crossbow.json new file mode 100644 index 00000000..270fc0bb --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/plutonium_crossbow.json @@ -0,0 +1,25 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:plutonium_crossbow" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "zxx", + " yx", + "x z" + ], + "key": { + "x": { + "tag": "forge:rods/plutonium" + }, + "y": { + "item": "minecraft:string" + }, + "z": { + "tag": "forge:gears/plutonium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/plutonium_door.json b/src/generated/resources/data/modernmetals/recipes/plutonium_door.json new file mode 100644 index 00000000..2c58a4b7 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/plutonium_door.json @@ -0,0 +1,20 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:plutonium_door", + "count": 3 + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx", + "xx" + ], + "key": { + "x": { + "tag": "forge:ingots/plutonium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/plutonium_fishingrod.json b/src/generated/resources/data/modernmetals/recipes/plutonium_fishingrod.json new file mode 100644 index 00000000..fd112c42 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/plutonium_fishingrod.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:plutonium_fishing_rod" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + " x", + " xy", + "x y" + ], + "key": { + "x": { + "tag": "forge:rods/plutonium" + }, + "y": { + "item": "minecraft:string" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/plutonium_gear.json b/src/generated/resources/data/modernmetals/recipes/plutonium_gear.json new file mode 100644 index 00000000..532f0d96 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/plutonium_gear.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:plutonium_gear" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + " x ", + "xrx", + " x " + ], + "key": { + "x": { + "tag": "forge:ingots/plutonium" + }, + "r": { + "tag": "forge:rods/plutonium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/plutonium_helmet.json b/src/generated/resources/data/modernmetals/recipes/plutonium_helmet.json new file mode 100644 index 00000000..d8afdd10 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/plutonium_helmet.json @@ -0,0 +1,18 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:plutonium_helmet" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "x x" + ], + "key": { + "x": { + "tag": "forge:ingots/plutonium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/plutonium_hoe.json b/src/generated/resources/data/modernmetals/recipes/plutonium_hoe.json new file mode 100644 index 00000000..ac534726 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/plutonium_hoe.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:plutonium_hoe" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + " s", + " s" + ], + "key": { + "x": { + "tag": "forge:ingots/plutonium" + }, + "s": { + "item": "minecraft:stick" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/plutonium_horsearmor.json b/src/generated/resources/data/modernmetals/recipes/plutonium_horsearmor.json new file mode 100644 index 00000000..99ea6baf --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/plutonium_horsearmor.json @@ -0,0 +1,69 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:plutonium_horse_armor" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + " x", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "forge:ingots/plutonium" + }, + "y": [ + { + "item": "minecraft:white_wool" + }, + { + "item": "minecraft:orange_wool" + }, + { + "item": "minecraft:magenta_wool" + }, + { + "item": "minecraft:light_blue_wool" + }, + { + "item": "minecraft:yellow_wool" + }, + { + "item": "minecraft:lime_wool" + }, + { + "item": "minecraft:pink_wool" + }, + { + "item": "minecraft:gray_wool" + }, + { + "item": "minecraft:light_gray_wool" + }, + { + "item": "minecraft:cyan_wool" + }, + { + "item": "minecraft:purple_wool" + }, + { + "item": "minecraft:blue_wool" + }, + { + "item": "minecraft:brown_wool" + }, + { + "item": "minecraft:green_wool" + }, + { + "item": "minecraft:red_wool" + }, + { + "item": "minecraft:black_wool" + } + ] + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/plutonium_ingot.json b/src/generated/resources/data/modernmetals/recipes/plutonium_ingot.json new file mode 100644 index 00000000..9e9b5963 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/plutonium_ingot.json @@ -0,0 +1,19 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:plutonium_ingot" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "forge:nuggets/plutonium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/plutonium_leggings.json b/src/generated/resources/data/modernmetals/recipes/plutonium_leggings.json new file mode 100644 index 00000000..3b7e0f60 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/plutonium_leggings.json @@ -0,0 +1,19 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:plutonium_leggings" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "x x", + "x x" + ], + "key": { + "x": { + "tag": "forge:ingots/plutonium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/plutonium_lever.json b/src/generated/resources/data/modernmetals/recipes/plutonium_lever.json new file mode 100644 index 00000000..a4a267e7 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/plutonium_lever.json @@ -0,0 +1,21 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:plutonium_lever" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "y" + ], + "key": { + "x": { + "tag": "forge:rods/plutonium" + }, + "y": { + "tag": "forge:ingots/plutonium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/plutonium_nugget.json b/src/generated/resources/data/modernmetals/recipes/plutonium_nugget.json new file mode 100644 index 00000000..5d3ca1f0 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/plutonium_nugget.json @@ -0,0 +1,15 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:plutonium_nugget", + "count": 9 + }, + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "forge:ingots/plutonium" + } + ] + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/plutonium_pickaxe.json b/src/generated/resources/data/modernmetals/recipes/plutonium_pickaxe.json new file mode 100644 index 00000000..9a3af5cd --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/plutonium_pickaxe.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:plutonium_pickaxe" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + " s ", + " s " + ], + "key": { + "x": { + "tag": "forge:ingots/plutonium" + }, + "s": { + "item": "minecraft:stick" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/plutonium_plate.json b/src/generated/resources/data/modernmetals/recipes/plutonium_plate.json new file mode 100644 index 00000000..e7161505 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/plutonium_plate.json @@ -0,0 +1,17 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:plutonium_plate" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "tag": "forge:ingots/plutonium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/plutonium_powder.json b/src/generated/resources/data/modernmetals/recipes/plutonium_powder.json new file mode 100644 index 00000000..ebe35520 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/plutonium_powder.json @@ -0,0 +1,19 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:plutonium_powder" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "forge:tiny_dusts/plutonium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/plutonium_pressureplate.json b/src/generated/resources/data/modernmetals/recipes/plutonium_pressureplate.json new file mode 100644 index 00000000..7614f652 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/plutonium_pressureplate.json @@ -0,0 +1,17 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:plutonium_pressure_plate" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx" + ], + "key": { + "x": { + "tag": "forge:ingots/plutonium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/plutonium_rod.json b/src/generated/resources/data/modernmetals/recipes/plutonium_rod.json new file mode 100644 index 00000000..a50b1826 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/plutonium_rod.json @@ -0,0 +1,18 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:plutonium_rod" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + " x ", + " x " + ], + "key": { + "x": { + "tag": "forge:ingots/plutonium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/plutonium_scythe.json b/src/generated/resources/data/modernmetals/recipes/plutonium_scythe.json new file mode 100644 index 00000000..7d5357a4 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/plutonium_scythe.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:plutonium_scythe" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "ii ", + " i", + " s " + ], + "key": { + "i": { + "tag": "forge:ingots/plutonium" + }, + "s": { + "item": "minecraft:stick" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/plutonium_shears.json b/src/generated/resources/data/modernmetals/recipes/plutonium_shears.json new file mode 100644 index 00000000..0f41c2f8 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/plutonium_shears.json @@ -0,0 +1,18 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:plutonium_shears" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + " x", + "x " + ], + "key": { + "x": { + "tag": "forge:ingots/plutonium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/plutonium_shield.json b/src/generated/resources/data/modernmetals/recipes/plutonium_shield.json new file mode 100644 index 00000000..0b98ea24 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/plutonium_shield.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:plutonium_shield" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xyx", + "xxx", + " x " + ], + "key": { + "x": { + "tag": "forge:ingots/plutonium" + }, + "y": { + "tag": "minecraft:planks" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/plutonium_shovel.json b/src/generated/resources/data/modernmetals/recipes/plutonium_shovel.json new file mode 100644 index 00000000..3ceac2a1 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/plutonium_shovel.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:plutonium_shovel" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "s", + "s" + ], + "key": { + "x": { + "tag": "forge:ingots/plutonium" + }, + "s": { + "item": "minecraft:stick" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/plutonium_slab.json b/src/generated/resources/data/modernmetals/recipes/plutonium_slab.json new file mode 100644 index 00000000..2e15d6a4 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/plutonium_slab.json @@ -0,0 +1,18 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:plutonium_slab", + "count": 6 + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "tag": "forge:storage_blocks/plutonium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/plutonium_smallpowder.json b/src/generated/resources/data/modernmetals/recipes/plutonium_smallpowder.json new file mode 100644 index 00000000..8cc56cd9 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/plutonium_smallpowder.json @@ -0,0 +1,15 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:plutonium_smallpowder", + "count": 9 + }, + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "forge:dusts/plutonium" + } + ] + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/plutonium_stairs.json b/src/generated/resources/data/modernmetals/recipes/plutonium_stairs.json new file mode 100644 index 00000000..5d341d24 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/plutonium_stairs.json @@ -0,0 +1,20 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:plutonium_stairs", + "count": 4 + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "forge:storage_blocks/plutonium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/plutonium_sword.json b/src/generated/resources/data/modernmetals/recipes/plutonium_sword.json new file mode 100644 index 00000000..96a336ae --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/plutonium_sword.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:plutonium_sword" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "x", + "s" + ], + "key": { + "x": { + "tag": "forge:ingots/plutonium" + }, + "s": { + "item": "minecraft:stick" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/plutonium_trapdoor.json b/src/generated/resources/data/modernmetals/recipes/plutonium_trapdoor.json new file mode 100644 index 00000000..b259ea81 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/plutonium_trapdoor.json @@ -0,0 +1,18 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:plutonium_trapdoor" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "tag": "forge:ingots/plutonium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/plutonium_wall.json b/src/generated/resources/data/modernmetals/recipes/plutonium_wall.json new file mode 100644 index 00000000..31513f9d --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/plutonium_wall.json @@ -0,0 +1,19 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:plutonium_wall", + "count": 6 + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "forge:storage_blocks/plutonium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/rutile_arrow.json b/src/generated/resources/data/modernmetals/recipes/rutile_arrow.json new file mode 100644 index 00000000..dda61d07 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/rutile_arrow.json @@ -0,0 +1,26 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:rutile_arrow", + "count": 4 + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "y", + "z" + ], + "key": { + "x": { + "tag": "forge:nuggets/rutile" + }, + "y": { + "tag": "forge:rods/rutile" + }, + "z": { + "item": "minecraft:feather" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/rutile_axe.json b/src/generated/resources/data/modernmetals/recipes/rutile_axe.json new file mode 100644 index 00000000..68c44822 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/rutile_axe.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:rutile_axe" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xs", + " s" + ], + "key": { + "x": { + "tag": "forge:ingots/rutile" + }, + "s": { + "item": "minecraft:stick" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/rutile_bars_1.json b/src/generated/resources/data/modernmetals/recipes/rutile_bars_1.json new file mode 100644 index 00000000..6d5ed967 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/rutile_bars_1.json @@ -0,0 +1,19 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:rutile_bars", + "count": 16 + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "forge:ingots/rutile" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/rutile_bars_2.json b/src/generated/resources/data/modernmetals/recipes/rutile_bars_2.json new file mode 100644 index 00000000..54014576 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/rutile_bars_2.json @@ -0,0 +1,18 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:rutile_bars", + "count": 4 + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "tag": "forge:rods/rutile" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/rutile_block.json b/src/generated/resources/data/modernmetals/recipes/rutile_block.json new file mode 100644 index 00000000..60ee5fff --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/rutile_block.json @@ -0,0 +1,19 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:rutile_block" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "forge:ingots/rutile" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/rutile_block_ingot.json b/src/generated/resources/data/modernmetals/recipes/rutile_block_ingot.json new file mode 100644 index 00000000..1f7f64fb --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/rutile_block_ingot.json @@ -0,0 +1,15 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:rutile_ingot", + "count": 9 + }, + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "forge:storage_blocks/rutile" + } + ] + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/rutile_bolt.json b/src/generated/resources/data/modernmetals/recipes/rutile_bolt.json new file mode 100644 index 00000000..e0ac3ae1 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/rutile_bolt.json @@ -0,0 +1,23 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:rutile_bolt", + "count": 4 + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "x", + "y" + ], + "key": { + "x": { + "tag": "forge:rods/rutile" + }, + "y": { + "item": "minecraft:feather" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/rutile_boots.json b/src/generated/resources/data/modernmetals/recipes/rutile_boots.json new file mode 100644 index 00000000..e856d058 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/rutile_boots.json @@ -0,0 +1,18 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:rutile_boots" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "x x", + "x x" + ], + "key": { + "x": { + "tag": "forge:ingots/rutile" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/rutile_bow.json b/src/generated/resources/data/modernmetals/recipes/rutile_bow.json new file mode 100644 index 00000000..6d6d2854 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/rutile_bow.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:rutile_bow" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + " xs", + "x s", + " xs" + ], + "key": { + "x": { + "tag": "forge:rods/rutile" + }, + "s": { + "item": "minecraft:string" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/rutile_button.json b/src/generated/resources/data/modernmetals/recipes/rutile_button.json new file mode 100644 index 00000000..f40b9a10 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/rutile_button.json @@ -0,0 +1,18 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:rutile_button" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "x" + ], + "key": { + "x": { + "tag": "forge:nuggets/rutile" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/rutile_chestplate.json b/src/generated/resources/data/modernmetals/recipes/rutile_chestplate.json new file mode 100644 index 00000000..c8c3b15c --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/rutile_chestplate.json @@ -0,0 +1,19 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:rutile_chestplate" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "x x", + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "forge:ingots/rutile" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/rutile_crackhammer.json b/src/generated/resources/data/modernmetals/recipes/rutile_crackhammer.json new file mode 100644 index 00000000..989aede1 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/rutile_crackhammer.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:rutile_crackhammer" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "y", + "y" + ], + "key": { + "x": { + "tag": "forge:storage_blocks/rutile" + }, + "y": { + "item": "minecraft:stick" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/rutile_crossbow.json b/src/generated/resources/data/modernmetals/recipes/rutile_crossbow.json new file mode 100644 index 00000000..f70ed654 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/rutile_crossbow.json @@ -0,0 +1,25 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:rutile_crossbow" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "zxx", + " yx", + "x z" + ], + "key": { + "x": { + "tag": "forge:rods/rutile" + }, + "y": { + "item": "minecraft:string" + }, + "z": { + "tag": "forge:gears/rutile" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/rutile_door.json b/src/generated/resources/data/modernmetals/recipes/rutile_door.json new file mode 100644 index 00000000..e2a0e5fc --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/rutile_door.json @@ -0,0 +1,20 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:rutile_door", + "count": 3 + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx", + "xx" + ], + "key": { + "x": { + "tag": "forge:ingots/rutile" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/rutile_fishingrod.json b/src/generated/resources/data/modernmetals/recipes/rutile_fishingrod.json new file mode 100644 index 00000000..03a939cb --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/rutile_fishingrod.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:rutile_fishing_rod" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + " x", + " xy", + "x y" + ], + "key": { + "x": { + "tag": "forge:rods/rutile" + }, + "y": { + "item": "minecraft:string" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/rutile_gear.json b/src/generated/resources/data/modernmetals/recipes/rutile_gear.json new file mode 100644 index 00000000..f237481d --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/rutile_gear.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:rutile_gear" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + " x ", + "xrx", + " x " + ], + "key": { + "x": { + "tag": "forge:ingots/rutile" + }, + "r": { + "tag": "forge:rods/rutile" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/rutile_helmet.json b/src/generated/resources/data/modernmetals/recipes/rutile_helmet.json new file mode 100644 index 00000000..d02d2aaf --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/rutile_helmet.json @@ -0,0 +1,18 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:rutile_helmet" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "x x" + ], + "key": { + "x": { + "tag": "forge:ingots/rutile" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/rutile_hoe.json b/src/generated/resources/data/modernmetals/recipes/rutile_hoe.json new file mode 100644 index 00000000..0a4ac560 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/rutile_hoe.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:rutile_hoe" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + " s", + " s" + ], + "key": { + "x": { + "tag": "forge:ingots/rutile" + }, + "s": { + "item": "minecraft:stick" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/rutile_horsearmor.json b/src/generated/resources/data/modernmetals/recipes/rutile_horsearmor.json new file mode 100644 index 00000000..f0492152 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/rutile_horsearmor.json @@ -0,0 +1,69 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:rutile_horse_armor" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + " x", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "forge:ingots/rutile" + }, + "y": [ + { + "item": "minecraft:white_wool" + }, + { + "item": "minecraft:orange_wool" + }, + { + "item": "minecraft:magenta_wool" + }, + { + "item": "minecraft:light_blue_wool" + }, + { + "item": "minecraft:yellow_wool" + }, + { + "item": "minecraft:lime_wool" + }, + { + "item": "minecraft:pink_wool" + }, + { + "item": "minecraft:gray_wool" + }, + { + "item": "minecraft:light_gray_wool" + }, + { + "item": "minecraft:cyan_wool" + }, + { + "item": "minecraft:purple_wool" + }, + { + "item": "minecraft:blue_wool" + }, + { + "item": "minecraft:brown_wool" + }, + { + "item": "minecraft:green_wool" + }, + { + "item": "minecraft:red_wool" + }, + { + "item": "minecraft:black_wool" + } + ] + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/rutile_ingot.json b/src/generated/resources/data/modernmetals/recipes/rutile_ingot.json new file mode 100644 index 00000000..4e46a79e --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/rutile_ingot.json @@ -0,0 +1,19 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:rutile_ingot" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "forge:nuggets/rutile" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/rutile_leggings.json b/src/generated/resources/data/modernmetals/recipes/rutile_leggings.json new file mode 100644 index 00000000..6f4afc55 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/rutile_leggings.json @@ -0,0 +1,19 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:rutile_leggings" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "x x", + "x x" + ], + "key": { + "x": { + "tag": "forge:ingots/rutile" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/rutile_lever.json b/src/generated/resources/data/modernmetals/recipes/rutile_lever.json new file mode 100644 index 00000000..624b9c6b --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/rutile_lever.json @@ -0,0 +1,21 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:rutile_lever" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "y" + ], + "key": { + "x": { + "tag": "forge:rods/rutile" + }, + "y": { + "tag": "forge:ingots/rutile" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/rutile_nugget.json b/src/generated/resources/data/modernmetals/recipes/rutile_nugget.json new file mode 100644 index 00000000..5c8789b3 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/rutile_nugget.json @@ -0,0 +1,15 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:rutile_nugget", + "count": 9 + }, + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "forge:ingots/rutile" + } + ] + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/rutile_pickaxe.json b/src/generated/resources/data/modernmetals/recipes/rutile_pickaxe.json new file mode 100644 index 00000000..44d1cc0a --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/rutile_pickaxe.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:rutile_pickaxe" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + " s ", + " s " + ], + "key": { + "x": { + "tag": "forge:ingots/rutile" + }, + "s": { + "item": "minecraft:stick" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/rutile_plate.json b/src/generated/resources/data/modernmetals/recipes/rutile_plate.json new file mode 100644 index 00000000..fd68b0db --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/rutile_plate.json @@ -0,0 +1,17 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:rutile_plate" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "tag": "forge:ingots/rutile" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/rutile_powder.json b/src/generated/resources/data/modernmetals/recipes/rutile_powder.json new file mode 100644 index 00000000..31b01ef6 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/rutile_powder.json @@ -0,0 +1,19 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:rutile_powder" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "forge:tiny_dusts/rutile" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/rutile_pressureplate.json b/src/generated/resources/data/modernmetals/recipes/rutile_pressureplate.json new file mode 100644 index 00000000..2e0e3c0a --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/rutile_pressureplate.json @@ -0,0 +1,17 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:rutile_pressure_plate" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx" + ], + "key": { + "x": { + "tag": "forge:ingots/rutile" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/rutile_rod.json b/src/generated/resources/data/modernmetals/recipes/rutile_rod.json new file mode 100644 index 00000000..9cabc26f --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/rutile_rod.json @@ -0,0 +1,18 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:rutile_rod" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + " x ", + " x " + ], + "key": { + "x": { + "tag": "forge:ingots/rutile" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/rutile_scythe.json b/src/generated/resources/data/modernmetals/recipes/rutile_scythe.json new file mode 100644 index 00000000..90022bcb --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/rutile_scythe.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:rutile_scythe" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "ii ", + " i", + " s " + ], + "key": { + "i": { + "tag": "forge:ingots/rutile" + }, + "s": { + "item": "minecraft:stick" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/rutile_shears.json b/src/generated/resources/data/modernmetals/recipes/rutile_shears.json new file mode 100644 index 00000000..85eec85c --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/rutile_shears.json @@ -0,0 +1,18 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:rutile_shears" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + " x", + "x " + ], + "key": { + "x": { + "tag": "forge:ingots/rutile" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/rutile_shield.json b/src/generated/resources/data/modernmetals/recipes/rutile_shield.json new file mode 100644 index 00000000..69ec247d --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/rutile_shield.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:rutile_shield" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xyx", + "xxx", + " x " + ], + "key": { + "x": { + "tag": "forge:ingots/rutile" + }, + "y": { + "tag": "minecraft:planks" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/rutile_shovel.json b/src/generated/resources/data/modernmetals/recipes/rutile_shovel.json new file mode 100644 index 00000000..b1d0409c --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/rutile_shovel.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:rutile_shovel" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "s", + "s" + ], + "key": { + "x": { + "tag": "forge:ingots/rutile" + }, + "s": { + "item": "minecraft:stick" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/rutile_slab.json b/src/generated/resources/data/modernmetals/recipes/rutile_slab.json new file mode 100644 index 00000000..8c7780b9 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/rutile_slab.json @@ -0,0 +1,18 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:rutile_slab", + "count": 6 + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "tag": "forge:storage_blocks/rutile" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/rutile_smallpowder.json b/src/generated/resources/data/modernmetals/recipes/rutile_smallpowder.json new file mode 100644 index 00000000..20b2fb10 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/rutile_smallpowder.json @@ -0,0 +1,15 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:rutile_smallpowder", + "count": 9 + }, + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "forge:dusts/rutile" + } + ] + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/rutile_stairs.json b/src/generated/resources/data/modernmetals/recipes/rutile_stairs.json new file mode 100644 index 00000000..9719bcae --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/rutile_stairs.json @@ -0,0 +1,20 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:rutile_stairs", + "count": 4 + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "forge:storage_blocks/rutile" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/rutile_sword.json b/src/generated/resources/data/modernmetals/recipes/rutile_sword.json new file mode 100644 index 00000000..0fb73fd4 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/rutile_sword.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:rutile_sword" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "x", + "s" + ], + "key": { + "x": { + "tag": "forge:ingots/rutile" + }, + "s": { + "item": "minecraft:stick" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/rutile_trapdoor.json b/src/generated/resources/data/modernmetals/recipes/rutile_trapdoor.json new file mode 100644 index 00000000..642919ad --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/rutile_trapdoor.json @@ -0,0 +1,18 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:rutile_trapdoor" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "tag": "forge:ingots/rutile" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/rutile_wall.json b/src/generated/resources/data/modernmetals/recipes/rutile_wall.json new file mode 100644 index 00000000..2493edad --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/rutile_wall.json @@ -0,0 +1,19 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:rutile_wall", + "count": 6 + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "forge:storage_blocks/rutile" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/smelting/aluminum_ore.json b/src/generated/resources/data/modernmetals/recipes/smelting/aluminum_ore.json new file mode 100644 index 00000000..be4c40a4 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/smelting/aluminum_ore.json @@ -0,0 +1,9 @@ +{ + "type": "minecraft:smelting", + "ingredient": { + "item": "modernmetals:aluminum_ore" + }, + "result": "modernmetals:aluminum_ingot", + "experience": 0.45, + "cookingtime": 200 +} diff --git a/src/generated/resources/data/modernmetals/recipes/smelting/aluminum_powder.json b/src/generated/resources/data/modernmetals/recipes/smelting/aluminum_powder.json new file mode 100644 index 00000000..d6179840 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/smelting/aluminum_powder.json @@ -0,0 +1,9 @@ +{ + "type": "minecraft:smelting", + "ingredient": { + "item": "modernmetals:aluminum_powder" + }, + "result": "modernmetals:aluminum_ingot", + "experience": 0.45, + "cookingtime": 200 +} diff --git a/src/generated/resources/data/modernmetals/recipes/smelting/aluminumbrass_blend.json b/src/generated/resources/data/modernmetals/recipes/smelting/aluminumbrass_blend.json new file mode 100644 index 00000000..fff0c16f --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/smelting/aluminumbrass_blend.json @@ -0,0 +1,9 @@ +{ + "type": "minecraft:smelting", + "ingredient": { + "item": "modernmetals:aluminumbrass_blend" + }, + "result": "modernmetals:aluminumbrass_ingot", + "experience": 0.45, + "cookingtime": 200 +} diff --git a/src/generated/resources/data/modernmetals/recipes/smelting/aluminumbrass_powder.json b/src/generated/resources/data/modernmetals/recipes/smelting/aluminumbrass_powder.json new file mode 100644 index 00000000..edf03e50 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/smelting/aluminumbrass_powder.json @@ -0,0 +1,9 @@ +{ + "type": "minecraft:smelting", + "ingredient": { + "item": "modernmetals:aluminumbrass_powder" + }, + "result": "modernmetals:aluminumbrass_ingot", + "experience": 0.45, + "cookingtime": 200 +} diff --git a/src/generated/resources/data/modernmetals/recipes/smelting/beryllium_ore.json b/src/generated/resources/data/modernmetals/recipes/smelting/beryllium_ore.json new file mode 100644 index 00000000..999b7e42 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/smelting/beryllium_ore.json @@ -0,0 +1,9 @@ +{ + "type": "minecraft:smelting", + "ingredient": { + "item": "modernmetals:beryllium_ore" + }, + "result": "modernmetals:beryllium_ingot", + "experience": 0.45, + "cookingtime": 200 +} diff --git a/src/generated/resources/data/modernmetals/recipes/smelting/beryllium_powder.json b/src/generated/resources/data/modernmetals/recipes/smelting/beryllium_powder.json new file mode 100644 index 00000000..bc09e8a4 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/smelting/beryllium_powder.json @@ -0,0 +1,9 @@ +{ + "type": "minecraft:smelting", + "ingredient": { + "item": "modernmetals:beryllium_powder" + }, + "result": "modernmetals:beryllium_ingot", + "experience": 0.45, + "cookingtime": 200 +} diff --git a/src/generated/resources/data/modernmetals/recipes/smelting/boron_ore.json b/src/generated/resources/data/modernmetals/recipes/smelting/boron_ore.json new file mode 100644 index 00000000..37530c96 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/smelting/boron_ore.json @@ -0,0 +1,9 @@ +{ + "type": "minecraft:smelting", + "ingredient": { + "item": "modernmetals:boron_ore" + }, + "result": "modernmetals:boron_ingot", + "experience": 0.45, + "cookingtime": 200 +} diff --git a/src/generated/resources/data/modernmetals/recipes/smelting/boron_powder.json b/src/generated/resources/data/modernmetals/recipes/smelting/boron_powder.json new file mode 100644 index 00000000..0de7c48a --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/smelting/boron_powder.json @@ -0,0 +1,9 @@ +{ + "type": "minecraft:smelting", + "ingredient": { + "item": "modernmetals:boron_powder" + }, + "result": "modernmetals:boron_ingot", + "experience": 0.45, + "cookingtime": 200 +} diff --git a/src/generated/resources/data/modernmetals/recipes/smelting/cadmium_ore.json b/src/generated/resources/data/modernmetals/recipes/smelting/cadmium_ore.json new file mode 100644 index 00000000..2aa3b287 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/smelting/cadmium_ore.json @@ -0,0 +1,9 @@ +{ + "type": "minecraft:smelting", + "ingredient": { + "item": "modernmetals:cadmium_ore" + }, + "result": "modernmetals:cadmium_ingot", + "experience": 0.45, + "cookingtime": 200 +} diff --git a/src/generated/resources/data/modernmetals/recipes/smelting/cadmium_powder.json b/src/generated/resources/data/modernmetals/recipes/smelting/cadmium_powder.json new file mode 100644 index 00000000..a17b443b --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/smelting/cadmium_powder.json @@ -0,0 +1,9 @@ +{ + "type": "minecraft:smelting", + "ingredient": { + "item": "modernmetals:cadmium_powder" + }, + "result": "modernmetals:cadmium_ingot", + "experience": 0.45, + "cookingtime": 200 +} diff --git a/src/generated/resources/data/modernmetals/recipes/smelting/chromium_ore.json b/src/generated/resources/data/modernmetals/recipes/smelting/chromium_ore.json new file mode 100644 index 00000000..b9a0a34f --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/smelting/chromium_ore.json @@ -0,0 +1,9 @@ +{ + "type": "minecraft:smelting", + "ingredient": { + "item": "modernmetals:chromium_ore" + }, + "result": "modernmetals:chromium_ingot", + "experience": 0.45, + "cookingtime": 200 +} diff --git a/src/generated/resources/data/modernmetals/recipes/smelting/chromium_powder.json b/src/generated/resources/data/modernmetals/recipes/smelting/chromium_powder.json new file mode 100644 index 00000000..270090c8 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/smelting/chromium_powder.json @@ -0,0 +1,9 @@ +{ + "type": "minecraft:smelting", + "ingredient": { + "item": "modernmetals:chromium_powder" + }, + "result": "modernmetals:chromium_ingot", + "experience": 0.45, + "cookingtime": 200 +} diff --git a/src/generated/resources/data/modernmetals/recipes/smelting/galvanizedsteel_blend.json b/src/generated/resources/data/modernmetals/recipes/smelting/galvanizedsteel_blend.json new file mode 100644 index 00000000..65f6d6b1 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/smelting/galvanizedsteel_blend.json @@ -0,0 +1,9 @@ +{ + "type": "minecraft:smelting", + "ingredient": { + "item": "modernmetals:galvanizedsteel_blend" + }, + "result": "modernmetals:galvanizedsteel_ingot", + "experience": 0.45, + "cookingtime": 200 +} diff --git a/src/generated/resources/data/modernmetals/recipes/smelting/galvanizedsteel_powder.json b/src/generated/resources/data/modernmetals/recipes/smelting/galvanizedsteel_powder.json new file mode 100644 index 00000000..b40cc72f --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/smelting/galvanizedsteel_powder.json @@ -0,0 +1,9 @@ +{ + "type": "minecraft:smelting", + "ingredient": { + "item": "modernmetals:galvanizedsteel_powder" + }, + "result": "modernmetals:galvanizedsteel_ingot", + "experience": 0.45, + "cookingtime": 200 +} diff --git a/src/generated/resources/data/modernmetals/recipes/smelting/iridium_ore.json b/src/generated/resources/data/modernmetals/recipes/smelting/iridium_ore.json new file mode 100644 index 00000000..60f06d2d --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/smelting/iridium_ore.json @@ -0,0 +1,9 @@ +{ + "type": "minecraft:smelting", + "ingredient": { + "item": "modernmetals:iridium_ore" + }, + "result": "modernmetals:iridium_ingot", + "experience": 0.45, + "cookingtime": 200 +} diff --git a/src/generated/resources/data/modernmetals/recipes/smelting/iridium_powder.json b/src/generated/resources/data/modernmetals/recipes/smelting/iridium_powder.json new file mode 100644 index 00000000..d29fc27d --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/smelting/iridium_powder.json @@ -0,0 +1,9 @@ +{ + "type": "minecraft:smelting", + "ingredient": { + "item": "modernmetals:iridium_powder" + }, + "result": "modernmetals:iridium_ingot", + "experience": 0.45, + "cookingtime": 200 +} diff --git a/src/generated/resources/data/modernmetals/recipes/smelting/magnesium_ore.json b/src/generated/resources/data/modernmetals/recipes/smelting/magnesium_ore.json new file mode 100644 index 00000000..92515db3 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/smelting/magnesium_ore.json @@ -0,0 +1,9 @@ +{ + "type": "minecraft:smelting", + "ingredient": { + "item": "modernmetals:magnesium_ore" + }, + "result": "modernmetals:magnesium_ingot", + "experience": 0.45, + "cookingtime": 200 +} diff --git a/src/generated/resources/data/modernmetals/recipes/smelting/magnesium_powder.json b/src/generated/resources/data/modernmetals/recipes/smelting/magnesium_powder.json new file mode 100644 index 00000000..7e290cd2 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/smelting/magnesium_powder.json @@ -0,0 +1,9 @@ +{ + "type": "minecraft:smelting", + "ingredient": { + "item": "modernmetals:magnesium_powder" + }, + "result": "modernmetals:magnesium_ingot", + "experience": 0.45, + "cookingtime": 200 +} diff --git a/src/generated/resources/data/modernmetals/recipes/smelting/manganese_ore.json b/src/generated/resources/data/modernmetals/recipes/smelting/manganese_ore.json new file mode 100644 index 00000000..f8effc52 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/smelting/manganese_ore.json @@ -0,0 +1,9 @@ +{ + "type": "minecraft:smelting", + "ingredient": { + "item": "modernmetals:manganese_ore" + }, + "result": "modernmetals:manganese_ingot", + "experience": 0.45, + "cookingtime": 200 +} diff --git a/src/generated/resources/data/modernmetals/recipes/smelting/manganese_powder.json b/src/generated/resources/data/modernmetals/recipes/smelting/manganese_powder.json new file mode 100644 index 00000000..4a058457 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/smelting/manganese_powder.json @@ -0,0 +1,9 @@ +{ + "type": "minecraft:smelting", + "ingredient": { + "item": "modernmetals:manganese_powder" + }, + "result": "modernmetals:manganese_ingot", + "experience": 0.45, + "cookingtime": 200 +} diff --git a/src/generated/resources/data/modernmetals/recipes/smelting/nichrome_blend.json b/src/generated/resources/data/modernmetals/recipes/smelting/nichrome_blend.json new file mode 100644 index 00000000..940f66ae --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/smelting/nichrome_blend.json @@ -0,0 +1,9 @@ +{ + "type": "minecraft:smelting", + "ingredient": { + "item": "modernmetals:nichrome_blend" + }, + "result": "modernmetals:nichrome_ingot", + "experience": 0.45, + "cookingtime": 200 +} diff --git a/src/generated/resources/data/modernmetals/recipes/smelting/nichrome_powder.json b/src/generated/resources/data/modernmetals/recipes/smelting/nichrome_powder.json new file mode 100644 index 00000000..36a75594 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/smelting/nichrome_powder.json @@ -0,0 +1,9 @@ +{ + "type": "minecraft:smelting", + "ingredient": { + "item": "modernmetals:nichrome_powder" + }, + "result": "modernmetals:nichrome_ingot", + "experience": 0.45, + "cookingtime": 200 +} diff --git a/src/generated/resources/data/modernmetals/recipes/smelting/osmium_ore.json b/src/generated/resources/data/modernmetals/recipes/smelting/osmium_ore.json new file mode 100644 index 00000000..c8331c8f --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/smelting/osmium_ore.json @@ -0,0 +1,9 @@ +{ + "type": "minecraft:smelting", + "ingredient": { + "item": "modernmetals:osmium_ore" + }, + "result": "modernmetals:osmium_ingot", + "experience": 0.45, + "cookingtime": 200 +} diff --git a/src/generated/resources/data/modernmetals/recipes/smelting/osmium_powder.json b/src/generated/resources/data/modernmetals/recipes/smelting/osmium_powder.json new file mode 100644 index 00000000..254c13dd --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/smelting/osmium_powder.json @@ -0,0 +1,9 @@ +{ + "type": "minecraft:smelting", + "ingredient": { + "item": "modernmetals:osmium_powder" + }, + "result": "modernmetals:osmium_ingot", + "experience": 0.45, + "cookingtime": 200 +} diff --git a/src/generated/resources/data/modernmetals/recipes/smelting/plutonium_ore.json b/src/generated/resources/data/modernmetals/recipes/smelting/plutonium_ore.json new file mode 100644 index 00000000..cedd2bf2 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/smelting/plutonium_ore.json @@ -0,0 +1,9 @@ +{ + "type": "minecraft:smelting", + "ingredient": { + "item": "modernmetals:plutonium_ore" + }, + "result": "modernmetals:plutonium_ingot", + "experience": 0.45, + "cookingtime": 200 +} diff --git a/src/generated/resources/data/modernmetals/recipes/smelting/plutonium_powder.json b/src/generated/resources/data/modernmetals/recipes/smelting/plutonium_powder.json new file mode 100644 index 00000000..b25ed776 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/smelting/plutonium_powder.json @@ -0,0 +1,9 @@ +{ + "type": "minecraft:smelting", + "ingredient": { + "item": "modernmetals:plutonium_powder" + }, + "result": "modernmetals:plutonium_ingot", + "experience": 0.45, + "cookingtime": 200 +} diff --git a/src/generated/resources/data/modernmetals/recipes/smelting/rutile_ore.json b/src/generated/resources/data/modernmetals/recipes/smelting/rutile_ore.json new file mode 100644 index 00000000..e8640782 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/smelting/rutile_ore.json @@ -0,0 +1,9 @@ +{ + "type": "minecraft:smelting", + "ingredient": { + "item": "modernmetals:rutile_ore" + }, + "result": "modernmetals:rutile_ingot", + "experience": 0.45, + "cookingtime": 200 +} diff --git a/src/generated/resources/data/modernmetals/recipes/smelting/rutile_powder.json b/src/generated/resources/data/modernmetals/recipes/smelting/rutile_powder.json new file mode 100644 index 00000000..0306d026 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/smelting/rutile_powder.json @@ -0,0 +1,9 @@ +{ + "type": "minecraft:smelting", + "ingredient": { + "item": "modernmetals:rutile_powder" + }, + "result": "modernmetals:rutile_ingot", + "experience": 0.45, + "cookingtime": 200 +} diff --git a/src/generated/resources/data/modernmetals/recipes/smelting/stainlesssteel_blend.json b/src/generated/resources/data/modernmetals/recipes/smelting/stainlesssteel_blend.json new file mode 100644 index 00000000..f973c824 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/smelting/stainlesssteel_blend.json @@ -0,0 +1,9 @@ +{ + "type": "minecraft:smelting", + "ingredient": { + "item": "modernmetals:stainlesssteel_blend" + }, + "result": "modernmetals:stainlesssteel_ingot", + "experience": 0.45, + "cookingtime": 200 +} diff --git a/src/generated/resources/data/modernmetals/recipes/smelting/stainlesssteel_powder.json b/src/generated/resources/data/modernmetals/recipes/smelting/stainlesssteel_powder.json new file mode 100644 index 00000000..f37284b2 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/smelting/stainlesssteel_powder.json @@ -0,0 +1,9 @@ +{ + "type": "minecraft:smelting", + "ingredient": { + "item": "modernmetals:stainlesssteel_powder" + }, + "result": "modernmetals:stainlesssteel_ingot", + "experience": 0.45, + "cookingtime": 200 +} diff --git a/src/generated/resources/data/modernmetals/recipes/smelting/tantalum_ore.json b/src/generated/resources/data/modernmetals/recipes/smelting/tantalum_ore.json new file mode 100644 index 00000000..e386423b --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/smelting/tantalum_ore.json @@ -0,0 +1,9 @@ +{ + "type": "minecraft:smelting", + "ingredient": { + "item": "modernmetals:tantalum_ore" + }, + "result": "modernmetals:tantalum_ingot", + "experience": 0.45, + "cookingtime": 200 +} diff --git a/src/generated/resources/data/modernmetals/recipes/smelting/tantalum_powder.json b/src/generated/resources/data/modernmetals/recipes/smelting/tantalum_powder.json new file mode 100644 index 00000000..21b8861c --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/smelting/tantalum_powder.json @@ -0,0 +1,9 @@ +{ + "type": "minecraft:smelting", + "ingredient": { + "item": "modernmetals:tantalum_powder" + }, + "result": "modernmetals:tantalum_ingot", + "experience": 0.45, + "cookingtime": 200 +} diff --git a/src/generated/resources/data/modernmetals/recipes/smelting/thorium_ore.json b/src/generated/resources/data/modernmetals/recipes/smelting/thorium_ore.json new file mode 100644 index 00000000..f5a195fb --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/smelting/thorium_ore.json @@ -0,0 +1,9 @@ +{ + "type": "minecraft:smelting", + "ingredient": { + "item": "modernmetals:thorium_ore" + }, + "result": "modernmetals:thorium_ingot", + "experience": 0.45, + "cookingtime": 200 +} diff --git a/src/generated/resources/data/modernmetals/recipes/smelting/thorium_powder.json b/src/generated/resources/data/modernmetals/recipes/smelting/thorium_powder.json new file mode 100644 index 00000000..dabb8b85 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/smelting/thorium_powder.json @@ -0,0 +1,9 @@ +{ + "type": "minecraft:smelting", + "ingredient": { + "item": "modernmetals:thorium_powder" + }, + "result": "modernmetals:thorium_ingot", + "experience": 0.45, + "cookingtime": 200 +} diff --git a/src/generated/resources/data/modernmetals/recipes/smelting/titanium_blend.json b/src/generated/resources/data/modernmetals/recipes/smelting/titanium_blend.json new file mode 100644 index 00000000..a8e95b66 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/smelting/titanium_blend.json @@ -0,0 +1,9 @@ +{ + "type": "minecraft:smelting", + "ingredient": { + "item": "modernmetals:titanium_blend" + }, + "result": "modernmetals:titanium_ingot", + "experience": 0.45, + "cookingtime": 200 +} diff --git a/src/generated/resources/data/modernmetals/recipes/smelting/titanium_ore.json b/src/generated/resources/data/modernmetals/recipes/smelting/titanium_ore.json new file mode 100644 index 00000000..f101ad11 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/smelting/titanium_ore.json @@ -0,0 +1,9 @@ +{ + "type": "minecraft:smelting", + "ingredient": { + "item": "modernmetals:titanium_ore" + }, + "result": "modernmetals:titanium_ingot", + "experience": 0.45, + "cookingtime": 200 +} diff --git a/src/generated/resources/data/modernmetals/recipes/smelting/titanium_powder.json b/src/generated/resources/data/modernmetals/recipes/smelting/titanium_powder.json new file mode 100644 index 00000000..7b8526a9 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/smelting/titanium_powder.json @@ -0,0 +1,9 @@ +{ + "type": "minecraft:smelting", + "ingredient": { + "item": "modernmetals:titanium_powder" + }, + "result": "modernmetals:titanium_ingot", + "experience": 0.45, + "cookingtime": 200 +} diff --git a/src/generated/resources/data/modernmetals/recipes/smelting/tungsten_ore.json b/src/generated/resources/data/modernmetals/recipes/smelting/tungsten_ore.json new file mode 100644 index 00000000..76848ca0 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/smelting/tungsten_ore.json @@ -0,0 +1,9 @@ +{ + "type": "minecraft:smelting", + "ingredient": { + "item": "modernmetals:tungsten_ore" + }, + "result": "modernmetals:tungsten_ingot", + "experience": 0.45, + "cookingtime": 200 +} diff --git a/src/generated/resources/data/modernmetals/recipes/smelting/tungsten_powder.json b/src/generated/resources/data/modernmetals/recipes/smelting/tungsten_powder.json new file mode 100644 index 00000000..19c7a076 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/smelting/tungsten_powder.json @@ -0,0 +1,9 @@ +{ + "type": "minecraft:smelting", + "ingredient": { + "item": "modernmetals:tungsten_powder" + }, + "result": "modernmetals:tungsten_ingot", + "experience": 0.45, + "cookingtime": 200 +} diff --git a/src/generated/resources/data/modernmetals/recipes/smelting/uranium_ore.json b/src/generated/resources/data/modernmetals/recipes/smelting/uranium_ore.json new file mode 100644 index 00000000..d7648f82 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/smelting/uranium_ore.json @@ -0,0 +1,9 @@ +{ + "type": "minecraft:smelting", + "ingredient": { + "item": "modernmetals:uranium_ore" + }, + "result": "modernmetals:uranium_ingot", + "experience": 0.45, + "cookingtime": 200 +} diff --git a/src/generated/resources/data/modernmetals/recipes/smelting/uranium_powder.json b/src/generated/resources/data/modernmetals/recipes/smelting/uranium_powder.json new file mode 100644 index 00000000..eae75930 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/smelting/uranium_powder.json @@ -0,0 +1,9 @@ +{ + "type": "minecraft:smelting", + "ingredient": { + "item": "modernmetals:uranium_powder" + }, + "result": "modernmetals:uranium_ingot", + "experience": 0.45, + "cookingtime": 200 +} diff --git a/src/generated/resources/data/modernmetals/recipes/smelting/zirconium_ore.json b/src/generated/resources/data/modernmetals/recipes/smelting/zirconium_ore.json new file mode 100644 index 00000000..4a13394e --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/smelting/zirconium_ore.json @@ -0,0 +1,9 @@ +{ + "type": "minecraft:smelting", + "ingredient": { + "item": "modernmetals:zirconium_ore" + }, + "result": "modernmetals:zirconium_ingot", + "experience": 0.45, + "cookingtime": 200 +} diff --git a/src/generated/resources/data/modernmetals/recipes/smelting/zirconium_powder.json b/src/generated/resources/data/modernmetals/recipes/smelting/zirconium_powder.json new file mode 100644 index 00000000..62672e5b --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/smelting/zirconium_powder.json @@ -0,0 +1,9 @@ +{ + "type": "minecraft:smelting", + "ingredient": { + "item": "modernmetals:zirconium_powder" + }, + "result": "modernmetals:zirconium_ingot", + "experience": 0.45, + "cookingtime": 200 +} diff --git a/src/generated/resources/data/modernmetals/recipes/stainlesssteel_arrow.json b/src/generated/resources/data/modernmetals/recipes/stainlesssteel_arrow.json new file mode 100644 index 00000000..ba63454a --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/stainlesssteel_arrow.json @@ -0,0 +1,26 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:stainlesssteel_arrow", + "count": 4 + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "y", + "z" + ], + "key": { + "x": { + "tag": "forge:nuggets/stainlesssteel" + }, + "y": { + "tag": "forge:rods/stainlesssteel" + }, + "z": { + "item": "minecraft:feather" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/stainlesssteel_axe.json b/src/generated/resources/data/modernmetals/recipes/stainlesssteel_axe.json new file mode 100644 index 00000000..f971050e --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/stainlesssteel_axe.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:stainlesssteel_axe" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xs", + " s" + ], + "key": { + "x": { + "tag": "forge:ingots/stainlesssteel" + }, + "s": { + "item": "minecraft:stick" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/stainlesssteel_bars_1.json b/src/generated/resources/data/modernmetals/recipes/stainlesssteel_bars_1.json new file mode 100644 index 00000000..f4396e29 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/stainlesssteel_bars_1.json @@ -0,0 +1,19 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:stainlesssteel_bars", + "count": 16 + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "forge:ingots/stainlesssteel" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/stainlesssteel_bars_2.json b/src/generated/resources/data/modernmetals/recipes/stainlesssteel_bars_2.json new file mode 100644 index 00000000..8e23bb69 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/stainlesssteel_bars_2.json @@ -0,0 +1,18 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:stainlesssteel_bars", + "count": 4 + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "tag": "forge:rods/stainlesssteel" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/stainlesssteel_blend_base.json b/src/generated/resources/data/modernmetals/recipes/stainlesssteel_blend_base.json new file mode 100644 index 00000000..21c756f5 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/stainlesssteel_blend_base.json @@ -0,0 +1,29 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:stainlesssteel_blend", + "count": 2 + }, + "type": "minecraft:crafting_shapeless", + "ingredients": [ + [ + { "tag": "forge:dusts/steel" }, + { "tag": "forge:blends/steel" } + ], + [ + { "tag": "forge:dusts/chromium" }, + { "tag": "forge:dusts/chrome" } + ] + ] + }, + "conditions": [ + { + "type": "forge:or", + "values": [ + { "type": "modernmetals:non_empty_tag", "tag": "forge:dusts/steel" }, + { "type": "modernmetals:non_empty_tag", "tag": "forge:blends/steel" } + ] + } + ] +} diff --git a/src/generated/resources/data/modernmetals/recipes/stainlesssteel_blend_smallblend.json b/src/generated/resources/data/modernmetals/recipes/stainlesssteel_blend_smallblend.json new file mode 100644 index 00000000..25a71ae4 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/stainlesssteel_blend_smallblend.json @@ -0,0 +1,19 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:stainlesssteel_blend" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "forge:small_blends/stainlesssteel" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/stainlesssteel_block.json b/src/generated/resources/data/modernmetals/recipes/stainlesssteel_block.json new file mode 100644 index 00000000..80c7034f --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/stainlesssteel_block.json @@ -0,0 +1,19 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:stainlesssteel_block" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "forge:ingots/stainlesssteel" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/stainlesssteel_block_ingot.json b/src/generated/resources/data/modernmetals/recipes/stainlesssteel_block_ingot.json new file mode 100644 index 00000000..682f4e32 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/stainlesssteel_block_ingot.json @@ -0,0 +1,15 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:stainlesssteel_ingot", + "count": 9 + }, + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "forge:storage_blocks/stainlesssteel" + } + ] + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/stainlesssteel_bolt.json b/src/generated/resources/data/modernmetals/recipes/stainlesssteel_bolt.json new file mode 100644 index 00000000..3ee17dd5 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/stainlesssteel_bolt.json @@ -0,0 +1,23 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:stainlesssteel_bolt", + "count": 4 + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "x", + "y" + ], + "key": { + "x": { + "tag": "forge:rods/stainlesssteel" + }, + "y": { + "item": "minecraft:feather" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/stainlesssteel_boots.json b/src/generated/resources/data/modernmetals/recipes/stainlesssteel_boots.json new file mode 100644 index 00000000..8a55ef1a --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/stainlesssteel_boots.json @@ -0,0 +1,18 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:stainlesssteel_boots" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "x x", + "x x" + ], + "key": { + "x": { + "tag": "forge:ingots/stainlesssteel" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/stainlesssteel_bow.json b/src/generated/resources/data/modernmetals/recipes/stainlesssteel_bow.json new file mode 100644 index 00000000..3ac15aaa --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/stainlesssteel_bow.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:stainlesssteel_bow" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + " xs", + "x s", + " xs" + ], + "key": { + "x": { + "tag": "forge:rods/stainlesssteel" + }, + "s": { + "item": "minecraft:string" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/stainlesssteel_button.json b/src/generated/resources/data/modernmetals/recipes/stainlesssteel_button.json new file mode 100644 index 00000000..03f33bc2 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/stainlesssteel_button.json @@ -0,0 +1,18 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:stainlesssteel_button" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "x" + ], + "key": { + "x": { + "tag": "forge:nuggets/stainlesssteel" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/stainlesssteel_chestplate.json b/src/generated/resources/data/modernmetals/recipes/stainlesssteel_chestplate.json new file mode 100644 index 00000000..4b128d3a --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/stainlesssteel_chestplate.json @@ -0,0 +1,19 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:stainlesssteel_chestplate" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "x x", + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "forge:ingots/stainlesssteel" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/stainlesssteel_crackhammer.json b/src/generated/resources/data/modernmetals/recipes/stainlesssteel_crackhammer.json new file mode 100644 index 00000000..ca12346e --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/stainlesssteel_crackhammer.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:stainlesssteel_crackhammer" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "y", + "y" + ], + "key": { + "x": { + "tag": "forge:storage_blocks/stainlesssteel" + }, + "y": { + "item": "minecraft:stick" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/stainlesssteel_crossbow.json b/src/generated/resources/data/modernmetals/recipes/stainlesssteel_crossbow.json new file mode 100644 index 00000000..87d6b2af --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/stainlesssteel_crossbow.json @@ -0,0 +1,25 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:stainlesssteel_crossbow" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "zxx", + " yx", + "x z" + ], + "key": { + "x": { + "tag": "forge:rods/stainlesssteel" + }, + "y": { + "item": "minecraft:string" + }, + "z": { + "tag": "forge:gears/stainlesssteel" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/stainlesssteel_door.json b/src/generated/resources/data/modernmetals/recipes/stainlesssteel_door.json new file mode 100644 index 00000000..ac45e8de --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/stainlesssteel_door.json @@ -0,0 +1,20 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:stainlesssteel_door", + "count": 3 + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx", + "xx" + ], + "key": { + "x": { + "tag": "forge:ingots/stainlesssteel" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/stainlesssteel_fishingrod.json b/src/generated/resources/data/modernmetals/recipes/stainlesssteel_fishingrod.json new file mode 100644 index 00000000..0129125a --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/stainlesssteel_fishingrod.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:stainlesssteel_fishing_rod" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + " x", + " xy", + "x y" + ], + "key": { + "x": { + "tag": "forge:rods/stainlesssteel" + }, + "y": { + "item": "minecraft:string" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/stainlesssteel_gear.json b/src/generated/resources/data/modernmetals/recipes/stainlesssteel_gear.json new file mode 100644 index 00000000..6b03e456 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/stainlesssteel_gear.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:stainlesssteel_gear" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + " x ", + "xrx", + " x " + ], + "key": { + "x": { + "tag": "forge:ingots/stainlesssteel" + }, + "r": { + "tag": "forge:rods/stainlesssteel" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/stainlesssteel_helmet.json b/src/generated/resources/data/modernmetals/recipes/stainlesssteel_helmet.json new file mode 100644 index 00000000..71289b7f --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/stainlesssteel_helmet.json @@ -0,0 +1,18 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:stainlesssteel_helmet" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "x x" + ], + "key": { + "x": { + "tag": "forge:ingots/stainlesssteel" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/stainlesssteel_hoe.json b/src/generated/resources/data/modernmetals/recipes/stainlesssteel_hoe.json new file mode 100644 index 00000000..ff0faf7b --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/stainlesssteel_hoe.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:stainlesssteel_hoe" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + " s", + " s" + ], + "key": { + "x": { + "tag": "forge:ingots/stainlesssteel" + }, + "s": { + "item": "minecraft:stick" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/stainlesssteel_horsearmor.json b/src/generated/resources/data/modernmetals/recipes/stainlesssteel_horsearmor.json new file mode 100644 index 00000000..83f17451 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/stainlesssteel_horsearmor.json @@ -0,0 +1,69 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:stainlesssteel_horse_armor" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + " x", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "forge:ingots/stainlesssteel" + }, + "y": [ + { + "item": "minecraft:white_wool" + }, + { + "item": "minecraft:orange_wool" + }, + { + "item": "minecraft:magenta_wool" + }, + { + "item": "minecraft:light_blue_wool" + }, + { + "item": "minecraft:yellow_wool" + }, + { + "item": "minecraft:lime_wool" + }, + { + "item": "minecraft:pink_wool" + }, + { + "item": "minecraft:gray_wool" + }, + { + "item": "minecraft:light_gray_wool" + }, + { + "item": "minecraft:cyan_wool" + }, + { + "item": "minecraft:purple_wool" + }, + { + "item": "minecraft:blue_wool" + }, + { + "item": "minecraft:brown_wool" + }, + { + "item": "minecraft:green_wool" + }, + { + "item": "minecraft:red_wool" + }, + { + "item": "minecraft:black_wool" + } + ] + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/stainlesssteel_ingot.json b/src/generated/resources/data/modernmetals/recipes/stainlesssteel_ingot.json new file mode 100644 index 00000000..aade78ae --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/stainlesssteel_ingot.json @@ -0,0 +1,19 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:stainlesssteel_ingot" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "forge:nuggets/stainlesssteel" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/stainlesssteel_leggings.json b/src/generated/resources/data/modernmetals/recipes/stainlesssteel_leggings.json new file mode 100644 index 00000000..50929432 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/stainlesssteel_leggings.json @@ -0,0 +1,19 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:stainlesssteel_leggings" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "x x", + "x x" + ], + "key": { + "x": { + "tag": "forge:ingots/stainlesssteel" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/stainlesssteel_lever.json b/src/generated/resources/data/modernmetals/recipes/stainlesssteel_lever.json new file mode 100644 index 00000000..69a4c51b --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/stainlesssteel_lever.json @@ -0,0 +1,21 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:stainlesssteel_lever" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "y" + ], + "key": { + "x": { + "tag": "forge:rods/stainlesssteel" + }, + "y": { + "tag": "forge:ingots/stainlesssteel" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/stainlesssteel_nugget.json b/src/generated/resources/data/modernmetals/recipes/stainlesssteel_nugget.json new file mode 100644 index 00000000..fbcd101a --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/stainlesssteel_nugget.json @@ -0,0 +1,15 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:stainlesssteel_nugget", + "count": 9 + }, + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "forge:ingots/stainlesssteel" + } + ] + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/stainlesssteel_pickaxe.json b/src/generated/resources/data/modernmetals/recipes/stainlesssteel_pickaxe.json new file mode 100644 index 00000000..e29eba9d --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/stainlesssteel_pickaxe.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:stainlesssteel_pickaxe" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + " s ", + " s " + ], + "key": { + "x": { + "tag": "forge:ingots/stainlesssteel" + }, + "s": { + "item": "minecraft:stick" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/stainlesssteel_plate.json b/src/generated/resources/data/modernmetals/recipes/stainlesssteel_plate.json new file mode 100644 index 00000000..7e1c08af --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/stainlesssteel_plate.json @@ -0,0 +1,17 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:stainlesssteel_plate" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "tag": "forge:ingots/stainlesssteel" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/stainlesssteel_powder.json b/src/generated/resources/data/modernmetals/recipes/stainlesssteel_powder.json new file mode 100644 index 00000000..49a3a5b9 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/stainlesssteel_powder.json @@ -0,0 +1,19 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:stainlesssteel_powder" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "forge:tiny_dusts/stainlesssteel" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/stainlesssteel_pressureplate.json b/src/generated/resources/data/modernmetals/recipes/stainlesssteel_pressureplate.json new file mode 100644 index 00000000..cafac28b --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/stainlesssteel_pressureplate.json @@ -0,0 +1,17 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:stainlesssteel_pressure_plate" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx" + ], + "key": { + "x": { + "tag": "forge:ingots/stainlesssteel" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/stainlesssteel_rod.json b/src/generated/resources/data/modernmetals/recipes/stainlesssteel_rod.json new file mode 100644 index 00000000..8ca1306b --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/stainlesssteel_rod.json @@ -0,0 +1,18 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:stainlesssteel_rod" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + " x ", + " x " + ], + "key": { + "x": { + "tag": "forge:ingots/stainlesssteel" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/stainlesssteel_scythe.json b/src/generated/resources/data/modernmetals/recipes/stainlesssteel_scythe.json new file mode 100644 index 00000000..43a1d45f --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/stainlesssteel_scythe.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:stainlesssteel_scythe" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "ii ", + " i", + " s " + ], + "key": { + "i": { + "tag": "forge:ingots/stainlesssteel" + }, + "s": { + "item": "minecraft:stick" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/stainlesssteel_shears.json b/src/generated/resources/data/modernmetals/recipes/stainlesssteel_shears.json new file mode 100644 index 00000000..84ec7bb0 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/stainlesssteel_shears.json @@ -0,0 +1,18 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:stainlesssteel_shears" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + " x", + "x " + ], + "key": { + "x": { + "tag": "forge:ingots/stainlesssteel" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/stainlesssteel_shield.json b/src/generated/resources/data/modernmetals/recipes/stainlesssteel_shield.json new file mode 100644 index 00000000..4b1ede48 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/stainlesssteel_shield.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:stainlesssteel_shield" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xyx", + "xxx", + " x " + ], + "key": { + "x": { + "tag": "forge:ingots/stainlesssteel" + }, + "y": { + "tag": "minecraft:planks" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/stainlesssteel_shovel.json b/src/generated/resources/data/modernmetals/recipes/stainlesssteel_shovel.json new file mode 100644 index 00000000..eecbb6b2 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/stainlesssteel_shovel.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:stainlesssteel_shovel" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "s", + "s" + ], + "key": { + "x": { + "tag": "forge:ingots/stainlesssteel" + }, + "s": { + "item": "minecraft:stick" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/stainlesssteel_slab.json b/src/generated/resources/data/modernmetals/recipes/stainlesssteel_slab.json new file mode 100644 index 00000000..89c758db --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/stainlesssteel_slab.json @@ -0,0 +1,18 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:stainlesssteel_slab", + "count": 6 + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "tag": "forge:storage_blocks/stainlesssteel" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/stainlesssteel_smallblend_blend.json b/src/generated/resources/data/modernmetals/recipes/stainlesssteel_smallblend_blend.json new file mode 100644 index 00000000..409ed943 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/stainlesssteel_smallblend_blend.json @@ -0,0 +1,15 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:stainlesssteel_smallblend", + "count": 9 + }, + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "forge:blends/stainlesssteel" + } + ] + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/stainlesssteel_smallpowder.json b/src/generated/resources/data/modernmetals/recipes/stainlesssteel_smallpowder.json new file mode 100644 index 00000000..d73d4582 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/stainlesssteel_smallpowder.json @@ -0,0 +1,15 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:stainlesssteel_smallpowder", + "count": 9 + }, + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "forge:dusts/stainlesssteel" + } + ] + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/stainlesssteel_stairs.json b/src/generated/resources/data/modernmetals/recipes/stainlesssteel_stairs.json new file mode 100644 index 00000000..acfd251c --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/stainlesssteel_stairs.json @@ -0,0 +1,20 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:stainlesssteel_stairs", + "count": 4 + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "forge:storage_blocks/stainlesssteel" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/stainlesssteel_sword.json b/src/generated/resources/data/modernmetals/recipes/stainlesssteel_sword.json new file mode 100644 index 00000000..57cd5b02 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/stainlesssteel_sword.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:stainlesssteel_sword" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "x", + "s" + ], + "key": { + "x": { + "tag": "forge:ingots/stainlesssteel" + }, + "s": { + "item": "minecraft:stick" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/stainlesssteel_trapdoor.json b/src/generated/resources/data/modernmetals/recipes/stainlesssteel_trapdoor.json new file mode 100644 index 00000000..65712968 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/stainlesssteel_trapdoor.json @@ -0,0 +1,18 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:stainlesssteel_trapdoor" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "tag": "forge:ingots/stainlesssteel" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/stainlesssteel_wall.json b/src/generated/resources/data/modernmetals/recipes/stainlesssteel_wall.json new file mode 100644 index 00000000..79ff3f46 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/stainlesssteel_wall.json @@ -0,0 +1,19 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:stainlesssteel_wall", + "count": 6 + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "forge:storage_blocks/stainlesssteel" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/tantalum_arrow.json b/src/generated/resources/data/modernmetals/recipes/tantalum_arrow.json new file mode 100644 index 00000000..43d572a3 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/tantalum_arrow.json @@ -0,0 +1,26 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:tantalum_arrow", + "count": 4 + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "y", + "z" + ], + "key": { + "x": { + "tag": "forge:nuggets/tantalum" + }, + "y": { + "tag": "forge:rods/tantalum" + }, + "z": { + "item": "minecraft:feather" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/tantalum_axe.json b/src/generated/resources/data/modernmetals/recipes/tantalum_axe.json new file mode 100644 index 00000000..516cceee --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/tantalum_axe.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:tantalum_axe" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xs", + " s" + ], + "key": { + "x": { + "tag": "forge:ingots/tantalum" + }, + "s": { + "item": "minecraft:stick" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/tantalum_bars_1.json b/src/generated/resources/data/modernmetals/recipes/tantalum_bars_1.json new file mode 100644 index 00000000..efb87ad0 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/tantalum_bars_1.json @@ -0,0 +1,19 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:tantalum_bars", + "count": 16 + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "forge:ingots/tantalum" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/tantalum_bars_2.json b/src/generated/resources/data/modernmetals/recipes/tantalum_bars_2.json new file mode 100644 index 00000000..1c69f82a --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/tantalum_bars_2.json @@ -0,0 +1,18 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:tantalum_bars", + "count": 4 + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "tag": "forge:rods/tantalum" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/tantalum_block.json b/src/generated/resources/data/modernmetals/recipes/tantalum_block.json new file mode 100644 index 00000000..53bd2fab --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/tantalum_block.json @@ -0,0 +1,19 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:tantalum_block" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "forge:ingots/tantalum" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/tantalum_block_ingot.json b/src/generated/resources/data/modernmetals/recipes/tantalum_block_ingot.json new file mode 100644 index 00000000..84000e28 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/tantalum_block_ingot.json @@ -0,0 +1,15 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:tantalum_ingot", + "count": 9 + }, + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "forge:storage_blocks/tantalum" + } + ] + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/tantalum_bolt.json b/src/generated/resources/data/modernmetals/recipes/tantalum_bolt.json new file mode 100644 index 00000000..391870d5 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/tantalum_bolt.json @@ -0,0 +1,23 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:tantalum_bolt", + "count": 4 + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "x", + "y" + ], + "key": { + "x": { + "tag": "forge:rods/tantalum" + }, + "y": { + "item": "minecraft:feather" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/tantalum_boots.json b/src/generated/resources/data/modernmetals/recipes/tantalum_boots.json new file mode 100644 index 00000000..2f79839b --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/tantalum_boots.json @@ -0,0 +1,18 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:tantalum_boots" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "x x", + "x x" + ], + "key": { + "x": { + "tag": "forge:ingots/tantalum" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/tantalum_bow.json b/src/generated/resources/data/modernmetals/recipes/tantalum_bow.json new file mode 100644 index 00000000..1e1bcc68 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/tantalum_bow.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:tantalum_bow" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + " xs", + "x s", + " xs" + ], + "key": { + "x": { + "tag": "forge:rods/tantalum" + }, + "s": { + "item": "minecraft:string" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/tantalum_button.json b/src/generated/resources/data/modernmetals/recipes/tantalum_button.json new file mode 100644 index 00000000..340f2c1a --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/tantalum_button.json @@ -0,0 +1,18 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:tantalum_button" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "x" + ], + "key": { + "x": { + "tag": "forge:nuggets/tantalum" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/tantalum_chestplate.json b/src/generated/resources/data/modernmetals/recipes/tantalum_chestplate.json new file mode 100644 index 00000000..fb487cad --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/tantalum_chestplate.json @@ -0,0 +1,19 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:tantalum_chestplate" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "x x", + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "forge:ingots/tantalum" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/tantalum_crackhammer.json b/src/generated/resources/data/modernmetals/recipes/tantalum_crackhammer.json new file mode 100644 index 00000000..bcb506eb --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/tantalum_crackhammer.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:tantalum_crackhammer" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "y", + "y" + ], + "key": { + "x": { + "tag": "forge:storage_blocks/tantalum" + }, + "y": { + "item": "minecraft:stick" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/tantalum_crossbow.json b/src/generated/resources/data/modernmetals/recipes/tantalum_crossbow.json new file mode 100644 index 00000000..cee04d9b --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/tantalum_crossbow.json @@ -0,0 +1,25 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:tantalum_crossbow" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "zxx", + " yx", + "x z" + ], + "key": { + "x": { + "tag": "forge:rods/tantalum" + }, + "y": { + "item": "minecraft:string" + }, + "z": { + "tag": "forge:gears/tantalum" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/tantalum_door.json b/src/generated/resources/data/modernmetals/recipes/tantalum_door.json new file mode 100644 index 00000000..853adf73 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/tantalum_door.json @@ -0,0 +1,20 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:tantalum_door", + "count": 3 + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx", + "xx" + ], + "key": { + "x": { + "tag": "forge:ingots/tantalum" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/tantalum_fishingrod.json b/src/generated/resources/data/modernmetals/recipes/tantalum_fishingrod.json new file mode 100644 index 00000000..f5616c72 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/tantalum_fishingrod.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:tantalum_fishing_rod" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + " x", + " xy", + "x y" + ], + "key": { + "x": { + "tag": "forge:rods/tantalum" + }, + "y": { + "item": "minecraft:string" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/tantalum_gear.json b/src/generated/resources/data/modernmetals/recipes/tantalum_gear.json new file mode 100644 index 00000000..a258a1cd --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/tantalum_gear.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:tantalum_gear" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + " x ", + "xrx", + " x " + ], + "key": { + "x": { + "tag": "forge:ingots/tantalum" + }, + "r": { + "tag": "forge:rods/tantalum" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/tantalum_helmet.json b/src/generated/resources/data/modernmetals/recipes/tantalum_helmet.json new file mode 100644 index 00000000..0a9ccd4c --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/tantalum_helmet.json @@ -0,0 +1,18 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:tantalum_helmet" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "x x" + ], + "key": { + "x": { + "tag": "forge:ingots/tantalum" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/tantalum_hoe.json b/src/generated/resources/data/modernmetals/recipes/tantalum_hoe.json new file mode 100644 index 00000000..96163be1 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/tantalum_hoe.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:tantalum_hoe" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + " s", + " s" + ], + "key": { + "x": { + "tag": "forge:ingots/tantalum" + }, + "s": { + "item": "minecraft:stick" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/tantalum_horsearmor.json b/src/generated/resources/data/modernmetals/recipes/tantalum_horsearmor.json new file mode 100644 index 00000000..fece72d5 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/tantalum_horsearmor.json @@ -0,0 +1,69 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:tantalum_horse_armor" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + " x", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "forge:ingots/tantalum" + }, + "y": [ + { + "item": "minecraft:white_wool" + }, + { + "item": "minecraft:orange_wool" + }, + { + "item": "minecraft:magenta_wool" + }, + { + "item": "minecraft:light_blue_wool" + }, + { + "item": "minecraft:yellow_wool" + }, + { + "item": "minecraft:lime_wool" + }, + { + "item": "minecraft:pink_wool" + }, + { + "item": "minecraft:gray_wool" + }, + { + "item": "minecraft:light_gray_wool" + }, + { + "item": "minecraft:cyan_wool" + }, + { + "item": "minecraft:purple_wool" + }, + { + "item": "minecraft:blue_wool" + }, + { + "item": "minecraft:brown_wool" + }, + { + "item": "minecraft:green_wool" + }, + { + "item": "minecraft:red_wool" + }, + { + "item": "minecraft:black_wool" + } + ] + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/tantalum_ingot.json b/src/generated/resources/data/modernmetals/recipes/tantalum_ingot.json new file mode 100644 index 00000000..51243d45 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/tantalum_ingot.json @@ -0,0 +1,19 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:tantalum_ingot" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "forge:nuggets/tantalum" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/tantalum_leggings.json b/src/generated/resources/data/modernmetals/recipes/tantalum_leggings.json new file mode 100644 index 00000000..bd1ee00a --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/tantalum_leggings.json @@ -0,0 +1,19 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:tantalum_leggings" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "x x", + "x x" + ], + "key": { + "x": { + "tag": "forge:ingots/tantalum" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/tantalum_lever.json b/src/generated/resources/data/modernmetals/recipes/tantalum_lever.json new file mode 100644 index 00000000..2a06563a --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/tantalum_lever.json @@ -0,0 +1,21 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:tantalum_lever" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "y" + ], + "key": { + "x": { + "tag": "forge:rods/tantalum" + }, + "y": { + "tag": "forge:ingots/tantalum" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/tantalum_nugget.json b/src/generated/resources/data/modernmetals/recipes/tantalum_nugget.json new file mode 100644 index 00000000..9d23e604 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/tantalum_nugget.json @@ -0,0 +1,15 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:tantalum_nugget", + "count": 9 + }, + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "forge:ingots/tantalum" + } + ] + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/tantalum_pickaxe.json b/src/generated/resources/data/modernmetals/recipes/tantalum_pickaxe.json new file mode 100644 index 00000000..8c1a9a90 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/tantalum_pickaxe.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:tantalum_pickaxe" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + " s ", + " s " + ], + "key": { + "x": { + "tag": "forge:ingots/tantalum" + }, + "s": { + "item": "minecraft:stick" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/tantalum_plate.json b/src/generated/resources/data/modernmetals/recipes/tantalum_plate.json new file mode 100644 index 00000000..0eda9819 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/tantalum_plate.json @@ -0,0 +1,17 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:tantalum_plate" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "tag": "forge:ingots/tantalum" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/tantalum_powder.json b/src/generated/resources/data/modernmetals/recipes/tantalum_powder.json new file mode 100644 index 00000000..4228ee86 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/tantalum_powder.json @@ -0,0 +1,19 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:tantalum_powder" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "forge:tiny_dusts/tantalum" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/tantalum_pressureplate.json b/src/generated/resources/data/modernmetals/recipes/tantalum_pressureplate.json new file mode 100644 index 00000000..0ac8d3f1 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/tantalum_pressureplate.json @@ -0,0 +1,17 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:tantalum_pressure_plate" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx" + ], + "key": { + "x": { + "tag": "forge:ingots/tantalum" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/tantalum_rod.json b/src/generated/resources/data/modernmetals/recipes/tantalum_rod.json new file mode 100644 index 00000000..06218991 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/tantalum_rod.json @@ -0,0 +1,18 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:tantalum_rod" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + " x ", + " x " + ], + "key": { + "x": { + "tag": "forge:ingots/tantalum" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/tantalum_scythe.json b/src/generated/resources/data/modernmetals/recipes/tantalum_scythe.json new file mode 100644 index 00000000..6f309912 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/tantalum_scythe.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:tantalum_scythe" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "ii ", + " i", + " s " + ], + "key": { + "i": { + "tag": "forge:ingots/tantalum" + }, + "s": { + "item": "minecraft:stick" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/tantalum_shears.json b/src/generated/resources/data/modernmetals/recipes/tantalum_shears.json new file mode 100644 index 00000000..729e7459 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/tantalum_shears.json @@ -0,0 +1,18 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:tantalum_shears" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + " x", + "x " + ], + "key": { + "x": { + "tag": "forge:ingots/tantalum" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/tantalum_shield.json b/src/generated/resources/data/modernmetals/recipes/tantalum_shield.json new file mode 100644 index 00000000..8a5c4c61 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/tantalum_shield.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:tantalum_shield" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xyx", + "xxx", + " x " + ], + "key": { + "x": { + "tag": "forge:ingots/tantalum" + }, + "y": { + "tag": "minecraft:planks" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/tantalum_shovel.json b/src/generated/resources/data/modernmetals/recipes/tantalum_shovel.json new file mode 100644 index 00000000..3d600c51 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/tantalum_shovel.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:tantalum_shovel" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "s", + "s" + ], + "key": { + "x": { + "tag": "forge:ingots/tantalum" + }, + "s": { + "item": "minecraft:stick" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/tantalum_slab.json b/src/generated/resources/data/modernmetals/recipes/tantalum_slab.json new file mode 100644 index 00000000..2c340472 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/tantalum_slab.json @@ -0,0 +1,18 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:tantalum_slab", + "count": 6 + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "tag": "forge:storage_blocks/tantalum" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/tantalum_smallpowder.json b/src/generated/resources/data/modernmetals/recipes/tantalum_smallpowder.json new file mode 100644 index 00000000..aebcd296 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/tantalum_smallpowder.json @@ -0,0 +1,15 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:tantalum_smallpowder", + "count": 9 + }, + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "forge:dusts/tantalum" + } + ] + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/tantalum_stairs.json b/src/generated/resources/data/modernmetals/recipes/tantalum_stairs.json new file mode 100644 index 00000000..dbc85500 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/tantalum_stairs.json @@ -0,0 +1,20 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:tantalum_stairs", + "count": 4 + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "forge:storage_blocks/tantalum" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/tantalum_sword.json b/src/generated/resources/data/modernmetals/recipes/tantalum_sword.json new file mode 100644 index 00000000..6b012b9b --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/tantalum_sword.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:tantalum_sword" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "x", + "s" + ], + "key": { + "x": { + "tag": "forge:ingots/tantalum" + }, + "s": { + "item": "minecraft:stick" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/tantalum_trapdoor.json b/src/generated/resources/data/modernmetals/recipes/tantalum_trapdoor.json new file mode 100644 index 00000000..9c35adc2 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/tantalum_trapdoor.json @@ -0,0 +1,18 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:tantalum_trapdoor" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "tag": "forge:ingots/tantalum" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/tantalum_wall.json b/src/generated/resources/data/modernmetals/recipes/tantalum_wall.json new file mode 100644 index 00000000..90699ac9 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/tantalum_wall.json @@ -0,0 +1,19 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:tantalum_wall", + "count": 6 + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "forge:storage_blocks/tantalum" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/thorium_arrow.json b/src/generated/resources/data/modernmetals/recipes/thorium_arrow.json new file mode 100644 index 00000000..0225baae --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/thorium_arrow.json @@ -0,0 +1,26 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:thorium_arrow", + "count": 4 + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "y", + "z" + ], + "key": { + "x": { + "tag": "forge:nuggets/thorium" + }, + "y": { + "tag": "forge:rods/thorium" + }, + "z": { + "item": "minecraft:feather" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/thorium_axe.json b/src/generated/resources/data/modernmetals/recipes/thorium_axe.json new file mode 100644 index 00000000..e7904fd5 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/thorium_axe.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:thorium_axe" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xs", + " s" + ], + "key": { + "x": { + "tag": "forge:ingots/thorium" + }, + "s": { + "item": "minecraft:stick" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/thorium_bars_1.json b/src/generated/resources/data/modernmetals/recipes/thorium_bars_1.json new file mode 100644 index 00000000..2f091226 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/thorium_bars_1.json @@ -0,0 +1,19 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:thorium_bars", + "count": 16 + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "forge:ingots/thorium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/thorium_bars_2.json b/src/generated/resources/data/modernmetals/recipes/thorium_bars_2.json new file mode 100644 index 00000000..71f6802a --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/thorium_bars_2.json @@ -0,0 +1,18 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:thorium_bars", + "count": 4 + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "tag": "forge:rods/thorium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/thorium_block.json b/src/generated/resources/data/modernmetals/recipes/thorium_block.json new file mode 100644 index 00000000..49f74e08 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/thorium_block.json @@ -0,0 +1,19 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:thorium_block" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "forge:ingots/thorium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/thorium_block_ingot.json b/src/generated/resources/data/modernmetals/recipes/thorium_block_ingot.json new file mode 100644 index 00000000..db58b182 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/thorium_block_ingot.json @@ -0,0 +1,15 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:thorium_ingot", + "count": 9 + }, + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "forge:storage_blocks/thorium" + } + ] + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/thorium_bolt.json b/src/generated/resources/data/modernmetals/recipes/thorium_bolt.json new file mode 100644 index 00000000..33bc9407 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/thorium_bolt.json @@ -0,0 +1,23 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:thorium_bolt", + "count": 4 + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "x", + "y" + ], + "key": { + "x": { + "tag": "forge:rods/thorium" + }, + "y": { + "item": "minecraft:feather" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/thorium_boots.json b/src/generated/resources/data/modernmetals/recipes/thorium_boots.json new file mode 100644 index 00000000..f76ee43e --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/thorium_boots.json @@ -0,0 +1,18 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:thorium_boots" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "x x", + "x x" + ], + "key": { + "x": { + "tag": "forge:ingots/thorium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/thorium_bow.json b/src/generated/resources/data/modernmetals/recipes/thorium_bow.json new file mode 100644 index 00000000..9d6a95c5 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/thorium_bow.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:thorium_bow" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + " xs", + "x s", + " xs" + ], + "key": { + "x": { + "tag": "forge:rods/thorium" + }, + "s": { + "item": "minecraft:string" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/thorium_button.json b/src/generated/resources/data/modernmetals/recipes/thorium_button.json new file mode 100644 index 00000000..3eccc0a0 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/thorium_button.json @@ -0,0 +1,18 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:thorium_button" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "x" + ], + "key": { + "x": { + "tag": "forge:nuggets/thorium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/thorium_chestplate.json b/src/generated/resources/data/modernmetals/recipes/thorium_chestplate.json new file mode 100644 index 00000000..680bda8d --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/thorium_chestplate.json @@ -0,0 +1,19 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:thorium_chestplate" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "x x", + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "forge:ingots/thorium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/thorium_crackhammer.json b/src/generated/resources/data/modernmetals/recipes/thorium_crackhammer.json new file mode 100644 index 00000000..68adc8be --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/thorium_crackhammer.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:thorium_crackhammer" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "y", + "y" + ], + "key": { + "x": { + "tag": "forge:storage_blocks/thorium" + }, + "y": { + "item": "minecraft:stick" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/thorium_crossbow.json b/src/generated/resources/data/modernmetals/recipes/thorium_crossbow.json new file mode 100644 index 00000000..04712e07 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/thorium_crossbow.json @@ -0,0 +1,25 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:thorium_crossbow" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "zxx", + " yx", + "x z" + ], + "key": { + "x": { + "tag": "forge:rods/thorium" + }, + "y": { + "item": "minecraft:string" + }, + "z": { + "tag": "forge:gears/thorium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/thorium_door.json b/src/generated/resources/data/modernmetals/recipes/thorium_door.json new file mode 100644 index 00000000..ce1d1ba1 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/thorium_door.json @@ -0,0 +1,20 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:thorium_door", + "count": 3 + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx", + "xx" + ], + "key": { + "x": { + "tag": "forge:ingots/thorium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/thorium_fishingrod.json b/src/generated/resources/data/modernmetals/recipes/thorium_fishingrod.json new file mode 100644 index 00000000..13633738 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/thorium_fishingrod.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:thorium_fishing_rod" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + " x", + " xy", + "x y" + ], + "key": { + "x": { + "tag": "forge:rods/thorium" + }, + "y": { + "item": "minecraft:string" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/thorium_gear.json b/src/generated/resources/data/modernmetals/recipes/thorium_gear.json new file mode 100644 index 00000000..ca04a3ac --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/thorium_gear.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:thorium_gear" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + " x ", + "xrx", + " x " + ], + "key": { + "x": { + "tag": "forge:ingots/thorium" + }, + "r": { + "tag": "forge:rods/thorium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/thorium_helmet.json b/src/generated/resources/data/modernmetals/recipes/thorium_helmet.json new file mode 100644 index 00000000..206ddf17 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/thorium_helmet.json @@ -0,0 +1,18 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:thorium_helmet" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "x x" + ], + "key": { + "x": { + "tag": "forge:ingots/thorium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/thorium_hoe.json b/src/generated/resources/data/modernmetals/recipes/thorium_hoe.json new file mode 100644 index 00000000..0722a83f --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/thorium_hoe.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:thorium_hoe" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + " s", + " s" + ], + "key": { + "x": { + "tag": "forge:ingots/thorium" + }, + "s": { + "item": "minecraft:stick" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/thorium_horsearmor.json b/src/generated/resources/data/modernmetals/recipes/thorium_horsearmor.json new file mode 100644 index 00000000..f96115b1 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/thorium_horsearmor.json @@ -0,0 +1,69 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:thorium_horse_armor" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + " x", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "forge:ingots/thorium" + }, + "y": [ + { + "item": "minecraft:white_wool" + }, + { + "item": "minecraft:orange_wool" + }, + { + "item": "minecraft:magenta_wool" + }, + { + "item": "minecraft:light_blue_wool" + }, + { + "item": "minecraft:yellow_wool" + }, + { + "item": "minecraft:lime_wool" + }, + { + "item": "minecraft:pink_wool" + }, + { + "item": "minecraft:gray_wool" + }, + { + "item": "minecraft:light_gray_wool" + }, + { + "item": "minecraft:cyan_wool" + }, + { + "item": "minecraft:purple_wool" + }, + { + "item": "minecraft:blue_wool" + }, + { + "item": "minecraft:brown_wool" + }, + { + "item": "minecraft:green_wool" + }, + { + "item": "minecraft:red_wool" + }, + { + "item": "minecraft:black_wool" + } + ] + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/thorium_ingot.json b/src/generated/resources/data/modernmetals/recipes/thorium_ingot.json new file mode 100644 index 00000000..1dc413d2 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/thorium_ingot.json @@ -0,0 +1,19 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:thorium_ingot" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "forge:nuggets/thorium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/thorium_leggings.json b/src/generated/resources/data/modernmetals/recipes/thorium_leggings.json new file mode 100644 index 00000000..bd9cabf3 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/thorium_leggings.json @@ -0,0 +1,19 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:thorium_leggings" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "x x", + "x x" + ], + "key": { + "x": { + "tag": "forge:ingots/thorium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/thorium_lever.json b/src/generated/resources/data/modernmetals/recipes/thorium_lever.json new file mode 100644 index 00000000..a8e2a5d6 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/thorium_lever.json @@ -0,0 +1,21 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:thorium_lever" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "y" + ], + "key": { + "x": { + "tag": "forge:rods/thorium" + }, + "y": { + "tag": "forge:ingots/thorium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/thorium_nugget.json b/src/generated/resources/data/modernmetals/recipes/thorium_nugget.json new file mode 100644 index 00000000..e176b26c --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/thorium_nugget.json @@ -0,0 +1,15 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:thorium_nugget", + "count": 9 + }, + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "forge:ingots/thorium" + } + ] + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/thorium_pickaxe.json b/src/generated/resources/data/modernmetals/recipes/thorium_pickaxe.json new file mode 100644 index 00000000..550459b5 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/thorium_pickaxe.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:thorium_pickaxe" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + " s ", + " s " + ], + "key": { + "x": { + "tag": "forge:ingots/thorium" + }, + "s": { + "item": "minecraft:stick" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/thorium_plate.json b/src/generated/resources/data/modernmetals/recipes/thorium_plate.json new file mode 100644 index 00000000..7a822fb4 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/thorium_plate.json @@ -0,0 +1,17 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:thorium_plate" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "tag": "forge:ingots/thorium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/thorium_powder.json b/src/generated/resources/data/modernmetals/recipes/thorium_powder.json new file mode 100644 index 00000000..c7db11a8 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/thorium_powder.json @@ -0,0 +1,19 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:thorium_powder" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "forge:tiny_dusts/thorium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/thorium_pressureplate.json b/src/generated/resources/data/modernmetals/recipes/thorium_pressureplate.json new file mode 100644 index 00000000..2f4837b8 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/thorium_pressureplate.json @@ -0,0 +1,17 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:thorium_pressure_plate" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx" + ], + "key": { + "x": { + "tag": "forge:ingots/thorium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/thorium_rod.json b/src/generated/resources/data/modernmetals/recipes/thorium_rod.json new file mode 100644 index 00000000..26d55203 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/thorium_rod.json @@ -0,0 +1,18 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:thorium_rod" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + " x ", + " x " + ], + "key": { + "x": { + "tag": "forge:ingots/thorium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/thorium_scythe.json b/src/generated/resources/data/modernmetals/recipes/thorium_scythe.json new file mode 100644 index 00000000..f10764fa --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/thorium_scythe.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:thorium_scythe" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "ii ", + " i", + " s " + ], + "key": { + "i": { + "tag": "forge:ingots/thorium" + }, + "s": { + "item": "minecraft:stick" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/thorium_shears.json b/src/generated/resources/data/modernmetals/recipes/thorium_shears.json new file mode 100644 index 00000000..ff650b8a --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/thorium_shears.json @@ -0,0 +1,18 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:thorium_shears" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + " x", + "x " + ], + "key": { + "x": { + "tag": "forge:ingots/thorium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/thorium_shield.json b/src/generated/resources/data/modernmetals/recipes/thorium_shield.json new file mode 100644 index 00000000..b9242e24 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/thorium_shield.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:thorium_shield" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xyx", + "xxx", + " x " + ], + "key": { + "x": { + "tag": "forge:ingots/thorium" + }, + "y": { + "tag": "minecraft:planks" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/thorium_shovel.json b/src/generated/resources/data/modernmetals/recipes/thorium_shovel.json new file mode 100644 index 00000000..db466914 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/thorium_shovel.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:thorium_shovel" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "s", + "s" + ], + "key": { + "x": { + "tag": "forge:ingots/thorium" + }, + "s": { + "item": "minecraft:stick" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/thorium_slab.json b/src/generated/resources/data/modernmetals/recipes/thorium_slab.json new file mode 100644 index 00000000..b36ecc5e --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/thorium_slab.json @@ -0,0 +1,18 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:thorium_slab", + "count": 6 + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "tag": "forge:storage_blocks/thorium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/thorium_smallpowder.json b/src/generated/resources/data/modernmetals/recipes/thorium_smallpowder.json new file mode 100644 index 00000000..ac327f61 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/thorium_smallpowder.json @@ -0,0 +1,15 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:thorium_smallpowder", + "count": 9 + }, + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "forge:dusts/thorium" + } + ] + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/thorium_stairs.json b/src/generated/resources/data/modernmetals/recipes/thorium_stairs.json new file mode 100644 index 00000000..0665761f --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/thorium_stairs.json @@ -0,0 +1,20 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:thorium_stairs", + "count": 4 + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "forge:storage_blocks/thorium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/thorium_sword.json b/src/generated/resources/data/modernmetals/recipes/thorium_sword.json new file mode 100644 index 00000000..e328e4b7 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/thorium_sword.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:thorium_sword" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "x", + "s" + ], + "key": { + "x": { + "tag": "forge:ingots/thorium" + }, + "s": { + "item": "minecraft:stick" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/thorium_trapdoor.json b/src/generated/resources/data/modernmetals/recipes/thorium_trapdoor.json new file mode 100644 index 00000000..2e63c55b --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/thorium_trapdoor.json @@ -0,0 +1,18 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:thorium_trapdoor" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "tag": "forge:ingots/thorium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/thorium_wall.json b/src/generated/resources/data/modernmetals/recipes/thorium_wall.json new file mode 100644 index 00000000..bd8a67a6 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/thorium_wall.json @@ -0,0 +1,19 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:thorium_wall", + "count": 6 + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "forge:storage_blocks/thorium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/titanium_arrow.json b/src/generated/resources/data/modernmetals/recipes/titanium_arrow.json new file mode 100644 index 00000000..8b68f48d --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/titanium_arrow.json @@ -0,0 +1,26 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:titanium_arrow", + "count": 4 + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "y", + "z" + ], + "key": { + "x": { + "tag": "forge:nuggets/titanium" + }, + "y": { + "tag": "forge:rods/titanium" + }, + "z": { + "item": "minecraft:feather" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/titanium_axe.json b/src/generated/resources/data/modernmetals/recipes/titanium_axe.json new file mode 100644 index 00000000..76066f6f --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/titanium_axe.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:titanium_axe" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xs", + " s" + ], + "key": { + "x": { + "tag": "forge:ingots/titanium" + }, + "s": { + "item": "minecraft:stick" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/titanium_bars_1.json b/src/generated/resources/data/modernmetals/recipes/titanium_bars_1.json new file mode 100644 index 00000000..3eec485b --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/titanium_bars_1.json @@ -0,0 +1,19 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:titanium_bars", + "count": 16 + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "forge:ingots/titanium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/titanium_bars_2.json b/src/generated/resources/data/modernmetals/recipes/titanium_bars_2.json new file mode 100644 index 00000000..cfe8cd33 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/titanium_bars_2.json @@ -0,0 +1,18 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:titanium_bars", + "count": 4 + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "tag": "forge:rods/titanium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/titanium_blend_base.json b/src/generated/resources/data/modernmetals/recipes/titanium_blend_base.json new file mode 100644 index 00000000..53859904 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/titanium_blend_base.json @@ -0,0 +1,17 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:titanium_blend" + }, + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "forge:dusts/rutile" + }, + { + "tag": "forge:dusts/magnesium" + } + ] + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/titanium_blend_smallblend.json b/src/generated/resources/data/modernmetals/recipes/titanium_blend_smallblend.json new file mode 100644 index 00000000..9f8b0aee --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/titanium_blend_smallblend.json @@ -0,0 +1,19 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:titanium_blend" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "forge:small_blends/titanium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/titanium_block.json b/src/generated/resources/data/modernmetals/recipes/titanium_block.json new file mode 100644 index 00000000..02dd0a22 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/titanium_block.json @@ -0,0 +1,19 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:titanium_block" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "forge:ingots/titanium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/titanium_block_ingot.json b/src/generated/resources/data/modernmetals/recipes/titanium_block_ingot.json new file mode 100644 index 00000000..5b263cd6 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/titanium_block_ingot.json @@ -0,0 +1,15 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:titanium_ingot", + "count": 9 + }, + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "forge:storage_blocks/titanium" + } + ] + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/titanium_bolt.json b/src/generated/resources/data/modernmetals/recipes/titanium_bolt.json new file mode 100644 index 00000000..7bfbb020 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/titanium_bolt.json @@ -0,0 +1,23 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:titanium_bolt", + "count": 4 + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "x", + "y" + ], + "key": { + "x": { + "tag": "forge:rods/titanium" + }, + "y": { + "item": "minecraft:feather" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/titanium_boots.json b/src/generated/resources/data/modernmetals/recipes/titanium_boots.json new file mode 100644 index 00000000..b0c2165c --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/titanium_boots.json @@ -0,0 +1,18 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:titanium_boots" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "x x", + "x x" + ], + "key": { + "x": { + "tag": "forge:ingots/titanium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/titanium_bow.json b/src/generated/resources/data/modernmetals/recipes/titanium_bow.json new file mode 100644 index 00000000..969511ba --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/titanium_bow.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:titanium_bow" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + " xs", + "x s", + " xs" + ], + "key": { + "x": { + "tag": "forge:rods/titanium" + }, + "s": { + "item": "minecraft:string" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/titanium_button.json b/src/generated/resources/data/modernmetals/recipes/titanium_button.json new file mode 100644 index 00000000..af6cf924 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/titanium_button.json @@ -0,0 +1,18 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:titanium_button" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "x" + ], + "key": { + "x": { + "tag": "forge:nuggets/titanium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/titanium_chestplate.json b/src/generated/resources/data/modernmetals/recipes/titanium_chestplate.json new file mode 100644 index 00000000..6029cddd --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/titanium_chestplate.json @@ -0,0 +1,19 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:titanium_chestplate" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "x x", + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "forge:ingots/titanium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/titanium_crackhammer.json b/src/generated/resources/data/modernmetals/recipes/titanium_crackhammer.json new file mode 100644 index 00000000..0ae1b72e --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/titanium_crackhammer.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:titanium_crackhammer" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "y", + "y" + ], + "key": { + "x": { + "tag": "forge:storage_blocks/titanium" + }, + "y": { + "item": "minecraft:stick" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/titanium_crossbow.json b/src/generated/resources/data/modernmetals/recipes/titanium_crossbow.json new file mode 100644 index 00000000..fdc2b9c8 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/titanium_crossbow.json @@ -0,0 +1,25 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:titanium_crossbow" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "zxx", + " yx", + "x z" + ], + "key": { + "x": { + "tag": "forge:rods/titanium" + }, + "y": { + "item": "minecraft:string" + }, + "z": { + "tag": "forge:gears/titanium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/titanium_door.json b/src/generated/resources/data/modernmetals/recipes/titanium_door.json new file mode 100644 index 00000000..7a29a1b4 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/titanium_door.json @@ -0,0 +1,20 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:titanium_door", + "count": 3 + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx", + "xx" + ], + "key": { + "x": { + "tag": "forge:ingots/titanium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/titanium_fishingrod.json b/src/generated/resources/data/modernmetals/recipes/titanium_fishingrod.json new file mode 100644 index 00000000..6f7a273e --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/titanium_fishingrod.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:titanium_fishing_rod" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + " x", + " xy", + "x y" + ], + "key": { + "x": { + "tag": "forge:rods/titanium" + }, + "y": { + "item": "minecraft:string" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/titanium_gear.json b/src/generated/resources/data/modernmetals/recipes/titanium_gear.json new file mode 100644 index 00000000..eab3a140 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/titanium_gear.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:titanium_gear" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + " x ", + "xrx", + " x " + ], + "key": { + "x": { + "tag": "forge:ingots/titanium" + }, + "r": { + "tag": "forge:rods/titanium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/titanium_helmet.json b/src/generated/resources/data/modernmetals/recipes/titanium_helmet.json new file mode 100644 index 00000000..e8e43b15 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/titanium_helmet.json @@ -0,0 +1,18 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:titanium_helmet" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "x x" + ], + "key": { + "x": { + "tag": "forge:ingots/titanium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/titanium_hoe.json b/src/generated/resources/data/modernmetals/recipes/titanium_hoe.json new file mode 100644 index 00000000..f92be640 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/titanium_hoe.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:titanium_hoe" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + " s", + " s" + ], + "key": { + "x": { + "tag": "forge:ingots/titanium" + }, + "s": { + "item": "minecraft:stick" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/titanium_horsearmor.json b/src/generated/resources/data/modernmetals/recipes/titanium_horsearmor.json new file mode 100644 index 00000000..5ffd532d --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/titanium_horsearmor.json @@ -0,0 +1,69 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:titanium_horse_armor" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + " x", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "forge:ingots/titanium" + }, + "y": [ + { + "item": "minecraft:white_wool" + }, + { + "item": "minecraft:orange_wool" + }, + { + "item": "minecraft:magenta_wool" + }, + { + "item": "minecraft:light_blue_wool" + }, + { + "item": "minecraft:yellow_wool" + }, + { + "item": "minecraft:lime_wool" + }, + { + "item": "minecraft:pink_wool" + }, + { + "item": "minecraft:gray_wool" + }, + { + "item": "minecraft:light_gray_wool" + }, + { + "item": "minecraft:cyan_wool" + }, + { + "item": "minecraft:purple_wool" + }, + { + "item": "minecraft:blue_wool" + }, + { + "item": "minecraft:brown_wool" + }, + { + "item": "minecraft:green_wool" + }, + { + "item": "minecraft:red_wool" + }, + { + "item": "minecraft:black_wool" + } + ] + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/titanium_ingot.json b/src/generated/resources/data/modernmetals/recipes/titanium_ingot.json new file mode 100644 index 00000000..bbe14498 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/titanium_ingot.json @@ -0,0 +1,19 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:titanium_ingot" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "forge:nuggets/titanium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/titanium_leggings.json b/src/generated/resources/data/modernmetals/recipes/titanium_leggings.json new file mode 100644 index 00000000..c4eeb51b --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/titanium_leggings.json @@ -0,0 +1,19 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:titanium_leggings" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "x x", + "x x" + ], + "key": { + "x": { + "tag": "forge:ingots/titanium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/titanium_lever.json b/src/generated/resources/data/modernmetals/recipes/titanium_lever.json new file mode 100644 index 00000000..1db986b1 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/titanium_lever.json @@ -0,0 +1,21 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:titanium_lever" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "y" + ], + "key": { + "x": { + "tag": "forge:rods/titanium" + }, + "y": { + "tag": "forge:ingots/titanium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/titanium_nugget.json b/src/generated/resources/data/modernmetals/recipes/titanium_nugget.json new file mode 100644 index 00000000..0c4100dc --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/titanium_nugget.json @@ -0,0 +1,15 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:titanium_nugget", + "count": 9 + }, + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "forge:ingots/titanium" + } + ] + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/titanium_pickaxe.json b/src/generated/resources/data/modernmetals/recipes/titanium_pickaxe.json new file mode 100644 index 00000000..a5512202 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/titanium_pickaxe.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:titanium_pickaxe" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + " s ", + " s " + ], + "key": { + "x": { + "tag": "forge:ingots/titanium" + }, + "s": { + "item": "minecraft:stick" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/titanium_plate.json b/src/generated/resources/data/modernmetals/recipes/titanium_plate.json new file mode 100644 index 00000000..f024c1d6 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/titanium_plate.json @@ -0,0 +1,17 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:titanium_plate" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "tag": "forge:ingots/titanium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/titanium_powder.json b/src/generated/resources/data/modernmetals/recipes/titanium_powder.json new file mode 100644 index 00000000..e7f07f2d --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/titanium_powder.json @@ -0,0 +1,19 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:titanium_powder" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "forge:tiny_dusts/titanium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/titanium_pressureplate.json b/src/generated/resources/data/modernmetals/recipes/titanium_pressureplate.json new file mode 100644 index 00000000..486d586f --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/titanium_pressureplate.json @@ -0,0 +1,17 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:titanium_pressure_plate" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx" + ], + "key": { + "x": { + "tag": "forge:ingots/titanium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/titanium_rod.json b/src/generated/resources/data/modernmetals/recipes/titanium_rod.json new file mode 100644 index 00000000..08a29128 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/titanium_rod.json @@ -0,0 +1,18 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:titanium_rod" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + " x ", + " x " + ], + "key": { + "x": { + "tag": "forge:ingots/titanium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/titanium_scythe.json b/src/generated/resources/data/modernmetals/recipes/titanium_scythe.json new file mode 100644 index 00000000..17080572 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/titanium_scythe.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:titanium_scythe" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "ii ", + " i", + " s " + ], + "key": { + "i": { + "tag": "forge:ingots/titanium" + }, + "s": { + "item": "minecraft:stick" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/titanium_shears.json b/src/generated/resources/data/modernmetals/recipes/titanium_shears.json new file mode 100644 index 00000000..460c2a0b --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/titanium_shears.json @@ -0,0 +1,18 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:titanium_shears" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + " x", + "x " + ], + "key": { + "x": { + "tag": "forge:ingots/titanium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/titanium_shield.json b/src/generated/resources/data/modernmetals/recipes/titanium_shield.json new file mode 100644 index 00000000..90a3d1a4 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/titanium_shield.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:titanium_shield" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xyx", + "xxx", + " x " + ], + "key": { + "x": { + "tag": "forge:ingots/titanium" + }, + "y": { + "tag": "minecraft:planks" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/titanium_shovel.json b/src/generated/resources/data/modernmetals/recipes/titanium_shovel.json new file mode 100644 index 00000000..8eb2b265 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/titanium_shovel.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:titanium_shovel" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "s", + "s" + ], + "key": { + "x": { + "tag": "forge:ingots/titanium" + }, + "s": { + "item": "minecraft:stick" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/titanium_slab.json b/src/generated/resources/data/modernmetals/recipes/titanium_slab.json new file mode 100644 index 00000000..15339f7e --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/titanium_slab.json @@ -0,0 +1,18 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:titanium_slab", + "count": 6 + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "tag": "forge:storage_blocks/titanium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/titanium_smallblend_blend.json b/src/generated/resources/data/modernmetals/recipes/titanium_smallblend_blend.json new file mode 100644 index 00000000..9c4a80b9 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/titanium_smallblend_blend.json @@ -0,0 +1,15 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:titanium_smallblend", + "count": 9 + }, + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "forge:blends/titanium" + } + ] + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/titanium_smallpowder.json b/src/generated/resources/data/modernmetals/recipes/titanium_smallpowder.json new file mode 100644 index 00000000..56918cec --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/titanium_smallpowder.json @@ -0,0 +1,15 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:titanium_smallpowder", + "count": 9 + }, + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "forge:dusts/titanium" + } + ] + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/titanium_stairs.json b/src/generated/resources/data/modernmetals/recipes/titanium_stairs.json new file mode 100644 index 00000000..c4f00c69 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/titanium_stairs.json @@ -0,0 +1,20 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:titanium_stairs", + "count": 4 + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "forge:storage_blocks/titanium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/titanium_sword.json b/src/generated/resources/data/modernmetals/recipes/titanium_sword.json new file mode 100644 index 00000000..63f785e5 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/titanium_sword.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:titanium_sword" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "x", + "s" + ], + "key": { + "x": { + "tag": "forge:ingots/titanium" + }, + "s": { + "item": "minecraft:stick" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/titanium_trapdoor.json b/src/generated/resources/data/modernmetals/recipes/titanium_trapdoor.json new file mode 100644 index 00000000..c98085e8 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/titanium_trapdoor.json @@ -0,0 +1,18 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:titanium_trapdoor" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "tag": "forge:ingots/titanium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/titanium_wall.json b/src/generated/resources/data/modernmetals/recipes/titanium_wall.json new file mode 100644 index 00000000..cf410641 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/titanium_wall.json @@ -0,0 +1,19 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:titanium_wall", + "count": 6 + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "forge:storage_blocks/titanium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/tungsten_arrow.json b/src/generated/resources/data/modernmetals/recipes/tungsten_arrow.json new file mode 100644 index 00000000..b0e444d4 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/tungsten_arrow.json @@ -0,0 +1,26 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:tungsten_arrow", + "count": 4 + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "y", + "z" + ], + "key": { + "x": { + "tag": "forge:nuggets/tungsten" + }, + "y": { + "tag": "forge:rods/tungsten" + }, + "z": { + "item": "minecraft:feather" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/tungsten_axe.json b/src/generated/resources/data/modernmetals/recipes/tungsten_axe.json new file mode 100644 index 00000000..85f3aba0 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/tungsten_axe.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:tungsten_axe" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xs", + " s" + ], + "key": { + "x": { + "tag": "forge:ingots/tungsten" + }, + "s": { + "item": "minecraft:stick" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/tungsten_bars_1.json b/src/generated/resources/data/modernmetals/recipes/tungsten_bars_1.json new file mode 100644 index 00000000..60cade6f --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/tungsten_bars_1.json @@ -0,0 +1,19 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:tungsten_bars", + "count": 16 + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "forge:ingots/tungsten" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/tungsten_bars_2.json b/src/generated/resources/data/modernmetals/recipes/tungsten_bars_2.json new file mode 100644 index 00000000..f2900798 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/tungsten_bars_2.json @@ -0,0 +1,18 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:tungsten_bars", + "count": 4 + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "tag": "forge:rods/tungsten" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/tungsten_block.json b/src/generated/resources/data/modernmetals/recipes/tungsten_block.json new file mode 100644 index 00000000..a8358868 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/tungsten_block.json @@ -0,0 +1,19 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:tungsten_block" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "forge:ingots/tungsten" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/tungsten_block_ingot.json b/src/generated/resources/data/modernmetals/recipes/tungsten_block_ingot.json new file mode 100644 index 00000000..76ffc8a3 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/tungsten_block_ingot.json @@ -0,0 +1,15 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:tungsten_ingot", + "count": 9 + }, + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "forge:storage_blocks/tungsten" + } + ] + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/tungsten_bolt.json b/src/generated/resources/data/modernmetals/recipes/tungsten_bolt.json new file mode 100644 index 00000000..a65c308c --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/tungsten_bolt.json @@ -0,0 +1,23 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:tungsten_bolt", + "count": 4 + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "x", + "y" + ], + "key": { + "x": { + "tag": "forge:rods/tungsten" + }, + "y": { + "item": "minecraft:feather" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/tungsten_boots.json b/src/generated/resources/data/modernmetals/recipes/tungsten_boots.json new file mode 100644 index 00000000..1ee788d5 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/tungsten_boots.json @@ -0,0 +1,18 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:tungsten_boots" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "x x", + "x x" + ], + "key": { + "x": { + "tag": "forge:ingots/tungsten" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/tungsten_bow.json b/src/generated/resources/data/modernmetals/recipes/tungsten_bow.json new file mode 100644 index 00000000..794c67ab --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/tungsten_bow.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:tungsten_bow" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + " xs", + "x s", + " xs" + ], + "key": { + "x": { + "tag": "forge:rods/tungsten" + }, + "s": { + "item": "minecraft:string" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/tungsten_button.json b/src/generated/resources/data/modernmetals/recipes/tungsten_button.json new file mode 100644 index 00000000..432dd126 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/tungsten_button.json @@ -0,0 +1,18 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:tungsten_button" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "x" + ], + "key": { + "x": { + "tag": "forge:nuggets/tungsten" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/tungsten_chestplate.json b/src/generated/resources/data/modernmetals/recipes/tungsten_chestplate.json new file mode 100644 index 00000000..7cf6dc0e --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/tungsten_chestplate.json @@ -0,0 +1,19 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:tungsten_chestplate" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "x x", + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "forge:ingots/tungsten" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/tungsten_crackhammer.json b/src/generated/resources/data/modernmetals/recipes/tungsten_crackhammer.json new file mode 100644 index 00000000..b21ab29c --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/tungsten_crackhammer.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:tungsten_crackhammer" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "y", + "y" + ], + "key": { + "x": { + "tag": "forge:storage_blocks/tungsten" + }, + "y": { + "item": "minecraft:stick" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/tungsten_crossbow.json b/src/generated/resources/data/modernmetals/recipes/tungsten_crossbow.json new file mode 100644 index 00000000..db739b02 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/tungsten_crossbow.json @@ -0,0 +1,25 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:tungsten_crossbow" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "zxx", + " yx", + "x z" + ], + "key": { + "x": { + "tag": "forge:rods/tungsten" + }, + "y": { + "item": "minecraft:string" + }, + "z": { + "tag": "forge:gears/tungsten" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/tungsten_door.json b/src/generated/resources/data/modernmetals/recipes/tungsten_door.json new file mode 100644 index 00000000..5c5f3c98 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/tungsten_door.json @@ -0,0 +1,20 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:tungsten_door", + "count": 3 + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx", + "xx" + ], + "key": { + "x": { + "tag": "forge:ingots/tungsten" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/tungsten_fishingrod.json b/src/generated/resources/data/modernmetals/recipes/tungsten_fishingrod.json new file mode 100644 index 00000000..3ec60b8b --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/tungsten_fishingrod.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:tungsten_fishing_rod" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + " x", + " xy", + "x y" + ], + "key": { + "x": { + "tag": "forge:rods/tungsten" + }, + "y": { + "item": "minecraft:string" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/tungsten_gear.json b/src/generated/resources/data/modernmetals/recipes/tungsten_gear.json new file mode 100644 index 00000000..7abd9e3d --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/tungsten_gear.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:tungsten_gear" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + " x ", + "xrx", + " x " + ], + "key": { + "x": { + "tag": "forge:ingots/tungsten" + }, + "r": { + "tag": "forge:rods/tungsten" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/tungsten_helmet.json b/src/generated/resources/data/modernmetals/recipes/tungsten_helmet.json new file mode 100644 index 00000000..193249f9 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/tungsten_helmet.json @@ -0,0 +1,18 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:tungsten_helmet" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "x x" + ], + "key": { + "x": { + "tag": "forge:ingots/tungsten" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/tungsten_hoe.json b/src/generated/resources/data/modernmetals/recipes/tungsten_hoe.json new file mode 100644 index 00000000..3d1bfaff --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/tungsten_hoe.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:tungsten_hoe" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + " s", + " s" + ], + "key": { + "x": { + "tag": "forge:ingots/tungsten" + }, + "s": { + "item": "minecraft:stick" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/tungsten_horsearmor.json b/src/generated/resources/data/modernmetals/recipes/tungsten_horsearmor.json new file mode 100644 index 00000000..850a9033 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/tungsten_horsearmor.json @@ -0,0 +1,69 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:tungsten_horse_armor" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + " x", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "forge:ingots/tungsten" + }, + "y": [ + { + "item": "minecraft:white_wool" + }, + { + "item": "minecraft:orange_wool" + }, + { + "item": "minecraft:magenta_wool" + }, + { + "item": "minecraft:light_blue_wool" + }, + { + "item": "minecraft:yellow_wool" + }, + { + "item": "minecraft:lime_wool" + }, + { + "item": "minecraft:pink_wool" + }, + { + "item": "minecraft:gray_wool" + }, + { + "item": "minecraft:light_gray_wool" + }, + { + "item": "minecraft:cyan_wool" + }, + { + "item": "minecraft:purple_wool" + }, + { + "item": "minecraft:blue_wool" + }, + { + "item": "minecraft:brown_wool" + }, + { + "item": "minecraft:green_wool" + }, + { + "item": "minecraft:red_wool" + }, + { + "item": "minecraft:black_wool" + } + ] + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/tungsten_ingot.json b/src/generated/resources/data/modernmetals/recipes/tungsten_ingot.json new file mode 100644 index 00000000..7b812aa0 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/tungsten_ingot.json @@ -0,0 +1,19 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:tungsten_ingot" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "forge:nuggets/tungsten" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/tungsten_leggings.json b/src/generated/resources/data/modernmetals/recipes/tungsten_leggings.json new file mode 100644 index 00000000..6291b8f2 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/tungsten_leggings.json @@ -0,0 +1,19 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:tungsten_leggings" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "x x", + "x x" + ], + "key": { + "x": { + "tag": "forge:ingots/tungsten" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/tungsten_lever.json b/src/generated/resources/data/modernmetals/recipes/tungsten_lever.json new file mode 100644 index 00000000..12f249f4 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/tungsten_lever.json @@ -0,0 +1,21 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:tungsten_lever" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "y" + ], + "key": { + "x": { + "tag": "forge:rods/tungsten" + }, + "y": { + "tag": "forge:ingots/tungsten" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/tungsten_nugget.json b/src/generated/resources/data/modernmetals/recipes/tungsten_nugget.json new file mode 100644 index 00000000..af3a261a --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/tungsten_nugget.json @@ -0,0 +1,15 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:tungsten_nugget", + "count": 9 + }, + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "forge:ingots/tungsten" + } + ] + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/tungsten_pickaxe.json b/src/generated/resources/data/modernmetals/recipes/tungsten_pickaxe.json new file mode 100644 index 00000000..81ea49d0 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/tungsten_pickaxe.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:tungsten_pickaxe" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + " s ", + " s " + ], + "key": { + "x": { + "tag": "forge:ingots/tungsten" + }, + "s": { + "item": "minecraft:stick" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/tungsten_plate.json b/src/generated/resources/data/modernmetals/recipes/tungsten_plate.json new file mode 100644 index 00000000..b62db1de --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/tungsten_plate.json @@ -0,0 +1,17 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:tungsten_plate" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "tag": "forge:ingots/tungsten" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/tungsten_powder.json b/src/generated/resources/data/modernmetals/recipes/tungsten_powder.json new file mode 100644 index 00000000..7cc64e79 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/tungsten_powder.json @@ -0,0 +1,19 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:tungsten_powder" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "forge:tiny_dusts/tungsten" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/tungsten_pressureplate.json b/src/generated/resources/data/modernmetals/recipes/tungsten_pressureplate.json new file mode 100644 index 00000000..6577bf76 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/tungsten_pressureplate.json @@ -0,0 +1,17 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:tungsten_pressure_plate" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx" + ], + "key": { + "x": { + "tag": "forge:ingots/tungsten" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/tungsten_rod.json b/src/generated/resources/data/modernmetals/recipes/tungsten_rod.json new file mode 100644 index 00000000..a09ebe20 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/tungsten_rod.json @@ -0,0 +1,18 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:tungsten_rod" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + " x ", + " x " + ], + "key": { + "x": { + "tag": "forge:ingots/tungsten" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/tungsten_scythe.json b/src/generated/resources/data/modernmetals/recipes/tungsten_scythe.json new file mode 100644 index 00000000..2aef7fd8 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/tungsten_scythe.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:tungsten_scythe" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "ii ", + " i", + " s " + ], + "key": { + "i": { + "tag": "forge:ingots/tungsten" + }, + "s": { + "item": "minecraft:stick" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/tungsten_shears.json b/src/generated/resources/data/modernmetals/recipes/tungsten_shears.json new file mode 100644 index 00000000..24101990 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/tungsten_shears.json @@ -0,0 +1,18 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:tungsten_shears" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + " x", + "x " + ], + "key": { + "x": { + "tag": "forge:ingots/tungsten" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/tungsten_shield.json b/src/generated/resources/data/modernmetals/recipes/tungsten_shield.json new file mode 100644 index 00000000..2363f899 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/tungsten_shield.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:tungsten_shield" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xyx", + "xxx", + " x " + ], + "key": { + "x": { + "tag": "forge:ingots/tungsten" + }, + "y": { + "tag": "minecraft:planks" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/tungsten_shovel.json b/src/generated/resources/data/modernmetals/recipes/tungsten_shovel.json new file mode 100644 index 00000000..85d4c055 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/tungsten_shovel.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:tungsten_shovel" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "s", + "s" + ], + "key": { + "x": { + "tag": "forge:ingots/tungsten" + }, + "s": { + "item": "minecraft:stick" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/tungsten_slab.json b/src/generated/resources/data/modernmetals/recipes/tungsten_slab.json new file mode 100644 index 00000000..8e6b6c47 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/tungsten_slab.json @@ -0,0 +1,18 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:tungsten_slab", + "count": 6 + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "tag": "forge:storage_blocks/tungsten" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/tungsten_smallpowder.json b/src/generated/resources/data/modernmetals/recipes/tungsten_smallpowder.json new file mode 100644 index 00000000..29562b2e --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/tungsten_smallpowder.json @@ -0,0 +1,15 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:tungsten_smallpowder", + "count": 9 + }, + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "forge:dusts/tungsten" + } + ] + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/tungsten_stairs.json b/src/generated/resources/data/modernmetals/recipes/tungsten_stairs.json new file mode 100644 index 00000000..0c06991c --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/tungsten_stairs.json @@ -0,0 +1,20 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:tungsten_stairs", + "count": 4 + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "forge:storage_blocks/tungsten" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/tungsten_sword.json b/src/generated/resources/data/modernmetals/recipes/tungsten_sword.json new file mode 100644 index 00000000..b06bf615 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/tungsten_sword.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:tungsten_sword" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "x", + "s" + ], + "key": { + "x": { + "tag": "forge:ingots/tungsten" + }, + "s": { + "item": "minecraft:stick" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/tungsten_trapdoor.json b/src/generated/resources/data/modernmetals/recipes/tungsten_trapdoor.json new file mode 100644 index 00000000..15063a9c --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/tungsten_trapdoor.json @@ -0,0 +1,18 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:tungsten_trapdoor" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "tag": "forge:ingots/tungsten" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/tungsten_wall.json b/src/generated/resources/data/modernmetals/recipes/tungsten_wall.json new file mode 100644 index 00000000..b15564ca --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/tungsten_wall.json @@ -0,0 +1,19 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:tungsten_wall", + "count": 6 + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "forge:storage_blocks/tungsten" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/uranium_arrow.json b/src/generated/resources/data/modernmetals/recipes/uranium_arrow.json new file mode 100644 index 00000000..ab7dfedf --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/uranium_arrow.json @@ -0,0 +1,26 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:uranium_arrow", + "count": 4 + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "y", + "z" + ], + "key": { + "x": { + "tag": "forge:nuggets/uranium" + }, + "y": { + "tag": "forge:rods/uranium" + }, + "z": { + "item": "minecraft:feather" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/uranium_axe.json b/src/generated/resources/data/modernmetals/recipes/uranium_axe.json new file mode 100644 index 00000000..03fafaf9 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/uranium_axe.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:uranium_axe" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xs", + " s" + ], + "key": { + "x": { + "tag": "forge:ingots/uranium" + }, + "s": { + "item": "minecraft:stick" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/uranium_bars_1.json b/src/generated/resources/data/modernmetals/recipes/uranium_bars_1.json new file mode 100644 index 00000000..afb11790 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/uranium_bars_1.json @@ -0,0 +1,19 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:uranium_bars", + "count": 16 + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "forge:ingots/uranium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/uranium_bars_2.json b/src/generated/resources/data/modernmetals/recipes/uranium_bars_2.json new file mode 100644 index 00000000..5bfe29cd --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/uranium_bars_2.json @@ -0,0 +1,18 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:uranium_bars", + "count": 4 + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "tag": "forge:rods/uranium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/uranium_block.json b/src/generated/resources/data/modernmetals/recipes/uranium_block.json new file mode 100644 index 00000000..36916b68 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/uranium_block.json @@ -0,0 +1,19 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:uranium_block" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "forge:ingots/uranium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/uranium_block_ingot.json b/src/generated/resources/data/modernmetals/recipes/uranium_block_ingot.json new file mode 100644 index 00000000..fd603e21 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/uranium_block_ingot.json @@ -0,0 +1,15 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:uranium_ingot", + "count": 9 + }, + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "forge:storage_blocks/uranium" + } + ] + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/uranium_bolt.json b/src/generated/resources/data/modernmetals/recipes/uranium_bolt.json new file mode 100644 index 00000000..796cbbc9 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/uranium_bolt.json @@ -0,0 +1,23 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:uranium_bolt", + "count": 4 + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "x", + "y" + ], + "key": { + "x": { + "tag": "forge:rods/uranium" + }, + "y": { + "item": "minecraft:feather" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/uranium_boots.json b/src/generated/resources/data/modernmetals/recipes/uranium_boots.json new file mode 100644 index 00000000..4892888d --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/uranium_boots.json @@ -0,0 +1,18 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:uranium_boots" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "x x", + "x x" + ], + "key": { + "x": { + "tag": "forge:ingots/uranium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/uranium_bow.json b/src/generated/resources/data/modernmetals/recipes/uranium_bow.json new file mode 100644 index 00000000..59c90c8d --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/uranium_bow.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:uranium_bow" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + " xs", + "x s", + " xs" + ], + "key": { + "x": { + "tag": "forge:rods/uranium" + }, + "s": { + "item": "minecraft:string" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/uranium_button.json b/src/generated/resources/data/modernmetals/recipes/uranium_button.json new file mode 100644 index 00000000..fb323e0b --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/uranium_button.json @@ -0,0 +1,18 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:uranium_button" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "x" + ], + "key": { + "x": { + "tag": "forge:nuggets/uranium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/uranium_chestplate.json b/src/generated/resources/data/modernmetals/recipes/uranium_chestplate.json new file mode 100644 index 00000000..73df8a68 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/uranium_chestplate.json @@ -0,0 +1,19 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:uranium_chestplate" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "x x", + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "forge:ingots/uranium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/uranium_crackhammer.json b/src/generated/resources/data/modernmetals/recipes/uranium_crackhammer.json new file mode 100644 index 00000000..1b333b00 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/uranium_crackhammer.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:uranium_crackhammer" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "y", + "y" + ], + "key": { + "x": { + "tag": "forge:storage_blocks/uranium" + }, + "y": { + "item": "minecraft:stick" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/uranium_crossbow.json b/src/generated/resources/data/modernmetals/recipes/uranium_crossbow.json new file mode 100644 index 00000000..a56b5d0d --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/uranium_crossbow.json @@ -0,0 +1,25 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:uranium_crossbow" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "zxx", + " yx", + "x z" + ], + "key": { + "x": { + "tag": "forge:rods/uranium" + }, + "y": { + "item": "minecraft:string" + }, + "z": { + "tag": "forge:gears/uranium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/uranium_door.json b/src/generated/resources/data/modernmetals/recipes/uranium_door.json new file mode 100644 index 00000000..06f1edd1 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/uranium_door.json @@ -0,0 +1,20 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:uranium_door", + "count": 3 + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx", + "xx" + ], + "key": { + "x": { + "tag": "forge:ingots/uranium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/uranium_fishingrod.json b/src/generated/resources/data/modernmetals/recipes/uranium_fishingrod.json new file mode 100644 index 00000000..951c9436 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/uranium_fishingrod.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:uranium_fishing_rod" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + " x", + " xy", + "x y" + ], + "key": { + "x": { + "tag": "forge:rods/uranium" + }, + "y": { + "item": "minecraft:string" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/uranium_gear.json b/src/generated/resources/data/modernmetals/recipes/uranium_gear.json new file mode 100644 index 00000000..eec927b6 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/uranium_gear.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:uranium_gear" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + " x ", + "xrx", + " x " + ], + "key": { + "x": { + "tag": "forge:ingots/uranium" + }, + "r": { + "tag": "forge:rods/uranium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/uranium_helmet.json b/src/generated/resources/data/modernmetals/recipes/uranium_helmet.json new file mode 100644 index 00000000..1b7750c2 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/uranium_helmet.json @@ -0,0 +1,18 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:uranium_helmet" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "x x" + ], + "key": { + "x": { + "tag": "forge:ingots/uranium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/uranium_hoe.json b/src/generated/resources/data/modernmetals/recipes/uranium_hoe.json new file mode 100644 index 00000000..6a0db730 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/uranium_hoe.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:uranium_hoe" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + " s", + " s" + ], + "key": { + "x": { + "tag": "forge:ingots/uranium" + }, + "s": { + "item": "minecraft:stick" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/uranium_horsearmor.json b/src/generated/resources/data/modernmetals/recipes/uranium_horsearmor.json new file mode 100644 index 00000000..b09944eb --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/uranium_horsearmor.json @@ -0,0 +1,69 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:uranium_horse_armor" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + " x", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "forge:ingots/uranium" + }, + "y": [ + { + "item": "minecraft:white_wool" + }, + { + "item": "minecraft:orange_wool" + }, + { + "item": "minecraft:magenta_wool" + }, + { + "item": "minecraft:light_blue_wool" + }, + { + "item": "minecraft:yellow_wool" + }, + { + "item": "minecraft:lime_wool" + }, + { + "item": "minecraft:pink_wool" + }, + { + "item": "minecraft:gray_wool" + }, + { + "item": "minecraft:light_gray_wool" + }, + { + "item": "minecraft:cyan_wool" + }, + { + "item": "minecraft:purple_wool" + }, + { + "item": "minecraft:blue_wool" + }, + { + "item": "minecraft:brown_wool" + }, + { + "item": "minecraft:green_wool" + }, + { + "item": "minecraft:red_wool" + }, + { + "item": "minecraft:black_wool" + } + ] + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/uranium_ingot.json b/src/generated/resources/data/modernmetals/recipes/uranium_ingot.json new file mode 100644 index 00000000..73c4e5fa --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/uranium_ingot.json @@ -0,0 +1,19 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:uranium_ingot" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "forge:nuggets/uranium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/uranium_leggings.json b/src/generated/resources/data/modernmetals/recipes/uranium_leggings.json new file mode 100644 index 00000000..28e9c867 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/uranium_leggings.json @@ -0,0 +1,19 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:uranium_leggings" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "x x", + "x x" + ], + "key": { + "x": { + "tag": "forge:ingots/uranium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/uranium_lever.json b/src/generated/resources/data/modernmetals/recipes/uranium_lever.json new file mode 100644 index 00000000..86b09d37 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/uranium_lever.json @@ -0,0 +1,21 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:uranium_lever" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "y" + ], + "key": { + "x": { + "tag": "forge:rods/uranium" + }, + "y": { + "tag": "forge:ingots/uranium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/uranium_nugget.json b/src/generated/resources/data/modernmetals/recipes/uranium_nugget.json new file mode 100644 index 00000000..bafc6fa0 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/uranium_nugget.json @@ -0,0 +1,15 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:uranium_nugget", + "count": 9 + }, + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "forge:ingots/uranium" + } + ] + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/uranium_pickaxe.json b/src/generated/resources/data/modernmetals/recipes/uranium_pickaxe.json new file mode 100644 index 00000000..50a59d22 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/uranium_pickaxe.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:uranium_pickaxe" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + " s ", + " s " + ], + "key": { + "x": { + "tag": "forge:ingots/uranium" + }, + "s": { + "item": "minecraft:stick" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/uranium_plate.json b/src/generated/resources/data/modernmetals/recipes/uranium_plate.json new file mode 100644 index 00000000..f6c81b08 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/uranium_plate.json @@ -0,0 +1,17 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:uranium_plate" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "tag": "forge:ingots/uranium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/uranium_powder.json b/src/generated/resources/data/modernmetals/recipes/uranium_powder.json new file mode 100644 index 00000000..c852b5b1 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/uranium_powder.json @@ -0,0 +1,19 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:uranium_powder" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "forge:tiny_dusts/uranium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/uranium_pressureplate.json b/src/generated/resources/data/modernmetals/recipes/uranium_pressureplate.json new file mode 100644 index 00000000..997cba7d --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/uranium_pressureplate.json @@ -0,0 +1,17 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:uranium_pressure_plate" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx" + ], + "key": { + "x": { + "tag": "forge:ingots/uranium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/uranium_rod.json b/src/generated/resources/data/modernmetals/recipes/uranium_rod.json new file mode 100644 index 00000000..96b8fc93 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/uranium_rod.json @@ -0,0 +1,18 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:uranium_rod" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + " x ", + " x " + ], + "key": { + "x": { + "tag": "forge:ingots/uranium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/uranium_scythe.json b/src/generated/resources/data/modernmetals/recipes/uranium_scythe.json new file mode 100644 index 00000000..287577f0 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/uranium_scythe.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:uranium_scythe" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "ii ", + " i", + " s " + ], + "key": { + "i": { + "tag": "forge:ingots/uranium" + }, + "s": { + "item": "minecraft:stick" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/uranium_shears.json b/src/generated/resources/data/modernmetals/recipes/uranium_shears.json new file mode 100644 index 00000000..6620b0b3 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/uranium_shears.json @@ -0,0 +1,18 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:uranium_shears" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + " x", + "x " + ], + "key": { + "x": { + "tag": "forge:ingots/uranium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/uranium_shield.json b/src/generated/resources/data/modernmetals/recipes/uranium_shield.json new file mode 100644 index 00000000..8b9904a1 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/uranium_shield.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:uranium_shield" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xyx", + "xxx", + " x " + ], + "key": { + "x": { + "tag": "forge:ingots/uranium" + }, + "y": { + "tag": "minecraft:planks" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/uranium_shovel.json b/src/generated/resources/data/modernmetals/recipes/uranium_shovel.json new file mode 100644 index 00000000..72a5768f --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/uranium_shovel.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:uranium_shovel" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "s", + "s" + ], + "key": { + "x": { + "tag": "forge:ingots/uranium" + }, + "s": { + "item": "minecraft:stick" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/uranium_slab.json b/src/generated/resources/data/modernmetals/recipes/uranium_slab.json new file mode 100644 index 00000000..1a55ec7f --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/uranium_slab.json @@ -0,0 +1,18 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:uranium_slab", + "count": 6 + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "tag": "forge:storage_blocks/uranium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/uranium_smallpowder.json b/src/generated/resources/data/modernmetals/recipes/uranium_smallpowder.json new file mode 100644 index 00000000..d0b79971 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/uranium_smallpowder.json @@ -0,0 +1,15 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:uranium_smallpowder", + "count": 9 + }, + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "forge:dusts/uranium" + } + ] + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/uranium_stairs.json b/src/generated/resources/data/modernmetals/recipes/uranium_stairs.json new file mode 100644 index 00000000..18681de4 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/uranium_stairs.json @@ -0,0 +1,20 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:uranium_stairs", + "count": 4 + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "forge:storage_blocks/uranium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/uranium_sword.json b/src/generated/resources/data/modernmetals/recipes/uranium_sword.json new file mode 100644 index 00000000..3cb0ccb1 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/uranium_sword.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:uranium_sword" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "x", + "s" + ], + "key": { + "x": { + "tag": "forge:ingots/uranium" + }, + "s": { + "item": "minecraft:stick" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/uranium_trapdoor.json b/src/generated/resources/data/modernmetals/recipes/uranium_trapdoor.json new file mode 100644 index 00000000..151cb151 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/uranium_trapdoor.json @@ -0,0 +1,18 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:uranium_trapdoor" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "tag": "forge:ingots/uranium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/uranium_wall.json b/src/generated/resources/data/modernmetals/recipes/uranium_wall.json new file mode 100644 index 00000000..12e3610a --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/uranium_wall.json @@ -0,0 +1,19 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:uranium_wall", + "count": 6 + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "forge:storage_blocks/uranium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/zirconium_arrow.json b/src/generated/resources/data/modernmetals/recipes/zirconium_arrow.json new file mode 100644 index 00000000..6a93c9c5 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/zirconium_arrow.json @@ -0,0 +1,26 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:zirconium_arrow", + "count": 4 + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "y", + "z" + ], + "key": { + "x": { + "tag": "forge:nuggets/zirconium" + }, + "y": { + "tag": "forge:rods/zirconium" + }, + "z": { + "item": "minecraft:feather" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/zirconium_axe.json b/src/generated/resources/data/modernmetals/recipes/zirconium_axe.json new file mode 100644 index 00000000..5218b768 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/zirconium_axe.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:zirconium_axe" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xs", + " s" + ], + "key": { + "x": { + "tag": "forge:ingots/zirconium" + }, + "s": { + "item": "minecraft:stick" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/zirconium_bars_1.json b/src/generated/resources/data/modernmetals/recipes/zirconium_bars_1.json new file mode 100644 index 00000000..f42aa90f --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/zirconium_bars_1.json @@ -0,0 +1,19 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:zirconium_bars", + "count": 16 + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "forge:ingots/zirconium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/zirconium_bars_2.json b/src/generated/resources/data/modernmetals/recipes/zirconium_bars_2.json new file mode 100644 index 00000000..f802c6c6 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/zirconium_bars_2.json @@ -0,0 +1,18 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:zirconium_bars", + "count": 4 + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "tag": "forge:rods/zirconium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/zirconium_block.json b/src/generated/resources/data/modernmetals/recipes/zirconium_block.json new file mode 100644 index 00000000..95984c21 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/zirconium_block.json @@ -0,0 +1,19 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:zirconium_block" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "forge:ingots/zirconium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/zirconium_block_ingot.json b/src/generated/resources/data/modernmetals/recipes/zirconium_block_ingot.json new file mode 100644 index 00000000..79592222 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/zirconium_block_ingot.json @@ -0,0 +1,15 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:zirconium_ingot", + "count": 9 + }, + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "forge:storage_blocks/zirconium" + } + ] + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/zirconium_bolt.json b/src/generated/resources/data/modernmetals/recipes/zirconium_bolt.json new file mode 100644 index 00000000..dc56e566 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/zirconium_bolt.json @@ -0,0 +1,23 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:zirconium_bolt", + "count": 4 + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "x", + "y" + ], + "key": { + "x": { + "tag": "forge:rods/zirconium" + }, + "y": { + "item": "minecraft:feather" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/zirconium_boots.json b/src/generated/resources/data/modernmetals/recipes/zirconium_boots.json new file mode 100644 index 00000000..4d808459 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/zirconium_boots.json @@ -0,0 +1,18 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:zirconium_boots" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "x x", + "x x" + ], + "key": { + "x": { + "tag": "forge:ingots/zirconium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/zirconium_bow.json b/src/generated/resources/data/modernmetals/recipes/zirconium_bow.json new file mode 100644 index 00000000..0d366fe8 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/zirconium_bow.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:zirconium_bow" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + " xs", + "x s", + " xs" + ], + "key": { + "x": { + "tag": "forge:rods/zirconium" + }, + "s": { + "item": "minecraft:string" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/zirconium_button.json b/src/generated/resources/data/modernmetals/recipes/zirconium_button.json new file mode 100644 index 00000000..a52ddd36 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/zirconium_button.json @@ -0,0 +1,18 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:zirconium_button" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "x" + ], + "key": { + "x": { + "tag": "forge:nuggets/zirconium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/zirconium_chestplate.json b/src/generated/resources/data/modernmetals/recipes/zirconium_chestplate.json new file mode 100644 index 00000000..4d1280ec --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/zirconium_chestplate.json @@ -0,0 +1,19 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:zirconium_chestplate" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "x x", + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "forge:ingots/zirconium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/zirconium_crackhammer.json b/src/generated/resources/data/modernmetals/recipes/zirconium_crackhammer.json new file mode 100644 index 00000000..525f93b9 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/zirconium_crackhammer.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:zirconium_crackhammer" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "y", + "y" + ], + "key": { + "x": { + "tag": "forge:storage_blocks/zirconium" + }, + "y": { + "item": "minecraft:stick" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/zirconium_crossbow.json b/src/generated/resources/data/modernmetals/recipes/zirconium_crossbow.json new file mode 100644 index 00000000..36966eb1 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/zirconium_crossbow.json @@ -0,0 +1,25 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:zirconium_crossbow" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "zxx", + " yx", + "x z" + ], + "key": { + "x": { + "tag": "forge:rods/zirconium" + }, + "y": { + "item": "minecraft:string" + }, + "z": { + "tag": "forge:gears/zirconium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/zirconium_door.json b/src/generated/resources/data/modernmetals/recipes/zirconium_door.json new file mode 100644 index 00000000..b979207a --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/zirconium_door.json @@ -0,0 +1,20 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:zirconium_door", + "count": 3 + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx", + "xx" + ], + "key": { + "x": { + "tag": "forge:ingots/zirconium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/zirconium_fishingrod.json b/src/generated/resources/data/modernmetals/recipes/zirconium_fishingrod.json new file mode 100644 index 00000000..ba64401d --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/zirconium_fishingrod.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:zirconium_fishing_rod" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + " x", + " xy", + "x y" + ], + "key": { + "x": { + "tag": "forge:rods/zirconium" + }, + "y": { + "item": "minecraft:string" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/zirconium_gear.json b/src/generated/resources/data/modernmetals/recipes/zirconium_gear.json new file mode 100644 index 00000000..3fdbc249 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/zirconium_gear.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:zirconium_gear" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + " x ", + "xrx", + " x " + ], + "key": { + "x": { + "tag": "forge:ingots/zirconium" + }, + "r": { + "tag": "forge:rods/zirconium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/zirconium_helmet.json b/src/generated/resources/data/modernmetals/recipes/zirconium_helmet.json new file mode 100644 index 00000000..1bb95837 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/zirconium_helmet.json @@ -0,0 +1,18 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:zirconium_helmet" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "x x" + ], + "key": { + "x": { + "tag": "forge:ingots/zirconium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/zirconium_hoe.json b/src/generated/resources/data/modernmetals/recipes/zirconium_hoe.json new file mode 100644 index 00000000..98b35258 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/zirconium_hoe.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:zirconium_hoe" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + " s", + " s" + ], + "key": { + "x": { + "tag": "forge:ingots/zirconium" + }, + "s": { + "item": "minecraft:stick" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/zirconium_horsearmor.json b/src/generated/resources/data/modernmetals/recipes/zirconium_horsearmor.json new file mode 100644 index 00000000..42b9c51f --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/zirconium_horsearmor.json @@ -0,0 +1,69 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:zirconium_horse_armor" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + " x", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "forge:ingots/zirconium" + }, + "y": [ + { + "item": "minecraft:white_wool" + }, + { + "item": "minecraft:orange_wool" + }, + { + "item": "minecraft:magenta_wool" + }, + { + "item": "minecraft:light_blue_wool" + }, + { + "item": "minecraft:yellow_wool" + }, + { + "item": "minecraft:lime_wool" + }, + { + "item": "minecraft:pink_wool" + }, + { + "item": "minecraft:gray_wool" + }, + { + "item": "minecraft:light_gray_wool" + }, + { + "item": "minecraft:cyan_wool" + }, + { + "item": "minecraft:purple_wool" + }, + { + "item": "minecraft:blue_wool" + }, + { + "item": "minecraft:brown_wool" + }, + { + "item": "minecraft:green_wool" + }, + { + "item": "minecraft:red_wool" + }, + { + "item": "minecraft:black_wool" + } + ] + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/zirconium_ingot.json b/src/generated/resources/data/modernmetals/recipes/zirconium_ingot.json new file mode 100644 index 00000000..ab4664a2 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/zirconium_ingot.json @@ -0,0 +1,19 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:zirconium_ingot" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "forge:nuggets/zirconium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/zirconium_leggings.json b/src/generated/resources/data/modernmetals/recipes/zirconium_leggings.json new file mode 100644 index 00000000..7bb5c78e --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/zirconium_leggings.json @@ -0,0 +1,19 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:zirconium_leggings" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "x x", + "x x" + ], + "key": { + "x": { + "tag": "forge:ingots/zirconium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/zirconium_lever.json b/src/generated/resources/data/modernmetals/recipes/zirconium_lever.json new file mode 100644 index 00000000..d8ccfe27 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/zirconium_lever.json @@ -0,0 +1,21 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:zirconium_lever" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "y" + ], + "key": { + "x": { + "tag": "forge:rods/zirconium" + }, + "y": { + "tag": "forge:ingots/zirconium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/zirconium_nugget.json b/src/generated/resources/data/modernmetals/recipes/zirconium_nugget.json new file mode 100644 index 00000000..51743049 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/zirconium_nugget.json @@ -0,0 +1,15 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:zirconium_nugget", + "count": 9 + }, + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "forge:ingots/zirconium" + } + ] + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/zirconium_pickaxe.json b/src/generated/resources/data/modernmetals/recipes/zirconium_pickaxe.json new file mode 100644 index 00000000..a532e6c4 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/zirconium_pickaxe.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:zirconium_pickaxe" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + " s ", + " s " + ], + "key": { + "x": { + "tag": "forge:ingots/zirconium" + }, + "s": { + "item": "minecraft:stick" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/zirconium_plate.json b/src/generated/resources/data/modernmetals/recipes/zirconium_plate.json new file mode 100644 index 00000000..20b13cb9 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/zirconium_plate.json @@ -0,0 +1,17 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:zirconium_plate" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "tag": "forge:ingots/zirconium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/zirconium_powder.json b/src/generated/resources/data/modernmetals/recipes/zirconium_powder.json new file mode 100644 index 00000000..ae8da529 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/zirconium_powder.json @@ -0,0 +1,19 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:zirconium_powder" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "forge:tiny_dusts/zirconium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/zirconium_pressureplate.json b/src/generated/resources/data/modernmetals/recipes/zirconium_pressureplate.json new file mode 100644 index 00000000..1b1b1729 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/zirconium_pressureplate.json @@ -0,0 +1,17 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:zirconium_pressure_plate" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx" + ], + "key": { + "x": { + "tag": "forge:ingots/zirconium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/zirconium_rod.json b/src/generated/resources/data/modernmetals/recipes/zirconium_rod.json new file mode 100644 index 00000000..8147efd3 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/zirconium_rod.json @@ -0,0 +1,18 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:zirconium_rod" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + " x ", + " x " + ], + "key": { + "x": { + "tag": "forge:ingots/zirconium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/zirconium_scythe.json b/src/generated/resources/data/modernmetals/recipes/zirconium_scythe.json new file mode 100644 index 00000000..4511322e --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/zirconium_scythe.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:zirconium_scythe" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "ii ", + " i", + " s " + ], + "key": { + "i": { + "tag": "forge:ingots/zirconium" + }, + "s": { + "item": "minecraft:stick" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/zirconium_shears.json b/src/generated/resources/data/modernmetals/recipes/zirconium_shears.json new file mode 100644 index 00000000..f1b94c51 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/zirconium_shears.json @@ -0,0 +1,18 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:zirconium_shears" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + " x", + "x " + ], + "key": { + "x": { + "tag": "forge:ingots/zirconium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/zirconium_shield.json b/src/generated/resources/data/modernmetals/recipes/zirconium_shield.json new file mode 100644 index 00000000..c374abf1 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/zirconium_shield.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:zirconium_shield" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xyx", + "xxx", + " x " + ], + "key": { + "x": { + "tag": "forge:ingots/zirconium" + }, + "y": { + "tag": "minecraft:planks" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/zirconium_shovel.json b/src/generated/resources/data/modernmetals/recipes/zirconium_shovel.json new file mode 100644 index 00000000..04eed9d5 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/zirconium_shovel.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:zirconium_shovel" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "s", + "s" + ], + "key": { + "x": { + "tag": "forge:ingots/zirconium" + }, + "s": { + "item": "minecraft:stick" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/zirconium_slab.json b/src/generated/resources/data/modernmetals/recipes/zirconium_slab.json new file mode 100644 index 00000000..507bdf69 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/zirconium_slab.json @@ -0,0 +1,18 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:zirconium_slab", + "count": 6 + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "tag": "forge:storage_blocks/zirconium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/zirconium_smallpowder.json b/src/generated/resources/data/modernmetals/recipes/zirconium_smallpowder.json new file mode 100644 index 00000000..aad5a6bd --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/zirconium_smallpowder.json @@ -0,0 +1,15 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:zirconium_smallpowder", + "count": 9 + }, + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "forge:dusts/zirconium" + } + ] + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/zirconium_stairs.json b/src/generated/resources/data/modernmetals/recipes/zirconium_stairs.json new file mode 100644 index 00000000..bbbdaf75 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/zirconium_stairs.json @@ -0,0 +1,20 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:zirconium_stairs", + "count": 4 + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "forge:storage_blocks/zirconium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/zirconium_sword.json b/src/generated/resources/data/modernmetals/recipes/zirconium_sword.json new file mode 100644 index 00000000..73e522d0 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/zirconium_sword.json @@ -0,0 +1,22 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:zirconium_sword" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "x", + "s" + ], + "key": { + "x": { + "tag": "forge:ingots/zirconium" + }, + "s": { + "item": "minecraft:stick" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/zirconium_trapdoor.json b/src/generated/resources/data/modernmetals/recipes/zirconium_trapdoor.json new file mode 100644 index 00000000..2233c172 --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/zirconium_trapdoor.json @@ -0,0 +1,18 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:zirconium_trapdoor" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "tag": "forge:ingots/zirconium" + } + } + } +} diff --git a/src/generated/resources/data/modernmetals/recipes/zirconium_wall.json b/src/generated/resources/data/modernmetals/recipes/zirconium_wall.json new file mode 100644 index 00000000..42b8757c --- /dev/null +++ b/src/generated/resources/data/modernmetals/recipes/zirconium_wall.json @@ -0,0 +1,19 @@ +{ + "type": "modernmetals:content_crafting", + "recipe": { + "result": { + "item": "modernmetals:zirconium_wall", + "count": 6 + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "forge:storage_blocks/zirconium" + } + } + } +} diff --git a/src/main/java/com/mcmoddev/alt/ModernMetalsALT.java b/src/main/java/com/mcmoddev/alt/ModernMetalsALT.java deleted file mode 100644 index a37ffd7a..00000000 --- a/src/main/java/com/mcmoddev/alt/ModernMetalsALT.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.mcmoddev.alt; - -import com.mcmoddev.alt.api.IALTPlugin; - -//@ALTPlugin(modid = "modernmetals") -class ModernMetalsALT implements IALTPlugin { - // Intentionally left blank -} diff --git a/src/main/java/zone/moddev/mc/modernmetals/ModTabs.java b/src/main/java/zone/moddev/mc/modernmetals/ModTabs.java new file mode 100644 index 00000000..b9558abe --- /dev/null +++ b/src/main/java/zone/moddev/mc/modernmetals/ModTabs.java @@ -0,0 +1,31 @@ +package zone.moddev.mc.modernmetals; + +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; +import net.minecraft.item.Item; +import net.minecraft.item.ItemGroup; +import net.minecraft.item.ItemStack; +import net.minecraft.util.ResourceLocation; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; +import net.minecraftforge.registries.ForgeRegistries; + +public final class ModTabs { + public static final ItemGroup BLOCKS = tab("blocks", "titanium_block", Item.getItemFromBlock(Blocks.IRON_BLOCK)); + public static final ItemGroup ITEMS = tab("items", "titanium_gear", Items.IRON_INGOT); + public static final ItemGroup TOOLS = tab("tools", "titanium_pickaxe", Items.IRON_PICKAXE); + public static final ItemGroup COMBAT = tab("combat", "titanium_sword", Items.IRON_SWORD); + + private ModTabs() {} + + private static ItemGroup tab(String suffix, final String iconId, final Item fallback) { + return new ItemGroup(ModernMetals.MOD_ID + "." + suffix) { + @Override + @OnlyIn(Dist.CLIENT) + public ItemStack createIcon() { + Item registered = ForgeRegistries.ITEMS.getValue(new ResourceLocation(ModernMetals.MOD_ID, iconId)); + return new ItemStack(registered == null ? fallback : registered); + } + }; + } +} diff --git a/src/main/java/zone/moddev/mc/modernmetals/ModTags.java b/src/main/java/zone/moddev/mc/modernmetals/ModTags.java new file mode 100644 index 00000000..beca77af --- /dev/null +++ b/src/main/java/zone/moddev/mc/modernmetals/ModTags.java @@ -0,0 +1,15 @@ +package zone.moddev.mc.modernmetals; + +import net.minecraft.block.Block; +import net.minecraft.tags.BlockTags; +import net.minecraft.tags.Tag; +import net.minecraft.util.ResourceLocation; + +public final class ModTags { + public static final Tag SCYTHE_HARVESTABLE = new BlockTags.Wrapper( + new ResourceLocation(ModernMetals.MOD_ID, "scythe_harvestable")); + public static final Tag CRACKHAMMER_CRUSHABLE = new BlockTags.Wrapper( + new ResourceLocation(ModernMetals.MOD_ID, "crackhammer_crushable")); + + private ModTags() {} +} diff --git a/src/main/java/zone/moddev/mc/modernmetals/ModernMetals.java b/src/main/java/zone/moddev/mc/modernmetals/ModernMetals.java index 3afa7dcb..18fa31ee 100644 --- a/src/main/java/zone/moddev/mc/modernmetals/ModernMetals.java +++ b/src/main/java/zone/moddev/mc/modernmetals/ModernMetals.java @@ -1,102 +1,40 @@ package zone.moddev.mc.modernmetals; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.fml.DeferredWorkQueue; +import net.minecraftforge.fml.DistExecutor; +import net.minecraftforge.fml.ModLoadingContext; +import net.minecraftforge.fml.config.ModConfig; +import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent; +import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext; +import zone.moddev.mc.modernmetals.config.ModernMetalsConfig; +import net.minecraftforge.fml.common.Mod; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; - -import zone.moddev.mc.modernmetals.proxy.CommonProxy; -import zone.moddev.mc.modernmetals.content.ContentPolicy; -import zone.moddev.mc.modernmetals.util.MMeConfig; -import com.mcmoddev.lib.data.SharedStrings; - -import net.minecraft.launchwrapper.Launch; -import net.minecraftforge.fml.common.Mod; -import net.minecraftforge.fml.common.Mod.EventHandler; -import net.minecraftforge.fml.common.Mod.Instance; -import net.minecraftforge.fml.common.SidedProxy; -import net.minecraftforge.fml.common.event.FMLConstructionEvent; -import net.minecraftforge.fml.common.event.FMLFingerprintViolationEvent; -import net.minecraftforge.fml.common.event.FMLInitializationEvent; -import net.minecraftforge.fml.common.event.FMLPostInitializationEvent; -import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; - -/** - * This is the entry point for this Mod. - * - * @author Jasmine Iwanek - * - */ -@Mod( - modid = ModernMetals.MODID, - name = ModernMetals.NAME, - version = ModernMetals.VERSION, - dependencies = "required-after:forge@[14.23.5.2859,);required-after:mmdlib@[1.0.0-rc2,2.0.0);required-after:orespawn@[4.1.6.112021,5.0.0);after:basemetals;after:tconstruct;after:conarm;before:buildingbricks", - acceptedMinecraftVersions = "[1.12.2]", - updateJSON = ModernMetals.UPDATEJSON, - guiFactory = "zone.moddev.mc.modernmetals.client.ModernMetalsGuiFactory") -public class ModernMetals { - - @Instance - public static ModernMetals instance; - - /** ID of this Mod. */ - public static final String MODID = "modernmetals"; - - /** Display name of this Mod. */ - protected static final String NAME = "Modern Metals"; - - /** - * Version number, in Major.Minor.Build format. The minor number is - * increased whenever a change is made that has the potential to break - * compatibility with other mods that depend on this one. - */ - protected static final String VERSION = "2.5.2.112021"; - - protected static final String UPDATEJSON = SharedStrings.UPDATE_JSON_URL + "ModernMetals/master/update.json"; - - private static final String PROXY_BASE = "zone.moddev.mc.modernmetals.proxy."; - - @SidedProxy(clientSide = PROXY_BASE + SharedStrings.CLIENTPROXY, serverSide = PROXY_BASE - + SharedStrings.SERVERPROXY) - public static CommonProxy proxy; - - public static final Logger logger = LogManager.getFormatterLogger(ModernMetals.MODID); - - /** - * - * @param event The Event. - */ - @EventHandler - public void onFingerprintViolation(FMLFingerprintViolationEvent event) { - if (!(Boolean)Launch.blackboard.get("fml.deobfuscatedEnvironment")) { -// logger.warn("The Mod " + MODID + " is expecting signature " + event.getExpectedFingerprint() + " for source "+ event.getSource() + ", however there is no signature matching that description") - logger.warn(SharedStrings.INVALID_FINGERPRINT); - } - } - - @EventHandler - public static void constructing(final FMLConstructionEvent event) { - MMeConfig.init(); - ContentPolicy.initialize(); - } - - /** - * - * @param event The Event. - */ - @EventHandler - public static void preInit(final FMLPreInitializationEvent event) { - proxy.preInit(event); - - } - - @EventHandler - public static void init(final FMLInitializationEvent event) { - zone.moddev.mc.modernmetals.worldgen.ModernMetalsWorldgenProvider.enqueue(); - proxy.init(event); - } - - @EventHandler - public static void postInit(final FMLPostInitializationEvent event) { - proxy.postInit(event); - } +import zone.moddev.mc.modernmetals.client.ClientSetup; +import zone.moddev.mc.modernmetals.entity.ModEntities; +import zone.moddev.mc.modernmetals.migration.LegacyWorldDataHook; +import zone.moddev.mc.modernmetals.recipe.CrushingRecipe; +import zone.moddev.mc.modernmetals.network.ContentModeNetwork; + +@Mod(ModernMetals.MOD_ID) +public final class ModernMetals { + public static final String MOD_ID = "modernmetals"; + public static final Logger LOGGER = LogManager.getLogger(MOD_ID); + + public ModernMetals() { + ModEntities.initialize(); + ModLoadingContext.get().registerConfig(ModConfig.Type.COMMON, ModernMetalsConfig.SPEC); + FMLJavaModLoadingContext.get().getModEventBus().addListener(ModernMetalsConfig::onConfigLoading); + FMLJavaModLoadingContext.get().getModEventBus().addListener(this::setup); + DistExecutor.runWhenOn(Dist.CLIENT, () -> ClientSetup::register); + } + + private void setup(FMLCommonSetupEvent event) { + // Creating a channel grows Forge 25's shared listener tables. + DeferredWorkQueue.runLater(ContentModeNetwork::register); + // Forge's world-save hook list is shared and is not thread-safe. + DeferredWorkQueue.runLater(LegacyWorldDataHook::register); + DeferredWorkQueue.runLater(CrushingRecipe::register); + } } diff --git a/src/main/java/zone/moddev/mc/modernmetals/block/OverlayOreBlock.java b/src/main/java/zone/moddev/mc/modernmetals/block/OverlayOreBlock.java deleted file mode 100644 index 51154998..00000000 --- a/src/main/java/zone/moddev/mc/modernmetals/block/OverlayOreBlock.java +++ /dev/null @@ -1,20 +0,0 @@ -package zone.moddev.mc.modernmetals.block; - -import com.mcmoddev.lib.block.BlockMMDOre; -import com.mcmoddev.lib.material.MMDMaterial; -import net.minecraft.util.BlockRenderLayer; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -/** Lets the stone show through the ore texture's transparent pixels. */ -public final class OverlayOreBlock extends BlockMMDOre { - public OverlayOreBlock(final MMDMaterial material) { - super(material); - } - - @Override - @SideOnly(Side.CLIENT) - public BlockRenderLayer getRenderLayer() { - return BlockRenderLayer.CUTOUT_MIPPED; - } -} diff --git a/src/main/java/zone/moddev/mc/modernmetals/client/ClientMoltenMetalRenderer.java b/src/main/java/zone/moddev/mc/modernmetals/client/ClientMoltenMetalRenderer.java new file mode 100644 index 00000000..4b2fd6e6 --- /dev/null +++ b/src/main/java/zone/moddev/mc/modernmetals/client/ClientMoltenMetalRenderer.java @@ -0,0 +1,54 @@ +package zone.moddev.mc.modernmetals.client; + +import zone.moddev.mc.modernmetals.ModernMetals; +import zone.moddev.mc.modernmetals.content.ModContent; + +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.texture.TextureAtlasSprite; +import net.minecraft.fluid.IFluidState; +import net.minecraft.util.ResourceLocation; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; +import net.minecraftforge.client.event.TextureStitchEvent; +import net.minecraftforge.common.MinecraftForge; + +/** Adds the fluid textures and colours that Forge 25 doesn't render on its own. */ +@OnlyIn(Dist.CLIENT) +public final class ClientMoltenMetalRenderer { + private static final ResourceLocation STILL = new ResourceLocation(ModernMetals.MOD_ID, "blocks/molten_metal_still"); + private static final ResourceLocation FLOW = new ResourceLocation(ModernMetals.MOD_ID, "blocks/molten_metal_flow"); + private static volatile TextureAtlasSprite[] sprites; + + private ClientMoltenMetalRenderer() {} + + public static void register() { + MinecraftForge.EVENT_BUS.addListener(ClientMoltenMetalRenderer::onTexturePre); + MinecraftForge.EVENT_BUS.addListener(ClientMoltenMetalRenderer::onTexturePost); + } + + private static void onTexturePre(TextureStitchEvent.Pre event) { + event.getMap().registerSprite(Minecraft.getInstance().getResourceManager(), STILL); + event.getMap().registerSprite(Minecraft.getInstance().getResourceManager(), FLOW); + } + + private static void onTexturePost(TextureStitchEvent.Post event) { + sprites = new TextureAtlasSprite[] { event.getMap().getSprite(STILL), event.getMap().getSprite(FLOW) }; + } + + public static boolean useOpaqueFluidPath(IFluidState state, boolean vanillaValue) { + return isOurs(state) || vanillaValue; + } + + public static TextureAtlasSprite[] overrideSprites(IFluidState state, TextureAtlasSprite[] vanillaSprites) { + TextureAtlasSprite[] current = sprites; + return isOurs(state) && current != null ? current : vanillaSprites; + } + + public static int overrideColor(IFluidState state, int vanillaColor) { + return isOurs(state) ? ModContent.fluidColour(state.getFluid()) : vanillaColor; + } + + private static boolean isOurs(IFluidState state) { + return state != null && ModContent.isModernMetalsFluid(state.getFluid()); + } +} diff --git a/src/main/java/zone/moddev/mc/modernmetals/client/ClientSetup.java b/src/main/java/zone/moddev/mc/modernmetals/client/ClientSetup.java new file mode 100644 index 00000000..1eccc9ea --- /dev/null +++ b/src/main/java/zone/moddev/mc/modernmetals/client/ClientSetup.java @@ -0,0 +1,35 @@ +package zone.moddev.mc.modernmetals.client; + +import zone.moddev.mc.modernmetals.content.FluidContent; +import zone.moddev.mc.modernmetals.content.ModContent; +import zone.moddev.mc.modernmetals.entity.MaterialProjectile; + +import net.minecraftforge.client.event.ColorHandlerEvent; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.fml.client.registry.RenderingRegistry; +import net.minecraftforge.fml.ExtensionPoint; +import net.minecraftforge.fml.ModLoadingContext; +import zone.moddev.mc.orespawn.api.client.WorldSettingsExtensionRegistry; + +public final class ClientSetup { + private ClientSetup() {} + + public static void register() { + ModLoadingContext.get().registerExtensionPoint(ExtensionPoint.CONFIGGUIFACTORY, + () -> (minecraft, parent) -> new ModernMetalsConfigScreen(parent)); + WorldSettingsExtensionRegistry.registerConfigScreen("modernmetals", ModernMetalsConfigScreen::new); + ClientMoltenMetalRenderer.register(); + MinecraftForge.EVENT_BUS.addListener(ClientSetup::registerBucketColours); + MinecraftForge.EVENT_BUS.addListener(ModsListConfigButton::onDraw); + RenderingRegistry.registerEntityRenderingHandler(MaterialProjectile.class, + manager -> new MaterialProjectileRenderer(manager)); + } + + private static void registerBucketColours(ColorHandlerEvent.Item event) { + for (final FluidContent content : ModContent.fluids().values()) { + event.getItemColors().register((stack, tintIndex) -> tintIndex == 1 + ? ModContent.fluidColour(content.source().get()) : 0xFFFFFF, + content.bucket().get()); + } + } +} diff --git a/src/main/java/zone/moddev/mc/modernmetals/client/MaterialProjectileRenderer.java b/src/main/java/zone/moddev/mc/modernmetals/client/MaterialProjectileRenderer.java new file mode 100644 index 00000000..3498417b --- /dev/null +++ b/src/main/java/zone/moddev/mc/modernmetals/client/MaterialProjectileRenderer.java @@ -0,0 +1,21 @@ +package zone.moddev.mc.modernmetals.client; + +import zone.moddev.mc.modernmetals.entity.MaterialProjectile; + +import net.minecraft.client.renderer.entity.RenderArrow; +import net.minecraft.client.renderer.entity.RenderManager; +import net.minecraft.util.ResourceLocation; + +public final class MaterialProjectileRenderer extends RenderArrow { + private static final ResourceLocation ARROW_TEXTURE = + new ResourceLocation("textures/entity/projectiles/arrow.png"); + + public MaterialProjectileRenderer(RenderManager manager) { + super(manager); + } + + @Override + protected ResourceLocation getEntityTexture(MaterialProjectile projectile) { + return ARROW_TEXTURE; + } +} diff --git a/src/main/java/zone/moddev/mc/modernmetals/client/ModernMetalsConfigScreen.java b/src/main/java/zone/moddev/mc/modernmetals/client/ModernMetalsConfigScreen.java index 3914de2b..e145a168 100644 --- a/src/main/java/zone/moddev/mc/modernmetals/client/ModernMetalsConfigScreen.java +++ b/src/main/java/zone/moddev/mc/modernmetals/client/ModernMetalsConfigScreen.java @@ -1,36 +1,65 @@ package zone.moddev.mc.modernmetals.client; -import java.util.ArrayList; -import java.util.List; +import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.resources.I18n; -import net.minecraftforge.common.config.ConfigElement; -import net.minecraftforge.common.config.Configuration; -import net.minecraftforge.fml.client.config.GuiConfig; -import net.minecraftforge.fml.client.config.IConfigElement; -import zone.moddev.mc.modernmetals.ModernMetals; -import zone.moddev.mc.modernmetals.content.ContentPolicy; -import zone.moddev.mc.modernmetals.util.MMeConfig; - -/** Shared configuration screen for the Forge and OreSpawn mod lists. */ -public final class ModernMetalsConfigScreen extends GuiConfig { - public ModernMetalsConfigScreen(final GuiScreen parent) { - super(parent, elements(), ModernMetals.MODID, false, true, - I18n.format("config.modernmetals.title"), - I18n.format(ContentPolicy.inheritsBaseMetals() - ? "config.modernmetals.inherited_mode" : "config.modernmetals.description")); +import zone.moddev.mc.modernmetals.config.ContentPolicy; +import zone.moddev.mc.modernmetals.config.ModernMetalsConfig; + +public final class ModernMetalsConfigScreen extends GuiScreen { + private static final String PREFIX = "config.modernmetals."; + private final GuiScreen parent; + private final boolean inherited = ContentPolicy.inheritsBaseMetals(); + private String mode; + + public ModernMetalsConfigScreen(GuiScreen parent) { + this.parent = parent; + mode = inherited ? (ContentPolicy.active().lowFantasy() ? "low_fantasy" : "high_fantasy") + : ModernMetalsConfig.CONTENT_MODE.get(); } - private static List elements() { - final Configuration config = MMeConfig.getConfiguration(); - final List elements = new ArrayList<>( - new ConfigElement(config.getCategory("General")).getChildElements()); - if (ContentPolicy.inheritsBaseMetals()) { - elements.removeIf(element -> "contentMode".equals(element.getName())); - } - for (final String category : MMeConfig.MATERIAL_CATEGORIES) { - elements.add(new ConfigElement(config.getCategory(category))); + @Override + protected void initGui() { + int top = height / 2 - 25; + GuiButton selector = addButton(new Button(20, width / 2 - 125, top, 250, label(), () -> { + mode = "low_fantasy".equals(mode) ? "high_fantasy" : "low_fantasy"; + for (GuiButton button : buttons) { + if (button.id == 20) button.displayString = label(); + } + })); + selector.enabled = !inherited; + addButton(new Button(0, width / 2 - 105, top + 52, 100, I18n.format("gui.done"), () -> { + if (!inherited && !mode.equals(ModernMetalsConfig.CONTENT_MODE.get())) { + ModernMetalsConfig.saveMode(mode); + } + close(); + })); + addButton(new Button(1, width / 2 + 5, top + 52, 100, I18n.format("gui.cancel"), this::close)); + } + + private String label() { + return I18n.format(PREFIX + "contentMode") + ": " + I18n.format(PREFIX + mode); + } + + @Override public void close() { mc.displayGuiScreen(parent); } + + @Override + public void render(int mouseX, int mouseY, float partialTicks) { + drawDefaultBackground(); + drawCenteredString(fontRenderer, I18n.format(PREFIX + "title"), width / 2, 18, 0xFFFFFF); + drawCenteredString(fontRenderer, I18n.format(PREFIX + (inherited ? "inherited" : "restart")), + width / 2, height / 2 + 8, 0xFFFFFF); + super.render(mouseX, mouseY, partialTicks); + } + + private static final class Button extends GuiButton { + private final Runnable action; + + private Button(int id, int x, int y, int width, String text, Runnable action) { + super(id, x, y, width, 20, text); + this.action = action; } - return elements; + + @Override public void onClick(double mouseX, double mouseY) { action.run(); } } } diff --git a/src/main/java/zone/moddev/mc/modernmetals/client/ModernMetalsGuiFactory.java b/src/main/java/zone/moddev/mc/modernmetals/client/ModernMetalsGuiFactory.java deleted file mode 100644 index ecf8054c..00000000 --- a/src/main/java/zone/moddev/mc/modernmetals/client/ModernMetalsGuiFactory.java +++ /dev/null @@ -1,32 +0,0 @@ -package zone.moddev.mc.modernmetals.client; - -import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.GuiScreen; -import net.minecraftforge.fml.client.IModGuiFactory; - -import java.util.Collections; -import java.util.Set; - -/** Opens the existing configuration screen from Forge's Mods list. */ -public final class ModernMetalsGuiFactory implements IModGuiFactory { - - @Override - public void initialize(final Minecraft minecraftInstance) { - // The screen uses the configuration already loaded by Modern Metals. - } - - @Override - public boolean hasConfigGui() { - return true; - } - - @Override - public GuiScreen createConfigGui(final GuiScreen parentScreen) { - return new ModernMetalsConfigScreen(parentScreen); - } - - @Override - public Set runtimeGuiCategories() { - return Collections.emptySet(); - } -} diff --git a/src/main/java/zone/moddev/mc/modernmetals/client/ModsListConfigButton.java b/src/main/java/zone/moddev/mc/modernmetals/client/ModsListConfigButton.java new file mode 100644 index 00000000..73740e0f --- /dev/null +++ b/src/main/java/zone/moddev/mc/modernmetals/client/ModsListConfigButton.java @@ -0,0 +1,51 @@ +package zone.moddev.mc.modernmetals.client; + +import java.lang.reflect.Field; + +import net.minecraft.client.gui.GuiButton; +import net.minecraftforge.client.event.GuiScreenEvent; +import net.minecraftforge.fml.client.gui.GuiModList; +import net.minecraftforge.fml.loading.moddiscovery.ModInfo; +import zone.moddev.mc.modernmetals.ModernMetals; + +/** Enables our Config button on Forge 25's Mods screen. */ +final class ModsListConfigButton { + private static final int CONFIG_BUTTON_ID = 20; + private static final Field SELECTED_MOD = selectedModField(); + + private ModsListConfigButton() {} + + static void onDraw(GuiScreenEvent.DrawScreenEvent.Pre event) { + if (!(event.getGui() instanceof GuiModList)) return; + + GuiModList screen = (GuiModList) event.getGui(); + ModInfo selected = selectedMod(screen); + if (selected != null && !ModernMetals.MOD_ID.equals(selected.getModId())) return; + + // Forge 25's hasConfigUI() always returns false, even with a registered factory. + screen.getChildren().stream() + .filter(GuiButton.class::isInstance) + .map(GuiButton.class::cast) + .filter(button -> button.id == CONFIG_BUTTON_ID) + .forEach(button -> button.enabled = selected != null); + } + + private static Field selectedModField() { + // Forge keeps the selection private; the field isn't Minecraft-mapped. + try { + Field field = GuiModList.class.getDeclaredField("selectedMod"); + field.setAccessible(true); + return field; + } catch (NoSuchFieldException failure) { + throw new IllegalStateException("Cannot read the selected mod on Forge's Mods screen", failure); + } + } + + private static ModInfo selectedMod(GuiModList screen) { + try { + return (ModInfo) SELECTED_MOD.get(screen); + } catch (IllegalAccessException failure) { + throw new IllegalStateException("Cannot read the selected mod on Forge's Mods screen", failure); + } + } +} diff --git a/src/main/java/zone/moddev/mc/modernmetals/compat/LegacyNamespaceTransformer.java b/src/main/java/zone/moddev/mc/modernmetals/compat/LegacyNamespaceTransformer.java deleted file mode 100644 index 0c3635d6..00000000 --- a/src/main/java/zone/moddev/mc/modernmetals/compat/LegacyNamespaceTransformer.java +++ /dev/null @@ -1,89 +0,0 @@ -package zone.moddev.mc.modernmetals.compat; - -import java.io.BufferedReader; -import java.io.IOException; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.nio.charset.StandardCharsets; -import java.util.Collections; -import java.util.HashSet; -import java.util.Set; -import net.minecraft.launchwrapper.IClassTransformer; -import org.objectweb.asm.ClassReader; -import org.objectweb.asm.ClassWriter; -import org.objectweb.asm.commons.Remapper; -import org.objectweb.asm.commons.RemappingClassAdapter; - -/** Relinks existing MMD add-ons to the same classes and registries as Modern Metals. */ -public final class LegacyNamespaceTransformer implements IClassTransformer { - - private static final String OLD = "com/mcmoddev/modernmetals/"; - private static final String CURRENT = "zone/moddev/mc/modernmetals/"; - private static final Set EXPORTS = loadExports(); - - @Override - public byte[] transform(final String name, final String transformedName, final byte[] bytes) { - if (bytes == null || name == null || name.startsWith("zone.moddev.mc.modernmetals.") - || !(contains(bytes, OLD) || contains(bytes, OLD.replace('/', '.')))) { - return bytes; - } - - final ClassWriter output = new ClassWriter(0); - final Remapper names = new Remapper() { - @Override - public String map(final String internalName) { - return currentName(internalName); - } - - @Override - public Object mapValue(final Object value) { - if (value instanceof String) { - final String text = (String) value; - final String internal = text.replace('.', '/'); - final String mapped = currentName(internal); - if (mapped.equals(internal)) return value; - return text.indexOf('/') < 0 ? mapped.replace('/', '.') : mapped; - } - return super.mapValue(value); - } - }; - - new ClassReader(bytes).accept(new RemappingClassAdapter(output, names), 0); - return output.toByteArray(); - } - - private static String currentName(final String name) { - if (!name.startsWith(OLD)) return name; - - final String suffix = name.substring(OLD.length()); - final int nested = suffix.indexOf('$'); - final String owner = nested < 0 ? suffix : suffix.substring(0, nested); - return EXPORTS.contains(owner) ? CURRENT + suffix : name; - } - - private static Set loadExports() { - final Set result = new HashSet<>(); - final InputStream stream = LegacyNamespaceTransformer.class.getClassLoader() - .getResourceAsStream("META-INF/modernmetals-legacy-api.list"); - if (stream == null) throw new IllegalStateException("Missing Modern Metals API name list"); - - try (BufferedReader reader = new BufferedReader(new InputStreamReader(stream, StandardCharsets.UTF_8))) { - String line; - while ((line = reader.readLine()) != null) { - if (!line.isEmpty() && !line.startsWith("#")) result.add(line); - } - } catch (final IOException failure) { - throw new IllegalStateException("Cannot read Modern Metals API names", failure); - } - return Collections.unmodifiableSet(result); - } - - private static boolean contains(final byte[] bytes, final String text) { - for (int offset = 0; offset <= bytes.length - text.length(); offset++) { - int index = 0; - while (index < text.length() && bytes[offset + index] == text.charAt(index)) index++; - if (index == text.length()) return true; - } - return false; - } -} diff --git a/src/main/java/zone/moddev/mc/modernmetals/compat/ModernMetalsLoadingPlugin.java b/src/main/java/zone/moddev/mc/modernmetals/compat/ModernMetalsLoadingPlugin.java deleted file mode 100644 index 45021ae0..00000000 --- a/src/main/java/zone/moddev/mc/modernmetals/compat/ModernMetalsLoadingPlugin.java +++ /dev/null @@ -1,19 +0,0 @@ -package zone.moddev.mc.modernmetals.compat; - -import java.util.Map; -import net.minecraftforge.fml.relauncher.IFMLLoadingPlugin; - -/** Relinks old add-on names without installing a second Base Metals transformer. */ -@IFMLLoadingPlugin.Name("ModernMetals") -@IFMLLoadingPlugin.MCVersion("1.12.2") -@IFMLLoadingPlugin.SortingIndex(1002) -@IFMLLoadingPlugin.TransformerExclusions("zone.moddev.mc.modernmetals.compat.") -public final class ModernMetalsLoadingPlugin implements IFMLLoadingPlugin { - @Override public String[] getASMTransformerClass() { - return new String[] { "zone.moddev.mc.modernmetals.compat.LegacyNamespaceTransformer" }; - } - @Override public String getModContainerClass() { return null; } - @Override public String getSetupClass() { return null; } - @Override public void injectData(final Map data) { } - @Override public String getAccessTransformerClass() { return null; } -} diff --git a/src/main/java/zone/moddev/mc/modernmetals/config/ContentMode.java b/src/main/java/zone/moddev/mc/modernmetals/config/ContentMode.java new file mode 100644 index 00000000..0e2dd15c --- /dev/null +++ b/src/main/java/zone/moddev/mc/modernmetals/config/ContentMode.java @@ -0,0 +1,38 @@ +package zone.moddev.mc.modernmetals.config; + +import java.util.Locale; + +/** Names shared by the config file, config screen and login check. */ +public enum ContentMode { + HIGH_FANTASY("high_fantasy"), + LOW_FANTASY("low_fantasy"); + + private final String name; + + ContentMode(String name) { + this.name = name; + } + + public String serializedName() { + return name; + } + + public String translationKey() { + return "config.modernmetals.content_mode." + name; + } + + public static ContentMode parse(String value) { + if (value != null) { + String normalized = value.trim().toLowerCase(Locale.ROOT); + for (ContentMode mode : values()) { + if (mode.name.equals(normalized)) return mode; + } + } + + return HIGH_FANTASY; + } + + public static boolean isValid(String value) { + return value != null && parse(value).name.equals(value.trim().toLowerCase(Locale.ROOT)); + } +} diff --git a/src/main/java/zone/moddev/mc/modernmetals/content/ContentPolicy.java b/src/main/java/zone/moddev/mc/modernmetals/config/ContentPolicy.java similarity index 52% rename from src/main/java/zone/moddev/mc/modernmetals/content/ContentPolicy.java rename to src/main/java/zone/moddev/mc/modernmetals/config/ContentPolicy.java index b32c1a18..d3dcdaf9 100644 --- a/src/main/java/zone/moddev/mc/modernmetals/content/ContentPolicy.java +++ b/src/main/java/zone/moddev/mc/modernmetals/config/ContentPolicy.java @@ -1,17 +1,13 @@ -package zone.moddev.mc.modernmetals.content; +package zone.moddev.mc.modernmetals.config; import java.util.Arrays; import java.util.Collections; import java.util.HashSet; import java.util.Locale; import java.util.Set; -import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; -import net.minecraftforge.fml.common.Loader; -import net.minecraftforge.fml.common.ModContainer; -import net.minecraftforge.fml.common.versioning.DefaultArtifactVersion; +import net.minecraftforge.fml.ModList; import zone.moddev.mc.modernmetals.ModernMetals; -import zone.moddev.mc.modernmetals.util.MMeConfig; /** Restricts obtainability, while retaining every registered item and saved stack. */ public final class ContentPolicy { @@ -22,35 +18,34 @@ public final class ContentPolicy { private static final Set GEARS = names("aluminum","aluminumbrass","galvanizedsteel","stainlesssteel","titanium"); private static final Set STRUCTURAL_FORMS = names("bars","bookshelf","button","door","double_slab","doubleslab","fence","fence_gate","flower_pot","ladder","lever","pressure_plate","pressureplate","slab","stairs","trapdoor","tripwire_hook","wall"); private static final Set STRUCTURAL_METALS = names("aluminum","aluminumbrass","galvanizedsteel","nichrome","stainlesssteel","tantalum","titanium","tungsten","zirconium"); - private static boolean initialized; - private static ContentPolicy active = forMode("high_fantasy"); private final boolean low; - private ContentPolicy(final boolean low) { this.low=low; } - public static ContentPolicy forMode(final String mode) { - return new ContentPolicy(mode!=null && "low_fantasy".equals(mode.trim().toLowerCase(Locale.ROOT))); - } - public static ContentPolicy active() { return active; } + + private ContentPolicy(boolean low) { this.low = low; } + + public static ContentPolicy active() { return EffectivePolicy.INSTANCE; } public boolean lowFantasy() { return low; } - /** Base Metals owns the mode when its startup configuration API is available. */ - public static boolean inheritsBaseMetals() { - final ModContainer mod = Loader.instance().getIndexedModList().get("basemetals"); - return mod != null && new DefaultArtifactVersion(mod.getVersion()) - .compareTo(new DefaultArtifactVersion("2.6.1.112021")) >= 0; + public ContentMode mode() { return low ? ContentMode.LOW_FANTASY : ContentMode.HIGH_FANTASY; } + + private static final class EffectivePolicy { + private static final ContentPolicy INSTANCE = load(); } - public static void initialize() { - if (initialized) return; - final boolean inherited = inheritsBaseMetals(); - active = forMode(inherited ? BaseMetalsMode.read() : MMeConfig.configuredContentMode()); - initialized = true; - ModernMetals.logger.info("Modern Metals Fantasy Level %s (%s)", - active.low ? "low_fantasy" : "high_fantasy", inherited ? "Base Metals" : "Modern Metals"); + private static ContentPolicy load() { + String mode = inheritsBaseMetals() ? baseMode() : ModernMetalsConfig.activeMode(); + return new ContentPolicy("low_fantasy".equals(mode.toLowerCase(Locale.ROOT))); } - // This class is linked only in a pack with the compatible Base Metals API. - private static final class BaseMetalsMode { - static String read() { - return com.mcmoddev.basemetals.util.BMeConfig.getActiveContentMode().serializedName(); + public static boolean inheritsBaseMetals() { + return ModList.get().isLoaded("basemetals"); + } + + private static String baseMode() { + // Keep the optional Base Metals dependency off the standalone runtime classpath. + try { + Class config = Class.forName("zone.moddev.mc.basemetals.config.BaseMetalsConfig"); + return config.getMethod("activeMode").invoke(null).toString(); + } catch (ReflectiveOperationException error) { + throw new IllegalStateException("Could not read Base Metals Fantasy Level", error); } } @@ -65,14 +60,14 @@ public boolean allows(final String material,final String form) { if(STRUCTURAL_FORMS.contains(form)) return STRUCTURAL_METALS.contains(material); return true; } - public boolean allows(final ItemStack stack) { - if(!low || stack==null || stack.isEmpty()) return true; - final ResourceLocation id=stack.getItem().getRegistryName(); - if(id==null || !ModernMetals.MODID.equals(id.getNamespace())) return true; - final String path=id.getPath().startsWith("double_") ? id.getPath().substring(7) : id.getPath(); - final int split=path.indexOf('_'); - return split<0 || allows(path.substring(0,split),path.substring(split+1)); + public boolean allows(String item) { + ResourceLocation id = new ResourceLocation(item); + if (!ModernMetals.MOD_ID.equals(id.getNamespace())) return true; + String path = id.getPath(); + int split = path.indexOf('_'); + return split < 0 || allows(path.substring(0, split), path.substring(split + 1)); } + private static Set names(final String... values) { return Collections.unmodifiableSet(new HashSet<>(Arrays.asList(values))); } diff --git a/src/main/java/zone/moddev/mc/modernmetals/config/ModernMetalsConfig.java b/src/main/java/zone/moddev/mc/modernmetals/config/ModernMetalsConfig.java new file mode 100644 index 00000000..31f7f2e3 --- /dev/null +++ b/src/main/java/zone/moddev/mc/modernmetals/config/ModernMetalsConfig.java @@ -0,0 +1,61 @@ +package zone.moddev.mc.modernmetals.config; + +import java.io.IOException; +import java.nio.charset.StandardCharsets; +import java.nio.file.Files; +import java.nio.file.Path; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +import net.minecraftforge.common.ForgeConfigSpec; +import net.minecraftforge.fml.config.ModConfig; +import net.minecraftforge.fml.loading.FMLPaths; +import zone.moddev.mc.modernmetals.ModernMetals; + +public final class ModernMetalsConfig { + private static final Pattern LEGACY_MODE = Pattern.compile("(?im)^\\s*S:contentMode\\s*=\\s*(high_fantasy|low_fantasy)\\s*$"); + public static final ForgeConfigSpec SPEC; + public static final ForgeConfigSpec.ConfigValue CONTENT_MODE; + public static final ForgeConfigSpec.BooleanValue VILLAGER_TRADES; + private static String activeMode = "high_fantasy"; + private static ModConfig loadedConfig; + + static { + ForgeConfigSpec.Builder builder = new ForgeConfigSpec.Builder(); + CONTENT_MODE = builder.comment("Fantasy Level for installations without Base Metals. Restart to apply.") + .worldRestart().define("contentMode", legacyMode(), + value -> "high_fantasy".equals(value) || "low_fantasy".equals(value)); + VILLAGER_TRADES = builder.comment("Allow blacksmiths to trade Modern Metals items.") + .worldRestart().define("villagerTrades", true); + SPEC = builder.build(); + } + + private ModernMetalsConfig() {} + + private static String legacyMode() { + Path legacy = FMLPaths.CONFIGDIR.get().resolve("ModernMetals.cfg"); + if (Files.isRegularFile(legacy)) { + try { + Matcher matcher = LEGACY_MODE.matcher(new String(Files.readAllBytes(legacy), StandardCharsets.UTF_8)); + if (matcher.find()) return ContentMode.parse(matcher.group(1)).serializedName(); + } catch (IOException error) { + ModernMetals.LOGGER.warn("Could not import Fantasy Level from {}", legacy, error); + } + } + return "high_fantasy"; + } + + public static void onConfigLoading(ModConfig.Loading event) { + if (event.getConfig().getSpec() == SPEC && loadedConfig == null) { + loadedConfig = event.getConfig(); + activeMode = CONTENT_MODE.get(); + } + } + + public static String activeMode() { return activeMode; } + + public static void saveMode(String value) { + loadedConfig.getConfigData().set(CONTENT_MODE.getPath(), value); + loadedConfig.save(); + } +} diff --git a/src/main/java/zone/moddev/mc/modernmetals/content/ContentModeNetwork.java b/src/main/java/zone/moddev/mc/modernmetals/content/ContentModeNetwork.java deleted file mode 100644 index bbe36aec..00000000 --- a/src/main/java/zone/moddev/mc/modernmetals/content/ContentModeNetwork.java +++ /dev/null @@ -1,64 +0,0 @@ -package zone.moddev.mc.modernmetals.content; - -import java.util.Set; - -import net.minecraft.network.NetworkManager; -import net.minecraft.network.play.server.SPacketDisconnect; -import net.minecraft.util.text.ITextComponent; -import net.minecraft.util.text.TextComponentString; -import net.minecraft.util.text.TextComponentTranslation; -import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -import net.minecraftforge.fml.common.network.FMLNetworkEvent.CustomPacketRegistrationEvent; -import net.minecraftforge.fml.common.network.NetworkRegistry; - -/** Advertise the active recipe mode in Forge's login channel registration. */ -public final class ContentModeNetwork { - private static final String HIGH = "ModernMetals|High"; - private static final String LOW = "ModernMetals|Low"; - - private ContentModeNetwork() {} - - public static void register() { - NetworkRegistry.INSTANCE.newEventDrivenChannel(ContentPolicy.active().lowFantasy() ? LOW : HIGH); - MinecraftForge.EVENT_BUS.register(new ContentModeNetwork()); - } - - @SubscribeEvent - public void checkMode(final CustomPacketRegistrationEvent event) { - final Set channels = event.getRegistrations(); - // Forge includes FML|HS in its login registration, not ordinary channel updates. - if (!"REGISTER".equals(event.getOperation()) || !channels.contains("FML|HS")) return; - - final boolean localLow = ContentPolicy.active().lowFantasy(); - final boolean remoteLow = channels.contains(LOW); - final boolean remoteHigh = channels.contains(HIGH); - final boolean server = event.getSide().isServer(); - final ITextComponent reason; - if (remoteLow == remoteHigh) { - // A client with no mode channel may also lack the translation key. - reason = server - ? new TextComponentString("Modern Metals could not check the Fantasy Level. " - + "Use the same Modern Metals build on the server and client.") - : new TextComponentTranslation("config.modernmetals.connection.protocol"); - } else if (remoteLow == localLow) { - return; - } else { - final boolean serverLow = server ? localLow : remoteLow; - reason = new TextComponentTranslation("config.modernmetals.connection.mismatch", - modeLabel(serverLow), modeLabel(!serverLow)); - } - - final NetworkManager manager = event.getManager(); - manager.channel().config().setAutoRead(false); - if (server) { - manager.sendPacket(new SPacketDisconnect(reason), future -> manager.closeChannel(reason)); - } else { - manager.closeChannel(reason); - } - } - - private static ITextComponent modeLabel(final boolean low) { - return new TextComponentTranslation("config.modernmetals.content_mode." + (low ? "low_fantasy" : "high_fantasy")); - } -} diff --git a/src/main/java/zone/moddev/mc/modernmetals/content/CrackhammerItem.java b/src/main/java/zone/moddev/mc/modernmetals/content/CrackhammerItem.java new file mode 100644 index 00000000..212cc15e --- /dev/null +++ b/src/main/java/zone/moddev/mc/modernmetals/content/CrackhammerItem.java @@ -0,0 +1,153 @@ +package zone.moddev.mc.modernmetals.content; + +import java.util.Collections; +import java.util.List; + +import javax.annotation.Nullable; + +import zone.moddev.mc.modernmetals.ModTags; +import zone.moddev.mc.modernmetals.material.MaterialDefinition; +import zone.moddev.mc.modernmetals.recipe.CrushingRecipe; + +import net.minecraft.block.Block; +import net.minecraft.block.material.Material; +import net.minecraft.block.state.IBlockState; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.item.EntityItem; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.InventoryBasic; +import net.minecraft.item.Item; +import net.minecraft.item.ItemBlock; +import net.minecraft.item.ItemStack; +import net.minecraft.item.crafting.IRecipe; +import net.minecraft.util.ResourceLocation; +import net.minecraft.item.ItemTool; +import net.minecraft.item.ItemUseContext; +import net.minecraft.client.util.ITooltipFlag; +import net.minecraft.stats.StatList; +import net.minecraft.util.EnumActionResult; +import net.minecraft.util.EnumFacing; +import net.minecraft.util.EnumHand; +import net.minecraft.util.SoundCategory; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.text.ITextComponent; +import net.minecraft.util.text.TextComponentString; +import net.minecraft.world.World; +import net.minecraftforge.common.ToolType; +import net.minecraftforge.event.ForgeEventFactory; + +public final class CrackhammerItem extends ItemTool implements MaterialBacked { + private static final ResourceLocation BASE_METALS_CRUSHING = new ResourceLocation("basemetals", "crushing"); + private final MaterialDefinition material; + + public CrackhammerItem(MaterialDefinition material, Item.Properties properties) { + super(material.crackhammerAttackDamage() - material.baseAttackDamage(), -3.5F, + new MaterialTier(material), Collections.emptySet(), + properties.defaultMaxDamage(material.crackhammerDurability()) + .addToolType(ToolType.PICKAXE, material.toolLevel())); + this.material = material; + } + + @Override public MaterialDefinition baseMetalsMaterial() { return material; } + + @Override public float getDestroySpeed(ItemStack stack, IBlockState state) { + return state.isIn(ModTags.CRACKHAMMER_CRUSHABLE) && canHarvestBlock(state) + ? material.crackhammerDestroySpeed() : 1.0F; + } + + @Override public boolean canHarvestBlock(IBlockState state) { + if (state.getHarvestTool() == ToolType.PICKAXE) return material.toolLevel() >= state.getHarvestLevel(); + Material blockMaterial = state.getMaterial(); + return blockMaterial == Material.ROCK || blockMaterial == Material.IRON + || blockMaterial == Material.ANVIL; + } + + @Override public void addInformation(ItemStack stack, @Nullable World world, + List tooltip, ITooltipFlag flag) { MaterialItems.addToolTooltip(material, tooltip); } + + @Override + public boolean onBlockStartBreak(ItemStack hammer, BlockPos pos, EntityPlayer player) { + World world = player.world; + if (world.isRemote || player.isCreative()) return false; + + IBlockState state = world.getBlockState(pos); + if (!state.canHarvestBlock(world, pos, player)) return false; + Block block = state.getBlock(); + IRecipe recipe = findRecipe(world, new ItemStack(block)); + if (recipe == null) return false; + + // Forge has already checked the break event. Remove the block without its usual drops. + if (state.removedByPlayer(world, pos, player, false, world.getFluidState(pos))) { + block.onPlayerDestroy(world, pos, state); + Block.spawnAsEntity(world, pos, recipe.getRecipeOutput().copy()); + player.addStat(StatList.BLOCK_MINED.get(block)); + player.addExhaustion(0.005F); + ItemStack original = hammer.copy(); + hammer.onBlockDestroyed(world, state, pos, player); + if (hammer.isEmpty()) ForgeEventFactory.onPlayerDestroyItem(player, original, EnumHand.MAIN_HAND); + } + return true; + } + + @Override + public EnumActionResult onItemUse(ItemUseContext context) { + World world = context.getWorld(); + EntityPlayer player = context.getPlayer(); + if (context.getFace() != EnumFacing.UP || world.isRemote || player == null) return EnumActionResult.PASS; + + AxisAlignedBB area = new AxisAlignedBB(context.getPos().up()); + List entities = world.getEntitiesWithinAABB(EntityItem.class, area); + for (EntityItem entity : entities) { + ItemStack input = entity.getItem(); + IRecipe recipe = findRecipe(world, input); + if (recipe == null || !canCrushDroppedBlock(input)) continue; + int requested = player.isSneaking() ? input.getCount() : 1; + ItemStack hammer = context.getItem(); + int durability = hammer.isDamageable() + ? Math.max(0, hammer.getMaxDamage() - hammer.getDamage()) : requested; + int operations = Math.min(requested, durability); + if (operations <= 0) break; + ItemStack output = recipe.getRecipeOutput().copy(); + input.shrink(operations); + if (input.isEmpty()) entity.remove(); else entity.setItem(input); + spawnOutputs(world, entity, output, operations); + hammer.damageItem(operations, player); + world.playSound(null, context.getPos(), net.minecraft.init.SoundEvents.BLOCK_GRAVEL_BREAK, + SoundCategory.BLOCKS, 0.5F, 0.5F + world.rand.nextFloat() * 0.3F); + return EnumActionResult.SUCCESS; + } + return EnumActionResult.PASS; + } + + @Nullable + private static IRecipe findRecipe(World world, ItemStack input) { + InventoryBasic inventory = new InventoryBasic(new TextComponentString("crushing"), 1); + inventory.setInventorySlotContents(0, input); + for (IRecipe candidate : world.getRecipeManager().getRecipes()) { + ResourceLocation type = candidate.getType().getId(); + if ((CrushingRecipe.TYPE_ID.equals(type) || BASE_METALS_CRUSHING.equals(type)) + && candidate.matches(inventory, world)) { + return candidate; + } + } + return null; + } + + private boolean canCrushDroppedBlock(ItemStack input) { + if (!(input.getItem() instanceof ItemBlock)) return true; + return canHarvestBlock(((ItemBlock) input.getItem()).getBlock().getDefaultState()); + } + + private static void spawnOutputs(World world, EntityItem source, ItemStack result, int operations) { + int remaining = result.getCount() * operations; + while (remaining > 0) { + ItemStack output = result.copy(); + output.setCount(Math.min(output.getMaxStackSize(), remaining)); + remaining -= output.getCount(); + EntityItem crushed = new EntityItem(world, source.posX, source.posY, source.posZ, output); + crushed.setDefaultPickupDelay(); + world.spawnEntity(crushed); + } + } +} diff --git a/src/main/java/zone/moddev/mc/modernmetals/content/FluidContent.java b/src/main/java/zone/moddev/mc/modernmetals/content/FluidContent.java new file mode 100644 index 00000000..ed9cb578 --- /dev/null +++ b/src/main/java/zone/moddev/mc/modernmetals/content/FluidContent.java @@ -0,0 +1,25 @@ +package zone.moddev.mc.modernmetals.content; + +import net.minecraft.block.BlockFlowingFluid; +import net.minecraft.fluid.FlowingFluid; +import net.minecraft.item.Item; + +public final class FluidContent { + private final RegistryHandle source; + private final RegistryHandle flowing; + private final RegistryHandle block; + private final RegistryHandle bucket; + + public FluidContent(RegistryHandle source, RegistryHandle flowing, + RegistryHandle block, RegistryHandle bucket) { + this.source = source; + this.flowing = flowing; + this.block = block; + this.bucket = bucket; + } + + public RegistryHandle source() { return source; } + public RegistryHandle flowing() { return flowing; } + public RegistryHandle block() { return block; } + public RegistryHandle bucket() { return bucket; } +} diff --git a/src/main/java/zone/moddev/mc/modernmetals/content/LegacyRegistry.java b/src/main/java/zone/moddev/mc/modernmetals/content/LegacyRegistry.java new file mode 100644 index 00000000..a875c9ff --- /dev/null +++ b/src/main/java/zone/moddev/mc/modernmetals/content/LegacyRegistry.java @@ -0,0 +1,31 @@ +package zone.moddev.mc.modernmetals.content; + +import java.io.InputStreamReader; +import java.nio.charset.StandardCharsets; +import java.util.HashSet; +import java.util.Objects; +import java.util.Set; + +import com.google.gson.JsonElement; +import com.google.gson.JsonParser; + +final class LegacyRegistry { + private static final Set ITEMS = new HashSet<>(); + + static { + InputStreamReader reader = new InputStreamReader(Objects.requireNonNull( + LegacyRegistry.class.getResourceAsStream("/data/modernmetals/migration/registry_1_12.json")), + StandardCharsets.UTF_8); + try (InputStreamReader closeable = reader) { + for (JsonElement element : new JsonParser().parse(closeable).getAsJsonObject().getAsJsonArray("items")) { + ITEMS.add(element.getAsString()); + } + } catch (java.io.IOException exception) { + throw new IllegalStateException("Could not read the historical item registry", exception); + } + } + + private LegacyRegistry() {} + + static boolean containsItem(String id) { return ITEMS.contains(id); } +} diff --git a/src/main/java/zone/moddev/mc/modernmetals/content/MaterialArmor.java b/src/main/java/zone/moddev/mc/modernmetals/content/MaterialArmor.java new file mode 100644 index 00000000..78219bb8 --- /dev/null +++ b/src/main/java/zone/moddev/mc/modernmetals/content/MaterialArmor.java @@ -0,0 +1,36 @@ +package zone.moddev.mc.modernmetals.content; + +import java.util.function.Supplier; + +import zone.moddev.mc.modernmetals.material.MaterialDefinition; + +import net.minecraft.init.SoundEvents; +import net.minecraft.inventory.EntityEquipmentSlot; +import net.minecraft.item.IArmorMaterial; +import net.minecraft.item.crafting.Ingredient; +import net.minecraft.tags.ItemTags; +import net.minecraft.util.ResourceLocation; +import net.minecraft.util.SoundEvent; + +public final class MaterialArmor implements IArmorMaterial { + private static final int[] DURABILITY = {13, 15, 16, 11}; + private final MaterialDefinition material; + private final Supplier repair; + + public MaterialArmor(MaterialDefinition material) { + this.material = material; + final ItemTags.Wrapper tag = new ItemTags.Wrapper(new ResourceLocation(material.repairIngredientTag())); + this.repair = () -> Ingredient.fromTag(tag); + } + + public MaterialDefinition material() { return material; } + @Override public int getDurability(EntityEquipmentSlot slot) { + return DURABILITY[slot.getIndex()] * material.armorDurabilityFactor(); + } + @Override public int getDamageReductionAmount(EntityEquipmentSlot slot) { return material.armorProtection(slot); } + @Override public int getEnchantability() { return material.enchantability(); } + @Override public SoundEvent getSoundEvent() { return SoundEvents.ITEM_ARMOR_EQUIP_IRON; } + @Override public Ingredient getRepairMaterial() { return repair.get(); } + @Override public String getName() { return "modernmetals:" + material.name(); } + @Override public float getToughness() { return material.armorToughness(); } +} diff --git a/src/main/java/zone/moddev/mc/modernmetals/content/MaterialBacked.java b/src/main/java/zone/moddev/mc/modernmetals/content/MaterialBacked.java new file mode 100644 index 00000000..ff32d26a --- /dev/null +++ b/src/main/java/zone/moddev/mc/modernmetals/content/MaterialBacked.java @@ -0,0 +1,16 @@ +package zone.moddev.mc.modernmetals.content; + +import zone.moddev.mc.modernmetals.material.MaterialDefinition; + +import net.minecraft.util.ResourceLocation; +import net.minecraft.tags.ItemTags; +import net.minecraft.item.ItemStack; + +public interface MaterialBacked { + MaterialDefinition baseMetalsMaterial(); + + default boolean isMaterialRepairIngredient(ItemStack repair) { + return new ItemTags.Wrapper(new ResourceLocation( + baseMetalsMaterial().repairIngredientTag())).contains(repair.getItem()); + } +} diff --git a/src/main/java/zone/moddev/mc/modernmetals/content/MaterialContent.java b/src/main/java/zone/moddev/mc/modernmetals/content/MaterialContent.java new file mode 100644 index 00000000..03f0875d --- /dev/null +++ b/src/main/java/zone/moddev/mc/modernmetals/content/MaterialContent.java @@ -0,0 +1,26 @@ +package zone.moddev.mc.modernmetals.content; + +import java.util.Collections; +import java.util.LinkedHashMap; +import java.util.Map; + +import zone.moddev.mc.modernmetals.material.MaterialDefinition; +import net.minecraft.block.Block; +import net.minecraft.item.Item; + +public final class MaterialContent { + private final MaterialDefinition definition; + private final Map> blocks; + private final Map> items; + + public MaterialContent(MaterialDefinition definition, Map> blocks, + Map> items) { + this.definition = definition; + this.blocks = Collections.unmodifiableMap(new LinkedHashMap>(blocks)); + this.items = Collections.unmodifiableMap(new LinkedHashMap>(items)); + } + + public MaterialDefinition definition() { return definition; } + public Map> blocks() { return blocks; } + public Map> items() { return items; } +} diff --git a/src/main/java/zone/moddev/mc/modernmetals/content/MaterialItems.java b/src/main/java/zone/moddev/mc/modernmetals/content/MaterialItems.java new file mode 100644 index 00000000..54cd07e0 --- /dev/null +++ b/src/main/java/zone/moddev/mc/modernmetals/content/MaterialItems.java @@ -0,0 +1,299 @@ +package zone.moddev.mc.modernmetals.content; + +import java.util.List; + +import javax.annotation.Nullable; + +import zone.moddev.mc.modernmetals.ModernMetals; +import zone.moddev.mc.modernmetals.material.MaterialDefinition; + +import net.minecraft.entity.passive.HorseArmorType; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.projectile.EntityArrow; +import net.minecraft.enchantment.EnchantmentHelper; +import net.minecraft.init.Enchantments; +import net.minecraft.init.SoundEvents; +import net.minecraft.inventory.EntityEquipmentSlot; +import net.minecraft.item.Item; +import net.minecraft.item.ItemArmor; +import net.minecraft.item.ItemArrow; +import net.minecraft.item.ItemAxe; +import net.minecraft.item.ItemBlock; +import net.minecraft.item.ItemBow; +import net.minecraft.item.ItemFishingRod; +import net.minecraft.item.ItemHoe; +import net.minecraft.item.ItemPickaxe; +import net.minecraft.item.ItemShears; +import net.minecraft.item.ItemShield; +import net.minecraft.item.ItemSpade; +import net.minecraft.item.ItemStack; +import net.minecraft.item.ItemSword; +import net.minecraft.client.util.ITooltipFlag; +import net.minecraft.stats.StatList; +import net.minecraft.util.SoundCategory; +import net.minecraft.util.ResourceLocation; +import net.minecraft.util.text.ITextComponent; +import net.minecraft.util.text.TextComponentTranslation; +import net.minecraft.world.World; +import net.minecraftforge.event.ForgeEventFactory; + +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; + } + @Override public MaterialDefinition baseMetalsMaterial() { return material; } + @Override public int getBurnTime(ItemStack stack) { return burnTime; } + } + + public static final class Pickaxe extends ItemPickaxe implements MaterialBacked { + private final MaterialDefinition material; + public Pickaxe(MaterialDefinition material, Properties properties) { + super(new MaterialTier(material), 1, -2.8F, properties); + this.material = material; + } + @Override public MaterialDefinition baseMetalsMaterial() { return material; } + @Override public void addInformation(ItemStack stack, @Nullable World world, + List tooltip, ITooltipFlag flag) { addToolTooltip(material, tooltip); } + } + + public static final class Axe extends ItemAxe implements MaterialBacked { + private final MaterialDefinition material; + public Axe(MaterialDefinition material, Properties properties) { + super(new MaterialTier(material), 4.0F + material.baseAttackDamage(), + material.axeAttackSpeed(), properties); + this.material = material; + } + @Override public MaterialDefinition baseMetalsMaterial() { return material; } + @Override public void addInformation(ItemStack stack, @Nullable World world, + List tooltip, ITooltipFlag flag) { addToolTooltip(material, tooltip); } + } + + public static final class Shovel extends ItemSpade implements MaterialBacked { + private final MaterialDefinition material; + public Shovel(MaterialDefinition material, Properties properties) { + super(new MaterialTier(material), 1.5F, -3.0F, properties); + this.material = material; + } + @Override public MaterialDefinition baseMetalsMaterial() { return material; } + @Override public void addInformation(ItemStack stack, @Nullable World world, + List tooltip, ITooltipFlag flag) { addToolTooltip(material, tooltip); } + } + + public static final class Hoe extends ItemHoe implements MaterialBacked { + private final MaterialDefinition material; + public Hoe(MaterialDefinition material, Properties properties) { + super(new MaterialTier(material), material.baseAttackDamage() - 3.0F, properties); + this.material = material; + } + @Override public MaterialDefinition baseMetalsMaterial() { return material; } + @Override public void addInformation(ItemStack stack, @Nullable World world, + List tooltip, ITooltipFlag flag) { addToolTooltip(material, tooltip); } + } + + public static class Sword extends ItemSword implements MaterialBacked { + private final MaterialDefinition material; + public Sword(MaterialDefinition material, Properties properties) { + super(new MaterialTier(material), 3, -2.4F, properties); + this.material = material; + } + @Override public MaterialDefinition baseMetalsMaterial() { return material; } + @Override public void addInformation(ItemStack stack, @Nullable World world, + List tooltip, ITooltipFlag flag) { addToolTooltip(material, tooltip); } + } + + public static final class Armor extends ItemArmor implements MaterialBacked { + private final MaterialDefinition material; + public Armor(MaterialDefinition material, EntityEquipmentSlot slot, Properties properties) { + super(new MaterialArmor(material), slot, properties); + this.material = material; + } + @Override public MaterialDefinition baseMetalsMaterial() { return material; } + @Override public void addInformation(ItemStack stack, @Nullable World world, + List tooltip, ITooltipFlag flag) { addArmorTooltip(material, tooltip); } + } + + public static final class HorseArmor extends Item implements MaterialBacked { + private final MaterialDefinition material; + private final HorseArmorType armorType; + public HorseArmor(MaterialDefinition material, Properties properties) { + super(properties.maxStackSize(1)); + this.material = material; + String texture = ModernMetals.MOD_ID + ":textures/entity/horse/armor/horse_armor_" + + material.name() + ".png"; + String hash = Integer.toHexString(material.name().hashCode()); + this.armorType = HorseArmorType.create("BASEMETALS_" + material.name().toUpperCase(), + material.horseArmorProtection(), texture, hash, this); + } + @Override public MaterialDefinition baseMetalsMaterial() { return material; } + @Override public HorseArmorType getHorseArmorType(ItemStack stack) { return armorType; } + } + + public static final class BurnableBlock extends ItemBlock { + private final int burnTime; + public BurnableBlock(net.minecraft.block.Block block, int burnTime, Properties properties) { + super(block, properties); + this.burnTime = burnTime; + } + @Override public int getBurnTime(ItemStack stack) { return burnTime; } + } + + public static final class Shears extends ItemShears implements MaterialBacked { + private final MaterialDefinition material; + public Shears(MaterialDefinition material, Properties properties) { + super(properties.defaultMaxDamage(material.toolDurability())); + this.material = material; + } + @Override public MaterialDefinition baseMetalsMaterial() { return material; } + @Override public boolean getIsRepairable(ItemStack toRepair, ItemStack repair) { + return new MaterialTier(material).getRepairMaterial().test(repair) || super.getIsRepairable(toRepair, repair); + } + @Override public void addInformation(ItemStack stack, @Nullable World world, + List tooltip, ITooltipFlag flag) { addToolTooltip(material, tooltip); } + } + + public static class Shield extends ItemShield implements MaterialBacked { + private final MaterialDefinition material; + public Shield(MaterialDefinition material, Properties properties) { + super(properties.defaultMaxDamage(material.shieldDurability())); + this.material = material; + } + @Override public MaterialDefinition baseMetalsMaterial() { return material; } + @Override public boolean getIsRepairable(ItemStack toRepair, ItemStack repair) { + return new MaterialTier(material).getRepairMaterial().test(repair) || super.getIsRepairable(toRepair, repair); + } + @Override public void addInformation(ItemStack stack, @Nullable World world, + List tooltip, ITooltipFlag flag) { addToolTooltip(material, tooltip); } + } + + public static class Bow extends ItemBow implements MaterialBacked { + private final MaterialDefinition material; + + public Bow(MaterialDefinition material, Properties properties) { + super(properties.defaultMaxDamage(material.toolDurability())); + this.material = material; + } + + @Override public MaterialDefinition baseMetalsMaterial() { return material; } + + @Override + public EntityArrow customizeArrow(EntityArrow arrow) { + // Forge calls this before applying Power, so enchantment bonuses stay unchanged. + arrow.setDamage(arrow.getDamage() + material.baseAttackDamage() - 1.0D); + + return arrow; + } + + @Override protected boolean isArrow(ItemStack stack) { + if (stack.getItem() instanceof MetalAmmoItem) { + return ((MetalAmmoItem) stack.getItem()).kind() == MetalAmmoItem.Kind.ARROW; + } + return stack.getItem() instanceof ItemArrow; + } + @Override public boolean getIsRepairable(ItemStack toRepair, ItemStack repair) { + return new MaterialTier(material).getRepairMaterial().test(repair) || super.getIsRepairable(toRepair, repair); + } + @Override public void addInformation(ItemStack stack, @Nullable World world, + List tooltip, ITooltipFlag flag) { addToolTooltip(material, tooltip); } + } + + public static final class Crossbow extends Bow { + public Crossbow(MaterialDefinition material, Properties properties) { + super(material, properties); + } + + @Override protected boolean isArrow(ItemStack stack) { + return stack.getItem() instanceof MetalAmmoItem + && ((MetalAmmoItem) stack.getItem()).kind() == MetalAmmoItem.Kind.BOLT; + } + @Override + public void onPlayerStoppedUsing(ItemStack bow, World world, EntityLivingBase user, int timeLeft) { + if (!(user instanceof EntityPlayer)) return; + EntityPlayer player = (EntityPlayer) user; + boolean hasInfiniteAmmo = player.abilities.isCreativeMode + || EnchantmentHelper.getEnchantmentLevel(Enchantments.INFINITY, bow) > 0; + ItemStack ammunition = findAmmo(player); + int charge = getUseDuration(bow) - timeLeft; + charge = ForgeEventFactory.onArrowLoose(bow, world, player, charge, + !ammunition.isEmpty() || hasInfiniteAmmo); + if (charge < 0 || ammunition.isEmpty() && !hasInfiniteAmmo) return; + + if (ammunition.isEmpty()) ammunition = new ItemStack(ModContent.item(baseMetalsMaterial().name() + "_bolt").get()); + float power = getArrowVelocity(charge); + if (power < 0.1F) return; + + MetalAmmoItem bolt = (MetalAmmoItem) ammunition.getItem(); + boolean infiniteShot = player.abilities.isCreativeMode + || bolt.isInfinite(ammunition, bow, player); + if (!world.isRemote) { + EntityArrow projectile = customizeArrow(bolt.createArrow(world, ammunition, player)); + projectile.shoot(player, player.rotationPitch, player.rotationYaw, 0.0F, + power * 3.0F, 1.0F); + if (power == 1.0F) projectile.setIsCritical(true); + int powerLevel = EnchantmentHelper.getEnchantmentLevel(Enchantments.POWER, bow); + if (powerLevel > 0) { + projectile.setDamage(projectile.getDamage() + powerLevel * 0.5D + 0.5D); + } + int punchLevel = EnchantmentHelper.getEnchantmentLevel(Enchantments.PUNCH, bow); + if (punchLevel > 0) projectile.setKnockbackStrength(punchLevel); + if (EnchantmentHelper.getEnchantmentLevel(Enchantments.FLAME, bow) > 0) { + projectile.setFire(100); + } + bow.damageItem(1, player); + if (infiniteShot) projectile.pickupStatus = EntityArrow.PickupStatus.CREATIVE_ONLY; + world.spawnEntity(projectile); + } + world.playSound(null, player.posX, player.posY, player.posZ, + SoundEvents.ENTITY_ARROW_SHOOT, SoundCategory.PLAYERS, 1.0F, + 1.0F / (random.nextFloat() * 0.4F + 1.2F) + power * 0.5F); + if (!infiniteShot && !player.abilities.isCreativeMode) { + ammunition.shrink(1); + if (ammunition.isEmpty()) player.inventory.deleteStack(ammunition); + } + player.addStat(StatList.ITEM_USED.get(this)); + } + } + + public static final class FishingRod extends ItemFishingRod implements MaterialBacked { + private final MaterialDefinition material; + public FishingRod(MaterialDefinition material, Properties properties) { + super(properties.defaultMaxDamage(material.toolDurability())); + this.material = material; + } + @Override public MaterialDefinition baseMetalsMaterial() { return material; } + @Override public boolean getIsRepairable(ItemStack toRepair, ItemStack repair) { + return new MaterialTier(material).getRepairMaterial().test(repair) || super.getIsRepairable(toRepair, repair); + } + @Override public void addInformation(ItemStack stack, @Nullable World world, + List tooltip, ITooltipFlag flag) { addToolTooltip(material, tooltip); } + } + + static void addToolTooltip(MaterialDefinition material, List tooltip) { + if ("adamantine".equals(material.name())) { + tooltip.add(new TextComponentTranslation("tooltip.adamantine.tool", 4)); + } else if ("aquarium".equals(material.name())) { + tooltip.add(new TextComponentTranslation("tooltip.aquarium.tool", 4)); + } else if ("coldiron".equals(material.name())) { + tooltip.add(new TextComponentTranslation("tooltip.coldiron.tool", 3)); + } else if ("mithril".equals(material.name())) { + tooltip.add(new TextComponentTranslation("tooltip.mithril.tool")); + } else if ("starsteel".equals(material.name())) { + tooltip.add(new TextComponentTranslation("tooltip.starsteel.tool", 10)); + } + } + + private static void addArmorTooltip(MaterialDefinition material, List tooltip) { + if ("adamantine".equals(material.name()) || "aquarium".equals(material.name()) + || "coldiron".equals(material.name()) || "mithril".equals(material.name()) + || "starsteel".equals(material.name())) { + tooltip.add(new TextComponentTranslation("tooltip." + material.name() + ".armor")); + } + } +} diff --git a/src/main/java/zone/moddev/mc/modernmetals/content/MaterialTier.java b/src/main/java/zone/moddev/mc/modernmetals/content/MaterialTier.java new file mode 100644 index 00000000..fbccad4e --- /dev/null +++ b/src/main/java/zone/moddev/mc/modernmetals/content/MaterialTier.java @@ -0,0 +1,29 @@ +package zone.moddev.mc.modernmetals.content; + +import java.util.function.Supplier; + +import zone.moddev.mc.modernmetals.material.MaterialDefinition; + +import net.minecraft.item.IItemTier; +import net.minecraft.item.crafting.Ingredient; +import net.minecraft.tags.ItemTags; +import net.minecraft.util.ResourceLocation; + +public final class MaterialTier implements IItemTier { + private final MaterialDefinition material; + private final Supplier repair; + + public MaterialTier(MaterialDefinition material) { + this.material = material; + final ItemTags.Wrapper tag = new ItemTags.Wrapper(new ResourceLocation(material.repairIngredientTag())); + this.repair = () -> Ingredient.fromTag(tag); + } + + public MaterialDefinition material() { return material; } + @Override public int getMaxUses() { return material.toolDurability(); } + @Override public float getEfficiency() { return material.toolEfficiency(); } + @Override public float getAttackDamage() { return material.baseAttackDamage(); } + @Override public int getHarvestLevel() { return material.toolLevel(); } + @Override public int getEnchantability() { return material.enchantability(); } + @Override public Ingredient getRepairMaterial() { return repair.get(); } +} diff --git a/src/main/java/zone/moddev/mc/modernmetals/content/MetalAmmoItem.java b/src/main/java/zone/moddev/mc/modernmetals/content/MetalAmmoItem.java new file mode 100644 index 00000000..c6e8f7c3 --- /dev/null +++ b/src/main/java/zone/moddev/mc/modernmetals/content/MetalAmmoItem.java @@ -0,0 +1,42 @@ +package zone.moddev.mc.modernmetals.content; + +import java.util.function.Supplier; + +import zone.moddev.mc.modernmetals.entity.MaterialProjectile; +import zone.moddev.mc.modernmetals.material.MaterialDefinition; + +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.EntityType; +import net.minecraft.entity.projectile.EntityArrow; +import net.minecraft.item.Item; +import net.minecraft.item.ItemArrow; +import net.minecraft.item.ItemStack; +import net.minecraft.world.World; + +public final class MetalAmmoItem extends ItemArrow implements MaterialBacked { + public enum Kind { ARROW, BOLT } + private final MaterialDefinition material; + private final Kind kind; + private final Supplier> entityType; + + public MetalAmmoItem(MaterialDefinition material, Kind kind, + Supplier> entityType, Item.Properties properties) { + super(properties); + this.material = material; + this.kind = kind; + this.entityType = entityType; + } + + public Kind kind() { return kind; } + @Override public MaterialDefinition baseMetalsMaterial() { return material; } + + @Override + public EntityArrow createArrow(World world, ItemStack stack, EntityLivingBase shooter) { + MaterialProjectile projectile = new MaterialProjectile(entityType.get(), world, shooter, stack); + + // A vanilla bow adds one damage. Material bows replace that with their own damage. + projectile.setDamage(1.0D + material.baseAttackDamage()); + + return projectile; + } +} diff --git a/src/main/java/zone/moddev/mc/modernmetals/content/MetalBucketItem.java b/src/main/java/zone/moddev/mc/modernmetals/content/MetalBucketItem.java new file mode 100644 index 00000000..369746d0 --- /dev/null +++ b/src/main/java/zone/moddev/mc/modernmetals/content/MetalBucketItem.java @@ -0,0 +1,12 @@ +package zone.moddev.mc.modernmetals.content; + +import net.minecraft.fluid.Fluid; +import net.minecraft.item.Item; +import net.minecraft.item.ItemBucket; + +/** A dedicated filled bucket; Forge 25 has no universal bucket replacement. */ +public final class MetalBucketItem extends ItemBucket { + public MetalBucketItem(Fluid fluid, Item.Properties properties) { + super(fluid, properties); + } +} diff --git a/src/main/java/zone/moddev/mc/modernmetals/content/ModContent.java b/src/main/java/zone/moddev/mc/modernmetals/content/ModContent.java new file mode 100644 index 00000000..78630390 --- /dev/null +++ b/src/main/java/zone/moddev/mc/modernmetals/content/ModContent.java @@ -0,0 +1,428 @@ +package zone.moddev.mc.modernmetals.content; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import java.util.function.Supplier; + +import zone.moddev.mc.modernmetals.ModernMetals; +import zone.moddev.mc.modernmetals.ModTabs; +import zone.moddev.mc.modernmetals.entity.ModEntities; +import zone.moddev.mc.modernmetals.material.MaterialCatalogue; +import zone.moddev.mc.modernmetals.material.MaterialDefinition; + +import net.minecraft.block.Block; +import net.minecraft.block.BlockButtonStone; +import net.minecraft.block.BlockDoor; +import net.minecraft.block.BlockLever; +import net.minecraft.block.BlockPane; +import net.minecraft.block.BlockPressurePlate; +import net.minecraft.block.BlockSlab; +import net.minecraft.block.BlockStairs; +import net.minecraft.block.BlockTrapDoor; +import net.minecraft.block.BlockWall; +import net.minecraft.block.BlockFlowingFluid; +import net.minecraft.block.SoundType; +import net.minecraft.block.material.Material; +import net.minecraft.fluid.FlowingFluid; +import net.minecraft.fluid.Fluid; +import net.minecraft.fluid.IFluidState; +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; +import net.minecraft.inventory.EntityEquipmentSlot; +import net.minecraft.item.Item; +import net.minecraft.item.ItemBlock; +import net.minecraft.item.ItemGroup; +import net.minecraft.item.ItemStack; +import net.minecraft.util.BlockRenderLayer; +import net.minecraft.util.ResourceLocation; +import net.minecraft.util.registry.IRegistry; +import net.minecraftforge.common.ToolType; +import net.minecraftforge.event.RegistryEvent; +import net.minecraftforge.eventbus.api.SubscribeEvent; +import net.minecraftforge.fml.ModList; +import net.minecraftforge.fml.common.Mod; + +/** Registers material blocks, items and fluids from the catalogue. */ +@Mod.EventBusSubscriber(modid = ModernMetals.MOD_ID, bus = Mod.EventBusSubscriber.Bus.MOD) +public final class ModContent { + private static final Map> BLOCKS_BY_ID = + new LinkedHashMap>(); + private static final Map> ITEMS_BY_ID = + new LinkedHashMap>(); + private static final Map> BLOCK_FACTORIES = + new LinkedHashMap>(); + private static final Map> ITEM_FACTORIES = + new LinkedHashMap>(); + private static final Map MATERIALS = + new LinkedHashMap(); + private static final Map FLUID_CONTENT = + new LinkedHashMap(); + private static final Map FLUID_COLOURS = + new LinkedHashMap(); + private static final List MATERIAL_BLOCK_FORMS = list( + "block", "plate", "bars", "door", "trapdoor", "button", "slab", "lever", + "pressure_plate", "stairs", "wall"); + private static final List BASIC_ITEM_FORMS = list("ingot", "nugget", "powder", "smallpowder"); + private static final List PROCESSING_FORMS = list( + "casing", "dense_plate", "crushed", "crushed_purified", "crystal", "shard", "clump", "powder_dirty"); + + static { + for (MaterialDefinition material : MaterialCatalogue.ALL) { + registerMaterial(material); + registerFluid(material.name(), material.colour()); + } + registerItem("coal_powder", () -> { + Item.Properties properties = new Item.Properties(); + if (!ModList.get().isLoaded("basemetals")) properties.group(ModTabs.ITEMS); + return new Item(properties); + }); + } + + private ModContent() {} + + // Forge 25's vanilla fluid and state registries are not thread-safe. Register + // here, during the sequential block event, rather than in the mod constructor. + private static void initializeFluids() { + for (Map.Entry entry : FLUID_CONTENT.entrySet()) { + FluidContent content = entry.getValue(); + if (isBound(content.source())) continue; + MoltenFluid flowing = new MoltenFluid.Flowing(entry.getKey()); + MoltenFluid source = new MoltenFluid.Source(entry.getKey()); + content.flowing().bind(flowing); + content.source().bind(source); + IRegistry.field_212619_h.put(id("flowing_" + entry.getKey()), flowing); + IRegistry.field_212619_h.put(id(entry.getKey()), source); + for (Fluid fluid : new Fluid[] { flowing, source }) { + for (IFluidState state : fluid.getStateContainer().getValidStates()) { + Fluid.STATE_REGISTRY.add(state); + } + } + } + } + + private static boolean isBound(RegistryHandle handle) { + try { handle.get(); return true; } catch (IllegalStateException ignored) { return false; } + } + + @SubscribeEvent + public static void registerBlocks(RegistryEvent.Register event) { + initializeFluids(); + for (Map.Entry> entry : BLOCK_FACTORIES.entrySet()) { + Block value = entry.getValue().get(); + value.setRegistryName(ModernMetals.MOD_ID, entry.getKey()); + BLOCKS_BY_ID.get(entry.getKey()).bind(value); + event.getRegistry().register(value); + } + } + + @SubscribeEvent + public static void registerItems(RegistryEvent.Register event) { + for (Map.Entry> entry : ITEM_FACTORIES.entrySet()) { + Item value = entry.getValue().get(); + value.setRegistryName(ModernMetals.MOD_ID, entry.getKey()); + ITEMS_BY_ID.get(entry.getKey()).bind(value); + event.getRegistry().register(value); + } + zone.moddev.mc.modernmetals.trade.ModernMetalsTrades.register(); + } + + public static Map materials() { return Collections.unmodifiableMap(MATERIALS); } + public static Map> blocksById() { return Collections.unmodifiableMap(BLOCKS_BY_ID); } + public static Map> itemsById() { return Collections.unmodifiableMap(ITEMS_BY_ID); } + public static Map fluids() { return Collections.unmodifiableMap(FLUID_CONTENT); } + + public static int fluidColour(Fluid fluid) { + for (Map.Entry entry : FLUID_CONTENT.entrySet()) { + FluidContent content = entry.getValue(); + if (fluid == content.source().get() || fluid == content.flowing().get()) { + Integer colour = FLUID_COLOURS.get(entry.getKey()); + return colour == null ? 0xFFFFFF : colour.intValue(); + } + } + return 0xFFFFFF; + } + + public static boolean isModernMetalsFluid(Fluid fluid) { + for (FluidContent content : FLUID_CONTENT.values()) { + if (fluid == content.source().get() || fluid == content.flowing().get()) return true; + } + return false; + } + + public static RegistryHandle item(String id) { + RegistryHandle item = ITEMS_BY_ID.get(id); + if (item == null) throw new IllegalArgumentException("Unknown item " + id); + return item; + } + + public static FluidContent fluid(String id) { + FluidContent fluid = FLUID_CONTENT.get(id); + if (fluid == null) throw new IllegalArgumentException("Unknown fluid " + id); + return fluid; + } + + private static void registerMaterial(MaterialDefinition material) { + String name = material.name(); + Map> blocks = new LinkedHashMap<>(); + Map> items = new LinkedHashMap<>(); + for (String form : MATERIAL_BLOCK_FORMS) { + String id = name + "_" + form; + RegistryHandle block = registerMaterialBlock(id, form, material, true, + () -> metalProperties(material), null); + blocks.put(form, block); + items.put(form, ITEMS_BY_ID.get(id)); + } + boolean historicalAlloyOre = "galvanizedsteel".equals(name) || "nichrome".equals(name) + || "stainlesssteel".equals(name); + if (material.hasOre() || historicalAlloyOre) { + String id = name + "_ore"; + blocks.put("ore", registerBlock(id, + () -> new HarvestOre(oreProperties(material), material.requiredOreHarvestLevel(), + !"thorium".equals(name) && !historicalAlloyOre), !historicalAlloyOre)); + if (historicalAlloyOre) { + registerItem(id, () -> new ItemBlock(BLOCKS_BY_ID.get(id).get(), new Item.Properties())); + } + items.put("ore", ITEMS_BY_ID.get(id)); + } + for (String form : BASIC_ITEM_FORMS) { + items.put(form, registerSimpleMaterialItem(name + "_" + form, material)); + } + if (material.isAlloy()) { + items.put("blend", registerSimpleMaterialItem(name + "_blend", material)); + items.put("smallblend", registerSimpleMaterialItem(name + "_smallblend", material)); + } + registerEquipment(material, items); + for (String form : PROCESSING_FORMS) { + if (LegacyRegistry.containsItem(name + "_" + form)) { + items.put(form, registerSimpleMaterialItem(name + "_" + form, material)); + } + } + MATERIALS.put(name, new MaterialContent(material, blocks, items)); + } + + private static RegistryHandle registerMaterialBlock(String id, String form, + final MaterialDefinition material, boolean hasItem, + final Supplier properties, final Supplier stairBase) { + Supplier factory; + if ("plate".equals(form)) { + factory = new Supplier() { @Override public Block get() { return new PlateBlock(properties.get(), material.requiredHarvestLevel()); } }; + } else if ("bars".equals(form)) { + factory = new Supplier() { @Override public Block get() { return new HarvestPane(properties.get().variableOpacity(), material.requiredHarvestLevel()); } }; + } else if ("door".equals(form)) { + factory = new Supplier() { @Override public Block get() { return new HarvestDoor(properties.get().variableOpacity(), material.requiredHarvestLevel()); } }; + } else if ("trapdoor".equals(form)) { + factory = new Supplier() { @Override public Block get() { return new HarvestTrapDoor(properties.get().variableOpacity(), material.requiredHarvestLevel()); } }; + } else if ("button".equals(form)) { + factory = new Supplier() { @Override public Block get() { return new HarvestButton(properties.get().doesNotBlockMovement(), material.requiredHarvestLevel()); } }; + } else if ("slab".equals(form)) { + factory = new Supplier() { @Override public Block get() { return new HarvestSlab(properties.get(), material.requiredHarvestLevel()); } }; + } else if ("lever".equals(form)) { + factory = new Supplier() { @Override public Block get() { return new HarvestLever(properties.get().doesNotBlockMovement(), material.requiredHarvestLevel()); } }; + } else if ("pressure_plate".equals(form)) { + factory = new Supplier() { @Override public Block get() { return new HarvestPressurePlate(properties.get(), material.requiredHarvestLevel()); } }; + } else if ("stairs".equals(form)) { + factory = new Supplier() { @Override public Block get() { + Block base = stairBase == null ? Blocks.IRON_BLOCK : stairBase.get(); + return new HarvestStairs(base.getDefaultState(), properties.get(), material.requiredHarvestLevel()); + } }; + } else if ("wall".equals(form)) { + factory = new Supplier() { @Override public Block get() { return new HarvestWall(properties.get(), material.requiredHarvestLevel()); } }; + } else { + factory = new Supplier() { @Override public Block get() { return new HarvestBlock(properties.get(), material.requiredHarvestLevel()); } }; + } + return registerBlock(id, factory, hasItem); + } + + private static void registerEquipment(final MaterialDefinition material, + Map> items) { + items.put("pickaxe", registerItem(material.name() + "_pickaxe", new Supplier() { @Override public Item get() { return new MaterialItems.Pickaxe(material, toolProperties()); } })); + items.put("axe", registerItem(material.name() + "_axe", new Supplier() { @Override public Item get() { return new MaterialItems.Axe(material, toolProperties()); } })); + items.put("shovel", registerItem(material.name() + "_shovel", new Supplier() { @Override public Item get() { return new MaterialItems.Shovel(material, toolProperties()); } })); + items.put("hoe", registerItem(material.name() + "_hoe", new Supplier() { @Override public Item get() { return new MaterialItems.Hoe(material, toolProperties()); } })); + items.put("sword", registerItem(material.name() + "_sword", new Supplier() { @Override public Item get() { return new MaterialItems.Sword(material, combatProperties()); } })); + items.put("crackhammer", registerItem(material.name() + "_crackhammer", new Supplier() { @Override public Item get() { return new CrackhammerItem(material, toolProperties()); } })); + items.put("scythe", registerItem(material.name() + "_scythe", new Supplier() { @Override public Item get() { return new ScytheItem(material, toolProperties()); } })); + items.put("shears", registerItem(material.name() + "_shears", new Supplier() { @Override public Item get() { return new MaterialItems.Shears(material, toolProperties()); } })); + items.put("fishing_rod", registerItem(material.name() + "_fishing_rod", new Supplier() { @Override public Item get() { return new MaterialItems.FishingRod(material, toolProperties()); } })); + items.put("bow", registerItem(material.name() + "_bow", new Supplier() { @Override public Item get() { return new MaterialItems.Bow(material, combatProperties()); } })); + items.put("crossbow", registerItem(material.name() + "_crossbow", new Supplier() { @Override public Item get() { return new MaterialItems.Crossbow(material, combatProperties()); } })); + items.put("shield", registerItem(material.name() + "_shield", new Supplier() { @Override public Item get() { return new MaterialItems.Shield(material, combatProperties()); } })); + items.put("arrow", registerAmmo(material, MetalAmmoItem.Kind.ARROW)); + items.put("bolt", registerAmmo(material, MetalAmmoItem.Kind.BOLT)); + 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 Supplier() { @Override public Item get() { return new MaterialItems.HorseArmor(material, combatProperties()); } })); + items.put("helmet", registerArmor(material, EntityEquipmentSlot.HEAD)); + items.put("chestplate", registerArmor(material, EntityEquipmentSlot.CHEST)); + items.put("leggings", registerArmor(material, EntityEquipmentSlot.LEGS)); + items.put("boots", registerArmor(material, EntityEquipmentSlot.FEET)); + } + + private static RegistryHandle registerAmmo(final MaterialDefinition material, final MetalAmmoItem.Kind kind) { + String suffix = kind == MetalAmmoItem.Kind.ARROW ? "_arrow" : "_bolt"; + return registerItem(material.name() + suffix, new Supplier() { + @Override public Item get() { + return new MetalAmmoItem(material, kind, + kind == MetalAmmoItem.Kind.ARROW ? ModEntities.CUSTOM_ARROW : ModEntities.CUSTOM_BOLT, + combatProperties()); + } + }); + } + + private static RegistryHandle registerArmor(final MaterialDefinition material, + final EntityEquipmentSlot slot) { + String suffix; + switch (slot) { + case HEAD: suffix = "helmet"; break; + case CHEST: suffix = "chestplate"; break; + case LEGS: suffix = "leggings"; break; + case FEET: suffix = "boots"; break; + default: throw new IllegalArgumentException("Not armor: " + slot); + } + return registerItem(material.name() + "_" + suffix, new Supplier() { + @Override public Item get() { return new MaterialItems.Armor(material, slot, combatProperties()); } + }); + } + + private static void registerFluid(final String name, int colour) { + final RegistryHandle source = new RegistryHandle(name); + final RegistryHandle flowing = new RegistryHandle("flowing_" + name); + final RegistryHandle block = new RegistryHandle(name); + final RegistryHandle bucket = new RegistryHandle(name + "_bucket"); + FLUID_CONTENT.put(name, new FluidContent(source, flowing, block, bucket)); + FLUID_COLOURS.put(name, Integer.valueOf(colour)); + RegistryHandle blockHandle = registerBlock(name, new Supplier() { @Override public Block get() { + MoltenMetalBlock value = new MoltenMetalBlock(source.get(), + Block.Properties.create(Material.LAVA).doesNotBlockMovement() + .hardnessAndResistance(100.0F).variableOpacity()); + block.bind(value); + return value; + } }, false); + registerItem(name, new Supplier() { @Override public Item get() { + return new ItemBlock(blockHandle.get(), new Item.Properties()); + } }); + registerItem(name + "_bucket", new Supplier() { @Override public Item get() { + MetalBucketItem value = new MetalBucketItem(source.get(), + new Item.Properties().containerItem(Items.BUCKET).maxStackSize(1).group(ModTabs.ITEMS)); + bucket.bind(value); + return value; + } }); + } + + private static RegistryHandle registerBlock(String id, Supplier factory, boolean hasItem) { + if (BLOCKS_BY_ID.containsKey(id)) throw new IllegalStateException("Duplicate block " + id); + final RegistryHandle handle = new RegistryHandle(id); + BLOCKS_BY_ID.put(id, handle); + BLOCK_FACTORIES.put(id, factory); + if (hasItem) registerItem(id, new Supplier() { @Override public Item get() { + return new ItemBlock(handle.get(), new Item.Properties().group(ModTabs.BLOCKS)); + } }); + return handle; + } + + private static RegistryHandle registerSimpleMaterialItem(final String id, + final MaterialDefinition material) { + return registerItem(id, new Supplier() { @Override public Item get() { + return new MaterialItems.Basic(material, -1, new Item.Properties().group(ModTabs.ITEMS)); + } }); + } + + private static RegistryHandle registerItem(String id, Supplier factory) { + if (ITEMS_BY_ID.containsKey(id)) throw new IllegalStateException("Duplicate item " + id); + RegistryHandle handle = new RegistryHandle(id); + ITEMS_BY_ID.put(id, handle); + ITEM_FACTORIES.put(id, factory); + return handle; + } + + private static Item.Properties toolProperties() { return new Item.Properties().group(ModTabs.TOOLS); } + private static Item.Properties combatProperties() { return new Item.Properties().group(ModTabs.COMBAT); } + private static Block.Properties metalProperties(MaterialDefinition material) { + return Block.Properties.create(Material.IRON).sound(SoundType.METAL) + .hardnessAndResistance(material.blockHardness(), material.blastResistance()); + } + private static Block.Properties oreProperties(MaterialDefinition material) { + return Block.Properties.create(Material.ROCK).sound(SoundType.STONE) + .hardnessAndResistance(material.oreHardness(), material.blastResistance()); + } + private static ResourceLocation id(String path) { return new ResourceLocation(ModernMetals.MOD_ID, path); } + private static List list(String... values) { + return Collections.unmodifiableList(Arrays.asList(values)); + } + + private static class HarvestBlock extends Block { + private final int level; + HarvestBlock(Properties properties, int level) { super(properties); this.level = level; } + @Override public ToolType getHarvestTool(net.minecraft.block.state.IBlockState state) { return ToolType.PICKAXE; } + @Override public int getHarvestLevel(net.minecraft.block.state.IBlockState state) { return level; } + } + + private static class HarvestOre extends HarvestBlock { + private final boolean overlay; + HarvestOre(Properties properties, int level, boolean overlay) { + super(properties, level); + this.overlay = overlay; + } + + // Cutout rendering leaves the transparent parts of the ore overlay clear. + @Override public BlockRenderLayer getRenderLayer() { return overlay ? BlockRenderLayer.CUTOUT_MIPPED : BlockRenderLayer.SOLID; } + } + private static class HarvestPane extends BlockPane { + private final int level; + HarvestPane(Properties properties, int level) { super(properties); this.level = level; } + @Override public ToolType getHarvestTool(net.minecraft.block.state.IBlockState state) { return ToolType.PICKAXE; } + @Override public int getHarvestLevel(net.minecraft.block.state.IBlockState state) { return level; } + } + private static class HarvestDoor extends BlockDoor { + private final int level; + HarvestDoor(Properties properties, int level) { super(properties); this.level = level; } + @Override public ToolType getHarvestTool(net.minecraft.block.state.IBlockState state) { return ToolType.PICKAXE; } + @Override public int getHarvestLevel(net.minecraft.block.state.IBlockState state) { return level; } + } + private static class HarvestTrapDoor extends BlockTrapDoor { + private final int level; + HarvestTrapDoor(Properties properties, int level) { super(properties); this.level = level; } + @Override public ToolType getHarvestTool(net.minecraft.block.state.IBlockState state) { return ToolType.PICKAXE; } + @Override public int getHarvestLevel(net.minecraft.block.state.IBlockState state) { return level; } + } + private static class HarvestButton extends BlockButtonStone { + private final int level; + HarvestButton(Properties properties, int level) { super(properties); this.level = level; } + @Override public ToolType getHarvestTool(net.minecraft.block.state.IBlockState state) { return ToolType.PICKAXE; } + @Override public int getHarvestLevel(net.minecraft.block.state.IBlockState state) { return level; } + } + private static class HarvestSlab extends BlockSlab { + private final int level; + HarvestSlab(Properties properties, int level) { super(properties); this.level = level; } + @Override public ToolType getHarvestTool(net.minecraft.block.state.IBlockState state) { return ToolType.PICKAXE; } + @Override public int getHarvestLevel(net.minecraft.block.state.IBlockState state) { return level; } + } + private static class HarvestLever extends BlockLever { + private final int level; + HarvestLever(Properties properties, int level) { super(properties); this.level = level; } + @Override public ToolType getHarvestTool(net.minecraft.block.state.IBlockState state) { return ToolType.PICKAXE; } + @Override public int getHarvestLevel(net.minecraft.block.state.IBlockState state) { return level; } + } + private static class HarvestPressurePlate extends BlockPressurePlate { + private final int level; + HarvestPressurePlate(Properties properties, int level) { super(Sensitivity.MOBS, properties); this.level = level; } + @Override public ToolType getHarvestTool(net.minecraft.block.state.IBlockState state) { return ToolType.PICKAXE; } + @Override public int getHarvestLevel(net.minecraft.block.state.IBlockState state) { return level; } + } + private static class HarvestStairs extends BlockStairs { + private final int level; + HarvestStairs(net.minecraft.block.state.IBlockState base, Properties properties, int level) { super(base, properties); this.level = level; } + @Override public ToolType getHarvestTool(net.minecraft.block.state.IBlockState state) { return ToolType.PICKAXE; } + @Override public int getHarvestLevel(net.minecraft.block.state.IBlockState state) { return level; } + } + private static class HarvestWall extends BlockWall { + private final int level; + HarvestWall(Properties properties, int level) { super(properties); this.level = level; } + @Override public ToolType getHarvestTool(net.minecraft.block.state.IBlockState state) { return ToolType.PICKAXE; } + @Override public int getHarvestLevel(net.minecraft.block.state.IBlockState state) { return level; } + } +} diff --git a/src/main/java/zone/moddev/mc/modernmetals/content/MoltenFluid.java b/src/main/java/zone/moddev/mc/modernmetals/content/MoltenFluid.java new file mode 100644 index 00000000..b8476e43 --- /dev/null +++ b/src/main/java/zone/moddev/mc/modernmetals/content/MoltenFluid.java @@ -0,0 +1,67 @@ +package zone.moddev.mc.modernmetals.content; + +import net.minecraft.block.BlockFlowingFluid; +import net.minecraft.block.state.IBlockState; +import net.minecraft.fluid.FlowingFluid; +import net.minecraft.fluid.Fluid; +import net.minecraft.fluid.IFluidState; +import net.minecraft.item.Item; +import net.minecraft.state.StateContainer; +import net.minecraft.util.BlockRenderLayer; +import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.IWorld; +import net.minecraft.world.IWorldReaderBase; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; + +/** Common flow behaviour for the molten metals. */ +public abstract class MoltenFluid extends FlowingFluid { + private final String name; + + protected MoltenFluid(String name) { + this.name = name; + } + + private FluidContent content() { return ModContent.fluid(name); } + @Override public Fluid getFlowingFluid() { return content().flowing().get(); } + @Override public Fluid getStillFluid() { return content().source().get(); } + @Override public Item getFilledBucket() { return content().bucket().get(); } + + @Override @OnlyIn(Dist.CLIENT) + public BlockRenderLayer getRenderLayer() { return BlockRenderLayer.TRANSLUCENT; } + @Override protected boolean canSourcesMultiply() { return false; } + @Override protected void beforeReplacingBlock(IWorld world, BlockPos pos, IBlockState state) { + state.dropBlockAsItem(world.getWorld(), pos, 0); + } + @Override public int getSlopeFindDistance(IWorldReaderBase world) { return 2; } + @Override public int getLevelDecreasePerBlock(IWorldReaderBase world) { return 2; } + @Override public int getTickRate(IWorldReaderBase world) { return 30; } + @Override protected float getExplosionResistance() { return 100.0F; } + @Override public boolean isEquivalentTo(Fluid fluid) { + return fluid == content().source().get() || fluid == content().flowing().get(); + } + @Override protected boolean canOtherFlowInto(IFluidState state, Fluid fluid, EnumFacing direction) { + return direction == EnumFacing.DOWN && !fluid.isEquivalentTo(this); + } + @Override public IBlockState getBlockState(IFluidState state) { + return content().block().get().getDefaultState() + .with(BlockFlowingFluid.LEVEL, Integer.valueOf(getLevelFromState(state))); + } + + public static final class Flowing extends MoltenFluid { + public Flowing(String name) { super(name); } + @Override protected void fillStateContainer(StateContainer.Builder builder) { + super.fillStateContainer(builder); + builder.add(LEVEL_1_TO_8); + } + @Override public int getLevel(IFluidState state) { return state.get(LEVEL_1_TO_8); } + @Override public boolean isSource(IFluidState state) { return false; } + } + + public static final class Source extends MoltenFluid { + public Source(String name) { super(name); } + @Override public int getLevel(IFluidState state) { return 8; } + @Override public boolean isSource(IFluidState state) { return true; } + } +} diff --git a/src/main/java/zone/moddev/mc/modernmetals/content/MoltenMetalBlock.java b/src/main/java/zone/moddev/mc/modernmetals/content/MoltenMetalBlock.java new file mode 100644 index 00000000..6cc69f11 --- /dev/null +++ b/src/main/java/zone/moddev/mc/modernmetals/content/MoltenMetalBlock.java @@ -0,0 +1,27 @@ +package zone.moddev.mc.modernmetals.content; + +import net.minecraft.block.BlockFlowingFluid; +import net.minecraft.block.state.IBlockState; +import net.minecraft.entity.Entity; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.fluid.FlowingFluid; +import net.minecraft.util.DamageSource; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; + +public final class MoltenMetalBlock extends BlockFlowingFluid { + public MoltenMetalBlock(FlowingFluid fluid, Properties properties) { + super(fluid, properties); + } + + @Override + public void onEntityCollision(IBlockState state, World world, BlockPos pos, Entity entity) { + super.onEntityCollision(state, world, pos, entity); + if (!world.isRemote && entity instanceof EntityLivingBase && !entity.isImmuneToFire() + && !entity.isInLava() + && entity.getBoundingBox().minY < pos.getY() + state.getFluidState().getHeight()) { + entity.attackEntityFrom(DamageSource.LAVA, 4.0F); + entity.setFire(15); + } + } +} diff --git a/src/main/java/zone/moddev/mc/modernmetals/content/PlateBlock.java b/src/main/java/zone/moddev/mc/modernmetals/content/PlateBlock.java new file mode 100644 index 00000000..42af0f53 --- /dev/null +++ b/src/main/java/zone/moddev/mc/modernmetals/content/PlateBlock.java @@ -0,0 +1,51 @@ +package zone.moddev.mc.modernmetals.content; + +import net.minecraft.block.Block; +import net.minecraft.block.state.IBlockState; +import net.minecraft.item.BlockItemUseContext; +import net.minecraft.state.DirectionProperty; +import net.minecraft.state.StateContainer; +import net.minecraft.state.properties.BlockStateProperties; +import net.minecraft.util.EnumFacing; +import net.minecraft.util.Mirror; +import net.minecraft.util.Rotation; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.shapes.VoxelShape; +import net.minecraft.world.IBlockReader; +import net.minecraftforge.common.ToolType; + +/** A one-pixel-thick plate attached flush to the selected block face. */ +public final class PlateBlock extends Block { + public static final DirectionProperty FACING = BlockStateProperties.FACING; + private static final VoxelShape[] SHAPES = { + makeCuboidShape(0, 15, 0, 16, 16, 16), makeCuboidShape(0, 0, 0, 16, 1, 16), + makeCuboidShape(0, 0, 15, 16, 16, 16), makeCuboidShape(0, 0, 0, 16, 16, 1), + makeCuboidShape(15, 0, 0, 16, 16, 16), makeCuboidShape(0, 0, 0, 1, 16, 16)}; + private final int harvestLevel; + + public PlateBlock(Properties properties, int harvestLevel) { + super(properties); + this.harvestLevel = harvestLevel; + setDefaultState(stateContainer.getBaseState().with(FACING, EnumFacing.NORTH)); + } + + @Override + public IBlockState getStateForPlacement(BlockItemUseContext context) { + return getDefaultState().with(FACING, context.getFace()); + } + + @Override public VoxelShape getShape(IBlockState state, IBlockReader world, BlockPos pos) { + return SHAPES[state.get(FACING).getIndex()]; + } + @Override public IBlockState rotate(IBlockState state, Rotation rotation) { + return state.with(FACING, rotation.rotate(state.get(FACING))); + } + @Override public IBlockState mirror(IBlockState state, Mirror mirror) { + return rotate(state, mirror.toRotation(state.get(FACING))); + } + @Override protected void fillStateContainer(StateContainer.Builder builder) { + builder.add(FACING); + } + @Override public ToolType getHarvestTool(IBlockState state) { return ToolType.PICKAXE; } + @Override public int getHarvestLevel(IBlockState state) { return harvestLevel; } +} diff --git a/src/main/java/zone/moddev/mc/modernmetals/content/RegistryHandle.java b/src/main/java/zone/moddev/mc/modernmetals/content/RegistryHandle.java new file mode 100644 index 00000000..13b125a2 --- /dev/null +++ b/src/main/java/zone/moddev/mc/modernmetals/content/RegistryHandle.java @@ -0,0 +1,33 @@ +package zone.moddev.mc.modernmetals.content; + +import java.util.Objects; +import java.util.function.Supplier; + +/** Holds an entry until its Forge registration event supplies the instance. */ +public final class RegistryHandle implements Supplier { + private final String id; + private T value; + + public RegistryHandle(String id) { + this.id = Objects.requireNonNull(id, "id"); + } + + public String id() { + return id; + } + + public void bind(T registeredValue) { + if (value != null) { + throw new IllegalStateException("Registry handle already bound: " + id); + } + value = Objects.requireNonNull(registeredValue, "registeredValue"); + } + + @Override + public T get() { + if (value == null) { + throw new IllegalStateException("Registry handle has not been bound: " + id); + } + return value; + } +} diff --git a/src/main/java/zone/moddev/mc/modernmetals/content/ScytheItem.java b/src/main/java/zone/moddev/mc/modernmetals/content/ScytheItem.java new file mode 100644 index 00000000..0b183936 --- /dev/null +++ b/src/main/java/zone/moddev/mc/modernmetals/content/ScytheItem.java @@ -0,0 +1,62 @@ +package zone.moddev.mc.modernmetals.content; + +import java.util.Collections; +import java.util.List; + +import javax.annotation.Nullable; + +import zone.moddev.mc.modernmetals.ModTags; +import zone.moddev.mc.modernmetals.material.MaterialDefinition; + +import net.minecraft.block.Block; +import net.minecraft.block.state.IBlockState; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.item.ItemTool; +import net.minecraft.client.util.ITooltipFlag; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.text.ITextComponent; +import net.minecraft.world.World; + +public final class ScytheItem extends ItemTool implements MaterialBacked { + private static final ThreadLocal HARVESTING = new ThreadLocal() { + @Override protected Boolean initialValue() { return Boolean.FALSE; } + }; + private final MaterialDefinition material; + + public ScytheItem(MaterialDefinition material, Item.Properties properties) { + super(0.0F, 0.0F, new MaterialTier(material), Collections.emptySet(), properties); + this.material = material; + } + + @Override public MaterialDefinition baseMetalsMaterial() { return material; } + @Override public float getDestroySpeed(ItemStack stack, IBlockState state) { + return state.isIn(ModTags.SCYTHE_HARVESTABLE) ? material.toolEfficiency() : 1.0F; + } + + @Override + public boolean onBlockStartBreak(ItemStack stack, BlockPos position, EntityPlayer player) { + if (player.world.isRemote || !(player instanceof EntityPlayerMP) || HARVESTING.get()) return false; + if (!player.world.getBlockState(position).isIn(ModTags.SCYTHE_HARVESTABLE)) return false; + HARVESTING.set(Boolean.TRUE); + try { + EntityPlayerMP serverPlayer = (EntityPlayerMP) player; + for (int dx = -1; dx <= 1; dx++) { + for (int dz = -1; dz <= 1; dz++) { + BlockPos target = position.add(dx, 0, dz); + if (player.world.getBlockState(target).isIn(ModTags.SCYTHE_HARVESTABLE)) { + serverPlayer.interactionManager.tryHarvestBlock(target); + } + } + } + } finally { + HARVESTING.set(Boolean.FALSE); + } + return true; + } + + @Override public void addInformation(ItemStack stack, @Nullable World world, + List tooltip, ITooltipFlag flag) { MaterialItems.addToolTooltip(material, tooltip); } +} diff --git a/src/main/java/zone/moddev/mc/modernmetals/data/MaterialNames.java b/src/main/java/zone/moddev/mc/modernmetals/data/MaterialNames.java deleted file mode 100644 index 27083e9e..00000000 --- a/src/main/java/zone/moddev/mc/modernmetals/data/MaterialNames.java +++ /dev/null @@ -1,35 +0,0 @@ -package zone.moddev.mc.modernmetals.data; - -import com.mcmoddev.lib.data.SharedStrings; - -public final class MaterialNames { - - public static final String ALUMINUM = "aluminum"; - public static final String ALUMINUM_BRASS = "aluminumbrass"; - public static final String CADMIUM = "cadmium"; - public static final String CHROMIUM = "chromium"; - public static final String GALVANIZED_STEEL = "galvanizedsteel"; - public static final String IRIDIUM = "iridium"; - public static final String MAGNESIUM = "magnesium"; - public static final String MANGANESE = "manganese"; - public static final String NICHROME = "nichrome"; - public static final String OSMIUM = "osmium"; - public static final String PLUTONIUM = "plutonium"; - public static final String RUTILE = "rutile"; - public static final String STEEL = "steel"; - public static final String STAINLESS_STEEL = "stainlesssteel"; - public static final String TANTALUM = "tantalum"; - public static final String TITANIUM = "titanium"; - public static final String TUNGSTEN = "tungsten"; - public static final String URANIUM = "uranium"; - public static final String ZIRCONIUM = "zirconium"; - public static final String BORON = "boron"; - public static final String BERYLLIUM = "beryllium"; - public static final String THORIUM = "thorium"; - public static final String ZINC = "zinc"; - public static final String NICKEL = "nickel"; - - private MaterialNames() { - throw new IllegalAccessError(SharedStrings.NOT_INSTANTIABLE); - } -} diff --git a/src/main/java/zone/moddev/mc/modernmetals/data/TraitNames.java b/src/main/java/zone/moddev/mc/modernmetals/data/TraitNames.java deleted file mode 100644 index 82ededc3..00000000 --- a/src/main/java/zone/moddev/mc/modernmetals/data/TraitNames.java +++ /dev/null @@ -1,22 +0,0 @@ -package zone.moddev.mc.modernmetals.data; - -import com.mcmoddev.lib.data.SharedStrings; - -public class TraitNames { - - public static final String LIGHTWEIGHT = "lightweight"; - public static final String MAGNETIC = "magnetic"; - public static final String MAGNETIC2 = "magnetic2"; - public static final String SHARP = "sharp"; - public static final String STIFF = "stiff"; - public static final String HEAVY = "heavy"; - public static final String REACTIVE = "reactive"; - public static final String BRITTLE = "brittle"; - public static final String RADIOACTIVE = "radioactive"; - public static final String TOXIC = "toxic"; - public static final String POISONOUS = "poisonous"; - - private TraitNames() { - throw new IllegalAccessError(SharedStrings.NOT_INSTANTIABLE); - } -} diff --git a/src/main/java/zone/moddev/mc/modernmetals/entity/MaterialProjectile.java b/src/main/java/zone/moddev/mc/modernmetals/entity/MaterialProjectile.java new file mode 100644 index 00000000..33f1139c --- /dev/null +++ b/src/main/java/zone/moddev/mc/modernmetals/entity/MaterialProjectile.java @@ -0,0 +1,56 @@ +package zone.moddev.mc.modernmetals.entity; + +import zone.moddev.mc.modernmetals.content.ModContent; + +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.EntityType; +import net.minecraft.entity.projectile.EntityArrow; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.network.PacketBuffer; +import net.minecraft.world.World; +import net.minecraftforge.fml.common.registry.IEntityAdditionalSpawnData; + +public final class MaterialProjectile extends EntityArrow implements IEntityAdditionalSpawnData { + private ItemStack ammunition = ItemStack.EMPTY; + + public MaterialProjectile(EntityType type, World world) { + super(type, world); + } + + public MaterialProjectile(EntityType type, World world, EntityLivingBase shooter, ItemStack ammunition) { + super(type, shooter, world); + this.ammunition = single(ammunition); + } + + private static ItemStack single(ItemStack stack) { + ItemStack copy = stack.copy(); + copy.setCount(1); + return copy; + } + + @Override + protected ItemStack getArrowStack() { + return ammunition.isEmpty() ? new ItemStack(ModContent.item("aluminum_arrow").get()) : ammunition.copy(); + } + + public ItemStack getAmmunition() { + return getArrowStack(); + } + + @Override + public void writeAdditional(NBTTagCompound tag) { + super.writeAdditional(tag); + if (!ammunition.isEmpty()) tag.setTag("Ammunition", ammunition.write(new NBTTagCompound())); + } + + @Override + public void readAdditional(NBTTagCompound tag) { + super.readAdditional(tag); + ammunition = tag.contains("Ammunition", 10) + ? ItemStack.read(tag.getCompound("Ammunition")) : ItemStack.EMPTY; + } + + @Override public void writeSpawnData(PacketBuffer buffer) { buffer.writeItemStack(ammunition); } + @Override public void readSpawnData(PacketBuffer buffer) { ammunition = buffer.readItemStack(); } +} diff --git a/src/main/java/zone/moddev/mc/modernmetals/entity/ModEntities.java b/src/main/java/zone/moddev/mc/modernmetals/entity/ModEntities.java new file mode 100644 index 00000000..aaa124ef --- /dev/null +++ b/src/main/java/zone/moddev/mc/modernmetals/entity/ModEntities.java @@ -0,0 +1,40 @@ +package zone.moddev.mc.modernmetals.entity; + +import zone.moddev.mc.modernmetals.ModernMetals; +import zone.moddev.mc.modernmetals.content.RegistryHandle; + +import net.minecraft.entity.EntityType; +import net.minecraftforge.event.RegistryEvent; +import net.minecraftforge.eventbus.api.SubscribeEvent; +import net.minecraftforge.fml.common.Mod; + +@Mod.EventBusSubscriber(modid = ModernMetals.MOD_ID, bus = Mod.EventBusSubscriber.Bus.MOD) +public final class ModEntities { + public static final RegistryHandle> CUSTOM_ARROW = + new RegistryHandle>("custom_arrow"); + public static final RegistryHandle> CUSTOM_BOLT = + new RegistryHandle>("custom_bolt"); + + private ModEntities() {} + + public static void initialize() { + // Register the event subscriber before item factories ask for these entities. + } + + @SubscribeEvent + public static void registerEntities(RegistryEvent.Register> event) { + CUSTOM_ARROW.bind(register(event, "custom_arrow", CUSTOM_ARROW)); + CUSTOM_BOLT.bind(register(event, "custom_bolt", CUSTOM_BOLT)); + } + + private static EntityType register(RegistryEvent.Register> event, + String name, final RegistryHandle> self) { + EntityType type = EntityType.Builder + .create(MaterialProjectile.class, world -> new MaterialProjectile(self.get(), world)) + .tracker(64, 20, true) + .build(ModernMetals.MOD_ID + ":" + name); + type.setRegistryName(ModernMetals.MOD_ID, name); + event.getRegistry().register(type); + return type; + } +} diff --git a/src/main/java/zone/moddev/mc/modernmetals/init/Blocks.java b/src/main/java/zone/moddev/mc/modernmetals/init/Blocks.java deleted file mode 100644 index 8cfb063c..00000000 --- a/src/main/java/zone/moddev/mc/modernmetals/init/Blocks.java +++ /dev/null @@ -1,90 +0,0 @@ -package zone.moddev.mc.modernmetals.init; - -import java.util.Arrays; -import java.util.List; - -import com.mcmoddev.lib.data.Names; -import com.mcmoddev.lib.data.SharedStrings; -import com.mcmoddev.lib.init.Materials; -import com.mcmoddev.lib.material.MMDMaterial; -import com.mcmoddev.lib.util.Oredicts; -import zone.moddev.mc.modernmetals.ModernMetals; -import zone.moddev.mc.modernmetals.block.OverlayOreBlock; -import zone.moddev.mc.modernmetals.data.MaterialNames; - -import net.minecraft.block.Block; -import net.minecraftforge.event.RegistryEvent; -import net.minecraftforge.fml.common.Mod.EventBusSubscriber; -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; - -/** - * This class initializes all blocks in Modern Metals. - * - * @author Jasmine Iwanek - * - */ -@EventBusSubscriber(modid=ModernMetals.MODID) -public class Blocks extends com.mcmoddev.lib.init.Blocks { - - protected Blocks() { - throw new IllegalAccessError(SharedStrings.NOT_INSTANTIABLE); - } - - /** - * - */ - public static void init() { - final List materials = Arrays.asList(MaterialNames.ALUMINUM, MaterialNames.ALUMINUM_BRASS, - MaterialNames.BERYLLIUM, MaterialNames.BORON, MaterialNames.CADMIUM, MaterialNames.CHROMIUM, - MaterialNames.GALVANIZED_STEEL, MaterialNames.IRIDIUM, MaterialNames.MAGNESIUM, MaterialNames.MANGANESE, - MaterialNames.NICHROME, MaterialNames.OSMIUM, MaterialNames.PLUTONIUM, MaterialNames.RUTILE, - MaterialNames.STAINLESS_STEEL, MaterialNames.TANTALUM, MaterialNames.THORIUM, MaterialNames.TITANIUM, - MaterialNames.TUNGSTEN, MaterialNames.URANIUM, MaterialNames.ZIRCONIUM); - - materials.stream().filter(Materials::hasMaterial) - .filter(materialName -> !Materials.getMaterialByName(materialName).isEmpty()) - .forEach(materialName -> { - final MMDMaterial material = Materials.getMaterialByName(materialName); - create(Names.BLOCK, material); - create(Names.PLATE, material); - createOre(material); - Arrays.asList(Names.BARS, Names.DOOR, Names.TRAPDOOR, - Names.BUTTON, Names.SLAB, Names.DOUBLE_SLAB, Names.LEVER, Names.PRESSURE_PLATE, - Names.STAIRS, Names.WALL).stream() - .forEach(name -> create(name, material)); - }); - } - - private static void createOre(final MMDMaterial material) { - if (MaterialNames.THORIUM.equals(material.getName())) { - create(Names.ORE, material); - } else if (material.hasOre() && !material.hasBlock(Names.ORE) && isNameEnabled(Names.ORE)) { - final Block ore = addBlock(new OverlayOreBlock(material), Names.ORE, material, - ItemGroups.getTab(SharedStrings.TAB_BLOCKS)); - material.addNewBlock(Names.ORE, ore); - final String prefix = getOredictFromName(Names.ORE); - if (prefix != null) { - Oredicts.registerOre(prefix + material.getCapitalizedName(), ore); - } - } - } - - private static boolean filterFunc(final Block block) { - return block.getRegistryName().getNamespace().equals(ModernMetals.MODID); - } - - /** - * - * @param event The Event. - */ - @SubscribeEvent - public static void registerBlocks(final RegistryEvent.Register event) { - ModernMetals.logger.fatal("RegistryEvent.Register"); - Materials.getMaterialsByMod(ModernMetals.MODID).stream() - .forEach(mat -> - mat.getBlocks().stream() - .filter(Blocks::filterFunc) - .forEach(event.getRegistry()::register) - ); - } -} diff --git a/src/main/java/zone/moddev/mc/modernmetals/init/Fluids.java b/src/main/java/zone/moddev/mc/modernmetals/init/Fluids.java deleted file mode 100644 index 83ad1837..00000000 --- a/src/main/java/zone/moddev/mc/modernmetals/init/Fluids.java +++ /dev/null @@ -1,93 +0,0 @@ -package zone.moddev.mc.modernmetals.init; - -import java.util.Arrays; -import java.util.List; - -import javax.annotation.Nonnull; - -import com.mcmoddev.lib.block.BlockMoltenFluid; -import com.mcmoddev.lib.data.SharedStrings; -import com.mcmoddev.lib.material.MMDMaterial; -import com.mcmoddev.lib.init.Materials; -import com.mcmoddev.lib.util.Config.Options; -import zone.moddev.mc.modernmetals.data.MaterialNames; -import net.minecraft.block.state.IBlockState; -import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.util.DamageSource; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; -import net.minecraftforge.fluids.Fluid; - -/** - * This class initializes all fluids in Modern Metals. - * - * @author Jasmine Iwanek - * - */ -public class Fluids extends com.mcmoddev.lib.init.Fluids { - private Fluids() { - throw new IllegalAccessError(SharedStrings.NOT_INSTANTIABLE); - } - - /** - * - */ - public static void init() { - final List materials = Arrays.asList(MaterialNames.ALUMINUM, MaterialNames.ALUMINUM_BRASS, - MaterialNames.BERYLLIUM, MaterialNames.BORON, MaterialNames.CADMIUM, MaterialNames.CHROMIUM, MaterialNames.GALVANIZED_STEEL, - MaterialNames.IRIDIUM, MaterialNames.MAGNESIUM, MaterialNames.MANGANESE, MaterialNames.NICHROME, - MaterialNames.OSMIUM, MaterialNames.PLUTONIUM, MaterialNames.RUTILE, MaterialNames.STAINLESS_STEEL, - MaterialNames.TANTALUM, MaterialNames.THORIUM, MaterialNames.TITANIUM, MaterialNames.TUNGSTEN, - MaterialNames.URANIUM, MaterialNames.ZIRCONIUM); - - materials.stream().filter(Materials::hasMaterial) - .filter(Options::isFluidEnabled).forEach(materialName -> { - final MMDMaterial material = Materials.getMaterialByName(materialName); - addFluid(material, 2000, 10000, getTemperature(materialName), 10); - material.setFluidBlockGetter(name -> new MoltenMetalBlock(material.getFluid())); - addFluidBlock(material); - }); - } - - private static final class MoltenMetalBlock extends BlockMoltenFluid { - MoltenMetalBlock(final Fluid fluid) { - super(fluid); - } - - @Override - public void onEntityCollision(final World world, final BlockPos pos, final IBlockState state, - final Entity entity) { - super.onEntityCollision(world, pos, state, entity); - if (world.isRemote || !(entity instanceof EntityLivingBase) || entity.isImmuneToFire()) { - return; - } - final double surface = pos.getY() + getFluidHeightForRender(world, pos, world.getBlockState(pos.up())); - if (entity.getEntityBoundingBox().minY >= surface || entity.isInLava()) { - return; - } - - // Minecraft handles damage once the entity enters the deeper lava contact bounds. - entity.attackEntityFrom(DamageSource.LAVA, 4.0F); - entity.setFire(15); - } - } - - private static int getTemperature(@Nonnull final String name) { - switch (name) { - case MaterialNames.ALUMINUM: - return 330; - case MaterialNames.ALUMINUM_BRASS: - return 500; - case MaterialNames.BERYLLIUM: - case MaterialNames.BORON: - return 400; - case MaterialNames.CADMIUM: - return 300; - case MaterialNames.THORIUM: - return 514; - default: - return 769; - } - } -} diff --git a/src/main/java/zone/moddev/mc/modernmetals/init/ItemGroups.java b/src/main/java/zone/moddev/mc/modernmetals/init/ItemGroups.java deleted file mode 100644 index 573ddbc0..00000000 --- a/src/main/java/zone/moddev/mc/modernmetals/init/ItemGroups.java +++ /dev/null @@ -1,52 +0,0 @@ -package zone.moddev.mc.modernmetals.init; - -import com.mcmoddev.lib.data.Names; -import com.mcmoddev.lib.data.SharedStrings; -import com.mcmoddev.lib.init.Materials; -import com.mcmoddev.lib.material.MMDMaterial; -import zone.moddev.mc.modernmetals.ModernMetals; - -/** - * This class initializes all item groups in Modern Metals. - * - * @author Jasmine Iwanek - * - */ -public class ItemGroups extends com.mcmoddev.lib.init.ItemGroups { - private ItemGroups() { - throw new IllegalAccessError(SharedStrings.NOT_INSTANTIABLE); - } - - /** - * - */ - public static void init() { - // Unused - } - - /** - * - * @param materialName The name of the material. - */ - public static void setupIcons(final String materialName) { - if (Materials.hasMaterial(materialName)) { - final MMDMaterial material = Materials.getMaterialByName(materialName); - - if (material.hasBlock(Names.BLOCK)) { - getTab(ModernMetals.MODID, SharedStrings.TAB_BLOCKS).setTabIconItem(material.getBlock(Names.BLOCK)); - } - - if (material.hasItem(Names.GEAR)) { - getTab(ModernMetals.MODID, SharedStrings.TAB_ITEMS).setTabIconItem(material.getItem(Names.GEAR)); - } - - if (material.hasItem(Names.PICKAXE)) { - getTab(ModernMetals.MODID, SharedStrings.TAB_TOOLS).setTabIconItem(material.getItem(Names.PICKAXE)); - } - - if (material.hasItem(Names.SWORD)) { - getTab(ModernMetals.MODID, SharedStrings.TAB_COMBAT).setTabIconItem(material.getItem(Names.SWORD)); - } - } - } -} diff --git a/src/main/java/zone/moddev/mc/modernmetals/init/Items.java b/src/main/java/zone/moddev/mc/modernmetals/init/Items.java deleted file mode 100644 index 59e5a901..00000000 --- a/src/main/java/zone/moddev/mc/modernmetals/init/Items.java +++ /dev/null @@ -1,133 +0,0 @@ -package zone.moddev.mc.modernmetals.init; - -import java.util.Arrays; -import java.util.List; - -import com.mcmoddev.lib.data.Names; -import com.mcmoddev.lib.data.SharedStrings; -import com.mcmoddev.lib.init.Materials; -import com.mcmoddev.lib.material.MMDMaterial; -import com.mcmoddev.lib.util.Oredicts; -import zone.moddev.mc.modernmetals.ModernMetals; -import zone.moddev.mc.modernmetals.data.MaterialNames; - -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraftforge.event.RegistryEvent; -import net.minecraftforge.fml.common.Mod.EventBusSubscriber; -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; - -/** - * This class initializes all items in Modern Metals. - * - * @author Jasmine Iwanek - * - */ -@EventBusSubscriber(modid=ModernMetals.MODID) -public class Items extends com.mcmoddev.lib.init.Items { - protected Items() { - throw new IllegalAccessError(SharedStrings.NOT_INSTANTIABLE); - } - - /** - * - */ - public static void init() { - final List materials = Arrays.asList(MaterialNames.ALUMINUM, MaterialNames.ALUMINUM_BRASS, - MaterialNames.BERYLLIUM, MaterialNames.BORON, MaterialNames.CADMIUM, MaterialNames.CHROMIUM, - MaterialNames.GALVANIZED_STEEL, MaterialNames.IRIDIUM, MaterialNames.MAGNESIUM, MaterialNames.MANGANESE, - MaterialNames.NICHROME, MaterialNames.OSMIUM, MaterialNames.PLUTONIUM, MaterialNames.RUTILE, - MaterialNames.STAINLESS_STEEL, MaterialNames.TANTALUM, MaterialNames.THORIUM, MaterialNames.TITANIUM, - MaterialNames.TUNGSTEN, MaterialNames.URANIUM, MaterialNames.ZIRCONIUM); - - final List materialsIC2Support = Arrays.asList(MaterialNames.ALUMINUM_BRASS, MaterialNames.GALVANIZED_STEEL, - MaterialNames.NICHROME, MaterialNames.OSMIUM, MaterialNames.STAINLESS_STEEL, MaterialNames.URANIUM); - - final List materialsModSupport = Arrays.asList(MaterialNames.ALUMINUM, MaterialNames.BERYLLIUM, - MaterialNames.BORON, MaterialNames.CADMIUM, MaterialNames.CHROMIUM, MaterialNames.IRIDIUM, - MaterialNames.MAGNESIUM, MaterialNames.MANGANESE, MaterialNames.PLUTONIUM, MaterialNames.RUTILE, - MaterialNames.TANTALUM, MaterialNames.THORIUM, MaterialNames.TITANIUM, MaterialNames.TUNGSTEN, - MaterialNames.ZIRCONIUM); - - final List itemsToMake = Arrays.asList(Names.BLEND, Names.INGOT, Names.NUGGET, Names.POWDER, - Names.SMALLBLEND, Names.SMALLPOWDER, Names.ARROW, Names.AXE, Names.BOLT, Names.BOOTS, - Names.BOW, Names.CHESTPLATE, Names.CRACKHAMMER, Names.CROSSBOW, Names.DOOR, - Names.FISHING_ROD, Names.HELMET, Names.HOE, Names.HORSE_ARMOR, Names.LEGGINGS, Names.PICKAXE, - Names.SHEARS, Names.SHIELD, Names.SHOVEL, Names.SCYTHE, Names.SLAB, Names.SWORD, Names.ROD, - Names.GEAR); - - materials.stream().filter(Materials::hasMaterial) - .filter(materialName -> !Materials.getMaterialByName(materialName).isEmpty()) - .forEach(materialName -> { - final MMDMaterial material = Materials.getMaterialByName(materialName); - itemsToMake.stream().forEach(name -> create(name, material)); - }); - - materialsModSupport.stream().filter(Materials::hasMaterial) - .filter(materialName -> !Materials.getMaterialByName(materialName).isEmpty()) - .forEach(materialName -> { - final MMDMaterial material = Materials.getMaterialByName(materialName); - - create(Names.CASING, material); - create(Names.DENSE_PLATE, material); - - if (material.hasOre()) { - Arrays.asList(Names.CRUSHED, Names.CRUSHED_PURIFIED, Names.SHARD, Names.CLUMP, - Names.POWDER_DIRTY, Names.CRYSTAL).stream() - .forEach(name -> create(name, material)); - } - }); - - materialsIC2Support.stream().filter(Materials::hasMaterial) - .filter(materialName -> !Materials.getMaterialByName(materialName).isEmpty()) - .forEach(materialName -> { - final MMDMaterial material = Materials.getMaterialByName(materialName); - - create(Names.CASING, material); - create(Names.DENSE_PLATE, material); - }); - - if (Materials.hasMaterial(MaterialNames.OSMIUM)) { - final MMDMaterial osmium = Materials.getMaterialByName(MaterialNames.OSMIUM); - - create(Names.CRUSHED, osmium); - create(Names.CRUSHED_PURIFIED, osmium); - } - - if (Materials.hasMaterial(MaterialNames.URANIUM)) { - final MMDMaterial uranium = Materials.getMaterialByName(MaterialNames.URANIUM); - - create(Names.SHARD, uranium); - create(Names.CLUMP, uranium); - create(Names.POWDER_DIRTY, uranium); - create(Names.CRYSTAL, uranium); - } - } - - private static boolean filterFunc(final ItemStack itemStack) { - return itemStack.getItem().getRegistryName().getNamespace().equals(ModernMetals.MODID); - } - - private static Item mapFunc(final ItemStack itemStack) { - return itemStack.getItem(); - } - - /** - * - * @param event The Event. - */ - @SubscribeEvent - public static void registerItems(final RegistryEvent.Register event) { - ModernMetals.logger.fatal("RegistryEvent.Register"); - Materials.getMaterialsByMod(ModernMetals.MODID).stream() - .forEach(mat -> - mat.getItems().stream() - .filter(Items::filterFunc) - .map(Items::mapFunc) - .forEach(event.getRegistry()::register) - ); - - Oredicts.registerItemOreDictionaryEntries(); - Oredicts.registerBlockOreDictionaryEntries(); - } -} diff --git a/src/main/java/zone/moddev/mc/modernmetals/init/Materials.java b/src/main/java/zone/moddev/mc/modernmetals/init/Materials.java deleted file mode 100644 index 88a9c35e..00000000 --- a/src/main/java/zone/moddev/mc/modernmetals/init/Materials.java +++ /dev/null @@ -1,217 +0,0 @@ -package zone.moddev.mc.modernmetals.init; - -import java.util.Arrays; -import java.util.List; - -import javax.annotation.Nonnull; - -import com.mcmoddev.lib.data.SharedStrings; -import com.mcmoddev.lib.material.MMDMaterialType.MaterialType; -import com.mcmoddev.lib.util.Config.Options; -import zone.moddev.mc.modernmetals.data.MaterialNames; - -/** - * This class initializes all of the materials in Modern Metals. - * - * @author Jasmine Iwanek - * - */ -public class Materials extends com.mcmoddev.lib.init.Materials { - private Materials() { - throw new IllegalAccessError(SharedStrings.NOT_INSTANTIABLE); - } - - /** - * - */ - public static void init() { - final List materials = Arrays.asList(MaterialNames.ALUMINUM, MaterialNames.BERYLLIUM, - MaterialNames.BORON, MaterialNames.CHROMIUM, MaterialNames.MAGNESIUM, MaterialNames.MANGANESE, - MaterialNames.OSMIUM, MaterialNames.RUTILE, MaterialNames.TANTALUM, MaterialNames.THORIUM, - MaterialNames.TUNGSTEN, MaterialNames.ZIRCONIUM); - - final List rareMaterials = Arrays.asList(MaterialNames.CADMIUM, MaterialNames.IRIDIUM, - MaterialNames.PLUTONIUM, MaterialNames.URANIUM); - - final List alloyMaterials = Arrays.asList(MaterialNames.ALUMINUM_BRASS, MaterialNames.GALVANIZED_STEEL, - MaterialNames.NICHROME, MaterialNames.STAINLESS_STEEL); - - materials.stream().filter(Options::isMaterialEnabled).forEach(name -> createMaterial(name, MaterialType.METAL, - getHardness(name), getStrength(name), getMagic(name), getColor(name))); - - alloyMaterials.stream().filter(Options::isMaterialEnabled).forEach(name -> createAlloyMaterial(name, - MaterialType.METAL, getHardness(name), getStrength(name), getMagic(name), getColor(name))); - - rareMaterials.stream().filter(Options::isMaterialEnabled).forEach(name -> createRareMaterial(name, - MaterialType.METAL, getHardness(name), getStrength(name), getMagic(name), getColor(name))); - - if (Options.isMaterialEnabled(MaterialNames.TITANIUM)) { - final String name = MaterialNames.TITANIUM; - createSpecialMaterial(name, MaterialType.METAL, getHardness(name), getStrength(name), getMagic(name), - getColor(name)); - } - } - - private static int getColor(@Nonnull final String name) { - switch (name) { - case MaterialNames.ALUMINUM: - return 0xFFC5C8C1; - case MaterialNames.ALUMINUM_BRASS: - return 0xFFEBAA56; - case MaterialNames.CADMIUM: - return 0xFFC9D4DA; - case MaterialNames.CHROMIUM: - return 0xFFCDCDCF; - case MaterialNames.GALVANIZED_STEEL: - return 0xFF9BA6A2; - case MaterialNames.IRIDIUM: - return 0xFFF8EDCC; - case MaterialNames.MAGNESIUM: - return 0xFF7F7F77; - case MaterialNames.MANGANESE: - return 0xFFF5CFDA; - case MaterialNames.NICHROME: - return 0xFFDEA054; - case MaterialNames.OSMIUM: - return 0xFF7C8E99; - case MaterialNames.PLUTONIUM: - return 0xFFB333EA; - case MaterialNames.RUTILE: - return 0xFFBF928B; - case MaterialNames.STAINLESS_STEEL: - return 0xFFC5BFC1; - case MaterialNames.TANTALUM: - return 0xFFC4BEC2; - case MaterialNames.TITANIUM: - return 0xFF73787E; - case MaterialNames.TUNGSTEN: - return 0xFF969696; - case MaterialNames.URANIUM: - return 0xFFA7B345; - case MaterialNames.ZIRCONIUM: - return 0xFF929793; - case MaterialNames.BERYLLIUM: - return 0xFFD5D3D5; - case MaterialNames.BORON: - return 0xFF888888; - case MaterialNames.THORIUM: - return 0xFF4F5A5A; - default: - return 0xFF000000; - } - } - - private static double getMagic(@Nonnull final String name) { - switch (name) { - case MaterialNames.ALUMINUM: - case MaterialNames.ALUMINUM_BRASS: - case MaterialNames.CADMIUM: - case MaterialNames.CHROMIUM: - case MaterialNames.GALVANIZED_STEEL: - case MaterialNames.IRIDIUM: - case MaterialNames.MAGNESIUM: - case MaterialNames.MANGANESE: - case MaterialNames.NICHROME: - case MaterialNames.OSMIUM: - case MaterialNames.PLUTONIUM: - case MaterialNames.RUTILE: - case MaterialNames.STAINLESS_STEEL: - case MaterialNames.TANTALUM: - case MaterialNames.TITANIUM: - case MaterialNames.TUNGSTEN: - case MaterialNames.URANIUM: - case MaterialNames.ZIRCONIUM: - return 4.5d; - case MaterialNames.BERYLLIUM: - case MaterialNames.BORON: - case MaterialNames.THORIUM: - return 1.0d; - default: - return 1.0d; - } - } - - private static double getStrength(@Nonnull final String name) { - switch (name) { - case MaterialNames.TANTALUM: - return 17.5d; - case MaterialNames.TITANIUM: - case MaterialNames.URANIUM: - return 16.25d; - case MaterialNames.STAINLESS_STEEL: - return 16d; - case MaterialNames.NICHROME: - return 15.5d; - case MaterialNames.GALVANIZED_STEEL: - return 15.25d; - case MaterialNames.TUNGSTEN: - return 12.5d; - case MaterialNames.BORON: - return 8d; - case MaterialNames.ALUMINUM_BRASS: - case MaterialNames.PLUTONIUM: - return 7.5d; - case MaterialNames.ALUMINUM: - return 3.75d; - case MaterialNames.MAGNESIUM: - case MaterialNames.ZIRCONIUM: - return 3.5d; - case MaterialNames.CHROMIUM: - case MaterialNames.IRIDIUM: - return 3d; - case MaterialNames.MANGANESE: - case MaterialNames.OSMIUM: - return 2.75d; - case MaterialNames.BERYLLIUM: - return 2.5d; - case MaterialNames.CADMIUM: - case MaterialNames.THORIUM: - return 1d; - case MaterialNames.RUTILE: - return 0.25d; - default: - return 1.0d; - } - } - - private static double getHardness(@Nonnull final String name) { - switch (name) { - case MaterialNames.BORON: - return 9.5d; - case MaterialNames.CHROMIUM: - return 9d; - case MaterialNames.TUNGSTEN: - return 7.5d; - case MaterialNames.OSMIUM: - return 7d; - case MaterialNames.IRIDIUM: - case MaterialNames.TANTALUM: - case MaterialNames.TITANIUM: - return 6.5d; - case MaterialNames.NICHROME: - case MaterialNames.RUTILE: - case MaterialNames.STAINLESS_STEEL: - case MaterialNames.URANIUM: - return 6d; - case MaterialNames.BERYLLIUM: - case MaterialNames.GALVANIZED_STEEL: - return 5.5d; - case MaterialNames.MANGANESE: - case MaterialNames.ZIRCONIUM: - return 5d; - case MaterialNames.PLUTONIUM: - return 4d; - case MaterialNames.THORIUM: - return 3d; - case MaterialNames.ALUMINUM: - case MaterialNames.MAGNESIUM: - return 2.5d; - case MaterialNames.CADMIUM: - return 2d; - case MaterialNames.ALUMINUM_BRASS: - return 1.0d; - default: - return 1.0d; - } - } -} diff --git a/src/main/java/zone/moddev/mc/modernmetals/init/PolicyRecipe.java b/src/main/java/zone/moddev/mc/modernmetals/init/PolicyRecipe.java deleted file mode 100644 index 166e5f70..00000000 --- a/src/main/java/zone/moddev/mc/modernmetals/init/PolicyRecipe.java +++ /dev/null @@ -1,66 +0,0 @@ -package zone.moddev.mc.modernmetals.init; - -import zone.moddev.mc.modernmetals.content.ContentPolicy; -import net.minecraft.inventory.InventoryCrafting; -import net.minecraft.item.ItemStack; -import net.minecraft.item.crafting.IRecipe; -import net.minecraft.util.NonNullList; -import net.minecraft.world.World; -import net.minecraftforge.registries.IForgeRegistryEntry; - -/** Disables restricted recipes without removing their saved registry names. */ -final class PolicyRecipe extends IForgeRegistryEntry.Impl implements IRecipe { - private final IRecipe delegate; - private final ContentPolicy policy; - private final boolean allowed; - - PolicyRecipe(final IRecipe delegate, final ContentPolicy policy) { - this.delegate = delegate; - - this.policy = policy; - this.allowed = policy.allows(delegate.getRecipeOutput()); - setRegistryName(delegate.getRegistryName()); - } - - @Override - public boolean matches(final InventoryCrafting inventory, final World world) { - return allowed && delegate.matches(inventory, world) && policy.allows(delegate.getCraftingResult(inventory)); - } - - @Override - public ItemStack getCraftingResult(final InventoryCrafting inventory) { - if (!allowed) return ItemStack.EMPTY; - final ItemStack result = delegate.getCraftingResult(inventory); - return policy.allows(result) ? result : ItemStack.EMPTY; - } - - @Override - public boolean canFit(final int width, final int height) { - return allowed && delegate.canFit(width, height); - } - - @Override - public ItemStack getRecipeOutput() { - return allowed ? delegate.getRecipeOutput() : ItemStack.EMPTY; - } - - @Override - public NonNullList getRemainingItems(final InventoryCrafting inventory) { - return delegate.getRemainingItems(inventory); - } - - @Override - public NonNullList getIngredients() { - return delegate.getIngredients(); - } - - @Override - public boolean isDynamic() { - return !allowed || delegate.isDynamic(); - } - - @Override - public String getGroup() { - return delegate.getGroup(); - } -} diff --git a/src/main/java/zone/moddev/mc/modernmetals/init/Recipes.java b/src/main/java/zone/moddev/mc/modernmetals/init/Recipes.java deleted file mode 100644 index febf6624..00000000 --- a/src/main/java/zone/moddev/mc/modernmetals/init/Recipes.java +++ /dev/null @@ -1,116 +0,0 @@ -package zone.moddev.mc.modernmetals.init; - -import java.util.ArrayList; -import java.util.List; -import com.mcmoddev.lib.data.Names; -import com.mcmoddev.lib.data.SharedStrings; -import com.mcmoddev.lib.init.Materials; -import com.mcmoddev.lib.material.MMDMaterial; -import zone.moddev.mc.modernmetals.ModernMetals; -import zone.moddev.mc.modernmetals.content.ContentPolicy; -import zone.moddev.mc.modernmetals.data.MaterialNames; -import net.minecraft.item.crafting.IRecipe; -import net.minecraft.item.ItemStack; -import net.minecraft.item.crafting.FurnaceRecipes; -import net.minecraftforge.event.RegistryEvent; -import net.minecraftforge.fml.common.Mod; -import net.minecraftforge.fml.common.eventhandler.EventPriority; -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -import net.minecraftforge.fml.common.registry.GameRegistry; - -/** - * - * @author Jasmine Iwanek - * - */ -@Mod.EventBusSubscriber(modid = ModernMetals.MODID) -public class Recipes extends com.mcmoddev.lib.init.Recipes { - - private Recipes() { - throw new IllegalAccessError(SharedStrings.NOT_INSTANTIABLE); - } - - /** - * - */ - public static void init() { - initModSpecificRecipes(); - } - - @SubscribeEvent(priority = EventPriority.LOWEST) - public static void registerRecipes(final RegistryEvent.Register event) { - initModSpecificRecipes(); - register(event); - registerBlendSmelting(); - final ContentPolicy policy = ContentPolicy.active(); - if (!policy.lowFantasy()) return; - - final List restricted = new ArrayList<>(); - for (final IRecipe recipe : event.getRegistry()) { - final String type = recipe.getClass().getName(); - final boolean sharedDynamic = recipe.getRecipeOutput().isEmpty() - && (type.startsWith("com.mcmoddev.lib.recipe.") || type.startsWith("zone.moddev.mc.mmdlib.recipe.")); - if (!policy.allows(recipe.getRecipeOutput()) || sharedDynamic) { - restricted.add(recipe); - } - } - for (final IRecipe recipe : restricted) { - event.getRegistry().register(new PolicyRecipe(recipe, policy)); - } - } - - private static void registerBlendSmelting() { - for (final MMDMaterial material : Materials.getMaterialsByMod(ModernMetals.MODID)) { - if (!material.hasItem(Names.BLEND) || !material.hasItem(Names.INGOT)) continue; - final ItemStack blend = material.getItemStack(Names.BLEND); - if (FurnaceRecipes.instance().getSmeltingResult(blend).isEmpty()) { - GameRegistry.addSmelting(blend, material.getItemStack(Names.INGOT), material.getOreSmeltXP()); - } - } - } - - private static void initModSpecificRecipes() { - if (Materials.hasMaterial(MaterialNames.ALUMINUM)) { - final MMDMaterial aluminum = Materials.getMaterialByName(MaterialNames.ALUMINUM); - - addAdditionalOredicts(aluminum, "Aluminium"); - addAdditionalOredicts(aluminum, "Bauxite"); - } - - if (Materials.hasMaterial(MaterialNames.ALUMINUM_BRASS)) { - final MMDMaterial aluminumBrass = Materials.getMaterialByName(MaterialNames.ALUMINUM_BRASS); - - addAdditionalOredicts(aluminumBrass, "AluminumBrass"); - addAdditionalOredicts(aluminumBrass, "Aluminiumbrass"); - addAdditionalOredicts(aluminumBrass, "AluminiumBrass"); - addAdditionalOredicts(aluminumBrass, "Alubrass"); - addAdditionalOredicts(aluminumBrass, "AluBrass"); - } - - if (Materials.hasMaterial(MaterialNames.CHROMIUM)) { - addAdditionalOredicts(MaterialNames.CHROMIUM, "Chrome"); - } - - if (Materials.hasMaterial(MaterialNames.GALVANIZED_STEEL)) { - final MMDMaterial galvanizedSteel = Materials.getMaterialByName(MaterialNames.GALVANIZED_STEEL); - - addAdditionalOredicts(galvanizedSteel, "GalvinizedSteel"); - } - - if (Materials.hasMaterial(MaterialNames.NICHROME)) { - final MMDMaterial nichrome = Materials.getMaterialByName(MaterialNames.NICHROME); - - addAdditionalOredicts(nichrome, "Nichrome"); - } - - if (Materials.hasMaterial(MaterialNames.STAINLESS_STEEL)) { - final MMDMaterial stainlessSteel = Materials.getMaterialByName(MaterialNames.STAINLESS_STEEL); - - addAdditionalOredicts(stainlessSteel, "StainlessSteel"); - } - - if (Materials.hasMaterial(MaterialNames.TUNGSTEN)) { - addAdditionalOredicts(MaterialNames.TUNGSTEN, "Wolfram"); - } - } -} diff --git a/src/main/java/zone/moddev/mc/modernmetals/init/VillagerTrades.java b/src/main/java/zone/moddev/mc/modernmetals/init/VillagerTrades.java deleted file mode 100644 index ed00507e..00000000 --- a/src/main/java/zone/moddev/mc/modernmetals/init/VillagerTrades.java +++ /dev/null @@ -1,46 +0,0 @@ -package zone.moddev.mc.modernmetals.init; - -import com.mcmoddev.lib.data.MaterialStats; -import com.mcmoddev.lib.data.Names; -import com.mcmoddev.lib.data.SharedStrings; -import com.mcmoddev.lib.init.Materials; -import com.mcmoddev.lib.material.MMDMaterial; -import com.mcmoddev.lib.util.VillagerTradeHelper; -import net.minecraft.item.ItemStack; -import zone.moddev.mc.modernmetals.ModernMetals; -import zone.moddev.mc.modernmetals.content.ContentPolicy; - -/** - * - * @author Jasmine Iwanek - * - */ -public class VillagerTrades extends com.mcmoddev.lib.init.VillagerTrades { - private VillagerTrades() { - throw new IllegalAccessError(SharedStrings.NOT_INSTANTIABLE); - } - - /** - * - */ - public static void init() { - if (!ContentPolicy.active().lowFantasy()) { - registerCommonTrades(); - return; - } - // Keep smiths trading metal in Low Fantasy, without offering implausible equipment. - for (final MMDMaterial material : Materials.getMaterialsByMod(ModernMetals.MODID)) { - if (material.isEmpty() || material.isRare() || !material.hasItem(Names.INGOT)) continue; - final float value = material.getStat(MaterialStats.HARDNESS) - + material.getStat(MaterialStats.STRENGTH) - + material.getStat(MaterialStats.MAGICAFFINITY) + material.getToolHarvestLevel(); - final int price = emeraldPurchaseValue(value); - if (price > 64 || emeraldSaleValue(value) > 64) continue; - final ItemStack ingots = material.getItemStack(Names.INGOT, 12); - for (final int career : new int[] { ARMOR_SMITH_ID, WEAPON_SMITH_ID, TOOL_SMITH_ID }) { - VillagerTradeHelper.insertTrades(SMITH_RL, career, tradeLevel(value), - makePurchasePalette(price, ingots)); - } - } - } -} diff --git a/src/main/java/zone/moddev/mc/modernmetals/integration/plugins/MMeConstructsArmory.java b/src/main/java/zone/moddev/mc/modernmetals/integration/plugins/MMeConstructsArmory.java deleted file mode 100644 index 5cf3f1d3..00000000 --- a/src/main/java/zone/moddev/mc/modernmetals/integration/plugins/MMeConstructsArmory.java +++ /dev/null @@ -1,77 +0,0 @@ -package zone.moddev.mc.modernmetals.integration.plugins; - -import c4.conarm.common.armor.traits.ArmorTraits; -import com.mcmoddev.lib.integration.IIntegration; -import com.mcmoddev.lib.integration.MMDPlugin; -import com.mcmoddev.lib.integration.plugins.ConstructsArmory; -import com.mcmoddev.lib.integration.plugins.armory.traits.MMDTraitsCA; -import com.mcmoddev.lib.integration.plugins.tinkers.events.MaterialRegistrationEvent; -import com.mcmoddev.lib.integration.plugins.tinkers.traits.MMDTraits; -import com.mcmoddev.lib.util.Config; -import zone.moddev.mc.modernmetals.ModernMetals; -import zone.moddev.mc.modernmetals.data.MaterialNames; -import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.fml.common.eventhandler.EventPriority; -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; - -import static com.mcmoddev.lib.integration.plugins.ConstructsArmory.addArmorTrait; - -@MMDPlugin(addonId = ModernMetals.MODID, pluginId = MMeConstructsArmory.PLUGIN_MODID, versions = MMeConstructsArmory.PLUGIN_MODID - + "@[1.12.2-2.10.1.87,)") -public final class MMeConstructsArmory implements IIntegration { - - public static final String PLUGIN_MODID = ConstructsArmory.PLUGIN_MODID; - - public MMeConstructsArmory() { - // do nothing - } - - @Override - public void init() { - ConstructsArmory.INSTANCE.init(); - if (!Config.Options.isModEnabled(PLUGIN_MODID)) { - return; - } - MinecraftForge.EVENT_BUS.register(this); - } - - @SubscribeEvent(priority = EventPriority.LOWEST) - public void materialRegistration(MaterialRegistrationEvent ev) { - if(Config.Options.isModEnabled(PLUGIN_MODID)){ - ev.getRegistry().getEntries().stream() - .map(ent -> ent.getValue()) - .forEach(mat -> { - switch (mat.getName()){ - case MaterialNames.CHROMIUM: - addArmorTrait(mat.getTinkerMaterial(), ArmorTraits.magnetic2); - break; - case MaterialNames.GALVANIZED_STEEL: - addArmorTrait(mat.getTinkerMaterial(), ArmorTraits.steady, ArmorTraits.indomitable); - break; - case MaterialNames.IRIDIUM: - addArmorTrait(mat.getTinkerMaterial(), MMDTraitsCA.brittle); - break; - case MaterialNames.MAGNESIUM: - addArmorTrait(mat.getTinkerMaterial(), MMDTraitsCA.reactive); - break; - case MaterialNames.MANGANESE: - addArmorTrait(mat.getTinkerMaterial(), MMDTraitsCA.brittle); - break; - case MaterialNames.OSMIUM: - addArmorTrait(mat.getTinkerMaterial(), MMDTraitsCA.brittle); - addArmorTrait(mat.getTinkerMaterial(), ArmorTraits.heavy); - break; - case MaterialNames.PLUTONIUM: - addArmorTrait(mat.getTinkerMaterial(), MMDTraitsCA.toxic, MMDTraits.radioactive); - break; - case MaterialNames.STAINLESS_STEEL: - addArmorTrait(mat.getTinkerMaterial(), ArmorTraits.steady, ArmorTraits.indomitable); - break; - case MaterialNames.URANIUM: - addArmorTrait(mat.getTinkerMaterial(), MMDTraitsCA.poisonous, MMDTraits.radioactive); - break; - } - }); - } - } -} diff --git a/src/main/java/zone/moddev/mc/modernmetals/integration/plugins/MMeDenseOres.java b/src/main/java/zone/moddev/mc/modernmetals/integration/plugins/MMeDenseOres.java deleted file mode 100644 index 66f3bedc..00000000 --- a/src/main/java/zone/moddev/mc/modernmetals/integration/plugins/MMeDenseOres.java +++ /dev/null @@ -1,47 +0,0 @@ -package zone.moddev.mc.modernmetals.integration.plugins; - -import java.util.Arrays; -import java.util.List; - -import com.mcmoddev.lib.init.Materials; -import com.mcmoddev.lib.integration.IIntegration; -import com.mcmoddev.lib.integration.MMDPlugin; -import com.mcmoddev.lib.material.MMDMaterial; -import com.mcmoddev.lib.util.Config.Options; -import com.mcmoddev.lib.util.Oredicts; -import zone.moddev.mc.modernmetals.ModernMetals; -import zone.moddev.mc.modernmetals.data.MaterialNames; - -@MMDPlugin(addonId = ModernMetals.MODID, pluginId = MMeDenseOres.PLUGIN_MODID) -public class MMeDenseOres extends com.mcmoddev.lib.integration.plugins.DenseOres implements IIntegration { - - @Override - public void init() { - if (!Options.isModEnabled(PLUGIN_MODID)) { - return; - } - - registerOres(); - } - - /** - * Register all ores that are currently known by the materials registry. - * - * @author Daniel Hazelton <dshadowwolf@gmail.com> - */ - private static void registerOres() { - final List materials = Arrays.asList(MaterialNames.ALUMINUM, MaterialNames.CADMIUM, - MaterialNames.CHROMIUM, MaterialNames.IRIDIUM, MaterialNames.MAGNESIUM, MaterialNames.MANGANESE, - MaterialNames.OSMIUM, MaterialNames.PLUTONIUM, MaterialNames.RUTILE, MaterialNames.TANTALUM, - MaterialNames.TITANIUM, MaterialNames.TUNGSTEN, MaterialNames.URANIUM, MaterialNames.ZIRCONIUM); - - materials.stream().filter(Materials::hasMaterial) - .filter(materialName -> !Materials.getMaterialByName(materialName).isEmpty()) - .forEach(materialName -> { - final MMDMaterial material = Materials.getMaterialByName(materialName); - if (material.isEmpty()) { - registerOre(String.format("%s_%s", materialName, Oredicts.ORE), Oredicts.STONE, 0); - } - }); - } -} diff --git a/src/main/java/zone/moddev/mc/modernmetals/integration/plugins/MMeEnderIO.java b/src/main/java/zone/moddev/mc/modernmetals/integration/plugins/MMeEnderIO.java deleted file mode 100644 index 9f3d8891..00000000 --- a/src/main/java/zone/moddev/mc/modernmetals/integration/plugins/MMeEnderIO.java +++ /dev/null @@ -1,39 +0,0 @@ -package zone.moddev.mc.modernmetals.integration.plugins; - -import java.util.Arrays; -import java.util.List; - -import com.mcmoddev.lib.init.Materials; -import com.mcmoddev.lib.integration.IIntegration; -import com.mcmoddev.lib.integration.MMDPlugin; -import com.mcmoddev.lib.util.Config.Options; -import zone.moddev.mc.modernmetals.ModernMetals; -import zone.moddev.mc.modernmetals.data.MaterialNames; - -/** - * - * @author Jasmine Iwanek - * - */ -@MMDPlugin(addonId = ModernMetals.MODID, pluginId = MMeEnderIO.PLUGIN_MODID) -public class MMeEnderIO extends com.mcmoddev.lib.integration.plugins.EnderIO implements IIntegration { - /** - * - */ - @Override - public void init() { - if (!Options.isModEnabled(PLUGIN_MODID)) { - return; - } - - final List materials = Arrays.asList(MaterialNames.ALUMINUM, MaterialNames.ALUMINUM_BRASS, - MaterialNames.CADMIUM, MaterialNames.CHROMIUM, MaterialNames.GALVANIZED_STEEL, MaterialNames.IRIDIUM, - MaterialNames.MAGNESIUM, MaterialNames.MANGANESE, MaterialNames.NICHROME, MaterialNames.OSMIUM, - MaterialNames.PLUTONIUM, MaterialNames.RUTILE, MaterialNames.STAINLESS_STEEL, MaterialNames.TANTALUM, - MaterialNames.TITANIUM, MaterialNames.TUNGSTEN, MaterialNames.URANIUM, MaterialNames.ZIRCONIUM); - - materials.stream().filter(Materials::hasMaterial) - .filter(materialName -> !Materials.getMaterialByName(materialName).isEmpty()) - .forEach(materialName -> addSagMillRecipe(materialName, 3600)); - } -} diff --git a/src/main/java/zone/moddev/mc/modernmetals/integration/plugins/MMeIC2.java b/src/main/java/zone/moddev/mc/modernmetals/integration/plugins/MMeIC2.java deleted file mode 100644 index 50b86927..00000000 --- a/src/main/java/zone/moddev/mc/modernmetals/integration/plugins/MMeIC2.java +++ /dev/null @@ -1,87 +0,0 @@ -package zone.moddev.mc.modernmetals.integration.plugins; - -import java.util.Arrays; - -import com.mcmoddev.lib.init.Materials; -import com.mcmoddev.lib.integration.IIntegration; -import com.mcmoddev.lib.integration.IntegrationInitEvent; -import com.mcmoddev.lib.integration.MMDPlugin; -import com.mcmoddev.lib.material.MMDMaterial; -import com.mcmoddev.lib.util.Config.Options; -import zone.moddev.mc.modernmetals.ModernMetals; -import zone.moddev.mc.modernmetals.data.MaterialNames; - -import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.event.RegistryEvent; -import net.minecraftforge.fml.common.Loader; -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -import net.minecraft.item.crafting.IRecipe; - -@MMDPlugin(addonId = ModernMetals.MODID, pluginId = MMeIC2.PLUGIN_MODID) -public final class MMeIC2 extends com.mcmoddev.lib.integration.plugins.IC2 implements IIntegration { - - @Override - public void init() { - if (!Options.isModEnabled(PLUGIN_MODID)) { - return; - } - - MinecraftForge.EVENT_BUS.register(this); - } - - /** - * - * @param event The Event. - */ - @SubscribeEvent - public void mainInteraction(final RegistryEvent.Register event) { - MinecraftForge.EVENT_BUS.register(this); - Arrays.asList(MaterialNames.ALUMINUM, MaterialNames.ALUMINUM_BRASS, MaterialNames.BERYLLIUM, - MaterialNames.BORON, MaterialNames.CADMIUM, MaterialNames.CHROMIUM, MaterialNames.GALVANIZED_STEEL, - MaterialNames.IRIDIUM, MaterialNames.MAGNESIUM, MaterialNames.MANGANESE, MaterialNames.NICHROME, - MaterialNames.OSMIUM, MaterialNames.PLUTONIUM, MaterialNames.RUTILE, MaterialNames.STAINLESS_STEEL, - MaterialNames.TANTALUM, MaterialNames.THORIUM, MaterialNames.TITANIUM, MaterialNames.TUNGSTEN, - MaterialNames.ZIRCONIUM).stream() - .filter(Materials::hasMaterial) - .filter(materialName -> !Materials.getMaterialByName(materialName).isEmpty()) - .forEach(materialName -> { - registerVanillaRecipes(materialName); - if ((!Loader.isModLoaded("techreborn")) - || (!materialName.equalsIgnoreCase(MaterialNames.IRIDIUM))) { - addMaceratorRecipes(materialName); - addOreWashingPlantRecipes(materialName); - addThermalCentrifugeRecipes(materialName); - } - addMetalFormerRecipes(materialName); - addCompressorRecipes(materialName); - }); - - if (Materials.hasMaterial(MaterialNames.URANIUM)) { - final MMDMaterial uranium = Materials.getMaterialByName(MaterialNames.URANIUM); - - registerVanillaRecipes(uranium); - addMaceratorRecipes(uranium); - addMetalFormerRecipes(uranium); - addCompressorRecipes(uranium); - } - - MinecraftForge.EVENT_BUS.register(this); - } - - /** - * - * @param event The Event. - */ - @SubscribeEvent - public void pluginInit(final IntegrationInitEvent event) { - Arrays.asList(MaterialNames.ALUMINUM, MaterialNames.ALUMINUM_BRASS, MaterialNames.BERYLLIUM, - MaterialNames.BORON, MaterialNames.CADMIUM, MaterialNames.CHROMIUM, MaterialNames.GALVANIZED_STEEL, - MaterialNames.IRIDIUM, MaterialNames.MAGNESIUM, MaterialNames.MANGANESE, MaterialNames.NICHROME, - MaterialNames.OSMIUM, MaterialNames.PLUTONIUM, MaterialNames.RUTILE, MaterialNames.STAINLESS_STEEL, - MaterialNames.TANTALUM, MaterialNames.THORIUM, MaterialNames.TITANIUM, MaterialNames.TUNGSTEN, - MaterialNames.URANIUM, MaterialNames.ZIRCONIUM).stream() - .filter(Materials::hasMaterial) - .filter(name -> !Materials.getMaterialByName(name).isEmpty()) - .forEach(this::addForgeHammerRecipe); - } -} diff --git a/src/main/java/zone/moddev/mc/modernmetals/integration/plugins/MMeMekanism.java b/src/main/java/zone/moddev/mc/modernmetals/integration/plugins/MMeMekanism.java deleted file mode 100644 index 420c2cc8..00000000 --- a/src/main/java/zone/moddev/mc/modernmetals/integration/plugins/MMeMekanism.java +++ /dev/null @@ -1,56 +0,0 @@ -package zone.moddev.mc.modernmetals.integration.plugins; - -import java.util.Arrays; -import java.util.List; - -import com.mcmoddev.lib.init.Materials; -import com.mcmoddev.lib.integration.IIntegration; -import com.mcmoddev.lib.integration.MMDPlugin; -import com.mcmoddev.lib.integration.plugins.Mekanism; -import com.mcmoddev.lib.util.Config.Options; -import zone.moddev.mc.modernmetals.ModernMetals; -import zone.moddev.mc.modernmetals.data.MaterialNames; - -import net.minecraft.item.crafting.IRecipe; -import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.event.RegistryEvent; -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; - -@MMDPlugin(addonId = ModernMetals.MODID, pluginId = MMeMekanism.PLUGIN_MODID) -public class MMeMekanism extends Mekanism implements IIntegration { - @Override - public void init() { - if (!Options.isModEnabled(PLUGIN_MODID)) { - return; - } - - final List materials = Arrays.asList(MaterialNames.ALUMINUM, MaterialNames.BERYLLIUM, - MaterialNames.BORON, MaterialNames.CADMIUM, MaterialNames.CHROMIUM, MaterialNames.IRIDIUM, - MaterialNames.MAGNESIUM, MaterialNames.MANGANESE, MaterialNames.PLUTONIUM, MaterialNames.RUTILE, - MaterialNames.TANTALUM, MaterialNames.THORIUM, MaterialNames.TITANIUM, MaterialNames.TUNGSTEN, - MaterialNames.URANIUM, MaterialNames.ZIRCONIUM); - - materials.stream().filter(Materials::hasMaterial) - .filter(materialName -> !Materials.getMaterialByName(materialName).isEmpty()) - .forEach(Mekanism::addGassesForMaterial); - - MinecraftForge.EVENT_BUS.register(this); - } - - /** - * - * @param event The Event. - */ - @SubscribeEvent - public void multiplyOres(final RegistryEvent.Register event) { - final List materials = Arrays.asList(MaterialNames.ALUMINUM, MaterialNames.BERYLLIUM, - MaterialNames.BORON, MaterialNames.CADMIUM, MaterialNames.CHROMIUM, MaterialNames.IRIDIUM, - MaterialNames.MAGNESIUM, MaterialNames.MANGANESE, MaterialNames.PLUTONIUM, MaterialNames.RUTILE, - MaterialNames.TANTALUM, MaterialNames.THORIUM, MaterialNames.TITANIUM, MaterialNames.TUNGSTEN, - MaterialNames.URANIUM, MaterialNames.ZIRCONIUM); - - materials.stream().filter(Materials::hasMaterial) - .filter(materialName -> !Materials.getMaterialByName(materialName).isEmpty()) - .forEach(Mekanism::addOreMultiplicationRecipes); - } -} diff --git a/src/main/java/zone/moddev/mc/modernmetals/integration/plugins/MMeThaumcraft.java b/src/main/java/zone/moddev/mc/modernmetals/integration/plugins/MMeThaumcraft.java deleted file mode 100644 index c669e075..00000000 --- a/src/main/java/zone/moddev/mc/modernmetals/integration/plugins/MMeThaumcraft.java +++ /dev/null @@ -1,17 +0,0 @@ -package zone.moddev.mc.modernmetals.integration.plugins; - -import com.mcmoddev.lib.integration.IIntegration; -import com.mcmoddev.lib.integration.MMDPlugin; -import com.mcmoddev.lib.util.Config.Options; -import zone.moddev.mc.modernmetals.ModernMetals; - -@MMDPlugin(addonId = ModernMetals.MODID, pluginId = MMeThaumcraft.PLUGIN_MODID) -public class MMeThaumcraft extends com.mcmoddev.lib.integration.plugins.Thaumcraft implements IIntegration { - - @Override - public void init() { - if (!Options.isModEnabled(PLUGIN_MODID)) { - return; - } - } -} diff --git a/src/main/java/zone/moddev/mc/modernmetals/integration/plugins/MMeThermalExpansion.java b/src/main/java/zone/moddev/mc/modernmetals/integration/plugins/MMeThermalExpansion.java deleted file mode 100644 index 3e4ca4ae..00000000 --- a/src/main/java/zone/moddev/mc/modernmetals/integration/plugins/MMeThermalExpansion.java +++ /dev/null @@ -1,128 +0,0 @@ -package zone.moddev.mc.modernmetals.integration.plugins; - -import java.util.Arrays; -import java.util.List; - -import com.mcmoddev.lib.data.Names; -import com.mcmoddev.lib.init.Materials; -import com.mcmoddev.lib.integration.IIntegration; -import com.mcmoddev.lib.integration.MMDPlugin; -import com.mcmoddev.lib.material.MMDMaterial; -import com.mcmoddev.lib.util.Config.Options; -import zone.moddev.mc.modernmetals.ModernMetals; -import zone.moddev.mc.modernmetals.data.MaterialNames; - -import cofh.api.util.ThermalExpansionHelper; -import net.minecraft.item.crafting.IRecipe; -import net.minecraftforge.event.RegistryEvent; -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; - -@MMDPlugin(addonId = ModernMetals.MODID, pluginId = MMeThermalExpansion.PLUGIN_MODID) -public class MMeThermalExpansion extends com.mcmoddev.lib.integration.plugins.ThermalExpansion - implements IIntegration { - - /** - * - */ - public void init() { - if (!Options.isModEnabled(PLUGIN_MODID)) { - return; - } - } - - /** - * - * @param event The Event. - */ - @SubscribeEvent - public void regShit(final RegistryEvent.Register event) { - - final List materials = Arrays.asList(MaterialNames.ALUMINUM_BRASS, MaterialNames.BERYLLIUM, - MaterialNames.BORON, MaterialNames.CADMIUM, MaterialNames.CHROMIUM, MaterialNames.GALVANIZED_STEEL, - MaterialNames.MAGNESIUM, MaterialNames.MANGANESE, MaterialNames.NICHROME, MaterialNames.OSMIUM, - MaterialNames.PLUTONIUM, MaterialNames.RUTILE, MaterialNames.STAINLESS_STEEL, MaterialNames.TANTALUM, - MaterialNames.THORIUM, MaterialNames.TITANIUM, MaterialNames.TUNGSTEN, MaterialNames.URANIUM, - MaterialNames.ZIRCONIUM); - - materials.stream().filter(Materials::hasMaterial) - .filter(materialName -> !Materials.getMaterialByName(materialName).isEmpty()) - .forEach(materialName -> { - addFurnace(materialName); - addCrucible(materialName); - addPlatePress(materialName); - addPressStorage(materialName); - }); - - maybeAddMagmaticFuels(MaterialNames.PLUTONIUM, MaterialNames.URANIUM); - - if ((hasMaterials(zone.moddev.mc.modernmetals.data.MaterialNames.STEEL, MaterialNames.CHROMIUM, MaterialNames.STAINLESS_STEEL)) - && (materialsHaveItems(Arrays.asList(zone.moddev.mc.modernmetals.data.MaterialNames.STEEL, MaterialNames.CHROMIUM, MaterialNames.STAINLESS_STEEL), Names.INGOT.toString()))) { - final MMDMaterial steel = Materials.getMaterialByName(zone.moddev.mc.modernmetals.data.MaterialNames.STEEL); - final MMDMaterial chromium = Materials.getMaterialByName(MaterialNames.CHROMIUM); - final MMDMaterial stainlessSteel = Materials.getMaterialByName(MaterialNames.STAINLESS_STEEL); - ThermalExpansionHelper.addSmelterRecipe(4000, steel.getItemStack(Names.INGOT, 1), - chromium.getItemStack(Names.INGOT, 1), stainlessSteel.getItemStack(Names.INGOT, 2)); - } - - if ((hasMaterials(zone.moddev.mc.modernmetals.data.MaterialNames.STEEL, zone.moddev.mc.modernmetals.data.MaterialNames.ZINC, MaterialNames.GALVANIZED_STEEL)) - && (materialsHaveItems(Arrays.asList(zone.moddev.mc.modernmetals.data.MaterialNames.STEEL, zone.moddev.mc.modernmetals.data.MaterialNames.ZINC, MaterialNames.GALVANIZED_STEEL), Names.INGOT.toString()))) { - final MMDMaterial steel = Materials.getMaterialByName(zone.moddev.mc.modernmetals.data.MaterialNames.STEEL); - final MMDMaterial galvanizedSteel = Materials.getMaterialByName(MaterialNames.GALVANIZED_STEEL); - final MMDMaterial zinc = Materials - .getMaterialByName(zone.moddev.mc.modernmetals.data.MaterialNames.ZINC); - ThermalExpansionHelper.addSmelterRecipe(4000, steel.getItemStack(Names.INGOT, 1), - zinc.getItemStack(Names.INGOT, 1), galvanizedSteel.getItemStack(Names.INGOT, 2)); - } - - if ((hasMaterials(MaterialNames.RUTILE, MaterialNames.MAGNESIUM, MaterialNames.TITANIUM) - && (materialsHaveItems(Arrays.asList(MaterialNames.RUTILE, MaterialNames.MAGNESIUM, MaterialNames.TITANIUM), Names.INGOT.toString())))) { - final MMDMaterial magnesium = Materials.getMaterialByName(MaterialNames.MAGNESIUM); - final MMDMaterial rutile = Materials.getMaterialByName(MaterialNames.RUTILE); - final MMDMaterial titanium = Materials.getMaterialByName(MaterialNames.TITANIUM); - ThermalExpansionHelper.addSmelterRecipe(4000, rutile.getItemStack(Names.INGOT, 1), - magnesium.getItemStack(Names.INGOT, 1), titanium.getItemStack(Names.INGOT, 2)); - } - } - - private void maybeAddMagmaticFuels(final String...materials) { - Arrays.asList(materials).stream().filter(Materials::hasMaterial) - .map(Materials::getMaterialByName) - .forEach(mat -> { - final int fuelRF = getFuelRF(mat.getName()); - if (fuelRF > 0) { - final String fluidName = mat.getFluid().getName(); - ThermalExpansionHelper.addMagmaticFuel(fluidName, fuelRF); - } - }); - } - - private int getFuelRF(final String name) { - if (name.equals(MaterialNames.URANIUM)) { - return 750000; - } - if (name.equals(MaterialNames.PLUTONIUM)) { - return 1000000; - } - return 0; - } - - private static boolean materialsHaveItems(final List materialNames, final String...items) { - for (final String item : items) { - for (final String materialName : materialNames) { - if (!Materials.getMaterialByName(materialName).hasItem(item)) { - return false; - } - } - } - return true; - } - - private static boolean hasMaterials(final String...materials) { - for (final String materialName : materials) { - if (!Materials.hasMaterial(materialName)) { - return false; - } - } - return true; - } -} diff --git a/src/main/java/zone/moddev/mc/modernmetals/integration/plugins/MMeTinkersConstruct.java b/src/main/java/zone/moddev/mc/modernmetals/integration/plugins/MMeTinkersConstruct.java deleted file mode 100644 index 7001fdc4..00000000 --- a/src/main/java/zone/moddev/mc/modernmetals/integration/plugins/MMeTinkersConstruct.java +++ /dev/null @@ -1,204 +0,0 @@ -package zone.moddev.mc.modernmetals.integration.plugins; - -import java.util.Locale; - -import com.mcmoddev.lib.init.Materials; -import com.mcmoddev.lib.integration.IIntegration; -import com.mcmoddev.lib.integration.MMDPlugin; -import com.mcmoddev.lib.integration.plugins.TinkersConstruct; -import com.mcmoddev.lib.integration.plugins.tinkers.TinkerTraitLocation; -import com.mcmoddev.lib.integration.plugins.tinkers.TinkersMaterial; -import com.mcmoddev.lib.integration.plugins.tinkers.events.MaterialRegistrationEvent; -import com.mcmoddev.lib.integration.plugins.tinkers.events.TinkersAlloyRecipeEvent; - -import com.mcmoddev.lib.util.Config.Options; -import zone.moddev.mc.modernmetals.ModernMetals; -import zone.moddev.mc.modernmetals.content.ContentPolicy; -import zone.moddev.mc.modernmetals.data.MaterialNames; -import zone.moddev.mc.modernmetals.data.TraitNames; - -import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.fluids.FluidRegistry; -import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.fml.common.Loader; -import net.minecraftforge.fml.common.ModContainer; -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -import slimeknights.tconstruct.library.events.TinkerRegisterEvent; -import slimeknights.tconstruct.library.smeltery.CastingRecipe; -import slimeknights.tconstruct.library.smeltery.ICastingRecipe; -import slimeknights.tconstruct.library.tools.IToolPart; -import net.minecraft.item.ItemStack; - -/** - * - * @author Jasmine Iwanek - * - */ -@MMDPlugin(addonId = ModernMetals.MODID, pluginId = MMeTinkersConstruct.PLUGIN_MODID, - versions = MMeTinkersConstruct.PLUGIN_MODID + "@[1.12.2-2.7.4.0,)") - -public class MMeTinkersConstruct implements IIntegration { - - public static final String PLUGIN_MODID = TinkersConstruct.PLUGIN_MODID; - - @Override - public void init() { - TinkersConstruct.INSTANCE.init(); - if(!slimeknights.tconstruct.TConstruct.pulseManager.isPulseLoaded("TinkerSmeltery")) { - return; - } - if (!Options.isModEnabled(PLUGIN_MODID)) { - return; - } - - MinecraftForge.EVENT_BUS.register(this); - } - - @SubscribeEvent - public void materialRegistration(MaterialRegistrationEvent ev) { - ModContainer oldActive = Loader.instance().activeModContainer(); - ModContainer newActive = Loader.instance().getIndexedModList().get(ModernMetals.MODID); - Loader.instance().setActiveModContainer(newActive); -/* - * Strangely enough, Aluminum doesn't trigger a "this already exists" check like Lead or Copper do... - * Lets make sure we exclude it and Aluminum Brass here, for safety. - - registerMaterial(Materials.hasMaterial(MaterialNames.ALUMINUM), MaterialNames.ALUMINUM, true, false, - TraitNames.LIGHTWEIGHT) - - registerMaterial(Materials.hasMaterial(MaterialNames.ALUMINUM_BRASS), MaterialNames.ALUMINUM_BRASS, true, - false) - */ - registerMaterial(Materials.hasMaterial(MaterialNames.BERYLLIUM), MaterialNames.BERYLLIUM, true, false, ev); - - registerMaterial(Materials.hasMaterial(MaterialNames.BORON), MaterialNames.BORON, true, false, ev); - - registerMaterial(Materials.hasMaterial(MaterialNames.CADMIUM), MaterialNames.CADMIUM, true, false, ev); - - registerMaterial(Materials.hasMaterial(MaterialNames.CHROMIUM), MaterialNames.CHROMIUM, true, false, ev, - TraitNames.MAGNETIC, TinkerTraitLocation.HEAD, TraitNames.MAGNETIC2); - - registerMaterial(Materials.hasMaterial(MaterialNames.GALVANIZED_STEEL), MaterialNames.GALVANIZED_STEEL, true, - false, ev, TinkerTraitLocation.HEAD, TraitNames.SHARP, TraitNames.STIFF); - - registerMaterial(Materials.hasMaterial(MaterialNames.IRIDIUM), MaterialNames.IRIDIUM, true, false, ev, - TraitNames.BRITTLE); - - registerMaterial(Materials.hasMaterial(MaterialNames.MAGNESIUM), MaterialNames.MAGNESIUM, true, false, ev, - TraitNames.REACTIVE); - - registerMaterial(Materials.hasMaterial(MaterialNames.MANGANESE), MaterialNames.MANGANESE, true, false, ev, - TraitNames.BRITTLE); - - registerMaterial(Materials.hasMaterial(MaterialNames.NICHROME), MaterialNames.NICHROME, true, false, ev); - - registerMaterial(Materials.hasMaterial(MaterialNames.OSMIUM), MaterialNames.OSMIUM, true, false, ev, - TraitNames.HEAVY, TraitNames.BRITTLE); - - registerMaterial(Materials.hasMaterial(MaterialNames.PLUTONIUM), MaterialNames.PLUTONIUM, true, false, ev, - TraitNames.RADIOACTIVE, TinkerTraitLocation.HEAD, TraitNames.TOXIC, TinkerTraitLocation.PROJECTILE, - TraitNames.TOXIC); - - registerMaterial(Materials.hasMaterial(MaterialNames.RUTILE), MaterialNames.RUTILE, true, false, ev); - - registerMaterial(Materials.hasMaterial(MaterialNames.STAINLESS_STEEL), MaterialNames.STAINLESS_STEEL, true, - false, ev, TinkerTraitLocation.HEAD, TraitNames.SHARP, TraitNames.STIFF); - - registerMaterial(Materials.hasMaterial(MaterialNames.TANTALUM), MaterialNames.TANTALUM, true, false, ev); - - registerMaterial(Materials.hasMaterial(MaterialNames.THORIUM), MaterialNames.THORIUM, true, false, ev); - - registerMaterial(Materials.hasMaterial(MaterialNames.TITANIUM), MaterialNames.TITANIUM, true, false, ev); - - registerMaterial(Materials.hasMaterial(MaterialNames.TUNGSTEN), MaterialNames.TUNGSTEN, true, false, ev); - - registerMaterial(Materials.hasMaterial(MaterialNames.URANIUM), MaterialNames.URANIUM, true, false, ev, - TraitNames.RADIOACTIVE, TinkerTraitLocation.HEAD, TraitNames.POISONOUS, TinkerTraitLocation.PROJECTILE, - TraitNames.POISONOUS); - - registerMaterial(Materials.hasMaterial(MaterialNames.ZIRCONIUM), MaterialNames.ZIRCONIUM, true, false, ev); - Loader.instance().setActiveModContainer(oldActive); - } - - private void registerMaterial(final boolean active, final String name, final boolean castable, final boolean craftable, - MaterialRegistrationEvent ev, final Object... traits) { - if (active && Materials.getMaterialByName(name).getFluid() != null) { - TinkersMaterial mat = new TinkersMaterial(Materials.getMaterialByName(name)) - .setCastable(castable).setCraftable(craftable).setToolForge(true); - int i = 0; - while(i < traits.length) { - TinkerTraitLocation loc; - String trait; - Object item = traits[i]; - if(item instanceof TinkerTraitLocation) { - loc = (TinkerTraitLocation)item; - trait = ((String)traits[++i]).toLowerCase(Locale.US); - - mat.addTrait(trait, loc); - } else { - trait = ((String)item).toLowerCase(Locale.US); - mat.addTrait(trait); - } - i++; - } - - ev.getRegistry().register(mat.create()); - } - } - - private void registerMaterial(final boolean active, final String name, final boolean castable, - final boolean craftable, MaterialRegistrationEvent ev) { - registerMaterial(active, name, castable, craftable, ev, new Object[0]); - } - - private void registerAlloy(TinkersAlloyRecipeEvent ev, final String outputMaterialName, final int outputAmount, final Object[] recipe) { - if (FluidRegistry.getFluid(outputMaterialName) == null) return; - final FluidStack[] rest = new FluidStack[recipe.length / 2]; - for (int i = 0, j = 0; i < recipe.length; i += 2, j++) { - rest[j] = FluidRegistry.getFluidStack((String)recipe[i], (int)recipe[i + 1]); - if (rest[j] == null) return; - } - ev.addAlloyRecipe(outputMaterialName, outputAmount, rest); - } - - @SubscribeEvent - public void tableCasting(final TinkerRegisterEvent.TableCastingRegisterEvent event) { - restrictCasting(event); - } - - @SubscribeEvent - public void basinCasting(final TinkerRegisterEvent.BasinCastingRegisterEvent event) { - restrictCasting(event); - } - - private static void restrictCasting(final TinkerRegisterEvent event) { - final ContentPolicy policy = ContentPolicy.active(); - if (!policy.lowFantasy() || !(event.getRecipe() instanceof CastingRecipe)) return; - final ItemStack output = ((CastingRecipe) event.getRecipe()).getResult(); - if (!policy.allows(output)) { - event.setCanceled(true); - return; - } - if (output.isEmpty() || !(output.getItem() instanceof IToolPart)) return; - final IToolPart part = (IToolPart) output.getItem(); - final String name = part.getMaterialID(output); - final boolean modernMaterial = Materials.getMaterialsByMod(ModernMetals.MODID).stream() - .anyMatch(material -> name.equals(material.getName())); - if (modernMaterial && (!policy.allows(name, "pickaxe") - || part.hasUseForStat("bow") || part.hasUseForStat("bowstring"))) { - event.setCanceled(true); - } - } - - @SubscribeEvent - public void registerMyAlloys(TinkersAlloyRecipeEvent ev) { - ModContainer oldActive = Loader.instance().activeModContainer(); - ModContainer newActive = Loader.instance().getIndexedModList().get(ModernMetals.MODID); - Loader.instance().setActiveModContainer(newActive); - registerAlloy(ev, MaterialNames.GALVANIZED_STEEL, 2, new Object[] { zone.moddev.mc.modernmetals.data.MaterialNames.STEEL, 1, zone.moddev.mc.modernmetals.data.MaterialNames.ZINC, 1 }); - registerAlloy(ev, MaterialNames.NICHROME, 2, new Object[] { zone.moddev.mc.modernmetals.data.MaterialNames.NICKEL, 1, MaterialNames.CHROMIUM, 1 }); - registerAlloy(ev, MaterialNames.STAINLESS_STEEL, 2, new Object[] { zone.moddev.mc.modernmetals.data.MaterialNames.STEEL, 1, MaterialNames.CHROMIUM, 1 }); - registerAlloy(ev, MaterialNames.TITANIUM, 2, new Object[] { MaterialNames.RUTILE, 1, MaterialNames.MAGNESIUM, 1 }); - Loader.instance().setActiveModContainer(oldActive); - } -} diff --git a/src/main/java/zone/moddev/mc/modernmetals/integration/plugins/MMeVeinMiner.java b/src/main/java/zone/moddev/mc/modernmetals/integration/plugins/MMeVeinMiner.java deleted file mode 100644 index 1f620bdd..00000000 --- a/src/main/java/zone/moddev/mc/modernmetals/integration/plugins/MMeVeinMiner.java +++ /dev/null @@ -1,39 +0,0 @@ -package zone.moddev.mc.modernmetals.integration.plugins; - -import java.util.Arrays; -import java.util.List; - -import com.mcmoddev.lib.init.Materials; -import com.mcmoddev.lib.integration.IIntegration; -import com.mcmoddev.lib.integration.MMDPlugin; -import com.mcmoddev.lib.integration.plugins.VeinMiner; -import com.mcmoddev.lib.util.Config.Options; -import zone.moddev.mc.modernmetals.ModernMetals; -import zone.moddev.mc.modernmetals.data.MaterialNames; - -/** - * VeinMiner Integration Plugin. - * - * @author Jasmine Iwanek - * - */ -@MMDPlugin(addonId = ModernMetals.MODID, pluginId = MMeVeinMiner.PLUGIN_MODID) -public class MMeVeinMiner extends VeinMiner implements IIntegration { - @Override - public void init() { - if (!Options.isModEnabled(PLUGIN_MODID)) { - return; - } - - final List materials = Arrays.asList(MaterialNames.ALUMINUM, MaterialNames.ALUMINUM_BRASS, - MaterialNames.BERYLLIUM, MaterialNames.BORON, MaterialNames.CADMIUM, MaterialNames.CHROMIUM, - MaterialNames.GALVANIZED_STEEL, MaterialNames.IRIDIUM, MaterialNames.MAGNESIUM, MaterialNames.MANGANESE, - MaterialNames.NICHROME, MaterialNames.OSMIUM, MaterialNames.PLUTONIUM, MaterialNames.RUTILE, - MaterialNames.STAINLESS_STEEL, MaterialNames.TANTALUM, MaterialNames.THORIUM, MaterialNames.TITANIUM, - MaterialNames.TUNGSTEN, MaterialNames.URANIUM, MaterialNames.ZIRCONIUM); - - materials.stream().filter(Materials::hasMaterial) - .filter(materialName -> !Materials.getMaterialByName(materialName).isEmpty()) - .forEach(VeinMiner::addToolsForMaterial); - } -} diff --git a/src/main/java/zone/moddev/mc/modernmetals/material/MaterialCatalogue.java b/src/main/java/zone/moddev/mc/modernmetals/material/MaterialCatalogue.java new file mode 100644 index 00000000..5db44976 --- /dev/null +++ b/src/main/java/zone/moddev/mc/modernmetals/material/MaterialCatalogue.java @@ -0,0 +1,35 @@ +package zone.moddev.mc.modernmetals.material; + +import java.util.Arrays; +import java.util.Collections; +import java.util.List; + +import zone.moddev.mc.modernmetals.material.MaterialDefinition.Kind; + +/** Legacy physical statistics with independently reviewed 1.13.2 mining levels. */ +public final class MaterialCatalogue { + public static final List ALL = Collections.unmodifiableList(Arrays.asList( + new MaterialDefinition("aluminum", Kind.ORE, 2.5d, 3.75d, 4.5d, 0xFFC5C8C1, false, 0, 0, 1), + new MaterialDefinition("aluminumbrass", Kind.ALLOY, 1.0d, 7.5d, 4.5d, 0xFFEBAA56, false, 1, 1, 1), + new MaterialDefinition("beryllium", Kind.ORE, 5.5d, 2.5d, 1.0d, 0xFFD5D3D5, false, 1, 1, 1), + new MaterialDefinition("boron", Kind.ORE, 9.5d, 8d, 1.0d, 0xFF888888, false, 1, 2, 1), + new MaterialDefinition("cadmium", Kind.RARE_ORE, 2d, 1d, 4.5d, 0xFFC9D4DA, false, 0, 0, 1), + new MaterialDefinition("chromium", Kind.ORE, 9d, 3d, 4.5d, 0xFFCDCDCF, false, 1, 2, 1), + new MaterialDefinition("galvanizedsteel", Kind.ALLOY, 5.5d, 15.25d, 4.5d, 0xFF9BA6A2, false, 2, 2, 1), + new MaterialDefinition("iridium", Kind.RARE_ORE, 6.5d, 3d, 4.5d, 0xFFF8EDCC, false, 1, 2, 1), + new MaterialDefinition("magnesium", Kind.ORE, 2.5d, 3.5d, 4.5d, 0xFF7F7F77, false, 0, 0, 1), + new MaterialDefinition("manganese", Kind.ORE, 5d, 2.75d, 4.5d, 0xFFF5CFDA, false, 1, 1, 1), + new MaterialDefinition("nichrome", Kind.ALLOY, 6d, 15.5d, 4.5d, 0xFFDEA054, false, 2, 2, 1), + new MaterialDefinition("osmium", Kind.ORE, 7d, 2.75d, 4.5d, 0xFF7C8E99, false, 1, 2, 1), + new MaterialDefinition("plutonium", Kind.RARE_ORE, 4d, 7.5d, 4.5d, 0xFFB333EA, false, 1, 1, 1), + new MaterialDefinition("rutile", Kind.ORE, 6d, 0.25d, 4.5d, 0xFFBF928B, false, 1, 2, 1), + new MaterialDefinition("stainlesssteel", Kind.ALLOY, 6d, 16d, 4.5d, 0xFFC5BFC1, false, 2, 2, 1), + new MaterialDefinition("tantalum", Kind.ORE, 6.5d, 17.5d, 4.5d, 0xFFC4BEC2, false, 1, 1, 1), + new MaterialDefinition("thorium", Kind.ORE, 3d, 1d, 1.0d, 0xFF4F5A5A, false, 1, 1, 1), + new MaterialDefinition("titanium", Kind.SPECIAL, 6.5d, 16.25d, 4.5d, 0xFF73787E, false, 2, 2, 1), + new MaterialDefinition("tungsten", Kind.ORE, 7.5d, 12.5d, 4.5d, 0xFF969696, false, 1, 2, 1), + new MaterialDefinition("uranium", Kind.RARE_ORE, 6d, 16.25d, 4.5d, 0xFFA7B345, false, 1, 1, 1), + new MaterialDefinition("zirconium", Kind.ORE, 5d, 3.5d, 4.5d, 0xFF929793, false, 1, 1, 1))); + + private MaterialCatalogue() {} +} diff --git a/src/main/java/zone/moddev/mc/modernmetals/material/MaterialDefinition.java b/src/main/java/zone/moddev/mc/modernmetals/material/MaterialDefinition.java new file mode 100644 index 00000000..b196f645 --- /dev/null +++ b/src/main/java/zone/moddev/mc/modernmetals/material/MaterialDefinition.java @@ -0,0 +1,116 @@ +package zone.moddev.mc.modernmetals.material; + +import java.util.Objects; + +import net.minecraft.inventory.EntityEquipmentSlot; + +/** Material statistics and form availability used by registration and recipes. */ +public final class MaterialDefinition { + public enum Kind { + ORE, RARE_ORE, ALLOY, SPECIAL; + + public boolean hasOre() { + return this == ORE || this == RARE_ORE || this == SPECIAL; + } + + public boolean isAlloy() { + return this == ALLOY || this == SPECIAL; + } + } + + private final String name; + private final Kind kind; + private final double hardness; + private final double strength; + private final double magic; + private final int colour; + private final boolean processingForms; + private final int toolHarvestLevel; + private final int blockHarvestLevel; + private final int oreHarvestLevel; + + public MaterialDefinition(String name, Kind kind, double hardness, double strength, + double magic, int colour, boolean processingForms) { + this(name, kind, hardness, strength, magic, colour, processingForms, + Math.max(0, Math.min(4, (int) (hardness / 3.0D))), + Math.max(-1, Math.min(3, (int) ((0.9D * hardness) / 3.0D))), + Math.max(-1, Math.min(3, (int) ((0.9D * hardness) / 3.0D)))); + } + + /** Explicit mining policy; hardness still controls the existing speed and combat statistics. */ + public MaterialDefinition(String name, Kind kind, double hardness, double strength, + double magic, int colour, boolean processingForms, + int toolHarvestLevel, int blockHarvestLevel, int oreHarvestLevel) { + this.name = Objects.requireNonNull(name, "name"); + this.kind = Objects.requireNonNull(kind, "kind"); + if (!name.matches("[a-z][a-z0-9_]*")) { + throw new IllegalArgumentException("Invalid material name: " + name); + } + if (hardness <= 0 || strength <= 0 || magic < 0) { + throw new IllegalArgumentException("Invalid material statistics for " + name); + } + this.hardness = hardness; + this.strength = strength; + this.magic = magic; + this.colour = colour; + this.processingForms = processingForms; + if (toolHarvestLevel < 0 || toolHarvestLevel > 4 || blockHarvestLevel < -1 + || blockHarvestLevel > 3 || oreHarvestLevel < -1 || oreHarvestLevel > 3) { + throw new IllegalArgumentException("Invalid mining levels for " + name); + } + this.toolHarvestLevel = toolHarvestLevel; + this.blockHarvestLevel = blockHarvestLevel; + this.oreHarvestLevel = oreHarvestLevel; + } + + public String name() { return name; } + public Kind kind() { return kind; } + public double hardness() { return hardness; } + public double strength() { return strength; } + public double magic() { return magic; } + public int colour() { return colour; } + public boolean processingForms() { return processingForms; } + public boolean hasOre() { return kind.hasOre(); } + public boolean isAlloy() { return kind.isAlloy(); } + public float blockHardness() { return (float) (2.0D * hardness); } + public float oreHardness() { return (float) (0.5D * hardness); } + public float blastResistance() { + return (float) (2.5D * strength); + } + public int toolLevel() { return toolHarvestLevel; } + public int requiredHarvestLevel() { return blockHarvestLevel; } + public int requiredOreHarvestLevel() { return oreHarvestLevel; } + public int toolDurability() { return Math.max(1, (int) (32.0D * strength)); } + public float toolEfficiency() { return (float) hardness; } + public float baseAttackDamage() { return Math.round((float) (2.5D * hardness)) / 10.0F; } + public float axeAttackDamage() { return 4.0F + (2.0F * baseAttackDamage()); } + public float axeAttackSpeed() { return -3.5F + Math.min(0.5F, 0.05F * (float) strength); } + public float crackhammerAttackDamage() { return 5.0F + (2.0F * baseAttackDamage()); } + public float crackhammerDestroySpeed() { return Math.max(1.0F, 0.5F * toolEfficiency()); } + public int crackhammerDurability() { return Math.max(1, (int) (0.75D * toolDurability())); } + public int shieldDurability() { return Math.max(1, (int) (168.0D * strength)); } + + public String repairIngredientTag() { + return "forge:ingots/" + name; + } + + public int enchantability() { return Math.max(0, (int) (2.5D * magic)); } + public int armorDurabilityFactor() { return Math.max(1, (int) (2.0D * strength)); } + public float armorToughness() { return hardness > 10.0D ? (int) (hardness / 5.0D) : 0.0F; } + + public int armorProtection(EntityEquipmentSlot slot) { + double total = (1.25D * hardness) + 5.0D; + double fraction; + switch (slot) { + case HEAD: fraction = 0.10D; break; + case CHEST: fraction = 0.40D; break; + case LEGS: fraction = 0.35D; break; + case FEET: fraction = 0.15D; break; + default: fraction = 0.0D; + } + return Math.max(0, Math.min(30, (int) Math.round(total * fraction))); + } + + public int horseArmorProtection() { return Math.max(0, Math.min(30, (int) ((hardness / 10.0D) * 11.0D))); } + public float oreSmeltingExperience() { return Math.max(0.1F, (float) (0.1D * magic)); } +} diff --git a/src/main/java/zone/moddev/mc/modernmetals/migration/LegacyDoorStates.java b/src/main/java/zone/moddev/mc/modernmetals/migration/LegacyDoorStates.java new file mode 100644 index 00000000..31492689 --- /dev/null +++ b/src/main/java/zone/moddev/mc/modernmetals/migration/LegacyDoorStates.java @@ -0,0 +1,108 @@ +package zone.moddev.mc.modernmetals.migration; + +import java.util.HashMap; +import java.util.Map; + +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.NBTTagList; +import net.minecraft.util.BitArray; + +/** In old saves each door half held only part of the state. Forge 25 needs the full state on both. */ +final class LegacyDoorStates { + private static final int SECTION_SIZE = 4096; + private static final int LAYER_SIZE = 256; + + private LegacyDoorStates() {} + + static void joinHalves(NBTTagCompound level) { + NBTTagList sections = level.getList("Sections", 10); + Map byY = new HashMap<>(); + for (int index = 0; index < sections.size(); index++) { + NBTTagCompound section = sections.getCompound(index); + if (section.contains("Palette", 9) && section.contains("BlockStates", 12)) { + byY.put(section.getInt("Y"), new Section(section)); + } + } + for (Map.Entry entry : byY.entrySet()) { + Section section = entry.getValue(); + if (!section.hasDoor) continue; + for (int index = 0; index < SECTION_SIZE; index++) { + NBTTagCompound lower = section.get(index); + if (!isDoor(lower) || !"lower".equals(lower.getCompound("Properties").getString("half"))) continue; + boolean crossesSection = index >= SECTION_SIZE - LAYER_SIZE; + Section above = crossesSection ? byY.get(entry.getKey() + 1) : section; + if (above == null) continue; + int upperIndex = (index + LAYER_SIZE) % SECTION_SIZE; + NBTTagCompound upper = above.get(upperIndex); + if (!lower.getString("Name").equals(upper.getString("Name")) + || !"upper".equals(upper.getCompound("Properties").getString("half"))) continue; + NBTTagCompound fullLower = lower.copy(); + NBTTagCompound fullUpper = upper.copy(); + copy(upper, fullLower, "hinge"); + copy(upper, fullLower, "powered"); + copy(lower, fullUpper, "facing"); + copy(lower, fullUpper, "open"); + section.set(index, fullLower); + above.set(upperIndex, fullUpper); + } + } + for (Section section : byY.values()) { + if (section.changed) section.nbt.setLongArray("BlockStates", section.bits.getBackingLongArray()); + } + } + + private static boolean isDoor(NBTTagCompound state) { + String name = state.getString("Name"); + return name.startsWith("modernmetals:") && name.endsWith("_door"); + } + + private static void copy(NBTTagCompound from, NBTTagCompound to, String property) { + to.getCompound("Properties").setString(property, from.getCompound("Properties").getString(property)); + } + + private static final class Section { + private final NBTTagCompound nbt; + private final NBTTagList palette; + private final Map entries = new HashMap<>(); + private final boolean hasDoor; + private BitArray bits; + private boolean changed; + + Section(NBTTagCompound nbt) { + this.nbt = nbt; + palette = nbt.getList("Palette", 10); + bits = new BitArray(bitsNeeded(palette.size()), SECTION_SIZE, nbt.getLongArray("BlockStates")); + boolean foundDoor = false; + for (int i = 0; i < palette.size(); i++) { + NBTTagCompound state = palette.getCompound(i); + entries.put(state, i); + foundDoor |= isDoor(state); + } + hasDoor = foundDoor; + } + + NBTTagCompound get(int index) { return palette.getCompound(bits.getAt(index)); } + + void set(int index, NBTTagCompound state) { + if (state.equals(get(index))) return; + Integer entry = entries.get(state); + if (entry == null) { + entry = palette.size(); + palette.add(state); + entries.put(state, entry); + int width = bitsNeeded(palette.size()); + if (width != bits.bitsPerEntry()) { + BitArray expanded = new BitArray(width, SECTION_SIZE); + for (int i = 0; i < SECTION_SIZE; i++) expanded.setAt(i, bits.getAt(i)); + bits = expanded; + } + } + bits.setAt(index, entry); + changed = true; + } + + private static int bitsNeeded(int size) { + return Math.max(4, Integer.SIZE - Integer.numberOfLeadingZeros(size - 1)); + } + } +} diff --git a/src/main/java/zone/moddev/mc/modernmetals/migration/LegacyWorldDataHook.java b/src/main/java/zone/moddev/mc/modernmetals/migration/LegacyWorldDataHook.java new file mode 100644 index 00000000..157058d7 --- /dev/null +++ b/src/main/java/zone/moddev/mc/modernmetals/migration/LegacyWorldDataHook.java @@ -0,0 +1,506 @@ +package zone.moddev.mc.modernmetals.migration; + +import java.io.File; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.lang.reflect.Field; +import java.lang.reflect.Modifier; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.StandardCopyOption; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Collections; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Locale; +import java.util.Map; +import java.util.Set; + + +import com.mojang.datafixers.Dynamic; + +import cpw.mods.modlauncher.api.INameMappingService; +import zone.moddev.mc.modernmetals.ModernMetals; +import zone.moddev.mc.modernmetals.content.ModContent; +import zone.moddev.mc.modernmetals.content.PlateBlock; + +import net.minecraft.block.Block; +import net.minecraft.block.BlockAnvil; +import net.minecraft.block.BlockButton; +import net.minecraft.block.BlockDoor; +import net.minecraft.block.BlockHorizontal; +import net.minecraft.block.BlockHorizontalFace; +import net.minecraft.block.BlockLever; +import net.minecraft.block.BlockPressurePlate; +import net.minecraft.block.BlockSlab; +import net.minecraft.block.BlockStairs; +import net.minecraft.block.BlockTrapDoor; +import net.minecraft.block.BlockFlowingFluid; +import net.minecraft.block.state.IBlockState; +import net.minecraft.nbt.CompressedStreamTools; +import net.minecraft.nbt.INBTBase; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.NBTTagList; +import net.minecraft.nbt.NBTUtil; +import net.minecraft.state.properties.AttachFace; +import net.minecraft.state.properties.DoorHingeSide; +import net.minecraft.state.properties.DoubleBlockHalf; +import net.minecraft.state.properties.Half; +import net.minecraft.state.properties.SlabType; +import net.minecraft.state.properties.StairsShape; +import net.minecraft.util.EnumFacing; +import net.minecraft.util.ResourceLocation; +import net.minecraft.util.datafix.fixes.BlockStateFlatteningMap; +import net.minecraft.world.storage.SaveHandler; +import net.minecraft.world.storage.WorldInfo; +import net.minecraftforge.fml.WorldPersistenceHooks; +import net.minecraftforge.fml.common.ObfuscationReflectionHelper; +import net.minecraftforge.registries.ForgeRegistries; + +/** Translates Modern Metals data before the Forge 25 flattening pass. */ +public final class LegacyWorldDataHook implements WorldPersistenceHooks.WorldPersistenceHook { + private static final String SAVE_KEY = "ModernMetalsLegacyRegistry"; + private static final String CHUNK_MARKER = "ModernMetalsLegacyPreserveChunk"; + private static final Map VANILLA_BLOCK_ENTITY_IDS = vanillaBlockEntityIds(); + private static final Map> ownedStates = new HashMap<>(); + private static final Map itemIds = new HashMap<>(); + private static volatile Map> existingChunks = Collections.emptyMap(); + private static File activeWorld; + private static NBTTagCompound savedRegistry; + private static boolean registered; + + private LegacyWorldDataHook() {} + + public static synchronized void register() { + if (!registered) { + WorldPersistenceHooks.addHook(new LegacyWorldDataHook()); + registered = true; + } + } + + /** Read the world's own numeric IDs before Minecraft starts flattening any of its data. */ + public static synchronized void prepareLegacyWorld(File levelDat) { + if (!levelDat.isFile()) return; + try (FileInputStream input = new FileInputStream(levelDat)) { + NBTTagCompound root = CompressedStreamTools.readCompressed(input); + File world = levelDat.getParentFile().getCanonicalFile(); + NBTTagCompound legacy = root.getCompound("FML").getCompound("Registries"); + NBTTagCompound persisted = root.getCompound(SAVE_KEY); + if (persisted.contains("minecraft:blocks", 10)) legacy = persisted; + installRegistry(world, legacy); + if (savedRegistry == null) return; + if (migrateLegacyItems(root.getCompound("Data").getCompound("Player"))) { + writeWithBackup(levelDat, root); + } + File[] players = new File(world, "playerdata").listFiles((dir, name) -> name.endsWith(".dat")); + if (players != null) { + for (File player : players) { + try (FileInputStream playerInput = new FileInputStream(player)) { + NBTTagCompound data = CompressedStreamTools.readCompressed(playerInput); + if (migrateLegacyItems(data)) writeWithBackup(player, data); + } + } + } + } catch (IOException error) { + throw new IllegalStateException("Could not safely read the legacy world at " + levelDat, error); + } + } + + @Override public String getModId() { return SAVE_KEY; } + + @Override + public NBTTagCompound getDataForWriting(SaveHandler handler, WorldInfo info) { + if (savedRegistry == null || !sameWorld(handler.getWorldDirectory())) return new NBTTagCompound(); + return savedRegistry.copy(); + } + + @Override + public void readData(SaveHandler handler, WorldInfo info, NBTTagCompound tag) { + // prepareLegacyWorld installs the table before Forge reaches this callback. + } + + private static boolean sameWorld(File world) { + try { return world.getCanonicalFile().equals(activeWorld); } + catch (IOException error) { throw new IllegalStateException("Could not resolve the world directory", error); } + } + + private static void installRegistry(File world, NBTTagCompound registries) throws IOException { + NBTTagCompound blocks = registries.getCompound("minecraft:blocks"); + Map blockIds = ownedIds(blocks); + if (world.equals(activeWorld) && savedRegistry != null && blockIds.isEmpty()) return; + Dynamic[] table = expandFlatteningTable(0); + for (Map.Entry> entry : ownedStates.entrySet()) { + if (table[entry.getKey()] == entry.getValue()) table[entry.getKey()] = null; + } + ownedStates.clear(); + itemIds.clear(); + existingChunks = Collections.emptyMap(); + activeWorld = world; + savedRegistry = null; + if (blockIds.isEmpty()) return; + + // Resolve all target names before writing anything to disk or letting DFU consume the table. + for (Map.Entry entry : blockIds.entrySet()) { + int numeric = entry.getKey(); + String path = entry.getValue(); + String target = path.startsWith("double_") ? path.substring(7) : canonicalPath(path); + Block block = ForgeRegistries.BLOCKS.getValue(new ResourceLocation(ModernMetals.MOD_ID, target)); + if (block == null || block == net.minecraft.init.Blocks.AIR) { + throw new IllegalStateException("No flattened Modern Metals block for " + path + " (ID " + numeric + ")"); + } + for (int meta = 0; meta < 16; meta++) { + IBlockState state = legacyState(block, path, meta); + ownedStates.put((numeric << 4) | meta, + BlockStateFlatteningMap.makeDynamic(NBTUtil.writeBlockState(state).toString())); + } + } + itemIds.putAll(ownedIds(registries.getCompound("minecraft:items"))); + int max = Collections.max(ownedStates.keySet()); + table = expandFlatteningTable(max + 1); + for (Map.Entry> entry : ownedStates.entrySet()) { + table[entry.getKey()] = entry.getValue(); + } + savedRegistry = new NBTTagCompound(); + savedRegistry.setTag("minecraft:blocks", compactSnapshot(blockIds)); + savedRegistry.setTag("minecraft:items", compactSnapshot(itemIds)); + if (registries.contains("protectedChunks", 10)) { + existingChunks = readChunkIndex(registries.getCompound("protectedChunks")); + } else { + existingChunks = indexRegions(world); + } + savedRegistry.setTag("protectedChunks", writeChunkIndex(existingChunks)); + ModernMetals.LOGGER.info("Prepared {} legacy Modern Metals states from the saved registry in '{}'", + ownedStates.size(), world); + } + + private static NBTTagCompound compactSnapshot(Map source) { + NBTTagList list = new NBTTagList(); + for (Map.Entry entry : source.entrySet()) { + NBTTagCompound id = new NBTTagCompound(); + id.setString("K", "modernmetals:" + entry.getValue()); + id.setInt("V", entry.getKey()); + list.add(id); + } + NBTTagCompound snapshot = new NBTTagCompound(); + snapshot.setTag("ids", list); + return snapshot; + } + + private static Map ownedIds(NBTTagCompound registry) { + Map result = new LinkedHashMap<>(); + NBTTagList entries = registry.getList("ids", 10); + for (int i = 0; i < entries.size(); i++) { + NBTTagCompound entry = entries.getCompound(i); + String name = entry.getString("K").toLowerCase(Locale.ROOT); + if (!name.startsWith("modernmetals:")) continue; + int numeric = entry.getInt("V"); + if (numeric < 0 || numeric > 65535) { + throw new IllegalStateException("Invalid saved Modern Metals registry ID " + numeric); + } + String previous = result.put(numeric, name.substring("modernmetals:".length())); + if (previous != null) { + throw new IllegalStateException("Duplicate saved Modern Metals registry ID " + numeric); + } + } + return result; + } + + public static synchronized void prepareLegacyChunk(NBTTagCompound root) { + if (root == null || savedRegistry == null || root.getInt("DataVersion") >= 1451 + || !root.contains("Level", 10)) return; + NBTTagCompound level = root.getCompound("Level"); + migrateLegacyItems(level); + // An unpopulated source chunk can contain a player's only chest or placed block. + level.setBoolean("TerrainPopulated", true); + level.setBoolean("LightPopulated", true); + level.setBoolean(CHUNK_MARKER, true); + } + + public static NBTTagCompound finalizeLegacyChunk(NBTTagCompound root) { + if (root != null && root.contains("Level", 10)) { + NBTTagCompound level = root.getCompound("Level"); + if (level.getBoolean(CHUNK_MARKER)) { + LegacyDoorStates.joinHalves(level); + level.setString("Status", "postprocessed"); + level.removeTag(CHUNK_MARKER); + } + } + return root; + } + + public static boolean shouldBlockWorldgenWrite(net.minecraft.world.gen.WorldGenRegion region, + net.minecraft.util.math.BlockPos pos) { + Map> chunks = existingChunks; + if (chunks.isEmpty()) return false; + Set dimension = chunks.get(region.getDimension().getType().getId()); + return dimension != null && dimension.contains(chunkKey(pos.getX() >> 4, pos.getZ() >> 4)); + } + + private static Map> indexRegions(File world) throws IOException { + Map> result = new HashMap<>(); + result.put(0, indexRegionDirectory(new File(world, "region"))); + File[] dimensions = world.listFiles(file -> file.isDirectory() && file.getName().matches("DIM-?[0-9]+")); + if (dimensions != null) { + for (File dimension : dimensions) { + int id = Integer.parseInt(dimension.getName().substring(3)); + result.put(id, indexRegionDirectory(new File(dimension, "region"))); + } + } + return result; + } + + private static Set indexRegionDirectory(File folder) throws IOException { + Set result = new HashSet<>(); + File[] regions = folder.listFiles((dir, name) -> name.matches("r\\.-?[0-9]+\\.-?[0-9]+\\.mca")); + if (regions == null) return result; + for (File region : regions) { + String[] parts = region.getName().split("\\."); + int originX = Integer.parseInt(parts[1]) * 32; + int originZ = Integer.parseInt(parts[2]) * 32; + try (java.io.DataInputStream input = new java.io.DataInputStream(Files.newInputStream(region.toPath()))) { + for (int index = 0; index < 1024; index++) { + if (input.readInt() != 0) result.add(chunkKey(originX + (index & 31), originZ + (index >> 5))); + } + } + } + return result; + } + + private static NBTTagCompound writeChunkIndex(Map> index) { + NBTTagCompound result = new NBTTagCompound(); + index.forEach((dimension, chunks) -> { + long[] values = chunks.stream().mapToLong(Long::longValue).sorted().toArray(); + result.setLongArray(dimension.toString(), values); + }); + return result; + } + + private static Map> readChunkIndex(NBTTagCompound index) { + Map> result = new HashMap<>(); + for (String dimension : index.keySet()) { + Set chunks = new HashSet<>(); + for (long chunk : index.getLongArray(dimension)) chunks.add(chunk); + result.put(Integer.valueOf(dimension), chunks); + } + return result; + } + + static String canonicalPath(String path) { + if ("alubrass".equals(path)) return "aluminumbrass"; + if (path.endsWith("_door_item")) return path.substring(0, path.length() - 5); + if (path.endsWith("_fishingrod")) return path.substring(0, path.length() - 10) + "fishing_rod"; + if (path.endsWith("_horsearmor")) return path.substring(0, path.length() - 10) + "horse_armor"; + return path; + } + + private static boolean migrateLegacyItems(INBTBase value) { + boolean changed = false; + if (value instanceof NBTTagCompound) { + NBTTagCompound compound = (NBTTagCompound) value; + String id = compound.getString("id"); + String blockEntity = VANILLA_BLOCK_ENTITY_IDS.get(id); + if (blockEntity != null && !compound.contains("Count", 99)) { + compound.setString("id", blockEntity); + changed = true; + } + if (compound.contains("Count", 99)) changed |= migrateStack(compound, id); + for (String key : new ArrayList<>(compound.keySet())) { + changed |= migrateLegacyItems(compound.getTag(key)); + } + } else if (value instanceof NBTTagList) { + NBTTagList list = (NBTTagList) value; + for (int index = 0; index < list.size(); index++) changed |= migrateLegacyItems(list.get(index)); + } + return changed; + } + + private static boolean migrateStack(NBTTagCompound stack, String id) { + String path = null; + String name = id.toLowerCase(Locale.ROOT); + if (name.startsWith("modernmetals:")) path = canonicalPath(name.substring(13)); + if (stack.contains("id", 99) && itemIds.containsKey(stack.getInt("id"))) { + path = canonicalPath(itemIds.get(stack.getInt("id"))); + } + if ("forge:bucketfilled".equals(name)) { + NBTTagCompound tag = stack.getCompound("tag"); + String fluid = tag.getString("FluidName").toLowerCase(Locale.ROOT); + boolean explicitlyOwned = fluid.startsWith("modernmetals:"); + String candidate = canonicalPath(explicitlyOwned ? fluid.substring(13) : fluid); + if (ModContent.fluids().containsKey(candidate) + && (explicitlyOwned || !fluid.contains(":"))) { + path = candidate + "_bucket"; + tag.removeTag("FluidName"); + tag.removeTag("Amount"); + if (tag.isEmpty()) stack.removeTag("tag"); + } + } + if (path == null) return false; + ResourceLocation target = new ResourceLocation(ModernMetals.MOD_ID, path); + net.minecraft.item.Item item = ForgeRegistries.ITEMS.getValue(target); + if (item == null || item == net.minecraft.init.Items.AIR) { + throw new IllegalStateException("No flattened Modern Metals item for " + id); + } + boolean changed = !target.toString().equals(id); + if (changed) stack.setString("id", target.toString()); + if (stack.getInt("Damage") > 0 && item.getMaxDamage() > 0) { + NBTTagCompound tag = stack.getCompound("tag"); + if (!tag.contains("Damage", 99)) { + tag.setInt("Damage", stack.getInt("Damage")); + stack.setTag("tag", tag); + changed = true; + } + } + return changed; + } + + private static void writeWithBackup(File file, NBTTagCompound data) throws IOException { + Path path = file.toPath(); + Path backup = path.resolveSibling(file.getName() + ".modernmetals-legacy-backup"); + if (!Files.exists(backup)) Files.copy(path, backup, StandardCopyOption.COPY_ATTRIBUTES); + Path temp = Files.createTempFile(path.getParent(), "modernmetals-legacy-", ".tmp"); + try { + try (FileOutputStream output = new FileOutputStream(temp.toFile())) { + CompressedStreamTools.writeCompressed(data, output); + } + Files.move(temp, path, StandardCopyOption.REPLACE_EXISTING, StandardCopyOption.ATOMIC_MOVE); + } finally { + Files.deleteIfExists(temp); + } + } + + static IBlockState legacyState(Block block, String path, int meta) { + IBlockState state = block.getDefaultState(); + if (block instanceof PlateBlock) return state.with(PlateBlock.FACING, EnumFacing.byIndex(meta)); + if (path.startsWith("double_") && block instanceof BlockSlab) return state.with(BlockSlab.TYPE, SlabType.DOUBLE); + if (block instanceof BlockSlab) return state.with(BlockSlab.TYPE, + (meta & 8) == 0 ? SlabType.BOTTOM : SlabType.TOP); + if (block instanceof BlockStairs) { + EnumFacing facing = EnumFacing.byIndex(5 - (meta & 3)); + return state.with(BlockStairs.FACING, facing) + .with(BlockStairs.HALF, (meta & 4) == 0 ? Half.BOTTOM : Half.TOP) + .with(BlockStairs.SHAPE, StairsShape.STRAIGHT) + .with(BlockStairs.WATERLOGGED, Boolean.FALSE); + } + if (block instanceof BlockDoor) { + if ((meta & 8) != 0) { + return state.with(BlockDoor.HALF, DoubleBlockHalf.UPPER) + .with(BlockDoor.HINGE, (meta & 1) != 0 ? DoorHingeSide.RIGHT : DoorHingeSide.LEFT) + .with(BlockDoor.POWERED, Boolean.valueOf((meta & 2) != 0)); + } + return state.with(BlockDoor.HALF, DoubleBlockHalf.LOWER) + .with(BlockDoor.FACING, EnumFacing.byHorizontalIndex(meta & 3).rotateYCCW()) + .with(BlockDoor.OPEN, Boolean.valueOf((meta & 4) != 0)); + } + if (block instanceof BlockTrapDoor) { + EnumFacing[] facing = { EnumFacing.NORTH, EnumFacing.SOUTH, EnumFacing.WEST, EnumFacing.EAST }; + return state.with(BlockHorizontal.HORIZONTAL_FACING, facing[meta & 3]) + .with(BlockTrapDoor.OPEN, Boolean.valueOf((meta & 4) != 0)) + .with(BlockTrapDoor.HALF, (meta & 8) == 0 ? Half.BOTTOM : Half.TOP) + .with(BlockTrapDoor.POWERED, Boolean.FALSE) + .with(BlockTrapDoor.WATERLOGGED, Boolean.FALSE); + } + if (block instanceof BlockButton) return attachedState(state, meta, BlockButton.POWERED); + if (block instanceof BlockLever) return legacyLeverState(state, meta); + if (block instanceof BlockPressurePlate) return state.with(BlockPressurePlate.POWERED, + Boolean.valueOf(meta > 0)); + if (block instanceof BlockFlowingFluid) return state.with(BlockFlowingFluid.LEVEL, + Integer.valueOf(Math.min(15, meta))); + return state; + } + + private static IBlockState attachedState(IBlockState state, int meta, + net.minecraft.state.BooleanProperty powered) { + EnumFacing oldFacing; + switch (meta & 7) { + case 0: oldFacing = EnumFacing.DOWN; break; + case 1: oldFacing = EnumFacing.EAST; break; + case 2: oldFacing = EnumFacing.WEST; break; + case 3: oldFacing = EnumFacing.SOUTH; break; + case 4: oldFacing = EnumFacing.NORTH; break; + default: oldFacing = EnumFacing.UP; + } + AttachFace face = oldFacing == EnumFacing.DOWN ? AttachFace.CEILING + : oldFacing == EnumFacing.UP ? AttachFace.FLOOR : AttachFace.WALL; + EnumFacing horizontal = oldFacing.getAxis().isHorizontal() ? oldFacing : EnumFacing.NORTH; + return state.with(BlockHorizontalFace.FACE, face) + .with(BlockHorizontal.HORIZONTAL_FACING, horizontal) + .with(powered, Boolean.valueOf((meta & 8) != 0)); + } + + private static IBlockState legacyLeverState(IBlockState state, int meta) { + int orientation = meta & 7; + AttachFace face; + EnumFacing horizontal; + if (orientation == 0 || orientation == 7) { + face = AttachFace.CEILING; + horizontal = orientation == 0 ? EnumFacing.EAST : EnumFacing.NORTH; + } else if (orientation == 5 || orientation == 6) { + face = AttachFace.FLOOR; + horizontal = orientation == 6 ? EnumFacing.EAST : EnumFacing.NORTH; + } else { + face = AttachFace.WALL; + horizontal = new EnumFacing[] { EnumFacing.NORTH, EnumFacing.EAST, EnumFacing.WEST, + EnumFacing.SOUTH, EnumFacing.NORTH }[orientation]; + } + return state.with(BlockHorizontalFace.FACE, face) + .with(BlockHorizontal.HORIZONTAL_FACING, horizontal) + .with(BlockLever.POWERED, Boolean.valueOf((meta & 8) != 0)); + } + + private static Map vanillaBlockEntityIds() { + Map ids = new LinkedHashMap(); + ids.put("Airportal", "minecraft:end_portal"); + ids.put("Banner", "minecraft:banner"); + ids.put("Beacon", "minecraft:beacon"); + ids.put("Cauldron", "minecraft:brewing_stand"); + ids.put("Chest", "minecraft:chest"); + ids.put("Comparator", "minecraft:comparator"); + ids.put("Control", "minecraft:command_block"); + ids.put("DLDetector", "minecraft:daylight_detector"); + ids.put("Dropper", "minecraft:dropper"); + ids.put("EnchantTable", "minecraft:enchanting_table"); + ids.put("EndGateway", "minecraft:end_gateway"); + ids.put("EnderChest", "minecraft:ender_chest"); + ids.put("FlowerPot", "minecraft:flower_pot"); + ids.put("Furnace", "minecraft:furnace"); + ids.put("Hopper", "minecraft:hopper"); + ids.put("MobSpawner", "minecraft:mob_spawner"); + ids.put("Music", "minecraft:noteblock"); + ids.put("Piston", "minecraft:piston"); + ids.put("RecordPlayer", "minecraft:jukebox"); + ids.put("Sign", "minecraft:sign"); + ids.put("Skull", "minecraft:skull"); + ids.put("Structure", "minecraft:structure_block"); + ids.put("Trap", "minecraft:dispenser"); + return Collections.unmodifiableMap(ids); + } + + private static long chunkKey(int x, int z) { + return ((long) x & 0xffffffffL) << 32 | ((long) z & 0xffffffffL); + } + + @SuppressWarnings("unchecked") + private static Dynamic[] expandFlatteningTable(int requiredLength) { + try { + String fieldName = ObfuscationReflectionHelper.remapName(INameMappingService.Domain.FIELD, "field_199200_b"); + Field valuesField = BlockStateFlatteningMap.class.getDeclaredField(fieldName); + valuesField.setAccessible(true); + Field modifiersField = Field.class.getDeclaredField("modifiers"); + modifiersField.setAccessible(true); + modifiersField.setInt(valuesField, valuesField.getModifiers() & ~Modifier.FINAL); + Dynamic[] current = (Dynamic[]) valuesField.get(null); + if (current.length >= requiredLength) return current; + Dynamic[] expanded = Arrays.copyOf(current, requiredLength); + valuesField.set(null, expanded); + return expanded; + } catch (ReflectiveOperationException exception) { + throw new IllegalStateException("Could not expand Minecraft's legacy block-state flattening table", exception); + } + } + +} diff --git a/src/main/java/zone/moddev/mc/modernmetals/network/ContentModeNetwork.java b/src/main/java/zone/moddev/mc/modernmetals/network/ContentModeNetwork.java new file mode 100644 index 00000000..f30fc007 --- /dev/null +++ b/src/main/java/zone/moddev/mc/modernmetals/network/ContentModeNetwork.java @@ -0,0 +1,112 @@ +package zone.moddev.mc.modernmetals.network; + +import java.lang.reflect.Field; +import java.lang.reflect.Method; +import java.util.Collections; +import java.util.function.Supplier; +import org.apache.commons.lang3.tuple.Pair; +import net.minecraft.network.NetworkManager; +import net.minecraft.network.PacketBuffer; +import net.minecraft.util.ResourceLocation; +import net.minecraft.util.text.TextComponentTranslation; +import net.minecraftforge.fml.network.FMLHandshakeMessages; +import net.minecraftforge.fml.network.FMLNetworkConstants; +import net.minecraftforge.fml.network.NetworkDirection; +import net.minecraftforge.fml.network.NetworkEvent; +import net.minecraftforge.fml.network.NetworkRegistry; +import net.minecraftforge.fml.network.simple.SimpleChannel; +import zone.moddev.mc.modernmetals.config.ContentPolicy; +import zone.moddev.mc.modernmetals.config.ContentMode; + +/** Makes sure client and server use the same content mode before the player joins. */ +public final class ContentModeNetwork { + private ContentModeNetwork() {} + + public static void register() { + SimpleChannel channel = NetworkRegistry.newSimpleChannel( + new ResourceLocation("modernmetals", "content_mode"), () -> "1", "1"::equals, "1"::equals); + channel.messageBuilder(ModeMessage.class, 0) + .encoder((message, buffer) -> buffer.writeString(message.mode.serializedName())) + .decoder(ModeMessage::read) + .loginIndex(message -> message.loginIndex, (message, index) -> message.loginIndex = index) + .buildLoginPacketList(local -> Collections.singletonList( + Pair.of("Modern Metals content mode", new ModeMessage(ContentPolicy.active().mode())))) + .consumer(ContentModeNetwork::receive) + .add(); + + Forge25Login.initialize(); + } + + public static boolean modesMatch(String server, String client) { + return ContentMode.parse(server) == ContentMode.parse(client); + } + + private static void receive(ModeMessage message, Supplier supplier) { + NetworkEvent.Context context = supplier.get(); + context.setPacketHandled(true); + if (context.getDirection() != NetworkDirection.LOGIN_TO_CLIENT) { + throw new IllegalStateException("Content mode received outside the client login handshake"); + } + + ContentMode clientMode = ContentPolicy.active().mode(); + if (message.mode != clientMode) { + Forge25Login.manager(context).closeChannel(new TextComponentTranslation( + "config.modernmetals.connection.mismatch", + new TextComponentTranslation(message.mode.translationKey()), + new TextComponentTranslation(clientMode.translationKey()))); + return; + } + + Forge25Login.acknowledge(context); + } + + private static final class ModeMessage { + private final ContentMode mode; + private int loginIndex; + + private ModeMessage(ContentMode mode) { this.mode = mode; } + + private static ModeMessage read(PacketBuffer buffer) { + String value = buffer.readString(32); + if (!ContentMode.isValid(value)) throw new IllegalArgumentException("Unknown server content mode " + value); + return new ModeMessage(ContentMode.parse(value)); + } + } + + private static final class Forge25Login { + private static final Method NETWORK_MANAGER; + private static final SimpleChannel HANDSHAKE; + + static { + // Forge 25 doesn't expose these login helpers. Cache them here so we can + // send its normal acknowledgement after checking the content mode. + try { + // Forge's handshake listener has to be ready before anyone connects. + Class.forName("net.minecraftforge.fml.network.FMLHandshakeHandler"); + NETWORK_MANAGER = NetworkEvent.Context.class.getDeclaredMethod("getNetworkManager"); + NETWORK_MANAGER.setAccessible(true); + Field field = FMLNetworkConstants.class.getDeclaredField("handshakeChannel"); + field.setAccessible(true); + HANDSHAKE = (SimpleChannel) field.get(null); + } catch (ReflectiveOperationException failure) { + throw new ExceptionInInitializerError(failure); + } + } + + private static void initialize() { + // The static initializer prepares Forge's handshake before the server starts. + } + + private static NetworkManager manager(NetworkEvent.Context context) { + try { + return (NetworkManager) NETWORK_MANAGER.invoke(context); + } catch (ReflectiveOperationException failure) { + throw new IllegalStateException("Cannot access Forge's login connection", failure); + } + } + + private static void acknowledge(NetworkEvent.Context context) { + HANDSHAKE.reply(new FMLHandshakeMessages.C2SAcknowledge(), context); + } + } +} diff --git a/src/main/java/zone/moddev/mc/modernmetals/proxy/ClientProxy.java b/src/main/java/zone/moddev/mc/modernmetals/proxy/ClientProxy.java deleted file mode 100644 index 5416d17b..00000000 --- a/src/main/java/zone/moddev/mc/modernmetals/proxy/ClientProxy.java +++ /dev/null @@ -1,65 +0,0 @@ -package zone.moddev.mc.modernmetals.proxy; - -import com.mcmoddev.lib.client.registrations.RegistrationHelper; -import com.mcmoddev.lib.material.MMDMaterial; -import zone.moddev.mc.modernmetals.init.Blocks; -import zone.moddev.mc.modernmetals.init.Fluids; -import zone.moddev.mc.modernmetals.init.Items; - -import net.minecraftforge.client.event.ModelRegistryEvent; -import net.minecraftforge.fml.common.event.FMLInitializationEvent; -import zone.moddev.mc.modernmetals.ModernMetals; -import zone.moddev.mc.modernmetals.client.ModernMetalsConfigScreen; -import zone.moddev.mc.orespawn.api.client.WorldSettingsExtensionRegistry; -import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.event.RegistryEvent; -import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; - -/** - * Modern Metals Client Proxy. - * - * @author Jasmine Iwanek - * - */ -public class ClientProxy extends CommonProxy { - - @Override - public void preInit(final FMLPreInitializationEvent event) { - super.preInit(event); - - MinecraftForge.EVENT_BUS.register(this); - } - - @Override - public void init(final FMLInitializationEvent event) { - super.init(event); - WorldSettingsExtensionRegistry.registerConfigScreen(ModernMetals.MODID, ModernMetalsConfigScreen::new); - } - - /** - * - * @param event The Event. - */ - @SubscribeEvent - public void fluidRendering(final RegistryEvent.Register event) { - for (final String name : Fluids.getFluidBlockRegistry().keySet()) { - RegistrationHelper.registerFluidRender(name); - } - } - - /** - * - * @param event The Event. - */ - @SubscribeEvent - public void modelRegistry(final ModelRegistryEvent event) { - for (final String name : Items.getItemRegistry().keySet()) { - RegistrationHelper.registerItemRender(name); - } - - for (final String name : Blocks.getBlockRegistry().keySet()) { - RegistrationHelper.registerBlockRender(name); - } - } -} diff --git a/src/main/java/zone/moddev/mc/modernmetals/proxy/CommonProxy.java b/src/main/java/zone/moddev/mc/modernmetals/proxy/CommonProxy.java deleted file mode 100644 index 6504d0b4..00000000 --- a/src/main/java/zone/moddev/mc/modernmetals/proxy/CommonProxy.java +++ /dev/null @@ -1,50 +0,0 @@ -package zone.moddev.mc.modernmetals.proxy; - - -import zone.moddev.mc.modernmetals.content.ContentModeNetwork; -import zone.moddev.mc.modernmetals.data.MaterialNames; -import zone.moddev.mc.modernmetals.init.ItemGroups; -import zone.moddev.mc.modernmetals.init.VillagerTrades; -import zone.moddev.mc.modernmetals.util.MMeConfig; - -import net.minecraftforge.fml.common.event.FMLInitializationEvent; -import net.minecraftforge.fml.common.event.FMLPostInitializationEvent; -import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; - -/** - * Modern Metals Common Proxy. - * - * @author Jasmine Iwanek - * - */ -public class CommonProxy { - - /** - * - * @param event The Event. - */ - @SuppressWarnings("deprecation") - public void preInit(final FMLPreInitializationEvent event) { - - ContentModeNetwork.register(); - if (MMeConfig.villagerTradesEnabled()) { - VillagerTrades.init(); - } - } - - /** - * - * @param event The Event. - */ - public void init(final FMLInitializationEvent event) { - ItemGroups.setupIcons(MaterialNames.ALUMINUM); - } - - /** - * - * @param event The Event. - */ - public void postInit(FMLPostInitializationEvent event) { - MMeConfig.postInit(); - } -} diff --git a/src/main/java/zone/moddev/mc/modernmetals/proxy/ServerProxy.java b/src/main/java/zone/moddev/mc/modernmetals/proxy/ServerProxy.java deleted file mode 100644 index 1e68b620..00000000 --- a/src/main/java/zone/moddev/mc/modernmetals/proxy/ServerProxy.java +++ /dev/null @@ -1,11 +0,0 @@ -package zone.moddev.mc.modernmetals.proxy; - -/** - * Modern Metals Server Proxy. - * - * @author Jasmine Iwanek - * - */ -public class ServerProxy extends CommonProxy { - // Nothing to see here people -} diff --git a/src/main/java/zone/moddev/mc/modernmetals/recipe/ContentCraftingRecipe.java b/src/main/java/zone/moddev/mc/modernmetals/recipe/ContentCraftingRecipe.java new file mode 100644 index 00000000..a5f4c7fc --- /dev/null +++ b/src/main/java/zone/moddev/mc/modernmetals/recipe/ContentCraftingRecipe.java @@ -0,0 +1,136 @@ +package zone.moddev.mc.modernmetals.recipe; + +import com.google.gson.JsonObject; +import com.google.gson.JsonSyntaxException; +import net.minecraft.inventory.IInventory; +import net.minecraft.item.ItemStack; +import net.minecraft.item.crafting.IRecipe; +import net.minecraft.item.crafting.IRecipeSerializer; +import net.minecraft.item.crafting.RecipeSerializers; +import net.minecraft.item.crafting.ShapedRecipe; +import net.minecraft.item.crafting.ShapelessRecipe; +import net.minecraft.network.PacketBuffer; +import net.minecraft.tags.ItemTags; +import net.minecraftforge.common.crafting.CraftingHelper; +import net.minecraft.util.JsonUtils; +import net.minecraft.util.ResourceLocation; +import net.minecraft.world.World; +import zone.moddev.mc.modernmetals.config.ContentPolicy; + +/** Keeps recipe IDs stable between modes, including IDs stored in an old recipe book. */ +public final class ContentCraftingRecipe { + public static final IRecipeSerializer SERIALIZER = new Serializer(); + private ContentCraftingRecipe() {} + + static void registerConditions() { + CraftingHelper.register(new ResourceLocation("modernmetals", "non_empty_tag"), json -> { + ResourceLocation id = new ResourceLocation(JsonUtils.getString(json, "tag")); + return () -> !ItemTags.getCollection().getOrCreate(id).getAllElements().isEmpty(); + }); + } + + private static boolean allowed(IRecipe recipe) { + return ContentPolicy.active().allows(recipe.getRecipeOutput().getItem().getRegistryName().toString()); + } + + private static IRecipe wrap(IRecipe recipe) { + // Recipe-book placement needs the shaped recipe's width and height, not just its ingredients. + if (recipe instanceof ShapedRecipe) return new Shaped((ShapedRecipe) recipe); + if (recipe instanceof ShapelessRecipe) return new Shapeless((ShapelessRecipe) recipe); + throw new IllegalArgumentException("Not an ordinary crafting recipe: " + recipe.getId()); + } + + private static final class Shaped extends ShapedRecipe { + private final ShapedRecipe plain; + + private Shaped(ShapedRecipe plain) { + super(plain.getId(), plain.getGroup(), plain.getWidth(), plain.getHeight(), + plain.getIngredients(), plain.getRecipeOutput()); + this.plain = plain; + } + + @Override + public boolean matches(IInventory inventory, World world) { + return allowed(this) && super.matches(inventory, world); + } + + @Override + public ItemStack getCraftingResult(IInventory inventory) { + return allowed(this) ? super.getCraftingResult(inventory) : ItemStack.EMPTY; + } + + @Override + public boolean isDynamic() { + return !allowed(this); + } + + @Override + public IRecipeSerializer getSerializer() { + return SERIALIZER; + } + } + + private static final class Shapeless extends ShapelessRecipe { + private final ShapelessRecipe plain; + + private Shapeless(ShapelessRecipe plain) { + super(plain.getId(), plain.getGroup(), plain.getRecipeOutput(), plain.getIngredients()); + this.plain = plain; + } + + @Override + public boolean matches(IInventory inventory, World world) { + return allowed(this) && super.matches(inventory, world); + } + + @Override + public ItemStack getCraftingResult(IInventory inventory) { + return allowed(this) ? super.getCraftingResult(inventory) : ItemStack.EMPTY; + } + + @Override + public boolean isDynamic() { + return !allowed(this); + } + + @Override + public IRecipeSerializer getSerializer() { + return SERIALIZER; + } + } + + private static final class Serializer implements IRecipeSerializer { + private static final ResourceLocation NAME = new ResourceLocation("modernmetals", "content_crafting"); + + @Override + public IRecipe read(ResourceLocation id, JsonObject json) { + JsonObject nested = JsonUtils.getJsonObject(json, "recipe"); + String type = JsonUtils.getString(nested, "type"); + if (!"minecraft:crafting_shaped".equals(type) && !"minecraft:crafting_shapeless".equals(type)) { + throw new JsonSyntaxException("Content-mode crafting requires an ordinary shaped or shapeless recipe"); + } + + return wrap(RecipeSerializers.deserialize(id, nested)); + } + + @Override + public IRecipe read(ResourceLocation id, PacketBuffer buffer) { + IRecipe nested = RecipeSerializers.read(buffer); + if (!nested.getId().equals(id) || nested.getSerializer() == SERIALIZER) { + throw new IllegalArgumentException("Invalid nested content-mode recipe " + id); + } + return wrap(nested); + } + + @Override + public void write(PacketBuffer buffer, IRecipe value) { + IRecipe plain = value instanceof Shaped ? ((Shaped) value).plain : ((Shapeless) value).plain; + RecipeSerializers.write(plain, buffer); + } + + @Override + public ResourceLocation getName() { + return NAME; + } + } +} diff --git a/src/main/java/zone/moddev/mc/modernmetals/recipe/CrushingRecipe.java b/src/main/java/zone/moddev/mc/modernmetals/recipe/CrushingRecipe.java new file mode 100644 index 00000000..fc5d248c --- /dev/null +++ b/src/main/java/zone/moddev/mc/modernmetals/recipe/CrushingRecipe.java @@ -0,0 +1,97 @@ +package zone.moddev.mc.modernmetals.recipe; + +import com.google.gson.JsonObject; + +import zone.moddev.mc.modernmetals.ModernMetals; + +import net.minecraft.inventory.IInventory; +import net.minecraft.item.ItemStack; +import net.minecraft.item.crafting.IRecipe; +import net.minecraft.item.crafting.IRecipeSerializer; +import net.minecraft.item.crafting.Ingredient; +import net.minecraft.item.crafting.RecipeSerializers; +import net.minecraft.network.PacketBuffer; +import net.minecraft.util.NonNullList; +import net.minecraft.util.ResourceLocation; +import net.minecraft.world.World; +import net.minecraftforge.common.crafting.RecipeType; +import net.minecraftforge.common.crafting.CraftingHelper; +import net.minecraftforge.fml.ModList; + +/** + * Crushing recipes supplied by Modern Metals and other data packs. The JSON serializer + * accepts the same ingredient and result objects as Base Metals. When Base Metals is + * loaded, the serializer keeps the recipe ID and loads it under the Base Metals type. + */ +public final class CrushingRecipe implements IRecipe { + public static final ResourceLocation TYPE_ID = new ResourceLocation(ModernMetals.MOD_ID, "crushing"); + public static final RecipeType TYPE = RecipeType.get(TYPE_ID, CrushingRecipe.class); + public static final IRecipeSerializer SERIALIZER = new Serializer(); + public static final IRecipeSerializer LEGACY_SMELTING_SERIALIZER = + new LegacySmeltingRecipe.Serializer(); + public static final IRecipeSerializer PLATE_REPAIR_SERIALIZER = + new PlateRepairRecipe.Serializer(); + private static boolean registered; + + private final ResourceLocation id; + private final Ingredient ingredient; + private final ItemStack result; + + public CrushingRecipe(ResourceLocation id, Ingredient ingredient, ItemStack result) { + this.id = id; + this.ingredient = ingredient; + this.result = result.copy(); + } + + public static synchronized void register() { + if (registered) return; + RecipeSerializers.register(SERIALIZER); + RecipeSerializers.register(LEGACY_SMELTING_SERIALIZER); + RecipeSerializers.register(PLATE_REPAIR_SERIALIZER); + RecipeSerializers.register(ContentCraftingRecipe.SERIALIZER); + ContentCraftingRecipe.registerConditions(); + registered = true; + } + + @Override public boolean matches(IInventory inventory, World world) { + return inventory.getSizeInventory() > 0 && ingredient.test(inventory.getStackInSlot(0)); + } + @Override public ItemStack getCraftingResult(IInventory inventory) { return result.copy(); } + @Override public boolean canFit(int width, int height) { return width * height >= 1; } + @Override public ItemStack getRecipeOutput() { return result.copy(); } + @Override public ResourceLocation getId() { return id; } + @Override public IRecipeSerializer getSerializer() { return SERIALIZER; } + @Override public RecipeType getType() { return TYPE; } + @Override public NonNullList getIngredients() { + NonNullList ingredients = NonNullList.create(); + ingredients.add(ingredient); + return ingredients; + } + @Override public boolean isDynamic() { return true; } + + public static final class Serializer implements IRecipeSerializer { + private Serializer() {} + @Override public IRecipe read(ResourceLocation id, JsonObject json) { + if (ModList.get().isLoaded("basemetals")) { + // Base Metals tools and add-ons consume its recipe type. Preserve our recipe ID. + JsonObject shared = new JsonObject(); + shared.addProperty("type", "basemetals:crushing"); + shared.add("ingredient", json.get("ingredient")); + shared.add("result", json.get("result")); + return RecipeSerializers.deserialize(id, shared); + } + Ingredient ingredient = Ingredient.fromJson(json.get("ingredient")); + ItemStack result = CraftingHelper.getItemStack(json.getAsJsonObject("result"), true); + return new CrushingRecipe(id, ingredient, result); + } + @Override public CrushingRecipe read(ResourceLocation id, PacketBuffer buffer) { + return new CrushingRecipe(id, Ingredient.fromBuffer(buffer), buffer.readItemStack()); + } + @Override public void write(PacketBuffer buffer, IRecipe value) { + CrushingRecipe recipe = (CrushingRecipe) value; + recipe.ingredient.writeToBuffer(buffer); + buffer.writeItemStack(recipe.result); + } + @Override public ResourceLocation getName() { return TYPE_ID; } + } +} diff --git a/src/main/java/zone/moddev/mc/modernmetals/recipe/LegacySmeltingRecipe.java b/src/main/java/zone/moddev/mc/modernmetals/recipe/LegacySmeltingRecipe.java new file mode 100644 index 00000000..3bca562c --- /dev/null +++ b/src/main/java/zone/moddev/mc/modernmetals/recipe/LegacySmeltingRecipe.java @@ -0,0 +1,67 @@ +package zone.moddev.mc.modernmetals.recipe; + +import com.google.gson.JsonObject; + +import zone.moddev.mc.modernmetals.ModernMetals; +import zone.moddev.mc.modernmetals.config.ContentPolicy; +import net.minecraft.inventory.IInventory; +import net.minecraft.world.World; + +import net.minecraft.item.ItemStack; +import net.minecraft.item.crafting.FurnaceRecipe; +import net.minecraft.item.crafting.IRecipeSerializer; +import net.minecraft.item.crafting.Ingredient; +import net.minecraft.network.PacketBuffer; +import net.minecraft.util.JsonUtils; +import net.minecraft.util.ResourceLocation; +import net.minecraftforge.common.crafting.CraftingHelper; + +/** Smelting recipes that can produce more than one item. */ +public final class LegacySmeltingRecipe extends FurnaceRecipe { + public LegacySmeltingRecipe(ResourceLocation id, String group, Ingredient ingredient, + ItemStack result, float experience, int cookingTime) { + super(id, group, ingredient, result, experience, cookingTime); + } + + @Override public IRecipeSerializer getSerializer() { + return CrushingRecipe.LEGACY_SMELTING_SERIALIZER; + } + + @Override public boolean matches(IInventory inventory, World world) { + return allowed() && super.matches(inventory, world); + } + + @Override public ItemStack getCraftingResult(IInventory inventory) { + return allowed() ? super.getCraftingResult(inventory) : ItemStack.EMPTY; + } + + @Override public boolean isDynamic() { return !allowed(); } + + private boolean allowed() { + return ContentPolicy.active().allows(getRecipeOutput().getItem().getRegistryName().toString()); + } + + public static final class Serializer implements IRecipeSerializer { + private final ResourceLocation name = new ResourceLocation(ModernMetals.MOD_ID, "legacy_smelting"); + @Override public LegacySmeltingRecipe read(ResourceLocation id, JsonObject json) { + String group = JsonUtils.getString(json, "group", ""); + Ingredient ingredient = Ingredient.fromJson(json.get("ingredient")); + ItemStack result = CraftingHelper.getItemStack(JsonUtils.getJsonObject(json, "result"), true); + return new LegacySmeltingRecipe(id, group, ingredient, result, + JsonUtils.getFloat(json, "experience", 0.0F), + JsonUtils.getInt(json, "cookingtime", 200)); + } + @Override public LegacySmeltingRecipe read(ResourceLocation id, PacketBuffer buffer) { + return new LegacySmeltingRecipe(id, buffer.readString(32767), Ingredient.fromBuffer(buffer), + buffer.readItemStack(), buffer.readFloat(), buffer.readVarInt()); + } + @Override public void write(PacketBuffer buffer, LegacySmeltingRecipe recipe) { + buffer.writeString(recipe.getGroup()); + recipe.getIngredients().get(0).writeToBuffer(buffer); + buffer.writeItemStack(recipe.getRecipeOutput()); + buffer.writeFloat(recipe.getExperience()); + buffer.writeVarInt(recipe.getCookingTime()); + } + @Override public ResourceLocation getName() { return name; } + } +} diff --git a/src/main/java/zone/moddev/mc/modernmetals/recipe/PlateRepairRecipe.java b/src/main/java/zone/moddev/mc/modernmetals/recipe/PlateRepairRecipe.java new file mode 100644 index 00000000..52a67da0 --- /dev/null +++ b/src/main/java/zone/moddev/mc/modernmetals/recipe/PlateRepairRecipe.java @@ -0,0 +1,121 @@ +package zone.moddev.mc.modernmetals.recipe; + +import com.google.gson.JsonObject; +import com.google.gson.JsonSyntaxException; + +import zone.moddev.mc.modernmetals.ModernMetals; +import zone.moddev.mc.modernmetals.config.ContentPolicy; + +import net.minecraft.init.Items; +import net.minecraft.inventory.IInventory; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.item.crafting.IRecipeHidden; +import net.minecraft.item.crafting.IRecipeSerializer; +import net.minecraft.item.crafting.Ingredient; +import net.minecraft.network.PacketBuffer; +import net.minecraft.util.JsonUtils; +import net.minecraft.util.NonNullList; +import net.minecraft.util.ResourceLocation; +import net.minecraft.world.World; +import net.minecraftforge.registries.ForgeRegistries; + +public final class PlateRepairRecipe extends IRecipeHidden { + private final Item target; + private final Ingredient plate; + + public PlateRepairRecipe(ResourceLocation id, Item target, Ingredient plate) { + super(id); + this.target = target; + this.plate = plate; + } + + @Override + public boolean matches(IInventory inventory, World world) { + if (!ContentPolicy.active().allows(target.getRegistryName().toString())) return false; + ItemStack foundTarget = ItemStack.EMPTY; + boolean foundPlate = false; + + for (int slot = 0; slot < inventory.getSizeInventory(); slot++) { + ItemStack stack = inventory.getStackInSlot(slot); + + if (stack.isEmpty()) { + continue; + } + + if (stack.getItem() == target && stack.isDamaged() && foundTarget.isEmpty()) { + foundTarget = stack; + } else if (plate.test(stack) && !foundPlate) { + foundPlate = true; + } else { + return false; + } + } + + return !foundTarget.isEmpty() && foundPlate; + } + + @Override + public ItemStack getCraftingResult(IInventory inventory) { + if (!matches(inventory, null)) { + return ItemStack.EMPTY; + } + + for (int slot = 0; slot < inventory.getSizeInventory(); slot++) { + ItemStack stack = inventory.getStackInSlot(slot); + + if (stack.getItem() == target && stack.isDamaged()) { + ItemStack repaired = stack.copy(); + repaired.setCount(1); + repaired.setDamage(0); + + return repaired; + } + } + + return ItemStack.EMPTY; + } + @Override + public boolean canFit(int width, int height) { + return width * height >= 2; + } + + @Override + public ItemStack getRecipeOutput() { + return new ItemStack(target); + } + + @Override + public NonNullList getIngredients() { + NonNullList ingredients = NonNullList.create(); + ingredients.add(Ingredient.fromItems(target)); + ingredients.add(plate); + + return ingredients; + } + + @Override + public IRecipeSerializer getSerializer() { + return CrushingRecipe.PLATE_REPAIR_SERIALIZER; + } + + public static final class Serializer implements IRecipeSerializer { + private final ResourceLocation name = new ResourceLocation(ModernMetals.MOD_ID, "plate_repair"); + @Override public PlateRepairRecipe read(ResourceLocation id, JsonObject json) { + ResourceLocation targetId = new ResourceLocation(JsonUtils.getString(json, "target")); + Item target = ForgeRegistries.ITEMS.getValue(targetId); + if (target == null || target == Items.AIR) throw new JsonSyntaxException("Unknown target " + targetId); + return new PlateRepairRecipe(id, target, Ingredient.fromJson(JsonUtils.getJsonObject(json, "plate"))); + } + @Override public PlateRepairRecipe read(ResourceLocation id, PacketBuffer buffer) { + Item target = ForgeRegistries.ITEMS.getValue(buffer.readResourceLocation()); + if (target == null || target == Items.AIR) throw new IllegalStateException("Missing target"); + return new PlateRepairRecipe(id, target, Ingredient.fromBuffer(buffer)); + } + @Override public void write(PacketBuffer buffer, PlateRepairRecipe recipe) { + buffer.writeResourceLocation(recipe.target.getRegistryName()); + recipe.plate.writeToBuffer(buffer); + } + @Override public ResourceLocation getName() { return name; } + } +} diff --git a/src/main/java/zone/moddev/mc/modernmetals/recipe/RecipeDiscovery.java b/src/main/java/zone/moddev/mc/modernmetals/recipe/RecipeDiscovery.java new file mode 100644 index 00000000..6d94694c --- /dev/null +++ b/src/main/java/zone/moddev/mc/modernmetals/recipe/RecipeDiscovery.java @@ -0,0 +1,57 @@ +package zone.moddev.mc.modernmetals.recipe; + +import java.util.Collections; +import net.minecraft.advancements.Advancement; +import net.minecraft.advancements.CriteriaTriggers; +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.item.crafting.IRecipe; +import net.minecraft.server.MinecraftServer; +import net.minecraft.util.ResourceLocation; +import net.minecraftforge.eventbus.api.SubscribeEvent; +import net.minecraftforge.fml.common.Mod; +import net.minecraftforge.fml.common.gameevent.PlayerEvent; +import net.minecraftforge.fml.common.gameevent.TickEvent; +import net.minecraftforge.fml.event.server.FMLServerAboutToStartEvent; +import zone.moddev.mc.modernmetals.ModernMetals; + +/** Restores discovery for inventories and advancement progress saved before a recipe update. */ +@Mod.EventBusSubscriber(modid = ModernMetals.MOD_ID) +public final class RecipeDiscovery { + private static MinecraftServer pendingReload; + private RecipeDiscovery() {} + + @SubscribeEvent + public static void onLogin(PlayerEvent.PlayerLoggedInEvent event) { + if (!(event.getPlayer() instanceof EntityPlayerMP)) return; + EntityPlayerMP player = (EntityPlayerMP) event.getPlayer(); + player.getServer().addScheduledTask(() -> discover(player)); + } + + @SubscribeEvent + public static void onServerStarting(FMLServerAboutToStartEvent event) { + MinecraftServer server = event.getServer(); + server.getResourceManager().addReloadListener(resources -> pendingReload = server); + } + + @SubscribeEvent + public static void onServerTick(TickEvent.ServerTickEvent event) { + if (event.phase != TickEvent.Phase.END || pendingReload == null) return; + MinecraftServer server = pendingReload; + pendingReload = null; + // Player advancements are reloaded after the resource listeners finish. + server.getPlayerList().getPlayers().forEach(RecipeDiscovery::discover); + } + + public static void discover(EntityPlayerMP player) { + CriteriaTriggers.INVENTORY_CHANGED.trigger(player, player.inventory); + for (IRecipe recipe : player.getServer().getRecipeManager().getRecipes()) { + if (!ModernMetals.MOD_ID.equals(recipe.getId().getNamespace()) || recipe.isDynamic() + || player.getRecipeBook().isUnlocked(recipe)) continue; + Advancement advancement = player.getServer().getAdvancementManager().getAdvancement( + new ResourceLocation(ModernMetals.MOD_ID, "recipes/" + recipe.getId().getPath())); + if (advancement != null && player.getAdvancements().getProgress(advancement).isDone()) { + player.unlockRecipes(Collections.singletonList(recipe)); + } + } + } +} diff --git a/src/main/java/zone/moddev/mc/modernmetals/trade/ModernMetalsTrades.java b/src/main/java/zone/moddev/mc/modernmetals/trade/ModernMetalsTrades.java new file mode 100644 index 00000000..b7417e8a --- /dev/null +++ b/src/main/java/zone/moddev/mc/modernmetals/trade/ModernMetalsTrades.java @@ -0,0 +1,68 @@ +package zone.moddev.mc.modernmetals.trade; + +import zone.moddev.mc.modernmetals.config.ModernMetalsConfig; +import zone.moddev.mc.modernmetals.config.ContentPolicy; +import zone.moddev.mc.modernmetals.content.ModContent; +import zone.moddev.mc.modernmetals.material.MaterialCatalogue; +import zone.moddev.mc.modernmetals.material.MaterialDefinition; + +import net.minecraft.entity.passive.EntityVillager; +import net.minecraft.init.Items; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.util.ResourceLocation; +import net.minecraft.village.MerchantRecipe; +import net.minecraftforge.fml.common.registry.VillagerRegistry.VillagerCareer; +import net.minecraftforge.fml.common.registry.VillagerRegistry.VillagerProfession; +import net.minecraftforge.registries.ForgeRegistries; + +/** Adds the historical smith careers' Modern Metals offers after item registration. */ +public final class ModernMetalsTrades { + private static boolean registered; + private ModernMetalsTrades() {} + + public static synchronized void register() { + if (registered) return; + VillagerProfession smith = ForgeRegistries.VILLAGER_PROFESSIONS.getValue( + new ResourceLocation("minecraft", "smith")); + if (smith == null) return; + VillagerCareer armor = smith.getCareer(1); + VillagerCareer weapons = smith.getCareer(2); + VillagerCareer tools = smith.getCareer(3); + + for (MaterialDefinition material : MaterialCatalogue.ALL) { + if (material.kind() == MaterialDefinition.Kind.RARE_ORE) continue; + int value = (int) (material.hardness() + material.strength() + material.magic() + material.toolLevel()); + int cost = Math.max(1, (int) (0.2F * value)); + int level = Math.max(1, Math.min(4, (int) (0.1F * value))); + EntityVillager.ITradeList ingot = selling(ModContent.item(material.name() + "_ingot").get(), 12, cost); + armor.addTrade(level, ingot); + weapons.addTrade(level, ingot); + tools.addTrade(level, ingot); + // Low Fantasy still allows the smiths’ ordinary metal trades. + addSales(armor, level, cost + (int) (material.hardness() / 2.0D), material, + "helmet", "chestplate", "leggings", "boots"); + addSales(tools, level, cost, material, "pickaxe", "axe", "shovel", "hoe", "crackhammer"); + addSales(weapons, level, cost, material, "sword", "bow", "crossbow"); + } + registered = true; + } + + private static void addSales(VillagerCareer career, int level, int cost, + MaterialDefinition material, String... forms) { + for (String form : forms) { + career.addTrade(level, selling(ModContent.item(material.name() + "_" + form).get(), 1, cost)); + } + } + + private static EntityVillager.ITradeList selling(final Item item, final int count, final int emeralds) { + return (merchant, recipes, random) -> { + if (ModernMetalsConfig.VILLAGER_TRADES.get() + && (!ContentPolicy.active().lowFantasy() || item.getRegistryName().getPath().endsWith("_ingot"))) { + recipes.add(new MerchantRecipe( + new ItemStack(Items.EMERALD, Math.max(1, emeralds)), + new ItemStack(item, count))); + } + }; + } +} diff --git a/src/main/java/zone/moddev/mc/modernmetals/util/EventHandler.java b/src/main/java/zone/moddev/mc/modernmetals/util/EventHandler.java deleted file mode 100644 index 64896d7d..00000000 --- a/src/main/java/zone/moddev/mc/modernmetals/util/EventHandler.java +++ /dev/null @@ -1,89 +0,0 @@ -package zone.moddev.mc.modernmetals.util; - -import zone.moddev.mc.modernmetals.init.Blocks; -import zone.moddev.mc.modernmetals.init.Fluids; -import zone.moddev.mc.modernmetals.init.Items; -import zone.moddev.mc.modernmetals.init.Materials; -import com.google.common.collect.ImmutableSet; -import com.mcmoddev.lib.events.MMDLibRegisterBlocks; -import com.mcmoddev.lib.events.MMDLibRegisterFluids; -import com.mcmoddev.lib.events.MMDLibRegisterItems; -import com.mcmoddev.lib.events.MMDLibRegisterMaterials; -import com.mcmoddev.lib.registry.recipe.ICrusherRecipe; -import java.util.Set; - -import zone.moddev.mc.modernmetals.ModernMetals; - -import net.minecraft.block.Block; -import net.minecraft.item.Item; -import net.minecraftforge.event.RegistryEvent; -import net.minecraftforge.fml.common.Mod.EventBusSubscriber; -import net.minecraftforge.fml.common.eventhandler.EventPriority; -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; - -@EventBusSubscriber(modid=ModernMetals.MODID) -public class EventHandler { - private static final Set LEGACY_EMPTY_CRUSHER_RECIPES = ImmutableSet.of( - "blocklapis_to_air", "orelapis_to_air", "blockredstone_to_air", - "oreredstone_to_air", "quartz_block_to_air", "orequartz_to_air", "stone_slab_to_air"); - - @SubscribeEvent - public static void mmdlibRegisterMaterials(final MMDLibRegisterMaterials event) { - Materials.init(); - } - - @SubscribeEvent - public static void mmdlibRegisterBlocks(final MMDLibRegisterBlocks event) { - Blocks.init(); - } - - @SubscribeEvent - public static void mmdlibRegisterItems(final MMDLibRegisterItems event) { - Items.init(); - } - - @SubscribeEvent - public static void mmdlibRegisterFluids(final MMDLibRegisterFluids event) { - Fluids.init(); - } - - @SubscribeEvent(priority = EventPriority.LOWEST) - public static void onRemapLegacyCrusherRecipes(final RegistryEvent.MissingMappings event) { - for (final RegistryEvent.MissingMappings.Mapping mapping : event.getAllMappings()) { - // Older builds registered these empty outputs under either namespace. - final String namespace = mapping.key.getNamespace(); - if (mapping.getAction() == RegistryEvent.MissingMappings.Action.DEFAULT - && ("mmdlib".equals(namespace) || ModernMetals.MODID.equals(namespace)) - && LEGACY_EMPTY_CRUSHER_RECIPES.contains(mapping.key.getPath())) { - mapping.ignore(); - } - } - } - - /** - * - * @param event The Event. - */ - @SubscribeEvent - public static void onRemapBlock(final RegistryEvent.MissingMappings event) { - for (final RegistryEvent.MissingMappings.Mapping mapping : event.getAllMappings()) { - if (mapping.key.getNamespace().equals(ModernMetals.MODID)) { - // dummy - } - } - } - - /** - * - * @param event The Event. - */ - @SubscribeEvent - public static void onRemapItem(final RegistryEvent.MissingMappings event) { - for (final RegistryEvent.MissingMappings.Mapping mapping : event.getAllMappings()) { - if (mapping.key.getNamespace().equals(ModernMetals.MODID)) { - // dummy - } - } - } - -} diff --git a/src/main/java/zone/moddev/mc/modernmetals/util/MMeConfig.java b/src/main/java/zone/moddev/mc/modernmetals/util/MMeConfig.java deleted file mode 100644 index 925bbcc8..00000000 --- a/src/main/java/zone/moddev/mc/modernmetals/util/MMeConfig.java +++ /dev/null @@ -1,120 +0,0 @@ -package zone.moddev.mc.modernmetals.util; - -import com.mcmoddev.lib.registry.CrusherRecipeRegistry; -import com.mcmoddev.lib.util.MaterialConfigOptions; -import zone.moddev.mc.modernmetals.ModernMetals; -import zone.moddev.mc.modernmetals.data.MaterialNames; -import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.common.config.Configuration; -import net.minecraftforge.fml.client.event.ConfigChangedEvent; -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; - -import java.io.File; -import java.util.Arrays; -import java.util.Collections; -import java.util.List; -import net.minecraftforge.common.config.Property; -import org.apache.commons.lang3.text.WordUtils; - -/** - * @author Jasmine Iwanek - * - */ -public class MMeConfig extends com.mcmoddev.lib.util.Config { - - public static final List MATERIAL_CATEGORIES = Collections.unmodifiableList( - Arrays.asList("Metals", "Fluids", "Forced Traits")); - private static Configuration configuration; - private static final String CONFIG_FILE = "config/ModernMetals.cfg"; - - private static final MaterialConfigOptions[] MATERIAL_CONFIG_OPTIONS = new MaterialConfigOptions[]{ - new MaterialConfigOptions(MaterialNames.ALUMINUM, false, true, true, true, true), - new MaterialConfigOptions(MaterialNames.ALUMINUM_BRASS, false, true, true, true, true), - new MaterialConfigOptions(MaterialNames.BERYLLIUM, false, true, true, true, true), - new MaterialConfigOptions(MaterialNames.BORON, false, true, true, true, true), - new MaterialConfigOptions(MaterialNames.CADMIUM, false, true, true, true, true), - new MaterialConfigOptions(MaterialNames.CHROMIUM, false, true, true, true, true), - new MaterialConfigOptions(MaterialNames.GALVANIZED_STEEL, false, true, true, true, true), - new MaterialConfigOptions(MaterialNames.IRIDIUM, false, true, true, true, true), - new MaterialConfigOptions(MaterialNames.MAGNESIUM, false, true, true, true, true), - new MaterialConfigOptions(MaterialNames.MANGANESE, false, true, true, true, true), - new MaterialConfigOptions(MaterialNames.NICHROME, false, true, true, true, true), - new MaterialConfigOptions(MaterialNames.OSMIUM, false, true, true, true, true), - new MaterialConfigOptions(MaterialNames.PLUTONIUM, false, true, true, true, true), - new MaterialConfigOptions(MaterialNames.RUTILE, false, true, true, true, true), - new MaterialConfigOptions(MaterialNames.STAINLESS_STEEL, false, true, true, true, true), - new MaterialConfigOptions(MaterialNames.TANTALUM, false, true, true, true, true), - new MaterialConfigOptions(MaterialNames.THORIUM, false, true, true, true, true), - new MaterialConfigOptions(MaterialNames.TITANIUM, false, true, true, true, true), - new MaterialConfigOptions(MaterialNames.TUNGSTEN, false, true, true, true, true), - new MaterialConfigOptions(MaterialNames.URANIUM, false, true, true, true, true), - new MaterialConfigOptions(MaterialNames.ZIRCONIUM, false, true, true, true, true), - }; - /** - * - * @param event The Event. - */ - @SubscribeEvent - public void onConfigChange(final ConfigChangedEvent.OnConfigChangedEvent event) { - if (event.getModID().equals(ModernMetals.MODID)) { - init(); - } - } - - /** - * - */ - public static void init() { - if (configuration == null) { - configuration = new Configuration(new File(CONFIG_FILE)); - MinecraftForge.EVENT_BUS.register(new MMeConfig()); - } - - final Property mode = configuration.get("General", "contentMode", "high_fantasy", - "Applies when a compatible Base Metals build is absent. Restart after changing.", - new String[] { "high_fantasy", "low_fantasy" }); - mode.setLanguageKey("config.modernmetals.content_mode").setRequiresMcRestart(true); - mode.setValidValuesDisplay(new String[] { - "config.modernmetals.content_mode.high_fantasy", "config.modernmetals.content_mode.low_fantasy" }); - configuration.get("General", "enableVillagerTrades", true) - .setLanguageKey("config.modernmetals.villager_trades").setRequiresMcRestart(true); - configMaterialOptions(MATERIAL_CONFIG_OPTIONS, configuration); - for (final String category : MATERIAL_CATEGORIES) { - configuration.getCategory(category).setRequiresMcRestart(true); - } - for (final MaterialConfigOptions material : MATERIAL_CONFIG_OPTIONS) { - final String name = material.getIdentifier(); - final String suffix = WordUtils.capitalizeFully(name); - decorate("Metals", "Enable" + suffix, name); - decorate("Fluids", "Enabled " + suffix, name); - decorate("Forced Traits", "Force" + suffix + "TraitRegistration", name); - } - - if (configuration.hasChanged()) { - configuration.save(); - } - } - - private static void decorate(final String category, final String key, final String material) { - final Property property = configuration.getCategory(category).get(key); - if (property != null) { - property.setLanguageKey("config.modernmetals.enable_" + material).setRequiresMcRestart(true); - } - } - - public static Configuration getConfiguration() { - return configuration; - } - - public static String configuredContentMode() { - return configuration.getCategory("General").get("contentMode").getString(); - } - - public static boolean villagerTradesEnabled() { - return configuration.getCategory("General").get("enableVillagerTrades").getBoolean(); - } - - public static void postInit() { - CrusherRecipeRegistry.getInstance().clearCache(); - } -} diff --git a/src/main/java/zone/moddev/mc/modernmetals/worldgen/ModernMetalsWorldgenProvider.java b/src/main/java/zone/moddev/mc/modernmetals/worldgen/ModernMetalsWorldgenProvider.java deleted file mode 100644 index 90260f0a..00000000 --- a/src/main/java/zone/moddev/mc/modernmetals/worldgen/ModernMetalsWorldgenProvider.java +++ /dev/null @@ -1,85 +0,0 @@ -package zone.moddev.mc.modernmetals.worldgen; - -import java.util.ArrayList; -import java.util.List; -import java.util.Optional; -import java.util.function.Predicate; -import net.minecraft.util.ResourceLocation; -import net.minecraftforge.fml.common.registry.ForgeRegistries; -import zone.moddev.mc.modernmetals.ModernMetals; -import zone.moddev.mc.orespawn.api.GeologyFamily; -import zone.moddev.mc.orespawn.api.OreDimensionSelector; -import zone.moddev.mc.orespawn.api.OrePattern; -import zone.moddev.mc.orespawn.api.OreSpawnApi; -import zone.moddev.mc.orespawn.api.WorldgenProvider; - -/** Native declarations only; OreSpawn resolves, bakes and executes generation. */ -public final class ModernMetalsWorldgenProvider { - private static final Ore[] ORES = { - new Ore("boron", 0, 31, 8D, 8, 8, true), - new Ore("thorium", 0, 31, 8D, 8, 4, true), - new Ore("beryllium", 0, 127, 20D, 5, 3, true), - new Ore("aluminum", 0, 95, 8D, 10, 8, true), - new Ore("cadmium", 0, 95, 8D, 4, 8, true), - new Ore("chromium", 0, 31, 3D, 2, 4, true), - new Ore("iridium", 0, 63, 5D, 6, 4, true), - new Ore("magnesium", 0, 95, 8D, 6, 4, true), - new Ore("manganese", 0, 63, 6D, 6, 4, true), - new Ore("osmium", 0, 95, 8D, 10, 4, true), - new Ore("plutonium", 0, 31, 4D, 2, 4, true), - new Ore("rutile", 0, 63, 6D, 6, 4, true), - new Ore("tantalum", 0, 63, 6D, 6, 4, true), - new Ore("tungsten", 0, 31, 6D, 4, 4, true), - new Ore("uranium", 0, 31, 6D, 2, 4, true), - new Ore("zirconium", 0, 63, 6D, 8, 4, true), - new Ore("titanium", 0, 63, 6D, 6, 4, false) - }; - private ModernMetalsWorldgenProvider() { } - public static void enqueue() { - build(ForgeRegistries.BLOCKS::containsKey).ifPresent(provider -> { - if (!OreSpawnApi.enqueue(provider)) throw new IllegalStateException("Modern Metals provider registered twice"); - }); - for (final Ore ore : ORES) { - final int minimum = ore.size - ore.variation; - if (minimum < 1 && ForgeRegistries.BLOCKS.containsKey(id("modernmetals", ore.name + "_ore"))) { - ModernMetals.logger.info("OreSpawn native quantity minimum for " + ore.name - + " is clamped from " + minimum + " to 1, matching the legacy importer"); - } - } - } - public static Optional build(final Predicate available) { - final List ores = new ArrayList<>(); - for (final Ore rule : ORES) { - final ResourceLocation block = id("modernmetals", rule.name + "_ore"); - if (!available.test(block)) continue; - final WorldgenProvider.OreDefinition.Builder ore = WorldgenProvider.OreDefinition - .builder(id("modernmetals", "legacy/" + rule.name + "_ore"), block) - .enabled(rule.enabled).nativeGeneration(false).retrogen(false) - .material(id("orespawn", rule.name)).output(block, 100D); - ore.dimensionSelector(OreDimensionSelector.ALL_EXCEPT_NETHER_AND_END, placement -> { - placement.yRange(rule.minY, rule.maxY).attempts(rule.frequency) - .quantityRange(Math.max(1, rule.size - rule.variation), Math.min(64, rule.size + rule.variation - 1)) - .pattern(OrePattern.DEFAULT).placementChannel(id("orespawn", "standard")) - .hostBlock(id("minecraft", "stone")).hostBlock(id("minecraft", "netherrack")) - .hostBlock(id("minecraft", "end_stone")); - for (final GeologyFamily family : GeologyFamily.values()) placement.hostFamily(family); - }); - ores.add(ore.build()); - } - if (ores.isEmpty()) return Optional.empty(); - final WorldgenProvider.Builder provider = WorldgenProvider.builder("modernmetals", 1); - ores.forEach(provider::ore); - return Optional.of(provider.build()); - } - private static ResourceLocation id(final String namespace, final String path) { return new ResourceLocation(namespace, path); } - private static final class Ore { - final String name; - final int minY, maxY, size, variation; - final double frequency; - final boolean enabled; - Ore(String name, int minY, int maxY, double frequency, int size, int variation, boolean enabled) { - this.name = name; this.minY = minY; this.maxY = maxY; this.frequency = frequency; - this.size = size; this.variation = variation; this.enabled = enabled; - } - } -} diff --git a/src/main/resources/META-INF/coremods.json b/src/main/resources/META-INF/coremods.json new file mode 100644 index 00000000..1ae6342a --- /dev/null +++ b/src/main/resources/META-INF/coremods.json @@ -0,0 +1,3 @@ +{ + "modernmetals_113_compatibility": "coremods/modernmetals_113_compatibility.js" +} diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml new file mode 100644 index 00000000..ab57aa82 --- /dev/null +++ b/src/main/resources/META-INF/mods.toml @@ -0,0 +1,40 @@ +modLoader="javafml" +loaderVersion="[25,)" +license="LGPL-2.1" +issueTrackerURL="https://github.com/MinecraftModDevelopmentMods/ModernMetals/issues" + +[[mods]] +modId="modernmetals" +version="${mod_version}" +displayName="Modern Metals" +displayURL="https://www.curseforge.com/minecraft/mc-mods/modern-metals" +authors="Jasmine Iwanek, dshadowwolf, SkyBlade1978, the MMD Team" +description="Adds modern metals, alloys, tools and armour." + +[[dependencies.modernmetals]] +modId="minecraft" +mandatory=true +versionRange="[1.13.2]" +ordering="NONE" +side="BOTH" + +[[dependencies.modernmetals]] +modId="forge" +mandatory=true +versionRange="[25,)" +ordering="NONE" +side="BOTH" + +[[dependencies.modernmetals]] +modId="orespawn" +mandatory=true +versionRange="[4.1.7.113021,5.0.0)" +ordering="AFTER" +side="BOTH" + +[[dependencies.modernmetals]] +modId="basemetals" +mandatory=false +versionRange="[3.0.3.113021,4.0.0)" +ordering="AFTER" +side="BOTH" diff --git a/src/main/resources/assets/modernmetals/blockstates/aluminum.json b/src/main/resources/assets/modernmetals/blockstates/aluminum.json index 2373531a..f3798b03 100644 --- a/src/main/resources/assets/modernmetals/blockstates/aluminum.json +++ b/src/main/resources/assets/modernmetals/blockstates/aluminum.json @@ -1,9 +1,10 @@ { - "forge_marker": 1, - "variants": { - "fluid": { - "model": "forge:fluid", - "custom": { "fluid": "aluminum" } - } + "variants": { + "": { + "model": "minecraft:block/water", + "custom": { + "fluid": "modernmetals:aluminum" + } } -} \ No newline at end of file + } +} diff --git a/src/main/resources/assets/modernmetals/blockstates/aluminum_bars.json b/src/main/resources/assets/modernmetals/blockstates/aluminum_bars.json index 9c90b7bd..a47df6d2 100644 --- a/src/main/resources/assets/modernmetals/blockstates/aluminum_bars.json +++ b/src/main/resources/assets/modernmetals/blockstates/aluminum_bars.json @@ -1,32 +1,77 @@ { - "multipart": [ - { "apply": { "model": "modernmetals:aluminum_bars_post_ends" }}, - { "when": { "north": false, "east": false, "south": false, "west": false }, - "apply": { "model": "modernmetals:aluminum_bars_post" } - }, - { "when": { "north": true, "east": false, "south": false, "west": false }, - "apply": { "model": "modernmetals:aluminum_bars_cap" } - }, - { "when": { "north": false, "east": true, "south": false, "west": false }, - "apply": { "model": "modernmetals:aluminum_bars_cap", "y": 90 } - }, - { "when": { "north": false, "east": false, "south": true, "west": false }, - "apply": { "model": "modernmetals:aluminum_bars_cap_alt" } - }, - { "when": { "north": false, "east": false, "south": false, "west": true }, - "apply": { "model": "modernmetals:aluminum_bars_cap_alt", "y": 90 } - }, - { "when": { "north": true }, - "apply": { "model": "modernmetals:aluminum_bars_side" } - }, - { "when": { "east": true }, - "apply": { "model": "modernmetals:aluminum_bars_side", "y": 90 } - }, - { "when": { "south": true }, - "apply": { "model": "modernmetals:aluminum_bars_side_alt" } - }, - { "when": { "west": true }, - "apply": { "model": "modernmetals:aluminum_bars_side_alt", "y": 90 } - } - ] + "multipart": [ + { + "apply": { + "model": "modernmetals:block/aluminum_bars_post" + } + }, + { + "when": { + "north": "true" + }, + "apply": { + "model": "modernmetals:block/aluminum_bars_side" + } + }, + { + "when": { + "north": "false" + }, + "apply": { + "model": "modernmetals:block/aluminum_bars_cap" + } + }, + { + "when": { + "south": "true" + }, + "apply": { + "model": "modernmetals:block/aluminum_bars_side_alt" + } + }, + { + "when": { + "south": "false" + }, + "apply": { + "model": "modernmetals:block/aluminum_bars_cap_alt", + "y": 90 + } + }, + { + "when": { + "west": "true" + }, + "apply": { + "model": "modernmetals:block/aluminum_bars_side_alt", + "y": 90 + } + }, + { + "when": { + "west": "false" + }, + "apply": { + "model": "modernmetals:block/aluminum_bars_cap", + "y": 270 + } + }, + { + "when": { + "east": "true" + }, + "apply": { + "model": "modernmetals:block/aluminum_bars_side", + "y": 90 + } + }, + { + "when": { + "east": "false" + }, + "apply": { + "model": "modernmetals:block/aluminum_bars_cap_alt" + } + } + ] } diff --git a/src/main/resources/assets/modernmetals/blockstates/aluminum_block.json b/src/main/resources/assets/modernmetals/blockstates/aluminum_block.json index 05566cdb..8f428d70 100644 --- a/src/main/resources/assets/modernmetals/blockstates/aluminum_block.json +++ b/src/main/resources/assets/modernmetals/blockstates/aluminum_block.json @@ -1,5 +1,7 @@ { - "variants": { - "normal": { "model": "modernmetals:aluminum_block" } + "variants": { + "": { + "model": "modernmetals:block/aluminum_block" } + } } diff --git a/src/main/resources/assets/modernmetals/blockstates/aluminum_button.json b/src/main/resources/assets/modernmetals/blockstates/aluminum_button.json index d13c581b..1e160b20 100644 --- a/src/main/resources/assets/modernmetals/blockstates/aluminum_button.json +++ b/src/main/resources/assets/modernmetals/blockstates/aluminum_button.json @@ -1,16 +1,118 @@ { - "variants": { - "facing=up,powered=false": { "model": "modernmetals:aluminum_button", "uvlock": true }, - "facing=down,powered=false": { "model": "modernmetals:aluminum_button", "uvlock": true, "x": 180 }, - "facing=east,powered=false": { "model": "modernmetals:aluminum_button", "uvlock": true, "x": 90, "y": 90 }, - "facing=west,powered=false": { "model": "modernmetals:aluminum_button", "uvlock": true, "x": 90, "y": 270 }, - "facing=south,powered=false": { "model": "modernmetals:aluminum_button", "uvlock": true, "x": 90, "y": 180 }, - "facing=north,powered=false": { "model": "modernmetals:aluminum_button", "uvlock": true, "x": 90 }, - "facing=up,powered=true": { "model": "modernmetals:aluminum_button_pressed", "uvlock": true }, - "facing=down,powered=true": { "model": "modernmetals:aluminum_button_pressed", "uvlock": true, "x": 180 }, - "facing=east,powered=true": { "model": "modernmetals:aluminum_button_pressed", "uvlock": true, "x": 90, "y": 90 }, - "facing=west,powered=true": { "model": "modernmetals:aluminum_button_pressed", "uvlock": true, "x": 90, "y": 270 }, - "facing=south,powered=true": { "model": "modernmetals:aluminum_button_pressed", "uvlock": true, "x": 90, "y": 180 }, - "facing=north,powered=true": { "model": "modernmetals:aluminum_button_pressed", "uvlock": true, "x": 90 } + "variants": { + "face=floor,facing=north,powered=false": { + "model": "modernmetals:block/aluminum_button" + }, + "face=wall,facing=north,powered=false": { + "model": "modernmetals:block/aluminum_button", + "x": 90, + "uvlock": true + }, + "face=ceiling,facing=north,powered=false": { + "model": "modernmetals:block/aluminum_button", + "x": 180, + "y": 180 + }, + "face=floor,facing=south,powered=false": { + "model": "modernmetals:block/aluminum_button", + "y": 180 + }, + "face=wall,facing=south,powered=false": { + "model": "modernmetals:block/aluminum_button", + "x": 90, + "y": 180, + "uvlock": true + }, + "face=ceiling,facing=south,powered=false": { + "model": "modernmetals:block/aluminum_button", + "x": 180 + }, + "face=floor,facing=west,powered=false": { + "model": "modernmetals:block/aluminum_button", + "y": 270 + }, + "face=wall,facing=west,powered=false": { + "model": "modernmetals:block/aluminum_button", + "x": 90, + "y": 270, + "uvlock": true + }, + "face=ceiling,facing=west,powered=false": { + "model": "modernmetals:block/aluminum_button", + "x": 180, + "y": 90 + }, + "face=floor,facing=east,powered=false": { + "model": "modernmetals:block/aluminum_button", + "y": 90 + }, + "face=wall,facing=east,powered=false": { + "model": "modernmetals:block/aluminum_button", + "x": 90, + "y": 90, + "uvlock": true + }, + "face=ceiling,facing=east,powered=false": { + "model": "modernmetals:block/aluminum_button", + "x": 180, + "y": 270 + }, + "face=floor,facing=north,powered=true": { + "model": "modernmetals:block/aluminum_button_pressed" + }, + "face=wall,facing=north,powered=true": { + "model": "modernmetals:block/aluminum_button_pressed", + "x": 90, + "uvlock": true + }, + "face=ceiling,facing=north,powered=true": { + "model": "modernmetals:block/aluminum_button_pressed", + "x": 180, + "y": 180 + }, + "face=floor,facing=south,powered=true": { + "model": "modernmetals:block/aluminum_button_pressed", + "y": 180 + }, + "face=wall,facing=south,powered=true": { + "model": "modernmetals:block/aluminum_button_pressed", + "x": 90, + "y": 180, + "uvlock": true + }, + "face=ceiling,facing=south,powered=true": { + "model": "modernmetals:block/aluminum_button_pressed", + "x": 180 + }, + "face=floor,facing=west,powered=true": { + "model": "modernmetals:block/aluminum_button_pressed", + "y": 270 + }, + "face=wall,facing=west,powered=true": { + "model": "modernmetals:block/aluminum_button_pressed", + "x": 90, + "y": 270, + "uvlock": true + }, + "face=ceiling,facing=west,powered=true": { + "model": "modernmetals:block/aluminum_button_pressed", + "x": 180, + "y": 90 + }, + "face=floor,facing=east,powered=true": { + "model": "modernmetals:block/aluminum_button_pressed", + "y": 90 + }, + "face=wall,facing=east,powered=true": { + "model": "modernmetals:block/aluminum_button_pressed", + "x": 90, + "y": 90, + "uvlock": true + }, + "face=ceiling,facing=east,powered=true": { + "model": "modernmetals:block/aluminum_button_pressed", + "x": 180, + "y": 270 } + } } diff --git a/src/main/resources/assets/modernmetals/blockstates/aluminum_door.json b/src/main/resources/assets/modernmetals/blockstates/aluminum_door.json index 75eac791..c71cd534 100644 --- a/src/main/resources/assets/modernmetals/blockstates/aluminum_door.json +++ b/src/main/resources/assets/modernmetals/blockstates/aluminum_door.json @@ -1,70 +1,124 @@ { - "variants": { - "facing=east,half=lower,hinge=left,open=false,powered=false": { "model": "modernmetals:aluminum_door_bottom" }, - "facing=south,half=lower,hinge=left,open=false,powered=false": { "model": "modernmetals:aluminum_door_bottom", "y": 90 }, - "facing=west,half=lower,hinge=left,open=false,powered=false": { "model": "modernmetals:aluminum_door_bottom", "y": 180 }, - "facing=north,half=lower,hinge=left,open=false,powered=false": { "model": "modernmetals:aluminum_door_bottom", "y": 270 }, - "facing=east,half=lower,hinge=right,open=false,powered=false": { "model": "modernmetals:aluminum_door_bottom_rh" }, - "facing=south,half=lower,hinge=right,open=false,powered=false": { "model": "modernmetals:aluminum_door_bottom_rh", "y": 90 }, - "facing=west,half=lower,hinge=right,open=false,powered=false": { "model": "modernmetals:aluminum_door_bottom_rh", "y": 180 }, - "facing=north,half=lower,hinge=right,open=false,powered=false": { "model": "modernmetals:aluminum_door_bottom_rh", "y": 270 }, - "facing=east,half=lower,hinge=left,open=true,powered=false": { "model": "modernmetals:aluminum_door_bottom_rh", "y": 90 }, - "facing=south,half=lower,hinge=left,open=true,powered=false": { "model": "modernmetals:aluminum_door_bottom_rh", "y": 180 }, - "facing=west,half=lower,hinge=left,open=true,powered=false": { "model": "modernmetals:aluminum_door_bottom_rh", "y": 270 }, - "facing=north,half=lower,hinge=left,open=true,powered=false": { "model": "modernmetals:aluminum_door_bottom_rh" }, - "facing=east,half=lower,hinge=right,open=true,powered=false": { "model": "modernmetals:aluminum_door_bottom", "y": 270 }, - "facing=south,half=lower,hinge=right,open=true,powered=false": { "model": "modernmetals:aluminum_door_bottom" }, - "facing=west,half=lower,hinge=right,open=true,powered=false": { "model": "modernmetals:aluminum_door_bottom", "y": 90 }, - "facing=north,half=lower,hinge=right,open=true,powered=false": { "model": "modernmetals:aluminum_door_bottom", "y": 180 }, - "facing=east,half=upper,hinge=left,open=false,powered=false": { "model": "modernmetals:aluminum_door_top" }, - "facing=south,half=upper,hinge=left,open=false,powered=false": { "model": "modernmetals:aluminum_door_top", "y": 90 }, - "facing=west,half=upper,hinge=left,open=false,powered=false": { "model": "modernmetals:aluminum_door_top", "y": 180 }, - "facing=north,half=upper,hinge=left,open=false,powered=false": { "model": "modernmetals:aluminum_door_top", "y": 270 }, - "facing=east,half=upper,hinge=right,open=false,powered=false": { "model": "modernmetals:aluminum_door_top_rh" }, - "facing=south,half=upper,hinge=right,open=false,powered=false": { "model": "modernmetals:aluminum_door_top_rh", "y": 90 }, - "facing=west,half=upper,hinge=right,open=false,powered=false": { "model": "modernmetals:aluminum_door_top_rh", "y": 180 }, - "facing=north,half=upper,hinge=right,open=false,powered=false": { "model": "modernmetals:aluminum_door_top_rh", "y": 270 }, - "facing=east,half=upper,hinge=left,open=true,powered=false": { "model": "modernmetals:aluminum_door_top_rh", "y": 90 }, - "facing=south,half=upper,hinge=left,open=true,powered=false": { "model": "modernmetals:aluminum_door_top_rh", "y": 180 }, - "facing=west,half=upper,hinge=left,open=true,powered=false": { "model": "modernmetals:aluminum_door_top_rh", "y": 270 }, - "facing=north,half=upper,hinge=left,open=true,powered=false": { "model": "modernmetals:aluminum_door_top_rh" }, - "facing=east,half=upper,hinge=right,open=true,powered=false": { "model": "modernmetals:aluminum_door_top", "y": 270 }, - "facing=south,half=upper,hinge=right,open=true,powered=false": { "model": "modernmetals:aluminum_door_top" }, - "facing=west,half=upper,hinge=right,open=true,powered=false": { "model": "modernmetals:aluminum_door_top", "y": 90 }, - "facing=north,half=upper,hinge=right,open=true,powered=false": { "model": "modernmetals:aluminum_door_top", "y": 180 }, - - - "facing=east,half=lower,hinge=left,open=false,powered=true": { "model": "modernmetals:aluminum_door_bottom" }, - "facing=south,half=lower,hinge=left,open=false,powered=true": { "model": "modernmetals:aluminum_door_bottom", "y": 90 }, - "facing=west,half=lower,hinge=left,open=false,powered=true": { "model": "modernmetals:aluminum_door_bottom", "y": 180 }, - "facing=north,half=lower,hinge=left,open=false,powered=true": { "model": "modernmetals:aluminum_door_bottom", "y": 270 }, - "facing=east,half=lower,hinge=right,open=false,powered=true": { "model": "modernmetals:aluminum_door_bottom_rh" }, - "facing=south,half=lower,hinge=right,open=false,powered=true": { "model": "modernmetals:aluminum_door_bottom_rh", "y": 90 }, - "facing=west,half=lower,hinge=right,open=false,powered=true": { "model": "modernmetals:aluminum_door_bottom_rh", "y": 180 }, - "facing=north,half=lower,hinge=right,open=false,powered=true": { "model": "modernmetals:aluminum_door_bottom_rh", "y": 270 }, - "facing=east,half=lower,hinge=left,open=true,powered=true": { "model": "modernmetals:aluminum_door_bottom_rh", "y": 90 }, - "facing=south,half=lower,hinge=left,open=true,powered=true": { "model": "modernmetals:aluminum_door_bottom_rh", "y": 180 }, - "facing=west,half=lower,hinge=left,open=true,powered=true": { "model": "modernmetals:aluminum_door_bottom_rh", "y": 270 }, - "facing=north,half=lower,hinge=left,open=true,powered=true": { "model": "modernmetals:aluminum_door_bottom_rh" }, - "facing=east,half=lower,hinge=right,open=true,powered=true": { "model": "modernmetals:aluminum_door_bottom", "y": 270 }, - "facing=south,half=lower,hinge=right,open=true,powered=true": { "model": "modernmetals:aluminum_door_bottom" }, - "facing=west,half=lower,hinge=right,open=true,powered=true": { "model": "modernmetals:aluminum_door_bottom", "y": 90 }, - "facing=north,half=lower,hinge=right,open=true,powered=true": { "model": "modernmetals:aluminum_door_bottom", "y": 180 }, - "facing=east,half=upper,hinge=left,open=false,powered=true": { "model": "modernmetals:aluminum_door_top" }, - "facing=south,half=upper,hinge=left,open=false,powered=true": { "model": "modernmetals:aluminum_door_top", "y": 90 }, - "facing=west,half=upper,hinge=left,open=false,powered=true": { "model": "modernmetals:aluminum_door_top", "y": 180 }, - "facing=north,half=upper,hinge=left,open=false,powered=true": { "model": "modernmetals:aluminum_door_top", "y": 270 }, - "facing=east,half=upper,hinge=right,open=false,powered=true": { "model": "modernmetals:aluminum_door_top_rh" }, - "facing=south,half=upper,hinge=right,open=false,powered=true": { "model": "modernmetals:aluminum_door_top_rh", "y": 90 }, - "facing=west,half=upper,hinge=right,open=false,powered=true": { "model": "modernmetals:aluminum_door_top_rh", "y": 180 }, - "facing=north,half=upper,hinge=right,open=false,powered=true": { "model": "modernmetals:aluminum_door_top_rh", "y": 270 }, - "facing=east,half=upper,hinge=left,open=true,powered=true": { "model": "modernmetals:aluminum_door_top_rh", "y": 90 }, - "facing=south,half=upper,hinge=left,open=true,powered=true": { "model": "modernmetals:aluminum_door_top_rh", "y": 180 }, - "facing=west,half=upper,hinge=left,open=true,powered=true": { "model": "modernmetals:aluminum_door_top_rh", "y": 270 }, - "facing=north,half=upper,hinge=left,open=true,powered=true": { "model": "modernmetals:aluminum_door_top_rh" }, - "facing=east,half=upper,hinge=right,open=true,powered=true": { "model": "modernmetals:aluminum_door_top", "y": 270 }, - "facing=south,half=upper,hinge=right,open=true,powered=true": { "model": "modernmetals:aluminum_door_top" }, - "facing=west,half=upper,hinge=right,open=true,powered=true": { "model": "modernmetals:aluminum_door_top", "y": 90 }, - "facing=north,half=upper,hinge=right,open=true,powered=true": { "model": "modernmetals:aluminum_door_top", "y": 180 } + "variants": { + "facing=north,half=upper,hinge=left,open=false": { + "model": "modernmetals:block/aluminum_door_top", + "y": 270 + }, + "facing=south,half=upper,hinge=left,open=false": { + "model": "modernmetals:block/aluminum_door_top", + "y": 90 + }, + "facing=west,half=upper,hinge=left,open=false": { + "model": "modernmetals:block/aluminum_door_top", + "y": 180 + }, + "facing=east,half=upper,hinge=left,open=false": { + "model": "modernmetals:block/aluminum_door_top" + }, + "facing=north,half=lower,hinge=left,open=false": { + "model": "modernmetals:block/aluminum_door_bottom", + "y": 270 + }, + "facing=south,half=lower,hinge=left,open=false": { + "model": "modernmetals:block/aluminum_door_bottom", + "y": 90 + }, + "facing=west,half=lower,hinge=left,open=false": { + "model": "modernmetals:block/aluminum_door_bottom", + "y": 180 + }, + "facing=east,half=lower,hinge=left,open=false": { + "model": "modernmetals:block/aluminum_door_bottom" + }, + "facing=north,half=upper,hinge=right,open=false": { + "model": "modernmetals:block/aluminum_door_top_rh", + "y": 270 + }, + "facing=south,half=upper,hinge=right,open=false": { + "model": "modernmetals:block/aluminum_door_top_rh", + "y": 90 + }, + "facing=west,half=upper,hinge=right,open=false": { + "model": "modernmetals:block/aluminum_door_top_rh", + "y": 180 + }, + "facing=east,half=upper,hinge=right,open=false": { + "model": "modernmetals:block/aluminum_door_top_rh" + }, + "facing=north,half=lower,hinge=right,open=false": { + "model": "modernmetals:block/aluminum_door_bottom_rh", + "y": 270 + }, + "facing=south,half=lower,hinge=right,open=false": { + "model": "modernmetals:block/aluminum_door_bottom_rh", + "y": 90 + }, + "facing=west,half=lower,hinge=right,open=false": { + "model": "modernmetals:block/aluminum_door_bottom_rh", + "y": 180 + }, + "facing=east,half=lower,hinge=right,open=false": { + "model": "modernmetals:block/aluminum_door_bottom_rh" + }, + "facing=north,half=upper,hinge=left,open=true": { + "model": "modernmetals:block/aluminum_door_top_rh" + }, + "facing=south,half=upper,hinge=left,open=true": { + "model": "modernmetals:block/aluminum_door_top_rh", + "y": 180 + }, + "facing=west,half=upper,hinge=left,open=true": { + "model": "modernmetals:block/aluminum_door_top_rh", + "y": 270 + }, + "facing=east,half=upper,hinge=left,open=true": { + "model": "modernmetals:block/aluminum_door_top_rh", + "y": 90 + }, + "facing=north,half=lower,hinge=left,open=true": { + "model": "modernmetals:block/aluminum_door_bottom_rh" + }, + "facing=south,half=lower,hinge=left,open=true": { + "model": "modernmetals:block/aluminum_door_bottom_rh", + "y": 180 + }, + "facing=west,half=lower,hinge=left,open=true": { + "model": "modernmetals:block/aluminum_door_bottom_rh", + "y": 270 + }, + "facing=east,half=lower,hinge=left,open=true": { + "model": "modernmetals:block/aluminum_door_bottom_rh", + "y": 90 + }, + "facing=north,half=upper,hinge=right,open=true": { + "model": "modernmetals:block/aluminum_door_top", + "y": 180 + }, + "facing=south,half=upper,hinge=right,open=true": { + "model": "modernmetals:block/aluminum_door_top" + }, + "facing=west,half=upper,hinge=right,open=true": { + "model": "modernmetals:block/aluminum_door_top", + "y": 90 + }, + "facing=east,half=upper,hinge=right,open=true": { + "model": "modernmetals:block/aluminum_door_top", + "y": 270 + }, + "facing=north,half=lower,hinge=right,open=true": { + "model": "modernmetals:block/aluminum_door_bottom", + "y": 180 + }, + "facing=south,half=lower,hinge=right,open=true": { + "model": "modernmetals:block/aluminum_door_bottom" + }, + "facing=west,half=lower,hinge=right,open=true": { + "model": "modernmetals:block/aluminum_door_bottom", + "y": 90 + }, + "facing=east,half=lower,hinge=right,open=true": { + "model": "modernmetals:block/aluminum_door_bottom", + "y": 270 } + } } diff --git a/src/main/resources/assets/modernmetals/blockstates/aluminum_lever.json b/src/main/resources/assets/modernmetals/blockstates/aluminum_lever.json index ba360139..6d827235 100644 --- a/src/main/resources/assets/modernmetals/blockstates/aluminum_lever.json +++ b/src/main/resources/assets/modernmetals/blockstates/aluminum_lever.json @@ -1,20 +1,76 @@ { - "variants": { - "facing=down_z,powered=false": { "model": "modernmetals:aluminum_lever_off", "x": 180, "y": 180 }, - "facing=down_x,powered=false": { "model": "modernmetals:aluminum_lever_off", "x": 180, "y": 90 }, - "facing=up_z,powered=false": { "model": "modernmetals:aluminum_lever_off" }, - "facing=up_x,powered=false": { "model": "modernmetals:aluminum_lever_off", "y": 270 }, - "facing=east,powered=false": { "model": "modernmetals:aluminum_lever_off", "x": 90, "y": 90 }, - "facing=west,powered=false": { "model": "modernmetals:aluminum_lever_off", "x": 90, "y": 270 }, - "facing=south,powered=false" : { "model": "modernmetals:aluminum_lever_off", "x": 90, "y": 180 }, - "facing=north,powered=false" : { "model": "modernmetals:aluminum_lever_off", "x": 90 }, - "facing=down_z,powered=true" : { "model": "modernmetals:aluminum_lever", "x": 180, "y": 180 }, - "facing=down_x,powered=true" : { "model": "modernmetals:aluminum_lever", "x": 180, "y": 90 }, - "facing=up_z,powered=true": { "model": "modernmetals:aluminum_lever" }, - "facing=up_x,powered=true": { "model": "modernmetals:aluminum_lever", "y": 270 }, - "facing=east,powered=true": { "model": "modernmetals:aluminum_lever", "x": 90, "y": 90 }, - "facing=west,powered=true": { "model": "modernmetals:aluminum_lever", "x": 90, "y": 270 }, - "facing=south,powered=true": { "model": "modernmetals:aluminum_lever", "x": 90, "y": 180 }, - "facing=north,powered=true": { "model": "modernmetals:aluminum_lever", "x": 90 } + "variants": { + "face=floor,facing=north,powered=false": { + "model": "modernmetals:block/aluminum_lever_off" + }, + "face=wall,facing=north,powered=false": { + "model": "modernmetals:block/aluminum_lever_off" + }, + "face=ceiling,facing=north,powered=false": { + "model": "modernmetals:block/aluminum_lever_off" + }, + "face=floor,facing=south,powered=false": { + "model": "modernmetals:block/aluminum_lever_off" + }, + "face=wall,facing=south,powered=false": { + "model": "modernmetals:block/aluminum_lever_off" + }, + "face=ceiling,facing=south,powered=false": { + "model": "modernmetals:block/aluminum_lever_off" + }, + "face=floor,facing=west,powered=false": { + "model": "modernmetals:block/aluminum_lever_off" + }, + "face=wall,facing=west,powered=false": { + "model": "modernmetals:block/aluminum_lever_off" + }, + "face=ceiling,facing=west,powered=false": { + "model": "modernmetals:block/aluminum_lever_off" + }, + "face=floor,facing=east,powered=false": { + "model": "modernmetals:block/aluminum_lever_off" + }, + "face=wall,facing=east,powered=false": { + "model": "modernmetals:block/aluminum_lever_off" + }, + "face=ceiling,facing=east,powered=false": { + "model": "modernmetals:block/aluminum_lever_off" + }, + "face=floor,facing=north,powered=true": { + "model": "modernmetals:block/aluminum_lever" + }, + "face=wall,facing=north,powered=true": { + "model": "modernmetals:block/aluminum_lever" + }, + "face=ceiling,facing=north,powered=true": { + "model": "modernmetals:block/aluminum_lever" + }, + "face=floor,facing=south,powered=true": { + "model": "modernmetals:block/aluminum_lever" + }, + "face=wall,facing=south,powered=true": { + "model": "modernmetals:block/aluminum_lever" + }, + "face=ceiling,facing=south,powered=true": { + "model": "modernmetals:block/aluminum_lever" + }, + "face=floor,facing=west,powered=true": { + "model": "modernmetals:block/aluminum_lever" + }, + "face=wall,facing=west,powered=true": { + "model": "modernmetals:block/aluminum_lever" + }, + "face=ceiling,facing=west,powered=true": { + "model": "modernmetals:block/aluminum_lever" + }, + "face=floor,facing=east,powered=true": { + "model": "modernmetals:block/aluminum_lever" + }, + "face=wall,facing=east,powered=true": { + "model": "modernmetals:block/aluminum_lever" + }, + "face=ceiling,facing=east,powered=true": { + "model": "modernmetals:block/aluminum_lever" } + } } diff --git a/src/main/resources/assets/modernmetals/blockstates/aluminum_ore.json b/src/main/resources/assets/modernmetals/blockstates/aluminum_ore.json index 5c3eaa75..46c88ce6 100644 --- a/src/main/resources/assets/modernmetals/blockstates/aluminum_ore.json +++ b/src/main/resources/assets/modernmetals/blockstates/aluminum_ore.json @@ -1,5 +1,7 @@ { - "variants": { - "normal": { "model": "modernmetals:aluminum_ore" } + "variants": { + "": { + "model": "modernmetals:block/aluminum_ore" } + } } diff --git a/src/main/resources/assets/modernmetals/blockstates/aluminum_plate.json b/src/main/resources/assets/modernmetals/blockstates/aluminum_plate.json index f6c23e2c..2f612361 100644 --- a/src/main/resources/assets/modernmetals/blockstates/aluminum_plate.json +++ b/src/main/resources/assets/modernmetals/blockstates/aluminum_plate.json @@ -1,10 +1,27 @@ { - "variants": { - "facing=down": { "model": "modernmetals:aluminum_plate", "x": 90 }, - "facing=up": { "model": "modernmetals:aluminum_plate", "x": 270 }, - "facing=north": { "model": "modernmetals:aluminum_plate" }, - "facing=south": { "model": "modernmetals:aluminum_plate", "y": 180 }, - "facing=west": { "model": "modernmetals:aluminum_plate", "y": 270 }, - "facing=east": { "model": "modernmetals:aluminum_plate", "y": 90 } + "variants": { + "facing=down": { + "model": "modernmetals:block/aluminum_plate", + "x": 90 + }, + "facing=up": { + "model": "modernmetals:block/aluminum_plate", + "x": 270 + }, + "facing=north": { + "model": "modernmetals:block/aluminum_plate" + }, + "facing=south": { + "model": "modernmetals:block/aluminum_plate", + "y": 180 + }, + "facing=west": { + "model": "modernmetals:block/aluminum_plate", + "y": 270 + }, + "facing=east": { + "model": "modernmetals:block/aluminum_plate", + "y": 90 } + } } diff --git a/src/main/resources/assets/modernmetals/blockstates/aluminum_pressure_plate.json b/src/main/resources/assets/modernmetals/blockstates/aluminum_pressure_plate.json index baa2ecea..aa248a6f 100644 --- a/src/main/resources/assets/modernmetals/blockstates/aluminum_pressure_plate.json +++ b/src/main/resources/assets/modernmetals/blockstates/aluminum_pressure_plate.json @@ -1,6 +1,10 @@ { - "variants": { - "powered=false": { "model": "modernmetals:aluminum_pressure_plate_up" }, - "powered=true": { "model": "modernmetals:aluminum_pressure_plate_down" } + "variants": { + "powered=false": { + "model": "modernmetals:block/aluminum_pressure_plate_up" + }, + "powered=true": { + "model": "modernmetals:block/aluminum_pressure_plate_down" } + } } diff --git a/src/main/resources/assets/modernmetals/blockstates/aluminum_slab.json b/src/main/resources/assets/modernmetals/blockstates/aluminum_slab.json index d897a6ff..49310183 100644 --- a/src/main/resources/assets/modernmetals/blockstates/aluminum_slab.json +++ b/src/main/resources/assets/modernmetals/blockstates/aluminum_slab.json @@ -1,6 +1,13 @@ { - "variants": { - "half=bottom,variant=default": { "model": "modernmetals:half_slab_aluminum" }, - "half=top,variant=default": { "model": "modernmetals:upper_slab_aluminum" } + "variants": { + "type=top": { + "model": "modernmetals:block/upper_slab_aluminum" + }, + "type=bottom": { + "model": "modernmetals:block/half_slab_aluminum" + }, + "type=double": { + "model": "modernmetals:block/aluminum_block" } + } } diff --git a/src/main/resources/assets/modernmetals/blockstates/aluminum_stairs.json b/src/main/resources/assets/modernmetals/blockstates/aluminum_stairs.json index db5153a6..8f46afcc 100644 --- a/src/main/resources/assets/modernmetals/blockstates/aluminum_stairs.json +++ b/src/main/resources/assets/modernmetals/blockstates/aluminum_stairs.json @@ -1,44 +1,209 @@ { - "variants": { - "facing=east,half=bottom,shape=straight": { "model": "modernmetals:aluminum_stairs" }, - "facing=west,half=bottom,shape=straight": { "model": "modernmetals:aluminum_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=straight": { "model": "modernmetals:aluminum_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=straight": { "model": "modernmetals:aluminum_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_right": { "model": "modernmetals:aluminum_outer_stairs" }, - "facing=west,half=bottom,shape=outer_right": { "model": "modernmetals:aluminum_outer_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=outer_right": { "model": "modernmetals:aluminum_outer_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=outer_right": { "model": "modernmetals:aluminum_outer_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_left": { "model": "modernmetals:aluminum_outer_stairs", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=outer_left": { "model": "modernmetals:aluminum_outer_stairs", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=outer_left": { "model": "modernmetals:aluminum_outer_stairs" }, - "facing=north,half=bottom,shape=outer_left": { "model": "modernmetals:aluminum_outer_stairs", "y": 180, "uvlock": true }, - "facing=east,half=bottom,shape=inner_right": { "model": "modernmetals:aluminum_inner_stairs" }, - "facing=west,half=bottom,shape=inner_right": { "model": "modernmetals:aluminum_inner_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=inner_right": { "model": "modernmetals:aluminum_inner_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=inner_right": { "model": "modernmetals:aluminum_inner_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=inner_left": { "model": "modernmetals:aluminum_inner_stairs", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=inner_left": { "model": "modernmetals:aluminum_inner_stairs", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=inner_left": { "model": "modernmetals:aluminum_inner_stairs" }, - "facing=north,half=bottom,shape=inner_left": { "model": "modernmetals:aluminum_inner_stairs", "y": 180, "uvlock": true }, - "facing=east,half=top,shape=straight": { "model": "modernmetals:aluminum_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=straight": { "model": "modernmetals:aluminum_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=straight": { "model": "modernmetals:aluminum_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=straight": { "model": "modernmetals:aluminum_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { "model": "modernmetals:aluminum_outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_right": { "model": "modernmetals:aluminum_outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { "model": "modernmetals:aluminum_outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { "model": "modernmetals:aluminum_outer_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { "model": "modernmetals:aluminum_outer_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { "model": "modernmetals:aluminum_outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { "model": "modernmetals:aluminum_outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=outer_left": { "model": "modernmetals:aluminum_outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { "model": "modernmetals:aluminum_inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { "model": "modernmetals:aluminum_inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { "model": "modernmetals:aluminum_inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { "model": "modernmetals:aluminum_inner_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { "model": "modernmetals:aluminum_inner_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { "model": "modernmetals:aluminum_inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { "model": "modernmetals:aluminum_inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { "model": "modernmetals:aluminum_inner_stairs", "x": 180, "y": 270, "uvlock": true } + "variants": { + "facing=north,half=top,shape=straight": { + "model": "modernmetals:block/aluminum_stairs", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=south,half=top,shape=straight": { + "model": "modernmetals:block/aluminum_stairs", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=west,half=top,shape=straight": { + "model": "modernmetals:block/aluminum_stairs", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=east,half=top,shape=straight": { + "model": "modernmetals:block/aluminum_stairs", + "x": 180, + "uvlock": true + }, + "facing=north,half=bottom,shape=straight": { + "model": "modernmetals:block/aluminum_stairs", + "y": 270, + "uvlock": true + }, + "facing=south,half=bottom,shape=straight": { + "model": "modernmetals:block/aluminum_stairs", + "y": 90, + "uvlock": true + }, + "facing=west,half=bottom,shape=straight": { + "model": "modernmetals:block/aluminum_stairs", + "y": 180, + "uvlock": true + }, + "facing=east,half=bottom,shape=straight": { + "model": "modernmetals:block/aluminum_stairs" + }, + "facing=north,half=top,shape=inner_left": { + "model": "modernmetals:block/aluminum_inner_stairs", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=south,half=top,shape=inner_left": { + "model": "modernmetals:block/aluminum_inner_stairs", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=west,half=top,shape=inner_left": { + "model": "modernmetals:block/aluminum_inner_stairs", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=east,half=top,shape=inner_left": { + "model": "modernmetals:block/aluminum_inner_stairs", + "x": 180, + "uvlock": true + }, + "facing=north,half=bottom,shape=inner_left": { + "model": "modernmetals:block/aluminum_inner_stairs", + "y": 180, + "uvlock": true + }, + "facing=south,half=bottom,shape=inner_left": { + "model": "modernmetals:block/aluminum_inner_stairs" + }, + "facing=west,half=bottom,shape=inner_left": { + "model": "modernmetals:block/aluminum_inner_stairs", + "y": 90, + "uvlock": true + }, + "facing=east,half=bottom,shape=inner_left": { + "model": "modernmetals:block/aluminum_inner_stairs", + "y": 270, + "uvlock": true + }, + "facing=north,half=top,shape=inner_right": { + "model": "modernmetals:block/aluminum_inner_stairs", + "x": 180, + "uvlock": true + }, + "facing=south,half=top,shape=inner_right": { + "model": "modernmetals:block/aluminum_inner_stairs", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=west,half=top,shape=inner_right": { + "model": "modernmetals:block/aluminum_inner_stairs", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=east,half=top,shape=inner_right": { + "model": "modernmetals:block/aluminum_inner_stairs", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=north,half=bottom,shape=inner_right": { + "model": "modernmetals:block/aluminum_inner_stairs", + "y": 270, + "uvlock": true + }, + "facing=south,half=bottom,shape=inner_right": { + "model": "modernmetals:block/aluminum_inner_stairs", + "y": 90, + "uvlock": true + }, + "facing=west,half=bottom,shape=inner_right": { + "model": "modernmetals:block/aluminum_inner_stairs", + "y": 180, + "uvlock": true + }, + "facing=east,half=bottom,shape=inner_right": { + "model": "modernmetals:block/aluminum_inner_stairs" + }, + "facing=north,half=top,shape=outer_left": { + "model": "modernmetals:block/aluminum_outer_stairs", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=south,half=top,shape=outer_left": { + "model": "modernmetals:block/aluminum_outer_stairs", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=west,half=top,shape=outer_left": { + "model": "modernmetals:block/aluminum_outer_stairs", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=east,half=top,shape=outer_left": { + "model": "modernmetals:block/aluminum_outer_stairs", + "x": 180, + "uvlock": true + }, + "facing=north,half=bottom,shape=outer_left": { + "model": "modernmetals:block/aluminum_outer_stairs", + "y": 180, + "uvlock": true + }, + "facing=south,half=bottom,shape=outer_left": { + "model": "modernmetals:block/aluminum_outer_stairs" + }, + "facing=west,half=bottom,shape=outer_left": { + "model": "modernmetals:block/aluminum_outer_stairs", + "y": 90, + "uvlock": true + }, + "facing=east,half=bottom,shape=outer_left": { + "model": "modernmetals:block/aluminum_outer_stairs", + "y": 270, + "uvlock": true + }, + "facing=north,half=top,shape=outer_right": { + "model": "modernmetals:block/aluminum_outer_stairs", + "x": 180, + "uvlock": true + }, + "facing=south,half=top,shape=outer_right": { + "model": "modernmetals:block/aluminum_outer_stairs", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=west,half=top,shape=outer_right": { + "model": "modernmetals:block/aluminum_outer_stairs", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=east,half=top,shape=outer_right": { + "model": "modernmetals:block/aluminum_outer_stairs", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=north,half=bottom,shape=outer_right": { + "model": "modernmetals:block/aluminum_outer_stairs", + "y": 270, + "uvlock": true + }, + "facing=south,half=bottom,shape=outer_right": { + "model": "modernmetals:block/aluminum_outer_stairs", + "y": 90, + "uvlock": true + }, + "facing=west,half=bottom,shape=outer_right": { + "model": "modernmetals:block/aluminum_outer_stairs", + "y": 180, + "uvlock": true + }, + "facing=east,half=bottom,shape=outer_right": { + "model": "modernmetals:block/aluminum_outer_stairs" } + } } diff --git a/src/main/resources/assets/modernmetals/blockstates/aluminum_trapdoor.json b/src/main/resources/assets/modernmetals/blockstates/aluminum_trapdoor.json index d714cbd2..faa6609b 100644 --- a/src/main/resources/assets/modernmetals/blockstates/aluminum_trapdoor.json +++ b/src/main/resources/assets/modernmetals/blockstates/aluminum_trapdoor.json @@ -1,20 +1,68 @@ { - "variants": { - "facing=north,half=bottom,open=false": { "model": "modernmetals:aluminum_trapdoor_bottom" }, - "facing=south,half=bottom,open=false": { "model": "modernmetals:aluminum_trapdoor_bottom" }, - "facing=east,half=bottom,open=false": { "model": "modernmetals:aluminum_trapdoor_bottom" }, - "facing=west,half=bottom,open=false": { "model": "modernmetals:aluminum_trapdoor_bottom" }, - "facing=north,half=top,open=false": { "model": "modernmetals:aluminum_trapdoor_top" }, - "facing=south,half=top,open=false": { "model": "modernmetals:aluminum_trapdoor_top" }, - "facing=east,half=top,open=false": { "model": "modernmetals:aluminum_trapdoor_top" }, - "facing=west,half=top,open=false": { "model": "modernmetals:aluminum_trapdoor_top" }, - "facing=north,half=bottom,open=true": { "model": "modernmetals:aluminum_trapdoor_open" }, - "facing=south,half=bottom,open=true": { "model": "modernmetals:aluminum_trapdoor_open", "y": 180 }, - "facing=east,half=bottom,open=true": { "model": "modernmetals:aluminum_trapdoor_open", "y": 90 }, - "facing=west,half=bottom,open=true": { "model": "modernmetals:aluminum_trapdoor_open", "y": 270 }, - "facing=north,half=top,open=true": { "model": "modernmetals:aluminum_trapdoor_open" }, - "facing=south,half=top,open=true": { "model": "modernmetals:aluminum_trapdoor_open", "y": 180 }, - "facing=east,half=top,open=true": { "model": "modernmetals:aluminum_trapdoor_open", "y": 90 }, - "facing=west,half=top,open=true": { "model": "modernmetals:aluminum_trapdoor_open", "y": 270 } + "variants": { + "facing=north,half=top,open=false": { + "model": "modernmetals:block/aluminum_trapdoor_top" + }, + "facing=south,half=top,open=false": { + "model": "modernmetals:block/aluminum_trapdoor_top", + "y": 180 + }, + "facing=west,half=top,open=false": { + "model": "modernmetals:block/aluminum_trapdoor_top", + "y": 270 + }, + "facing=east,half=top,open=false": { + "model": "modernmetals:block/aluminum_trapdoor_top", + "y": 90 + }, + "facing=north,half=bottom,open=false": { + "model": "modernmetals:block/aluminum_trapdoor_bottom" + }, + "facing=south,half=bottom,open=false": { + "model": "modernmetals:block/aluminum_trapdoor_bottom", + "y": 180 + }, + "facing=west,half=bottom,open=false": { + "model": "modernmetals:block/aluminum_trapdoor_bottom", + "y": 270 + }, + "facing=east,half=bottom,open=false": { + "model": "modernmetals:block/aluminum_trapdoor_bottom", + "y": 90 + }, + "facing=north,half=top,open=true": { + "model": "modernmetals:block/aluminum_trapdoor_open", + "x": 180, + "y": 180 + }, + "facing=south,half=top,open=true": { + "model": "modernmetals:block/aluminum_trapdoor_open", + "x": 180 + }, + "facing=west,half=top,open=true": { + "model": "modernmetals:block/aluminum_trapdoor_open", + "x": 180, + "y": 90 + }, + "facing=east,half=top,open=true": { + "model": "modernmetals:block/aluminum_trapdoor_open", + "x": 180, + "y": 270 + }, + "facing=north,half=bottom,open=true": { + "model": "modernmetals:block/aluminum_trapdoor_open" + }, + "facing=south,half=bottom,open=true": { + "model": "modernmetals:block/aluminum_trapdoor_open", + "y": 180 + }, + "facing=west,half=bottom,open=true": { + "model": "modernmetals:block/aluminum_trapdoor_open", + "y": 270 + }, + "facing=east,half=bottom,open=true": { + "model": "modernmetals:block/aluminum_trapdoor_open", + "y": 90 } + } } diff --git a/src/main/resources/assets/modernmetals/blockstates/aluminum_wall.json b/src/main/resources/assets/modernmetals/blockstates/aluminum_wall.json index 4d5dea2e..b896183f 100644 --- a/src/main/resources/assets/modernmetals/blockstates/aluminum_wall.json +++ b/src/main/resources/assets/modernmetals/blockstates/aluminum_wall.json @@ -1,19 +1,51 @@ { - "multipart": [ - { "when": { "up": "true" }, - "apply": { "model": "modernmetals:aluminum_wall_post" } - }, - { "when": { "north": "true" }, - "apply": { "model": "modernmetals:aluminum_wall_side", "uvlock": true } - }, - { "when": { "east": "true" }, - "apply": { "model": "modernmetals:aluminum_wall_side", "y": 90, "uvlock": true } - }, - { "when": { "south": "true" }, - "apply": { "model": "modernmetals:aluminum_wall_side", "y": 180, "uvlock": true } - }, - { "when": { "west": "true" }, - "apply": { "model": "modernmetals:aluminum_wall_side", "y": 270, "uvlock": true } - } - ] + "multipart": [ + { + "when": { + "up": "true" + }, + "apply": { + "model": "modernmetals:block/aluminum_wall_post" + } + }, + { + "when": { + "north": "true" + }, + "apply": { + "model": "modernmetals:block/aluminum_wall_side", + "uvlock": true + } + }, + { + "when": { + "east": "true" + }, + "apply": { + "model": "modernmetals:block/aluminum_wall_side", + "y": 90, + "uvlock": true + } + }, + { + "when": { + "south": "true" + }, + "apply": { + "model": "modernmetals:block/aluminum_wall_side", + "y": 180, + "uvlock": true + } + }, + { + "when": { + "west": "true" + }, + "apply": { + "model": "modernmetals:block/aluminum_wall_side", + "y": 270, + "uvlock": true + } + } + ] } diff --git a/src/main/resources/assets/modernmetals/blockstates/aluminumbrass.json b/src/main/resources/assets/modernmetals/blockstates/aluminumbrass.json index 7376359c..c93d5db4 100644 --- a/src/main/resources/assets/modernmetals/blockstates/aluminumbrass.json +++ b/src/main/resources/assets/modernmetals/blockstates/aluminumbrass.json @@ -1,9 +1,10 @@ { - "forge_marker": 1, - "variants": { - "fluid": { - "model": "forge:fluid", - "custom": { "fluid": "aluminumbrass" } - } + "variants": { + "": { + "model": "minecraft:block/water", + "custom": { + "fluid": "modernmetals:aluminumbrass" + } } -} \ No newline at end of file + } +} diff --git a/src/main/resources/assets/modernmetals/blockstates/aluminumbrass_bars.json b/src/main/resources/assets/modernmetals/blockstates/aluminumbrass_bars.json index 44cbda66..789858a1 100644 --- a/src/main/resources/assets/modernmetals/blockstates/aluminumbrass_bars.json +++ b/src/main/resources/assets/modernmetals/blockstates/aluminumbrass_bars.json @@ -1,32 +1,77 @@ { - "multipart": [ - { "apply": { "model": "modernmetals:aluminumbrass_bars_post_ends" }}, - { "when": { "north": false, "east": false, "south": false, "west": false }, - "apply": { "model": "modernmetals:aluminumbrass_bars_post" } - }, - { "when": { "north": true, "east": false, "south": false, "west": false }, - "apply": { "model": "modernmetals:aluminumbrass_bars_cap" } - }, - { "when": { "north": false, "east": true, "south": false, "west": false }, - "apply": { "model": "modernmetals:aluminumbrass_bars_cap", "y": 90 } - }, - { "when": { "north": false, "east": false, "south": true, "west": false }, - "apply": { "model": "modernmetals:aluminumbrass_bars_cap_alt" } - }, - { "when": { "north": false, "east": false, "south": false, "west": true }, - "apply": { "model": "modernmetals:aluminumbrass_bars_cap_alt", "y": 90 } - }, - { "when": { "north": true }, - "apply": { "model": "modernmetals:aluminumbrass_bars_side" } - }, - { "when": { "east": true }, - "apply": { "model": "modernmetals:aluminumbrass_bars_side", "y": 90 } - }, - { "when": { "south": true }, - "apply": { "model": "modernmetals:aluminumbrass_bars_side_alt" } - }, - { "when": { "west": true }, - "apply": { "model": "modernmetals:aluminumbrass_bars_side_alt", "y": 90 } - } - ] + "multipart": [ + { + "apply": { + "model": "modernmetals:block/aluminumbrass_bars_post" + } + }, + { + "when": { + "north": "true" + }, + "apply": { + "model": "modernmetals:block/aluminumbrass_bars_side" + } + }, + { + "when": { + "north": "false" + }, + "apply": { + "model": "modernmetals:block/aluminumbrass_bars_cap" + } + }, + { + "when": { + "south": "true" + }, + "apply": { + "model": "modernmetals:block/aluminumbrass_bars_side_alt" + } + }, + { + "when": { + "south": "false" + }, + "apply": { + "model": "modernmetals:block/aluminumbrass_bars_cap_alt", + "y": 90 + } + }, + { + "when": { + "west": "true" + }, + "apply": { + "model": "modernmetals:block/aluminumbrass_bars_side_alt", + "y": 90 + } + }, + { + "when": { + "west": "false" + }, + "apply": { + "model": "modernmetals:block/aluminumbrass_bars_cap", + "y": 270 + } + }, + { + "when": { + "east": "true" + }, + "apply": { + "model": "modernmetals:block/aluminumbrass_bars_side", + "y": 90 + } + }, + { + "when": { + "east": "false" + }, + "apply": { + "model": "modernmetals:block/aluminumbrass_bars_cap_alt" + } + } + ] } diff --git a/src/main/resources/assets/modernmetals/blockstates/aluminumbrass_block.json b/src/main/resources/assets/modernmetals/blockstates/aluminumbrass_block.json index 69769da6..63ec7c4c 100644 --- a/src/main/resources/assets/modernmetals/blockstates/aluminumbrass_block.json +++ b/src/main/resources/assets/modernmetals/blockstates/aluminumbrass_block.json @@ -1,5 +1,7 @@ { - "variants": { - "normal": { "model": "modernmetals:aluminumbrass_block" } + "variants": { + "": { + "model": "modernmetals:block/aluminumbrass_block" } + } } diff --git a/src/main/resources/assets/modernmetals/blockstates/aluminumbrass_button.json b/src/main/resources/assets/modernmetals/blockstates/aluminumbrass_button.json index d8b5f667..e856ff6c 100644 --- a/src/main/resources/assets/modernmetals/blockstates/aluminumbrass_button.json +++ b/src/main/resources/assets/modernmetals/blockstates/aluminumbrass_button.json @@ -1,16 +1,118 @@ { - "variants": { - "facing=up,powered=false": { "model": "modernmetals:aluminumbrass_button", "uvlock": true }, - "facing=down,powered=false": { "model": "modernmetals:aluminumbrass_button", "uvlock": true, "x": 180 }, - "facing=east,powered=false": { "model": "modernmetals:aluminumbrass_button", "uvlock": true, "x": 90, "y": 90 }, - "facing=west,powered=false": { "model": "modernmetals:aluminumbrass_button", "uvlock": true, "x": 90, "y": 270 }, - "facing=south,powered=false": { "model": "modernmetals:aluminumbrass_button", "uvlock": true, "x": 90, "y": 180 }, - "facing=north,powered=false": { "model": "modernmetals:aluminumbrass_button", "uvlock": true, "x": 90 }, - "facing=up,powered=true": { "model": "modernmetals:aluminumbrass_button_pressed", "uvlock": true }, - "facing=down,powered=true": { "model": "modernmetals:aluminumbrass_button_pressed", "uvlock": true, "x": 180 }, - "facing=east,powered=true": { "model": "modernmetals:aluminumbrass_button_pressed", "uvlock": true, "x": 90, "y": 90 }, - "facing=west,powered=true": { "model": "modernmetals:aluminumbrass_button_pressed", "uvlock": true, "x": 90, "y": 270 }, - "facing=south,powered=true": { "model": "modernmetals:aluminumbrass_button_pressed", "uvlock": true, "x": 90, "y": 180 }, - "facing=north,powered=true": { "model": "modernmetals:aluminumbrass_button_pressed", "uvlock": true, "x": 90 } + "variants": { + "face=floor,facing=north,powered=false": { + "model": "modernmetals:block/aluminumbrass_button" + }, + "face=wall,facing=north,powered=false": { + "model": "modernmetals:block/aluminumbrass_button", + "x": 90, + "uvlock": true + }, + "face=ceiling,facing=north,powered=false": { + "model": "modernmetals:block/aluminumbrass_button", + "x": 180, + "y": 180 + }, + "face=floor,facing=south,powered=false": { + "model": "modernmetals:block/aluminumbrass_button", + "y": 180 + }, + "face=wall,facing=south,powered=false": { + "model": "modernmetals:block/aluminumbrass_button", + "x": 90, + "y": 180, + "uvlock": true + }, + "face=ceiling,facing=south,powered=false": { + "model": "modernmetals:block/aluminumbrass_button", + "x": 180 + }, + "face=floor,facing=west,powered=false": { + "model": "modernmetals:block/aluminumbrass_button", + "y": 270 + }, + "face=wall,facing=west,powered=false": { + "model": "modernmetals:block/aluminumbrass_button", + "x": 90, + "y": 270, + "uvlock": true + }, + "face=ceiling,facing=west,powered=false": { + "model": "modernmetals:block/aluminumbrass_button", + "x": 180, + "y": 90 + }, + "face=floor,facing=east,powered=false": { + "model": "modernmetals:block/aluminumbrass_button", + "y": 90 + }, + "face=wall,facing=east,powered=false": { + "model": "modernmetals:block/aluminumbrass_button", + "x": 90, + "y": 90, + "uvlock": true + }, + "face=ceiling,facing=east,powered=false": { + "model": "modernmetals:block/aluminumbrass_button", + "x": 180, + "y": 270 + }, + "face=floor,facing=north,powered=true": { + "model": "modernmetals:block/aluminumbrass_button_pressed" + }, + "face=wall,facing=north,powered=true": { + "model": "modernmetals:block/aluminumbrass_button_pressed", + "x": 90, + "uvlock": true + }, + "face=ceiling,facing=north,powered=true": { + "model": "modernmetals:block/aluminumbrass_button_pressed", + "x": 180, + "y": 180 + }, + "face=floor,facing=south,powered=true": { + "model": "modernmetals:block/aluminumbrass_button_pressed", + "y": 180 + }, + "face=wall,facing=south,powered=true": { + "model": "modernmetals:block/aluminumbrass_button_pressed", + "x": 90, + "y": 180, + "uvlock": true + }, + "face=ceiling,facing=south,powered=true": { + "model": "modernmetals:block/aluminumbrass_button_pressed", + "x": 180 + }, + "face=floor,facing=west,powered=true": { + "model": "modernmetals:block/aluminumbrass_button_pressed", + "y": 270 + }, + "face=wall,facing=west,powered=true": { + "model": "modernmetals:block/aluminumbrass_button_pressed", + "x": 90, + "y": 270, + "uvlock": true + }, + "face=ceiling,facing=west,powered=true": { + "model": "modernmetals:block/aluminumbrass_button_pressed", + "x": 180, + "y": 90 + }, + "face=floor,facing=east,powered=true": { + "model": "modernmetals:block/aluminumbrass_button_pressed", + "y": 90 + }, + "face=wall,facing=east,powered=true": { + "model": "modernmetals:block/aluminumbrass_button_pressed", + "x": 90, + "y": 90, + "uvlock": true + }, + "face=ceiling,facing=east,powered=true": { + "model": "modernmetals:block/aluminumbrass_button_pressed", + "x": 180, + "y": 270 } + } } diff --git a/src/main/resources/assets/modernmetals/blockstates/aluminumbrass_door.json b/src/main/resources/assets/modernmetals/blockstates/aluminumbrass_door.json index eba56a35..a54c0a6b 100644 --- a/src/main/resources/assets/modernmetals/blockstates/aluminumbrass_door.json +++ b/src/main/resources/assets/modernmetals/blockstates/aluminumbrass_door.json @@ -1,70 +1,124 @@ { - "variants": { - "facing=east,half=lower,hinge=left,open=false,powered=false": { "model": "modernmetals:aluminumbrass_door_bottom" }, - "facing=south,half=lower,hinge=left,open=false,powered=false": { "model": "modernmetals:aluminumbrass_door_bottom", "y": 90 }, - "facing=west,half=lower,hinge=left,open=false,powered=false": { "model": "modernmetals:aluminumbrass_door_bottom", "y": 180 }, - "facing=north,half=lower,hinge=left,open=false,powered=false": { "model": "modernmetals:aluminumbrass_door_bottom", "y": 270 }, - "facing=east,half=lower,hinge=right,open=false,powered=false": { "model": "modernmetals:aluminumbrass_door_bottom_rh" }, - "facing=south,half=lower,hinge=right,open=false,powered=false": { "model": "modernmetals:aluminumbrass_door_bottom_rh", "y": 90 }, - "facing=west,half=lower,hinge=right,open=false,powered=false": { "model": "modernmetals:aluminumbrass_door_bottom_rh", "y": 180 }, - "facing=north,half=lower,hinge=right,open=false,powered=false": { "model": "modernmetals:aluminumbrass_door_bottom_rh", "y": 270 }, - "facing=east,half=lower,hinge=left,open=true,powered=false": { "model": "modernmetals:aluminumbrass_door_bottom_rh", "y": 90 }, - "facing=south,half=lower,hinge=left,open=true,powered=false": { "model": "modernmetals:aluminumbrass_door_bottom_rh", "y": 180 }, - "facing=west,half=lower,hinge=left,open=true,powered=false": { "model": "modernmetals:aluminumbrass_door_bottom_rh", "y": 270 }, - "facing=north,half=lower,hinge=left,open=true,powered=false": { "model": "modernmetals:aluminumbrass_door_bottom_rh" }, - "facing=east,half=lower,hinge=right,open=true,powered=false": { "model": "modernmetals:aluminumbrass_door_bottom", "y": 270 }, - "facing=south,half=lower,hinge=right,open=true,powered=false": { "model": "modernmetals:aluminumbrass_door_bottom" }, - "facing=west,half=lower,hinge=right,open=true,powered=false": { "model": "modernmetals:aluminumbrass_door_bottom", "y": 90 }, - "facing=north,half=lower,hinge=right,open=true,powered=false": { "model": "modernmetals:aluminumbrass_door_bottom", "y": 180 }, - "facing=east,half=upper,hinge=left,open=false,powered=false": { "model": "modernmetals:aluminumbrass_door_top" }, - "facing=south,half=upper,hinge=left,open=false,powered=false": { "model": "modernmetals:aluminumbrass_door_top", "y": 90 }, - "facing=west,half=upper,hinge=left,open=false,powered=false": { "model": "modernmetals:aluminumbrass_door_top", "y": 180 }, - "facing=north,half=upper,hinge=left,open=false,powered=false": { "model": "modernmetals:aluminumbrass_door_top", "y": 270 }, - "facing=east,half=upper,hinge=right,open=false,powered=false": { "model": "modernmetals:aluminumbrass_door_top_rh" }, - "facing=south,half=upper,hinge=right,open=false,powered=false": { "model": "modernmetals:aluminumbrass_door_top_rh", "y": 90 }, - "facing=west,half=upper,hinge=right,open=false,powered=false": { "model": "modernmetals:aluminumbrass_door_top_rh", "y": 180 }, - "facing=north,half=upper,hinge=right,open=false,powered=false": { "model": "modernmetals:aluminumbrass_door_top_rh", "y": 270 }, - "facing=east,half=upper,hinge=left,open=true,powered=false": { "model": "modernmetals:aluminumbrass_door_top_rh", "y": 90 }, - "facing=south,half=upper,hinge=left,open=true,powered=false": { "model": "modernmetals:aluminumbrass_door_top_rh", "y": 180 }, - "facing=west,half=upper,hinge=left,open=true,powered=false": { "model": "modernmetals:aluminumbrass_door_top_rh", "y": 270 }, - "facing=north,half=upper,hinge=left,open=true,powered=false": { "model": "modernmetals:aluminumbrass_door_top_rh" }, - "facing=east,half=upper,hinge=right,open=true,powered=false": { "model": "modernmetals:aluminumbrass_door_top", "y": 270 }, - "facing=south,half=upper,hinge=right,open=true,powered=false": { "model": "modernmetals:aluminumbrass_door_top" }, - "facing=west,half=upper,hinge=right,open=true,powered=false": { "model": "modernmetals:aluminumbrass_door_top", "y": 90 }, - "facing=north,half=upper,hinge=right,open=true,powered=false": { "model": "modernmetals:aluminumbrass_door_top", "y": 180 }, - - - "facing=east,half=lower,hinge=left,open=false,powered=true": { "model": "modernmetals:aluminumbrass_door_bottom" }, - "facing=south,half=lower,hinge=left,open=false,powered=true": { "model": "modernmetals:aluminumbrass_door_bottom", "y": 90 }, - "facing=west,half=lower,hinge=left,open=false,powered=true": { "model": "modernmetals:aluminumbrass_door_bottom", "y": 180 }, - "facing=north,half=lower,hinge=left,open=false,powered=true": { "model": "modernmetals:aluminumbrass_door_bottom", "y": 270 }, - "facing=east,half=lower,hinge=right,open=false,powered=true": { "model": "modernmetals:aluminumbrass_door_bottom_rh" }, - "facing=south,half=lower,hinge=right,open=false,powered=true": { "model": "modernmetals:aluminumbrass_door_bottom_rh", "y": 90 }, - "facing=west,half=lower,hinge=right,open=false,powered=true": { "model": "modernmetals:aluminumbrass_door_bottom_rh", "y": 180 }, - "facing=north,half=lower,hinge=right,open=false,powered=true": { "model": "modernmetals:aluminumbrass_door_bottom_rh", "y": 270 }, - "facing=east,half=lower,hinge=left,open=true,powered=true": { "model": "modernmetals:aluminumbrass_door_bottom_rh", "y": 90 }, - "facing=south,half=lower,hinge=left,open=true,powered=true": { "model": "modernmetals:aluminumbrass_door_bottom_rh", "y": 180 }, - "facing=west,half=lower,hinge=left,open=true,powered=true": { "model": "modernmetals:aluminumbrass_door_bottom_rh", "y": 270 }, - "facing=north,half=lower,hinge=left,open=true,powered=true": { "model": "modernmetals:aluminumbrass_door_bottom_rh" }, - "facing=east,half=lower,hinge=right,open=true,powered=true": { "model": "modernmetals:aluminumbrass_door_bottom", "y": 270 }, - "facing=south,half=lower,hinge=right,open=true,powered=true": { "model": "modernmetals:aluminumbrass_door_bottom" }, - "facing=west,half=lower,hinge=right,open=true,powered=true": { "model": "modernmetals:aluminumbrass_door_bottom", "y": 90 }, - "facing=north,half=lower,hinge=right,open=true,powered=true": { "model": "modernmetals:aluminumbrass_door_bottom", "y": 180 }, - "facing=east,half=upper,hinge=left,open=false,powered=true": { "model": "modernmetals:aluminumbrass_door_top" }, - "facing=south,half=upper,hinge=left,open=false,powered=true": { "model": "modernmetals:aluminumbrass_door_top", "y": 90 }, - "facing=west,half=upper,hinge=left,open=false,powered=true": { "model": "modernmetals:aluminumbrass_door_top", "y": 180 }, - "facing=north,half=upper,hinge=left,open=false,powered=true": { "model": "modernmetals:aluminumbrass_door_top", "y": 270 }, - "facing=east,half=upper,hinge=right,open=false,powered=true": { "model": "modernmetals:aluminumbrass_door_top_rh" }, - "facing=south,half=upper,hinge=right,open=false,powered=true": { "model": "modernmetals:aluminumbrass_door_top_rh", "y": 90 }, - "facing=west,half=upper,hinge=right,open=false,powered=true": { "model": "modernmetals:aluminumbrass_door_top_rh", "y": 180 }, - "facing=north,half=upper,hinge=right,open=false,powered=true": { "model": "modernmetals:aluminumbrass_door_top_rh", "y": 270 }, - "facing=east,half=upper,hinge=left,open=true,powered=true": { "model": "modernmetals:aluminumbrass_door_top_rh", "y": 90 }, - "facing=south,half=upper,hinge=left,open=true,powered=true": { "model": "modernmetals:aluminumbrass_door_top_rh", "y": 180 }, - "facing=west,half=upper,hinge=left,open=true,powered=true": { "model": "modernmetals:aluminumbrass_door_top_rh", "y": 270 }, - "facing=north,half=upper,hinge=left,open=true,powered=true": { "model": "modernmetals:aluminumbrass_door_top_rh" }, - "facing=east,half=upper,hinge=right,open=true,powered=true": { "model": "modernmetals:aluminumbrass_door_top", "y": 270 }, - "facing=south,half=upper,hinge=right,open=true,powered=true": { "model": "modernmetals:aluminumbrass_door_top" }, - "facing=west,half=upper,hinge=right,open=true,powered=true": { "model": "modernmetals:aluminumbrass_door_top", "y": 90 }, - "facing=north,half=upper,hinge=right,open=true,powered=true": { "model": "modernmetals:aluminumbrass_door_top", "y": 180 } + "variants": { + "facing=north,half=upper,hinge=left,open=false": { + "model": "modernmetals:block/aluminumbrass_door_top", + "y": 270 + }, + "facing=south,half=upper,hinge=left,open=false": { + "model": "modernmetals:block/aluminumbrass_door_top", + "y": 90 + }, + "facing=west,half=upper,hinge=left,open=false": { + "model": "modernmetals:block/aluminumbrass_door_top", + "y": 180 + }, + "facing=east,half=upper,hinge=left,open=false": { + "model": "modernmetals:block/aluminumbrass_door_top" + }, + "facing=north,half=lower,hinge=left,open=false": { + "model": "modernmetals:block/aluminumbrass_door_bottom", + "y": 270 + }, + "facing=south,half=lower,hinge=left,open=false": { + "model": "modernmetals:block/aluminumbrass_door_bottom", + "y": 90 + }, + "facing=west,half=lower,hinge=left,open=false": { + "model": "modernmetals:block/aluminumbrass_door_bottom", + "y": 180 + }, + "facing=east,half=lower,hinge=left,open=false": { + "model": "modernmetals:block/aluminumbrass_door_bottom" + }, + "facing=north,half=upper,hinge=right,open=false": { + "model": "modernmetals:block/aluminumbrass_door_top_rh", + "y": 270 + }, + "facing=south,half=upper,hinge=right,open=false": { + "model": "modernmetals:block/aluminumbrass_door_top_rh", + "y": 90 + }, + "facing=west,half=upper,hinge=right,open=false": { + "model": "modernmetals:block/aluminumbrass_door_top_rh", + "y": 180 + }, + "facing=east,half=upper,hinge=right,open=false": { + "model": "modernmetals:block/aluminumbrass_door_top_rh" + }, + "facing=north,half=lower,hinge=right,open=false": { + "model": "modernmetals:block/aluminumbrass_door_bottom_rh", + "y": 270 + }, + "facing=south,half=lower,hinge=right,open=false": { + "model": "modernmetals:block/aluminumbrass_door_bottom_rh", + "y": 90 + }, + "facing=west,half=lower,hinge=right,open=false": { + "model": "modernmetals:block/aluminumbrass_door_bottom_rh", + "y": 180 + }, + "facing=east,half=lower,hinge=right,open=false": { + "model": "modernmetals:block/aluminumbrass_door_bottom_rh" + }, + "facing=north,half=upper,hinge=left,open=true": { + "model": "modernmetals:block/aluminumbrass_door_top_rh" + }, + "facing=south,half=upper,hinge=left,open=true": { + "model": "modernmetals:block/aluminumbrass_door_top_rh", + "y": 180 + }, + "facing=west,half=upper,hinge=left,open=true": { + "model": "modernmetals:block/aluminumbrass_door_top_rh", + "y": 270 + }, + "facing=east,half=upper,hinge=left,open=true": { + "model": "modernmetals:block/aluminumbrass_door_top_rh", + "y": 90 + }, + "facing=north,half=lower,hinge=left,open=true": { + "model": "modernmetals:block/aluminumbrass_door_bottom_rh" + }, + "facing=south,half=lower,hinge=left,open=true": { + "model": "modernmetals:block/aluminumbrass_door_bottom_rh", + "y": 180 + }, + "facing=west,half=lower,hinge=left,open=true": { + "model": "modernmetals:block/aluminumbrass_door_bottom_rh", + "y": 270 + }, + "facing=east,half=lower,hinge=left,open=true": { + "model": "modernmetals:block/aluminumbrass_door_bottom_rh", + "y": 90 + }, + "facing=north,half=upper,hinge=right,open=true": { + "model": "modernmetals:block/aluminumbrass_door_top", + "y": 180 + }, + "facing=south,half=upper,hinge=right,open=true": { + "model": "modernmetals:block/aluminumbrass_door_top" + }, + "facing=west,half=upper,hinge=right,open=true": { + "model": "modernmetals:block/aluminumbrass_door_top", + "y": 90 + }, + "facing=east,half=upper,hinge=right,open=true": { + "model": "modernmetals:block/aluminumbrass_door_top", + "y": 270 + }, + "facing=north,half=lower,hinge=right,open=true": { + "model": "modernmetals:block/aluminumbrass_door_bottom", + "y": 180 + }, + "facing=south,half=lower,hinge=right,open=true": { + "model": "modernmetals:block/aluminumbrass_door_bottom" + }, + "facing=west,half=lower,hinge=right,open=true": { + "model": "modernmetals:block/aluminumbrass_door_bottom", + "y": 90 + }, + "facing=east,half=lower,hinge=right,open=true": { + "model": "modernmetals:block/aluminumbrass_door_bottom", + "y": 270 } + } } diff --git a/src/main/resources/assets/modernmetals/blockstates/aluminumbrass_lever.json b/src/main/resources/assets/modernmetals/blockstates/aluminumbrass_lever.json index 923993a1..7491715c 100644 --- a/src/main/resources/assets/modernmetals/blockstates/aluminumbrass_lever.json +++ b/src/main/resources/assets/modernmetals/blockstates/aluminumbrass_lever.json @@ -1,20 +1,76 @@ { - "variants": { - "facing=down_z,powered=false": { "model": "modernmetals:aluminumbrass_lever_off", "x": 180, "y": 180 }, - "facing=down_x,powered=false": { "model": "modernmetals:aluminumbrass_lever_off", "x": 180, "y": 90 }, - "facing=up_z,powered=false": { "model": "modernmetals:aluminumbrass_lever_off" }, - "facing=up_x,powered=false": { "model": "modernmetals:aluminumbrass_lever_off", "y": 270 }, - "facing=east,powered=false": { "model": "modernmetals:aluminumbrass_lever_off", "x": 90, "y": 90 }, - "facing=west,powered=false": { "model": "modernmetals:aluminumbrass_lever_off", "x": 90, "y": 270 }, - "facing=south,powered=false" : { "model": "modernmetals:aluminumbrass_lever_off", "x": 90, "y": 180 }, - "facing=north,powered=false" : { "model": "modernmetals:aluminumbrass_lever_off", "x": 90 }, - "facing=down_z,powered=true" : { "model": "modernmetals:aluminumbrass_lever", "x": 180, "y": 180 }, - "facing=down_x,powered=true" : { "model": "modernmetals:aluminumbrass_lever", "x": 180, "y": 90 }, - "facing=up_z,powered=true": { "model": "modernmetals:aluminumbrass_lever" }, - "facing=up_x,powered=true": { "model": "modernmetals:aluminumbrass_lever", "y": 270 }, - "facing=east,powered=true": { "model": "modernmetals:aluminumbrass_lever", "x": 90, "y": 90 }, - "facing=west,powered=true": { "model": "modernmetals:aluminumbrass_lever", "x": 90, "y": 270 }, - "facing=south,powered=true": { "model": "modernmetals:aluminumbrass_lever", "x": 90, "y": 180 }, - "facing=north,powered=true": { "model": "modernmetals:aluminumbrass_lever", "x": 90 } + "variants": { + "face=floor,facing=north,powered=false": { + "model": "modernmetals:block/aluminumbrass_lever_off" + }, + "face=wall,facing=north,powered=false": { + "model": "modernmetals:block/aluminumbrass_lever_off" + }, + "face=ceiling,facing=north,powered=false": { + "model": "modernmetals:block/aluminumbrass_lever_off" + }, + "face=floor,facing=south,powered=false": { + "model": "modernmetals:block/aluminumbrass_lever_off" + }, + "face=wall,facing=south,powered=false": { + "model": "modernmetals:block/aluminumbrass_lever_off" + }, + "face=ceiling,facing=south,powered=false": { + "model": "modernmetals:block/aluminumbrass_lever_off" + }, + "face=floor,facing=west,powered=false": { + "model": "modernmetals:block/aluminumbrass_lever_off" + }, + "face=wall,facing=west,powered=false": { + "model": "modernmetals:block/aluminumbrass_lever_off" + }, + "face=ceiling,facing=west,powered=false": { + "model": "modernmetals:block/aluminumbrass_lever_off" + }, + "face=floor,facing=east,powered=false": { + "model": "modernmetals:block/aluminumbrass_lever_off" + }, + "face=wall,facing=east,powered=false": { + "model": "modernmetals:block/aluminumbrass_lever_off" + }, + "face=ceiling,facing=east,powered=false": { + "model": "modernmetals:block/aluminumbrass_lever_off" + }, + "face=floor,facing=north,powered=true": { + "model": "modernmetals:block/aluminumbrass_lever" + }, + "face=wall,facing=north,powered=true": { + "model": "modernmetals:block/aluminumbrass_lever" + }, + "face=ceiling,facing=north,powered=true": { + "model": "modernmetals:block/aluminumbrass_lever" + }, + "face=floor,facing=south,powered=true": { + "model": "modernmetals:block/aluminumbrass_lever" + }, + "face=wall,facing=south,powered=true": { + "model": "modernmetals:block/aluminumbrass_lever" + }, + "face=ceiling,facing=south,powered=true": { + "model": "modernmetals:block/aluminumbrass_lever" + }, + "face=floor,facing=west,powered=true": { + "model": "modernmetals:block/aluminumbrass_lever" + }, + "face=wall,facing=west,powered=true": { + "model": "modernmetals:block/aluminumbrass_lever" + }, + "face=ceiling,facing=west,powered=true": { + "model": "modernmetals:block/aluminumbrass_lever" + }, + "face=floor,facing=east,powered=true": { + "model": "modernmetals:block/aluminumbrass_lever" + }, + "face=wall,facing=east,powered=true": { + "model": "modernmetals:block/aluminumbrass_lever" + }, + "face=ceiling,facing=east,powered=true": { + "model": "modernmetals:block/aluminumbrass_lever" } + } } diff --git a/src/main/resources/assets/modernmetals/blockstates/aluminumbrass_plate.json b/src/main/resources/assets/modernmetals/blockstates/aluminumbrass_plate.json index 2f986bc3..4d997364 100644 --- a/src/main/resources/assets/modernmetals/blockstates/aluminumbrass_plate.json +++ b/src/main/resources/assets/modernmetals/blockstates/aluminumbrass_plate.json @@ -1,10 +1,27 @@ { - "variants": { - "facing=down": { "model": "modernmetals:aluminumbrass_plate", "x": 90 }, - "facing=up": { "model": "modernmetals:aluminumbrass_plate", "x": 270 }, - "facing=north": { "model": "modernmetals:aluminumbrass_plate" }, - "facing=south": { "model": "modernmetals:aluminumbrass_plate", "y": 180 }, - "facing=west": { "model": "modernmetals:aluminumbrass_plate", "y": 270 }, - "facing=east": { "model": "modernmetals:aluminumbrass_plate", "y": 90 } + "variants": { + "facing=down": { + "model": "modernmetals:block/aluminumbrass_plate", + "x": 90 + }, + "facing=up": { + "model": "modernmetals:block/aluminumbrass_plate", + "x": 270 + }, + "facing=north": { + "model": "modernmetals:block/aluminumbrass_plate" + }, + "facing=south": { + "model": "modernmetals:block/aluminumbrass_plate", + "y": 180 + }, + "facing=west": { + "model": "modernmetals:block/aluminumbrass_plate", + "y": 270 + }, + "facing=east": { + "model": "modernmetals:block/aluminumbrass_plate", + "y": 90 } + } } diff --git a/src/main/resources/assets/modernmetals/blockstates/aluminumbrass_pressure_plate.json b/src/main/resources/assets/modernmetals/blockstates/aluminumbrass_pressure_plate.json index a52c956e..8f90a4bf 100644 --- a/src/main/resources/assets/modernmetals/blockstates/aluminumbrass_pressure_plate.json +++ b/src/main/resources/assets/modernmetals/blockstates/aluminumbrass_pressure_plate.json @@ -1,6 +1,10 @@ { - "variants": { - "powered=false": { "model": "modernmetals:aluminumbrass_pressure_plate_up" }, - "powered=true": { "model": "modernmetals:aluminumbrass_pressure_plate_down" } + "variants": { + "powered=false": { + "model": "modernmetals:block/aluminumbrass_pressure_plate_up" + }, + "powered=true": { + "model": "modernmetals:block/aluminumbrass_pressure_plate_down" } + } } diff --git a/src/main/resources/assets/modernmetals/blockstates/aluminumbrass_slab.json b/src/main/resources/assets/modernmetals/blockstates/aluminumbrass_slab.json index f4d468e2..4c4db8a4 100644 --- a/src/main/resources/assets/modernmetals/blockstates/aluminumbrass_slab.json +++ b/src/main/resources/assets/modernmetals/blockstates/aluminumbrass_slab.json @@ -1,6 +1,13 @@ { - "variants": { - "half=bottom,variant=default": { "model": "modernmetals:half_slab_aluminumbrass" }, - "half=top,variant=default": { "model": "modernmetals:upper_slab_aluminumbrass" } + "variants": { + "type=top": { + "model": "modernmetals:block/upper_slab_aluminumbrass" + }, + "type=bottom": { + "model": "modernmetals:block/half_slab_aluminumbrass" + }, + "type=double": { + "model": "modernmetals:block/aluminumbrass_block" } + } } diff --git a/src/main/resources/assets/modernmetals/blockstates/aluminumbrass_stairs.json b/src/main/resources/assets/modernmetals/blockstates/aluminumbrass_stairs.json index 380da1f9..eacef7dc 100644 --- a/src/main/resources/assets/modernmetals/blockstates/aluminumbrass_stairs.json +++ b/src/main/resources/assets/modernmetals/blockstates/aluminumbrass_stairs.json @@ -1,44 +1,209 @@ { - "variants": { - "facing=east,half=bottom,shape=straight": { "model": "modernmetals:aluminumbrass_stairs" }, - "facing=west,half=bottom,shape=straight": { "model": "modernmetals:aluminumbrass_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=straight": { "model": "modernmetals:aluminumbrass_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=straight": { "model": "modernmetals:aluminumbrass_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_right": { "model": "modernmetals:aluminumbrass_outer_stairs" }, - "facing=west,half=bottom,shape=outer_right": { "model": "modernmetals:aluminumbrass_outer_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=outer_right": { "model": "modernmetals:aluminumbrass_outer_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=outer_right": { "model": "modernmetals:aluminumbrass_outer_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_left": { "model": "modernmetals:aluminumbrass_outer_stairs", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=outer_left": { "model": "modernmetals:aluminumbrass_outer_stairs", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=outer_left": { "model": "modernmetals:aluminumbrass_outer_stairs" }, - "facing=north,half=bottom,shape=outer_left": { "model": "modernmetals:aluminumbrass_outer_stairs", "y": 180, "uvlock": true }, - "facing=east,half=bottom,shape=inner_right": { "model": "modernmetals:aluminumbrass_inner_stairs" }, - "facing=west,half=bottom,shape=inner_right": { "model": "modernmetals:aluminumbrass_inner_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=inner_right": { "model": "modernmetals:aluminumbrass_inner_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=inner_right": { "model": "modernmetals:aluminumbrass_inner_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=inner_left": { "model": "modernmetals:aluminumbrass_inner_stairs", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=inner_left": { "model": "modernmetals:aluminumbrass_inner_stairs", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=inner_left": { "model": "modernmetals:aluminumbrass_inner_stairs" }, - "facing=north,half=bottom,shape=inner_left": { "model": "modernmetals:aluminumbrass_inner_stairs", "y": 180, "uvlock": true }, - "facing=east,half=top,shape=straight": { "model": "modernmetals:aluminumbrass_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=straight": { "model": "modernmetals:aluminumbrass_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=straight": { "model": "modernmetals:aluminumbrass_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=straight": { "model": "modernmetals:aluminumbrass_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { "model": "modernmetals:aluminumbrass_outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_right": { "model": "modernmetals:aluminumbrass_outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { "model": "modernmetals:aluminumbrass_outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { "model": "modernmetals:aluminumbrass_outer_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { "model": "modernmetals:aluminumbrass_outer_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { "model": "modernmetals:aluminumbrass_outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { "model": "modernmetals:aluminumbrass_outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=outer_left": { "model": "modernmetals:aluminumbrass_outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { "model": "modernmetals:aluminumbrass_inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { "model": "modernmetals:aluminumbrass_inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { "model": "modernmetals:aluminumbrass_inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { "model": "modernmetals:aluminumbrass_inner_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { "model": "modernmetals:aluminumbrass_inner_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { "model": "modernmetals:aluminumbrass_inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { "model": "modernmetals:aluminumbrass_inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { "model": "modernmetals:aluminumbrass_inner_stairs", "x": 180, "y": 270, "uvlock": true } + "variants": { + "facing=north,half=top,shape=straight": { + "model": "modernmetals:block/aluminumbrass_stairs", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=south,half=top,shape=straight": { + "model": "modernmetals:block/aluminumbrass_stairs", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=west,half=top,shape=straight": { + "model": "modernmetals:block/aluminumbrass_stairs", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=east,half=top,shape=straight": { + "model": "modernmetals:block/aluminumbrass_stairs", + "x": 180, + "uvlock": true + }, + "facing=north,half=bottom,shape=straight": { + "model": "modernmetals:block/aluminumbrass_stairs", + "y": 270, + "uvlock": true + }, + "facing=south,half=bottom,shape=straight": { + "model": "modernmetals:block/aluminumbrass_stairs", + "y": 90, + "uvlock": true + }, + "facing=west,half=bottom,shape=straight": { + "model": "modernmetals:block/aluminumbrass_stairs", + "y": 180, + "uvlock": true + }, + "facing=east,half=bottom,shape=straight": { + "model": "modernmetals:block/aluminumbrass_stairs" + }, + "facing=north,half=top,shape=inner_left": { + "model": "modernmetals:block/aluminumbrass_inner_stairs", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=south,half=top,shape=inner_left": { + "model": "modernmetals:block/aluminumbrass_inner_stairs", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=west,half=top,shape=inner_left": { + "model": "modernmetals:block/aluminumbrass_inner_stairs", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=east,half=top,shape=inner_left": { + "model": "modernmetals:block/aluminumbrass_inner_stairs", + "x": 180, + "uvlock": true + }, + "facing=north,half=bottom,shape=inner_left": { + "model": "modernmetals:block/aluminumbrass_inner_stairs", + "y": 180, + "uvlock": true + }, + "facing=south,half=bottom,shape=inner_left": { + "model": "modernmetals:block/aluminumbrass_inner_stairs" + }, + "facing=west,half=bottom,shape=inner_left": { + "model": "modernmetals:block/aluminumbrass_inner_stairs", + "y": 90, + "uvlock": true + }, + "facing=east,half=bottom,shape=inner_left": { + "model": "modernmetals:block/aluminumbrass_inner_stairs", + "y": 270, + "uvlock": true + }, + "facing=north,half=top,shape=inner_right": { + "model": "modernmetals:block/aluminumbrass_inner_stairs", + "x": 180, + "uvlock": true + }, + "facing=south,half=top,shape=inner_right": { + "model": "modernmetals:block/aluminumbrass_inner_stairs", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=west,half=top,shape=inner_right": { + "model": "modernmetals:block/aluminumbrass_inner_stairs", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=east,half=top,shape=inner_right": { + "model": "modernmetals:block/aluminumbrass_inner_stairs", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=north,half=bottom,shape=inner_right": { + "model": "modernmetals:block/aluminumbrass_inner_stairs", + "y": 270, + "uvlock": true + }, + "facing=south,half=bottom,shape=inner_right": { + "model": "modernmetals:block/aluminumbrass_inner_stairs", + "y": 90, + "uvlock": true + }, + "facing=west,half=bottom,shape=inner_right": { + "model": "modernmetals:block/aluminumbrass_inner_stairs", + "y": 180, + "uvlock": true + }, + "facing=east,half=bottom,shape=inner_right": { + "model": "modernmetals:block/aluminumbrass_inner_stairs" + }, + "facing=north,half=top,shape=outer_left": { + "model": "modernmetals:block/aluminumbrass_outer_stairs", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=south,half=top,shape=outer_left": { + "model": "modernmetals:block/aluminumbrass_outer_stairs", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=west,half=top,shape=outer_left": { + "model": "modernmetals:block/aluminumbrass_outer_stairs", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=east,half=top,shape=outer_left": { + "model": "modernmetals:block/aluminumbrass_outer_stairs", + "x": 180, + "uvlock": true + }, + "facing=north,half=bottom,shape=outer_left": { + "model": "modernmetals:block/aluminumbrass_outer_stairs", + "y": 180, + "uvlock": true + }, + "facing=south,half=bottom,shape=outer_left": { + "model": "modernmetals:block/aluminumbrass_outer_stairs" + }, + "facing=west,half=bottom,shape=outer_left": { + "model": "modernmetals:block/aluminumbrass_outer_stairs", + "y": 90, + "uvlock": true + }, + "facing=east,half=bottom,shape=outer_left": { + "model": "modernmetals:block/aluminumbrass_outer_stairs", + "y": 270, + "uvlock": true + }, + "facing=north,half=top,shape=outer_right": { + "model": "modernmetals:block/aluminumbrass_outer_stairs", + "x": 180, + "uvlock": true + }, + "facing=south,half=top,shape=outer_right": { + "model": "modernmetals:block/aluminumbrass_outer_stairs", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=west,half=top,shape=outer_right": { + "model": "modernmetals:block/aluminumbrass_outer_stairs", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=east,half=top,shape=outer_right": { + "model": "modernmetals:block/aluminumbrass_outer_stairs", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=north,half=bottom,shape=outer_right": { + "model": "modernmetals:block/aluminumbrass_outer_stairs", + "y": 270, + "uvlock": true + }, + "facing=south,half=bottom,shape=outer_right": { + "model": "modernmetals:block/aluminumbrass_outer_stairs", + "y": 90, + "uvlock": true + }, + "facing=west,half=bottom,shape=outer_right": { + "model": "modernmetals:block/aluminumbrass_outer_stairs", + "y": 180, + "uvlock": true + }, + "facing=east,half=bottom,shape=outer_right": { + "model": "modernmetals:block/aluminumbrass_outer_stairs" } + } } diff --git a/src/main/resources/assets/modernmetals/blockstates/aluminumbrass_trapdoor.json b/src/main/resources/assets/modernmetals/blockstates/aluminumbrass_trapdoor.json index 8c929cbf..4f87d405 100644 --- a/src/main/resources/assets/modernmetals/blockstates/aluminumbrass_trapdoor.json +++ b/src/main/resources/assets/modernmetals/blockstates/aluminumbrass_trapdoor.json @@ -1,20 +1,68 @@ { - "variants": { - "facing=north,half=bottom,open=false": { "model": "modernmetals:aluminumbrass_trapdoor_bottom" }, - "facing=south,half=bottom,open=false": { "model": "modernmetals:aluminumbrass_trapdoor_bottom" }, - "facing=east,half=bottom,open=false": { "model": "modernmetals:aluminumbrass_trapdoor_bottom" }, - "facing=west,half=bottom,open=false": { "model": "modernmetals:aluminumbrass_trapdoor_bottom" }, - "facing=north,half=top,open=false": { "model": "modernmetals:aluminumbrass_trapdoor_top" }, - "facing=south,half=top,open=false": { "model": "modernmetals:aluminumbrass_trapdoor_top" }, - "facing=east,half=top,open=false": { "model": "modernmetals:aluminumbrass_trapdoor_top" }, - "facing=west,half=top,open=false": { "model": "modernmetals:aluminumbrass_trapdoor_top" }, - "facing=north,half=bottom,open=true": { "model": "modernmetals:aluminumbrass_trapdoor_open" }, - "facing=south,half=bottom,open=true": { "model": "modernmetals:aluminumbrass_trapdoor_open", "y": 180 }, - "facing=east,half=bottom,open=true": { "model": "modernmetals:aluminumbrass_trapdoor_open", "y": 90 }, - "facing=west,half=bottom,open=true": { "model": "modernmetals:aluminumbrass_trapdoor_open", "y": 270 }, - "facing=north,half=top,open=true": { "model": "modernmetals:aluminumbrass_trapdoor_open" }, - "facing=south,half=top,open=true": { "model": "modernmetals:aluminumbrass_trapdoor_open", "y": 180 }, - "facing=east,half=top,open=true": { "model": "modernmetals:aluminumbrass_trapdoor_open", "y": 90 }, - "facing=west,half=top,open=true": { "model": "modernmetals:aluminumbrass_trapdoor_open", "y": 270 } + "variants": { + "facing=north,half=top,open=false": { + "model": "modernmetals:block/aluminumbrass_trapdoor_top" + }, + "facing=south,half=top,open=false": { + "model": "modernmetals:block/aluminumbrass_trapdoor_top", + "y": 180 + }, + "facing=west,half=top,open=false": { + "model": "modernmetals:block/aluminumbrass_trapdoor_top", + "y": 270 + }, + "facing=east,half=top,open=false": { + "model": "modernmetals:block/aluminumbrass_trapdoor_top", + "y": 90 + }, + "facing=north,half=bottom,open=false": { + "model": "modernmetals:block/aluminumbrass_trapdoor_bottom" + }, + "facing=south,half=bottom,open=false": { + "model": "modernmetals:block/aluminumbrass_trapdoor_bottom", + "y": 180 + }, + "facing=west,half=bottom,open=false": { + "model": "modernmetals:block/aluminumbrass_trapdoor_bottom", + "y": 270 + }, + "facing=east,half=bottom,open=false": { + "model": "modernmetals:block/aluminumbrass_trapdoor_bottom", + "y": 90 + }, + "facing=north,half=top,open=true": { + "model": "modernmetals:block/aluminumbrass_trapdoor_open", + "x": 180, + "y": 180 + }, + "facing=south,half=top,open=true": { + "model": "modernmetals:block/aluminumbrass_trapdoor_open", + "x": 180 + }, + "facing=west,half=top,open=true": { + "model": "modernmetals:block/aluminumbrass_trapdoor_open", + "x": 180, + "y": 90 + }, + "facing=east,half=top,open=true": { + "model": "modernmetals:block/aluminumbrass_trapdoor_open", + "x": 180, + "y": 270 + }, + "facing=north,half=bottom,open=true": { + "model": "modernmetals:block/aluminumbrass_trapdoor_open" + }, + "facing=south,half=bottom,open=true": { + "model": "modernmetals:block/aluminumbrass_trapdoor_open", + "y": 180 + }, + "facing=west,half=bottom,open=true": { + "model": "modernmetals:block/aluminumbrass_trapdoor_open", + "y": 270 + }, + "facing=east,half=bottom,open=true": { + "model": "modernmetals:block/aluminumbrass_trapdoor_open", + "y": 90 } + } } diff --git a/src/main/resources/assets/modernmetals/blockstates/aluminumbrass_wall.json b/src/main/resources/assets/modernmetals/blockstates/aluminumbrass_wall.json index 40dc672a..260d5a76 100644 --- a/src/main/resources/assets/modernmetals/blockstates/aluminumbrass_wall.json +++ b/src/main/resources/assets/modernmetals/blockstates/aluminumbrass_wall.json @@ -1,19 +1,51 @@ { - "multipart": [ - { "when": { "up": "true" }, - "apply": { "model": "modernmetals:aluminumbrass_wall_post" } - }, - { "when": { "north": "true" }, - "apply": { "model": "modernmetals:aluminumbrass_wall_side", "uvlock": true } - }, - { "when": { "east": "true" }, - "apply": { "model": "modernmetals:aluminumbrass_wall_side", "y": 90, "uvlock": true } - }, - { "when": { "south": "true" }, - "apply": { "model": "modernmetals:aluminumbrass_wall_side", "y": 180, "uvlock": true } - }, - { "when": { "west": "true" }, - "apply": { "model": "modernmetals:aluminumbrass_wall_side", "y": 270, "uvlock": true } - } - ] + "multipart": [ + { + "when": { + "up": "true" + }, + "apply": { + "model": "modernmetals:block/aluminumbrass_wall_post" + } + }, + { + "when": { + "north": "true" + }, + "apply": { + "model": "modernmetals:block/aluminumbrass_wall_side", + "uvlock": true + } + }, + { + "when": { + "east": "true" + }, + "apply": { + "model": "modernmetals:block/aluminumbrass_wall_side", + "y": 90, + "uvlock": true + } + }, + { + "when": { + "south": "true" + }, + "apply": { + "model": "modernmetals:block/aluminumbrass_wall_side", + "y": 180, + "uvlock": true + } + }, + { + "when": { + "west": "true" + }, + "apply": { + "model": "modernmetals:block/aluminumbrass_wall_side", + "y": 270, + "uvlock": true + } + } + ] } diff --git a/src/main/resources/assets/modernmetals/blockstates/beryllium.json b/src/main/resources/assets/modernmetals/blockstates/beryllium.json index fca7fc49..409e0d28 100644 --- a/src/main/resources/assets/modernmetals/blockstates/beryllium.json +++ b/src/main/resources/assets/modernmetals/blockstates/beryllium.json @@ -1,9 +1,10 @@ { - "forge_marker": 1, - "variants": { - "fluid": { - "model": "forge:fluid", - "custom": { "fluid": "beryllium" } - } + "variants": { + "": { + "model": "minecraft:block/water", + "custom": { + "fluid": "modernmetals:beryllium" + } } + } } diff --git a/src/main/resources/assets/modernmetals/blockstates/beryllium_bars.json b/src/main/resources/assets/modernmetals/blockstates/beryllium_bars.json index 30e9c6e1..94cc8ab7 100644 --- a/src/main/resources/assets/modernmetals/blockstates/beryllium_bars.json +++ b/src/main/resources/assets/modernmetals/blockstates/beryllium_bars.json @@ -1,32 +1,77 @@ { - "multipart": [ - { "apply": { "model": "modernmetals:beryllium_bars_post_ends" }}, - { "when": { "north": false, "east": false, "south": false, "west": false }, - "apply": { "model": "modernmetals:beryllium_bars_post" } - }, - { "when": { "north": true, "east": false, "south": false, "west": false }, - "apply": { "model": "modernmetals:beryllium_bars_cap" } - }, - { "when": { "north": false, "east": true, "south": false, "west": false }, - "apply": { "model": "modernmetals:beryllium_bars_cap", "y": 90 } - }, - { "when": { "north": false, "east": false, "south": true, "west": false }, - "apply": { "model": "modernmetals:beryllium_bars_cap_alt" } - }, - { "when": { "north": false, "east": false, "south": false, "west": true }, - "apply": { "model": "modernmetals:beryllium_bars_cap_alt", "y": 90 } - }, - { "when": { "north": true }, - "apply": { "model": "modernmetals:beryllium_bars_side" } - }, - { "when": { "east": true }, - "apply": { "model": "modernmetals:beryllium_bars_side", "y": 90 } - }, - { "when": { "south": true }, - "apply": { "model": "modernmetals:beryllium_bars_side_alt" } - }, - { "when": { "west": true }, - "apply": { "model": "modernmetals:beryllium_bars_side_alt", "y": 90 } - } - ] + "multipart": [ + { + "apply": { + "model": "modernmetals:block/beryllium_bars_post" + } + }, + { + "when": { + "north": "true" + }, + "apply": { + "model": "modernmetals:block/beryllium_bars_side" + } + }, + { + "when": { + "north": "false" + }, + "apply": { + "model": "modernmetals:block/beryllium_bars_cap" + } + }, + { + "when": { + "south": "true" + }, + "apply": { + "model": "modernmetals:block/beryllium_bars_side_alt" + } + }, + { + "when": { + "south": "false" + }, + "apply": { + "model": "modernmetals:block/beryllium_bars_cap_alt", + "y": 90 + } + }, + { + "when": { + "west": "true" + }, + "apply": { + "model": "modernmetals:block/beryllium_bars_side_alt", + "y": 90 + } + }, + { + "when": { + "west": "false" + }, + "apply": { + "model": "modernmetals:block/beryllium_bars_cap", + "y": 270 + } + }, + { + "when": { + "east": "true" + }, + "apply": { + "model": "modernmetals:block/beryllium_bars_side", + "y": 90 + } + }, + { + "when": { + "east": "false" + }, + "apply": { + "model": "modernmetals:block/beryllium_bars_cap_alt" + } + } + ] } diff --git a/src/main/resources/assets/modernmetals/blockstates/beryllium_block.json b/src/main/resources/assets/modernmetals/blockstates/beryllium_block.json index 7055e2f1..5b6ada55 100644 --- a/src/main/resources/assets/modernmetals/blockstates/beryllium_block.json +++ b/src/main/resources/assets/modernmetals/blockstates/beryllium_block.json @@ -1,5 +1,7 @@ { - "variants": { - "normal": { "model": "modernmetals:beryllium_block" } + "variants": { + "": { + "model": "modernmetals:block/beryllium_block" } + } } diff --git a/src/main/resources/assets/modernmetals/blockstates/beryllium_button.json b/src/main/resources/assets/modernmetals/blockstates/beryllium_button.json index d66baf78..0491f5e3 100644 --- a/src/main/resources/assets/modernmetals/blockstates/beryllium_button.json +++ b/src/main/resources/assets/modernmetals/blockstates/beryllium_button.json @@ -1,16 +1,118 @@ { - "variants": { - "facing=up,powered=false": { "model": "modernmetals:beryllium_button", "uvlock": true }, - "facing=down,powered=false": { "model": "modernmetals:beryllium_button", "uvlock": true, "x": 180 }, - "facing=east,powered=false": { "model": "modernmetals:beryllium_button", "uvlock": true, "x": 90, "y": 90 }, - "facing=west,powered=false": { "model": "modernmetals:beryllium_button", "uvlock": true, "x": 90, "y": 270 }, - "facing=south,powered=false": { "model": "modernmetals:beryllium_button", "uvlock": true, "x": 90, "y": 180 }, - "facing=north,powered=false": { "model": "modernmetals:beryllium_button", "uvlock": true, "x": 90 }, - "facing=up,powered=true": { "model": "modernmetals:beryllium_button_pressed", "uvlock": true }, - "facing=down,powered=true": { "model": "modernmetals:beryllium_button_pressed", "uvlock": true, "x": 180 }, - "facing=east,powered=true": { "model": "modernmetals:beryllium_button_pressed", "uvlock": true, "x": 90, "y": 90 }, - "facing=west,powered=true": { "model": "modernmetals:beryllium_button_pressed", "uvlock": true, "x": 90, "y": 270 }, - "facing=south,powered=true": { "model": "modernmetals:beryllium_button_pressed", "uvlock": true, "x": 90, "y": 180 }, - "facing=north,powered=true": { "model": "modernmetals:beryllium_button_pressed", "uvlock": true, "x": 90 } + "variants": { + "face=floor,facing=north,powered=false": { + "model": "modernmetals:block/beryllium_button" + }, + "face=wall,facing=north,powered=false": { + "model": "modernmetals:block/beryllium_button", + "x": 90, + "uvlock": true + }, + "face=ceiling,facing=north,powered=false": { + "model": "modernmetals:block/beryllium_button", + "x": 180, + "y": 180 + }, + "face=floor,facing=south,powered=false": { + "model": "modernmetals:block/beryllium_button", + "y": 180 + }, + "face=wall,facing=south,powered=false": { + "model": "modernmetals:block/beryllium_button", + "x": 90, + "y": 180, + "uvlock": true + }, + "face=ceiling,facing=south,powered=false": { + "model": "modernmetals:block/beryllium_button", + "x": 180 + }, + "face=floor,facing=west,powered=false": { + "model": "modernmetals:block/beryllium_button", + "y": 270 + }, + "face=wall,facing=west,powered=false": { + "model": "modernmetals:block/beryllium_button", + "x": 90, + "y": 270, + "uvlock": true + }, + "face=ceiling,facing=west,powered=false": { + "model": "modernmetals:block/beryllium_button", + "x": 180, + "y": 90 + }, + "face=floor,facing=east,powered=false": { + "model": "modernmetals:block/beryllium_button", + "y": 90 + }, + "face=wall,facing=east,powered=false": { + "model": "modernmetals:block/beryllium_button", + "x": 90, + "y": 90, + "uvlock": true + }, + "face=ceiling,facing=east,powered=false": { + "model": "modernmetals:block/beryllium_button", + "x": 180, + "y": 270 + }, + "face=floor,facing=north,powered=true": { + "model": "modernmetals:block/beryllium_button_pressed" + }, + "face=wall,facing=north,powered=true": { + "model": "modernmetals:block/beryllium_button_pressed", + "x": 90, + "uvlock": true + }, + "face=ceiling,facing=north,powered=true": { + "model": "modernmetals:block/beryllium_button_pressed", + "x": 180, + "y": 180 + }, + "face=floor,facing=south,powered=true": { + "model": "modernmetals:block/beryllium_button_pressed", + "y": 180 + }, + "face=wall,facing=south,powered=true": { + "model": "modernmetals:block/beryllium_button_pressed", + "x": 90, + "y": 180, + "uvlock": true + }, + "face=ceiling,facing=south,powered=true": { + "model": "modernmetals:block/beryllium_button_pressed", + "x": 180 + }, + "face=floor,facing=west,powered=true": { + "model": "modernmetals:block/beryllium_button_pressed", + "y": 270 + }, + "face=wall,facing=west,powered=true": { + "model": "modernmetals:block/beryllium_button_pressed", + "x": 90, + "y": 270, + "uvlock": true + }, + "face=ceiling,facing=west,powered=true": { + "model": "modernmetals:block/beryllium_button_pressed", + "x": 180, + "y": 90 + }, + "face=floor,facing=east,powered=true": { + "model": "modernmetals:block/beryllium_button_pressed", + "y": 90 + }, + "face=wall,facing=east,powered=true": { + "model": "modernmetals:block/beryllium_button_pressed", + "x": 90, + "y": 90, + "uvlock": true + }, + "face=ceiling,facing=east,powered=true": { + "model": "modernmetals:block/beryllium_button_pressed", + "x": 180, + "y": 270 } + } } diff --git a/src/main/resources/assets/modernmetals/blockstates/beryllium_door.json b/src/main/resources/assets/modernmetals/blockstates/beryllium_door.json index 0186eef9..f7ef14e8 100644 --- a/src/main/resources/assets/modernmetals/blockstates/beryllium_door.json +++ b/src/main/resources/assets/modernmetals/blockstates/beryllium_door.json @@ -1,70 +1,124 @@ { - "variants": { - "facing=east,half=lower,hinge=left,open=false,powered=false": { "model": "modernmetals:beryllium_door_bottom" }, - "facing=south,half=lower,hinge=left,open=false,powered=false": { "model": "modernmetals:beryllium_door_bottom", "y": 90 }, - "facing=west,half=lower,hinge=left,open=false,powered=false": { "model": "modernmetals:beryllium_door_bottom", "y": 180 }, - "facing=north,half=lower,hinge=left,open=false,powered=false": { "model": "modernmetals:beryllium_door_bottom", "y": 270 }, - "facing=east,half=lower,hinge=right,open=false,powered=false": { "model": "modernmetals:beryllium_door_bottom_rh" }, - "facing=south,half=lower,hinge=right,open=false,powered=false": { "model": "modernmetals:beryllium_door_bottom_rh", "y": 90 }, - "facing=west,half=lower,hinge=right,open=false,powered=false": { "model": "modernmetals:beryllium_door_bottom_rh", "y": 180 }, - "facing=north,half=lower,hinge=right,open=false,powered=false": { "model": "modernmetals:beryllium_door_bottom_rh", "y": 270 }, - "facing=east,half=lower,hinge=left,open=true,powered=false": { "model": "modernmetals:beryllium_door_bottom_rh", "y": 90 }, - "facing=south,half=lower,hinge=left,open=true,powered=false": { "model": "modernmetals:beryllium_door_bottom_rh", "y": 180 }, - "facing=west,half=lower,hinge=left,open=true,powered=false": { "model": "modernmetals:beryllium_door_bottom_rh", "y": 270 }, - "facing=north,half=lower,hinge=left,open=true,powered=false": { "model": "modernmetals:beryllium_door_bottom_rh" }, - "facing=east,half=lower,hinge=right,open=true,powered=false": { "model": "modernmetals:beryllium_door_bottom", "y": 270 }, - "facing=south,half=lower,hinge=right,open=true,powered=false": { "model": "modernmetals:beryllium_door_bottom" }, - "facing=west,half=lower,hinge=right,open=true,powered=false": { "model": "modernmetals:beryllium_door_bottom", "y": 90 }, - "facing=north,half=lower,hinge=right,open=true,powered=false": { "model": "modernmetals:beryllium_door_bottom", "y": 180 }, - "facing=east,half=upper,hinge=left,open=false,powered=false": { "model": "modernmetals:beryllium_door_top" }, - "facing=south,half=upper,hinge=left,open=false,powered=false": { "model": "modernmetals:beryllium_door_top", "y": 90 }, - "facing=west,half=upper,hinge=left,open=false,powered=false": { "model": "modernmetals:beryllium_door_top", "y": 180 }, - "facing=north,half=upper,hinge=left,open=false,powered=false": { "model": "modernmetals:beryllium_door_top", "y": 270 }, - "facing=east,half=upper,hinge=right,open=false,powered=false": { "model": "modernmetals:beryllium_door_top_rh" }, - "facing=south,half=upper,hinge=right,open=false,powered=false": { "model": "modernmetals:beryllium_door_top_rh", "y": 90 }, - "facing=west,half=upper,hinge=right,open=false,powered=false": { "model": "modernmetals:beryllium_door_top_rh", "y": 180 }, - "facing=north,half=upper,hinge=right,open=false,powered=false": { "model": "modernmetals:beryllium_door_top_rh", "y": 270 }, - "facing=east,half=upper,hinge=left,open=true,powered=false": { "model": "modernmetals:beryllium_door_top_rh", "y": 90 }, - "facing=south,half=upper,hinge=left,open=true,powered=false": { "model": "modernmetals:beryllium_door_top_rh", "y": 180 }, - "facing=west,half=upper,hinge=left,open=true,powered=false": { "model": "modernmetals:beryllium_door_top_rh", "y": 270 }, - "facing=north,half=upper,hinge=left,open=true,powered=false": { "model": "modernmetals:beryllium_door_top_rh" }, - "facing=east,half=upper,hinge=right,open=true,powered=false": { "model": "modernmetals:beryllium_door_top", "y": 270 }, - "facing=south,half=upper,hinge=right,open=true,powered=false": { "model": "modernmetals:beryllium_door_top" }, - "facing=west,half=upper,hinge=right,open=true,powered=false": { "model": "modernmetals:beryllium_door_top", "y": 90 }, - "facing=north,half=upper,hinge=right,open=true,powered=false": { "model": "modernmetals:beryllium_door_top", "y": 180 }, - - - "facing=east,half=lower,hinge=left,open=false,powered=true": { "model": "modernmetals:beryllium_door_bottom" }, - "facing=south,half=lower,hinge=left,open=false,powered=true": { "model": "modernmetals:beryllium_door_bottom", "y": 90 }, - "facing=west,half=lower,hinge=left,open=false,powered=true": { "model": "modernmetals:beryllium_door_bottom", "y": 180 }, - "facing=north,half=lower,hinge=left,open=false,powered=true": { "model": "modernmetals:beryllium_door_bottom", "y": 270 }, - "facing=east,half=lower,hinge=right,open=false,powered=true": { "model": "modernmetals:beryllium_door_bottom_rh" }, - "facing=south,half=lower,hinge=right,open=false,powered=true": { "model": "modernmetals:beryllium_door_bottom_rh", "y": 90 }, - "facing=west,half=lower,hinge=right,open=false,powered=true": { "model": "modernmetals:beryllium_door_bottom_rh", "y": 180 }, - "facing=north,half=lower,hinge=right,open=false,powered=true": { "model": "modernmetals:beryllium_door_bottom_rh", "y": 270 }, - "facing=east,half=lower,hinge=left,open=true,powered=true": { "model": "modernmetals:beryllium_door_bottom_rh", "y": 90 }, - "facing=south,half=lower,hinge=left,open=true,powered=true": { "model": "modernmetals:beryllium_door_bottom_rh", "y": 180 }, - "facing=west,half=lower,hinge=left,open=true,powered=true": { "model": "modernmetals:beryllium_door_bottom_rh", "y": 270 }, - "facing=north,half=lower,hinge=left,open=true,powered=true": { "model": "modernmetals:beryllium_door_bottom_rh" }, - "facing=east,half=lower,hinge=right,open=true,powered=true": { "model": "modernmetals:beryllium_door_bottom", "y": 270 }, - "facing=south,half=lower,hinge=right,open=true,powered=true": { "model": "modernmetals:beryllium_door_bottom" }, - "facing=west,half=lower,hinge=right,open=true,powered=true": { "model": "modernmetals:beryllium_door_bottom", "y": 90 }, - "facing=north,half=lower,hinge=right,open=true,powered=true": { "model": "modernmetals:beryllium_door_bottom", "y": 180 }, - "facing=east,half=upper,hinge=left,open=false,powered=true": { "model": "modernmetals:beryllium_door_top" }, - "facing=south,half=upper,hinge=left,open=false,powered=true": { "model": "modernmetals:beryllium_door_top", "y": 90 }, - "facing=west,half=upper,hinge=left,open=false,powered=true": { "model": "modernmetals:beryllium_door_top", "y": 180 }, - "facing=north,half=upper,hinge=left,open=false,powered=true": { "model": "modernmetals:beryllium_door_top", "y": 270 }, - "facing=east,half=upper,hinge=right,open=false,powered=true": { "model": "modernmetals:beryllium_door_top_rh" }, - "facing=south,half=upper,hinge=right,open=false,powered=true": { "model": "modernmetals:beryllium_door_top_rh", "y": 90 }, - "facing=west,half=upper,hinge=right,open=false,powered=true": { "model": "modernmetals:beryllium_door_top_rh", "y": 180 }, - "facing=north,half=upper,hinge=right,open=false,powered=true": { "model": "modernmetals:beryllium_door_top_rh", "y": 270 }, - "facing=east,half=upper,hinge=left,open=true,powered=true": { "model": "modernmetals:beryllium_door_top_rh", "y": 90 }, - "facing=south,half=upper,hinge=left,open=true,powered=true": { "model": "modernmetals:beryllium_door_top_rh", "y": 180 }, - "facing=west,half=upper,hinge=left,open=true,powered=true": { "model": "modernmetals:beryllium_door_top_rh", "y": 270 }, - "facing=north,half=upper,hinge=left,open=true,powered=true": { "model": "modernmetals:beryllium_door_top_rh" }, - "facing=east,half=upper,hinge=right,open=true,powered=true": { "model": "modernmetals:beryllium_door_top", "y": 270 }, - "facing=south,half=upper,hinge=right,open=true,powered=true": { "model": "modernmetals:beryllium_door_top" }, - "facing=west,half=upper,hinge=right,open=true,powered=true": { "model": "modernmetals:beryllium_door_top", "y": 90 }, - "facing=north,half=upper,hinge=right,open=true,powered=true": { "model": "modernmetals:beryllium_door_top", "y": 180 } + "variants": { + "facing=north,half=upper,hinge=left,open=false": { + "model": "modernmetals:block/beryllium_door_top", + "y": 270 + }, + "facing=south,half=upper,hinge=left,open=false": { + "model": "modernmetals:block/beryllium_door_top", + "y": 90 + }, + "facing=west,half=upper,hinge=left,open=false": { + "model": "modernmetals:block/beryllium_door_top", + "y": 180 + }, + "facing=east,half=upper,hinge=left,open=false": { + "model": "modernmetals:block/beryllium_door_top" + }, + "facing=north,half=lower,hinge=left,open=false": { + "model": "modernmetals:block/beryllium_door_bottom", + "y": 270 + }, + "facing=south,half=lower,hinge=left,open=false": { + "model": "modernmetals:block/beryllium_door_bottom", + "y": 90 + }, + "facing=west,half=lower,hinge=left,open=false": { + "model": "modernmetals:block/beryllium_door_bottom", + "y": 180 + }, + "facing=east,half=lower,hinge=left,open=false": { + "model": "modernmetals:block/beryllium_door_bottom" + }, + "facing=north,half=upper,hinge=right,open=false": { + "model": "modernmetals:block/beryllium_door_top_rh", + "y": 270 + }, + "facing=south,half=upper,hinge=right,open=false": { + "model": "modernmetals:block/beryllium_door_top_rh", + "y": 90 + }, + "facing=west,half=upper,hinge=right,open=false": { + "model": "modernmetals:block/beryllium_door_top_rh", + "y": 180 + }, + "facing=east,half=upper,hinge=right,open=false": { + "model": "modernmetals:block/beryllium_door_top_rh" + }, + "facing=north,half=lower,hinge=right,open=false": { + "model": "modernmetals:block/beryllium_door_bottom_rh", + "y": 270 + }, + "facing=south,half=lower,hinge=right,open=false": { + "model": "modernmetals:block/beryllium_door_bottom_rh", + "y": 90 + }, + "facing=west,half=lower,hinge=right,open=false": { + "model": "modernmetals:block/beryllium_door_bottom_rh", + "y": 180 + }, + "facing=east,half=lower,hinge=right,open=false": { + "model": "modernmetals:block/beryllium_door_bottom_rh" + }, + "facing=north,half=upper,hinge=left,open=true": { + "model": "modernmetals:block/beryllium_door_top_rh" + }, + "facing=south,half=upper,hinge=left,open=true": { + "model": "modernmetals:block/beryllium_door_top_rh", + "y": 180 + }, + "facing=west,half=upper,hinge=left,open=true": { + "model": "modernmetals:block/beryllium_door_top_rh", + "y": 270 + }, + "facing=east,half=upper,hinge=left,open=true": { + "model": "modernmetals:block/beryllium_door_top_rh", + "y": 90 + }, + "facing=north,half=lower,hinge=left,open=true": { + "model": "modernmetals:block/beryllium_door_bottom_rh" + }, + "facing=south,half=lower,hinge=left,open=true": { + "model": "modernmetals:block/beryllium_door_bottom_rh", + "y": 180 + }, + "facing=west,half=lower,hinge=left,open=true": { + "model": "modernmetals:block/beryllium_door_bottom_rh", + "y": 270 + }, + "facing=east,half=lower,hinge=left,open=true": { + "model": "modernmetals:block/beryllium_door_bottom_rh", + "y": 90 + }, + "facing=north,half=upper,hinge=right,open=true": { + "model": "modernmetals:block/beryllium_door_top", + "y": 180 + }, + "facing=south,half=upper,hinge=right,open=true": { + "model": "modernmetals:block/beryllium_door_top" + }, + "facing=west,half=upper,hinge=right,open=true": { + "model": "modernmetals:block/beryllium_door_top", + "y": 90 + }, + "facing=east,half=upper,hinge=right,open=true": { + "model": "modernmetals:block/beryllium_door_top", + "y": 270 + }, + "facing=north,half=lower,hinge=right,open=true": { + "model": "modernmetals:block/beryllium_door_bottom", + "y": 180 + }, + "facing=south,half=lower,hinge=right,open=true": { + "model": "modernmetals:block/beryllium_door_bottom" + }, + "facing=west,half=lower,hinge=right,open=true": { + "model": "modernmetals:block/beryllium_door_bottom", + "y": 90 + }, + "facing=east,half=lower,hinge=right,open=true": { + "model": "modernmetals:block/beryllium_door_bottom", + "y": 270 } + } } diff --git a/src/main/resources/assets/modernmetals/blockstates/beryllium_lever.json b/src/main/resources/assets/modernmetals/blockstates/beryllium_lever.json index f642ed15..1310bbf8 100644 --- a/src/main/resources/assets/modernmetals/blockstates/beryllium_lever.json +++ b/src/main/resources/assets/modernmetals/blockstates/beryllium_lever.json @@ -1,20 +1,76 @@ { - "variants": { - "facing=down_z,powered=false": { "model": "modernmetals:beryllium_lever_off", "x": 180, "y": 180 }, - "facing=down_x,powered=false": { "model": "modernmetals:beryllium_lever_off", "x": 180, "y": 90 }, - "facing=up_z,powered=false": { "model": "modernmetals:beryllium_lever_off" }, - "facing=up_x,powered=false": { "model": "modernmetals:beryllium_lever_off", "y": 270 }, - "facing=east,powered=false": { "model": "modernmetals:beryllium_lever_off", "x": 90, "y": 90 }, - "facing=west,powered=false": { "model": "modernmetals:beryllium_lever_off", "x": 90, "y": 270 }, - "facing=south,powered=false" : { "model": "modernmetals:beryllium_lever_off", "x": 90, "y": 180 }, - "facing=north,powered=false" : { "model": "modernmetals:beryllium_lever_off", "x": 90 }, - "facing=down_z,powered=true" : { "model": "modernmetals:beryllium_lever", "x": 180, "y": 180 }, - "facing=down_x,powered=true" : { "model": "modernmetals:beryllium_lever", "x": 180, "y": 90 }, - "facing=up_z,powered=true": { "model": "modernmetals:beryllium_lever" }, - "facing=up_x,powered=true": { "model": "modernmetals:beryllium_lever", "y": 270 }, - "facing=east,powered=true": { "model": "modernmetals:beryllium_lever", "x": 90, "y": 90 }, - "facing=west,powered=true": { "model": "modernmetals:beryllium_lever", "x": 90, "y": 270 }, - "facing=south,powered=true": { "model": "modernmetals:beryllium_lever", "x": 90, "y": 180 }, - "facing=north,powered=true": { "model": "modernmetals:beryllium_lever", "x": 90 } + "variants": { + "face=floor,facing=north,powered=false": { + "model": "modernmetals:block/beryllium_lever_off" + }, + "face=wall,facing=north,powered=false": { + "model": "modernmetals:block/beryllium_lever_off" + }, + "face=ceiling,facing=north,powered=false": { + "model": "modernmetals:block/beryllium_lever_off" + }, + "face=floor,facing=south,powered=false": { + "model": "modernmetals:block/beryllium_lever_off" + }, + "face=wall,facing=south,powered=false": { + "model": "modernmetals:block/beryllium_lever_off" + }, + "face=ceiling,facing=south,powered=false": { + "model": "modernmetals:block/beryllium_lever_off" + }, + "face=floor,facing=west,powered=false": { + "model": "modernmetals:block/beryllium_lever_off" + }, + "face=wall,facing=west,powered=false": { + "model": "modernmetals:block/beryllium_lever_off" + }, + "face=ceiling,facing=west,powered=false": { + "model": "modernmetals:block/beryllium_lever_off" + }, + "face=floor,facing=east,powered=false": { + "model": "modernmetals:block/beryllium_lever_off" + }, + "face=wall,facing=east,powered=false": { + "model": "modernmetals:block/beryllium_lever_off" + }, + "face=ceiling,facing=east,powered=false": { + "model": "modernmetals:block/beryllium_lever_off" + }, + "face=floor,facing=north,powered=true": { + "model": "modernmetals:block/beryllium_lever" + }, + "face=wall,facing=north,powered=true": { + "model": "modernmetals:block/beryllium_lever" + }, + "face=ceiling,facing=north,powered=true": { + "model": "modernmetals:block/beryllium_lever" + }, + "face=floor,facing=south,powered=true": { + "model": "modernmetals:block/beryllium_lever" + }, + "face=wall,facing=south,powered=true": { + "model": "modernmetals:block/beryllium_lever" + }, + "face=ceiling,facing=south,powered=true": { + "model": "modernmetals:block/beryllium_lever" + }, + "face=floor,facing=west,powered=true": { + "model": "modernmetals:block/beryllium_lever" + }, + "face=wall,facing=west,powered=true": { + "model": "modernmetals:block/beryllium_lever" + }, + "face=ceiling,facing=west,powered=true": { + "model": "modernmetals:block/beryllium_lever" + }, + "face=floor,facing=east,powered=true": { + "model": "modernmetals:block/beryllium_lever" + }, + "face=wall,facing=east,powered=true": { + "model": "modernmetals:block/beryllium_lever" + }, + "face=ceiling,facing=east,powered=true": { + "model": "modernmetals:block/beryllium_lever" } + } } diff --git a/src/main/resources/assets/modernmetals/blockstates/beryllium_ore.json b/src/main/resources/assets/modernmetals/blockstates/beryllium_ore.json index 8ef16ac0..dcca24a6 100644 --- a/src/main/resources/assets/modernmetals/blockstates/beryllium_ore.json +++ b/src/main/resources/assets/modernmetals/blockstates/beryllium_ore.json @@ -1,5 +1,7 @@ { - "variants": { - "normal": { "model": "modernmetals:beryllium_ore" } + "variants": { + "": { + "model": "modernmetals:block/beryllium_ore" } + } } diff --git a/src/main/resources/assets/modernmetals/blockstates/beryllium_plate.json b/src/main/resources/assets/modernmetals/blockstates/beryllium_plate.json index 1f186e68..9cfdfc3b 100644 --- a/src/main/resources/assets/modernmetals/blockstates/beryllium_plate.json +++ b/src/main/resources/assets/modernmetals/blockstates/beryllium_plate.json @@ -1,10 +1,27 @@ { - "variants": { - "facing=down": { "model": "modernmetals:beryllium_plate", "x": 90 }, - "facing=up": { "model": "modernmetals:beryllium_plate", "x": 270 }, - "facing=north": { "model": "modernmetals:beryllium_plate" }, - "facing=south": { "model": "modernmetals:beryllium_plate", "y": 180 }, - "facing=west": { "model": "modernmetals:beryllium_plate", "y": 270 }, - "facing=east": { "model": "modernmetals:beryllium_plate", "y": 90 } + "variants": { + "facing=down": { + "model": "modernmetals:block/beryllium_plate", + "x": 90 + }, + "facing=up": { + "model": "modernmetals:block/beryllium_plate", + "x": 270 + }, + "facing=north": { + "model": "modernmetals:block/beryllium_plate" + }, + "facing=south": { + "model": "modernmetals:block/beryllium_plate", + "y": 180 + }, + "facing=west": { + "model": "modernmetals:block/beryllium_plate", + "y": 270 + }, + "facing=east": { + "model": "modernmetals:block/beryllium_plate", + "y": 90 } + } } diff --git a/src/main/resources/assets/modernmetals/blockstates/beryllium_pressure_plate.json b/src/main/resources/assets/modernmetals/blockstates/beryllium_pressure_plate.json index 457a1391..a84bbd1e 100644 --- a/src/main/resources/assets/modernmetals/blockstates/beryllium_pressure_plate.json +++ b/src/main/resources/assets/modernmetals/blockstates/beryllium_pressure_plate.json @@ -1,6 +1,10 @@ { - "variants": { - "powered=false": { "model": "modernmetals:beryllium_pressure_plate_up" }, - "powered=true": { "model": "modernmetals:beryllium_pressure_plate_down" } + "variants": { + "powered=false": { + "model": "modernmetals:block/beryllium_pressure_plate_up" + }, + "powered=true": { + "model": "modernmetals:block/beryllium_pressure_plate_down" } + } } diff --git a/src/main/resources/assets/modernmetals/blockstates/beryllium_slab.json b/src/main/resources/assets/modernmetals/blockstates/beryllium_slab.json index 441e0e8c..64d13c51 100644 --- a/src/main/resources/assets/modernmetals/blockstates/beryllium_slab.json +++ b/src/main/resources/assets/modernmetals/blockstates/beryllium_slab.json @@ -1,6 +1,13 @@ { - "variants": { - "half=bottom,variant=default": { "model": "modernmetals:half_slab_beryllium" }, - "half=top,variant=default": { "model": "modernmetals:upper_slab_beryllium" } + "variants": { + "type=top": { + "model": "modernmetals:block/upper_slab_beryllium" + }, + "type=bottom": { + "model": "modernmetals:block/half_slab_beryllium" + }, + "type=double": { + "model": "modernmetals:block/beryllium_block" } + } } diff --git a/src/main/resources/assets/modernmetals/blockstates/beryllium_stairs.json b/src/main/resources/assets/modernmetals/blockstates/beryllium_stairs.json index 5b2899c7..4d97f841 100644 --- a/src/main/resources/assets/modernmetals/blockstates/beryllium_stairs.json +++ b/src/main/resources/assets/modernmetals/blockstates/beryllium_stairs.json @@ -1,44 +1,209 @@ { - "variants": { - "facing=east,half=bottom,shape=straight": { "model": "modernmetals:beryllium_stairs" }, - "facing=west,half=bottom,shape=straight": { "model": "modernmetals:beryllium_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=straight": { "model": "modernmetals:beryllium_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=straight": { "model": "modernmetals:beryllium_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_right": { "model": "modernmetals:beryllium_outer_stairs" }, - "facing=west,half=bottom,shape=outer_right": { "model": "modernmetals:beryllium_outer_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=outer_right": { "model": "modernmetals:beryllium_outer_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=outer_right": { "model": "modernmetals:beryllium_outer_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_left": { "model": "modernmetals:beryllium_outer_stairs", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=outer_left": { "model": "modernmetals:beryllium_outer_stairs", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=outer_left": { "model": "modernmetals:beryllium_outer_stairs" }, - "facing=north,half=bottom,shape=outer_left": { "model": "modernmetals:beryllium_outer_stairs", "y": 180, "uvlock": true }, - "facing=east,half=bottom,shape=inner_right": { "model": "modernmetals:beryllium_inner_stairs" }, - "facing=west,half=bottom,shape=inner_right": { "model": "modernmetals:beryllium_inner_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=inner_right": { "model": "modernmetals:beryllium_inner_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=inner_right": { "model": "modernmetals:beryllium_inner_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=inner_left": { "model": "modernmetals:beryllium_inner_stairs", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=inner_left": { "model": "modernmetals:beryllium_inner_stairs", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=inner_left": { "model": "modernmetals:beryllium_inner_stairs" }, - "facing=north,half=bottom,shape=inner_left": { "model": "modernmetals:beryllium_inner_stairs", "y": 180, "uvlock": true }, - "facing=east,half=top,shape=straight": { "model": "modernmetals:beryllium_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=straight": { "model": "modernmetals:beryllium_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=straight": { "model": "modernmetals:beryllium_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=straight": { "model": "modernmetals:beryllium_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { "model": "modernmetals:beryllium_outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_right": { "model": "modernmetals:beryllium_outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { "model": "modernmetals:beryllium_outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { "model": "modernmetals:beryllium_outer_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { "model": "modernmetals:beryllium_outer_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { "model": "modernmetals:beryllium_outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { "model": "modernmetals:beryllium_outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=outer_left": { "model": "modernmetals:beryllium_outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { "model": "modernmetals:beryllium_inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { "model": "modernmetals:beryllium_inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { "model": "modernmetals:beryllium_inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { "model": "modernmetals:beryllium_inner_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { "model": "modernmetals:beryllium_inner_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { "model": "modernmetals:beryllium_inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { "model": "modernmetals:beryllium_inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { "model": "modernmetals:beryllium_inner_stairs", "x": 180, "y": 270, "uvlock": true } + "variants": { + "facing=north,half=top,shape=straight": { + "model": "modernmetals:block/beryllium_stairs", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=south,half=top,shape=straight": { + "model": "modernmetals:block/beryllium_stairs", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=west,half=top,shape=straight": { + "model": "modernmetals:block/beryllium_stairs", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=east,half=top,shape=straight": { + "model": "modernmetals:block/beryllium_stairs", + "x": 180, + "uvlock": true + }, + "facing=north,half=bottom,shape=straight": { + "model": "modernmetals:block/beryllium_stairs", + "y": 270, + "uvlock": true + }, + "facing=south,half=bottom,shape=straight": { + "model": "modernmetals:block/beryllium_stairs", + "y": 90, + "uvlock": true + }, + "facing=west,half=bottom,shape=straight": { + "model": "modernmetals:block/beryllium_stairs", + "y": 180, + "uvlock": true + }, + "facing=east,half=bottom,shape=straight": { + "model": "modernmetals:block/beryllium_stairs" + }, + "facing=north,half=top,shape=inner_left": { + "model": "modernmetals:block/beryllium_inner_stairs", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=south,half=top,shape=inner_left": { + "model": "modernmetals:block/beryllium_inner_stairs", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=west,half=top,shape=inner_left": { + "model": "modernmetals:block/beryllium_inner_stairs", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=east,half=top,shape=inner_left": { + "model": "modernmetals:block/beryllium_inner_stairs", + "x": 180, + "uvlock": true + }, + "facing=north,half=bottom,shape=inner_left": { + "model": "modernmetals:block/beryllium_inner_stairs", + "y": 180, + "uvlock": true + }, + "facing=south,half=bottom,shape=inner_left": { + "model": "modernmetals:block/beryllium_inner_stairs" + }, + "facing=west,half=bottom,shape=inner_left": { + "model": "modernmetals:block/beryllium_inner_stairs", + "y": 90, + "uvlock": true + }, + "facing=east,half=bottom,shape=inner_left": { + "model": "modernmetals:block/beryllium_inner_stairs", + "y": 270, + "uvlock": true + }, + "facing=north,half=top,shape=inner_right": { + "model": "modernmetals:block/beryllium_inner_stairs", + "x": 180, + "uvlock": true + }, + "facing=south,half=top,shape=inner_right": { + "model": "modernmetals:block/beryllium_inner_stairs", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=west,half=top,shape=inner_right": { + "model": "modernmetals:block/beryllium_inner_stairs", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=east,half=top,shape=inner_right": { + "model": "modernmetals:block/beryllium_inner_stairs", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=north,half=bottom,shape=inner_right": { + "model": "modernmetals:block/beryllium_inner_stairs", + "y": 270, + "uvlock": true + }, + "facing=south,half=bottom,shape=inner_right": { + "model": "modernmetals:block/beryllium_inner_stairs", + "y": 90, + "uvlock": true + }, + "facing=west,half=bottom,shape=inner_right": { + "model": "modernmetals:block/beryllium_inner_stairs", + "y": 180, + "uvlock": true + }, + "facing=east,half=bottom,shape=inner_right": { + "model": "modernmetals:block/beryllium_inner_stairs" + }, + "facing=north,half=top,shape=outer_left": { + "model": "modernmetals:block/beryllium_outer_stairs", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=south,half=top,shape=outer_left": { + "model": "modernmetals:block/beryllium_outer_stairs", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=west,half=top,shape=outer_left": { + "model": "modernmetals:block/beryllium_outer_stairs", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=east,half=top,shape=outer_left": { + "model": "modernmetals:block/beryllium_outer_stairs", + "x": 180, + "uvlock": true + }, + "facing=north,half=bottom,shape=outer_left": { + "model": "modernmetals:block/beryllium_outer_stairs", + "y": 180, + "uvlock": true + }, + "facing=south,half=bottom,shape=outer_left": { + "model": "modernmetals:block/beryllium_outer_stairs" + }, + "facing=west,half=bottom,shape=outer_left": { + "model": "modernmetals:block/beryllium_outer_stairs", + "y": 90, + "uvlock": true + }, + "facing=east,half=bottom,shape=outer_left": { + "model": "modernmetals:block/beryllium_outer_stairs", + "y": 270, + "uvlock": true + }, + "facing=north,half=top,shape=outer_right": { + "model": "modernmetals:block/beryllium_outer_stairs", + "x": 180, + "uvlock": true + }, + "facing=south,half=top,shape=outer_right": { + "model": "modernmetals:block/beryllium_outer_stairs", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=west,half=top,shape=outer_right": { + "model": "modernmetals:block/beryllium_outer_stairs", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=east,half=top,shape=outer_right": { + "model": "modernmetals:block/beryllium_outer_stairs", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=north,half=bottom,shape=outer_right": { + "model": "modernmetals:block/beryllium_outer_stairs", + "y": 270, + "uvlock": true + }, + "facing=south,half=bottom,shape=outer_right": { + "model": "modernmetals:block/beryllium_outer_stairs", + "y": 90, + "uvlock": true + }, + "facing=west,half=bottom,shape=outer_right": { + "model": "modernmetals:block/beryllium_outer_stairs", + "y": 180, + "uvlock": true + }, + "facing=east,half=bottom,shape=outer_right": { + "model": "modernmetals:block/beryllium_outer_stairs" } + } } diff --git a/src/main/resources/assets/modernmetals/blockstates/beryllium_trapdoor.json b/src/main/resources/assets/modernmetals/blockstates/beryllium_trapdoor.json index cd175da2..3f8b4fd3 100644 --- a/src/main/resources/assets/modernmetals/blockstates/beryllium_trapdoor.json +++ b/src/main/resources/assets/modernmetals/blockstates/beryllium_trapdoor.json @@ -1,20 +1,68 @@ { - "variants": { - "facing=north,half=bottom,open=false": { "model": "modernmetals:beryllium_trapdoor_bottom" }, - "facing=south,half=bottom,open=false": { "model": "modernmetals:beryllium_trapdoor_bottom" }, - "facing=east,half=bottom,open=false": { "model": "modernmetals:beryllium_trapdoor_bottom" }, - "facing=west,half=bottom,open=false": { "model": "modernmetals:beryllium_trapdoor_bottom" }, - "facing=north,half=top,open=false": { "model": "modernmetals:beryllium_trapdoor_top" }, - "facing=south,half=top,open=false": { "model": "modernmetals:beryllium_trapdoor_top" }, - "facing=east,half=top,open=false": { "model": "modernmetals:beryllium_trapdoor_top" }, - "facing=west,half=top,open=false": { "model": "modernmetals:beryllium_trapdoor_top" }, - "facing=north,half=bottom,open=true": { "model": "modernmetals:beryllium_trapdoor_open" }, - "facing=south,half=bottom,open=true": { "model": "modernmetals:beryllium_trapdoor_open", "y": 180 }, - "facing=east,half=bottom,open=true": { "model": "modernmetals:beryllium_trapdoor_open", "y": 90 }, - "facing=west,half=bottom,open=true": { "model": "modernmetals:beryllium_trapdoor_open", "y": 270 }, - "facing=north,half=top,open=true": { "model": "modernmetals:beryllium_trapdoor_open" }, - "facing=south,half=top,open=true": { "model": "modernmetals:beryllium_trapdoor_open", "y": 180 }, - "facing=east,half=top,open=true": { "model": "modernmetals:beryllium_trapdoor_open", "y": 90 }, - "facing=west,half=top,open=true": { "model": "modernmetals:beryllium_trapdoor_open", "y": 270 } + "variants": { + "facing=north,half=top,open=false": { + "model": "modernmetals:block/beryllium_trapdoor_top" + }, + "facing=south,half=top,open=false": { + "model": "modernmetals:block/beryllium_trapdoor_top", + "y": 180 + }, + "facing=west,half=top,open=false": { + "model": "modernmetals:block/beryllium_trapdoor_top", + "y": 270 + }, + "facing=east,half=top,open=false": { + "model": "modernmetals:block/beryllium_trapdoor_top", + "y": 90 + }, + "facing=north,half=bottom,open=false": { + "model": "modernmetals:block/beryllium_trapdoor_bottom" + }, + "facing=south,half=bottom,open=false": { + "model": "modernmetals:block/beryllium_trapdoor_bottom", + "y": 180 + }, + "facing=west,half=bottom,open=false": { + "model": "modernmetals:block/beryllium_trapdoor_bottom", + "y": 270 + }, + "facing=east,half=bottom,open=false": { + "model": "modernmetals:block/beryllium_trapdoor_bottom", + "y": 90 + }, + "facing=north,half=top,open=true": { + "model": "modernmetals:block/beryllium_trapdoor_open", + "x": 180, + "y": 180 + }, + "facing=south,half=top,open=true": { + "model": "modernmetals:block/beryllium_trapdoor_open", + "x": 180 + }, + "facing=west,half=top,open=true": { + "model": "modernmetals:block/beryllium_trapdoor_open", + "x": 180, + "y": 90 + }, + "facing=east,half=top,open=true": { + "model": "modernmetals:block/beryllium_trapdoor_open", + "x": 180, + "y": 270 + }, + "facing=north,half=bottom,open=true": { + "model": "modernmetals:block/beryllium_trapdoor_open" + }, + "facing=south,half=bottom,open=true": { + "model": "modernmetals:block/beryllium_trapdoor_open", + "y": 180 + }, + "facing=west,half=bottom,open=true": { + "model": "modernmetals:block/beryllium_trapdoor_open", + "y": 270 + }, + "facing=east,half=bottom,open=true": { + "model": "modernmetals:block/beryllium_trapdoor_open", + "y": 90 } + } } diff --git a/src/main/resources/assets/modernmetals/blockstates/beryllium_wall.json b/src/main/resources/assets/modernmetals/blockstates/beryllium_wall.json index 4bd52c44..4e62d4eb 100644 --- a/src/main/resources/assets/modernmetals/blockstates/beryllium_wall.json +++ b/src/main/resources/assets/modernmetals/blockstates/beryllium_wall.json @@ -1,19 +1,51 @@ { - "multipart": [ - { "when": { "up": "true" }, - "apply": { "model": "modernmetals:beryllium_wall_post" } - }, - { "when": { "north": "true" }, - "apply": { "model": "modernmetals:beryllium_wall_side", "uvlock": true } - }, - { "when": { "east": "true" }, - "apply": { "model": "modernmetals:beryllium_wall_side", "y": 90, "uvlock": true } - }, - { "when": { "south": "true" }, - "apply": { "model": "modernmetals:beryllium_wall_side", "y": 180, "uvlock": true } - }, - { "when": { "west": "true" }, - "apply": { "model": "modernmetals:beryllium_wall_side", "y": 270, "uvlock": true } - } - ] + "multipart": [ + { + "when": { + "up": "true" + }, + "apply": { + "model": "modernmetals:block/beryllium_wall_post" + } + }, + { + "when": { + "north": "true" + }, + "apply": { + "model": "modernmetals:block/beryllium_wall_side", + "uvlock": true + } + }, + { + "when": { + "east": "true" + }, + "apply": { + "model": "modernmetals:block/beryllium_wall_side", + "y": 90, + "uvlock": true + } + }, + { + "when": { + "south": "true" + }, + "apply": { + "model": "modernmetals:block/beryllium_wall_side", + "y": 180, + "uvlock": true + } + }, + { + "when": { + "west": "true" + }, + "apply": { + "model": "modernmetals:block/beryllium_wall_side", + "y": 270, + "uvlock": true + } + } + ] } diff --git a/src/main/resources/assets/modernmetals/blockstates/boron.json b/src/main/resources/assets/modernmetals/blockstates/boron.json index dd912aba..9fdadca2 100644 --- a/src/main/resources/assets/modernmetals/blockstates/boron.json +++ b/src/main/resources/assets/modernmetals/blockstates/boron.json @@ -1,9 +1,10 @@ { - "forge_marker": 1, - "variants": { - "fluid": { - "model": "forge:fluid", - "custom": { "fluid": "boron" } - } + "variants": { + "": { + "model": "minecraft:block/water", + "custom": { + "fluid": "modernmetals:boron" + } } + } } diff --git a/src/main/resources/assets/modernmetals/blockstates/boron_bars.json b/src/main/resources/assets/modernmetals/blockstates/boron_bars.json index fe4eabe7..8947ad2f 100644 --- a/src/main/resources/assets/modernmetals/blockstates/boron_bars.json +++ b/src/main/resources/assets/modernmetals/blockstates/boron_bars.json @@ -1,32 +1,77 @@ { - "multipart": [ - { "apply": { "model": "modernmetals:boron_bars_post_ends" }}, - { "when": { "north": false, "east": false, "south": false, "west": false }, - "apply": { "model": "modernmetals:boron_bars_post" } - }, - { "when": { "north": true, "east": false, "south": false, "west": false }, - "apply": { "model": "modernmetals:boron_bars_cap" } - }, - { "when": { "north": false, "east": true, "south": false, "west": false }, - "apply": { "model": "modernmetals:boron_bars_cap", "y": 90 } - }, - { "when": { "north": false, "east": false, "south": true, "west": false }, - "apply": { "model": "modernmetals:boron_bars_cap_alt" } - }, - { "when": { "north": false, "east": false, "south": false, "west": true }, - "apply": { "model": "modernmetals:boron_bars_cap_alt", "y": 90 } - }, - { "when": { "north": true }, - "apply": { "model": "modernmetals:boron_bars_side" } - }, - { "when": { "east": true }, - "apply": { "model": "modernmetals:boron_bars_side", "y": 90 } - }, - { "when": { "south": true }, - "apply": { "model": "modernmetals:boron_bars_side_alt" } - }, - { "when": { "west": true }, - "apply": { "model": "modernmetals:boron_bars_side_alt", "y": 90 } - } - ] + "multipart": [ + { + "apply": { + "model": "modernmetals:block/boron_bars_post" + } + }, + { + "when": { + "north": "true" + }, + "apply": { + "model": "modernmetals:block/boron_bars_side" + } + }, + { + "when": { + "north": "false" + }, + "apply": { + "model": "modernmetals:block/boron_bars_cap" + } + }, + { + "when": { + "south": "true" + }, + "apply": { + "model": "modernmetals:block/boron_bars_side_alt" + } + }, + { + "when": { + "south": "false" + }, + "apply": { + "model": "modernmetals:block/boron_bars_cap_alt", + "y": 90 + } + }, + { + "when": { + "west": "true" + }, + "apply": { + "model": "modernmetals:block/boron_bars_side_alt", + "y": 90 + } + }, + { + "when": { + "west": "false" + }, + "apply": { + "model": "modernmetals:block/boron_bars_cap", + "y": 270 + } + }, + { + "when": { + "east": "true" + }, + "apply": { + "model": "modernmetals:block/boron_bars_side", + "y": 90 + } + }, + { + "when": { + "east": "false" + }, + "apply": { + "model": "modernmetals:block/boron_bars_cap_alt" + } + } + ] } diff --git a/src/main/resources/assets/modernmetals/blockstates/boron_block.json b/src/main/resources/assets/modernmetals/blockstates/boron_block.json index 97a83424..7cce5042 100644 --- a/src/main/resources/assets/modernmetals/blockstates/boron_block.json +++ b/src/main/resources/assets/modernmetals/blockstates/boron_block.json @@ -1,5 +1,7 @@ { - "variants": { - "normal": { "model": "modernmetals:boron_block" } + "variants": { + "": { + "model": "modernmetals:block/boron_block" } + } } diff --git a/src/main/resources/assets/modernmetals/blockstates/boron_button.json b/src/main/resources/assets/modernmetals/blockstates/boron_button.json index f03c8a20..79ca3819 100644 --- a/src/main/resources/assets/modernmetals/blockstates/boron_button.json +++ b/src/main/resources/assets/modernmetals/blockstates/boron_button.json @@ -1,16 +1,118 @@ { - "variants": { - "facing=up,powered=false": { "model": "modernmetals:boron_button", "uvlock": true }, - "facing=down,powered=false": { "model": "modernmetals:boron_button", "uvlock": true, "x": 180 }, - "facing=east,powered=false": { "model": "modernmetals:boron_button", "uvlock": true, "x": 90, "y": 90 }, - "facing=west,powered=false": { "model": "modernmetals:boron_button", "uvlock": true, "x": 90, "y": 270 }, - "facing=south,powered=false": { "model": "modernmetals:boron_button", "uvlock": true, "x": 90, "y": 180 }, - "facing=north,powered=false": { "model": "modernmetals:boron_button", "uvlock": true, "x": 90 }, - "facing=up,powered=true": { "model": "modernmetals:boron_button_pressed", "uvlock": true }, - "facing=down,powered=true": { "model": "modernmetals:boron_button_pressed", "uvlock": true, "x": 180 }, - "facing=east,powered=true": { "model": "modernmetals:boron_button_pressed", "uvlock": true, "x": 90, "y": 90 }, - "facing=west,powered=true": { "model": "modernmetals:boron_button_pressed", "uvlock": true, "x": 90, "y": 270 }, - "facing=south,powered=true": { "model": "modernmetals:boron_button_pressed", "uvlock": true, "x": 90, "y": 180 }, - "facing=north,powered=true": { "model": "modernmetals:boron_button_pressed", "uvlock": true, "x": 90 } + "variants": { + "face=floor,facing=north,powered=false": { + "model": "modernmetals:block/boron_button" + }, + "face=wall,facing=north,powered=false": { + "model": "modernmetals:block/boron_button", + "x": 90, + "uvlock": true + }, + "face=ceiling,facing=north,powered=false": { + "model": "modernmetals:block/boron_button", + "x": 180, + "y": 180 + }, + "face=floor,facing=south,powered=false": { + "model": "modernmetals:block/boron_button", + "y": 180 + }, + "face=wall,facing=south,powered=false": { + "model": "modernmetals:block/boron_button", + "x": 90, + "y": 180, + "uvlock": true + }, + "face=ceiling,facing=south,powered=false": { + "model": "modernmetals:block/boron_button", + "x": 180 + }, + "face=floor,facing=west,powered=false": { + "model": "modernmetals:block/boron_button", + "y": 270 + }, + "face=wall,facing=west,powered=false": { + "model": "modernmetals:block/boron_button", + "x": 90, + "y": 270, + "uvlock": true + }, + "face=ceiling,facing=west,powered=false": { + "model": "modernmetals:block/boron_button", + "x": 180, + "y": 90 + }, + "face=floor,facing=east,powered=false": { + "model": "modernmetals:block/boron_button", + "y": 90 + }, + "face=wall,facing=east,powered=false": { + "model": "modernmetals:block/boron_button", + "x": 90, + "y": 90, + "uvlock": true + }, + "face=ceiling,facing=east,powered=false": { + "model": "modernmetals:block/boron_button", + "x": 180, + "y": 270 + }, + "face=floor,facing=north,powered=true": { + "model": "modernmetals:block/boron_button_pressed" + }, + "face=wall,facing=north,powered=true": { + "model": "modernmetals:block/boron_button_pressed", + "x": 90, + "uvlock": true + }, + "face=ceiling,facing=north,powered=true": { + "model": "modernmetals:block/boron_button_pressed", + "x": 180, + "y": 180 + }, + "face=floor,facing=south,powered=true": { + "model": "modernmetals:block/boron_button_pressed", + "y": 180 + }, + "face=wall,facing=south,powered=true": { + "model": "modernmetals:block/boron_button_pressed", + "x": 90, + "y": 180, + "uvlock": true + }, + "face=ceiling,facing=south,powered=true": { + "model": "modernmetals:block/boron_button_pressed", + "x": 180 + }, + "face=floor,facing=west,powered=true": { + "model": "modernmetals:block/boron_button_pressed", + "y": 270 + }, + "face=wall,facing=west,powered=true": { + "model": "modernmetals:block/boron_button_pressed", + "x": 90, + "y": 270, + "uvlock": true + }, + "face=ceiling,facing=west,powered=true": { + "model": "modernmetals:block/boron_button_pressed", + "x": 180, + "y": 90 + }, + "face=floor,facing=east,powered=true": { + "model": "modernmetals:block/boron_button_pressed", + "y": 90 + }, + "face=wall,facing=east,powered=true": { + "model": "modernmetals:block/boron_button_pressed", + "x": 90, + "y": 90, + "uvlock": true + }, + "face=ceiling,facing=east,powered=true": { + "model": "modernmetals:block/boron_button_pressed", + "x": 180, + "y": 270 } + } } diff --git a/src/main/resources/assets/modernmetals/blockstates/boron_door.json b/src/main/resources/assets/modernmetals/blockstates/boron_door.json index 5a47917c..be9ac39b 100644 --- a/src/main/resources/assets/modernmetals/blockstates/boron_door.json +++ b/src/main/resources/assets/modernmetals/blockstates/boron_door.json @@ -1,70 +1,124 @@ { - "variants": { - "facing=east,half=lower,hinge=left,open=false,powered=false": { "model": "modernmetals:boron_door_bottom" }, - "facing=south,half=lower,hinge=left,open=false,powered=false": { "model": "modernmetals:boron_door_bottom", "y": 90 }, - "facing=west,half=lower,hinge=left,open=false,powered=false": { "model": "modernmetals:boron_door_bottom", "y": 180 }, - "facing=north,half=lower,hinge=left,open=false,powered=false": { "model": "modernmetals:boron_door_bottom", "y": 270 }, - "facing=east,half=lower,hinge=right,open=false,powered=false": { "model": "modernmetals:boron_door_bottom_rh" }, - "facing=south,half=lower,hinge=right,open=false,powered=false": { "model": "modernmetals:boron_door_bottom_rh", "y": 90 }, - "facing=west,half=lower,hinge=right,open=false,powered=false": { "model": "modernmetals:boron_door_bottom_rh", "y": 180 }, - "facing=north,half=lower,hinge=right,open=false,powered=false": { "model": "modernmetals:boron_door_bottom_rh", "y": 270 }, - "facing=east,half=lower,hinge=left,open=true,powered=false": { "model": "modernmetals:boron_door_bottom_rh", "y": 90 }, - "facing=south,half=lower,hinge=left,open=true,powered=false": { "model": "modernmetals:boron_door_bottom_rh", "y": 180 }, - "facing=west,half=lower,hinge=left,open=true,powered=false": { "model": "modernmetals:boron_door_bottom_rh", "y": 270 }, - "facing=north,half=lower,hinge=left,open=true,powered=false": { "model": "modernmetals:boron_door_bottom_rh" }, - "facing=east,half=lower,hinge=right,open=true,powered=false": { "model": "modernmetals:boron_door_bottom", "y": 270 }, - "facing=south,half=lower,hinge=right,open=true,powered=false": { "model": "modernmetals:boron_door_bottom" }, - "facing=west,half=lower,hinge=right,open=true,powered=false": { "model": "modernmetals:boron_door_bottom", "y": 90 }, - "facing=north,half=lower,hinge=right,open=true,powered=false": { "model": "modernmetals:boron_door_bottom", "y": 180 }, - "facing=east,half=upper,hinge=left,open=false,powered=false": { "model": "modernmetals:boron_door_top" }, - "facing=south,half=upper,hinge=left,open=false,powered=false": { "model": "modernmetals:boron_door_top", "y": 90 }, - "facing=west,half=upper,hinge=left,open=false,powered=false": { "model": "modernmetals:boron_door_top", "y": 180 }, - "facing=north,half=upper,hinge=left,open=false,powered=false": { "model": "modernmetals:boron_door_top", "y": 270 }, - "facing=east,half=upper,hinge=right,open=false,powered=false": { "model": "modernmetals:boron_door_top_rh" }, - "facing=south,half=upper,hinge=right,open=false,powered=false": { "model": "modernmetals:boron_door_top_rh", "y": 90 }, - "facing=west,half=upper,hinge=right,open=false,powered=false": { "model": "modernmetals:boron_door_top_rh", "y": 180 }, - "facing=north,half=upper,hinge=right,open=false,powered=false": { "model": "modernmetals:boron_door_top_rh", "y": 270 }, - "facing=east,half=upper,hinge=left,open=true,powered=false": { "model": "modernmetals:boron_door_top_rh", "y": 90 }, - "facing=south,half=upper,hinge=left,open=true,powered=false": { "model": "modernmetals:boron_door_top_rh", "y": 180 }, - "facing=west,half=upper,hinge=left,open=true,powered=false": { "model": "modernmetals:boron_door_top_rh", "y": 270 }, - "facing=north,half=upper,hinge=left,open=true,powered=false": { "model": "modernmetals:boron_door_top_rh" }, - "facing=east,half=upper,hinge=right,open=true,powered=false": { "model": "modernmetals:boron_door_top", "y": 270 }, - "facing=south,half=upper,hinge=right,open=true,powered=false": { "model": "modernmetals:boron_door_top" }, - "facing=west,half=upper,hinge=right,open=true,powered=false": { "model": "modernmetals:boron_door_top", "y": 90 }, - "facing=north,half=upper,hinge=right,open=true,powered=false": { "model": "modernmetals:boron_door_top", "y": 180 }, - - - "facing=east,half=lower,hinge=left,open=false,powered=true": { "model": "modernmetals:boron_door_bottom" }, - "facing=south,half=lower,hinge=left,open=false,powered=true": { "model": "modernmetals:boron_door_bottom", "y": 90 }, - "facing=west,half=lower,hinge=left,open=false,powered=true": { "model": "modernmetals:boron_door_bottom", "y": 180 }, - "facing=north,half=lower,hinge=left,open=false,powered=true": { "model": "modernmetals:boron_door_bottom", "y": 270 }, - "facing=east,half=lower,hinge=right,open=false,powered=true": { "model": "modernmetals:boron_door_bottom_rh" }, - "facing=south,half=lower,hinge=right,open=false,powered=true": { "model": "modernmetals:boron_door_bottom_rh", "y": 90 }, - "facing=west,half=lower,hinge=right,open=false,powered=true": { "model": "modernmetals:boron_door_bottom_rh", "y": 180 }, - "facing=north,half=lower,hinge=right,open=false,powered=true": { "model": "modernmetals:boron_door_bottom_rh", "y": 270 }, - "facing=east,half=lower,hinge=left,open=true,powered=true": { "model": "modernmetals:boron_door_bottom_rh", "y": 90 }, - "facing=south,half=lower,hinge=left,open=true,powered=true": { "model": "modernmetals:boron_door_bottom_rh", "y": 180 }, - "facing=west,half=lower,hinge=left,open=true,powered=true": { "model": "modernmetals:boron_door_bottom_rh", "y": 270 }, - "facing=north,half=lower,hinge=left,open=true,powered=true": { "model": "modernmetals:boron_door_bottom_rh" }, - "facing=east,half=lower,hinge=right,open=true,powered=true": { "model": "modernmetals:boron_door_bottom", "y": 270 }, - "facing=south,half=lower,hinge=right,open=true,powered=true": { "model": "modernmetals:boron_door_bottom" }, - "facing=west,half=lower,hinge=right,open=true,powered=true": { "model": "modernmetals:boron_door_bottom", "y": 90 }, - "facing=north,half=lower,hinge=right,open=true,powered=true": { "model": "modernmetals:boron_door_bottom", "y": 180 }, - "facing=east,half=upper,hinge=left,open=false,powered=true": { "model": "modernmetals:boron_door_top" }, - "facing=south,half=upper,hinge=left,open=false,powered=true": { "model": "modernmetals:boron_door_top", "y": 90 }, - "facing=west,half=upper,hinge=left,open=false,powered=true": { "model": "modernmetals:boron_door_top", "y": 180 }, - "facing=north,half=upper,hinge=left,open=false,powered=true": { "model": "modernmetals:boron_door_top", "y": 270 }, - "facing=east,half=upper,hinge=right,open=false,powered=true": { "model": "modernmetals:boron_door_top_rh" }, - "facing=south,half=upper,hinge=right,open=false,powered=true": { "model": "modernmetals:boron_door_top_rh", "y": 90 }, - "facing=west,half=upper,hinge=right,open=false,powered=true": { "model": "modernmetals:boron_door_top_rh", "y": 180 }, - "facing=north,half=upper,hinge=right,open=false,powered=true": { "model": "modernmetals:boron_door_top_rh", "y": 270 }, - "facing=east,half=upper,hinge=left,open=true,powered=true": { "model": "modernmetals:boron_door_top_rh", "y": 90 }, - "facing=south,half=upper,hinge=left,open=true,powered=true": { "model": "modernmetals:boron_door_top_rh", "y": 180 }, - "facing=west,half=upper,hinge=left,open=true,powered=true": { "model": "modernmetals:boron_door_top_rh", "y": 270 }, - "facing=north,half=upper,hinge=left,open=true,powered=true": { "model": "modernmetals:boron_door_top_rh" }, - "facing=east,half=upper,hinge=right,open=true,powered=true": { "model": "modernmetals:boron_door_top", "y": 270 }, - "facing=south,half=upper,hinge=right,open=true,powered=true": { "model": "modernmetals:boron_door_top" }, - "facing=west,half=upper,hinge=right,open=true,powered=true": { "model": "modernmetals:boron_door_top", "y": 90 }, - "facing=north,half=upper,hinge=right,open=true,powered=true": { "model": "modernmetals:boron_door_top", "y": 180 } + "variants": { + "facing=north,half=upper,hinge=left,open=false": { + "model": "modernmetals:block/boron_door_top", + "y": 270 + }, + "facing=south,half=upper,hinge=left,open=false": { + "model": "modernmetals:block/boron_door_top", + "y": 90 + }, + "facing=west,half=upper,hinge=left,open=false": { + "model": "modernmetals:block/boron_door_top", + "y": 180 + }, + "facing=east,half=upper,hinge=left,open=false": { + "model": "modernmetals:block/boron_door_top" + }, + "facing=north,half=lower,hinge=left,open=false": { + "model": "modernmetals:block/boron_door_bottom", + "y": 270 + }, + "facing=south,half=lower,hinge=left,open=false": { + "model": "modernmetals:block/boron_door_bottom", + "y": 90 + }, + "facing=west,half=lower,hinge=left,open=false": { + "model": "modernmetals:block/boron_door_bottom", + "y": 180 + }, + "facing=east,half=lower,hinge=left,open=false": { + "model": "modernmetals:block/boron_door_bottom" + }, + "facing=north,half=upper,hinge=right,open=false": { + "model": "modernmetals:block/boron_door_top_rh", + "y": 270 + }, + "facing=south,half=upper,hinge=right,open=false": { + "model": "modernmetals:block/boron_door_top_rh", + "y": 90 + }, + "facing=west,half=upper,hinge=right,open=false": { + "model": "modernmetals:block/boron_door_top_rh", + "y": 180 + }, + "facing=east,half=upper,hinge=right,open=false": { + "model": "modernmetals:block/boron_door_top_rh" + }, + "facing=north,half=lower,hinge=right,open=false": { + "model": "modernmetals:block/boron_door_bottom_rh", + "y": 270 + }, + "facing=south,half=lower,hinge=right,open=false": { + "model": "modernmetals:block/boron_door_bottom_rh", + "y": 90 + }, + "facing=west,half=lower,hinge=right,open=false": { + "model": "modernmetals:block/boron_door_bottom_rh", + "y": 180 + }, + "facing=east,half=lower,hinge=right,open=false": { + "model": "modernmetals:block/boron_door_bottom_rh" + }, + "facing=north,half=upper,hinge=left,open=true": { + "model": "modernmetals:block/boron_door_top_rh" + }, + "facing=south,half=upper,hinge=left,open=true": { + "model": "modernmetals:block/boron_door_top_rh", + "y": 180 + }, + "facing=west,half=upper,hinge=left,open=true": { + "model": "modernmetals:block/boron_door_top_rh", + "y": 270 + }, + "facing=east,half=upper,hinge=left,open=true": { + "model": "modernmetals:block/boron_door_top_rh", + "y": 90 + }, + "facing=north,half=lower,hinge=left,open=true": { + "model": "modernmetals:block/boron_door_bottom_rh" + }, + "facing=south,half=lower,hinge=left,open=true": { + "model": "modernmetals:block/boron_door_bottom_rh", + "y": 180 + }, + "facing=west,half=lower,hinge=left,open=true": { + "model": "modernmetals:block/boron_door_bottom_rh", + "y": 270 + }, + "facing=east,half=lower,hinge=left,open=true": { + "model": "modernmetals:block/boron_door_bottom_rh", + "y": 90 + }, + "facing=north,half=upper,hinge=right,open=true": { + "model": "modernmetals:block/boron_door_top", + "y": 180 + }, + "facing=south,half=upper,hinge=right,open=true": { + "model": "modernmetals:block/boron_door_top" + }, + "facing=west,half=upper,hinge=right,open=true": { + "model": "modernmetals:block/boron_door_top", + "y": 90 + }, + "facing=east,half=upper,hinge=right,open=true": { + "model": "modernmetals:block/boron_door_top", + "y": 270 + }, + "facing=north,half=lower,hinge=right,open=true": { + "model": "modernmetals:block/boron_door_bottom", + "y": 180 + }, + "facing=south,half=lower,hinge=right,open=true": { + "model": "modernmetals:block/boron_door_bottom" + }, + "facing=west,half=lower,hinge=right,open=true": { + "model": "modernmetals:block/boron_door_bottom", + "y": 90 + }, + "facing=east,half=lower,hinge=right,open=true": { + "model": "modernmetals:block/boron_door_bottom", + "y": 270 } + } } diff --git a/src/main/resources/assets/modernmetals/blockstates/boron_lever.json b/src/main/resources/assets/modernmetals/blockstates/boron_lever.json index 67c3b7dc..78fafdcb 100644 --- a/src/main/resources/assets/modernmetals/blockstates/boron_lever.json +++ b/src/main/resources/assets/modernmetals/blockstates/boron_lever.json @@ -1,20 +1,76 @@ { - "variants": { - "facing=down_z,powered=false": { "model": "modernmetals:boron_lever_off", "x": 180, "y": 180 }, - "facing=down_x,powered=false": { "model": "modernmetals:boron_lever_off", "x": 180, "y": 90 }, - "facing=up_z,powered=false": { "model": "modernmetals:boron_lever_off" }, - "facing=up_x,powered=false": { "model": "modernmetals:boron_lever_off", "y": 270 }, - "facing=east,powered=false": { "model": "modernmetals:boron_lever_off", "x": 90, "y": 90 }, - "facing=west,powered=false": { "model": "modernmetals:boron_lever_off", "x": 90, "y": 270 }, - "facing=south,powered=false" : { "model": "modernmetals:boron_lever_off", "x": 90, "y": 180 }, - "facing=north,powered=false" : { "model": "modernmetals:boron_lever_off", "x": 90 }, - "facing=down_z,powered=true" : { "model": "modernmetals:boron_lever", "x": 180, "y": 180 }, - "facing=down_x,powered=true" : { "model": "modernmetals:boron_lever", "x": 180, "y": 90 }, - "facing=up_z,powered=true": { "model": "modernmetals:boron_lever" }, - "facing=up_x,powered=true": { "model": "modernmetals:boron_lever", "y": 270 }, - "facing=east,powered=true": { "model": "modernmetals:boron_lever", "x": 90, "y": 90 }, - "facing=west,powered=true": { "model": "modernmetals:boron_lever", "x": 90, "y": 270 }, - "facing=south,powered=true": { "model": "modernmetals:boron_lever", "x": 90, "y": 180 }, - "facing=north,powered=true": { "model": "modernmetals:boron_lever", "x": 90 } + "variants": { + "face=floor,facing=north,powered=false": { + "model": "modernmetals:block/boron_lever_off" + }, + "face=wall,facing=north,powered=false": { + "model": "modernmetals:block/boron_lever_off" + }, + "face=ceiling,facing=north,powered=false": { + "model": "modernmetals:block/boron_lever_off" + }, + "face=floor,facing=south,powered=false": { + "model": "modernmetals:block/boron_lever_off" + }, + "face=wall,facing=south,powered=false": { + "model": "modernmetals:block/boron_lever_off" + }, + "face=ceiling,facing=south,powered=false": { + "model": "modernmetals:block/boron_lever_off" + }, + "face=floor,facing=west,powered=false": { + "model": "modernmetals:block/boron_lever_off" + }, + "face=wall,facing=west,powered=false": { + "model": "modernmetals:block/boron_lever_off" + }, + "face=ceiling,facing=west,powered=false": { + "model": "modernmetals:block/boron_lever_off" + }, + "face=floor,facing=east,powered=false": { + "model": "modernmetals:block/boron_lever_off" + }, + "face=wall,facing=east,powered=false": { + "model": "modernmetals:block/boron_lever_off" + }, + "face=ceiling,facing=east,powered=false": { + "model": "modernmetals:block/boron_lever_off" + }, + "face=floor,facing=north,powered=true": { + "model": "modernmetals:block/boron_lever" + }, + "face=wall,facing=north,powered=true": { + "model": "modernmetals:block/boron_lever" + }, + "face=ceiling,facing=north,powered=true": { + "model": "modernmetals:block/boron_lever" + }, + "face=floor,facing=south,powered=true": { + "model": "modernmetals:block/boron_lever" + }, + "face=wall,facing=south,powered=true": { + "model": "modernmetals:block/boron_lever" + }, + "face=ceiling,facing=south,powered=true": { + "model": "modernmetals:block/boron_lever" + }, + "face=floor,facing=west,powered=true": { + "model": "modernmetals:block/boron_lever" + }, + "face=wall,facing=west,powered=true": { + "model": "modernmetals:block/boron_lever" + }, + "face=ceiling,facing=west,powered=true": { + "model": "modernmetals:block/boron_lever" + }, + "face=floor,facing=east,powered=true": { + "model": "modernmetals:block/boron_lever" + }, + "face=wall,facing=east,powered=true": { + "model": "modernmetals:block/boron_lever" + }, + "face=ceiling,facing=east,powered=true": { + "model": "modernmetals:block/boron_lever" } + } } diff --git a/src/main/resources/assets/modernmetals/blockstates/boron_ore.json b/src/main/resources/assets/modernmetals/blockstates/boron_ore.json index 5bf2ef89..99c899fb 100644 --- a/src/main/resources/assets/modernmetals/blockstates/boron_ore.json +++ b/src/main/resources/assets/modernmetals/blockstates/boron_ore.json @@ -1,5 +1,7 @@ { - "variants": { - "normal": { "model": "modernmetals:boron_ore" } + "variants": { + "": { + "model": "modernmetals:block/boron_ore" } + } } diff --git a/src/main/resources/assets/modernmetals/blockstates/boron_plate.json b/src/main/resources/assets/modernmetals/blockstates/boron_plate.json index d1746522..87f559b6 100644 --- a/src/main/resources/assets/modernmetals/blockstates/boron_plate.json +++ b/src/main/resources/assets/modernmetals/blockstates/boron_plate.json @@ -1,10 +1,27 @@ { - "variants": { - "facing=down": { "model": "modernmetals:boron_plate", "x": 90 }, - "facing=up": { "model": "modernmetals:boron_plate", "x": 270 }, - "facing=north": { "model": "modernmetals:boron_plate" }, - "facing=south": { "model": "modernmetals:boron_plate", "y": 180 }, - "facing=west": { "model": "modernmetals:boron_plate", "y": 270 }, - "facing=east": { "model": "modernmetals:boron_plate", "y": 90 } + "variants": { + "facing=down": { + "model": "modernmetals:block/boron_plate", + "x": 90 + }, + "facing=up": { + "model": "modernmetals:block/boron_plate", + "x": 270 + }, + "facing=north": { + "model": "modernmetals:block/boron_plate" + }, + "facing=south": { + "model": "modernmetals:block/boron_plate", + "y": 180 + }, + "facing=west": { + "model": "modernmetals:block/boron_plate", + "y": 270 + }, + "facing=east": { + "model": "modernmetals:block/boron_plate", + "y": 90 } + } } diff --git a/src/main/resources/assets/modernmetals/blockstates/boron_pressure_plate.json b/src/main/resources/assets/modernmetals/blockstates/boron_pressure_plate.json index e3c40b27..082f6c18 100644 --- a/src/main/resources/assets/modernmetals/blockstates/boron_pressure_plate.json +++ b/src/main/resources/assets/modernmetals/blockstates/boron_pressure_plate.json @@ -1,6 +1,10 @@ { - "variants": { - "powered=false": { "model": "modernmetals:boron_pressure_plate_up" }, - "powered=true": { "model": "modernmetals:boron_pressure_plate_down" } + "variants": { + "powered=false": { + "model": "modernmetals:block/boron_pressure_plate_up" + }, + "powered=true": { + "model": "modernmetals:block/boron_pressure_plate_down" } + } } diff --git a/src/main/resources/assets/modernmetals/blockstates/boron_slab.json b/src/main/resources/assets/modernmetals/blockstates/boron_slab.json index 61b13d1d..2987c617 100644 --- a/src/main/resources/assets/modernmetals/blockstates/boron_slab.json +++ b/src/main/resources/assets/modernmetals/blockstates/boron_slab.json @@ -1,6 +1,13 @@ { - "variants": { - "half=bottom,variant=default": { "model": "modernmetals:half_slab_boron" }, - "half=top,variant=default": { "model": "modernmetals:upper_slab_boron" } + "variants": { + "type=top": { + "model": "modernmetals:block/upper_slab_boron" + }, + "type=bottom": { + "model": "modernmetals:block/half_slab_boron" + }, + "type=double": { + "model": "modernmetals:block/boron_block" } + } } diff --git a/src/main/resources/assets/modernmetals/blockstates/boron_stairs.json b/src/main/resources/assets/modernmetals/blockstates/boron_stairs.json index eabf626c..8466c025 100644 --- a/src/main/resources/assets/modernmetals/blockstates/boron_stairs.json +++ b/src/main/resources/assets/modernmetals/blockstates/boron_stairs.json @@ -1,44 +1,209 @@ { - "variants": { - "facing=east,half=bottom,shape=straight": { "model": "modernmetals:boron_stairs" }, - "facing=west,half=bottom,shape=straight": { "model": "modernmetals:boron_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=straight": { "model": "modernmetals:boron_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=straight": { "model": "modernmetals:boron_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_right": { "model": "modernmetals:boron_outer_stairs" }, - "facing=west,half=bottom,shape=outer_right": { "model": "modernmetals:boron_outer_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=outer_right": { "model": "modernmetals:boron_outer_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=outer_right": { "model": "modernmetals:boron_outer_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_left": { "model": "modernmetals:boron_outer_stairs", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=outer_left": { "model": "modernmetals:boron_outer_stairs", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=outer_left": { "model": "modernmetals:boron_outer_stairs" }, - "facing=north,half=bottom,shape=outer_left": { "model": "modernmetals:boron_outer_stairs", "y": 180, "uvlock": true }, - "facing=east,half=bottom,shape=inner_right": { "model": "modernmetals:boron_inner_stairs" }, - "facing=west,half=bottom,shape=inner_right": { "model": "modernmetals:boron_inner_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=inner_right": { "model": "modernmetals:boron_inner_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=inner_right": { "model": "modernmetals:boron_inner_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=inner_left": { "model": "modernmetals:boron_inner_stairs", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=inner_left": { "model": "modernmetals:boron_inner_stairs", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=inner_left": { "model": "modernmetals:boron_inner_stairs" }, - "facing=north,half=bottom,shape=inner_left": { "model": "modernmetals:boron_inner_stairs", "y": 180, "uvlock": true }, - "facing=east,half=top,shape=straight": { "model": "modernmetals:boron_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=straight": { "model": "modernmetals:boron_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=straight": { "model": "modernmetals:boron_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=straight": { "model": "modernmetals:boron_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { "model": "modernmetals:boron_outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_right": { "model": "modernmetals:boron_outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { "model": "modernmetals:boron_outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { "model": "modernmetals:boron_outer_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { "model": "modernmetals:boron_outer_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { "model": "modernmetals:boron_outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { "model": "modernmetals:boron_outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=outer_left": { "model": "modernmetals:boron_outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { "model": "modernmetals:boron_inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { "model": "modernmetals:boron_inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { "model": "modernmetals:boron_inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { "model": "modernmetals:boron_inner_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { "model": "modernmetals:boron_inner_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { "model": "modernmetals:boron_inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { "model": "modernmetals:boron_inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { "model": "modernmetals:boron_inner_stairs", "x": 180, "y": 270, "uvlock": true } + "variants": { + "facing=north,half=top,shape=straight": { + "model": "modernmetals:block/boron_stairs", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=south,half=top,shape=straight": { + "model": "modernmetals:block/boron_stairs", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=west,half=top,shape=straight": { + "model": "modernmetals:block/boron_stairs", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=east,half=top,shape=straight": { + "model": "modernmetals:block/boron_stairs", + "x": 180, + "uvlock": true + }, + "facing=north,half=bottom,shape=straight": { + "model": "modernmetals:block/boron_stairs", + "y": 270, + "uvlock": true + }, + "facing=south,half=bottom,shape=straight": { + "model": "modernmetals:block/boron_stairs", + "y": 90, + "uvlock": true + }, + "facing=west,half=bottom,shape=straight": { + "model": "modernmetals:block/boron_stairs", + "y": 180, + "uvlock": true + }, + "facing=east,half=bottom,shape=straight": { + "model": "modernmetals:block/boron_stairs" + }, + "facing=north,half=top,shape=inner_left": { + "model": "modernmetals:block/boron_inner_stairs", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=south,half=top,shape=inner_left": { + "model": "modernmetals:block/boron_inner_stairs", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=west,half=top,shape=inner_left": { + "model": "modernmetals:block/boron_inner_stairs", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=east,half=top,shape=inner_left": { + "model": "modernmetals:block/boron_inner_stairs", + "x": 180, + "uvlock": true + }, + "facing=north,half=bottom,shape=inner_left": { + "model": "modernmetals:block/boron_inner_stairs", + "y": 180, + "uvlock": true + }, + "facing=south,half=bottom,shape=inner_left": { + "model": "modernmetals:block/boron_inner_stairs" + }, + "facing=west,half=bottom,shape=inner_left": { + "model": "modernmetals:block/boron_inner_stairs", + "y": 90, + "uvlock": true + }, + "facing=east,half=bottom,shape=inner_left": { + "model": "modernmetals:block/boron_inner_stairs", + "y": 270, + "uvlock": true + }, + "facing=north,half=top,shape=inner_right": { + "model": "modernmetals:block/boron_inner_stairs", + "x": 180, + "uvlock": true + }, + "facing=south,half=top,shape=inner_right": { + "model": "modernmetals:block/boron_inner_stairs", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=west,half=top,shape=inner_right": { + "model": "modernmetals:block/boron_inner_stairs", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=east,half=top,shape=inner_right": { + "model": "modernmetals:block/boron_inner_stairs", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=north,half=bottom,shape=inner_right": { + "model": "modernmetals:block/boron_inner_stairs", + "y": 270, + "uvlock": true + }, + "facing=south,half=bottom,shape=inner_right": { + "model": "modernmetals:block/boron_inner_stairs", + "y": 90, + "uvlock": true + }, + "facing=west,half=bottom,shape=inner_right": { + "model": "modernmetals:block/boron_inner_stairs", + "y": 180, + "uvlock": true + }, + "facing=east,half=bottom,shape=inner_right": { + "model": "modernmetals:block/boron_inner_stairs" + }, + "facing=north,half=top,shape=outer_left": { + "model": "modernmetals:block/boron_outer_stairs", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=south,half=top,shape=outer_left": { + "model": "modernmetals:block/boron_outer_stairs", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=west,half=top,shape=outer_left": { + "model": "modernmetals:block/boron_outer_stairs", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=east,half=top,shape=outer_left": { + "model": "modernmetals:block/boron_outer_stairs", + "x": 180, + "uvlock": true + }, + "facing=north,half=bottom,shape=outer_left": { + "model": "modernmetals:block/boron_outer_stairs", + "y": 180, + "uvlock": true + }, + "facing=south,half=bottom,shape=outer_left": { + "model": "modernmetals:block/boron_outer_stairs" + }, + "facing=west,half=bottom,shape=outer_left": { + "model": "modernmetals:block/boron_outer_stairs", + "y": 90, + "uvlock": true + }, + "facing=east,half=bottom,shape=outer_left": { + "model": "modernmetals:block/boron_outer_stairs", + "y": 270, + "uvlock": true + }, + "facing=north,half=top,shape=outer_right": { + "model": "modernmetals:block/boron_outer_stairs", + "x": 180, + "uvlock": true + }, + "facing=south,half=top,shape=outer_right": { + "model": "modernmetals:block/boron_outer_stairs", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=west,half=top,shape=outer_right": { + "model": "modernmetals:block/boron_outer_stairs", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=east,half=top,shape=outer_right": { + "model": "modernmetals:block/boron_outer_stairs", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=north,half=bottom,shape=outer_right": { + "model": "modernmetals:block/boron_outer_stairs", + "y": 270, + "uvlock": true + }, + "facing=south,half=bottom,shape=outer_right": { + "model": "modernmetals:block/boron_outer_stairs", + "y": 90, + "uvlock": true + }, + "facing=west,half=bottom,shape=outer_right": { + "model": "modernmetals:block/boron_outer_stairs", + "y": 180, + "uvlock": true + }, + "facing=east,half=bottom,shape=outer_right": { + "model": "modernmetals:block/boron_outer_stairs" } + } } diff --git a/src/main/resources/assets/modernmetals/blockstates/boron_trapdoor.json b/src/main/resources/assets/modernmetals/blockstates/boron_trapdoor.json index 3c77ef2c..0d316f4e 100644 --- a/src/main/resources/assets/modernmetals/blockstates/boron_trapdoor.json +++ b/src/main/resources/assets/modernmetals/blockstates/boron_trapdoor.json @@ -1,20 +1,68 @@ { - "variants": { - "facing=north,half=bottom,open=false": { "model": "modernmetals:boron_trapdoor_bottom" }, - "facing=south,half=bottom,open=false": { "model": "modernmetals:boron_trapdoor_bottom" }, - "facing=east,half=bottom,open=false": { "model": "modernmetals:boron_trapdoor_bottom" }, - "facing=west,half=bottom,open=false": { "model": "modernmetals:boron_trapdoor_bottom" }, - "facing=north,half=top,open=false": { "model": "modernmetals:boron_trapdoor_top" }, - "facing=south,half=top,open=false": { "model": "modernmetals:boron_trapdoor_top" }, - "facing=east,half=top,open=false": { "model": "modernmetals:boron_trapdoor_top" }, - "facing=west,half=top,open=false": { "model": "modernmetals:boron_trapdoor_top" }, - "facing=north,half=bottom,open=true": { "model": "modernmetals:boron_trapdoor_open" }, - "facing=south,half=bottom,open=true": { "model": "modernmetals:boron_trapdoor_open", "y": 180 }, - "facing=east,half=bottom,open=true": { "model": "modernmetals:boron_trapdoor_open", "y": 90 }, - "facing=west,half=bottom,open=true": { "model": "modernmetals:boron_trapdoor_open", "y": 270 }, - "facing=north,half=top,open=true": { "model": "modernmetals:boron_trapdoor_open" }, - "facing=south,half=top,open=true": { "model": "modernmetals:boron_trapdoor_open", "y": 180 }, - "facing=east,half=top,open=true": { "model": "modernmetals:boron_trapdoor_open", "y": 90 }, - "facing=west,half=top,open=true": { "model": "modernmetals:boron_trapdoor_open", "y": 270 } + "variants": { + "facing=north,half=top,open=false": { + "model": "modernmetals:block/boron_trapdoor_top" + }, + "facing=south,half=top,open=false": { + "model": "modernmetals:block/boron_trapdoor_top", + "y": 180 + }, + "facing=west,half=top,open=false": { + "model": "modernmetals:block/boron_trapdoor_top", + "y": 270 + }, + "facing=east,half=top,open=false": { + "model": "modernmetals:block/boron_trapdoor_top", + "y": 90 + }, + "facing=north,half=bottom,open=false": { + "model": "modernmetals:block/boron_trapdoor_bottom" + }, + "facing=south,half=bottom,open=false": { + "model": "modernmetals:block/boron_trapdoor_bottom", + "y": 180 + }, + "facing=west,half=bottom,open=false": { + "model": "modernmetals:block/boron_trapdoor_bottom", + "y": 270 + }, + "facing=east,half=bottom,open=false": { + "model": "modernmetals:block/boron_trapdoor_bottom", + "y": 90 + }, + "facing=north,half=top,open=true": { + "model": "modernmetals:block/boron_trapdoor_open", + "x": 180, + "y": 180 + }, + "facing=south,half=top,open=true": { + "model": "modernmetals:block/boron_trapdoor_open", + "x": 180 + }, + "facing=west,half=top,open=true": { + "model": "modernmetals:block/boron_trapdoor_open", + "x": 180, + "y": 90 + }, + "facing=east,half=top,open=true": { + "model": "modernmetals:block/boron_trapdoor_open", + "x": 180, + "y": 270 + }, + "facing=north,half=bottom,open=true": { + "model": "modernmetals:block/boron_trapdoor_open" + }, + "facing=south,half=bottom,open=true": { + "model": "modernmetals:block/boron_trapdoor_open", + "y": 180 + }, + "facing=west,half=bottom,open=true": { + "model": "modernmetals:block/boron_trapdoor_open", + "y": 270 + }, + "facing=east,half=bottom,open=true": { + "model": "modernmetals:block/boron_trapdoor_open", + "y": 90 } + } } diff --git a/src/main/resources/assets/modernmetals/blockstates/boron_wall.json b/src/main/resources/assets/modernmetals/blockstates/boron_wall.json index d35dae1e..a0a59ab5 100644 --- a/src/main/resources/assets/modernmetals/blockstates/boron_wall.json +++ b/src/main/resources/assets/modernmetals/blockstates/boron_wall.json @@ -1,19 +1,51 @@ { - "multipart": [ - { "when": { "up": "true" }, - "apply": { "model": "modernmetals:boron_wall_post" } - }, - { "when": { "north": "true" }, - "apply": { "model": "modernmetals:boron_wall_side", "uvlock": true } - }, - { "when": { "east": "true" }, - "apply": { "model": "modernmetals:boron_wall_side", "y": 90, "uvlock": true } - }, - { "when": { "south": "true" }, - "apply": { "model": "modernmetals:boron_wall_side", "y": 180, "uvlock": true } - }, - { "when": { "west": "true" }, - "apply": { "model": "modernmetals:boron_wall_side", "y": 270, "uvlock": true } - } - ] + "multipart": [ + { + "when": { + "up": "true" + }, + "apply": { + "model": "modernmetals:block/boron_wall_post" + } + }, + { + "when": { + "north": "true" + }, + "apply": { + "model": "modernmetals:block/boron_wall_side", + "uvlock": true + } + }, + { + "when": { + "east": "true" + }, + "apply": { + "model": "modernmetals:block/boron_wall_side", + "y": 90, + "uvlock": true + } + }, + { + "when": { + "south": "true" + }, + "apply": { + "model": "modernmetals:block/boron_wall_side", + "y": 180, + "uvlock": true + } + }, + { + "when": { + "west": "true" + }, + "apply": { + "model": "modernmetals:block/boron_wall_side", + "y": 270, + "uvlock": true + } + } + ] } diff --git a/src/main/resources/assets/modernmetals/blockstates/cadmium.json b/src/main/resources/assets/modernmetals/blockstates/cadmium.json index 1eb44916..daef5c46 100644 --- a/src/main/resources/assets/modernmetals/blockstates/cadmium.json +++ b/src/main/resources/assets/modernmetals/blockstates/cadmium.json @@ -1,9 +1,10 @@ { - "forge_marker": 1, - "variants": { - "fluid": { - "model": "forge:fluid", - "custom": { "fluid": "cadmium" } - } + "variants": { + "": { + "model": "minecraft:block/water", + "custom": { + "fluid": "modernmetals:cadmium" + } } -} \ No newline at end of file + } +} diff --git a/src/main/resources/assets/modernmetals/blockstates/cadmium_bars.json b/src/main/resources/assets/modernmetals/blockstates/cadmium_bars.json index d5de2440..4c7e4f3b 100644 --- a/src/main/resources/assets/modernmetals/blockstates/cadmium_bars.json +++ b/src/main/resources/assets/modernmetals/blockstates/cadmium_bars.json @@ -1,32 +1,77 @@ { - "multipart": [ - { "apply": { "model": "modernmetals:cadmium_bars_post_ends" }}, - { "when": { "north": false, "east": false, "south": false, "west": false }, - "apply": { "model": "modernmetals:cadmium_bars_post" } - }, - { "when": { "north": true, "east": false, "south": false, "west": false }, - "apply": { "model": "modernmetals:cadmium_bars_cap" } - }, - { "when": { "north": false, "east": true, "south": false, "west": false }, - "apply": { "model": "modernmetals:cadmium_bars_cap", "y": 90 } - }, - { "when": { "north": false, "east": false, "south": true, "west": false }, - "apply": { "model": "modernmetals:cadmium_bars_cap_alt" } - }, - { "when": { "north": false, "east": false, "south": false, "west": true }, - "apply": { "model": "modernmetals:cadmium_bars_cap_alt", "y": 90 } - }, - { "when": { "north": true }, - "apply": { "model": "modernmetals:cadmium_bars_side" } - }, - { "when": { "east": true }, - "apply": { "model": "modernmetals:cadmium_bars_side", "y": 90 } - }, - { "when": { "south": true }, - "apply": { "model": "modernmetals:cadmium_bars_side_alt" } - }, - { "when": { "west": true }, - "apply": { "model": "modernmetals:cadmium_bars_side_alt", "y": 90 } - } - ] + "multipart": [ + { + "apply": { + "model": "modernmetals:block/cadmium_bars_post" + } + }, + { + "when": { + "north": "true" + }, + "apply": { + "model": "modernmetals:block/cadmium_bars_side" + } + }, + { + "when": { + "north": "false" + }, + "apply": { + "model": "modernmetals:block/cadmium_bars_cap" + } + }, + { + "when": { + "south": "true" + }, + "apply": { + "model": "modernmetals:block/cadmium_bars_side_alt" + } + }, + { + "when": { + "south": "false" + }, + "apply": { + "model": "modernmetals:block/cadmium_bars_cap_alt", + "y": 90 + } + }, + { + "when": { + "west": "true" + }, + "apply": { + "model": "modernmetals:block/cadmium_bars_side_alt", + "y": 90 + } + }, + { + "when": { + "west": "false" + }, + "apply": { + "model": "modernmetals:block/cadmium_bars_cap", + "y": 270 + } + }, + { + "when": { + "east": "true" + }, + "apply": { + "model": "modernmetals:block/cadmium_bars_side", + "y": 90 + } + }, + { + "when": { + "east": "false" + }, + "apply": { + "model": "modernmetals:block/cadmium_bars_cap_alt" + } + } + ] } diff --git a/src/main/resources/assets/modernmetals/blockstates/cadmium_block.json b/src/main/resources/assets/modernmetals/blockstates/cadmium_block.json index b460fa5b..a9a0ca2d 100644 --- a/src/main/resources/assets/modernmetals/blockstates/cadmium_block.json +++ b/src/main/resources/assets/modernmetals/blockstates/cadmium_block.json @@ -1,5 +1,7 @@ { - "variants": { - "normal": { "model": "modernmetals:cadmium_block" } + "variants": { + "": { + "model": "modernmetals:block/cadmium_block" } + } } diff --git a/src/main/resources/assets/modernmetals/blockstates/cadmium_button.json b/src/main/resources/assets/modernmetals/blockstates/cadmium_button.json index 692df84f..f06583a5 100644 --- a/src/main/resources/assets/modernmetals/blockstates/cadmium_button.json +++ b/src/main/resources/assets/modernmetals/blockstates/cadmium_button.json @@ -1,16 +1,118 @@ { - "variants": { - "facing=up,powered=false": { "model": "modernmetals:cadmium_button", "uvlock": true }, - "facing=down,powered=false": { "model": "modernmetals:cadmium_button", "uvlock": true, "x": 180 }, - "facing=east,powered=false": { "model": "modernmetals:cadmium_button", "uvlock": true, "x": 90, "y": 90 }, - "facing=west,powered=false": { "model": "modernmetals:cadmium_button", "uvlock": true, "x": 90, "y": 270 }, - "facing=south,powered=false": { "model": "modernmetals:cadmium_button", "uvlock": true, "x": 90, "y": 180 }, - "facing=north,powered=false": { "model": "modernmetals:cadmium_button", "uvlock": true, "x": 90 }, - "facing=up,powered=true": { "model": "modernmetals:cadmium_button_pressed", "uvlock": true }, - "facing=down,powered=true": { "model": "modernmetals:cadmium_button_pressed", "uvlock": true, "x": 180 }, - "facing=east,powered=true": { "model": "modernmetals:cadmium_button_pressed", "uvlock": true, "x": 90, "y": 90 }, - "facing=west,powered=true": { "model": "modernmetals:cadmium_button_pressed", "uvlock": true, "x": 90, "y": 270 }, - "facing=south,powered=true": { "model": "modernmetals:cadmium_button_pressed", "uvlock": true, "x": 90, "y": 180 }, - "facing=north,powered=true": { "model": "modernmetals:cadmium_button_pressed", "uvlock": true, "x": 90 } + "variants": { + "face=floor,facing=north,powered=false": { + "model": "modernmetals:block/cadmium_button" + }, + "face=wall,facing=north,powered=false": { + "model": "modernmetals:block/cadmium_button", + "x": 90, + "uvlock": true + }, + "face=ceiling,facing=north,powered=false": { + "model": "modernmetals:block/cadmium_button", + "x": 180, + "y": 180 + }, + "face=floor,facing=south,powered=false": { + "model": "modernmetals:block/cadmium_button", + "y": 180 + }, + "face=wall,facing=south,powered=false": { + "model": "modernmetals:block/cadmium_button", + "x": 90, + "y": 180, + "uvlock": true + }, + "face=ceiling,facing=south,powered=false": { + "model": "modernmetals:block/cadmium_button", + "x": 180 + }, + "face=floor,facing=west,powered=false": { + "model": "modernmetals:block/cadmium_button", + "y": 270 + }, + "face=wall,facing=west,powered=false": { + "model": "modernmetals:block/cadmium_button", + "x": 90, + "y": 270, + "uvlock": true + }, + "face=ceiling,facing=west,powered=false": { + "model": "modernmetals:block/cadmium_button", + "x": 180, + "y": 90 + }, + "face=floor,facing=east,powered=false": { + "model": "modernmetals:block/cadmium_button", + "y": 90 + }, + "face=wall,facing=east,powered=false": { + "model": "modernmetals:block/cadmium_button", + "x": 90, + "y": 90, + "uvlock": true + }, + "face=ceiling,facing=east,powered=false": { + "model": "modernmetals:block/cadmium_button", + "x": 180, + "y": 270 + }, + "face=floor,facing=north,powered=true": { + "model": "modernmetals:block/cadmium_button_pressed" + }, + "face=wall,facing=north,powered=true": { + "model": "modernmetals:block/cadmium_button_pressed", + "x": 90, + "uvlock": true + }, + "face=ceiling,facing=north,powered=true": { + "model": "modernmetals:block/cadmium_button_pressed", + "x": 180, + "y": 180 + }, + "face=floor,facing=south,powered=true": { + "model": "modernmetals:block/cadmium_button_pressed", + "y": 180 + }, + "face=wall,facing=south,powered=true": { + "model": "modernmetals:block/cadmium_button_pressed", + "x": 90, + "y": 180, + "uvlock": true + }, + "face=ceiling,facing=south,powered=true": { + "model": "modernmetals:block/cadmium_button_pressed", + "x": 180 + }, + "face=floor,facing=west,powered=true": { + "model": "modernmetals:block/cadmium_button_pressed", + "y": 270 + }, + "face=wall,facing=west,powered=true": { + "model": "modernmetals:block/cadmium_button_pressed", + "x": 90, + "y": 270, + "uvlock": true + }, + "face=ceiling,facing=west,powered=true": { + "model": "modernmetals:block/cadmium_button_pressed", + "x": 180, + "y": 90 + }, + "face=floor,facing=east,powered=true": { + "model": "modernmetals:block/cadmium_button_pressed", + "y": 90 + }, + "face=wall,facing=east,powered=true": { + "model": "modernmetals:block/cadmium_button_pressed", + "x": 90, + "y": 90, + "uvlock": true + }, + "face=ceiling,facing=east,powered=true": { + "model": "modernmetals:block/cadmium_button_pressed", + "x": 180, + "y": 270 } + } } diff --git a/src/main/resources/assets/modernmetals/blockstates/cadmium_door.json b/src/main/resources/assets/modernmetals/blockstates/cadmium_door.json index 82877e80..be8912f0 100644 --- a/src/main/resources/assets/modernmetals/blockstates/cadmium_door.json +++ b/src/main/resources/assets/modernmetals/blockstates/cadmium_door.json @@ -1,70 +1,124 @@ { - "variants": { - "facing=east,half=lower,hinge=left,open=false,powered=false": { "model": "modernmetals:cadmium_door_bottom" }, - "facing=south,half=lower,hinge=left,open=false,powered=false": { "model": "modernmetals:cadmium_door_bottom", "y": 90 }, - "facing=west,half=lower,hinge=left,open=false,powered=false": { "model": "modernmetals:cadmium_door_bottom", "y": 180 }, - "facing=north,half=lower,hinge=left,open=false,powered=false": { "model": "modernmetals:cadmium_door_bottom", "y": 270 }, - "facing=east,half=lower,hinge=right,open=false,powered=false": { "model": "modernmetals:cadmium_door_bottom_rh" }, - "facing=south,half=lower,hinge=right,open=false,powered=false": { "model": "modernmetals:cadmium_door_bottom_rh", "y": 90 }, - "facing=west,half=lower,hinge=right,open=false,powered=false": { "model": "modernmetals:cadmium_door_bottom_rh", "y": 180 }, - "facing=north,half=lower,hinge=right,open=false,powered=false": { "model": "modernmetals:cadmium_door_bottom_rh", "y": 270 }, - "facing=east,half=lower,hinge=left,open=true,powered=false": { "model": "modernmetals:cadmium_door_bottom_rh", "y": 90 }, - "facing=south,half=lower,hinge=left,open=true,powered=false": { "model": "modernmetals:cadmium_door_bottom_rh", "y": 180 }, - "facing=west,half=lower,hinge=left,open=true,powered=false": { "model": "modernmetals:cadmium_door_bottom_rh", "y": 270 }, - "facing=north,half=lower,hinge=left,open=true,powered=false": { "model": "modernmetals:cadmium_door_bottom_rh" }, - "facing=east,half=lower,hinge=right,open=true,powered=false": { "model": "modernmetals:cadmium_door_bottom", "y": 270 }, - "facing=south,half=lower,hinge=right,open=true,powered=false": { "model": "modernmetals:cadmium_door_bottom" }, - "facing=west,half=lower,hinge=right,open=true,powered=false": { "model": "modernmetals:cadmium_door_bottom", "y": 90 }, - "facing=north,half=lower,hinge=right,open=true,powered=false": { "model": "modernmetals:cadmium_door_bottom", "y": 180 }, - "facing=east,half=upper,hinge=left,open=false,powered=false": { "model": "modernmetals:cadmium_door_top" }, - "facing=south,half=upper,hinge=left,open=false,powered=false": { "model": "modernmetals:cadmium_door_top", "y": 90 }, - "facing=west,half=upper,hinge=left,open=false,powered=false": { "model": "modernmetals:cadmium_door_top", "y": 180 }, - "facing=north,half=upper,hinge=left,open=false,powered=false": { "model": "modernmetals:cadmium_door_top", "y": 270 }, - "facing=east,half=upper,hinge=right,open=false,powered=false": { "model": "modernmetals:cadmium_door_top_rh" }, - "facing=south,half=upper,hinge=right,open=false,powered=false": { "model": "modernmetals:cadmium_door_top_rh", "y": 90 }, - "facing=west,half=upper,hinge=right,open=false,powered=false": { "model": "modernmetals:cadmium_door_top_rh", "y": 180 }, - "facing=north,half=upper,hinge=right,open=false,powered=false": { "model": "modernmetals:cadmium_door_top_rh", "y": 270 }, - "facing=east,half=upper,hinge=left,open=true,powered=false": { "model": "modernmetals:cadmium_door_top_rh", "y": 90 }, - "facing=south,half=upper,hinge=left,open=true,powered=false": { "model": "modernmetals:cadmium_door_top_rh", "y": 180 }, - "facing=west,half=upper,hinge=left,open=true,powered=false": { "model": "modernmetals:cadmium_door_top_rh", "y": 270 }, - "facing=north,half=upper,hinge=left,open=true,powered=false": { "model": "modernmetals:cadmium_door_top_rh" }, - "facing=east,half=upper,hinge=right,open=true,powered=false": { "model": "modernmetals:cadmium_door_top", "y": 270 }, - "facing=south,half=upper,hinge=right,open=true,powered=false": { "model": "modernmetals:cadmium_door_top" }, - "facing=west,half=upper,hinge=right,open=true,powered=false": { "model": "modernmetals:cadmium_door_top", "y": 90 }, - "facing=north,half=upper,hinge=right,open=true,powered=false": { "model": "modernmetals:cadmium_door_top", "y": 180 }, - - - "facing=east,half=lower,hinge=left,open=false,powered=true": { "model": "modernmetals:cadmium_door_bottom" }, - "facing=south,half=lower,hinge=left,open=false,powered=true": { "model": "modernmetals:cadmium_door_bottom", "y": 90 }, - "facing=west,half=lower,hinge=left,open=false,powered=true": { "model": "modernmetals:cadmium_door_bottom", "y": 180 }, - "facing=north,half=lower,hinge=left,open=false,powered=true": { "model": "modernmetals:cadmium_door_bottom", "y": 270 }, - "facing=east,half=lower,hinge=right,open=false,powered=true": { "model": "modernmetals:cadmium_door_bottom_rh" }, - "facing=south,half=lower,hinge=right,open=false,powered=true": { "model": "modernmetals:cadmium_door_bottom_rh", "y": 90 }, - "facing=west,half=lower,hinge=right,open=false,powered=true": { "model": "modernmetals:cadmium_door_bottom_rh", "y": 180 }, - "facing=north,half=lower,hinge=right,open=false,powered=true": { "model": "modernmetals:cadmium_door_bottom_rh", "y": 270 }, - "facing=east,half=lower,hinge=left,open=true,powered=true": { "model": "modernmetals:cadmium_door_bottom_rh", "y": 90 }, - "facing=south,half=lower,hinge=left,open=true,powered=true": { "model": "modernmetals:cadmium_door_bottom_rh", "y": 180 }, - "facing=west,half=lower,hinge=left,open=true,powered=true": { "model": "modernmetals:cadmium_door_bottom_rh", "y": 270 }, - "facing=north,half=lower,hinge=left,open=true,powered=true": { "model": "modernmetals:cadmium_door_bottom_rh" }, - "facing=east,half=lower,hinge=right,open=true,powered=true": { "model": "modernmetals:cadmium_door_bottom", "y": 270 }, - "facing=south,half=lower,hinge=right,open=true,powered=true": { "model": "modernmetals:cadmium_door_bottom" }, - "facing=west,half=lower,hinge=right,open=true,powered=true": { "model": "modernmetals:cadmium_door_bottom", "y": 90 }, - "facing=north,half=lower,hinge=right,open=true,powered=true": { "model": "modernmetals:cadmium_door_bottom", "y": 180 }, - "facing=east,half=upper,hinge=left,open=false,powered=true": { "model": "modernmetals:cadmium_door_top" }, - "facing=south,half=upper,hinge=left,open=false,powered=true": { "model": "modernmetals:cadmium_door_top", "y": 90 }, - "facing=west,half=upper,hinge=left,open=false,powered=true": { "model": "modernmetals:cadmium_door_top", "y": 180 }, - "facing=north,half=upper,hinge=left,open=false,powered=true": { "model": "modernmetals:cadmium_door_top", "y": 270 }, - "facing=east,half=upper,hinge=right,open=false,powered=true": { "model": "modernmetals:cadmium_door_top_rh" }, - "facing=south,half=upper,hinge=right,open=false,powered=true": { "model": "modernmetals:cadmium_door_top_rh", "y": 90 }, - "facing=west,half=upper,hinge=right,open=false,powered=true": { "model": "modernmetals:cadmium_door_top_rh", "y": 180 }, - "facing=north,half=upper,hinge=right,open=false,powered=true": { "model": "modernmetals:cadmium_door_top_rh", "y": 270 }, - "facing=east,half=upper,hinge=left,open=true,powered=true": { "model": "modernmetals:cadmium_door_top_rh", "y": 90 }, - "facing=south,half=upper,hinge=left,open=true,powered=true": { "model": "modernmetals:cadmium_door_top_rh", "y": 180 }, - "facing=west,half=upper,hinge=left,open=true,powered=true": { "model": "modernmetals:cadmium_door_top_rh", "y": 270 }, - "facing=north,half=upper,hinge=left,open=true,powered=true": { "model": "modernmetals:cadmium_door_top_rh" }, - "facing=east,half=upper,hinge=right,open=true,powered=true": { "model": "modernmetals:cadmium_door_top", "y": 270 }, - "facing=south,half=upper,hinge=right,open=true,powered=true": { "model": "modernmetals:cadmium_door_top" }, - "facing=west,half=upper,hinge=right,open=true,powered=true": { "model": "modernmetals:cadmium_door_top", "y": 90 }, - "facing=north,half=upper,hinge=right,open=true,powered=true": { "model": "modernmetals:cadmium_door_top", "y": 180 } + "variants": { + "facing=north,half=upper,hinge=left,open=false": { + "model": "modernmetals:block/cadmium_door_top", + "y": 270 + }, + "facing=south,half=upper,hinge=left,open=false": { + "model": "modernmetals:block/cadmium_door_top", + "y": 90 + }, + "facing=west,half=upper,hinge=left,open=false": { + "model": "modernmetals:block/cadmium_door_top", + "y": 180 + }, + "facing=east,half=upper,hinge=left,open=false": { + "model": "modernmetals:block/cadmium_door_top" + }, + "facing=north,half=lower,hinge=left,open=false": { + "model": "modernmetals:block/cadmium_door_bottom", + "y": 270 + }, + "facing=south,half=lower,hinge=left,open=false": { + "model": "modernmetals:block/cadmium_door_bottom", + "y": 90 + }, + "facing=west,half=lower,hinge=left,open=false": { + "model": "modernmetals:block/cadmium_door_bottom", + "y": 180 + }, + "facing=east,half=lower,hinge=left,open=false": { + "model": "modernmetals:block/cadmium_door_bottom" + }, + "facing=north,half=upper,hinge=right,open=false": { + "model": "modernmetals:block/cadmium_door_top_rh", + "y": 270 + }, + "facing=south,half=upper,hinge=right,open=false": { + "model": "modernmetals:block/cadmium_door_top_rh", + "y": 90 + }, + "facing=west,half=upper,hinge=right,open=false": { + "model": "modernmetals:block/cadmium_door_top_rh", + "y": 180 + }, + "facing=east,half=upper,hinge=right,open=false": { + "model": "modernmetals:block/cadmium_door_top_rh" + }, + "facing=north,half=lower,hinge=right,open=false": { + "model": "modernmetals:block/cadmium_door_bottom_rh", + "y": 270 + }, + "facing=south,half=lower,hinge=right,open=false": { + "model": "modernmetals:block/cadmium_door_bottom_rh", + "y": 90 + }, + "facing=west,half=lower,hinge=right,open=false": { + "model": "modernmetals:block/cadmium_door_bottom_rh", + "y": 180 + }, + "facing=east,half=lower,hinge=right,open=false": { + "model": "modernmetals:block/cadmium_door_bottom_rh" + }, + "facing=north,half=upper,hinge=left,open=true": { + "model": "modernmetals:block/cadmium_door_top_rh" + }, + "facing=south,half=upper,hinge=left,open=true": { + "model": "modernmetals:block/cadmium_door_top_rh", + "y": 180 + }, + "facing=west,half=upper,hinge=left,open=true": { + "model": "modernmetals:block/cadmium_door_top_rh", + "y": 270 + }, + "facing=east,half=upper,hinge=left,open=true": { + "model": "modernmetals:block/cadmium_door_top_rh", + "y": 90 + }, + "facing=north,half=lower,hinge=left,open=true": { + "model": "modernmetals:block/cadmium_door_bottom_rh" + }, + "facing=south,half=lower,hinge=left,open=true": { + "model": "modernmetals:block/cadmium_door_bottom_rh", + "y": 180 + }, + "facing=west,half=lower,hinge=left,open=true": { + "model": "modernmetals:block/cadmium_door_bottom_rh", + "y": 270 + }, + "facing=east,half=lower,hinge=left,open=true": { + "model": "modernmetals:block/cadmium_door_bottom_rh", + "y": 90 + }, + "facing=north,half=upper,hinge=right,open=true": { + "model": "modernmetals:block/cadmium_door_top", + "y": 180 + }, + "facing=south,half=upper,hinge=right,open=true": { + "model": "modernmetals:block/cadmium_door_top" + }, + "facing=west,half=upper,hinge=right,open=true": { + "model": "modernmetals:block/cadmium_door_top", + "y": 90 + }, + "facing=east,half=upper,hinge=right,open=true": { + "model": "modernmetals:block/cadmium_door_top", + "y": 270 + }, + "facing=north,half=lower,hinge=right,open=true": { + "model": "modernmetals:block/cadmium_door_bottom", + "y": 180 + }, + "facing=south,half=lower,hinge=right,open=true": { + "model": "modernmetals:block/cadmium_door_bottom" + }, + "facing=west,half=lower,hinge=right,open=true": { + "model": "modernmetals:block/cadmium_door_bottom", + "y": 90 + }, + "facing=east,half=lower,hinge=right,open=true": { + "model": "modernmetals:block/cadmium_door_bottom", + "y": 270 } + } } diff --git a/src/main/resources/assets/modernmetals/blockstates/cadmium_lever.json b/src/main/resources/assets/modernmetals/blockstates/cadmium_lever.json index bcbb5c51..04ad2e8a 100644 --- a/src/main/resources/assets/modernmetals/blockstates/cadmium_lever.json +++ b/src/main/resources/assets/modernmetals/blockstates/cadmium_lever.json @@ -1,20 +1,76 @@ { - "variants": { - "facing=down_z,powered=false": { "model": "modernmetals:cadmium_lever_off", "x": 180, "y": 180 }, - "facing=down_x,powered=false": { "model": "modernmetals:cadmium_lever_off", "x": 180, "y": 90 }, - "facing=up_z,powered=false": { "model": "modernmetals:cadmium_lever_off" }, - "facing=up_x,powered=false": { "model": "modernmetals:cadmium_lever_off", "y": 270 }, - "facing=east,powered=false": { "model": "modernmetals:cadmium_lever_off", "x": 90, "y": 90 }, - "facing=west,powered=false": { "model": "modernmetals:cadmium_lever_off", "x": 90, "y": 270 }, - "facing=south,powered=false" : { "model": "modernmetals:cadmium_lever_off", "x": 90, "y": 180 }, - "facing=north,powered=false" : { "model": "modernmetals:cadmium_lever_off", "x": 90 }, - "facing=down_z,powered=true" : { "model": "modernmetals:cadmium_lever", "x": 180, "y": 180 }, - "facing=down_x,powered=true" : { "model": "modernmetals:cadmium_lever", "x": 180, "y": 90 }, - "facing=up_z,powered=true": { "model": "modernmetals:cadmium_lever" }, - "facing=up_x,powered=true": { "model": "modernmetals:cadmium_lever", "y": 270 }, - "facing=east,powered=true": { "model": "modernmetals:cadmium_lever", "x": 90, "y": 90 }, - "facing=west,powered=true": { "model": "modernmetals:cadmium_lever", "x": 90, "y": 270 }, - "facing=south,powered=true": { "model": "modernmetals:cadmium_lever", "x": 90, "y": 180 }, - "facing=north,powered=true": { "model": "modernmetals:cadmium_lever", "x": 90 } + "variants": { + "face=floor,facing=north,powered=false": { + "model": "modernmetals:block/cadmium_lever_off" + }, + "face=wall,facing=north,powered=false": { + "model": "modernmetals:block/cadmium_lever_off" + }, + "face=ceiling,facing=north,powered=false": { + "model": "modernmetals:block/cadmium_lever_off" + }, + "face=floor,facing=south,powered=false": { + "model": "modernmetals:block/cadmium_lever_off" + }, + "face=wall,facing=south,powered=false": { + "model": "modernmetals:block/cadmium_lever_off" + }, + "face=ceiling,facing=south,powered=false": { + "model": "modernmetals:block/cadmium_lever_off" + }, + "face=floor,facing=west,powered=false": { + "model": "modernmetals:block/cadmium_lever_off" + }, + "face=wall,facing=west,powered=false": { + "model": "modernmetals:block/cadmium_lever_off" + }, + "face=ceiling,facing=west,powered=false": { + "model": "modernmetals:block/cadmium_lever_off" + }, + "face=floor,facing=east,powered=false": { + "model": "modernmetals:block/cadmium_lever_off" + }, + "face=wall,facing=east,powered=false": { + "model": "modernmetals:block/cadmium_lever_off" + }, + "face=ceiling,facing=east,powered=false": { + "model": "modernmetals:block/cadmium_lever_off" + }, + "face=floor,facing=north,powered=true": { + "model": "modernmetals:block/cadmium_lever" + }, + "face=wall,facing=north,powered=true": { + "model": "modernmetals:block/cadmium_lever" + }, + "face=ceiling,facing=north,powered=true": { + "model": "modernmetals:block/cadmium_lever" + }, + "face=floor,facing=south,powered=true": { + "model": "modernmetals:block/cadmium_lever" + }, + "face=wall,facing=south,powered=true": { + "model": "modernmetals:block/cadmium_lever" + }, + "face=ceiling,facing=south,powered=true": { + "model": "modernmetals:block/cadmium_lever" + }, + "face=floor,facing=west,powered=true": { + "model": "modernmetals:block/cadmium_lever" + }, + "face=wall,facing=west,powered=true": { + "model": "modernmetals:block/cadmium_lever" + }, + "face=ceiling,facing=west,powered=true": { + "model": "modernmetals:block/cadmium_lever" + }, + "face=floor,facing=east,powered=true": { + "model": "modernmetals:block/cadmium_lever" + }, + "face=wall,facing=east,powered=true": { + "model": "modernmetals:block/cadmium_lever" + }, + "face=ceiling,facing=east,powered=true": { + "model": "modernmetals:block/cadmium_lever" } + } } diff --git a/src/main/resources/assets/modernmetals/blockstates/cadmium_ore.json b/src/main/resources/assets/modernmetals/blockstates/cadmium_ore.json index d4832d6f..01884ae5 100644 --- a/src/main/resources/assets/modernmetals/blockstates/cadmium_ore.json +++ b/src/main/resources/assets/modernmetals/blockstates/cadmium_ore.json @@ -1,5 +1,7 @@ { - "variants": { - "normal": { "model": "modernmetals:cadmium_ore" } + "variants": { + "": { + "model": "modernmetals:block/cadmium_ore" } + } } diff --git a/src/main/resources/assets/modernmetals/blockstates/cadmium_plate.json b/src/main/resources/assets/modernmetals/blockstates/cadmium_plate.json index 71ac0365..3b54d0f4 100644 --- a/src/main/resources/assets/modernmetals/blockstates/cadmium_plate.json +++ b/src/main/resources/assets/modernmetals/blockstates/cadmium_plate.json @@ -1,10 +1,27 @@ { - "variants": { - "facing=down": { "model": "modernmetals:cadmium_plate", "x": 90 }, - "facing=up": { "model": "modernmetals:cadmium_plate", "x": 270 }, - "facing=north": { "model": "modernmetals:cadmium_plate" }, - "facing=south": { "model": "modernmetals:cadmium_plate", "y": 180 }, - "facing=west": { "model": "modernmetals:cadmium_plate", "y": 270 }, - "facing=east": { "model": "modernmetals:cadmium_plate", "y": 90 } + "variants": { + "facing=down": { + "model": "modernmetals:block/cadmium_plate", + "x": 90 + }, + "facing=up": { + "model": "modernmetals:block/cadmium_plate", + "x": 270 + }, + "facing=north": { + "model": "modernmetals:block/cadmium_plate" + }, + "facing=south": { + "model": "modernmetals:block/cadmium_plate", + "y": 180 + }, + "facing=west": { + "model": "modernmetals:block/cadmium_plate", + "y": 270 + }, + "facing=east": { + "model": "modernmetals:block/cadmium_plate", + "y": 90 } + } } diff --git a/src/main/resources/assets/modernmetals/blockstates/cadmium_pressure_plate.json b/src/main/resources/assets/modernmetals/blockstates/cadmium_pressure_plate.json index 2bb11b1a..dd37bb74 100644 --- a/src/main/resources/assets/modernmetals/blockstates/cadmium_pressure_plate.json +++ b/src/main/resources/assets/modernmetals/blockstates/cadmium_pressure_plate.json @@ -1,6 +1,10 @@ { - "variants": { - "powered=false": { "model": "modernmetals:cadmium_pressure_plate_up" }, - "powered=true": { "model": "modernmetals:cadmium_pressure_plate_down" } + "variants": { + "powered=false": { + "model": "modernmetals:block/cadmium_pressure_plate_up" + }, + "powered=true": { + "model": "modernmetals:block/cadmium_pressure_plate_down" } + } } diff --git a/src/main/resources/assets/modernmetals/blockstates/cadmium_slab.json b/src/main/resources/assets/modernmetals/blockstates/cadmium_slab.json index 7650dfbb..b4a39ff2 100644 --- a/src/main/resources/assets/modernmetals/blockstates/cadmium_slab.json +++ b/src/main/resources/assets/modernmetals/blockstates/cadmium_slab.json @@ -1,6 +1,13 @@ { - "variants": { - "half=bottom,variant=default": { "model": "modernmetals:half_slab_cadmium" }, - "half=top,variant=default": { "model": "modernmetals:upper_slab_cadmium" } + "variants": { + "type=top": { + "model": "modernmetals:block/upper_slab_cadmium" + }, + "type=bottom": { + "model": "modernmetals:block/half_slab_cadmium" + }, + "type=double": { + "model": "modernmetals:block/cadmium_block" } + } } diff --git a/src/main/resources/assets/modernmetals/blockstates/cadmium_stairs.json b/src/main/resources/assets/modernmetals/blockstates/cadmium_stairs.json index ae196685..780d48ae 100644 --- a/src/main/resources/assets/modernmetals/blockstates/cadmium_stairs.json +++ b/src/main/resources/assets/modernmetals/blockstates/cadmium_stairs.json @@ -1,44 +1,209 @@ { - "variants": { - "facing=east,half=bottom,shape=straight": { "model": "modernmetals:cadmium_stairs" }, - "facing=west,half=bottom,shape=straight": { "model": "modernmetals:cadmium_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=straight": { "model": "modernmetals:cadmium_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=straight": { "model": "modernmetals:cadmium_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_right": { "model": "modernmetals:cadmium_outer_stairs" }, - "facing=west,half=bottom,shape=outer_right": { "model": "modernmetals:cadmium_outer_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=outer_right": { "model": "modernmetals:cadmium_outer_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=outer_right": { "model": "modernmetals:cadmium_outer_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_left": { "model": "modernmetals:cadmium_outer_stairs", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=outer_left": { "model": "modernmetals:cadmium_outer_stairs", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=outer_left": { "model": "modernmetals:cadmium_outer_stairs" }, - "facing=north,half=bottom,shape=outer_left": { "model": "modernmetals:cadmium_outer_stairs", "y": 180, "uvlock": true }, - "facing=east,half=bottom,shape=inner_right": { "model": "modernmetals:cadmium_inner_stairs" }, - "facing=west,half=bottom,shape=inner_right": { "model": "modernmetals:cadmium_inner_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=inner_right": { "model": "modernmetals:cadmium_inner_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=inner_right": { "model": "modernmetals:cadmium_inner_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=inner_left": { "model": "modernmetals:cadmium_inner_stairs", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=inner_left": { "model": "modernmetals:cadmium_inner_stairs", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=inner_left": { "model": "modernmetals:cadmium_inner_stairs" }, - "facing=north,half=bottom,shape=inner_left": { "model": "modernmetals:cadmium_inner_stairs", "y": 180, "uvlock": true }, - "facing=east,half=top,shape=straight": { "model": "modernmetals:cadmium_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=straight": { "model": "modernmetals:cadmium_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=straight": { "model": "modernmetals:cadmium_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=straight": { "model": "modernmetals:cadmium_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { "model": "modernmetals:cadmium_outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_right": { "model": "modernmetals:cadmium_outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { "model": "modernmetals:cadmium_outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { "model": "modernmetals:cadmium_outer_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { "model": "modernmetals:cadmium_outer_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { "model": "modernmetals:cadmium_outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { "model": "modernmetals:cadmium_outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=outer_left": { "model": "modernmetals:cadmium_outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { "model": "modernmetals:cadmium_inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { "model": "modernmetals:cadmium_inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { "model": "modernmetals:cadmium_inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { "model": "modernmetals:cadmium_inner_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { "model": "modernmetals:cadmium_inner_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { "model": "modernmetals:cadmium_inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { "model": "modernmetals:cadmium_inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { "model": "modernmetals:cadmium_inner_stairs", "x": 180, "y": 270, "uvlock": true } + "variants": { + "facing=north,half=top,shape=straight": { + "model": "modernmetals:block/cadmium_stairs", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=south,half=top,shape=straight": { + "model": "modernmetals:block/cadmium_stairs", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=west,half=top,shape=straight": { + "model": "modernmetals:block/cadmium_stairs", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=east,half=top,shape=straight": { + "model": "modernmetals:block/cadmium_stairs", + "x": 180, + "uvlock": true + }, + "facing=north,half=bottom,shape=straight": { + "model": "modernmetals:block/cadmium_stairs", + "y": 270, + "uvlock": true + }, + "facing=south,half=bottom,shape=straight": { + "model": "modernmetals:block/cadmium_stairs", + "y": 90, + "uvlock": true + }, + "facing=west,half=bottom,shape=straight": { + "model": "modernmetals:block/cadmium_stairs", + "y": 180, + "uvlock": true + }, + "facing=east,half=bottom,shape=straight": { + "model": "modernmetals:block/cadmium_stairs" + }, + "facing=north,half=top,shape=inner_left": { + "model": "modernmetals:block/cadmium_inner_stairs", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=south,half=top,shape=inner_left": { + "model": "modernmetals:block/cadmium_inner_stairs", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=west,half=top,shape=inner_left": { + "model": "modernmetals:block/cadmium_inner_stairs", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=east,half=top,shape=inner_left": { + "model": "modernmetals:block/cadmium_inner_stairs", + "x": 180, + "uvlock": true + }, + "facing=north,half=bottom,shape=inner_left": { + "model": "modernmetals:block/cadmium_inner_stairs", + "y": 180, + "uvlock": true + }, + "facing=south,half=bottom,shape=inner_left": { + "model": "modernmetals:block/cadmium_inner_stairs" + }, + "facing=west,half=bottom,shape=inner_left": { + "model": "modernmetals:block/cadmium_inner_stairs", + "y": 90, + "uvlock": true + }, + "facing=east,half=bottom,shape=inner_left": { + "model": "modernmetals:block/cadmium_inner_stairs", + "y": 270, + "uvlock": true + }, + "facing=north,half=top,shape=inner_right": { + "model": "modernmetals:block/cadmium_inner_stairs", + "x": 180, + "uvlock": true + }, + "facing=south,half=top,shape=inner_right": { + "model": "modernmetals:block/cadmium_inner_stairs", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=west,half=top,shape=inner_right": { + "model": "modernmetals:block/cadmium_inner_stairs", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=east,half=top,shape=inner_right": { + "model": "modernmetals:block/cadmium_inner_stairs", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=north,half=bottom,shape=inner_right": { + "model": "modernmetals:block/cadmium_inner_stairs", + "y": 270, + "uvlock": true + }, + "facing=south,half=bottom,shape=inner_right": { + "model": "modernmetals:block/cadmium_inner_stairs", + "y": 90, + "uvlock": true + }, + "facing=west,half=bottom,shape=inner_right": { + "model": "modernmetals:block/cadmium_inner_stairs", + "y": 180, + "uvlock": true + }, + "facing=east,half=bottom,shape=inner_right": { + "model": "modernmetals:block/cadmium_inner_stairs" + }, + "facing=north,half=top,shape=outer_left": { + "model": "modernmetals:block/cadmium_outer_stairs", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=south,half=top,shape=outer_left": { + "model": "modernmetals:block/cadmium_outer_stairs", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=west,half=top,shape=outer_left": { + "model": "modernmetals:block/cadmium_outer_stairs", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=east,half=top,shape=outer_left": { + "model": "modernmetals:block/cadmium_outer_stairs", + "x": 180, + "uvlock": true + }, + "facing=north,half=bottom,shape=outer_left": { + "model": "modernmetals:block/cadmium_outer_stairs", + "y": 180, + "uvlock": true + }, + "facing=south,half=bottom,shape=outer_left": { + "model": "modernmetals:block/cadmium_outer_stairs" + }, + "facing=west,half=bottom,shape=outer_left": { + "model": "modernmetals:block/cadmium_outer_stairs", + "y": 90, + "uvlock": true + }, + "facing=east,half=bottom,shape=outer_left": { + "model": "modernmetals:block/cadmium_outer_stairs", + "y": 270, + "uvlock": true + }, + "facing=north,half=top,shape=outer_right": { + "model": "modernmetals:block/cadmium_outer_stairs", + "x": 180, + "uvlock": true + }, + "facing=south,half=top,shape=outer_right": { + "model": "modernmetals:block/cadmium_outer_stairs", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=west,half=top,shape=outer_right": { + "model": "modernmetals:block/cadmium_outer_stairs", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=east,half=top,shape=outer_right": { + "model": "modernmetals:block/cadmium_outer_stairs", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=north,half=bottom,shape=outer_right": { + "model": "modernmetals:block/cadmium_outer_stairs", + "y": 270, + "uvlock": true + }, + "facing=south,half=bottom,shape=outer_right": { + "model": "modernmetals:block/cadmium_outer_stairs", + "y": 90, + "uvlock": true + }, + "facing=west,half=bottom,shape=outer_right": { + "model": "modernmetals:block/cadmium_outer_stairs", + "y": 180, + "uvlock": true + }, + "facing=east,half=bottom,shape=outer_right": { + "model": "modernmetals:block/cadmium_outer_stairs" } + } } diff --git a/src/main/resources/assets/modernmetals/blockstates/cadmium_trapdoor.json b/src/main/resources/assets/modernmetals/blockstates/cadmium_trapdoor.json index a68f1700..20bf8c75 100644 --- a/src/main/resources/assets/modernmetals/blockstates/cadmium_trapdoor.json +++ b/src/main/resources/assets/modernmetals/blockstates/cadmium_trapdoor.json @@ -1,20 +1,68 @@ { - "variants": { - "facing=north,half=bottom,open=false": { "model": "modernmetals:cadmium_trapdoor_bottom" }, - "facing=south,half=bottom,open=false": { "model": "modernmetals:cadmium_trapdoor_bottom" }, - "facing=east,half=bottom,open=false": { "model": "modernmetals:cadmium_trapdoor_bottom" }, - "facing=west,half=bottom,open=false": { "model": "modernmetals:cadmium_trapdoor_bottom" }, - "facing=north,half=top,open=false": { "model": "modernmetals:cadmium_trapdoor_top" }, - "facing=south,half=top,open=false": { "model": "modernmetals:cadmium_trapdoor_top" }, - "facing=east,half=top,open=false": { "model": "modernmetals:cadmium_trapdoor_top" }, - "facing=west,half=top,open=false": { "model": "modernmetals:cadmium_trapdoor_top" }, - "facing=north,half=bottom,open=true": { "model": "modernmetals:cadmium_trapdoor_open" }, - "facing=south,half=bottom,open=true": { "model": "modernmetals:cadmium_trapdoor_open", "y": 180 }, - "facing=east,half=bottom,open=true": { "model": "modernmetals:cadmium_trapdoor_open", "y": 90 }, - "facing=west,half=bottom,open=true": { "model": "modernmetals:cadmium_trapdoor_open", "y": 270 }, - "facing=north,half=top,open=true": { "model": "modernmetals:cadmium_trapdoor_open" }, - "facing=south,half=top,open=true": { "model": "modernmetals:cadmium_trapdoor_open", "y": 180 }, - "facing=east,half=top,open=true": { "model": "modernmetals:cadmium_trapdoor_open", "y": 90 }, - "facing=west,half=top,open=true": { "model": "modernmetals:cadmium_trapdoor_open", "y": 270 } + "variants": { + "facing=north,half=top,open=false": { + "model": "modernmetals:block/cadmium_trapdoor_top" + }, + "facing=south,half=top,open=false": { + "model": "modernmetals:block/cadmium_trapdoor_top", + "y": 180 + }, + "facing=west,half=top,open=false": { + "model": "modernmetals:block/cadmium_trapdoor_top", + "y": 270 + }, + "facing=east,half=top,open=false": { + "model": "modernmetals:block/cadmium_trapdoor_top", + "y": 90 + }, + "facing=north,half=bottom,open=false": { + "model": "modernmetals:block/cadmium_trapdoor_bottom" + }, + "facing=south,half=bottom,open=false": { + "model": "modernmetals:block/cadmium_trapdoor_bottom", + "y": 180 + }, + "facing=west,half=bottom,open=false": { + "model": "modernmetals:block/cadmium_trapdoor_bottom", + "y": 270 + }, + "facing=east,half=bottom,open=false": { + "model": "modernmetals:block/cadmium_trapdoor_bottom", + "y": 90 + }, + "facing=north,half=top,open=true": { + "model": "modernmetals:block/cadmium_trapdoor_open", + "x": 180, + "y": 180 + }, + "facing=south,half=top,open=true": { + "model": "modernmetals:block/cadmium_trapdoor_open", + "x": 180 + }, + "facing=west,half=top,open=true": { + "model": "modernmetals:block/cadmium_trapdoor_open", + "x": 180, + "y": 90 + }, + "facing=east,half=top,open=true": { + "model": "modernmetals:block/cadmium_trapdoor_open", + "x": 180, + "y": 270 + }, + "facing=north,half=bottom,open=true": { + "model": "modernmetals:block/cadmium_trapdoor_open" + }, + "facing=south,half=bottom,open=true": { + "model": "modernmetals:block/cadmium_trapdoor_open", + "y": 180 + }, + "facing=west,half=bottom,open=true": { + "model": "modernmetals:block/cadmium_trapdoor_open", + "y": 270 + }, + "facing=east,half=bottom,open=true": { + "model": "modernmetals:block/cadmium_trapdoor_open", + "y": 90 } + } } diff --git a/src/main/resources/assets/modernmetals/blockstates/cadmium_wall.json b/src/main/resources/assets/modernmetals/blockstates/cadmium_wall.json index ff3c5405..496274de 100644 --- a/src/main/resources/assets/modernmetals/blockstates/cadmium_wall.json +++ b/src/main/resources/assets/modernmetals/blockstates/cadmium_wall.json @@ -1,19 +1,51 @@ { - "multipart": [ - { "when": { "up": "true" }, - "apply": { "model": "modernmetals:cadmium_wall_post" } - }, - { "when": { "north": "true" }, - "apply": { "model": "modernmetals:cadmium_wall_side", "uvlock": true } - }, - { "when": { "east": "true" }, - "apply": { "model": "modernmetals:cadmium_wall_side", "y": 90, "uvlock": true } - }, - { "when": { "south": "true" }, - "apply": { "model": "modernmetals:cadmium_wall_side", "y": 180, "uvlock": true } - }, - { "when": { "west": "true" }, - "apply": { "model": "modernmetals:cadmium_wall_side", "y": 270, "uvlock": true } - } - ] + "multipart": [ + { + "when": { + "up": "true" + }, + "apply": { + "model": "modernmetals:block/cadmium_wall_post" + } + }, + { + "when": { + "north": "true" + }, + "apply": { + "model": "modernmetals:block/cadmium_wall_side", + "uvlock": true + } + }, + { + "when": { + "east": "true" + }, + "apply": { + "model": "modernmetals:block/cadmium_wall_side", + "y": 90, + "uvlock": true + } + }, + { + "when": { + "south": "true" + }, + "apply": { + "model": "modernmetals:block/cadmium_wall_side", + "y": 180, + "uvlock": true + } + }, + { + "when": { + "west": "true" + }, + "apply": { + "model": "modernmetals:block/cadmium_wall_side", + "y": 270, + "uvlock": true + } + } + ] } diff --git a/src/main/resources/assets/modernmetals/blockstates/chromium.json b/src/main/resources/assets/modernmetals/blockstates/chromium.json index 6544e76c..47f59e0e 100644 --- a/src/main/resources/assets/modernmetals/blockstates/chromium.json +++ b/src/main/resources/assets/modernmetals/blockstates/chromium.json @@ -1,9 +1,10 @@ { - "forge_marker": 1, - "variants": { - "fluid": { - "model": "forge:fluid", - "custom": { "fluid": "chromium" } - } + "variants": { + "": { + "model": "minecraft:block/water", + "custom": { + "fluid": "modernmetals:chromium" + } } -} \ No newline at end of file + } +} diff --git a/src/main/resources/assets/modernmetals/blockstates/chromium_bars.json b/src/main/resources/assets/modernmetals/blockstates/chromium_bars.json index 741a8e23..29a2823d 100644 --- a/src/main/resources/assets/modernmetals/blockstates/chromium_bars.json +++ b/src/main/resources/assets/modernmetals/blockstates/chromium_bars.json @@ -1,32 +1,77 @@ { - "multipart": [ - { "apply": { "model": "modernmetals:chromium_bars_post_ends" }}, - { "when": { "north": false, "east": false, "south": false, "west": false }, - "apply": { "model": "modernmetals:chromium_bars_post" } - }, - { "when": { "north": true, "east": false, "south": false, "west": false }, - "apply": { "model": "modernmetals:chromium_bars_cap" } - }, - { "when": { "north": false, "east": true, "south": false, "west": false }, - "apply": { "model": "modernmetals:chromium_bars_cap", "y": 90 } - }, - { "when": { "north": false, "east": false, "south": true, "west": false }, - "apply": { "model": "modernmetals:chromium_bars_cap_alt" } - }, - { "when": { "north": false, "east": false, "south": false, "west": true }, - "apply": { "model": "modernmetals:chromium_bars_cap_alt", "y": 90 } - }, - { "when": { "north": true }, - "apply": { "model": "modernmetals:chromium_bars_side" } - }, - { "when": { "east": true }, - "apply": { "model": "modernmetals:chromium_bars_side", "y": 90 } - }, - { "when": { "south": true }, - "apply": { "model": "modernmetals:chromium_bars_side_alt" } - }, - { "when": { "west": true }, - "apply": { "model": "modernmetals:chromium_bars_side_alt", "y": 90 } - } - ] + "multipart": [ + { + "apply": { + "model": "modernmetals:block/chromium_bars_post" + } + }, + { + "when": { + "north": "true" + }, + "apply": { + "model": "modernmetals:block/chromium_bars_side" + } + }, + { + "when": { + "north": "false" + }, + "apply": { + "model": "modernmetals:block/chromium_bars_cap" + } + }, + { + "when": { + "south": "true" + }, + "apply": { + "model": "modernmetals:block/chromium_bars_side_alt" + } + }, + { + "when": { + "south": "false" + }, + "apply": { + "model": "modernmetals:block/chromium_bars_cap_alt", + "y": 90 + } + }, + { + "when": { + "west": "true" + }, + "apply": { + "model": "modernmetals:block/chromium_bars_side_alt", + "y": 90 + } + }, + { + "when": { + "west": "false" + }, + "apply": { + "model": "modernmetals:block/chromium_bars_cap", + "y": 270 + } + }, + { + "when": { + "east": "true" + }, + "apply": { + "model": "modernmetals:block/chromium_bars_side", + "y": 90 + } + }, + { + "when": { + "east": "false" + }, + "apply": { + "model": "modernmetals:block/chromium_bars_cap_alt" + } + } + ] } diff --git a/src/main/resources/assets/modernmetals/blockstates/chromium_block.json b/src/main/resources/assets/modernmetals/blockstates/chromium_block.json index af15a0e8..2bb0171e 100644 --- a/src/main/resources/assets/modernmetals/blockstates/chromium_block.json +++ b/src/main/resources/assets/modernmetals/blockstates/chromium_block.json @@ -1,5 +1,7 @@ { - "variants": { - "normal": { "model": "modernmetals:chromium_block" } + "variants": { + "": { + "model": "modernmetals:block/chromium_block" } + } } diff --git a/src/main/resources/assets/modernmetals/blockstates/chromium_button.json b/src/main/resources/assets/modernmetals/blockstates/chromium_button.json index f066b2f2..b999649e 100644 --- a/src/main/resources/assets/modernmetals/blockstates/chromium_button.json +++ b/src/main/resources/assets/modernmetals/blockstates/chromium_button.json @@ -1,16 +1,118 @@ { - "variants": { - "facing=up,powered=false": { "model": "modernmetals:chromium_button", "uvlock": true }, - "facing=down,powered=false": { "model": "modernmetals:chromium_button", "uvlock": true, "x": 180 }, - "facing=east,powered=false": { "model": "modernmetals:chromium_button", "uvlock": true, "x": 90, "y": 90 }, - "facing=west,powered=false": { "model": "modernmetals:chromium_button", "uvlock": true, "x": 90, "y": 270 }, - "facing=south,powered=false": { "model": "modernmetals:chromium_button", "uvlock": true, "x": 90, "y": 180 }, - "facing=north,powered=false": { "model": "modernmetals:chromium_button", "uvlock": true, "x": 90 }, - "facing=up,powered=true": { "model": "modernmetals:chromium_button_pressed", "uvlock": true }, - "facing=down,powered=true": { "model": "modernmetals:chromium_button_pressed", "uvlock": true, "x": 180 }, - "facing=east,powered=true": { "model": "modernmetals:chromium_button_pressed", "uvlock": true, "x": 90, "y": 90 }, - "facing=west,powered=true": { "model": "modernmetals:chromium_button_pressed", "uvlock": true, "x": 90, "y": 270 }, - "facing=south,powered=true": { "model": "modernmetals:chromium_button_pressed", "uvlock": true, "x": 90, "y": 180 }, - "facing=north,powered=true": { "model": "modernmetals:chromium_button_pressed", "uvlock": true, "x": 90 } + "variants": { + "face=floor,facing=north,powered=false": { + "model": "modernmetals:block/chromium_button" + }, + "face=wall,facing=north,powered=false": { + "model": "modernmetals:block/chromium_button", + "x": 90, + "uvlock": true + }, + "face=ceiling,facing=north,powered=false": { + "model": "modernmetals:block/chromium_button", + "x": 180, + "y": 180 + }, + "face=floor,facing=south,powered=false": { + "model": "modernmetals:block/chromium_button", + "y": 180 + }, + "face=wall,facing=south,powered=false": { + "model": "modernmetals:block/chromium_button", + "x": 90, + "y": 180, + "uvlock": true + }, + "face=ceiling,facing=south,powered=false": { + "model": "modernmetals:block/chromium_button", + "x": 180 + }, + "face=floor,facing=west,powered=false": { + "model": "modernmetals:block/chromium_button", + "y": 270 + }, + "face=wall,facing=west,powered=false": { + "model": "modernmetals:block/chromium_button", + "x": 90, + "y": 270, + "uvlock": true + }, + "face=ceiling,facing=west,powered=false": { + "model": "modernmetals:block/chromium_button", + "x": 180, + "y": 90 + }, + "face=floor,facing=east,powered=false": { + "model": "modernmetals:block/chromium_button", + "y": 90 + }, + "face=wall,facing=east,powered=false": { + "model": "modernmetals:block/chromium_button", + "x": 90, + "y": 90, + "uvlock": true + }, + "face=ceiling,facing=east,powered=false": { + "model": "modernmetals:block/chromium_button", + "x": 180, + "y": 270 + }, + "face=floor,facing=north,powered=true": { + "model": "modernmetals:block/chromium_button_pressed" + }, + "face=wall,facing=north,powered=true": { + "model": "modernmetals:block/chromium_button_pressed", + "x": 90, + "uvlock": true + }, + "face=ceiling,facing=north,powered=true": { + "model": "modernmetals:block/chromium_button_pressed", + "x": 180, + "y": 180 + }, + "face=floor,facing=south,powered=true": { + "model": "modernmetals:block/chromium_button_pressed", + "y": 180 + }, + "face=wall,facing=south,powered=true": { + "model": "modernmetals:block/chromium_button_pressed", + "x": 90, + "y": 180, + "uvlock": true + }, + "face=ceiling,facing=south,powered=true": { + "model": "modernmetals:block/chromium_button_pressed", + "x": 180 + }, + "face=floor,facing=west,powered=true": { + "model": "modernmetals:block/chromium_button_pressed", + "y": 270 + }, + "face=wall,facing=west,powered=true": { + "model": "modernmetals:block/chromium_button_pressed", + "x": 90, + "y": 270, + "uvlock": true + }, + "face=ceiling,facing=west,powered=true": { + "model": "modernmetals:block/chromium_button_pressed", + "x": 180, + "y": 90 + }, + "face=floor,facing=east,powered=true": { + "model": "modernmetals:block/chromium_button_pressed", + "y": 90 + }, + "face=wall,facing=east,powered=true": { + "model": "modernmetals:block/chromium_button_pressed", + "x": 90, + "y": 90, + "uvlock": true + }, + "face=ceiling,facing=east,powered=true": { + "model": "modernmetals:block/chromium_button_pressed", + "x": 180, + "y": 270 } + } } diff --git a/src/main/resources/assets/modernmetals/blockstates/chromium_door.json b/src/main/resources/assets/modernmetals/blockstates/chromium_door.json index e4d16204..f7e2dcac 100644 --- a/src/main/resources/assets/modernmetals/blockstates/chromium_door.json +++ b/src/main/resources/assets/modernmetals/blockstates/chromium_door.json @@ -1,70 +1,124 @@ { - "variants": { - "facing=east,half=lower,hinge=left,open=false,powered=false": { "model": "modernmetals:chromium_door_bottom" }, - "facing=south,half=lower,hinge=left,open=false,powered=false": { "model": "modernmetals:chromium_door_bottom", "y": 90 }, - "facing=west,half=lower,hinge=left,open=false,powered=false": { "model": "modernmetals:chromium_door_bottom", "y": 180 }, - "facing=north,half=lower,hinge=left,open=false,powered=false": { "model": "modernmetals:chromium_door_bottom", "y": 270 }, - "facing=east,half=lower,hinge=right,open=false,powered=false": { "model": "modernmetals:chromium_door_bottom_rh" }, - "facing=south,half=lower,hinge=right,open=false,powered=false": { "model": "modernmetals:chromium_door_bottom_rh", "y": 90 }, - "facing=west,half=lower,hinge=right,open=false,powered=false": { "model": "modernmetals:chromium_door_bottom_rh", "y": 180 }, - "facing=north,half=lower,hinge=right,open=false,powered=false": { "model": "modernmetals:chromium_door_bottom_rh", "y": 270 }, - "facing=east,half=lower,hinge=left,open=true,powered=false": { "model": "modernmetals:chromium_door_bottom_rh", "y": 90 }, - "facing=south,half=lower,hinge=left,open=true,powered=false": { "model": "modernmetals:chromium_door_bottom_rh", "y": 180 }, - "facing=west,half=lower,hinge=left,open=true,powered=false": { "model": "modernmetals:chromium_door_bottom_rh", "y": 270 }, - "facing=north,half=lower,hinge=left,open=true,powered=false": { "model": "modernmetals:chromium_door_bottom_rh" }, - "facing=east,half=lower,hinge=right,open=true,powered=false": { "model": "modernmetals:chromium_door_bottom", "y": 270 }, - "facing=south,half=lower,hinge=right,open=true,powered=false": { "model": "modernmetals:chromium_door_bottom" }, - "facing=west,half=lower,hinge=right,open=true,powered=false": { "model": "modernmetals:chromium_door_bottom", "y": 90 }, - "facing=north,half=lower,hinge=right,open=true,powered=false": { "model": "modernmetals:chromium_door_bottom", "y": 180 }, - "facing=east,half=upper,hinge=left,open=false,powered=false": { "model": "modernmetals:chromium_door_top" }, - "facing=south,half=upper,hinge=left,open=false,powered=false": { "model": "modernmetals:chromium_door_top", "y": 90 }, - "facing=west,half=upper,hinge=left,open=false,powered=false": { "model": "modernmetals:chromium_door_top", "y": 180 }, - "facing=north,half=upper,hinge=left,open=false,powered=false": { "model": "modernmetals:chromium_door_top", "y": 270 }, - "facing=east,half=upper,hinge=right,open=false,powered=false": { "model": "modernmetals:chromium_door_top_rh" }, - "facing=south,half=upper,hinge=right,open=false,powered=false": { "model": "modernmetals:chromium_door_top_rh", "y": 90 }, - "facing=west,half=upper,hinge=right,open=false,powered=false": { "model": "modernmetals:chromium_door_top_rh", "y": 180 }, - "facing=north,half=upper,hinge=right,open=false,powered=false": { "model": "modernmetals:chromium_door_top_rh", "y": 270 }, - "facing=east,half=upper,hinge=left,open=true,powered=false": { "model": "modernmetals:chromium_door_top_rh", "y": 90 }, - "facing=south,half=upper,hinge=left,open=true,powered=false": { "model": "modernmetals:chromium_door_top_rh", "y": 180 }, - "facing=west,half=upper,hinge=left,open=true,powered=false": { "model": "modernmetals:chromium_door_top_rh", "y": 270 }, - "facing=north,half=upper,hinge=left,open=true,powered=false": { "model": "modernmetals:chromium_door_top_rh" }, - "facing=east,half=upper,hinge=right,open=true,powered=false": { "model": "modernmetals:chromium_door_top", "y": 270 }, - "facing=south,half=upper,hinge=right,open=true,powered=false": { "model": "modernmetals:chromium_door_top" }, - "facing=west,half=upper,hinge=right,open=true,powered=false": { "model": "modernmetals:chromium_door_top", "y": 90 }, - "facing=north,half=upper,hinge=right,open=true,powered=false": { "model": "modernmetals:chromium_door_top", "y": 180 }, - - - "facing=east,half=lower,hinge=left,open=false,powered=true": { "model": "modernmetals:chromium_door_bottom" }, - "facing=south,half=lower,hinge=left,open=false,powered=true": { "model": "modernmetals:chromium_door_bottom", "y": 90 }, - "facing=west,half=lower,hinge=left,open=false,powered=true": { "model": "modernmetals:chromium_door_bottom", "y": 180 }, - "facing=north,half=lower,hinge=left,open=false,powered=true": { "model": "modernmetals:chromium_door_bottom", "y": 270 }, - "facing=east,half=lower,hinge=right,open=false,powered=true": { "model": "modernmetals:chromium_door_bottom_rh" }, - "facing=south,half=lower,hinge=right,open=false,powered=true": { "model": "modernmetals:chromium_door_bottom_rh", "y": 90 }, - "facing=west,half=lower,hinge=right,open=false,powered=true": { "model": "modernmetals:chromium_door_bottom_rh", "y": 180 }, - "facing=north,half=lower,hinge=right,open=false,powered=true": { "model": "modernmetals:chromium_door_bottom_rh", "y": 270 }, - "facing=east,half=lower,hinge=left,open=true,powered=true": { "model": "modernmetals:chromium_door_bottom_rh", "y": 90 }, - "facing=south,half=lower,hinge=left,open=true,powered=true": { "model": "modernmetals:chromium_door_bottom_rh", "y": 180 }, - "facing=west,half=lower,hinge=left,open=true,powered=true": { "model": "modernmetals:chromium_door_bottom_rh", "y": 270 }, - "facing=north,half=lower,hinge=left,open=true,powered=true": { "model": "modernmetals:chromium_door_bottom_rh" }, - "facing=east,half=lower,hinge=right,open=true,powered=true": { "model": "modernmetals:chromium_door_bottom", "y": 270 }, - "facing=south,half=lower,hinge=right,open=true,powered=true": { "model": "modernmetals:chromium_door_bottom" }, - "facing=west,half=lower,hinge=right,open=true,powered=true": { "model": "modernmetals:chromium_door_bottom", "y": 90 }, - "facing=north,half=lower,hinge=right,open=true,powered=true": { "model": "modernmetals:chromium_door_bottom", "y": 180 }, - "facing=east,half=upper,hinge=left,open=false,powered=true": { "model": "modernmetals:chromium_door_top" }, - "facing=south,half=upper,hinge=left,open=false,powered=true": { "model": "modernmetals:chromium_door_top", "y": 90 }, - "facing=west,half=upper,hinge=left,open=false,powered=true": { "model": "modernmetals:chromium_door_top", "y": 180 }, - "facing=north,half=upper,hinge=left,open=false,powered=true": { "model": "modernmetals:chromium_door_top", "y": 270 }, - "facing=east,half=upper,hinge=right,open=false,powered=true": { "model": "modernmetals:chromium_door_top_rh" }, - "facing=south,half=upper,hinge=right,open=false,powered=true": { "model": "modernmetals:chromium_door_top_rh", "y": 90 }, - "facing=west,half=upper,hinge=right,open=false,powered=true": { "model": "modernmetals:chromium_door_top_rh", "y": 180 }, - "facing=north,half=upper,hinge=right,open=false,powered=true": { "model": "modernmetals:chromium_door_top_rh", "y": 270 }, - "facing=east,half=upper,hinge=left,open=true,powered=true": { "model": "modernmetals:chromium_door_top_rh", "y": 90 }, - "facing=south,half=upper,hinge=left,open=true,powered=true": { "model": "modernmetals:chromium_door_top_rh", "y": 180 }, - "facing=west,half=upper,hinge=left,open=true,powered=true": { "model": "modernmetals:chromium_door_top_rh", "y": 270 }, - "facing=north,half=upper,hinge=left,open=true,powered=true": { "model": "modernmetals:chromium_door_top_rh" }, - "facing=east,half=upper,hinge=right,open=true,powered=true": { "model": "modernmetals:chromium_door_top", "y": 270 }, - "facing=south,half=upper,hinge=right,open=true,powered=true": { "model": "modernmetals:chromium_door_top" }, - "facing=west,half=upper,hinge=right,open=true,powered=true": { "model": "modernmetals:chromium_door_top", "y": 90 }, - "facing=north,half=upper,hinge=right,open=true,powered=true": { "model": "modernmetals:chromium_door_top", "y": 180 } + "variants": { + "facing=north,half=upper,hinge=left,open=false": { + "model": "modernmetals:block/chromium_door_top", + "y": 270 + }, + "facing=south,half=upper,hinge=left,open=false": { + "model": "modernmetals:block/chromium_door_top", + "y": 90 + }, + "facing=west,half=upper,hinge=left,open=false": { + "model": "modernmetals:block/chromium_door_top", + "y": 180 + }, + "facing=east,half=upper,hinge=left,open=false": { + "model": "modernmetals:block/chromium_door_top" + }, + "facing=north,half=lower,hinge=left,open=false": { + "model": "modernmetals:block/chromium_door_bottom", + "y": 270 + }, + "facing=south,half=lower,hinge=left,open=false": { + "model": "modernmetals:block/chromium_door_bottom", + "y": 90 + }, + "facing=west,half=lower,hinge=left,open=false": { + "model": "modernmetals:block/chromium_door_bottom", + "y": 180 + }, + "facing=east,half=lower,hinge=left,open=false": { + "model": "modernmetals:block/chromium_door_bottom" + }, + "facing=north,half=upper,hinge=right,open=false": { + "model": "modernmetals:block/chromium_door_top_rh", + "y": 270 + }, + "facing=south,half=upper,hinge=right,open=false": { + "model": "modernmetals:block/chromium_door_top_rh", + "y": 90 + }, + "facing=west,half=upper,hinge=right,open=false": { + "model": "modernmetals:block/chromium_door_top_rh", + "y": 180 + }, + "facing=east,half=upper,hinge=right,open=false": { + "model": "modernmetals:block/chromium_door_top_rh" + }, + "facing=north,half=lower,hinge=right,open=false": { + "model": "modernmetals:block/chromium_door_bottom_rh", + "y": 270 + }, + "facing=south,half=lower,hinge=right,open=false": { + "model": "modernmetals:block/chromium_door_bottom_rh", + "y": 90 + }, + "facing=west,half=lower,hinge=right,open=false": { + "model": "modernmetals:block/chromium_door_bottom_rh", + "y": 180 + }, + "facing=east,half=lower,hinge=right,open=false": { + "model": "modernmetals:block/chromium_door_bottom_rh" + }, + "facing=north,half=upper,hinge=left,open=true": { + "model": "modernmetals:block/chromium_door_top_rh" + }, + "facing=south,half=upper,hinge=left,open=true": { + "model": "modernmetals:block/chromium_door_top_rh", + "y": 180 + }, + "facing=west,half=upper,hinge=left,open=true": { + "model": "modernmetals:block/chromium_door_top_rh", + "y": 270 + }, + "facing=east,half=upper,hinge=left,open=true": { + "model": "modernmetals:block/chromium_door_top_rh", + "y": 90 + }, + "facing=north,half=lower,hinge=left,open=true": { + "model": "modernmetals:block/chromium_door_bottom_rh" + }, + "facing=south,half=lower,hinge=left,open=true": { + "model": "modernmetals:block/chromium_door_bottom_rh", + "y": 180 + }, + "facing=west,half=lower,hinge=left,open=true": { + "model": "modernmetals:block/chromium_door_bottom_rh", + "y": 270 + }, + "facing=east,half=lower,hinge=left,open=true": { + "model": "modernmetals:block/chromium_door_bottom_rh", + "y": 90 + }, + "facing=north,half=upper,hinge=right,open=true": { + "model": "modernmetals:block/chromium_door_top", + "y": 180 + }, + "facing=south,half=upper,hinge=right,open=true": { + "model": "modernmetals:block/chromium_door_top" + }, + "facing=west,half=upper,hinge=right,open=true": { + "model": "modernmetals:block/chromium_door_top", + "y": 90 + }, + "facing=east,half=upper,hinge=right,open=true": { + "model": "modernmetals:block/chromium_door_top", + "y": 270 + }, + "facing=north,half=lower,hinge=right,open=true": { + "model": "modernmetals:block/chromium_door_bottom", + "y": 180 + }, + "facing=south,half=lower,hinge=right,open=true": { + "model": "modernmetals:block/chromium_door_bottom" + }, + "facing=west,half=lower,hinge=right,open=true": { + "model": "modernmetals:block/chromium_door_bottom", + "y": 90 + }, + "facing=east,half=lower,hinge=right,open=true": { + "model": "modernmetals:block/chromium_door_bottom", + "y": 270 } + } } diff --git a/src/main/resources/assets/modernmetals/blockstates/chromium_lever.json b/src/main/resources/assets/modernmetals/blockstates/chromium_lever.json index b22e8089..36258266 100644 --- a/src/main/resources/assets/modernmetals/blockstates/chromium_lever.json +++ b/src/main/resources/assets/modernmetals/blockstates/chromium_lever.json @@ -1,20 +1,76 @@ { - "variants": { - "facing=down_z,powered=false": { "model": "modernmetals:chromium_lever_off", "x": 180, "y": 180 }, - "facing=down_x,powered=false": { "model": "modernmetals:chromium_lever_off", "x": 180, "y": 90 }, - "facing=up_z,powered=false": { "model": "modernmetals:chromium_lever_off" }, - "facing=up_x,powered=false": { "model": "modernmetals:chromium_lever_off", "y": 270 }, - "facing=east,powered=false": { "model": "modernmetals:chromium_lever_off", "x": 90, "y": 90 }, - "facing=west,powered=false": { "model": "modernmetals:chromium_lever_off", "x": 90, "y": 270 }, - "facing=south,powered=false" : { "model": "modernmetals:chromium_lever_off", "x": 90, "y": 180 }, - "facing=north,powered=false" : { "model": "modernmetals:chromium_lever_off", "x": 90 }, - "facing=down_z,powered=true" : { "model": "modernmetals:chromium_lever", "x": 180, "y": 180 }, - "facing=down_x,powered=true" : { "model": "modernmetals:chromium_lever", "x": 180, "y": 90 }, - "facing=up_z,powered=true": { "model": "modernmetals:chromium_lever" }, - "facing=up_x,powered=true": { "model": "modernmetals:chromium_lever", "y": 270 }, - "facing=east,powered=true": { "model": "modernmetals:chromium_lever", "x": 90, "y": 90 }, - "facing=west,powered=true": { "model": "modernmetals:chromium_lever", "x": 90, "y": 270 }, - "facing=south,powered=true": { "model": "modernmetals:chromium_lever", "x": 90, "y": 180 }, - "facing=north,powered=true": { "model": "modernmetals:chromium_lever", "x": 90 } + "variants": { + "face=floor,facing=north,powered=false": { + "model": "modernmetals:block/chromium_lever_off" + }, + "face=wall,facing=north,powered=false": { + "model": "modernmetals:block/chromium_lever_off" + }, + "face=ceiling,facing=north,powered=false": { + "model": "modernmetals:block/chromium_lever_off" + }, + "face=floor,facing=south,powered=false": { + "model": "modernmetals:block/chromium_lever_off" + }, + "face=wall,facing=south,powered=false": { + "model": "modernmetals:block/chromium_lever_off" + }, + "face=ceiling,facing=south,powered=false": { + "model": "modernmetals:block/chromium_lever_off" + }, + "face=floor,facing=west,powered=false": { + "model": "modernmetals:block/chromium_lever_off" + }, + "face=wall,facing=west,powered=false": { + "model": "modernmetals:block/chromium_lever_off" + }, + "face=ceiling,facing=west,powered=false": { + "model": "modernmetals:block/chromium_lever_off" + }, + "face=floor,facing=east,powered=false": { + "model": "modernmetals:block/chromium_lever_off" + }, + "face=wall,facing=east,powered=false": { + "model": "modernmetals:block/chromium_lever_off" + }, + "face=ceiling,facing=east,powered=false": { + "model": "modernmetals:block/chromium_lever_off" + }, + "face=floor,facing=north,powered=true": { + "model": "modernmetals:block/chromium_lever" + }, + "face=wall,facing=north,powered=true": { + "model": "modernmetals:block/chromium_lever" + }, + "face=ceiling,facing=north,powered=true": { + "model": "modernmetals:block/chromium_lever" + }, + "face=floor,facing=south,powered=true": { + "model": "modernmetals:block/chromium_lever" + }, + "face=wall,facing=south,powered=true": { + "model": "modernmetals:block/chromium_lever" + }, + "face=ceiling,facing=south,powered=true": { + "model": "modernmetals:block/chromium_lever" + }, + "face=floor,facing=west,powered=true": { + "model": "modernmetals:block/chromium_lever" + }, + "face=wall,facing=west,powered=true": { + "model": "modernmetals:block/chromium_lever" + }, + "face=ceiling,facing=west,powered=true": { + "model": "modernmetals:block/chromium_lever" + }, + "face=floor,facing=east,powered=true": { + "model": "modernmetals:block/chromium_lever" + }, + "face=wall,facing=east,powered=true": { + "model": "modernmetals:block/chromium_lever" + }, + "face=ceiling,facing=east,powered=true": { + "model": "modernmetals:block/chromium_lever" } + } } diff --git a/src/main/resources/assets/modernmetals/blockstates/chromium_ore.json b/src/main/resources/assets/modernmetals/blockstates/chromium_ore.json index 352a77c4..24228e57 100644 --- a/src/main/resources/assets/modernmetals/blockstates/chromium_ore.json +++ b/src/main/resources/assets/modernmetals/blockstates/chromium_ore.json @@ -1,5 +1,7 @@ { - "variants": { - "normal": { "model": "modernmetals:chromium_ore" } + "variants": { + "": { + "model": "modernmetals:block/chromium_ore" } + } } diff --git a/src/main/resources/assets/modernmetals/blockstates/chromium_plate.json b/src/main/resources/assets/modernmetals/blockstates/chromium_plate.json index dbff3685..ce49e82a 100644 --- a/src/main/resources/assets/modernmetals/blockstates/chromium_plate.json +++ b/src/main/resources/assets/modernmetals/blockstates/chromium_plate.json @@ -1,10 +1,27 @@ { - "variants": { - "facing=down": { "model": "modernmetals:chromium_plate", "x": 90 }, - "facing=up": { "model": "modernmetals:chromium_plate", "x": 270 }, - "facing=north": { "model": "modernmetals:chromium_plate" }, - "facing=south": { "model": "modernmetals:chromium_plate", "y": 180 }, - "facing=west": { "model": "modernmetals:chromium_plate", "y": 270 }, - "facing=east": { "model": "modernmetals:chromium_plate", "y": 90 } + "variants": { + "facing=down": { + "model": "modernmetals:block/chromium_plate", + "x": 90 + }, + "facing=up": { + "model": "modernmetals:block/chromium_plate", + "x": 270 + }, + "facing=north": { + "model": "modernmetals:block/chromium_plate" + }, + "facing=south": { + "model": "modernmetals:block/chromium_plate", + "y": 180 + }, + "facing=west": { + "model": "modernmetals:block/chromium_plate", + "y": 270 + }, + "facing=east": { + "model": "modernmetals:block/chromium_plate", + "y": 90 } + } } diff --git a/src/main/resources/assets/modernmetals/blockstates/chromium_pressure_plate.json b/src/main/resources/assets/modernmetals/blockstates/chromium_pressure_plate.json index 57c482fb..a236d34f 100644 --- a/src/main/resources/assets/modernmetals/blockstates/chromium_pressure_plate.json +++ b/src/main/resources/assets/modernmetals/blockstates/chromium_pressure_plate.json @@ -1,6 +1,10 @@ { - "variants": { - "powered=false": { "model": "modernmetals:chromium_pressure_plate_up" }, - "powered=true": { "model": "modernmetals:chromium_pressure_plate_down" } + "variants": { + "powered=false": { + "model": "modernmetals:block/chromium_pressure_plate_up" + }, + "powered=true": { + "model": "modernmetals:block/chromium_pressure_plate_down" } + } } diff --git a/src/main/resources/assets/modernmetals/blockstates/chromium_slab.json b/src/main/resources/assets/modernmetals/blockstates/chromium_slab.json index 8170e6db..0eb69b85 100644 --- a/src/main/resources/assets/modernmetals/blockstates/chromium_slab.json +++ b/src/main/resources/assets/modernmetals/blockstates/chromium_slab.json @@ -1,6 +1,13 @@ { - "variants": { - "half=bottom,variant=default": { "model": "modernmetals:half_slab_chromium" }, - "half=top,variant=default": { "model": "modernmetals:upper_slab_chromium" } + "variants": { + "type=top": { + "model": "modernmetals:block/upper_slab_chromium" + }, + "type=bottom": { + "model": "modernmetals:block/half_slab_chromium" + }, + "type=double": { + "model": "modernmetals:block/chromium_block" } + } } diff --git a/src/main/resources/assets/modernmetals/blockstates/chromium_stairs.json b/src/main/resources/assets/modernmetals/blockstates/chromium_stairs.json index 7a659b5b..a8c507bc 100644 --- a/src/main/resources/assets/modernmetals/blockstates/chromium_stairs.json +++ b/src/main/resources/assets/modernmetals/blockstates/chromium_stairs.json @@ -1,44 +1,209 @@ { - "variants": { - "facing=east,half=bottom,shape=straight": { "model": "modernmetals:chromium_stairs" }, - "facing=west,half=bottom,shape=straight": { "model": "modernmetals:chromium_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=straight": { "model": "modernmetals:chromium_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=straight": { "model": "modernmetals:chromium_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_right": { "model": "modernmetals:chromium_outer_stairs" }, - "facing=west,half=bottom,shape=outer_right": { "model": "modernmetals:chromium_outer_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=outer_right": { "model": "modernmetals:chromium_outer_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=outer_right": { "model": "modernmetals:chromium_outer_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_left": { "model": "modernmetals:chromium_outer_stairs", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=outer_left": { "model": "modernmetals:chromium_outer_stairs", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=outer_left": { "model": "modernmetals:chromium_outer_stairs" }, - "facing=north,half=bottom,shape=outer_left": { "model": "modernmetals:chromium_outer_stairs", "y": 180, "uvlock": true }, - "facing=east,half=bottom,shape=inner_right": { "model": "modernmetals:chromium_inner_stairs" }, - "facing=west,half=bottom,shape=inner_right": { "model": "modernmetals:chromium_inner_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=inner_right": { "model": "modernmetals:chromium_inner_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=inner_right": { "model": "modernmetals:chromium_inner_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=inner_left": { "model": "modernmetals:chromium_inner_stairs", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=inner_left": { "model": "modernmetals:chromium_inner_stairs", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=inner_left": { "model": "modernmetals:chromium_inner_stairs" }, - "facing=north,half=bottom,shape=inner_left": { "model": "modernmetals:chromium_inner_stairs", "y": 180, "uvlock": true }, - "facing=east,half=top,shape=straight": { "model": "modernmetals:chromium_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=straight": { "model": "modernmetals:chromium_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=straight": { "model": "modernmetals:chromium_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=straight": { "model": "modernmetals:chromium_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { "model": "modernmetals:chromium_outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_right": { "model": "modernmetals:chromium_outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { "model": "modernmetals:chromium_outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { "model": "modernmetals:chromium_outer_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { "model": "modernmetals:chromium_outer_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { "model": "modernmetals:chromium_outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { "model": "modernmetals:chromium_outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=outer_left": { "model": "modernmetals:chromium_outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { "model": "modernmetals:chromium_inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { "model": "modernmetals:chromium_inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { "model": "modernmetals:chromium_inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { "model": "modernmetals:chromium_inner_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { "model": "modernmetals:chromium_inner_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { "model": "modernmetals:chromium_inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { "model": "modernmetals:chromium_inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { "model": "modernmetals:chromium_inner_stairs", "x": 180, "y": 270, "uvlock": true } + "variants": { + "facing=north,half=top,shape=straight": { + "model": "modernmetals:block/chromium_stairs", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=south,half=top,shape=straight": { + "model": "modernmetals:block/chromium_stairs", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=west,half=top,shape=straight": { + "model": "modernmetals:block/chromium_stairs", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=east,half=top,shape=straight": { + "model": "modernmetals:block/chromium_stairs", + "x": 180, + "uvlock": true + }, + "facing=north,half=bottom,shape=straight": { + "model": "modernmetals:block/chromium_stairs", + "y": 270, + "uvlock": true + }, + "facing=south,half=bottom,shape=straight": { + "model": "modernmetals:block/chromium_stairs", + "y": 90, + "uvlock": true + }, + "facing=west,half=bottom,shape=straight": { + "model": "modernmetals:block/chromium_stairs", + "y": 180, + "uvlock": true + }, + "facing=east,half=bottom,shape=straight": { + "model": "modernmetals:block/chromium_stairs" + }, + "facing=north,half=top,shape=inner_left": { + "model": "modernmetals:block/chromium_inner_stairs", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=south,half=top,shape=inner_left": { + "model": "modernmetals:block/chromium_inner_stairs", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=west,half=top,shape=inner_left": { + "model": "modernmetals:block/chromium_inner_stairs", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=east,half=top,shape=inner_left": { + "model": "modernmetals:block/chromium_inner_stairs", + "x": 180, + "uvlock": true + }, + "facing=north,half=bottom,shape=inner_left": { + "model": "modernmetals:block/chromium_inner_stairs", + "y": 180, + "uvlock": true + }, + "facing=south,half=bottom,shape=inner_left": { + "model": "modernmetals:block/chromium_inner_stairs" + }, + "facing=west,half=bottom,shape=inner_left": { + "model": "modernmetals:block/chromium_inner_stairs", + "y": 90, + "uvlock": true + }, + "facing=east,half=bottom,shape=inner_left": { + "model": "modernmetals:block/chromium_inner_stairs", + "y": 270, + "uvlock": true + }, + "facing=north,half=top,shape=inner_right": { + "model": "modernmetals:block/chromium_inner_stairs", + "x": 180, + "uvlock": true + }, + "facing=south,half=top,shape=inner_right": { + "model": "modernmetals:block/chromium_inner_stairs", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=west,half=top,shape=inner_right": { + "model": "modernmetals:block/chromium_inner_stairs", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=east,half=top,shape=inner_right": { + "model": "modernmetals:block/chromium_inner_stairs", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=north,half=bottom,shape=inner_right": { + "model": "modernmetals:block/chromium_inner_stairs", + "y": 270, + "uvlock": true + }, + "facing=south,half=bottom,shape=inner_right": { + "model": "modernmetals:block/chromium_inner_stairs", + "y": 90, + "uvlock": true + }, + "facing=west,half=bottom,shape=inner_right": { + "model": "modernmetals:block/chromium_inner_stairs", + "y": 180, + "uvlock": true + }, + "facing=east,half=bottom,shape=inner_right": { + "model": "modernmetals:block/chromium_inner_stairs" + }, + "facing=north,half=top,shape=outer_left": { + "model": "modernmetals:block/chromium_outer_stairs", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=south,half=top,shape=outer_left": { + "model": "modernmetals:block/chromium_outer_stairs", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=west,half=top,shape=outer_left": { + "model": "modernmetals:block/chromium_outer_stairs", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=east,half=top,shape=outer_left": { + "model": "modernmetals:block/chromium_outer_stairs", + "x": 180, + "uvlock": true + }, + "facing=north,half=bottom,shape=outer_left": { + "model": "modernmetals:block/chromium_outer_stairs", + "y": 180, + "uvlock": true + }, + "facing=south,half=bottom,shape=outer_left": { + "model": "modernmetals:block/chromium_outer_stairs" + }, + "facing=west,half=bottom,shape=outer_left": { + "model": "modernmetals:block/chromium_outer_stairs", + "y": 90, + "uvlock": true + }, + "facing=east,half=bottom,shape=outer_left": { + "model": "modernmetals:block/chromium_outer_stairs", + "y": 270, + "uvlock": true + }, + "facing=north,half=top,shape=outer_right": { + "model": "modernmetals:block/chromium_outer_stairs", + "x": 180, + "uvlock": true + }, + "facing=south,half=top,shape=outer_right": { + "model": "modernmetals:block/chromium_outer_stairs", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=west,half=top,shape=outer_right": { + "model": "modernmetals:block/chromium_outer_stairs", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=east,half=top,shape=outer_right": { + "model": "modernmetals:block/chromium_outer_stairs", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=north,half=bottom,shape=outer_right": { + "model": "modernmetals:block/chromium_outer_stairs", + "y": 270, + "uvlock": true + }, + "facing=south,half=bottom,shape=outer_right": { + "model": "modernmetals:block/chromium_outer_stairs", + "y": 90, + "uvlock": true + }, + "facing=west,half=bottom,shape=outer_right": { + "model": "modernmetals:block/chromium_outer_stairs", + "y": 180, + "uvlock": true + }, + "facing=east,half=bottom,shape=outer_right": { + "model": "modernmetals:block/chromium_outer_stairs" } + } } diff --git a/src/main/resources/assets/modernmetals/blockstates/chromium_trapdoor.json b/src/main/resources/assets/modernmetals/blockstates/chromium_trapdoor.json index 3db20ed0..937c37e6 100644 --- a/src/main/resources/assets/modernmetals/blockstates/chromium_trapdoor.json +++ b/src/main/resources/assets/modernmetals/blockstates/chromium_trapdoor.json @@ -1,20 +1,68 @@ { - "variants": { - "facing=north,half=bottom,open=false": { "model": "modernmetals:chromium_trapdoor_bottom" }, - "facing=south,half=bottom,open=false": { "model": "modernmetals:chromium_trapdoor_bottom" }, - "facing=east,half=bottom,open=false": { "model": "modernmetals:chromium_trapdoor_bottom" }, - "facing=west,half=bottom,open=false": { "model": "modernmetals:chromium_trapdoor_bottom" }, - "facing=north,half=top,open=false": { "model": "modernmetals:chromium_trapdoor_top" }, - "facing=south,half=top,open=false": { "model": "modernmetals:chromium_trapdoor_top" }, - "facing=east,half=top,open=false": { "model": "modernmetals:chromium_trapdoor_top" }, - "facing=west,half=top,open=false": { "model": "modernmetals:chromium_trapdoor_top" }, - "facing=north,half=bottom,open=true": { "model": "modernmetals:chromium_trapdoor_open" }, - "facing=south,half=bottom,open=true": { "model": "modernmetals:chromium_trapdoor_open", "y": 180 }, - "facing=east,half=bottom,open=true": { "model": "modernmetals:chromium_trapdoor_open", "y": 90 }, - "facing=west,half=bottom,open=true": { "model": "modernmetals:chromium_trapdoor_open", "y": 270 }, - "facing=north,half=top,open=true": { "model": "modernmetals:chromium_trapdoor_open" }, - "facing=south,half=top,open=true": { "model": "modernmetals:chromium_trapdoor_open", "y": 180 }, - "facing=east,half=top,open=true": { "model": "modernmetals:chromium_trapdoor_open", "y": 90 }, - "facing=west,half=top,open=true": { "model": "modernmetals:chromium_trapdoor_open", "y": 270 } + "variants": { + "facing=north,half=top,open=false": { + "model": "modernmetals:block/chromium_trapdoor_top" + }, + "facing=south,half=top,open=false": { + "model": "modernmetals:block/chromium_trapdoor_top", + "y": 180 + }, + "facing=west,half=top,open=false": { + "model": "modernmetals:block/chromium_trapdoor_top", + "y": 270 + }, + "facing=east,half=top,open=false": { + "model": "modernmetals:block/chromium_trapdoor_top", + "y": 90 + }, + "facing=north,half=bottom,open=false": { + "model": "modernmetals:block/chromium_trapdoor_bottom" + }, + "facing=south,half=bottom,open=false": { + "model": "modernmetals:block/chromium_trapdoor_bottom", + "y": 180 + }, + "facing=west,half=bottom,open=false": { + "model": "modernmetals:block/chromium_trapdoor_bottom", + "y": 270 + }, + "facing=east,half=bottom,open=false": { + "model": "modernmetals:block/chromium_trapdoor_bottom", + "y": 90 + }, + "facing=north,half=top,open=true": { + "model": "modernmetals:block/chromium_trapdoor_open", + "x": 180, + "y": 180 + }, + "facing=south,half=top,open=true": { + "model": "modernmetals:block/chromium_trapdoor_open", + "x": 180 + }, + "facing=west,half=top,open=true": { + "model": "modernmetals:block/chromium_trapdoor_open", + "x": 180, + "y": 90 + }, + "facing=east,half=top,open=true": { + "model": "modernmetals:block/chromium_trapdoor_open", + "x": 180, + "y": 270 + }, + "facing=north,half=bottom,open=true": { + "model": "modernmetals:block/chromium_trapdoor_open" + }, + "facing=south,half=bottom,open=true": { + "model": "modernmetals:block/chromium_trapdoor_open", + "y": 180 + }, + "facing=west,half=bottom,open=true": { + "model": "modernmetals:block/chromium_trapdoor_open", + "y": 270 + }, + "facing=east,half=bottom,open=true": { + "model": "modernmetals:block/chromium_trapdoor_open", + "y": 90 } + } } diff --git a/src/main/resources/assets/modernmetals/blockstates/chromium_wall.json b/src/main/resources/assets/modernmetals/blockstates/chromium_wall.json index 5b6e7616..718de5ff 100644 --- a/src/main/resources/assets/modernmetals/blockstates/chromium_wall.json +++ b/src/main/resources/assets/modernmetals/blockstates/chromium_wall.json @@ -1,19 +1,51 @@ { - "multipart": [ - { "when": { "up": "true" }, - "apply": { "model": "modernmetals:chromium_wall_post" } - }, - { "when": { "north": "true" }, - "apply": { "model": "modernmetals:chromium_wall_side", "uvlock": true } - }, - { "when": { "east": "true" }, - "apply": { "model": "modernmetals:chromium_wall_side", "y": 90, "uvlock": true } - }, - { "when": { "south": "true" }, - "apply": { "model": "modernmetals:chromium_wall_side", "y": 180, "uvlock": true } - }, - { "when": { "west": "true" }, - "apply": { "model": "modernmetals:chromium_wall_side", "y": 270, "uvlock": true } - } - ] + "multipart": [ + { + "when": { + "up": "true" + }, + "apply": { + "model": "modernmetals:block/chromium_wall_post" + } + }, + { + "when": { + "north": "true" + }, + "apply": { + "model": "modernmetals:block/chromium_wall_side", + "uvlock": true + } + }, + { + "when": { + "east": "true" + }, + "apply": { + "model": "modernmetals:block/chromium_wall_side", + "y": 90, + "uvlock": true + } + }, + { + "when": { + "south": "true" + }, + "apply": { + "model": "modernmetals:block/chromium_wall_side", + "y": 180, + "uvlock": true + } + }, + { + "when": { + "west": "true" + }, + "apply": { + "model": "modernmetals:block/chromium_wall_side", + "y": 270, + "uvlock": true + } + } + ] } diff --git a/src/main/resources/assets/modernmetals/blockstates/galvanizedsteel.json b/src/main/resources/assets/modernmetals/blockstates/galvanizedsteel.json index ebd000e2..6d9de74b 100644 --- a/src/main/resources/assets/modernmetals/blockstates/galvanizedsteel.json +++ b/src/main/resources/assets/modernmetals/blockstates/galvanizedsteel.json @@ -1,9 +1,10 @@ { - "forge_marker": 1, - "variants": { - "fluid": { - "model": "forge:fluid", - "custom": { "fluid": "galvanizedsteel" } - } + "variants": { + "": { + "model": "minecraft:block/water", + "custom": { + "fluid": "modernmetals:galvanizedsteel" + } } -} \ No newline at end of file + } +} diff --git a/src/main/resources/assets/modernmetals/blockstates/galvanizedsteel_bars.json b/src/main/resources/assets/modernmetals/blockstates/galvanizedsteel_bars.json index 36e997fa..a64ba9ae 100644 --- a/src/main/resources/assets/modernmetals/blockstates/galvanizedsteel_bars.json +++ b/src/main/resources/assets/modernmetals/blockstates/galvanizedsteel_bars.json @@ -1,32 +1,77 @@ { - "multipart": [ - { "apply": { "model": "modernmetals:galvanizedsteel_bars_post_ends" }}, - { "when": { "north": false, "east": false, "south": false, "west": false }, - "apply": { "model": "modernmetals:galvanizedsteel_bars_post" } - }, - { "when": { "north": true, "east": false, "south": false, "west": false }, - "apply": { "model": "modernmetals:galvanizedsteel_bars_cap" } - }, - { "when": { "north": false, "east": true, "south": false, "west": false }, - "apply": { "model": "modernmetals:galvanizedsteel_bars_cap", "y": 90 } - }, - { "when": { "north": false, "east": false, "south": true, "west": false }, - "apply": { "model": "modernmetals:galvanizedsteel_bars_cap_alt" } - }, - { "when": { "north": false, "east": false, "south": false, "west": true }, - "apply": { "model": "modernmetals:galvanizedsteel_bars_cap_alt", "y": 90 } - }, - { "when": { "north": true }, - "apply": { "model": "modernmetals:galvanizedsteel_bars_side" } - }, - { "when": { "east": true }, - "apply": { "model": "modernmetals:galvanizedsteel_bars_side", "y": 90 } - }, - { "when": { "south": true }, - "apply": { "model": "modernmetals:galvanizedsteel_bars_side_alt" } - }, - { "when": { "west": true }, - "apply": { "model": "modernmetals:galvanizedsteel_bars_side_alt", "y": 90 } - } - ] + "multipart": [ + { + "apply": { + "model": "modernmetals:block/galvanizedsteel_bars_post" + } + }, + { + "when": { + "north": "true" + }, + "apply": { + "model": "modernmetals:block/galvanizedsteel_bars_side" + } + }, + { + "when": { + "north": "false" + }, + "apply": { + "model": "modernmetals:block/galvanizedsteel_bars_cap" + } + }, + { + "when": { + "south": "true" + }, + "apply": { + "model": "modernmetals:block/galvanizedsteel_bars_side_alt" + } + }, + { + "when": { + "south": "false" + }, + "apply": { + "model": "modernmetals:block/galvanizedsteel_bars_cap_alt", + "y": 90 + } + }, + { + "when": { + "west": "true" + }, + "apply": { + "model": "modernmetals:block/galvanizedsteel_bars_side_alt", + "y": 90 + } + }, + { + "when": { + "west": "false" + }, + "apply": { + "model": "modernmetals:block/galvanizedsteel_bars_cap", + "y": 270 + } + }, + { + "when": { + "east": "true" + }, + "apply": { + "model": "modernmetals:block/galvanizedsteel_bars_side", + "y": 90 + } + }, + { + "when": { + "east": "false" + }, + "apply": { + "model": "modernmetals:block/galvanizedsteel_bars_cap_alt" + } + } + ] } diff --git a/src/main/resources/assets/modernmetals/blockstates/galvanizedsteel_block.json b/src/main/resources/assets/modernmetals/blockstates/galvanizedsteel_block.json index 88688088..1cde241a 100644 --- a/src/main/resources/assets/modernmetals/blockstates/galvanizedsteel_block.json +++ b/src/main/resources/assets/modernmetals/blockstates/galvanizedsteel_block.json @@ -1,5 +1,7 @@ { - "variants": { - "normal": { "model": "modernmetals:galvanizedsteel_block" } + "variants": { + "": { + "model": "modernmetals:block/galvanizedsteel_block" } + } } diff --git a/src/main/resources/assets/modernmetals/blockstates/galvanizedsteel_button.json b/src/main/resources/assets/modernmetals/blockstates/galvanizedsteel_button.json index a3886d84..a1220eeb 100644 --- a/src/main/resources/assets/modernmetals/blockstates/galvanizedsteel_button.json +++ b/src/main/resources/assets/modernmetals/blockstates/galvanizedsteel_button.json @@ -1,16 +1,118 @@ { - "variants": { - "facing=up,powered=false": { "model": "modernmetals:galvanizedsteel_button", "uvlock": true }, - "facing=down,powered=false": { "model": "modernmetals:galvanizedsteel_button", "uvlock": true, "x": 180 }, - "facing=east,powered=false": { "model": "modernmetals:galvanizedsteel_button", "uvlock": true, "x": 90, "y": 90 }, - "facing=west,powered=false": { "model": "modernmetals:galvanizedsteel_button", "uvlock": true, "x": 90, "y": 270 }, - "facing=south,powered=false": { "model": "modernmetals:galvanizedsteel_button", "uvlock": true, "x": 90, "y": 180 }, - "facing=north,powered=false": { "model": "modernmetals:galvanizedsteel_button", "uvlock": true, "x": 90 }, - "facing=up,powered=true": { "model": "modernmetals:galvanizedsteel_button_pressed", "uvlock": true }, - "facing=down,powered=true": { "model": "modernmetals:galvanizedsteel_button_pressed", "uvlock": true, "x": 180 }, - "facing=east,powered=true": { "model": "modernmetals:galvanizedsteel_button_pressed", "uvlock": true, "x": 90, "y": 90 }, - "facing=west,powered=true": { "model": "modernmetals:galvanizedsteel_button_pressed", "uvlock": true, "x": 90, "y": 270 }, - "facing=south,powered=true": { "model": "modernmetals:galvanizedsteel_button_pressed", "uvlock": true, "x": 90, "y": 180 }, - "facing=north,powered=true": { "model": "modernmetals:galvanizedsteel_button_pressed", "uvlock": true, "x": 90 } + "variants": { + "face=floor,facing=north,powered=false": { + "model": "modernmetals:block/galvanizedsteel_button" + }, + "face=wall,facing=north,powered=false": { + "model": "modernmetals:block/galvanizedsteel_button", + "x": 90, + "uvlock": true + }, + "face=ceiling,facing=north,powered=false": { + "model": "modernmetals:block/galvanizedsteel_button", + "x": 180, + "y": 180 + }, + "face=floor,facing=south,powered=false": { + "model": "modernmetals:block/galvanizedsteel_button", + "y": 180 + }, + "face=wall,facing=south,powered=false": { + "model": "modernmetals:block/galvanizedsteel_button", + "x": 90, + "y": 180, + "uvlock": true + }, + "face=ceiling,facing=south,powered=false": { + "model": "modernmetals:block/galvanizedsteel_button", + "x": 180 + }, + "face=floor,facing=west,powered=false": { + "model": "modernmetals:block/galvanizedsteel_button", + "y": 270 + }, + "face=wall,facing=west,powered=false": { + "model": "modernmetals:block/galvanizedsteel_button", + "x": 90, + "y": 270, + "uvlock": true + }, + "face=ceiling,facing=west,powered=false": { + "model": "modernmetals:block/galvanizedsteel_button", + "x": 180, + "y": 90 + }, + "face=floor,facing=east,powered=false": { + "model": "modernmetals:block/galvanizedsteel_button", + "y": 90 + }, + "face=wall,facing=east,powered=false": { + "model": "modernmetals:block/galvanizedsteel_button", + "x": 90, + "y": 90, + "uvlock": true + }, + "face=ceiling,facing=east,powered=false": { + "model": "modernmetals:block/galvanizedsteel_button", + "x": 180, + "y": 270 + }, + "face=floor,facing=north,powered=true": { + "model": "modernmetals:block/galvanizedsteel_button_pressed" + }, + "face=wall,facing=north,powered=true": { + "model": "modernmetals:block/galvanizedsteel_button_pressed", + "x": 90, + "uvlock": true + }, + "face=ceiling,facing=north,powered=true": { + "model": "modernmetals:block/galvanizedsteel_button_pressed", + "x": 180, + "y": 180 + }, + "face=floor,facing=south,powered=true": { + "model": "modernmetals:block/galvanizedsteel_button_pressed", + "y": 180 + }, + "face=wall,facing=south,powered=true": { + "model": "modernmetals:block/galvanizedsteel_button_pressed", + "x": 90, + "y": 180, + "uvlock": true + }, + "face=ceiling,facing=south,powered=true": { + "model": "modernmetals:block/galvanizedsteel_button_pressed", + "x": 180 + }, + "face=floor,facing=west,powered=true": { + "model": "modernmetals:block/galvanizedsteel_button_pressed", + "y": 270 + }, + "face=wall,facing=west,powered=true": { + "model": "modernmetals:block/galvanizedsteel_button_pressed", + "x": 90, + "y": 270, + "uvlock": true + }, + "face=ceiling,facing=west,powered=true": { + "model": "modernmetals:block/galvanizedsteel_button_pressed", + "x": 180, + "y": 90 + }, + "face=floor,facing=east,powered=true": { + "model": "modernmetals:block/galvanizedsteel_button_pressed", + "y": 90 + }, + "face=wall,facing=east,powered=true": { + "model": "modernmetals:block/galvanizedsteel_button_pressed", + "x": 90, + "y": 90, + "uvlock": true + }, + "face=ceiling,facing=east,powered=true": { + "model": "modernmetals:block/galvanizedsteel_button_pressed", + "x": 180, + "y": 270 } + } } diff --git a/src/main/resources/assets/modernmetals/blockstates/galvanizedsteel_door.json b/src/main/resources/assets/modernmetals/blockstates/galvanizedsteel_door.json index 3b562618..d0dde430 100644 --- a/src/main/resources/assets/modernmetals/blockstates/galvanizedsteel_door.json +++ b/src/main/resources/assets/modernmetals/blockstates/galvanizedsteel_door.json @@ -1,70 +1,124 @@ { - "variants": { - "facing=east,half=lower,hinge=left,open=false,powered=false": { "model": "modernmetals:galvanizedsteel_door_bottom" }, - "facing=south,half=lower,hinge=left,open=false,powered=false": { "model": "modernmetals:galvanizedsteel_door_bottom", "y": 90 }, - "facing=west,half=lower,hinge=left,open=false,powered=false": { "model": "modernmetals:galvanizedsteel_door_bottom", "y": 180 }, - "facing=north,half=lower,hinge=left,open=false,powered=false": { "model": "modernmetals:galvanizedsteel_door_bottom", "y": 270 }, - "facing=east,half=lower,hinge=right,open=false,powered=false": { "model": "modernmetals:galvanizedsteel_door_bottom_rh" }, - "facing=south,half=lower,hinge=right,open=false,powered=false": { "model": "modernmetals:galvanizedsteel_door_bottom_rh", "y": 90 }, - "facing=west,half=lower,hinge=right,open=false,powered=false": { "model": "modernmetals:galvanizedsteel_door_bottom_rh", "y": 180 }, - "facing=north,half=lower,hinge=right,open=false,powered=false": { "model": "modernmetals:galvanizedsteel_door_bottom_rh", "y": 270 }, - "facing=east,half=lower,hinge=left,open=true,powered=false": { "model": "modernmetals:galvanizedsteel_door_bottom_rh", "y": 90 }, - "facing=south,half=lower,hinge=left,open=true,powered=false": { "model": "modernmetals:galvanizedsteel_door_bottom_rh", "y": 180 }, - "facing=west,half=lower,hinge=left,open=true,powered=false": { "model": "modernmetals:galvanizedsteel_door_bottom_rh", "y": 270 }, - "facing=north,half=lower,hinge=left,open=true,powered=false": { "model": "modernmetals:galvanizedsteel_door_bottom_rh" }, - "facing=east,half=lower,hinge=right,open=true,powered=false": { "model": "modernmetals:galvanizedsteel_door_bottom", "y": 270 }, - "facing=south,half=lower,hinge=right,open=true,powered=false": { "model": "modernmetals:galvanizedsteel_door_bottom" }, - "facing=west,half=lower,hinge=right,open=true,powered=false": { "model": "modernmetals:galvanizedsteel_door_bottom", "y": 90 }, - "facing=north,half=lower,hinge=right,open=true,powered=false": { "model": "modernmetals:galvanizedsteel_door_bottom", "y": 180 }, - "facing=east,half=upper,hinge=left,open=false,powered=false": { "model": "modernmetals:galvanizedsteel_door_top" }, - "facing=south,half=upper,hinge=left,open=false,powered=false": { "model": "modernmetals:galvanizedsteel_door_top", "y": 90 }, - "facing=west,half=upper,hinge=left,open=false,powered=false": { "model": "modernmetals:galvanizedsteel_door_top", "y": 180 }, - "facing=north,half=upper,hinge=left,open=false,powered=false": { "model": "modernmetals:galvanizedsteel_door_top", "y": 270 }, - "facing=east,half=upper,hinge=right,open=false,powered=false": { "model": "modernmetals:galvanizedsteel_door_top_rh" }, - "facing=south,half=upper,hinge=right,open=false,powered=false": { "model": "modernmetals:galvanizedsteel_door_top_rh", "y": 90 }, - "facing=west,half=upper,hinge=right,open=false,powered=false": { "model": "modernmetals:galvanizedsteel_door_top_rh", "y": 180 }, - "facing=north,half=upper,hinge=right,open=false,powered=false": { "model": "modernmetals:galvanizedsteel_door_top_rh", "y": 270 }, - "facing=east,half=upper,hinge=left,open=true,powered=false": { "model": "modernmetals:galvanizedsteel_door_top_rh", "y": 90 }, - "facing=south,half=upper,hinge=left,open=true,powered=false": { "model": "modernmetals:galvanizedsteel_door_top_rh", "y": 180 }, - "facing=west,half=upper,hinge=left,open=true,powered=false": { "model": "modernmetals:galvanizedsteel_door_top_rh", "y": 270 }, - "facing=north,half=upper,hinge=left,open=true,powered=false": { "model": "modernmetals:galvanizedsteel_door_top_rh" }, - "facing=east,half=upper,hinge=right,open=true,powered=false": { "model": "modernmetals:galvanizedsteel_door_top", "y": 270 }, - "facing=south,half=upper,hinge=right,open=true,powered=false": { "model": "modernmetals:galvanizedsteel_door_top" }, - "facing=west,half=upper,hinge=right,open=true,powered=false": { "model": "modernmetals:galvanizedsteel_door_top", "y": 90 }, - "facing=north,half=upper,hinge=right,open=true,powered=false": { "model": "modernmetals:galvanizedsteel_door_top", "y": 180 }, - - - "facing=east,half=lower,hinge=left,open=false,powered=true": { "model": "modernmetals:galvanizedsteel_door_bottom" }, - "facing=south,half=lower,hinge=left,open=false,powered=true": { "model": "modernmetals:galvanizedsteel_door_bottom", "y": 90 }, - "facing=west,half=lower,hinge=left,open=false,powered=true": { "model": "modernmetals:galvanizedsteel_door_bottom", "y": 180 }, - "facing=north,half=lower,hinge=left,open=false,powered=true": { "model": "modernmetals:galvanizedsteel_door_bottom", "y": 270 }, - "facing=east,half=lower,hinge=right,open=false,powered=true": { "model": "modernmetals:galvanizedsteel_door_bottom_rh" }, - "facing=south,half=lower,hinge=right,open=false,powered=true": { "model": "modernmetals:galvanizedsteel_door_bottom_rh", "y": 90 }, - "facing=west,half=lower,hinge=right,open=false,powered=true": { "model": "modernmetals:galvanizedsteel_door_bottom_rh", "y": 180 }, - "facing=north,half=lower,hinge=right,open=false,powered=true": { "model": "modernmetals:galvanizedsteel_door_bottom_rh", "y": 270 }, - "facing=east,half=lower,hinge=left,open=true,powered=true": { "model": "modernmetals:galvanizedsteel_door_bottom_rh", "y": 90 }, - "facing=south,half=lower,hinge=left,open=true,powered=true": { "model": "modernmetals:galvanizedsteel_door_bottom_rh", "y": 180 }, - "facing=west,half=lower,hinge=left,open=true,powered=true": { "model": "modernmetals:galvanizedsteel_door_bottom_rh", "y": 270 }, - "facing=north,half=lower,hinge=left,open=true,powered=true": { "model": "modernmetals:galvanizedsteel_door_bottom_rh" }, - "facing=east,half=lower,hinge=right,open=true,powered=true": { "model": "modernmetals:galvanizedsteel_door_bottom", "y": 270 }, - "facing=south,half=lower,hinge=right,open=true,powered=true": { "model": "modernmetals:galvanizedsteel_door_bottom" }, - "facing=west,half=lower,hinge=right,open=true,powered=true": { "model": "modernmetals:galvanizedsteel_door_bottom", "y": 90 }, - "facing=north,half=lower,hinge=right,open=true,powered=true": { "model": "modernmetals:galvanizedsteel_door_bottom", "y": 180 }, - "facing=east,half=upper,hinge=left,open=false,powered=true": { "model": "modernmetals:galvanizedsteel_door_top" }, - "facing=south,half=upper,hinge=left,open=false,powered=true": { "model": "modernmetals:galvanizedsteel_door_top", "y": 90 }, - "facing=west,half=upper,hinge=left,open=false,powered=true": { "model": "modernmetals:galvanizedsteel_door_top", "y": 180 }, - "facing=north,half=upper,hinge=left,open=false,powered=true": { "model": "modernmetals:galvanizedsteel_door_top", "y": 270 }, - "facing=east,half=upper,hinge=right,open=false,powered=true": { "model": "modernmetals:galvanizedsteel_door_top_rh" }, - "facing=south,half=upper,hinge=right,open=false,powered=true": { "model": "modernmetals:galvanizedsteel_door_top_rh", "y": 90 }, - "facing=west,half=upper,hinge=right,open=false,powered=true": { "model": "modernmetals:galvanizedsteel_door_top_rh", "y": 180 }, - "facing=north,half=upper,hinge=right,open=false,powered=true": { "model": "modernmetals:galvanizedsteel_door_top_rh", "y": 270 }, - "facing=east,half=upper,hinge=left,open=true,powered=true": { "model": "modernmetals:galvanizedsteel_door_top_rh", "y": 90 }, - "facing=south,half=upper,hinge=left,open=true,powered=true": { "model": "modernmetals:galvanizedsteel_door_top_rh", "y": 180 }, - "facing=west,half=upper,hinge=left,open=true,powered=true": { "model": "modernmetals:galvanizedsteel_door_top_rh", "y": 270 }, - "facing=north,half=upper,hinge=left,open=true,powered=true": { "model": "modernmetals:galvanizedsteel_door_top_rh" }, - "facing=east,half=upper,hinge=right,open=true,powered=true": { "model": "modernmetals:galvanizedsteel_door_top", "y": 270 }, - "facing=south,half=upper,hinge=right,open=true,powered=true": { "model": "modernmetals:galvanizedsteel_door_top" }, - "facing=west,half=upper,hinge=right,open=true,powered=true": { "model": "modernmetals:galvanizedsteel_door_top", "y": 90 }, - "facing=north,half=upper,hinge=right,open=true,powered=true": { "model": "modernmetals:galvanizedsteel_door_top", "y": 180 } + "variants": { + "facing=north,half=upper,hinge=left,open=false": { + "model": "modernmetals:block/galvanizedsteel_door_top", + "y": 270 + }, + "facing=south,half=upper,hinge=left,open=false": { + "model": "modernmetals:block/galvanizedsteel_door_top", + "y": 90 + }, + "facing=west,half=upper,hinge=left,open=false": { + "model": "modernmetals:block/galvanizedsteel_door_top", + "y": 180 + }, + "facing=east,half=upper,hinge=left,open=false": { + "model": "modernmetals:block/galvanizedsteel_door_top" + }, + "facing=north,half=lower,hinge=left,open=false": { + "model": "modernmetals:block/galvanizedsteel_door_bottom", + "y": 270 + }, + "facing=south,half=lower,hinge=left,open=false": { + "model": "modernmetals:block/galvanizedsteel_door_bottom", + "y": 90 + }, + "facing=west,half=lower,hinge=left,open=false": { + "model": "modernmetals:block/galvanizedsteel_door_bottom", + "y": 180 + }, + "facing=east,half=lower,hinge=left,open=false": { + "model": "modernmetals:block/galvanizedsteel_door_bottom" + }, + "facing=north,half=upper,hinge=right,open=false": { + "model": "modernmetals:block/galvanizedsteel_door_top_rh", + "y": 270 + }, + "facing=south,half=upper,hinge=right,open=false": { + "model": "modernmetals:block/galvanizedsteel_door_top_rh", + "y": 90 + }, + "facing=west,half=upper,hinge=right,open=false": { + "model": "modernmetals:block/galvanizedsteel_door_top_rh", + "y": 180 + }, + "facing=east,half=upper,hinge=right,open=false": { + "model": "modernmetals:block/galvanizedsteel_door_top_rh" + }, + "facing=north,half=lower,hinge=right,open=false": { + "model": "modernmetals:block/galvanizedsteel_door_bottom_rh", + "y": 270 + }, + "facing=south,half=lower,hinge=right,open=false": { + "model": "modernmetals:block/galvanizedsteel_door_bottom_rh", + "y": 90 + }, + "facing=west,half=lower,hinge=right,open=false": { + "model": "modernmetals:block/galvanizedsteel_door_bottom_rh", + "y": 180 + }, + "facing=east,half=lower,hinge=right,open=false": { + "model": "modernmetals:block/galvanizedsteel_door_bottom_rh" + }, + "facing=north,half=upper,hinge=left,open=true": { + "model": "modernmetals:block/galvanizedsteel_door_top_rh" + }, + "facing=south,half=upper,hinge=left,open=true": { + "model": "modernmetals:block/galvanizedsteel_door_top_rh", + "y": 180 + }, + "facing=west,half=upper,hinge=left,open=true": { + "model": "modernmetals:block/galvanizedsteel_door_top_rh", + "y": 270 + }, + "facing=east,half=upper,hinge=left,open=true": { + "model": "modernmetals:block/galvanizedsteel_door_top_rh", + "y": 90 + }, + "facing=north,half=lower,hinge=left,open=true": { + "model": "modernmetals:block/galvanizedsteel_door_bottom_rh" + }, + "facing=south,half=lower,hinge=left,open=true": { + "model": "modernmetals:block/galvanizedsteel_door_bottom_rh", + "y": 180 + }, + "facing=west,half=lower,hinge=left,open=true": { + "model": "modernmetals:block/galvanizedsteel_door_bottom_rh", + "y": 270 + }, + "facing=east,half=lower,hinge=left,open=true": { + "model": "modernmetals:block/galvanizedsteel_door_bottom_rh", + "y": 90 + }, + "facing=north,half=upper,hinge=right,open=true": { + "model": "modernmetals:block/galvanizedsteel_door_top", + "y": 180 + }, + "facing=south,half=upper,hinge=right,open=true": { + "model": "modernmetals:block/galvanizedsteel_door_top" + }, + "facing=west,half=upper,hinge=right,open=true": { + "model": "modernmetals:block/galvanizedsteel_door_top", + "y": 90 + }, + "facing=east,half=upper,hinge=right,open=true": { + "model": "modernmetals:block/galvanizedsteel_door_top", + "y": 270 + }, + "facing=north,half=lower,hinge=right,open=true": { + "model": "modernmetals:block/galvanizedsteel_door_bottom", + "y": 180 + }, + "facing=south,half=lower,hinge=right,open=true": { + "model": "modernmetals:block/galvanizedsteel_door_bottom" + }, + "facing=west,half=lower,hinge=right,open=true": { + "model": "modernmetals:block/galvanizedsteel_door_bottom", + "y": 90 + }, + "facing=east,half=lower,hinge=right,open=true": { + "model": "modernmetals:block/galvanizedsteel_door_bottom", + "y": 270 } + } } diff --git a/src/main/resources/assets/modernmetals/blockstates/galvanizedsteel_lever.json b/src/main/resources/assets/modernmetals/blockstates/galvanizedsteel_lever.json index 68d8c936..2528711c 100644 --- a/src/main/resources/assets/modernmetals/blockstates/galvanizedsteel_lever.json +++ b/src/main/resources/assets/modernmetals/blockstates/galvanizedsteel_lever.json @@ -1,20 +1,76 @@ { - "variants": { - "facing=down_z,powered=false": { "model": "modernmetals:galvanizedsteel_lever_off", "x": 180, "y": 180 }, - "facing=down_x,powered=false": { "model": "modernmetals:galvanizedsteel_lever_off", "x": 180, "y": 90 }, - "facing=up_z,powered=false": { "model": "modernmetals:galvanizedsteel_lever_off" }, - "facing=up_x,powered=false": { "model": "modernmetals:galvanizedsteel_lever_off", "y": 270 }, - "facing=east,powered=false": { "model": "modernmetals:galvanizedsteel_lever_off", "x": 90, "y": 90 }, - "facing=west,powered=false": { "model": "modernmetals:galvanizedsteel_lever_off", "x": 90, "y": 270 }, - "facing=south,powered=false" : { "model": "modernmetals:galvanizedsteel_lever_off", "x": 90, "y": 180 }, - "facing=north,powered=false" : { "model": "modernmetals:galvanizedsteel_lever_off", "x": 90 }, - "facing=down_z,powered=true" : { "model": "modernmetals:galvanizedsteel_lever", "x": 180, "y": 180 }, - "facing=down_x,powered=true" : { "model": "modernmetals:galvanizedsteel_lever", "x": 180, "y": 90 }, - "facing=up_z,powered=true": { "model": "modernmetals:galvanizedsteel_lever" }, - "facing=up_x,powered=true": { "model": "modernmetals:galvanizedsteel_lever", "y": 270 }, - "facing=east,powered=true": { "model": "modernmetals:galvanizedsteel_lever", "x": 90, "y": 90 }, - "facing=west,powered=true": { "model": "modernmetals:galvanizedsteel_lever", "x": 90, "y": 270 }, - "facing=south,powered=true": { "model": "modernmetals:galvanizedsteel_lever", "x": 90, "y": 180 }, - "facing=north,powered=true": { "model": "modernmetals:galvanizedsteel_lever", "x": 90 } + "variants": { + "face=floor,facing=north,powered=false": { + "model": "modernmetals:block/galvanizedsteel_lever_off" + }, + "face=wall,facing=north,powered=false": { + "model": "modernmetals:block/galvanizedsteel_lever_off" + }, + "face=ceiling,facing=north,powered=false": { + "model": "modernmetals:block/galvanizedsteel_lever_off" + }, + "face=floor,facing=south,powered=false": { + "model": "modernmetals:block/galvanizedsteel_lever_off" + }, + "face=wall,facing=south,powered=false": { + "model": "modernmetals:block/galvanizedsteel_lever_off" + }, + "face=ceiling,facing=south,powered=false": { + "model": "modernmetals:block/galvanizedsteel_lever_off" + }, + "face=floor,facing=west,powered=false": { + "model": "modernmetals:block/galvanizedsteel_lever_off" + }, + "face=wall,facing=west,powered=false": { + "model": "modernmetals:block/galvanizedsteel_lever_off" + }, + "face=ceiling,facing=west,powered=false": { + "model": "modernmetals:block/galvanizedsteel_lever_off" + }, + "face=floor,facing=east,powered=false": { + "model": "modernmetals:block/galvanizedsteel_lever_off" + }, + "face=wall,facing=east,powered=false": { + "model": "modernmetals:block/galvanizedsteel_lever_off" + }, + "face=ceiling,facing=east,powered=false": { + "model": "modernmetals:block/galvanizedsteel_lever_off" + }, + "face=floor,facing=north,powered=true": { + "model": "modernmetals:block/galvanizedsteel_lever" + }, + "face=wall,facing=north,powered=true": { + "model": "modernmetals:block/galvanizedsteel_lever" + }, + "face=ceiling,facing=north,powered=true": { + "model": "modernmetals:block/galvanizedsteel_lever" + }, + "face=floor,facing=south,powered=true": { + "model": "modernmetals:block/galvanizedsteel_lever" + }, + "face=wall,facing=south,powered=true": { + "model": "modernmetals:block/galvanizedsteel_lever" + }, + "face=ceiling,facing=south,powered=true": { + "model": "modernmetals:block/galvanizedsteel_lever" + }, + "face=floor,facing=west,powered=true": { + "model": "modernmetals:block/galvanizedsteel_lever" + }, + "face=wall,facing=west,powered=true": { + "model": "modernmetals:block/galvanizedsteel_lever" + }, + "face=ceiling,facing=west,powered=true": { + "model": "modernmetals:block/galvanizedsteel_lever" + }, + "face=floor,facing=east,powered=true": { + "model": "modernmetals:block/galvanizedsteel_lever" + }, + "face=wall,facing=east,powered=true": { + "model": "modernmetals:block/galvanizedsteel_lever" + }, + "face=ceiling,facing=east,powered=true": { + "model": "modernmetals:block/galvanizedsteel_lever" } + } } diff --git a/src/main/resources/assets/modernmetals/blockstates/galvanizedsteel_ore.json b/src/main/resources/assets/modernmetals/blockstates/galvanizedsteel_ore.json index b423638e..bae54cc6 100644 --- a/src/main/resources/assets/modernmetals/blockstates/galvanizedsteel_ore.json +++ b/src/main/resources/assets/modernmetals/blockstates/galvanizedsteel_ore.json @@ -1,5 +1,7 @@ { - "variants": { - "normal": { "model": "modernmetals:galvanizedsteel_ore" } + "variants": { + "": { + "model": "modernmetals:block/galvanizedsteel_ore" } + } } diff --git a/src/main/resources/assets/modernmetals/blockstates/galvanizedsteel_plate.json b/src/main/resources/assets/modernmetals/blockstates/galvanizedsteel_plate.json index 4258dbf9..3c25f309 100644 --- a/src/main/resources/assets/modernmetals/blockstates/galvanizedsteel_plate.json +++ b/src/main/resources/assets/modernmetals/blockstates/galvanizedsteel_plate.json @@ -1,10 +1,27 @@ { - "variants": { - "facing=down": { "model": "modernmetals:galvanizedsteel_plate", "x": 90 }, - "facing=up": { "model": "modernmetals:galvanizedsteel_plate", "x": 270 }, - "facing=north": { "model": "modernmetals:galvanizedsteel_plate" }, - "facing=south": { "model": "modernmetals:galvanizedsteel_plate", "y": 180 }, - "facing=west": { "model": "modernmetals:galvanizedsteel_plate", "y": 270 }, - "facing=east": { "model": "modernmetals:galvanizedsteel_plate", "y": 90 } + "variants": { + "facing=down": { + "model": "modernmetals:block/galvanizedsteel_plate", + "x": 90 + }, + "facing=up": { + "model": "modernmetals:block/galvanizedsteel_plate", + "x": 270 + }, + "facing=north": { + "model": "modernmetals:block/galvanizedsteel_plate" + }, + "facing=south": { + "model": "modernmetals:block/galvanizedsteel_plate", + "y": 180 + }, + "facing=west": { + "model": "modernmetals:block/galvanizedsteel_plate", + "y": 270 + }, + "facing=east": { + "model": "modernmetals:block/galvanizedsteel_plate", + "y": 90 } + } } diff --git a/src/main/resources/assets/modernmetals/blockstates/galvanizedsteel_pressure_plate.json b/src/main/resources/assets/modernmetals/blockstates/galvanizedsteel_pressure_plate.json index 674f731a..16b87c35 100644 --- a/src/main/resources/assets/modernmetals/blockstates/galvanizedsteel_pressure_plate.json +++ b/src/main/resources/assets/modernmetals/blockstates/galvanizedsteel_pressure_plate.json @@ -1,6 +1,10 @@ { - "variants": { - "powered=false": { "model": "modernmetals:galvanizedsteel_pressure_plate_up" }, - "powered=true": { "model": "modernmetals:galvanizedsteel_pressure_plate_down" } + "variants": { + "powered=false": { + "model": "modernmetals:block/galvanizedsteel_pressure_plate_up" + }, + "powered=true": { + "model": "modernmetals:block/galvanizedsteel_pressure_plate_down" } + } } diff --git a/src/main/resources/assets/modernmetals/blockstates/galvanizedsteel_slab.json b/src/main/resources/assets/modernmetals/blockstates/galvanizedsteel_slab.json index bd758c75..188d017c 100644 --- a/src/main/resources/assets/modernmetals/blockstates/galvanizedsteel_slab.json +++ b/src/main/resources/assets/modernmetals/blockstates/galvanizedsteel_slab.json @@ -1,6 +1,13 @@ { - "variants": { - "half=bottom,variant=default": { "model": "modernmetals:half_slab_galvanizedsteel" }, - "half=top,variant=default": { "model": "modernmetals:upper_slab_galvanizedsteel" } + "variants": { + "type=top": { + "model": "modernmetals:block/upper_slab_galvanizedsteel" + }, + "type=bottom": { + "model": "modernmetals:block/half_slab_galvanizedsteel" + }, + "type=double": { + "model": "modernmetals:block/galvanizedsteel_block" } + } } diff --git a/src/main/resources/assets/modernmetals/blockstates/galvanizedsteel_stairs.json b/src/main/resources/assets/modernmetals/blockstates/galvanizedsteel_stairs.json index 3596a8dc..30ea4df7 100644 --- a/src/main/resources/assets/modernmetals/blockstates/galvanizedsteel_stairs.json +++ b/src/main/resources/assets/modernmetals/blockstates/galvanizedsteel_stairs.json @@ -1,44 +1,209 @@ { - "variants": { - "facing=east,half=bottom,shape=straight": { "model": "modernmetals:galvanizedsteel_stairs" }, - "facing=west,half=bottom,shape=straight": { "model": "modernmetals:galvanizedsteel_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=straight": { "model": "modernmetals:galvanizedsteel_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=straight": { "model": "modernmetals:galvanizedsteel_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_right": { "model": "modernmetals:galvanizedsteel_outer_stairs" }, - "facing=west,half=bottom,shape=outer_right": { "model": "modernmetals:galvanizedsteel_outer_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=outer_right": { "model": "modernmetals:galvanizedsteel_outer_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=outer_right": { "model": "modernmetals:galvanizedsteel_outer_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_left": { "model": "modernmetals:galvanizedsteel_outer_stairs", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=outer_left": { "model": "modernmetals:galvanizedsteel_outer_stairs", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=outer_left": { "model": "modernmetals:galvanizedsteel_outer_stairs" }, - "facing=north,half=bottom,shape=outer_left": { "model": "modernmetals:galvanizedsteel_outer_stairs", "y": 180, "uvlock": true }, - "facing=east,half=bottom,shape=inner_right": { "model": "modernmetals:galvanizedsteel_inner_stairs" }, - "facing=west,half=bottom,shape=inner_right": { "model": "modernmetals:galvanizedsteel_inner_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=inner_right": { "model": "modernmetals:galvanizedsteel_inner_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=inner_right": { "model": "modernmetals:galvanizedsteel_inner_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=inner_left": { "model": "modernmetals:galvanizedsteel_inner_stairs", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=inner_left": { "model": "modernmetals:galvanizedsteel_inner_stairs", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=inner_left": { "model": "modernmetals:galvanizedsteel_inner_stairs" }, - "facing=north,half=bottom,shape=inner_left": { "model": "modernmetals:galvanizedsteel_inner_stairs", "y": 180, "uvlock": true }, - "facing=east,half=top,shape=straight": { "model": "modernmetals:galvanizedsteel_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=straight": { "model": "modernmetals:galvanizedsteel_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=straight": { "model": "modernmetals:galvanizedsteel_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=straight": { "model": "modernmetals:galvanizedsteel_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { "model": "modernmetals:galvanizedsteel_outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_right": { "model": "modernmetals:galvanizedsteel_outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { "model": "modernmetals:galvanizedsteel_outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { "model": "modernmetals:galvanizedsteel_outer_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { "model": "modernmetals:galvanizedsteel_outer_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { "model": "modernmetals:galvanizedsteel_outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { "model": "modernmetals:galvanizedsteel_outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=outer_left": { "model": "modernmetals:galvanizedsteel_outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { "model": "modernmetals:galvanizedsteel_inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { "model": "modernmetals:galvanizedsteel_inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { "model": "modernmetals:galvanizedsteel_inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { "model": "modernmetals:galvanizedsteel_inner_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { "model": "modernmetals:galvanizedsteel_inner_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { "model": "modernmetals:galvanizedsteel_inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { "model": "modernmetals:galvanizedsteel_inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { "model": "modernmetals:galvanizedsteel_inner_stairs", "x": 180, "y": 270, "uvlock": true } + "variants": { + "facing=north,half=top,shape=straight": { + "model": "modernmetals:block/galvanizedsteel_stairs", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=south,half=top,shape=straight": { + "model": "modernmetals:block/galvanizedsteel_stairs", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=west,half=top,shape=straight": { + "model": "modernmetals:block/galvanizedsteel_stairs", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=east,half=top,shape=straight": { + "model": "modernmetals:block/galvanizedsteel_stairs", + "x": 180, + "uvlock": true + }, + "facing=north,half=bottom,shape=straight": { + "model": "modernmetals:block/galvanizedsteel_stairs", + "y": 270, + "uvlock": true + }, + "facing=south,half=bottom,shape=straight": { + "model": "modernmetals:block/galvanizedsteel_stairs", + "y": 90, + "uvlock": true + }, + "facing=west,half=bottom,shape=straight": { + "model": "modernmetals:block/galvanizedsteel_stairs", + "y": 180, + "uvlock": true + }, + "facing=east,half=bottom,shape=straight": { + "model": "modernmetals:block/galvanizedsteel_stairs" + }, + "facing=north,half=top,shape=inner_left": { + "model": "modernmetals:block/galvanizedsteel_inner_stairs", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=south,half=top,shape=inner_left": { + "model": "modernmetals:block/galvanizedsteel_inner_stairs", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=west,half=top,shape=inner_left": { + "model": "modernmetals:block/galvanizedsteel_inner_stairs", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=east,half=top,shape=inner_left": { + "model": "modernmetals:block/galvanizedsteel_inner_stairs", + "x": 180, + "uvlock": true + }, + "facing=north,half=bottom,shape=inner_left": { + "model": "modernmetals:block/galvanizedsteel_inner_stairs", + "y": 180, + "uvlock": true + }, + "facing=south,half=bottom,shape=inner_left": { + "model": "modernmetals:block/galvanizedsteel_inner_stairs" + }, + "facing=west,half=bottom,shape=inner_left": { + "model": "modernmetals:block/galvanizedsteel_inner_stairs", + "y": 90, + "uvlock": true + }, + "facing=east,half=bottom,shape=inner_left": { + "model": "modernmetals:block/galvanizedsteel_inner_stairs", + "y": 270, + "uvlock": true + }, + "facing=north,half=top,shape=inner_right": { + "model": "modernmetals:block/galvanizedsteel_inner_stairs", + "x": 180, + "uvlock": true + }, + "facing=south,half=top,shape=inner_right": { + "model": "modernmetals:block/galvanizedsteel_inner_stairs", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=west,half=top,shape=inner_right": { + "model": "modernmetals:block/galvanizedsteel_inner_stairs", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=east,half=top,shape=inner_right": { + "model": "modernmetals:block/galvanizedsteel_inner_stairs", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=north,half=bottom,shape=inner_right": { + "model": "modernmetals:block/galvanizedsteel_inner_stairs", + "y": 270, + "uvlock": true + }, + "facing=south,half=bottom,shape=inner_right": { + "model": "modernmetals:block/galvanizedsteel_inner_stairs", + "y": 90, + "uvlock": true + }, + "facing=west,half=bottom,shape=inner_right": { + "model": "modernmetals:block/galvanizedsteel_inner_stairs", + "y": 180, + "uvlock": true + }, + "facing=east,half=bottom,shape=inner_right": { + "model": "modernmetals:block/galvanizedsteel_inner_stairs" + }, + "facing=north,half=top,shape=outer_left": { + "model": "modernmetals:block/galvanizedsteel_outer_stairs", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=south,half=top,shape=outer_left": { + "model": "modernmetals:block/galvanizedsteel_outer_stairs", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=west,half=top,shape=outer_left": { + "model": "modernmetals:block/galvanizedsteel_outer_stairs", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=east,half=top,shape=outer_left": { + "model": "modernmetals:block/galvanizedsteel_outer_stairs", + "x": 180, + "uvlock": true + }, + "facing=north,half=bottom,shape=outer_left": { + "model": "modernmetals:block/galvanizedsteel_outer_stairs", + "y": 180, + "uvlock": true + }, + "facing=south,half=bottom,shape=outer_left": { + "model": "modernmetals:block/galvanizedsteel_outer_stairs" + }, + "facing=west,half=bottom,shape=outer_left": { + "model": "modernmetals:block/galvanizedsteel_outer_stairs", + "y": 90, + "uvlock": true + }, + "facing=east,half=bottom,shape=outer_left": { + "model": "modernmetals:block/galvanizedsteel_outer_stairs", + "y": 270, + "uvlock": true + }, + "facing=north,half=top,shape=outer_right": { + "model": "modernmetals:block/galvanizedsteel_outer_stairs", + "x": 180, + "uvlock": true + }, + "facing=south,half=top,shape=outer_right": { + "model": "modernmetals:block/galvanizedsteel_outer_stairs", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=west,half=top,shape=outer_right": { + "model": "modernmetals:block/galvanizedsteel_outer_stairs", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=east,half=top,shape=outer_right": { + "model": "modernmetals:block/galvanizedsteel_outer_stairs", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=north,half=bottom,shape=outer_right": { + "model": "modernmetals:block/galvanizedsteel_outer_stairs", + "y": 270, + "uvlock": true + }, + "facing=south,half=bottom,shape=outer_right": { + "model": "modernmetals:block/galvanizedsteel_outer_stairs", + "y": 90, + "uvlock": true + }, + "facing=west,half=bottom,shape=outer_right": { + "model": "modernmetals:block/galvanizedsteel_outer_stairs", + "y": 180, + "uvlock": true + }, + "facing=east,half=bottom,shape=outer_right": { + "model": "modernmetals:block/galvanizedsteel_outer_stairs" } + } } diff --git a/src/main/resources/assets/modernmetals/blockstates/galvanizedsteel_trapdoor.json b/src/main/resources/assets/modernmetals/blockstates/galvanizedsteel_trapdoor.json index a3f1fce5..82eb8fbf 100644 --- a/src/main/resources/assets/modernmetals/blockstates/galvanizedsteel_trapdoor.json +++ b/src/main/resources/assets/modernmetals/blockstates/galvanizedsteel_trapdoor.json @@ -1,20 +1,68 @@ { - "variants": { - "facing=north,half=bottom,open=false": { "model": "modernmetals:galvanizedsteel_trapdoor_bottom" }, - "facing=south,half=bottom,open=false": { "model": "modernmetals:galvanizedsteel_trapdoor_bottom" }, - "facing=east,half=bottom,open=false": { "model": "modernmetals:galvanizedsteel_trapdoor_bottom" }, - "facing=west,half=bottom,open=false": { "model": "modernmetals:galvanizedsteel_trapdoor_bottom" }, - "facing=north,half=top,open=false": { "model": "modernmetals:galvanizedsteel_trapdoor_top" }, - "facing=south,half=top,open=false": { "model": "modernmetals:galvanizedsteel_trapdoor_top" }, - "facing=east,half=top,open=false": { "model": "modernmetals:galvanizedsteel_trapdoor_top" }, - "facing=west,half=top,open=false": { "model": "modernmetals:galvanizedsteel_trapdoor_top" }, - "facing=north,half=bottom,open=true": { "model": "modernmetals:galvanizedsteel_trapdoor_open" }, - "facing=south,half=bottom,open=true": { "model": "modernmetals:galvanizedsteel_trapdoor_open", "y": 180 }, - "facing=east,half=bottom,open=true": { "model": "modernmetals:galvanizedsteel_trapdoor_open", "y": 90 }, - "facing=west,half=bottom,open=true": { "model": "modernmetals:galvanizedsteel_trapdoor_open", "y": 270 }, - "facing=north,half=top,open=true": { "model": "modernmetals:galvanizedsteel_trapdoor_open" }, - "facing=south,half=top,open=true": { "model": "modernmetals:galvanizedsteel_trapdoor_open", "y": 180 }, - "facing=east,half=top,open=true": { "model": "modernmetals:galvanizedsteel_trapdoor_open", "y": 90 }, - "facing=west,half=top,open=true": { "model": "modernmetals:galvanizedsteel_trapdoor_open", "y": 270 } + "variants": { + "facing=north,half=top,open=false": { + "model": "modernmetals:block/galvanizedsteel_trapdoor_top" + }, + "facing=south,half=top,open=false": { + "model": "modernmetals:block/galvanizedsteel_trapdoor_top", + "y": 180 + }, + "facing=west,half=top,open=false": { + "model": "modernmetals:block/galvanizedsteel_trapdoor_top", + "y": 270 + }, + "facing=east,half=top,open=false": { + "model": "modernmetals:block/galvanizedsteel_trapdoor_top", + "y": 90 + }, + "facing=north,half=bottom,open=false": { + "model": "modernmetals:block/galvanizedsteel_trapdoor_bottom" + }, + "facing=south,half=bottom,open=false": { + "model": "modernmetals:block/galvanizedsteel_trapdoor_bottom", + "y": 180 + }, + "facing=west,half=bottom,open=false": { + "model": "modernmetals:block/galvanizedsteel_trapdoor_bottom", + "y": 270 + }, + "facing=east,half=bottom,open=false": { + "model": "modernmetals:block/galvanizedsteel_trapdoor_bottom", + "y": 90 + }, + "facing=north,half=top,open=true": { + "model": "modernmetals:block/galvanizedsteel_trapdoor_open", + "x": 180, + "y": 180 + }, + "facing=south,half=top,open=true": { + "model": "modernmetals:block/galvanizedsteel_trapdoor_open", + "x": 180 + }, + "facing=west,half=top,open=true": { + "model": "modernmetals:block/galvanizedsteel_trapdoor_open", + "x": 180, + "y": 90 + }, + "facing=east,half=top,open=true": { + "model": "modernmetals:block/galvanizedsteel_trapdoor_open", + "x": 180, + "y": 270 + }, + "facing=north,half=bottom,open=true": { + "model": "modernmetals:block/galvanizedsteel_trapdoor_open" + }, + "facing=south,half=bottom,open=true": { + "model": "modernmetals:block/galvanizedsteel_trapdoor_open", + "y": 180 + }, + "facing=west,half=bottom,open=true": { + "model": "modernmetals:block/galvanizedsteel_trapdoor_open", + "y": 270 + }, + "facing=east,half=bottom,open=true": { + "model": "modernmetals:block/galvanizedsteel_trapdoor_open", + "y": 90 } + } } diff --git a/src/main/resources/assets/modernmetals/blockstates/galvanizedsteel_wall.json b/src/main/resources/assets/modernmetals/blockstates/galvanizedsteel_wall.json index 9da569c0..af5df405 100644 --- a/src/main/resources/assets/modernmetals/blockstates/galvanizedsteel_wall.json +++ b/src/main/resources/assets/modernmetals/blockstates/galvanizedsteel_wall.json @@ -1,19 +1,51 @@ { - "multipart": [ - { "when": { "up": "true" }, - "apply": { "model": "modernmetals:galvanizedsteel_wall_post" } - }, - { "when": { "north": "true" }, - "apply": { "model": "modernmetals:galvanizedsteel_wall_side", "uvlock": true } - }, - { "when": { "east": "true" }, - "apply": { "model": "modernmetals:galvanizedsteel_wall_side", "y": 90, "uvlock": true } - }, - { "when": { "south": "true" }, - "apply": { "model": "modernmetals:galvanizedsteel_wall_side", "y": 180, "uvlock": true } - }, - { "when": { "west": "true" }, - "apply": { "model": "modernmetals:galvanizedsteel_wall_side", "y": 270, "uvlock": true } - } - ] + "multipart": [ + { + "when": { + "up": "true" + }, + "apply": { + "model": "modernmetals:block/galvanizedsteel_wall_post" + } + }, + { + "when": { + "north": "true" + }, + "apply": { + "model": "modernmetals:block/galvanizedsteel_wall_side", + "uvlock": true + } + }, + { + "when": { + "east": "true" + }, + "apply": { + "model": "modernmetals:block/galvanizedsteel_wall_side", + "y": 90, + "uvlock": true + } + }, + { + "when": { + "south": "true" + }, + "apply": { + "model": "modernmetals:block/galvanizedsteel_wall_side", + "y": 180, + "uvlock": true + } + }, + { + "when": { + "west": "true" + }, + "apply": { + "model": "modernmetals:block/galvanizedsteel_wall_side", + "y": 270, + "uvlock": true + } + } + ] } diff --git a/src/main/resources/assets/modernmetals/blockstates/iridium.json b/src/main/resources/assets/modernmetals/blockstates/iridium.json index e0dc9ce7..f04b09b7 100644 --- a/src/main/resources/assets/modernmetals/blockstates/iridium.json +++ b/src/main/resources/assets/modernmetals/blockstates/iridium.json @@ -1,9 +1,10 @@ { - "forge_marker": 1, - "variants": { - "fluid": { - "model": "forge:fluid", - "custom": { "fluid": "iridium" } - } + "variants": { + "": { + "model": "minecraft:block/water", + "custom": { + "fluid": "modernmetals:iridium" + } } -} \ No newline at end of file + } +} diff --git a/src/main/resources/assets/modernmetals/blockstates/iridium_bars.json b/src/main/resources/assets/modernmetals/blockstates/iridium_bars.json index 7ec67557..d331a9fb 100644 --- a/src/main/resources/assets/modernmetals/blockstates/iridium_bars.json +++ b/src/main/resources/assets/modernmetals/blockstates/iridium_bars.json @@ -1,32 +1,77 @@ { - "multipart": [ - { "apply": { "model": "modernmetals:iridium_bars_post_ends" }}, - { "when": { "north": false, "east": false, "south": false, "west": false }, - "apply": { "model": "modernmetals:iridium_bars_post" } - }, - { "when": { "north": true, "east": false, "south": false, "west": false }, - "apply": { "model": "modernmetals:iridium_bars_cap" } - }, - { "when": { "north": false, "east": true, "south": false, "west": false }, - "apply": { "model": "modernmetals:iridium_bars_cap", "y": 90 } - }, - { "when": { "north": false, "east": false, "south": true, "west": false }, - "apply": { "model": "modernmetals:iridium_bars_cap_alt" } - }, - { "when": { "north": false, "east": false, "south": false, "west": true }, - "apply": { "model": "modernmetals:iridium_bars_cap_alt", "y": 90 } - }, - { "when": { "north": true }, - "apply": { "model": "modernmetals:iridium_bars_side" } - }, - { "when": { "east": true }, - "apply": { "model": "modernmetals:iridium_bars_side", "y": 90 } - }, - { "when": { "south": true }, - "apply": { "model": "modernmetals:iridium_bars_side_alt" } - }, - { "when": { "west": true }, - "apply": { "model": "modernmetals:iridium_bars_side_alt", "y": 90 } - } - ] + "multipart": [ + { + "apply": { + "model": "modernmetals:block/iridium_bars_post" + } + }, + { + "when": { + "north": "true" + }, + "apply": { + "model": "modernmetals:block/iridium_bars_side" + } + }, + { + "when": { + "north": "false" + }, + "apply": { + "model": "modernmetals:block/iridium_bars_cap" + } + }, + { + "when": { + "south": "true" + }, + "apply": { + "model": "modernmetals:block/iridium_bars_side_alt" + } + }, + { + "when": { + "south": "false" + }, + "apply": { + "model": "modernmetals:block/iridium_bars_cap_alt", + "y": 90 + } + }, + { + "when": { + "west": "true" + }, + "apply": { + "model": "modernmetals:block/iridium_bars_side_alt", + "y": 90 + } + }, + { + "when": { + "west": "false" + }, + "apply": { + "model": "modernmetals:block/iridium_bars_cap", + "y": 270 + } + }, + { + "when": { + "east": "true" + }, + "apply": { + "model": "modernmetals:block/iridium_bars_side", + "y": 90 + } + }, + { + "when": { + "east": "false" + }, + "apply": { + "model": "modernmetals:block/iridium_bars_cap_alt" + } + } + ] } diff --git a/src/main/resources/assets/modernmetals/blockstates/iridium_block.json b/src/main/resources/assets/modernmetals/blockstates/iridium_block.json index 7cf86910..da6f0bf6 100644 --- a/src/main/resources/assets/modernmetals/blockstates/iridium_block.json +++ b/src/main/resources/assets/modernmetals/blockstates/iridium_block.json @@ -1,5 +1,7 @@ { - "variants": { - "normal": { "model": "modernmetals:iridium_block" } + "variants": { + "": { + "model": "modernmetals:block/iridium_block" } + } } diff --git a/src/main/resources/assets/modernmetals/blockstates/iridium_button.json b/src/main/resources/assets/modernmetals/blockstates/iridium_button.json index 0a46400e..27e51043 100644 --- a/src/main/resources/assets/modernmetals/blockstates/iridium_button.json +++ b/src/main/resources/assets/modernmetals/blockstates/iridium_button.json @@ -1,16 +1,118 @@ { - "variants": { - "facing=up,powered=false": { "model": "modernmetals:iridium_button", "uvlock": true }, - "facing=down,powered=false": { "model": "modernmetals:iridium_button", "uvlock": true, "x": 180 }, - "facing=east,powered=false": { "model": "modernmetals:iridium_button", "uvlock": true, "x": 90, "y": 90 }, - "facing=west,powered=false": { "model": "modernmetals:iridium_button", "uvlock": true, "x": 90, "y": 270 }, - "facing=south,powered=false": { "model": "modernmetals:iridium_button", "uvlock": true, "x": 90, "y": 180 }, - "facing=north,powered=false": { "model": "modernmetals:iridium_button", "uvlock": true, "x": 90 }, - "facing=up,powered=true": { "model": "modernmetals:iridium_button_pressed", "uvlock": true }, - "facing=down,powered=true": { "model": "modernmetals:iridium_button_pressed", "uvlock": true, "x": 180 }, - "facing=east,powered=true": { "model": "modernmetals:iridium_button_pressed", "uvlock": true, "x": 90, "y": 90 }, - "facing=west,powered=true": { "model": "modernmetals:iridium_button_pressed", "uvlock": true, "x": 90, "y": 270 }, - "facing=south,powered=true": { "model": "modernmetals:iridium_button_pressed", "uvlock": true, "x": 90, "y": 180 }, - "facing=north,powered=true": { "model": "modernmetals:iridium_button_pressed", "uvlock": true, "x": 90 } + "variants": { + "face=floor,facing=north,powered=false": { + "model": "modernmetals:block/iridium_button" + }, + "face=wall,facing=north,powered=false": { + "model": "modernmetals:block/iridium_button", + "x": 90, + "uvlock": true + }, + "face=ceiling,facing=north,powered=false": { + "model": "modernmetals:block/iridium_button", + "x": 180, + "y": 180 + }, + "face=floor,facing=south,powered=false": { + "model": "modernmetals:block/iridium_button", + "y": 180 + }, + "face=wall,facing=south,powered=false": { + "model": "modernmetals:block/iridium_button", + "x": 90, + "y": 180, + "uvlock": true + }, + "face=ceiling,facing=south,powered=false": { + "model": "modernmetals:block/iridium_button", + "x": 180 + }, + "face=floor,facing=west,powered=false": { + "model": "modernmetals:block/iridium_button", + "y": 270 + }, + "face=wall,facing=west,powered=false": { + "model": "modernmetals:block/iridium_button", + "x": 90, + "y": 270, + "uvlock": true + }, + "face=ceiling,facing=west,powered=false": { + "model": "modernmetals:block/iridium_button", + "x": 180, + "y": 90 + }, + "face=floor,facing=east,powered=false": { + "model": "modernmetals:block/iridium_button", + "y": 90 + }, + "face=wall,facing=east,powered=false": { + "model": "modernmetals:block/iridium_button", + "x": 90, + "y": 90, + "uvlock": true + }, + "face=ceiling,facing=east,powered=false": { + "model": "modernmetals:block/iridium_button", + "x": 180, + "y": 270 + }, + "face=floor,facing=north,powered=true": { + "model": "modernmetals:block/iridium_button_pressed" + }, + "face=wall,facing=north,powered=true": { + "model": "modernmetals:block/iridium_button_pressed", + "x": 90, + "uvlock": true + }, + "face=ceiling,facing=north,powered=true": { + "model": "modernmetals:block/iridium_button_pressed", + "x": 180, + "y": 180 + }, + "face=floor,facing=south,powered=true": { + "model": "modernmetals:block/iridium_button_pressed", + "y": 180 + }, + "face=wall,facing=south,powered=true": { + "model": "modernmetals:block/iridium_button_pressed", + "x": 90, + "y": 180, + "uvlock": true + }, + "face=ceiling,facing=south,powered=true": { + "model": "modernmetals:block/iridium_button_pressed", + "x": 180 + }, + "face=floor,facing=west,powered=true": { + "model": "modernmetals:block/iridium_button_pressed", + "y": 270 + }, + "face=wall,facing=west,powered=true": { + "model": "modernmetals:block/iridium_button_pressed", + "x": 90, + "y": 270, + "uvlock": true + }, + "face=ceiling,facing=west,powered=true": { + "model": "modernmetals:block/iridium_button_pressed", + "x": 180, + "y": 90 + }, + "face=floor,facing=east,powered=true": { + "model": "modernmetals:block/iridium_button_pressed", + "y": 90 + }, + "face=wall,facing=east,powered=true": { + "model": "modernmetals:block/iridium_button_pressed", + "x": 90, + "y": 90, + "uvlock": true + }, + "face=ceiling,facing=east,powered=true": { + "model": "modernmetals:block/iridium_button_pressed", + "x": 180, + "y": 270 } + } } diff --git a/src/main/resources/assets/modernmetals/blockstates/iridium_door.json b/src/main/resources/assets/modernmetals/blockstates/iridium_door.json index a5e861d8..4be20ae3 100644 --- a/src/main/resources/assets/modernmetals/blockstates/iridium_door.json +++ b/src/main/resources/assets/modernmetals/blockstates/iridium_door.json @@ -1,70 +1,124 @@ { - "variants": { - "facing=east,half=lower,hinge=left,open=false,powered=false": { "model": "modernmetals:iridium_door_bottom" }, - "facing=south,half=lower,hinge=left,open=false,powered=false": { "model": "modernmetals:iridium_door_bottom", "y": 90 }, - "facing=west,half=lower,hinge=left,open=false,powered=false": { "model": "modernmetals:iridium_door_bottom", "y": 180 }, - "facing=north,half=lower,hinge=left,open=false,powered=false": { "model": "modernmetals:iridium_door_bottom", "y": 270 }, - "facing=east,half=lower,hinge=right,open=false,powered=false": { "model": "modernmetals:iridium_door_bottom_rh" }, - "facing=south,half=lower,hinge=right,open=false,powered=false": { "model": "modernmetals:iridium_door_bottom_rh", "y": 90 }, - "facing=west,half=lower,hinge=right,open=false,powered=false": { "model": "modernmetals:iridium_door_bottom_rh", "y": 180 }, - "facing=north,half=lower,hinge=right,open=false,powered=false": { "model": "modernmetals:iridium_door_bottom_rh", "y": 270 }, - "facing=east,half=lower,hinge=left,open=true,powered=false": { "model": "modernmetals:iridium_door_bottom_rh", "y": 90 }, - "facing=south,half=lower,hinge=left,open=true,powered=false": { "model": "modernmetals:iridium_door_bottom_rh", "y": 180 }, - "facing=west,half=lower,hinge=left,open=true,powered=false": { "model": "modernmetals:iridium_door_bottom_rh", "y": 270 }, - "facing=north,half=lower,hinge=left,open=true,powered=false": { "model": "modernmetals:iridium_door_bottom_rh" }, - "facing=east,half=lower,hinge=right,open=true,powered=false": { "model": "modernmetals:iridium_door_bottom", "y": 270 }, - "facing=south,half=lower,hinge=right,open=true,powered=false": { "model": "modernmetals:iridium_door_bottom" }, - "facing=west,half=lower,hinge=right,open=true,powered=false": { "model": "modernmetals:iridium_door_bottom", "y": 90 }, - "facing=north,half=lower,hinge=right,open=true,powered=false": { "model": "modernmetals:iridium_door_bottom", "y": 180 }, - "facing=east,half=upper,hinge=left,open=false,powered=false": { "model": "modernmetals:iridium_door_top" }, - "facing=south,half=upper,hinge=left,open=false,powered=false": { "model": "modernmetals:iridium_door_top", "y": 90 }, - "facing=west,half=upper,hinge=left,open=false,powered=false": { "model": "modernmetals:iridium_door_top", "y": 180 }, - "facing=north,half=upper,hinge=left,open=false,powered=false": { "model": "modernmetals:iridium_door_top", "y": 270 }, - "facing=east,half=upper,hinge=right,open=false,powered=false": { "model": "modernmetals:iridium_door_top_rh" }, - "facing=south,half=upper,hinge=right,open=false,powered=false": { "model": "modernmetals:iridium_door_top_rh", "y": 90 }, - "facing=west,half=upper,hinge=right,open=false,powered=false": { "model": "modernmetals:iridium_door_top_rh", "y": 180 }, - "facing=north,half=upper,hinge=right,open=false,powered=false": { "model": "modernmetals:iridium_door_top_rh", "y": 270 }, - "facing=east,half=upper,hinge=left,open=true,powered=false": { "model": "modernmetals:iridium_door_top_rh", "y": 90 }, - "facing=south,half=upper,hinge=left,open=true,powered=false": { "model": "modernmetals:iridium_door_top_rh", "y": 180 }, - "facing=west,half=upper,hinge=left,open=true,powered=false": { "model": "modernmetals:iridium_door_top_rh", "y": 270 }, - "facing=north,half=upper,hinge=left,open=true,powered=false": { "model": "modernmetals:iridium_door_top_rh" }, - "facing=east,half=upper,hinge=right,open=true,powered=false": { "model": "modernmetals:iridium_door_top", "y": 270 }, - "facing=south,half=upper,hinge=right,open=true,powered=false": { "model": "modernmetals:iridium_door_top" }, - "facing=west,half=upper,hinge=right,open=true,powered=false": { "model": "modernmetals:iridium_door_top", "y": 90 }, - "facing=north,half=upper,hinge=right,open=true,powered=false": { "model": "modernmetals:iridium_door_top", "y": 180 }, - - - "facing=east,half=lower,hinge=left,open=false,powered=true": { "model": "modernmetals:iridium_door_bottom" }, - "facing=south,half=lower,hinge=left,open=false,powered=true": { "model": "modernmetals:iridium_door_bottom", "y": 90 }, - "facing=west,half=lower,hinge=left,open=false,powered=true": { "model": "modernmetals:iridium_door_bottom", "y": 180 }, - "facing=north,half=lower,hinge=left,open=false,powered=true": { "model": "modernmetals:iridium_door_bottom", "y": 270 }, - "facing=east,half=lower,hinge=right,open=false,powered=true": { "model": "modernmetals:iridium_door_bottom_rh" }, - "facing=south,half=lower,hinge=right,open=false,powered=true": { "model": "modernmetals:iridium_door_bottom_rh", "y": 90 }, - "facing=west,half=lower,hinge=right,open=false,powered=true": { "model": "modernmetals:iridium_door_bottom_rh", "y": 180 }, - "facing=north,half=lower,hinge=right,open=false,powered=true": { "model": "modernmetals:iridium_door_bottom_rh", "y": 270 }, - "facing=east,half=lower,hinge=left,open=true,powered=true": { "model": "modernmetals:iridium_door_bottom_rh", "y": 90 }, - "facing=south,half=lower,hinge=left,open=true,powered=true": { "model": "modernmetals:iridium_door_bottom_rh", "y": 180 }, - "facing=west,half=lower,hinge=left,open=true,powered=true": { "model": "modernmetals:iridium_door_bottom_rh", "y": 270 }, - "facing=north,half=lower,hinge=left,open=true,powered=true": { "model": "modernmetals:iridium_door_bottom_rh" }, - "facing=east,half=lower,hinge=right,open=true,powered=true": { "model": "modernmetals:iridium_door_bottom", "y": 270 }, - "facing=south,half=lower,hinge=right,open=true,powered=true": { "model": "modernmetals:iridium_door_bottom" }, - "facing=west,half=lower,hinge=right,open=true,powered=true": { "model": "modernmetals:iridium_door_bottom", "y": 90 }, - "facing=north,half=lower,hinge=right,open=true,powered=true": { "model": "modernmetals:iridium_door_bottom", "y": 180 }, - "facing=east,half=upper,hinge=left,open=false,powered=true": { "model": "modernmetals:iridium_door_top" }, - "facing=south,half=upper,hinge=left,open=false,powered=true": { "model": "modernmetals:iridium_door_top", "y": 90 }, - "facing=west,half=upper,hinge=left,open=false,powered=true": { "model": "modernmetals:iridium_door_top", "y": 180 }, - "facing=north,half=upper,hinge=left,open=false,powered=true": { "model": "modernmetals:iridium_door_top", "y": 270 }, - "facing=east,half=upper,hinge=right,open=false,powered=true": { "model": "modernmetals:iridium_door_top_rh" }, - "facing=south,half=upper,hinge=right,open=false,powered=true": { "model": "modernmetals:iridium_door_top_rh", "y": 90 }, - "facing=west,half=upper,hinge=right,open=false,powered=true": { "model": "modernmetals:iridium_door_top_rh", "y": 180 }, - "facing=north,half=upper,hinge=right,open=false,powered=true": { "model": "modernmetals:iridium_door_top_rh", "y": 270 }, - "facing=east,half=upper,hinge=left,open=true,powered=true": { "model": "modernmetals:iridium_door_top_rh", "y": 90 }, - "facing=south,half=upper,hinge=left,open=true,powered=true": { "model": "modernmetals:iridium_door_top_rh", "y": 180 }, - "facing=west,half=upper,hinge=left,open=true,powered=true": { "model": "modernmetals:iridium_door_top_rh", "y": 270 }, - "facing=north,half=upper,hinge=left,open=true,powered=true": { "model": "modernmetals:iridium_door_top_rh" }, - "facing=east,half=upper,hinge=right,open=true,powered=true": { "model": "modernmetals:iridium_door_top", "y": 270 }, - "facing=south,half=upper,hinge=right,open=true,powered=true": { "model": "modernmetals:iridium_door_top" }, - "facing=west,half=upper,hinge=right,open=true,powered=true": { "model": "modernmetals:iridium_door_top", "y": 90 }, - "facing=north,half=upper,hinge=right,open=true,powered=true": { "model": "modernmetals:iridium_door_top", "y": 180 } + "variants": { + "facing=north,half=upper,hinge=left,open=false": { + "model": "modernmetals:block/iridium_door_top", + "y": 270 + }, + "facing=south,half=upper,hinge=left,open=false": { + "model": "modernmetals:block/iridium_door_top", + "y": 90 + }, + "facing=west,half=upper,hinge=left,open=false": { + "model": "modernmetals:block/iridium_door_top", + "y": 180 + }, + "facing=east,half=upper,hinge=left,open=false": { + "model": "modernmetals:block/iridium_door_top" + }, + "facing=north,half=lower,hinge=left,open=false": { + "model": "modernmetals:block/iridium_door_bottom", + "y": 270 + }, + "facing=south,half=lower,hinge=left,open=false": { + "model": "modernmetals:block/iridium_door_bottom", + "y": 90 + }, + "facing=west,half=lower,hinge=left,open=false": { + "model": "modernmetals:block/iridium_door_bottom", + "y": 180 + }, + "facing=east,half=lower,hinge=left,open=false": { + "model": "modernmetals:block/iridium_door_bottom" + }, + "facing=north,half=upper,hinge=right,open=false": { + "model": "modernmetals:block/iridium_door_top_rh", + "y": 270 + }, + "facing=south,half=upper,hinge=right,open=false": { + "model": "modernmetals:block/iridium_door_top_rh", + "y": 90 + }, + "facing=west,half=upper,hinge=right,open=false": { + "model": "modernmetals:block/iridium_door_top_rh", + "y": 180 + }, + "facing=east,half=upper,hinge=right,open=false": { + "model": "modernmetals:block/iridium_door_top_rh" + }, + "facing=north,half=lower,hinge=right,open=false": { + "model": "modernmetals:block/iridium_door_bottom_rh", + "y": 270 + }, + "facing=south,half=lower,hinge=right,open=false": { + "model": "modernmetals:block/iridium_door_bottom_rh", + "y": 90 + }, + "facing=west,half=lower,hinge=right,open=false": { + "model": "modernmetals:block/iridium_door_bottom_rh", + "y": 180 + }, + "facing=east,half=lower,hinge=right,open=false": { + "model": "modernmetals:block/iridium_door_bottom_rh" + }, + "facing=north,half=upper,hinge=left,open=true": { + "model": "modernmetals:block/iridium_door_top_rh" + }, + "facing=south,half=upper,hinge=left,open=true": { + "model": "modernmetals:block/iridium_door_top_rh", + "y": 180 + }, + "facing=west,half=upper,hinge=left,open=true": { + "model": "modernmetals:block/iridium_door_top_rh", + "y": 270 + }, + "facing=east,half=upper,hinge=left,open=true": { + "model": "modernmetals:block/iridium_door_top_rh", + "y": 90 + }, + "facing=north,half=lower,hinge=left,open=true": { + "model": "modernmetals:block/iridium_door_bottom_rh" + }, + "facing=south,half=lower,hinge=left,open=true": { + "model": "modernmetals:block/iridium_door_bottom_rh", + "y": 180 + }, + "facing=west,half=lower,hinge=left,open=true": { + "model": "modernmetals:block/iridium_door_bottom_rh", + "y": 270 + }, + "facing=east,half=lower,hinge=left,open=true": { + "model": "modernmetals:block/iridium_door_bottom_rh", + "y": 90 + }, + "facing=north,half=upper,hinge=right,open=true": { + "model": "modernmetals:block/iridium_door_top", + "y": 180 + }, + "facing=south,half=upper,hinge=right,open=true": { + "model": "modernmetals:block/iridium_door_top" + }, + "facing=west,half=upper,hinge=right,open=true": { + "model": "modernmetals:block/iridium_door_top", + "y": 90 + }, + "facing=east,half=upper,hinge=right,open=true": { + "model": "modernmetals:block/iridium_door_top", + "y": 270 + }, + "facing=north,half=lower,hinge=right,open=true": { + "model": "modernmetals:block/iridium_door_bottom", + "y": 180 + }, + "facing=south,half=lower,hinge=right,open=true": { + "model": "modernmetals:block/iridium_door_bottom" + }, + "facing=west,half=lower,hinge=right,open=true": { + "model": "modernmetals:block/iridium_door_bottom", + "y": 90 + }, + "facing=east,half=lower,hinge=right,open=true": { + "model": "modernmetals:block/iridium_door_bottom", + "y": 270 } + } } diff --git a/src/main/resources/assets/modernmetals/blockstates/iridium_lever.json b/src/main/resources/assets/modernmetals/blockstates/iridium_lever.json index 0d15d763..ed601d4d 100644 --- a/src/main/resources/assets/modernmetals/blockstates/iridium_lever.json +++ b/src/main/resources/assets/modernmetals/blockstates/iridium_lever.json @@ -1,20 +1,76 @@ { - "variants": { - "facing=down_z,powered=false": { "model": "modernmetals:iridium_lever_off", "x": 180, "y": 180 }, - "facing=down_x,powered=false": { "model": "modernmetals:iridium_lever_off", "x": 180, "y": 90 }, - "facing=up_z,powered=false": { "model": "modernmetals:iridium_lever_off" }, - "facing=up_x,powered=false": { "model": "modernmetals:iridium_lever_off", "y": 270 }, - "facing=east,powered=false": { "model": "modernmetals:iridium_lever_off", "x": 90, "y": 90 }, - "facing=west,powered=false": { "model": "modernmetals:iridium_lever_off", "x": 90, "y": 270 }, - "facing=south,powered=false" : { "model": "modernmetals:iridium_lever_off", "x": 90, "y": 180 }, - "facing=north,powered=false" : { "model": "modernmetals:iridium_lever_off", "x": 90 }, - "facing=down_z,powered=true" : { "model": "modernmetals:iridium_lever", "x": 180, "y": 180 }, - "facing=down_x,powered=true" : { "model": "modernmetals:iridium_lever", "x": 180, "y": 90 }, - "facing=up_z,powered=true": { "model": "modernmetals:iridium_lever" }, - "facing=up_x,powered=true": { "model": "modernmetals:iridium_lever", "y": 270 }, - "facing=east,powered=true": { "model": "modernmetals:iridium_lever", "x": 90, "y": 90 }, - "facing=west,powered=true": { "model": "modernmetals:iridium_lever", "x": 90, "y": 270 }, - "facing=south,powered=true": { "model": "modernmetals:iridium_lever", "x": 90, "y": 180 }, - "facing=north,powered=true": { "model": "modernmetals:iridium_lever", "x": 90 } + "variants": { + "face=floor,facing=north,powered=false": { + "model": "modernmetals:block/iridium_lever_off" + }, + "face=wall,facing=north,powered=false": { + "model": "modernmetals:block/iridium_lever_off" + }, + "face=ceiling,facing=north,powered=false": { + "model": "modernmetals:block/iridium_lever_off" + }, + "face=floor,facing=south,powered=false": { + "model": "modernmetals:block/iridium_lever_off" + }, + "face=wall,facing=south,powered=false": { + "model": "modernmetals:block/iridium_lever_off" + }, + "face=ceiling,facing=south,powered=false": { + "model": "modernmetals:block/iridium_lever_off" + }, + "face=floor,facing=west,powered=false": { + "model": "modernmetals:block/iridium_lever_off" + }, + "face=wall,facing=west,powered=false": { + "model": "modernmetals:block/iridium_lever_off" + }, + "face=ceiling,facing=west,powered=false": { + "model": "modernmetals:block/iridium_lever_off" + }, + "face=floor,facing=east,powered=false": { + "model": "modernmetals:block/iridium_lever_off" + }, + "face=wall,facing=east,powered=false": { + "model": "modernmetals:block/iridium_lever_off" + }, + "face=ceiling,facing=east,powered=false": { + "model": "modernmetals:block/iridium_lever_off" + }, + "face=floor,facing=north,powered=true": { + "model": "modernmetals:block/iridium_lever" + }, + "face=wall,facing=north,powered=true": { + "model": "modernmetals:block/iridium_lever" + }, + "face=ceiling,facing=north,powered=true": { + "model": "modernmetals:block/iridium_lever" + }, + "face=floor,facing=south,powered=true": { + "model": "modernmetals:block/iridium_lever" + }, + "face=wall,facing=south,powered=true": { + "model": "modernmetals:block/iridium_lever" + }, + "face=ceiling,facing=south,powered=true": { + "model": "modernmetals:block/iridium_lever" + }, + "face=floor,facing=west,powered=true": { + "model": "modernmetals:block/iridium_lever" + }, + "face=wall,facing=west,powered=true": { + "model": "modernmetals:block/iridium_lever" + }, + "face=ceiling,facing=west,powered=true": { + "model": "modernmetals:block/iridium_lever" + }, + "face=floor,facing=east,powered=true": { + "model": "modernmetals:block/iridium_lever" + }, + "face=wall,facing=east,powered=true": { + "model": "modernmetals:block/iridium_lever" + }, + "face=ceiling,facing=east,powered=true": { + "model": "modernmetals:block/iridium_lever" } + } } diff --git a/src/main/resources/assets/modernmetals/blockstates/iridium_ore.json b/src/main/resources/assets/modernmetals/blockstates/iridium_ore.json index 2dc1b46d..77c8e683 100644 --- a/src/main/resources/assets/modernmetals/blockstates/iridium_ore.json +++ b/src/main/resources/assets/modernmetals/blockstates/iridium_ore.json @@ -1,5 +1,7 @@ { - "variants": { - "normal": { "model": "modernmetals:iridium_ore" } + "variants": { + "": { + "model": "modernmetals:block/iridium_ore" } + } } diff --git a/src/main/resources/assets/modernmetals/blockstates/iridium_plate.json b/src/main/resources/assets/modernmetals/blockstates/iridium_plate.json index ec8e125c..929cc554 100644 --- a/src/main/resources/assets/modernmetals/blockstates/iridium_plate.json +++ b/src/main/resources/assets/modernmetals/blockstates/iridium_plate.json @@ -1,10 +1,27 @@ { - "variants": { - "facing=down": { "model": "modernmetals:iridium_plate", "x": 90 }, - "facing=up": { "model": "modernmetals:iridium_plate", "x": 270 }, - "facing=north": { "model": "modernmetals:iridium_plate" }, - "facing=south": { "model": "modernmetals:iridium_plate", "y": 180 }, - "facing=west": { "model": "modernmetals:iridium_plate", "y": 270 }, - "facing=east": { "model": "modernmetals:iridium_plate", "y": 90 } + "variants": { + "facing=down": { + "model": "modernmetals:block/iridium_plate", + "x": 90 + }, + "facing=up": { + "model": "modernmetals:block/iridium_plate", + "x": 270 + }, + "facing=north": { + "model": "modernmetals:block/iridium_plate" + }, + "facing=south": { + "model": "modernmetals:block/iridium_plate", + "y": 180 + }, + "facing=west": { + "model": "modernmetals:block/iridium_plate", + "y": 270 + }, + "facing=east": { + "model": "modernmetals:block/iridium_plate", + "y": 90 } + } } diff --git a/src/main/resources/assets/modernmetals/blockstates/iridium_pressure_plate.json b/src/main/resources/assets/modernmetals/blockstates/iridium_pressure_plate.json index 781be7ce..b7c5bcf2 100644 --- a/src/main/resources/assets/modernmetals/blockstates/iridium_pressure_plate.json +++ b/src/main/resources/assets/modernmetals/blockstates/iridium_pressure_plate.json @@ -1,6 +1,10 @@ { - "variants": { - "powered=false": { "model": "modernmetals:iridium_pressure_plate_up" }, - "powered=true": { "model": "modernmetals:iridium_pressure_plate_down" } + "variants": { + "powered=false": { + "model": "modernmetals:block/iridium_pressure_plate_up" + }, + "powered=true": { + "model": "modernmetals:block/iridium_pressure_plate_down" } + } } diff --git a/src/main/resources/assets/modernmetals/blockstates/iridium_slab.json b/src/main/resources/assets/modernmetals/blockstates/iridium_slab.json index 76267464..d120aaa1 100644 --- a/src/main/resources/assets/modernmetals/blockstates/iridium_slab.json +++ b/src/main/resources/assets/modernmetals/blockstates/iridium_slab.json @@ -1,6 +1,13 @@ { - "variants": { - "half=bottom,variant=default": { "model": "modernmetals:half_slab_iridium" }, - "half=top,variant=default": { "model": "modernmetals:upper_slab_iridium" } + "variants": { + "type=top": { + "model": "modernmetals:block/upper_slab_iridium" + }, + "type=bottom": { + "model": "modernmetals:block/half_slab_iridium" + }, + "type=double": { + "model": "modernmetals:block/iridium_block" } + } } diff --git a/src/main/resources/assets/modernmetals/blockstates/iridium_stairs.json b/src/main/resources/assets/modernmetals/blockstates/iridium_stairs.json index b5d8ce56..0b2a975a 100644 --- a/src/main/resources/assets/modernmetals/blockstates/iridium_stairs.json +++ b/src/main/resources/assets/modernmetals/blockstates/iridium_stairs.json @@ -1,44 +1,209 @@ { - "variants": { - "facing=east,half=bottom,shape=straight": { "model": "modernmetals:iridium_stairs" }, - "facing=west,half=bottom,shape=straight": { "model": "modernmetals:iridium_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=straight": { "model": "modernmetals:iridium_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=straight": { "model": "modernmetals:iridium_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_right": { "model": "modernmetals:iridium_outer_stairs" }, - "facing=west,half=bottom,shape=outer_right": { "model": "modernmetals:iridium_outer_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=outer_right": { "model": "modernmetals:iridium_outer_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=outer_right": { "model": "modernmetals:iridium_outer_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_left": { "model": "modernmetals:iridium_outer_stairs", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=outer_left": { "model": "modernmetals:iridium_outer_stairs", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=outer_left": { "model": "modernmetals:iridium_outer_stairs" }, - "facing=north,half=bottom,shape=outer_left": { "model": "modernmetals:iridium_outer_stairs", "y": 180, "uvlock": true }, - "facing=east,half=bottom,shape=inner_right": { "model": "modernmetals:iridium_inner_stairs" }, - "facing=west,half=bottom,shape=inner_right": { "model": "modernmetals:iridium_inner_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=inner_right": { "model": "modernmetals:iridium_inner_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=inner_right": { "model": "modernmetals:iridium_inner_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=inner_left": { "model": "modernmetals:iridium_inner_stairs", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=inner_left": { "model": "modernmetals:iridium_inner_stairs", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=inner_left": { "model": "modernmetals:iridium_inner_stairs" }, - "facing=north,half=bottom,shape=inner_left": { "model": "modernmetals:iridium_inner_stairs", "y": 180, "uvlock": true }, - "facing=east,half=top,shape=straight": { "model": "modernmetals:iridium_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=straight": { "model": "modernmetals:iridium_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=straight": { "model": "modernmetals:iridium_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=straight": { "model": "modernmetals:iridium_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { "model": "modernmetals:iridium_outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_right": { "model": "modernmetals:iridium_outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { "model": "modernmetals:iridium_outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { "model": "modernmetals:iridium_outer_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { "model": "modernmetals:iridium_outer_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { "model": "modernmetals:iridium_outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { "model": "modernmetals:iridium_outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=outer_left": { "model": "modernmetals:iridium_outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { "model": "modernmetals:iridium_inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { "model": "modernmetals:iridium_inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { "model": "modernmetals:iridium_inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { "model": "modernmetals:iridium_inner_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { "model": "modernmetals:iridium_inner_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { "model": "modernmetals:iridium_inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { "model": "modernmetals:iridium_inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { "model": "modernmetals:iridium_inner_stairs", "x": 180, "y": 270, "uvlock": true } + "variants": { + "facing=north,half=top,shape=straight": { + "model": "modernmetals:block/iridium_stairs", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=south,half=top,shape=straight": { + "model": "modernmetals:block/iridium_stairs", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=west,half=top,shape=straight": { + "model": "modernmetals:block/iridium_stairs", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=east,half=top,shape=straight": { + "model": "modernmetals:block/iridium_stairs", + "x": 180, + "uvlock": true + }, + "facing=north,half=bottom,shape=straight": { + "model": "modernmetals:block/iridium_stairs", + "y": 270, + "uvlock": true + }, + "facing=south,half=bottom,shape=straight": { + "model": "modernmetals:block/iridium_stairs", + "y": 90, + "uvlock": true + }, + "facing=west,half=bottom,shape=straight": { + "model": "modernmetals:block/iridium_stairs", + "y": 180, + "uvlock": true + }, + "facing=east,half=bottom,shape=straight": { + "model": "modernmetals:block/iridium_stairs" + }, + "facing=north,half=top,shape=inner_left": { + "model": "modernmetals:block/iridium_inner_stairs", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=south,half=top,shape=inner_left": { + "model": "modernmetals:block/iridium_inner_stairs", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=west,half=top,shape=inner_left": { + "model": "modernmetals:block/iridium_inner_stairs", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=east,half=top,shape=inner_left": { + "model": "modernmetals:block/iridium_inner_stairs", + "x": 180, + "uvlock": true + }, + "facing=north,half=bottom,shape=inner_left": { + "model": "modernmetals:block/iridium_inner_stairs", + "y": 180, + "uvlock": true + }, + "facing=south,half=bottom,shape=inner_left": { + "model": "modernmetals:block/iridium_inner_stairs" + }, + "facing=west,half=bottom,shape=inner_left": { + "model": "modernmetals:block/iridium_inner_stairs", + "y": 90, + "uvlock": true + }, + "facing=east,half=bottom,shape=inner_left": { + "model": "modernmetals:block/iridium_inner_stairs", + "y": 270, + "uvlock": true + }, + "facing=north,half=top,shape=inner_right": { + "model": "modernmetals:block/iridium_inner_stairs", + "x": 180, + "uvlock": true + }, + "facing=south,half=top,shape=inner_right": { + "model": "modernmetals:block/iridium_inner_stairs", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=west,half=top,shape=inner_right": { + "model": "modernmetals:block/iridium_inner_stairs", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=east,half=top,shape=inner_right": { + "model": "modernmetals:block/iridium_inner_stairs", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=north,half=bottom,shape=inner_right": { + "model": "modernmetals:block/iridium_inner_stairs", + "y": 270, + "uvlock": true + }, + "facing=south,half=bottom,shape=inner_right": { + "model": "modernmetals:block/iridium_inner_stairs", + "y": 90, + "uvlock": true + }, + "facing=west,half=bottom,shape=inner_right": { + "model": "modernmetals:block/iridium_inner_stairs", + "y": 180, + "uvlock": true + }, + "facing=east,half=bottom,shape=inner_right": { + "model": "modernmetals:block/iridium_inner_stairs" + }, + "facing=north,half=top,shape=outer_left": { + "model": "modernmetals:block/iridium_outer_stairs", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=south,half=top,shape=outer_left": { + "model": "modernmetals:block/iridium_outer_stairs", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=west,half=top,shape=outer_left": { + "model": "modernmetals:block/iridium_outer_stairs", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=east,half=top,shape=outer_left": { + "model": "modernmetals:block/iridium_outer_stairs", + "x": 180, + "uvlock": true + }, + "facing=north,half=bottom,shape=outer_left": { + "model": "modernmetals:block/iridium_outer_stairs", + "y": 180, + "uvlock": true + }, + "facing=south,half=bottom,shape=outer_left": { + "model": "modernmetals:block/iridium_outer_stairs" + }, + "facing=west,half=bottom,shape=outer_left": { + "model": "modernmetals:block/iridium_outer_stairs", + "y": 90, + "uvlock": true + }, + "facing=east,half=bottom,shape=outer_left": { + "model": "modernmetals:block/iridium_outer_stairs", + "y": 270, + "uvlock": true + }, + "facing=north,half=top,shape=outer_right": { + "model": "modernmetals:block/iridium_outer_stairs", + "x": 180, + "uvlock": true + }, + "facing=south,half=top,shape=outer_right": { + "model": "modernmetals:block/iridium_outer_stairs", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=west,half=top,shape=outer_right": { + "model": "modernmetals:block/iridium_outer_stairs", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=east,half=top,shape=outer_right": { + "model": "modernmetals:block/iridium_outer_stairs", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=north,half=bottom,shape=outer_right": { + "model": "modernmetals:block/iridium_outer_stairs", + "y": 270, + "uvlock": true + }, + "facing=south,half=bottom,shape=outer_right": { + "model": "modernmetals:block/iridium_outer_stairs", + "y": 90, + "uvlock": true + }, + "facing=west,half=bottom,shape=outer_right": { + "model": "modernmetals:block/iridium_outer_stairs", + "y": 180, + "uvlock": true + }, + "facing=east,half=bottom,shape=outer_right": { + "model": "modernmetals:block/iridium_outer_stairs" } + } } diff --git a/src/main/resources/assets/modernmetals/blockstates/iridium_trapdoor.json b/src/main/resources/assets/modernmetals/blockstates/iridium_trapdoor.json index ff419887..6b2e47ed 100644 --- a/src/main/resources/assets/modernmetals/blockstates/iridium_trapdoor.json +++ b/src/main/resources/assets/modernmetals/blockstates/iridium_trapdoor.json @@ -1,20 +1,68 @@ { - "variants": { - "facing=north,half=bottom,open=false": { "model": "modernmetals:iridium_trapdoor_bottom" }, - "facing=south,half=bottom,open=false": { "model": "modernmetals:iridium_trapdoor_bottom" }, - "facing=east,half=bottom,open=false": { "model": "modernmetals:iridium_trapdoor_bottom" }, - "facing=west,half=bottom,open=false": { "model": "modernmetals:iridium_trapdoor_bottom" }, - "facing=north,half=top,open=false": { "model": "modernmetals:iridium_trapdoor_top" }, - "facing=south,half=top,open=false": { "model": "modernmetals:iridium_trapdoor_top" }, - "facing=east,half=top,open=false": { "model": "modernmetals:iridium_trapdoor_top" }, - "facing=west,half=top,open=false": { "model": "modernmetals:iridium_trapdoor_top" }, - "facing=north,half=bottom,open=true": { "model": "modernmetals:iridium_trapdoor_open" }, - "facing=south,half=bottom,open=true": { "model": "modernmetals:iridium_trapdoor_open", "y": 180 }, - "facing=east,half=bottom,open=true": { "model": "modernmetals:iridium_trapdoor_open", "y": 90 }, - "facing=west,half=bottom,open=true": { "model": "modernmetals:iridium_trapdoor_open", "y": 270 }, - "facing=north,half=top,open=true": { "model": "modernmetals:iridium_trapdoor_open" }, - "facing=south,half=top,open=true": { "model": "modernmetals:iridium_trapdoor_open", "y": 180 }, - "facing=east,half=top,open=true": { "model": "modernmetals:iridium_trapdoor_open", "y": 90 }, - "facing=west,half=top,open=true": { "model": "modernmetals:iridium_trapdoor_open", "y": 270 } + "variants": { + "facing=north,half=top,open=false": { + "model": "modernmetals:block/iridium_trapdoor_top" + }, + "facing=south,half=top,open=false": { + "model": "modernmetals:block/iridium_trapdoor_top", + "y": 180 + }, + "facing=west,half=top,open=false": { + "model": "modernmetals:block/iridium_trapdoor_top", + "y": 270 + }, + "facing=east,half=top,open=false": { + "model": "modernmetals:block/iridium_trapdoor_top", + "y": 90 + }, + "facing=north,half=bottom,open=false": { + "model": "modernmetals:block/iridium_trapdoor_bottom" + }, + "facing=south,half=bottom,open=false": { + "model": "modernmetals:block/iridium_trapdoor_bottom", + "y": 180 + }, + "facing=west,half=bottom,open=false": { + "model": "modernmetals:block/iridium_trapdoor_bottom", + "y": 270 + }, + "facing=east,half=bottom,open=false": { + "model": "modernmetals:block/iridium_trapdoor_bottom", + "y": 90 + }, + "facing=north,half=top,open=true": { + "model": "modernmetals:block/iridium_trapdoor_open", + "x": 180, + "y": 180 + }, + "facing=south,half=top,open=true": { + "model": "modernmetals:block/iridium_trapdoor_open", + "x": 180 + }, + "facing=west,half=top,open=true": { + "model": "modernmetals:block/iridium_trapdoor_open", + "x": 180, + "y": 90 + }, + "facing=east,half=top,open=true": { + "model": "modernmetals:block/iridium_trapdoor_open", + "x": 180, + "y": 270 + }, + "facing=north,half=bottom,open=true": { + "model": "modernmetals:block/iridium_trapdoor_open" + }, + "facing=south,half=bottom,open=true": { + "model": "modernmetals:block/iridium_trapdoor_open", + "y": 180 + }, + "facing=west,half=bottom,open=true": { + "model": "modernmetals:block/iridium_trapdoor_open", + "y": 270 + }, + "facing=east,half=bottom,open=true": { + "model": "modernmetals:block/iridium_trapdoor_open", + "y": 90 } + } } diff --git a/src/main/resources/assets/modernmetals/blockstates/iridium_wall.json b/src/main/resources/assets/modernmetals/blockstates/iridium_wall.json index c62b3025..e65064c4 100644 --- a/src/main/resources/assets/modernmetals/blockstates/iridium_wall.json +++ b/src/main/resources/assets/modernmetals/blockstates/iridium_wall.json @@ -1,19 +1,51 @@ { - "multipart": [ - { "when": { "up": "true" }, - "apply": { "model": "modernmetals:iridium_wall_post" } - }, - { "when": { "north": "true" }, - "apply": { "model": "modernmetals:iridium_wall_side", "uvlock": true } - }, - { "when": { "east": "true" }, - "apply": { "model": "modernmetals:iridium_wall_side", "y": 90, "uvlock": true } - }, - { "when": { "south": "true" }, - "apply": { "model": "modernmetals:iridium_wall_side", "y": 180, "uvlock": true } - }, - { "when": { "west": "true" }, - "apply": { "model": "modernmetals:iridium_wall_side", "y": 270, "uvlock": true } - } - ] + "multipart": [ + { + "when": { + "up": "true" + }, + "apply": { + "model": "modernmetals:block/iridium_wall_post" + } + }, + { + "when": { + "north": "true" + }, + "apply": { + "model": "modernmetals:block/iridium_wall_side", + "uvlock": true + } + }, + { + "when": { + "east": "true" + }, + "apply": { + "model": "modernmetals:block/iridium_wall_side", + "y": 90, + "uvlock": true + } + }, + { + "when": { + "south": "true" + }, + "apply": { + "model": "modernmetals:block/iridium_wall_side", + "y": 180, + "uvlock": true + } + }, + { + "when": { + "west": "true" + }, + "apply": { + "model": "modernmetals:block/iridium_wall_side", + "y": 270, + "uvlock": true + } + } + ] } diff --git a/src/main/resources/assets/modernmetals/blockstates/magnesium.json b/src/main/resources/assets/modernmetals/blockstates/magnesium.json index 33c2bdf3..e2d08c0d 100644 --- a/src/main/resources/assets/modernmetals/blockstates/magnesium.json +++ b/src/main/resources/assets/modernmetals/blockstates/magnesium.json @@ -1,9 +1,10 @@ { - "forge_marker": 1, - "variants": { - "fluid": { - "model": "forge:fluid", - "custom": { "fluid": "magnesium" } - } + "variants": { + "": { + "model": "minecraft:block/water", + "custom": { + "fluid": "modernmetals:magnesium" + } } -} \ No newline at end of file + } +} diff --git a/src/main/resources/assets/modernmetals/blockstates/magnesium_bars.json b/src/main/resources/assets/modernmetals/blockstates/magnesium_bars.json index df8a719d..4c41ee30 100644 --- a/src/main/resources/assets/modernmetals/blockstates/magnesium_bars.json +++ b/src/main/resources/assets/modernmetals/blockstates/magnesium_bars.json @@ -1,32 +1,77 @@ { - "multipart": [ - { "apply": { "model": "modernmetals:magnesium_bars_post_ends" }}, - { "when": { "north": false, "east": false, "south": false, "west": false }, - "apply": { "model": "modernmetals:magnesium_bars_post" } - }, - { "when": { "north": true, "east": false, "south": false, "west": false }, - "apply": { "model": "modernmetals:magnesium_bars_cap" } - }, - { "when": { "north": false, "east": true, "south": false, "west": false }, - "apply": { "model": "modernmetals:magnesium_bars_cap", "y": 90 } - }, - { "when": { "north": false, "east": false, "south": true, "west": false }, - "apply": { "model": "modernmetals:magnesium_bars_cap_alt" } - }, - { "when": { "north": false, "east": false, "south": false, "west": true }, - "apply": { "model": "modernmetals:magnesium_bars_cap_alt", "y": 90 } - }, - { "when": { "north": true }, - "apply": { "model": "modernmetals:magnesium_bars_side" } - }, - { "when": { "east": true }, - "apply": { "model": "modernmetals:magnesium_bars_side", "y": 90 } - }, - { "when": { "south": true }, - "apply": { "model": "modernmetals:magnesium_bars_side_alt" } - }, - { "when": { "west": true }, - "apply": { "model": "modernmetals:magnesium_bars_side_alt", "y": 90 } - } - ] + "multipart": [ + { + "apply": { + "model": "modernmetals:block/magnesium_bars_post" + } + }, + { + "when": { + "north": "true" + }, + "apply": { + "model": "modernmetals:block/magnesium_bars_side" + } + }, + { + "when": { + "north": "false" + }, + "apply": { + "model": "modernmetals:block/magnesium_bars_cap" + } + }, + { + "when": { + "south": "true" + }, + "apply": { + "model": "modernmetals:block/magnesium_bars_side_alt" + } + }, + { + "when": { + "south": "false" + }, + "apply": { + "model": "modernmetals:block/magnesium_bars_cap_alt", + "y": 90 + } + }, + { + "when": { + "west": "true" + }, + "apply": { + "model": "modernmetals:block/magnesium_bars_side_alt", + "y": 90 + } + }, + { + "when": { + "west": "false" + }, + "apply": { + "model": "modernmetals:block/magnesium_bars_cap", + "y": 270 + } + }, + { + "when": { + "east": "true" + }, + "apply": { + "model": "modernmetals:block/magnesium_bars_side", + "y": 90 + } + }, + { + "when": { + "east": "false" + }, + "apply": { + "model": "modernmetals:block/magnesium_bars_cap_alt" + } + } + ] } diff --git a/src/main/resources/assets/modernmetals/blockstates/magnesium_block.json b/src/main/resources/assets/modernmetals/blockstates/magnesium_block.json index 9934bdf5..1652003f 100644 --- a/src/main/resources/assets/modernmetals/blockstates/magnesium_block.json +++ b/src/main/resources/assets/modernmetals/blockstates/magnesium_block.json @@ -1,5 +1,7 @@ { - "variants": { - "normal": { "model": "modernmetals:magnesium_block" } + "variants": { + "": { + "model": "modernmetals:block/magnesium_block" } + } } diff --git a/src/main/resources/assets/modernmetals/blockstates/magnesium_button.json b/src/main/resources/assets/modernmetals/blockstates/magnesium_button.json index 304aa55f..b3061bd0 100644 --- a/src/main/resources/assets/modernmetals/blockstates/magnesium_button.json +++ b/src/main/resources/assets/modernmetals/blockstates/magnesium_button.json @@ -1,16 +1,118 @@ { - "variants": { - "facing=up,powered=false": { "model": "modernmetals:magnesium_button", "uvlock": true }, - "facing=down,powered=false": { "model": "modernmetals:magnesium_button", "uvlock": true, "x": 180 }, - "facing=east,powered=false": { "model": "modernmetals:magnesium_button", "uvlock": true, "x": 90, "y": 90 }, - "facing=west,powered=false": { "model": "modernmetals:magnesium_button", "uvlock": true, "x": 90, "y": 270 }, - "facing=south,powered=false": { "model": "modernmetals:magnesium_button", "uvlock": true, "x": 90, "y": 180 }, - "facing=north,powered=false": { "model": "modernmetals:magnesium_button", "uvlock": true, "x": 90 }, - "facing=up,powered=true": { "model": "modernmetals:magnesium_button_pressed", "uvlock": true }, - "facing=down,powered=true": { "model": "modernmetals:magnesium_button_pressed", "uvlock": true, "x": 180 }, - "facing=east,powered=true": { "model": "modernmetals:magnesium_button_pressed", "uvlock": true, "x": 90, "y": 90 }, - "facing=west,powered=true": { "model": "modernmetals:magnesium_button_pressed", "uvlock": true, "x": 90, "y": 270 }, - "facing=south,powered=true": { "model": "modernmetals:magnesium_button_pressed", "uvlock": true, "x": 90, "y": 180 }, - "facing=north,powered=true": { "model": "modernmetals:magnesium_button_pressed", "uvlock": true, "x": 90 } + "variants": { + "face=floor,facing=north,powered=false": { + "model": "modernmetals:block/magnesium_button" + }, + "face=wall,facing=north,powered=false": { + "model": "modernmetals:block/magnesium_button", + "x": 90, + "uvlock": true + }, + "face=ceiling,facing=north,powered=false": { + "model": "modernmetals:block/magnesium_button", + "x": 180, + "y": 180 + }, + "face=floor,facing=south,powered=false": { + "model": "modernmetals:block/magnesium_button", + "y": 180 + }, + "face=wall,facing=south,powered=false": { + "model": "modernmetals:block/magnesium_button", + "x": 90, + "y": 180, + "uvlock": true + }, + "face=ceiling,facing=south,powered=false": { + "model": "modernmetals:block/magnesium_button", + "x": 180 + }, + "face=floor,facing=west,powered=false": { + "model": "modernmetals:block/magnesium_button", + "y": 270 + }, + "face=wall,facing=west,powered=false": { + "model": "modernmetals:block/magnesium_button", + "x": 90, + "y": 270, + "uvlock": true + }, + "face=ceiling,facing=west,powered=false": { + "model": "modernmetals:block/magnesium_button", + "x": 180, + "y": 90 + }, + "face=floor,facing=east,powered=false": { + "model": "modernmetals:block/magnesium_button", + "y": 90 + }, + "face=wall,facing=east,powered=false": { + "model": "modernmetals:block/magnesium_button", + "x": 90, + "y": 90, + "uvlock": true + }, + "face=ceiling,facing=east,powered=false": { + "model": "modernmetals:block/magnesium_button", + "x": 180, + "y": 270 + }, + "face=floor,facing=north,powered=true": { + "model": "modernmetals:block/magnesium_button_pressed" + }, + "face=wall,facing=north,powered=true": { + "model": "modernmetals:block/magnesium_button_pressed", + "x": 90, + "uvlock": true + }, + "face=ceiling,facing=north,powered=true": { + "model": "modernmetals:block/magnesium_button_pressed", + "x": 180, + "y": 180 + }, + "face=floor,facing=south,powered=true": { + "model": "modernmetals:block/magnesium_button_pressed", + "y": 180 + }, + "face=wall,facing=south,powered=true": { + "model": "modernmetals:block/magnesium_button_pressed", + "x": 90, + "y": 180, + "uvlock": true + }, + "face=ceiling,facing=south,powered=true": { + "model": "modernmetals:block/magnesium_button_pressed", + "x": 180 + }, + "face=floor,facing=west,powered=true": { + "model": "modernmetals:block/magnesium_button_pressed", + "y": 270 + }, + "face=wall,facing=west,powered=true": { + "model": "modernmetals:block/magnesium_button_pressed", + "x": 90, + "y": 270, + "uvlock": true + }, + "face=ceiling,facing=west,powered=true": { + "model": "modernmetals:block/magnesium_button_pressed", + "x": 180, + "y": 90 + }, + "face=floor,facing=east,powered=true": { + "model": "modernmetals:block/magnesium_button_pressed", + "y": 90 + }, + "face=wall,facing=east,powered=true": { + "model": "modernmetals:block/magnesium_button_pressed", + "x": 90, + "y": 90, + "uvlock": true + }, + "face=ceiling,facing=east,powered=true": { + "model": "modernmetals:block/magnesium_button_pressed", + "x": 180, + "y": 270 } + } } diff --git a/src/main/resources/assets/modernmetals/blockstates/magnesium_door.json b/src/main/resources/assets/modernmetals/blockstates/magnesium_door.json index 2662a8ab..c06f5653 100644 --- a/src/main/resources/assets/modernmetals/blockstates/magnesium_door.json +++ b/src/main/resources/assets/modernmetals/blockstates/magnesium_door.json @@ -1,70 +1,124 @@ { - "variants": { - "facing=east,half=lower,hinge=left,open=false,powered=false": { "model": "modernmetals:magnesium_door_bottom" }, - "facing=south,half=lower,hinge=left,open=false,powered=false": { "model": "modernmetals:magnesium_door_bottom", "y": 90 }, - "facing=west,half=lower,hinge=left,open=false,powered=false": { "model": "modernmetals:magnesium_door_bottom", "y": 180 }, - "facing=north,half=lower,hinge=left,open=false,powered=false": { "model": "modernmetals:magnesium_door_bottom", "y": 270 }, - "facing=east,half=lower,hinge=right,open=false,powered=false": { "model": "modernmetals:magnesium_door_bottom_rh" }, - "facing=south,half=lower,hinge=right,open=false,powered=false": { "model": "modernmetals:magnesium_door_bottom_rh", "y": 90 }, - "facing=west,half=lower,hinge=right,open=false,powered=false": { "model": "modernmetals:magnesium_door_bottom_rh", "y": 180 }, - "facing=north,half=lower,hinge=right,open=false,powered=false": { "model": "modernmetals:magnesium_door_bottom_rh", "y": 270 }, - "facing=east,half=lower,hinge=left,open=true,powered=false": { "model": "modernmetals:magnesium_door_bottom_rh", "y": 90 }, - "facing=south,half=lower,hinge=left,open=true,powered=false": { "model": "modernmetals:magnesium_door_bottom_rh", "y": 180 }, - "facing=west,half=lower,hinge=left,open=true,powered=false": { "model": "modernmetals:magnesium_door_bottom_rh", "y": 270 }, - "facing=north,half=lower,hinge=left,open=true,powered=false": { "model": "modernmetals:magnesium_door_bottom_rh" }, - "facing=east,half=lower,hinge=right,open=true,powered=false": { "model": "modernmetals:magnesium_door_bottom", "y": 270 }, - "facing=south,half=lower,hinge=right,open=true,powered=false": { "model": "modernmetals:magnesium_door_bottom" }, - "facing=west,half=lower,hinge=right,open=true,powered=false": { "model": "modernmetals:magnesium_door_bottom", "y": 90 }, - "facing=north,half=lower,hinge=right,open=true,powered=false": { "model": "modernmetals:magnesium_door_bottom", "y": 180 }, - "facing=east,half=upper,hinge=left,open=false,powered=false": { "model": "modernmetals:magnesium_door_top" }, - "facing=south,half=upper,hinge=left,open=false,powered=false": { "model": "modernmetals:magnesium_door_top", "y": 90 }, - "facing=west,half=upper,hinge=left,open=false,powered=false": { "model": "modernmetals:magnesium_door_top", "y": 180 }, - "facing=north,half=upper,hinge=left,open=false,powered=false": { "model": "modernmetals:magnesium_door_top", "y": 270 }, - "facing=east,half=upper,hinge=right,open=false,powered=false": { "model": "modernmetals:magnesium_door_top_rh" }, - "facing=south,half=upper,hinge=right,open=false,powered=false": { "model": "modernmetals:magnesium_door_top_rh", "y": 90 }, - "facing=west,half=upper,hinge=right,open=false,powered=false": { "model": "modernmetals:magnesium_door_top_rh", "y": 180 }, - "facing=north,half=upper,hinge=right,open=false,powered=false": { "model": "modernmetals:magnesium_door_top_rh", "y": 270 }, - "facing=east,half=upper,hinge=left,open=true,powered=false": { "model": "modernmetals:magnesium_door_top_rh", "y": 90 }, - "facing=south,half=upper,hinge=left,open=true,powered=false": { "model": "modernmetals:magnesium_door_top_rh", "y": 180 }, - "facing=west,half=upper,hinge=left,open=true,powered=false": { "model": "modernmetals:magnesium_door_top_rh", "y": 270 }, - "facing=north,half=upper,hinge=left,open=true,powered=false": { "model": "modernmetals:magnesium_door_top_rh" }, - "facing=east,half=upper,hinge=right,open=true,powered=false": { "model": "modernmetals:magnesium_door_top", "y": 270 }, - "facing=south,half=upper,hinge=right,open=true,powered=false": { "model": "modernmetals:magnesium_door_top" }, - "facing=west,half=upper,hinge=right,open=true,powered=false": { "model": "modernmetals:magnesium_door_top", "y": 90 }, - "facing=north,half=upper,hinge=right,open=true,powered=false": { "model": "modernmetals:magnesium_door_top", "y": 180 }, - - - "facing=east,half=lower,hinge=left,open=false,powered=true": { "model": "modernmetals:magnesium_door_bottom" }, - "facing=south,half=lower,hinge=left,open=false,powered=true": { "model": "modernmetals:magnesium_door_bottom", "y": 90 }, - "facing=west,half=lower,hinge=left,open=false,powered=true": { "model": "modernmetals:magnesium_door_bottom", "y": 180 }, - "facing=north,half=lower,hinge=left,open=false,powered=true": { "model": "modernmetals:magnesium_door_bottom", "y": 270 }, - "facing=east,half=lower,hinge=right,open=false,powered=true": { "model": "modernmetals:magnesium_door_bottom_rh" }, - "facing=south,half=lower,hinge=right,open=false,powered=true": { "model": "modernmetals:magnesium_door_bottom_rh", "y": 90 }, - "facing=west,half=lower,hinge=right,open=false,powered=true": { "model": "modernmetals:magnesium_door_bottom_rh", "y": 180 }, - "facing=north,half=lower,hinge=right,open=false,powered=true": { "model": "modernmetals:magnesium_door_bottom_rh", "y": 270 }, - "facing=east,half=lower,hinge=left,open=true,powered=true": { "model": "modernmetals:magnesium_door_bottom_rh", "y": 90 }, - "facing=south,half=lower,hinge=left,open=true,powered=true": { "model": "modernmetals:magnesium_door_bottom_rh", "y": 180 }, - "facing=west,half=lower,hinge=left,open=true,powered=true": { "model": "modernmetals:magnesium_door_bottom_rh", "y": 270 }, - "facing=north,half=lower,hinge=left,open=true,powered=true": { "model": "modernmetals:magnesium_door_bottom_rh" }, - "facing=east,half=lower,hinge=right,open=true,powered=true": { "model": "modernmetals:magnesium_door_bottom", "y": 270 }, - "facing=south,half=lower,hinge=right,open=true,powered=true": { "model": "modernmetals:magnesium_door_bottom" }, - "facing=west,half=lower,hinge=right,open=true,powered=true": { "model": "modernmetals:magnesium_door_bottom", "y": 90 }, - "facing=north,half=lower,hinge=right,open=true,powered=true": { "model": "modernmetals:magnesium_door_bottom", "y": 180 }, - "facing=east,half=upper,hinge=left,open=false,powered=true": { "model": "modernmetals:magnesium_door_top" }, - "facing=south,half=upper,hinge=left,open=false,powered=true": { "model": "modernmetals:magnesium_door_top", "y": 90 }, - "facing=west,half=upper,hinge=left,open=false,powered=true": { "model": "modernmetals:magnesium_door_top", "y": 180 }, - "facing=north,half=upper,hinge=left,open=false,powered=true": { "model": "modernmetals:magnesium_door_top", "y": 270 }, - "facing=east,half=upper,hinge=right,open=false,powered=true": { "model": "modernmetals:magnesium_door_top_rh" }, - "facing=south,half=upper,hinge=right,open=false,powered=true": { "model": "modernmetals:magnesium_door_top_rh", "y": 90 }, - "facing=west,half=upper,hinge=right,open=false,powered=true": { "model": "modernmetals:magnesium_door_top_rh", "y": 180 }, - "facing=north,half=upper,hinge=right,open=false,powered=true": { "model": "modernmetals:magnesium_door_top_rh", "y": 270 }, - "facing=east,half=upper,hinge=left,open=true,powered=true": { "model": "modernmetals:magnesium_door_top_rh", "y": 90 }, - "facing=south,half=upper,hinge=left,open=true,powered=true": { "model": "modernmetals:magnesium_door_top_rh", "y": 180 }, - "facing=west,half=upper,hinge=left,open=true,powered=true": { "model": "modernmetals:magnesium_door_top_rh", "y": 270 }, - "facing=north,half=upper,hinge=left,open=true,powered=true": { "model": "modernmetals:magnesium_door_top_rh" }, - "facing=east,half=upper,hinge=right,open=true,powered=true": { "model": "modernmetals:magnesium_door_top", "y": 270 }, - "facing=south,half=upper,hinge=right,open=true,powered=true": { "model": "modernmetals:magnesium_door_top" }, - "facing=west,half=upper,hinge=right,open=true,powered=true": { "model": "modernmetals:magnesium_door_top", "y": 90 }, - "facing=north,half=upper,hinge=right,open=true,powered=true": { "model": "modernmetals:magnesium_door_top", "y": 180 } + "variants": { + "facing=north,half=upper,hinge=left,open=false": { + "model": "modernmetals:block/magnesium_door_top", + "y": 270 + }, + "facing=south,half=upper,hinge=left,open=false": { + "model": "modernmetals:block/magnesium_door_top", + "y": 90 + }, + "facing=west,half=upper,hinge=left,open=false": { + "model": "modernmetals:block/magnesium_door_top", + "y": 180 + }, + "facing=east,half=upper,hinge=left,open=false": { + "model": "modernmetals:block/magnesium_door_top" + }, + "facing=north,half=lower,hinge=left,open=false": { + "model": "modernmetals:block/magnesium_door_bottom", + "y": 270 + }, + "facing=south,half=lower,hinge=left,open=false": { + "model": "modernmetals:block/magnesium_door_bottom", + "y": 90 + }, + "facing=west,half=lower,hinge=left,open=false": { + "model": "modernmetals:block/magnesium_door_bottom", + "y": 180 + }, + "facing=east,half=lower,hinge=left,open=false": { + "model": "modernmetals:block/magnesium_door_bottom" + }, + "facing=north,half=upper,hinge=right,open=false": { + "model": "modernmetals:block/magnesium_door_top_rh", + "y": 270 + }, + "facing=south,half=upper,hinge=right,open=false": { + "model": "modernmetals:block/magnesium_door_top_rh", + "y": 90 + }, + "facing=west,half=upper,hinge=right,open=false": { + "model": "modernmetals:block/magnesium_door_top_rh", + "y": 180 + }, + "facing=east,half=upper,hinge=right,open=false": { + "model": "modernmetals:block/magnesium_door_top_rh" + }, + "facing=north,half=lower,hinge=right,open=false": { + "model": "modernmetals:block/magnesium_door_bottom_rh", + "y": 270 + }, + "facing=south,half=lower,hinge=right,open=false": { + "model": "modernmetals:block/magnesium_door_bottom_rh", + "y": 90 + }, + "facing=west,half=lower,hinge=right,open=false": { + "model": "modernmetals:block/magnesium_door_bottom_rh", + "y": 180 + }, + "facing=east,half=lower,hinge=right,open=false": { + "model": "modernmetals:block/magnesium_door_bottom_rh" + }, + "facing=north,half=upper,hinge=left,open=true": { + "model": "modernmetals:block/magnesium_door_top_rh" + }, + "facing=south,half=upper,hinge=left,open=true": { + "model": "modernmetals:block/magnesium_door_top_rh", + "y": 180 + }, + "facing=west,half=upper,hinge=left,open=true": { + "model": "modernmetals:block/magnesium_door_top_rh", + "y": 270 + }, + "facing=east,half=upper,hinge=left,open=true": { + "model": "modernmetals:block/magnesium_door_top_rh", + "y": 90 + }, + "facing=north,half=lower,hinge=left,open=true": { + "model": "modernmetals:block/magnesium_door_bottom_rh" + }, + "facing=south,half=lower,hinge=left,open=true": { + "model": "modernmetals:block/magnesium_door_bottom_rh", + "y": 180 + }, + "facing=west,half=lower,hinge=left,open=true": { + "model": "modernmetals:block/magnesium_door_bottom_rh", + "y": 270 + }, + "facing=east,half=lower,hinge=left,open=true": { + "model": "modernmetals:block/magnesium_door_bottom_rh", + "y": 90 + }, + "facing=north,half=upper,hinge=right,open=true": { + "model": "modernmetals:block/magnesium_door_top", + "y": 180 + }, + "facing=south,half=upper,hinge=right,open=true": { + "model": "modernmetals:block/magnesium_door_top" + }, + "facing=west,half=upper,hinge=right,open=true": { + "model": "modernmetals:block/magnesium_door_top", + "y": 90 + }, + "facing=east,half=upper,hinge=right,open=true": { + "model": "modernmetals:block/magnesium_door_top", + "y": 270 + }, + "facing=north,half=lower,hinge=right,open=true": { + "model": "modernmetals:block/magnesium_door_bottom", + "y": 180 + }, + "facing=south,half=lower,hinge=right,open=true": { + "model": "modernmetals:block/magnesium_door_bottom" + }, + "facing=west,half=lower,hinge=right,open=true": { + "model": "modernmetals:block/magnesium_door_bottom", + "y": 90 + }, + "facing=east,half=lower,hinge=right,open=true": { + "model": "modernmetals:block/magnesium_door_bottom", + "y": 270 } + } } diff --git a/src/main/resources/assets/modernmetals/blockstates/magnesium_lever.json b/src/main/resources/assets/modernmetals/blockstates/magnesium_lever.json index 54f29085..1775c05f 100644 --- a/src/main/resources/assets/modernmetals/blockstates/magnesium_lever.json +++ b/src/main/resources/assets/modernmetals/blockstates/magnesium_lever.json @@ -1,20 +1,76 @@ { - "variants": { - "facing=down_z,powered=false": { "model": "modernmetals:magnesium_lever_off", "x": 180, "y": 180 }, - "facing=down_x,powered=false": { "model": "modernmetals:magnesium_lever_off", "x": 180, "y": 90 }, - "facing=up_z,powered=false": { "model": "modernmetals:magnesium_lever_off" }, - "facing=up_x,powered=false": { "model": "modernmetals:magnesium_lever_off", "y": 270 }, - "facing=east,powered=false": { "model": "modernmetals:magnesium_lever_off", "x": 90, "y": 90 }, - "facing=west,powered=false": { "model": "modernmetals:magnesium_lever_off", "x": 90, "y": 270 }, - "facing=south,powered=false" : { "model": "modernmetals:magnesium_lever_off", "x": 90, "y": 180 }, - "facing=north,powered=false" : { "model": "modernmetals:magnesium_lever_off", "x": 90 }, - "facing=down_z,powered=true" : { "model": "modernmetals:magnesium_lever", "x": 180, "y": 180 }, - "facing=down_x,powered=true" : { "model": "modernmetals:magnesium_lever", "x": 180, "y": 90 }, - "facing=up_z,powered=true": { "model": "modernmetals:magnesium_lever" }, - "facing=up_x,powered=true": { "model": "modernmetals:magnesium_lever", "y": 270 }, - "facing=east,powered=true": { "model": "modernmetals:magnesium_lever", "x": 90, "y": 90 }, - "facing=west,powered=true": { "model": "modernmetals:magnesium_lever", "x": 90, "y": 270 }, - "facing=south,powered=true": { "model": "modernmetals:magnesium_lever", "x": 90, "y": 180 }, - "facing=north,powered=true": { "model": "modernmetals:magnesium_lever", "x": 90 } + "variants": { + "face=floor,facing=north,powered=false": { + "model": "modernmetals:block/magnesium_lever_off" + }, + "face=wall,facing=north,powered=false": { + "model": "modernmetals:block/magnesium_lever_off" + }, + "face=ceiling,facing=north,powered=false": { + "model": "modernmetals:block/magnesium_lever_off" + }, + "face=floor,facing=south,powered=false": { + "model": "modernmetals:block/magnesium_lever_off" + }, + "face=wall,facing=south,powered=false": { + "model": "modernmetals:block/magnesium_lever_off" + }, + "face=ceiling,facing=south,powered=false": { + "model": "modernmetals:block/magnesium_lever_off" + }, + "face=floor,facing=west,powered=false": { + "model": "modernmetals:block/magnesium_lever_off" + }, + "face=wall,facing=west,powered=false": { + "model": "modernmetals:block/magnesium_lever_off" + }, + "face=ceiling,facing=west,powered=false": { + "model": "modernmetals:block/magnesium_lever_off" + }, + "face=floor,facing=east,powered=false": { + "model": "modernmetals:block/magnesium_lever_off" + }, + "face=wall,facing=east,powered=false": { + "model": "modernmetals:block/magnesium_lever_off" + }, + "face=ceiling,facing=east,powered=false": { + "model": "modernmetals:block/magnesium_lever_off" + }, + "face=floor,facing=north,powered=true": { + "model": "modernmetals:block/magnesium_lever" + }, + "face=wall,facing=north,powered=true": { + "model": "modernmetals:block/magnesium_lever" + }, + "face=ceiling,facing=north,powered=true": { + "model": "modernmetals:block/magnesium_lever" + }, + "face=floor,facing=south,powered=true": { + "model": "modernmetals:block/magnesium_lever" + }, + "face=wall,facing=south,powered=true": { + "model": "modernmetals:block/magnesium_lever" + }, + "face=ceiling,facing=south,powered=true": { + "model": "modernmetals:block/magnesium_lever" + }, + "face=floor,facing=west,powered=true": { + "model": "modernmetals:block/magnesium_lever" + }, + "face=wall,facing=west,powered=true": { + "model": "modernmetals:block/magnesium_lever" + }, + "face=ceiling,facing=west,powered=true": { + "model": "modernmetals:block/magnesium_lever" + }, + "face=floor,facing=east,powered=true": { + "model": "modernmetals:block/magnesium_lever" + }, + "face=wall,facing=east,powered=true": { + "model": "modernmetals:block/magnesium_lever" + }, + "face=ceiling,facing=east,powered=true": { + "model": "modernmetals:block/magnesium_lever" } + } } diff --git a/src/main/resources/assets/modernmetals/blockstates/magnesium_ore.json b/src/main/resources/assets/modernmetals/blockstates/magnesium_ore.json index 7e0f4418..c658e124 100644 --- a/src/main/resources/assets/modernmetals/blockstates/magnesium_ore.json +++ b/src/main/resources/assets/modernmetals/blockstates/magnesium_ore.json @@ -1,5 +1,7 @@ { - "variants": { - "normal": { "model": "modernmetals:magnesium_ore" } + "variants": { + "": { + "model": "modernmetals:block/magnesium_ore" } + } } diff --git a/src/main/resources/assets/modernmetals/blockstates/magnesium_plate.json b/src/main/resources/assets/modernmetals/blockstates/magnesium_plate.json index 9219ffd9..8c26b1b4 100644 --- a/src/main/resources/assets/modernmetals/blockstates/magnesium_plate.json +++ b/src/main/resources/assets/modernmetals/blockstates/magnesium_plate.json @@ -1,10 +1,27 @@ { - "variants": { - "facing=down": { "model": "modernmetals:magnesium_plate", "x": 90 }, - "facing=up": { "model": "modernmetals:magnesium_plate", "x": 270 }, - "facing=north": { "model": "modernmetals:magnesium_plate" }, - "facing=south": { "model": "modernmetals:magnesium_plate", "y": 180 }, - "facing=west": { "model": "modernmetals:magnesium_plate", "y": 270 }, - "facing=east": { "model": "modernmetals:magnesium_plate", "y": 90 } + "variants": { + "facing=down": { + "model": "modernmetals:block/magnesium_plate", + "x": 90 + }, + "facing=up": { + "model": "modernmetals:block/magnesium_plate", + "x": 270 + }, + "facing=north": { + "model": "modernmetals:block/magnesium_plate" + }, + "facing=south": { + "model": "modernmetals:block/magnesium_plate", + "y": 180 + }, + "facing=west": { + "model": "modernmetals:block/magnesium_plate", + "y": 270 + }, + "facing=east": { + "model": "modernmetals:block/magnesium_plate", + "y": 90 } + } } diff --git a/src/main/resources/assets/modernmetals/blockstates/magnesium_pressure_plate.json b/src/main/resources/assets/modernmetals/blockstates/magnesium_pressure_plate.json index 5c77079f..40cdab95 100644 --- a/src/main/resources/assets/modernmetals/blockstates/magnesium_pressure_plate.json +++ b/src/main/resources/assets/modernmetals/blockstates/magnesium_pressure_plate.json @@ -1,6 +1,10 @@ { - "variants": { - "powered=false": { "model": "modernmetals:magnesium_pressure_plate_up" }, - "powered=true": { "model": "modernmetals:magnesium_pressure_plate_down" } + "variants": { + "powered=false": { + "model": "modernmetals:block/magnesium_pressure_plate_up" + }, + "powered=true": { + "model": "modernmetals:block/magnesium_pressure_plate_down" } + } } diff --git a/src/main/resources/assets/modernmetals/blockstates/magnesium_slab.json b/src/main/resources/assets/modernmetals/blockstates/magnesium_slab.json index b574ffe9..42a54ae8 100644 --- a/src/main/resources/assets/modernmetals/blockstates/magnesium_slab.json +++ b/src/main/resources/assets/modernmetals/blockstates/magnesium_slab.json @@ -1,6 +1,13 @@ { - "variants": { - "half=bottom,variant=default": { "model": "modernmetals:half_slab_magnesium" }, - "half=top,variant=default": { "model": "modernmetals:upper_slab_magnesium" } + "variants": { + "type=top": { + "model": "modernmetals:block/upper_slab_magnesium" + }, + "type=bottom": { + "model": "modernmetals:block/half_slab_magnesium" + }, + "type=double": { + "model": "modernmetals:block/magnesium_block" } + } } diff --git a/src/main/resources/assets/modernmetals/blockstates/magnesium_stairs.json b/src/main/resources/assets/modernmetals/blockstates/magnesium_stairs.json index 8278cccc..97ca6b68 100644 --- a/src/main/resources/assets/modernmetals/blockstates/magnesium_stairs.json +++ b/src/main/resources/assets/modernmetals/blockstates/magnesium_stairs.json @@ -1,44 +1,209 @@ { - "variants": { - "facing=east,half=bottom,shape=straight": { "model": "modernmetals:magnesium_stairs" }, - "facing=west,half=bottom,shape=straight": { "model": "modernmetals:magnesium_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=straight": { "model": "modernmetals:magnesium_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=straight": { "model": "modernmetals:magnesium_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_right": { "model": "modernmetals:magnesium_outer_stairs" }, - "facing=west,half=bottom,shape=outer_right": { "model": "modernmetals:magnesium_outer_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=outer_right": { "model": "modernmetals:magnesium_outer_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=outer_right": { "model": "modernmetals:magnesium_outer_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_left": { "model": "modernmetals:magnesium_outer_stairs", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=outer_left": { "model": "modernmetals:magnesium_outer_stairs", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=outer_left": { "model": "modernmetals:magnesium_outer_stairs" }, - "facing=north,half=bottom,shape=outer_left": { "model": "modernmetals:magnesium_outer_stairs", "y": 180, "uvlock": true }, - "facing=east,half=bottom,shape=inner_right": { "model": "modernmetals:magnesium_inner_stairs" }, - "facing=west,half=bottom,shape=inner_right": { "model": "modernmetals:magnesium_inner_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=inner_right": { "model": "modernmetals:magnesium_inner_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=inner_right": { "model": "modernmetals:magnesium_inner_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=inner_left": { "model": "modernmetals:magnesium_inner_stairs", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=inner_left": { "model": "modernmetals:magnesium_inner_stairs", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=inner_left": { "model": "modernmetals:magnesium_inner_stairs" }, - "facing=north,half=bottom,shape=inner_left": { "model": "modernmetals:magnesium_inner_stairs", "y": 180, "uvlock": true }, - "facing=east,half=top,shape=straight": { "model": "modernmetals:magnesium_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=straight": { "model": "modernmetals:magnesium_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=straight": { "model": "modernmetals:magnesium_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=straight": { "model": "modernmetals:magnesium_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { "model": "modernmetals:magnesium_outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_right": { "model": "modernmetals:magnesium_outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { "model": "modernmetals:magnesium_outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { "model": "modernmetals:magnesium_outer_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { "model": "modernmetals:magnesium_outer_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { "model": "modernmetals:magnesium_outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { "model": "modernmetals:magnesium_outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=outer_left": { "model": "modernmetals:magnesium_outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { "model": "modernmetals:magnesium_inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { "model": "modernmetals:magnesium_inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { "model": "modernmetals:magnesium_inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { "model": "modernmetals:magnesium_inner_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { "model": "modernmetals:magnesium_inner_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { "model": "modernmetals:magnesium_inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { "model": "modernmetals:magnesium_inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { "model": "modernmetals:magnesium_inner_stairs", "x": 180, "y": 270, "uvlock": true } + "variants": { + "facing=north,half=top,shape=straight": { + "model": "modernmetals:block/magnesium_stairs", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=south,half=top,shape=straight": { + "model": "modernmetals:block/magnesium_stairs", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=west,half=top,shape=straight": { + "model": "modernmetals:block/magnesium_stairs", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=east,half=top,shape=straight": { + "model": "modernmetals:block/magnesium_stairs", + "x": 180, + "uvlock": true + }, + "facing=north,half=bottom,shape=straight": { + "model": "modernmetals:block/magnesium_stairs", + "y": 270, + "uvlock": true + }, + "facing=south,half=bottom,shape=straight": { + "model": "modernmetals:block/magnesium_stairs", + "y": 90, + "uvlock": true + }, + "facing=west,half=bottom,shape=straight": { + "model": "modernmetals:block/magnesium_stairs", + "y": 180, + "uvlock": true + }, + "facing=east,half=bottom,shape=straight": { + "model": "modernmetals:block/magnesium_stairs" + }, + "facing=north,half=top,shape=inner_left": { + "model": "modernmetals:block/magnesium_inner_stairs", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=south,half=top,shape=inner_left": { + "model": "modernmetals:block/magnesium_inner_stairs", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=west,half=top,shape=inner_left": { + "model": "modernmetals:block/magnesium_inner_stairs", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=east,half=top,shape=inner_left": { + "model": "modernmetals:block/magnesium_inner_stairs", + "x": 180, + "uvlock": true + }, + "facing=north,half=bottom,shape=inner_left": { + "model": "modernmetals:block/magnesium_inner_stairs", + "y": 180, + "uvlock": true + }, + "facing=south,half=bottom,shape=inner_left": { + "model": "modernmetals:block/magnesium_inner_stairs" + }, + "facing=west,half=bottom,shape=inner_left": { + "model": "modernmetals:block/magnesium_inner_stairs", + "y": 90, + "uvlock": true + }, + "facing=east,half=bottom,shape=inner_left": { + "model": "modernmetals:block/magnesium_inner_stairs", + "y": 270, + "uvlock": true + }, + "facing=north,half=top,shape=inner_right": { + "model": "modernmetals:block/magnesium_inner_stairs", + "x": 180, + "uvlock": true + }, + "facing=south,half=top,shape=inner_right": { + "model": "modernmetals:block/magnesium_inner_stairs", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=west,half=top,shape=inner_right": { + "model": "modernmetals:block/magnesium_inner_stairs", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=east,half=top,shape=inner_right": { + "model": "modernmetals:block/magnesium_inner_stairs", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=north,half=bottom,shape=inner_right": { + "model": "modernmetals:block/magnesium_inner_stairs", + "y": 270, + "uvlock": true + }, + "facing=south,half=bottom,shape=inner_right": { + "model": "modernmetals:block/magnesium_inner_stairs", + "y": 90, + "uvlock": true + }, + "facing=west,half=bottom,shape=inner_right": { + "model": "modernmetals:block/magnesium_inner_stairs", + "y": 180, + "uvlock": true + }, + "facing=east,half=bottom,shape=inner_right": { + "model": "modernmetals:block/magnesium_inner_stairs" + }, + "facing=north,half=top,shape=outer_left": { + "model": "modernmetals:block/magnesium_outer_stairs", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=south,half=top,shape=outer_left": { + "model": "modernmetals:block/magnesium_outer_stairs", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=west,half=top,shape=outer_left": { + "model": "modernmetals:block/magnesium_outer_stairs", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=east,half=top,shape=outer_left": { + "model": "modernmetals:block/magnesium_outer_stairs", + "x": 180, + "uvlock": true + }, + "facing=north,half=bottom,shape=outer_left": { + "model": "modernmetals:block/magnesium_outer_stairs", + "y": 180, + "uvlock": true + }, + "facing=south,half=bottom,shape=outer_left": { + "model": "modernmetals:block/magnesium_outer_stairs" + }, + "facing=west,half=bottom,shape=outer_left": { + "model": "modernmetals:block/magnesium_outer_stairs", + "y": 90, + "uvlock": true + }, + "facing=east,half=bottom,shape=outer_left": { + "model": "modernmetals:block/magnesium_outer_stairs", + "y": 270, + "uvlock": true + }, + "facing=north,half=top,shape=outer_right": { + "model": "modernmetals:block/magnesium_outer_stairs", + "x": 180, + "uvlock": true + }, + "facing=south,half=top,shape=outer_right": { + "model": "modernmetals:block/magnesium_outer_stairs", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=west,half=top,shape=outer_right": { + "model": "modernmetals:block/magnesium_outer_stairs", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=east,half=top,shape=outer_right": { + "model": "modernmetals:block/magnesium_outer_stairs", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=north,half=bottom,shape=outer_right": { + "model": "modernmetals:block/magnesium_outer_stairs", + "y": 270, + "uvlock": true + }, + "facing=south,half=bottom,shape=outer_right": { + "model": "modernmetals:block/magnesium_outer_stairs", + "y": 90, + "uvlock": true + }, + "facing=west,half=bottom,shape=outer_right": { + "model": "modernmetals:block/magnesium_outer_stairs", + "y": 180, + "uvlock": true + }, + "facing=east,half=bottom,shape=outer_right": { + "model": "modernmetals:block/magnesium_outer_stairs" } + } } diff --git a/src/main/resources/assets/modernmetals/blockstates/magnesium_trapdoor.json b/src/main/resources/assets/modernmetals/blockstates/magnesium_trapdoor.json index 24fd671a..60a50b80 100644 --- a/src/main/resources/assets/modernmetals/blockstates/magnesium_trapdoor.json +++ b/src/main/resources/assets/modernmetals/blockstates/magnesium_trapdoor.json @@ -1,20 +1,68 @@ { - "variants": { - "facing=north,half=bottom,open=false": { "model": "modernmetals:magnesium_trapdoor_bottom" }, - "facing=south,half=bottom,open=false": { "model": "modernmetals:magnesium_trapdoor_bottom" }, - "facing=east,half=bottom,open=false": { "model": "modernmetals:magnesium_trapdoor_bottom" }, - "facing=west,half=bottom,open=false": { "model": "modernmetals:magnesium_trapdoor_bottom" }, - "facing=north,half=top,open=false": { "model": "modernmetals:magnesium_trapdoor_top" }, - "facing=south,half=top,open=false": { "model": "modernmetals:magnesium_trapdoor_top" }, - "facing=east,half=top,open=false": { "model": "modernmetals:magnesium_trapdoor_top" }, - "facing=west,half=top,open=false": { "model": "modernmetals:magnesium_trapdoor_top" }, - "facing=north,half=bottom,open=true": { "model": "modernmetals:magnesium_trapdoor_open" }, - "facing=south,half=bottom,open=true": { "model": "modernmetals:magnesium_trapdoor_open", "y": 180 }, - "facing=east,half=bottom,open=true": { "model": "modernmetals:magnesium_trapdoor_open", "y": 90 }, - "facing=west,half=bottom,open=true": { "model": "modernmetals:magnesium_trapdoor_open", "y": 270 }, - "facing=north,half=top,open=true": { "model": "modernmetals:magnesium_trapdoor_open" }, - "facing=south,half=top,open=true": { "model": "modernmetals:magnesium_trapdoor_open", "y": 180 }, - "facing=east,half=top,open=true": { "model": "modernmetals:magnesium_trapdoor_open", "y": 90 }, - "facing=west,half=top,open=true": { "model": "modernmetals:magnesium_trapdoor_open", "y": 270 } + "variants": { + "facing=north,half=top,open=false": { + "model": "modernmetals:block/magnesium_trapdoor_top" + }, + "facing=south,half=top,open=false": { + "model": "modernmetals:block/magnesium_trapdoor_top", + "y": 180 + }, + "facing=west,half=top,open=false": { + "model": "modernmetals:block/magnesium_trapdoor_top", + "y": 270 + }, + "facing=east,half=top,open=false": { + "model": "modernmetals:block/magnesium_trapdoor_top", + "y": 90 + }, + "facing=north,half=bottom,open=false": { + "model": "modernmetals:block/magnesium_trapdoor_bottom" + }, + "facing=south,half=bottom,open=false": { + "model": "modernmetals:block/magnesium_trapdoor_bottom", + "y": 180 + }, + "facing=west,half=bottom,open=false": { + "model": "modernmetals:block/magnesium_trapdoor_bottom", + "y": 270 + }, + "facing=east,half=bottom,open=false": { + "model": "modernmetals:block/magnesium_trapdoor_bottom", + "y": 90 + }, + "facing=north,half=top,open=true": { + "model": "modernmetals:block/magnesium_trapdoor_open", + "x": 180, + "y": 180 + }, + "facing=south,half=top,open=true": { + "model": "modernmetals:block/magnesium_trapdoor_open", + "x": 180 + }, + "facing=west,half=top,open=true": { + "model": "modernmetals:block/magnesium_trapdoor_open", + "x": 180, + "y": 90 + }, + "facing=east,half=top,open=true": { + "model": "modernmetals:block/magnesium_trapdoor_open", + "x": 180, + "y": 270 + }, + "facing=north,half=bottom,open=true": { + "model": "modernmetals:block/magnesium_trapdoor_open" + }, + "facing=south,half=bottom,open=true": { + "model": "modernmetals:block/magnesium_trapdoor_open", + "y": 180 + }, + "facing=west,half=bottom,open=true": { + "model": "modernmetals:block/magnesium_trapdoor_open", + "y": 270 + }, + "facing=east,half=bottom,open=true": { + "model": "modernmetals:block/magnesium_trapdoor_open", + "y": 90 } + } } diff --git a/src/main/resources/assets/modernmetals/blockstates/magnesium_wall.json b/src/main/resources/assets/modernmetals/blockstates/magnesium_wall.json index 3a5f1feb..637e69a9 100644 --- a/src/main/resources/assets/modernmetals/blockstates/magnesium_wall.json +++ b/src/main/resources/assets/modernmetals/blockstates/magnesium_wall.json @@ -1,19 +1,51 @@ { - "multipart": [ - { "when": { "up": "true" }, - "apply": { "model": "modernmetals:magnesium_wall_post" } - }, - { "when": { "north": "true" }, - "apply": { "model": "modernmetals:magnesium_wall_side", "uvlock": true } - }, - { "when": { "east": "true" }, - "apply": { "model": "modernmetals:magnesium_wall_side", "y": 90, "uvlock": true } - }, - { "when": { "south": "true" }, - "apply": { "model": "modernmetals:magnesium_wall_side", "y": 180, "uvlock": true } - }, - { "when": { "west": "true" }, - "apply": { "model": "modernmetals:magnesium_wall_side", "y": 270, "uvlock": true } - } - ] + "multipart": [ + { + "when": { + "up": "true" + }, + "apply": { + "model": "modernmetals:block/magnesium_wall_post" + } + }, + { + "when": { + "north": "true" + }, + "apply": { + "model": "modernmetals:block/magnesium_wall_side", + "uvlock": true + } + }, + { + "when": { + "east": "true" + }, + "apply": { + "model": "modernmetals:block/magnesium_wall_side", + "y": 90, + "uvlock": true + } + }, + { + "when": { + "south": "true" + }, + "apply": { + "model": "modernmetals:block/magnesium_wall_side", + "y": 180, + "uvlock": true + } + }, + { + "when": { + "west": "true" + }, + "apply": { + "model": "modernmetals:block/magnesium_wall_side", + "y": 270, + "uvlock": true + } + } + ] } diff --git a/src/main/resources/assets/modernmetals/blockstates/manganese.json b/src/main/resources/assets/modernmetals/blockstates/manganese.json index 1b1fa1b9..26c49796 100644 --- a/src/main/resources/assets/modernmetals/blockstates/manganese.json +++ b/src/main/resources/assets/modernmetals/blockstates/manganese.json @@ -1,9 +1,10 @@ { - "forge_marker": 1, - "variants": { - "fluid": { - "model": "forge:fluid", - "custom": { "fluid": "manganese" } - } + "variants": { + "": { + "model": "minecraft:block/water", + "custom": { + "fluid": "modernmetals:manganese" + } } -} \ No newline at end of file + } +} diff --git a/src/main/resources/assets/modernmetals/blockstates/manganese_bars.json b/src/main/resources/assets/modernmetals/blockstates/manganese_bars.json index cf61bc1d..56037aed 100644 --- a/src/main/resources/assets/modernmetals/blockstates/manganese_bars.json +++ b/src/main/resources/assets/modernmetals/blockstates/manganese_bars.json @@ -1,32 +1,77 @@ { - "multipart": [ - { "apply": { "model": "modernmetals:manganese_bars_post_ends" }}, - { "when": { "north": false, "east": false, "south": false, "west": false }, - "apply": { "model": "modernmetals:manganese_bars_post" } - }, - { "when": { "north": true, "east": false, "south": false, "west": false }, - "apply": { "model": "modernmetals:manganese_bars_cap" } - }, - { "when": { "north": false, "east": true, "south": false, "west": false }, - "apply": { "model": "modernmetals:manganese_bars_cap", "y": 90 } - }, - { "when": { "north": false, "east": false, "south": true, "west": false }, - "apply": { "model": "modernmetals:manganese_bars_cap_alt" } - }, - { "when": { "north": false, "east": false, "south": false, "west": true }, - "apply": { "model": "modernmetals:manganese_bars_cap_alt", "y": 90 } - }, - { "when": { "north": true }, - "apply": { "model": "modernmetals:manganese_bars_side" } - }, - { "when": { "east": true }, - "apply": { "model": "modernmetals:manganese_bars_side", "y": 90 } - }, - { "when": { "south": true }, - "apply": { "model": "modernmetals:manganese_bars_side_alt" } - }, - { "when": { "west": true }, - "apply": { "model": "modernmetals:manganese_bars_side_alt", "y": 90 } - } - ] + "multipart": [ + { + "apply": { + "model": "modernmetals:block/manganese_bars_post" + } + }, + { + "when": { + "north": "true" + }, + "apply": { + "model": "modernmetals:block/manganese_bars_side" + } + }, + { + "when": { + "north": "false" + }, + "apply": { + "model": "modernmetals:block/manganese_bars_cap" + } + }, + { + "when": { + "south": "true" + }, + "apply": { + "model": "modernmetals:block/manganese_bars_side_alt" + } + }, + { + "when": { + "south": "false" + }, + "apply": { + "model": "modernmetals:block/manganese_bars_cap_alt", + "y": 90 + } + }, + { + "when": { + "west": "true" + }, + "apply": { + "model": "modernmetals:block/manganese_bars_side_alt", + "y": 90 + } + }, + { + "when": { + "west": "false" + }, + "apply": { + "model": "modernmetals:block/manganese_bars_cap", + "y": 270 + } + }, + { + "when": { + "east": "true" + }, + "apply": { + "model": "modernmetals:block/manganese_bars_side", + "y": 90 + } + }, + { + "when": { + "east": "false" + }, + "apply": { + "model": "modernmetals:block/manganese_bars_cap_alt" + } + } + ] } diff --git a/src/main/resources/assets/modernmetals/blockstates/manganese_block.json b/src/main/resources/assets/modernmetals/blockstates/manganese_block.json index 0c3f96a7..d10189f2 100644 --- a/src/main/resources/assets/modernmetals/blockstates/manganese_block.json +++ b/src/main/resources/assets/modernmetals/blockstates/manganese_block.json @@ -1,5 +1,7 @@ { - "variants": { - "normal": { "model": "modernmetals:manganese_block" } + "variants": { + "": { + "model": "modernmetals:block/manganese_block" } + } } diff --git a/src/main/resources/assets/modernmetals/blockstates/manganese_button.json b/src/main/resources/assets/modernmetals/blockstates/manganese_button.json index 3955cd8c..ceb5636e 100644 --- a/src/main/resources/assets/modernmetals/blockstates/manganese_button.json +++ b/src/main/resources/assets/modernmetals/blockstates/manganese_button.json @@ -1,16 +1,118 @@ { - "variants": { - "facing=up,powered=false": { "model": "modernmetals:manganese_button", "uvlock": true }, - "facing=down,powered=false": { "model": "modernmetals:manganese_button", "uvlock": true, "x": 180 }, - "facing=east,powered=false": { "model": "modernmetals:manganese_button", "uvlock": true, "x": 90, "y": 90 }, - "facing=west,powered=false": { "model": "modernmetals:manganese_button", "uvlock": true, "x": 90, "y": 270 }, - "facing=south,powered=false": { "model": "modernmetals:manganese_button", "uvlock": true, "x": 90, "y": 180 }, - "facing=north,powered=false": { "model": "modernmetals:manganese_button", "uvlock": true, "x": 90 }, - "facing=up,powered=true": { "model": "modernmetals:manganese_button_pressed", "uvlock": true }, - "facing=down,powered=true": { "model": "modernmetals:manganese_button_pressed", "uvlock": true, "x": 180 }, - "facing=east,powered=true": { "model": "modernmetals:manganese_button_pressed", "uvlock": true, "x": 90, "y": 90 }, - "facing=west,powered=true": { "model": "modernmetals:manganese_button_pressed", "uvlock": true, "x": 90, "y": 270 }, - "facing=south,powered=true": { "model": "modernmetals:manganese_button_pressed", "uvlock": true, "x": 90, "y": 180 }, - "facing=north,powered=true": { "model": "modernmetals:manganese_button_pressed", "uvlock": true, "x": 90 } + "variants": { + "face=floor,facing=north,powered=false": { + "model": "modernmetals:block/manganese_button" + }, + "face=wall,facing=north,powered=false": { + "model": "modernmetals:block/manganese_button", + "x": 90, + "uvlock": true + }, + "face=ceiling,facing=north,powered=false": { + "model": "modernmetals:block/manganese_button", + "x": 180, + "y": 180 + }, + "face=floor,facing=south,powered=false": { + "model": "modernmetals:block/manganese_button", + "y": 180 + }, + "face=wall,facing=south,powered=false": { + "model": "modernmetals:block/manganese_button", + "x": 90, + "y": 180, + "uvlock": true + }, + "face=ceiling,facing=south,powered=false": { + "model": "modernmetals:block/manganese_button", + "x": 180 + }, + "face=floor,facing=west,powered=false": { + "model": "modernmetals:block/manganese_button", + "y": 270 + }, + "face=wall,facing=west,powered=false": { + "model": "modernmetals:block/manganese_button", + "x": 90, + "y": 270, + "uvlock": true + }, + "face=ceiling,facing=west,powered=false": { + "model": "modernmetals:block/manganese_button", + "x": 180, + "y": 90 + }, + "face=floor,facing=east,powered=false": { + "model": "modernmetals:block/manganese_button", + "y": 90 + }, + "face=wall,facing=east,powered=false": { + "model": "modernmetals:block/manganese_button", + "x": 90, + "y": 90, + "uvlock": true + }, + "face=ceiling,facing=east,powered=false": { + "model": "modernmetals:block/manganese_button", + "x": 180, + "y": 270 + }, + "face=floor,facing=north,powered=true": { + "model": "modernmetals:block/manganese_button_pressed" + }, + "face=wall,facing=north,powered=true": { + "model": "modernmetals:block/manganese_button_pressed", + "x": 90, + "uvlock": true + }, + "face=ceiling,facing=north,powered=true": { + "model": "modernmetals:block/manganese_button_pressed", + "x": 180, + "y": 180 + }, + "face=floor,facing=south,powered=true": { + "model": "modernmetals:block/manganese_button_pressed", + "y": 180 + }, + "face=wall,facing=south,powered=true": { + "model": "modernmetals:block/manganese_button_pressed", + "x": 90, + "y": 180, + "uvlock": true + }, + "face=ceiling,facing=south,powered=true": { + "model": "modernmetals:block/manganese_button_pressed", + "x": 180 + }, + "face=floor,facing=west,powered=true": { + "model": "modernmetals:block/manganese_button_pressed", + "y": 270 + }, + "face=wall,facing=west,powered=true": { + "model": "modernmetals:block/manganese_button_pressed", + "x": 90, + "y": 270, + "uvlock": true + }, + "face=ceiling,facing=west,powered=true": { + "model": "modernmetals:block/manganese_button_pressed", + "x": 180, + "y": 90 + }, + "face=floor,facing=east,powered=true": { + "model": "modernmetals:block/manganese_button_pressed", + "y": 90 + }, + "face=wall,facing=east,powered=true": { + "model": "modernmetals:block/manganese_button_pressed", + "x": 90, + "y": 90, + "uvlock": true + }, + "face=ceiling,facing=east,powered=true": { + "model": "modernmetals:block/manganese_button_pressed", + "x": 180, + "y": 270 } + } } diff --git a/src/main/resources/assets/modernmetals/blockstates/manganese_door.json b/src/main/resources/assets/modernmetals/blockstates/manganese_door.json index 5c50cb38..9ac0a7e5 100644 --- a/src/main/resources/assets/modernmetals/blockstates/manganese_door.json +++ b/src/main/resources/assets/modernmetals/blockstates/manganese_door.json @@ -1,70 +1,124 @@ { - "variants": { - "facing=east,half=lower,hinge=left,open=false,powered=false": { "model": "modernmetals:manganese_door_bottom" }, - "facing=south,half=lower,hinge=left,open=false,powered=false": { "model": "modernmetals:manganese_door_bottom", "y": 90 }, - "facing=west,half=lower,hinge=left,open=false,powered=false": { "model": "modernmetals:manganese_door_bottom", "y": 180 }, - "facing=north,half=lower,hinge=left,open=false,powered=false": { "model": "modernmetals:manganese_door_bottom", "y": 270 }, - "facing=east,half=lower,hinge=right,open=false,powered=false": { "model": "modernmetals:manganese_door_bottom_rh" }, - "facing=south,half=lower,hinge=right,open=false,powered=false": { "model": "modernmetals:manganese_door_bottom_rh", "y": 90 }, - "facing=west,half=lower,hinge=right,open=false,powered=false": { "model": "modernmetals:manganese_door_bottom_rh", "y": 180 }, - "facing=north,half=lower,hinge=right,open=false,powered=false": { "model": "modernmetals:manganese_door_bottom_rh", "y": 270 }, - "facing=east,half=lower,hinge=left,open=true,powered=false": { "model": "modernmetals:manganese_door_bottom_rh", "y": 90 }, - "facing=south,half=lower,hinge=left,open=true,powered=false": { "model": "modernmetals:manganese_door_bottom_rh", "y": 180 }, - "facing=west,half=lower,hinge=left,open=true,powered=false": { "model": "modernmetals:manganese_door_bottom_rh", "y": 270 }, - "facing=north,half=lower,hinge=left,open=true,powered=false": { "model": "modernmetals:manganese_door_bottom_rh" }, - "facing=east,half=lower,hinge=right,open=true,powered=false": { "model": "modernmetals:manganese_door_bottom", "y": 270 }, - "facing=south,half=lower,hinge=right,open=true,powered=false": { "model": "modernmetals:manganese_door_bottom" }, - "facing=west,half=lower,hinge=right,open=true,powered=false": { "model": "modernmetals:manganese_door_bottom", "y": 90 }, - "facing=north,half=lower,hinge=right,open=true,powered=false": { "model": "modernmetals:manganese_door_bottom", "y": 180 }, - "facing=east,half=upper,hinge=left,open=false,powered=false": { "model": "modernmetals:manganese_door_top" }, - "facing=south,half=upper,hinge=left,open=false,powered=false": { "model": "modernmetals:manganese_door_top", "y": 90 }, - "facing=west,half=upper,hinge=left,open=false,powered=false": { "model": "modernmetals:manganese_door_top", "y": 180 }, - "facing=north,half=upper,hinge=left,open=false,powered=false": { "model": "modernmetals:manganese_door_top", "y": 270 }, - "facing=east,half=upper,hinge=right,open=false,powered=false": { "model": "modernmetals:manganese_door_top_rh" }, - "facing=south,half=upper,hinge=right,open=false,powered=false": { "model": "modernmetals:manganese_door_top_rh", "y": 90 }, - "facing=west,half=upper,hinge=right,open=false,powered=false": { "model": "modernmetals:manganese_door_top_rh", "y": 180 }, - "facing=north,half=upper,hinge=right,open=false,powered=false": { "model": "modernmetals:manganese_door_top_rh", "y": 270 }, - "facing=east,half=upper,hinge=left,open=true,powered=false": { "model": "modernmetals:manganese_door_top_rh", "y": 90 }, - "facing=south,half=upper,hinge=left,open=true,powered=false": { "model": "modernmetals:manganese_door_top_rh", "y": 180 }, - "facing=west,half=upper,hinge=left,open=true,powered=false": { "model": "modernmetals:manganese_door_top_rh", "y": 270 }, - "facing=north,half=upper,hinge=left,open=true,powered=false": { "model": "modernmetals:manganese_door_top_rh" }, - "facing=east,half=upper,hinge=right,open=true,powered=false": { "model": "modernmetals:manganese_door_top", "y": 270 }, - "facing=south,half=upper,hinge=right,open=true,powered=false": { "model": "modernmetals:manganese_door_top" }, - "facing=west,half=upper,hinge=right,open=true,powered=false": { "model": "modernmetals:manganese_door_top", "y": 90 }, - "facing=north,half=upper,hinge=right,open=true,powered=false": { "model": "modernmetals:manganese_door_top", "y": 180 }, - - - "facing=east,half=lower,hinge=left,open=false,powered=true": { "model": "modernmetals:manganese_door_bottom" }, - "facing=south,half=lower,hinge=left,open=false,powered=true": { "model": "modernmetals:manganese_door_bottom", "y": 90 }, - "facing=west,half=lower,hinge=left,open=false,powered=true": { "model": "modernmetals:manganese_door_bottom", "y": 180 }, - "facing=north,half=lower,hinge=left,open=false,powered=true": { "model": "modernmetals:manganese_door_bottom", "y": 270 }, - "facing=east,half=lower,hinge=right,open=false,powered=true": { "model": "modernmetals:manganese_door_bottom_rh" }, - "facing=south,half=lower,hinge=right,open=false,powered=true": { "model": "modernmetals:manganese_door_bottom_rh", "y": 90 }, - "facing=west,half=lower,hinge=right,open=false,powered=true": { "model": "modernmetals:manganese_door_bottom_rh", "y": 180 }, - "facing=north,half=lower,hinge=right,open=false,powered=true": { "model": "modernmetals:manganese_door_bottom_rh", "y": 270 }, - "facing=east,half=lower,hinge=left,open=true,powered=true": { "model": "modernmetals:manganese_door_bottom_rh", "y": 90 }, - "facing=south,half=lower,hinge=left,open=true,powered=true": { "model": "modernmetals:manganese_door_bottom_rh", "y": 180 }, - "facing=west,half=lower,hinge=left,open=true,powered=true": { "model": "modernmetals:manganese_door_bottom_rh", "y": 270 }, - "facing=north,half=lower,hinge=left,open=true,powered=true": { "model": "modernmetals:manganese_door_bottom_rh" }, - "facing=east,half=lower,hinge=right,open=true,powered=true": { "model": "modernmetals:manganese_door_bottom", "y": 270 }, - "facing=south,half=lower,hinge=right,open=true,powered=true": { "model": "modernmetals:manganese_door_bottom" }, - "facing=west,half=lower,hinge=right,open=true,powered=true": { "model": "modernmetals:manganese_door_bottom", "y": 90 }, - "facing=north,half=lower,hinge=right,open=true,powered=true": { "model": "modernmetals:manganese_door_bottom", "y": 180 }, - "facing=east,half=upper,hinge=left,open=false,powered=true": { "model": "modernmetals:manganese_door_top" }, - "facing=south,half=upper,hinge=left,open=false,powered=true": { "model": "modernmetals:manganese_door_top", "y": 90 }, - "facing=west,half=upper,hinge=left,open=false,powered=true": { "model": "modernmetals:manganese_door_top", "y": 180 }, - "facing=north,half=upper,hinge=left,open=false,powered=true": { "model": "modernmetals:manganese_door_top", "y": 270 }, - "facing=east,half=upper,hinge=right,open=false,powered=true": { "model": "modernmetals:manganese_door_top_rh" }, - "facing=south,half=upper,hinge=right,open=false,powered=true": { "model": "modernmetals:manganese_door_top_rh", "y": 90 }, - "facing=west,half=upper,hinge=right,open=false,powered=true": { "model": "modernmetals:manganese_door_top_rh", "y": 180 }, - "facing=north,half=upper,hinge=right,open=false,powered=true": { "model": "modernmetals:manganese_door_top_rh", "y": 270 }, - "facing=east,half=upper,hinge=left,open=true,powered=true": { "model": "modernmetals:manganese_door_top_rh", "y": 90 }, - "facing=south,half=upper,hinge=left,open=true,powered=true": { "model": "modernmetals:manganese_door_top_rh", "y": 180 }, - "facing=west,half=upper,hinge=left,open=true,powered=true": { "model": "modernmetals:manganese_door_top_rh", "y": 270 }, - "facing=north,half=upper,hinge=left,open=true,powered=true": { "model": "modernmetals:manganese_door_top_rh" }, - "facing=east,half=upper,hinge=right,open=true,powered=true": { "model": "modernmetals:manganese_door_top", "y": 270 }, - "facing=south,half=upper,hinge=right,open=true,powered=true": { "model": "modernmetals:manganese_door_top" }, - "facing=west,half=upper,hinge=right,open=true,powered=true": { "model": "modernmetals:manganese_door_top", "y": 90 }, - "facing=north,half=upper,hinge=right,open=true,powered=true": { "model": "modernmetals:manganese_door_top", "y": 180 } + "variants": { + "facing=north,half=upper,hinge=left,open=false": { + "model": "modernmetals:block/manganese_door_top", + "y": 270 + }, + "facing=south,half=upper,hinge=left,open=false": { + "model": "modernmetals:block/manganese_door_top", + "y": 90 + }, + "facing=west,half=upper,hinge=left,open=false": { + "model": "modernmetals:block/manganese_door_top", + "y": 180 + }, + "facing=east,half=upper,hinge=left,open=false": { + "model": "modernmetals:block/manganese_door_top" + }, + "facing=north,half=lower,hinge=left,open=false": { + "model": "modernmetals:block/manganese_door_bottom", + "y": 270 + }, + "facing=south,half=lower,hinge=left,open=false": { + "model": "modernmetals:block/manganese_door_bottom", + "y": 90 + }, + "facing=west,half=lower,hinge=left,open=false": { + "model": "modernmetals:block/manganese_door_bottom", + "y": 180 + }, + "facing=east,half=lower,hinge=left,open=false": { + "model": "modernmetals:block/manganese_door_bottom" + }, + "facing=north,half=upper,hinge=right,open=false": { + "model": "modernmetals:block/manganese_door_top_rh", + "y": 270 + }, + "facing=south,half=upper,hinge=right,open=false": { + "model": "modernmetals:block/manganese_door_top_rh", + "y": 90 + }, + "facing=west,half=upper,hinge=right,open=false": { + "model": "modernmetals:block/manganese_door_top_rh", + "y": 180 + }, + "facing=east,half=upper,hinge=right,open=false": { + "model": "modernmetals:block/manganese_door_top_rh" + }, + "facing=north,half=lower,hinge=right,open=false": { + "model": "modernmetals:block/manganese_door_bottom_rh", + "y": 270 + }, + "facing=south,half=lower,hinge=right,open=false": { + "model": "modernmetals:block/manganese_door_bottom_rh", + "y": 90 + }, + "facing=west,half=lower,hinge=right,open=false": { + "model": "modernmetals:block/manganese_door_bottom_rh", + "y": 180 + }, + "facing=east,half=lower,hinge=right,open=false": { + "model": "modernmetals:block/manganese_door_bottom_rh" + }, + "facing=north,half=upper,hinge=left,open=true": { + "model": "modernmetals:block/manganese_door_top_rh" + }, + "facing=south,half=upper,hinge=left,open=true": { + "model": "modernmetals:block/manganese_door_top_rh", + "y": 180 + }, + "facing=west,half=upper,hinge=left,open=true": { + "model": "modernmetals:block/manganese_door_top_rh", + "y": 270 + }, + "facing=east,half=upper,hinge=left,open=true": { + "model": "modernmetals:block/manganese_door_top_rh", + "y": 90 + }, + "facing=north,half=lower,hinge=left,open=true": { + "model": "modernmetals:block/manganese_door_bottom_rh" + }, + "facing=south,half=lower,hinge=left,open=true": { + "model": "modernmetals:block/manganese_door_bottom_rh", + "y": 180 + }, + "facing=west,half=lower,hinge=left,open=true": { + "model": "modernmetals:block/manganese_door_bottom_rh", + "y": 270 + }, + "facing=east,half=lower,hinge=left,open=true": { + "model": "modernmetals:block/manganese_door_bottom_rh", + "y": 90 + }, + "facing=north,half=upper,hinge=right,open=true": { + "model": "modernmetals:block/manganese_door_top", + "y": 180 + }, + "facing=south,half=upper,hinge=right,open=true": { + "model": "modernmetals:block/manganese_door_top" + }, + "facing=west,half=upper,hinge=right,open=true": { + "model": "modernmetals:block/manganese_door_top", + "y": 90 + }, + "facing=east,half=upper,hinge=right,open=true": { + "model": "modernmetals:block/manganese_door_top", + "y": 270 + }, + "facing=north,half=lower,hinge=right,open=true": { + "model": "modernmetals:block/manganese_door_bottom", + "y": 180 + }, + "facing=south,half=lower,hinge=right,open=true": { + "model": "modernmetals:block/manganese_door_bottom" + }, + "facing=west,half=lower,hinge=right,open=true": { + "model": "modernmetals:block/manganese_door_bottom", + "y": 90 + }, + "facing=east,half=lower,hinge=right,open=true": { + "model": "modernmetals:block/manganese_door_bottom", + "y": 270 } + } } diff --git a/src/main/resources/assets/modernmetals/blockstates/manganese_lever.json b/src/main/resources/assets/modernmetals/blockstates/manganese_lever.json index afec707c..61c8c926 100644 --- a/src/main/resources/assets/modernmetals/blockstates/manganese_lever.json +++ b/src/main/resources/assets/modernmetals/blockstates/manganese_lever.json @@ -1,20 +1,76 @@ { - "variants": { - "facing=down_z,powered=false": { "model": "modernmetals:manganese_lever_off", "x": 180, "y": 180 }, - "facing=down_x,powered=false": { "model": "modernmetals:manganese_lever_off", "x": 180, "y": 90 }, - "facing=up_z,powered=false": { "model": "modernmetals:manganese_lever_off" }, - "facing=up_x,powered=false": { "model": "modernmetals:manganese_lever_off", "y": 270 }, - "facing=east,powered=false": { "model": "modernmetals:manganese_lever_off", "x": 90, "y": 90 }, - "facing=west,powered=false": { "model": "modernmetals:manganese_lever_off", "x": 90, "y": 270 }, - "facing=south,powered=false" : { "model": "modernmetals:manganese_lever_off", "x": 90, "y": 180 }, - "facing=north,powered=false" : { "model": "modernmetals:manganese_lever_off", "x": 90 }, - "facing=down_z,powered=true" : { "model": "modernmetals:manganese_lever", "x": 180, "y": 180 }, - "facing=down_x,powered=true" : { "model": "modernmetals:manganese_lever", "x": 180, "y": 90 }, - "facing=up_z,powered=true": { "model": "modernmetals:manganese_lever" }, - "facing=up_x,powered=true": { "model": "modernmetals:manganese_lever", "y": 270 }, - "facing=east,powered=true": { "model": "modernmetals:manganese_lever", "x": 90, "y": 90 }, - "facing=west,powered=true": { "model": "modernmetals:manganese_lever", "x": 90, "y": 270 }, - "facing=south,powered=true": { "model": "modernmetals:manganese_lever", "x": 90, "y": 180 }, - "facing=north,powered=true": { "model": "modernmetals:manganese_lever", "x": 90 } + "variants": { + "face=floor,facing=north,powered=false": { + "model": "modernmetals:block/manganese_lever_off" + }, + "face=wall,facing=north,powered=false": { + "model": "modernmetals:block/manganese_lever_off" + }, + "face=ceiling,facing=north,powered=false": { + "model": "modernmetals:block/manganese_lever_off" + }, + "face=floor,facing=south,powered=false": { + "model": "modernmetals:block/manganese_lever_off" + }, + "face=wall,facing=south,powered=false": { + "model": "modernmetals:block/manganese_lever_off" + }, + "face=ceiling,facing=south,powered=false": { + "model": "modernmetals:block/manganese_lever_off" + }, + "face=floor,facing=west,powered=false": { + "model": "modernmetals:block/manganese_lever_off" + }, + "face=wall,facing=west,powered=false": { + "model": "modernmetals:block/manganese_lever_off" + }, + "face=ceiling,facing=west,powered=false": { + "model": "modernmetals:block/manganese_lever_off" + }, + "face=floor,facing=east,powered=false": { + "model": "modernmetals:block/manganese_lever_off" + }, + "face=wall,facing=east,powered=false": { + "model": "modernmetals:block/manganese_lever_off" + }, + "face=ceiling,facing=east,powered=false": { + "model": "modernmetals:block/manganese_lever_off" + }, + "face=floor,facing=north,powered=true": { + "model": "modernmetals:block/manganese_lever" + }, + "face=wall,facing=north,powered=true": { + "model": "modernmetals:block/manganese_lever" + }, + "face=ceiling,facing=north,powered=true": { + "model": "modernmetals:block/manganese_lever" + }, + "face=floor,facing=south,powered=true": { + "model": "modernmetals:block/manganese_lever" + }, + "face=wall,facing=south,powered=true": { + "model": "modernmetals:block/manganese_lever" + }, + "face=ceiling,facing=south,powered=true": { + "model": "modernmetals:block/manganese_lever" + }, + "face=floor,facing=west,powered=true": { + "model": "modernmetals:block/manganese_lever" + }, + "face=wall,facing=west,powered=true": { + "model": "modernmetals:block/manganese_lever" + }, + "face=ceiling,facing=west,powered=true": { + "model": "modernmetals:block/manganese_lever" + }, + "face=floor,facing=east,powered=true": { + "model": "modernmetals:block/manganese_lever" + }, + "face=wall,facing=east,powered=true": { + "model": "modernmetals:block/manganese_lever" + }, + "face=ceiling,facing=east,powered=true": { + "model": "modernmetals:block/manganese_lever" } + } } diff --git a/src/main/resources/assets/modernmetals/blockstates/manganese_ore.json b/src/main/resources/assets/modernmetals/blockstates/manganese_ore.json index f0f6aadc..6c4d7ca4 100644 --- a/src/main/resources/assets/modernmetals/blockstates/manganese_ore.json +++ b/src/main/resources/assets/modernmetals/blockstates/manganese_ore.json @@ -1,5 +1,7 @@ { - "variants": { - "normal": { "model": "modernmetals:manganese_ore" } + "variants": { + "": { + "model": "modernmetals:block/manganese_ore" } + } } diff --git a/src/main/resources/assets/modernmetals/blockstates/manganese_plate.json b/src/main/resources/assets/modernmetals/blockstates/manganese_plate.json index 71b63ae9..c0e97bc5 100644 --- a/src/main/resources/assets/modernmetals/blockstates/manganese_plate.json +++ b/src/main/resources/assets/modernmetals/blockstates/manganese_plate.json @@ -1,10 +1,27 @@ { - "variants": { - "facing=down": { "model": "modernmetals:manganese_plate", "x": 90 }, - "facing=up": { "model": "modernmetals:manganese_plate", "x": 270 }, - "facing=north": { "model": "modernmetals:manganese_plate" }, - "facing=south": { "model": "modernmetals:manganese_plate", "y": 180 }, - "facing=west": { "model": "modernmetals:manganese_plate", "y": 270 }, - "facing=east": { "model": "modernmetals:manganese_plate", "y": 90 } + "variants": { + "facing=down": { + "model": "modernmetals:block/manganese_plate", + "x": 90 + }, + "facing=up": { + "model": "modernmetals:block/manganese_plate", + "x": 270 + }, + "facing=north": { + "model": "modernmetals:block/manganese_plate" + }, + "facing=south": { + "model": "modernmetals:block/manganese_plate", + "y": 180 + }, + "facing=west": { + "model": "modernmetals:block/manganese_plate", + "y": 270 + }, + "facing=east": { + "model": "modernmetals:block/manganese_plate", + "y": 90 } + } } diff --git a/src/main/resources/assets/modernmetals/blockstates/manganese_pressure_plate.json b/src/main/resources/assets/modernmetals/blockstates/manganese_pressure_plate.json index 693b2bc1..3298113e 100644 --- a/src/main/resources/assets/modernmetals/blockstates/manganese_pressure_plate.json +++ b/src/main/resources/assets/modernmetals/blockstates/manganese_pressure_plate.json @@ -1,6 +1,10 @@ { - "variants": { - "powered=false": { "model": "modernmetals:manganese_pressure_plate_up" }, - "powered=true": { "model": "modernmetals:manganese_pressure_plate_down" } + "variants": { + "powered=false": { + "model": "modernmetals:block/manganese_pressure_plate_up" + }, + "powered=true": { + "model": "modernmetals:block/manganese_pressure_plate_down" } + } } diff --git a/src/main/resources/assets/modernmetals/blockstates/manganese_slab.json b/src/main/resources/assets/modernmetals/blockstates/manganese_slab.json index 57e4e4b6..5cded76f 100644 --- a/src/main/resources/assets/modernmetals/blockstates/manganese_slab.json +++ b/src/main/resources/assets/modernmetals/blockstates/manganese_slab.json @@ -1,6 +1,13 @@ { - "variants": { - "half=bottom,variant=default": { "model": "modernmetals:half_slab_manganese" }, - "half=top,variant=default": { "model": "modernmetals:upper_slab_manganese" } + "variants": { + "type=top": { + "model": "modernmetals:block/upper_slab_manganese" + }, + "type=bottom": { + "model": "modernmetals:block/half_slab_manganese" + }, + "type=double": { + "model": "modernmetals:block/manganese_block" } + } } diff --git a/src/main/resources/assets/modernmetals/blockstates/manganese_stairs.json b/src/main/resources/assets/modernmetals/blockstates/manganese_stairs.json index 736e6dcd..22524b8f 100644 --- a/src/main/resources/assets/modernmetals/blockstates/manganese_stairs.json +++ b/src/main/resources/assets/modernmetals/blockstates/manganese_stairs.json @@ -1,44 +1,209 @@ { - "variants": { - "facing=east,half=bottom,shape=straight": { "model": "modernmetals:manganese_stairs" }, - "facing=west,half=bottom,shape=straight": { "model": "modernmetals:manganese_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=straight": { "model": "modernmetals:manganese_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=straight": { "model": "modernmetals:manganese_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_right": { "model": "modernmetals:manganese_outer_stairs" }, - "facing=west,half=bottom,shape=outer_right": { "model": "modernmetals:manganese_outer_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=outer_right": { "model": "modernmetals:manganese_outer_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=outer_right": { "model": "modernmetals:manganese_outer_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_left": { "model": "modernmetals:manganese_outer_stairs", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=outer_left": { "model": "modernmetals:manganese_outer_stairs", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=outer_left": { "model": "modernmetals:manganese_outer_stairs" }, - "facing=north,half=bottom,shape=outer_left": { "model": "modernmetals:manganese_outer_stairs", "y": 180, "uvlock": true }, - "facing=east,half=bottom,shape=inner_right": { "model": "modernmetals:manganese_inner_stairs" }, - "facing=west,half=bottom,shape=inner_right": { "model": "modernmetals:manganese_inner_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=inner_right": { "model": "modernmetals:manganese_inner_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=inner_right": { "model": "modernmetals:manganese_inner_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=inner_left": { "model": "modernmetals:manganese_inner_stairs", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=inner_left": { "model": "modernmetals:manganese_inner_stairs", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=inner_left": { "model": "modernmetals:manganese_inner_stairs" }, - "facing=north,half=bottom,shape=inner_left": { "model": "modernmetals:manganese_inner_stairs", "y": 180, "uvlock": true }, - "facing=east,half=top,shape=straight": { "model": "modernmetals:manganese_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=straight": { "model": "modernmetals:manganese_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=straight": { "model": "modernmetals:manganese_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=straight": { "model": "modernmetals:manganese_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { "model": "modernmetals:manganese_outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_right": { "model": "modernmetals:manganese_outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { "model": "modernmetals:manganese_outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { "model": "modernmetals:manganese_outer_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { "model": "modernmetals:manganese_outer_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { "model": "modernmetals:manganese_outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { "model": "modernmetals:manganese_outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=outer_left": { "model": "modernmetals:manganese_outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { "model": "modernmetals:manganese_inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { "model": "modernmetals:manganese_inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { "model": "modernmetals:manganese_inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { "model": "modernmetals:manganese_inner_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { "model": "modernmetals:manganese_inner_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { "model": "modernmetals:manganese_inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { "model": "modernmetals:manganese_inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { "model": "modernmetals:manganese_inner_stairs", "x": 180, "y": 270, "uvlock": true } + "variants": { + "facing=north,half=top,shape=straight": { + "model": "modernmetals:block/manganese_stairs", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=south,half=top,shape=straight": { + "model": "modernmetals:block/manganese_stairs", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=west,half=top,shape=straight": { + "model": "modernmetals:block/manganese_stairs", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=east,half=top,shape=straight": { + "model": "modernmetals:block/manganese_stairs", + "x": 180, + "uvlock": true + }, + "facing=north,half=bottom,shape=straight": { + "model": "modernmetals:block/manganese_stairs", + "y": 270, + "uvlock": true + }, + "facing=south,half=bottom,shape=straight": { + "model": "modernmetals:block/manganese_stairs", + "y": 90, + "uvlock": true + }, + "facing=west,half=bottom,shape=straight": { + "model": "modernmetals:block/manganese_stairs", + "y": 180, + "uvlock": true + }, + "facing=east,half=bottom,shape=straight": { + "model": "modernmetals:block/manganese_stairs" + }, + "facing=north,half=top,shape=inner_left": { + "model": "modernmetals:block/manganese_inner_stairs", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=south,half=top,shape=inner_left": { + "model": "modernmetals:block/manganese_inner_stairs", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=west,half=top,shape=inner_left": { + "model": "modernmetals:block/manganese_inner_stairs", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=east,half=top,shape=inner_left": { + "model": "modernmetals:block/manganese_inner_stairs", + "x": 180, + "uvlock": true + }, + "facing=north,half=bottom,shape=inner_left": { + "model": "modernmetals:block/manganese_inner_stairs", + "y": 180, + "uvlock": true + }, + "facing=south,half=bottom,shape=inner_left": { + "model": "modernmetals:block/manganese_inner_stairs" + }, + "facing=west,half=bottom,shape=inner_left": { + "model": "modernmetals:block/manganese_inner_stairs", + "y": 90, + "uvlock": true + }, + "facing=east,half=bottom,shape=inner_left": { + "model": "modernmetals:block/manganese_inner_stairs", + "y": 270, + "uvlock": true + }, + "facing=north,half=top,shape=inner_right": { + "model": "modernmetals:block/manganese_inner_stairs", + "x": 180, + "uvlock": true + }, + "facing=south,half=top,shape=inner_right": { + "model": "modernmetals:block/manganese_inner_stairs", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=west,half=top,shape=inner_right": { + "model": "modernmetals:block/manganese_inner_stairs", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=east,half=top,shape=inner_right": { + "model": "modernmetals:block/manganese_inner_stairs", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=north,half=bottom,shape=inner_right": { + "model": "modernmetals:block/manganese_inner_stairs", + "y": 270, + "uvlock": true + }, + "facing=south,half=bottom,shape=inner_right": { + "model": "modernmetals:block/manganese_inner_stairs", + "y": 90, + "uvlock": true + }, + "facing=west,half=bottom,shape=inner_right": { + "model": "modernmetals:block/manganese_inner_stairs", + "y": 180, + "uvlock": true + }, + "facing=east,half=bottom,shape=inner_right": { + "model": "modernmetals:block/manganese_inner_stairs" + }, + "facing=north,half=top,shape=outer_left": { + "model": "modernmetals:block/manganese_outer_stairs", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=south,half=top,shape=outer_left": { + "model": "modernmetals:block/manganese_outer_stairs", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=west,half=top,shape=outer_left": { + "model": "modernmetals:block/manganese_outer_stairs", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=east,half=top,shape=outer_left": { + "model": "modernmetals:block/manganese_outer_stairs", + "x": 180, + "uvlock": true + }, + "facing=north,half=bottom,shape=outer_left": { + "model": "modernmetals:block/manganese_outer_stairs", + "y": 180, + "uvlock": true + }, + "facing=south,half=bottom,shape=outer_left": { + "model": "modernmetals:block/manganese_outer_stairs" + }, + "facing=west,half=bottom,shape=outer_left": { + "model": "modernmetals:block/manganese_outer_stairs", + "y": 90, + "uvlock": true + }, + "facing=east,half=bottom,shape=outer_left": { + "model": "modernmetals:block/manganese_outer_stairs", + "y": 270, + "uvlock": true + }, + "facing=north,half=top,shape=outer_right": { + "model": "modernmetals:block/manganese_outer_stairs", + "x": 180, + "uvlock": true + }, + "facing=south,half=top,shape=outer_right": { + "model": "modernmetals:block/manganese_outer_stairs", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=west,half=top,shape=outer_right": { + "model": "modernmetals:block/manganese_outer_stairs", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=east,half=top,shape=outer_right": { + "model": "modernmetals:block/manganese_outer_stairs", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=north,half=bottom,shape=outer_right": { + "model": "modernmetals:block/manganese_outer_stairs", + "y": 270, + "uvlock": true + }, + "facing=south,half=bottom,shape=outer_right": { + "model": "modernmetals:block/manganese_outer_stairs", + "y": 90, + "uvlock": true + }, + "facing=west,half=bottom,shape=outer_right": { + "model": "modernmetals:block/manganese_outer_stairs", + "y": 180, + "uvlock": true + }, + "facing=east,half=bottom,shape=outer_right": { + "model": "modernmetals:block/manganese_outer_stairs" } + } } diff --git a/src/main/resources/assets/modernmetals/blockstates/manganese_trapdoor.json b/src/main/resources/assets/modernmetals/blockstates/manganese_trapdoor.json index 7e980714..666f78a7 100644 --- a/src/main/resources/assets/modernmetals/blockstates/manganese_trapdoor.json +++ b/src/main/resources/assets/modernmetals/blockstates/manganese_trapdoor.json @@ -1,20 +1,68 @@ { - "variants": { - "facing=north,half=bottom,open=false": { "model": "modernmetals:manganese_trapdoor_bottom" }, - "facing=south,half=bottom,open=false": { "model": "modernmetals:manganese_trapdoor_bottom" }, - "facing=east,half=bottom,open=false": { "model": "modernmetals:manganese_trapdoor_bottom" }, - "facing=west,half=bottom,open=false": { "model": "modernmetals:manganese_trapdoor_bottom" }, - "facing=north,half=top,open=false": { "model": "modernmetals:manganese_trapdoor_top" }, - "facing=south,half=top,open=false": { "model": "modernmetals:manganese_trapdoor_top" }, - "facing=east,half=top,open=false": { "model": "modernmetals:manganese_trapdoor_top" }, - "facing=west,half=top,open=false": { "model": "modernmetals:manganese_trapdoor_top" }, - "facing=north,half=bottom,open=true": { "model": "modernmetals:manganese_trapdoor_open" }, - "facing=south,half=bottom,open=true": { "model": "modernmetals:manganese_trapdoor_open", "y": 180 }, - "facing=east,half=bottom,open=true": { "model": "modernmetals:manganese_trapdoor_open", "y": 90 }, - "facing=west,half=bottom,open=true": { "model": "modernmetals:manganese_trapdoor_open", "y": 270 }, - "facing=north,half=top,open=true": { "model": "modernmetals:manganese_trapdoor_open" }, - "facing=south,half=top,open=true": { "model": "modernmetals:manganese_trapdoor_open", "y": 180 }, - "facing=east,half=top,open=true": { "model": "modernmetals:manganese_trapdoor_open", "y": 90 }, - "facing=west,half=top,open=true": { "model": "modernmetals:manganese_trapdoor_open", "y": 270 } + "variants": { + "facing=north,half=top,open=false": { + "model": "modernmetals:block/manganese_trapdoor_top" + }, + "facing=south,half=top,open=false": { + "model": "modernmetals:block/manganese_trapdoor_top", + "y": 180 + }, + "facing=west,half=top,open=false": { + "model": "modernmetals:block/manganese_trapdoor_top", + "y": 270 + }, + "facing=east,half=top,open=false": { + "model": "modernmetals:block/manganese_trapdoor_top", + "y": 90 + }, + "facing=north,half=bottom,open=false": { + "model": "modernmetals:block/manganese_trapdoor_bottom" + }, + "facing=south,half=bottom,open=false": { + "model": "modernmetals:block/manganese_trapdoor_bottom", + "y": 180 + }, + "facing=west,half=bottom,open=false": { + "model": "modernmetals:block/manganese_trapdoor_bottom", + "y": 270 + }, + "facing=east,half=bottom,open=false": { + "model": "modernmetals:block/manganese_trapdoor_bottom", + "y": 90 + }, + "facing=north,half=top,open=true": { + "model": "modernmetals:block/manganese_trapdoor_open", + "x": 180, + "y": 180 + }, + "facing=south,half=top,open=true": { + "model": "modernmetals:block/manganese_trapdoor_open", + "x": 180 + }, + "facing=west,half=top,open=true": { + "model": "modernmetals:block/manganese_trapdoor_open", + "x": 180, + "y": 90 + }, + "facing=east,half=top,open=true": { + "model": "modernmetals:block/manganese_trapdoor_open", + "x": 180, + "y": 270 + }, + "facing=north,half=bottom,open=true": { + "model": "modernmetals:block/manganese_trapdoor_open" + }, + "facing=south,half=bottom,open=true": { + "model": "modernmetals:block/manganese_trapdoor_open", + "y": 180 + }, + "facing=west,half=bottom,open=true": { + "model": "modernmetals:block/manganese_trapdoor_open", + "y": 270 + }, + "facing=east,half=bottom,open=true": { + "model": "modernmetals:block/manganese_trapdoor_open", + "y": 90 } + } } diff --git a/src/main/resources/assets/modernmetals/blockstates/manganese_wall.json b/src/main/resources/assets/modernmetals/blockstates/manganese_wall.json index ea582a5e..0f9fa4d8 100644 --- a/src/main/resources/assets/modernmetals/blockstates/manganese_wall.json +++ b/src/main/resources/assets/modernmetals/blockstates/manganese_wall.json @@ -1,19 +1,51 @@ { - "multipart": [ - { "when": { "up": "true" }, - "apply": { "model": "modernmetals:manganese_wall_post" } - }, - { "when": { "north": "true" }, - "apply": { "model": "modernmetals:manganese_wall_side", "uvlock": true } - }, - { "when": { "east": "true" }, - "apply": { "model": "modernmetals:manganese_wall_side", "y": 90, "uvlock": true } - }, - { "when": { "south": "true" }, - "apply": { "model": "modernmetals:manganese_wall_side", "y": 180, "uvlock": true } - }, - { "when": { "west": "true" }, - "apply": { "model": "modernmetals:manganese_wall_side", "y": 270, "uvlock": true } - } - ] + "multipart": [ + { + "when": { + "up": "true" + }, + "apply": { + "model": "modernmetals:block/manganese_wall_post" + } + }, + { + "when": { + "north": "true" + }, + "apply": { + "model": "modernmetals:block/manganese_wall_side", + "uvlock": true + } + }, + { + "when": { + "east": "true" + }, + "apply": { + "model": "modernmetals:block/manganese_wall_side", + "y": 90, + "uvlock": true + } + }, + { + "when": { + "south": "true" + }, + "apply": { + "model": "modernmetals:block/manganese_wall_side", + "y": 180, + "uvlock": true + } + }, + { + "when": { + "west": "true" + }, + "apply": { + "model": "modernmetals:block/manganese_wall_side", + "y": 270, + "uvlock": true + } + } + ] } diff --git a/src/main/resources/assets/modernmetals/blockstates/nichrome.json b/src/main/resources/assets/modernmetals/blockstates/nichrome.json index 1ad44f4f..e910dc2b 100644 --- a/src/main/resources/assets/modernmetals/blockstates/nichrome.json +++ b/src/main/resources/assets/modernmetals/blockstates/nichrome.json @@ -1,9 +1,10 @@ { - "forge_marker": 1, - "variants": { - "fluid": { - "model": "forge:fluid", - "custom": { "fluid": "nichrome" } - } + "variants": { + "": { + "model": "minecraft:block/water", + "custom": { + "fluid": "modernmetals:nichrome" + } } -} \ No newline at end of file + } +} diff --git a/src/main/resources/assets/modernmetals/blockstates/nichrome_bars.json b/src/main/resources/assets/modernmetals/blockstates/nichrome_bars.json index 4b0c221e..703f7714 100644 --- a/src/main/resources/assets/modernmetals/blockstates/nichrome_bars.json +++ b/src/main/resources/assets/modernmetals/blockstates/nichrome_bars.json @@ -1,32 +1,77 @@ { - "multipart": [ - { "apply": { "model": "modernmetals:nichrome_bars_post_ends" }}, - { "when": { "north": false, "east": false, "south": false, "west": false }, - "apply": { "model": "modernmetals:nichrome_bars_post" } - }, - { "when": { "north": true, "east": false, "south": false, "west": false }, - "apply": { "model": "modernmetals:nichrome_bars_cap" } - }, - { "when": { "north": false, "east": true, "south": false, "west": false }, - "apply": { "model": "modernmetals:nichrome_bars_cap", "y": 90 } - }, - { "when": { "north": false, "east": false, "south": true, "west": false }, - "apply": { "model": "modernmetals:nichrome_bars_cap_alt" } - }, - { "when": { "north": false, "east": false, "south": false, "west": true }, - "apply": { "model": "modernmetals:nichrome_bars_cap_alt", "y": 90 } - }, - { "when": { "north": true }, - "apply": { "model": "modernmetals:nichrome_bars_side" } - }, - { "when": { "east": true }, - "apply": { "model": "modernmetals:nichrome_bars_side", "y": 90 } - }, - { "when": { "south": true }, - "apply": { "model": "modernmetals:nichrome_bars_side_alt" } - }, - { "when": { "west": true }, - "apply": { "model": "modernmetals:nichrome_bars_side_alt", "y": 90 } - } - ] + "multipart": [ + { + "apply": { + "model": "modernmetals:block/nichrome_bars_post" + } + }, + { + "when": { + "north": "true" + }, + "apply": { + "model": "modernmetals:block/nichrome_bars_side" + } + }, + { + "when": { + "north": "false" + }, + "apply": { + "model": "modernmetals:block/nichrome_bars_cap" + } + }, + { + "when": { + "south": "true" + }, + "apply": { + "model": "modernmetals:block/nichrome_bars_side_alt" + } + }, + { + "when": { + "south": "false" + }, + "apply": { + "model": "modernmetals:block/nichrome_bars_cap_alt", + "y": 90 + } + }, + { + "when": { + "west": "true" + }, + "apply": { + "model": "modernmetals:block/nichrome_bars_side_alt", + "y": 90 + } + }, + { + "when": { + "west": "false" + }, + "apply": { + "model": "modernmetals:block/nichrome_bars_cap", + "y": 270 + } + }, + { + "when": { + "east": "true" + }, + "apply": { + "model": "modernmetals:block/nichrome_bars_side", + "y": 90 + } + }, + { + "when": { + "east": "false" + }, + "apply": { + "model": "modernmetals:block/nichrome_bars_cap_alt" + } + } + ] } diff --git a/src/main/resources/assets/modernmetals/blockstates/nichrome_block.json b/src/main/resources/assets/modernmetals/blockstates/nichrome_block.json index 14a069dd..b53cafea 100644 --- a/src/main/resources/assets/modernmetals/blockstates/nichrome_block.json +++ b/src/main/resources/assets/modernmetals/blockstates/nichrome_block.json @@ -1,5 +1,7 @@ { - "variants": { - "normal": { "model": "modernmetals:nichrome_block" } + "variants": { + "": { + "model": "modernmetals:block/nichrome_block" } + } } diff --git a/src/main/resources/assets/modernmetals/blockstates/nichrome_button.json b/src/main/resources/assets/modernmetals/blockstates/nichrome_button.json index d03704d8..5745bc87 100644 --- a/src/main/resources/assets/modernmetals/blockstates/nichrome_button.json +++ b/src/main/resources/assets/modernmetals/blockstates/nichrome_button.json @@ -1,16 +1,118 @@ { - "variants": { - "facing=up,powered=false": { "model": "modernmetals:nichrome_button", "uvlock": true }, - "facing=down,powered=false": { "model": "modernmetals:nichrome_button", "uvlock": true, "x": 180 }, - "facing=east,powered=false": { "model": "modernmetals:nichrome_button", "uvlock": true, "x": 90, "y": 90 }, - "facing=west,powered=false": { "model": "modernmetals:nichrome_button", "uvlock": true, "x": 90, "y": 270 }, - "facing=south,powered=false": { "model": "modernmetals:nichrome_button", "uvlock": true, "x": 90, "y": 180 }, - "facing=north,powered=false": { "model": "modernmetals:nichrome_button", "uvlock": true, "x": 90 }, - "facing=up,powered=true": { "model": "modernmetals:nichrome_button_pressed", "uvlock": true }, - "facing=down,powered=true": { "model": "modernmetals:nichrome_button_pressed", "uvlock": true, "x": 180 }, - "facing=east,powered=true": { "model": "modernmetals:nichrome_button_pressed", "uvlock": true, "x": 90, "y": 90 }, - "facing=west,powered=true": { "model": "modernmetals:nichrome_button_pressed", "uvlock": true, "x": 90, "y": 270 }, - "facing=south,powered=true": { "model": "modernmetals:nichrome_button_pressed", "uvlock": true, "x": 90, "y": 180 }, - "facing=north,powered=true": { "model": "modernmetals:nichrome_button_pressed", "uvlock": true, "x": 90 } + "variants": { + "face=floor,facing=north,powered=false": { + "model": "modernmetals:block/nichrome_button" + }, + "face=wall,facing=north,powered=false": { + "model": "modernmetals:block/nichrome_button", + "x": 90, + "uvlock": true + }, + "face=ceiling,facing=north,powered=false": { + "model": "modernmetals:block/nichrome_button", + "x": 180, + "y": 180 + }, + "face=floor,facing=south,powered=false": { + "model": "modernmetals:block/nichrome_button", + "y": 180 + }, + "face=wall,facing=south,powered=false": { + "model": "modernmetals:block/nichrome_button", + "x": 90, + "y": 180, + "uvlock": true + }, + "face=ceiling,facing=south,powered=false": { + "model": "modernmetals:block/nichrome_button", + "x": 180 + }, + "face=floor,facing=west,powered=false": { + "model": "modernmetals:block/nichrome_button", + "y": 270 + }, + "face=wall,facing=west,powered=false": { + "model": "modernmetals:block/nichrome_button", + "x": 90, + "y": 270, + "uvlock": true + }, + "face=ceiling,facing=west,powered=false": { + "model": "modernmetals:block/nichrome_button", + "x": 180, + "y": 90 + }, + "face=floor,facing=east,powered=false": { + "model": "modernmetals:block/nichrome_button", + "y": 90 + }, + "face=wall,facing=east,powered=false": { + "model": "modernmetals:block/nichrome_button", + "x": 90, + "y": 90, + "uvlock": true + }, + "face=ceiling,facing=east,powered=false": { + "model": "modernmetals:block/nichrome_button", + "x": 180, + "y": 270 + }, + "face=floor,facing=north,powered=true": { + "model": "modernmetals:block/nichrome_button_pressed" + }, + "face=wall,facing=north,powered=true": { + "model": "modernmetals:block/nichrome_button_pressed", + "x": 90, + "uvlock": true + }, + "face=ceiling,facing=north,powered=true": { + "model": "modernmetals:block/nichrome_button_pressed", + "x": 180, + "y": 180 + }, + "face=floor,facing=south,powered=true": { + "model": "modernmetals:block/nichrome_button_pressed", + "y": 180 + }, + "face=wall,facing=south,powered=true": { + "model": "modernmetals:block/nichrome_button_pressed", + "x": 90, + "y": 180, + "uvlock": true + }, + "face=ceiling,facing=south,powered=true": { + "model": "modernmetals:block/nichrome_button_pressed", + "x": 180 + }, + "face=floor,facing=west,powered=true": { + "model": "modernmetals:block/nichrome_button_pressed", + "y": 270 + }, + "face=wall,facing=west,powered=true": { + "model": "modernmetals:block/nichrome_button_pressed", + "x": 90, + "y": 270, + "uvlock": true + }, + "face=ceiling,facing=west,powered=true": { + "model": "modernmetals:block/nichrome_button_pressed", + "x": 180, + "y": 90 + }, + "face=floor,facing=east,powered=true": { + "model": "modernmetals:block/nichrome_button_pressed", + "y": 90 + }, + "face=wall,facing=east,powered=true": { + "model": "modernmetals:block/nichrome_button_pressed", + "x": 90, + "y": 90, + "uvlock": true + }, + "face=ceiling,facing=east,powered=true": { + "model": "modernmetals:block/nichrome_button_pressed", + "x": 180, + "y": 270 } + } } diff --git a/src/main/resources/assets/modernmetals/blockstates/nichrome_door.json b/src/main/resources/assets/modernmetals/blockstates/nichrome_door.json index 65fc7eb4..774559e5 100644 --- a/src/main/resources/assets/modernmetals/blockstates/nichrome_door.json +++ b/src/main/resources/assets/modernmetals/blockstates/nichrome_door.json @@ -1,70 +1,124 @@ { - "variants": { - "facing=east,half=lower,hinge=left,open=false,powered=false": { "model": "modernmetals:nichrome_door_bottom" }, - "facing=south,half=lower,hinge=left,open=false,powered=false": { "model": "modernmetals:nichrome_door_bottom", "y": 90 }, - "facing=west,half=lower,hinge=left,open=false,powered=false": { "model": "modernmetals:nichrome_door_bottom", "y": 180 }, - "facing=north,half=lower,hinge=left,open=false,powered=false": { "model": "modernmetals:nichrome_door_bottom", "y": 270 }, - "facing=east,half=lower,hinge=right,open=false,powered=false": { "model": "modernmetals:nichrome_door_bottom_rh" }, - "facing=south,half=lower,hinge=right,open=false,powered=false": { "model": "modernmetals:nichrome_door_bottom_rh", "y": 90 }, - "facing=west,half=lower,hinge=right,open=false,powered=false": { "model": "modernmetals:nichrome_door_bottom_rh", "y": 180 }, - "facing=north,half=lower,hinge=right,open=false,powered=false": { "model": "modernmetals:nichrome_door_bottom_rh", "y": 270 }, - "facing=east,half=lower,hinge=left,open=true,powered=false": { "model": "modernmetals:nichrome_door_bottom_rh", "y": 90 }, - "facing=south,half=lower,hinge=left,open=true,powered=false": { "model": "modernmetals:nichrome_door_bottom_rh", "y": 180 }, - "facing=west,half=lower,hinge=left,open=true,powered=false": { "model": "modernmetals:nichrome_door_bottom_rh", "y": 270 }, - "facing=north,half=lower,hinge=left,open=true,powered=false": { "model": "modernmetals:nichrome_door_bottom_rh" }, - "facing=east,half=lower,hinge=right,open=true,powered=false": { "model": "modernmetals:nichrome_door_bottom", "y": 270 }, - "facing=south,half=lower,hinge=right,open=true,powered=false": { "model": "modernmetals:nichrome_door_bottom" }, - "facing=west,half=lower,hinge=right,open=true,powered=false": { "model": "modernmetals:nichrome_door_bottom", "y": 90 }, - "facing=north,half=lower,hinge=right,open=true,powered=false": { "model": "modernmetals:nichrome_door_bottom", "y": 180 }, - "facing=east,half=upper,hinge=left,open=false,powered=false": { "model": "modernmetals:nichrome_door_top" }, - "facing=south,half=upper,hinge=left,open=false,powered=false": { "model": "modernmetals:nichrome_door_top", "y": 90 }, - "facing=west,half=upper,hinge=left,open=false,powered=false": { "model": "modernmetals:nichrome_door_top", "y": 180 }, - "facing=north,half=upper,hinge=left,open=false,powered=false": { "model": "modernmetals:nichrome_door_top", "y": 270 }, - "facing=east,half=upper,hinge=right,open=false,powered=false": { "model": "modernmetals:nichrome_door_top_rh" }, - "facing=south,half=upper,hinge=right,open=false,powered=false": { "model": "modernmetals:nichrome_door_top_rh", "y": 90 }, - "facing=west,half=upper,hinge=right,open=false,powered=false": { "model": "modernmetals:nichrome_door_top_rh", "y": 180 }, - "facing=north,half=upper,hinge=right,open=false,powered=false": { "model": "modernmetals:nichrome_door_top_rh", "y": 270 }, - "facing=east,half=upper,hinge=left,open=true,powered=false": { "model": "modernmetals:nichrome_door_top_rh", "y": 90 }, - "facing=south,half=upper,hinge=left,open=true,powered=false": { "model": "modernmetals:nichrome_door_top_rh", "y": 180 }, - "facing=west,half=upper,hinge=left,open=true,powered=false": { "model": "modernmetals:nichrome_door_top_rh", "y": 270 }, - "facing=north,half=upper,hinge=left,open=true,powered=false": { "model": "modernmetals:nichrome_door_top_rh" }, - "facing=east,half=upper,hinge=right,open=true,powered=false": { "model": "modernmetals:nichrome_door_top", "y": 270 }, - "facing=south,half=upper,hinge=right,open=true,powered=false": { "model": "modernmetals:nichrome_door_top" }, - "facing=west,half=upper,hinge=right,open=true,powered=false": { "model": "modernmetals:nichrome_door_top", "y": 90 }, - "facing=north,half=upper,hinge=right,open=true,powered=false": { "model": "modernmetals:nichrome_door_top", "y": 180 }, - - - "facing=east,half=lower,hinge=left,open=false,powered=true": { "model": "modernmetals:nichrome_door_bottom" }, - "facing=south,half=lower,hinge=left,open=false,powered=true": { "model": "modernmetals:nichrome_door_bottom", "y": 90 }, - "facing=west,half=lower,hinge=left,open=false,powered=true": { "model": "modernmetals:nichrome_door_bottom", "y": 180 }, - "facing=north,half=lower,hinge=left,open=false,powered=true": { "model": "modernmetals:nichrome_door_bottom", "y": 270 }, - "facing=east,half=lower,hinge=right,open=false,powered=true": { "model": "modernmetals:nichrome_door_bottom_rh" }, - "facing=south,half=lower,hinge=right,open=false,powered=true": { "model": "modernmetals:nichrome_door_bottom_rh", "y": 90 }, - "facing=west,half=lower,hinge=right,open=false,powered=true": { "model": "modernmetals:nichrome_door_bottom_rh", "y": 180 }, - "facing=north,half=lower,hinge=right,open=false,powered=true": { "model": "modernmetals:nichrome_door_bottom_rh", "y": 270 }, - "facing=east,half=lower,hinge=left,open=true,powered=true": { "model": "modernmetals:nichrome_door_bottom_rh", "y": 90 }, - "facing=south,half=lower,hinge=left,open=true,powered=true": { "model": "modernmetals:nichrome_door_bottom_rh", "y": 180 }, - "facing=west,half=lower,hinge=left,open=true,powered=true": { "model": "modernmetals:nichrome_door_bottom_rh", "y": 270 }, - "facing=north,half=lower,hinge=left,open=true,powered=true": { "model": "modernmetals:nichrome_door_bottom_rh" }, - "facing=east,half=lower,hinge=right,open=true,powered=true": { "model": "modernmetals:nichrome_door_bottom", "y": 270 }, - "facing=south,half=lower,hinge=right,open=true,powered=true": { "model": "modernmetals:nichrome_door_bottom" }, - "facing=west,half=lower,hinge=right,open=true,powered=true": { "model": "modernmetals:nichrome_door_bottom", "y": 90 }, - "facing=north,half=lower,hinge=right,open=true,powered=true": { "model": "modernmetals:nichrome_door_bottom", "y": 180 }, - "facing=east,half=upper,hinge=left,open=false,powered=true": { "model": "modernmetals:nichrome_door_top" }, - "facing=south,half=upper,hinge=left,open=false,powered=true": { "model": "modernmetals:nichrome_door_top", "y": 90 }, - "facing=west,half=upper,hinge=left,open=false,powered=true": { "model": "modernmetals:nichrome_door_top", "y": 180 }, - "facing=north,half=upper,hinge=left,open=false,powered=true": { "model": "modernmetals:nichrome_door_top", "y": 270 }, - "facing=east,half=upper,hinge=right,open=false,powered=true": { "model": "modernmetals:nichrome_door_top_rh" }, - "facing=south,half=upper,hinge=right,open=false,powered=true": { "model": "modernmetals:nichrome_door_top_rh", "y": 90 }, - "facing=west,half=upper,hinge=right,open=false,powered=true": { "model": "modernmetals:nichrome_door_top_rh", "y": 180 }, - "facing=north,half=upper,hinge=right,open=false,powered=true": { "model": "modernmetals:nichrome_door_top_rh", "y": 270 }, - "facing=east,half=upper,hinge=left,open=true,powered=true": { "model": "modernmetals:nichrome_door_top_rh", "y": 90 }, - "facing=south,half=upper,hinge=left,open=true,powered=true": { "model": "modernmetals:nichrome_door_top_rh", "y": 180 }, - "facing=west,half=upper,hinge=left,open=true,powered=true": { "model": "modernmetals:nichrome_door_top_rh", "y": 270 }, - "facing=north,half=upper,hinge=left,open=true,powered=true": { "model": "modernmetals:nichrome_door_top_rh" }, - "facing=east,half=upper,hinge=right,open=true,powered=true": { "model": "modernmetals:nichrome_door_top", "y": 270 }, - "facing=south,half=upper,hinge=right,open=true,powered=true": { "model": "modernmetals:nichrome_door_top" }, - "facing=west,half=upper,hinge=right,open=true,powered=true": { "model": "modernmetals:nichrome_door_top", "y": 90 }, - "facing=north,half=upper,hinge=right,open=true,powered=true": { "model": "modernmetals:nichrome_door_top", "y": 180 } + "variants": { + "facing=north,half=upper,hinge=left,open=false": { + "model": "modernmetals:block/nichrome_door_top", + "y": 270 + }, + "facing=south,half=upper,hinge=left,open=false": { + "model": "modernmetals:block/nichrome_door_top", + "y": 90 + }, + "facing=west,half=upper,hinge=left,open=false": { + "model": "modernmetals:block/nichrome_door_top", + "y": 180 + }, + "facing=east,half=upper,hinge=left,open=false": { + "model": "modernmetals:block/nichrome_door_top" + }, + "facing=north,half=lower,hinge=left,open=false": { + "model": "modernmetals:block/nichrome_door_bottom", + "y": 270 + }, + "facing=south,half=lower,hinge=left,open=false": { + "model": "modernmetals:block/nichrome_door_bottom", + "y": 90 + }, + "facing=west,half=lower,hinge=left,open=false": { + "model": "modernmetals:block/nichrome_door_bottom", + "y": 180 + }, + "facing=east,half=lower,hinge=left,open=false": { + "model": "modernmetals:block/nichrome_door_bottom" + }, + "facing=north,half=upper,hinge=right,open=false": { + "model": "modernmetals:block/nichrome_door_top_rh", + "y": 270 + }, + "facing=south,half=upper,hinge=right,open=false": { + "model": "modernmetals:block/nichrome_door_top_rh", + "y": 90 + }, + "facing=west,half=upper,hinge=right,open=false": { + "model": "modernmetals:block/nichrome_door_top_rh", + "y": 180 + }, + "facing=east,half=upper,hinge=right,open=false": { + "model": "modernmetals:block/nichrome_door_top_rh" + }, + "facing=north,half=lower,hinge=right,open=false": { + "model": "modernmetals:block/nichrome_door_bottom_rh", + "y": 270 + }, + "facing=south,half=lower,hinge=right,open=false": { + "model": "modernmetals:block/nichrome_door_bottom_rh", + "y": 90 + }, + "facing=west,half=lower,hinge=right,open=false": { + "model": "modernmetals:block/nichrome_door_bottom_rh", + "y": 180 + }, + "facing=east,half=lower,hinge=right,open=false": { + "model": "modernmetals:block/nichrome_door_bottom_rh" + }, + "facing=north,half=upper,hinge=left,open=true": { + "model": "modernmetals:block/nichrome_door_top_rh" + }, + "facing=south,half=upper,hinge=left,open=true": { + "model": "modernmetals:block/nichrome_door_top_rh", + "y": 180 + }, + "facing=west,half=upper,hinge=left,open=true": { + "model": "modernmetals:block/nichrome_door_top_rh", + "y": 270 + }, + "facing=east,half=upper,hinge=left,open=true": { + "model": "modernmetals:block/nichrome_door_top_rh", + "y": 90 + }, + "facing=north,half=lower,hinge=left,open=true": { + "model": "modernmetals:block/nichrome_door_bottom_rh" + }, + "facing=south,half=lower,hinge=left,open=true": { + "model": "modernmetals:block/nichrome_door_bottom_rh", + "y": 180 + }, + "facing=west,half=lower,hinge=left,open=true": { + "model": "modernmetals:block/nichrome_door_bottom_rh", + "y": 270 + }, + "facing=east,half=lower,hinge=left,open=true": { + "model": "modernmetals:block/nichrome_door_bottom_rh", + "y": 90 + }, + "facing=north,half=upper,hinge=right,open=true": { + "model": "modernmetals:block/nichrome_door_top", + "y": 180 + }, + "facing=south,half=upper,hinge=right,open=true": { + "model": "modernmetals:block/nichrome_door_top" + }, + "facing=west,half=upper,hinge=right,open=true": { + "model": "modernmetals:block/nichrome_door_top", + "y": 90 + }, + "facing=east,half=upper,hinge=right,open=true": { + "model": "modernmetals:block/nichrome_door_top", + "y": 270 + }, + "facing=north,half=lower,hinge=right,open=true": { + "model": "modernmetals:block/nichrome_door_bottom", + "y": 180 + }, + "facing=south,half=lower,hinge=right,open=true": { + "model": "modernmetals:block/nichrome_door_bottom" + }, + "facing=west,half=lower,hinge=right,open=true": { + "model": "modernmetals:block/nichrome_door_bottom", + "y": 90 + }, + "facing=east,half=lower,hinge=right,open=true": { + "model": "modernmetals:block/nichrome_door_bottom", + "y": 270 } + } } diff --git a/src/main/resources/assets/modernmetals/blockstates/nichrome_lever.json b/src/main/resources/assets/modernmetals/blockstates/nichrome_lever.json index 61fc6e17..d1bc4c72 100644 --- a/src/main/resources/assets/modernmetals/blockstates/nichrome_lever.json +++ b/src/main/resources/assets/modernmetals/blockstates/nichrome_lever.json @@ -1,20 +1,76 @@ { - "variants": { - "facing=down_z,powered=false": { "model": "modernmetals:nichrome_lever_off", "x": 180, "y": 180 }, - "facing=down_x,powered=false": { "model": "modernmetals:nichrome_lever_off", "x": 180, "y": 90 }, - "facing=up_z,powered=false": { "model": "modernmetals:nichrome_lever_off" }, - "facing=up_x,powered=false": { "model": "modernmetals:nichrome_lever_off", "y": 270 }, - "facing=east,powered=false": { "model": "modernmetals:nichrome_lever_off", "x": 90, "y": 90 }, - "facing=west,powered=false": { "model": "modernmetals:nichrome_lever_off", "x": 90, "y": 270 }, - "facing=south,powered=false" : { "model": "modernmetals:nichrome_lever_off", "x": 90, "y": 180 }, - "facing=north,powered=false" : { "model": "modernmetals:nichrome_lever_off", "x": 90 }, - "facing=down_z,powered=true" : { "model": "modernmetals:nichrome_lever", "x": 180, "y": 180 }, - "facing=down_x,powered=true" : { "model": "modernmetals:nichrome_lever", "x": 180, "y": 90 }, - "facing=up_z,powered=true": { "model": "modernmetals:nichrome_lever" }, - "facing=up_x,powered=true": { "model": "modernmetals:nichrome_lever", "y": 270 }, - "facing=east,powered=true": { "model": "modernmetals:nichrome_lever", "x": 90, "y": 90 }, - "facing=west,powered=true": { "model": "modernmetals:nichrome_lever", "x": 90, "y": 270 }, - "facing=south,powered=true": { "model": "modernmetals:nichrome_lever", "x": 90, "y": 180 }, - "facing=north,powered=true": { "model": "modernmetals:nichrome_lever", "x": 90 } + "variants": { + "face=floor,facing=north,powered=false": { + "model": "modernmetals:block/nichrome_lever_off" + }, + "face=wall,facing=north,powered=false": { + "model": "modernmetals:block/nichrome_lever_off" + }, + "face=ceiling,facing=north,powered=false": { + "model": "modernmetals:block/nichrome_lever_off" + }, + "face=floor,facing=south,powered=false": { + "model": "modernmetals:block/nichrome_lever_off" + }, + "face=wall,facing=south,powered=false": { + "model": "modernmetals:block/nichrome_lever_off" + }, + "face=ceiling,facing=south,powered=false": { + "model": "modernmetals:block/nichrome_lever_off" + }, + "face=floor,facing=west,powered=false": { + "model": "modernmetals:block/nichrome_lever_off" + }, + "face=wall,facing=west,powered=false": { + "model": "modernmetals:block/nichrome_lever_off" + }, + "face=ceiling,facing=west,powered=false": { + "model": "modernmetals:block/nichrome_lever_off" + }, + "face=floor,facing=east,powered=false": { + "model": "modernmetals:block/nichrome_lever_off" + }, + "face=wall,facing=east,powered=false": { + "model": "modernmetals:block/nichrome_lever_off" + }, + "face=ceiling,facing=east,powered=false": { + "model": "modernmetals:block/nichrome_lever_off" + }, + "face=floor,facing=north,powered=true": { + "model": "modernmetals:block/nichrome_lever" + }, + "face=wall,facing=north,powered=true": { + "model": "modernmetals:block/nichrome_lever" + }, + "face=ceiling,facing=north,powered=true": { + "model": "modernmetals:block/nichrome_lever" + }, + "face=floor,facing=south,powered=true": { + "model": "modernmetals:block/nichrome_lever" + }, + "face=wall,facing=south,powered=true": { + "model": "modernmetals:block/nichrome_lever" + }, + "face=ceiling,facing=south,powered=true": { + "model": "modernmetals:block/nichrome_lever" + }, + "face=floor,facing=west,powered=true": { + "model": "modernmetals:block/nichrome_lever" + }, + "face=wall,facing=west,powered=true": { + "model": "modernmetals:block/nichrome_lever" + }, + "face=ceiling,facing=west,powered=true": { + "model": "modernmetals:block/nichrome_lever" + }, + "face=floor,facing=east,powered=true": { + "model": "modernmetals:block/nichrome_lever" + }, + "face=wall,facing=east,powered=true": { + "model": "modernmetals:block/nichrome_lever" + }, + "face=ceiling,facing=east,powered=true": { + "model": "modernmetals:block/nichrome_lever" } + } } diff --git a/src/main/resources/assets/modernmetals/blockstates/nichrome_ore.json b/src/main/resources/assets/modernmetals/blockstates/nichrome_ore.json index 2a57fb98..abcd1c44 100644 --- a/src/main/resources/assets/modernmetals/blockstates/nichrome_ore.json +++ b/src/main/resources/assets/modernmetals/blockstates/nichrome_ore.json @@ -1,5 +1,7 @@ { - "variants": { - "normal": { "model": "modernmetals:nichrome_ore" } + "variants": { + "": { + "model": "modernmetals:block/nichrome_ore" } + } } diff --git a/src/main/resources/assets/modernmetals/blockstates/nichrome_plate.json b/src/main/resources/assets/modernmetals/blockstates/nichrome_plate.json index 7a8f4058..92f23587 100644 --- a/src/main/resources/assets/modernmetals/blockstates/nichrome_plate.json +++ b/src/main/resources/assets/modernmetals/blockstates/nichrome_plate.json @@ -1,10 +1,27 @@ { - "variants": { - "facing=down": { "model": "modernmetals:nichrome_plate", "x": 90 }, - "facing=up": { "model": "modernmetals:nichrome_plate", "x": 270 }, - "facing=north": { "model": "modernmetals:nichrome_plate" }, - "facing=south": { "model": "modernmetals:nichrome_plate", "y": 180 }, - "facing=west": { "model": "modernmetals:nichrome_plate", "y": 270 }, - "facing=east": { "model": "modernmetals:nichrome_plate", "y": 90 } + "variants": { + "facing=down": { + "model": "modernmetals:block/nichrome_plate", + "x": 90 + }, + "facing=up": { + "model": "modernmetals:block/nichrome_plate", + "x": 270 + }, + "facing=north": { + "model": "modernmetals:block/nichrome_plate" + }, + "facing=south": { + "model": "modernmetals:block/nichrome_plate", + "y": 180 + }, + "facing=west": { + "model": "modernmetals:block/nichrome_plate", + "y": 270 + }, + "facing=east": { + "model": "modernmetals:block/nichrome_plate", + "y": 90 } + } } diff --git a/src/main/resources/assets/modernmetals/blockstates/nichrome_pressure_plate.json b/src/main/resources/assets/modernmetals/blockstates/nichrome_pressure_plate.json index fcac66b3..60097853 100644 --- a/src/main/resources/assets/modernmetals/blockstates/nichrome_pressure_plate.json +++ b/src/main/resources/assets/modernmetals/blockstates/nichrome_pressure_plate.json @@ -1,6 +1,10 @@ { - "variants": { - "powered=false": { "model": "modernmetals:nichrome_pressure_plate_up" }, - "powered=true": { "model": "modernmetals:nichrome_pressure_plate_down" } + "variants": { + "powered=false": { + "model": "modernmetals:block/nichrome_pressure_plate_up" + }, + "powered=true": { + "model": "modernmetals:block/nichrome_pressure_plate_down" } + } } diff --git a/src/main/resources/assets/modernmetals/blockstates/nichrome_slab.json b/src/main/resources/assets/modernmetals/blockstates/nichrome_slab.json index c88a6e50..949eccd0 100644 --- a/src/main/resources/assets/modernmetals/blockstates/nichrome_slab.json +++ b/src/main/resources/assets/modernmetals/blockstates/nichrome_slab.json @@ -1,6 +1,13 @@ { - "variants": { - "half=bottom,variant=default": { "model": "modernmetals:half_slab_nichrome" }, - "half=top,variant=default": { "model": "modernmetals:upper_slab_nichrome" } + "variants": { + "type=top": { + "model": "modernmetals:block/upper_slab_nichrome" + }, + "type=bottom": { + "model": "modernmetals:block/half_slab_nichrome" + }, + "type=double": { + "model": "modernmetals:block/nichrome_block" } + } } diff --git a/src/main/resources/assets/modernmetals/blockstates/nichrome_stairs.json b/src/main/resources/assets/modernmetals/blockstates/nichrome_stairs.json index 499e3e2e..4f0f6b22 100644 --- a/src/main/resources/assets/modernmetals/blockstates/nichrome_stairs.json +++ b/src/main/resources/assets/modernmetals/blockstates/nichrome_stairs.json @@ -1,44 +1,209 @@ { - "variants": { - "facing=east,half=bottom,shape=straight": { "model": "modernmetals:nichrome_stairs" }, - "facing=west,half=bottom,shape=straight": { "model": "modernmetals:nichrome_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=straight": { "model": "modernmetals:nichrome_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=straight": { "model": "modernmetals:nichrome_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_right": { "model": "modernmetals:nichrome_outer_stairs" }, - "facing=west,half=bottom,shape=outer_right": { "model": "modernmetals:nichrome_outer_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=outer_right": { "model": "modernmetals:nichrome_outer_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=outer_right": { "model": "modernmetals:nichrome_outer_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_left": { "model": "modernmetals:nichrome_outer_stairs", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=outer_left": { "model": "modernmetals:nichrome_outer_stairs", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=outer_left": { "model": "modernmetals:nichrome_outer_stairs" }, - "facing=north,half=bottom,shape=outer_left": { "model": "modernmetals:nichrome_outer_stairs", "y": 180, "uvlock": true }, - "facing=east,half=bottom,shape=inner_right": { "model": "modernmetals:nichrome_inner_stairs" }, - "facing=west,half=bottom,shape=inner_right": { "model": "modernmetals:nichrome_inner_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=inner_right": { "model": "modernmetals:nichrome_inner_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=inner_right": { "model": "modernmetals:nichrome_inner_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=inner_left": { "model": "modernmetals:nichrome_inner_stairs", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=inner_left": { "model": "modernmetals:nichrome_inner_stairs", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=inner_left": { "model": "modernmetals:nichrome_inner_stairs" }, - "facing=north,half=bottom,shape=inner_left": { "model": "modernmetals:nichrome_inner_stairs", "y": 180, "uvlock": true }, - "facing=east,half=top,shape=straight": { "model": "modernmetals:nichrome_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=straight": { "model": "modernmetals:nichrome_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=straight": { "model": "modernmetals:nichrome_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=straight": { "model": "modernmetals:nichrome_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { "model": "modernmetals:nichrome_outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_right": { "model": "modernmetals:nichrome_outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { "model": "modernmetals:nichrome_outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { "model": "modernmetals:nichrome_outer_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { "model": "modernmetals:nichrome_outer_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { "model": "modernmetals:nichrome_outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { "model": "modernmetals:nichrome_outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=outer_left": { "model": "modernmetals:nichrome_outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { "model": "modernmetals:nichrome_inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { "model": "modernmetals:nichrome_inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { "model": "modernmetals:nichrome_inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { "model": "modernmetals:nichrome_inner_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { "model": "modernmetals:nichrome_inner_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { "model": "modernmetals:nichrome_inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { "model": "modernmetals:nichrome_inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { "model": "modernmetals:nichrome_inner_stairs", "x": 180, "y": 270, "uvlock": true } + "variants": { + "facing=north,half=top,shape=straight": { + "model": "modernmetals:block/nichrome_stairs", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=south,half=top,shape=straight": { + "model": "modernmetals:block/nichrome_stairs", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=west,half=top,shape=straight": { + "model": "modernmetals:block/nichrome_stairs", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=east,half=top,shape=straight": { + "model": "modernmetals:block/nichrome_stairs", + "x": 180, + "uvlock": true + }, + "facing=north,half=bottom,shape=straight": { + "model": "modernmetals:block/nichrome_stairs", + "y": 270, + "uvlock": true + }, + "facing=south,half=bottom,shape=straight": { + "model": "modernmetals:block/nichrome_stairs", + "y": 90, + "uvlock": true + }, + "facing=west,half=bottom,shape=straight": { + "model": "modernmetals:block/nichrome_stairs", + "y": 180, + "uvlock": true + }, + "facing=east,half=bottom,shape=straight": { + "model": "modernmetals:block/nichrome_stairs" + }, + "facing=north,half=top,shape=inner_left": { + "model": "modernmetals:block/nichrome_inner_stairs", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=south,half=top,shape=inner_left": { + "model": "modernmetals:block/nichrome_inner_stairs", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=west,half=top,shape=inner_left": { + "model": "modernmetals:block/nichrome_inner_stairs", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=east,half=top,shape=inner_left": { + "model": "modernmetals:block/nichrome_inner_stairs", + "x": 180, + "uvlock": true + }, + "facing=north,half=bottom,shape=inner_left": { + "model": "modernmetals:block/nichrome_inner_stairs", + "y": 180, + "uvlock": true + }, + "facing=south,half=bottom,shape=inner_left": { + "model": "modernmetals:block/nichrome_inner_stairs" + }, + "facing=west,half=bottom,shape=inner_left": { + "model": "modernmetals:block/nichrome_inner_stairs", + "y": 90, + "uvlock": true + }, + "facing=east,half=bottom,shape=inner_left": { + "model": "modernmetals:block/nichrome_inner_stairs", + "y": 270, + "uvlock": true + }, + "facing=north,half=top,shape=inner_right": { + "model": "modernmetals:block/nichrome_inner_stairs", + "x": 180, + "uvlock": true + }, + "facing=south,half=top,shape=inner_right": { + "model": "modernmetals:block/nichrome_inner_stairs", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=west,half=top,shape=inner_right": { + "model": "modernmetals:block/nichrome_inner_stairs", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=east,half=top,shape=inner_right": { + "model": "modernmetals:block/nichrome_inner_stairs", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=north,half=bottom,shape=inner_right": { + "model": "modernmetals:block/nichrome_inner_stairs", + "y": 270, + "uvlock": true + }, + "facing=south,half=bottom,shape=inner_right": { + "model": "modernmetals:block/nichrome_inner_stairs", + "y": 90, + "uvlock": true + }, + "facing=west,half=bottom,shape=inner_right": { + "model": "modernmetals:block/nichrome_inner_stairs", + "y": 180, + "uvlock": true + }, + "facing=east,half=bottom,shape=inner_right": { + "model": "modernmetals:block/nichrome_inner_stairs" + }, + "facing=north,half=top,shape=outer_left": { + "model": "modernmetals:block/nichrome_outer_stairs", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=south,half=top,shape=outer_left": { + "model": "modernmetals:block/nichrome_outer_stairs", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=west,half=top,shape=outer_left": { + "model": "modernmetals:block/nichrome_outer_stairs", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=east,half=top,shape=outer_left": { + "model": "modernmetals:block/nichrome_outer_stairs", + "x": 180, + "uvlock": true + }, + "facing=north,half=bottom,shape=outer_left": { + "model": "modernmetals:block/nichrome_outer_stairs", + "y": 180, + "uvlock": true + }, + "facing=south,half=bottom,shape=outer_left": { + "model": "modernmetals:block/nichrome_outer_stairs" + }, + "facing=west,half=bottom,shape=outer_left": { + "model": "modernmetals:block/nichrome_outer_stairs", + "y": 90, + "uvlock": true + }, + "facing=east,half=bottom,shape=outer_left": { + "model": "modernmetals:block/nichrome_outer_stairs", + "y": 270, + "uvlock": true + }, + "facing=north,half=top,shape=outer_right": { + "model": "modernmetals:block/nichrome_outer_stairs", + "x": 180, + "uvlock": true + }, + "facing=south,half=top,shape=outer_right": { + "model": "modernmetals:block/nichrome_outer_stairs", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=west,half=top,shape=outer_right": { + "model": "modernmetals:block/nichrome_outer_stairs", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=east,half=top,shape=outer_right": { + "model": "modernmetals:block/nichrome_outer_stairs", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=north,half=bottom,shape=outer_right": { + "model": "modernmetals:block/nichrome_outer_stairs", + "y": 270, + "uvlock": true + }, + "facing=south,half=bottom,shape=outer_right": { + "model": "modernmetals:block/nichrome_outer_stairs", + "y": 90, + "uvlock": true + }, + "facing=west,half=bottom,shape=outer_right": { + "model": "modernmetals:block/nichrome_outer_stairs", + "y": 180, + "uvlock": true + }, + "facing=east,half=bottom,shape=outer_right": { + "model": "modernmetals:block/nichrome_outer_stairs" } + } } diff --git a/src/main/resources/assets/modernmetals/blockstates/nichrome_trapdoor.json b/src/main/resources/assets/modernmetals/blockstates/nichrome_trapdoor.json index 5660536f..367a5dd0 100644 --- a/src/main/resources/assets/modernmetals/blockstates/nichrome_trapdoor.json +++ b/src/main/resources/assets/modernmetals/blockstates/nichrome_trapdoor.json @@ -1,20 +1,68 @@ { - "variants": { - "facing=north,half=bottom,open=false": { "model": "modernmetals:nichrome_trapdoor_bottom" }, - "facing=south,half=bottom,open=false": { "model": "modernmetals:nichrome_trapdoor_bottom" }, - "facing=east,half=bottom,open=false": { "model": "modernmetals:nichrome_trapdoor_bottom" }, - "facing=west,half=bottom,open=false": { "model": "modernmetals:nichrome_trapdoor_bottom" }, - "facing=north,half=top,open=false": { "model": "modernmetals:nichrome_trapdoor_top" }, - "facing=south,half=top,open=false": { "model": "modernmetals:nichrome_trapdoor_top" }, - "facing=east,half=top,open=false": { "model": "modernmetals:nichrome_trapdoor_top" }, - "facing=west,half=top,open=false": { "model": "modernmetals:nichrome_trapdoor_top" }, - "facing=north,half=bottom,open=true": { "model": "modernmetals:nichrome_trapdoor_open" }, - "facing=south,half=bottom,open=true": { "model": "modernmetals:nichrome_trapdoor_open", "y": 180 }, - "facing=east,half=bottom,open=true": { "model": "modernmetals:nichrome_trapdoor_open", "y": 90 }, - "facing=west,half=bottom,open=true": { "model": "modernmetals:nichrome_trapdoor_open", "y": 270 }, - "facing=north,half=top,open=true": { "model": "modernmetals:nichrome_trapdoor_open" }, - "facing=south,half=top,open=true": { "model": "modernmetals:nichrome_trapdoor_open", "y": 180 }, - "facing=east,half=top,open=true": { "model": "modernmetals:nichrome_trapdoor_open", "y": 90 }, - "facing=west,half=top,open=true": { "model": "modernmetals:nichrome_trapdoor_open", "y": 270 } + "variants": { + "facing=north,half=top,open=false": { + "model": "modernmetals:block/nichrome_trapdoor_top" + }, + "facing=south,half=top,open=false": { + "model": "modernmetals:block/nichrome_trapdoor_top", + "y": 180 + }, + "facing=west,half=top,open=false": { + "model": "modernmetals:block/nichrome_trapdoor_top", + "y": 270 + }, + "facing=east,half=top,open=false": { + "model": "modernmetals:block/nichrome_trapdoor_top", + "y": 90 + }, + "facing=north,half=bottom,open=false": { + "model": "modernmetals:block/nichrome_trapdoor_bottom" + }, + "facing=south,half=bottom,open=false": { + "model": "modernmetals:block/nichrome_trapdoor_bottom", + "y": 180 + }, + "facing=west,half=bottom,open=false": { + "model": "modernmetals:block/nichrome_trapdoor_bottom", + "y": 270 + }, + "facing=east,half=bottom,open=false": { + "model": "modernmetals:block/nichrome_trapdoor_bottom", + "y": 90 + }, + "facing=north,half=top,open=true": { + "model": "modernmetals:block/nichrome_trapdoor_open", + "x": 180, + "y": 180 + }, + "facing=south,half=top,open=true": { + "model": "modernmetals:block/nichrome_trapdoor_open", + "x": 180 + }, + "facing=west,half=top,open=true": { + "model": "modernmetals:block/nichrome_trapdoor_open", + "x": 180, + "y": 90 + }, + "facing=east,half=top,open=true": { + "model": "modernmetals:block/nichrome_trapdoor_open", + "x": 180, + "y": 270 + }, + "facing=north,half=bottom,open=true": { + "model": "modernmetals:block/nichrome_trapdoor_open" + }, + "facing=south,half=bottom,open=true": { + "model": "modernmetals:block/nichrome_trapdoor_open", + "y": 180 + }, + "facing=west,half=bottom,open=true": { + "model": "modernmetals:block/nichrome_trapdoor_open", + "y": 270 + }, + "facing=east,half=bottom,open=true": { + "model": "modernmetals:block/nichrome_trapdoor_open", + "y": 90 } + } } diff --git a/src/main/resources/assets/modernmetals/blockstates/nichrome_wall.json b/src/main/resources/assets/modernmetals/blockstates/nichrome_wall.json index 7c3ca68f..c438a41a 100644 --- a/src/main/resources/assets/modernmetals/blockstates/nichrome_wall.json +++ b/src/main/resources/assets/modernmetals/blockstates/nichrome_wall.json @@ -1,19 +1,51 @@ { - "multipart": [ - { "when": { "up": "true" }, - "apply": { "model": "modernmetals:nichrome_wall_post" } - }, - { "when": { "north": "true" }, - "apply": { "model": "modernmetals:nichrome_wall_side", "uvlock": true } - }, - { "when": { "east": "true" }, - "apply": { "model": "modernmetals:nichrome_wall_side", "y": 90, "uvlock": true } - }, - { "when": { "south": "true" }, - "apply": { "model": "modernmetals:nichrome_wall_side", "y": 180, "uvlock": true } - }, - { "when": { "west": "true" }, - "apply": { "model": "modernmetals:nichrome_wall_side", "y": 270, "uvlock": true } - } - ] + "multipart": [ + { + "when": { + "up": "true" + }, + "apply": { + "model": "modernmetals:block/nichrome_wall_post" + } + }, + { + "when": { + "north": "true" + }, + "apply": { + "model": "modernmetals:block/nichrome_wall_side", + "uvlock": true + } + }, + { + "when": { + "east": "true" + }, + "apply": { + "model": "modernmetals:block/nichrome_wall_side", + "y": 90, + "uvlock": true + } + }, + { + "when": { + "south": "true" + }, + "apply": { + "model": "modernmetals:block/nichrome_wall_side", + "y": 180, + "uvlock": true + } + }, + { + "when": { + "west": "true" + }, + "apply": { + "model": "modernmetals:block/nichrome_wall_side", + "y": 270, + "uvlock": true + } + } + ] } diff --git a/src/main/resources/assets/modernmetals/blockstates/osmium.json b/src/main/resources/assets/modernmetals/blockstates/osmium.json index 7d1a5f7f..7052a06b 100644 --- a/src/main/resources/assets/modernmetals/blockstates/osmium.json +++ b/src/main/resources/assets/modernmetals/blockstates/osmium.json @@ -1,9 +1,10 @@ { - "forge_marker": 1, - "variants": { - "fluid": { - "model": "forge:fluid", - "custom": { "fluid": "osmium" } - } + "variants": { + "": { + "model": "minecraft:block/water", + "custom": { + "fluid": "modernmetals:osmium" + } } -} \ No newline at end of file + } +} diff --git a/src/main/resources/assets/modernmetals/blockstates/osmium_bars.json b/src/main/resources/assets/modernmetals/blockstates/osmium_bars.json index cac9ae34..3f30aa3d 100644 --- a/src/main/resources/assets/modernmetals/blockstates/osmium_bars.json +++ b/src/main/resources/assets/modernmetals/blockstates/osmium_bars.json @@ -1,32 +1,77 @@ { - "multipart": [ - { "apply": { "model": "modernmetals:osmium_bars_post_ends" }}, - { "when": { "north": false, "east": false, "south": false, "west": false }, - "apply": { "model": "modernmetals:osmium_bars_post" } - }, - { "when": { "north": true, "east": false, "south": false, "west": false }, - "apply": { "model": "modernmetals:osmium_bars_cap" } - }, - { "when": { "north": false, "east": true, "south": false, "west": false }, - "apply": { "model": "modernmetals:osmium_bars_cap", "y": 90 } - }, - { "when": { "north": false, "east": false, "south": true, "west": false }, - "apply": { "model": "modernmetals:osmium_bars_cap_alt" } - }, - { "when": { "north": false, "east": false, "south": false, "west": true }, - "apply": { "model": "modernmetals:osmium_bars_cap_alt", "y": 90 } - }, - { "when": { "north": true }, - "apply": { "model": "modernmetals:osmium_bars_side" } - }, - { "when": { "east": true }, - "apply": { "model": "modernmetals:osmium_bars_side", "y": 90 } - }, - { "when": { "south": true }, - "apply": { "model": "modernmetals:osmium_bars_side_alt" } - }, - { "when": { "west": true }, - "apply": { "model": "modernmetals:osmium_bars_side_alt", "y": 90 } - } - ] + "multipart": [ + { + "apply": { + "model": "modernmetals:block/osmium_bars_post" + } + }, + { + "when": { + "north": "true" + }, + "apply": { + "model": "modernmetals:block/osmium_bars_side" + } + }, + { + "when": { + "north": "false" + }, + "apply": { + "model": "modernmetals:block/osmium_bars_cap" + } + }, + { + "when": { + "south": "true" + }, + "apply": { + "model": "modernmetals:block/osmium_bars_side_alt" + } + }, + { + "when": { + "south": "false" + }, + "apply": { + "model": "modernmetals:block/osmium_bars_cap_alt", + "y": 90 + } + }, + { + "when": { + "west": "true" + }, + "apply": { + "model": "modernmetals:block/osmium_bars_side_alt", + "y": 90 + } + }, + { + "when": { + "west": "false" + }, + "apply": { + "model": "modernmetals:block/osmium_bars_cap", + "y": 270 + } + }, + { + "when": { + "east": "true" + }, + "apply": { + "model": "modernmetals:block/osmium_bars_side", + "y": 90 + } + }, + { + "when": { + "east": "false" + }, + "apply": { + "model": "modernmetals:block/osmium_bars_cap_alt" + } + } + ] } diff --git a/src/main/resources/assets/modernmetals/blockstates/osmium_block.json b/src/main/resources/assets/modernmetals/blockstates/osmium_block.json index f45cbb38..8989fe6f 100644 --- a/src/main/resources/assets/modernmetals/blockstates/osmium_block.json +++ b/src/main/resources/assets/modernmetals/blockstates/osmium_block.json @@ -1,5 +1,7 @@ { - "variants": { - "normal": { "model": "modernmetals:osmium_block" } + "variants": { + "": { + "model": "modernmetals:block/osmium_block" } + } } diff --git a/src/main/resources/assets/modernmetals/blockstates/osmium_button.json b/src/main/resources/assets/modernmetals/blockstates/osmium_button.json index 658bea35..9ae112f7 100644 --- a/src/main/resources/assets/modernmetals/blockstates/osmium_button.json +++ b/src/main/resources/assets/modernmetals/blockstates/osmium_button.json @@ -1,16 +1,118 @@ { - "variants": { - "facing=up,powered=false": { "model": "modernmetals:osmium_button", "uvlock": true }, - "facing=down,powered=false": { "model": "modernmetals:osmium_button", "uvlock": true, "x": 180 }, - "facing=east,powered=false": { "model": "modernmetals:osmium_button", "uvlock": true, "x": 90, "y": 90 }, - "facing=west,powered=false": { "model": "modernmetals:osmium_button", "uvlock": true, "x": 90, "y": 270 }, - "facing=south,powered=false": { "model": "modernmetals:osmium_button", "uvlock": true, "x": 90, "y": 180 }, - "facing=north,powered=false": { "model": "modernmetals:osmium_button", "uvlock": true, "x": 90 }, - "facing=up,powered=true": { "model": "modernmetals:osmium_button_pressed", "uvlock": true }, - "facing=down,powered=true": { "model": "modernmetals:osmium_button_pressed", "uvlock": true, "x": 180 }, - "facing=east,powered=true": { "model": "modernmetals:osmium_button_pressed", "uvlock": true, "x": 90, "y": 90 }, - "facing=west,powered=true": { "model": "modernmetals:osmium_button_pressed", "uvlock": true, "x": 90, "y": 270 }, - "facing=south,powered=true": { "model": "modernmetals:osmium_button_pressed", "uvlock": true, "x": 90, "y": 180 }, - "facing=north,powered=true": { "model": "modernmetals:osmium_button_pressed", "uvlock": true, "x": 90 } + "variants": { + "face=floor,facing=north,powered=false": { + "model": "modernmetals:block/osmium_button" + }, + "face=wall,facing=north,powered=false": { + "model": "modernmetals:block/osmium_button", + "x": 90, + "uvlock": true + }, + "face=ceiling,facing=north,powered=false": { + "model": "modernmetals:block/osmium_button", + "x": 180, + "y": 180 + }, + "face=floor,facing=south,powered=false": { + "model": "modernmetals:block/osmium_button", + "y": 180 + }, + "face=wall,facing=south,powered=false": { + "model": "modernmetals:block/osmium_button", + "x": 90, + "y": 180, + "uvlock": true + }, + "face=ceiling,facing=south,powered=false": { + "model": "modernmetals:block/osmium_button", + "x": 180 + }, + "face=floor,facing=west,powered=false": { + "model": "modernmetals:block/osmium_button", + "y": 270 + }, + "face=wall,facing=west,powered=false": { + "model": "modernmetals:block/osmium_button", + "x": 90, + "y": 270, + "uvlock": true + }, + "face=ceiling,facing=west,powered=false": { + "model": "modernmetals:block/osmium_button", + "x": 180, + "y": 90 + }, + "face=floor,facing=east,powered=false": { + "model": "modernmetals:block/osmium_button", + "y": 90 + }, + "face=wall,facing=east,powered=false": { + "model": "modernmetals:block/osmium_button", + "x": 90, + "y": 90, + "uvlock": true + }, + "face=ceiling,facing=east,powered=false": { + "model": "modernmetals:block/osmium_button", + "x": 180, + "y": 270 + }, + "face=floor,facing=north,powered=true": { + "model": "modernmetals:block/osmium_button_pressed" + }, + "face=wall,facing=north,powered=true": { + "model": "modernmetals:block/osmium_button_pressed", + "x": 90, + "uvlock": true + }, + "face=ceiling,facing=north,powered=true": { + "model": "modernmetals:block/osmium_button_pressed", + "x": 180, + "y": 180 + }, + "face=floor,facing=south,powered=true": { + "model": "modernmetals:block/osmium_button_pressed", + "y": 180 + }, + "face=wall,facing=south,powered=true": { + "model": "modernmetals:block/osmium_button_pressed", + "x": 90, + "y": 180, + "uvlock": true + }, + "face=ceiling,facing=south,powered=true": { + "model": "modernmetals:block/osmium_button_pressed", + "x": 180 + }, + "face=floor,facing=west,powered=true": { + "model": "modernmetals:block/osmium_button_pressed", + "y": 270 + }, + "face=wall,facing=west,powered=true": { + "model": "modernmetals:block/osmium_button_pressed", + "x": 90, + "y": 270, + "uvlock": true + }, + "face=ceiling,facing=west,powered=true": { + "model": "modernmetals:block/osmium_button_pressed", + "x": 180, + "y": 90 + }, + "face=floor,facing=east,powered=true": { + "model": "modernmetals:block/osmium_button_pressed", + "y": 90 + }, + "face=wall,facing=east,powered=true": { + "model": "modernmetals:block/osmium_button_pressed", + "x": 90, + "y": 90, + "uvlock": true + }, + "face=ceiling,facing=east,powered=true": { + "model": "modernmetals:block/osmium_button_pressed", + "x": 180, + "y": 270 } + } } diff --git a/src/main/resources/assets/modernmetals/blockstates/osmium_door.json b/src/main/resources/assets/modernmetals/blockstates/osmium_door.json index 8c246d6e..4fe84595 100644 --- a/src/main/resources/assets/modernmetals/blockstates/osmium_door.json +++ b/src/main/resources/assets/modernmetals/blockstates/osmium_door.json @@ -1,70 +1,124 @@ { - "variants": { - "facing=east,half=lower,hinge=left,open=false,powered=false": { "model": "modernmetals:osmium_door_bottom" }, - "facing=south,half=lower,hinge=left,open=false,powered=false": { "model": "modernmetals:osmium_door_bottom", "y": 90 }, - "facing=west,half=lower,hinge=left,open=false,powered=false": { "model": "modernmetals:osmium_door_bottom", "y": 180 }, - "facing=north,half=lower,hinge=left,open=false,powered=false": { "model": "modernmetals:osmium_door_bottom", "y": 270 }, - "facing=east,half=lower,hinge=right,open=false,powered=false": { "model": "modernmetals:osmium_door_bottom_rh" }, - "facing=south,half=lower,hinge=right,open=false,powered=false": { "model": "modernmetals:osmium_door_bottom_rh", "y": 90 }, - "facing=west,half=lower,hinge=right,open=false,powered=false": { "model": "modernmetals:osmium_door_bottom_rh", "y": 180 }, - "facing=north,half=lower,hinge=right,open=false,powered=false": { "model": "modernmetals:osmium_door_bottom_rh", "y": 270 }, - "facing=east,half=lower,hinge=left,open=true,powered=false": { "model": "modernmetals:osmium_door_bottom_rh", "y": 90 }, - "facing=south,half=lower,hinge=left,open=true,powered=false": { "model": "modernmetals:osmium_door_bottom_rh", "y": 180 }, - "facing=west,half=lower,hinge=left,open=true,powered=false": { "model": "modernmetals:osmium_door_bottom_rh", "y": 270 }, - "facing=north,half=lower,hinge=left,open=true,powered=false": { "model": "modernmetals:osmium_door_bottom_rh" }, - "facing=east,half=lower,hinge=right,open=true,powered=false": { "model": "modernmetals:osmium_door_bottom", "y": 270 }, - "facing=south,half=lower,hinge=right,open=true,powered=false": { "model": "modernmetals:osmium_door_bottom" }, - "facing=west,half=lower,hinge=right,open=true,powered=false": { "model": "modernmetals:osmium_door_bottom", "y": 90 }, - "facing=north,half=lower,hinge=right,open=true,powered=false": { "model": "modernmetals:osmium_door_bottom", "y": 180 }, - "facing=east,half=upper,hinge=left,open=false,powered=false": { "model": "modernmetals:osmium_door_top" }, - "facing=south,half=upper,hinge=left,open=false,powered=false": { "model": "modernmetals:osmium_door_top", "y": 90 }, - "facing=west,half=upper,hinge=left,open=false,powered=false": { "model": "modernmetals:osmium_door_top", "y": 180 }, - "facing=north,half=upper,hinge=left,open=false,powered=false": { "model": "modernmetals:osmium_door_top", "y": 270 }, - "facing=east,half=upper,hinge=right,open=false,powered=false": { "model": "modernmetals:osmium_door_top_rh" }, - "facing=south,half=upper,hinge=right,open=false,powered=false": { "model": "modernmetals:osmium_door_top_rh", "y": 90 }, - "facing=west,half=upper,hinge=right,open=false,powered=false": { "model": "modernmetals:osmium_door_top_rh", "y": 180 }, - "facing=north,half=upper,hinge=right,open=false,powered=false": { "model": "modernmetals:osmium_door_top_rh", "y": 270 }, - "facing=east,half=upper,hinge=left,open=true,powered=false": { "model": "modernmetals:osmium_door_top_rh", "y": 90 }, - "facing=south,half=upper,hinge=left,open=true,powered=false": { "model": "modernmetals:osmium_door_top_rh", "y": 180 }, - "facing=west,half=upper,hinge=left,open=true,powered=false": { "model": "modernmetals:osmium_door_top_rh", "y": 270 }, - "facing=north,half=upper,hinge=left,open=true,powered=false": { "model": "modernmetals:osmium_door_top_rh" }, - "facing=east,half=upper,hinge=right,open=true,powered=false": { "model": "modernmetals:osmium_door_top", "y": 270 }, - "facing=south,half=upper,hinge=right,open=true,powered=false": { "model": "modernmetals:osmium_door_top" }, - "facing=west,half=upper,hinge=right,open=true,powered=false": { "model": "modernmetals:osmium_door_top", "y": 90 }, - "facing=north,half=upper,hinge=right,open=true,powered=false": { "model": "modernmetals:osmium_door_top", "y": 180 }, - - - "facing=east,half=lower,hinge=left,open=false,powered=true": { "model": "modernmetals:osmium_door_bottom" }, - "facing=south,half=lower,hinge=left,open=false,powered=true": { "model": "modernmetals:osmium_door_bottom", "y": 90 }, - "facing=west,half=lower,hinge=left,open=false,powered=true": { "model": "modernmetals:osmium_door_bottom", "y": 180 }, - "facing=north,half=lower,hinge=left,open=false,powered=true": { "model": "modernmetals:osmium_door_bottom", "y": 270 }, - "facing=east,half=lower,hinge=right,open=false,powered=true": { "model": "modernmetals:osmium_door_bottom_rh" }, - "facing=south,half=lower,hinge=right,open=false,powered=true": { "model": "modernmetals:osmium_door_bottom_rh", "y": 90 }, - "facing=west,half=lower,hinge=right,open=false,powered=true": { "model": "modernmetals:osmium_door_bottom_rh", "y": 180 }, - "facing=north,half=lower,hinge=right,open=false,powered=true": { "model": "modernmetals:osmium_door_bottom_rh", "y": 270 }, - "facing=east,half=lower,hinge=left,open=true,powered=true": { "model": "modernmetals:osmium_door_bottom_rh", "y": 90 }, - "facing=south,half=lower,hinge=left,open=true,powered=true": { "model": "modernmetals:osmium_door_bottom_rh", "y": 180 }, - "facing=west,half=lower,hinge=left,open=true,powered=true": { "model": "modernmetals:osmium_door_bottom_rh", "y": 270 }, - "facing=north,half=lower,hinge=left,open=true,powered=true": { "model": "modernmetals:osmium_door_bottom_rh" }, - "facing=east,half=lower,hinge=right,open=true,powered=true": { "model": "modernmetals:osmium_door_bottom", "y": 270 }, - "facing=south,half=lower,hinge=right,open=true,powered=true": { "model": "modernmetals:osmium_door_bottom" }, - "facing=west,half=lower,hinge=right,open=true,powered=true": { "model": "modernmetals:osmium_door_bottom", "y": 90 }, - "facing=north,half=lower,hinge=right,open=true,powered=true": { "model": "modernmetals:osmium_door_bottom", "y": 180 }, - "facing=east,half=upper,hinge=left,open=false,powered=true": { "model": "modernmetals:osmium_door_top" }, - "facing=south,half=upper,hinge=left,open=false,powered=true": { "model": "modernmetals:osmium_door_top", "y": 90 }, - "facing=west,half=upper,hinge=left,open=false,powered=true": { "model": "modernmetals:osmium_door_top", "y": 180 }, - "facing=north,half=upper,hinge=left,open=false,powered=true": { "model": "modernmetals:osmium_door_top", "y": 270 }, - "facing=east,half=upper,hinge=right,open=false,powered=true": { "model": "modernmetals:osmium_door_top_rh" }, - "facing=south,half=upper,hinge=right,open=false,powered=true": { "model": "modernmetals:osmium_door_top_rh", "y": 90 }, - "facing=west,half=upper,hinge=right,open=false,powered=true": { "model": "modernmetals:osmium_door_top_rh", "y": 180 }, - "facing=north,half=upper,hinge=right,open=false,powered=true": { "model": "modernmetals:osmium_door_top_rh", "y": 270 }, - "facing=east,half=upper,hinge=left,open=true,powered=true": { "model": "modernmetals:osmium_door_top_rh", "y": 90 }, - "facing=south,half=upper,hinge=left,open=true,powered=true": { "model": "modernmetals:osmium_door_top_rh", "y": 180 }, - "facing=west,half=upper,hinge=left,open=true,powered=true": { "model": "modernmetals:osmium_door_top_rh", "y": 270 }, - "facing=north,half=upper,hinge=left,open=true,powered=true": { "model": "modernmetals:osmium_door_top_rh" }, - "facing=east,half=upper,hinge=right,open=true,powered=true": { "model": "modernmetals:osmium_door_top", "y": 270 }, - "facing=south,half=upper,hinge=right,open=true,powered=true": { "model": "modernmetals:osmium_door_top" }, - "facing=west,half=upper,hinge=right,open=true,powered=true": { "model": "modernmetals:osmium_door_top", "y": 90 }, - "facing=north,half=upper,hinge=right,open=true,powered=true": { "model": "modernmetals:osmium_door_top", "y": 180 } + "variants": { + "facing=north,half=upper,hinge=left,open=false": { + "model": "modernmetals:block/osmium_door_top", + "y": 270 + }, + "facing=south,half=upper,hinge=left,open=false": { + "model": "modernmetals:block/osmium_door_top", + "y": 90 + }, + "facing=west,half=upper,hinge=left,open=false": { + "model": "modernmetals:block/osmium_door_top", + "y": 180 + }, + "facing=east,half=upper,hinge=left,open=false": { + "model": "modernmetals:block/osmium_door_top" + }, + "facing=north,half=lower,hinge=left,open=false": { + "model": "modernmetals:block/osmium_door_bottom", + "y": 270 + }, + "facing=south,half=lower,hinge=left,open=false": { + "model": "modernmetals:block/osmium_door_bottom", + "y": 90 + }, + "facing=west,half=lower,hinge=left,open=false": { + "model": "modernmetals:block/osmium_door_bottom", + "y": 180 + }, + "facing=east,half=lower,hinge=left,open=false": { + "model": "modernmetals:block/osmium_door_bottom" + }, + "facing=north,half=upper,hinge=right,open=false": { + "model": "modernmetals:block/osmium_door_top_rh", + "y": 270 + }, + "facing=south,half=upper,hinge=right,open=false": { + "model": "modernmetals:block/osmium_door_top_rh", + "y": 90 + }, + "facing=west,half=upper,hinge=right,open=false": { + "model": "modernmetals:block/osmium_door_top_rh", + "y": 180 + }, + "facing=east,half=upper,hinge=right,open=false": { + "model": "modernmetals:block/osmium_door_top_rh" + }, + "facing=north,half=lower,hinge=right,open=false": { + "model": "modernmetals:block/osmium_door_bottom_rh", + "y": 270 + }, + "facing=south,half=lower,hinge=right,open=false": { + "model": "modernmetals:block/osmium_door_bottom_rh", + "y": 90 + }, + "facing=west,half=lower,hinge=right,open=false": { + "model": "modernmetals:block/osmium_door_bottom_rh", + "y": 180 + }, + "facing=east,half=lower,hinge=right,open=false": { + "model": "modernmetals:block/osmium_door_bottom_rh" + }, + "facing=north,half=upper,hinge=left,open=true": { + "model": "modernmetals:block/osmium_door_top_rh" + }, + "facing=south,half=upper,hinge=left,open=true": { + "model": "modernmetals:block/osmium_door_top_rh", + "y": 180 + }, + "facing=west,half=upper,hinge=left,open=true": { + "model": "modernmetals:block/osmium_door_top_rh", + "y": 270 + }, + "facing=east,half=upper,hinge=left,open=true": { + "model": "modernmetals:block/osmium_door_top_rh", + "y": 90 + }, + "facing=north,half=lower,hinge=left,open=true": { + "model": "modernmetals:block/osmium_door_bottom_rh" + }, + "facing=south,half=lower,hinge=left,open=true": { + "model": "modernmetals:block/osmium_door_bottom_rh", + "y": 180 + }, + "facing=west,half=lower,hinge=left,open=true": { + "model": "modernmetals:block/osmium_door_bottom_rh", + "y": 270 + }, + "facing=east,half=lower,hinge=left,open=true": { + "model": "modernmetals:block/osmium_door_bottom_rh", + "y": 90 + }, + "facing=north,half=upper,hinge=right,open=true": { + "model": "modernmetals:block/osmium_door_top", + "y": 180 + }, + "facing=south,half=upper,hinge=right,open=true": { + "model": "modernmetals:block/osmium_door_top" + }, + "facing=west,half=upper,hinge=right,open=true": { + "model": "modernmetals:block/osmium_door_top", + "y": 90 + }, + "facing=east,half=upper,hinge=right,open=true": { + "model": "modernmetals:block/osmium_door_top", + "y": 270 + }, + "facing=north,half=lower,hinge=right,open=true": { + "model": "modernmetals:block/osmium_door_bottom", + "y": 180 + }, + "facing=south,half=lower,hinge=right,open=true": { + "model": "modernmetals:block/osmium_door_bottom" + }, + "facing=west,half=lower,hinge=right,open=true": { + "model": "modernmetals:block/osmium_door_bottom", + "y": 90 + }, + "facing=east,half=lower,hinge=right,open=true": { + "model": "modernmetals:block/osmium_door_bottom", + "y": 270 } + } } diff --git a/src/main/resources/assets/modernmetals/blockstates/osmium_lever.json b/src/main/resources/assets/modernmetals/blockstates/osmium_lever.json index 6cc3f176..c48843fe 100644 --- a/src/main/resources/assets/modernmetals/blockstates/osmium_lever.json +++ b/src/main/resources/assets/modernmetals/blockstates/osmium_lever.json @@ -1,20 +1,76 @@ { - "variants": { - "facing=down_z,powered=false": { "model": "modernmetals:osmium_lever_off", "x": 180, "y": 180 }, - "facing=down_x,powered=false": { "model": "modernmetals:osmium_lever_off", "x": 180, "y": 90 }, - "facing=up_z,powered=false": { "model": "modernmetals:osmium_lever_off" }, - "facing=up_x,powered=false": { "model": "modernmetals:osmium_lever_off", "y": 270 }, - "facing=east,powered=false": { "model": "modernmetals:osmium_lever_off", "x": 90, "y": 90 }, - "facing=west,powered=false": { "model": "modernmetals:osmium_lever_off", "x": 90, "y": 270 }, - "facing=south,powered=false" : { "model": "modernmetals:osmium_lever_off", "x": 90, "y": 180 }, - "facing=north,powered=false" : { "model": "modernmetals:osmium_lever_off", "x": 90 }, - "facing=down_z,powered=true" : { "model": "modernmetals:osmium_lever", "x": 180, "y": 180 }, - "facing=down_x,powered=true" : { "model": "modernmetals:osmium_lever", "x": 180, "y": 90 }, - "facing=up_z,powered=true": { "model": "modernmetals:osmium_lever" }, - "facing=up_x,powered=true": { "model": "modernmetals:osmium_lever", "y": 270 }, - "facing=east,powered=true": { "model": "modernmetals:osmium_lever", "x": 90, "y": 90 }, - "facing=west,powered=true": { "model": "modernmetals:osmium_lever", "x": 90, "y": 270 }, - "facing=south,powered=true": { "model": "modernmetals:osmium_lever", "x": 90, "y": 180 }, - "facing=north,powered=true": { "model": "modernmetals:osmium_lever", "x": 90 } + "variants": { + "face=floor,facing=north,powered=false": { + "model": "modernmetals:block/osmium_lever_off" + }, + "face=wall,facing=north,powered=false": { + "model": "modernmetals:block/osmium_lever_off" + }, + "face=ceiling,facing=north,powered=false": { + "model": "modernmetals:block/osmium_lever_off" + }, + "face=floor,facing=south,powered=false": { + "model": "modernmetals:block/osmium_lever_off" + }, + "face=wall,facing=south,powered=false": { + "model": "modernmetals:block/osmium_lever_off" + }, + "face=ceiling,facing=south,powered=false": { + "model": "modernmetals:block/osmium_lever_off" + }, + "face=floor,facing=west,powered=false": { + "model": "modernmetals:block/osmium_lever_off" + }, + "face=wall,facing=west,powered=false": { + "model": "modernmetals:block/osmium_lever_off" + }, + "face=ceiling,facing=west,powered=false": { + "model": "modernmetals:block/osmium_lever_off" + }, + "face=floor,facing=east,powered=false": { + "model": "modernmetals:block/osmium_lever_off" + }, + "face=wall,facing=east,powered=false": { + "model": "modernmetals:block/osmium_lever_off" + }, + "face=ceiling,facing=east,powered=false": { + "model": "modernmetals:block/osmium_lever_off" + }, + "face=floor,facing=north,powered=true": { + "model": "modernmetals:block/osmium_lever" + }, + "face=wall,facing=north,powered=true": { + "model": "modernmetals:block/osmium_lever" + }, + "face=ceiling,facing=north,powered=true": { + "model": "modernmetals:block/osmium_lever" + }, + "face=floor,facing=south,powered=true": { + "model": "modernmetals:block/osmium_lever" + }, + "face=wall,facing=south,powered=true": { + "model": "modernmetals:block/osmium_lever" + }, + "face=ceiling,facing=south,powered=true": { + "model": "modernmetals:block/osmium_lever" + }, + "face=floor,facing=west,powered=true": { + "model": "modernmetals:block/osmium_lever" + }, + "face=wall,facing=west,powered=true": { + "model": "modernmetals:block/osmium_lever" + }, + "face=ceiling,facing=west,powered=true": { + "model": "modernmetals:block/osmium_lever" + }, + "face=floor,facing=east,powered=true": { + "model": "modernmetals:block/osmium_lever" + }, + "face=wall,facing=east,powered=true": { + "model": "modernmetals:block/osmium_lever" + }, + "face=ceiling,facing=east,powered=true": { + "model": "modernmetals:block/osmium_lever" } + } } diff --git a/src/main/resources/assets/modernmetals/blockstates/osmium_ore.json b/src/main/resources/assets/modernmetals/blockstates/osmium_ore.json index 21a24a14..75d8b05e 100644 --- a/src/main/resources/assets/modernmetals/blockstates/osmium_ore.json +++ b/src/main/resources/assets/modernmetals/blockstates/osmium_ore.json @@ -1,5 +1,7 @@ { - "variants": { - "normal": { "model": "modernmetals:osmium_ore" } + "variants": { + "": { + "model": "modernmetals:block/osmium_ore" } + } } diff --git a/src/main/resources/assets/modernmetals/blockstates/osmium_plate.json b/src/main/resources/assets/modernmetals/blockstates/osmium_plate.json index 3290cca3..60e7c384 100644 --- a/src/main/resources/assets/modernmetals/blockstates/osmium_plate.json +++ b/src/main/resources/assets/modernmetals/blockstates/osmium_plate.json @@ -1,10 +1,27 @@ { - "variants": { - "facing=down": { "model": "modernmetals:osmium_plate", "x": 90 }, - "facing=up": { "model": "modernmetals:osmium_plate", "x": 270 }, - "facing=north": { "model": "modernmetals:osmium_plate" }, - "facing=south": { "model": "modernmetals:osmium_plate", "y": 180 }, - "facing=west": { "model": "modernmetals:osmium_plate", "y": 270 }, - "facing=east": { "model": "modernmetals:osmium_plate", "y": 90 } + "variants": { + "facing=down": { + "model": "modernmetals:block/osmium_plate", + "x": 90 + }, + "facing=up": { + "model": "modernmetals:block/osmium_plate", + "x": 270 + }, + "facing=north": { + "model": "modernmetals:block/osmium_plate" + }, + "facing=south": { + "model": "modernmetals:block/osmium_plate", + "y": 180 + }, + "facing=west": { + "model": "modernmetals:block/osmium_plate", + "y": 270 + }, + "facing=east": { + "model": "modernmetals:block/osmium_plate", + "y": 90 } + } } diff --git a/src/main/resources/assets/modernmetals/blockstates/osmium_pressure_plate.json b/src/main/resources/assets/modernmetals/blockstates/osmium_pressure_plate.json index 7c262bff..cdfeb9a9 100644 --- a/src/main/resources/assets/modernmetals/blockstates/osmium_pressure_plate.json +++ b/src/main/resources/assets/modernmetals/blockstates/osmium_pressure_plate.json @@ -1,6 +1,10 @@ { - "variants": { - "powered=false": { "model": "modernmetals:osmium_pressure_plate_up" }, - "powered=true": { "model": "modernmetals:osmium_pressure_plate_down" } + "variants": { + "powered=false": { + "model": "modernmetals:block/osmium_pressure_plate_up" + }, + "powered=true": { + "model": "modernmetals:block/osmium_pressure_plate_down" } + } } diff --git a/src/main/resources/assets/modernmetals/blockstates/osmium_slab.json b/src/main/resources/assets/modernmetals/blockstates/osmium_slab.json index 319f51e5..4b73a5c2 100644 --- a/src/main/resources/assets/modernmetals/blockstates/osmium_slab.json +++ b/src/main/resources/assets/modernmetals/blockstates/osmium_slab.json @@ -1,6 +1,13 @@ { - "variants": { - "half=bottom,variant=default": { "model": "modernmetals:half_slab_osmium" }, - "half=top,variant=default": { "model": "modernmetals:upper_slab_osmium" } + "variants": { + "type=top": { + "model": "modernmetals:block/upper_slab_osmium" + }, + "type=bottom": { + "model": "modernmetals:block/half_slab_osmium" + }, + "type=double": { + "model": "modernmetals:block/osmium_block" } + } } diff --git a/src/main/resources/assets/modernmetals/blockstates/osmium_stairs.json b/src/main/resources/assets/modernmetals/blockstates/osmium_stairs.json index 574a2058..7bb0f2b7 100644 --- a/src/main/resources/assets/modernmetals/blockstates/osmium_stairs.json +++ b/src/main/resources/assets/modernmetals/blockstates/osmium_stairs.json @@ -1,44 +1,209 @@ { - "variants": { - "facing=east,half=bottom,shape=straight": { "model": "modernmetals:osmium_stairs" }, - "facing=west,half=bottom,shape=straight": { "model": "modernmetals:osmium_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=straight": { "model": "modernmetals:osmium_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=straight": { "model": "modernmetals:osmium_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_right": { "model": "modernmetals:osmium_outer_stairs" }, - "facing=west,half=bottom,shape=outer_right": { "model": "modernmetals:osmium_outer_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=outer_right": { "model": "modernmetals:osmium_outer_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=outer_right": { "model": "modernmetals:osmium_outer_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_left": { "model": "modernmetals:osmium_outer_stairs", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=outer_left": { "model": "modernmetals:osmium_outer_stairs", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=outer_left": { "model": "modernmetals:osmium_outer_stairs" }, - "facing=north,half=bottom,shape=outer_left": { "model": "modernmetals:osmium_outer_stairs", "y": 180, "uvlock": true }, - "facing=east,half=bottom,shape=inner_right": { "model": "modernmetals:osmium_inner_stairs" }, - "facing=west,half=bottom,shape=inner_right": { "model": "modernmetals:osmium_inner_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=inner_right": { "model": "modernmetals:osmium_inner_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=inner_right": { "model": "modernmetals:osmium_inner_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=inner_left": { "model": "modernmetals:osmium_inner_stairs", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=inner_left": { "model": "modernmetals:osmium_inner_stairs", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=inner_left": { "model": "modernmetals:osmium_inner_stairs" }, - "facing=north,half=bottom,shape=inner_left": { "model": "modernmetals:osmium_inner_stairs", "y": 180, "uvlock": true }, - "facing=east,half=top,shape=straight": { "model": "modernmetals:osmium_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=straight": { "model": "modernmetals:osmium_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=straight": { "model": "modernmetals:osmium_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=straight": { "model": "modernmetals:osmium_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { "model": "modernmetals:osmium_outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_right": { "model": "modernmetals:osmium_outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { "model": "modernmetals:osmium_outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { "model": "modernmetals:osmium_outer_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { "model": "modernmetals:osmium_outer_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { "model": "modernmetals:osmium_outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { "model": "modernmetals:osmium_outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=outer_left": { "model": "modernmetals:osmium_outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { "model": "modernmetals:osmium_inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { "model": "modernmetals:osmium_inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { "model": "modernmetals:osmium_inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { "model": "modernmetals:osmium_inner_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { "model": "modernmetals:osmium_inner_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { "model": "modernmetals:osmium_inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { "model": "modernmetals:osmium_inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { "model": "modernmetals:osmium_inner_stairs", "x": 180, "y": 270, "uvlock": true } + "variants": { + "facing=north,half=top,shape=straight": { + "model": "modernmetals:block/osmium_stairs", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=south,half=top,shape=straight": { + "model": "modernmetals:block/osmium_stairs", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=west,half=top,shape=straight": { + "model": "modernmetals:block/osmium_stairs", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=east,half=top,shape=straight": { + "model": "modernmetals:block/osmium_stairs", + "x": 180, + "uvlock": true + }, + "facing=north,half=bottom,shape=straight": { + "model": "modernmetals:block/osmium_stairs", + "y": 270, + "uvlock": true + }, + "facing=south,half=bottom,shape=straight": { + "model": "modernmetals:block/osmium_stairs", + "y": 90, + "uvlock": true + }, + "facing=west,half=bottom,shape=straight": { + "model": "modernmetals:block/osmium_stairs", + "y": 180, + "uvlock": true + }, + "facing=east,half=bottom,shape=straight": { + "model": "modernmetals:block/osmium_stairs" + }, + "facing=north,half=top,shape=inner_left": { + "model": "modernmetals:block/osmium_inner_stairs", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=south,half=top,shape=inner_left": { + "model": "modernmetals:block/osmium_inner_stairs", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=west,half=top,shape=inner_left": { + "model": "modernmetals:block/osmium_inner_stairs", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=east,half=top,shape=inner_left": { + "model": "modernmetals:block/osmium_inner_stairs", + "x": 180, + "uvlock": true + }, + "facing=north,half=bottom,shape=inner_left": { + "model": "modernmetals:block/osmium_inner_stairs", + "y": 180, + "uvlock": true + }, + "facing=south,half=bottom,shape=inner_left": { + "model": "modernmetals:block/osmium_inner_stairs" + }, + "facing=west,half=bottom,shape=inner_left": { + "model": "modernmetals:block/osmium_inner_stairs", + "y": 90, + "uvlock": true + }, + "facing=east,half=bottom,shape=inner_left": { + "model": "modernmetals:block/osmium_inner_stairs", + "y": 270, + "uvlock": true + }, + "facing=north,half=top,shape=inner_right": { + "model": "modernmetals:block/osmium_inner_stairs", + "x": 180, + "uvlock": true + }, + "facing=south,half=top,shape=inner_right": { + "model": "modernmetals:block/osmium_inner_stairs", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=west,half=top,shape=inner_right": { + "model": "modernmetals:block/osmium_inner_stairs", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=east,half=top,shape=inner_right": { + "model": "modernmetals:block/osmium_inner_stairs", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=north,half=bottom,shape=inner_right": { + "model": "modernmetals:block/osmium_inner_stairs", + "y": 270, + "uvlock": true + }, + "facing=south,half=bottom,shape=inner_right": { + "model": "modernmetals:block/osmium_inner_stairs", + "y": 90, + "uvlock": true + }, + "facing=west,half=bottom,shape=inner_right": { + "model": "modernmetals:block/osmium_inner_stairs", + "y": 180, + "uvlock": true + }, + "facing=east,half=bottom,shape=inner_right": { + "model": "modernmetals:block/osmium_inner_stairs" + }, + "facing=north,half=top,shape=outer_left": { + "model": "modernmetals:block/osmium_outer_stairs", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=south,half=top,shape=outer_left": { + "model": "modernmetals:block/osmium_outer_stairs", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=west,half=top,shape=outer_left": { + "model": "modernmetals:block/osmium_outer_stairs", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=east,half=top,shape=outer_left": { + "model": "modernmetals:block/osmium_outer_stairs", + "x": 180, + "uvlock": true + }, + "facing=north,half=bottom,shape=outer_left": { + "model": "modernmetals:block/osmium_outer_stairs", + "y": 180, + "uvlock": true + }, + "facing=south,half=bottom,shape=outer_left": { + "model": "modernmetals:block/osmium_outer_stairs" + }, + "facing=west,half=bottom,shape=outer_left": { + "model": "modernmetals:block/osmium_outer_stairs", + "y": 90, + "uvlock": true + }, + "facing=east,half=bottom,shape=outer_left": { + "model": "modernmetals:block/osmium_outer_stairs", + "y": 270, + "uvlock": true + }, + "facing=north,half=top,shape=outer_right": { + "model": "modernmetals:block/osmium_outer_stairs", + "x": 180, + "uvlock": true + }, + "facing=south,half=top,shape=outer_right": { + "model": "modernmetals:block/osmium_outer_stairs", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=west,half=top,shape=outer_right": { + "model": "modernmetals:block/osmium_outer_stairs", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=east,half=top,shape=outer_right": { + "model": "modernmetals:block/osmium_outer_stairs", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=north,half=bottom,shape=outer_right": { + "model": "modernmetals:block/osmium_outer_stairs", + "y": 270, + "uvlock": true + }, + "facing=south,half=bottom,shape=outer_right": { + "model": "modernmetals:block/osmium_outer_stairs", + "y": 90, + "uvlock": true + }, + "facing=west,half=bottom,shape=outer_right": { + "model": "modernmetals:block/osmium_outer_stairs", + "y": 180, + "uvlock": true + }, + "facing=east,half=bottom,shape=outer_right": { + "model": "modernmetals:block/osmium_outer_stairs" } + } } diff --git a/src/main/resources/assets/modernmetals/blockstates/osmium_trapdoor.json b/src/main/resources/assets/modernmetals/blockstates/osmium_trapdoor.json index ad66e46b..18f0d933 100644 --- a/src/main/resources/assets/modernmetals/blockstates/osmium_trapdoor.json +++ b/src/main/resources/assets/modernmetals/blockstates/osmium_trapdoor.json @@ -1,20 +1,68 @@ { - "variants": { - "facing=north,half=bottom,open=false": { "model": "modernmetals:osmium_trapdoor_bottom" }, - "facing=south,half=bottom,open=false": { "model": "modernmetals:osmium_trapdoor_bottom" }, - "facing=east,half=bottom,open=false": { "model": "modernmetals:osmium_trapdoor_bottom" }, - "facing=west,half=bottom,open=false": { "model": "modernmetals:osmium_trapdoor_bottom" }, - "facing=north,half=top,open=false": { "model": "modernmetals:osmium_trapdoor_top" }, - "facing=south,half=top,open=false": { "model": "modernmetals:osmium_trapdoor_top" }, - "facing=east,half=top,open=false": { "model": "modernmetals:osmium_trapdoor_top" }, - "facing=west,half=top,open=false": { "model": "modernmetals:osmium_trapdoor_top" }, - "facing=north,half=bottom,open=true": { "model": "modernmetals:osmium_trapdoor_open" }, - "facing=south,half=bottom,open=true": { "model": "modernmetals:osmium_trapdoor_open", "y": 180 }, - "facing=east,half=bottom,open=true": { "model": "modernmetals:osmium_trapdoor_open", "y": 90 }, - "facing=west,half=bottom,open=true": { "model": "modernmetals:osmium_trapdoor_open", "y": 270 }, - "facing=north,half=top,open=true": { "model": "modernmetals:osmium_trapdoor_open" }, - "facing=south,half=top,open=true": { "model": "modernmetals:osmium_trapdoor_open", "y": 180 }, - "facing=east,half=top,open=true": { "model": "modernmetals:osmium_trapdoor_open", "y": 90 }, - "facing=west,half=top,open=true": { "model": "modernmetals:osmium_trapdoor_open", "y": 270 } + "variants": { + "facing=north,half=top,open=false": { + "model": "modernmetals:block/osmium_trapdoor_top" + }, + "facing=south,half=top,open=false": { + "model": "modernmetals:block/osmium_trapdoor_top", + "y": 180 + }, + "facing=west,half=top,open=false": { + "model": "modernmetals:block/osmium_trapdoor_top", + "y": 270 + }, + "facing=east,half=top,open=false": { + "model": "modernmetals:block/osmium_trapdoor_top", + "y": 90 + }, + "facing=north,half=bottom,open=false": { + "model": "modernmetals:block/osmium_trapdoor_bottom" + }, + "facing=south,half=bottom,open=false": { + "model": "modernmetals:block/osmium_trapdoor_bottom", + "y": 180 + }, + "facing=west,half=bottom,open=false": { + "model": "modernmetals:block/osmium_trapdoor_bottom", + "y": 270 + }, + "facing=east,half=bottom,open=false": { + "model": "modernmetals:block/osmium_trapdoor_bottom", + "y": 90 + }, + "facing=north,half=top,open=true": { + "model": "modernmetals:block/osmium_trapdoor_open", + "x": 180, + "y": 180 + }, + "facing=south,half=top,open=true": { + "model": "modernmetals:block/osmium_trapdoor_open", + "x": 180 + }, + "facing=west,half=top,open=true": { + "model": "modernmetals:block/osmium_trapdoor_open", + "x": 180, + "y": 90 + }, + "facing=east,half=top,open=true": { + "model": "modernmetals:block/osmium_trapdoor_open", + "x": 180, + "y": 270 + }, + "facing=north,half=bottom,open=true": { + "model": "modernmetals:block/osmium_trapdoor_open" + }, + "facing=south,half=bottom,open=true": { + "model": "modernmetals:block/osmium_trapdoor_open", + "y": 180 + }, + "facing=west,half=bottom,open=true": { + "model": "modernmetals:block/osmium_trapdoor_open", + "y": 270 + }, + "facing=east,half=bottom,open=true": { + "model": "modernmetals:block/osmium_trapdoor_open", + "y": 90 } + } } diff --git a/src/main/resources/assets/modernmetals/blockstates/osmium_wall.json b/src/main/resources/assets/modernmetals/blockstates/osmium_wall.json index 6bb83e08..700216c3 100644 --- a/src/main/resources/assets/modernmetals/blockstates/osmium_wall.json +++ b/src/main/resources/assets/modernmetals/blockstates/osmium_wall.json @@ -1,19 +1,51 @@ { - "multipart": [ - { "when": { "up": "true" }, - "apply": { "model": "modernmetals:osmium_wall_post" } - }, - { "when": { "north": "true" }, - "apply": { "model": "modernmetals:osmium_wall_side", "uvlock": true } - }, - { "when": { "east": "true" }, - "apply": { "model": "modernmetals:osmium_wall_side", "y": 90, "uvlock": true } - }, - { "when": { "south": "true" }, - "apply": { "model": "modernmetals:osmium_wall_side", "y": 180, "uvlock": true } - }, - { "when": { "west": "true" }, - "apply": { "model": "modernmetals:osmium_wall_side", "y": 270, "uvlock": true } - } - ] + "multipart": [ + { + "when": { + "up": "true" + }, + "apply": { + "model": "modernmetals:block/osmium_wall_post" + } + }, + { + "when": { + "north": "true" + }, + "apply": { + "model": "modernmetals:block/osmium_wall_side", + "uvlock": true + } + }, + { + "when": { + "east": "true" + }, + "apply": { + "model": "modernmetals:block/osmium_wall_side", + "y": 90, + "uvlock": true + } + }, + { + "when": { + "south": "true" + }, + "apply": { + "model": "modernmetals:block/osmium_wall_side", + "y": 180, + "uvlock": true + } + }, + { + "when": { + "west": "true" + }, + "apply": { + "model": "modernmetals:block/osmium_wall_side", + "y": 270, + "uvlock": true + } + } + ] } diff --git a/src/main/resources/assets/modernmetals/blockstates/plutonium.json b/src/main/resources/assets/modernmetals/blockstates/plutonium.json index 44bf8e9a..7162de70 100644 --- a/src/main/resources/assets/modernmetals/blockstates/plutonium.json +++ b/src/main/resources/assets/modernmetals/blockstates/plutonium.json @@ -1,9 +1,10 @@ { - "forge_marker": 1, - "variants": { - "fluid": { - "model": "forge:fluid", - "custom": { "fluid": "plutonium" } - } + "variants": { + "": { + "model": "minecraft:block/water", + "custom": { + "fluid": "modernmetals:plutonium" + } } -} \ No newline at end of file + } +} diff --git a/src/main/resources/assets/modernmetals/blockstates/plutonium_bars.json b/src/main/resources/assets/modernmetals/blockstates/plutonium_bars.json index ccc75add..1a095fd1 100644 --- a/src/main/resources/assets/modernmetals/blockstates/plutonium_bars.json +++ b/src/main/resources/assets/modernmetals/blockstates/plutonium_bars.json @@ -1,32 +1,77 @@ { - "multipart": [ - { "apply": { "model": "modernmetals:plutonium_bars_post_ends" }}, - { "when": { "north": false, "east": false, "south": false, "west": false }, - "apply": { "model": "modernmetals:plutonium_bars_post" } - }, - { "when": { "north": true, "east": false, "south": false, "west": false }, - "apply": { "model": "modernmetals:plutonium_bars_cap" } - }, - { "when": { "north": false, "east": true, "south": false, "west": false }, - "apply": { "model": "modernmetals:plutonium_bars_cap", "y": 90 } - }, - { "when": { "north": false, "east": false, "south": true, "west": false }, - "apply": { "model": "modernmetals:plutonium_bars_cap_alt" } - }, - { "when": { "north": false, "east": false, "south": false, "west": true }, - "apply": { "model": "modernmetals:plutonium_bars_cap_alt", "y": 90 } - }, - { "when": { "north": true }, - "apply": { "model": "modernmetals:plutonium_bars_side" } - }, - { "when": { "east": true }, - "apply": { "model": "modernmetals:plutonium_bars_side", "y": 90 } - }, - { "when": { "south": true }, - "apply": { "model": "modernmetals:plutonium_bars_side_alt" } - }, - { "when": { "west": true }, - "apply": { "model": "modernmetals:plutonium_bars_side_alt", "y": 90 } - } - ] + "multipart": [ + { + "apply": { + "model": "modernmetals:block/plutonium_bars_post" + } + }, + { + "when": { + "north": "true" + }, + "apply": { + "model": "modernmetals:block/plutonium_bars_side" + } + }, + { + "when": { + "north": "false" + }, + "apply": { + "model": "modernmetals:block/plutonium_bars_cap" + } + }, + { + "when": { + "south": "true" + }, + "apply": { + "model": "modernmetals:block/plutonium_bars_side_alt" + } + }, + { + "when": { + "south": "false" + }, + "apply": { + "model": "modernmetals:block/plutonium_bars_cap_alt", + "y": 90 + } + }, + { + "when": { + "west": "true" + }, + "apply": { + "model": "modernmetals:block/plutonium_bars_side_alt", + "y": 90 + } + }, + { + "when": { + "west": "false" + }, + "apply": { + "model": "modernmetals:block/plutonium_bars_cap", + "y": 270 + } + }, + { + "when": { + "east": "true" + }, + "apply": { + "model": "modernmetals:block/plutonium_bars_side", + "y": 90 + } + }, + { + "when": { + "east": "false" + }, + "apply": { + "model": "modernmetals:block/plutonium_bars_cap_alt" + } + } + ] } diff --git a/src/main/resources/assets/modernmetals/blockstates/plutonium_block.json b/src/main/resources/assets/modernmetals/blockstates/plutonium_block.json index 803bdd70..8dccd251 100644 --- a/src/main/resources/assets/modernmetals/blockstates/plutonium_block.json +++ b/src/main/resources/assets/modernmetals/blockstates/plutonium_block.json @@ -1,5 +1,7 @@ { - "variants": { - "normal": { "model": "modernmetals:plutonium_block" } + "variants": { + "": { + "model": "modernmetals:block/plutonium_block" } + } } diff --git a/src/main/resources/assets/modernmetals/blockstates/plutonium_button.json b/src/main/resources/assets/modernmetals/blockstates/plutonium_button.json index fcb6a992..dd2341ab 100644 --- a/src/main/resources/assets/modernmetals/blockstates/plutonium_button.json +++ b/src/main/resources/assets/modernmetals/blockstates/plutonium_button.json @@ -1,16 +1,118 @@ { - "variants": { - "facing=up,powered=false": { "model": "modernmetals:plutonium_button", "uvlock": true }, - "facing=down,powered=false": { "model": "modernmetals:plutonium_button", "uvlock": true, "x": 180 }, - "facing=east,powered=false": { "model": "modernmetals:plutonium_button", "uvlock": true, "x": 90, "y": 90 }, - "facing=west,powered=false": { "model": "modernmetals:plutonium_button", "uvlock": true, "x": 90, "y": 270 }, - "facing=south,powered=false": { "model": "modernmetals:plutonium_button", "uvlock": true, "x": 90, "y": 180 }, - "facing=north,powered=false": { "model": "modernmetals:plutonium_button", "uvlock": true, "x": 90 }, - "facing=up,powered=true": { "model": "modernmetals:plutonium_button_pressed", "uvlock": true }, - "facing=down,powered=true": { "model": "modernmetals:plutonium_button_pressed", "uvlock": true, "x": 180 }, - "facing=east,powered=true": { "model": "modernmetals:plutonium_button_pressed", "uvlock": true, "x": 90, "y": 90 }, - "facing=west,powered=true": { "model": "modernmetals:plutonium_button_pressed", "uvlock": true, "x": 90, "y": 270 }, - "facing=south,powered=true": { "model": "modernmetals:plutonium_button_pressed", "uvlock": true, "x": 90, "y": 180 }, - "facing=north,powered=true": { "model": "modernmetals:plutonium_button_pressed", "uvlock": true, "x": 90 } + "variants": { + "face=floor,facing=north,powered=false": { + "model": "modernmetals:block/plutonium_button" + }, + "face=wall,facing=north,powered=false": { + "model": "modernmetals:block/plutonium_button", + "x": 90, + "uvlock": true + }, + "face=ceiling,facing=north,powered=false": { + "model": "modernmetals:block/plutonium_button", + "x": 180, + "y": 180 + }, + "face=floor,facing=south,powered=false": { + "model": "modernmetals:block/plutonium_button", + "y": 180 + }, + "face=wall,facing=south,powered=false": { + "model": "modernmetals:block/plutonium_button", + "x": 90, + "y": 180, + "uvlock": true + }, + "face=ceiling,facing=south,powered=false": { + "model": "modernmetals:block/plutonium_button", + "x": 180 + }, + "face=floor,facing=west,powered=false": { + "model": "modernmetals:block/plutonium_button", + "y": 270 + }, + "face=wall,facing=west,powered=false": { + "model": "modernmetals:block/plutonium_button", + "x": 90, + "y": 270, + "uvlock": true + }, + "face=ceiling,facing=west,powered=false": { + "model": "modernmetals:block/plutonium_button", + "x": 180, + "y": 90 + }, + "face=floor,facing=east,powered=false": { + "model": "modernmetals:block/plutonium_button", + "y": 90 + }, + "face=wall,facing=east,powered=false": { + "model": "modernmetals:block/plutonium_button", + "x": 90, + "y": 90, + "uvlock": true + }, + "face=ceiling,facing=east,powered=false": { + "model": "modernmetals:block/plutonium_button", + "x": 180, + "y": 270 + }, + "face=floor,facing=north,powered=true": { + "model": "modernmetals:block/plutonium_button_pressed" + }, + "face=wall,facing=north,powered=true": { + "model": "modernmetals:block/plutonium_button_pressed", + "x": 90, + "uvlock": true + }, + "face=ceiling,facing=north,powered=true": { + "model": "modernmetals:block/plutonium_button_pressed", + "x": 180, + "y": 180 + }, + "face=floor,facing=south,powered=true": { + "model": "modernmetals:block/plutonium_button_pressed", + "y": 180 + }, + "face=wall,facing=south,powered=true": { + "model": "modernmetals:block/plutonium_button_pressed", + "x": 90, + "y": 180, + "uvlock": true + }, + "face=ceiling,facing=south,powered=true": { + "model": "modernmetals:block/plutonium_button_pressed", + "x": 180 + }, + "face=floor,facing=west,powered=true": { + "model": "modernmetals:block/plutonium_button_pressed", + "y": 270 + }, + "face=wall,facing=west,powered=true": { + "model": "modernmetals:block/plutonium_button_pressed", + "x": 90, + "y": 270, + "uvlock": true + }, + "face=ceiling,facing=west,powered=true": { + "model": "modernmetals:block/plutonium_button_pressed", + "x": 180, + "y": 90 + }, + "face=floor,facing=east,powered=true": { + "model": "modernmetals:block/plutonium_button_pressed", + "y": 90 + }, + "face=wall,facing=east,powered=true": { + "model": "modernmetals:block/plutonium_button_pressed", + "x": 90, + "y": 90, + "uvlock": true + }, + "face=ceiling,facing=east,powered=true": { + "model": "modernmetals:block/plutonium_button_pressed", + "x": 180, + "y": 270 } + } } diff --git a/src/main/resources/assets/modernmetals/blockstates/plutonium_door.json b/src/main/resources/assets/modernmetals/blockstates/plutonium_door.json index 0e8fabec..8cc7c90f 100644 --- a/src/main/resources/assets/modernmetals/blockstates/plutonium_door.json +++ b/src/main/resources/assets/modernmetals/blockstates/plutonium_door.json @@ -1,70 +1,124 @@ { - "variants": { - "facing=east,half=lower,hinge=left,open=false,powered=false": { "model": "modernmetals:plutonium_door_bottom" }, - "facing=south,half=lower,hinge=left,open=false,powered=false": { "model": "modernmetals:plutonium_door_bottom", "y": 90 }, - "facing=west,half=lower,hinge=left,open=false,powered=false": { "model": "modernmetals:plutonium_door_bottom", "y": 180 }, - "facing=north,half=lower,hinge=left,open=false,powered=false": { "model": "modernmetals:plutonium_door_bottom", "y": 270 }, - "facing=east,half=lower,hinge=right,open=false,powered=false": { "model": "modernmetals:plutonium_door_bottom_rh" }, - "facing=south,half=lower,hinge=right,open=false,powered=false": { "model": "modernmetals:plutonium_door_bottom_rh", "y": 90 }, - "facing=west,half=lower,hinge=right,open=false,powered=false": { "model": "modernmetals:plutonium_door_bottom_rh", "y": 180 }, - "facing=north,half=lower,hinge=right,open=false,powered=false": { "model": "modernmetals:plutonium_door_bottom_rh", "y": 270 }, - "facing=east,half=lower,hinge=left,open=true,powered=false": { "model": "modernmetals:plutonium_door_bottom_rh", "y": 90 }, - "facing=south,half=lower,hinge=left,open=true,powered=false": { "model": "modernmetals:plutonium_door_bottom_rh", "y": 180 }, - "facing=west,half=lower,hinge=left,open=true,powered=false": { "model": "modernmetals:plutonium_door_bottom_rh", "y": 270 }, - "facing=north,half=lower,hinge=left,open=true,powered=false": { "model": "modernmetals:plutonium_door_bottom_rh" }, - "facing=east,half=lower,hinge=right,open=true,powered=false": { "model": "modernmetals:plutonium_door_bottom", "y": 270 }, - "facing=south,half=lower,hinge=right,open=true,powered=false": { "model": "modernmetals:plutonium_door_bottom" }, - "facing=west,half=lower,hinge=right,open=true,powered=false": { "model": "modernmetals:plutonium_door_bottom", "y": 90 }, - "facing=north,half=lower,hinge=right,open=true,powered=false": { "model": "modernmetals:plutonium_door_bottom", "y": 180 }, - "facing=east,half=upper,hinge=left,open=false,powered=false": { "model": "modernmetals:plutonium_door_top" }, - "facing=south,half=upper,hinge=left,open=false,powered=false": { "model": "modernmetals:plutonium_door_top", "y": 90 }, - "facing=west,half=upper,hinge=left,open=false,powered=false": { "model": "modernmetals:plutonium_door_top", "y": 180 }, - "facing=north,half=upper,hinge=left,open=false,powered=false": { "model": "modernmetals:plutonium_door_top", "y": 270 }, - "facing=east,half=upper,hinge=right,open=false,powered=false": { "model": "modernmetals:plutonium_door_top_rh" }, - "facing=south,half=upper,hinge=right,open=false,powered=false": { "model": "modernmetals:plutonium_door_top_rh", "y": 90 }, - "facing=west,half=upper,hinge=right,open=false,powered=false": { "model": "modernmetals:plutonium_door_top_rh", "y": 180 }, - "facing=north,half=upper,hinge=right,open=false,powered=false": { "model": "modernmetals:plutonium_door_top_rh", "y": 270 }, - "facing=east,half=upper,hinge=left,open=true,powered=false": { "model": "modernmetals:plutonium_door_top_rh", "y": 90 }, - "facing=south,half=upper,hinge=left,open=true,powered=false": { "model": "modernmetals:plutonium_door_top_rh", "y": 180 }, - "facing=west,half=upper,hinge=left,open=true,powered=false": { "model": "modernmetals:plutonium_door_top_rh", "y": 270 }, - "facing=north,half=upper,hinge=left,open=true,powered=false": { "model": "modernmetals:plutonium_door_top_rh" }, - "facing=east,half=upper,hinge=right,open=true,powered=false": { "model": "modernmetals:plutonium_door_top", "y": 270 }, - "facing=south,half=upper,hinge=right,open=true,powered=false": { "model": "modernmetals:plutonium_door_top" }, - "facing=west,half=upper,hinge=right,open=true,powered=false": { "model": "modernmetals:plutonium_door_top", "y": 90 }, - "facing=north,half=upper,hinge=right,open=true,powered=false": { "model": "modernmetals:plutonium_door_top", "y": 180 }, - - - "facing=east,half=lower,hinge=left,open=false,powered=true": { "model": "modernmetals:plutonium_door_bottom" }, - "facing=south,half=lower,hinge=left,open=false,powered=true": { "model": "modernmetals:plutonium_door_bottom", "y": 90 }, - "facing=west,half=lower,hinge=left,open=false,powered=true": { "model": "modernmetals:plutonium_door_bottom", "y": 180 }, - "facing=north,half=lower,hinge=left,open=false,powered=true": { "model": "modernmetals:plutonium_door_bottom", "y": 270 }, - "facing=east,half=lower,hinge=right,open=false,powered=true": { "model": "modernmetals:plutonium_door_bottom_rh" }, - "facing=south,half=lower,hinge=right,open=false,powered=true": { "model": "modernmetals:plutonium_door_bottom_rh", "y": 90 }, - "facing=west,half=lower,hinge=right,open=false,powered=true": { "model": "modernmetals:plutonium_door_bottom_rh", "y": 180 }, - "facing=north,half=lower,hinge=right,open=false,powered=true": { "model": "modernmetals:plutonium_door_bottom_rh", "y": 270 }, - "facing=east,half=lower,hinge=left,open=true,powered=true": { "model": "modernmetals:plutonium_door_bottom_rh", "y": 90 }, - "facing=south,half=lower,hinge=left,open=true,powered=true": { "model": "modernmetals:plutonium_door_bottom_rh", "y": 180 }, - "facing=west,half=lower,hinge=left,open=true,powered=true": { "model": "modernmetals:plutonium_door_bottom_rh", "y": 270 }, - "facing=north,half=lower,hinge=left,open=true,powered=true": { "model": "modernmetals:plutonium_door_bottom_rh" }, - "facing=east,half=lower,hinge=right,open=true,powered=true": { "model": "modernmetals:plutonium_door_bottom", "y": 270 }, - "facing=south,half=lower,hinge=right,open=true,powered=true": { "model": "modernmetals:plutonium_door_bottom" }, - "facing=west,half=lower,hinge=right,open=true,powered=true": { "model": "modernmetals:plutonium_door_bottom", "y": 90 }, - "facing=north,half=lower,hinge=right,open=true,powered=true": { "model": "modernmetals:plutonium_door_bottom", "y": 180 }, - "facing=east,half=upper,hinge=left,open=false,powered=true": { "model": "modernmetals:plutonium_door_top" }, - "facing=south,half=upper,hinge=left,open=false,powered=true": { "model": "modernmetals:plutonium_door_top", "y": 90 }, - "facing=west,half=upper,hinge=left,open=false,powered=true": { "model": "modernmetals:plutonium_door_top", "y": 180 }, - "facing=north,half=upper,hinge=left,open=false,powered=true": { "model": "modernmetals:plutonium_door_top", "y": 270 }, - "facing=east,half=upper,hinge=right,open=false,powered=true": { "model": "modernmetals:plutonium_door_top_rh" }, - "facing=south,half=upper,hinge=right,open=false,powered=true": { "model": "modernmetals:plutonium_door_top_rh", "y": 90 }, - "facing=west,half=upper,hinge=right,open=false,powered=true": { "model": "modernmetals:plutonium_door_top_rh", "y": 180 }, - "facing=north,half=upper,hinge=right,open=false,powered=true": { "model": "modernmetals:plutonium_door_top_rh", "y": 270 }, - "facing=east,half=upper,hinge=left,open=true,powered=true": { "model": "modernmetals:plutonium_door_top_rh", "y": 90 }, - "facing=south,half=upper,hinge=left,open=true,powered=true": { "model": "modernmetals:plutonium_door_top_rh", "y": 180 }, - "facing=west,half=upper,hinge=left,open=true,powered=true": { "model": "modernmetals:plutonium_door_top_rh", "y": 270 }, - "facing=north,half=upper,hinge=left,open=true,powered=true": { "model": "modernmetals:plutonium_door_top_rh" }, - "facing=east,half=upper,hinge=right,open=true,powered=true": { "model": "modernmetals:plutonium_door_top", "y": 270 }, - "facing=south,half=upper,hinge=right,open=true,powered=true": { "model": "modernmetals:plutonium_door_top" }, - "facing=west,half=upper,hinge=right,open=true,powered=true": { "model": "modernmetals:plutonium_door_top", "y": 90 }, - "facing=north,half=upper,hinge=right,open=true,powered=true": { "model": "modernmetals:plutonium_door_top", "y": 180 } + "variants": { + "facing=north,half=upper,hinge=left,open=false": { + "model": "modernmetals:block/plutonium_door_top", + "y": 270 + }, + "facing=south,half=upper,hinge=left,open=false": { + "model": "modernmetals:block/plutonium_door_top", + "y": 90 + }, + "facing=west,half=upper,hinge=left,open=false": { + "model": "modernmetals:block/plutonium_door_top", + "y": 180 + }, + "facing=east,half=upper,hinge=left,open=false": { + "model": "modernmetals:block/plutonium_door_top" + }, + "facing=north,half=lower,hinge=left,open=false": { + "model": "modernmetals:block/plutonium_door_bottom", + "y": 270 + }, + "facing=south,half=lower,hinge=left,open=false": { + "model": "modernmetals:block/plutonium_door_bottom", + "y": 90 + }, + "facing=west,half=lower,hinge=left,open=false": { + "model": "modernmetals:block/plutonium_door_bottom", + "y": 180 + }, + "facing=east,half=lower,hinge=left,open=false": { + "model": "modernmetals:block/plutonium_door_bottom" + }, + "facing=north,half=upper,hinge=right,open=false": { + "model": "modernmetals:block/plutonium_door_top_rh", + "y": 270 + }, + "facing=south,half=upper,hinge=right,open=false": { + "model": "modernmetals:block/plutonium_door_top_rh", + "y": 90 + }, + "facing=west,half=upper,hinge=right,open=false": { + "model": "modernmetals:block/plutonium_door_top_rh", + "y": 180 + }, + "facing=east,half=upper,hinge=right,open=false": { + "model": "modernmetals:block/plutonium_door_top_rh" + }, + "facing=north,half=lower,hinge=right,open=false": { + "model": "modernmetals:block/plutonium_door_bottom_rh", + "y": 270 + }, + "facing=south,half=lower,hinge=right,open=false": { + "model": "modernmetals:block/plutonium_door_bottom_rh", + "y": 90 + }, + "facing=west,half=lower,hinge=right,open=false": { + "model": "modernmetals:block/plutonium_door_bottom_rh", + "y": 180 + }, + "facing=east,half=lower,hinge=right,open=false": { + "model": "modernmetals:block/plutonium_door_bottom_rh" + }, + "facing=north,half=upper,hinge=left,open=true": { + "model": "modernmetals:block/plutonium_door_top_rh" + }, + "facing=south,half=upper,hinge=left,open=true": { + "model": "modernmetals:block/plutonium_door_top_rh", + "y": 180 + }, + "facing=west,half=upper,hinge=left,open=true": { + "model": "modernmetals:block/plutonium_door_top_rh", + "y": 270 + }, + "facing=east,half=upper,hinge=left,open=true": { + "model": "modernmetals:block/plutonium_door_top_rh", + "y": 90 + }, + "facing=north,half=lower,hinge=left,open=true": { + "model": "modernmetals:block/plutonium_door_bottom_rh" + }, + "facing=south,half=lower,hinge=left,open=true": { + "model": "modernmetals:block/plutonium_door_bottom_rh", + "y": 180 + }, + "facing=west,half=lower,hinge=left,open=true": { + "model": "modernmetals:block/plutonium_door_bottom_rh", + "y": 270 + }, + "facing=east,half=lower,hinge=left,open=true": { + "model": "modernmetals:block/plutonium_door_bottom_rh", + "y": 90 + }, + "facing=north,half=upper,hinge=right,open=true": { + "model": "modernmetals:block/plutonium_door_top", + "y": 180 + }, + "facing=south,half=upper,hinge=right,open=true": { + "model": "modernmetals:block/plutonium_door_top" + }, + "facing=west,half=upper,hinge=right,open=true": { + "model": "modernmetals:block/plutonium_door_top", + "y": 90 + }, + "facing=east,half=upper,hinge=right,open=true": { + "model": "modernmetals:block/plutonium_door_top", + "y": 270 + }, + "facing=north,half=lower,hinge=right,open=true": { + "model": "modernmetals:block/plutonium_door_bottom", + "y": 180 + }, + "facing=south,half=lower,hinge=right,open=true": { + "model": "modernmetals:block/plutonium_door_bottom" + }, + "facing=west,half=lower,hinge=right,open=true": { + "model": "modernmetals:block/plutonium_door_bottom", + "y": 90 + }, + "facing=east,half=lower,hinge=right,open=true": { + "model": "modernmetals:block/plutonium_door_bottom", + "y": 270 } + } } diff --git a/src/main/resources/assets/modernmetals/blockstates/plutonium_lever.json b/src/main/resources/assets/modernmetals/blockstates/plutonium_lever.json index 74036f3b..c5740197 100644 --- a/src/main/resources/assets/modernmetals/blockstates/plutonium_lever.json +++ b/src/main/resources/assets/modernmetals/blockstates/plutonium_lever.json @@ -1,20 +1,76 @@ { - "variants": { - "facing=down_z,powered=false": { "model": "modernmetals:plutonium_lever_off", "x": 180, "y": 180 }, - "facing=down_x,powered=false": { "model": "modernmetals:plutonium_lever_off", "x": 180, "y": 90 }, - "facing=up_z,powered=false": { "model": "modernmetals:plutonium_lever_off" }, - "facing=up_x,powered=false": { "model": "modernmetals:plutonium_lever_off", "y": 270 }, - "facing=east,powered=false": { "model": "modernmetals:plutonium_lever_off", "x": 90, "y": 90 }, - "facing=west,powered=false": { "model": "modernmetals:plutonium_lever_off", "x": 90, "y": 270 }, - "facing=south,powered=false" : { "model": "modernmetals:plutonium_lever_off", "x": 90, "y": 180 }, - "facing=north,powered=false" : { "model": "modernmetals:plutonium_lever_off", "x": 90 }, - "facing=down_z,powered=true" : { "model": "modernmetals:plutonium_lever", "x": 180, "y": 180 }, - "facing=down_x,powered=true" : { "model": "modernmetals:plutonium_lever", "x": 180, "y": 90 }, - "facing=up_z,powered=true": { "model": "modernmetals:plutonium_lever" }, - "facing=up_x,powered=true": { "model": "modernmetals:plutonium_lever", "y": 270 }, - "facing=east,powered=true": { "model": "modernmetals:plutonium_lever", "x": 90, "y": 90 }, - "facing=west,powered=true": { "model": "modernmetals:plutonium_lever", "x": 90, "y": 270 }, - "facing=south,powered=true": { "model": "modernmetals:plutonium_lever", "x": 90, "y": 180 }, - "facing=north,powered=true": { "model": "modernmetals:plutonium_lever", "x": 90 } + "variants": { + "face=floor,facing=north,powered=false": { + "model": "modernmetals:block/plutonium_lever_off" + }, + "face=wall,facing=north,powered=false": { + "model": "modernmetals:block/plutonium_lever_off" + }, + "face=ceiling,facing=north,powered=false": { + "model": "modernmetals:block/plutonium_lever_off" + }, + "face=floor,facing=south,powered=false": { + "model": "modernmetals:block/plutonium_lever_off" + }, + "face=wall,facing=south,powered=false": { + "model": "modernmetals:block/plutonium_lever_off" + }, + "face=ceiling,facing=south,powered=false": { + "model": "modernmetals:block/plutonium_lever_off" + }, + "face=floor,facing=west,powered=false": { + "model": "modernmetals:block/plutonium_lever_off" + }, + "face=wall,facing=west,powered=false": { + "model": "modernmetals:block/plutonium_lever_off" + }, + "face=ceiling,facing=west,powered=false": { + "model": "modernmetals:block/plutonium_lever_off" + }, + "face=floor,facing=east,powered=false": { + "model": "modernmetals:block/plutonium_lever_off" + }, + "face=wall,facing=east,powered=false": { + "model": "modernmetals:block/plutonium_lever_off" + }, + "face=ceiling,facing=east,powered=false": { + "model": "modernmetals:block/plutonium_lever_off" + }, + "face=floor,facing=north,powered=true": { + "model": "modernmetals:block/plutonium_lever" + }, + "face=wall,facing=north,powered=true": { + "model": "modernmetals:block/plutonium_lever" + }, + "face=ceiling,facing=north,powered=true": { + "model": "modernmetals:block/plutonium_lever" + }, + "face=floor,facing=south,powered=true": { + "model": "modernmetals:block/plutonium_lever" + }, + "face=wall,facing=south,powered=true": { + "model": "modernmetals:block/plutonium_lever" + }, + "face=ceiling,facing=south,powered=true": { + "model": "modernmetals:block/plutonium_lever" + }, + "face=floor,facing=west,powered=true": { + "model": "modernmetals:block/plutonium_lever" + }, + "face=wall,facing=west,powered=true": { + "model": "modernmetals:block/plutonium_lever" + }, + "face=ceiling,facing=west,powered=true": { + "model": "modernmetals:block/plutonium_lever" + }, + "face=floor,facing=east,powered=true": { + "model": "modernmetals:block/plutonium_lever" + }, + "face=wall,facing=east,powered=true": { + "model": "modernmetals:block/plutonium_lever" + }, + "face=ceiling,facing=east,powered=true": { + "model": "modernmetals:block/plutonium_lever" } + } } diff --git a/src/main/resources/assets/modernmetals/blockstates/plutonium_ore.json b/src/main/resources/assets/modernmetals/blockstates/plutonium_ore.json index f821546e..8bd6f0e7 100644 --- a/src/main/resources/assets/modernmetals/blockstates/plutonium_ore.json +++ b/src/main/resources/assets/modernmetals/blockstates/plutonium_ore.json @@ -1,5 +1,7 @@ { - "variants": { - "normal": { "model": "modernmetals:plutonium_ore" } + "variants": { + "": { + "model": "modernmetals:block/plutonium_ore" } + } } diff --git a/src/main/resources/assets/modernmetals/blockstates/plutonium_plate.json b/src/main/resources/assets/modernmetals/blockstates/plutonium_plate.json index 80bbf6b8..da2595f8 100644 --- a/src/main/resources/assets/modernmetals/blockstates/plutonium_plate.json +++ b/src/main/resources/assets/modernmetals/blockstates/plutonium_plate.json @@ -1,10 +1,27 @@ { - "variants": { - "facing=down": { "model": "modernmetals:plutonium_plate", "x": 90 }, - "facing=up": { "model": "modernmetals:plutonium_plate", "x": 270 }, - "facing=north": { "model": "modernmetals:plutonium_plate" }, - "facing=south": { "model": "modernmetals:plutonium_plate", "y": 180 }, - "facing=west": { "model": "modernmetals:plutonium_plate", "y": 270 }, - "facing=east": { "model": "modernmetals:plutonium_plate", "y": 90 } + "variants": { + "facing=down": { + "model": "modernmetals:block/plutonium_plate", + "x": 90 + }, + "facing=up": { + "model": "modernmetals:block/plutonium_plate", + "x": 270 + }, + "facing=north": { + "model": "modernmetals:block/plutonium_plate" + }, + "facing=south": { + "model": "modernmetals:block/plutonium_plate", + "y": 180 + }, + "facing=west": { + "model": "modernmetals:block/plutonium_plate", + "y": 270 + }, + "facing=east": { + "model": "modernmetals:block/plutonium_plate", + "y": 90 } + } } diff --git a/src/main/resources/assets/modernmetals/blockstates/plutonium_pressure_plate.json b/src/main/resources/assets/modernmetals/blockstates/plutonium_pressure_plate.json index 6b2d2a9f..40a095ba 100644 --- a/src/main/resources/assets/modernmetals/blockstates/plutonium_pressure_plate.json +++ b/src/main/resources/assets/modernmetals/blockstates/plutonium_pressure_plate.json @@ -1,6 +1,10 @@ { - "variants": { - "powered=false": { "model": "modernmetals:plutonium_pressure_plate_up" }, - "powered=true": { "model": "modernmetals:plutonium_pressure_plate_down" } + "variants": { + "powered=false": { + "model": "modernmetals:block/plutonium_pressure_plate_up" + }, + "powered=true": { + "model": "modernmetals:block/plutonium_pressure_plate_down" } + } } diff --git a/src/main/resources/assets/modernmetals/blockstates/plutonium_slab.json b/src/main/resources/assets/modernmetals/blockstates/plutonium_slab.json index f0a63f3e..f676dcb2 100644 --- a/src/main/resources/assets/modernmetals/blockstates/plutonium_slab.json +++ b/src/main/resources/assets/modernmetals/blockstates/plutonium_slab.json @@ -1,6 +1,13 @@ { - "variants": { - "half=bottom,variant=default": { "model": "modernmetals:half_slab_plutonium" }, - "half=top,variant=default": { "model": "modernmetals:upper_slab_plutonium" } + "variants": { + "type=top": { + "model": "modernmetals:block/upper_slab_plutonium" + }, + "type=bottom": { + "model": "modernmetals:block/half_slab_plutonium" + }, + "type=double": { + "model": "modernmetals:block/plutonium_block" } + } } diff --git a/src/main/resources/assets/modernmetals/blockstates/plutonium_stairs.json b/src/main/resources/assets/modernmetals/blockstates/plutonium_stairs.json index d115edd6..ea448b31 100644 --- a/src/main/resources/assets/modernmetals/blockstates/plutonium_stairs.json +++ b/src/main/resources/assets/modernmetals/blockstates/plutonium_stairs.json @@ -1,44 +1,209 @@ { - "variants": { - "facing=east,half=bottom,shape=straight": { "model": "modernmetals:plutonium_stairs" }, - "facing=west,half=bottom,shape=straight": { "model": "modernmetals:plutonium_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=straight": { "model": "modernmetals:plutonium_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=straight": { "model": "modernmetals:plutonium_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_right": { "model": "modernmetals:plutonium_outer_stairs" }, - "facing=west,half=bottom,shape=outer_right": { "model": "modernmetals:plutonium_outer_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=outer_right": { "model": "modernmetals:plutonium_outer_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=outer_right": { "model": "modernmetals:plutonium_outer_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_left": { "model": "modernmetals:plutonium_outer_stairs", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=outer_left": { "model": "modernmetals:plutonium_outer_stairs", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=outer_left": { "model": "modernmetals:plutonium_outer_stairs" }, - "facing=north,half=bottom,shape=outer_left": { "model": "modernmetals:plutonium_outer_stairs", "y": 180, "uvlock": true }, - "facing=east,half=bottom,shape=inner_right": { "model": "modernmetals:plutonium_inner_stairs" }, - "facing=west,half=bottom,shape=inner_right": { "model": "modernmetals:plutonium_inner_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=inner_right": { "model": "modernmetals:plutonium_inner_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=inner_right": { "model": "modernmetals:plutonium_inner_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=inner_left": { "model": "modernmetals:plutonium_inner_stairs", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=inner_left": { "model": "modernmetals:plutonium_inner_stairs", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=inner_left": { "model": "modernmetals:plutonium_inner_stairs" }, - "facing=north,half=bottom,shape=inner_left": { "model": "modernmetals:plutonium_inner_stairs", "y": 180, "uvlock": true }, - "facing=east,half=top,shape=straight": { "model": "modernmetals:plutonium_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=straight": { "model": "modernmetals:plutonium_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=straight": { "model": "modernmetals:plutonium_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=straight": { "model": "modernmetals:plutonium_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { "model": "modernmetals:plutonium_outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_right": { "model": "modernmetals:plutonium_outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { "model": "modernmetals:plutonium_outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { "model": "modernmetals:plutonium_outer_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { "model": "modernmetals:plutonium_outer_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { "model": "modernmetals:plutonium_outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { "model": "modernmetals:plutonium_outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=outer_left": { "model": "modernmetals:plutonium_outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { "model": "modernmetals:plutonium_inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { "model": "modernmetals:plutonium_inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { "model": "modernmetals:plutonium_inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { "model": "modernmetals:plutonium_inner_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { "model": "modernmetals:plutonium_inner_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { "model": "modernmetals:plutonium_inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { "model": "modernmetals:plutonium_inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { "model": "modernmetals:plutonium_inner_stairs", "x": 180, "y": 270, "uvlock": true } + "variants": { + "facing=north,half=top,shape=straight": { + "model": "modernmetals:block/plutonium_stairs", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=south,half=top,shape=straight": { + "model": "modernmetals:block/plutonium_stairs", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=west,half=top,shape=straight": { + "model": "modernmetals:block/plutonium_stairs", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=east,half=top,shape=straight": { + "model": "modernmetals:block/plutonium_stairs", + "x": 180, + "uvlock": true + }, + "facing=north,half=bottom,shape=straight": { + "model": "modernmetals:block/plutonium_stairs", + "y": 270, + "uvlock": true + }, + "facing=south,half=bottom,shape=straight": { + "model": "modernmetals:block/plutonium_stairs", + "y": 90, + "uvlock": true + }, + "facing=west,half=bottom,shape=straight": { + "model": "modernmetals:block/plutonium_stairs", + "y": 180, + "uvlock": true + }, + "facing=east,half=bottom,shape=straight": { + "model": "modernmetals:block/plutonium_stairs" + }, + "facing=north,half=top,shape=inner_left": { + "model": "modernmetals:block/plutonium_inner_stairs", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=south,half=top,shape=inner_left": { + "model": "modernmetals:block/plutonium_inner_stairs", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=west,half=top,shape=inner_left": { + "model": "modernmetals:block/plutonium_inner_stairs", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=east,half=top,shape=inner_left": { + "model": "modernmetals:block/plutonium_inner_stairs", + "x": 180, + "uvlock": true + }, + "facing=north,half=bottom,shape=inner_left": { + "model": "modernmetals:block/plutonium_inner_stairs", + "y": 180, + "uvlock": true + }, + "facing=south,half=bottom,shape=inner_left": { + "model": "modernmetals:block/plutonium_inner_stairs" + }, + "facing=west,half=bottom,shape=inner_left": { + "model": "modernmetals:block/plutonium_inner_stairs", + "y": 90, + "uvlock": true + }, + "facing=east,half=bottom,shape=inner_left": { + "model": "modernmetals:block/plutonium_inner_stairs", + "y": 270, + "uvlock": true + }, + "facing=north,half=top,shape=inner_right": { + "model": "modernmetals:block/plutonium_inner_stairs", + "x": 180, + "uvlock": true + }, + "facing=south,half=top,shape=inner_right": { + "model": "modernmetals:block/plutonium_inner_stairs", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=west,half=top,shape=inner_right": { + "model": "modernmetals:block/plutonium_inner_stairs", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=east,half=top,shape=inner_right": { + "model": "modernmetals:block/plutonium_inner_stairs", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=north,half=bottom,shape=inner_right": { + "model": "modernmetals:block/plutonium_inner_stairs", + "y": 270, + "uvlock": true + }, + "facing=south,half=bottom,shape=inner_right": { + "model": "modernmetals:block/plutonium_inner_stairs", + "y": 90, + "uvlock": true + }, + "facing=west,half=bottom,shape=inner_right": { + "model": "modernmetals:block/plutonium_inner_stairs", + "y": 180, + "uvlock": true + }, + "facing=east,half=bottom,shape=inner_right": { + "model": "modernmetals:block/plutonium_inner_stairs" + }, + "facing=north,half=top,shape=outer_left": { + "model": "modernmetals:block/plutonium_outer_stairs", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=south,half=top,shape=outer_left": { + "model": "modernmetals:block/plutonium_outer_stairs", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=west,half=top,shape=outer_left": { + "model": "modernmetals:block/plutonium_outer_stairs", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=east,half=top,shape=outer_left": { + "model": "modernmetals:block/plutonium_outer_stairs", + "x": 180, + "uvlock": true + }, + "facing=north,half=bottom,shape=outer_left": { + "model": "modernmetals:block/plutonium_outer_stairs", + "y": 180, + "uvlock": true + }, + "facing=south,half=bottom,shape=outer_left": { + "model": "modernmetals:block/plutonium_outer_stairs" + }, + "facing=west,half=bottom,shape=outer_left": { + "model": "modernmetals:block/plutonium_outer_stairs", + "y": 90, + "uvlock": true + }, + "facing=east,half=bottom,shape=outer_left": { + "model": "modernmetals:block/plutonium_outer_stairs", + "y": 270, + "uvlock": true + }, + "facing=north,half=top,shape=outer_right": { + "model": "modernmetals:block/plutonium_outer_stairs", + "x": 180, + "uvlock": true + }, + "facing=south,half=top,shape=outer_right": { + "model": "modernmetals:block/plutonium_outer_stairs", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=west,half=top,shape=outer_right": { + "model": "modernmetals:block/plutonium_outer_stairs", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=east,half=top,shape=outer_right": { + "model": "modernmetals:block/plutonium_outer_stairs", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=north,half=bottom,shape=outer_right": { + "model": "modernmetals:block/plutonium_outer_stairs", + "y": 270, + "uvlock": true + }, + "facing=south,half=bottom,shape=outer_right": { + "model": "modernmetals:block/plutonium_outer_stairs", + "y": 90, + "uvlock": true + }, + "facing=west,half=bottom,shape=outer_right": { + "model": "modernmetals:block/plutonium_outer_stairs", + "y": 180, + "uvlock": true + }, + "facing=east,half=bottom,shape=outer_right": { + "model": "modernmetals:block/plutonium_outer_stairs" } + } } diff --git a/src/main/resources/assets/modernmetals/blockstates/plutonium_trapdoor.json b/src/main/resources/assets/modernmetals/blockstates/plutonium_trapdoor.json index e9b3432d..95c435c9 100644 --- a/src/main/resources/assets/modernmetals/blockstates/plutonium_trapdoor.json +++ b/src/main/resources/assets/modernmetals/blockstates/plutonium_trapdoor.json @@ -1,20 +1,68 @@ { - "variants": { - "facing=north,half=bottom,open=false": { "model": "modernmetals:plutonium_trapdoor_bottom" }, - "facing=south,half=bottom,open=false": { "model": "modernmetals:plutonium_trapdoor_bottom" }, - "facing=east,half=bottom,open=false": { "model": "modernmetals:plutonium_trapdoor_bottom" }, - "facing=west,half=bottom,open=false": { "model": "modernmetals:plutonium_trapdoor_bottom" }, - "facing=north,half=top,open=false": { "model": "modernmetals:plutonium_trapdoor_top" }, - "facing=south,half=top,open=false": { "model": "modernmetals:plutonium_trapdoor_top" }, - "facing=east,half=top,open=false": { "model": "modernmetals:plutonium_trapdoor_top" }, - "facing=west,half=top,open=false": { "model": "modernmetals:plutonium_trapdoor_top" }, - "facing=north,half=bottom,open=true": { "model": "modernmetals:plutonium_trapdoor_open" }, - "facing=south,half=bottom,open=true": { "model": "modernmetals:plutonium_trapdoor_open", "y": 180 }, - "facing=east,half=bottom,open=true": { "model": "modernmetals:plutonium_trapdoor_open", "y": 90 }, - "facing=west,half=bottom,open=true": { "model": "modernmetals:plutonium_trapdoor_open", "y": 270 }, - "facing=north,half=top,open=true": { "model": "modernmetals:plutonium_trapdoor_open" }, - "facing=south,half=top,open=true": { "model": "modernmetals:plutonium_trapdoor_open", "y": 180 }, - "facing=east,half=top,open=true": { "model": "modernmetals:plutonium_trapdoor_open", "y": 90 }, - "facing=west,half=top,open=true": { "model": "modernmetals:plutonium_trapdoor_open", "y": 270 } + "variants": { + "facing=north,half=top,open=false": { + "model": "modernmetals:block/plutonium_trapdoor_top" + }, + "facing=south,half=top,open=false": { + "model": "modernmetals:block/plutonium_trapdoor_top", + "y": 180 + }, + "facing=west,half=top,open=false": { + "model": "modernmetals:block/plutonium_trapdoor_top", + "y": 270 + }, + "facing=east,half=top,open=false": { + "model": "modernmetals:block/plutonium_trapdoor_top", + "y": 90 + }, + "facing=north,half=bottom,open=false": { + "model": "modernmetals:block/plutonium_trapdoor_bottom" + }, + "facing=south,half=bottom,open=false": { + "model": "modernmetals:block/plutonium_trapdoor_bottom", + "y": 180 + }, + "facing=west,half=bottom,open=false": { + "model": "modernmetals:block/plutonium_trapdoor_bottom", + "y": 270 + }, + "facing=east,half=bottom,open=false": { + "model": "modernmetals:block/plutonium_trapdoor_bottom", + "y": 90 + }, + "facing=north,half=top,open=true": { + "model": "modernmetals:block/plutonium_trapdoor_open", + "x": 180, + "y": 180 + }, + "facing=south,half=top,open=true": { + "model": "modernmetals:block/plutonium_trapdoor_open", + "x": 180 + }, + "facing=west,half=top,open=true": { + "model": "modernmetals:block/plutonium_trapdoor_open", + "x": 180, + "y": 90 + }, + "facing=east,half=top,open=true": { + "model": "modernmetals:block/plutonium_trapdoor_open", + "x": 180, + "y": 270 + }, + "facing=north,half=bottom,open=true": { + "model": "modernmetals:block/plutonium_trapdoor_open" + }, + "facing=south,half=bottom,open=true": { + "model": "modernmetals:block/plutonium_trapdoor_open", + "y": 180 + }, + "facing=west,half=bottom,open=true": { + "model": "modernmetals:block/plutonium_trapdoor_open", + "y": 270 + }, + "facing=east,half=bottom,open=true": { + "model": "modernmetals:block/plutonium_trapdoor_open", + "y": 90 } + } } diff --git a/src/main/resources/assets/modernmetals/blockstates/plutonium_wall.json b/src/main/resources/assets/modernmetals/blockstates/plutonium_wall.json index 64e395d7..9b06a2e5 100644 --- a/src/main/resources/assets/modernmetals/blockstates/plutonium_wall.json +++ b/src/main/resources/assets/modernmetals/blockstates/plutonium_wall.json @@ -1,19 +1,51 @@ { - "multipart": [ - { "when": { "up": "true" }, - "apply": { "model": "modernmetals:plutonium_wall_post" } - }, - { "when": { "north": "true" }, - "apply": { "model": "modernmetals:plutonium_wall_side", "uvlock": true } - }, - { "when": { "east": "true" }, - "apply": { "model": "modernmetals:plutonium_wall_side", "y": 90, "uvlock": true } - }, - { "when": { "south": "true" }, - "apply": { "model": "modernmetals:plutonium_wall_side", "y": 180, "uvlock": true } - }, - { "when": { "west": "true" }, - "apply": { "model": "modernmetals:plutonium_wall_side", "y": 270, "uvlock": true } - } - ] + "multipart": [ + { + "when": { + "up": "true" + }, + "apply": { + "model": "modernmetals:block/plutonium_wall_post" + } + }, + { + "when": { + "north": "true" + }, + "apply": { + "model": "modernmetals:block/plutonium_wall_side", + "uvlock": true + } + }, + { + "when": { + "east": "true" + }, + "apply": { + "model": "modernmetals:block/plutonium_wall_side", + "y": 90, + "uvlock": true + } + }, + { + "when": { + "south": "true" + }, + "apply": { + "model": "modernmetals:block/plutonium_wall_side", + "y": 180, + "uvlock": true + } + }, + { + "when": { + "west": "true" + }, + "apply": { + "model": "modernmetals:block/plutonium_wall_side", + "y": 270, + "uvlock": true + } + } + ] } diff --git a/src/main/resources/assets/modernmetals/blockstates/rutile.json b/src/main/resources/assets/modernmetals/blockstates/rutile.json index bce9b67d..7311c9fd 100644 --- a/src/main/resources/assets/modernmetals/blockstates/rutile.json +++ b/src/main/resources/assets/modernmetals/blockstates/rutile.json @@ -1,9 +1,10 @@ { - "forge_marker": 1, - "variants": { - "fluid": { - "model": "forge:fluid", - "custom": { "fluid": "rutile" } - } + "variants": { + "": { + "model": "minecraft:block/water", + "custom": { + "fluid": "modernmetals:rutile" + } } -} \ No newline at end of file + } +} diff --git a/src/main/resources/assets/modernmetals/blockstates/rutile_bars.json b/src/main/resources/assets/modernmetals/blockstates/rutile_bars.json index 4ae2613d..e0d7bc2a 100644 --- a/src/main/resources/assets/modernmetals/blockstates/rutile_bars.json +++ b/src/main/resources/assets/modernmetals/blockstates/rutile_bars.json @@ -1,32 +1,77 @@ { - "multipart": [ - { "apply": { "model": "modernmetals:rutile_bars_post_ends" }}, - { "when": { "north": false, "east": false, "south": false, "west": false }, - "apply": { "model": "modernmetals:rutile_bars_post" } - }, - { "when": { "north": true, "east": false, "south": false, "west": false }, - "apply": { "model": "modernmetals:rutile_bars_cap" } - }, - { "when": { "north": false, "east": true, "south": false, "west": false }, - "apply": { "model": "modernmetals:rutile_bars_cap", "y": 90 } - }, - { "when": { "north": false, "east": false, "south": true, "west": false }, - "apply": { "model": "modernmetals:rutile_bars_cap_alt" } - }, - { "when": { "north": false, "east": false, "south": false, "west": true }, - "apply": { "model": "modernmetals:rutile_bars_cap_alt", "y": 90 } - }, - { "when": { "north": true }, - "apply": { "model": "modernmetals:rutile_bars_side" } - }, - { "when": { "east": true }, - "apply": { "model": "modernmetals:rutile_bars_side", "y": 90 } - }, - { "when": { "south": true }, - "apply": { "model": "modernmetals:rutile_bars_side_alt" } - }, - { "when": { "west": true }, - "apply": { "model": "modernmetals:rutile_bars_side_alt", "y": 90 } - } - ] + "multipart": [ + { + "apply": { + "model": "modernmetals:block/rutile_bars_post" + } + }, + { + "when": { + "north": "true" + }, + "apply": { + "model": "modernmetals:block/rutile_bars_side" + } + }, + { + "when": { + "north": "false" + }, + "apply": { + "model": "modernmetals:block/rutile_bars_cap" + } + }, + { + "when": { + "south": "true" + }, + "apply": { + "model": "modernmetals:block/rutile_bars_side_alt" + } + }, + { + "when": { + "south": "false" + }, + "apply": { + "model": "modernmetals:block/rutile_bars_cap_alt", + "y": 90 + } + }, + { + "when": { + "west": "true" + }, + "apply": { + "model": "modernmetals:block/rutile_bars_side_alt", + "y": 90 + } + }, + { + "when": { + "west": "false" + }, + "apply": { + "model": "modernmetals:block/rutile_bars_cap", + "y": 270 + } + }, + { + "when": { + "east": "true" + }, + "apply": { + "model": "modernmetals:block/rutile_bars_side", + "y": 90 + } + }, + { + "when": { + "east": "false" + }, + "apply": { + "model": "modernmetals:block/rutile_bars_cap_alt" + } + } + ] } diff --git a/src/main/resources/assets/modernmetals/blockstates/rutile_block.json b/src/main/resources/assets/modernmetals/blockstates/rutile_block.json index c632870c..3d665cf4 100644 --- a/src/main/resources/assets/modernmetals/blockstates/rutile_block.json +++ b/src/main/resources/assets/modernmetals/blockstates/rutile_block.json @@ -1,5 +1,7 @@ { - "variants": { - "normal": { "model": "modernmetals:rutile_block" } + "variants": { + "": { + "model": "modernmetals:block/rutile_block" } + } } diff --git a/src/main/resources/assets/modernmetals/blockstates/rutile_button.json b/src/main/resources/assets/modernmetals/blockstates/rutile_button.json index 8d5602c0..5049dc1f 100644 --- a/src/main/resources/assets/modernmetals/blockstates/rutile_button.json +++ b/src/main/resources/assets/modernmetals/blockstates/rutile_button.json @@ -1,16 +1,118 @@ { - "variants": { - "facing=up,powered=false": { "model": "modernmetals:rutile_button", "uvlock": true }, - "facing=down,powered=false": { "model": "modernmetals:rutile_button", "uvlock": true, "x": 180 }, - "facing=east,powered=false": { "model": "modernmetals:rutile_button", "uvlock": true, "x": 90, "y": 90 }, - "facing=west,powered=false": { "model": "modernmetals:rutile_button", "uvlock": true, "x": 90, "y": 270 }, - "facing=south,powered=false": { "model": "modernmetals:rutile_button", "uvlock": true, "x": 90, "y": 180 }, - "facing=north,powered=false": { "model": "modernmetals:rutile_button", "uvlock": true, "x": 90 }, - "facing=up,powered=true": { "model": "modernmetals:rutile_button_pressed", "uvlock": true }, - "facing=down,powered=true": { "model": "modernmetals:rutile_button_pressed", "uvlock": true, "x": 180 }, - "facing=east,powered=true": { "model": "modernmetals:rutile_button_pressed", "uvlock": true, "x": 90, "y": 90 }, - "facing=west,powered=true": { "model": "modernmetals:rutile_button_pressed", "uvlock": true, "x": 90, "y": 270 }, - "facing=south,powered=true": { "model": "modernmetals:rutile_button_pressed", "uvlock": true, "x": 90, "y": 180 }, - "facing=north,powered=true": { "model": "modernmetals:rutile_button_pressed", "uvlock": true, "x": 90 } + "variants": { + "face=floor,facing=north,powered=false": { + "model": "modernmetals:block/rutile_button" + }, + "face=wall,facing=north,powered=false": { + "model": "modernmetals:block/rutile_button", + "x": 90, + "uvlock": true + }, + "face=ceiling,facing=north,powered=false": { + "model": "modernmetals:block/rutile_button", + "x": 180, + "y": 180 + }, + "face=floor,facing=south,powered=false": { + "model": "modernmetals:block/rutile_button", + "y": 180 + }, + "face=wall,facing=south,powered=false": { + "model": "modernmetals:block/rutile_button", + "x": 90, + "y": 180, + "uvlock": true + }, + "face=ceiling,facing=south,powered=false": { + "model": "modernmetals:block/rutile_button", + "x": 180 + }, + "face=floor,facing=west,powered=false": { + "model": "modernmetals:block/rutile_button", + "y": 270 + }, + "face=wall,facing=west,powered=false": { + "model": "modernmetals:block/rutile_button", + "x": 90, + "y": 270, + "uvlock": true + }, + "face=ceiling,facing=west,powered=false": { + "model": "modernmetals:block/rutile_button", + "x": 180, + "y": 90 + }, + "face=floor,facing=east,powered=false": { + "model": "modernmetals:block/rutile_button", + "y": 90 + }, + "face=wall,facing=east,powered=false": { + "model": "modernmetals:block/rutile_button", + "x": 90, + "y": 90, + "uvlock": true + }, + "face=ceiling,facing=east,powered=false": { + "model": "modernmetals:block/rutile_button", + "x": 180, + "y": 270 + }, + "face=floor,facing=north,powered=true": { + "model": "modernmetals:block/rutile_button_pressed" + }, + "face=wall,facing=north,powered=true": { + "model": "modernmetals:block/rutile_button_pressed", + "x": 90, + "uvlock": true + }, + "face=ceiling,facing=north,powered=true": { + "model": "modernmetals:block/rutile_button_pressed", + "x": 180, + "y": 180 + }, + "face=floor,facing=south,powered=true": { + "model": "modernmetals:block/rutile_button_pressed", + "y": 180 + }, + "face=wall,facing=south,powered=true": { + "model": "modernmetals:block/rutile_button_pressed", + "x": 90, + "y": 180, + "uvlock": true + }, + "face=ceiling,facing=south,powered=true": { + "model": "modernmetals:block/rutile_button_pressed", + "x": 180 + }, + "face=floor,facing=west,powered=true": { + "model": "modernmetals:block/rutile_button_pressed", + "y": 270 + }, + "face=wall,facing=west,powered=true": { + "model": "modernmetals:block/rutile_button_pressed", + "x": 90, + "y": 270, + "uvlock": true + }, + "face=ceiling,facing=west,powered=true": { + "model": "modernmetals:block/rutile_button_pressed", + "x": 180, + "y": 90 + }, + "face=floor,facing=east,powered=true": { + "model": "modernmetals:block/rutile_button_pressed", + "y": 90 + }, + "face=wall,facing=east,powered=true": { + "model": "modernmetals:block/rutile_button_pressed", + "x": 90, + "y": 90, + "uvlock": true + }, + "face=ceiling,facing=east,powered=true": { + "model": "modernmetals:block/rutile_button_pressed", + "x": 180, + "y": 270 } + } } diff --git a/src/main/resources/assets/modernmetals/blockstates/rutile_door.json b/src/main/resources/assets/modernmetals/blockstates/rutile_door.json index 2820318b..e24ed89a 100644 --- a/src/main/resources/assets/modernmetals/blockstates/rutile_door.json +++ b/src/main/resources/assets/modernmetals/blockstates/rutile_door.json @@ -1,70 +1,124 @@ { - "variants": { - "facing=east,half=lower,hinge=left,open=false,powered=false": { "model": "modernmetals:rutile_door_bottom" }, - "facing=south,half=lower,hinge=left,open=false,powered=false": { "model": "modernmetals:rutile_door_bottom", "y": 90 }, - "facing=west,half=lower,hinge=left,open=false,powered=false": { "model": "modernmetals:rutile_door_bottom", "y": 180 }, - "facing=north,half=lower,hinge=left,open=false,powered=false": { "model": "modernmetals:rutile_door_bottom", "y": 270 }, - "facing=east,half=lower,hinge=right,open=false,powered=false": { "model": "modernmetals:rutile_door_bottom_rh" }, - "facing=south,half=lower,hinge=right,open=false,powered=false": { "model": "modernmetals:rutile_door_bottom_rh", "y": 90 }, - "facing=west,half=lower,hinge=right,open=false,powered=false": { "model": "modernmetals:rutile_door_bottom_rh", "y": 180 }, - "facing=north,half=lower,hinge=right,open=false,powered=false": { "model": "modernmetals:rutile_door_bottom_rh", "y": 270 }, - "facing=east,half=lower,hinge=left,open=true,powered=false": { "model": "modernmetals:rutile_door_bottom_rh", "y": 90 }, - "facing=south,half=lower,hinge=left,open=true,powered=false": { "model": "modernmetals:rutile_door_bottom_rh", "y": 180 }, - "facing=west,half=lower,hinge=left,open=true,powered=false": { "model": "modernmetals:rutile_door_bottom_rh", "y": 270 }, - "facing=north,half=lower,hinge=left,open=true,powered=false": { "model": "modernmetals:rutile_door_bottom_rh" }, - "facing=east,half=lower,hinge=right,open=true,powered=false": { "model": "modernmetals:rutile_door_bottom", "y": 270 }, - "facing=south,half=lower,hinge=right,open=true,powered=false": { "model": "modernmetals:rutile_door_bottom" }, - "facing=west,half=lower,hinge=right,open=true,powered=false": { "model": "modernmetals:rutile_door_bottom", "y": 90 }, - "facing=north,half=lower,hinge=right,open=true,powered=false": { "model": "modernmetals:rutile_door_bottom", "y": 180 }, - "facing=east,half=upper,hinge=left,open=false,powered=false": { "model": "modernmetals:rutile_door_top" }, - "facing=south,half=upper,hinge=left,open=false,powered=false": { "model": "modernmetals:rutile_door_top", "y": 90 }, - "facing=west,half=upper,hinge=left,open=false,powered=false": { "model": "modernmetals:rutile_door_top", "y": 180 }, - "facing=north,half=upper,hinge=left,open=false,powered=false": { "model": "modernmetals:rutile_door_top", "y": 270 }, - "facing=east,half=upper,hinge=right,open=false,powered=false": { "model": "modernmetals:rutile_door_top_rh" }, - "facing=south,half=upper,hinge=right,open=false,powered=false": { "model": "modernmetals:rutile_door_top_rh", "y": 90 }, - "facing=west,half=upper,hinge=right,open=false,powered=false": { "model": "modernmetals:rutile_door_top_rh", "y": 180 }, - "facing=north,half=upper,hinge=right,open=false,powered=false": { "model": "modernmetals:rutile_door_top_rh", "y": 270 }, - "facing=east,half=upper,hinge=left,open=true,powered=false": { "model": "modernmetals:rutile_door_top_rh", "y": 90 }, - "facing=south,half=upper,hinge=left,open=true,powered=false": { "model": "modernmetals:rutile_door_top_rh", "y": 180 }, - "facing=west,half=upper,hinge=left,open=true,powered=false": { "model": "modernmetals:rutile_door_top_rh", "y": 270 }, - "facing=north,half=upper,hinge=left,open=true,powered=false": { "model": "modernmetals:rutile_door_top_rh" }, - "facing=east,half=upper,hinge=right,open=true,powered=false": { "model": "modernmetals:rutile_door_top", "y": 270 }, - "facing=south,half=upper,hinge=right,open=true,powered=false": { "model": "modernmetals:rutile_door_top" }, - "facing=west,half=upper,hinge=right,open=true,powered=false": { "model": "modernmetals:rutile_door_top", "y": 90 }, - "facing=north,half=upper,hinge=right,open=true,powered=false": { "model": "modernmetals:rutile_door_top", "y": 180 }, - - - "facing=east,half=lower,hinge=left,open=false,powered=true": { "model": "modernmetals:rutile_door_bottom" }, - "facing=south,half=lower,hinge=left,open=false,powered=true": { "model": "modernmetals:rutile_door_bottom", "y": 90 }, - "facing=west,half=lower,hinge=left,open=false,powered=true": { "model": "modernmetals:rutile_door_bottom", "y": 180 }, - "facing=north,half=lower,hinge=left,open=false,powered=true": { "model": "modernmetals:rutile_door_bottom", "y": 270 }, - "facing=east,half=lower,hinge=right,open=false,powered=true": { "model": "modernmetals:rutile_door_bottom_rh" }, - "facing=south,half=lower,hinge=right,open=false,powered=true": { "model": "modernmetals:rutile_door_bottom_rh", "y": 90 }, - "facing=west,half=lower,hinge=right,open=false,powered=true": { "model": "modernmetals:rutile_door_bottom_rh", "y": 180 }, - "facing=north,half=lower,hinge=right,open=false,powered=true": { "model": "modernmetals:rutile_door_bottom_rh", "y": 270 }, - "facing=east,half=lower,hinge=left,open=true,powered=true": { "model": "modernmetals:rutile_door_bottom_rh", "y": 90 }, - "facing=south,half=lower,hinge=left,open=true,powered=true": { "model": "modernmetals:rutile_door_bottom_rh", "y": 180 }, - "facing=west,half=lower,hinge=left,open=true,powered=true": { "model": "modernmetals:rutile_door_bottom_rh", "y": 270 }, - "facing=north,half=lower,hinge=left,open=true,powered=true": { "model": "modernmetals:rutile_door_bottom_rh" }, - "facing=east,half=lower,hinge=right,open=true,powered=true": { "model": "modernmetals:rutile_door_bottom", "y": 270 }, - "facing=south,half=lower,hinge=right,open=true,powered=true": { "model": "modernmetals:rutile_door_bottom" }, - "facing=west,half=lower,hinge=right,open=true,powered=true": { "model": "modernmetals:rutile_door_bottom", "y": 90 }, - "facing=north,half=lower,hinge=right,open=true,powered=true": { "model": "modernmetals:rutile_door_bottom", "y": 180 }, - "facing=east,half=upper,hinge=left,open=false,powered=true": { "model": "modernmetals:rutile_door_top" }, - "facing=south,half=upper,hinge=left,open=false,powered=true": { "model": "modernmetals:rutile_door_top", "y": 90 }, - "facing=west,half=upper,hinge=left,open=false,powered=true": { "model": "modernmetals:rutile_door_top", "y": 180 }, - "facing=north,half=upper,hinge=left,open=false,powered=true": { "model": "modernmetals:rutile_door_top", "y": 270 }, - "facing=east,half=upper,hinge=right,open=false,powered=true": { "model": "modernmetals:rutile_door_top_rh" }, - "facing=south,half=upper,hinge=right,open=false,powered=true": { "model": "modernmetals:rutile_door_top_rh", "y": 90 }, - "facing=west,half=upper,hinge=right,open=false,powered=true": { "model": "modernmetals:rutile_door_top_rh", "y": 180 }, - "facing=north,half=upper,hinge=right,open=false,powered=true": { "model": "modernmetals:rutile_door_top_rh", "y": 270 }, - "facing=east,half=upper,hinge=left,open=true,powered=true": { "model": "modernmetals:rutile_door_top_rh", "y": 90 }, - "facing=south,half=upper,hinge=left,open=true,powered=true": { "model": "modernmetals:rutile_door_top_rh", "y": 180 }, - "facing=west,half=upper,hinge=left,open=true,powered=true": { "model": "modernmetals:rutile_door_top_rh", "y": 270 }, - "facing=north,half=upper,hinge=left,open=true,powered=true": { "model": "modernmetals:rutile_door_top_rh" }, - "facing=east,half=upper,hinge=right,open=true,powered=true": { "model": "modernmetals:rutile_door_top", "y": 270 }, - "facing=south,half=upper,hinge=right,open=true,powered=true": { "model": "modernmetals:rutile_door_top" }, - "facing=west,half=upper,hinge=right,open=true,powered=true": { "model": "modernmetals:rutile_door_top", "y": 90 }, - "facing=north,half=upper,hinge=right,open=true,powered=true": { "model": "modernmetals:rutile_door_top", "y": 180 } + "variants": { + "facing=north,half=upper,hinge=left,open=false": { + "model": "modernmetals:block/rutile_door_top", + "y": 270 + }, + "facing=south,half=upper,hinge=left,open=false": { + "model": "modernmetals:block/rutile_door_top", + "y": 90 + }, + "facing=west,half=upper,hinge=left,open=false": { + "model": "modernmetals:block/rutile_door_top", + "y": 180 + }, + "facing=east,half=upper,hinge=left,open=false": { + "model": "modernmetals:block/rutile_door_top" + }, + "facing=north,half=lower,hinge=left,open=false": { + "model": "modernmetals:block/rutile_door_bottom", + "y": 270 + }, + "facing=south,half=lower,hinge=left,open=false": { + "model": "modernmetals:block/rutile_door_bottom", + "y": 90 + }, + "facing=west,half=lower,hinge=left,open=false": { + "model": "modernmetals:block/rutile_door_bottom", + "y": 180 + }, + "facing=east,half=lower,hinge=left,open=false": { + "model": "modernmetals:block/rutile_door_bottom" + }, + "facing=north,half=upper,hinge=right,open=false": { + "model": "modernmetals:block/rutile_door_top_rh", + "y": 270 + }, + "facing=south,half=upper,hinge=right,open=false": { + "model": "modernmetals:block/rutile_door_top_rh", + "y": 90 + }, + "facing=west,half=upper,hinge=right,open=false": { + "model": "modernmetals:block/rutile_door_top_rh", + "y": 180 + }, + "facing=east,half=upper,hinge=right,open=false": { + "model": "modernmetals:block/rutile_door_top_rh" + }, + "facing=north,half=lower,hinge=right,open=false": { + "model": "modernmetals:block/rutile_door_bottom_rh", + "y": 270 + }, + "facing=south,half=lower,hinge=right,open=false": { + "model": "modernmetals:block/rutile_door_bottom_rh", + "y": 90 + }, + "facing=west,half=lower,hinge=right,open=false": { + "model": "modernmetals:block/rutile_door_bottom_rh", + "y": 180 + }, + "facing=east,half=lower,hinge=right,open=false": { + "model": "modernmetals:block/rutile_door_bottom_rh" + }, + "facing=north,half=upper,hinge=left,open=true": { + "model": "modernmetals:block/rutile_door_top_rh" + }, + "facing=south,half=upper,hinge=left,open=true": { + "model": "modernmetals:block/rutile_door_top_rh", + "y": 180 + }, + "facing=west,half=upper,hinge=left,open=true": { + "model": "modernmetals:block/rutile_door_top_rh", + "y": 270 + }, + "facing=east,half=upper,hinge=left,open=true": { + "model": "modernmetals:block/rutile_door_top_rh", + "y": 90 + }, + "facing=north,half=lower,hinge=left,open=true": { + "model": "modernmetals:block/rutile_door_bottom_rh" + }, + "facing=south,half=lower,hinge=left,open=true": { + "model": "modernmetals:block/rutile_door_bottom_rh", + "y": 180 + }, + "facing=west,half=lower,hinge=left,open=true": { + "model": "modernmetals:block/rutile_door_bottom_rh", + "y": 270 + }, + "facing=east,half=lower,hinge=left,open=true": { + "model": "modernmetals:block/rutile_door_bottom_rh", + "y": 90 + }, + "facing=north,half=upper,hinge=right,open=true": { + "model": "modernmetals:block/rutile_door_top", + "y": 180 + }, + "facing=south,half=upper,hinge=right,open=true": { + "model": "modernmetals:block/rutile_door_top" + }, + "facing=west,half=upper,hinge=right,open=true": { + "model": "modernmetals:block/rutile_door_top", + "y": 90 + }, + "facing=east,half=upper,hinge=right,open=true": { + "model": "modernmetals:block/rutile_door_top", + "y": 270 + }, + "facing=north,half=lower,hinge=right,open=true": { + "model": "modernmetals:block/rutile_door_bottom", + "y": 180 + }, + "facing=south,half=lower,hinge=right,open=true": { + "model": "modernmetals:block/rutile_door_bottom" + }, + "facing=west,half=lower,hinge=right,open=true": { + "model": "modernmetals:block/rutile_door_bottom", + "y": 90 + }, + "facing=east,half=lower,hinge=right,open=true": { + "model": "modernmetals:block/rutile_door_bottom", + "y": 270 } + } } diff --git a/src/main/resources/assets/modernmetals/blockstates/rutile_lever.json b/src/main/resources/assets/modernmetals/blockstates/rutile_lever.json index 362e5523..6f6fe701 100644 --- a/src/main/resources/assets/modernmetals/blockstates/rutile_lever.json +++ b/src/main/resources/assets/modernmetals/blockstates/rutile_lever.json @@ -1,20 +1,76 @@ { - "variants": { - "facing=down_z,powered=false": { "model": "modernmetals:rutile_lever_off", "x": 180, "y": 180 }, - "facing=down_x,powered=false": { "model": "modernmetals:rutile_lever_off", "x": 180, "y": 90 }, - "facing=up_z,powered=false": { "model": "modernmetals:rutile_lever_off" }, - "facing=up_x,powered=false": { "model": "modernmetals:rutile_lever_off", "y": 270 }, - "facing=east,powered=false": { "model": "modernmetals:rutile_lever_off", "x": 90, "y": 90 }, - "facing=west,powered=false": { "model": "modernmetals:rutile_lever_off", "x": 90, "y": 270 }, - "facing=south,powered=false" : { "model": "modernmetals:rutile_lever_off", "x": 90, "y": 180 }, - "facing=north,powered=false" : { "model": "modernmetals:rutile_lever_off", "x": 90 }, - "facing=down_z,powered=true" : { "model": "modernmetals:rutile_lever", "x": 180, "y": 180 }, - "facing=down_x,powered=true" : { "model": "modernmetals:rutile_lever", "x": 180, "y": 90 }, - "facing=up_z,powered=true": { "model": "modernmetals:rutile_lever" }, - "facing=up_x,powered=true": { "model": "modernmetals:rutile_lever", "y": 270 }, - "facing=east,powered=true": { "model": "modernmetals:rutile_lever", "x": 90, "y": 90 }, - "facing=west,powered=true": { "model": "modernmetals:rutile_lever", "x": 90, "y": 270 }, - "facing=south,powered=true": { "model": "modernmetals:rutile_lever", "x": 90, "y": 180 }, - "facing=north,powered=true": { "model": "modernmetals:rutile_lever", "x": 90 } + "variants": { + "face=floor,facing=north,powered=false": { + "model": "modernmetals:block/rutile_lever_off" + }, + "face=wall,facing=north,powered=false": { + "model": "modernmetals:block/rutile_lever_off" + }, + "face=ceiling,facing=north,powered=false": { + "model": "modernmetals:block/rutile_lever_off" + }, + "face=floor,facing=south,powered=false": { + "model": "modernmetals:block/rutile_lever_off" + }, + "face=wall,facing=south,powered=false": { + "model": "modernmetals:block/rutile_lever_off" + }, + "face=ceiling,facing=south,powered=false": { + "model": "modernmetals:block/rutile_lever_off" + }, + "face=floor,facing=west,powered=false": { + "model": "modernmetals:block/rutile_lever_off" + }, + "face=wall,facing=west,powered=false": { + "model": "modernmetals:block/rutile_lever_off" + }, + "face=ceiling,facing=west,powered=false": { + "model": "modernmetals:block/rutile_lever_off" + }, + "face=floor,facing=east,powered=false": { + "model": "modernmetals:block/rutile_lever_off" + }, + "face=wall,facing=east,powered=false": { + "model": "modernmetals:block/rutile_lever_off" + }, + "face=ceiling,facing=east,powered=false": { + "model": "modernmetals:block/rutile_lever_off" + }, + "face=floor,facing=north,powered=true": { + "model": "modernmetals:block/rutile_lever" + }, + "face=wall,facing=north,powered=true": { + "model": "modernmetals:block/rutile_lever" + }, + "face=ceiling,facing=north,powered=true": { + "model": "modernmetals:block/rutile_lever" + }, + "face=floor,facing=south,powered=true": { + "model": "modernmetals:block/rutile_lever" + }, + "face=wall,facing=south,powered=true": { + "model": "modernmetals:block/rutile_lever" + }, + "face=ceiling,facing=south,powered=true": { + "model": "modernmetals:block/rutile_lever" + }, + "face=floor,facing=west,powered=true": { + "model": "modernmetals:block/rutile_lever" + }, + "face=wall,facing=west,powered=true": { + "model": "modernmetals:block/rutile_lever" + }, + "face=ceiling,facing=west,powered=true": { + "model": "modernmetals:block/rutile_lever" + }, + "face=floor,facing=east,powered=true": { + "model": "modernmetals:block/rutile_lever" + }, + "face=wall,facing=east,powered=true": { + "model": "modernmetals:block/rutile_lever" + }, + "face=ceiling,facing=east,powered=true": { + "model": "modernmetals:block/rutile_lever" } + } } diff --git a/src/main/resources/assets/modernmetals/blockstates/rutile_ore.json b/src/main/resources/assets/modernmetals/blockstates/rutile_ore.json index 8f266dcf..3eae6c28 100644 --- a/src/main/resources/assets/modernmetals/blockstates/rutile_ore.json +++ b/src/main/resources/assets/modernmetals/blockstates/rutile_ore.json @@ -1,5 +1,7 @@ { - "variants": { - "normal": { "model": "modernmetals:rutile_ore" } + "variants": { + "": { + "model": "modernmetals:block/rutile_ore" } + } } diff --git a/src/main/resources/assets/modernmetals/blockstates/rutile_plate.json b/src/main/resources/assets/modernmetals/blockstates/rutile_plate.json index cfdeacd5..133cd652 100644 --- a/src/main/resources/assets/modernmetals/blockstates/rutile_plate.json +++ b/src/main/resources/assets/modernmetals/blockstates/rutile_plate.json @@ -1,10 +1,27 @@ { - "variants": { - "facing=down": { "model": "modernmetals:rutile_plate", "x": 90 }, - "facing=up": { "model": "modernmetals:rutile_plate", "x": 270 }, - "facing=north": { "model": "modernmetals:rutile_plate" }, - "facing=south": { "model": "modernmetals:rutile_plate", "y": 180 }, - "facing=west": { "model": "modernmetals:rutile_plate", "y": 270 }, - "facing=east": { "model": "modernmetals:rutile_plate", "y": 90 } + "variants": { + "facing=down": { + "model": "modernmetals:block/rutile_plate", + "x": 90 + }, + "facing=up": { + "model": "modernmetals:block/rutile_plate", + "x": 270 + }, + "facing=north": { + "model": "modernmetals:block/rutile_plate" + }, + "facing=south": { + "model": "modernmetals:block/rutile_plate", + "y": 180 + }, + "facing=west": { + "model": "modernmetals:block/rutile_plate", + "y": 270 + }, + "facing=east": { + "model": "modernmetals:block/rutile_plate", + "y": 90 } + } } diff --git a/src/main/resources/assets/modernmetals/blockstates/rutile_pressure_plate.json b/src/main/resources/assets/modernmetals/blockstates/rutile_pressure_plate.json index 3088b238..f66ad668 100644 --- a/src/main/resources/assets/modernmetals/blockstates/rutile_pressure_plate.json +++ b/src/main/resources/assets/modernmetals/blockstates/rutile_pressure_plate.json @@ -1,6 +1,10 @@ { - "variants": { - "powered=false": { "model": "modernmetals:rutile_pressure_plate_up" }, - "powered=true": { "model": "modernmetals:rutile_pressure_plate_down" } + "variants": { + "powered=false": { + "model": "modernmetals:block/rutile_pressure_plate_up" + }, + "powered=true": { + "model": "modernmetals:block/rutile_pressure_plate_down" } + } } diff --git a/src/main/resources/assets/modernmetals/blockstates/rutile_slab.json b/src/main/resources/assets/modernmetals/blockstates/rutile_slab.json index c9e791ef..a37e1479 100644 --- a/src/main/resources/assets/modernmetals/blockstates/rutile_slab.json +++ b/src/main/resources/assets/modernmetals/blockstates/rutile_slab.json @@ -1,6 +1,13 @@ { - "variants": { - "half=bottom,variant=default": { "model": "modernmetals:half_slab_rutile" }, - "half=top,variant=default": { "model": "modernmetals:upper_slab_rutile" } + "variants": { + "type=top": { + "model": "modernmetals:block/upper_slab_rutile" + }, + "type=bottom": { + "model": "modernmetals:block/half_slab_rutile" + }, + "type=double": { + "model": "modernmetals:block/rutile_block" } + } } diff --git a/src/main/resources/assets/modernmetals/blockstates/rutile_stairs.json b/src/main/resources/assets/modernmetals/blockstates/rutile_stairs.json index 5e5eda85..3423a31e 100644 --- a/src/main/resources/assets/modernmetals/blockstates/rutile_stairs.json +++ b/src/main/resources/assets/modernmetals/blockstates/rutile_stairs.json @@ -1,44 +1,209 @@ { - "variants": { - "facing=east,half=bottom,shape=straight": { "model": "modernmetals:rutile_stairs" }, - "facing=west,half=bottom,shape=straight": { "model": "modernmetals:rutile_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=straight": { "model": "modernmetals:rutile_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=straight": { "model": "modernmetals:rutile_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_right": { "model": "modernmetals:rutile_outer_stairs" }, - "facing=west,half=bottom,shape=outer_right": { "model": "modernmetals:rutile_outer_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=outer_right": { "model": "modernmetals:rutile_outer_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=outer_right": { "model": "modernmetals:rutile_outer_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_left": { "model": "modernmetals:rutile_outer_stairs", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=outer_left": { "model": "modernmetals:rutile_outer_stairs", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=outer_left": { "model": "modernmetals:rutile_outer_stairs" }, - "facing=north,half=bottom,shape=outer_left": { "model": "modernmetals:rutile_outer_stairs", "y": 180, "uvlock": true }, - "facing=east,half=bottom,shape=inner_right": { "model": "modernmetals:rutile_inner_stairs" }, - "facing=west,half=bottom,shape=inner_right": { "model": "modernmetals:rutile_inner_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=inner_right": { "model": "modernmetals:rutile_inner_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=inner_right": { "model": "modernmetals:rutile_inner_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=inner_left": { "model": "modernmetals:rutile_inner_stairs", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=inner_left": { "model": "modernmetals:rutile_inner_stairs", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=inner_left": { "model": "modernmetals:rutile_inner_stairs" }, - "facing=north,half=bottom,shape=inner_left": { "model": "modernmetals:rutile_inner_stairs", "y": 180, "uvlock": true }, - "facing=east,half=top,shape=straight": { "model": "modernmetals:rutile_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=straight": { "model": "modernmetals:rutile_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=straight": { "model": "modernmetals:rutile_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=straight": { "model": "modernmetals:rutile_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { "model": "modernmetals:rutile_outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_right": { "model": "modernmetals:rutile_outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { "model": "modernmetals:rutile_outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { "model": "modernmetals:rutile_outer_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { "model": "modernmetals:rutile_outer_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { "model": "modernmetals:rutile_outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { "model": "modernmetals:rutile_outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=outer_left": { "model": "modernmetals:rutile_outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { "model": "modernmetals:rutile_inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { "model": "modernmetals:rutile_inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { "model": "modernmetals:rutile_inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { "model": "modernmetals:rutile_inner_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { "model": "modernmetals:rutile_inner_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { "model": "modernmetals:rutile_inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { "model": "modernmetals:rutile_inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { "model": "modernmetals:rutile_inner_stairs", "x": 180, "y": 270, "uvlock": true } + "variants": { + "facing=north,half=top,shape=straight": { + "model": "modernmetals:block/rutile_stairs", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=south,half=top,shape=straight": { + "model": "modernmetals:block/rutile_stairs", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=west,half=top,shape=straight": { + "model": "modernmetals:block/rutile_stairs", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=east,half=top,shape=straight": { + "model": "modernmetals:block/rutile_stairs", + "x": 180, + "uvlock": true + }, + "facing=north,half=bottom,shape=straight": { + "model": "modernmetals:block/rutile_stairs", + "y": 270, + "uvlock": true + }, + "facing=south,half=bottom,shape=straight": { + "model": "modernmetals:block/rutile_stairs", + "y": 90, + "uvlock": true + }, + "facing=west,half=bottom,shape=straight": { + "model": "modernmetals:block/rutile_stairs", + "y": 180, + "uvlock": true + }, + "facing=east,half=bottom,shape=straight": { + "model": "modernmetals:block/rutile_stairs" + }, + "facing=north,half=top,shape=inner_left": { + "model": "modernmetals:block/rutile_inner_stairs", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=south,half=top,shape=inner_left": { + "model": "modernmetals:block/rutile_inner_stairs", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=west,half=top,shape=inner_left": { + "model": "modernmetals:block/rutile_inner_stairs", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=east,half=top,shape=inner_left": { + "model": "modernmetals:block/rutile_inner_stairs", + "x": 180, + "uvlock": true + }, + "facing=north,half=bottom,shape=inner_left": { + "model": "modernmetals:block/rutile_inner_stairs", + "y": 180, + "uvlock": true + }, + "facing=south,half=bottom,shape=inner_left": { + "model": "modernmetals:block/rutile_inner_stairs" + }, + "facing=west,half=bottom,shape=inner_left": { + "model": "modernmetals:block/rutile_inner_stairs", + "y": 90, + "uvlock": true + }, + "facing=east,half=bottom,shape=inner_left": { + "model": "modernmetals:block/rutile_inner_stairs", + "y": 270, + "uvlock": true + }, + "facing=north,half=top,shape=inner_right": { + "model": "modernmetals:block/rutile_inner_stairs", + "x": 180, + "uvlock": true + }, + "facing=south,half=top,shape=inner_right": { + "model": "modernmetals:block/rutile_inner_stairs", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=west,half=top,shape=inner_right": { + "model": "modernmetals:block/rutile_inner_stairs", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=east,half=top,shape=inner_right": { + "model": "modernmetals:block/rutile_inner_stairs", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=north,half=bottom,shape=inner_right": { + "model": "modernmetals:block/rutile_inner_stairs", + "y": 270, + "uvlock": true + }, + "facing=south,half=bottom,shape=inner_right": { + "model": "modernmetals:block/rutile_inner_stairs", + "y": 90, + "uvlock": true + }, + "facing=west,half=bottom,shape=inner_right": { + "model": "modernmetals:block/rutile_inner_stairs", + "y": 180, + "uvlock": true + }, + "facing=east,half=bottom,shape=inner_right": { + "model": "modernmetals:block/rutile_inner_stairs" + }, + "facing=north,half=top,shape=outer_left": { + "model": "modernmetals:block/rutile_outer_stairs", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=south,half=top,shape=outer_left": { + "model": "modernmetals:block/rutile_outer_stairs", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=west,half=top,shape=outer_left": { + "model": "modernmetals:block/rutile_outer_stairs", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=east,half=top,shape=outer_left": { + "model": "modernmetals:block/rutile_outer_stairs", + "x": 180, + "uvlock": true + }, + "facing=north,half=bottom,shape=outer_left": { + "model": "modernmetals:block/rutile_outer_stairs", + "y": 180, + "uvlock": true + }, + "facing=south,half=bottom,shape=outer_left": { + "model": "modernmetals:block/rutile_outer_stairs" + }, + "facing=west,half=bottom,shape=outer_left": { + "model": "modernmetals:block/rutile_outer_stairs", + "y": 90, + "uvlock": true + }, + "facing=east,half=bottom,shape=outer_left": { + "model": "modernmetals:block/rutile_outer_stairs", + "y": 270, + "uvlock": true + }, + "facing=north,half=top,shape=outer_right": { + "model": "modernmetals:block/rutile_outer_stairs", + "x": 180, + "uvlock": true + }, + "facing=south,half=top,shape=outer_right": { + "model": "modernmetals:block/rutile_outer_stairs", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=west,half=top,shape=outer_right": { + "model": "modernmetals:block/rutile_outer_stairs", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=east,half=top,shape=outer_right": { + "model": "modernmetals:block/rutile_outer_stairs", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=north,half=bottom,shape=outer_right": { + "model": "modernmetals:block/rutile_outer_stairs", + "y": 270, + "uvlock": true + }, + "facing=south,half=bottom,shape=outer_right": { + "model": "modernmetals:block/rutile_outer_stairs", + "y": 90, + "uvlock": true + }, + "facing=west,half=bottom,shape=outer_right": { + "model": "modernmetals:block/rutile_outer_stairs", + "y": 180, + "uvlock": true + }, + "facing=east,half=bottom,shape=outer_right": { + "model": "modernmetals:block/rutile_outer_stairs" } + } } diff --git a/src/main/resources/assets/modernmetals/blockstates/rutile_trapdoor.json b/src/main/resources/assets/modernmetals/blockstates/rutile_trapdoor.json index d3e045d8..fa9ad710 100644 --- a/src/main/resources/assets/modernmetals/blockstates/rutile_trapdoor.json +++ b/src/main/resources/assets/modernmetals/blockstates/rutile_trapdoor.json @@ -1,20 +1,68 @@ { - "variants": { - "facing=north,half=bottom,open=false": { "model": "modernmetals:rutile_trapdoor_bottom" }, - "facing=south,half=bottom,open=false": { "model": "modernmetals:rutile_trapdoor_bottom" }, - "facing=east,half=bottom,open=false": { "model": "modernmetals:rutile_trapdoor_bottom" }, - "facing=west,half=bottom,open=false": { "model": "modernmetals:rutile_trapdoor_bottom" }, - "facing=north,half=top,open=false": { "model": "modernmetals:rutile_trapdoor_top" }, - "facing=south,half=top,open=false": { "model": "modernmetals:rutile_trapdoor_top" }, - "facing=east,half=top,open=false": { "model": "modernmetals:rutile_trapdoor_top" }, - "facing=west,half=top,open=false": { "model": "modernmetals:rutile_trapdoor_top" }, - "facing=north,half=bottom,open=true": { "model": "modernmetals:rutile_trapdoor_open" }, - "facing=south,half=bottom,open=true": { "model": "modernmetals:rutile_trapdoor_open", "y": 180 }, - "facing=east,half=bottom,open=true": { "model": "modernmetals:rutile_trapdoor_open", "y": 90 }, - "facing=west,half=bottom,open=true": { "model": "modernmetals:rutile_trapdoor_open", "y": 270 }, - "facing=north,half=top,open=true": { "model": "modernmetals:rutile_trapdoor_open" }, - "facing=south,half=top,open=true": { "model": "modernmetals:rutile_trapdoor_open", "y": 180 }, - "facing=east,half=top,open=true": { "model": "modernmetals:rutile_trapdoor_open", "y": 90 }, - "facing=west,half=top,open=true": { "model": "modernmetals:rutile_trapdoor_open", "y": 270 } + "variants": { + "facing=north,half=top,open=false": { + "model": "modernmetals:block/rutile_trapdoor_top" + }, + "facing=south,half=top,open=false": { + "model": "modernmetals:block/rutile_trapdoor_top", + "y": 180 + }, + "facing=west,half=top,open=false": { + "model": "modernmetals:block/rutile_trapdoor_top", + "y": 270 + }, + "facing=east,half=top,open=false": { + "model": "modernmetals:block/rutile_trapdoor_top", + "y": 90 + }, + "facing=north,half=bottom,open=false": { + "model": "modernmetals:block/rutile_trapdoor_bottom" + }, + "facing=south,half=bottom,open=false": { + "model": "modernmetals:block/rutile_trapdoor_bottom", + "y": 180 + }, + "facing=west,half=bottom,open=false": { + "model": "modernmetals:block/rutile_trapdoor_bottom", + "y": 270 + }, + "facing=east,half=bottom,open=false": { + "model": "modernmetals:block/rutile_trapdoor_bottom", + "y": 90 + }, + "facing=north,half=top,open=true": { + "model": "modernmetals:block/rutile_trapdoor_open", + "x": 180, + "y": 180 + }, + "facing=south,half=top,open=true": { + "model": "modernmetals:block/rutile_trapdoor_open", + "x": 180 + }, + "facing=west,half=top,open=true": { + "model": "modernmetals:block/rutile_trapdoor_open", + "x": 180, + "y": 90 + }, + "facing=east,half=top,open=true": { + "model": "modernmetals:block/rutile_trapdoor_open", + "x": 180, + "y": 270 + }, + "facing=north,half=bottom,open=true": { + "model": "modernmetals:block/rutile_trapdoor_open" + }, + "facing=south,half=bottom,open=true": { + "model": "modernmetals:block/rutile_trapdoor_open", + "y": 180 + }, + "facing=west,half=bottom,open=true": { + "model": "modernmetals:block/rutile_trapdoor_open", + "y": 270 + }, + "facing=east,half=bottom,open=true": { + "model": "modernmetals:block/rutile_trapdoor_open", + "y": 90 } + } } diff --git a/src/main/resources/assets/modernmetals/blockstates/rutile_wall.json b/src/main/resources/assets/modernmetals/blockstates/rutile_wall.json index 8eb03015..5f8a4a41 100644 --- a/src/main/resources/assets/modernmetals/blockstates/rutile_wall.json +++ b/src/main/resources/assets/modernmetals/blockstates/rutile_wall.json @@ -1,19 +1,51 @@ { - "multipart": [ - { "when": { "up": "true" }, - "apply": { "model": "modernmetals:rutile_wall_post" } - }, - { "when": { "north": "true" }, - "apply": { "model": "modernmetals:rutile_wall_side", "uvlock": true } - }, - { "when": { "east": "true" }, - "apply": { "model": "modernmetals:rutile_wall_side", "y": 90, "uvlock": true } - }, - { "when": { "south": "true" }, - "apply": { "model": "modernmetals:rutile_wall_side", "y": 180, "uvlock": true } - }, - { "when": { "west": "true" }, - "apply": { "model": "modernmetals:rutile_wall_side", "y": 270, "uvlock": true } - } - ] + "multipart": [ + { + "when": { + "up": "true" + }, + "apply": { + "model": "modernmetals:block/rutile_wall_post" + } + }, + { + "when": { + "north": "true" + }, + "apply": { + "model": "modernmetals:block/rutile_wall_side", + "uvlock": true + } + }, + { + "when": { + "east": "true" + }, + "apply": { + "model": "modernmetals:block/rutile_wall_side", + "y": 90, + "uvlock": true + } + }, + { + "when": { + "south": "true" + }, + "apply": { + "model": "modernmetals:block/rutile_wall_side", + "y": 180, + "uvlock": true + } + }, + { + "when": { + "west": "true" + }, + "apply": { + "model": "modernmetals:block/rutile_wall_side", + "y": 270, + "uvlock": true + } + } + ] } diff --git a/src/main/resources/assets/modernmetals/blockstates/stainlesssteel.json b/src/main/resources/assets/modernmetals/blockstates/stainlesssteel.json index bfe005a0..0fa2c53d 100644 --- a/src/main/resources/assets/modernmetals/blockstates/stainlesssteel.json +++ b/src/main/resources/assets/modernmetals/blockstates/stainlesssteel.json @@ -1,9 +1,10 @@ { - "forge_marker": 1, - "variants": { - "fluid": { - "model": "forge:fluid", - "custom": { "fluid": "stainlesssteel" } - } + "variants": { + "": { + "model": "minecraft:block/water", + "custom": { + "fluid": "modernmetals:stainlesssteel" + } } -} \ No newline at end of file + } +} diff --git a/src/main/resources/assets/modernmetals/blockstates/stainlesssteel_bars.json b/src/main/resources/assets/modernmetals/blockstates/stainlesssteel_bars.json index 1978dd6d..5ce04740 100644 --- a/src/main/resources/assets/modernmetals/blockstates/stainlesssteel_bars.json +++ b/src/main/resources/assets/modernmetals/blockstates/stainlesssteel_bars.json @@ -1,32 +1,77 @@ { - "multipart": [ - { "apply": { "model": "modernmetals:stainlesssteel_bars_post_ends" }}, - { "when": { "north": false, "east": false, "south": false, "west": false }, - "apply": { "model": "modernmetals:stainlesssteel_bars_post" } - }, - { "when": { "north": true, "east": false, "south": false, "west": false }, - "apply": { "model": "modernmetals:stainlesssteel_bars_cap" } - }, - { "when": { "north": false, "east": true, "south": false, "west": false }, - "apply": { "model": "modernmetals:stainlesssteel_bars_cap", "y": 90 } - }, - { "when": { "north": false, "east": false, "south": true, "west": false }, - "apply": { "model": "modernmetals:stainlesssteel_bars_cap_alt" } - }, - { "when": { "north": false, "east": false, "south": false, "west": true }, - "apply": { "model": "modernmetals:stainlesssteel_bars_cap_alt", "y": 90 } - }, - { "when": { "north": true }, - "apply": { "model": "modernmetals:stainlesssteel_bars_side" } - }, - { "when": { "east": true }, - "apply": { "model": "modernmetals:stainlesssteel_bars_side", "y": 90 } - }, - { "when": { "south": true }, - "apply": { "model": "modernmetals:stainlesssteel_bars_side_alt" } - }, - { "when": { "west": true }, - "apply": { "model": "modernmetals:stainlesssteel_bars_side_alt", "y": 90 } - } - ] + "multipart": [ + { + "apply": { + "model": "modernmetals:block/stainlesssteel_bars_post" + } + }, + { + "when": { + "north": "true" + }, + "apply": { + "model": "modernmetals:block/stainlesssteel_bars_side" + } + }, + { + "when": { + "north": "false" + }, + "apply": { + "model": "modernmetals:block/stainlesssteel_bars_cap" + } + }, + { + "when": { + "south": "true" + }, + "apply": { + "model": "modernmetals:block/stainlesssteel_bars_side_alt" + } + }, + { + "when": { + "south": "false" + }, + "apply": { + "model": "modernmetals:block/stainlesssteel_bars_cap_alt", + "y": 90 + } + }, + { + "when": { + "west": "true" + }, + "apply": { + "model": "modernmetals:block/stainlesssteel_bars_side_alt", + "y": 90 + } + }, + { + "when": { + "west": "false" + }, + "apply": { + "model": "modernmetals:block/stainlesssteel_bars_cap", + "y": 270 + } + }, + { + "when": { + "east": "true" + }, + "apply": { + "model": "modernmetals:block/stainlesssteel_bars_side", + "y": 90 + } + }, + { + "when": { + "east": "false" + }, + "apply": { + "model": "modernmetals:block/stainlesssteel_bars_cap_alt" + } + } + ] } diff --git a/src/main/resources/assets/modernmetals/blockstates/stainlesssteel_block.json b/src/main/resources/assets/modernmetals/blockstates/stainlesssteel_block.json index 7b0a4359..e044ae72 100644 --- a/src/main/resources/assets/modernmetals/blockstates/stainlesssteel_block.json +++ b/src/main/resources/assets/modernmetals/blockstates/stainlesssteel_block.json @@ -1,5 +1,7 @@ { - "variants": { - "normal": { "model": "modernmetals:stainlesssteel_block" } + "variants": { + "": { + "model": "modernmetals:block/stainlesssteel_block" } + } } diff --git a/src/main/resources/assets/modernmetals/blockstates/stainlesssteel_button.json b/src/main/resources/assets/modernmetals/blockstates/stainlesssteel_button.json index 22f1bc3b..f5487cd3 100644 --- a/src/main/resources/assets/modernmetals/blockstates/stainlesssteel_button.json +++ b/src/main/resources/assets/modernmetals/blockstates/stainlesssteel_button.json @@ -1,16 +1,118 @@ { - "variants": { - "facing=up,powered=false": { "model": "modernmetals:stainlesssteel_button", "uvlock": true }, - "facing=down,powered=false": { "model": "modernmetals:stainlesssteel_button", "uvlock": true, "x": 180 }, - "facing=east,powered=false": { "model": "modernmetals:stainlesssteel_button", "uvlock": true, "x": 90, "y": 90 }, - "facing=west,powered=false": { "model": "modernmetals:stainlesssteel_button", "uvlock": true, "x": 90, "y": 270 }, - "facing=south,powered=false": { "model": "modernmetals:stainlesssteel_button", "uvlock": true, "x": 90, "y": 180 }, - "facing=north,powered=false": { "model": "modernmetals:stainlesssteel_button", "uvlock": true, "x": 90 }, - "facing=up,powered=true": { "model": "modernmetals:stainlesssteel_button_pressed", "uvlock": true }, - "facing=down,powered=true": { "model": "modernmetals:stainlesssteel_button_pressed", "uvlock": true, "x": 180 }, - "facing=east,powered=true": { "model": "modernmetals:stainlesssteel_button_pressed", "uvlock": true, "x": 90, "y": 90 }, - "facing=west,powered=true": { "model": "modernmetals:stainlesssteel_button_pressed", "uvlock": true, "x": 90, "y": 270 }, - "facing=south,powered=true": { "model": "modernmetals:stainlesssteel_button_pressed", "uvlock": true, "x": 90, "y": 180 }, - "facing=north,powered=true": { "model": "modernmetals:stainlesssteel_button_pressed", "uvlock": true, "x": 90 } + "variants": { + "face=floor,facing=north,powered=false": { + "model": "modernmetals:block/stainlesssteel_button" + }, + "face=wall,facing=north,powered=false": { + "model": "modernmetals:block/stainlesssteel_button", + "x": 90, + "uvlock": true + }, + "face=ceiling,facing=north,powered=false": { + "model": "modernmetals:block/stainlesssteel_button", + "x": 180, + "y": 180 + }, + "face=floor,facing=south,powered=false": { + "model": "modernmetals:block/stainlesssteel_button", + "y": 180 + }, + "face=wall,facing=south,powered=false": { + "model": "modernmetals:block/stainlesssteel_button", + "x": 90, + "y": 180, + "uvlock": true + }, + "face=ceiling,facing=south,powered=false": { + "model": "modernmetals:block/stainlesssteel_button", + "x": 180 + }, + "face=floor,facing=west,powered=false": { + "model": "modernmetals:block/stainlesssteel_button", + "y": 270 + }, + "face=wall,facing=west,powered=false": { + "model": "modernmetals:block/stainlesssteel_button", + "x": 90, + "y": 270, + "uvlock": true + }, + "face=ceiling,facing=west,powered=false": { + "model": "modernmetals:block/stainlesssteel_button", + "x": 180, + "y": 90 + }, + "face=floor,facing=east,powered=false": { + "model": "modernmetals:block/stainlesssteel_button", + "y": 90 + }, + "face=wall,facing=east,powered=false": { + "model": "modernmetals:block/stainlesssteel_button", + "x": 90, + "y": 90, + "uvlock": true + }, + "face=ceiling,facing=east,powered=false": { + "model": "modernmetals:block/stainlesssteel_button", + "x": 180, + "y": 270 + }, + "face=floor,facing=north,powered=true": { + "model": "modernmetals:block/stainlesssteel_button_pressed" + }, + "face=wall,facing=north,powered=true": { + "model": "modernmetals:block/stainlesssteel_button_pressed", + "x": 90, + "uvlock": true + }, + "face=ceiling,facing=north,powered=true": { + "model": "modernmetals:block/stainlesssteel_button_pressed", + "x": 180, + "y": 180 + }, + "face=floor,facing=south,powered=true": { + "model": "modernmetals:block/stainlesssteel_button_pressed", + "y": 180 + }, + "face=wall,facing=south,powered=true": { + "model": "modernmetals:block/stainlesssteel_button_pressed", + "x": 90, + "y": 180, + "uvlock": true + }, + "face=ceiling,facing=south,powered=true": { + "model": "modernmetals:block/stainlesssteel_button_pressed", + "x": 180 + }, + "face=floor,facing=west,powered=true": { + "model": "modernmetals:block/stainlesssteel_button_pressed", + "y": 270 + }, + "face=wall,facing=west,powered=true": { + "model": "modernmetals:block/stainlesssteel_button_pressed", + "x": 90, + "y": 270, + "uvlock": true + }, + "face=ceiling,facing=west,powered=true": { + "model": "modernmetals:block/stainlesssteel_button_pressed", + "x": 180, + "y": 90 + }, + "face=floor,facing=east,powered=true": { + "model": "modernmetals:block/stainlesssteel_button_pressed", + "y": 90 + }, + "face=wall,facing=east,powered=true": { + "model": "modernmetals:block/stainlesssteel_button_pressed", + "x": 90, + "y": 90, + "uvlock": true + }, + "face=ceiling,facing=east,powered=true": { + "model": "modernmetals:block/stainlesssteel_button_pressed", + "x": 180, + "y": 270 } + } } diff --git a/src/main/resources/assets/modernmetals/blockstates/stainlesssteel_door.json b/src/main/resources/assets/modernmetals/blockstates/stainlesssteel_door.json index 1815b10a..d25b95cd 100644 --- a/src/main/resources/assets/modernmetals/blockstates/stainlesssteel_door.json +++ b/src/main/resources/assets/modernmetals/blockstates/stainlesssteel_door.json @@ -1,70 +1,124 @@ { - "variants": { - "facing=east,half=lower,hinge=left,open=false,powered=false": { "model": "modernmetals:stainlesssteel_door_bottom" }, - "facing=south,half=lower,hinge=left,open=false,powered=false": { "model": "modernmetals:stainlesssteel_door_bottom", "y": 90 }, - "facing=west,half=lower,hinge=left,open=false,powered=false": { "model": "modernmetals:stainlesssteel_door_bottom", "y": 180 }, - "facing=north,half=lower,hinge=left,open=false,powered=false": { "model": "modernmetals:stainlesssteel_door_bottom", "y": 270 }, - "facing=east,half=lower,hinge=right,open=false,powered=false": { "model": "modernmetals:stainlesssteel_door_bottom_rh" }, - "facing=south,half=lower,hinge=right,open=false,powered=false": { "model": "modernmetals:stainlesssteel_door_bottom_rh", "y": 90 }, - "facing=west,half=lower,hinge=right,open=false,powered=false": { "model": "modernmetals:stainlesssteel_door_bottom_rh", "y": 180 }, - "facing=north,half=lower,hinge=right,open=false,powered=false": { "model": "modernmetals:stainlesssteel_door_bottom_rh", "y": 270 }, - "facing=east,half=lower,hinge=left,open=true,powered=false": { "model": "modernmetals:stainlesssteel_door_bottom_rh", "y": 90 }, - "facing=south,half=lower,hinge=left,open=true,powered=false": { "model": "modernmetals:stainlesssteel_door_bottom_rh", "y": 180 }, - "facing=west,half=lower,hinge=left,open=true,powered=false": { "model": "modernmetals:stainlesssteel_door_bottom_rh", "y": 270 }, - "facing=north,half=lower,hinge=left,open=true,powered=false": { "model": "modernmetals:stainlesssteel_door_bottom_rh" }, - "facing=east,half=lower,hinge=right,open=true,powered=false": { "model": "modernmetals:stainlesssteel_door_bottom", "y": 270 }, - "facing=south,half=lower,hinge=right,open=true,powered=false": { "model": "modernmetals:stainlesssteel_door_bottom" }, - "facing=west,half=lower,hinge=right,open=true,powered=false": { "model": "modernmetals:stainlesssteel_door_bottom", "y": 90 }, - "facing=north,half=lower,hinge=right,open=true,powered=false": { "model": "modernmetals:stainlesssteel_door_bottom", "y": 180 }, - "facing=east,half=upper,hinge=left,open=false,powered=false": { "model": "modernmetals:stainlesssteel_door_top" }, - "facing=south,half=upper,hinge=left,open=false,powered=false": { "model": "modernmetals:stainlesssteel_door_top", "y": 90 }, - "facing=west,half=upper,hinge=left,open=false,powered=false": { "model": "modernmetals:stainlesssteel_door_top", "y": 180 }, - "facing=north,half=upper,hinge=left,open=false,powered=false": { "model": "modernmetals:stainlesssteel_door_top", "y": 270 }, - "facing=east,half=upper,hinge=right,open=false,powered=false": { "model": "modernmetals:stainlesssteel_door_top_rh" }, - "facing=south,half=upper,hinge=right,open=false,powered=false": { "model": "modernmetals:stainlesssteel_door_top_rh", "y": 90 }, - "facing=west,half=upper,hinge=right,open=false,powered=false": { "model": "modernmetals:stainlesssteel_door_top_rh", "y": 180 }, - "facing=north,half=upper,hinge=right,open=false,powered=false": { "model": "modernmetals:stainlesssteel_door_top_rh", "y": 270 }, - "facing=east,half=upper,hinge=left,open=true,powered=false": { "model": "modernmetals:stainlesssteel_door_top_rh", "y": 90 }, - "facing=south,half=upper,hinge=left,open=true,powered=false": { "model": "modernmetals:stainlesssteel_door_top_rh", "y": 180 }, - "facing=west,half=upper,hinge=left,open=true,powered=false": { "model": "modernmetals:stainlesssteel_door_top_rh", "y": 270 }, - "facing=north,half=upper,hinge=left,open=true,powered=false": { "model": "modernmetals:stainlesssteel_door_top_rh" }, - "facing=east,half=upper,hinge=right,open=true,powered=false": { "model": "modernmetals:stainlesssteel_door_top", "y": 270 }, - "facing=south,half=upper,hinge=right,open=true,powered=false": { "model": "modernmetals:stainlesssteel_door_top" }, - "facing=west,half=upper,hinge=right,open=true,powered=false": { "model": "modernmetals:stainlesssteel_door_top", "y": 90 }, - "facing=north,half=upper,hinge=right,open=true,powered=false": { "model": "modernmetals:stainlesssteel_door_top", "y": 180 }, - - - "facing=east,half=lower,hinge=left,open=false,powered=true": { "model": "modernmetals:stainlesssteel_door_bottom" }, - "facing=south,half=lower,hinge=left,open=false,powered=true": { "model": "modernmetals:stainlesssteel_door_bottom", "y": 90 }, - "facing=west,half=lower,hinge=left,open=false,powered=true": { "model": "modernmetals:stainlesssteel_door_bottom", "y": 180 }, - "facing=north,half=lower,hinge=left,open=false,powered=true": { "model": "modernmetals:stainlesssteel_door_bottom", "y": 270 }, - "facing=east,half=lower,hinge=right,open=false,powered=true": { "model": "modernmetals:stainlesssteel_door_bottom_rh" }, - "facing=south,half=lower,hinge=right,open=false,powered=true": { "model": "modernmetals:stainlesssteel_door_bottom_rh", "y": 90 }, - "facing=west,half=lower,hinge=right,open=false,powered=true": { "model": "modernmetals:stainlesssteel_door_bottom_rh", "y": 180 }, - "facing=north,half=lower,hinge=right,open=false,powered=true": { "model": "modernmetals:stainlesssteel_door_bottom_rh", "y": 270 }, - "facing=east,half=lower,hinge=left,open=true,powered=true": { "model": "modernmetals:stainlesssteel_door_bottom_rh", "y": 90 }, - "facing=south,half=lower,hinge=left,open=true,powered=true": { "model": "modernmetals:stainlesssteel_door_bottom_rh", "y": 180 }, - "facing=west,half=lower,hinge=left,open=true,powered=true": { "model": "modernmetals:stainlesssteel_door_bottom_rh", "y": 270 }, - "facing=north,half=lower,hinge=left,open=true,powered=true": { "model": "modernmetals:stainlesssteel_door_bottom_rh" }, - "facing=east,half=lower,hinge=right,open=true,powered=true": { "model": "modernmetals:stainlesssteel_door_bottom", "y": 270 }, - "facing=south,half=lower,hinge=right,open=true,powered=true": { "model": "modernmetals:stainlesssteel_door_bottom" }, - "facing=west,half=lower,hinge=right,open=true,powered=true": { "model": "modernmetals:stainlesssteel_door_bottom", "y": 90 }, - "facing=north,half=lower,hinge=right,open=true,powered=true": { "model": "modernmetals:stainlesssteel_door_bottom", "y": 180 }, - "facing=east,half=upper,hinge=left,open=false,powered=true": { "model": "modernmetals:stainlesssteel_door_top" }, - "facing=south,half=upper,hinge=left,open=false,powered=true": { "model": "modernmetals:stainlesssteel_door_top", "y": 90 }, - "facing=west,half=upper,hinge=left,open=false,powered=true": { "model": "modernmetals:stainlesssteel_door_top", "y": 180 }, - "facing=north,half=upper,hinge=left,open=false,powered=true": { "model": "modernmetals:stainlesssteel_door_top", "y": 270 }, - "facing=east,half=upper,hinge=right,open=false,powered=true": { "model": "modernmetals:stainlesssteel_door_top_rh" }, - "facing=south,half=upper,hinge=right,open=false,powered=true": { "model": "modernmetals:stainlesssteel_door_top_rh", "y": 90 }, - "facing=west,half=upper,hinge=right,open=false,powered=true": { "model": "modernmetals:stainlesssteel_door_top_rh", "y": 180 }, - "facing=north,half=upper,hinge=right,open=false,powered=true": { "model": "modernmetals:stainlesssteel_door_top_rh", "y": 270 }, - "facing=east,half=upper,hinge=left,open=true,powered=true": { "model": "modernmetals:stainlesssteel_door_top_rh", "y": 90 }, - "facing=south,half=upper,hinge=left,open=true,powered=true": { "model": "modernmetals:stainlesssteel_door_top_rh", "y": 180 }, - "facing=west,half=upper,hinge=left,open=true,powered=true": { "model": "modernmetals:stainlesssteel_door_top_rh", "y": 270 }, - "facing=north,half=upper,hinge=left,open=true,powered=true": { "model": "modernmetals:stainlesssteel_door_top_rh" }, - "facing=east,half=upper,hinge=right,open=true,powered=true": { "model": "modernmetals:stainlesssteel_door_top", "y": 270 }, - "facing=south,half=upper,hinge=right,open=true,powered=true": { "model": "modernmetals:stainlesssteel_door_top" }, - "facing=west,half=upper,hinge=right,open=true,powered=true": { "model": "modernmetals:stainlesssteel_door_top", "y": 90 }, - "facing=north,half=upper,hinge=right,open=true,powered=true": { "model": "modernmetals:stainlesssteel_door_top", "y": 180 } + "variants": { + "facing=north,half=upper,hinge=left,open=false": { + "model": "modernmetals:block/stainlesssteel_door_top", + "y": 270 + }, + "facing=south,half=upper,hinge=left,open=false": { + "model": "modernmetals:block/stainlesssteel_door_top", + "y": 90 + }, + "facing=west,half=upper,hinge=left,open=false": { + "model": "modernmetals:block/stainlesssteel_door_top", + "y": 180 + }, + "facing=east,half=upper,hinge=left,open=false": { + "model": "modernmetals:block/stainlesssteel_door_top" + }, + "facing=north,half=lower,hinge=left,open=false": { + "model": "modernmetals:block/stainlesssteel_door_bottom", + "y": 270 + }, + "facing=south,half=lower,hinge=left,open=false": { + "model": "modernmetals:block/stainlesssteel_door_bottom", + "y": 90 + }, + "facing=west,half=lower,hinge=left,open=false": { + "model": "modernmetals:block/stainlesssteel_door_bottom", + "y": 180 + }, + "facing=east,half=lower,hinge=left,open=false": { + "model": "modernmetals:block/stainlesssteel_door_bottom" + }, + "facing=north,half=upper,hinge=right,open=false": { + "model": "modernmetals:block/stainlesssteel_door_top_rh", + "y": 270 + }, + "facing=south,half=upper,hinge=right,open=false": { + "model": "modernmetals:block/stainlesssteel_door_top_rh", + "y": 90 + }, + "facing=west,half=upper,hinge=right,open=false": { + "model": "modernmetals:block/stainlesssteel_door_top_rh", + "y": 180 + }, + "facing=east,half=upper,hinge=right,open=false": { + "model": "modernmetals:block/stainlesssteel_door_top_rh" + }, + "facing=north,half=lower,hinge=right,open=false": { + "model": "modernmetals:block/stainlesssteel_door_bottom_rh", + "y": 270 + }, + "facing=south,half=lower,hinge=right,open=false": { + "model": "modernmetals:block/stainlesssteel_door_bottom_rh", + "y": 90 + }, + "facing=west,half=lower,hinge=right,open=false": { + "model": "modernmetals:block/stainlesssteel_door_bottom_rh", + "y": 180 + }, + "facing=east,half=lower,hinge=right,open=false": { + "model": "modernmetals:block/stainlesssteel_door_bottom_rh" + }, + "facing=north,half=upper,hinge=left,open=true": { + "model": "modernmetals:block/stainlesssteel_door_top_rh" + }, + "facing=south,half=upper,hinge=left,open=true": { + "model": "modernmetals:block/stainlesssteel_door_top_rh", + "y": 180 + }, + "facing=west,half=upper,hinge=left,open=true": { + "model": "modernmetals:block/stainlesssteel_door_top_rh", + "y": 270 + }, + "facing=east,half=upper,hinge=left,open=true": { + "model": "modernmetals:block/stainlesssteel_door_top_rh", + "y": 90 + }, + "facing=north,half=lower,hinge=left,open=true": { + "model": "modernmetals:block/stainlesssteel_door_bottom_rh" + }, + "facing=south,half=lower,hinge=left,open=true": { + "model": "modernmetals:block/stainlesssteel_door_bottom_rh", + "y": 180 + }, + "facing=west,half=lower,hinge=left,open=true": { + "model": "modernmetals:block/stainlesssteel_door_bottom_rh", + "y": 270 + }, + "facing=east,half=lower,hinge=left,open=true": { + "model": "modernmetals:block/stainlesssteel_door_bottom_rh", + "y": 90 + }, + "facing=north,half=upper,hinge=right,open=true": { + "model": "modernmetals:block/stainlesssteel_door_top", + "y": 180 + }, + "facing=south,half=upper,hinge=right,open=true": { + "model": "modernmetals:block/stainlesssteel_door_top" + }, + "facing=west,half=upper,hinge=right,open=true": { + "model": "modernmetals:block/stainlesssteel_door_top", + "y": 90 + }, + "facing=east,half=upper,hinge=right,open=true": { + "model": "modernmetals:block/stainlesssteel_door_top", + "y": 270 + }, + "facing=north,half=lower,hinge=right,open=true": { + "model": "modernmetals:block/stainlesssteel_door_bottom", + "y": 180 + }, + "facing=south,half=lower,hinge=right,open=true": { + "model": "modernmetals:block/stainlesssteel_door_bottom" + }, + "facing=west,half=lower,hinge=right,open=true": { + "model": "modernmetals:block/stainlesssteel_door_bottom", + "y": 90 + }, + "facing=east,half=lower,hinge=right,open=true": { + "model": "modernmetals:block/stainlesssteel_door_bottom", + "y": 270 } + } } diff --git a/src/main/resources/assets/modernmetals/blockstates/stainlesssteel_lever.json b/src/main/resources/assets/modernmetals/blockstates/stainlesssteel_lever.json index c5cea434..31cdfab5 100644 --- a/src/main/resources/assets/modernmetals/blockstates/stainlesssteel_lever.json +++ b/src/main/resources/assets/modernmetals/blockstates/stainlesssteel_lever.json @@ -1,20 +1,76 @@ { - "variants": { - "facing=down_z,powered=false": { "model": "modernmetals:stainlesssteel_lever_off", "x": 180, "y": 180 }, - "facing=down_x,powered=false": { "model": "modernmetals:stainlesssteel_lever_off", "x": 180, "y": 90 }, - "facing=up_z,powered=false": { "model": "modernmetals:stainlesssteel_lever_off" }, - "facing=up_x,powered=false": { "model": "modernmetals:stainlesssteel_lever_off", "y": 270 }, - "facing=east,powered=false": { "model": "modernmetals:stainlesssteel_lever_off", "x": 90, "y": 90 }, - "facing=west,powered=false": { "model": "modernmetals:stainlesssteel_lever_off", "x": 90, "y": 270 }, - "facing=south,powered=false" : { "model": "modernmetals:stainlesssteel_lever_off", "x": 90, "y": 180 }, - "facing=north,powered=false" : { "model": "modernmetals:stainlesssteel_lever_off", "x": 90 }, - "facing=down_z,powered=true" : { "model": "modernmetals:stainlesssteel_lever", "x": 180, "y": 180 }, - "facing=down_x,powered=true" : { "model": "modernmetals:stainlesssteel_lever", "x": 180, "y": 90 }, - "facing=up_z,powered=true": { "model": "modernmetals:stainlesssteel_lever" }, - "facing=up_x,powered=true": { "model": "modernmetals:stainlesssteel_lever", "y": 270 }, - "facing=east,powered=true": { "model": "modernmetals:stainlesssteel_lever", "x": 90, "y": 90 }, - "facing=west,powered=true": { "model": "modernmetals:stainlesssteel_lever", "x": 90, "y": 270 }, - "facing=south,powered=true": { "model": "modernmetals:stainlesssteel_lever", "x": 90, "y": 180 }, - "facing=north,powered=true": { "model": "modernmetals:stainlesssteel_lever", "x": 90 } + "variants": { + "face=floor,facing=north,powered=false": { + "model": "modernmetals:block/stainlesssteel_lever_off" + }, + "face=wall,facing=north,powered=false": { + "model": "modernmetals:block/stainlesssteel_lever_off" + }, + "face=ceiling,facing=north,powered=false": { + "model": "modernmetals:block/stainlesssteel_lever_off" + }, + "face=floor,facing=south,powered=false": { + "model": "modernmetals:block/stainlesssteel_lever_off" + }, + "face=wall,facing=south,powered=false": { + "model": "modernmetals:block/stainlesssteel_lever_off" + }, + "face=ceiling,facing=south,powered=false": { + "model": "modernmetals:block/stainlesssteel_lever_off" + }, + "face=floor,facing=west,powered=false": { + "model": "modernmetals:block/stainlesssteel_lever_off" + }, + "face=wall,facing=west,powered=false": { + "model": "modernmetals:block/stainlesssteel_lever_off" + }, + "face=ceiling,facing=west,powered=false": { + "model": "modernmetals:block/stainlesssteel_lever_off" + }, + "face=floor,facing=east,powered=false": { + "model": "modernmetals:block/stainlesssteel_lever_off" + }, + "face=wall,facing=east,powered=false": { + "model": "modernmetals:block/stainlesssteel_lever_off" + }, + "face=ceiling,facing=east,powered=false": { + "model": "modernmetals:block/stainlesssteel_lever_off" + }, + "face=floor,facing=north,powered=true": { + "model": "modernmetals:block/stainlesssteel_lever" + }, + "face=wall,facing=north,powered=true": { + "model": "modernmetals:block/stainlesssteel_lever" + }, + "face=ceiling,facing=north,powered=true": { + "model": "modernmetals:block/stainlesssteel_lever" + }, + "face=floor,facing=south,powered=true": { + "model": "modernmetals:block/stainlesssteel_lever" + }, + "face=wall,facing=south,powered=true": { + "model": "modernmetals:block/stainlesssteel_lever" + }, + "face=ceiling,facing=south,powered=true": { + "model": "modernmetals:block/stainlesssteel_lever" + }, + "face=floor,facing=west,powered=true": { + "model": "modernmetals:block/stainlesssteel_lever" + }, + "face=wall,facing=west,powered=true": { + "model": "modernmetals:block/stainlesssteel_lever" + }, + "face=ceiling,facing=west,powered=true": { + "model": "modernmetals:block/stainlesssteel_lever" + }, + "face=floor,facing=east,powered=true": { + "model": "modernmetals:block/stainlesssteel_lever" + }, + "face=wall,facing=east,powered=true": { + "model": "modernmetals:block/stainlesssteel_lever" + }, + "face=ceiling,facing=east,powered=true": { + "model": "modernmetals:block/stainlesssteel_lever" } + } } diff --git a/src/main/resources/assets/modernmetals/blockstates/stainlesssteel_ore.json b/src/main/resources/assets/modernmetals/blockstates/stainlesssteel_ore.json index 4f10b681..5a2326b7 100644 --- a/src/main/resources/assets/modernmetals/blockstates/stainlesssteel_ore.json +++ b/src/main/resources/assets/modernmetals/blockstates/stainlesssteel_ore.json @@ -1,5 +1,7 @@ { - "variants": { - "normal": { "model": "modernmetals:stainlesssteel_ore" } + "variants": { + "": { + "model": "modernmetals:block/stainlesssteel_ore" } + } } diff --git a/src/main/resources/assets/modernmetals/blockstates/stainlesssteel_plate.json b/src/main/resources/assets/modernmetals/blockstates/stainlesssteel_plate.json index 6ae44181..e175c4d7 100644 --- a/src/main/resources/assets/modernmetals/blockstates/stainlesssteel_plate.json +++ b/src/main/resources/assets/modernmetals/blockstates/stainlesssteel_plate.json @@ -1,10 +1,27 @@ { - "variants": { - "facing=down": { "model": "modernmetals:stainlesssteel_plate", "x": 90 }, - "facing=up": { "model": "modernmetals:stainlesssteel_plate", "x": 270 }, - "facing=north": { "model": "modernmetals:stainlesssteel_plate" }, - "facing=south": { "model": "modernmetals:stainlesssteel_plate", "y": 180 }, - "facing=west": { "model": "modernmetals:stainlesssteel_plate", "y": 270 }, - "facing=east": { "model": "modernmetals:stainlesssteel_plate", "y": 90 } + "variants": { + "facing=down": { + "model": "modernmetals:block/stainlesssteel_plate", + "x": 90 + }, + "facing=up": { + "model": "modernmetals:block/stainlesssteel_plate", + "x": 270 + }, + "facing=north": { + "model": "modernmetals:block/stainlesssteel_plate" + }, + "facing=south": { + "model": "modernmetals:block/stainlesssteel_plate", + "y": 180 + }, + "facing=west": { + "model": "modernmetals:block/stainlesssteel_plate", + "y": 270 + }, + "facing=east": { + "model": "modernmetals:block/stainlesssteel_plate", + "y": 90 } + } } diff --git a/src/main/resources/assets/modernmetals/blockstates/stainlesssteel_pressure_plate.json b/src/main/resources/assets/modernmetals/blockstates/stainlesssteel_pressure_plate.json index 03f1c490..4bd162fa 100644 --- a/src/main/resources/assets/modernmetals/blockstates/stainlesssteel_pressure_plate.json +++ b/src/main/resources/assets/modernmetals/blockstates/stainlesssteel_pressure_plate.json @@ -1,6 +1,10 @@ { - "variants": { - "powered=false": { "model": "modernmetals:stainlesssteel_pressure_plate_up" }, - "powered=true": { "model": "modernmetals:stainlesssteel_pressure_plate_down" } + "variants": { + "powered=false": { + "model": "modernmetals:block/stainlesssteel_pressure_plate_up" + }, + "powered=true": { + "model": "modernmetals:block/stainlesssteel_pressure_plate_down" } + } } diff --git a/src/main/resources/assets/modernmetals/blockstates/stainlesssteel_slab.json b/src/main/resources/assets/modernmetals/blockstates/stainlesssteel_slab.json index 87d1b7c6..b17d6d74 100644 --- a/src/main/resources/assets/modernmetals/blockstates/stainlesssteel_slab.json +++ b/src/main/resources/assets/modernmetals/blockstates/stainlesssteel_slab.json @@ -1,6 +1,13 @@ { - "variants": { - "half=bottom,variant=default": { "model": "modernmetals:half_slab_stainlesssteel" }, - "half=top,variant=default": { "model": "modernmetals:upper_slab_stainlesssteel" } + "variants": { + "type=top": { + "model": "modernmetals:block/upper_slab_stainlesssteel" + }, + "type=bottom": { + "model": "modernmetals:block/half_slab_stainlesssteel" + }, + "type=double": { + "model": "modernmetals:block/stainlesssteel_block" } + } } diff --git a/src/main/resources/assets/modernmetals/blockstates/stainlesssteel_stairs.json b/src/main/resources/assets/modernmetals/blockstates/stainlesssteel_stairs.json index cddc65b7..72c2aca3 100644 --- a/src/main/resources/assets/modernmetals/blockstates/stainlesssteel_stairs.json +++ b/src/main/resources/assets/modernmetals/blockstates/stainlesssteel_stairs.json @@ -1,44 +1,209 @@ { - "variants": { - "facing=east,half=bottom,shape=straight": { "model": "modernmetals:stainlesssteel_stairs" }, - "facing=west,half=bottom,shape=straight": { "model": "modernmetals:stainlesssteel_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=straight": { "model": "modernmetals:stainlesssteel_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=straight": { "model": "modernmetals:stainlesssteel_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_right": { "model": "modernmetals:stainlesssteel_outer_stairs" }, - "facing=west,half=bottom,shape=outer_right": { "model": "modernmetals:stainlesssteel_outer_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=outer_right": { "model": "modernmetals:stainlesssteel_outer_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=outer_right": { "model": "modernmetals:stainlesssteel_outer_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_left": { "model": "modernmetals:stainlesssteel_outer_stairs", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=outer_left": { "model": "modernmetals:stainlesssteel_outer_stairs", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=outer_left": { "model": "modernmetals:stainlesssteel_outer_stairs" }, - "facing=north,half=bottom,shape=outer_left": { "model": "modernmetals:stainlesssteel_outer_stairs", "y": 180, "uvlock": true }, - "facing=east,half=bottom,shape=inner_right": { "model": "modernmetals:stainlesssteel_inner_stairs" }, - "facing=west,half=bottom,shape=inner_right": { "model": "modernmetals:stainlesssteel_inner_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=inner_right": { "model": "modernmetals:stainlesssteel_inner_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=inner_right": { "model": "modernmetals:stainlesssteel_inner_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=inner_left": { "model": "modernmetals:stainlesssteel_inner_stairs", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=inner_left": { "model": "modernmetals:stainlesssteel_inner_stairs", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=inner_left": { "model": "modernmetals:stainlesssteel_inner_stairs" }, - "facing=north,half=bottom,shape=inner_left": { "model": "modernmetals:stainlesssteel_inner_stairs", "y": 180, "uvlock": true }, - "facing=east,half=top,shape=straight": { "model": "modernmetals:stainlesssteel_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=straight": { "model": "modernmetals:stainlesssteel_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=straight": { "model": "modernmetals:stainlesssteel_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=straight": { "model": "modernmetals:stainlesssteel_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { "model": "modernmetals:stainlesssteel_outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_right": { "model": "modernmetals:stainlesssteel_outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { "model": "modernmetals:stainlesssteel_outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { "model": "modernmetals:stainlesssteel_outer_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { "model": "modernmetals:stainlesssteel_outer_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { "model": "modernmetals:stainlesssteel_outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { "model": "modernmetals:stainlesssteel_outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=outer_left": { "model": "modernmetals:stainlesssteel_outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { "model": "modernmetals:stainlesssteel_inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { "model": "modernmetals:stainlesssteel_inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { "model": "modernmetals:stainlesssteel_inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { "model": "modernmetals:stainlesssteel_inner_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { "model": "modernmetals:stainlesssteel_inner_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { "model": "modernmetals:stainlesssteel_inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { "model": "modernmetals:stainlesssteel_inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { "model": "modernmetals:stainlesssteel_inner_stairs", "x": 180, "y": 270, "uvlock": true } + "variants": { + "facing=north,half=top,shape=straight": { + "model": "modernmetals:block/stainlesssteel_stairs", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=south,half=top,shape=straight": { + "model": "modernmetals:block/stainlesssteel_stairs", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=west,half=top,shape=straight": { + "model": "modernmetals:block/stainlesssteel_stairs", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=east,half=top,shape=straight": { + "model": "modernmetals:block/stainlesssteel_stairs", + "x": 180, + "uvlock": true + }, + "facing=north,half=bottom,shape=straight": { + "model": "modernmetals:block/stainlesssteel_stairs", + "y": 270, + "uvlock": true + }, + "facing=south,half=bottom,shape=straight": { + "model": "modernmetals:block/stainlesssteel_stairs", + "y": 90, + "uvlock": true + }, + "facing=west,half=bottom,shape=straight": { + "model": "modernmetals:block/stainlesssteel_stairs", + "y": 180, + "uvlock": true + }, + "facing=east,half=bottom,shape=straight": { + "model": "modernmetals:block/stainlesssteel_stairs" + }, + "facing=north,half=top,shape=inner_left": { + "model": "modernmetals:block/stainlesssteel_inner_stairs", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=south,half=top,shape=inner_left": { + "model": "modernmetals:block/stainlesssteel_inner_stairs", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=west,half=top,shape=inner_left": { + "model": "modernmetals:block/stainlesssteel_inner_stairs", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=east,half=top,shape=inner_left": { + "model": "modernmetals:block/stainlesssteel_inner_stairs", + "x": 180, + "uvlock": true + }, + "facing=north,half=bottom,shape=inner_left": { + "model": "modernmetals:block/stainlesssteel_inner_stairs", + "y": 180, + "uvlock": true + }, + "facing=south,half=bottom,shape=inner_left": { + "model": "modernmetals:block/stainlesssteel_inner_stairs" + }, + "facing=west,half=bottom,shape=inner_left": { + "model": "modernmetals:block/stainlesssteel_inner_stairs", + "y": 90, + "uvlock": true + }, + "facing=east,half=bottom,shape=inner_left": { + "model": "modernmetals:block/stainlesssteel_inner_stairs", + "y": 270, + "uvlock": true + }, + "facing=north,half=top,shape=inner_right": { + "model": "modernmetals:block/stainlesssteel_inner_stairs", + "x": 180, + "uvlock": true + }, + "facing=south,half=top,shape=inner_right": { + "model": "modernmetals:block/stainlesssteel_inner_stairs", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=west,half=top,shape=inner_right": { + "model": "modernmetals:block/stainlesssteel_inner_stairs", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=east,half=top,shape=inner_right": { + "model": "modernmetals:block/stainlesssteel_inner_stairs", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=north,half=bottom,shape=inner_right": { + "model": "modernmetals:block/stainlesssteel_inner_stairs", + "y": 270, + "uvlock": true + }, + "facing=south,half=bottom,shape=inner_right": { + "model": "modernmetals:block/stainlesssteel_inner_stairs", + "y": 90, + "uvlock": true + }, + "facing=west,half=bottom,shape=inner_right": { + "model": "modernmetals:block/stainlesssteel_inner_stairs", + "y": 180, + "uvlock": true + }, + "facing=east,half=bottom,shape=inner_right": { + "model": "modernmetals:block/stainlesssteel_inner_stairs" + }, + "facing=north,half=top,shape=outer_left": { + "model": "modernmetals:block/stainlesssteel_outer_stairs", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=south,half=top,shape=outer_left": { + "model": "modernmetals:block/stainlesssteel_outer_stairs", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=west,half=top,shape=outer_left": { + "model": "modernmetals:block/stainlesssteel_outer_stairs", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=east,half=top,shape=outer_left": { + "model": "modernmetals:block/stainlesssteel_outer_stairs", + "x": 180, + "uvlock": true + }, + "facing=north,half=bottom,shape=outer_left": { + "model": "modernmetals:block/stainlesssteel_outer_stairs", + "y": 180, + "uvlock": true + }, + "facing=south,half=bottom,shape=outer_left": { + "model": "modernmetals:block/stainlesssteel_outer_stairs" + }, + "facing=west,half=bottom,shape=outer_left": { + "model": "modernmetals:block/stainlesssteel_outer_stairs", + "y": 90, + "uvlock": true + }, + "facing=east,half=bottom,shape=outer_left": { + "model": "modernmetals:block/stainlesssteel_outer_stairs", + "y": 270, + "uvlock": true + }, + "facing=north,half=top,shape=outer_right": { + "model": "modernmetals:block/stainlesssteel_outer_stairs", + "x": 180, + "uvlock": true + }, + "facing=south,half=top,shape=outer_right": { + "model": "modernmetals:block/stainlesssteel_outer_stairs", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=west,half=top,shape=outer_right": { + "model": "modernmetals:block/stainlesssteel_outer_stairs", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=east,half=top,shape=outer_right": { + "model": "modernmetals:block/stainlesssteel_outer_stairs", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=north,half=bottom,shape=outer_right": { + "model": "modernmetals:block/stainlesssteel_outer_stairs", + "y": 270, + "uvlock": true + }, + "facing=south,half=bottom,shape=outer_right": { + "model": "modernmetals:block/stainlesssteel_outer_stairs", + "y": 90, + "uvlock": true + }, + "facing=west,half=bottom,shape=outer_right": { + "model": "modernmetals:block/stainlesssteel_outer_stairs", + "y": 180, + "uvlock": true + }, + "facing=east,half=bottom,shape=outer_right": { + "model": "modernmetals:block/stainlesssteel_outer_stairs" } + } } diff --git a/src/main/resources/assets/modernmetals/blockstates/stainlesssteel_trapdoor.json b/src/main/resources/assets/modernmetals/blockstates/stainlesssteel_trapdoor.json index 37336fec..c3761472 100644 --- a/src/main/resources/assets/modernmetals/blockstates/stainlesssteel_trapdoor.json +++ b/src/main/resources/assets/modernmetals/blockstates/stainlesssteel_trapdoor.json @@ -1,20 +1,68 @@ { - "variants": { - "facing=north,half=bottom,open=false": { "model": "modernmetals:stainlesssteel_trapdoor_bottom" }, - "facing=south,half=bottom,open=false": { "model": "modernmetals:stainlesssteel_trapdoor_bottom" }, - "facing=east,half=bottom,open=false": { "model": "modernmetals:stainlesssteel_trapdoor_bottom" }, - "facing=west,half=bottom,open=false": { "model": "modernmetals:stainlesssteel_trapdoor_bottom" }, - "facing=north,half=top,open=false": { "model": "modernmetals:stainlesssteel_trapdoor_top" }, - "facing=south,half=top,open=false": { "model": "modernmetals:stainlesssteel_trapdoor_top" }, - "facing=east,half=top,open=false": { "model": "modernmetals:stainlesssteel_trapdoor_top" }, - "facing=west,half=top,open=false": { "model": "modernmetals:stainlesssteel_trapdoor_top" }, - "facing=north,half=bottom,open=true": { "model": "modernmetals:stainlesssteel_trapdoor_open" }, - "facing=south,half=bottom,open=true": { "model": "modernmetals:stainlesssteel_trapdoor_open", "y": 180 }, - "facing=east,half=bottom,open=true": { "model": "modernmetals:stainlesssteel_trapdoor_open", "y": 90 }, - "facing=west,half=bottom,open=true": { "model": "modernmetals:stainlesssteel_trapdoor_open", "y": 270 }, - "facing=north,half=top,open=true": { "model": "modernmetals:stainlesssteel_trapdoor_open" }, - "facing=south,half=top,open=true": { "model": "modernmetals:stainlesssteel_trapdoor_open", "y": 180 }, - "facing=east,half=top,open=true": { "model": "modernmetals:stainlesssteel_trapdoor_open", "y": 90 }, - "facing=west,half=top,open=true": { "model": "modernmetals:stainlesssteel_trapdoor_open", "y": 270 } + "variants": { + "facing=north,half=top,open=false": { + "model": "modernmetals:block/stainlesssteel_trapdoor_top" + }, + "facing=south,half=top,open=false": { + "model": "modernmetals:block/stainlesssteel_trapdoor_top", + "y": 180 + }, + "facing=west,half=top,open=false": { + "model": "modernmetals:block/stainlesssteel_trapdoor_top", + "y": 270 + }, + "facing=east,half=top,open=false": { + "model": "modernmetals:block/stainlesssteel_trapdoor_top", + "y": 90 + }, + "facing=north,half=bottom,open=false": { + "model": "modernmetals:block/stainlesssteel_trapdoor_bottom" + }, + "facing=south,half=bottom,open=false": { + "model": "modernmetals:block/stainlesssteel_trapdoor_bottom", + "y": 180 + }, + "facing=west,half=bottom,open=false": { + "model": "modernmetals:block/stainlesssteel_trapdoor_bottom", + "y": 270 + }, + "facing=east,half=bottom,open=false": { + "model": "modernmetals:block/stainlesssteel_trapdoor_bottom", + "y": 90 + }, + "facing=north,half=top,open=true": { + "model": "modernmetals:block/stainlesssteel_trapdoor_open", + "x": 180, + "y": 180 + }, + "facing=south,half=top,open=true": { + "model": "modernmetals:block/stainlesssteel_trapdoor_open", + "x": 180 + }, + "facing=west,half=top,open=true": { + "model": "modernmetals:block/stainlesssteel_trapdoor_open", + "x": 180, + "y": 90 + }, + "facing=east,half=top,open=true": { + "model": "modernmetals:block/stainlesssteel_trapdoor_open", + "x": 180, + "y": 270 + }, + "facing=north,half=bottom,open=true": { + "model": "modernmetals:block/stainlesssteel_trapdoor_open" + }, + "facing=south,half=bottom,open=true": { + "model": "modernmetals:block/stainlesssteel_trapdoor_open", + "y": 180 + }, + "facing=west,half=bottom,open=true": { + "model": "modernmetals:block/stainlesssteel_trapdoor_open", + "y": 270 + }, + "facing=east,half=bottom,open=true": { + "model": "modernmetals:block/stainlesssteel_trapdoor_open", + "y": 90 } + } } diff --git a/src/main/resources/assets/modernmetals/blockstates/stainlesssteel_wall.json b/src/main/resources/assets/modernmetals/blockstates/stainlesssteel_wall.json index 219d019b..48e67c8a 100644 --- a/src/main/resources/assets/modernmetals/blockstates/stainlesssteel_wall.json +++ b/src/main/resources/assets/modernmetals/blockstates/stainlesssteel_wall.json @@ -1,19 +1,51 @@ { - "multipart": [ - { "when": { "up": "true" }, - "apply": { "model": "modernmetals:stainlesssteel_wall_post" } - }, - { "when": { "north": "true" }, - "apply": { "model": "modernmetals:stainlesssteel_wall_side", "uvlock": true } - }, - { "when": { "east": "true" }, - "apply": { "model": "modernmetals:stainlesssteel_wall_side", "y": 90, "uvlock": true } - }, - { "when": { "south": "true" }, - "apply": { "model": "modernmetals:stainlesssteel_wall_side", "y": 180, "uvlock": true } - }, - { "when": { "west": "true" }, - "apply": { "model": "modernmetals:stainlesssteel_wall_side", "y": 270, "uvlock": true } - } - ] + "multipart": [ + { + "when": { + "up": "true" + }, + "apply": { + "model": "modernmetals:block/stainlesssteel_wall_post" + } + }, + { + "when": { + "north": "true" + }, + "apply": { + "model": "modernmetals:block/stainlesssteel_wall_side", + "uvlock": true + } + }, + { + "when": { + "east": "true" + }, + "apply": { + "model": "modernmetals:block/stainlesssteel_wall_side", + "y": 90, + "uvlock": true + } + }, + { + "when": { + "south": "true" + }, + "apply": { + "model": "modernmetals:block/stainlesssteel_wall_side", + "y": 180, + "uvlock": true + } + }, + { + "when": { + "west": "true" + }, + "apply": { + "model": "modernmetals:block/stainlesssteel_wall_side", + "y": 270, + "uvlock": true + } + } + ] } diff --git a/src/main/resources/assets/modernmetals/blockstates/tantalum.json b/src/main/resources/assets/modernmetals/blockstates/tantalum.json index 42d31d5c..5a77d60f 100644 --- a/src/main/resources/assets/modernmetals/blockstates/tantalum.json +++ b/src/main/resources/assets/modernmetals/blockstates/tantalum.json @@ -1,9 +1,10 @@ { - "forge_marker": 1, - "variants": { - "fluid": { - "model": "forge:fluid", - "custom": { "fluid": "tantalum" } - } + "variants": { + "": { + "model": "minecraft:block/water", + "custom": { + "fluid": "modernmetals:tantalum" + } } -} \ No newline at end of file + } +} diff --git a/src/main/resources/assets/modernmetals/blockstates/tantalum_bars.json b/src/main/resources/assets/modernmetals/blockstates/tantalum_bars.json index e1320e2e..8c9de5c0 100644 --- a/src/main/resources/assets/modernmetals/blockstates/tantalum_bars.json +++ b/src/main/resources/assets/modernmetals/blockstates/tantalum_bars.json @@ -1,32 +1,77 @@ { - "multipart": [ - { "apply": { "model": "modernmetals:tantalum_bars_post_ends" }}, - { "when": { "north": false, "east": false, "south": false, "west": false }, - "apply": { "model": "modernmetals:tantalum_bars_post" } - }, - { "when": { "north": true, "east": false, "south": false, "west": false }, - "apply": { "model": "modernmetals:tantalum_bars_cap" } - }, - { "when": { "north": false, "east": true, "south": false, "west": false }, - "apply": { "model": "modernmetals:tantalum_bars_cap", "y": 90 } - }, - { "when": { "north": false, "east": false, "south": true, "west": false }, - "apply": { "model": "modernmetals:tantalum_bars_cap_alt" } - }, - { "when": { "north": false, "east": false, "south": false, "west": true }, - "apply": { "model": "modernmetals:tantalum_bars_cap_alt", "y": 90 } - }, - { "when": { "north": true }, - "apply": { "model": "modernmetals:tantalum_bars_side" } - }, - { "when": { "east": true }, - "apply": { "model": "modernmetals:tantalum_bars_side", "y": 90 } - }, - { "when": { "south": true }, - "apply": { "model": "modernmetals:tantalum_bars_side_alt" } - }, - { "when": { "west": true }, - "apply": { "model": "modernmetals:tantalum_bars_side_alt", "y": 90 } - } - ] + "multipart": [ + { + "apply": { + "model": "modernmetals:block/tantalum_bars_post" + } + }, + { + "when": { + "north": "true" + }, + "apply": { + "model": "modernmetals:block/tantalum_bars_side" + } + }, + { + "when": { + "north": "false" + }, + "apply": { + "model": "modernmetals:block/tantalum_bars_cap" + } + }, + { + "when": { + "south": "true" + }, + "apply": { + "model": "modernmetals:block/tantalum_bars_side_alt" + } + }, + { + "when": { + "south": "false" + }, + "apply": { + "model": "modernmetals:block/tantalum_bars_cap_alt", + "y": 90 + } + }, + { + "when": { + "west": "true" + }, + "apply": { + "model": "modernmetals:block/tantalum_bars_side_alt", + "y": 90 + } + }, + { + "when": { + "west": "false" + }, + "apply": { + "model": "modernmetals:block/tantalum_bars_cap", + "y": 270 + } + }, + { + "when": { + "east": "true" + }, + "apply": { + "model": "modernmetals:block/tantalum_bars_side", + "y": 90 + } + }, + { + "when": { + "east": "false" + }, + "apply": { + "model": "modernmetals:block/tantalum_bars_cap_alt" + } + } + ] } diff --git a/src/main/resources/assets/modernmetals/blockstates/tantalum_block.json b/src/main/resources/assets/modernmetals/blockstates/tantalum_block.json index de23d5fb..4310c61a 100644 --- a/src/main/resources/assets/modernmetals/blockstates/tantalum_block.json +++ b/src/main/resources/assets/modernmetals/blockstates/tantalum_block.json @@ -1,5 +1,7 @@ { - "variants": { - "normal": { "model": "modernmetals:tantalum_block" } + "variants": { + "": { + "model": "modernmetals:block/tantalum_block" } + } } diff --git a/src/main/resources/assets/modernmetals/blockstates/tantalum_button.json b/src/main/resources/assets/modernmetals/blockstates/tantalum_button.json index 22387e07..42755adf 100644 --- a/src/main/resources/assets/modernmetals/blockstates/tantalum_button.json +++ b/src/main/resources/assets/modernmetals/blockstates/tantalum_button.json @@ -1,16 +1,118 @@ { - "variants": { - "facing=up,powered=false": { "model": "modernmetals:tantalum_button", "uvlock": true }, - "facing=down,powered=false": { "model": "modernmetals:tantalum_button", "uvlock": true, "x": 180 }, - "facing=east,powered=false": { "model": "modernmetals:tantalum_button", "uvlock": true, "x": 90, "y": 90 }, - "facing=west,powered=false": { "model": "modernmetals:tantalum_button", "uvlock": true, "x": 90, "y": 270 }, - "facing=south,powered=false": { "model": "modernmetals:tantalum_button", "uvlock": true, "x": 90, "y": 180 }, - "facing=north,powered=false": { "model": "modernmetals:tantalum_button", "uvlock": true, "x": 90 }, - "facing=up,powered=true": { "model": "modernmetals:tantalum_button_pressed", "uvlock": true }, - "facing=down,powered=true": { "model": "modernmetals:tantalum_button_pressed", "uvlock": true, "x": 180 }, - "facing=east,powered=true": { "model": "modernmetals:tantalum_button_pressed", "uvlock": true, "x": 90, "y": 90 }, - "facing=west,powered=true": { "model": "modernmetals:tantalum_button_pressed", "uvlock": true, "x": 90, "y": 270 }, - "facing=south,powered=true": { "model": "modernmetals:tantalum_button_pressed", "uvlock": true, "x": 90, "y": 180 }, - "facing=north,powered=true": { "model": "modernmetals:tantalum_button_pressed", "uvlock": true, "x": 90 } + "variants": { + "face=floor,facing=north,powered=false": { + "model": "modernmetals:block/tantalum_button" + }, + "face=wall,facing=north,powered=false": { + "model": "modernmetals:block/tantalum_button", + "x": 90, + "uvlock": true + }, + "face=ceiling,facing=north,powered=false": { + "model": "modernmetals:block/tantalum_button", + "x": 180, + "y": 180 + }, + "face=floor,facing=south,powered=false": { + "model": "modernmetals:block/tantalum_button", + "y": 180 + }, + "face=wall,facing=south,powered=false": { + "model": "modernmetals:block/tantalum_button", + "x": 90, + "y": 180, + "uvlock": true + }, + "face=ceiling,facing=south,powered=false": { + "model": "modernmetals:block/tantalum_button", + "x": 180 + }, + "face=floor,facing=west,powered=false": { + "model": "modernmetals:block/tantalum_button", + "y": 270 + }, + "face=wall,facing=west,powered=false": { + "model": "modernmetals:block/tantalum_button", + "x": 90, + "y": 270, + "uvlock": true + }, + "face=ceiling,facing=west,powered=false": { + "model": "modernmetals:block/tantalum_button", + "x": 180, + "y": 90 + }, + "face=floor,facing=east,powered=false": { + "model": "modernmetals:block/tantalum_button", + "y": 90 + }, + "face=wall,facing=east,powered=false": { + "model": "modernmetals:block/tantalum_button", + "x": 90, + "y": 90, + "uvlock": true + }, + "face=ceiling,facing=east,powered=false": { + "model": "modernmetals:block/tantalum_button", + "x": 180, + "y": 270 + }, + "face=floor,facing=north,powered=true": { + "model": "modernmetals:block/tantalum_button_pressed" + }, + "face=wall,facing=north,powered=true": { + "model": "modernmetals:block/tantalum_button_pressed", + "x": 90, + "uvlock": true + }, + "face=ceiling,facing=north,powered=true": { + "model": "modernmetals:block/tantalum_button_pressed", + "x": 180, + "y": 180 + }, + "face=floor,facing=south,powered=true": { + "model": "modernmetals:block/tantalum_button_pressed", + "y": 180 + }, + "face=wall,facing=south,powered=true": { + "model": "modernmetals:block/tantalum_button_pressed", + "x": 90, + "y": 180, + "uvlock": true + }, + "face=ceiling,facing=south,powered=true": { + "model": "modernmetals:block/tantalum_button_pressed", + "x": 180 + }, + "face=floor,facing=west,powered=true": { + "model": "modernmetals:block/tantalum_button_pressed", + "y": 270 + }, + "face=wall,facing=west,powered=true": { + "model": "modernmetals:block/tantalum_button_pressed", + "x": 90, + "y": 270, + "uvlock": true + }, + "face=ceiling,facing=west,powered=true": { + "model": "modernmetals:block/tantalum_button_pressed", + "x": 180, + "y": 90 + }, + "face=floor,facing=east,powered=true": { + "model": "modernmetals:block/tantalum_button_pressed", + "y": 90 + }, + "face=wall,facing=east,powered=true": { + "model": "modernmetals:block/tantalum_button_pressed", + "x": 90, + "y": 90, + "uvlock": true + }, + "face=ceiling,facing=east,powered=true": { + "model": "modernmetals:block/tantalum_button_pressed", + "x": 180, + "y": 270 } + } } diff --git a/src/main/resources/assets/modernmetals/blockstates/tantalum_door.json b/src/main/resources/assets/modernmetals/blockstates/tantalum_door.json index ab20ec0e..6d915bb0 100644 --- a/src/main/resources/assets/modernmetals/blockstates/tantalum_door.json +++ b/src/main/resources/assets/modernmetals/blockstates/tantalum_door.json @@ -1,70 +1,124 @@ { - "variants": { - "facing=east,half=lower,hinge=left,open=false,powered=false": { "model": "modernmetals:tantalum_door_bottom" }, - "facing=south,half=lower,hinge=left,open=false,powered=false": { "model": "modernmetals:tantalum_door_bottom", "y": 90 }, - "facing=west,half=lower,hinge=left,open=false,powered=false": { "model": "modernmetals:tantalum_door_bottom", "y": 180 }, - "facing=north,half=lower,hinge=left,open=false,powered=false": { "model": "modernmetals:tantalum_door_bottom", "y": 270 }, - "facing=east,half=lower,hinge=right,open=false,powered=false": { "model": "modernmetals:tantalum_door_bottom_rh" }, - "facing=south,half=lower,hinge=right,open=false,powered=false": { "model": "modernmetals:tantalum_door_bottom_rh", "y": 90 }, - "facing=west,half=lower,hinge=right,open=false,powered=false": { "model": "modernmetals:tantalum_door_bottom_rh", "y": 180 }, - "facing=north,half=lower,hinge=right,open=false,powered=false": { "model": "modernmetals:tantalum_door_bottom_rh", "y": 270 }, - "facing=east,half=lower,hinge=left,open=true,powered=false": { "model": "modernmetals:tantalum_door_bottom_rh", "y": 90 }, - "facing=south,half=lower,hinge=left,open=true,powered=false": { "model": "modernmetals:tantalum_door_bottom_rh", "y": 180 }, - "facing=west,half=lower,hinge=left,open=true,powered=false": { "model": "modernmetals:tantalum_door_bottom_rh", "y": 270 }, - "facing=north,half=lower,hinge=left,open=true,powered=false": { "model": "modernmetals:tantalum_door_bottom_rh" }, - "facing=east,half=lower,hinge=right,open=true,powered=false": { "model": "modernmetals:tantalum_door_bottom", "y": 270 }, - "facing=south,half=lower,hinge=right,open=true,powered=false": { "model": "modernmetals:tantalum_door_bottom" }, - "facing=west,half=lower,hinge=right,open=true,powered=false": { "model": "modernmetals:tantalum_door_bottom", "y": 90 }, - "facing=north,half=lower,hinge=right,open=true,powered=false": { "model": "modernmetals:tantalum_door_bottom", "y": 180 }, - "facing=east,half=upper,hinge=left,open=false,powered=false": { "model": "modernmetals:tantalum_door_top" }, - "facing=south,half=upper,hinge=left,open=false,powered=false": { "model": "modernmetals:tantalum_door_top", "y": 90 }, - "facing=west,half=upper,hinge=left,open=false,powered=false": { "model": "modernmetals:tantalum_door_top", "y": 180 }, - "facing=north,half=upper,hinge=left,open=false,powered=false": { "model": "modernmetals:tantalum_door_top", "y": 270 }, - "facing=east,half=upper,hinge=right,open=false,powered=false": { "model": "modernmetals:tantalum_door_top_rh" }, - "facing=south,half=upper,hinge=right,open=false,powered=false": { "model": "modernmetals:tantalum_door_top_rh", "y": 90 }, - "facing=west,half=upper,hinge=right,open=false,powered=false": { "model": "modernmetals:tantalum_door_top_rh", "y": 180 }, - "facing=north,half=upper,hinge=right,open=false,powered=false": { "model": "modernmetals:tantalum_door_top_rh", "y": 270 }, - "facing=east,half=upper,hinge=left,open=true,powered=false": { "model": "modernmetals:tantalum_door_top_rh", "y": 90 }, - "facing=south,half=upper,hinge=left,open=true,powered=false": { "model": "modernmetals:tantalum_door_top_rh", "y": 180 }, - "facing=west,half=upper,hinge=left,open=true,powered=false": { "model": "modernmetals:tantalum_door_top_rh", "y": 270 }, - "facing=north,half=upper,hinge=left,open=true,powered=false": { "model": "modernmetals:tantalum_door_top_rh" }, - "facing=east,half=upper,hinge=right,open=true,powered=false": { "model": "modernmetals:tantalum_door_top", "y": 270 }, - "facing=south,half=upper,hinge=right,open=true,powered=false": { "model": "modernmetals:tantalum_door_top" }, - "facing=west,half=upper,hinge=right,open=true,powered=false": { "model": "modernmetals:tantalum_door_top", "y": 90 }, - "facing=north,half=upper,hinge=right,open=true,powered=false": { "model": "modernmetals:tantalum_door_top", "y": 180 }, - - - "facing=east,half=lower,hinge=left,open=false,powered=true": { "model": "modernmetals:tantalum_door_bottom" }, - "facing=south,half=lower,hinge=left,open=false,powered=true": { "model": "modernmetals:tantalum_door_bottom", "y": 90 }, - "facing=west,half=lower,hinge=left,open=false,powered=true": { "model": "modernmetals:tantalum_door_bottom", "y": 180 }, - "facing=north,half=lower,hinge=left,open=false,powered=true": { "model": "modernmetals:tantalum_door_bottom", "y": 270 }, - "facing=east,half=lower,hinge=right,open=false,powered=true": { "model": "modernmetals:tantalum_door_bottom_rh" }, - "facing=south,half=lower,hinge=right,open=false,powered=true": { "model": "modernmetals:tantalum_door_bottom_rh", "y": 90 }, - "facing=west,half=lower,hinge=right,open=false,powered=true": { "model": "modernmetals:tantalum_door_bottom_rh", "y": 180 }, - "facing=north,half=lower,hinge=right,open=false,powered=true": { "model": "modernmetals:tantalum_door_bottom_rh", "y": 270 }, - "facing=east,half=lower,hinge=left,open=true,powered=true": { "model": "modernmetals:tantalum_door_bottom_rh", "y": 90 }, - "facing=south,half=lower,hinge=left,open=true,powered=true": { "model": "modernmetals:tantalum_door_bottom_rh", "y": 180 }, - "facing=west,half=lower,hinge=left,open=true,powered=true": { "model": "modernmetals:tantalum_door_bottom_rh", "y": 270 }, - "facing=north,half=lower,hinge=left,open=true,powered=true": { "model": "modernmetals:tantalum_door_bottom_rh" }, - "facing=east,half=lower,hinge=right,open=true,powered=true": { "model": "modernmetals:tantalum_door_bottom", "y": 270 }, - "facing=south,half=lower,hinge=right,open=true,powered=true": { "model": "modernmetals:tantalum_door_bottom" }, - "facing=west,half=lower,hinge=right,open=true,powered=true": { "model": "modernmetals:tantalum_door_bottom", "y": 90 }, - "facing=north,half=lower,hinge=right,open=true,powered=true": { "model": "modernmetals:tantalum_door_bottom", "y": 180 }, - "facing=east,half=upper,hinge=left,open=false,powered=true": { "model": "modernmetals:tantalum_door_top" }, - "facing=south,half=upper,hinge=left,open=false,powered=true": { "model": "modernmetals:tantalum_door_top", "y": 90 }, - "facing=west,half=upper,hinge=left,open=false,powered=true": { "model": "modernmetals:tantalum_door_top", "y": 180 }, - "facing=north,half=upper,hinge=left,open=false,powered=true": { "model": "modernmetals:tantalum_door_top", "y": 270 }, - "facing=east,half=upper,hinge=right,open=false,powered=true": { "model": "modernmetals:tantalum_door_top_rh" }, - "facing=south,half=upper,hinge=right,open=false,powered=true": { "model": "modernmetals:tantalum_door_top_rh", "y": 90 }, - "facing=west,half=upper,hinge=right,open=false,powered=true": { "model": "modernmetals:tantalum_door_top_rh", "y": 180 }, - "facing=north,half=upper,hinge=right,open=false,powered=true": { "model": "modernmetals:tantalum_door_top_rh", "y": 270 }, - "facing=east,half=upper,hinge=left,open=true,powered=true": { "model": "modernmetals:tantalum_door_top_rh", "y": 90 }, - "facing=south,half=upper,hinge=left,open=true,powered=true": { "model": "modernmetals:tantalum_door_top_rh", "y": 180 }, - "facing=west,half=upper,hinge=left,open=true,powered=true": { "model": "modernmetals:tantalum_door_top_rh", "y": 270 }, - "facing=north,half=upper,hinge=left,open=true,powered=true": { "model": "modernmetals:tantalum_door_top_rh" }, - "facing=east,half=upper,hinge=right,open=true,powered=true": { "model": "modernmetals:tantalum_door_top", "y": 270 }, - "facing=south,half=upper,hinge=right,open=true,powered=true": { "model": "modernmetals:tantalum_door_top" }, - "facing=west,half=upper,hinge=right,open=true,powered=true": { "model": "modernmetals:tantalum_door_top", "y": 90 }, - "facing=north,half=upper,hinge=right,open=true,powered=true": { "model": "modernmetals:tantalum_door_top", "y": 180 } + "variants": { + "facing=north,half=upper,hinge=left,open=false": { + "model": "modernmetals:block/tantalum_door_top", + "y": 270 + }, + "facing=south,half=upper,hinge=left,open=false": { + "model": "modernmetals:block/tantalum_door_top", + "y": 90 + }, + "facing=west,half=upper,hinge=left,open=false": { + "model": "modernmetals:block/tantalum_door_top", + "y": 180 + }, + "facing=east,half=upper,hinge=left,open=false": { + "model": "modernmetals:block/tantalum_door_top" + }, + "facing=north,half=lower,hinge=left,open=false": { + "model": "modernmetals:block/tantalum_door_bottom", + "y": 270 + }, + "facing=south,half=lower,hinge=left,open=false": { + "model": "modernmetals:block/tantalum_door_bottom", + "y": 90 + }, + "facing=west,half=lower,hinge=left,open=false": { + "model": "modernmetals:block/tantalum_door_bottom", + "y": 180 + }, + "facing=east,half=lower,hinge=left,open=false": { + "model": "modernmetals:block/tantalum_door_bottom" + }, + "facing=north,half=upper,hinge=right,open=false": { + "model": "modernmetals:block/tantalum_door_top_rh", + "y": 270 + }, + "facing=south,half=upper,hinge=right,open=false": { + "model": "modernmetals:block/tantalum_door_top_rh", + "y": 90 + }, + "facing=west,half=upper,hinge=right,open=false": { + "model": "modernmetals:block/tantalum_door_top_rh", + "y": 180 + }, + "facing=east,half=upper,hinge=right,open=false": { + "model": "modernmetals:block/tantalum_door_top_rh" + }, + "facing=north,half=lower,hinge=right,open=false": { + "model": "modernmetals:block/tantalum_door_bottom_rh", + "y": 270 + }, + "facing=south,half=lower,hinge=right,open=false": { + "model": "modernmetals:block/tantalum_door_bottom_rh", + "y": 90 + }, + "facing=west,half=lower,hinge=right,open=false": { + "model": "modernmetals:block/tantalum_door_bottom_rh", + "y": 180 + }, + "facing=east,half=lower,hinge=right,open=false": { + "model": "modernmetals:block/tantalum_door_bottom_rh" + }, + "facing=north,half=upper,hinge=left,open=true": { + "model": "modernmetals:block/tantalum_door_top_rh" + }, + "facing=south,half=upper,hinge=left,open=true": { + "model": "modernmetals:block/tantalum_door_top_rh", + "y": 180 + }, + "facing=west,half=upper,hinge=left,open=true": { + "model": "modernmetals:block/tantalum_door_top_rh", + "y": 270 + }, + "facing=east,half=upper,hinge=left,open=true": { + "model": "modernmetals:block/tantalum_door_top_rh", + "y": 90 + }, + "facing=north,half=lower,hinge=left,open=true": { + "model": "modernmetals:block/tantalum_door_bottom_rh" + }, + "facing=south,half=lower,hinge=left,open=true": { + "model": "modernmetals:block/tantalum_door_bottom_rh", + "y": 180 + }, + "facing=west,half=lower,hinge=left,open=true": { + "model": "modernmetals:block/tantalum_door_bottom_rh", + "y": 270 + }, + "facing=east,half=lower,hinge=left,open=true": { + "model": "modernmetals:block/tantalum_door_bottom_rh", + "y": 90 + }, + "facing=north,half=upper,hinge=right,open=true": { + "model": "modernmetals:block/tantalum_door_top", + "y": 180 + }, + "facing=south,half=upper,hinge=right,open=true": { + "model": "modernmetals:block/tantalum_door_top" + }, + "facing=west,half=upper,hinge=right,open=true": { + "model": "modernmetals:block/tantalum_door_top", + "y": 90 + }, + "facing=east,half=upper,hinge=right,open=true": { + "model": "modernmetals:block/tantalum_door_top", + "y": 270 + }, + "facing=north,half=lower,hinge=right,open=true": { + "model": "modernmetals:block/tantalum_door_bottom", + "y": 180 + }, + "facing=south,half=lower,hinge=right,open=true": { + "model": "modernmetals:block/tantalum_door_bottom" + }, + "facing=west,half=lower,hinge=right,open=true": { + "model": "modernmetals:block/tantalum_door_bottom", + "y": 90 + }, + "facing=east,half=lower,hinge=right,open=true": { + "model": "modernmetals:block/tantalum_door_bottom", + "y": 270 } + } } diff --git a/src/main/resources/assets/modernmetals/blockstates/tantalum_lever.json b/src/main/resources/assets/modernmetals/blockstates/tantalum_lever.json index 026c7ee0..01fe699e 100644 --- a/src/main/resources/assets/modernmetals/blockstates/tantalum_lever.json +++ b/src/main/resources/assets/modernmetals/blockstates/tantalum_lever.json @@ -1,20 +1,76 @@ { - "variants": { - "facing=down_z,powered=false": { "model": "modernmetals:tantalum_lever_off", "x": 180, "y": 180 }, - "facing=down_x,powered=false": { "model": "modernmetals:tantalum_lever_off", "x": 180, "y": 90 }, - "facing=up_z,powered=false": { "model": "modernmetals:tantalum_lever_off" }, - "facing=up_x,powered=false": { "model": "modernmetals:tantalum_lever_off", "y": 270 }, - "facing=east,powered=false": { "model": "modernmetals:tantalum_lever_off", "x": 90, "y": 90 }, - "facing=west,powered=false": { "model": "modernmetals:tantalum_lever_off", "x": 90, "y": 270 }, - "facing=south,powered=false" : { "model": "modernmetals:tantalum_lever_off", "x": 90, "y": 180 }, - "facing=north,powered=false" : { "model": "modernmetals:tantalum_lever_off", "x": 90 }, - "facing=down_z,powered=true" : { "model": "modernmetals:tantalum_lever", "x": 180, "y": 180 }, - "facing=down_x,powered=true" : { "model": "modernmetals:tantalum_lever", "x": 180, "y": 90 }, - "facing=up_z,powered=true": { "model": "modernmetals:tantalum_lever" }, - "facing=up_x,powered=true": { "model": "modernmetals:tantalum_lever", "y": 270 }, - "facing=east,powered=true": { "model": "modernmetals:tantalum_lever", "x": 90, "y": 90 }, - "facing=west,powered=true": { "model": "modernmetals:tantalum_lever", "x": 90, "y": 270 }, - "facing=south,powered=true": { "model": "modernmetals:tantalum_lever", "x": 90, "y": 180 }, - "facing=north,powered=true": { "model": "modernmetals:tantalum_lever", "x": 90 } + "variants": { + "face=floor,facing=north,powered=false": { + "model": "modernmetals:block/tantalum_lever_off" + }, + "face=wall,facing=north,powered=false": { + "model": "modernmetals:block/tantalum_lever_off" + }, + "face=ceiling,facing=north,powered=false": { + "model": "modernmetals:block/tantalum_lever_off" + }, + "face=floor,facing=south,powered=false": { + "model": "modernmetals:block/tantalum_lever_off" + }, + "face=wall,facing=south,powered=false": { + "model": "modernmetals:block/tantalum_lever_off" + }, + "face=ceiling,facing=south,powered=false": { + "model": "modernmetals:block/tantalum_lever_off" + }, + "face=floor,facing=west,powered=false": { + "model": "modernmetals:block/tantalum_lever_off" + }, + "face=wall,facing=west,powered=false": { + "model": "modernmetals:block/tantalum_lever_off" + }, + "face=ceiling,facing=west,powered=false": { + "model": "modernmetals:block/tantalum_lever_off" + }, + "face=floor,facing=east,powered=false": { + "model": "modernmetals:block/tantalum_lever_off" + }, + "face=wall,facing=east,powered=false": { + "model": "modernmetals:block/tantalum_lever_off" + }, + "face=ceiling,facing=east,powered=false": { + "model": "modernmetals:block/tantalum_lever_off" + }, + "face=floor,facing=north,powered=true": { + "model": "modernmetals:block/tantalum_lever" + }, + "face=wall,facing=north,powered=true": { + "model": "modernmetals:block/tantalum_lever" + }, + "face=ceiling,facing=north,powered=true": { + "model": "modernmetals:block/tantalum_lever" + }, + "face=floor,facing=south,powered=true": { + "model": "modernmetals:block/tantalum_lever" + }, + "face=wall,facing=south,powered=true": { + "model": "modernmetals:block/tantalum_lever" + }, + "face=ceiling,facing=south,powered=true": { + "model": "modernmetals:block/tantalum_lever" + }, + "face=floor,facing=west,powered=true": { + "model": "modernmetals:block/tantalum_lever" + }, + "face=wall,facing=west,powered=true": { + "model": "modernmetals:block/tantalum_lever" + }, + "face=ceiling,facing=west,powered=true": { + "model": "modernmetals:block/tantalum_lever" + }, + "face=floor,facing=east,powered=true": { + "model": "modernmetals:block/tantalum_lever" + }, + "face=wall,facing=east,powered=true": { + "model": "modernmetals:block/tantalum_lever" + }, + "face=ceiling,facing=east,powered=true": { + "model": "modernmetals:block/tantalum_lever" } + } } diff --git a/src/main/resources/assets/modernmetals/blockstates/tantalum_ore.json b/src/main/resources/assets/modernmetals/blockstates/tantalum_ore.json index 1f58595c..eb935568 100644 --- a/src/main/resources/assets/modernmetals/blockstates/tantalum_ore.json +++ b/src/main/resources/assets/modernmetals/blockstates/tantalum_ore.json @@ -1,5 +1,7 @@ { - "variants": { - "normal": { "model": "modernmetals:tantalum_ore" } + "variants": { + "": { + "model": "modernmetals:block/tantalum_ore" } + } } diff --git a/src/main/resources/assets/modernmetals/blockstates/tantalum_plate.json b/src/main/resources/assets/modernmetals/blockstates/tantalum_plate.json index fff3f1fb..df01a345 100644 --- a/src/main/resources/assets/modernmetals/blockstates/tantalum_plate.json +++ b/src/main/resources/assets/modernmetals/blockstates/tantalum_plate.json @@ -1,10 +1,27 @@ { - "variants": { - "facing=down": { "model": "modernmetals:tantalum_plate", "x": 90 }, - "facing=up": { "model": "modernmetals:tantalum_plate", "x": 270 }, - "facing=north": { "model": "modernmetals:tantalum_plate" }, - "facing=south": { "model": "modernmetals:tantalum_plate", "y": 180 }, - "facing=west": { "model": "modernmetals:tantalum_plate", "y": 270 }, - "facing=east": { "model": "modernmetals:tantalum_plate", "y": 90 } + "variants": { + "facing=down": { + "model": "modernmetals:block/tantalum_plate", + "x": 90 + }, + "facing=up": { + "model": "modernmetals:block/tantalum_plate", + "x": 270 + }, + "facing=north": { + "model": "modernmetals:block/tantalum_plate" + }, + "facing=south": { + "model": "modernmetals:block/tantalum_plate", + "y": 180 + }, + "facing=west": { + "model": "modernmetals:block/tantalum_plate", + "y": 270 + }, + "facing=east": { + "model": "modernmetals:block/tantalum_plate", + "y": 90 } + } } diff --git a/src/main/resources/assets/modernmetals/blockstates/tantalum_pressure_plate.json b/src/main/resources/assets/modernmetals/blockstates/tantalum_pressure_plate.json index bfd24d0c..76598ac2 100644 --- a/src/main/resources/assets/modernmetals/blockstates/tantalum_pressure_plate.json +++ b/src/main/resources/assets/modernmetals/blockstates/tantalum_pressure_plate.json @@ -1,6 +1,10 @@ { - "variants": { - "powered=false": { "model": "modernmetals:tantalum_pressure_plate_up" }, - "powered=true": { "model": "modernmetals:tantalum_pressure_plate_down" } + "variants": { + "powered=false": { + "model": "modernmetals:block/tantalum_pressure_plate_up" + }, + "powered=true": { + "model": "modernmetals:block/tantalum_pressure_plate_down" } + } } diff --git a/src/main/resources/assets/modernmetals/blockstates/tantalum_slab.json b/src/main/resources/assets/modernmetals/blockstates/tantalum_slab.json index 0e4cb184..18ad387c 100644 --- a/src/main/resources/assets/modernmetals/blockstates/tantalum_slab.json +++ b/src/main/resources/assets/modernmetals/blockstates/tantalum_slab.json @@ -1,6 +1,13 @@ { - "variants": { - "half=bottom,variant=default": { "model": "modernmetals:half_slab_tantalum" }, - "half=top,variant=default": { "model": "modernmetals:upper_slab_tantalum" } + "variants": { + "type=top": { + "model": "modernmetals:block/upper_slab_tantalum" + }, + "type=bottom": { + "model": "modernmetals:block/half_slab_tantalum" + }, + "type=double": { + "model": "modernmetals:block/tantalum_block" } + } } diff --git a/src/main/resources/assets/modernmetals/blockstates/tantalum_stairs.json b/src/main/resources/assets/modernmetals/blockstates/tantalum_stairs.json index aee8a681..9a44b9eb 100644 --- a/src/main/resources/assets/modernmetals/blockstates/tantalum_stairs.json +++ b/src/main/resources/assets/modernmetals/blockstates/tantalum_stairs.json @@ -1,44 +1,209 @@ { - "variants": { - "facing=east,half=bottom,shape=straight": { "model": "modernmetals:tantalum_stairs" }, - "facing=west,half=bottom,shape=straight": { "model": "modernmetals:tantalum_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=straight": { "model": "modernmetals:tantalum_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=straight": { "model": "modernmetals:tantalum_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_right": { "model": "modernmetals:tantalum_outer_stairs" }, - "facing=west,half=bottom,shape=outer_right": { "model": "modernmetals:tantalum_outer_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=outer_right": { "model": "modernmetals:tantalum_outer_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=outer_right": { "model": "modernmetals:tantalum_outer_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_left": { "model": "modernmetals:tantalum_outer_stairs", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=outer_left": { "model": "modernmetals:tantalum_outer_stairs", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=outer_left": { "model": "modernmetals:tantalum_outer_stairs" }, - "facing=north,half=bottom,shape=outer_left": { "model": "modernmetals:tantalum_outer_stairs", "y": 180, "uvlock": true }, - "facing=east,half=bottom,shape=inner_right": { "model": "modernmetals:tantalum_inner_stairs" }, - "facing=west,half=bottom,shape=inner_right": { "model": "modernmetals:tantalum_inner_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=inner_right": { "model": "modernmetals:tantalum_inner_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=inner_right": { "model": "modernmetals:tantalum_inner_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=inner_left": { "model": "modernmetals:tantalum_inner_stairs", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=inner_left": { "model": "modernmetals:tantalum_inner_stairs", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=inner_left": { "model": "modernmetals:tantalum_inner_stairs" }, - "facing=north,half=bottom,shape=inner_left": { "model": "modernmetals:tantalum_inner_stairs", "y": 180, "uvlock": true }, - "facing=east,half=top,shape=straight": { "model": "modernmetals:tantalum_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=straight": { "model": "modernmetals:tantalum_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=straight": { "model": "modernmetals:tantalum_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=straight": { "model": "modernmetals:tantalum_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { "model": "modernmetals:tantalum_outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_right": { "model": "modernmetals:tantalum_outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { "model": "modernmetals:tantalum_outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { "model": "modernmetals:tantalum_outer_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { "model": "modernmetals:tantalum_outer_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { "model": "modernmetals:tantalum_outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { "model": "modernmetals:tantalum_outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=outer_left": { "model": "modernmetals:tantalum_outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { "model": "modernmetals:tantalum_inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { "model": "modernmetals:tantalum_inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { "model": "modernmetals:tantalum_inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { "model": "modernmetals:tantalum_inner_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { "model": "modernmetals:tantalum_inner_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { "model": "modernmetals:tantalum_inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { "model": "modernmetals:tantalum_inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { "model": "modernmetals:tantalum_inner_stairs", "x": 180, "y": 270, "uvlock": true } + "variants": { + "facing=north,half=top,shape=straight": { + "model": "modernmetals:block/tantalum_stairs", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=south,half=top,shape=straight": { + "model": "modernmetals:block/tantalum_stairs", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=west,half=top,shape=straight": { + "model": "modernmetals:block/tantalum_stairs", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=east,half=top,shape=straight": { + "model": "modernmetals:block/tantalum_stairs", + "x": 180, + "uvlock": true + }, + "facing=north,half=bottom,shape=straight": { + "model": "modernmetals:block/tantalum_stairs", + "y": 270, + "uvlock": true + }, + "facing=south,half=bottom,shape=straight": { + "model": "modernmetals:block/tantalum_stairs", + "y": 90, + "uvlock": true + }, + "facing=west,half=bottom,shape=straight": { + "model": "modernmetals:block/tantalum_stairs", + "y": 180, + "uvlock": true + }, + "facing=east,half=bottom,shape=straight": { + "model": "modernmetals:block/tantalum_stairs" + }, + "facing=north,half=top,shape=inner_left": { + "model": "modernmetals:block/tantalum_inner_stairs", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=south,half=top,shape=inner_left": { + "model": "modernmetals:block/tantalum_inner_stairs", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=west,half=top,shape=inner_left": { + "model": "modernmetals:block/tantalum_inner_stairs", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=east,half=top,shape=inner_left": { + "model": "modernmetals:block/tantalum_inner_stairs", + "x": 180, + "uvlock": true + }, + "facing=north,half=bottom,shape=inner_left": { + "model": "modernmetals:block/tantalum_inner_stairs", + "y": 180, + "uvlock": true + }, + "facing=south,half=bottom,shape=inner_left": { + "model": "modernmetals:block/tantalum_inner_stairs" + }, + "facing=west,half=bottom,shape=inner_left": { + "model": "modernmetals:block/tantalum_inner_stairs", + "y": 90, + "uvlock": true + }, + "facing=east,half=bottom,shape=inner_left": { + "model": "modernmetals:block/tantalum_inner_stairs", + "y": 270, + "uvlock": true + }, + "facing=north,half=top,shape=inner_right": { + "model": "modernmetals:block/tantalum_inner_stairs", + "x": 180, + "uvlock": true + }, + "facing=south,half=top,shape=inner_right": { + "model": "modernmetals:block/tantalum_inner_stairs", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=west,half=top,shape=inner_right": { + "model": "modernmetals:block/tantalum_inner_stairs", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=east,half=top,shape=inner_right": { + "model": "modernmetals:block/tantalum_inner_stairs", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=north,half=bottom,shape=inner_right": { + "model": "modernmetals:block/tantalum_inner_stairs", + "y": 270, + "uvlock": true + }, + "facing=south,half=bottom,shape=inner_right": { + "model": "modernmetals:block/tantalum_inner_stairs", + "y": 90, + "uvlock": true + }, + "facing=west,half=bottom,shape=inner_right": { + "model": "modernmetals:block/tantalum_inner_stairs", + "y": 180, + "uvlock": true + }, + "facing=east,half=bottom,shape=inner_right": { + "model": "modernmetals:block/tantalum_inner_stairs" + }, + "facing=north,half=top,shape=outer_left": { + "model": "modernmetals:block/tantalum_outer_stairs", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=south,half=top,shape=outer_left": { + "model": "modernmetals:block/tantalum_outer_stairs", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=west,half=top,shape=outer_left": { + "model": "modernmetals:block/tantalum_outer_stairs", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=east,half=top,shape=outer_left": { + "model": "modernmetals:block/tantalum_outer_stairs", + "x": 180, + "uvlock": true + }, + "facing=north,half=bottom,shape=outer_left": { + "model": "modernmetals:block/tantalum_outer_stairs", + "y": 180, + "uvlock": true + }, + "facing=south,half=bottom,shape=outer_left": { + "model": "modernmetals:block/tantalum_outer_stairs" + }, + "facing=west,half=bottom,shape=outer_left": { + "model": "modernmetals:block/tantalum_outer_stairs", + "y": 90, + "uvlock": true + }, + "facing=east,half=bottom,shape=outer_left": { + "model": "modernmetals:block/tantalum_outer_stairs", + "y": 270, + "uvlock": true + }, + "facing=north,half=top,shape=outer_right": { + "model": "modernmetals:block/tantalum_outer_stairs", + "x": 180, + "uvlock": true + }, + "facing=south,half=top,shape=outer_right": { + "model": "modernmetals:block/tantalum_outer_stairs", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=west,half=top,shape=outer_right": { + "model": "modernmetals:block/tantalum_outer_stairs", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=east,half=top,shape=outer_right": { + "model": "modernmetals:block/tantalum_outer_stairs", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=north,half=bottom,shape=outer_right": { + "model": "modernmetals:block/tantalum_outer_stairs", + "y": 270, + "uvlock": true + }, + "facing=south,half=bottom,shape=outer_right": { + "model": "modernmetals:block/tantalum_outer_stairs", + "y": 90, + "uvlock": true + }, + "facing=west,half=bottom,shape=outer_right": { + "model": "modernmetals:block/tantalum_outer_stairs", + "y": 180, + "uvlock": true + }, + "facing=east,half=bottom,shape=outer_right": { + "model": "modernmetals:block/tantalum_outer_stairs" } + } } diff --git a/src/main/resources/assets/modernmetals/blockstates/tantalum_trapdoor.json b/src/main/resources/assets/modernmetals/blockstates/tantalum_trapdoor.json index 1932b714..8a07525d 100644 --- a/src/main/resources/assets/modernmetals/blockstates/tantalum_trapdoor.json +++ b/src/main/resources/assets/modernmetals/blockstates/tantalum_trapdoor.json @@ -1,20 +1,68 @@ { - "variants": { - "facing=north,half=bottom,open=false": { "model": "modernmetals:tantalum_trapdoor_bottom" }, - "facing=south,half=bottom,open=false": { "model": "modernmetals:tantalum_trapdoor_bottom" }, - "facing=east,half=bottom,open=false": { "model": "modernmetals:tantalum_trapdoor_bottom" }, - "facing=west,half=bottom,open=false": { "model": "modernmetals:tantalum_trapdoor_bottom" }, - "facing=north,half=top,open=false": { "model": "modernmetals:tantalum_trapdoor_top" }, - "facing=south,half=top,open=false": { "model": "modernmetals:tantalum_trapdoor_top" }, - "facing=east,half=top,open=false": { "model": "modernmetals:tantalum_trapdoor_top" }, - "facing=west,half=top,open=false": { "model": "modernmetals:tantalum_trapdoor_top" }, - "facing=north,half=bottom,open=true": { "model": "modernmetals:tantalum_trapdoor_open" }, - "facing=south,half=bottom,open=true": { "model": "modernmetals:tantalum_trapdoor_open", "y": 180 }, - "facing=east,half=bottom,open=true": { "model": "modernmetals:tantalum_trapdoor_open", "y": 90 }, - "facing=west,half=bottom,open=true": { "model": "modernmetals:tantalum_trapdoor_open", "y": 270 }, - "facing=north,half=top,open=true": { "model": "modernmetals:tantalum_trapdoor_open" }, - "facing=south,half=top,open=true": { "model": "modernmetals:tantalum_trapdoor_open", "y": 180 }, - "facing=east,half=top,open=true": { "model": "modernmetals:tantalum_trapdoor_open", "y": 90 }, - "facing=west,half=top,open=true": { "model": "modernmetals:tantalum_trapdoor_open", "y": 270 } + "variants": { + "facing=north,half=top,open=false": { + "model": "modernmetals:block/tantalum_trapdoor_top" + }, + "facing=south,half=top,open=false": { + "model": "modernmetals:block/tantalum_trapdoor_top", + "y": 180 + }, + "facing=west,half=top,open=false": { + "model": "modernmetals:block/tantalum_trapdoor_top", + "y": 270 + }, + "facing=east,half=top,open=false": { + "model": "modernmetals:block/tantalum_trapdoor_top", + "y": 90 + }, + "facing=north,half=bottom,open=false": { + "model": "modernmetals:block/tantalum_trapdoor_bottom" + }, + "facing=south,half=bottom,open=false": { + "model": "modernmetals:block/tantalum_trapdoor_bottom", + "y": 180 + }, + "facing=west,half=bottom,open=false": { + "model": "modernmetals:block/tantalum_trapdoor_bottom", + "y": 270 + }, + "facing=east,half=bottom,open=false": { + "model": "modernmetals:block/tantalum_trapdoor_bottom", + "y": 90 + }, + "facing=north,half=top,open=true": { + "model": "modernmetals:block/tantalum_trapdoor_open", + "x": 180, + "y": 180 + }, + "facing=south,half=top,open=true": { + "model": "modernmetals:block/tantalum_trapdoor_open", + "x": 180 + }, + "facing=west,half=top,open=true": { + "model": "modernmetals:block/tantalum_trapdoor_open", + "x": 180, + "y": 90 + }, + "facing=east,half=top,open=true": { + "model": "modernmetals:block/tantalum_trapdoor_open", + "x": 180, + "y": 270 + }, + "facing=north,half=bottom,open=true": { + "model": "modernmetals:block/tantalum_trapdoor_open" + }, + "facing=south,half=bottom,open=true": { + "model": "modernmetals:block/tantalum_trapdoor_open", + "y": 180 + }, + "facing=west,half=bottom,open=true": { + "model": "modernmetals:block/tantalum_trapdoor_open", + "y": 270 + }, + "facing=east,half=bottom,open=true": { + "model": "modernmetals:block/tantalum_trapdoor_open", + "y": 90 } + } } diff --git a/src/main/resources/assets/modernmetals/blockstates/tantalum_wall.json b/src/main/resources/assets/modernmetals/blockstates/tantalum_wall.json index af7dd5fd..84aded47 100644 --- a/src/main/resources/assets/modernmetals/blockstates/tantalum_wall.json +++ b/src/main/resources/assets/modernmetals/blockstates/tantalum_wall.json @@ -1,19 +1,51 @@ { - "multipart": [ - { "when": { "up": "true" }, - "apply": { "model": "modernmetals:tantalum_wall_post" } - }, - { "when": { "north": "true" }, - "apply": { "model": "modernmetals:tantalum_wall_side", "uvlock": true } - }, - { "when": { "east": "true" }, - "apply": { "model": "modernmetals:tantalum_wall_side", "y": 90, "uvlock": true } - }, - { "when": { "south": "true" }, - "apply": { "model": "modernmetals:tantalum_wall_side", "y": 180, "uvlock": true } - }, - { "when": { "west": "true" }, - "apply": { "model": "modernmetals:tantalum_wall_side", "y": 270, "uvlock": true } - } - ] + "multipart": [ + { + "when": { + "up": "true" + }, + "apply": { + "model": "modernmetals:block/tantalum_wall_post" + } + }, + { + "when": { + "north": "true" + }, + "apply": { + "model": "modernmetals:block/tantalum_wall_side", + "uvlock": true + } + }, + { + "when": { + "east": "true" + }, + "apply": { + "model": "modernmetals:block/tantalum_wall_side", + "y": 90, + "uvlock": true + } + }, + { + "when": { + "south": "true" + }, + "apply": { + "model": "modernmetals:block/tantalum_wall_side", + "y": 180, + "uvlock": true + } + }, + { + "when": { + "west": "true" + }, + "apply": { + "model": "modernmetals:block/tantalum_wall_side", + "y": 270, + "uvlock": true + } + } + ] } diff --git a/src/main/resources/assets/modernmetals/blockstates/thorium.json b/src/main/resources/assets/modernmetals/blockstates/thorium.json index a94e6d4d..b80e6822 100644 --- a/src/main/resources/assets/modernmetals/blockstates/thorium.json +++ b/src/main/resources/assets/modernmetals/blockstates/thorium.json @@ -1,9 +1,10 @@ { - "forge_marker": 1, - "variants": { - "fluid": { - "model": "forge:fluid", - "custom": { "fluid": "thorium" } - } + "variants": { + "": { + "model": "minecraft:block/water", + "custom": { + "fluid": "modernmetals:thorium" + } } + } } diff --git a/src/main/resources/assets/modernmetals/blockstates/thorium_bars.json b/src/main/resources/assets/modernmetals/blockstates/thorium_bars.json index 2c902a96..da5e7c49 100644 --- a/src/main/resources/assets/modernmetals/blockstates/thorium_bars.json +++ b/src/main/resources/assets/modernmetals/blockstates/thorium_bars.json @@ -1,32 +1,77 @@ { - "multipart": [ - { "apply": { "model": "modernmetals:thorium_bars_post_ends" }}, - { "when": { "north": false, "east": false, "south": false, "west": false }, - "apply": { "model": "modernmetals:thorium_bars_post" } - }, - { "when": { "north": true, "east": false, "south": false, "west": false }, - "apply": { "model": "modernmetals:thorium_bars_cap" } - }, - { "when": { "north": false, "east": true, "south": false, "west": false }, - "apply": { "model": "modernmetals:thorium_bars_cap", "y": 90 } - }, - { "when": { "north": false, "east": false, "south": true, "west": false }, - "apply": { "model": "modernmetals:thorium_bars_cap_alt" } - }, - { "when": { "north": false, "east": false, "south": false, "west": true }, - "apply": { "model": "modernmetals:thorium_bars_cap_alt", "y": 90 } - }, - { "when": { "north": true }, - "apply": { "model": "modernmetals:thorium_bars_side" } - }, - { "when": { "east": true }, - "apply": { "model": "modernmetals:thorium_bars_side", "y": 90 } - }, - { "when": { "south": true }, - "apply": { "model": "modernmetals:thorium_bars_side_alt" } - }, - { "when": { "west": true }, - "apply": { "model": "modernmetals:thorium_bars_side_alt", "y": 90 } - } - ] + "multipart": [ + { + "apply": { + "model": "modernmetals:block/thorium_bars_post" + } + }, + { + "when": { + "north": "true" + }, + "apply": { + "model": "modernmetals:block/thorium_bars_side" + } + }, + { + "when": { + "north": "false" + }, + "apply": { + "model": "modernmetals:block/thorium_bars_cap" + } + }, + { + "when": { + "south": "true" + }, + "apply": { + "model": "modernmetals:block/thorium_bars_side_alt" + } + }, + { + "when": { + "south": "false" + }, + "apply": { + "model": "modernmetals:block/thorium_bars_cap_alt", + "y": 90 + } + }, + { + "when": { + "west": "true" + }, + "apply": { + "model": "modernmetals:block/thorium_bars_side_alt", + "y": 90 + } + }, + { + "when": { + "west": "false" + }, + "apply": { + "model": "modernmetals:block/thorium_bars_cap", + "y": 270 + } + }, + { + "when": { + "east": "true" + }, + "apply": { + "model": "modernmetals:block/thorium_bars_side", + "y": 90 + } + }, + { + "when": { + "east": "false" + }, + "apply": { + "model": "modernmetals:block/thorium_bars_cap_alt" + } + } + ] } diff --git a/src/main/resources/assets/modernmetals/blockstates/thorium_block.json b/src/main/resources/assets/modernmetals/blockstates/thorium_block.json index bfe5a42d..daaab42b 100644 --- a/src/main/resources/assets/modernmetals/blockstates/thorium_block.json +++ b/src/main/resources/assets/modernmetals/blockstates/thorium_block.json @@ -1,5 +1,7 @@ { - "variants": { - "normal": { "model": "modernmetals:thorium_block" } + "variants": { + "": { + "model": "modernmetals:block/thorium_block" } + } } diff --git a/src/main/resources/assets/modernmetals/blockstates/thorium_button.json b/src/main/resources/assets/modernmetals/blockstates/thorium_button.json index 319db6ac..f74a1fa8 100644 --- a/src/main/resources/assets/modernmetals/blockstates/thorium_button.json +++ b/src/main/resources/assets/modernmetals/blockstates/thorium_button.json @@ -1,16 +1,118 @@ { - "variants": { - "facing=up,powered=false": { "model": "modernmetals:thorium_button", "uvlock": true }, - "facing=down,powered=false": { "model": "modernmetals:thorium_button", "uvlock": true, "x": 180 }, - "facing=east,powered=false": { "model": "modernmetals:thorium_button", "uvlock": true, "x": 90, "y": 90 }, - "facing=west,powered=false": { "model": "modernmetals:thorium_button", "uvlock": true, "x": 90, "y": 270 }, - "facing=south,powered=false": { "model": "modernmetals:thorium_button", "uvlock": true, "x": 90, "y": 180 }, - "facing=north,powered=false": { "model": "modernmetals:thorium_button", "uvlock": true, "x": 90 }, - "facing=up,powered=true": { "model": "modernmetals:thorium_button_pressed", "uvlock": true }, - "facing=down,powered=true": { "model": "modernmetals:thorium_button_pressed", "uvlock": true, "x": 180 }, - "facing=east,powered=true": { "model": "modernmetals:thorium_button_pressed", "uvlock": true, "x": 90, "y": 90 }, - "facing=west,powered=true": { "model": "modernmetals:thorium_button_pressed", "uvlock": true, "x": 90, "y": 270 }, - "facing=south,powered=true": { "model": "modernmetals:thorium_button_pressed", "uvlock": true, "x": 90, "y": 180 }, - "facing=north,powered=true": { "model": "modernmetals:thorium_button_pressed", "uvlock": true, "x": 90 } + "variants": { + "face=floor,facing=north,powered=false": { + "model": "modernmetals:block/thorium_button" + }, + "face=wall,facing=north,powered=false": { + "model": "modernmetals:block/thorium_button", + "x": 90, + "uvlock": true + }, + "face=ceiling,facing=north,powered=false": { + "model": "modernmetals:block/thorium_button", + "x": 180, + "y": 180 + }, + "face=floor,facing=south,powered=false": { + "model": "modernmetals:block/thorium_button", + "y": 180 + }, + "face=wall,facing=south,powered=false": { + "model": "modernmetals:block/thorium_button", + "x": 90, + "y": 180, + "uvlock": true + }, + "face=ceiling,facing=south,powered=false": { + "model": "modernmetals:block/thorium_button", + "x": 180 + }, + "face=floor,facing=west,powered=false": { + "model": "modernmetals:block/thorium_button", + "y": 270 + }, + "face=wall,facing=west,powered=false": { + "model": "modernmetals:block/thorium_button", + "x": 90, + "y": 270, + "uvlock": true + }, + "face=ceiling,facing=west,powered=false": { + "model": "modernmetals:block/thorium_button", + "x": 180, + "y": 90 + }, + "face=floor,facing=east,powered=false": { + "model": "modernmetals:block/thorium_button", + "y": 90 + }, + "face=wall,facing=east,powered=false": { + "model": "modernmetals:block/thorium_button", + "x": 90, + "y": 90, + "uvlock": true + }, + "face=ceiling,facing=east,powered=false": { + "model": "modernmetals:block/thorium_button", + "x": 180, + "y": 270 + }, + "face=floor,facing=north,powered=true": { + "model": "modernmetals:block/thorium_button_pressed" + }, + "face=wall,facing=north,powered=true": { + "model": "modernmetals:block/thorium_button_pressed", + "x": 90, + "uvlock": true + }, + "face=ceiling,facing=north,powered=true": { + "model": "modernmetals:block/thorium_button_pressed", + "x": 180, + "y": 180 + }, + "face=floor,facing=south,powered=true": { + "model": "modernmetals:block/thorium_button_pressed", + "y": 180 + }, + "face=wall,facing=south,powered=true": { + "model": "modernmetals:block/thorium_button_pressed", + "x": 90, + "y": 180, + "uvlock": true + }, + "face=ceiling,facing=south,powered=true": { + "model": "modernmetals:block/thorium_button_pressed", + "x": 180 + }, + "face=floor,facing=west,powered=true": { + "model": "modernmetals:block/thorium_button_pressed", + "y": 270 + }, + "face=wall,facing=west,powered=true": { + "model": "modernmetals:block/thorium_button_pressed", + "x": 90, + "y": 270, + "uvlock": true + }, + "face=ceiling,facing=west,powered=true": { + "model": "modernmetals:block/thorium_button_pressed", + "x": 180, + "y": 90 + }, + "face=floor,facing=east,powered=true": { + "model": "modernmetals:block/thorium_button_pressed", + "y": 90 + }, + "face=wall,facing=east,powered=true": { + "model": "modernmetals:block/thorium_button_pressed", + "x": 90, + "y": 90, + "uvlock": true + }, + "face=ceiling,facing=east,powered=true": { + "model": "modernmetals:block/thorium_button_pressed", + "x": 180, + "y": 270 } + } } diff --git a/src/main/resources/assets/modernmetals/blockstates/thorium_door.json b/src/main/resources/assets/modernmetals/blockstates/thorium_door.json index 51e6915e..efce9320 100644 --- a/src/main/resources/assets/modernmetals/blockstates/thorium_door.json +++ b/src/main/resources/assets/modernmetals/blockstates/thorium_door.json @@ -1,70 +1,124 @@ { - "variants": { - "facing=east,half=lower,hinge=left,open=false,powered=false": { "model": "modernmetals:thorium_door_bottom" }, - "facing=south,half=lower,hinge=left,open=false,powered=false": { "model": "modernmetals:thorium_door_bottom", "y": 90 }, - "facing=west,half=lower,hinge=left,open=false,powered=false": { "model": "modernmetals:thorium_door_bottom", "y": 180 }, - "facing=north,half=lower,hinge=left,open=false,powered=false": { "model": "modernmetals:thorium_door_bottom", "y": 270 }, - "facing=east,half=lower,hinge=right,open=false,powered=false": { "model": "modernmetals:thorium_door_bottom_rh" }, - "facing=south,half=lower,hinge=right,open=false,powered=false": { "model": "modernmetals:thorium_door_bottom_rh", "y": 90 }, - "facing=west,half=lower,hinge=right,open=false,powered=false": { "model": "modernmetals:thorium_door_bottom_rh", "y": 180 }, - "facing=north,half=lower,hinge=right,open=false,powered=false": { "model": "modernmetals:thorium_door_bottom_rh", "y": 270 }, - "facing=east,half=lower,hinge=left,open=true,powered=false": { "model": "modernmetals:thorium_door_bottom_rh", "y": 90 }, - "facing=south,half=lower,hinge=left,open=true,powered=false": { "model": "modernmetals:thorium_door_bottom_rh", "y": 180 }, - "facing=west,half=lower,hinge=left,open=true,powered=false": { "model": "modernmetals:thorium_door_bottom_rh", "y": 270 }, - "facing=north,half=lower,hinge=left,open=true,powered=false": { "model": "modernmetals:thorium_door_bottom_rh" }, - "facing=east,half=lower,hinge=right,open=true,powered=false": { "model": "modernmetals:thorium_door_bottom", "y": 270 }, - "facing=south,half=lower,hinge=right,open=true,powered=false": { "model": "modernmetals:thorium_door_bottom" }, - "facing=west,half=lower,hinge=right,open=true,powered=false": { "model": "modernmetals:thorium_door_bottom", "y": 90 }, - "facing=north,half=lower,hinge=right,open=true,powered=false": { "model": "modernmetals:thorium_door_bottom", "y": 180 }, - "facing=east,half=upper,hinge=left,open=false,powered=false": { "model": "modernmetals:thorium_door_top" }, - "facing=south,half=upper,hinge=left,open=false,powered=false": { "model": "modernmetals:thorium_door_top", "y": 90 }, - "facing=west,half=upper,hinge=left,open=false,powered=false": { "model": "modernmetals:thorium_door_top", "y": 180 }, - "facing=north,half=upper,hinge=left,open=false,powered=false": { "model": "modernmetals:thorium_door_top", "y": 270 }, - "facing=east,half=upper,hinge=right,open=false,powered=false": { "model": "modernmetals:thorium_door_top_rh" }, - "facing=south,half=upper,hinge=right,open=false,powered=false": { "model": "modernmetals:thorium_door_top_rh", "y": 90 }, - "facing=west,half=upper,hinge=right,open=false,powered=false": { "model": "modernmetals:thorium_door_top_rh", "y": 180 }, - "facing=north,half=upper,hinge=right,open=false,powered=false": { "model": "modernmetals:thorium_door_top_rh", "y": 270 }, - "facing=east,half=upper,hinge=left,open=true,powered=false": { "model": "modernmetals:thorium_door_top_rh", "y": 90 }, - "facing=south,half=upper,hinge=left,open=true,powered=false": { "model": "modernmetals:thorium_door_top_rh", "y": 180 }, - "facing=west,half=upper,hinge=left,open=true,powered=false": { "model": "modernmetals:thorium_door_top_rh", "y": 270 }, - "facing=north,half=upper,hinge=left,open=true,powered=false": { "model": "modernmetals:thorium_door_top_rh" }, - "facing=east,half=upper,hinge=right,open=true,powered=false": { "model": "modernmetals:thorium_door_top", "y": 270 }, - "facing=south,half=upper,hinge=right,open=true,powered=false": { "model": "modernmetals:thorium_door_top" }, - "facing=west,half=upper,hinge=right,open=true,powered=false": { "model": "modernmetals:thorium_door_top", "y": 90 }, - "facing=north,half=upper,hinge=right,open=true,powered=false": { "model": "modernmetals:thorium_door_top", "y": 180 }, - - - "facing=east,half=lower,hinge=left,open=false,powered=true": { "model": "modernmetals:thorium_door_bottom" }, - "facing=south,half=lower,hinge=left,open=false,powered=true": { "model": "modernmetals:thorium_door_bottom", "y": 90 }, - "facing=west,half=lower,hinge=left,open=false,powered=true": { "model": "modernmetals:thorium_door_bottom", "y": 180 }, - "facing=north,half=lower,hinge=left,open=false,powered=true": { "model": "modernmetals:thorium_door_bottom", "y": 270 }, - "facing=east,half=lower,hinge=right,open=false,powered=true": { "model": "modernmetals:thorium_door_bottom_rh" }, - "facing=south,half=lower,hinge=right,open=false,powered=true": { "model": "modernmetals:thorium_door_bottom_rh", "y": 90 }, - "facing=west,half=lower,hinge=right,open=false,powered=true": { "model": "modernmetals:thorium_door_bottom_rh", "y": 180 }, - "facing=north,half=lower,hinge=right,open=false,powered=true": { "model": "modernmetals:thorium_door_bottom_rh", "y": 270 }, - "facing=east,half=lower,hinge=left,open=true,powered=true": { "model": "modernmetals:thorium_door_bottom_rh", "y": 90 }, - "facing=south,half=lower,hinge=left,open=true,powered=true": { "model": "modernmetals:thorium_door_bottom_rh", "y": 180 }, - "facing=west,half=lower,hinge=left,open=true,powered=true": { "model": "modernmetals:thorium_door_bottom_rh", "y": 270 }, - "facing=north,half=lower,hinge=left,open=true,powered=true": { "model": "modernmetals:thorium_door_bottom_rh" }, - "facing=east,half=lower,hinge=right,open=true,powered=true": { "model": "modernmetals:thorium_door_bottom", "y": 270 }, - "facing=south,half=lower,hinge=right,open=true,powered=true": { "model": "modernmetals:thorium_door_bottom" }, - "facing=west,half=lower,hinge=right,open=true,powered=true": { "model": "modernmetals:thorium_door_bottom", "y": 90 }, - "facing=north,half=lower,hinge=right,open=true,powered=true": { "model": "modernmetals:thorium_door_bottom", "y": 180 }, - "facing=east,half=upper,hinge=left,open=false,powered=true": { "model": "modernmetals:thorium_door_top" }, - "facing=south,half=upper,hinge=left,open=false,powered=true": { "model": "modernmetals:thorium_door_top", "y": 90 }, - "facing=west,half=upper,hinge=left,open=false,powered=true": { "model": "modernmetals:thorium_door_top", "y": 180 }, - "facing=north,half=upper,hinge=left,open=false,powered=true": { "model": "modernmetals:thorium_door_top", "y": 270 }, - "facing=east,half=upper,hinge=right,open=false,powered=true": { "model": "modernmetals:thorium_door_top_rh" }, - "facing=south,half=upper,hinge=right,open=false,powered=true": { "model": "modernmetals:thorium_door_top_rh", "y": 90 }, - "facing=west,half=upper,hinge=right,open=false,powered=true": { "model": "modernmetals:thorium_door_top_rh", "y": 180 }, - "facing=north,half=upper,hinge=right,open=false,powered=true": { "model": "modernmetals:thorium_door_top_rh", "y": 270 }, - "facing=east,half=upper,hinge=left,open=true,powered=true": { "model": "modernmetals:thorium_door_top_rh", "y": 90 }, - "facing=south,half=upper,hinge=left,open=true,powered=true": { "model": "modernmetals:thorium_door_top_rh", "y": 180 }, - "facing=west,half=upper,hinge=left,open=true,powered=true": { "model": "modernmetals:thorium_door_top_rh", "y": 270 }, - "facing=north,half=upper,hinge=left,open=true,powered=true": { "model": "modernmetals:thorium_door_top_rh" }, - "facing=east,half=upper,hinge=right,open=true,powered=true": { "model": "modernmetals:thorium_door_top", "y": 270 }, - "facing=south,half=upper,hinge=right,open=true,powered=true": { "model": "modernmetals:thorium_door_top" }, - "facing=west,half=upper,hinge=right,open=true,powered=true": { "model": "modernmetals:thorium_door_top", "y": 90 }, - "facing=north,half=upper,hinge=right,open=true,powered=true": { "model": "modernmetals:thorium_door_top", "y": 180 } + "variants": { + "facing=north,half=upper,hinge=left,open=false": { + "model": "modernmetals:block/thorium_door_top", + "y": 270 + }, + "facing=south,half=upper,hinge=left,open=false": { + "model": "modernmetals:block/thorium_door_top", + "y": 90 + }, + "facing=west,half=upper,hinge=left,open=false": { + "model": "modernmetals:block/thorium_door_top", + "y": 180 + }, + "facing=east,half=upper,hinge=left,open=false": { + "model": "modernmetals:block/thorium_door_top" + }, + "facing=north,half=lower,hinge=left,open=false": { + "model": "modernmetals:block/thorium_door_bottom", + "y": 270 + }, + "facing=south,half=lower,hinge=left,open=false": { + "model": "modernmetals:block/thorium_door_bottom", + "y": 90 + }, + "facing=west,half=lower,hinge=left,open=false": { + "model": "modernmetals:block/thorium_door_bottom", + "y": 180 + }, + "facing=east,half=lower,hinge=left,open=false": { + "model": "modernmetals:block/thorium_door_bottom" + }, + "facing=north,half=upper,hinge=right,open=false": { + "model": "modernmetals:block/thorium_door_top_rh", + "y": 270 + }, + "facing=south,half=upper,hinge=right,open=false": { + "model": "modernmetals:block/thorium_door_top_rh", + "y": 90 + }, + "facing=west,half=upper,hinge=right,open=false": { + "model": "modernmetals:block/thorium_door_top_rh", + "y": 180 + }, + "facing=east,half=upper,hinge=right,open=false": { + "model": "modernmetals:block/thorium_door_top_rh" + }, + "facing=north,half=lower,hinge=right,open=false": { + "model": "modernmetals:block/thorium_door_bottom_rh", + "y": 270 + }, + "facing=south,half=lower,hinge=right,open=false": { + "model": "modernmetals:block/thorium_door_bottom_rh", + "y": 90 + }, + "facing=west,half=lower,hinge=right,open=false": { + "model": "modernmetals:block/thorium_door_bottom_rh", + "y": 180 + }, + "facing=east,half=lower,hinge=right,open=false": { + "model": "modernmetals:block/thorium_door_bottom_rh" + }, + "facing=north,half=upper,hinge=left,open=true": { + "model": "modernmetals:block/thorium_door_top_rh" + }, + "facing=south,half=upper,hinge=left,open=true": { + "model": "modernmetals:block/thorium_door_top_rh", + "y": 180 + }, + "facing=west,half=upper,hinge=left,open=true": { + "model": "modernmetals:block/thorium_door_top_rh", + "y": 270 + }, + "facing=east,half=upper,hinge=left,open=true": { + "model": "modernmetals:block/thorium_door_top_rh", + "y": 90 + }, + "facing=north,half=lower,hinge=left,open=true": { + "model": "modernmetals:block/thorium_door_bottom_rh" + }, + "facing=south,half=lower,hinge=left,open=true": { + "model": "modernmetals:block/thorium_door_bottom_rh", + "y": 180 + }, + "facing=west,half=lower,hinge=left,open=true": { + "model": "modernmetals:block/thorium_door_bottom_rh", + "y": 270 + }, + "facing=east,half=lower,hinge=left,open=true": { + "model": "modernmetals:block/thorium_door_bottom_rh", + "y": 90 + }, + "facing=north,half=upper,hinge=right,open=true": { + "model": "modernmetals:block/thorium_door_top", + "y": 180 + }, + "facing=south,half=upper,hinge=right,open=true": { + "model": "modernmetals:block/thorium_door_top" + }, + "facing=west,half=upper,hinge=right,open=true": { + "model": "modernmetals:block/thorium_door_top", + "y": 90 + }, + "facing=east,half=upper,hinge=right,open=true": { + "model": "modernmetals:block/thorium_door_top", + "y": 270 + }, + "facing=north,half=lower,hinge=right,open=true": { + "model": "modernmetals:block/thorium_door_bottom", + "y": 180 + }, + "facing=south,half=lower,hinge=right,open=true": { + "model": "modernmetals:block/thorium_door_bottom" + }, + "facing=west,half=lower,hinge=right,open=true": { + "model": "modernmetals:block/thorium_door_bottom", + "y": 90 + }, + "facing=east,half=lower,hinge=right,open=true": { + "model": "modernmetals:block/thorium_door_bottom", + "y": 270 } + } } diff --git a/src/main/resources/assets/modernmetals/blockstates/thorium_lever.json b/src/main/resources/assets/modernmetals/blockstates/thorium_lever.json index d704efa4..858e4a20 100644 --- a/src/main/resources/assets/modernmetals/blockstates/thorium_lever.json +++ b/src/main/resources/assets/modernmetals/blockstates/thorium_lever.json @@ -1,20 +1,76 @@ { - "variants": { - "facing=down_z,powered=false": { "model": "modernmetals:thorium_lever_off", "x": 180, "y": 180 }, - "facing=down_x,powered=false": { "model": "modernmetals:thorium_lever_off", "x": 180, "y": 90 }, - "facing=up_z,powered=false": { "model": "modernmetals:thorium_lever_off" }, - "facing=up_x,powered=false": { "model": "modernmetals:thorium_lever_off", "y": 270 }, - "facing=east,powered=false": { "model": "modernmetals:thorium_lever_off", "x": 90, "y": 90 }, - "facing=west,powered=false": { "model": "modernmetals:thorium_lever_off", "x": 90, "y": 270 }, - "facing=south,powered=false" : { "model": "modernmetals:thorium_lever_off", "x": 90, "y": 180 }, - "facing=north,powered=false" : { "model": "modernmetals:thorium_lever_off", "x": 90 }, - "facing=down_z,powered=true" : { "model": "modernmetals:thorium_lever", "x": 180, "y": 180 }, - "facing=down_x,powered=true" : { "model": "modernmetals:thorium_lever", "x": 180, "y": 90 }, - "facing=up_z,powered=true": { "model": "modernmetals:thorium_lever" }, - "facing=up_x,powered=true": { "model": "modernmetals:thorium_lever", "y": 270 }, - "facing=east,powered=true": { "model": "modernmetals:thorium_lever", "x": 90, "y": 90 }, - "facing=west,powered=true": { "model": "modernmetals:thorium_lever", "x": 90, "y": 270 }, - "facing=south,powered=true": { "model": "modernmetals:thorium_lever", "x": 90, "y": 180 }, - "facing=north,powered=true": { "model": "modernmetals:thorium_lever", "x": 90 } + "variants": { + "face=floor,facing=north,powered=false": { + "model": "modernmetals:block/thorium_lever_off" + }, + "face=wall,facing=north,powered=false": { + "model": "modernmetals:block/thorium_lever_off" + }, + "face=ceiling,facing=north,powered=false": { + "model": "modernmetals:block/thorium_lever_off" + }, + "face=floor,facing=south,powered=false": { + "model": "modernmetals:block/thorium_lever_off" + }, + "face=wall,facing=south,powered=false": { + "model": "modernmetals:block/thorium_lever_off" + }, + "face=ceiling,facing=south,powered=false": { + "model": "modernmetals:block/thorium_lever_off" + }, + "face=floor,facing=west,powered=false": { + "model": "modernmetals:block/thorium_lever_off" + }, + "face=wall,facing=west,powered=false": { + "model": "modernmetals:block/thorium_lever_off" + }, + "face=ceiling,facing=west,powered=false": { + "model": "modernmetals:block/thorium_lever_off" + }, + "face=floor,facing=east,powered=false": { + "model": "modernmetals:block/thorium_lever_off" + }, + "face=wall,facing=east,powered=false": { + "model": "modernmetals:block/thorium_lever_off" + }, + "face=ceiling,facing=east,powered=false": { + "model": "modernmetals:block/thorium_lever_off" + }, + "face=floor,facing=north,powered=true": { + "model": "modernmetals:block/thorium_lever" + }, + "face=wall,facing=north,powered=true": { + "model": "modernmetals:block/thorium_lever" + }, + "face=ceiling,facing=north,powered=true": { + "model": "modernmetals:block/thorium_lever" + }, + "face=floor,facing=south,powered=true": { + "model": "modernmetals:block/thorium_lever" + }, + "face=wall,facing=south,powered=true": { + "model": "modernmetals:block/thorium_lever" + }, + "face=ceiling,facing=south,powered=true": { + "model": "modernmetals:block/thorium_lever" + }, + "face=floor,facing=west,powered=true": { + "model": "modernmetals:block/thorium_lever" + }, + "face=wall,facing=west,powered=true": { + "model": "modernmetals:block/thorium_lever" + }, + "face=ceiling,facing=west,powered=true": { + "model": "modernmetals:block/thorium_lever" + }, + "face=floor,facing=east,powered=true": { + "model": "modernmetals:block/thorium_lever" + }, + "face=wall,facing=east,powered=true": { + "model": "modernmetals:block/thorium_lever" + }, + "face=ceiling,facing=east,powered=true": { + "model": "modernmetals:block/thorium_lever" } + } } diff --git a/src/main/resources/assets/modernmetals/blockstates/thorium_ore.json b/src/main/resources/assets/modernmetals/blockstates/thorium_ore.json index 6a5e10ba..bbf6253c 100644 --- a/src/main/resources/assets/modernmetals/blockstates/thorium_ore.json +++ b/src/main/resources/assets/modernmetals/blockstates/thorium_ore.json @@ -1,5 +1,7 @@ { - "variants": { - "normal": { "model": "modernmetals:thorium_ore" } + "variants": { + "": { + "model": "modernmetals:block/thorium_ore" } + } } diff --git a/src/main/resources/assets/modernmetals/blockstates/thorium_plate.json b/src/main/resources/assets/modernmetals/blockstates/thorium_plate.json index 9db1c419..3c74befb 100644 --- a/src/main/resources/assets/modernmetals/blockstates/thorium_plate.json +++ b/src/main/resources/assets/modernmetals/blockstates/thorium_plate.json @@ -1,10 +1,27 @@ { - "variants": { - "facing=down": { "model": "modernmetals:thorium_plate", "x": 90 }, - "facing=up": { "model": "modernmetals:thorium_plate", "x": 270 }, - "facing=north": { "model": "modernmetals:thorium_plate" }, - "facing=south": { "model": "modernmetals:thorium_plate", "y": 180 }, - "facing=west": { "model": "modernmetals:thorium_plate", "y": 270 }, - "facing=east": { "model": "modernmetals:thorium_plate", "y": 90 } + "variants": { + "facing=down": { + "model": "modernmetals:block/thorium_plate", + "x": 90 + }, + "facing=up": { + "model": "modernmetals:block/thorium_plate", + "x": 270 + }, + "facing=north": { + "model": "modernmetals:block/thorium_plate" + }, + "facing=south": { + "model": "modernmetals:block/thorium_plate", + "y": 180 + }, + "facing=west": { + "model": "modernmetals:block/thorium_plate", + "y": 270 + }, + "facing=east": { + "model": "modernmetals:block/thorium_plate", + "y": 90 } + } } diff --git a/src/main/resources/assets/modernmetals/blockstates/thorium_pressure_plate.json b/src/main/resources/assets/modernmetals/blockstates/thorium_pressure_plate.json index 931ab600..7a75c366 100644 --- a/src/main/resources/assets/modernmetals/blockstates/thorium_pressure_plate.json +++ b/src/main/resources/assets/modernmetals/blockstates/thorium_pressure_plate.json @@ -1,6 +1,10 @@ { - "variants": { - "powered=false": { "model": "modernmetals:thorium_pressure_plate_up" }, - "powered=true": { "model": "modernmetals:thorium_pressure_plate_down" } + "variants": { + "powered=false": { + "model": "modernmetals:block/thorium_pressure_plate_up" + }, + "powered=true": { + "model": "modernmetals:block/thorium_pressure_plate_down" } + } } diff --git a/src/main/resources/assets/modernmetals/blockstates/thorium_slab.json b/src/main/resources/assets/modernmetals/blockstates/thorium_slab.json index 44a3c9b0..e9baf551 100644 --- a/src/main/resources/assets/modernmetals/blockstates/thorium_slab.json +++ b/src/main/resources/assets/modernmetals/blockstates/thorium_slab.json @@ -1,6 +1,13 @@ { - "variants": { - "half=bottom,variant=default": { "model": "modernmetals:half_slab_thorium" }, - "half=top,variant=default": { "model": "modernmetals:upper_slab_thorium" } + "variants": { + "type=top": { + "model": "modernmetals:block/upper_slab_thorium" + }, + "type=bottom": { + "model": "modernmetals:block/half_slab_thorium" + }, + "type=double": { + "model": "modernmetals:block/thorium_block" } + } } diff --git a/src/main/resources/assets/modernmetals/blockstates/thorium_stairs.json b/src/main/resources/assets/modernmetals/blockstates/thorium_stairs.json index ddd0fed0..e3828937 100644 --- a/src/main/resources/assets/modernmetals/blockstates/thorium_stairs.json +++ b/src/main/resources/assets/modernmetals/blockstates/thorium_stairs.json @@ -1,44 +1,209 @@ { - "variants": { - "facing=east,half=bottom,shape=straight": { "model": "modernmetals:thorium_stairs" }, - "facing=west,half=bottom,shape=straight": { "model": "modernmetals:thorium_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=straight": { "model": "modernmetals:thorium_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=straight": { "model": "modernmetals:thorium_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_right": { "model": "modernmetals:thorium_outer_stairs" }, - "facing=west,half=bottom,shape=outer_right": { "model": "modernmetals:thorium_outer_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=outer_right": { "model": "modernmetals:thorium_outer_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=outer_right": { "model": "modernmetals:thorium_outer_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_left": { "model": "modernmetals:thorium_outer_stairs", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=outer_left": { "model": "modernmetals:thorium_outer_stairs", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=outer_left": { "model": "modernmetals:thorium_outer_stairs" }, - "facing=north,half=bottom,shape=outer_left": { "model": "modernmetals:thorium_outer_stairs", "y": 180, "uvlock": true }, - "facing=east,half=bottom,shape=inner_right": { "model": "modernmetals:thorium_inner_stairs" }, - "facing=west,half=bottom,shape=inner_right": { "model": "modernmetals:thorium_inner_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=inner_right": { "model": "modernmetals:thorium_inner_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=inner_right": { "model": "modernmetals:thorium_inner_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=inner_left": { "model": "modernmetals:thorium_inner_stairs", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=inner_left": { "model": "modernmetals:thorium_inner_stairs", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=inner_left": { "model": "modernmetals:thorium_inner_stairs" }, - "facing=north,half=bottom,shape=inner_left": { "model": "modernmetals:thorium_inner_stairs", "y": 180, "uvlock": true }, - "facing=east,half=top,shape=straight": { "model": "modernmetals:thorium_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=straight": { "model": "modernmetals:thorium_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=straight": { "model": "modernmetals:thorium_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=straight": { "model": "modernmetals:thorium_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { "model": "modernmetals:thorium_outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_right": { "model": "modernmetals:thorium_outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { "model": "modernmetals:thorium_outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { "model": "modernmetals:thorium_outer_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { "model": "modernmetals:thorium_outer_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { "model": "modernmetals:thorium_outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { "model": "modernmetals:thorium_outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=outer_left": { "model": "modernmetals:thorium_outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { "model": "modernmetals:thorium_inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { "model": "modernmetals:thorium_inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { "model": "modernmetals:thorium_inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { "model": "modernmetals:thorium_inner_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { "model": "modernmetals:thorium_inner_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { "model": "modernmetals:thorium_inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { "model": "modernmetals:thorium_inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { "model": "modernmetals:thorium_inner_stairs", "x": 180, "y": 270, "uvlock": true } + "variants": { + "facing=north,half=top,shape=straight": { + "model": "modernmetals:block/thorium_stairs", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=south,half=top,shape=straight": { + "model": "modernmetals:block/thorium_stairs", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=west,half=top,shape=straight": { + "model": "modernmetals:block/thorium_stairs", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=east,half=top,shape=straight": { + "model": "modernmetals:block/thorium_stairs", + "x": 180, + "uvlock": true + }, + "facing=north,half=bottom,shape=straight": { + "model": "modernmetals:block/thorium_stairs", + "y": 270, + "uvlock": true + }, + "facing=south,half=bottom,shape=straight": { + "model": "modernmetals:block/thorium_stairs", + "y": 90, + "uvlock": true + }, + "facing=west,half=bottom,shape=straight": { + "model": "modernmetals:block/thorium_stairs", + "y": 180, + "uvlock": true + }, + "facing=east,half=bottom,shape=straight": { + "model": "modernmetals:block/thorium_stairs" + }, + "facing=north,half=top,shape=inner_left": { + "model": "modernmetals:block/thorium_inner_stairs", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=south,half=top,shape=inner_left": { + "model": "modernmetals:block/thorium_inner_stairs", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=west,half=top,shape=inner_left": { + "model": "modernmetals:block/thorium_inner_stairs", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=east,half=top,shape=inner_left": { + "model": "modernmetals:block/thorium_inner_stairs", + "x": 180, + "uvlock": true + }, + "facing=north,half=bottom,shape=inner_left": { + "model": "modernmetals:block/thorium_inner_stairs", + "y": 180, + "uvlock": true + }, + "facing=south,half=bottom,shape=inner_left": { + "model": "modernmetals:block/thorium_inner_stairs" + }, + "facing=west,half=bottom,shape=inner_left": { + "model": "modernmetals:block/thorium_inner_stairs", + "y": 90, + "uvlock": true + }, + "facing=east,half=bottom,shape=inner_left": { + "model": "modernmetals:block/thorium_inner_stairs", + "y": 270, + "uvlock": true + }, + "facing=north,half=top,shape=inner_right": { + "model": "modernmetals:block/thorium_inner_stairs", + "x": 180, + "uvlock": true + }, + "facing=south,half=top,shape=inner_right": { + "model": "modernmetals:block/thorium_inner_stairs", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=west,half=top,shape=inner_right": { + "model": "modernmetals:block/thorium_inner_stairs", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=east,half=top,shape=inner_right": { + "model": "modernmetals:block/thorium_inner_stairs", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=north,half=bottom,shape=inner_right": { + "model": "modernmetals:block/thorium_inner_stairs", + "y": 270, + "uvlock": true + }, + "facing=south,half=bottom,shape=inner_right": { + "model": "modernmetals:block/thorium_inner_stairs", + "y": 90, + "uvlock": true + }, + "facing=west,half=bottom,shape=inner_right": { + "model": "modernmetals:block/thorium_inner_stairs", + "y": 180, + "uvlock": true + }, + "facing=east,half=bottom,shape=inner_right": { + "model": "modernmetals:block/thorium_inner_stairs" + }, + "facing=north,half=top,shape=outer_left": { + "model": "modernmetals:block/thorium_outer_stairs", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=south,half=top,shape=outer_left": { + "model": "modernmetals:block/thorium_outer_stairs", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=west,half=top,shape=outer_left": { + "model": "modernmetals:block/thorium_outer_stairs", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=east,half=top,shape=outer_left": { + "model": "modernmetals:block/thorium_outer_stairs", + "x": 180, + "uvlock": true + }, + "facing=north,half=bottom,shape=outer_left": { + "model": "modernmetals:block/thorium_outer_stairs", + "y": 180, + "uvlock": true + }, + "facing=south,half=bottom,shape=outer_left": { + "model": "modernmetals:block/thorium_outer_stairs" + }, + "facing=west,half=bottom,shape=outer_left": { + "model": "modernmetals:block/thorium_outer_stairs", + "y": 90, + "uvlock": true + }, + "facing=east,half=bottom,shape=outer_left": { + "model": "modernmetals:block/thorium_outer_stairs", + "y": 270, + "uvlock": true + }, + "facing=north,half=top,shape=outer_right": { + "model": "modernmetals:block/thorium_outer_stairs", + "x": 180, + "uvlock": true + }, + "facing=south,half=top,shape=outer_right": { + "model": "modernmetals:block/thorium_outer_stairs", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=west,half=top,shape=outer_right": { + "model": "modernmetals:block/thorium_outer_stairs", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=east,half=top,shape=outer_right": { + "model": "modernmetals:block/thorium_outer_stairs", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=north,half=bottom,shape=outer_right": { + "model": "modernmetals:block/thorium_outer_stairs", + "y": 270, + "uvlock": true + }, + "facing=south,half=bottom,shape=outer_right": { + "model": "modernmetals:block/thorium_outer_stairs", + "y": 90, + "uvlock": true + }, + "facing=west,half=bottom,shape=outer_right": { + "model": "modernmetals:block/thorium_outer_stairs", + "y": 180, + "uvlock": true + }, + "facing=east,half=bottom,shape=outer_right": { + "model": "modernmetals:block/thorium_outer_stairs" } + } } diff --git a/src/main/resources/assets/modernmetals/blockstates/thorium_trapdoor.json b/src/main/resources/assets/modernmetals/blockstates/thorium_trapdoor.json index abe76fa6..8ff0bc2e 100644 --- a/src/main/resources/assets/modernmetals/blockstates/thorium_trapdoor.json +++ b/src/main/resources/assets/modernmetals/blockstates/thorium_trapdoor.json @@ -1,20 +1,68 @@ { - "variants": { - "facing=north,half=bottom,open=false": { "model": "modernmetals:thorium_trapdoor_bottom" }, - "facing=south,half=bottom,open=false": { "model": "modernmetals:thorium_trapdoor_bottom" }, - "facing=east,half=bottom,open=false": { "model": "modernmetals:thorium_trapdoor_bottom" }, - "facing=west,half=bottom,open=false": { "model": "modernmetals:thorium_trapdoor_bottom" }, - "facing=north,half=top,open=false": { "model": "modernmetals:thorium_trapdoor_top" }, - "facing=south,half=top,open=false": { "model": "modernmetals:thorium_trapdoor_top" }, - "facing=east,half=top,open=false": { "model": "modernmetals:thorium_trapdoor_top" }, - "facing=west,half=top,open=false": { "model": "modernmetals:thorium_trapdoor_top" }, - "facing=north,half=bottom,open=true": { "model": "modernmetals:thorium_trapdoor_open" }, - "facing=south,half=bottom,open=true": { "model": "modernmetals:thorium_trapdoor_open", "y": 180 }, - "facing=east,half=bottom,open=true": { "model": "modernmetals:thorium_trapdoor_open", "y": 90 }, - "facing=west,half=bottom,open=true": { "model": "modernmetals:thorium_trapdoor_open", "y": 270 }, - "facing=north,half=top,open=true": { "model": "modernmetals:thorium_trapdoor_open" }, - "facing=south,half=top,open=true": { "model": "modernmetals:thorium_trapdoor_open", "y": 180 }, - "facing=east,half=top,open=true": { "model": "modernmetals:thorium_trapdoor_open", "y": 90 }, - "facing=west,half=top,open=true": { "model": "modernmetals:thorium_trapdoor_open", "y": 270 } + "variants": { + "facing=north,half=top,open=false": { + "model": "modernmetals:block/thorium_trapdoor_top" + }, + "facing=south,half=top,open=false": { + "model": "modernmetals:block/thorium_trapdoor_top", + "y": 180 + }, + "facing=west,half=top,open=false": { + "model": "modernmetals:block/thorium_trapdoor_top", + "y": 270 + }, + "facing=east,half=top,open=false": { + "model": "modernmetals:block/thorium_trapdoor_top", + "y": 90 + }, + "facing=north,half=bottom,open=false": { + "model": "modernmetals:block/thorium_trapdoor_bottom" + }, + "facing=south,half=bottom,open=false": { + "model": "modernmetals:block/thorium_trapdoor_bottom", + "y": 180 + }, + "facing=west,half=bottom,open=false": { + "model": "modernmetals:block/thorium_trapdoor_bottom", + "y": 270 + }, + "facing=east,half=bottom,open=false": { + "model": "modernmetals:block/thorium_trapdoor_bottom", + "y": 90 + }, + "facing=north,half=top,open=true": { + "model": "modernmetals:block/thorium_trapdoor_open", + "x": 180, + "y": 180 + }, + "facing=south,half=top,open=true": { + "model": "modernmetals:block/thorium_trapdoor_open", + "x": 180 + }, + "facing=west,half=top,open=true": { + "model": "modernmetals:block/thorium_trapdoor_open", + "x": 180, + "y": 90 + }, + "facing=east,half=top,open=true": { + "model": "modernmetals:block/thorium_trapdoor_open", + "x": 180, + "y": 270 + }, + "facing=north,half=bottom,open=true": { + "model": "modernmetals:block/thorium_trapdoor_open" + }, + "facing=south,half=bottom,open=true": { + "model": "modernmetals:block/thorium_trapdoor_open", + "y": 180 + }, + "facing=west,half=bottom,open=true": { + "model": "modernmetals:block/thorium_trapdoor_open", + "y": 270 + }, + "facing=east,half=bottom,open=true": { + "model": "modernmetals:block/thorium_trapdoor_open", + "y": 90 } + } } diff --git a/src/main/resources/assets/modernmetals/blockstates/thorium_wall.json b/src/main/resources/assets/modernmetals/blockstates/thorium_wall.json index 88e27eab..1bbcd20d 100644 --- a/src/main/resources/assets/modernmetals/blockstates/thorium_wall.json +++ b/src/main/resources/assets/modernmetals/blockstates/thorium_wall.json @@ -1,19 +1,51 @@ { - "multipart": [ - { "when": { "up": "true" }, - "apply": { "model": "modernmetals:thorium_wall_post" } - }, - { "when": { "north": "true" }, - "apply": { "model": "modernmetals:thorium_wall_side", "uvlock": true } - }, - { "when": { "east": "true" }, - "apply": { "model": "modernmetals:thorium_wall_side", "y": 90, "uvlock": true } - }, - { "when": { "south": "true" }, - "apply": { "model": "modernmetals:thorium_wall_side", "y": 180, "uvlock": true } - }, - { "when": { "west": "true" }, - "apply": { "model": "modernmetals:thorium_wall_side", "y": 270, "uvlock": true } - } - ] + "multipart": [ + { + "when": { + "up": "true" + }, + "apply": { + "model": "modernmetals:block/thorium_wall_post" + } + }, + { + "when": { + "north": "true" + }, + "apply": { + "model": "modernmetals:block/thorium_wall_side", + "uvlock": true + } + }, + { + "when": { + "east": "true" + }, + "apply": { + "model": "modernmetals:block/thorium_wall_side", + "y": 90, + "uvlock": true + } + }, + { + "when": { + "south": "true" + }, + "apply": { + "model": "modernmetals:block/thorium_wall_side", + "y": 180, + "uvlock": true + } + }, + { + "when": { + "west": "true" + }, + "apply": { + "model": "modernmetals:block/thorium_wall_side", + "y": 270, + "uvlock": true + } + } + ] } diff --git a/src/main/resources/assets/modernmetals/blockstates/titanium.json b/src/main/resources/assets/modernmetals/blockstates/titanium.json index 6e7eb218..587f1599 100644 --- a/src/main/resources/assets/modernmetals/blockstates/titanium.json +++ b/src/main/resources/assets/modernmetals/blockstates/titanium.json @@ -1,9 +1,10 @@ { - "forge_marker": 1, - "variants": { - "fluid": { - "model": "forge:fluid", - "custom": { "fluid": "titanium" } - } + "variants": { + "": { + "model": "minecraft:block/water", + "custom": { + "fluid": "modernmetals:titanium" + } } -} \ No newline at end of file + } +} diff --git a/src/main/resources/assets/modernmetals/blockstates/titanium_bars.json b/src/main/resources/assets/modernmetals/blockstates/titanium_bars.json index 9b99dbe4..54674e22 100644 --- a/src/main/resources/assets/modernmetals/blockstates/titanium_bars.json +++ b/src/main/resources/assets/modernmetals/blockstates/titanium_bars.json @@ -1,32 +1,77 @@ { - "multipart": [ - { "apply": { "model": "modernmetals:titanium_bars_post_ends" }}, - { "when": { "north": false, "east": false, "south": false, "west": false }, - "apply": { "model": "modernmetals:titanium_bars_post" } - }, - { "when": { "north": true, "east": false, "south": false, "west": false }, - "apply": { "model": "modernmetals:titanium_bars_cap" } - }, - { "when": { "north": false, "east": true, "south": false, "west": false }, - "apply": { "model": "modernmetals:titanium_bars_cap", "y": 90 } - }, - { "when": { "north": false, "east": false, "south": true, "west": false }, - "apply": { "model": "modernmetals:titanium_bars_cap_alt" } - }, - { "when": { "north": false, "east": false, "south": false, "west": true }, - "apply": { "model": "modernmetals:titanium_bars_cap_alt", "y": 90 } - }, - { "when": { "north": true }, - "apply": { "model": "modernmetals:titanium_bars_side" } - }, - { "when": { "east": true }, - "apply": { "model": "modernmetals:titanium_bars_side", "y": 90 } - }, - { "when": { "south": true }, - "apply": { "model": "modernmetals:titanium_bars_side_alt" } - }, - { "when": { "west": true }, - "apply": { "model": "modernmetals:titanium_bars_side_alt", "y": 90 } - } - ] + "multipart": [ + { + "apply": { + "model": "modernmetals:block/titanium_bars_post" + } + }, + { + "when": { + "north": "true" + }, + "apply": { + "model": "modernmetals:block/titanium_bars_side" + } + }, + { + "when": { + "north": "false" + }, + "apply": { + "model": "modernmetals:block/titanium_bars_cap" + } + }, + { + "when": { + "south": "true" + }, + "apply": { + "model": "modernmetals:block/titanium_bars_side_alt" + } + }, + { + "when": { + "south": "false" + }, + "apply": { + "model": "modernmetals:block/titanium_bars_cap_alt", + "y": 90 + } + }, + { + "when": { + "west": "true" + }, + "apply": { + "model": "modernmetals:block/titanium_bars_side_alt", + "y": 90 + } + }, + { + "when": { + "west": "false" + }, + "apply": { + "model": "modernmetals:block/titanium_bars_cap", + "y": 270 + } + }, + { + "when": { + "east": "true" + }, + "apply": { + "model": "modernmetals:block/titanium_bars_side", + "y": 90 + } + }, + { + "when": { + "east": "false" + }, + "apply": { + "model": "modernmetals:block/titanium_bars_cap_alt" + } + } + ] } diff --git a/src/main/resources/assets/modernmetals/blockstates/titanium_block.json b/src/main/resources/assets/modernmetals/blockstates/titanium_block.json index b5f48886..034d2d9d 100644 --- a/src/main/resources/assets/modernmetals/blockstates/titanium_block.json +++ b/src/main/resources/assets/modernmetals/blockstates/titanium_block.json @@ -1,5 +1,7 @@ { - "variants": { - "normal": { "model": "modernmetals:titanium_block" } + "variants": { + "": { + "model": "modernmetals:block/titanium_block" } + } } diff --git a/src/main/resources/assets/modernmetals/blockstates/titanium_button.json b/src/main/resources/assets/modernmetals/blockstates/titanium_button.json index a93e385b..b97875f6 100644 --- a/src/main/resources/assets/modernmetals/blockstates/titanium_button.json +++ b/src/main/resources/assets/modernmetals/blockstates/titanium_button.json @@ -1,16 +1,118 @@ { - "variants": { - "facing=up,powered=false": { "model": "modernmetals:titanium_button", "uvlock": true }, - "facing=down,powered=false": { "model": "modernmetals:titanium_button", "uvlock": true, "x": 180 }, - "facing=east,powered=false": { "model": "modernmetals:titanium_button", "uvlock": true, "x": 90, "y": 90 }, - "facing=west,powered=false": { "model": "modernmetals:titanium_button", "uvlock": true, "x": 90, "y": 270 }, - "facing=south,powered=false": { "model": "modernmetals:titanium_button", "uvlock": true, "x": 90, "y": 180 }, - "facing=north,powered=false": { "model": "modernmetals:titanium_button", "uvlock": true, "x": 90 }, - "facing=up,powered=true": { "model": "modernmetals:titanium_button_pressed", "uvlock": true }, - "facing=down,powered=true": { "model": "modernmetals:titanium_button_pressed", "uvlock": true, "x": 180 }, - "facing=east,powered=true": { "model": "modernmetals:titanium_button_pressed", "uvlock": true, "x": 90, "y": 90 }, - "facing=west,powered=true": { "model": "modernmetals:titanium_button_pressed", "uvlock": true, "x": 90, "y": 270 }, - "facing=south,powered=true": { "model": "modernmetals:titanium_button_pressed", "uvlock": true, "x": 90, "y": 180 }, - "facing=north,powered=true": { "model": "modernmetals:titanium_button_pressed", "uvlock": true, "x": 90 } + "variants": { + "face=floor,facing=north,powered=false": { + "model": "modernmetals:block/titanium_button" + }, + "face=wall,facing=north,powered=false": { + "model": "modernmetals:block/titanium_button", + "x": 90, + "uvlock": true + }, + "face=ceiling,facing=north,powered=false": { + "model": "modernmetals:block/titanium_button", + "x": 180, + "y": 180 + }, + "face=floor,facing=south,powered=false": { + "model": "modernmetals:block/titanium_button", + "y": 180 + }, + "face=wall,facing=south,powered=false": { + "model": "modernmetals:block/titanium_button", + "x": 90, + "y": 180, + "uvlock": true + }, + "face=ceiling,facing=south,powered=false": { + "model": "modernmetals:block/titanium_button", + "x": 180 + }, + "face=floor,facing=west,powered=false": { + "model": "modernmetals:block/titanium_button", + "y": 270 + }, + "face=wall,facing=west,powered=false": { + "model": "modernmetals:block/titanium_button", + "x": 90, + "y": 270, + "uvlock": true + }, + "face=ceiling,facing=west,powered=false": { + "model": "modernmetals:block/titanium_button", + "x": 180, + "y": 90 + }, + "face=floor,facing=east,powered=false": { + "model": "modernmetals:block/titanium_button", + "y": 90 + }, + "face=wall,facing=east,powered=false": { + "model": "modernmetals:block/titanium_button", + "x": 90, + "y": 90, + "uvlock": true + }, + "face=ceiling,facing=east,powered=false": { + "model": "modernmetals:block/titanium_button", + "x": 180, + "y": 270 + }, + "face=floor,facing=north,powered=true": { + "model": "modernmetals:block/titanium_button_pressed" + }, + "face=wall,facing=north,powered=true": { + "model": "modernmetals:block/titanium_button_pressed", + "x": 90, + "uvlock": true + }, + "face=ceiling,facing=north,powered=true": { + "model": "modernmetals:block/titanium_button_pressed", + "x": 180, + "y": 180 + }, + "face=floor,facing=south,powered=true": { + "model": "modernmetals:block/titanium_button_pressed", + "y": 180 + }, + "face=wall,facing=south,powered=true": { + "model": "modernmetals:block/titanium_button_pressed", + "x": 90, + "y": 180, + "uvlock": true + }, + "face=ceiling,facing=south,powered=true": { + "model": "modernmetals:block/titanium_button_pressed", + "x": 180 + }, + "face=floor,facing=west,powered=true": { + "model": "modernmetals:block/titanium_button_pressed", + "y": 270 + }, + "face=wall,facing=west,powered=true": { + "model": "modernmetals:block/titanium_button_pressed", + "x": 90, + "y": 270, + "uvlock": true + }, + "face=ceiling,facing=west,powered=true": { + "model": "modernmetals:block/titanium_button_pressed", + "x": 180, + "y": 90 + }, + "face=floor,facing=east,powered=true": { + "model": "modernmetals:block/titanium_button_pressed", + "y": 90 + }, + "face=wall,facing=east,powered=true": { + "model": "modernmetals:block/titanium_button_pressed", + "x": 90, + "y": 90, + "uvlock": true + }, + "face=ceiling,facing=east,powered=true": { + "model": "modernmetals:block/titanium_button_pressed", + "x": 180, + "y": 270 } + } } diff --git a/src/main/resources/assets/modernmetals/blockstates/titanium_door.json b/src/main/resources/assets/modernmetals/blockstates/titanium_door.json index c1daa2eb..18a22398 100644 --- a/src/main/resources/assets/modernmetals/blockstates/titanium_door.json +++ b/src/main/resources/assets/modernmetals/blockstates/titanium_door.json @@ -1,70 +1,124 @@ { - "variants": { - "facing=east,half=lower,hinge=left,open=false,powered=false": { "model": "modernmetals:titanium_door_bottom" }, - "facing=south,half=lower,hinge=left,open=false,powered=false": { "model": "modernmetals:titanium_door_bottom", "y": 90 }, - "facing=west,half=lower,hinge=left,open=false,powered=false": { "model": "modernmetals:titanium_door_bottom", "y": 180 }, - "facing=north,half=lower,hinge=left,open=false,powered=false": { "model": "modernmetals:titanium_door_bottom", "y": 270 }, - "facing=east,half=lower,hinge=right,open=false,powered=false": { "model": "modernmetals:titanium_door_bottom_rh" }, - "facing=south,half=lower,hinge=right,open=false,powered=false": { "model": "modernmetals:titanium_door_bottom_rh", "y": 90 }, - "facing=west,half=lower,hinge=right,open=false,powered=false": { "model": "modernmetals:titanium_door_bottom_rh", "y": 180 }, - "facing=north,half=lower,hinge=right,open=false,powered=false": { "model": "modernmetals:titanium_door_bottom_rh", "y": 270 }, - "facing=east,half=lower,hinge=left,open=true,powered=false": { "model": "modernmetals:titanium_door_bottom_rh", "y": 90 }, - "facing=south,half=lower,hinge=left,open=true,powered=false": { "model": "modernmetals:titanium_door_bottom_rh", "y": 180 }, - "facing=west,half=lower,hinge=left,open=true,powered=false": { "model": "modernmetals:titanium_door_bottom_rh", "y": 270 }, - "facing=north,half=lower,hinge=left,open=true,powered=false": { "model": "modernmetals:titanium_door_bottom_rh" }, - "facing=east,half=lower,hinge=right,open=true,powered=false": { "model": "modernmetals:titanium_door_bottom", "y": 270 }, - "facing=south,half=lower,hinge=right,open=true,powered=false": { "model": "modernmetals:titanium_door_bottom" }, - "facing=west,half=lower,hinge=right,open=true,powered=false": { "model": "modernmetals:titanium_door_bottom", "y": 90 }, - "facing=north,half=lower,hinge=right,open=true,powered=false": { "model": "modernmetals:titanium_door_bottom", "y": 180 }, - "facing=east,half=upper,hinge=left,open=false,powered=false": { "model": "modernmetals:titanium_door_top" }, - "facing=south,half=upper,hinge=left,open=false,powered=false": { "model": "modernmetals:titanium_door_top", "y": 90 }, - "facing=west,half=upper,hinge=left,open=false,powered=false": { "model": "modernmetals:titanium_door_top", "y": 180 }, - "facing=north,half=upper,hinge=left,open=false,powered=false": { "model": "modernmetals:titanium_door_top", "y": 270 }, - "facing=east,half=upper,hinge=right,open=false,powered=false": { "model": "modernmetals:titanium_door_top_rh" }, - "facing=south,half=upper,hinge=right,open=false,powered=false": { "model": "modernmetals:titanium_door_top_rh", "y": 90 }, - "facing=west,half=upper,hinge=right,open=false,powered=false": { "model": "modernmetals:titanium_door_top_rh", "y": 180 }, - "facing=north,half=upper,hinge=right,open=false,powered=false": { "model": "modernmetals:titanium_door_top_rh", "y": 270 }, - "facing=east,half=upper,hinge=left,open=true,powered=false": { "model": "modernmetals:titanium_door_top_rh", "y": 90 }, - "facing=south,half=upper,hinge=left,open=true,powered=false": { "model": "modernmetals:titanium_door_top_rh", "y": 180 }, - "facing=west,half=upper,hinge=left,open=true,powered=false": { "model": "modernmetals:titanium_door_top_rh", "y": 270 }, - "facing=north,half=upper,hinge=left,open=true,powered=false": { "model": "modernmetals:titanium_door_top_rh" }, - "facing=east,half=upper,hinge=right,open=true,powered=false": { "model": "modernmetals:titanium_door_top", "y": 270 }, - "facing=south,half=upper,hinge=right,open=true,powered=false": { "model": "modernmetals:titanium_door_top" }, - "facing=west,half=upper,hinge=right,open=true,powered=false": { "model": "modernmetals:titanium_door_top", "y": 90 }, - "facing=north,half=upper,hinge=right,open=true,powered=false": { "model": "modernmetals:titanium_door_top", "y": 180 }, - - - "facing=east,half=lower,hinge=left,open=false,powered=true": { "model": "modernmetals:titanium_door_bottom" }, - "facing=south,half=lower,hinge=left,open=false,powered=true": { "model": "modernmetals:titanium_door_bottom", "y": 90 }, - "facing=west,half=lower,hinge=left,open=false,powered=true": { "model": "modernmetals:titanium_door_bottom", "y": 180 }, - "facing=north,half=lower,hinge=left,open=false,powered=true": { "model": "modernmetals:titanium_door_bottom", "y": 270 }, - "facing=east,half=lower,hinge=right,open=false,powered=true": { "model": "modernmetals:titanium_door_bottom_rh" }, - "facing=south,half=lower,hinge=right,open=false,powered=true": { "model": "modernmetals:titanium_door_bottom_rh", "y": 90 }, - "facing=west,half=lower,hinge=right,open=false,powered=true": { "model": "modernmetals:titanium_door_bottom_rh", "y": 180 }, - "facing=north,half=lower,hinge=right,open=false,powered=true": { "model": "modernmetals:titanium_door_bottom_rh", "y": 270 }, - "facing=east,half=lower,hinge=left,open=true,powered=true": { "model": "modernmetals:titanium_door_bottom_rh", "y": 90 }, - "facing=south,half=lower,hinge=left,open=true,powered=true": { "model": "modernmetals:titanium_door_bottom_rh", "y": 180 }, - "facing=west,half=lower,hinge=left,open=true,powered=true": { "model": "modernmetals:titanium_door_bottom_rh", "y": 270 }, - "facing=north,half=lower,hinge=left,open=true,powered=true": { "model": "modernmetals:titanium_door_bottom_rh" }, - "facing=east,half=lower,hinge=right,open=true,powered=true": { "model": "modernmetals:titanium_door_bottom", "y": 270 }, - "facing=south,half=lower,hinge=right,open=true,powered=true": { "model": "modernmetals:titanium_door_bottom" }, - "facing=west,half=lower,hinge=right,open=true,powered=true": { "model": "modernmetals:titanium_door_bottom", "y": 90 }, - "facing=north,half=lower,hinge=right,open=true,powered=true": { "model": "modernmetals:titanium_door_bottom", "y": 180 }, - "facing=east,half=upper,hinge=left,open=false,powered=true": { "model": "modernmetals:titanium_door_top" }, - "facing=south,half=upper,hinge=left,open=false,powered=true": { "model": "modernmetals:titanium_door_top", "y": 90 }, - "facing=west,half=upper,hinge=left,open=false,powered=true": { "model": "modernmetals:titanium_door_top", "y": 180 }, - "facing=north,half=upper,hinge=left,open=false,powered=true": { "model": "modernmetals:titanium_door_top", "y": 270 }, - "facing=east,half=upper,hinge=right,open=false,powered=true": { "model": "modernmetals:titanium_door_top_rh" }, - "facing=south,half=upper,hinge=right,open=false,powered=true": { "model": "modernmetals:titanium_door_top_rh", "y": 90 }, - "facing=west,half=upper,hinge=right,open=false,powered=true": { "model": "modernmetals:titanium_door_top_rh", "y": 180 }, - "facing=north,half=upper,hinge=right,open=false,powered=true": { "model": "modernmetals:titanium_door_top_rh", "y": 270 }, - "facing=east,half=upper,hinge=left,open=true,powered=true": { "model": "modernmetals:titanium_door_top_rh", "y": 90 }, - "facing=south,half=upper,hinge=left,open=true,powered=true": { "model": "modernmetals:titanium_door_top_rh", "y": 180 }, - "facing=west,half=upper,hinge=left,open=true,powered=true": { "model": "modernmetals:titanium_door_top_rh", "y": 270 }, - "facing=north,half=upper,hinge=left,open=true,powered=true": { "model": "modernmetals:titanium_door_top_rh" }, - "facing=east,half=upper,hinge=right,open=true,powered=true": { "model": "modernmetals:titanium_door_top", "y": 270 }, - "facing=south,half=upper,hinge=right,open=true,powered=true": { "model": "modernmetals:titanium_door_top" }, - "facing=west,half=upper,hinge=right,open=true,powered=true": { "model": "modernmetals:titanium_door_top", "y": 90 }, - "facing=north,half=upper,hinge=right,open=true,powered=true": { "model": "modernmetals:titanium_door_top", "y": 180 } + "variants": { + "facing=north,half=upper,hinge=left,open=false": { + "model": "modernmetals:block/titanium_door_top", + "y": 270 + }, + "facing=south,half=upper,hinge=left,open=false": { + "model": "modernmetals:block/titanium_door_top", + "y": 90 + }, + "facing=west,half=upper,hinge=left,open=false": { + "model": "modernmetals:block/titanium_door_top", + "y": 180 + }, + "facing=east,half=upper,hinge=left,open=false": { + "model": "modernmetals:block/titanium_door_top" + }, + "facing=north,half=lower,hinge=left,open=false": { + "model": "modernmetals:block/titanium_door_bottom", + "y": 270 + }, + "facing=south,half=lower,hinge=left,open=false": { + "model": "modernmetals:block/titanium_door_bottom", + "y": 90 + }, + "facing=west,half=lower,hinge=left,open=false": { + "model": "modernmetals:block/titanium_door_bottom", + "y": 180 + }, + "facing=east,half=lower,hinge=left,open=false": { + "model": "modernmetals:block/titanium_door_bottom" + }, + "facing=north,half=upper,hinge=right,open=false": { + "model": "modernmetals:block/titanium_door_top_rh", + "y": 270 + }, + "facing=south,half=upper,hinge=right,open=false": { + "model": "modernmetals:block/titanium_door_top_rh", + "y": 90 + }, + "facing=west,half=upper,hinge=right,open=false": { + "model": "modernmetals:block/titanium_door_top_rh", + "y": 180 + }, + "facing=east,half=upper,hinge=right,open=false": { + "model": "modernmetals:block/titanium_door_top_rh" + }, + "facing=north,half=lower,hinge=right,open=false": { + "model": "modernmetals:block/titanium_door_bottom_rh", + "y": 270 + }, + "facing=south,half=lower,hinge=right,open=false": { + "model": "modernmetals:block/titanium_door_bottom_rh", + "y": 90 + }, + "facing=west,half=lower,hinge=right,open=false": { + "model": "modernmetals:block/titanium_door_bottom_rh", + "y": 180 + }, + "facing=east,half=lower,hinge=right,open=false": { + "model": "modernmetals:block/titanium_door_bottom_rh" + }, + "facing=north,half=upper,hinge=left,open=true": { + "model": "modernmetals:block/titanium_door_top_rh" + }, + "facing=south,half=upper,hinge=left,open=true": { + "model": "modernmetals:block/titanium_door_top_rh", + "y": 180 + }, + "facing=west,half=upper,hinge=left,open=true": { + "model": "modernmetals:block/titanium_door_top_rh", + "y": 270 + }, + "facing=east,half=upper,hinge=left,open=true": { + "model": "modernmetals:block/titanium_door_top_rh", + "y": 90 + }, + "facing=north,half=lower,hinge=left,open=true": { + "model": "modernmetals:block/titanium_door_bottom_rh" + }, + "facing=south,half=lower,hinge=left,open=true": { + "model": "modernmetals:block/titanium_door_bottom_rh", + "y": 180 + }, + "facing=west,half=lower,hinge=left,open=true": { + "model": "modernmetals:block/titanium_door_bottom_rh", + "y": 270 + }, + "facing=east,half=lower,hinge=left,open=true": { + "model": "modernmetals:block/titanium_door_bottom_rh", + "y": 90 + }, + "facing=north,half=upper,hinge=right,open=true": { + "model": "modernmetals:block/titanium_door_top", + "y": 180 + }, + "facing=south,half=upper,hinge=right,open=true": { + "model": "modernmetals:block/titanium_door_top" + }, + "facing=west,half=upper,hinge=right,open=true": { + "model": "modernmetals:block/titanium_door_top", + "y": 90 + }, + "facing=east,half=upper,hinge=right,open=true": { + "model": "modernmetals:block/titanium_door_top", + "y": 270 + }, + "facing=north,half=lower,hinge=right,open=true": { + "model": "modernmetals:block/titanium_door_bottom", + "y": 180 + }, + "facing=south,half=lower,hinge=right,open=true": { + "model": "modernmetals:block/titanium_door_bottom" + }, + "facing=west,half=lower,hinge=right,open=true": { + "model": "modernmetals:block/titanium_door_bottom", + "y": 90 + }, + "facing=east,half=lower,hinge=right,open=true": { + "model": "modernmetals:block/titanium_door_bottom", + "y": 270 } + } } diff --git a/src/main/resources/assets/modernmetals/blockstates/titanium_lever.json b/src/main/resources/assets/modernmetals/blockstates/titanium_lever.json index e6e0afbd..cb886227 100644 --- a/src/main/resources/assets/modernmetals/blockstates/titanium_lever.json +++ b/src/main/resources/assets/modernmetals/blockstates/titanium_lever.json @@ -1,20 +1,76 @@ { - "variants": { - "facing=down_z,powered=false": { "model": "modernmetals:titanium_lever_off", "x": 180, "y": 180 }, - "facing=down_x,powered=false": { "model": "modernmetals:titanium_lever_off", "x": 180, "y": 90 }, - "facing=up_z,powered=false": { "model": "modernmetals:titanium_lever_off" }, - "facing=up_x,powered=false": { "model": "modernmetals:titanium_lever_off", "y": 270 }, - "facing=east,powered=false": { "model": "modernmetals:titanium_lever_off", "x": 90, "y": 90 }, - "facing=west,powered=false": { "model": "modernmetals:titanium_lever_off", "x": 90, "y": 270 }, - "facing=south,powered=false" : { "model": "modernmetals:titanium_lever_off", "x": 90, "y": 180 }, - "facing=north,powered=false" : { "model": "modernmetals:titanium_lever_off", "x": 90 }, - "facing=down_z,powered=true" : { "model": "modernmetals:titanium_lever", "x": 180, "y": 180 }, - "facing=down_x,powered=true" : { "model": "modernmetals:titanium_lever", "x": 180, "y": 90 }, - "facing=up_z,powered=true": { "model": "modernmetals:titanium_lever" }, - "facing=up_x,powered=true": { "model": "modernmetals:titanium_lever", "y": 270 }, - "facing=east,powered=true": { "model": "modernmetals:titanium_lever", "x": 90, "y": 90 }, - "facing=west,powered=true": { "model": "modernmetals:titanium_lever", "x": 90, "y": 270 }, - "facing=south,powered=true": { "model": "modernmetals:titanium_lever", "x": 90, "y": 180 }, - "facing=north,powered=true": { "model": "modernmetals:titanium_lever", "x": 90 } + "variants": { + "face=floor,facing=north,powered=false": { + "model": "modernmetals:block/titanium_lever_off" + }, + "face=wall,facing=north,powered=false": { + "model": "modernmetals:block/titanium_lever_off" + }, + "face=ceiling,facing=north,powered=false": { + "model": "modernmetals:block/titanium_lever_off" + }, + "face=floor,facing=south,powered=false": { + "model": "modernmetals:block/titanium_lever_off" + }, + "face=wall,facing=south,powered=false": { + "model": "modernmetals:block/titanium_lever_off" + }, + "face=ceiling,facing=south,powered=false": { + "model": "modernmetals:block/titanium_lever_off" + }, + "face=floor,facing=west,powered=false": { + "model": "modernmetals:block/titanium_lever_off" + }, + "face=wall,facing=west,powered=false": { + "model": "modernmetals:block/titanium_lever_off" + }, + "face=ceiling,facing=west,powered=false": { + "model": "modernmetals:block/titanium_lever_off" + }, + "face=floor,facing=east,powered=false": { + "model": "modernmetals:block/titanium_lever_off" + }, + "face=wall,facing=east,powered=false": { + "model": "modernmetals:block/titanium_lever_off" + }, + "face=ceiling,facing=east,powered=false": { + "model": "modernmetals:block/titanium_lever_off" + }, + "face=floor,facing=north,powered=true": { + "model": "modernmetals:block/titanium_lever" + }, + "face=wall,facing=north,powered=true": { + "model": "modernmetals:block/titanium_lever" + }, + "face=ceiling,facing=north,powered=true": { + "model": "modernmetals:block/titanium_lever" + }, + "face=floor,facing=south,powered=true": { + "model": "modernmetals:block/titanium_lever" + }, + "face=wall,facing=south,powered=true": { + "model": "modernmetals:block/titanium_lever" + }, + "face=ceiling,facing=south,powered=true": { + "model": "modernmetals:block/titanium_lever" + }, + "face=floor,facing=west,powered=true": { + "model": "modernmetals:block/titanium_lever" + }, + "face=wall,facing=west,powered=true": { + "model": "modernmetals:block/titanium_lever" + }, + "face=ceiling,facing=west,powered=true": { + "model": "modernmetals:block/titanium_lever" + }, + "face=floor,facing=east,powered=true": { + "model": "modernmetals:block/titanium_lever" + }, + "face=wall,facing=east,powered=true": { + "model": "modernmetals:block/titanium_lever" + }, + "face=ceiling,facing=east,powered=true": { + "model": "modernmetals:block/titanium_lever" } + } } diff --git a/src/main/resources/assets/modernmetals/blockstates/titanium_ore.json b/src/main/resources/assets/modernmetals/blockstates/titanium_ore.json index eec7af9b..2daa68ea 100644 --- a/src/main/resources/assets/modernmetals/blockstates/titanium_ore.json +++ b/src/main/resources/assets/modernmetals/blockstates/titanium_ore.json @@ -1,5 +1,7 @@ { - "variants": { - "normal": { "model": "modernmetals:titanium_ore" } + "variants": { + "": { + "model": "modernmetals:block/titanium_ore" } + } } diff --git a/src/main/resources/assets/modernmetals/blockstates/titanium_plate.json b/src/main/resources/assets/modernmetals/blockstates/titanium_plate.json index 0d0a475a..fdae5e84 100644 --- a/src/main/resources/assets/modernmetals/blockstates/titanium_plate.json +++ b/src/main/resources/assets/modernmetals/blockstates/titanium_plate.json @@ -1,10 +1,27 @@ { - "variants": { - "facing=down": { "model": "modernmetals:titanium_plate", "x": 90 }, - "facing=up": { "model": "modernmetals:titanium_plate", "x": 270 }, - "facing=north": { "model": "modernmetals:titanium_plate" }, - "facing=south": { "model": "modernmetals:titanium_plate", "y": 180 }, - "facing=west": { "model": "modernmetals:titanium_plate", "y": 270 }, - "facing=east": { "model": "modernmetals:titanium_plate", "y": 90 } + "variants": { + "facing=down": { + "model": "modernmetals:block/titanium_plate", + "x": 90 + }, + "facing=up": { + "model": "modernmetals:block/titanium_plate", + "x": 270 + }, + "facing=north": { + "model": "modernmetals:block/titanium_plate" + }, + "facing=south": { + "model": "modernmetals:block/titanium_plate", + "y": 180 + }, + "facing=west": { + "model": "modernmetals:block/titanium_plate", + "y": 270 + }, + "facing=east": { + "model": "modernmetals:block/titanium_plate", + "y": 90 } + } } diff --git a/src/main/resources/assets/modernmetals/blockstates/titanium_pressure_plate.json b/src/main/resources/assets/modernmetals/blockstates/titanium_pressure_plate.json index db12ec49..14e1297e 100644 --- a/src/main/resources/assets/modernmetals/blockstates/titanium_pressure_plate.json +++ b/src/main/resources/assets/modernmetals/blockstates/titanium_pressure_plate.json @@ -1,6 +1,10 @@ { - "variants": { - "powered=false": { "model": "modernmetals:titanium_pressure_plate_up" }, - "powered=true": { "model": "modernmetals:titanium_pressure_plate_down" } + "variants": { + "powered=false": { + "model": "modernmetals:block/titanium_pressure_plate_up" + }, + "powered=true": { + "model": "modernmetals:block/titanium_pressure_plate_down" } + } } diff --git a/src/main/resources/assets/modernmetals/blockstates/titanium_slab.json b/src/main/resources/assets/modernmetals/blockstates/titanium_slab.json index 390c0b7d..2b20f6b2 100644 --- a/src/main/resources/assets/modernmetals/blockstates/titanium_slab.json +++ b/src/main/resources/assets/modernmetals/blockstates/titanium_slab.json @@ -1,6 +1,13 @@ { - "variants": { - "half=bottom,variant=default": { "model": "modernmetals:half_slab_titanium" }, - "half=top,variant=default": { "model": "modernmetals:upper_slab_titanium" } + "variants": { + "type=top": { + "model": "modernmetals:block/upper_slab_titanium" + }, + "type=bottom": { + "model": "modernmetals:block/half_slab_titanium" + }, + "type=double": { + "model": "modernmetals:block/titanium_block" } + } } diff --git a/src/main/resources/assets/modernmetals/blockstates/titanium_stairs.json b/src/main/resources/assets/modernmetals/blockstates/titanium_stairs.json index 8392df6f..6f1a3337 100644 --- a/src/main/resources/assets/modernmetals/blockstates/titanium_stairs.json +++ b/src/main/resources/assets/modernmetals/blockstates/titanium_stairs.json @@ -1,44 +1,209 @@ { - "variants": { - "facing=east,half=bottom,shape=straight": { "model": "modernmetals:titanium_stairs" }, - "facing=west,half=bottom,shape=straight": { "model": "modernmetals:titanium_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=straight": { "model": "modernmetals:titanium_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=straight": { "model": "modernmetals:titanium_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_right": { "model": "modernmetals:titanium_outer_stairs" }, - "facing=west,half=bottom,shape=outer_right": { "model": "modernmetals:titanium_outer_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=outer_right": { "model": "modernmetals:titanium_outer_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=outer_right": { "model": "modernmetals:titanium_outer_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_left": { "model": "modernmetals:titanium_outer_stairs", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=outer_left": { "model": "modernmetals:titanium_outer_stairs", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=outer_left": { "model": "modernmetals:titanium_outer_stairs" }, - "facing=north,half=bottom,shape=outer_left": { "model": "modernmetals:titanium_outer_stairs", "y": 180, "uvlock": true }, - "facing=east,half=bottom,shape=inner_right": { "model": "modernmetals:titanium_inner_stairs" }, - "facing=west,half=bottom,shape=inner_right": { "model": "modernmetals:titanium_inner_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=inner_right": { "model": "modernmetals:titanium_inner_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=inner_right": { "model": "modernmetals:titanium_inner_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=inner_left": { "model": "modernmetals:titanium_inner_stairs", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=inner_left": { "model": "modernmetals:titanium_inner_stairs", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=inner_left": { "model": "modernmetals:titanium_inner_stairs" }, - "facing=north,half=bottom,shape=inner_left": { "model": "modernmetals:titanium_inner_stairs", "y": 180, "uvlock": true }, - "facing=east,half=top,shape=straight": { "model": "modernmetals:titanium_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=straight": { "model": "modernmetals:titanium_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=straight": { "model": "modernmetals:titanium_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=straight": { "model": "modernmetals:titanium_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { "model": "modernmetals:titanium_outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_right": { "model": "modernmetals:titanium_outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { "model": "modernmetals:titanium_outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { "model": "modernmetals:titanium_outer_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { "model": "modernmetals:titanium_outer_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { "model": "modernmetals:titanium_outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { "model": "modernmetals:titanium_outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=outer_left": { "model": "modernmetals:titanium_outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { "model": "modernmetals:titanium_inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { "model": "modernmetals:titanium_inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { "model": "modernmetals:titanium_inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { "model": "modernmetals:titanium_inner_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { "model": "modernmetals:titanium_inner_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { "model": "modernmetals:titanium_inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { "model": "modernmetals:titanium_inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { "model": "modernmetals:titanium_inner_stairs", "x": 180, "y": 270, "uvlock": true } + "variants": { + "facing=north,half=top,shape=straight": { + "model": "modernmetals:block/titanium_stairs", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=south,half=top,shape=straight": { + "model": "modernmetals:block/titanium_stairs", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=west,half=top,shape=straight": { + "model": "modernmetals:block/titanium_stairs", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=east,half=top,shape=straight": { + "model": "modernmetals:block/titanium_stairs", + "x": 180, + "uvlock": true + }, + "facing=north,half=bottom,shape=straight": { + "model": "modernmetals:block/titanium_stairs", + "y": 270, + "uvlock": true + }, + "facing=south,half=bottom,shape=straight": { + "model": "modernmetals:block/titanium_stairs", + "y": 90, + "uvlock": true + }, + "facing=west,half=bottom,shape=straight": { + "model": "modernmetals:block/titanium_stairs", + "y": 180, + "uvlock": true + }, + "facing=east,half=bottom,shape=straight": { + "model": "modernmetals:block/titanium_stairs" + }, + "facing=north,half=top,shape=inner_left": { + "model": "modernmetals:block/titanium_inner_stairs", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=south,half=top,shape=inner_left": { + "model": "modernmetals:block/titanium_inner_stairs", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=west,half=top,shape=inner_left": { + "model": "modernmetals:block/titanium_inner_stairs", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=east,half=top,shape=inner_left": { + "model": "modernmetals:block/titanium_inner_stairs", + "x": 180, + "uvlock": true + }, + "facing=north,half=bottom,shape=inner_left": { + "model": "modernmetals:block/titanium_inner_stairs", + "y": 180, + "uvlock": true + }, + "facing=south,half=bottom,shape=inner_left": { + "model": "modernmetals:block/titanium_inner_stairs" + }, + "facing=west,half=bottom,shape=inner_left": { + "model": "modernmetals:block/titanium_inner_stairs", + "y": 90, + "uvlock": true + }, + "facing=east,half=bottom,shape=inner_left": { + "model": "modernmetals:block/titanium_inner_stairs", + "y": 270, + "uvlock": true + }, + "facing=north,half=top,shape=inner_right": { + "model": "modernmetals:block/titanium_inner_stairs", + "x": 180, + "uvlock": true + }, + "facing=south,half=top,shape=inner_right": { + "model": "modernmetals:block/titanium_inner_stairs", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=west,half=top,shape=inner_right": { + "model": "modernmetals:block/titanium_inner_stairs", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=east,half=top,shape=inner_right": { + "model": "modernmetals:block/titanium_inner_stairs", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=north,half=bottom,shape=inner_right": { + "model": "modernmetals:block/titanium_inner_stairs", + "y": 270, + "uvlock": true + }, + "facing=south,half=bottom,shape=inner_right": { + "model": "modernmetals:block/titanium_inner_stairs", + "y": 90, + "uvlock": true + }, + "facing=west,half=bottom,shape=inner_right": { + "model": "modernmetals:block/titanium_inner_stairs", + "y": 180, + "uvlock": true + }, + "facing=east,half=bottom,shape=inner_right": { + "model": "modernmetals:block/titanium_inner_stairs" + }, + "facing=north,half=top,shape=outer_left": { + "model": "modernmetals:block/titanium_outer_stairs", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=south,half=top,shape=outer_left": { + "model": "modernmetals:block/titanium_outer_stairs", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=west,half=top,shape=outer_left": { + "model": "modernmetals:block/titanium_outer_stairs", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=east,half=top,shape=outer_left": { + "model": "modernmetals:block/titanium_outer_stairs", + "x": 180, + "uvlock": true + }, + "facing=north,half=bottom,shape=outer_left": { + "model": "modernmetals:block/titanium_outer_stairs", + "y": 180, + "uvlock": true + }, + "facing=south,half=bottom,shape=outer_left": { + "model": "modernmetals:block/titanium_outer_stairs" + }, + "facing=west,half=bottom,shape=outer_left": { + "model": "modernmetals:block/titanium_outer_stairs", + "y": 90, + "uvlock": true + }, + "facing=east,half=bottom,shape=outer_left": { + "model": "modernmetals:block/titanium_outer_stairs", + "y": 270, + "uvlock": true + }, + "facing=north,half=top,shape=outer_right": { + "model": "modernmetals:block/titanium_outer_stairs", + "x": 180, + "uvlock": true + }, + "facing=south,half=top,shape=outer_right": { + "model": "modernmetals:block/titanium_outer_stairs", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=west,half=top,shape=outer_right": { + "model": "modernmetals:block/titanium_outer_stairs", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=east,half=top,shape=outer_right": { + "model": "modernmetals:block/titanium_outer_stairs", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=north,half=bottom,shape=outer_right": { + "model": "modernmetals:block/titanium_outer_stairs", + "y": 270, + "uvlock": true + }, + "facing=south,half=bottom,shape=outer_right": { + "model": "modernmetals:block/titanium_outer_stairs", + "y": 90, + "uvlock": true + }, + "facing=west,half=bottom,shape=outer_right": { + "model": "modernmetals:block/titanium_outer_stairs", + "y": 180, + "uvlock": true + }, + "facing=east,half=bottom,shape=outer_right": { + "model": "modernmetals:block/titanium_outer_stairs" } + } } diff --git a/src/main/resources/assets/modernmetals/blockstates/titanium_trapdoor.json b/src/main/resources/assets/modernmetals/blockstates/titanium_trapdoor.json index 057925c1..663f5311 100644 --- a/src/main/resources/assets/modernmetals/blockstates/titanium_trapdoor.json +++ b/src/main/resources/assets/modernmetals/blockstates/titanium_trapdoor.json @@ -1,20 +1,68 @@ { - "variants": { - "facing=north,half=bottom,open=false": { "model": "modernmetals:titanium_trapdoor_bottom" }, - "facing=south,half=bottom,open=false": { "model": "modernmetals:titanium_trapdoor_bottom" }, - "facing=east,half=bottom,open=false": { "model": "modernmetals:titanium_trapdoor_bottom" }, - "facing=west,half=bottom,open=false": { "model": "modernmetals:titanium_trapdoor_bottom" }, - "facing=north,half=top,open=false": { "model": "modernmetals:titanium_trapdoor_top" }, - "facing=south,half=top,open=false": { "model": "modernmetals:titanium_trapdoor_top" }, - "facing=east,half=top,open=false": { "model": "modernmetals:titanium_trapdoor_top" }, - "facing=west,half=top,open=false": { "model": "modernmetals:titanium_trapdoor_top" }, - "facing=north,half=bottom,open=true": { "model": "modernmetals:titanium_trapdoor_open" }, - "facing=south,half=bottom,open=true": { "model": "modernmetals:titanium_trapdoor_open", "y": 180 }, - "facing=east,half=bottom,open=true": { "model": "modernmetals:titanium_trapdoor_open", "y": 90 }, - "facing=west,half=bottom,open=true": { "model": "modernmetals:titanium_trapdoor_open", "y": 270 }, - "facing=north,half=top,open=true": { "model": "modernmetals:titanium_trapdoor_open" }, - "facing=south,half=top,open=true": { "model": "modernmetals:titanium_trapdoor_open", "y": 180 }, - "facing=east,half=top,open=true": { "model": "modernmetals:titanium_trapdoor_open", "y": 90 }, - "facing=west,half=top,open=true": { "model": "modernmetals:titanium_trapdoor_open", "y": 270 } + "variants": { + "facing=north,half=top,open=false": { + "model": "modernmetals:block/titanium_trapdoor_top" + }, + "facing=south,half=top,open=false": { + "model": "modernmetals:block/titanium_trapdoor_top", + "y": 180 + }, + "facing=west,half=top,open=false": { + "model": "modernmetals:block/titanium_trapdoor_top", + "y": 270 + }, + "facing=east,half=top,open=false": { + "model": "modernmetals:block/titanium_trapdoor_top", + "y": 90 + }, + "facing=north,half=bottom,open=false": { + "model": "modernmetals:block/titanium_trapdoor_bottom" + }, + "facing=south,half=bottom,open=false": { + "model": "modernmetals:block/titanium_trapdoor_bottom", + "y": 180 + }, + "facing=west,half=bottom,open=false": { + "model": "modernmetals:block/titanium_trapdoor_bottom", + "y": 270 + }, + "facing=east,half=bottom,open=false": { + "model": "modernmetals:block/titanium_trapdoor_bottom", + "y": 90 + }, + "facing=north,half=top,open=true": { + "model": "modernmetals:block/titanium_trapdoor_open", + "x": 180, + "y": 180 + }, + "facing=south,half=top,open=true": { + "model": "modernmetals:block/titanium_trapdoor_open", + "x": 180 + }, + "facing=west,half=top,open=true": { + "model": "modernmetals:block/titanium_trapdoor_open", + "x": 180, + "y": 90 + }, + "facing=east,half=top,open=true": { + "model": "modernmetals:block/titanium_trapdoor_open", + "x": 180, + "y": 270 + }, + "facing=north,half=bottom,open=true": { + "model": "modernmetals:block/titanium_trapdoor_open" + }, + "facing=south,half=bottom,open=true": { + "model": "modernmetals:block/titanium_trapdoor_open", + "y": 180 + }, + "facing=west,half=bottom,open=true": { + "model": "modernmetals:block/titanium_trapdoor_open", + "y": 270 + }, + "facing=east,half=bottom,open=true": { + "model": "modernmetals:block/titanium_trapdoor_open", + "y": 90 } + } } diff --git a/src/main/resources/assets/modernmetals/blockstates/titanium_wall.json b/src/main/resources/assets/modernmetals/blockstates/titanium_wall.json index 09898a1f..23384fa8 100644 --- a/src/main/resources/assets/modernmetals/blockstates/titanium_wall.json +++ b/src/main/resources/assets/modernmetals/blockstates/titanium_wall.json @@ -1,19 +1,51 @@ { - "multipart": [ - { "when": { "up": "true" }, - "apply": { "model": "modernmetals:titanium_wall_post" } - }, - { "when": { "north": "true" }, - "apply": { "model": "modernmetals:titanium_wall_side", "uvlock": true } - }, - { "when": { "east": "true" }, - "apply": { "model": "modernmetals:titanium_wall_side", "y": 90, "uvlock": true } - }, - { "when": { "south": "true" }, - "apply": { "model": "modernmetals:titanium_wall_side", "y": 180, "uvlock": true } - }, - { "when": { "west": "true" }, - "apply": { "model": "modernmetals:titanium_wall_side", "y": 270, "uvlock": true } - } - ] + "multipart": [ + { + "when": { + "up": "true" + }, + "apply": { + "model": "modernmetals:block/titanium_wall_post" + } + }, + { + "when": { + "north": "true" + }, + "apply": { + "model": "modernmetals:block/titanium_wall_side", + "uvlock": true + } + }, + { + "when": { + "east": "true" + }, + "apply": { + "model": "modernmetals:block/titanium_wall_side", + "y": 90, + "uvlock": true + } + }, + { + "when": { + "south": "true" + }, + "apply": { + "model": "modernmetals:block/titanium_wall_side", + "y": 180, + "uvlock": true + } + }, + { + "when": { + "west": "true" + }, + "apply": { + "model": "modernmetals:block/titanium_wall_side", + "y": 270, + "uvlock": true + } + } + ] } diff --git a/src/main/resources/assets/modernmetals/blockstates/tungsten.json b/src/main/resources/assets/modernmetals/blockstates/tungsten.json index b68dfcfb..4c3fbc62 100644 --- a/src/main/resources/assets/modernmetals/blockstates/tungsten.json +++ b/src/main/resources/assets/modernmetals/blockstates/tungsten.json @@ -1,9 +1,10 @@ { - "forge_marker": 1, - "variants": { - "fluid": { - "model": "forge:fluid", - "custom": { "fluid": "tungsten" } - } + "variants": { + "": { + "model": "minecraft:block/water", + "custom": { + "fluid": "modernmetals:tungsten" + } } -} \ No newline at end of file + } +} diff --git a/src/main/resources/assets/modernmetals/blockstates/tungsten_bars.json b/src/main/resources/assets/modernmetals/blockstates/tungsten_bars.json index 0c8abc8a..760468e6 100644 --- a/src/main/resources/assets/modernmetals/blockstates/tungsten_bars.json +++ b/src/main/resources/assets/modernmetals/blockstates/tungsten_bars.json @@ -1,32 +1,77 @@ { - "multipart": [ - { "apply": { "model": "modernmetals:tungsten_bars_post_ends" }}, - { "when": { "north": false, "east": false, "south": false, "west": false }, - "apply": { "model": "modernmetals:tungsten_bars_post" } - }, - { "when": { "north": true, "east": false, "south": false, "west": false }, - "apply": { "model": "modernmetals:tungsten_bars_cap" } - }, - { "when": { "north": false, "east": true, "south": false, "west": false }, - "apply": { "model": "modernmetals:tungsten_bars_cap", "y": 90 } - }, - { "when": { "north": false, "east": false, "south": true, "west": false }, - "apply": { "model": "modernmetals:tungsten_bars_cap_alt" } - }, - { "when": { "north": false, "east": false, "south": false, "west": true }, - "apply": { "model": "modernmetals:tungsten_bars_cap_alt", "y": 90 } - }, - { "when": { "north": true }, - "apply": { "model": "modernmetals:tungsten_bars_side" } - }, - { "when": { "east": true }, - "apply": { "model": "modernmetals:tungsten_bars_side", "y": 90 } - }, - { "when": { "south": true }, - "apply": { "model": "modernmetals:tungsten_bars_side_alt" } - }, - { "when": { "west": true }, - "apply": { "model": "modernmetals:tungsten_bars_side_alt", "y": 90 } - } - ] + "multipart": [ + { + "apply": { + "model": "modernmetals:block/tungsten_bars_post" + } + }, + { + "when": { + "north": "true" + }, + "apply": { + "model": "modernmetals:block/tungsten_bars_side" + } + }, + { + "when": { + "north": "false" + }, + "apply": { + "model": "modernmetals:block/tungsten_bars_cap" + } + }, + { + "when": { + "south": "true" + }, + "apply": { + "model": "modernmetals:block/tungsten_bars_side_alt" + } + }, + { + "when": { + "south": "false" + }, + "apply": { + "model": "modernmetals:block/tungsten_bars_cap_alt", + "y": 90 + } + }, + { + "when": { + "west": "true" + }, + "apply": { + "model": "modernmetals:block/tungsten_bars_side_alt", + "y": 90 + } + }, + { + "when": { + "west": "false" + }, + "apply": { + "model": "modernmetals:block/tungsten_bars_cap", + "y": 270 + } + }, + { + "when": { + "east": "true" + }, + "apply": { + "model": "modernmetals:block/tungsten_bars_side", + "y": 90 + } + }, + { + "when": { + "east": "false" + }, + "apply": { + "model": "modernmetals:block/tungsten_bars_cap_alt" + } + } + ] } diff --git a/src/main/resources/assets/modernmetals/blockstates/tungsten_block.json b/src/main/resources/assets/modernmetals/blockstates/tungsten_block.json index 5bd94374..36a2ae21 100644 --- a/src/main/resources/assets/modernmetals/blockstates/tungsten_block.json +++ b/src/main/resources/assets/modernmetals/blockstates/tungsten_block.json @@ -1,5 +1,7 @@ { - "variants": { - "normal": { "model": "modernmetals:tungsten_block" } + "variants": { + "": { + "model": "modernmetals:block/tungsten_block" } + } } diff --git a/src/main/resources/assets/modernmetals/blockstates/tungsten_button.json b/src/main/resources/assets/modernmetals/blockstates/tungsten_button.json index ecfe0ca4..f391b23c 100644 --- a/src/main/resources/assets/modernmetals/blockstates/tungsten_button.json +++ b/src/main/resources/assets/modernmetals/blockstates/tungsten_button.json @@ -1,16 +1,118 @@ { - "variants": { - "facing=up,powered=false": { "model": "modernmetals:tungsten_button", "uvlock": true }, - "facing=down,powered=false": { "model": "modernmetals:tungsten_button", "uvlock": true, "x": 180 }, - "facing=east,powered=false": { "model": "modernmetals:tungsten_button", "uvlock": true, "x": 90, "y": 90 }, - "facing=west,powered=false": { "model": "modernmetals:tungsten_button", "uvlock": true, "x": 90, "y": 270 }, - "facing=south,powered=false": { "model": "modernmetals:tungsten_button", "uvlock": true, "x": 90, "y": 180 }, - "facing=north,powered=false": { "model": "modernmetals:tungsten_button", "uvlock": true, "x": 90 }, - "facing=up,powered=true": { "model": "modernmetals:tungsten_button_pressed", "uvlock": true }, - "facing=down,powered=true": { "model": "modernmetals:tungsten_button_pressed", "uvlock": true, "x": 180 }, - "facing=east,powered=true": { "model": "modernmetals:tungsten_button_pressed", "uvlock": true, "x": 90, "y": 90 }, - "facing=west,powered=true": { "model": "modernmetals:tungsten_button_pressed", "uvlock": true, "x": 90, "y": 270 }, - "facing=south,powered=true": { "model": "modernmetals:tungsten_button_pressed", "uvlock": true, "x": 90, "y": 180 }, - "facing=north,powered=true": { "model": "modernmetals:tungsten_button_pressed", "uvlock": true, "x": 90 } + "variants": { + "face=floor,facing=north,powered=false": { + "model": "modernmetals:block/tungsten_button" + }, + "face=wall,facing=north,powered=false": { + "model": "modernmetals:block/tungsten_button", + "x": 90, + "uvlock": true + }, + "face=ceiling,facing=north,powered=false": { + "model": "modernmetals:block/tungsten_button", + "x": 180, + "y": 180 + }, + "face=floor,facing=south,powered=false": { + "model": "modernmetals:block/tungsten_button", + "y": 180 + }, + "face=wall,facing=south,powered=false": { + "model": "modernmetals:block/tungsten_button", + "x": 90, + "y": 180, + "uvlock": true + }, + "face=ceiling,facing=south,powered=false": { + "model": "modernmetals:block/tungsten_button", + "x": 180 + }, + "face=floor,facing=west,powered=false": { + "model": "modernmetals:block/tungsten_button", + "y": 270 + }, + "face=wall,facing=west,powered=false": { + "model": "modernmetals:block/tungsten_button", + "x": 90, + "y": 270, + "uvlock": true + }, + "face=ceiling,facing=west,powered=false": { + "model": "modernmetals:block/tungsten_button", + "x": 180, + "y": 90 + }, + "face=floor,facing=east,powered=false": { + "model": "modernmetals:block/tungsten_button", + "y": 90 + }, + "face=wall,facing=east,powered=false": { + "model": "modernmetals:block/tungsten_button", + "x": 90, + "y": 90, + "uvlock": true + }, + "face=ceiling,facing=east,powered=false": { + "model": "modernmetals:block/tungsten_button", + "x": 180, + "y": 270 + }, + "face=floor,facing=north,powered=true": { + "model": "modernmetals:block/tungsten_button_pressed" + }, + "face=wall,facing=north,powered=true": { + "model": "modernmetals:block/tungsten_button_pressed", + "x": 90, + "uvlock": true + }, + "face=ceiling,facing=north,powered=true": { + "model": "modernmetals:block/tungsten_button_pressed", + "x": 180, + "y": 180 + }, + "face=floor,facing=south,powered=true": { + "model": "modernmetals:block/tungsten_button_pressed", + "y": 180 + }, + "face=wall,facing=south,powered=true": { + "model": "modernmetals:block/tungsten_button_pressed", + "x": 90, + "y": 180, + "uvlock": true + }, + "face=ceiling,facing=south,powered=true": { + "model": "modernmetals:block/tungsten_button_pressed", + "x": 180 + }, + "face=floor,facing=west,powered=true": { + "model": "modernmetals:block/tungsten_button_pressed", + "y": 270 + }, + "face=wall,facing=west,powered=true": { + "model": "modernmetals:block/tungsten_button_pressed", + "x": 90, + "y": 270, + "uvlock": true + }, + "face=ceiling,facing=west,powered=true": { + "model": "modernmetals:block/tungsten_button_pressed", + "x": 180, + "y": 90 + }, + "face=floor,facing=east,powered=true": { + "model": "modernmetals:block/tungsten_button_pressed", + "y": 90 + }, + "face=wall,facing=east,powered=true": { + "model": "modernmetals:block/tungsten_button_pressed", + "x": 90, + "y": 90, + "uvlock": true + }, + "face=ceiling,facing=east,powered=true": { + "model": "modernmetals:block/tungsten_button_pressed", + "x": 180, + "y": 270 } + } } diff --git a/src/main/resources/assets/modernmetals/blockstates/tungsten_door.json b/src/main/resources/assets/modernmetals/blockstates/tungsten_door.json index 32e435d8..aeaef1e1 100644 --- a/src/main/resources/assets/modernmetals/blockstates/tungsten_door.json +++ b/src/main/resources/assets/modernmetals/blockstates/tungsten_door.json @@ -1,70 +1,124 @@ { - "variants": { - "facing=east,half=lower,hinge=left,open=false,powered=false": { "model": "modernmetals:tungsten_door_bottom" }, - "facing=south,half=lower,hinge=left,open=false,powered=false": { "model": "modernmetals:tungsten_door_bottom", "y": 90 }, - "facing=west,half=lower,hinge=left,open=false,powered=false": { "model": "modernmetals:tungsten_door_bottom", "y": 180 }, - "facing=north,half=lower,hinge=left,open=false,powered=false": { "model": "modernmetals:tungsten_door_bottom", "y": 270 }, - "facing=east,half=lower,hinge=right,open=false,powered=false": { "model": "modernmetals:tungsten_door_bottom_rh" }, - "facing=south,half=lower,hinge=right,open=false,powered=false": { "model": "modernmetals:tungsten_door_bottom_rh", "y": 90 }, - "facing=west,half=lower,hinge=right,open=false,powered=false": { "model": "modernmetals:tungsten_door_bottom_rh", "y": 180 }, - "facing=north,half=lower,hinge=right,open=false,powered=false": { "model": "modernmetals:tungsten_door_bottom_rh", "y": 270 }, - "facing=east,half=lower,hinge=left,open=true,powered=false": { "model": "modernmetals:tungsten_door_bottom_rh", "y": 90 }, - "facing=south,half=lower,hinge=left,open=true,powered=false": { "model": "modernmetals:tungsten_door_bottom_rh", "y": 180 }, - "facing=west,half=lower,hinge=left,open=true,powered=false": { "model": "modernmetals:tungsten_door_bottom_rh", "y": 270 }, - "facing=north,half=lower,hinge=left,open=true,powered=false": { "model": "modernmetals:tungsten_door_bottom_rh" }, - "facing=east,half=lower,hinge=right,open=true,powered=false": { "model": "modernmetals:tungsten_door_bottom", "y": 270 }, - "facing=south,half=lower,hinge=right,open=true,powered=false": { "model": "modernmetals:tungsten_door_bottom" }, - "facing=west,half=lower,hinge=right,open=true,powered=false": { "model": "modernmetals:tungsten_door_bottom", "y": 90 }, - "facing=north,half=lower,hinge=right,open=true,powered=false": { "model": "modernmetals:tungsten_door_bottom", "y": 180 }, - "facing=east,half=upper,hinge=left,open=false,powered=false": { "model": "modernmetals:tungsten_door_top" }, - "facing=south,half=upper,hinge=left,open=false,powered=false": { "model": "modernmetals:tungsten_door_top", "y": 90 }, - "facing=west,half=upper,hinge=left,open=false,powered=false": { "model": "modernmetals:tungsten_door_top", "y": 180 }, - "facing=north,half=upper,hinge=left,open=false,powered=false": { "model": "modernmetals:tungsten_door_top", "y": 270 }, - "facing=east,half=upper,hinge=right,open=false,powered=false": { "model": "modernmetals:tungsten_door_top_rh" }, - "facing=south,half=upper,hinge=right,open=false,powered=false": { "model": "modernmetals:tungsten_door_top_rh", "y": 90 }, - "facing=west,half=upper,hinge=right,open=false,powered=false": { "model": "modernmetals:tungsten_door_top_rh", "y": 180 }, - "facing=north,half=upper,hinge=right,open=false,powered=false": { "model": "modernmetals:tungsten_door_top_rh", "y": 270 }, - "facing=east,half=upper,hinge=left,open=true,powered=false": { "model": "modernmetals:tungsten_door_top_rh", "y": 90 }, - "facing=south,half=upper,hinge=left,open=true,powered=false": { "model": "modernmetals:tungsten_door_top_rh", "y": 180 }, - "facing=west,half=upper,hinge=left,open=true,powered=false": { "model": "modernmetals:tungsten_door_top_rh", "y": 270 }, - "facing=north,half=upper,hinge=left,open=true,powered=false": { "model": "modernmetals:tungsten_door_top_rh" }, - "facing=east,half=upper,hinge=right,open=true,powered=false": { "model": "modernmetals:tungsten_door_top", "y": 270 }, - "facing=south,half=upper,hinge=right,open=true,powered=false": { "model": "modernmetals:tungsten_door_top" }, - "facing=west,half=upper,hinge=right,open=true,powered=false": { "model": "modernmetals:tungsten_door_top", "y": 90 }, - "facing=north,half=upper,hinge=right,open=true,powered=false": { "model": "modernmetals:tungsten_door_top", "y": 180 }, - - - "facing=east,half=lower,hinge=left,open=false,powered=true": { "model": "modernmetals:tungsten_door_bottom" }, - "facing=south,half=lower,hinge=left,open=false,powered=true": { "model": "modernmetals:tungsten_door_bottom", "y": 90 }, - "facing=west,half=lower,hinge=left,open=false,powered=true": { "model": "modernmetals:tungsten_door_bottom", "y": 180 }, - "facing=north,half=lower,hinge=left,open=false,powered=true": { "model": "modernmetals:tungsten_door_bottom", "y": 270 }, - "facing=east,half=lower,hinge=right,open=false,powered=true": { "model": "modernmetals:tungsten_door_bottom_rh" }, - "facing=south,half=lower,hinge=right,open=false,powered=true": { "model": "modernmetals:tungsten_door_bottom_rh", "y": 90 }, - "facing=west,half=lower,hinge=right,open=false,powered=true": { "model": "modernmetals:tungsten_door_bottom_rh", "y": 180 }, - "facing=north,half=lower,hinge=right,open=false,powered=true": { "model": "modernmetals:tungsten_door_bottom_rh", "y": 270 }, - "facing=east,half=lower,hinge=left,open=true,powered=true": { "model": "modernmetals:tungsten_door_bottom_rh", "y": 90 }, - "facing=south,half=lower,hinge=left,open=true,powered=true": { "model": "modernmetals:tungsten_door_bottom_rh", "y": 180 }, - "facing=west,half=lower,hinge=left,open=true,powered=true": { "model": "modernmetals:tungsten_door_bottom_rh", "y": 270 }, - "facing=north,half=lower,hinge=left,open=true,powered=true": { "model": "modernmetals:tungsten_door_bottom_rh" }, - "facing=east,half=lower,hinge=right,open=true,powered=true": { "model": "modernmetals:tungsten_door_bottom", "y": 270 }, - "facing=south,half=lower,hinge=right,open=true,powered=true": { "model": "modernmetals:tungsten_door_bottom" }, - "facing=west,half=lower,hinge=right,open=true,powered=true": { "model": "modernmetals:tungsten_door_bottom", "y": 90 }, - "facing=north,half=lower,hinge=right,open=true,powered=true": { "model": "modernmetals:tungsten_door_bottom", "y": 180 }, - "facing=east,half=upper,hinge=left,open=false,powered=true": { "model": "modernmetals:tungsten_door_top" }, - "facing=south,half=upper,hinge=left,open=false,powered=true": { "model": "modernmetals:tungsten_door_top", "y": 90 }, - "facing=west,half=upper,hinge=left,open=false,powered=true": { "model": "modernmetals:tungsten_door_top", "y": 180 }, - "facing=north,half=upper,hinge=left,open=false,powered=true": { "model": "modernmetals:tungsten_door_top", "y": 270 }, - "facing=east,half=upper,hinge=right,open=false,powered=true": { "model": "modernmetals:tungsten_door_top_rh" }, - "facing=south,half=upper,hinge=right,open=false,powered=true": { "model": "modernmetals:tungsten_door_top_rh", "y": 90 }, - "facing=west,half=upper,hinge=right,open=false,powered=true": { "model": "modernmetals:tungsten_door_top_rh", "y": 180 }, - "facing=north,half=upper,hinge=right,open=false,powered=true": { "model": "modernmetals:tungsten_door_top_rh", "y": 270 }, - "facing=east,half=upper,hinge=left,open=true,powered=true": { "model": "modernmetals:tungsten_door_top_rh", "y": 90 }, - "facing=south,half=upper,hinge=left,open=true,powered=true": { "model": "modernmetals:tungsten_door_top_rh", "y": 180 }, - "facing=west,half=upper,hinge=left,open=true,powered=true": { "model": "modernmetals:tungsten_door_top_rh", "y": 270 }, - "facing=north,half=upper,hinge=left,open=true,powered=true": { "model": "modernmetals:tungsten_door_top_rh" }, - "facing=east,half=upper,hinge=right,open=true,powered=true": { "model": "modernmetals:tungsten_door_top", "y": 270 }, - "facing=south,half=upper,hinge=right,open=true,powered=true": { "model": "modernmetals:tungsten_door_top" }, - "facing=west,half=upper,hinge=right,open=true,powered=true": { "model": "modernmetals:tungsten_door_top", "y": 90 }, - "facing=north,half=upper,hinge=right,open=true,powered=true": { "model": "modernmetals:tungsten_door_top", "y": 180 } + "variants": { + "facing=north,half=upper,hinge=left,open=false": { + "model": "modernmetals:block/tungsten_door_top", + "y": 270 + }, + "facing=south,half=upper,hinge=left,open=false": { + "model": "modernmetals:block/tungsten_door_top", + "y": 90 + }, + "facing=west,half=upper,hinge=left,open=false": { + "model": "modernmetals:block/tungsten_door_top", + "y": 180 + }, + "facing=east,half=upper,hinge=left,open=false": { + "model": "modernmetals:block/tungsten_door_top" + }, + "facing=north,half=lower,hinge=left,open=false": { + "model": "modernmetals:block/tungsten_door_bottom", + "y": 270 + }, + "facing=south,half=lower,hinge=left,open=false": { + "model": "modernmetals:block/tungsten_door_bottom", + "y": 90 + }, + "facing=west,half=lower,hinge=left,open=false": { + "model": "modernmetals:block/tungsten_door_bottom", + "y": 180 + }, + "facing=east,half=lower,hinge=left,open=false": { + "model": "modernmetals:block/tungsten_door_bottom" + }, + "facing=north,half=upper,hinge=right,open=false": { + "model": "modernmetals:block/tungsten_door_top_rh", + "y": 270 + }, + "facing=south,half=upper,hinge=right,open=false": { + "model": "modernmetals:block/tungsten_door_top_rh", + "y": 90 + }, + "facing=west,half=upper,hinge=right,open=false": { + "model": "modernmetals:block/tungsten_door_top_rh", + "y": 180 + }, + "facing=east,half=upper,hinge=right,open=false": { + "model": "modernmetals:block/tungsten_door_top_rh" + }, + "facing=north,half=lower,hinge=right,open=false": { + "model": "modernmetals:block/tungsten_door_bottom_rh", + "y": 270 + }, + "facing=south,half=lower,hinge=right,open=false": { + "model": "modernmetals:block/tungsten_door_bottom_rh", + "y": 90 + }, + "facing=west,half=lower,hinge=right,open=false": { + "model": "modernmetals:block/tungsten_door_bottom_rh", + "y": 180 + }, + "facing=east,half=lower,hinge=right,open=false": { + "model": "modernmetals:block/tungsten_door_bottom_rh" + }, + "facing=north,half=upper,hinge=left,open=true": { + "model": "modernmetals:block/tungsten_door_top_rh" + }, + "facing=south,half=upper,hinge=left,open=true": { + "model": "modernmetals:block/tungsten_door_top_rh", + "y": 180 + }, + "facing=west,half=upper,hinge=left,open=true": { + "model": "modernmetals:block/tungsten_door_top_rh", + "y": 270 + }, + "facing=east,half=upper,hinge=left,open=true": { + "model": "modernmetals:block/tungsten_door_top_rh", + "y": 90 + }, + "facing=north,half=lower,hinge=left,open=true": { + "model": "modernmetals:block/tungsten_door_bottom_rh" + }, + "facing=south,half=lower,hinge=left,open=true": { + "model": "modernmetals:block/tungsten_door_bottom_rh", + "y": 180 + }, + "facing=west,half=lower,hinge=left,open=true": { + "model": "modernmetals:block/tungsten_door_bottom_rh", + "y": 270 + }, + "facing=east,half=lower,hinge=left,open=true": { + "model": "modernmetals:block/tungsten_door_bottom_rh", + "y": 90 + }, + "facing=north,half=upper,hinge=right,open=true": { + "model": "modernmetals:block/tungsten_door_top", + "y": 180 + }, + "facing=south,half=upper,hinge=right,open=true": { + "model": "modernmetals:block/tungsten_door_top" + }, + "facing=west,half=upper,hinge=right,open=true": { + "model": "modernmetals:block/tungsten_door_top", + "y": 90 + }, + "facing=east,half=upper,hinge=right,open=true": { + "model": "modernmetals:block/tungsten_door_top", + "y": 270 + }, + "facing=north,half=lower,hinge=right,open=true": { + "model": "modernmetals:block/tungsten_door_bottom", + "y": 180 + }, + "facing=south,half=lower,hinge=right,open=true": { + "model": "modernmetals:block/tungsten_door_bottom" + }, + "facing=west,half=lower,hinge=right,open=true": { + "model": "modernmetals:block/tungsten_door_bottom", + "y": 90 + }, + "facing=east,half=lower,hinge=right,open=true": { + "model": "modernmetals:block/tungsten_door_bottom", + "y": 270 } + } } diff --git a/src/main/resources/assets/modernmetals/blockstates/tungsten_lever.json b/src/main/resources/assets/modernmetals/blockstates/tungsten_lever.json index a4756480..0bd3a168 100644 --- a/src/main/resources/assets/modernmetals/blockstates/tungsten_lever.json +++ b/src/main/resources/assets/modernmetals/blockstates/tungsten_lever.json @@ -1,20 +1,76 @@ { - "variants": { - "facing=down_z,powered=false": { "model": "modernmetals:tungsten_lever_off", "x": 180, "y": 180 }, - "facing=down_x,powered=false": { "model": "modernmetals:tungsten_lever_off", "x": 180, "y": 90 }, - "facing=up_z,powered=false": { "model": "modernmetals:tungsten_lever_off" }, - "facing=up_x,powered=false": { "model": "modernmetals:tungsten_lever_off", "y": 270 }, - "facing=east,powered=false": { "model": "modernmetals:tungsten_lever_off", "x": 90, "y": 90 }, - "facing=west,powered=false": { "model": "modernmetals:tungsten_lever_off", "x": 90, "y": 270 }, - "facing=south,powered=false" : { "model": "modernmetals:tungsten_lever_off", "x": 90, "y": 180 }, - "facing=north,powered=false" : { "model": "modernmetals:tungsten_lever_off", "x": 90 }, - "facing=down_z,powered=true" : { "model": "modernmetals:tungsten_lever", "x": 180, "y": 180 }, - "facing=down_x,powered=true" : { "model": "modernmetals:tungsten_lever", "x": 180, "y": 90 }, - "facing=up_z,powered=true": { "model": "modernmetals:tungsten_lever" }, - "facing=up_x,powered=true": { "model": "modernmetals:tungsten_lever", "y": 270 }, - "facing=east,powered=true": { "model": "modernmetals:tungsten_lever", "x": 90, "y": 90 }, - "facing=west,powered=true": { "model": "modernmetals:tungsten_lever", "x": 90, "y": 270 }, - "facing=south,powered=true": { "model": "modernmetals:tungsten_lever", "x": 90, "y": 180 }, - "facing=north,powered=true": { "model": "modernmetals:tungsten_lever", "x": 90 } + "variants": { + "face=floor,facing=north,powered=false": { + "model": "modernmetals:block/tungsten_lever_off" + }, + "face=wall,facing=north,powered=false": { + "model": "modernmetals:block/tungsten_lever_off" + }, + "face=ceiling,facing=north,powered=false": { + "model": "modernmetals:block/tungsten_lever_off" + }, + "face=floor,facing=south,powered=false": { + "model": "modernmetals:block/tungsten_lever_off" + }, + "face=wall,facing=south,powered=false": { + "model": "modernmetals:block/tungsten_lever_off" + }, + "face=ceiling,facing=south,powered=false": { + "model": "modernmetals:block/tungsten_lever_off" + }, + "face=floor,facing=west,powered=false": { + "model": "modernmetals:block/tungsten_lever_off" + }, + "face=wall,facing=west,powered=false": { + "model": "modernmetals:block/tungsten_lever_off" + }, + "face=ceiling,facing=west,powered=false": { + "model": "modernmetals:block/tungsten_lever_off" + }, + "face=floor,facing=east,powered=false": { + "model": "modernmetals:block/tungsten_lever_off" + }, + "face=wall,facing=east,powered=false": { + "model": "modernmetals:block/tungsten_lever_off" + }, + "face=ceiling,facing=east,powered=false": { + "model": "modernmetals:block/tungsten_lever_off" + }, + "face=floor,facing=north,powered=true": { + "model": "modernmetals:block/tungsten_lever" + }, + "face=wall,facing=north,powered=true": { + "model": "modernmetals:block/tungsten_lever" + }, + "face=ceiling,facing=north,powered=true": { + "model": "modernmetals:block/tungsten_lever" + }, + "face=floor,facing=south,powered=true": { + "model": "modernmetals:block/tungsten_lever" + }, + "face=wall,facing=south,powered=true": { + "model": "modernmetals:block/tungsten_lever" + }, + "face=ceiling,facing=south,powered=true": { + "model": "modernmetals:block/tungsten_lever" + }, + "face=floor,facing=west,powered=true": { + "model": "modernmetals:block/tungsten_lever" + }, + "face=wall,facing=west,powered=true": { + "model": "modernmetals:block/tungsten_lever" + }, + "face=ceiling,facing=west,powered=true": { + "model": "modernmetals:block/tungsten_lever" + }, + "face=floor,facing=east,powered=true": { + "model": "modernmetals:block/tungsten_lever" + }, + "face=wall,facing=east,powered=true": { + "model": "modernmetals:block/tungsten_lever" + }, + "face=ceiling,facing=east,powered=true": { + "model": "modernmetals:block/tungsten_lever" } + } } diff --git a/src/main/resources/assets/modernmetals/blockstates/tungsten_ore.json b/src/main/resources/assets/modernmetals/blockstates/tungsten_ore.json index f45fc771..47d962eb 100644 --- a/src/main/resources/assets/modernmetals/blockstates/tungsten_ore.json +++ b/src/main/resources/assets/modernmetals/blockstates/tungsten_ore.json @@ -1,5 +1,7 @@ { - "variants": { - "normal": { "model": "modernmetals:tungsten_ore" } + "variants": { + "": { + "model": "modernmetals:block/tungsten_ore" } + } } diff --git a/src/main/resources/assets/modernmetals/blockstates/tungsten_plate.json b/src/main/resources/assets/modernmetals/blockstates/tungsten_plate.json index 0fb46ee7..dbb20f80 100644 --- a/src/main/resources/assets/modernmetals/blockstates/tungsten_plate.json +++ b/src/main/resources/assets/modernmetals/blockstates/tungsten_plate.json @@ -1,10 +1,27 @@ { - "variants": { - "facing=down": { "model": "modernmetals:tungsten_plate", "x": 90 }, - "facing=up": { "model": "modernmetals:tungsten_plate", "x": 270 }, - "facing=north": { "model": "modernmetals:tungsten_plate" }, - "facing=south": { "model": "modernmetals:tungsten_plate", "y": 180 }, - "facing=west": { "model": "modernmetals:tungsten_plate", "y": 270 }, - "facing=east": { "model": "modernmetals:tungsten_plate", "y": 90 } + "variants": { + "facing=down": { + "model": "modernmetals:block/tungsten_plate", + "x": 90 + }, + "facing=up": { + "model": "modernmetals:block/tungsten_plate", + "x": 270 + }, + "facing=north": { + "model": "modernmetals:block/tungsten_plate" + }, + "facing=south": { + "model": "modernmetals:block/tungsten_plate", + "y": 180 + }, + "facing=west": { + "model": "modernmetals:block/tungsten_plate", + "y": 270 + }, + "facing=east": { + "model": "modernmetals:block/tungsten_plate", + "y": 90 } + } } diff --git a/src/main/resources/assets/modernmetals/blockstates/tungsten_pressure_plate.json b/src/main/resources/assets/modernmetals/blockstates/tungsten_pressure_plate.json index 639cd68c..2d926744 100644 --- a/src/main/resources/assets/modernmetals/blockstates/tungsten_pressure_plate.json +++ b/src/main/resources/assets/modernmetals/blockstates/tungsten_pressure_plate.json @@ -1,6 +1,10 @@ { - "variants": { - "powered=false": { "model": "modernmetals:tungsten_pressure_plate_up" }, - "powered=true": { "model": "modernmetals:tungsten_pressure_plate_down" } + "variants": { + "powered=false": { + "model": "modernmetals:block/tungsten_pressure_plate_up" + }, + "powered=true": { + "model": "modernmetals:block/tungsten_pressure_plate_down" } + } } diff --git a/src/main/resources/assets/modernmetals/blockstates/tungsten_slab.json b/src/main/resources/assets/modernmetals/blockstates/tungsten_slab.json index 70f63113..d50fb44f 100644 --- a/src/main/resources/assets/modernmetals/blockstates/tungsten_slab.json +++ b/src/main/resources/assets/modernmetals/blockstates/tungsten_slab.json @@ -1,6 +1,13 @@ { - "variants": { - "half=bottom,variant=default": { "model": "modernmetals:half_slab_tungsten" }, - "half=top,variant=default": { "model": "modernmetals:upper_slab_tungsten" } + "variants": { + "type=top": { + "model": "modernmetals:block/upper_slab_tungsten" + }, + "type=bottom": { + "model": "modernmetals:block/half_slab_tungsten" + }, + "type=double": { + "model": "modernmetals:block/tungsten_block" } + } } diff --git a/src/main/resources/assets/modernmetals/blockstates/tungsten_stairs.json b/src/main/resources/assets/modernmetals/blockstates/tungsten_stairs.json index c95f5d4a..9390162b 100644 --- a/src/main/resources/assets/modernmetals/blockstates/tungsten_stairs.json +++ b/src/main/resources/assets/modernmetals/blockstates/tungsten_stairs.json @@ -1,44 +1,209 @@ { - "variants": { - "facing=east,half=bottom,shape=straight": { "model": "modernmetals:tungsten_stairs" }, - "facing=west,half=bottom,shape=straight": { "model": "modernmetals:tungsten_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=straight": { "model": "modernmetals:tungsten_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=straight": { "model": "modernmetals:tungsten_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_right": { "model": "modernmetals:tungsten_outer_stairs" }, - "facing=west,half=bottom,shape=outer_right": { "model": "modernmetals:tungsten_outer_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=outer_right": { "model": "modernmetals:tungsten_outer_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=outer_right": { "model": "modernmetals:tungsten_outer_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_left": { "model": "modernmetals:tungsten_outer_stairs", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=outer_left": { "model": "modernmetals:tungsten_outer_stairs", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=outer_left": { "model": "modernmetals:tungsten_outer_stairs" }, - "facing=north,half=bottom,shape=outer_left": { "model": "modernmetals:tungsten_outer_stairs", "y": 180, "uvlock": true }, - "facing=east,half=bottom,shape=inner_right": { "model": "modernmetals:tungsten_inner_stairs" }, - "facing=west,half=bottom,shape=inner_right": { "model": "modernmetals:tungsten_inner_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=inner_right": { "model": "modernmetals:tungsten_inner_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=inner_right": { "model": "modernmetals:tungsten_inner_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=inner_left": { "model": "modernmetals:tungsten_inner_stairs", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=inner_left": { "model": "modernmetals:tungsten_inner_stairs", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=inner_left": { "model": "modernmetals:tungsten_inner_stairs" }, - "facing=north,half=bottom,shape=inner_left": { "model": "modernmetals:tungsten_inner_stairs", "y": 180, "uvlock": true }, - "facing=east,half=top,shape=straight": { "model": "modernmetals:tungsten_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=straight": { "model": "modernmetals:tungsten_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=straight": { "model": "modernmetals:tungsten_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=straight": { "model": "modernmetals:tungsten_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { "model": "modernmetals:tungsten_outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_right": { "model": "modernmetals:tungsten_outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { "model": "modernmetals:tungsten_outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { "model": "modernmetals:tungsten_outer_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { "model": "modernmetals:tungsten_outer_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { "model": "modernmetals:tungsten_outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { "model": "modernmetals:tungsten_outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=outer_left": { "model": "modernmetals:tungsten_outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { "model": "modernmetals:tungsten_inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { "model": "modernmetals:tungsten_inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { "model": "modernmetals:tungsten_inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { "model": "modernmetals:tungsten_inner_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { "model": "modernmetals:tungsten_inner_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { "model": "modernmetals:tungsten_inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { "model": "modernmetals:tungsten_inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { "model": "modernmetals:tungsten_inner_stairs", "x": 180, "y": 270, "uvlock": true } + "variants": { + "facing=north,half=top,shape=straight": { + "model": "modernmetals:block/tungsten_stairs", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=south,half=top,shape=straight": { + "model": "modernmetals:block/tungsten_stairs", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=west,half=top,shape=straight": { + "model": "modernmetals:block/tungsten_stairs", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=east,half=top,shape=straight": { + "model": "modernmetals:block/tungsten_stairs", + "x": 180, + "uvlock": true + }, + "facing=north,half=bottom,shape=straight": { + "model": "modernmetals:block/tungsten_stairs", + "y": 270, + "uvlock": true + }, + "facing=south,half=bottom,shape=straight": { + "model": "modernmetals:block/tungsten_stairs", + "y": 90, + "uvlock": true + }, + "facing=west,half=bottom,shape=straight": { + "model": "modernmetals:block/tungsten_stairs", + "y": 180, + "uvlock": true + }, + "facing=east,half=bottom,shape=straight": { + "model": "modernmetals:block/tungsten_stairs" + }, + "facing=north,half=top,shape=inner_left": { + "model": "modernmetals:block/tungsten_inner_stairs", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=south,half=top,shape=inner_left": { + "model": "modernmetals:block/tungsten_inner_stairs", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=west,half=top,shape=inner_left": { + "model": "modernmetals:block/tungsten_inner_stairs", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=east,half=top,shape=inner_left": { + "model": "modernmetals:block/tungsten_inner_stairs", + "x": 180, + "uvlock": true + }, + "facing=north,half=bottom,shape=inner_left": { + "model": "modernmetals:block/tungsten_inner_stairs", + "y": 180, + "uvlock": true + }, + "facing=south,half=bottom,shape=inner_left": { + "model": "modernmetals:block/tungsten_inner_stairs" + }, + "facing=west,half=bottom,shape=inner_left": { + "model": "modernmetals:block/tungsten_inner_stairs", + "y": 90, + "uvlock": true + }, + "facing=east,half=bottom,shape=inner_left": { + "model": "modernmetals:block/tungsten_inner_stairs", + "y": 270, + "uvlock": true + }, + "facing=north,half=top,shape=inner_right": { + "model": "modernmetals:block/tungsten_inner_stairs", + "x": 180, + "uvlock": true + }, + "facing=south,half=top,shape=inner_right": { + "model": "modernmetals:block/tungsten_inner_stairs", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=west,half=top,shape=inner_right": { + "model": "modernmetals:block/tungsten_inner_stairs", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=east,half=top,shape=inner_right": { + "model": "modernmetals:block/tungsten_inner_stairs", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=north,half=bottom,shape=inner_right": { + "model": "modernmetals:block/tungsten_inner_stairs", + "y": 270, + "uvlock": true + }, + "facing=south,half=bottom,shape=inner_right": { + "model": "modernmetals:block/tungsten_inner_stairs", + "y": 90, + "uvlock": true + }, + "facing=west,half=bottom,shape=inner_right": { + "model": "modernmetals:block/tungsten_inner_stairs", + "y": 180, + "uvlock": true + }, + "facing=east,half=bottom,shape=inner_right": { + "model": "modernmetals:block/tungsten_inner_stairs" + }, + "facing=north,half=top,shape=outer_left": { + "model": "modernmetals:block/tungsten_outer_stairs", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=south,half=top,shape=outer_left": { + "model": "modernmetals:block/tungsten_outer_stairs", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=west,half=top,shape=outer_left": { + "model": "modernmetals:block/tungsten_outer_stairs", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=east,half=top,shape=outer_left": { + "model": "modernmetals:block/tungsten_outer_stairs", + "x": 180, + "uvlock": true + }, + "facing=north,half=bottom,shape=outer_left": { + "model": "modernmetals:block/tungsten_outer_stairs", + "y": 180, + "uvlock": true + }, + "facing=south,half=bottom,shape=outer_left": { + "model": "modernmetals:block/tungsten_outer_stairs" + }, + "facing=west,half=bottom,shape=outer_left": { + "model": "modernmetals:block/tungsten_outer_stairs", + "y": 90, + "uvlock": true + }, + "facing=east,half=bottom,shape=outer_left": { + "model": "modernmetals:block/tungsten_outer_stairs", + "y": 270, + "uvlock": true + }, + "facing=north,half=top,shape=outer_right": { + "model": "modernmetals:block/tungsten_outer_stairs", + "x": 180, + "uvlock": true + }, + "facing=south,half=top,shape=outer_right": { + "model": "modernmetals:block/tungsten_outer_stairs", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=west,half=top,shape=outer_right": { + "model": "modernmetals:block/tungsten_outer_stairs", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=east,half=top,shape=outer_right": { + "model": "modernmetals:block/tungsten_outer_stairs", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=north,half=bottom,shape=outer_right": { + "model": "modernmetals:block/tungsten_outer_stairs", + "y": 270, + "uvlock": true + }, + "facing=south,half=bottom,shape=outer_right": { + "model": "modernmetals:block/tungsten_outer_stairs", + "y": 90, + "uvlock": true + }, + "facing=west,half=bottom,shape=outer_right": { + "model": "modernmetals:block/tungsten_outer_stairs", + "y": 180, + "uvlock": true + }, + "facing=east,half=bottom,shape=outer_right": { + "model": "modernmetals:block/tungsten_outer_stairs" } + } } diff --git a/src/main/resources/assets/modernmetals/blockstates/tungsten_trapdoor.json b/src/main/resources/assets/modernmetals/blockstates/tungsten_trapdoor.json index db8e2093..c47517b0 100644 --- a/src/main/resources/assets/modernmetals/blockstates/tungsten_trapdoor.json +++ b/src/main/resources/assets/modernmetals/blockstates/tungsten_trapdoor.json @@ -1,20 +1,68 @@ { - "variants": { - "facing=north,half=bottom,open=false": { "model": "modernmetals:tungsten_trapdoor_bottom" }, - "facing=south,half=bottom,open=false": { "model": "modernmetals:tungsten_trapdoor_bottom" }, - "facing=east,half=bottom,open=false": { "model": "modernmetals:tungsten_trapdoor_bottom" }, - "facing=west,half=bottom,open=false": { "model": "modernmetals:tungsten_trapdoor_bottom" }, - "facing=north,half=top,open=false": { "model": "modernmetals:tungsten_trapdoor_top" }, - "facing=south,half=top,open=false": { "model": "modernmetals:tungsten_trapdoor_top" }, - "facing=east,half=top,open=false": { "model": "modernmetals:tungsten_trapdoor_top" }, - "facing=west,half=top,open=false": { "model": "modernmetals:tungsten_trapdoor_top" }, - "facing=north,half=bottom,open=true": { "model": "modernmetals:tungsten_trapdoor_open" }, - "facing=south,half=bottom,open=true": { "model": "modernmetals:tungsten_trapdoor_open", "y": 180 }, - "facing=east,half=bottom,open=true": { "model": "modernmetals:tungsten_trapdoor_open", "y": 90 }, - "facing=west,half=bottom,open=true": { "model": "modernmetals:tungsten_trapdoor_open", "y": 270 }, - "facing=north,half=top,open=true": { "model": "modernmetals:tungsten_trapdoor_open" }, - "facing=south,half=top,open=true": { "model": "modernmetals:tungsten_trapdoor_open", "y": 180 }, - "facing=east,half=top,open=true": { "model": "modernmetals:tungsten_trapdoor_open", "y": 90 }, - "facing=west,half=top,open=true": { "model": "modernmetals:tungsten_trapdoor_open", "y": 270 } + "variants": { + "facing=north,half=top,open=false": { + "model": "modernmetals:block/tungsten_trapdoor_top" + }, + "facing=south,half=top,open=false": { + "model": "modernmetals:block/tungsten_trapdoor_top", + "y": 180 + }, + "facing=west,half=top,open=false": { + "model": "modernmetals:block/tungsten_trapdoor_top", + "y": 270 + }, + "facing=east,half=top,open=false": { + "model": "modernmetals:block/tungsten_trapdoor_top", + "y": 90 + }, + "facing=north,half=bottom,open=false": { + "model": "modernmetals:block/tungsten_trapdoor_bottom" + }, + "facing=south,half=bottom,open=false": { + "model": "modernmetals:block/tungsten_trapdoor_bottom", + "y": 180 + }, + "facing=west,half=bottom,open=false": { + "model": "modernmetals:block/tungsten_trapdoor_bottom", + "y": 270 + }, + "facing=east,half=bottom,open=false": { + "model": "modernmetals:block/tungsten_trapdoor_bottom", + "y": 90 + }, + "facing=north,half=top,open=true": { + "model": "modernmetals:block/tungsten_trapdoor_open", + "x": 180, + "y": 180 + }, + "facing=south,half=top,open=true": { + "model": "modernmetals:block/tungsten_trapdoor_open", + "x": 180 + }, + "facing=west,half=top,open=true": { + "model": "modernmetals:block/tungsten_trapdoor_open", + "x": 180, + "y": 90 + }, + "facing=east,half=top,open=true": { + "model": "modernmetals:block/tungsten_trapdoor_open", + "x": 180, + "y": 270 + }, + "facing=north,half=bottom,open=true": { + "model": "modernmetals:block/tungsten_trapdoor_open" + }, + "facing=south,half=bottom,open=true": { + "model": "modernmetals:block/tungsten_trapdoor_open", + "y": 180 + }, + "facing=west,half=bottom,open=true": { + "model": "modernmetals:block/tungsten_trapdoor_open", + "y": 270 + }, + "facing=east,half=bottom,open=true": { + "model": "modernmetals:block/tungsten_trapdoor_open", + "y": 90 } + } } diff --git a/src/main/resources/assets/modernmetals/blockstates/tungsten_wall.json b/src/main/resources/assets/modernmetals/blockstates/tungsten_wall.json index 20ca4922..2476f16e 100644 --- a/src/main/resources/assets/modernmetals/blockstates/tungsten_wall.json +++ b/src/main/resources/assets/modernmetals/blockstates/tungsten_wall.json @@ -1,19 +1,51 @@ { - "multipart": [ - { "when": { "up": "true" }, - "apply": { "model": "modernmetals:tungsten_wall_post" } - }, - { "when": { "north": "true" }, - "apply": { "model": "modernmetals:tungsten_wall_side", "uvlock": true } - }, - { "when": { "east": "true" }, - "apply": { "model": "modernmetals:tungsten_wall_side", "y": 90, "uvlock": true } - }, - { "when": { "south": "true" }, - "apply": { "model": "modernmetals:tungsten_wall_side", "y": 180, "uvlock": true } - }, - { "when": { "west": "true" }, - "apply": { "model": "modernmetals:tungsten_wall_side", "y": 270, "uvlock": true } - } - ] + "multipart": [ + { + "when": { + "up": "true" + }, + "apply": { + "model": "modernmetals:block/tungsten_wall_post" + } + }, + { + "when": { + "north": "true" + }, + "apply": { + "model": "modernmetals:block/tungsten_wall_side", + "uvlock": true + } + }, + { + "when": { + "east": "true" + }, + "apply": { + "model": "modernmetals:block/tungsten_wall_side", + "y": 90, + "uvlock": true + } + }, + { + "when": { + "south": "true" + }, + "apply": { + "model": "modernmetals:block/tungsten_wall_side", + "y": 180, + "uvlock": true + } + }, + { + "when": { + "west": "true" + }, + "apply": { + "model": "modernmetals:block/tungsten_wall_side", + "y": 270, + "uvlock": true + } + } + ] } diff --git a/src/main/resources/assets/modernmetals/blockstates/uranium.json b/src/main/resources/assets/modernmetals/blockstates/uranium.json index a759c630..dd8650bd 100644 --- a/src/main/resources/assets/modernmetals/blockstates/uranium.json +++ b/src/main/resources/assets/modernmetals/blockstates/uranium.json @@ -1,9 +1,10 @@ { - "forge_marker": 1, - "variants": { - "fluid": { - "model": "forge:fluid", - "custom": { "fluid": "uranium" } - } + "variants": { + "": { + "model": "minecraft:block/water", + "custom": { + "fluid": "modernmetals:uranium" + } } -} \ No newline at end of file + } +} diff --git a/src/main/resources/assets/modernmetals/blockstates/uranium_bars.json b/src/main/resources/assets/modernmetals/blockstates/uranium_bars.json index ed708ae3..12f10465 100644 --- a/src/main/resources/assets/modernmetals/blockstates/uranium_bars.json +++ b/src/main/resources/assets/modernmetals/blockstates/uranium_bars.json @@ -1,32 +1,77 @@ { - "multipart": [ - { "apply": { "model": "modernmetals:uranium_bars_post_ends" }}, - { "when": { "north": false, "east": false, "south": false, "west": false }, - "apply": { "model": "modernmetals:uranium_bars_post" } - }, - { "when": { "north": true, "east": false, "south": false, "west": false }, - "apply": { "model": "modernmetals:uranium_bars_cap" } - }, - { "when": { "north": false, "east": true, "south": false, "west": false }, - "apply": { "model": "modernmetals:uranium_bars_cap", "y": 90 } - }, - { "when": { "north": false, "east": false, "south": true, "west": false }, - "apply": { "model": "modernmetals:uranium_bars_cap_alt" } - }, - { "when": { "north": false, "east": false, "south": false, "west": true }, - "apply": { "model": "modernmetals:uranium_bars_cap_alt", "y": 90 } - }, - { "when": { "north": true }, - "apply": { "model": "modernmetals:uranium_bars_side" } - }, - { "when": { "east": true }, - "apply": { "model": "modernmetals:uranium_bars_side", "y": 90 } - }, - { "when": { "south": true }, - "apply": { "model": "modernmetals:uranium_bars_side_alt" } - }, - { "when": { "west": true }, - "apply": { "model": "modernmetals:uranium_bars_side_alt", "y": 90 } - } - ] + "multipart": [ + { + "apply": { + "model": "modernmetals:block/uranium_bars_post" + } + }, + { + "when": { + "north": "true" + }, + "apply": { + "model": "modernmetals:block/uranium_bars_side" + } + }, + { + "when": { + "north": "false" + }, + "apply": { + "model": "modernmetals:block/uranium_bars_cap" + } + }, + { + "when": { + "south": "true" + }, + "apply": { + "model": "modernmetals:block/uranium_bars_side_alt" + } + }, + { + "when": { + "south": "false" + }, + "apply": { + "model": "modernmetals:block/uranium_bars_cap_alt", + "y": 90 + } + }, + { + "when": { + "west": "true" + }, + "apply": { + "model": "modernmetals:block/uranium_bars_side_alt", + "y": 90 + } + }, + { + "when": { + "west": "false" + }, + "apply": { + "model": "modernmetals:block/uranium_bars_cap", + "y": 270 + } + }, + { + "when": { + "east": "true" + }, + "apply": { + "model": "modernmetals:block/uranium_bars_side", + "y": 90 + } + }, + { + "when": { + "east": "false" + }, + "apply": { + "model": "modernmetals:block/uranium_bars_cap_alt" + } + } + ] } diff --git a/src/main/resources/assets/modernmetals/blockstates/uranium_block.json b/src/main/resources/assets/modernmetals/blockstates/uranium_block.json index dd4c057a..1147a956 100644 --- a/src/main/resources/assets/modernmetals/blockstates/uranium_block.json +++ b/src/main/resources/assets/modernmetals/blockstates/uranium_block.json @@ -1,5 +1,7 @@ { - "variants": { - "normal": { "model": "modernmetals:uranium_block" } + "variants": { + "": { + "model": "modernmetals:block/uranium_block" } + } } diff --git a/src/main/resources/assets/modernmetals/blockstates/uranium_button.json b/src/main/resources/assets/modernmetals/blockstates/uranium_button.json index 85f8284f..6aab4a2d 100644 --- a/src/main/resources/assets/modernmetals/blockstates/uranium_button.json +++ b/src/main/resources/assets/modernmetals/blockstates/uranium_button.json @@ -1,16 +1,118 @@ { - "variants": { - "facing=up,powered=false": { "model": "modernmetals:uranium_button", "uvlock": true }, - "facing=down,powered=false": { "model": "modernmetals:uranium_button", "uvlock": true, "x": 180 }, - "facing=east,powered=false": { "model": "modernmetals:uranium_button", "uvlock": true, "x": 90, "y": 90 }, - "facing=west,powered=false": { "model": "modernmetals:uranium_button", "uvlock": true, "x": 90, "y": 270 }, - "facing=south,powered=false": { "model": "modernmetals:uranium_button", "uvlock": true, "x": 90, "y": 180 }, - "facing=north,powered=false": { "model": "modernmetals:uranium_button", "uvlock": true, "x": 90 }, - "facing=up,powered=true": { "model": "modernmetals:uranium_button_pressed", "uvlock": true }, - "facing=down,powered=true": { "model": "modernmetals:uranium_button_pressed", "uvlock": true, "x": 180 }, - "facing=east,powered=true": { "model": "modernmetals:uranium_button_pressed", "uvlock": true, "x": 90, "y": 90 }, - "facing=west,powered=true": { "model": "modernmetals:uranium_button_pressed", "uvlock": true, "x": 90, "y": 270 }, - "facing=south,powered=true": { "model": "modernmetals:uranium_button_pressed", "uvlock": true, "x": 90, "y": 180 }, - "facing=north,powered=true": { "model": "modernmetals:uranium_button_pressed", "uvlock": true, "x": 90 } + "variants": { + "face=floor,facing=north,powered=false": { + "model": "modernmetals:block/uranium_button" + }, + "face=wall,facing=north,powered=false": { + "model": "modernmetals:block/uranium_button", + "x": 90, + "uvlock": true + }, + "face=ceiling,facing=north,powered=false": { + "model": "modernmetals:block/uranium_button", + "x": 180, + "y": 180 + }, + "face=floor,facing=south,powered=false": { + "model": "modernmetals:block/uranium_button", + "y": 180 + }, + "face=wall,facing=south,powered=false": { + "model": "modernmetals:block/uranium_button", + "x": 90, + "y": 180, + "uvlock": true + }, + "face=ceiling,facing=south,powered=false": { + "model": "modernmetals:block/uranium_button", + "x": 180 + }, + "face=floor,facing=west,powered=false": { + "model": "modernmetals:block/uranium_button", + "y": 270 + }, + "face=wall,facing=west,powered=false": { + "model": "modernmetals:block/uranium_button", + "x": 90, + "y": 270, + "uvlock": true + }, + "face=ceiling,facing=west,powered=false": { + "model": "modernmetals:block/uranium_button", + "x": 180, + "y": 90 + }, + "face=floor,facing=east,powered=false": { + "model": "modernmetals:block/uranium_button", + "y": 90 + }, + "face=wall,facing=east,powered=false": { + "model": "modernmetals:block/uranium_button", + "x": 90, + "y": 90, + "uvlock": true + }, + "face=ceiling,facing=east,powered=false": { + "model": "modernmetals:block/uranium_button", + "x": 180, + "y": 270 + }, + "face=floor,facing=north,powered=true": { + "model": "modernmetals:block/uranium_button_pressed" + }, + "face=wall,facing=north,powered=true": { + "model": "modernmetals:block/uranium_button_pressed", + "x": 90, + "uvlock": true + }, + "face=ceiling,facing=north,powered=true": { + "model": "modernmetals:block/uranium_button_pressed", + "x": 180, + "y": 180 + }, + "face=floor,facing=south,powered=true": { + "model": "modernmetals:block/uranium_button_pressed", + "y": 180 + }, + "face=wall,facing=south,powered=true": { + "model": "modernmetals:block/uranium_button_pressed", + "x": 90, + "y": 180, + "uvlock": true + }, + "face=ceiling,facing=south,powered=true": { + "model": "modernmetals:block/uranium_button_pressed", + "x": 180 + }, + "face=floor,facing=west,powered=true": { + "model": "modernmetals:block/uranium_button_pressed", + "y": 270 + }, + "face=wall,facing=west,powered=true": { + "model": "modernmetals:block/uranium_button_pressed", + "x": 90, + "y": 270, + "uvlock": true + }, + "face=ceiling,facing=west,powered=true": { + "model": "modernmetals:block/uranium_button_pressed", + "x": 180, + "y": 90 + }, + "face=floor,facing=east,powered=true": { + "model": "modernmetals:block/uranium_button_pressed", + "y": 90 + }, + "face=wall,facing=east,powered=true": { + "model": "modernmetals:block/uranium_button_pressed", + "x": 90, + "y": 90, + "uvlock": true + }, + "face=ceiling,facing=east,powered=true": { + "model": "modernmetals:block/uranium_button_pressed", + "x": 180, + "y": 270 } + } } diff --git a/src/main/resources/assets/modernmetals/blockstates/uranium_door.json b/src/main/resources/assets/modernmetals/blockstates/uranium_door.json index ed75ab39..a8e0003a 100644 --- a/src/main/resources/assets/modernmetals/blockstates/uranium_door.json +++ b/src/main/resources/assets/modernmetals/blockstates/uranium_door.json @@ -1,70 +1,124 @@ { - "variants": { - "facing=east,half=lower,hinge=left,open=false,powered=false": { "model": "modernmetals:uranium_door_bottom" }, - "facing=south,half=lower,hinge=left,open=false,powered=false": { "model": "modernmetals:uranium_door_bottom", "y": 90 }, - "facing=west,half=lower,hinge=left,open=false,powered=false": { "model": "modernmetals:uranium_door_bottom", "y": 180 }, - "facing=north,half=lower,hinge=left,open=false,powered=false": { "model": "modernmetals:uranium_door_bottom", "y": 270 }, - "facing=east,half=lower,hinge=right,open=false,powered=false": { "model": "modernmetals:uranium_door_bottom_rh" }, - "facing=south,half=lower,hinge=right,open=false,powered=false": { "model": "modernmetals:uranium_door_bottom_rh", "y": 90 }, - "facing=west,half=lower,hinge=right,open=false,powered=false": { "model": "modernmetals:uranium_door_bottom_rh", "y": 180 }, - "facing=north,half=lower,hinge=right,open=false,powered=false": { "model": "modernmetals:uranium_door_bottom_rh", "y": 270 }, - "facing=east,half=lower,hinge=left,open=true,powered=false": { "model": "modernmetals:uranium_door_bottom_rh", "y": 90 }, - "facing=south,half=lower,hinge=left,open=true,powered=false": { "model": "modernmetals:uranium_door_bottom_rh", "y": 180 }, - "facing=west,half=lower,hinge=left,open=true,powered=false": { "model": "modernmetals:uranium_door_bottom_rh", "y": 270 }, - "facing=north,half=lower,hinge=left,open=true,powered=false": { "model": "modernmetals:uranium_door_bottom_rh" }, - "facing=east,half=lower,hinge=right,open=true,powered=false": { "model": "modernmetals:uranium_door_bottom", "y": 270 }, - "facing=south,half=lower,hinge=right,open=true,powered=false": { "model": "modernmetals:uranium_door_bottom" }, - "facing=west,half=lower,hinge=right,open=true,powered=false": { "model": "modernmetals:uranium_door_bottom", "y": 90 }, - "facing=north,half=lower,hinge=right,open=true,powered=false": { "model": "modernmetals:uranium_door_bottom", "y": 180 }, - "facing=east,half=upper,hinge=left,open=false,powered=false": { "model": "modernmetals:uranium_door_top" }, - "facing=south,half=upper,hinge=left,open=false,powered=false": { "model": "modernmetals:uranium_door_top", "y": 90 }, - "facing=west,half=upper,hinge=left,open=false,powered=false": { "model": "modernmetals:uranium_door_top", "y": 180 }, - "facing=north,half=upper,hinge=left,open=false,powered=false": { "model": "modernmetals:uranium_door_top", "y": 270 }, - "facing=east,half=upper,hinge=right,open=false,powered=false": { "model": "modernmetals:uranium_door_top_rh" }, - "facing=south,half=upper,hinge=right,open=false,powered=false": { "model": "modernmetals:uranium_door_top_rh", "y": 90 }, - "facing=west,half=upper,hinge=right,open=false,powered=false": { "model": "modernmetals:uranium_door_top_rh", "y": 180 }, - "facing=north,half=upper,hinge=right,open=false,powered=false": { "model": "modernmetals:uranium_door_top_rh", "y": 270 }, - "facing=east,half=upper,hinge=left,open=true,powered=false": { "model": "modernmetals:uranium_door_top_rh", "y": 90 }, - "facing=south,half=upper,hinge=left,open=true,powered=false": { "model": "modernmetals:uranium_door_top_rh", "y": 180 }, - "facing=west,half=upper,hinge=left,open=true,powered=false": { "model": "modernmetals:uranium_door_top_rh", "y": 270 }, - "facing=north,half=upper,hinge=left,open=true,powered=false": { "model": "modernmetals:uranium_door_top_rh" }, - "facing=east,half=upper,hinge=right,open=true,powered=false": { "model": "modernmetals:uranium_door_top", "y": 270 }, - "facing=south,half=upper,hinge=right,open=true,powered=false": { "model": "modernmetals:uranium_door_top" }, - "facing=west,half=upper,hinge=right,open=true,powered=false": { "model": "modernmetals:uranium_door_top", "y": 90 }, - "facing=north,half=upper,hinge=right,open=true,powered=false": { "model": "modernmetals:uranium_door_top", "y": 180 }, - - - "facing=east,half=lower,hinge=left,open=false,powered=true": { "model": "modernmetals:uranium_door_bottom" }, - "facing=south,half=lower,hinge=left,open=false,powered=true": { "model": "modernmetals:uranium_door_bottom", "y": 90 }, - "facing=west,half=lower,hinge=left,open=false,powered=true": { "model": "modernmetals:uranium_door_bottom", "y": 180 }, - "facing=north,half=lower,hinge=left,open=false,powered=true": { "model": "modernmetals:uranium_door_bottom", "y": 270 }, - "facing=east,half=lower,hinge=right,open=false,powered=true": { "model": "modernmetals:uranium_door_bottom_rh" }, - "facing=south,half=lower,hinge=right,open=false,powered=true": { "model": "modernmetals:uranium_door_bottom_rh", "y": 90 }, - "facing=west,half=lower,hinge=right,open=false,powered=true": { "model": "modernmetals:uranium_door_bottom_rh", "y": 180 }, - "facing=north,half=lower,hinge=right,open=false,powered=true": { "model": "modernmetals:uranium_door_bottom_rh", "y": 270 }, - "facing=east,half=lower,hinge=left,open=true,powered=true": { "model": "modernmetals:uranium_door_bottom_rh", "y": 90 }, - "facing=south,half=lower,hinge=left,open=true,powered=true": { "model": "modernmetals:uranium_door_bottom_rh", "y": 180 }, - "facing=west,half=lower,hinge=left,open=true,powered=true": { "model": "modernmetals:uranium_door_bottom_rh", "y": 270 }, - "facing=north,half=lower,hinge=left,open=true,powered=true": { "model": "modernmetals:uranium_door_bottom_rh" }, - "facing=east,half=lower,hinge=right,open=true,powered=true": { "model": "modernmetals:uranium_door_bottom", "y": 270 }, - "facing=south,half=lower,hinge=right,open=true,powered=true": { "model": "modernmetals:uranium_door_bottom" }, - "facing=west,half=lower,hinge=right,open=true,powered=true": { "model": "modernmetals:uranium_door_bottom", "y": 90 }, - "facing=north,half=lower,hinge=right,open=true,powered=true": { "model": "modernmetals:uranium_door_bottom", "y": 180 }, - "facing=east,half=upper,hinge=left,open=false,powered=true": { "model": "modernmetals:uranium_door_top" }, - "facing=south,half=upper,hinge=left,open=false,powered=true": { "model": "modernmetals:uranium_door_top", "y": 90 }, - "facing=west,half=upper,hinge=left,open=false,powered=true": { "model": "modernmetals:uranium_door_top", "y": 180 }, - "facing=north,half=upper,hinge=left,open=false,powered=true": { "model": "modernmetals:uranium_door_top", "y": 270 }, - "facing=east,half=upper,hinge=right,open=false,powered=true": { "model": "modernmetals:uranium_door_top_rh" }, - "facing=south,half=upper,hinge=right,open=false,powered=true": { "model": "modernmetals:uranium_door_top_rh", "y": 90 }, - "facing=west,half=upper,hinge=right,open=false,powered=true": { "model": "modernmetals:uranium_door_top_rh", "y": 180 }, - "facing=north,half=upper,hinge=right,open=false,powered=true": { "model": "modernmetals:uranium_door_top_rh", "y": 270 }, - "facing=east,half=upper,hinge=left,open=true,powered=true": { "model": "modernmetals:uranium_door_top_rh", "y": 90 }, - "facing=south,half=upper,hinge=left,open=true,powered=true": { "model": "modernmetals:uranium_door_top_rh", "y": 180 }, - "facing=west,half=upper,hinge=left,open=true,powered=true": { "model": "modernmetals:uranium_door_top_rh", "y": 270 }, - "facing=north,half=upper,hinge=left,open=true,powered=true": { "model": "modernmetals:uranium_door_top_rh" }, - "facing=east,half=upper,hinge=right,open=true,powered=true": { "model": "modernmetals:uranium_door_top", "y": 270 }, - "facing=south,half=upper,hinge=right,open=true,powered=true": { "model": "modernmetals:uranium_door_top" }, - "facing=west,half=upper,hinge=right,open=true,powered=true": { "model": "modernmetals:uranium_door_top", "y": 90 }, - "facing=north,half=upper,hinge=right,open=true,powered=true": { "model": "modernmetals:uranium_door_top", "y": 180 } + "variants": { + "facing=north,half=upper,hinge=left,open=false": { + "model": "modernmetals:block/uranium_door_top", + "y": 270 + }, + "facing=south,half=upper,hinge=left,open=false": { + "model": "modernmetals:block/uranium_door_top", + "y": 90 + }, + "facing=west,half=upper,hinge=left,open=false": { + "model": "modernmetals:block/uranium_door_top", + "y": 180 + }, + "facing=east,half=upper,hinge=left,open=false": { + "model": "modernmetals:block/uranium_door_top" + }, + "facing=north,half=lower,hinge=left,open=false": { + "model": "modernmetals:block/uranium_door_bottom", + "y": 270 + }, + "facing=south,half=lower,hinge=left,open=false": { + "model": "modernmetals:block/uranium_door_bottom", + "y": 90 + }, + "facing=west,half=lower,hinge=left,open=false": { + "model": "modernmetals:block/uranium_door_bottom", + "y": 180 + }, + "facing=east,half=lower,hinge=left,open=false": { + "model": "modernmetals:block/uranium_door_bottom" + }, + "facing=north,half=upper,hinge=right,open=false": { + "model": "modernmetals:block/uranium_door_top_rh", + "y": 270 + }, + "facing=south,half=upper,hinge=right,open=false": { + "model": "modernmetals:block/uranium_door_top_rh", + "y": 90 + }, + "facing=west,half=upper,hinge=right,open=false": { + "model": "modernmetals:block/uranium_door_top_rh", + "y": 180 + }, + "facing=east,half=upper,hinge=right,open=false": { + "model": "modernmetals:block/uranium_door_top_rh" + }, + "facing=north,half=lower,hinge=right,open=false": { + "model": "modernmetals:block/uranium_door_bottom_rh", + "y": 270 + }, + "facing=south,half=lower,hinge=right,open=false": { + "model": "modernmetals:block/uranium_door_bottom_rh", + "y": 90 + }, + "facing=west,half=lower,hinge=right,open=false": { + "model": "modernmetals:block/uranium_door_bottom_rh", + "y": 180 + }, + "facing=east,half=lower,hinge=right,open=false": { + "model": "modernmetals:block/uranium_door_bottom_rh" + }, + "facing=north,half=upper,hinge=left,open=true": { + "model": "modernmetals:block/uranium_door_top_rh" + }, + "facing=south,half=upper,hinge=left,open=true": { + "model": "modernmetals:block/uranium_door_top_rh", + "y": 180 + }, + "facing=west,half=upper,hinge=left,open=true": { + "model": "modernmetals:block/uranium_door_top_rh", + "y": 270 + }, + "facing=east,half=upper,hinge=left,open=true": { + "model": "modernmetals:block/uranium_door_top_rh", + "y": 90 + }, + "facing=north,half=lower,hinge=left,open=true": { + "model": "modernmetals:block/uranium_door_bottom_rh" + }, + "facing=south,half=lower,hinge=left,open=true": { + "model": "modernmetals:block/uranium_door_bottom_rh", + "y": 180 + }, + "facing=west,half=lower,hinge=left,open=true": { + "model": "modernmetals:block/uranium_door_bottom_rh", + "y": 270 + }, + "facing=east,half=lower,hinge=left,open=true": { + "model": "modernmetals:block/uranium_door_bottom_rh", + "y": 90 + }, + "facing=north,half=upper,hinge=right,open=true": { + "model": "modernmetals:block/uranium_door_top", + "y": 180 + }, + "facing=south,half=upper,hinge=right,open=true": { + "model": "modernmetals:block/uranium_door_top" + }, + "facing=west,half=upper,hinge=right,open=true": { + "model": "modernmetals:block/uranium_door_top", + "y": 90 + }, + "facing=east,half=upper,hinge=right,open=true": { + "model": "modernmetals:block/uranium_door_top", + "y": 270 + }, + "facing=north,half=lower,hinge=right,open=true": { + "model": "modernmetals:block/uranium_door_bottom", + "y": 180 + }, + "facing=south,half=lower,hinge=right,open=true": { + "model": "modernmetals:block/uranium_door_bottom" + }, + "facing=west,half=lower,hinge=right,open=true": { + "model": "modernmetals:block/uranium_door_bottom", + "y": 90 + }, + "facing=east,half=lower,hinge=right,open=true": { + "model": "modernmetals:block/uranium_door_bottom", + "y": 270 } + } } diff --git a/src/main/resources/assets/modernmetals/blockstates/uranium_lever.json b/src/main/resources/assets/modernmetals/blockstates/uranium_lever.json index d8fdb391..b22f261c 100644 --- a/src/main/resources/assets/modernmetals/blockstates/uranium_lever.json +++ b/src/main/resources/assets/modernmetals/blockstates/uranium_lever.json @@ -1,20 +1,76 @@ { - "variants": { - "facing=down_z,powered=false": { "model": "modernmetals:uranium_lever_off", "x": 180, "y": 180 }, - "facing=down_x,powered=false": { "model": "modernmetals:uranium_lever_off", "x": 180, "y": 90 }, - "facing=up_z,powered=false": { "model": "modernmetals:uranium_lever_off" }, - "facing=up_x,powered=false": { "model": "modernmetals:uranium_lever_off", "y": 270 }, - "facing=east,powered=false": { "model": "modernmetals:uranium_lever_off", "x": 90, "y": 90 }, - "facing=west,powered=false": { "model": "modernmetals:uranium_lever_off", "x": 90, "y": 270 }, - "facing=south,powered=false" : { "model": "modernmetals:uranium_lever_off", "x": 90, "y": 180 }, - "facing=north,powered=false" : { "model": "modernmetals:uranium_lever_off", "x": 90 }, - "facing=down_z,powered=true" : { "model": "modernmetals:uranium_lever", "x": 180, "y": 180 }, - "facing=down_x,powered=true" : { "model": "modernmetals:uranium_lever", "x": 180, "y": 90 }, - "facing=up_z,powered=true": { "model": "modernmetals:uranium_lever" }, - "facing=up_x,powered=true": { "model": "modernmetals:uranium_lever", "y": 270 }, - "facing=east,powered=true": { "model": "modernmetals:uranium_lever", "x": 90, "y": 90 }, - "facing=west,powered=true": { "model": "modernmetals:uranium_lever", "x": 90, "y": 270 }, - "facing=south,powered=true": { "model": "modernmetals:uranium_lever", "x": 90, "y": 180 }, - "facing=north,powered=true": { "model": "modernmetals:uranium_lever", "x": 90 } + "variants": { + "face=floor,facing=north,powered=false": { + "model": "modernmetals:block/uranium_lever_off" + }, + "face=wall,facing=north,powered=false": { + "model": "modernmetals:block/uranium_lever_off" + }, + "face=ceiling,facing=north,powered=false": { + "model": "modernmetals:block/uranium_lever_off" + }, + "face=floor,facing=south,powered=false": { + "model": "modernmetals:block/uranium_lever_off" + }, + "face=wall,facing=south,powered=false": { + "model": "modernmetals:block/uranium_lever_off" + }, + "face=ceiling,facing=south,powered=false": { + "model": "modernmetals:block/uranium_lever_off" + }, + "face=floor,facing=west,powered=false": { + "model": "modernmetals:block/uranium_lever_off" + }, + "face=wall,facing=west,powered=false": { + "model": "modernmetals:block/uranium_lever_off" + }, + "face=ceiling,facing=west,powered=false": { + "model": "modernmetals:block/uranium_lever_off" + }, + "face=floor,facing=east,powered=false": { + "model": "modernmetals:block/uranium_lever_off" + }, + "face=wall,facing=east,powered=false": { + "model": "modernmetals:block/uranium_lever_off" + }, + "face=ceiling,facing=east,powered=false": { + "model": "modernmetals:block/uranium_lever_off" + }, + "face=floor,facing=north,powered=true": { + "model": "modernmetals:block/uranium_lever" + }, + "face=wall,facing=north,powered=true": { + "model": "modernmetals:block/uranium_lever" + }, + "face=ceiling,facing=north,powered=true": { + "model": "modernmetals:block/uranium_lever" + }, + "face=floor,facing=south,powered=true": { + "model": "modernmetals:block/uranium_lever" + }, + "face=wall,facing=south,powered=true": { + "model": "modernmetals:block/uranium_lever" + }, + "face=ceiling,facing=south,powered=true": { + "model": "modernmetals:block/uranium_lever" + }, + "face=floor,facing=west,powered=true": { + "model": "modernmetals:block/uranium_lever" + }, + "face=wall,facing=west,powered=true": { + "model": "modernmetals:block/uranium_lever" + }, + "face=ceiling,facing=west,powered=true": { + "model": "modernmetals:block/uranium_lever" + }, + "face=floor,facing=east,powered=true": { + "model": "modernmetals:block/uranium_lever" + }, + "face=wall,facing=east,powered=true": { + "model": "modernmetals:block/uranium_lever" + }, + "face=ceiling,facing=east,powered=true": { + "model": "modernmetals:block/uranium_lever" } + } } diff --git a/src/main/resources/assets/modernmetals/blockstates/uranium_ore.json b/src/main/resources/assets/modernmetals/blockstates/uranium_ore.json index b1ab3bce..ca78b2d7 100644 --- a/src/main/resources/assets/modernmetals/blockstates/uranium_ore.json +++ b/src/main/resources/assets/modernmetals/blockstates/uranium_ore.json @@ -1,5 +1,7 @@ { - "variants": { - "normal": { "model": "modernmetals:uranium_ore" } + "variants": { + "": { + "model": "modernmetals:block/uranium_ore" } + } } diff --git a/src/main/resources/assets/modernmetals/blockstates/uranium_plate.json b/src/main/resources/assets/modernmetals/blockstates/uranium_plate.json index 4d6a5d97..dcaf29cd 100644 --- a/src/main/resources/assets/modernmetals/blockstates/uranium_plate.json +++ b/src/main/resources/assets/modernmetals/blockstates/uranium_plate.json @@ -1,10 +1,27 @@ { - "variants": { - "facing=down": { "model": "modernmetals:uranium_plate", "x": 90 }, - "facing=up": { "model": "modernmetals:uranium_plate", "x": 270 }, - "facing=north": { "model": "modernmetals:uranium_plate" }, - "facing=south": { "model": "modernmetals:uranium_plate", "y": 180 }, - "facing=west": { "model": "modernmetals:uranium_plate", "y": 270 }, - "facing=east": { "model": "modernmetals:uranium_plate", "y": 90 } + "variants": { + "facing=down": { + "model": "modernmetals:block/uranium_plate", + "x": 90 + }, + "facing=up": { + "model": "modernmetals:block/uranium_plate", + "x": 270 + }, + "facing=north": { + "model": "modernmetals:block/uranium_plate" + }, + "facing=south": { + "model": "modernmetals:block/uranium_plate", + "y": 180 + }, + "facing=west": { + "model": "modernmetals:block/uranium_plate", + "y": 270 + }, + "facing=east": { + "model": "modernmetals:block/uranium_plate", + "y": 90 } + } } diff --git a/src/main/resources/assets/modernmetals/blockstates/uranium_pressure_plate.json b/src/main/resources/assets/modernmetals/blockstates/uranium_pressure_plate.json index a6d34951..a30dca1d 100644 --- a/src/main/resources/assets/modernmetals/blockstates/uranium_pressure_plate.json +++ b/src/main/resources/assets/modernmetals/blockstates/uranium_pressure_plate.json @@ -1,6 +1,10 @@ { - "variants": { - "powered=false": { "model": "modernmetals:uranium_pressure_plate_up" }, - "powered=true": { "model": "modernmetals:uranium_pressure_plate_down" } + "variants": { + "powered=false": { + "model": "modernmetals:block/uranium_pressure_plate_up" + }, + "powered=true": { + "model": "modernmetals:block/uranium_pressure_plate_down" } + } } diff --git a/src/main/resources/assets/modernmetals/blockstates/uranium_slab.json b/src/main/resources/assets/modernmetals/blockstates/uranium_slab.json index b81b4254..c2d3c90b 100644 --- a/src/main/resources/assets/modernmetals/blockstates/uranium_slab.json +++ b/src/main/resources/assets/modernmetals/blockstates/uranium_slab.json @@ -1,6 +1,13 @@ { - "variants": { - "half=bottom,variant=default": { "model": "modernmetals:half_slab_uranium" }, - "half=top,variant=default": { "model": "modernmetals:upper_slab_uranium" } + "variants": { + "type=top": { + "model": "modernmetals:block/upper_slab_uranium" + }, + "type=bottom": { + "model": "modernmetals:block/half_slab_uranium" + }, + "type=double": { + "model": "modernmetals:block/uranium_block" } + } } diff --git a/src/main/resources/assets/modernmetals/blockstates/uranium_stairs.json b/src/main/resources/assets/modernmetals/blockstates/uranium_stairs.json index fef14e1b..5bb51c3d 100644 --- a/src/main/resources/assets/modernmetals/blockstates/uranium_stairs.json +++ b/src/main/resources/assets/modernmetals/blockstates/uranium_stairs.json @@ -1,44 +1,209 @@ { - "variants": { - "facing=east,half=bottom,shape=straight": { "model": "modernmetals:uranium_stairs" }, - "facing=west,half=bottom,shape=straight": { "model": "modernmetals:uranium_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=straight": { "model": "modernmetals:uranium_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=straight": { "model": "modernmetals:uranium_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_right": { "model": "modernmetals:uranium_outer_stairs" }, - "facing=west,half=bottom,shape=outer_right": { "model": "modernmetals:uranium_outer_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=outer_right": { "model": "modernmetals:uranium_outer_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=outer_right": { "model": "modernmetals:uranium_outer_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_left": { "model": "modernmetals:uranium_outer_stairs", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=outer_left": { "model": "modernmetals:uranium_outer_stairs", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=outer_left": { "model": "modernmetals:uranium_outer_stairs" }, - "facing=north,half=bottom,shape=outer_left": { "model": "modernmetals:uranium_outer_stairs", "y": 180, "uvlock": true }, - "facing=east,half=bottom,shape=inner_right": { "model": "modernmetals:uranium_inner_stairs" }, - "facing=west,half=bottom,shape=inner_right": { "model": "modernmetals:uranium_inner_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=inner_right": { "model": "modernmetals:uranium_inner_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=inner_right": { "model": "modernmetals:uranium_inner_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=inner_left": { "model": "modernmetals:uranium_inner_stairs", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=inner_left": { "model": "modernmetals:uranium_inner_stairs", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=inner_left": { "model": "modernmetals:uranium_inner_stairs" }, - "facing=north,half=bottom,shape=inner_left": { "model": "modernmetals:uranium_inner_stairs", "y": 180, "uvlock": true }, - "facing=east,half=top,shape=straight": { "model": "modernmetals:uranium_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=straight": { "model": "modernmetals:uranium_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=straight": { "model": "modernmetals:uranium_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=straight": { "model": "modernmetals:uranium_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { "model": "modernmetals:uranium_outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_right": { "model": "modernmetals:uranium_outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { "model": "modernmetals:uranium_outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { "model": "modernmetals:uranium_outer_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { "model": "modernmetals:uranium_outer_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { "model": "modernmetals:uranium_outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { "model": "modernmetals:uranium_outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=outer_left": { "model": "modernmetals:uranium_outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { "model": "modernmetals:uranium_inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { "model": "modernmetals:uranium_inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { "model": "modernmetals:uranium_inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { "model": "modernmetals:uranium_inner_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { "model": "modernmetals:uranium_inner_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { "model": "modernmetals:uranium_inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { "model": "modernmetals:uranium_inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { "model": "modernmetals:uranium_inner_stairs", "x": 180, "y": 270, "uvlock": true } + "variants": { + "facing=north,half=top,shape=straight": { + "model": "modernmetals:block/uranium_stairs", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=south,half=top,shape=straight": { + "model": "modernmetals:block/uranium_stairs", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=west,half=top,shape=straight": { + "model": "modernmetals:block/uranium_stairs", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=east,half=top,shape=straight": { + "model": "modernmetals:block/uranium_stairs", + "x": 180, + "uvlock": true + }, + "facing=north,half=bottom,shape=straight": { + "model": "modernmetals:block/uranium_stairs", + "y": 270, + "uvlock": true + }, + "facing=south,half=bottom,shape=straight": { + "model": "modernmetals:block/uranium_stairs", + "y": 90, + "uvlock": true + }, + "facing=west,half=bottom,shape=straight": { + "model": "modernmetals:block/uranium_stairs", + "y": 180, + "uvlock": true + }, + "facing=east,half=bottom,shape=straight": { + "model": "modernmetals:block/uranium_stairs" + }, + "facing=north,half=top,shape=inner_left": { + "model": "modernmetals:block/uranium_inner_stairs", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=south,half=top,shape=inner_left": { + "model": "modernmetals:block/uranium_inner_stairs", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=west,half=top,shape=inner_left": { + "model": "modernmetals:block/uranium_inner_stairs", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=east,half=top,shape=inner_left": { + "model": "modernmetals:block/uranium_inner_stairs", + "x": 180, + "uvlock": true + }, + "facing=north,half=bottom,shape=inner_left": { + "model": "modernmetals:block/uranium_inner_stairs", + "y": 180, + "uvlock": true + }, + "facing=south,half=bottom,shape=inner_left": { + "model": "modernmetals:block/uranium_inner_stairs" + }, + "facing=west,half=bottom,shape=inner_left": { + "model": "modernmetals:block/uranium_inner_stairs", + "y": 90, + "uvlock": true + }, + "facing=east,half=bottom,shape=inner_left": { + "model": "modernmetals:block/uranium_inner_stairs", + "y": 270, + "uvlock": true + }, + "facing=north,half=top,shape=inner_right": { + "model": "modernmetals:block/uranium_inner_stairs", + "x": 180, + "uvlock": true + }, + "facing=south,half=top,shape=inner_right": { + "model": "modernmetals:block/uranium_inner_stairs", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=west,half=top,shape=inner_right": { + "model": "modernmetals:block/uranium_inner_stairs", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=east,half=top,shape=inner_right": { + "model": "modernmetals:block/uranium_inner_stairs", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=north,half=bottom,shape=inner_right": { + "model": "modernmetals:block/uranium_inner_stairs", + "y": 270, + "uvlock": true + }, + "facing=south,half=bottom,shape=inner_right": { + "model": "modernmetals:block/uranium_inner_stairs", + "y": 90, + "uvlock": true + }, + "facing=west,half=bottom,shape=inner_right": { + "model": "modernmetals:block/uranium_inner_stairs", + "y": 180, + "uvlock": true + }, + "facing=east,half=bottom,shape=inner_right": { + "model": "modernmetals:block/uranium_inner_stairs" + }, + "facing=north,half=top,shape=outer_left": { + "model": "modernmetals:block/uranium_outer_stairs", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=south,half=top,shape=outer_left": { + "model": "modernmetals:block/uranium_outer_stairs", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=west,half=top,shape=outer_left": { + "model": "modernmetals:block/uranium_outer_stairs", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=east,half=top,shape=outer_left": { + "model": "modernmetals:block/uranium_outer_stairs", + "x": 180, + "uvlock": true + }, + "facing=north,half=bottom,shape=outer_left": { + "model": "modernmetals:block/uranium_outer_stairs", + "y": 180, + "uvlock": true + }, + "facing=south,half=bottom,shape=outer_left": { + "model": "modernmetals:block/uranium_outer_stairs" + }, + "facing=west,half=bottom,shape=outer_left": { + "model": "modernmetals:block/uranium_outer_stairs", + "y": 90, + "uvlock": true + }, + "facing=east,half=bottom,shape=outer_left": { + "model": "modernmetals:block/uranium_outer_stairs", + "y": 270, + "uvlock": true + }, + "facing=north,half=top,shape=outer_right": { + "model": "modernmetals:block/uranium_outer_stairs", + "x": 180, + "uvlock": true + }, + "facing=south,half=top,shape=outer_right": { + "model": "modernmetals:block/uranium_outer_stairs", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=west,half=top,shape=outer_right": { + "model": "modernmetals:block/uranium_outer_stairs", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=east,half=top,shape=outer_right": { + "model": "modernmetals:block/uranium_outer_stairs", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=north,half=bottom,shape=outer_right": { + "model": "modernmetals:block/uranium_outer_stairs", + "y": 270, + "uvlock": true + }, + "facing=south,half=bottom,shape=outer_right": { + "model": "modernmetals:block/uranium_outer_stairs", + "y": 90, + "uvlock": true + }, + "facing=west,half=bottom,shape=outer_right": { + "model": "modernmetals:block/uranium_outer_stairs", + "y": 180, + "uvlock": true + }, + "facing=east,half=bottom,shape=outer_right": { + "model": "modernmetals:block/uranium_outer_stairs" } + } } diff --git a/src/main/resources/assets/modernmetals/blockstates/uranium_trapdoor.json b/src/main/resources/assets/modernmetals/blockstates/uranium_trapdoor.json index 0b33fe03..2878ae92 100644 --- a/src/main/resources/assets/modernmetals/blockstates/uranium_trapdoor.json +++ b/src/main/resources/assets/modernmetals/blockstates/uranium_trapdoor.json @@ -1,20 +1,68 @@ { - "variants": { - "facing=north,half=bottom,open=false": { "model": "modernmetals:uranium_trapdoor_bottom" }, - "facing=south,half=bottom,open=false": { "model": "modernmetals:uranium_trapdoor_bottom" }, - "facing=east,half=bottom,open=false": { "model": "modernmetals:uranium_trapdoor_bottom" }, - "facing=west,half=bottom,open=false": { "model": "modernmetals:uranium_trapdoor_bottom" }, - "facing=north,half=top,open=false": { "model": "modernmetals:uranium_trapdoor_top" }, - "facing=south,half=top,open=false": { "model": "modernmetals:uranium_trapdoor_top" }, - "facing=east,half=top,open=false": { "model": "modernmetals:uranium_trapdoor_top" }, - "facing=west,half=top,open=false": { "model": "modernmetals:uranium_trapdoor_top" }, - "facing=north,half=bottom,open=true": { "model": "modernmetals:uranium_trapdoor_open" }, - "facing=south,half=bottom,open=true": { "model": "modernmetals:uranium_trapdoor_open", "y": 180 }, - "facing=east,half=bottom,open=true": { "model": "modernmetals:uranium_trapdoor_open", "y": 90 }, - "facing=west,half=bottom,open=true": { "model": "modernmetals:uranium_trapdoor_open", "y": 270 }, - "facing=north,half=top,open=true": { "model": "modernmetals:uranium_trapdoor_open" }, - "facing=south,half=top,open=true": { "model": "modernmetals:uranium_trapdoor_open", "y": 180 }, - "facing=east,half=top,open=true": { "model": "modernmetals:uranium_trapdoor_open", "y": 90 }, - "facing=west,half=top,open=true": { "model": "modernmetals:uranium_trapdoor_open", "y": 270 } + "variants": { + "facing=north,half=top,open=false": { + "model": "modernmetals:block/uranium_trapdoor_top" + }, + "facing=south,half=top,open=false": { + "model": "modernmetals:block/uranium_trapdoor_top", + "y": 180 + }, + "facing=west,half=top,open=false": { + "model": "modernmetals:block/uranium_trapdoor_top", + "y": 270 + }, + "facing=east,half=top,open=false": { + "model": "modernmetals:block/uranium_trapdoor_top", + "y": 90 + }, + "facing=north,half=bottom,open=false": { + "model": "modernmetals:block/uranium_trapdoor_bottom" + }, + "facing=south,half=bottom,open=false": { + "model": "modernmetals:block/uranium_trapdoor_bottom", + "y": 180 + }, + "facing=west,half=bottom,open=false": { + "model": "modernmetals:block/uranium_trapdoor_bottom", + "y": 270 + }, + "facing=east,half=bottom,open=false": { + "model": "modernmetals:block/uranium_trapdoor_bottom", + "y": 90 + }, + "facing=north,half=top,open=true": { + "model": "modernmetals:block/uranium_trapdoor_open", + "x": 180, + "y": 180 + }, + "facing=south,half=top,open=true": { + "model": "modernmetals:block/uranium_trapdoor_open", + "x": 180 + }, + "facing=west,half=top,open=true": { + "model": "modernmetals:block/uranium_trapdoor_open", + "x": 180, + "y": 90 + }, + "facing=east,half=top,open=true": { + "model": "modernmetals:block/uranium_trapdoor_open", + "x": 180, + "y": 270 + }, + "facing=north,half=bottom,open=true": { + "model": "modernmetals:block/uranium_trapdoor_open" + }, + "facing=south,half=bottom,open=true": { + "model": "modernmetals:block/uranium_trapdoor_open", + "y": 180 + }, + "facing=west,half=bottom,open=true": { + "model": "modernmetals:block/uranium_trapdoor_open", + "y": 270 + }, + "facing=east,half=bottom,open=true": { + "model": "modernmetals:block/uranium_trapdoor_open", + "y": 90 } + } } diff --git a/src/main/resources/assets/modernmetals/blockstates/uranium_wall.json b/src/main/resources/assets/modernmetals/blockstates/uranium_wall.json index afde6fbc..8794be04 100644 --- a/src/main/resources/assets/modernmetals/blockstates/uranium_wall.json +++ b/src/main/resources/assets/modernmetals/blockstates/uranium_wall.json @@ -1,19 +1,51 @@ { - "multipart": [ - { "when": { "up": "true" }, - "apply": { "model": "modernmetals:uranium_wall_post" } - }, - { "when": { "north": "true" }, - "apply": { "model": "modernmetals:uranium_wall_side", "uvlock": true } - }, - { "when": { "east": "true" }, - "apply": { "model": "modernmetals:uranium_wall_side", "y": 90, "uvlock": true } - }, - { "when": { "south": "true" }, - "apply": { "model": "modernmetals:uranium_wall_side", "y": 180, "uvlock": true } - }, - { "when": { "west": "true" }, - "apply": { "model": "modernmetals:uranium_wall_side", "y": 270, "uvlock": true } - } - ] + "multipart": [ + { + "when": { + "up": "true" + }, + "apply": { + "model": "modernmetals:block/uranium_wall_post" + } + }, + { + "when": { + "north": "true" + }, + "apply": { + "model": "modernmetals:block/uranium_wall_side", + "uvlock": true + } + }, + { + "when": { + "east": "true" + }, + "apply": { + "model": "modernmetals:block/uranium_wall_side", + "y": 90, + "uvlock": true + } + }, + { + "when": { + "south": "true" + }, + "apply": { + "model": "modernmetals:block/uranium_wall_side", + "y": 180, + "uvlock": true + } + }, + { + "when": { + "west": "true" + }, + "apply": { + "model": "modernmetals:block/uranium_wall_side", + "y": 270, + "uvlock": true + } + } + ] } diff --git a/src/main/resources/assets/modernmetals/blockstates/zirconium.json b/src/main/resources/assets/modernmetals/blockstates/zirconium.json index 51e19703..e79e6522 100644 --- a/src/main/resources/assets/modernmetals/blockstates/zirconium.json +++ b/src/main/resources/assets/modernmetals/blockstates/zirconium.json @@ -1,9 +1,10 @@ { - "forge_marker": 1, - "variants": { - "fluid": { - "model": "forge:fluid", - "custom": { "fluid": "zirconium" } - } + "variants": { + "": { + "model": "minecraft:block/water", + "custom": { + "fluid": "modernmetals:zirconium" + } } -} \ No newline at end of file + } +} diff --git a/src/main/resources/assets/modernmetals/blockstates/zirconium_bars.json b/src/main/resources/assets/modernmetals/blockstates/zirconium_bars.json index 5e57c282..1163815b 100644 --- a/src/main/resources/assets/modernmetals/blockstates/zirconium_bars.json +++ b/src/main/resources/assets/modernmetals/blockstates/zirconium_bars.json @@ -1,32 +1,77 @@ { - "multipart": [ - { "apply": { "model": "modernmetals:zirconium_bars_post_ends" }}, - { "when": { "north": false, "east": false, "south": false, "west": false }, - "apply": { "model": "modernmetals:zirconium_bars_post" } - }, - { "when": { "north": true, "east": false, "south": false, "west": false }, - "apply": { "model": "modernmetals:zirconium_bars_cap" } - }, - { "when": { "north": false, "east": true, "south": false, "west": false }, - "apply": { "model": "modernmetals:zirconium_bars_cap", "y": 90 } - }, - { "when": { "north": false, "east": false, "south": true, "west": false }, - "apply": { "model": "modernmetals:zirconium_bars_cap_alt" } - }, - { "when": { "north": false, "east": false, "south": false, "west": true }, - "apply": { "model": "modernmetals:zirconium_bars_cap_alt", "y": 90 } - }, - { "when": { "north": true }, - "apply": { "model": "modernmetals:zirconium_bars_side" } - }, - { "when": { "east": true }, - "apply": { "model": "modernmetals:zirconium_bars_side", "y": 90 } - }, - { "when": { "south": true }, - "apply": { "model": "modernmetals:zirconium_bars_side_alt" } - }, - { "when": { "west": true }, - "apply": { "model": "modernmetals:zirconium_bars_side_alt", "y": 90 } - } - ] + "multipart": [ + { + "apply": { + "model": "modernmetals:block/zirconium_bars_post" + } + }, + { + "when": { + "north": "true" + }, + "apply": { + "model": "modernmetals:block/zirconium_bars_side" + } + }, + { + "when": { + "north": "false" + }, + "apply": { + "model": "modernmetals:block/zirconium_bars_cap" + } + }, + { + "when": { + "south": "true" + }, + "apply": { + "model": "modernmetals:block/zirconium_bars_side_alt" + } + }, + { + "when": { + "south": "false" + }, + "apply": { + "model": "modernmetals:block/zirconium_bars_cap_alt", + "y": 90 + } + }, + { + "when": { + "west": "true" + }, + "apply": { + "model": "modernmetals:block/zirconium_bars_side_alt", + "y": 90 + } + }, + { + "when": { + "west": "false" + }, + "apply": { + "model": "modernmetals:block/zirconium_bars_cap", + "y": 270 + } + }, + { + "when": { + "east": "true" + }, + "apply": { + "model": "modernmetals:block/zirconium_bars_side", + "y": 90 + } + }, + { + "when": { + "east": "false" + }, + "apply": { + "model": "modernmetals:block/zirconium_bars_cap_alt" + } + } + ] } diff --git a/src/main/resources/assets/modernmetals/blockstates/zirconium_block.json b/src/main/resources/assets/modernmetals/blockstates/zirconium_block.json index fdeff4ca..5bf7a680 100644 --- a/src/main/resources/assets/modernmetals/blockstates/zirconium_block.json +++ b/src/main/resources/assets/modernmetals/blockstates/zirconium_block.json @@ -1,5 +1,7 @@ { - "variants": { - "normal": { "model": "modernmetals:zirconium_block" } + "variants": { + "": { + "model": "modernmetals:block/zirconium_block" } + } } diff --git a/src/main/resources/assets/modernmetals/blockstates/zirconium_button.json b/src/main/resources/assets/modernmetals/blockstates/zirconium_button.json index a4174ae5..b746cf55 100644 --- a/src/main/resources/assets/modernmetals/blockstates/zirconium_button.json +++ b/src/main/resources/assets/modernmetals/blockstates/zirconium_button.json @@ -1,16 +1,118 @@ { - "variants": { - "facing=up,powered=false": { "model": "modernmetals:zirconium_button", "uvlock": true }, - "facing=down,powered=false": { "model": "modernmetals:zirconium_button", "uvlock": true, "x": 180 }, - "facing=east,powered=false": { "model": "modernmetals:zirconium_button", "uvlock": true, "x": 90, "y": 90 }, - "facing=west,powered=false": { "model": "modernmetals:zirconium_button", "uvlock": true, "x": 90, "y": 270 }, - "facing=south,powered=false": { "model": "modernmetals:zirconium_button", "uvlock": true, "x": 90, "y": 180 }, - "facing=north,powered=false": { "model": "modernmetals:zirconium_button", "uvlock": true, "x": 90 }, - "facing=up,powered=true": { "model": "modernmetals:zirconium_button_pressed", "uvlock": true }, - "facing=down,powered=true": { "model": "modernmetals:zirconium_button_pressed", "uvlock": true, "x": 180 }, - "facing=east,powered=true": { "model": "modernmetals:zirconium_button_pressed", "uvlock": true, "x": 90, "y": 90 }, - "facing=west,powered=true": { "model": "modernmetals:zirconium_button_pressed", "uvlock": true, "x": 90, "y": 270 }, - "facing=south,powered=true": { "model": "modernmetals:zirconium_button_pressed", "uvlock": true, "x": 90, "y": 180 }, - "facing=north,powered=true": { "model": "modernmetals:zirconium_button_pressed", "uvlock": true, "x": 90 } + "variants": { + "face=floor,facing=north,powered=false": { + "model": "modernmetals:block/zirconium_button" + }, + "face=wall,facing=north,powered=false": { + "model": "modernmetals:block/zirconium_button", + "x": 90, + "uvlock": true + }, + "face=ceiling,facing=north,powered=false": { + "model": "modernmetals:block/zirconium_button", + "x": 180, + "y": 180 + }, + "face=floor,facing=south,powered=false": { + "model": "modernmetals:block/zirconium_button", + "y": 180 + }, + "face=wall,facing=south,powered=false": { + "model": "modernmetals:block/zirconium_button", + "x": 90, + "y": 180, + "uvlock": true + }, + "face=ceiling,facing=south,powered=false": { + "model": "modernmetals:block/zirconium_button", + "x": 180 + }, + "face=floor,facing=west,powered=false": { + "model": "modernmetals:block/zirconium_button", + "y": 270 + }, + "face=wall,facing=west,powered=false": { + "model": "modernmetals:block/zirconium_button", + "x": 90, + "y": 270, + "uvlock": true + }, + "face=ceiling,facing=west,powered=false": { + "model": "modernmetals:block/zirconium_button", + "x": 180, + "y": 90 + }, + "face=floor,facing=east,powered=false": { + "model": "modernmetals:block/zirconium_button", + "y": 90 + }, + "face=wall,facing=east,powered=false": { + "model": "modernmetals:block/zirconium_button", + "x": 90, + "y": 90, + "uvlock": true + }, + "face=ceiling,facing=east,powered=false": { + "model": "modernmetals:block/zirconium_button", + "x": 180, + "y": 270 + }, + "face=floor,facing=north,powered=true": { + "model": "modernmetals:block/zirconium_button_pressed" + }, + "face=wall,facing=north,powered=true": { + "model": "modernmetals:block/zirconium_button_pressed", + "x": 90, + "uvlock": true + }, + "face=ceiling,facing=north,powered=true": { + "model": "modernmetals:block/zirconium_button_pressed", + "x": 180, + "y": 180 + }, + "face=floor,facing=south,powered=true": { + "model": "modernmetals:block/zirconium_button_pressed", + "y": 180 + }, + "face=wall,facing=south,powered=true": { + "model": "modernmetals:block/zirconium_button_pressed", + "x": 90, + "y": 180, + "uvlock": true + }, + "face=ceiling,facing=south,powered=true": { + "model": "modernmetals:block/zirconium_button_pressed", + "x": 180 + }, + "face=floor,facing=west,powered=true": { + "model": "modernmetals:block/zirconium_button_pressed", + "y": 270 + }, + "face=wall,facing=west,powered=true": { + "model": "modernmetals:block/zirconium_button_pressed", + "x": 90, + "y": 270, + "uvlock": true + }, + "face=ceiling,facing=west,powered=true": { + "model": "modernmetals:block/zirconium_button_pressed", + "x": 180, + "y": 90 + }, + "face=floor,facing=east,powered=true": { + "model": "modernmetals:block/zirconium_button_pressed", + "y": 90 + }, + "face=wall,facing=east,powered=true": { + "model": "modernmetals:block/zirconium_button_pressed", + "x": 90, + "y": 90, + "uvlock": true + }, + "face=ceiling,facing=east,powered=true": { + "model": "modernmetals:block/zirconium_button_pressed", + "x": 180, + "y": 270 } + } } diff --git a/src/main/resources/assets/modernmetals/blockstates/zirconium_door.json b/src/main/resources/assets/modernmetals/blockstates/zirconium_door.json index b6b683c9..64f6a116 100644 --- a/src/main/resources/assets/modernmetals/blockstates/zirconium_door.json +++ b/src/main/resources/assets/modernmetals/blockstates/zirconium_door.json @@ -1,70 +1,124 @@ { - "variants": { - "facing=east,half=lower,hinge=left,open=false,powered=false": { "model": "modernmetals:zirconium_door_bottom" }, - "facing=south,half=lower,hinge=left,open=false,powered=false": { "model": "modernmetals:zirconium_door_bottom", "y": 90 }, - "facing=west,half=lower,hinge=left,open=false,powered=false": { "model": "modernmetals:zirconium_door_bottom", "y": 180 }, - "facing=north,half=lower,hinge=left,open=false,powered=false": { "model": "modernmetals:zirconium_door_bottom", "y": 270 }, - "facing=east,half=lower,hinge=right,open=false,powered=false": { "model": "modernmetals:zirconium_door_bottom_rh" }, - "facing=south,half=lower,hinge=right,open=false,powered=false": { "model": "modernmetals:zirconium_door_bottom_rh", "y": 90 }, - "facing=west,half=lower,hinge=right,open=false,powered=false": { "model": "modernmetals:zirconium_door_bottom_rh", "y": 180 }, - "facing=north,half=lower,hinge=right,open=false,powered=false": { "model": "modernmetals:zirconium_door_bottom_rh", "y": 270 }, - "facing=east,half=lower,hinge=left,open=true,powered=false": { "model": "modernmetals:zirconium_door_bottom_rh", "y": 90 }, - "facing=south,half=lower,hinge=left,open=true,powered=false": { "model": "modernmetals:zirconium_door_bottom_rh", "y": 180 }, - "facing=west,half=lower,hinge=left,open=true,powered=false": { "model": "modernmetals:zirconium_door_bottom_rh", "y": 270 }, - "facing=north,half=lower,hinge=left,open=true,powered=false": { "model": "modernmetals:zirconium_door_bottom_rh" }, - "facing=east,half=lower,hinge=right,open=true,powered=false": { "model": "modernmetals:zirconium_door_bottom", "y": 270 }, - "facing=south,half=lower,hinge=right,open=true,powered=false": { "model": "modernmetals:zirconium_door_bottom" }, - "facing=west,half=lower,hinge=right,open=true,powered=false": { "model": "modernmetals:zirconium_door_bottom", "y": 90 }, - "facing=north,half=lower,hinge=right,open=true,powered=false": { "model": "modernmetals:zirconium_door_bottom", "y": 180 }, - "facing=east,half=upper,hinge=left,open=false,powered=false": { "model": "modernmetals:zirconium_door_top" }, - "facing=south,half=upper,hinge=left,open=false,powered=false": { "model": "modernmetals:zirconium_door_top", "y": 90 }, - "facing=west,half=upper,hinge=left,open=false,powered=false": { "model": "modernmetals:zirconium_door_top", "y": 180 }, - "facing=north,half=upper,hinge=left,open=false,powered=false": { "model": "modernmetals:zirconium_door_top", "y": 270 }, - "facing=east,half=upper,hinge=right,open=false,powered=false": { "model": "modernmetals:zirconium_door_top_rh" }, - "facing=south,half=upper,hinge=right,open=false,powered=false": { "model": "modernmetals:zirconium_door_top_rh", "y": 90 }, - "facing=west,half=upper,hinge=right,open=false,powered=false": { "model": "modernmetals:zirconium_door_top_rh", "y": 180 }, - "facing=north,half=upper,hinge=right,open=false,powered=false": { "model": "modernmetals:zirconium_door_top_rh", "y": 270 }, - "facing=east,half=upper,hinge=left,open=true,powered=false": { "model": "modernmetals:zirconium_door_top_rh", "y": 90 }, - "facing=south,half=upper,hinge=left,open=true,powered=false": { "model": "modernmetals:zirconium_door_top_rh", "y": 180 }, - "facing=west,half=upper,hinge=left,open=true,powered=false": { "model": "modernmetals:zirconium_door_top_rh", "y": 270 }, - "facing=north,half=upper,hinge=left,open=true,powered=false": { "model": "modernmetals:zirconium_door_top_rh" }, - "facing=east,half=upper,hinge=right,open=true,powered=false": { "model": "modernmetals:zirconium_door_top", "y": 270 }, - "facing=south,half=upper,hinge=right,open=true,powered=false": { "model": "modernmetals:zirconium_door_top" }, - "facing=west,half=upper,hinge=right,open=true,powered=false": { "model": "modernmetals:zirconium_door_top", "y": 90 }, - "facing=north,half=upper,hinge=right,open=true,powered=false": { "model": "modernmetals:zirconium_door_top", "y": 180 }, - - - "facing=east,half=lower,hinge=left,open=false,powered=true": { "model": "modernmetals:zirconium_door_bottom" }, - "facing=south,half=lower,hinge=left,open=false,powered=true": { "model": "modernmetals:zirconium_door_bottom", "y": 90 }, - "facing=west,half=lower,hinge=left,open=false,powered=true": { "model": "modernmetals:zirconium_door_bottom", "y": 180 }, - "facing=north,half=lower,hinge=left,open=false,powered=true": { "model": "modernmetals:zirconium_door_bottom", "y": 270 }, - "facing=east,half=lower,hinge=right,open=false,powered=true": { "model": "modernmetals:zirconium_door_bottom_rh" }, - "facing=south,half=lower,hinge=right,open=false,powered=true": { "model": "modernmetals:zirconium_door_bottom_rh", "y": 90 }, - "facing=west,half=lower,hinge=right,open=false,powered=true": { "model": "modernmetals:zirconium_door_bottom_rh", "y": 180 }, - "facing=north,half=lower,hinge=right,open=false,powered=true": { "model": "modernmetals:zirconium_door_bottom_rh", "y": 270 }, - "facing=east,half=lower,hinge=left,open=true,powered=true": { "model": "modernmetals:zirconium_door_bottom_rh", "y": 90 }, - "facing=south,half=lower,hinge=left,open=true,powered=true": { "model": "modernmetals:zirconium_door_bottom_rh", "y": 180 }, - "facing=west,half=lower,hinge=left,open=true,powered=true": { "model": "modernmetals:zirconium_door_bottom_rh", "y": 270 }, - "facing=north,half=lower,hinge=left,open=true,powered=true": { "model": "modernmetals:zirconium_door_bottom_rh" }, - "facing=east,half=lower,hinge=right,open=true,powered=true": { "model": "modernmetals:zirconium_door_bottom", "y": 270 }, - "facing=south,half=lower,hinge=right,open=true,powered=true": { "model": "modernmetals:zirconium_door_bottom" }, - "facing=west,half=lower,hinge=right,open=true,powered=true": { "model": "modernmetals:zirconium_door_bottom", "y": 90 }, - "facing=north,half=lower,hinge=right,open=true,powered=true": { "model": "modernmetals:zirconium_door_bottom", "y": 180 }, - "facing=east,half=upper,hinge=left,open=false,powered=true": { "model": "modernmetals:zirconium_door_top" }, - "facing=south,half=upper,hinge=left,open=false,powered=true": { "model": "modernmetals:zirconium_door_top", "y": 90 }, - "facing=west,half=upper,hinge=left,open=false,powered=true": { "model": "modernmetals:zirconium_door_top", "y": 180 }, - "facing=north,half=upper,hinge=left,open=false,powered=true": { "model": "modernmetals:zirconium_door_top", "y": 270 }, - "facing=east,half=upper,hinge=right,open=false,powered=true": { "model": "modernmetals:zirconium_door_top_rh" }, - "facing=south,half=upper,hinge=right,open=false,powered=true": { "model": "modernmetals:zirconium_door_top_rh", "y": 90 }, - "facing=west,half=upper,hinge=right,open=false,powered=true": { "model": "modernmetals:zirconium_door_top_rh", "y": 180 }, - "facing=north,half=upper,hinge=right,open=false,powered=true": { "model": "modernmetals:zirconium_door_top_rh", "y": 270 }, - "facing=east,half=upper,hinge=left,open=true,powered=true": { "model": "modernmetals:zirconium_door_top_rh", "y": 90 }, - "facing=south,half=upper,hinge=left,open=true,powered=true": { "model": "modernmetals:zirconium_door_top_rh", "y": 180 }, - "facing=west,half=upper,hinge=left,open=true,powered=true": { "model": "modernmetals:zirconium_door_top_rh", "y": 270 }, - "facing=north,half=upper,hinge=left,open=true,powered=true": { "model": "modernmetals:zirconium_door_top_rh" }, - "facing=east,half=upper,hinge=right,open=true,powered=true": { "model": "modernmetals:zirconium_door_top", "y": 270 }, - "facing=south,half=upper,hinge=right,open=true,powered=true": { "model": "modernmetals:zirconium_door_top" }, - "facing=west,half=upper,hinge=right,open=true,powered=true": { "model": "modernmetals:zirconium_door_top", "y": 90 }, - "facing=north,half=upper,hinge=right,open=true,powered=true": { "model": "modernmetals:zirconium_door_top", "y": 180 } + "variants": { + "facing=north,half=upper,hinge=left,open=false": { + "model": "modernmetals:block/zirconium_door_top", + "y": 270 + }, + "facing=south,half=upper,hinge=left,open=false": { + "model": "modernmetals:block/zirconium_door_top", + "y": 90 + }, + "facing=west,half=upper,hinge=left,open=false": { + "model": "modernmetals:block/zirconium_door_top", + "y": 180 + }, + "facing=east,half=upper,hinge=left,open=false": { + "model": "modernmetals:block/zirconium_door_top" + }, + "facing=north,half=lower,hinge=left,open=false": { + "model": "modernmetals:block/zirconium_door_bottom", + "y": 270 + }, + "facing=south,half=lower,hinge=left,open=false": { + "model": "modernmetals:block/zirconium_door_bottom", + "y": 90 + }, + "facing=west,half=lower,hinge=left,open=false": { + "model": "modernmetals:block/zirconium_door_bottom", + "y": 180 + }, + "facing=east,half=lower,hinge=left,open=false": { + "model": "modernmetals:block/zirconium_door_bottom" + }, + "facing=north,half=upper,hinge=right,open=false": { + "model": "modernmetals:block/zirconium_door_top_rh", + "y": 270 + }, + "facing=south,half=upper,hinge=right,open=false": { + "model": "modernmetals:block/zirconium_door_top_rh", + "y": 90 + }, + "facing=west,half=upper,hinge=right,open=false": { + "model": "modernmetals:block/zirconium_door_top_rh", + "y": 180 + }, + "facing=east,half=upper,hinge=right,open=false": { + "model": "modernmetals:block/zirconium_door_top_rh" + }, + "facing=north,half=lower,hinge=right,open=false": { + "model": "modernmetals:block/zirconium_door_bottom_rh", + "y": 270 + }, + "facing=south,half=lower,hinge=right,open=false": { + "model": "modernmetals:block/zirconium_door_bottom_rh", + "y": 90 + }, + "facing=west,half=lower,hinge=right,open=false": { + "model": "modernmetals:block/zirconium_door_bottom_rh", + "y": 180 + }, + "facing=east,half=lower,hinge=right,open=false": { + "model": "modernmetals:block/zirconium_door_bottom_rh" + }, + "facing=north,half=upper,hinge=left,open=true": { + "model": "modernmetals:block/zirconium_door_top_rh" + }, + "facing=south,half=upper,hinge=left,open=true": { + "model": "modernmetals:block/zirconium_door_top_rh", + "y": 180 + }, + "facing=west,half=upper,hinge=left,open=true": { + "model": "modernmetals:block/zirconium_door_top_rh", + "y": 270 + }, + "facing=east,half=upper,hinge=left,open=true": { + "model": "modernmetals:block/zirconium_door_top_rh", + "y": 90 + }, + "facing=north,half=lower,hinge=left,open=true": { + "model": "modernmetals:block/zirconium_door_bottom_rh" + }, + "facing=south,half=lower,hinge=left,open=true": { + "model": "modernmetals:block/zirconium_door_bottom_rh", + "y": 180 + }, + "facing=west,half=lower,hinge=left,open=true": { + "model": "modernmetals:block/zirconium_door_bottom_rh", + "y": 270 + }, + "facing=east,half=lower,hinge=left,open=true": { + "model": "modernmetals:block/zirconium_door_bottom_rh", + "y": 90 + }, + "facing=north,half=upper,hinge=right,open=true": { + "model": "modernmetals:block/zirconium_door_top", + "y": 180 + }, + "facing=south,half=upper,hinge=right,open=true": { + "model": "modernmetals:block/zirconium_door_top" + }, + "facing=west,half=upper,hinge=right,open=true": { + "model": "modernmetals:block/zirconium_door_top", + "y": 90 + }, + "facing=east,half=upper,hinge=right,open=true": { + "model": "modernmetals:block/zirconium_door_top", + "y": 270 + }, + "facing=north,half=lower,hinge=right,open=true": { + "model": "modernmetals:block/zirconium_door_bottom", + "y": 180 + }, + "facing=south,half=lower,hinge=right,open=true": { + "model": "modernmetals:block/zirconium_door_bottom" + }, + "facing=west,half=lower,hinge=right,open=true": { + "model": "modernmetals:block/zirconium_door_bottom", + "y": 90 + }, + "facing=east,half=lower,hinge=right,open=true": { + "model": "modernmetals:block/zirconium_door_bottom", + "y": 270 } + } } diff --git a/src/main/resources/assets/modernmetals/blockstates/zirconium_lever.json b/src/main/resources/assets/modernmetals/blockstates/zirconium_lever.json index 40fa37da..8c6c1fad 100644 --- a/src/main/resources/assets/modernmetals/blockstates/zirconium_lever.json +++ b/src/main/resources/assets/modernmetals/blockstates/zirconium_lever.json @@ -1,20 +1,76 @@ { - "variants": { - "facing=down_z,powered=false": { "model": "modernmetals:zirconium_lever_off", "x": 180, "y": 180 }, - "facing=down_x,powered=false": { "model": "modernmetals:zirconium_lever_off", "x": 180, "y": 90 }, - "facing=up_z,powered=false": { "model": "modernmetals:zirconium_lever_off" }, - "facing=up_x,powered=false": { "model": "modernmetals:zirconium_lever_off", "y": 270 }, - "facing=east,powered=false": { "model": "modernmetals:zirconium_lever_off", "x": 90, "y": 90 }, - "facing=west,powered=false": { "model": "modernmetals:zirconium_lever_off", "x": 90, "y": 270 }, - "facing=south,powered=false" : { "model": "modernmetals:zirconium_lever_off", "x": 90, "y": 180 }, - "facing=north,powered=false" : { "model": "modernmetals:zirconium_lever_off", "x": 90 }, - "facing=down_z,powered=true" : { "model": "modernmetals:zirconium_lever", "x": 180, "y": 180 }, - "facing=down_x,powered=true" : { "model": "modernmetals:zirconium_lever", "x": 180, "y": 90 }, - "facing=up_z,powered=true": { "model": "modernmetals:zirconium_lever" }, - "facing=up_x,powered=true": { "model": "modernmetals:zirconium_lever", "y": 270 }, - "facing=east,powered=true": { "model": "modernmetals:zirconium_lever", "x": 90, "y": 90 }, - "facing=west,powered=true": { "model": "modernmetals:zirconium_lever", "x": 90, "y": 270 }, - "facing=south,powered=true": { "model": "modernmetals:zirconium_lever", "x": 90, "y": 180 }, - "facing=north,powered=true": { "model": "modernmetals:zirconium_lever", "x": 90 } + "variants": { + "face=floor,facing=north,powered=false": { + "model": "modernmetals:block/zirconium_lever_off" + }, + "face=wall,facing=north,powered=false": { + "model": "modernmetals:block/zirconium_lever_off" + }, + "face=ceiling,facing=north,powered=false": { + "model": "modernmetals:block/zirconium_lever_off" + }, + "face=floor,facing=south,powered=false": { + "model": "modernmetals:block/zirconium_lever_off" + }, + "face=wall,facing=south,powered=false": { + "model": "modernmetals:block/zirconium_lever_off" + }, + "face=ceiling,facing=south,powered=false": { + "model": "modernmetals:block/zirconium_lever_off" + }, + "face=floor,facing=west,powered=false": { + "model": "modernmetals:block/zirconium_lever_off" + }, + "face=wall,facing=west,powered=false": { + "model": "modernmetals:block/zirconium_lever_off" + }, + "face=ceiling,facing=west,powered=false": { + "model": "modernmetals:block/zirconium_lever_off" + }, + "face=floor,facing=east,powered=false": { + "model": "modernmetals:block/zirconium_lever_off" + }, + "face=wall,facing=east,powered=false": { + "model": "modernmetals:block/zirconium_lever_off" + }, + "face=ceiling,facing=east,powered=false": { + "model": "modernmetals:block/zirconium_lever_off" + }, + "face=floor,facing=north,powered=true": { + "model": "modernmetals:block/zirconium_lever" + }, + "face=wall,facing=north,powered=true": { + "model": "modernmetals:block/zirconium_lever" + }, + "face=ceiling,facing=north,powered=true": { + "model": "modernmetals:block/zirconium_lever" + }, + "face=floor,facing=south,powered=true": { + "model": "modernmetals:block/zirconium_lever" + }, + "face=wall,facing=south,powered=true": { + "model": "modernmetals:block/zirconium_lever" + }, + "face=ceiling,facing=south,powered=true": { + "model": "modernmetals:block/zirconium_lever" + }, + "face=floor,facing=west,powered=true": { + "model": "modernmetals:block/zirconium_lever" + }, + "face=wall,facing=west,powered=true": { + "model": "modernmetals:block/zirconium_lever" + }, + "face=ceiling,facing=west,powered=true": { + "model": "modernmetals:block/zirconium_lever" + }, + "face=floor,facing=east,powered=true": { + "model": "modernmetals:block/zirconium_lever" + }, + "face=wall,facing=east,powered=true": { + "model": "modernmetals:block/zirconium_lever" + }, + "face=ceiling,facing=east,powered=true": { + "model": "modernmetals:block/zirconium_lever" } + } } diff --git a/src/main/resources/assets/modernmetals/blockstates/zirconium_ore.json b/src/main/resources/assets/modernmetals/blockstates/zirconium_ore.json index 1660bf9e..5f1491ca 100644 --- a/src/main/resources/assets/modernmetals/blockstates/zirconium_ore.json +++ b/src/main/resources/assets/modernmetals/blockstates/zirconium_ore.json @@ -1,5 +1,7 @@ { - "variants": { - "normal": { "model": "modernmetals:zirconium_ore" } + "variants": { + "": { + "model": "modernmetals:block/zirconium_ore" } + } } diff --git a/src/main/resources/assets/modernmetals/blockstates/zirconium_plate.json b/src/main/resources/assets/modernmetals/blockstates/zirconium_plate.json index 4731af8a..29b62b90 100644 --- a/src/main/resources/assets/modernmetals/blockstates/zirconium_plate.json +++ b/src/main/resources/assets/modernmetals/blockstates/zirconium_plate.json @@ -1,10 +1,27 @@ { - "variants": { - "facing=down": { "model": "modernmetals:zirconium_plate", "x": 90 }, - "facing=up": { "model": "modernmetals:zirconium_plate", "x": 270 }, - "facing=north": { "model": "modernmetals:zirconium_plate" }, - "facing=south": { "model": "modernmetals:zirconium_plate", "y": 180 }, - "facing=west": { "model": "modernmetals:zirconium_plate", "y": 270 }, - "facing=east": { "model": "modernmetals:zirconium_plate", "y": 90 } + "variants": { + "facing=down": { + "model": "modernmetals:block/zirconium_plate", + "x": 90 + }, + "facing=up": { + "model": "modernmetals:block/zirconium_plate", + "x": 270 + }, + "facing=north": { + "model": "modernmetals:block/zirconium_plate" + }, + "facing=south": { + "model": "modernmetals:block/zirconium_plate", + "y": 180 + }, + "facing=west": { + "model": "modernmetals:block/zirconium_plate", + "y": 270 + }, + "facing=east": { + "model": "modernmetals:block/zirconium_plate", + "y": 90 } + } } diff --git a/src/main/resources/assets/modernmetals/blockstates/zirconium_pressure_plate.json b/src/main/resources/assets/modernmetals/blockstates/zirconium_pressure_plate.json index ed704ed8..725c9fad 100644 --- a/src/main/resources/assets/modernmetals/blockstates/zirconium_pressure_plate.json +++ b/src/main/resources/assets/modernmetals/blockstates/zirconium_pressure_plate.json @@ -1,6 +1,10 @@ { - "variants": { - "powered=false": { "model": "modernmetals:zirconium_pressure_plate_up" }, - "powered=true": { "model": "modernmetals:zirconium_pressure_plate_down" } + "variants": { + "powered=false": { + "model": "modernmetals:block/zirconium_pressure_plate_up" + }, + "powered=true": { + "model": "modernmetals:block/zirconium_pressure_plate_down" } + } } diff --git a/src/main/resources/assets/modernmetals/blockstates/zirconium_slab.json b/src/main/resources/assets/modernmetals/blockstates/zirconium_slab.json index 733628ad..86ed5bd0 100644 --- a/src/main/resources/assets/modernmetals/blockstates/zirconium_slab.json +++ b/src/main/resources/assets/modernmetals/blockstates/zirconium_slab.json @@ -1,6 +1,13 @@ { - "variants": { - "half=bottom,variant=default": { "model": "modernmetals:half_slab_zirconium" }, - "half=top,variant=default": { "model": "modernmetals:upper_slab_zirconium" } + "variants": { + "type=top": { + "model": "modernmetals:block/upper_slab_zirconium" + }, + "type=bottom": { + "model": "modernmetals:block/half_slab_zirconium" + }, + "type=double": { + "model": "modernmetals:block/zirconium_block" } + } } diff --git a/src/main/resources/assets/modernmetals/blockstates/zirconium_stairs.json b/src/main/resources/assets/modernmetals/blockstates/zirconium_stairs.json index d73c63a5..ec77329a 100644 --- a/src/main/resources/assets/modernmetals/blockstates/zirconium_stairs.json +++ b/src/main/resources/assets/modernmetals/blockstates/zirconium_stairs.json @@ -1,44 +1,209 @@ { - "variants": { - "facing=east,half=bottom,shape=straight": { "model": "modernmetals:zirconium_stairs" }, - "facing=west,half=bottom,shape=straight": { "model": "modernmetals:zirconium_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=straight": { "model": "modernmetals:zirconium_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=straight": { "model": "modernmetals:zirconium_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_right": { "model": "modernmetals:zirconium_outer_stairs" }, - "facing=west,half=bottom,shape=outer_right": { "model": "modernmetals:zirconium_outer_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=outer_right": { "model": "modernmetals:zirconium_outer_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=outer_right": { "model": "modernmetals:zirconium_outer_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_left": { "model": "modernmetals:zirconium_outer_stairs", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=outer_left": { "model": "modernmetals:zirconium_outer_stairs", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=outer_left": { "model": "modernmetals:zirconium_outer_stairs" }, - "facing=north,half=bottom,shape=outer_left": { "model": "modernmetals:zirconium_outer_stairs", "y": 180, "uvlock": true }, - "facing=east,half=bottom,shape=inner_right": { "model": "modernmetals:zirconium_inner_stairs" }, - "facing=west,half=bottom,shape=inner_right": { "model": "modernmetals:zirconium_inner_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=inner_right": { "model": "modernmetals:zirconium_inner_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=inner_right": { "model": "modernmetals:zirconium_inner_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=inner_left": { "model": "modernmetals:zirconium_inner_stairs", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=inner_left": { "model": "modernmetals:zirconium_inner_stairs", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=inner_left": { "model": "modernmetals:zirconium_inner_stairs" }, - "facing=north,half=bottom,shape=inner_left": { "model": "modernmetals:zirconium_inner_stairs", "y": 180, "uvlock": true }, - "facing=east,half=top,shape=straight": { "model": "modernmetals:zirconium_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=straight": { "model": "modernmetals:zirconium_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=straight": { "model": "modernmetals:zirconium_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=straight": { "model": "modernmetals:zirconium_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { "model": "modernmetals:zirconium_outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_right": { "model": "modernmetals:zirconium_outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { "model": "modernmetals:zirconium_outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { "model": "modernmetals:zirconium_outer_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { "model": "modernmetals:zirconium_outer_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { "model": "modernmetals:zirconium_outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { "model": "modernmetals:zirconium_outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=outer_left": { "model": "modernmetals:zirconium_outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { "model": "modernmetals:zirconium_inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { "model": "modernmetals:zirconium_inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { "model": "modernmetals:zirconium_inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { "model": "modernmetals:zirconium_inner_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { "model": "modernmetals:zirconium_inner_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { "model": "modernmetals:zirconium_inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { "model": "modernmetals:zirconium_inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { "model": "modernmetals:zirconium_inner_stairs", "x": 180, "y": 270, "uvlock": true } + "variants": { + "facing=north,half=top,shape=straight": { + "model": "modernmetals:block/zirconium_stairs", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=south,half=top,shape=straight": { + "model": "modernmetals:block/zirconium_stairs", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=west,half=top,shape=straight": { + "model": "modernmetals:block/zirconium_stairs", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=east,half=top,shape=straight": { + "model": "modernmetals:block/zirconium_stairs", + "x": 180, + "uvlock": true + }, + "facing=north,half=bottom,shape=straight": { + "model": "modernmetals:block/zirconium_stairs", + "y": 270, + "uvlock": true + }, + "facing=south,half=bottom,shape=straight": { + "model": "modernmetals:block/zirconium_stairs", + "y": 90, + "uvlock": true + }, + "facing=west,half=bottom,shape=straight": { + "model": "modernmetals:block/zirconium_stairs", + "y": 180, + "uvlock": true + }, + "facing=east,half=bottom,shape=straight": { + "model": "modernmetals:block/zirconium_stairs" + }, + "facing=north,half=top,shape=inner_left": { + "model": "modernmetals:block/zirconium_inner_stairs", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=south,half=top,shape=inner_left": { + "model": "modernmetals:block/zirconium_inner_stairs", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=west,half=top,shape=inner_left": { + "model": "modernmetals:block/zirconium_inner_stairs", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=east,half=top,shape=inner_left": { + "model": "modernmetals:block/zirconium_inner_stairs", + "x": 180, + "uvlock": true + }, + "facing=north,half=bottom,shape=inner_left": { + "model": "modernmetals:block/zirconium_inner_stairs", + "y": 180, + "uvlock": true + }, + "facing=south,half=bottom,shape=inner_left": { + "model": "modernmetals:block/zirconium_inner_stairs" + }, + "facing=west,half=bottom,shape=inner_left": { + "model": "modernmetals:block/zirconium_inner_stairs", + "y": 90, + "uvlock": true + }, + "facing=east,half=bottom,shape=inner_left": { + "model": "modernmetals:block/zirconium_inner_stairs", + "y": 270, + "uvlock": true + }, + "facing=north,half=top,shape=inner_right": { + "model": "modernmetals:block/zirconium_inner_stairs", + "x": 180, + "uvlock": true + }, + "facing=south,half=top,shape=inner_right": { + "model": "modernmetals:block/zirconium_inner_stairs", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=west,half=top,shape=inner_right": { + "model": "modernmetals:block/zirconium_inner_stairs", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=east,half=top,shape=inner_right": { + "model": "modernmetals:block/zirconium_inner_stairs", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=north,half=bottom,shape=inner_right": { + "model": "modernmetals:block/zirconium_inner_stairs", + "y": 270, + "uvlock": true + }, + "facing=south,half=bottom,shape=inner_right": { + "model": "modernmetals:block/zirconium_inner_stairs", + "y": 90, + "uvlock": true + }, + "facing=west,half=bottom,shape=inner_right": { + "model": "modernmetals:block/zirconium_inner_stairs", + "y": 180, + "uvlock": true + }, + "facing=east,half=bottom,shape=inner_right": { + "model": "modernmetals:block/zirconium_inner_stairs" + }, + "facing=north,half=top,shape=outer_left": { + "model": "modernmetals:block/zirconium_outer_stairs", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=south,half=top,shape=outer_left": { + "model": "modernmetals:block/zirconium_outer_stairs", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=west,half=top,shape=outer_left": { + "model": "modernmetals:block/zirconium_outer_stairs", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=east,half=top,shape=outer_left": { + "model": "modernmetals:block/zirconium_outer_stairs", + "x": 180, + "uvlock": true + }, + "facing=north,half=bottom,shape=outer_left": { + "model": "modernmetals:block/zirconium_outer_stairs", + "y": 180, + "uvlock": true + }, + "facing=south,half=bottom,shape=outer_left": { + "model": "modernmetals:block/zirconium_outer_stairs" + }, + "facing=west,half=bottom,shape=outer_left": { + "model": "modernmetals:block/zirconium_outer_stairs", + "y": 90, + "uvlock": true + }, + "facing=east,half=bottom,shape=outer_left": { + "model": "modernmetals:block/zirconium_outer_stairs", + "y": 270, + "uvlock": true + }, + "facing=north,half=top,shape=outer_right": { + "model": "modernmetals:block/zirconium_outer_stairs", + "x": 180, + "uvlock": true + }, + "facing=south,half=top,shape=outer_right": { + "model": "modernmetals:block/zirconium_outer_stairs", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=west,half=top,shape=outer_right": { + "model": "modernmetals:block/zirconium_outer_stairs", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=east,half=top,shape=outer_right": { + "model": "modernmetals:block/zirconium_outer_stairs", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=north,half=bottom,shape=outer_right": { + "model": "modernmetals:block/zirconium_outer_stairs", + "y": 270, + "uvlock": true + }, + "facing=south,half=bottom,shape=outer_right": { + "model": "modernmetals:block/zirconium_outer_stairs", + "y": 90, + "uvlock": true + }, + "facing=west,half=bottom,shape=outer_right": { + "model": "modernmetals:block/zirconium_outer_stairs", + "y": 180, + "uvlock": true + }, + "facing=east,half=bottom,shape=outer_right": { + "model": "modernmetals:block/zirconium_outer_stairs" } + } } diff --git a/src/main/resources/assets/modernmetals/blockstates/zirconium_trapdoor.json b/src/main/resources/assets/modernmetals/blockstates/zirconium_trapdoor.json index 135deec0..0d5e618d 100644 --- a/src/main/resources/assets/modernmetals/blockstates/zirconium_trapdoor.json +++ b/src/main/resources/assets/modernmetals/blockstates/zirconium_trapdoor.json @@ -1,20 +1,68 @@ { - "variants": { - "facing=north,half=bottom,open=false": { "model": "modernmetals:zirconium_trapdoor_bottom" }, - "facing=south,half=bottom,open=false": { "model": "modernmetals:zirconium_trapdoor_bottom" }, - "facing=east,half=bottom,open=false": { "model": "modernmetals:zirconium_trapdoor_bottom" }, - "facing=west,half=bottom,open=false": { "model": "modernmetals:zirconium_trapdoor_bottom" }, - "facing=north,half=top,open=false": { "model": "modernmetals:zirconium_trapdoor_top" }, - "facing=south,half=top,open=false": { "model": "modernmetals:zirconium_trapdoor_top" }, - "facing=east,half=top,open=false": { "model": "modernmetals:zirconium_trapdoor_top" }, - "facing=west,half=top,open=false": { "model": "modernmetals:zirconium_trapdoor_top" }, - "facing=north,half=bottom,open=true": { "model": "modernmetals:zirconium_trapdoor_open" }, - "facing=south,half=bottom,open=true": { "model": "modernmetals:zirconium_trapdoor_open", "y": 180 }, - "facing=east,half=bottom,open=true": { "model": "modernmetals:zirconium_trapdoor_open", "y": 90 }, - "facing=west,half=bottom,open=true": { "model": "modernmetals:zirconium_trapdoor_open", "y": 270 }, - "facing=north,half=top,open=true": { "model": "modernmetals:zirconium_trapdoor_open" }, - "facing=south,half=top,open=true": { "model": "modernmetals:zirconium_trapdoor_open", "y": 180 }, - "facing=east,half=top,open=true": { "model": "modernmetals:zirconium_trapdoor_open", "y": 90 }, - "facing=west,half=top,open=true": { "model": "modernmetals:zirconium_trapdoor_open", "y": 270 } + "variants": { + "facing=north,half=top,open=false": { + "model": "modernmetals:block/zirconium_trapdoor_top" + }, + "facing=south,half=top,open=false": { + "model": "modernmetals:block/zirconium_trapdoor_top", + "y": 180 + }, + "facing=west,half=top,open=false": { + "model": "modernmetals:block/zirconium_trapdoor_top", + "y": 270 + }, + "facing=east,half=top,open=false": { + "model": "modernmetals:block/zirconium_trapdoor_top", + "y": 90 + }, + "facing=north,half=bottom,open=false": { + "model": "modernmetals:block/zirconium_trapdoor_bottom" + }, + "facing=south,half=bottom,open=false": { + "model": "modernmetals:block/zirconium_trapdoor_bottom", + "y": 180 + }, + "facing=west,half=bottom,open=false": { + "model": "modernmetals:block/zirconium_trapdoor_bottom", + "y": 270 + }, + "facing=east,half=bottom,open=false": { + "model": "modernmetals:block/zirconium_trapdoor_bottom", + "y": 90 + }, + "facing=north,half=top,open=true": { + "model": "modernmetals:block/zirconium_trapdoor_open", + "x": 180, + "y": 180 + }, + "facing=south,half=top,open=true": { + "model": "modernmetals:block/zirconium_trapdoor_open", + "x": 180 + }, + "facing=west,half=top,open=true": { + "model": "modernmetals:block/zirconium_trapdoor_open", + "x": 180, + "y": 90 + }, + "facing=east,half=top,open=true": { + "model": "modernmetals:block/zirconium_trapdoor_open", + "x": 180, + "y": 270 + }, + "facing=north,half=bottom,open=true": { + "model": "modernmetals:block/zirconium_trapdoor_open" + }, + "facing=south,half=bottom,open=true": { + "model": "modernmetals:block/zirconium_trapdoor_open", + "y": 180 + }, + "facing=west,half=bottom,open=true": { + "model": "modernmetals:block/zirconium_trapdoor_open", + "y": 270 + }, + "facing=east,half=bottom,open=true": { + "model": "modernmetals:block/zirconium_trapdoor_open", + "y": 90 } + } } diff --git a/src/main/resources/assets/modernmetals/blockstates/zirconium_wall.json b/src/main/resources/assets/modernmetals/blockstates/zirconium_wall.json index b7d44e93..5d06625e 100644 --- a/src/main/resources/assets/modernmetals/blockstates/zirconium_wall.json +++ b/src/main/resources/assets/modernmetals/blockstates/zirconium_wall.json @@ -1,19 +1,51 @@ { - "multipart": [ - { "when": { "up": "true" }, - "apply": { "model": "modernmetals:zirconium_wall_post" } - }, - { "when": { "north": "true" }, - "apply": { "model": "modernmetals:zirconium_wall_side", "uvlock": true } - }, - { "when": { "east": "true" }, - "apply": { "model": "modernmetals:zirconium_wall_side", "y": 90, "uvlock": true } - }, - { "when": { "south": "true" }, - "apply": { "model": "modernmetals:zirconium_wall_side", "y": 180, "uvlock": true } - }, - { "when": { "west": "true" }, - "apply": { "model": "modernmetals:zirconium_wall_side", "y": 270, "uvlock": true } - } - ] + "multipart": [ + { + "when": { + "up": "true" + }, + "apply": { + "model": "modernmetals:block/zirconium_wall_post" + } + }, + { + "when": { + "north": "true" + }, + "apply": { + "model": "modernmetals:block/zirconium_wall_side", + "uvlock": true + } + }, + { + "when": { + "east": "true" + }, + "apply": { + "model": "modernmetals:block/zirconium_wall_side", + "y": 90, + "uvlock": true + } + }, + { + "when": { + "south": "true" + }, + "apply": { + "model": "modernmetals:block/zirconium_wall_side", + "y": 180, + "uvlock": true + } + }, + { + "when": { + "west": "true" + }, + "apply": { + "model": "modernmetals:block/zirconium_wall_side", + "y": 270, + "uvlock": true + } + } + ] } diff --git a/src/main/resources/assets/modernmetals/lang/de_de.json b/src/main/resources/assets/modernmetals/lang/de_de.json new file mode 100644 index 00000000..56e34958 --- /dev/null +++ b/src/main/resources/assets/modernmetals/lang/de_de.json @@ -0,0 +1,1676 @@ +{ + "item.modernmetals.nichrome_casing": "Nickelchromgehäuse", + "itemGroup.modernmetals.items": "Modern Metals Gegenstände", + "itemGroup.modernmetals.tools": "Modern Metals Werkzeuge", + "itemGroup.modernmetals.blocks": "Modern Metals Blöcke", + "nei.modernmetals.recipehandler.crusher": "Zerkleinerte Blöcke / Gegenstände", + "material.aluminum": "Aluminium", + "item.modernmetals.aluminum_arrow": "Aluminiumpfeil", + "item.modernmetals.aluminum_axe": "Aluminiumaxt", + "item.modernmetals.aluminum_bars": "Aluminiumgitter", + "item.modernmetals.aluminum_blend": "Aluminiumgemisch", + "item.modernmetals.aluminum_block": "Aluminiumblock", + "item.modernmetals.aluminum_boots": "Aluminiumstiefel", + "item.modernmetals.aluminum_bolt": "Aluminiumbolzen", + "item.modernmetals.aluminum_bow": "Aluminiumbogen", + "item.modernmetals.aluminum_chestplate": "Aluminiumbrustpanzer", + "item.modernmetals.aluminum_crackhammer": "Aluminiumbruchhammer", + "item.modernmetals.aluminum_crossbow": "Aluminiumarmbrust", + "item.modernmetals.aluminum_door": "Aluminiumtür", + "item.modernmetals.aluminum_fishing_rod": "Aluminiumangel", + "item.modernmetals.aluminum_gear": "Aluminiumzahnrad", + "item.modernmetals.aluminum_helmet": "Aluminiumhelm", + "item.modernmetals.aluminum_hoe": "Aluminiumhacke", + "item.modernmetals.aluminum_horse_armor": "Aluminiumpferderüstung", + "item.modernmetals.aluminum_ingot": "Aluminiumbarren", + "item.modernmetals.aluminum_leggings": "Aluminiumbeinrüstung", + "item.modernmetals.aluminum_nugget": "Aluminiumnugget", + "item.modernmetals.aluminum_ore": "Aluminiumerz", + "item.modernmetals.aluminum_pickaxe": "Aluminiumspitzhacke", + "item.modernmetals.aluminum_powder": "Aluminiumpulver", + "item.modernmetals.aluminum_rod": "Aluminiumstange", + "item.modernmetals.aluminum_shears": "Aluminiumschere", + "item.modernmetals.aluminum_shield": "Aluminiumschild", + "item.modernmetals.aluminum_shovel": "Aluminiumschaufel", + "item.modernmetals.aluminum_smallblend": "Kleiner Aluminiumgemischhaufen", + "item.modernmetals.aluminum_smallpowder": "Kleiner Aluminiumpulverhaufen", + "item.modernmetals.aluminum_sword": "Aluminiumschwert", + "item.modernmetals.aluminum_trapdoor": "Aluminiumfalltür", + "material.aluminumbrass": "Duraluminium", + "item.modernmetals.aluminumbrass_arrow": "Duraluminiumpfeil", + "item.modernmetals.aluminumbrass_axe": "Duraluminiumaxt", + "item.modernmetals.aluminumbrass_bars": "Duraluminiumgitter", + "item.modernmetals.aluminumbrass_blend": "Duraluminiumgemisch", + "item.modernmetals.aluminumbrass_block": "Duraluminiumblock", + "item.modernmetals.aluminumbrass_boots": "Duraluminiumstiefel", + "item.modernmetals.aluminumbrass_bolt": "Duraluminiumbolzen", + "item.modernmetals.aluminumbrass_bow": "Duraluminiumbogen", + "item.modernmetals.aluminumbrass_chestplate": "Duraluminiumbrustpanzer", + "item.modernmetals.aluminumbrass_crackhammer": "Duraluminiumbruchhammer", + "item.modernmetals.aluminumbrass_crossbow": "Duraluminiumarmbrust", + "item.modernmetals.aluminumbrass_door": "Duraluminiumtür", + "item.modernmetals.aluminumbrass_fishing_rod": "Duraluminiumangel", + "item.modernmetals.aluminumbrass_gear": "Duraluminiumzahnrad", + "item.modernmetals.aluminumbrass_helmet": "Duraluminiumhelm", + "item.modernmetals.aluminumbrass_hoe": "Duraluminiumhacke", + "item.modernmetals.aluminumbrass_horse_armor": "Duraluminiumpferderüstung", + "item.modernmetals.aluminumbrass_ingot": "Duraluminiumbarren", + "item.modernmetals.aluminumbrass_leggings": "Duraluminiumbeinrüstung", + "item.modernmetals.aluminumbrass_nugget": "Duraluminiumnugget", + "item.modernmetals.aluminumbrass_ore": "Duraluminiumerz", + "item.modernmetals.aluminumbrass_pickaxe": "Duraluminiumspitzhacke", + "item.modernmetals.aluminumbrass_powder": "Duraluminiumpulver", + "item.modernmetals.aluminumbrass_rod": "Duraluminiumstange", + "item.modernmetals.aluminumbrass_shears": "Duraluminiumschere", + "item.modernmetals.aluminumbrass_shield": "Duraluminiumschild", + "item.modernmetals.aluminumbrass_shovel": "Duraluminiumschaufel", + "item.modernmetals.aluminumbrass_smallblend": "Kleiner Duraluminiumgemischhaufen", + "item.modernmetals.aluminumbrass_smallpowder": "Kleiner Duraluminiumpulverhaufen", + "item.modernmetals.aluminumbrass_sword": "Duraluminiumschwert", + "item.modernmetals.aluminumbrass_trapdoor": "Duraluminiumfalltür", + "material.antimony": "Antimon", + "item.modernmetals.antimony_arrow": "Antimonpfeil", + "item.modernmetals.antimony_axe": "Antimonaxt", + "item.modernmetals.antimony_bars": "Antimongitter", + "item.modernmetals.antimony_block": "Antimonblock", + "item.modernmetals.antimony_boots": "Antimonstiefel", + "item.modernmetals.antimony_chestplate": "Antimonbrustpanzer", + "item.modernmetals.antimony_crackhammer": "Antimonbruchhammer", + "item.modernmetals.antimony_door": "Antimontür", + "item.modernmetals.antimony_helmet": "Antimonhelm", + "item.modernmetals.antimony_hoe": "Antimonhacke", + "item.modernmetals.antimony_ingot": "Antimonbarren", + "item.modernmetals.antimony_leggings": "Antimonbeinrüstung", + "item.modernmetals.antimony_nugget": "Antimonnugget", + "item.modernmetals.antimony_ore": "Antimonerz", + "item.modernmetals.antimony_pickaxe": "Antimonspitzhacke", + "item.modernmetals.antimony_powder": "Antimonpulver", + "item.modernmetals.antimony_shears": "Antimonschere", + "item.modernmetals.antimony_shield": "Antimonschild", + "item.modernmetals.antimony_shovel": "Antimonschaufel", + "item.modernmetals.antimony_smallpowder": "Kleiner Antimonpulverhaufen", + "item.modernmetals.antimony_sword": "Antimonschwert", + "item.modernmetals.antimony_trapdoor": "Antimonfalltür", + "material.bismuth": "Bismuth", + "item.modernmetals.bismuth_arrow": "Bismuthpfeil", + "item.modernmetals.bismuth_axe": "Bismuthaxt", + "item.modernmetals.bismuth_bars": "Bismuthgitter", + "item.modernmetals.bismuth_block": "Bismuthblock", + "item.modernmetals.bismuth_boots": "Bismuthstiefel", + "item.modernmetals.bismuth_chestplate": "Bismuthbrustpanzer", + "item.modernmetals.bismuth_crackhammer": "Bismuthbruchhammer", + "item.modernmetals.bismuth_door": "Bismuthtür", + "item.modernmetals.bismuth_helmet": "Bismuthhelm", + "item.modernmetals.bismuth_hoe": "Bismuthhacke", + "item.modernmetals.bismuth_ingot": "Bismuthbarren", + "item.modernmetals.bismuth_leggings": "Bismuthbeinrüstung", + "item.modernmetals.bismuth_nugget": "Bismuthnugget", + "item.modernmetals.bismuth_ore": "Bismutherz", + "item.modernmetals.bismuth_pickaxe": "Bismuthspitzhacke", + "item.modernmetals.bismuth_powder": "Bismuthpulver", + "item.modernmetals.bismuth_shears": "Bismuthschere", + "item.modernmetals.bismuth_shovel": "Bismuthschaufel", + "item.modernmetals.bismuth_shield": "Bismuthschild", + "item.modernmetals.bismuth_smallpowder": "Kleiner Bismuthpulverhaufen", + "item.modernmetals.bismuth_sword": "Bismuthschwert", + "item.modernmetals.bismuth_trapdoor": "Bismuthfalltür", + "material.cadmium": "Cadmium", + "item.modernmetals.cadmium_arrow": "Cadmiumpfeil", + "item.modernmetals.cadmium_axe": "Cadmiumaxt", + "item.modernmetals.cadmium_bars": "Cadmiumgitter", + "item.modernmetals.cadmium_blend": "Cadmiumgemisch", + "item.modernmetals.cadmium_block": "Cadmiumblock", + "item.modernmetals.cadmium_bolt": "Cadmiumbolzen", + "item.modernmetals.cadmium_boots": "Cadmiumstiefel", + "item.modernmetals.cadmium_bow": "Cadmiumbogen", + "item.modernmetals.cadmium_chestplate": "Cadmiumbrustpanzer", + "item.modernmetals.cadmium_crackhammer": "Cadmiumbruchhammer", + "item.modernmetals.cadmium_crossbow": "Cadmiumarmbrust", + "item.modernmetals.cadmium_door": "Cadmiumtür", + "item.modernmetals.cadmium_fishing_rod": "Cadmiumangel", + "item.modernmetals.cadmium_gear": "Cadmiumzahnrad", + "item.modernmetals.cadmium_helmet": "Cadmiumhelm", + "item.modernmetals.cadmium_hoe": "Cadmiumhacke", + "item.modernmetals.cadmium_horse_armor": "Cadmiumpferderüstung", + "item.modernmetals.cadmium_ingot": "Cadmiumbarren", + "item.modernmetals.cadmium_leggings": "Cadmiumbeinrüstung", + "item.modernmetals.cadmium_nugget": "Cadmiumnugget", + "item.modernmetals.cadmium_ore": "Cadmiumerz", + "item.modernmetals.cadmium_pickaxe": "Cadmiumspitzhacke", + "item.modernmetals.cadmium_powder": "Cadmiumpulver", + "item.modernmetals.cadmium_rod": "Cadmiumstange", + "item.modernmetals.cadmium_shears": "Cadmiumschere", + "item.modernmetals.cadmium_shovel": "Cadmiumschaufel", + "item.modernmetals.cadmium_shield": "Cadmiumschild", + "item.modernmetals.cadmium_smallblend": "Kleiner Cadmiumgemischhaufen", + "item.modernmetals.cadmium_smallpowder": "Kleiner Cadmiumpulverhaufen", + "item.modernmetals.cadmium_sword": "Cadmiumschwert", + "item.modernmetals.cadmium_trapdoor": "Cadmiumfalltür", + "material.chromium": "Chrom", + "item.modernmetals.chromium_arrow": "Chrompfeil", + "item.modernmetals.chromium_axe": "Chromaxt", + "item.modernmetals.chromium_bars": "Chromgitter", + "item.modernmetals.chromium_blend": "Chromgemisch", + "item.modernmetals.chromium_block": "Chromblock", + "item.modernmetals.chromium_bolt": "Chrombolzen", + "item.modernmetals.chromium_boots": "Chromstiefel", + "item.modernmetals.chromium_bow": "Chrombogen", + "item.modernmetals.chromium_chestplate": "Chrombrustpanzer", + "item.modernmetals.chromium_crackhammer": "Chrombruchhammer", + "item.modernmetals.chromium_crossbow": "Chromarmbrust", + "item.modernmetals.chromium_door": "Chromtür", + "item.modernmetals.chromium_fishing_rod": "Chromangel", + "item.modernmetals.chromium_gear": "Chromzahnrad", + "item.modernmetals.chromium_helmet": "Chromhelm", + "item.modernmetals.chromium_hoe": "Chromhacke", + "item.modernmetals.chromium_horse_armor": "Chrompferderüstung", + "item.modernmetals.chromium_ingot": "Chrombarren", + "item.modernmetals.chromium_leggings": "Chrombeinrüstung", + "item.modernmetals.chromium_nugget": "Chromnugget", + "item.modernmetals.chromium_ore": "Chromerz", + "item.modernmetals.chromium_pickaxe": "Chromspitzhacke", + "item.modernmetals.chromium_powder": "Chrompulver", + "item.modernmetals.chromium_rod": "Chromstange", + "item.modernmetals.chromium_shears": "Chromschere", + "item.modernmetals.chromium_shield": "Chromschild", + "item.modernmetals.chromium_shovel": "Chromschaufel", + "item.modernmetals.chromium_smallblend": "Kleiner Chromgemischhaufen", + "item.modernmetals.chromium_smallpowder": "Kleiner Chrompulverhaufen", + "item.modernmetals.chromium_sword": "Chromschwert", + "item.modernmetals.chromium_trapdoor": "Chromfalltür", + "material.galvanizedsteel": "Verzinkter Stahl", + "item.modernmetals.galvanizedsteel_arrow": "Verzinkter Stahlpfeil", + "item.modernmetals.galvanizedsteel_axe": "Vernickelte Stahlaxt", + "item.modernmetals.galvanizedsteel_bars": "Vernickeltes Stahlgitter", + "item.modernmetals.galvanizedsteel_blend": "Vernickeltes Stahlgemisch", + "item.modernmetals.galvanizedsteel_block": "Verzinkter Stahl", + "item.modernmetals.galvanizedsteel_bolt": "Verzinkter Stahlbolzen", + "item.modernmetals.galvanizedsteel_boots": "Verzinkter Stahlstiefel", + "item.modernmetals.galvanizedsteel_bow": "Verzinkter Stahlbogen", + "item.modernmetals.galvanizedsteel_chestplate": "Verzinkter Stahlbrustpanzer", + "item.modernmetals.galvanizedsteel_crackhammer": "Verzinkter Stahlbruchhammer", + "item.modernmetals.galvanizedsteel_crossbow": "Vernickelte Stahlarmbrust", + "item.modernmetals.galvanizedsteel_door": "Vernickelte Stahltür", + "item.modernmetals.galvanizedsteel_fishing_rod": "Vernickelte Stahlangel", + "item.modernmetals.galvanizedsteel_gear": "Vernickeltes Stahlzahnrad", + "item.modernmetals.galvanizedsteel_helmet": "Verzinkter Stahlhelm", + "item.modernmetals.galvanizedsteel_hoe": "Vernickelte Stahlhacke", + "item.modernmetals.galvanizedsteel_horse_armor": "Vernickelte Stahlpferderüstung", + "item.modernmetals.galvanizedsteel_ingot": "Verzinkter Stahlbarren", + "item.modernmetals.galvanizedsteel_leggings": "Vernickelte Stahlbeinrüstung", + "item.modernmetals.galvanizedsteel_nugget": "Vernickeltes Stahlnugget", + "item.modernmetals.galvanizedsteel_ore": "Vernickeltes Stahlerz", + "item.modernmetals.galvanizedsteel_pickaxe": "Vernickelte Stahlspitzhacke", + "item.modernmetals.galvanizedsteel_powder": "Vernickeltes Stahl-Pulver", + "item.modernmetals.galvanizedsteel_rod": "Vernickelte Stahlstange", + "item.modernmetals.galvanizedsteel_shears": "Vernickelte Stahlschere", + "item.modernmetals.galvanizedsteel_shield": "Vernickeltes Stahlschild", + "item.modernmetals.galvanizedsteel_shovel": "Vernickelte Stahlschaufel", + "item.modernmetals.galvanizedsteel_smallblend": "Kleiner, vernickelter Stahlgemischhaufen", + "item.modernmetals.galvanizedsteel_smallpowder": "Kleiner, vernickelter Stahlpulverhaufen", + "item.modernmetals.galvanizedsteel_sword": "Vernickeltes Stahlschwert", + "item.modernmetals.galvanizedsteel_trapdoor": "Vernickelte Stahlfalltür", + "material.iridium": "Iridium", + "item.modernmetals.iridium_arrow": "Iridiumpfeil", + "item.modernmetals.iridium_axe": "Iridiumaxt", + "item.modernmetals.iridium_bars": "Iridiumgitter", + "item.modernmetals.iridium_blend": "Iridiumgemisch", + "item.modernmetals.iridium_block": "Iridium", + "item.modernmetals.iridium_bolt": "Iridiumbolzen", + "item.modernmetals.iridium_boots": "Iridiumstiefel", + "item.modernmetals.iridium_bow": "Iridiumbogen", + "item.modernmetals.iridium_chestplate": "Iridiumbrustpanzer", + "item.modernmetals.iridium_crackhammer": "Iridiumbruchhammer", + "item.modernmetals.iridium_crossbow": "Iridiumarmbrust", + "item.modernmetals.iridium_door": "Iridiumtür", + "item.modernmetals.iridium_fishing_rod": "Iridiumangel", + "item.modernmetals.iridium_gear": "Iridiumzahnrad", + "item.modernmetals.iridium_helmet": "Iridiumhelm", + "item.modernmetals.iridium_hoe": "Iridiumhacke", + "item.modernmetals.iridium_horse_armor": "Iridiumpferderüstung", + "item.modernmetals.iridium_ingot": "Iridiumbarren", + "item.modernmetals.iridium_leggings": "Iridiumbeinrüstung", + "item.modernmetals.iridium_nugget": "Iridiumnugget", + "item.modernmetals.iridium_ore": "Iridiumerz", + "item.modernmetals.iridium_pickaxe": "Iridiumspitzhacke", + "item.modernmetals.iridium_powder": "Iridiumpulver", + "item.modernmetals.iridium_rod": "Iridiumstange", + "item.modernmetals.iridium_shears": "Iridiumschere", + "item.modernmetals.iridium_shield": "Iridiumschild", + "item.modernmetals.iridium_shovel": "Iridiumschaufel", + "item.modernmetals.iridium_smallblend": "Kleiner Iridiumgemischhaufen", + "item.modernmetals.iridium_smallpowder": "Kleiner Iridiumpulverhaufen", + "item.modernmetals.iridium_sword": "Iridiumschwert", + "item.modernmetals.iridium_trapdoor": "Iridiumfalltür", + "material.magnesium": "Magnesium", + "item.modernmetals.magnesium_arrow": "Magnesiumpfeil", + "item.modernmetals.magnesium_axe": "Magnesiumaxt", + "item.modernmetals.magnesium_bars": "Magnesiumgitter", + "item.modernmetals.magnesium_blend": "Magnesiumgemisch", + "item.modernmetals.magnesium_block": "Magnesium", + "item.modernmetals.magnesium_boots": "Magnesiumstiefel", + "item.modernmetals.magnesium_bolt": "Magnesiumbolzen", + "item.modernmetals.magnesium_bow": "Magnesiumbogen", + "item.modernmetals.magnesium_chestplate": "Magnesiumbrustpanzer", + "item.modernmetals.magnesium_crackhammer": "Magnesiumbruchhammer", + "item.modernmetals.magnesium_crossbow": "Magnesiumarmbrust", + "item.modernmetals.magnesium_door": "Magnesiumtür", + "item.modernmetals.magnesium_fishing_rod": "Magnesiumangel", + "item.modernmetals.magnesium_gear": "Magnesiumzahnrad", + "item.modernmetals.magnesium_helmet": "Magnesiumhelm", + "item.modernmetals.magnesium_hoe": "Magnesiumhacke", + "item.modernmetals.magnesium_horse_armor": "Magnesiumpferderüstung", + "item.modernmetals.magnesium_ingot": "Magnesiumbarren", + "item.modernmetals.magnesium_leggings": "Magnesiumbeinrüstung", + "item.modernmetals.magnesium_nugget": "Magnesiumnugget", + "item.modernmetals.magnesium_ore": "Magnesiumerz", + "item.modernmetals.magnesium_pickaxe": "Magnesiumspitzhacke", + "item.modernmetals.magnesium_powder": "Magnesiumpulver", + "item.modernmetals.magnesium_rod": "Magnesiumstange", + "item.modernmetals.magnesium_shears": "Magnesiumschere", + "item.modernmetals.magnesium_shield": "Magnesiumschild", + "item.modernmetals.magnesium_shovel": "Magnesiumschaufel", + "item.modernmetals.magnesium_smallblend": "Kleiner Magnesiumgemischhaufen", + "item.modernmetals.magnesium_smallpowder": "Kleiner Magnesiumpulverhaufen", + "item.modernmetals.magnesium_sword": "Magnesiumschwert", + "item.modernmetals.magnesium_trapdoor": "Magnesiumfalltür", + "material.manganese": "Mangan", + "item.modernmetals.manganese_arrow": "Manganpfeil", + "item.modernmetals.manganese_axe": "Manganaxt", + "item.modernmetals.manganese_bars": "Mangangitter", + "item.modernmetals.manganese_blend": "Mangangemisch", + "item.modernmetals.manganese_block": "Mangan", + "item.modernmetals.manganese_bolt": "Manganbolzen", + "item.modernmetals.manganese_boots": "Manganstiefel", + "item.modernmetals.manganese_bow": "Manganbogen", + "item.modernmetals.manganese_chestplate": "Manganbrustpanzer", + "item.modernmetals.manganese_crackhammer": "Manganbruchhammer", + "item.modernmetals.manganese_crossbow": "Manganarmbrust", + "item.modernmetals.manganese_door": "Mangantür", + "item.modernmetals.manganese_fishing_rod": "Manganangel", + "item.modernmetals.manganese_gear": "Manganzahnrad", + "item.modernmetals.manganese_helmet": "Manganhelm", + "item.modernmetals.manganese_hoe": "Manganhacke", + "item.modernmetals.manganese_horse_armor": "Manganpferderüstung", + "item.modernmetals.manganese_ingot": "Manganbarren", + "item.modernmetals.manganese_leggings": "Manganbeinrüstung", + "item.modernmetals.manganese_nugget": "Mangannugget", + "item.modernmetals.manganese_ore": "Manganerz", + "item.modernmetals.manganese_pickaxe": "Manganspitzhacke", + "item.modernmetals.manganese_powder": "Manganpulver", + "item.modernmetals.manganese_rod": "Manganstange", + "item.modernmetals.manganese_shears": "Manganschere", + "item.modernmetals.manganese_shield": "Manganschild", + "item.modernmetals.manganese_shovel": "Manganschaufel", + "item.modernmetals.manganese_smallblend": "Kleiner Mangangemischhaufen", + "item.modernmetals.manganese_smallpowder": "Kleiner Manganpulverhaufen", + "item.modernmetals.manganese_sword": "Manganschwert", + "item.modernmetals.manganese_trapdoor": "Manganfalltür", + "material.nichrome": "Nickel-Chrom-", + "item.modernmetals.nichrome_arrow": "Nickel-Chrom-Pfeil", + "item.modernmetals.nichrome_axe": "Nickel-Chrom-Axt", + "item.modernmetals.nichrome_bars": "Nickel-Chrom-Gitter", + "item.modernmetals.nichrome_blend": "Nickel-Chrom-Gemisch", + "item.modernmetals.nichrome_block": "Nickel-Chrom", + "item.modernmetals.nichrome_bolt": "Nickel-Chrom-Bolzen", + "item.modernmetals.nichrome_boots": "Nickel-Chrom-Stiefel", + "item.modernmetals.nichrome_bow": "Nickel-Chrom-Bogen", + "item.modernmetals.nichrome_chestplate": "Nickel-Chrom-Brustpanzer", + "item.modernmetals.nichrome_crackhammer": "Nickel-Chrom-Bruchhammer", + "item.modernmetals.nichrome_crossbow": "Nickel-Chrom-Armbrust", + "item.modernmetals.nichrome_door": "Nickel-Chrom-Tür", + "item.modernmetals.nichrome_fishing_rod": "Nickel-Chrom-Angel", + "item.modernmetals.nichrome_gear": "Nickel-Chrom-Zahnrad", + "item.modernmetals.nichrome_helmet": "Nickel-Chrom-Helm", + "item.modernmetals.nichrome_hoe": "Nickel-Chrom-Hacke", + "item.modernmetals.nichrome_horse_armor": "Nickel-Chrom-Pferderüstung", + "item.modernmetals.nichrome_ingot": "Nickel-Chrom-Barren", + "item.modernmetals.nichrome_leggings": "Nickel-Chrom-Beinrüstung", + "item.modernmetals.nichrome_nugget": "Nickel-Chrom-Nugget", + "item.modernmetals.nichrome_ore": "Nickel-Chrom-Erz", + "item.modernmetals.nichrome_pickaxe": "Nickel-Chrom-Spitzhacke", + "item.modernmetals.nichrome_powder": "Nickel-Chrom-Pulver", + "item.modernmetals.nichrome_rod": "Nickel-Chrom-Stange", + "item.modernmetals.nichrome_shears": "Nickel-Chrom-Schere", + "item.modernmetals.nichrome_shield": "Nickel-Chrom-Schild", + "item.modernmetals.nichrome_shovel": "Nickel-Chrom-Schaufel", + "item.modernmetals.nichrome_smallblend": "Kleiner Nickel-Chrom-Gemischhaufen", + "item.modernmetals.nichrome_smallpowder": "Kleiner Nickel-Chrom-Pulverhaufen", + "item.modernmetals.nichrome_sword": "Nickel-Chrom-Schwert", + "item.modernmetals.nichrome_trapdoor": "Nickel-Chrom-Falltür", + "material.osmium": "Osmium", + "item.modernmetals.osmium_arrow": "Osmiumpfeil", + "item.modernmetals.osmium_axe": "Osmiumaxt", + "item.modernmetals.osmium_bars": "Osmiumgitter", + "item.modernmetals.osmium_blend": "Osmiumgemisch", + "item.modernmetals.osmium_block": "Osmium", + "item.modernmetals.osmium_boots": "Osmiumstiefel", + "item.modernmetals.osmium_bolt": "Osmiumbolzen", + "item.modernmetals.osmium_bow": "Osmiumbogen", + "item.modernmetals.osmium_chestplate": "Osmiumbrustpanzer", + "item.modernmetals.osmium_crackhammer": "Osmiumbruchhammer", + "item.modernmetals.osmium_crossbow": "Osmiumarmbrust", + "item.modernmetals.osmium_door": "Osmiumtür", + "item.modernmetals.osmium_fishing_rod": "Osmiumangel", + "item.modernmetals.osmium_gear": "Osmiumzahnrad", + "item.modernmetals.osmium_helmet": "Osmiumhelm", + "item.modernmetals.osmium_hoe": "Osmiumhacke", + "item.modernmetals.osmium_horse_armor": "Osmiumpferderüstung", + "item.modernmetals.osmium_ingot": "Osmiumbarren", + "item.modernmetals.osmium_leggings": "Osmiumbeinrüstung", + "item.modernmetals.osmium_nugget": "Osmiumnugget", + "item.modernmetals.osmium_ore": "Osmiumerz", + "item.modernmetals.osmium_pickaxe": "Osmiumspitzhacke", + "item.modernmetals.osmium_powder": "Osmiumpulver", + "item.modernmetals.osmium_rod": "Osmiumstange", + "item.modernmetals.osmium_shears": "Osmiumschere", + "item.modernmetals.osmium_shield": "Osmiumschild", + "item.modernmetals.osmium_shovel": "Osmiumschaufel", + "item.modernmetals.osmium_smallblend": "Kleiner Osmiumgemischhaufen", + "item.modernmetals.osmium_smallpowder": "Kleiner Osmiumpulverhaufen", + "item.modernmetals.osmium_sword": "Osmiumschwert", + "item.modernmetals.osmium_trapdoor": "Osmiumfalltür", + "material.pewter": "Hartzinn", + "item.modernmetals.pewter_arrow": "Hartzinnpfeil", + "item.modernmetals.pewter_axe": "Hartzinnaxt", + "item.modernmetals.pewter_bars": "Hartzinngitter", + "item.modernmetals.pewter_blend": "Hartzinngemisch", + "item.modernmetals.pewter_block": "Hartzinn", + "item.modernmetals.pewter_boots": "Hartzinnstiefel", + "item.modernmetals.pewter_chestplate": "Hartzinnbrustpanzer", + "item.modernmetals.pewter_crackhammer": "Hartzinnbruchhammer", + "item.modernmetals.pewter_door": "Hartzinntür", + "item.modernmetals.pewter_helmet": "Hartzinnhelm", + "item.modernmetals.pewter_hoe": "Hartzinnhacke", + "item.modernmetals.pewter_ingot": "Hartzinnbarren", + "item.modernmetals.pewter_leggings": "Hartzinnbeinrüstung", + "item.modernmetals.pewter_nugget": "Hartzinnnugget", + "item.modernmetals.pewter_ore": "Hartzinnerz", + "item.modernmetals.pewter_pickaxe": "Hartzinnspitzhacke", + "item.modernmetals.pewter_powder": "Hartzinnpulver", + "item.modernmetals.pewter_shears": "Hartzinnschere", + "item.modernmetals.pewter_shield": "Hartzinnschild", + "item.modernmetals.pewter_shovel": "Hartzinnschaufel", + "item.modernmetals.pewter_smallpowder": "Kleiner Hartzinnpulverhaufen", + "item.modernmetals.pewter_sword": "Hartzinnschwert", + "item.modernmetals.pewter_trapdoor": "Hartzinnfalltür", + "material.plutonium": "Plutonium", + "item.modernmetals.plutonium_arrow": "Plutoniumpfeil", + "item.modernmetals.plutonium_axe": "Plutoniumaxt", + "item.modernmetals.plutonium_bars": "Plutoniumgitter", + "item.modernmetals.plutonium_blend": "Plutoniumgemisch", + "item.modernmetals.plutonium_block": "Plutonium", + "item.modernmetals.plutonium_bolt": "Plutoniumbolzen", + "item.modernmetals.plutonium_boots": "Plutoniumstiefel", + "item.modernmetals.plutonium_bow": "Plutoniumbogen", + "item.modernmetals.plutonium_chestplate": "Plutoniumbrustpanzer", + "item.modernmetals.plutonium_crackhammer": "Plutoniumbruchhammer", + "item.modernmetals.plutonium_crossbow": "Plutoniumarmbrust", + "item.modernmetals.plutonium_door": "Plutoniumtür", + "item.modernmetals.plutonium_fishing_rod": "Plutoniumangel", + "item.modernmetals.plutonium_gear": "Plutoniumzahnrad", + "item.modernmetals.plutonium_helmet": "Plutoniumhelm", + "item.modernmetals.plutonium_hoe": "Plutoniumhacke", + "item.modernmetals.plutonium_horse_armor": "Plutoniumpferderüstung", + "item.modernmetals.plutonium_ingot": "Plutoniumbarren", + "item.modernmetals.plutonium_leggings": "Plutoniumbeinrüstung", + "item.modernmetals.plutonium_nugget": "Plutoniumnugget", + "item.modernmetals.plutonium_ore": "Plutoniumerz", + "item.modernmetals.plutonium_pickaxe": "Plutoniumspitzhacke", + "item.modernmetals.plutonium_powder": "Plutoniumpulver", + "item.modernmetals.plutonium_rod": "Plutoniumstange", + "item.modernmetals.plutonium_shears": "Plutoniumschere", + "item.modernmetals.plutonium_shield": "Plutoniumschild", + "item.modernmetals.plutonium_shovel": "Plutoniumschaufel", + "item.modernmetals.plutonium_smallblend": "Kleiner Plutoniumgemischhaufen", + "item.modernmetals.plutonium_smallpowder": "Kleiner Plutoniumpulverhaufen", + "item.modernmetals.plutonium_sword": "Plutoniumschwert", + "item.modernmetals.plutonium_trapdoor": "Plutoniumfalltür", + "material.rutile": "Rutil", + "item.modernmetals.rutile_arrow": "Rutilpfeil", + "item.modernmetals.rutile_axe": "Rutilaxt", + "item.modernmetals.rutile_bars": "Rutilgitter", + "item.modernmetals.rutile_blend": "Rutilgemisch", + "item.modernmetals.rutile_block": "Rutil", + "item.modernmetals.rutile_boots": "Rutilstiefel", + "item.modernmetals.rutile_bolt": "Rutilbolzen", + "item.modernmetals.rutile_bow": "Rutilbogen", + "item.modernmetals.rutile_chestplate": "Rutilbrustpanzer", + "item.modernmetals.rutile_crackhammer": "Rutilbruchhammer", + "item.modernmetals.rutile_crossbow": "Rutilarmbrust", + "item.modernmetals.rutile_door": "Rutiltür", + "item.modernmetals.rutile_fishing_rod": "Rutilangel", + "item.modernmetals.rutile_gear": "Rutilzahnrad", + "item.modernmetals.rutile_helmet": "Rutilhelm", + "item.modernmetals.rutile_hoe": "Rutilhacke", + "item.modernmetals.rutile_horse_armor": "Rutilpferderüstung", + "item.modernmetals.rutile_ingot": "Rutilbarren", + "item.modernmetals.rutile_leggings": "Rutilbeinrüstung", + "item.modernmetals.rutile_nugget": "Rutilnugget", + "item.modernmetals.rutile_ore": "Rutilerz", + "item.modernmetals.rutile_pickaxe": "Rutilspitzhacke", + "item.modernmetals.rutile_powder": "Rutilpulver", + "item.modernmetals.rutile_rod": "Rutilstange", + "item.modernmetals.rutile_shears": "Rutilschere", + "item.modernmetals.rutile_shield": "Rutilschild", + "item.modernmetals.rutile_shovel": "Rutilschaufel", + "item.modernmetals.rutile_smallblend": "Kleiner Rutilgemischhaufen", + "item.modernmetals.rutile_smallpowder": "Kleiner Rutilpulverhaufen", + "item.modernmetals.rutile_sword": "Rutilschwert", + "item.modernmetals.rutile_trapdoor": "Rutilfalltür", + "material.stainlesssteel": "Edelstahl", + "item.modernmetals.stainlesssteel_arrow": "Edelstahlpfeil", + "item.modernmetals.stainlesssteel_axe": "Edelstahlaxt", + "item.modernmetals.stainlesssteel_bars": "Edelstahlgitter", + "item.modernmetals.stainlesssteel_blend": "Edelstahlgemisch", + "item.modernmetals.stainlesssteel_block": "Edelstahl", + "item.modernmetals.stainlesssteel_bolt": "Edelstahlbolzen", + "item.modernmetals.stainlesssteel_boots": "Edelstahlstiefel", + "item.modernmetals.stainlesssteel_bow": "Edelstahlbogen", + "item.modernmetals.stainlesssteel_chestplate": "Edelstahlbrustpanzer", + "item.modernmetals.stainlesssteel_crackhammer": "Edelstahlbruchhammer", + "item.modernmetals.stainlesssteel_crossbow": "Edelstahlarmbrust", + "item.modernmetals.stainlesssteel_door": "Edelstahltür", + "item.modernmetals.stainlesssteel_fishing_rod": "Edelstahlangel", + "item.modernmetals.stainlesssteel_gear": "Edelstahlzahnrad", + "item.modernmetals.stainlesssteel_helmet": "Edelstahlhelm", + "item.modernmetals.stainlesssteel_hoe": "Edelstahlhacke", + "item.modernmetals.stainlesssteel_horse_armor": "Edelstahlpferderüstung", + "item.modernmetals.stainlesssteel_ingot": "Edelstahlbarren", + "item.modernmetals.stainlesssteel_leggings": "Edelstahlbeinrüstung", + "item.modernmetals.stainlesssteel_nugget": "Edelstahlnugget", + "item.modernmetals.stainlesssteel_ore": "Edelstahlerz", + "item.modernmetals.stainlesssteel_pickaxe": "Edelstahlspitzhacke", + "item.modernmetals.stainlesssteel_powder": "Edelstahlpulver", + "item.modernmetals.stainlesssteel_rod": "Edelstahlstange", + "item.modernmetals.stainlesssteel_shears": "Edelstahlschere", + "item.modernmetals.stainlesssteel_shield": "Edelstahlschild", + "item.modernmetals.stainlesssteel_shovel": "Edelstahlschaufel", + "item.modernmetals.stainlesssteel_smallblend": "Kleiner Edelstahlgemischhaufen", + "item.modernmetals.stainlesssteel_smallpowder": "Kleiner Edelstahlpulverhaufen", + "item.modernmetals.stainlesssteel_sword": "Edelstahlschwert", + "item.modernmetals.stainlesssteel_trapdoor": "Edelstahlfalltür", + "material.tantalum": "Tantal", + "item.modernmetals.tantalum_arrow": "Tantalpfeil", + "item.modernmetals.tantalum_axe": "Tantalaxt", + "item.modernmetals.tantalum_bars": "Tantalgitter", + "item.modernmetals.tantalum_blend": "Tantalgemisch", + "item.modernmetals.tantalum_block": "Tantal", + "item.modernmetals.tantalum_bolt": "Tantalbolzen", + "item.modernmetals.tantalum_boots": "Tantalstiefel", + "item.modernmetals.tantalum_bow": "Tantalbogen", + "item.modernmetals.tantalum_chestplate": "Tantalbrustpanzer", + "item.modernmetals.tantalum_crackhammer": "Tantalbruchhammer", + "item.modernmetals.tantalum_crossbow": "Tantalarmbrust", + "item.modernmetals.tantalum_door": "Tantaltür", + "item.modernmetals.tantalum_fishing_rod": "Tantalangel", + "item.modernmetals.tantalum_gear": "Tantalzahnrad", + "item.modernmetals.tantalum_helmet": "Tantalhelm", + "item.modernmetals.tantalum_hoe": "Tantalhacke", + "item.modernmetals.tantalum_horse_armor": "Tantalpferderüstung", + "item.modernmetals.tantalum_ingot": "Tantalbarren", + "item.modernmetals.tantalum_leggings": "Tantalbeinrüstung", + "item.modernmetals.tantalum_nugget": "Tantalnugget", + "item.modernmetals.tantalum_ore": "Tantalerz", + "item.modernmetals.tantalum_pickaxe": "Tantalspitzhacke", + "item.modernmetals.tantalum_powder": "Tantalpulver", + "item.modernmetals.tantalum_rod": "Tantalstange", + "item.modernmetals.tantalum_shears": "Tantalschere", + "item.modernmetals.tantalum_shield": "Tantalschild", + "item.modernmetals.tantalum_shovel": "Tantalschaufel", + "item.modernmetals.tantalum_smallblend": "Kleiner Tantalgemischhaufen", + "item.modernmetals.tantalum_smallpowder": "Kleiner Tantalpulverhaufen", + "item.modernmetals.tantalum_sword": "Tantalschwert", + "item.modernmetals.tantalum_trapdoor": "Tantalfalltür", + "material.titanium": "Titan", + "item.modernmetals.titanium_arrow": "Titanpfeil", + "item.modernmetals.titanium_axe": "Titanaxt", + "item.modernmetals.titanium_bars": "Titangitter", + "item.modernmetals.titanium_blend": "Titangemisch", + "item.modernmetals.titanium_block": "Titan", + "item.modernmetals.titanium_boots": "Titanstiefel", + "item.modernmetals.titanium_bolt": "Titanbolzen", + "item.modernmetals.titanium_bow": "Titanbogen", + "item.modernmetals.titanium_chestplate": "Titanbrustpanzer", + "item.modernmetals.titanium_crackhammer": "Titanbruchhammer", + "item.modernmetals.titanium_crossbow": "Titanarmbrust", + "item.modernmetals.titanium_door": "Titantür", + "item.modernmetals.titanium_fishing_rod": "Titanangel", + "item.modernmetals.titanium_gear": "Titanzahnrad", + "item.modernmetals.titanium_helmet": "Titanhelm", + "item.modernmetals.titanium_hoe": "Titanhacke", + "item.modernmetals.titanium_horse_armor": "Titanpferderüstung", + "item.modernmetals.titanium_ingot": "Titanbarren", + "item.modernmetals.titanium_leggings": "Titanbeinrüstung", + "item.modernmetals.titanium_nugget": "Titannugget", + "item.modernmetals.titanium_ore": "Titanerz", + "item.modernmetals.titanium_pickaxe": "Titanspitzhacke", + "item.modernmetals.titanium_powder": "Titanpulver", + "item.modernmetals.titanium_rod": "Titanstange", + "item.modernmetals.titanium_shears": "Titanschere", + "item.modernmetals.titanium_shield": "Titanschild", + "item.modernmetals.titanium_shovel": "Titanschaufel", + "item.modernmetals.titanium_smallblend": "Kleiner Titangemischhaufen", + "item.modernmetals.titanium_smallpowder": "Kleiner Titanpulverhaufen", + "item.modernmetals.titanium_sword": "Titanschwert", + "item.modernmetals.titanium_trapdoor": "Titanfalltür", + "material.tungsten": "Wolfram", + "item.modernmetals.tungsten_arrow": "Wolframpfeil", + "item.modernmetals.tungsten_axe": "Wolframaxt", + "item.modernmetals.tungsten_bars": "Wolframgitter", + "item.modernmetals.tungsten_blend": "Wolframgemisch", + "item.modernmetals.tungsten_block": "Wolfram", + "item.modernmetals.tungsten_boots": "Wolframstiefel", + "item.modernmetals.tungsten_bolt": "Wolframbolzen", + "item.modernmetals.tungsten_bow": "Wolframbogen", + "item.modernmetals.tungsten_chestplate": "Wolframbrustpanzer", + "item.modernmetals.tungsten_crackhammer": "Wolframbruchhammer", + "item.modernmetals.tungsten_crossbow": "Wolframarmbrust", + "item.modernmetals.tungsten_door": "Wolframtür", + "item.modernmetals.tungsten_fishing_rod": "Wolframangel", + "item.modernmetals.tungsten_gear": "Wolframzahnrad", + "item.modernmetals.tungsten_helmet": "Wolframhelm", + "item.modernmetals.tungsten_hoe": "Wolframhacke", + "item.modernmetals.tungsten_horse_armor": "Wolframpferderüstung", + "item.modernmetals.tungsten_ingot": "Wolframbarren", + "item.modernmetals.tungsten_leggings": "Wolframbeinrüstung", + "item.modernmetals.tungsten_nugget": "Wolframnugget", + "item.modernmetals.tungsten_ore": "Wolframerz", + "item.modernmetals.tungsten_pickaxe": "Wolframspitzhacke", + "item.modernmetals.tungsten_powder": "Wolframpulver", + "item.modernmetals.tungsten_rod": "Wolframstange", + "item.modernmetals.tungsten_shears": "Wolframschere", + "item.modernmetals.tungsten_shield": "Wolframschild", + "item.modernmetals.tungsten_shovel": "Wolframschaufel", + "item.modernmetals.tungsten_smallblend": "Kleiner Wolframgemischhaufen", + "item.modernmetals.tungsten_smallpowder": "Kleiner Wolframpulverhaufen", + "item.modernmetals.tungsten_sword": "Wolframschwert", + "item.modernmetals.tungsten_trapdoor": "Wolframfalltür", + "material.uranium": "Uran", + "item.modernmetals.uranium_arrow": "Uranpfeil", + "item.modernmetals.uranium_axe": "Uranaxt", + "item.modernmetals.uranium_bars": "Urangitter", + "item.modernmetals.uranium_blend": "Urangemisch", + "item.modernmetals.uranium_block": "Uran", + "item.modernmetals.uranium_boots": "Uranstiefel", + "item.modernmetals.uranium_bolt": "Uranbolzen", + "item.modernmetals.uranium_bow": "Uranbogen", + "item.modernmetals.uranium_chestplate": "Uranbrustpanzer", + "item.modernmetals.uranium_crackhammer": "Uranbruchhammer", + "item.modernmetals.uranium_crossbow": "Uranarmbrust", + "item.modernmetals.uranium_door": "Urantür", + "item.modernmetals.uranium_fishing_rod": "Uranangel", + "item.modernmetals.uranium_gear": "Uranzahnrad", + "item.modernmetals.uranium_helmet": "Uranhelm", + "item.modernmetals.uranium_hoe": "Uranhacke", + "item.modernmetals.uranium_horse_armor": "Uranpferderüstung", + "item.modernmetals.uranium_ingot": "Uranbarren", + "item.modernmetals.uranium_leggings": "Uranbeinrüstung", + "item.modernmetals.uranium_nugget": "Urannugget", + "item.modernmetals.uranium_ore": "Uranerz", + "item.modernmetals.uranium_pickaxe": "Uranspitzhacke", + "item.modernmetals.uranium_powder": "Uranpulver", + "item.modernmetals.uranium_rod": "Uranstange", + "item.modernmetals.uranium_shears": "Uranschere", + "item.modernmetals.uranium_shield": "Uranschild", + "item.modernmetals.uranium_shovel": "Uranschaufel", + "item.modernmetals.uranium_smallblend": "Kleiner Urangemischhaufen", + "item.modernmetals.uranium_smallpowder": "Kleiner Uranpulverhaufen", + "item.modernmetals.uranium_sword": "Uranschwert", + "item.modernmetals.uranium_trapdoor": "Uranfalltür", + "material.zirconium": "Zirkon", + "item.modernmetals.zirconium_arrow": "Zirkonpfeil", + "item.modernmetals.zirconium_axe": "Zirkonaxt", + "item.modernmetals.zirconium_bars": "Zirkongitter", + "item.modernmetals.zirconium_blend": "Zirkongemisch", + "item.modernmetals.zirconium_block": "Zirkon", + "item.modernmetals.zirconium_bolt": "Zirkonbolzen", + "item.modernmetals.zirconium_boots": "Zirkonstiefel", + "item.modernmetals.zirconium_bow": "Zirkonbogen", + "item.modernmetals.zirconium_chestplate": "Zirkonbrustpanzer", + "item.modernmetals.zirconium_crackhammer": "Zirkonbruchhammer", + "item.modernmetals.zirconium_crossbow": "Zirkonarmbrust", + "item.modernmetals.zirconium_door": "Zirkontür", + "item.modernmetals.zirconium_fishing_rod": "Zirkonangel", + "item.modernmetals.zirconium_gear": "Zirkonzahnrad", + "item.modernmetals.zirconium_helmet": "Zirkonhelm", + "item.modernmetals.zirconium_hoe": "Zirkonhacke", + "item.modernmetals.zirconium_horse_armor": "Zirkonpferderüstung", + "item.modernmetals.zirconium_ingot": "Zirkonbarren", + "item.modernmetals.zirconium_leggings": "Zirkonbeinrüstung", + "item.modernmetals.zirconium_nugget": "Zirkonnugget", + "item.modernmetals.zirconium_ore": "Zirkonerz", + "item.modernmetals.zirconium_pickaxe": "Zirkonspitzhacke", + "item.modernmetals.zirconium_powder": "Zirkonpulver", + "item.modernmetals.zirconium_rod": "Zirkonstange", + "item.modernmetals.zirconium_shears": "Zirkonschere", + "item.modernmetals.zirconium_shield": "Zirkonschild", + "item.modernmetals.zirconium_shovel": "Zirkonschaufel", + "item.modernmetals.zirconium_smallblend": "Kleiner Zirkongemischhaufen", + "item.modernmetals.zirconium_smallpowder": "Kleiner Zirkonpulverhaufen", + "item.modernmetals.zirconium_sword": "Zirkonschwert", + "item.modernmetals.zirconium_trapdoor": "Zirkonfalltür", + "tile.modernmetals.aluminum_bars": "Aluminiumgitter", + "block.modernmetals.aluminum_bars": "Aluminiumgitter", + "tile.modernmetals.aluminum_block": "Aluminium", + "block.modernmetals.aluminum_block": "Aluminium", + "tile.modernmetals.aluminum_door": "Aluminiumtür", + "block.modernmetals.aluminum_door": "Aluminiumtür", + "tile.modernmetals.aluminum_ore": "Aluminiumerz", + "block.modernmetals.aluminum_ore": "Aluminiumerz", + "tile.modernmetals.aluminum_plate": "Aluminiumblech", + "block.modernmetals.aluminum_plate": "Aluminiumblech", + "tile.modernmetals.aluminum_trapdoor": "Aluminiumfalltür", + "block.modernmetals.aluminum_trapdoor": "Aluminiumfalltür", + "tile.modernmetals.aluminumbrass_bars": "Duraluminiumgitter", + "block.modernmetals.aluminumbrass_bars": "Duraluminiumgitter", + "tile.modernmetals.aluminumbrass_block": "Duraluminium", + "block.modernmetals.aluminumbrass_block": "Duraluminium", + "tile.modernmetals.aluminumbrass_door": "Duraluminiumtür", + "block.modernmetals.aluminumbrass_door": "Duraluminiumtür", + "tile.modernmetals.aluminumbrass_ore": "Duraluminiumerz", + "block.modernmetals.aluminumbrass_ore": "Duraluminiumerz", + "tile.modernmetals.aluminumbrass_plate": "Duraluminiumblech", + "block.modernmetals.aluminumbrass_plate": "Duraluminiumblech", + "tile.modernmetals.aluminumbrass_trapdoor": "Duraluminiumfalltür", + "block.modernmetals.aluminumbrass_trapdoor": "Duraluminiumfalltür", + "tile.modernmetals.cadmium_bars": "Cadmiumgitter", + "block.modernmetals.cadmium_bars": "Cadmiumgitter", + "tile.modernmetals.cadmium_block": "Cadmium", + "block.modernmetals.cadmium_block": "Cadmium", + "tile.modernmetals.cadmium_door": "Cadmiumtür", + "block.modernmetals.cadmium_door": "Cadmiumtür", + "tile.modernmetals.cadmium_ore": "Cadmiumerz", + "block.modernmetals.cadmium_ore": "Cadmiumerz", + "tile.modernmetals.cadmium_plate": "Cadmiumblech", + "block.modernmetals.cadmium_plate": "Cadmiumblech", + "tile.modernmetals.cadmium_trapdoor": "Cadmiumfalltür", + "block.modernmetals.cadmium_trapdoor": "Cadmiumfalltür", + "tile.modernmetals.chromium_bars": "Chromgitter", + "block.modernmetals.chromium_bars": "Chromgitter", + "tile.modernmetals.chromium_block": "Chrom", + "block.modernmetals.chromium_block": "Chrom", + "tile.modernmetals.chromium_door": "Chromtür", + "block.modernmetals.chromium_door": "Chromtür", + "tile.modernmetals.chromium_ore": "Chromerz", + "block.modernmetals.chromium_ore": "Chromerz", + "tile.modernmetals.chromium_plate": "Chromblech", + "block.modernmetals.chromium_plate": "Chromblech", + "tile.modernmetals.chromium_trapdoor": "Chromfalltür", + "block.modernmetals.chromium_trapdoor": "Chromfalltür", + "tile.modernmetals.galvanizedsteel_bars": "Vernickeltes Stahlgitter", + "block.modernmetals.galvanizedsteel_bars": "Vernickeltes Stahlgitter", + "tile.modernmetals.galvanizedsteel_block": "Verzinkter Stahl", + "block.modernmetals.galvanizedsteel_block": "Verzinkter Stahl", + "tile.modernmetals.galvanizedsteel_door": "Vernickeltee Stahltür", + "block.modernmetals.galvanizedsteel_door": "Vernickeltee Stahltür", + "tile.modernmetals.galvanizedsteel_ore": "Vernickeltes Stahlerz", + "block.modernmetals.galvanizedsteel_ore": "Vernickeltes Stahlerz", + "tile.modernmetals.galvanizedsteel_plate": "Vernickeltes Stahlblech", + "block.modernmetals.galvanizedsteel_plate": "Vernickeltes Stahlblech", + "tile.modernmetals.galvanizedsteel_trapdoor": "Vernickelte Stahlfalltür", + "block.modernmetals.galvanizedsteel_trapdoor": "Vernickelte Stahlfalltür", + "tile.modernmetals.iridium_bars": "Iridiumgitter", + "block.modernmetals.iridium_bars": "Iridiumgitter", + "tile.modernmetals.iridium_block": "Iridium", + "block.modernmetals.iridium_block": "Iridium", + "tile.modernmetals.iridium_door": "Iridiumtür", + "block.modernmetals.iridium_door": "Iridiumtür", + "tile.modernmetals.iridium_ore": "Iridiumerz", + "block.modernmetals.iridium_ore": "Iridiumerz", + "tile.modernmetals.iridium_plate": "Iridiumblech", + "block.modernmetals.iridium_plate": "Iridiumblech", + "tile.modernmetals.iridium_trapdoor": "Iridiumfalltür", + "block.modernmetals.iridium_trapdoor": "Iridiumfalltür", + "tile.modernmetals.magnesium_bars": "Magnesiumgitter", + "block.modernmetals.magnesium_bars": "Magnesiumgitter", + "tile.modernmetals.magnesium_block": "Magnesium", + "block.modernmetals.magnesium_block": "Magnesium", + "tile.modernmetals.magnesium_door": "Magnesiumtür", + "block.modernmetals.magnesium_door": "Magnesiumtür", + "tile.modernmetals.magnesium_ore": "Magnesiumerz", + "block.modernmetals.magnesium_ore": "Magnesiumerz", + "tile.modernmetals.magnesium_plate": "Magnesiumblech", + "block.modernmetals.magnesium_plate": "Magnesiumblech", + "tile.modernmetals.magnesium_trapdoor": "Magnesiumfalltür", + "block.modernmetals.magnesium_trapdoor": "Magnesiumfalltür", + "tile.modernmetals.manganese_bars": "Mangangitter", + "block.modernmetals.manganese_bars": "Mangangitter", + "tile.modernmetals.manganese_block": "Mangan", + "block.modernmetals.manganese_block": "Mangan", + "tile.modernmetals.manganese_door": "Mangantür", + "block.modernmetals.manganese_door": "Mangantür", + "tile.modernmetals.manganese_ore": "Manganerz", + "block.modernmetals.manganese_ore": "Manganerz", + "tile.modernmetals.manganese_plate": "Manganblech", + "block.modernmetals.manganese_plate": "Manganblech", + "tile.modernmetals.manganese_trapdoor": "Manganfalltür", + "block.modernmetals.manganese_trapdoor": "Manganfalltür", + "tile.modernmetals.nichrome_bars": "Nickel-Chrom-gitter", + "block.modernmetals.nichrome_bars": "Nickel-Chrom-gitter", + "tile.modernmetals.nichrome_block": "Nickel-Chrom-", + "block.modernmetals.nichrome_block": "Nickel-Chrom-", + "tile.modernmetals.nichrome_door": "Nickel-Chrom-tür", + "block.modernmetals.nichrome_door": "Nickel-Chrom-tür", + "tile.modernmetals.nichrome_ore": "Nickel-Chrom-erz", + "block.modernmetals.nichrome_ore": "Nickel-Chrom-erz", + "tile.modernmetals.nichrome_plate": "Nickel-Chrom-blech", + "block.modernmetals.nichrome_plate": "Nickel-Chrom-blech", + "tile.modernmetals.nichrome_trapdoor": "Nickel-Chrom-falltür", + "block.modernmetals.nichrome_trapdoor": "Nickel-Chrom-falltür", + "tile.modernmetals.osmium_bars": "Osmiumgitter", + "block.modernmetals.osmium_bars": "Osmiumgitter", + "tile.modernmetals.osmium_block": "Osmium", + "block.modernmetals.osmium_block": "Osmium", + "tile.modernmetals.osmium_door": "Osmiumtür", + "block.modernmetals.osmium_door": "Osmiumtür", + "tile.modernmetals.osmium_ore": "Osmiumerz", + "block.modernmetals.osmium_ore": "Osmiumerz", + "tile.modernmetals.osmium_plate": "Osmiumblech", + "block.modernmetals.osmium_plate": "Osmiumblech", + "tile.modernmetals.osmium_trapdoor": "Osmiumfalltür", + "block.modernmetals.osmium_trapdoor": "Osmiumfalltür", + "tile.modernmetals.plutonium_bars": "Plutoniumgitter", + "block.modernmetals.plutonium_bars": "Plutoniumgitter", + "tile.modernmetals.plutonium_block": "Plutonium", + "block.modernmetals.plutonium_block": "Plutonium", + "tile.modernmetals.plutonium_door": "Plutoniumtür", + "block.modernmetals.plutonium_door": "Plutoniumtür", + "tile.modernmetals.plutonium_ore": "Plutoniumerz", + "block.modernmetals.plutonium_ore": "Plutoniumerz", + "tile.modernmetals.plutonium_plate": "Plutoniumblech", + "block.modernmetals.plutonium_plate": "Plutoniumblech", + "tile.modernmetals.plutonium_trapdoor": "Plutoniumfalltür", + "block.modernmetals.plutonium_trapdoor": "Plutoniumfalltür", + "tile.modernmetals.rutile_bars": "Rutilgitter", + "block.modernmetals.rutile_bars": "Rutilgitter", + "tile.modernmetals.rutile_block": "Rutil", + "block.modernmetals.rutile_block": "Rutil", + "tile.modernmetals.rutile_door": "Rutiltür", + "block.modernmetals.rutile_door": "Rutiltür", + "tile.modernmetals.rutile_ore": "Rutilerz", + "block.modernmetals.rutile_ore": "Rutilerz", + "tile.modernmetals.rutile_plate": "Rutilblech", + "block.modernmetals.rutile_plate": "Rutilblech", + "tile.modernmetals.rutile_trapdoor": "Rutilfalltür", + "block.modernmetals.rutile_trapdoor": "Rutilfalltür", + "tile.modernmetals.stainlesssteel_bars": "Edelstahlgitter", + "block.modernmetals.stainlesssteel_bars": "Edelstahlgitter", + "tile.modernmetals.stainlesssteel_block": "Edelstahl", + "block.modernmetals.stainlesssteel_block": "Edelstahl", + "tile.modernmetals.stainlesssteel_door": "Edelstahltür", + "block.modernmetals.stainlesssteel_door": "Edelstahltür", + "tile.modernmetals.stainlesssteel_ore": "Edelstahlerz", + "block.modernmetals.stainlesssteel_ore": "Edelstahlerz", + "tile.modernmetals.stainlesssteel_plate": "Edelstahlblech", + "block.modernmetals.stainlesssteel_plate": "Edelstahlblech", + "tile.modernmetals.stainlesssteel_trapdoor": "Edelstahlfalltür", + "block.modernmetals.stainlesssteel_trapdoor": "Edelstahlfalltür", + "tile.modernmetals.tantalum_bars": "Tantalgitter", + "block.modernmetals.tantalum_bars": "Tantalgitter", + "tile.modernmetals.tantalum_block": "Tantal", + "block.modernmetals.tantalum_block": "Tantal", + "tile.modernmetals.tantalum_door": "Tantaltür", + "block.modernmetals.tantalum_door": "Tantaltür", + "tile.modernmetals.tantalum_ore": "Tantalerz", + "block.modernmetals.tantalum_ore": "Tantalerz", + "tile.modernmetals.tantalum_plate": "Tantalblech", + "block.modernmetals.tantalum_plate": "Tantalblech", + "tile.modernmetals.tantalum_trapdoor": "Tantalfalltür", + "block.modernmetals.tantalum_trapdoor": "Tantalfalltür", + "tile.modernmetals.titanium_bars": "Titangitter", + "block.modernmetals.titanium_bars": "Titangitter", + "tile.modernmetals.titanium_block": "Titan", + "block.modernmetals.titanium_block": "Titan", + "tile.modernmetals.titanium_door": "Titantür", + "block.modernmetals.titanium_door": "Titantür", + "tile.modernmetals.titanium_ore": "Titanerz", + "block.modernmetals.titanium_ore": "Titanerz", + "tile.modernmetals.titanium_plate": "Titanblech", + "block.modernmetals.titanium_plate": "Titanblech", + "tile.modernmetals.titanium_trapdoor": "Titanfalltür", + "block.modernmetals.titanium_trapdoor": "Titanfalltür", + "tile.modernmetals.tungsten_bars": "Wolframgitter", + "block.modernmetals.tungsten_bars": "Wolframgitter", + "tile.modernmetals.tungsten_block": "Wolfram", + "block.modernmetals.tungsten_block": "Wolfram", + "tile.modernmetals.tungsten_door": "Wolframtür", + "block.modernmetals.tungsten_door": "Wolframtür", + "tile.modernmetals.tungsten_ore": "Wolframerz", + "block.modernmetals.tungsten_ore": "Wolframerz", + "tile.modernmetals.tungsten_plate": "Wolframblech", + "block.modernmetals.tungsten_plate": "Wolframblech", + "tile.modernmetals.tungsten_trapdoor": "Wolframfalltür", + "block.modernmetals.tungsten_trapdoor": "Wolframfalltür", + "tile.modernmetals.uranium_bars": "Urangitter", + "block.modernmetals.uranium_bars": "Urangitter", + "tile.modernmetals.uranium_block": "Uran", + "block.modernmetals.uranium_block": "Uran", + "tile.modernmetals.uranium_door": "Urantür", + "block.modernmetals.uranium_door": "Urantür", + "tile.modernmetals.uranium_ore": "Uranerz", + "block.modernmetals.uranium_ore": "Uranerz", + "tile.modernmetals.uranium_plate": "Uranblech", + "block.modernmetals.uranium_plate": "Uranblech", + "tile.modernmetals.uranium_trapdoor": "Uranfalltür", + "block.modernmetals.uranium_trapdoor": "Uranfalltür", + "tile.modernmetals.zirconium_bars": "Zirkongitter", + "block.modernmetals.zirconium_bars": "Zirkongitter", + "tile.modernmetals.zirconium_block": "Zirkon", + "block.modernmetals.zirconium_block": "Zirkon", + "tile.modernmetals.zirconium_door": "Zirkontür", + "block.modernmetals.zirconium_door": "Zirkontür", + "tile.modernmetals.zirconium_ore": "Zirkonerz", + "block.modernmetals.zirconium_ore": "Zirkonerz", + "tile.modernmetals.zirconium_plate": "Zirkonblech", + "block.modernmetals.zirconium_plate": "Zirkonblech", + "tile.modernmetals.zirconium_trapdoor": "Zirkonfalltür", + "block.modernmetals.zirconium_trapdoor": "Zirkonfalltür", + "tooltip.aluminum.tool": "Nichts Besonderes", + "tooltip.aluminumbrass.tool": "Nichts Besonderes", + "tooltip.cadmium.tool": "Nichts Besonderes", + "tooltip.chromium.tool": "Nichts Besonderes", + "tooltip.galvanized_steel.tool": "Nichts Besonderes", + "tooltip.iridium.tool": "Nichts Besonderes", + "tooltip.magnesium.tool": "Nichts Besonderes", + "tooltip.manganese.tool": "Nichts Besonderes", + "tooltip.nichrome.tool": "Nichts Besonderes", + "tooltip.osmium.tool": "Nichts Besonderes", + "tooltip.plutonium.tool": "Nichts Besonderes", + "tooltip.rutile.tool": "Nichts Besonderes", + "tooltip.stainless_steel.tool": "Nichts Besonderes", + "tooltip.tantalum.tool": "Nichts Besonderes", + "tooltip.titanium.tool": "Nichts Besonderes", + "tooltip.tungsten.tool": "Nichts Besonderes", + "tooltip.uranium.tool": "Nichts Besonderes", + "tooltip.zirconium.tool": "Nichts Besonderes", + "tooltip.aluminum.armor": "Nichts Besonderes", + "tooltip.aluminumbrass.armor": "Nichts Besonderes", + "tooltip.cadmium.armor": "Nichts Besonderes", + "tooltip.chromium.armor": "Nichts Besonderes", + "tooltip.galvanized_steel.armor": "Nichts Besonderes", + "tooltip.iridium.armor": "Nichts Besonderes", + "tooltip.magnesium.armor": "Nichts Besonderes", + "tooltip.manganese.armor": "Nichts Besonderes", + "tooltip.nichrome.armor": "Nichts Besonderes", + "tooltip.osmium.armor": "Nichts Besonderes", + "tooltip.plutonium.armor": "Nichts Besonderes", + "tooltip.rutile.armor": "Nichts Besonderes", + "tooltip.stainless_steel.armor": "Nichts Besonderes", + "tooltip.tantalum.armor": "Nichts Besonderes", + "tooltip.titanium.armor": "Nichts Besonderes", + "tooltip.tungsten.armor": "Nichts Besonderes", + "tooltip.uranium.armor": "Nichts Besonderes", + "tooltip.zirconium.armor": "Nichts Besonderes", + "achievement.aluminumbrass_maker": "Duraluminium", + "achievement.galvanized_steel_maker": "Verzinkter Stahl", + "achievement.nichrome_maker": "Nickel-Chrom-", + "achievement.stainless_steel_maker": "Edelstahl", + "achievement.titanium_maker": "Titan", + "achievement.aluminumbrass_maker.desc": "Kombiniere Aluminiumpulver und Kupferpulver, um Duraluminium herzustellen", + "achievement.galvanized_steel_maker.desc": "Kombininiere Stahlpulver und Zinkpulver, um verzinkten Stahl herzustellen", + "achievement.nichrome_maker.desc": "Kombiniere Nickelpulver und Chrompulver, um Nickel-Chrom herzustellen", + "achievement.stainless_steel_maker.desc": "Kombiniere Stahlpulver und Chrompulver, um Edelstahl herzustellen", + "achievement.titanium_maker.desc": "Kombiniere Rutilpulver und Magnesiumpulver, um Titan herzustellen", + "fluid.modernmetals.aluminum": "Geschmolzenes Aluminium", + "fluid.modernmetals.aluminumbrass": "Geschmolzenes Duraluminium", + "fluid.modernmetals.cadmium": "Geschmolzenes Cadmium", + "fluid.modernmetals.chromium": "Geschmolzenes Chrom", + "fluid.modernmetals.galvanizedsteel": "Geschmolzenes Verzinkter Stahl", + "fluid.modernmetals.iridium": "Geschmolzenes Iridium", + "fluid.modernmetals.magnesium": "Geschmolzenes Magnesium", + "fluid.modernmetals.manganese": "Geschmolzenes Mangan", + "fluid.modernmetals.nichrome": "Geschmolzenes Nickel-Chrom", + "fluid.modernmetals.osmium": "Geschmolzenes Osmium", + "fluid.modernmetals.plutonium": "Geschmolzenes Plutonium", + "fluid.modernmetals.rutile": "Geschmolzenes Rutil", + "fluid.modernmetals.stainlesssteel": "Geschmolzenes Edelstahl", + "fluid.modernmetals.tantalum": "Geschmolzenes Tantal", + "fluid.modernmetals.titanium": "Geschmolzenes Titan", + "fluid.modernmetals.tungsten": "Geschmolzenes Wolfram", + "fluid.modernmetals.uranium": "Geschmolzenes Uran", + "fluid.modernmetals.zirconium": "Geschmolzenes Zirkon", + "tile.modernmetals.aluminum": "Geschmolzenes Aluminium", + "block.modernmetals.aluminum": "Geschmolzenes Aluminium", + "tile.modernmetals.aluminumbrass": "Geschmolzenes Duraluminium", + "block.modernmetals.aluminumbrass": "Geschmolzenes Duraluminium", + "tile.modernmetals.cadmium": "Geschmolzenes Cadmium", + "block.modernmetals.cadmium": "Geschmolzenes Cadmium", + "tile.modernmetals.chromium": "Geschmolzenes Chrom", + "block.modernmetals.chromium": "Geschmolzenes Chrom", + "tile.modernmetals.galvanizedsteel": "Geschmolzenes Verzinkter Stahl", + "block.modernmetals.galvanizedsteel": "Geschmolzenes Verzinkter Stahl", + "tile.modernmetals.iridium": "Geschmolzenes Iridium", + "block.modernmetals.iridium": "Geschmolzenes Iridium", + "tile.modernmetals.magnesium": "Geschmolzenes Magnesium", + "block.modernmetals.magnesium": "Geschmolzenes Magnesium", + "tile.modernmetals.manganese": "Geschmolzenes Mangan", + "block.modernmetals.manganese": "Geschmolzenes Mangan", + "tile.modernmetals.nichrome": "Geschmolzenes Nickel-Chrom", + "block.modernmetals.nichrome": "Geschmolzenes Nickel-Chrom", + "tile.modernmetals.osmium": "Geschmolzenes Osmium", + "block.modernmetals.osmium": "Geschmolzenes Osmium", + "tile.modernmetals.plutonium": "Geschmolzenes Plutonium", + "block.modernmetals.plutonium": "Geschmolzenes Plutonium", + "tile.modernmetals.rutile": "Geschmolzenes Rutil", + "block.modernmetals.rutile": "Geschmolzenes Rutil", + "tile.modernmetals.stainlesssteel": "Geschmolzenes Edelstahl", + "block.modernmetals.stainlesssteel": "Geschmolzenes Edelstahl", + "tile.modernmetals.tantalum": "Geschmolzenes Tantal", + "block.modernmetals.tantalum": "Geschmolzenes Tantal", + "tile.modernmetals.titanium": "Geschmolzenes Titan", + "block.modernmetals.titanium": "Geschmolzenes Titan", + "tile.modernmetals.tungsten": "Geschmolzenes Wolfram", + "block.modernmetals.tungsten": "Geschmolzenes Wolfram", + "tile.modernmetals.uranium": "Geschmolzenes Uran", + "block.modernmetals.uranium": "Geschmolzenes Uran", + "tile.modernmetals.zirconium": "Geschmolzenes Zirkon", + "block.modernmetals.zirconium": "Geschmolzenes Zirkon", + "item.modernmetals.aluminum_clump": "Aluminiumklumpen", + "item.modernmetals.aluminum_crushed": "Zerkleinertes Aluminiumerz", + "item.modernmetals.aluminum_crushed_purified": "Gereinigtes, zerkleinertes Aluminiumerz", + "item.modernmetals.aluminum_crystal": "Aluminiumkristall", + "item.modernmetals.aluminum_dense_plate": "Verdichtetes Aluminiumblech", + "item.modernmetals.aluminum_powder_dirty": "Verunreinigtes Aluminiumpulver", + "item.modernmetals.aluminum_shard": "Aluminiumsplitter", + "item.modernmetals.aluminum_button": "Aluminiumschalter", + "item.modernmetals.aluminum_lever": "Aluminiumhebel", + "item.modernmetals.aluminum_pressure_plate": "Aluminiumdruckplatte", + "item.modernmetals.aluminum_slab": "Aluminiumfliese", + "item.modernmetals.aluminum_stairs": "Aluminiumtreppe", + "item.modernmetals.aluminum_wall": "Aluminiummauer", + "tile.modernmetals.aluminum_button": "Aluminiumschalter", + "block.modernmetals.aluminum_button": "Aluminiumschalter", + "tile.modernmetals.aluminum_lever": "Aluminiumhebel", + "block.modernmetals.aluminum_lever": "Aluminiumhebel", + "tile.modernmetals.aluminum_pressure_plate": "Aluminiumdruckplatte", + "block.modernmetals.aluminum_pressure_plate": "Aluminiumdruckplatte", + "tile.modernmetals.aluminum_slab": "Aluminiumfliese", + "block.modernmetals.aluminum_slab": "Aluminiumfliese", + "tile.modernmetals.aluminum_stairs": "Aluminiumtreppe", + "block.modernmetals.aluminum_stairs": "Aluminiumtreppe", + "tile.modernmetals.aluminum_wall": "Aluminiummauer", + "block.modernmetals.aluminum_wall": "Aluminiummauer", + "item.modernmetals.aluminumbrass_clump": "Duraluminiumklumpen", + "item.modernmetals.aluminumbrass_crushed": "Zerkleinertes Duraluminiumerz", + "item.modernmetals.aluminumbrass_crushed_purified": "Gereinigtes, zerkleinertes Duraluminiumerz", + "item.modernmetals.aluminumbrass_crystal": "Duraluminiumkristall", + "item.modernmetals.aluminumbrass_dense_plate": "Verdichtetes Duraluminiumblech", + "item.modernmetals.aluminumbrass_powder_dirty": "Verunreinigtes Duraluminiumpulver", + "item.modernmetals.aluminumbrass_shard": "Duraluminiumsplitter", + "item.modernmetals.aluminumbrass_button": "Duraluminiumschalter", + "item.modernmetals.aluminumbrass_lever": "Duraluminiumhebel", + "item.modernmetals.aluminumbrass_pressure_plate": "Duraluminiumdruckplatte", + "item.modernmetals.aluminumbrass_slab": "Duraluminiumfliese", + "item.modernmetals.aluminumbrass_stairs": "Duraluminiumtreppe", + "item.modernmetals.aluminumbrass_wall": "Duraluminiummauer", + "tile.modernmetals.aluminumbrass_button": "Duraluminiumschalter", + "block.modernmetals.aluminumbrass_button": "Duraluminiumschalter", + "tile.modernmetals.aluminumbrass_lever": "Duraluminiumhebel", + "block.modernmetals.aluminumbrass_lever": "Duraluminiumhebel", + "tile.modernmetals.aluminumbrass_pressure_plate": "Duraluminiumdruckplatte", + "block.modernmetals.aluminumbrass_pressure_plate": "Duraluminiumdruckplatte", + "tile.modernmetals.aluminumbrass_slab": "Duraluminiumfliese", + "block.modernmetals.aluminumbrass_slab": "Duraluminiumfliese", + "tile.modernmetals.aluminumbrass_stairs": "Duraluminiumtreppe", + "block.modernmetals.aluminumbrass_stairs": "Duraluminiumtreppe", + "tile.modernmetals.aluminumbrass_wall": "Duraluminiummauer", + "block.modernmetals.aluminumbrass_wall": "Duraluminiummauer", + "item.modernmetals.cadmium_clump": "Cadmiumklumpen", + "item.modernmetals.cadmium_crushed": "Zerkleinertes Cadmiumerz", + "item.modernmetals.cadmium_crushed_purified": "Gereinigtes, zerkleinertes Cadmiumerz", + "item.modernmetals.cadmium_crystal": "Cadmiumkristall", + "item.modernmetals.cadmium_dense_plate": "Verdichtetes Cadmiumblech", + "item.modernmetals.cadmium_powder_dirty": "Verunreinigtes Cadmiumpulver", + "item.modernmetals.cadmium_shard": "Cadmiumsplitter", + "item.modernmetals.cadmium_button": "Cadmiumschalter", + "item.modernmetals.cadmium_lever": "Cadmiumhebel", + "item.modernmetals.cadmium_pressure_plate": "Cadmiumdruckplatte", + "item.modernmetals.cadmium_slab": "Cadmiumfliese", + "item.modernmetals.cadmium_stairs": "Cadmiumtreppe", + "item.modernmetals.cadmium_wall": "Cadmiummauer", + "tile.modernmetals.cadmium_button": "Cadmiumschalter", + "block.modernmetals.cadmium_button": "Cadmiumschalter", + "tile.modernmetals.cadmium_lever": "Cadmiumhebel", + "block.modernmetals.cadmium_lever": "Cadmiumhebel", + "tile.modernmetals.cadmium_pressure_plate": "Cadmiumdruckplatte", + "block.modernmetals.cadmium_pressure_plate": "Cadmiumdruckplatte", + "tile.modernmetals.cadmium_slab": "Cadmiumfliese", + "block.modernmetals.cadmium_slab": "Cadmiumfliese", + "tile.modernmetals.cadmium_stairs": "Cadmiumtreppe", + "block.modernmetals.cadmium_stairs": "Cadmiumtreppe", + "tile.modernmetals.cadmium_wall": "Cadmiummauer", + "block.modernmetals.cadmium_wall": "Cadmiummauer", + "item.modernmetals.chromium_clump": "Chromklumpen", + "item.modernmetals.chromium_crushed": "Zerkleinertes Chromerz", + "item.modernmetals.chromium_crushed_purified": "Gereinigtes, zerkleinertes Chromerz", + "item.modernmetals.chromium_crystal": "Chromkristall", + "item.modernmetals.chromium_dense_plate": "Verdichtetes Chromblech", + "item.modernmetals.chromium_powder_dirty": "Verunreinigtes Chrompulver", + "item.modernmetals.chromium_shard": "Chromsplitter", + "item.modernmetals.chromium_button": "Chromschalter", + "item.modernmetals.chromium_lever": "Chromhebel", + "item.modernmetals.chromium_pressure_plate": "Chromdruckplatte", + "item.modernmetals.chromium_slab": "Chromfliese", + "item.modernmetals.chromium_stairs": "Chromtreppe", + "item.modernmetals.chromium_wall": "Chrommauer", + "tile.modernmetals.chromium_button": "Chromschalter", + "block.modernmetals.chromium_button": "Chromschalter", + "tile.modernmetals.chromium_lever": "Chromhebel", + "block.modernmetals.chromium_lever": "Chromhebel", + "tile.modernmetals.chromium_pressure_plate": "Chromdruckplatte", + "block.modernmetals.chromium_pressure_plate": "Chromdruckplatte", + "tile.modernmetals.chromium_slab": "Chromfliese", + "block.modernmetals.chromium_slab": "Chromfliese", + "tile.modernmetals.chromium_stairs": "Chromtreppe", + "block.modernmetals.chromium_stairs": "Chromtreppe", + "tile.modernmetals.chromium_wall": "Chrommauer", + "block.modernmetals.chromium_wall": "Chrommauer", + "item.modernmetals.galvanizedsteel_clump": "Verzinkter Stahlklumpen", + "item.modernmetals.galvanizedsteel_crushed": "Zerkleinertes, verzinktes Stahlerz", + "item.modernmetals.galvanizedsteel_crushed_purified": "Gereinigtes, zerkleinertes Verzinkter Stahlerz", + "item.modernmetals.galvanizedsteel_crystal": "Verzinkter Stahlkristall", + "item.modernmetals.galvanizedsteel_dense_plate": "Verdichtetes, verzinktes Stahlblech", + "item.modernmetals.galvanizedsteel_powder_dirty": "Verunreinigtes, verzinktes Stahlpulver", + "item.modernmetals.galvanizedsteel_shard": "Verzinkter Stahlsplitter", + "item.modernmetals.galvanizedsteel_button": "Verzinkter Stahlschalter", + "item.modernmetals.galvanizedsteel_lever": "Verzinkter Stahlhebel", + "item.modernmetals.galvanizedsteel_pressure_plate": "Verzinkte Stahldruckplatte", + "item.modernmetals.galvanizedsteel_slab": "Verzinkte Stahlfliese", + "item.modernmetals.galvanizedsteel_stairs": "Verzinkte Stahltreppe", + "item.modernmetals.galvanizedsteel_wall": "Verzinkte Stahlmauer", + "tile.modernmetals.galvanizedsteel_button": "Verzinkter Stahlschalter", + "block.modernmetals.galvanizedsteel_button": "Verzinkter Stahlschalter", + "tile.modernmetals.galvanizedsteel_lever": "Verzinkter Stahlhebel", + "block.modernmetals.galvanizedsteel_lever": "Verzinkter Stahlhebel", + "tile.modernmetals.galvanizedsteel_pressure_plate": "Verzinkte Stahldruckplatte", + "block.modernmetals.galvanizedsteel_pressure_plate": "Verzinkte Stahldruckplatte", + "tile.modernmetals.galvanizedsteel_slab": "Verzinkte Stahlfliese", + "block.modernmetals.galvanizedsteel_slab": "Verzinkte Stahlfliese", + "tile.modernmetals.galvanizedsteel_stairs": "Verzinkte Stahltreppe", + "block.modernmetals.galvanizedsteel_stairs": "Verzinkte Stahltreppe", + "tile.modernmetals.galvanizedsteel_wall": "Verzinkte Stahlmauer", + "block.modernmetals.galvanizedsteel_wall": "Verzinkte Stahlmauer", + "item.modernmetals.iridium_clump": "Iridiumklumpen", + "item.modernmetals.iridium_crushed": "Zerkleinertes Iridiumerz", + "item.modernmetals.iridium_crushed_purified": "Gereinigtes, zerkleinertes Iridiumerz", + "item.modernmetals.iridium_crystal": "Iridiumkristall", + "item.modernmetals.iridium_dense_plate": "Verdichtetes Iridiumblech", + "item.modernmetals.iridium_powder_dirty": "Verunreinigtes Iridiumpulver", + "item.modernmetals.iridium_shard": "Iridiumsplitter", + "item.modernmetals.iridium_button": "Iridiumschalter", + "item.modernmetals.iridium_lever": "Iridiumhebel", + "item.modernmetals.iridium_pressure_plate": "Iridiumdruckplatte", + "item.modernmetals.iridium_slab": "Iridiumfliese", + "item.modernmetals.iridium_stairs": "Iridiumtreppe", + "item.modernmetals.iridium_wall": "Iridiummauer", + "tile.modernmetals.iridium_button": "Iridiumschalter", + "block.modernmetals.iridium_button": "Iridiumschalter", + "tile.modernmetals.iridium_lever": "Iridiumhebel", + "block.modernmetals.iridium_lever": "Iridiumhebel", + "tile.modernmetals.iridium_pressure_plate": "Iridiumdruckplatte", + "block.modernmetals.iridium_pressure_plate": "Iridiumdruckplatte", + "tile.modernmetals.iridium_slab": "Iridiumfliese", + "block.modernmetals.iridium_slab": "Iridiumfliese", + "tile.modernmetals.iridium_stairs": "Iridiumtreppe", + "block.modernmetals.iridium_stairs": "Iridiumtreppe", + "tile.modernmetals.iridium_wall": "Iridiummauer", + "block.modernmetals.iridium_wall": "Iridiummauer", + "item.modernmetals.magnesium_clump": "Magnesiumklumpen", + "item.modernmetals.magnesium_crushed": "Zerkleinertes Magnesiumerz", + "item.modernmetals.magnesium_crushed_purified": "Gereinigtes, zerkleinertes Magnesiumerz", + "item.modernmetals.magnesium_crystal": "Magnesiumkristall", + "item.modernmetals.magnesium_dense_plate": "Verdichtetes Magnesiumblech", + "item.modernmetals.magnesium_powder_dirty": "Verunreinigtes Magnesiumpulver", + "item.modernmetals.magnesium_shard": "Magnesiumsplitter", + "item.modernmetals.magnesium_button": "Magnesiumschalter", + "item.modernmetals.magnesium_lever": "Magnesiumhebel", + "item.modernmetals.magnesium_pressure_plate": "Magnesiumdruckplatte", + "item.modernmetals.magnesium_slab": "Magnesiumfliese", + "item.modernmetals.magnesium_stairs": "Magnesiumtreppe", + "item.modernmetals.magnesium_wall": "Magnesiummauer", + "tile.modernmetals.magnesium_button": "Magnesiumschalter", + "block.modernmetals.magnesium_button": "Magnesiumschalter", + "tile.modernmetals.magnesium_lever": "Magnesiumhebel", + "block.modernmetals.magnesium_lever": "Magnesiumhebel", + "tile.modernmetals.magnesium_pressure_plate": "Magnesiumdruckplatte", + "block.modernmetals.magnesium_pressure_plate": "Magnesiumdruckplatte", + "tile.modernmetals.magnesium_slab": "Magnesiumfliese", + "block.modernmetals.magnesium_slab": "Magnesiumfliese", + "tile.modernmetals.magnesium_stairs": "Magnesiumtreppe", + "block.modernmetals.magnesium_stairs": "Magnesiumtreppe", + "tile.modernmetals.magnesium_wall": "Magnesiummauer", + "block.modernmetals.magnesium_wall": "Magnesiummauer", + "item.modernmetals.manganese_clump": "Manganklumpen", + "item.modernmetals.manganese_crushed": "Zerkleinertes Manganerz", + "item.modernmetals.manganese_crushed_purified": "Gereinigtes, zerkleinertes Manganerz", + "item.modernmetals.manganese_crystal": "Mangankristall", + "item.modernmetals.manganese_dense_plate": "Verdichtetes Manganblech", + "item.modernmetals.manganese_powder_dirty": "Verunreinigtes Manganpulver", + "item.modernmetals.manganese_shard": "Mangansplitter", + "item.modernmetals.manganese_button": "Manganschalter", + "item.modernmetals.manganese_lever": "Manganhebel", + "item.modernmetals.manganese_pressure_plate": "Mangandruckplatte", + "item.modernmetals.manganese_slab": "Manganfliese", + "item.modernmetals.manganese_stairs": "Mangantreppe", + "item.modernmetals.manganese_wall": "Manganmauer", + "tile.modernmetals.manganese_button": "Manganschalter", + "block.modernmetals.manganese_button": "Manganschalter", + "tile.modernmetals.manganese_lever": "Manganhebel", + "block.modernmetals.manganese_lever": "Manganhebel", + "tile.modernmetals.manganese_pressure_plate": "Mangandruckplatte", + "block.modernmetals.manganese_pressure_plate": "Mangandruckplatte", + "tile.modernmetals.manganese_slab": "Manganfliese", + "block.modernmetals.manganese_slab": "Manganfliese", + "tile.modernmetals.manganese_stairs": "Mangantreppe", + "block.modernmetals.manganese_stairs": "Mangantreppe", + "tile.modernmetals.manganese_wall": "Manganmauer", + "block.modernmetals.manganese_wall": "Manganmauer", + "item.modernmetals.nichrome_clump": "Nickel-Chrom-Klumpen", + "item.modernmetals.nichrome_crushed": "Zerkleinertes Nickel-Chrom-Erz", + "item.modernmetals.nichrome_crushed_purified": "Gereinigtes, zerkleinertes Nickel-Chrom-Erz", + "item.modernmetals.nichrome_crystal": "Nickel-Chrom-Kristall", + "item.modernmetals.nichrome_dense_plate": "Verdichtetes Nickel-Chrom-Blech", + "item.modernmetals.nichrome_powder_dirty": "Verunreinigtes Nickel-Chrom-Pulver", + "item.modernmetals.nichrome_shard": "Nickel-Chrom-Splitter", + "item.modernmetals.nichrome_button": "Nickel-Chrom-Schalter", + "item.modernmetals.nichrome_lever": "Nickel-Chrom-Hebel", + "item.modernmetals.nichrome_pressure_plate": "Nickel-Chrom-Druckplatte", + "item.modernmetals.nichrome_slab": "Nickel-Chrom-Fliese", + "item.modernmetals.nichrome_stairs": "Nickel-Chrom-Treppe", + "item.modernmetals.nichrome_wall": "Nickel-Chrom-Mauer", + "tile.modernmetals.nichrome_button": "Nickel-Chrom-Schalter", + "block.modernmetals.nichrome_button": "Nickel-Chrom-Schalter", + "tile.modernmetals.nichrome_lever": "Nickel-Chrom-Hebel", + "block.modernmetals.nichrome_lever": "Nickel-Chrom-Hebel", + "tile.modernmetals.nichrome_pressure_plate": "Nickel-Chrom-Druckplatte", + "block.modernmetals.nichrome_pressure_plate": "Nickel-Chrom-Druckplatte", + "tile.modernmetals.nichrome_slab": "Nickel-Chrom-Fliese", + "block.modernmetals.nichrome_slab": "Nickel-Chrom-Fliese", + "tile.modernmetals.nichrome_stairs": "Nickel-Chrom-Treppe", + "block.modernmetals.nichrome_stairs": "Nickel-Chrom-Treppe", + "tile.modernmetals.nichrome_wall": "Nickel-Chrom-Mauer", + "block.modernmetals.nichrome_wall": "Nickel-Chrom-Mauer", + "item.modernmetals.osmium_clump": "Osmiumklumpen", + "item.modernmetals.osmium_crushed": "Zerkleinertes Osmiumerz", + "item.modernmetals.osmium_crushed_purified": "Gereinigtes, zerkleinertes Osmiumerz", + "item.modernmetals.osmium_crystal": "Osmiumkristall", + "item.modernmetals.osmium_dense_plate": "Verdichtetes Osmiumblech", + "item.modernmetals.osmium_powder_dirty": "Verunreinigtes Osmiumpulver", + "item.modernmetals.osmium_shard": "Osmiumsplitter", + "item.modernmetals.osmium_button": "Osmiumschalter", + "item.modernmetals.osmium_lever": "Osmiumhebel", + "item.modernmetals.osmium_pressure_plate": "Osmiumdruckplatte", + "item.modernmetals.osmium_slab": "Osmiumfliese", + "item.modernmetals.osmium_stairs": "Osmiumtreppe", + "item.modernmetals.osmium_wall": "Osmiummauer", + "tile.modernmetals.osmium_button": "Osmiumschalter", + "block.modernmetals.osmium_button": "Osmiumschalter", + "tile.modernmetals.osmium_lever": "Osmiumhebel", + "block.modernmetals.osmium_lever": "Osmiumhebel", + "tile.modernmetals.osmium_pressure_plate": "Osmiumdruckplatte", + "block.modernmetals.osmium_pressure_plate": "Osmiumdruckplatte", + "tile.modernmetals.osmium_slab": "Osmiumfliese", + "block.modernmetals.osmium_slab": "Osmiumfliese", + "tile.modernmetals.osmium_stairs": "Osmiumtreppe", + "block.modernmetals.osmium_stairs": "Osmiumtreppe", + "tile.modernmetals.osmium_wall": "Osmiummauer", + "block.modernmetals.osmium_wall": "Osmiummauer", + "item.modernmetals.plutonium_clump": "Plutoniumklumpen", + "item.modernmetals.plutonium_crushed": "Zerkleinertes Plutoniumerz", + "item.modernmetals.plutonium_crushed_purified": "Gereinigtes, zerkleinertes Plutoniumerz", + "item.modernmetals.plutonium_crystal": "Plutoniumkristall", + "item.modernmetals.plutonium_dense_plate": "Verdichtetes Plutoniumblech", + "item.modernmetals.plutonium_powder_dirty": "Verunreinigtes Plutoniumpulver", + "item.modernmetals.plutonium_shard": "Plutoniumsplitter", + "item.modernmetals.plutonium_button": "Plutoniumschalter", + "item.modernmetals.plutonium_lever": "Plutoniumhebel", + "item.modernmetals.plutonium_pressure_plate": "Plutoniumdruckplatte", + "item.modernmetals.plutonium_slab": "Plutoniumfliese", + "item.modernmetals.plutonium_stairs": "Plutoniumtreppe", + "item.modernmetals.plutonium_wall": "Plutoniummauer", + "tile.modernmetals.plutonium_button": "Plutoniumschalter", + "block.modernmetals.plutonium_button": "Plutoniumschalter", + "tile.modernmetals.plutonium_lever": "Plutoniumhebel", + "block.modernmetals.plutonium_lever": "Plutoniumhebel", + "tile.modernmetals.plutonium_pressure_plate": "Plutoniumdruckplatte", + "block.modernmetals.plutonium_pressure_plate": "Plutoniumdruckplatte", + "tile.modernmetals.plutonium_slab": "Plutoniumfliese", + "block.modernmetals.plutonium_slab": "Plutoniumfliese", + "tile.modernmetals.plutonium_stairs": "Plutoniumtreppe", + "block.modernmetals.plutonium_stairs": "Plutoniumtreppe", + "tile.modernmetals.plutonium_wall": "Plutoniummauer", + "block.modernmetals.plutonium_wall": "Plutoniummauer", + "item.modernmetals.rutile_clump": "Rutilklumpen", + "item.modernmetals.rutile_crushed": "Zerkleinertes Rutilerz", + "item.modernmetals.rutile_crushed_purified": "Gereinigtes, zerkleinertes Rutilerz", + "item.modernmetals.rutile_crystal": "Rutilkristall", + "item.modernmetals.rutile_dense_plate": "Verdichtetes Rutilblech", + "item.modernmetals.rutile_powder_dirty": "Verunreinigtes Rutilpulver", + "item.modernmetals.rutile_shard": "Rutilsplitter", + "item.modernmetals.rutile_button": "Rutilschalter", + "item.modernmetals.rutile_lever": "Rutilhebel", + "item.modernmetals.rutile_pressure_plate": "Rutildruckplatte", + "item.modernmetals.rutile_slab": "Rutilfliese", + "item.modernmetals.rutile_stairs": "Rutiltreppe", + "item.modernmetals.rutile_wall": "Rutilmauer", + "tile.modernmetals.rutile_button": "Rutilschalter", + "block.modernmetals.rutile_button": "Rutilschalter", + "tile.modernmetals.rutile_lever": "Rutilhebel", + "block.modernmetals.rutile_lever": "Rutilhebel", + "tile.modernmetals.rutile_pressure_plate": "Rutildruckplatte", + "block.modernmetals.rutile_pressure_plate": "Rutildruckplatte", + "tile.modernmetals.rutile_slab": "Rutilfliese", + "block.modernmetals.rutile_slab": "Rutilfliese", + "tile.modernmetals.rutile_stairs": "Rutiltreppe", + "block.modernmetals.rutile_stairs": "Rutiltreppe", + "tile.modernmetals.rutile_wall": "Rutilmauer", + "block.modernmetals.rutile_wall": "Rutilmauer", + "item.modernmetals.stainlesssteel_clump": "Edelstahlklumpen", + "item.modernmetals.stainlesssteel_crushed": "Zerkleinertes Edelstahlerz", + "item.modernmetals.stainlesssteel_crushed_purified": "Gereinigtes, zerkleinertes Edelstahlerz", + "item.modernmetals.stainlesssteel_crystal": "Edelstahlkristall", + "item.modernmetals.stainlesssteel_dense_plate": "Verdichtetes Edelstahlblech", + "item.modernmetals.stainlesssteel_powder_dirty": "Verunreinigtes Edelstahlpulver", + "item.modernmetals.stainlesssteel_shard": "Edelstahlsplitter", + "item.modernmetals.stainlesssteel_button": "Edelstahlschalter", + "item.modernmetals.stainlesssteel_lever": "Edelstahlhebel", + "item.modernmetals.stainlesssteel_pressure_plate": "Edelstahldruckplatte", + "item.modernmetals.stainlesssteel_slab": "Edelstahlfliese", + "item.modernmetals.stainlesssteel_stairs": "Edelstahltreppe", + "item.modernmetals.stainlesssteel_wall": "Edelstahlmauer", + "tile.modernmetals.stainlesssteel_button": "Edelstahlschalter", + "block.modernmetals.stainlesssteel_button": "Edelstahlschalter", + "tile.modernmetals.stainlesssteel_lever": "Edelstahlhebel", + "block.modernmetals.stainlesssteel_lever": "Edelstahlhebel", + "tile.modernmetals.stainlesssteel_pressure_plate": "Edelstahldruckplatte", + "block.modernmetals.stainlesssteel_pressure_plate": "Edelstahldruckplatte", + "tile.modernmetals.stainlesssteel_slab": "Edelstahlfliese", + "block.modernmetals.stainlesssteel_slab": "Edelstahlfliese", + "tile.modernmetals.stainlesssteel_stairs": "Edelstahltreppe", + "block.modernmetals.stainlesssteel_stairs": "Edelstahltreppe", + "tile.modernmetals.stainlesssteel_wall": "Edelstahlmauer", + "block.modernmetals.stainlesssteel_wall": "Edelstahlmauer", + "item.modernmetals.tantalum_clump": "Tantalklumpen", + "item.modernmetals.tantalum_crushed": "Zerkleinertes Tantalerz", + "item.modernmetals.tantalum_crushed_purified": "Gereinigtes, zerkleinertes Tantalerz", + "item.modernmetals.tantalum_crystal": "Tantalkristall", + "item.modernmetals.tantalum_dense_plate": "Verdichtetes Tantalblech", + "item.modernmetals.tantalum_powder_dirty": "Verunreinigtes Tantalpulver", + "item.modernmetals.tantalum_shard": "Tantalsplitter", + "item.modernmetals.tantalum_button": "Tantalschalter", + "item.modernmetals.tantalum_lever": "Tantalhebel", + "item.modernmetals.tantalum_pressure_plate": "Tantaldruckplatte", + "item.modernmetals.tantalum_slab": "Tantalfliese", + "item.modernmetals.tantalum_stairs": "Tantaltreppe", + "item.modernmetals.tantalum_wall": "Tantalmauer", + "tile.modernmetals.tantalum_button": "Tantalschalter", + "block.modernmetals.tantalum_button": "Tantalschalter", + "tile.modernmetals.tantalum_lever": "Tantalhebel", + "block.modernmetals.tantalum_lever": "Tantalhebel", + "tile.modernmetals.tantalum_pressure_plate": "Tantaldruckplatte", + "block.modernmetals.tantalum_pressure_plate": "Tantaldruckplatte", + "tile.modernmetals.tantalum_slab": "Tantalfliese", + "block.modernmetals.tantalum_slab": "Tantalfliese", + "tile.modernmetals.tantalum_stairs": "Tantaltreppe", + "block.modernmetals.tantalum_stairs": "Tantaltreppe", + "tile.modernmetals.tantalum_wall": "Tantalmauer", + "block.modernmetals.tantalum_wall": "Tantalmauer", + "item.modernmetals.titanium_clump": "Titanklumpen", + "item.modernmetals.titanium_crushed": "Zerkleinertes Titanerz", + "item.modernmetals.titanium_crushed_purified": "Gereinigtes, zerkleinertes Titanerz", + "item.modernmetals.titanium_crystal": "Titankristall", + "item.modernmetals.titanium_dense_plate": "Verdichtetes Titanblech", + "item.modernmetals.titanium_powder_dirty": "Verunreinigtes Titanpulver", + "item.modernmetals.titanium_shard": "Titansplitter", + "item.modernmetals.titanium_button": "Titanschalter", + "item.modernmetals.titanium_lever": "Titanhebel", + "item.modernmetals.titanium_pressure_plate": "Titandruckplatte", + "item.modernmetals.titanium_slab": "Titanfliese", + "item.modernmetals.titanium_stairs": "Titantreppe", + "item.modernmetals.titanium_wall": "Titanmauer", + "tile.modernmetals.titanium_button": "Titanschalter", + "block.modernmetals.titanium_button": "Titanschalter", + "tile.modernmetals.titanium_lever": "Titanhebel", + "block.modernmetals.titanium_lever": "Titanhebel", + "tile.modernmetals.titanium_pressure_plate": "Titandruckplatte", + "block.modernmetals.titanium_pressure_plate": "Titandruckplatte", + "tile.modernmetals.titanium_slab": "Titanfliese", + "block.modernmetals.titanium_slab": "Titanfliese", + "tile.modernmetals.titanium_stairs": "Titantreppe", + "block.modernmetals.titanium_stairs": "Titantreppe", + "tile.modernmetals.titanium_wall": "Titanmauer", + "block.modernmetals.titanium_wall": "Titanmauer", + "item.modernmetals.tungsten_clump": "Wolframklumpen", + "item.modernmetals.tungsten_crushed": "Zerkleinertes Wolframerz", + "item.modernmetals.tungsten_crushed_purified": "Gereinigtes, zerkleinertes Wolframerz", + "item.modernmetals.tungsten_crystal": "Wolframkristall", + "item.modernmetals.tungsten_dense_plate": "Verdichtetes Wolframblech", + "item.modernmetals.tungsten_powder_dirty": "Verunreinigtes Wolframpulver", + "item.modernmetals.tungsten_shard": "Wolframsplitter", + "item.modernmetals.tungsten_button": "Wolframschalter", + "item.modernmetals.tungsten_lever": "Wolframhebel", + "item.modernmetals.tungsten_pressure_plate": "Wolframdruckplatte", + "item.modernmetals.tungsten_slab": "Wolframfliese", + "item.modernmetals.tungsten_stairs": "Wolframtreppe", + "item.modernmetals.tungsten_wall": "Wolframmauer", + "tile.modernmetals.tungsten_button": "Wolframschalter", + "block.modernmetals.tungsten_button": "Wolframschalter", + "tile.modernmetals.tungsten_lever": "Wolframhebel", + "block.modernmetals.tungsten_lever": "Wolframhebel", + "tile.modernmetals.tungsten_pressure_plate": "Wolframdruckplatte", + "block.modernmetals.tungsten_pressure_plate": "Wolframdruckplatte", + "tile.modernmetals.tungsten_slab": "Wolframfliese", + "block.modernmetals.tungsten_slab": "Wolframfliese", + "tile.modernmetals.tungsten_stairs": "Wolframtreppe", + "block.modernmetals.tungsten_stairs": "Wolframtreppe", + "tile.modernmetals.tungsten_wall": "Wolframmauer", + "block.modernmetals.tungsten_wall": "Wolframmauer", + "item.modernmetals.uranium_clump": "Uranklumpen", + "item.modernmetals.uranium_crushed": "Zerkleinertes Uranerz", + "item.modernmetals.uranium_crushed_purified": "Gereinigtes, zerkleinertes Uranerz", + "item.modernmetals.uranium_crystal": "Urankristall", + "item.modernmetals.uranium_dense_plate": "Verdichtetes Uranblech", + "item.modernmetals.uranium_powder_dirty": "Verunreinigtes Uranpulver", + "item.modernmetals.uranium_shard": "Uransplitter", + "item.modernmetals.uranium_button": "Uranschalter", + "item.modernmetals.uranium_lever": "Uranhebel", + "item.modernmetals.uranium_pressure_plate": "Urandruckplatte", + "item.modernmetals.uranium_slab": "Uranfliese", + "item.modernmetals.uranium_stairs": "Urantreppe", + "item.modernmetals.uranium_wall": "Uranmauer", + "tile.modernmetals.uranium_button": "Uranschalter", + "block.modernmetals.uranium_button": "Uranschalter", + "tile.modernmetals.uranium_lever": "Uranhebel", + "block.modernmetals.uranium_lever": "Uranhebel", + "tile.modernmetals.uranium_pressure_plate": "Urandruckplatte", + "block.modernmetals.uranium_pressure_plate": "Urandruckplatte", + "tile.modernmetals.uranium_slab": "Uranfliese", + "block.modernmetals.uranium_slab": "Uranfliese", + "tile.modernmetals.uranium_stairs": "Urantreppe", + "block.modernmetals.uranium_stairs": "Urantreppe", + "tile.modernmetals.uranium_wall": "Uranmauer", + "block.modernmetals.uranium_wall": "Uranmauer", + "item.modernmetals.zirconium_clump": "Zirkonklumpen", + "item.modernmetals.zirconium_crushed": "Zerkleinertes Zirkonerz", + "item.modernmetals.zirconium_crushed_purified": "Gereinigtes, zerkleinertes Zirkonerz", + "item.modernmetals.zirconium_crystal": "Zirkonkristall", + "item.modernmetals.zirconium_dense_plate": "Verdichtetes Zirkonblech", + "item.modernmetals.zirconium_powder_dirty": "Verunreinigtes Zirkonpulver", + "item.modernmetals.zirconium_shard": "Zirkonsplitter", + "item.modernmetals.zirconium_button": "Zirkonschalter", + "item.modernmetals.zirconium_lever": "Zirkonhebel", + "item.modernmetals.zirconium_pressure_plate": "Zirkondruckplatte", + "item.modernmetals.zirconium_slab": "Zirkonfliese", + "item.modernmetals.zirconium_stairs": "Zirkontreppe", + "item.modernmetals.zirconium_wall": "Zirkonmauer", + "tile.modernmetals.zirconium_button": "Zirkonschalter", + "block.modernmetals.zirconium_button": "Zirkonschalter", + "tile.modernmetals.zirconium_lever": "Zirkonhebel", + "block.modernmetals.zirconium_lever": "Zirkonhebel", + "tile.modernmetals.zirconium_pressure_plate": "Zirkondruckplatte", + "block.modernmetals.zirconium_pressure_plate": "Zirkondruckplatte", + "tile.modernmetals.zirconium_slab": "Zirkonfliese", + "block.modernmetals.zirconium_slab": "Zirkonfliese", + "tile.modernmetals.zirconium_stairs": "Zirkontreppe", + "block.modernmetals.zirconium_stairs": "Zirkontreppe", + "tile.modernmetals.zirconium_wall": "Zirkonmauer", + "block.modernmetals.zirconium_wall": "Zirkonmauer", + "config.modernmetals.material.tooltip": "Legt fest, ob die Blöcke, Gegenstände und Rezepte dieses Materials verfügbar sind. Ein Neustart ist nötig.", + "config.modernmetals.title": "Modern Metals", + "config.modernmetals.description": "Neustart erforderlich. Erze in OreSpawn einstellen.", + "config.modernmetals.content_mode": "Fantasy-Stufe", + "config.modernmetals.content_mode.tooltip": "Viel Fantasy behält alle Rezepte bei. Wenig Fantasy schränkt unrealistische Ausrüstung und Bauteile ein. Ein Neustart ist nötig.", + "high_fantasy": "Viel Fantasy", + "low_fantasy": "Wenig Fantasy", + "config.modernmetals.villager_trades": "Dorfbewohnerhandel", + "config.modernmetals.villager_trades.tooltip": "Schmiede handeln mit Barren und Ausrüstung aus Modern Metals. Ein Neustart ist nötig.", + "config.modernmetals.connection.mismatch": "Der Server verwendet %s, dein Spiel verwendet %s. Gleiche die Fantasy-Stufe unter Mods > Modern Metals > Konfiguration an und starte das Spiel neu.", + "config.modernmetals.connection.protocol": "Modern Metals konnte die Fantasy-Stufe nicht prüfen. Verwende auf dem Server und im Spiel denselben Build von Modern Metals.", + "config.modernmetals.enable_thorium": "Thorium aktivieren", + "config.modernmetals.enable_boron": "Bor aktivieren", + "config.modernmetals.enable_beryllium": "Beryllium aktivieren", + "config.modernmetals.enable_cadmium": "Cadmium aktivieren", + "config.modernmetals.enable_nichrome": "Nickel-Chrom-Legierung aktivieren", + "config.modernmetals.enable_aluminum": "Aluminium aktivieren", + "config.modernmetals.enable_aluminumbrass": "Aluminiummessing aktivieren", + "config.modernmetals.enable_chromium": "Chrom aktivieren", + "config.modernmetals.enable_galvanizedsteel": "Verzinkter Stahl aktivieren", + "config.modernmetals.enable_iridium": "Iridium aktivieren", + "config.modernmetals.enable_magnesium": "Magnesium aktivieren", + "config.modernmetals.enable_manganese": "Mangan aktivieren", + "config.modernmetals.enable_osmium": "Osmium aktivieren", + "config.modernmetals.enable_plutonium": "Plutonium aktivieren", + "config.modernmetals.enable_rutile": "Rutil aktivieren", + "config.modernmetals.enable_stainlesssteel": "Edelstahl aktivieren", + "config.modernmetals.enable_tantalum": "Tantal aktivieren", + "config.modernmetals.enable_titanium": "Titan aktivieren", + "config.modernmetals.enable_tungsten": "Wolfram aktivieren", + "config.modernmetals.enable_uranium": "Uran aktivieren", + "config.modernmetals.enable_zirconium": "Zirkon aktivieren", + "config.modernmetals.content_mode.high_fantasy": "Viel Fantasy", + "config.modernmetals.content_mode.low_fantasy": "Wenig Fantasy", + "config.modernmetals.inherited_mode": "Die Fantasiestufe wird in Base Metals eingestellt. Nach Änderungen das Spiel neu starten.", + "itemGroup.modernmetals.combat": "Modern Metals – Kampf", + "material.beryllium": "Beryllium", + "item.modernmetals.beryllium_arrow": "Berylliumpfeil", + "item.modernmetals.beryllium_axe": "Berylliumaxt", + "item.modernmetals.beryllium_bars": "Berylliumgitter", + "item.modernmetals.beryllium_blend": "Berylliumgemisch", + "item.modernmetals.beryllium_block": "Berylliumblock", + "item.modernmetals.beryllium_boots": "Berylliumstiefel", + "item.modernmetals.beryllium_bolt": "Berylliumbolzen", + "item.modernmetals.beryllium_bow": "Berylliumbogen", + "item.modernmetals.beryllium_chestplate": "Berylliumbrustpanzer", + "item.modernmetals.beryllium_crackhammer": "Berylliumbruchhammer", + "item.modernmetals.beryllium_crossbow": "Berylliumarmbrust", + "item.modernmetals.beryllium_door": "Berylliumtür", + "item.modernmetals.beryllium_fishing_rod": "Berylliumangel", + "item.modernmetals.beryllium_gear": "Berylliumzahnrad", + "item.modernmetals.beryllium_helmet": "Berylliumhelm", + "item.modernmetals.beryllium_hoe": "Berylliumhacke", + "item.modernmetals.beryllium_horse_armor": "Berylliumpferderüstung", + "item.modernmetals.beryllium_ingot": "Berylliumbarren", + "item.modernmetals.beryllium_leggings": "Berylliumbeinrüstung", + "item.modernmetals.beryllium_nugget": "Berylliumnugget", + "item.modernmetals.beryllium_ore": "Berylliumerz", + "item.modernmetals.beryllium_pickaxe": "Berylliumspitzhacke", + "item.modernmetals.beryllium_powder": "Berylliumpulver", + "item.modernmetals.beryllium_rod": "Berylliumstange", + "item.modernmetals.beryllium_shears": "Berylliumschere", + "item.modernmetals.beryllium_shield": "Berylliumschild", + "item.modernmetals.beryllium_shovel": "Berylliumschaufel", + "item.modernmetals.beryllium_smallblend": "Kleiner Berylliumgemischhaufen", + "item.modernmetals.beryllium_smallpowder": "Kleiner Berylliumpulverhaufen", + "item.modernmetals.beryllium_sword": "Berylliumschwert", + "item.modernmetals.beryllium_trapdoor": "Berylliumfalltür", + "material.boron": "Bor", + "item.modernmetals.boron_arrow": "Borpfeil", + "item.modernmetals.boron_axe": "Boraxt", + "item.modernmetals.boron_bars": "Borgitter", + "item.modernmetals.boron_blend": "Borgemisch", + "item.modernmetals.boron_block": "Borblock", + "item.modernmetals.boron_boots": "Borstiefel", + "item.modernmetals.boron_bolt": "Borbolzen", + "item.modernmetals.boron_bow": "Borbogen", + "item.modernmetals.boron_chestplate": "Borbrustpanzer", + "item.modernmetals.boron_crackhammer": "Borbruchhammer", + "item.modernmetals.boron_crossbow": "Borarmbrust", + "item.modernmetals.boron_door": "Bortür", + "item.modernmetals.boron_fishing_rod": "Borangel", + "item.modernmetals.boron_gear": "Borzahnrad", + "item.modernmetals.boron_helmet": "Borhelm", + "item.modernmetals.boron_hoe": "Borhacke", + "item.modernmetals.boron_horse_armor": "Borpferderüstung", + "item.modernmetals.boron_ingot": "Borbarren", + "item.modernmetals.boron_leggings": "Borbeinrüstung", + "item.modernmetals.boron_nugget": "Bornugget", + "item.modernmetals.boron_ore": "Borerz", + "item.modernmetals.boron_pickaxe": "Borspitzhacke", + "item.modernmetals.boron_powder": "Borpulver", + "item.modernmetals.boron_rod": "Borstange", + "item.modernmetals.boron_shears": "Borschere", + "item.modernmetals.boron_shield": "Borschild", + "item.modernmetals.boron_shovel": "Borschaufel", + "item.modernmetals.boron_smallblend": "Kleiner Borgemischhaufen", + "item.modernmetals.boron_smallpowder": "Kleiner Borpulverhaufen", + "item.modernmetals.boron_sword": "Borschwert", + "item.modernmetals.boron_trapdoor": "Borfalltür", + "tile.modernmetals.boron_bars": "Borgitter", + "block.modernmetals.boron_bars": "Borgitter", + "tile.modernmetals.boron_block": "Bor", + "block.modernmetals.boron_block": "Bor", + "tile.modernmetals.boron_door": "Bortür", + "block.modernmetals.boron_door": "Bortür", + "tile.modernmetals.boron_ore": "Borerz", + "block.modernmetals.boron_ore": "Borerz", + "tile.modernmetals.boron_plate": "Borblech", + "block.modernmetals.boron_plate": "Borblech", + "tile.modernmetals.boron_trapdoor": "Borfalltür", + "block.modernmetals.boron_trapdoor": "Borfalltür", + "fluid.modernmetals.boron": "Geschmolzenes Bor", + "fluid.modernmetals.beryllium": "Geschmolzenes Beryllium", + "tile.modernmetals.boron": "Geschmolzenes Bor", + "block.modernmetals.boron": "Geschmolzenes Bor", + "tile.modernmetals.beryllium_bars": "Berylliumgitter", + "block.modernmetals.beryllium_bars": "Berylliumgitter", + "tile.modernmetals.beryllium_block": "Beryllium", + "block.modernmetals.beryllium_block": "Beryllium", + "tile.modernmetals.beryllium_door": "Berylliumtür", + "block.modernmetals.beryllium_door": "Berylliumtür", + "tile.modernmetals.beryllium_ore": "Berylliumerz", + "block.modernmetals.beryllium_ore": "Berylliumerz", + "tile.modernmetals.beryllium_plate": "Berylliumblech", + "block.modernmetals.beryllium_plate": "Berylliumblech", + "tile.modernmetals.beryllium_trapdoor": "Berylliumfalltür", + "block.modernmetals.beryllium_trapdoor": "Berylliumfalltür", + "item.modernmetals.beryllium_clump": "Berylliumklumpen", + "item.modernmetals.beryllium_crushed": "Zerkleinertes Berylliumerz", + "item.modernmetals.beryllium_crushed_purified": "Gereinigtes, zerkleinertes Berylliumerz", + "item.modernmetals.beryllium_crystal": "Berylliumkristall", + "item.modernmetals.beryllium_dense_plate": "Verdichtetes Berylliumblech", + "item.modernmetals.beryllium_powder_dirty": "Verunreinigtes Berylliumpulver", + "item.modernmetals.beryllium_shard": "Berylliumsplitter", + "item.modernmetals.beryllium_button": "Berylliumschalter", + "item.modernmetals.beryllium_lever": "Berylliumhebel", + "item.modernmetals.beryllium_pressure_plate": "Berylliumdruckplatte", + "item.modernmetals.beryllium_slab": "Berylliumfliese", + "item.modernmetals.beryllium_stairs": "Berylliumtreppe", + "item.modernmetals.beryllium_wall": "Berylliummauer", + "tile.modernmetals.beryllium": "Geschmolzenes Beryllium", + "block.modernmetals.beryllium": "Geschmolzenes Beryllium", + "tile.modernmetals.beryllium_button": "Berylliumschalter", + "block.modernmetals.beryllium_button": "Berylliumschalter", + "tile.modernmetals.beryllium_lever": "Berylliumhebel", + "block.modernmetals.beryllium_lever": "Berylliumhebel", + "tile.modernmetals.beryllium_pressure_plate": "Berylliumdruckplatte", + "block.modernmetals.beryllium_pressure_plate": "Berylliumdruckplatte", + "tile.modernmetals.beryllium_slab": "Berylliumfliese", + "block.modernmetals.beryllium_slab": "Berylliumfliese", + "tile.modernmetals.beryllium_stairs": "Berylliumtreppe", + "block.modernmetals.beryllium_stairs": "Berylliumtreppe", + "tile.modernmetals.beryllium_wall": "Berylliummauer", + "block.modernmetals.beryllium_wall": "Berylliummauer", + "item.modernmetals.boron_clump": "Borklumpen", + "item.modernmetals.boron_crushed": "Zerkleinertes Borerz", + "item.modernmetals.boron_crushed_purified": "Gereinigtes, zerkleinertes Borerz", + "item.modernmetals.boron_crystal": "Borkristall", + "item.modernmetals.boron_dense_plate": "Verdichtetes Borblech", + "item.modernmetals.boron_powder_dirty": "Verunreinigtes Borpulver", + "item.modernmetals.boron_shard": "Borsplitter", + "item.modernmetals.boron_button": "Borschalter", + "item.modernmetals.boron_lever": "Borhebel", + "item.modernmetals.boron_pressure_plate": "Bordruckplatte", + "item.modernmetals.boron_slab": "Borfliese", + "item.modernmetals.boron_stairs": "Bortreppe", + "item.modernmetals.boron_wall": "Bormauer", + "tile.modernmetals.boron_button": "Borschalter", + "block.modernmetals.boron_button": "Borschalter", + "tile.modernmetals.boron_lever": "Borhebel", + "block.modernmetals.boron_lever": "Borhebel", + "tile.modernmetals.boron_pressure_plate": "Bordruckplatte", + "block.modernmetals.boron_pressure_plate": "Bordruckplatte", + "tile.modernmetals.boron_slab": "Borfliese", + "block.modernmetals.boron_slab": "Borfliese", + "tile.modernmetals.boron_stairs": "Bortreppe", + "block.modernmetals.boron_stairs": "Bortreppe", + "tile.modernmetals.boron_wall": "Bormauer", + "block.modernmetals.boron_wall": "Bormauer", + "material.thorium": "Thorium", + "item.modernmetals.thorium_arrow": "Thoriumpfeil", + "item.modernmetals.thorium_axe": "Thoriumaxt", + "item.modernmetals.thorium_bars": "Thoriumgitter", + "item.modernmetals.thorium_blend": "Thoriumgemisch", + "item.modernmetals.thorium_block": "Thoriumblock", + "item.modernmetals.thorium_boots": "Thoriumstiefel", + "item.modernmetals.thorium_bolt": "Thoriumbolzen", + "item.modernmetals.thorium_bow": "Thoriumbogen", + "item.modernmetals.thorium_chestplate": "Thoriumbrustpanzer", + "item.modernmetals.thorium_crackhammer": "Thoriumbruchhammer", + "item.modernmetals.thorium_crossbow": "Thoriumarmbrust", + "item.modernmetals.thorium_door": "Thoriumtür", + "item.modernmetals.thorium_fishing_rod": "Thoriumangel", + "item.modernmetals.thorium_gear": "Thoriumzahnrad", + "item.modernmetals.thorium_helmet": "Thoriumhelm", + "item.modernmetals.thorium_hoe": "Thoriumhacke", + "item.modernmetals.thorium_horse_armor": "Thoriumpferderüstung", + "item.modernmetals.thorium_ingot": "Thoriumbarren", + "item.modernmetals.thorium_leggings": "Thoriumbeinrüstung", + "item.modernmetals.thorium_nugget": "Thoriumnugget", + "item.modernmetals.thorium_ore": "Thoriumerz", + "item.modernmetals.thorium_pickaxe": "Thoriumspitzhacke", + "item.modernmetals.thorium_powder": "Thoriumpulver", + "item.modernmetals.thorium_rod": "Thoriumstange", + "item.modernmetals.thorium_shears": "Thoriumschere", + "item.modernmetals.thorium_shield": "Thoriumschild", + "item.modernmetals.thorium_shovel": "Thoriumschaufel", + "item.modernmetals.thorium_smallblend": "Kleiner Thoriumgemischhaufen", + "item.modernmetals.thorium_smallpowder": "Kleiner Thoriumpulverhaufen", + "item.modernmetals.thorium_sword": "Thoriumschwert", + "item.modernmetals.thorium_trapdoor": "Thoriumfalltür", + "tile.modernmetals.thorium_bars": "Thoriumgitter", + "block.modernmetals.thorium_bars": "Thoriumgitter", + "tile.modernmetals.thorium_block": "Thorium", + "block.modernmetals.thorium_block": "Thorium", + "tile.modernmetals.thorium_door": "Thoriumtür", + "block.modernmetals.thorium_door": "Thoriumtür", + "tile.modernmetals.thorium_ore": "Thoriumerz", + "block.modernmetals.thorium_ore": "Thoriumerz", + "tile.modernmetals.thorium_plate": "Thoriumblech", + "block.modernmetals.thorium_plate": "Thoriumblech", + "tile.modernmetals.thorium_trapdoor": "Thoriumfalltür", + "block.modernmetals.thorium_trapdoor": "Thoriumfalltür", + "fluid.modernmetals.thorium": "Geschmolzenes Thorium", + "tile.modernmetals.thorium": "Geschmolzenes Thorium", + "block.modernmetals.thorium": "Geschmolzenes Thorium", + "item.modernmetals.thorium_clump": "Thoriumklumpen", + "item.modernmetals.thorium_crushed": "Zerkleinertes Thoriumerz", + "item.modernmetals.thorium_crushed_purified": "Gereinigtes, zerkleinertes Thoriumerz", + "item.modernmetals.thorium_crystal": "Thoriumkristall", + "item.modernmetals.thorium_dense_plate": "Verdichtetes Thoriumblech", + "item.modernmetals.thorium_powder_dirty": "Verunreinigtes Thoriumpulver", + "item.modernmetals.thorium_shard": "Thoriumsplitter", + "item.modernmetals.thorium_button": "Thoriumschalter", + "item.modernmetals.thorium_lever": "Thoriumhebel", + "item.modernmetals.thorium_pressure_plate": "Thoriumdruckplatte", + "item.modernmetals.thorium_slab": "Thoriumfliese", + "item.modernmetals.thorium_stairs": "Thoriumtreppe", + "item.modernmetals.thorium_wall": "Thoriummauer", + "tile.modernmetals.thorium_button": "Thoriumschalter", + "block.modernmetals.thorium_button": "Thoriumschalter", + "tile.modernmetals.thorium_lever": "Thoriumhebel", + "block.modernmetals.thorium_lever": "Thoriumhebel", + "tile.modernmetals.thorium_pressure_plate": "Thoriumdruckplatte", + "block.modernmetals.thorium_pressure_plate": "Thoriumdruckplatte", + "tile.modernmetals.thorium_slab": "Thoriumfliese", + "block.modernmetals.thorium_slab": "Thoriumfliese", + "tile.modernmetals.thorium_stairs": "Thoriumtreppe", + "block.modernmetals.thorium_stairs": "Thoriumtreppe", + "tile.modernmetals.thorium_wall": "Thoriummauer", + "block.modernmetals.thorium_wall": "Thoriummauer", + "item.modernmetals.titanium_casing": "Titangehäuse", + "item.modernmetals.beryllium_scythe": "Berylliumsichel", + "item.modernmetals.boron_scythe": "Borsichel", + "item.modernmetals.thorium_scythe": "Thoriumsichel", + "item.modernmetals.titanium_scythe": "Titansichel" +} diff --git a/src/main/resources/assets/modernmetals/lang/en_au.json b/src/main/resources/assets/modernmetals/lang/en_au.json new file mode 100644 index 00000000..1587d2db --- /dev/null +++ b/src/main/resources/assets/modernmetals/lang/en_au.json @@ -0,0 +1,1760 @@ +{ + "item.modernmetals.nichrome_casing": "Nichrome Item Casing", + "itemGroup.modernmetals.blocks": "Modern Metals Blocks", + "itemGroup.modernmetals.combat": "Modern Metals Combat", + "itemGroup.modernmetals.items": "Modern Metals Items", + "itemGroup.modernmetals.tools": "Modern Metals Tools", + "nei.modernmetals.recipehandler.crusher": "Crushed Blocks/Items", + "material.aluminum": "Aluminum", + "item.modernmetals.aluminum_arrow": "Aluminum Arrow", + "item.modernmetals.aluminum_axe": "Aluminum Axe", + "item.modernmetals.aluminum_bars": "Aluminum Bars", + "item.modernmetals.aluminum_blend": "Aluminum Blend", + "item.modernmetals.aluminum_block": "Block of Aluminum", + "item.modernmetals.aluminum_boots": "Aluminum Boots", + "item.modernmetals.aluminum_bolt": "Aluminum Bolt", + "item.modernmetals.aluminum_bow": "Aluminum Bow", + "item.modernmetals.aluminum_chestplate": "Aluminum Chestplate", + "item.modernmetals.aluminum_crackhammer": "Aluminum Crack Hammer", + "item.modernmetals.aluminum_crossbow": "Aluminum Crossbow", + "item.modernmetals.aluminum_door": "Aluminum Door", + "item.modernmetals.aluminum_fishing_rod": "Aluminum Fishing Rod", + "item.modernmetals.aluminum_gear": "Aluminum Gear", + "item.modernmetals.aluminum_helmet": "Aluminum Helmet", + "item.modernmetals.aluminum_hoe": "Aluminum Hoe", + "item.modernmetals.aluminum_horse_armor": "Aluminum Horse Armour", + "item.modernmetals.aluminum_ingot": "Aluminum Ingot", + "item.modernmetals.aluminum_leggings": "Aluminum Leg Armour", + "item.modernmetals.aluminum_nugget": "Aluminum Nugget", + "item.modernmetals.aluminum_ore": "Aluminum Ore", + "item.modernmetals.aluminum_pickaxe": "Aluminum Pickaxe", + "item.modernmetals.aluminum_powder": "Aluminum Dust", + "item.modernmetals.aluminum_rod": "Aluminum Rod", + "item.modernmetals.aluminum_shears": "Aluminum Shears", + "item.modernmetals.aluminum_shield": "Aluminum Shield", + "item.modernmetals.aluminum_shovel": "Aluminum Shovel", + "item.modernmetals.aluminum_smallblend": "Tiny Pile of Aluminum Blend", + "item.modernmetals.aluminum_smallpowder": "Tiny Pile of Aluminum Dust", + "item.modernmetals.aluminum_sword": "Aluminum Sword", + "item.modernmetals.aluminum_trapdoor": "Aluminum Trapdoor", + "material.aluminumbrass": "Aluminum Brass", + "item.modernmetals.aluminumbrass_arrow": "Aluminum Brass Arrow", + "item.modernmetals.aluminumbrass_axe": "Aluminum Brass Axe", + "item.modernmetals.aluminumbrass_bars": "Aluminum Brass Bars", + "item.modernmetals.aluminumbrass_blend": "Aluminum Brass Blend", + "item.modernmetals.aluminumbrass_block": "Block of Aluminum Brass", + "item.modernmetals.aluminumbrass_boots": "Aluminum Brass Boots", + "item.modernmetals.aluminumbrass_bolt": "Aluminum Brass Bolt", + "item.modernmetals.aluminumbrass_bow": "Aluminum Brass Bow", + "item.modernmetals.aluminumbrass_chestplate": "Aluminum Brass Chestplate", + "item.modernmetals.aluminumbrass_crackhammer": "Aluminum Brass Crack Hammer", + "item.modernmetals.aluminumbrass_crossbow": "Aluminum Brass Crossbow", + "item.modernmetals.aluminumbrass_door": "Aluminum Brass Door", + "item.modernmetals.aluminumbrass_fishing_rod": "Aluminum Brass Fishing Rod", + "item.modernmetals.aluminumbrass_gear": "Aluminum Brass Gear", + "item.modernmetals.aluminumbrass_helmet": "Aluminum Brass Helmet", + "item.modernmetals.aluminumbrass_hoe": "Aluminum Brass Hoe", + "item.modernmetals.aluminumbrass_horse_armor": "Aluminum Brass Horse Armour", + "item.modernmetals.aluminumbrass_ingot": "Aluminum Brass Ingot", + "item.modernmetals.aluminumbrass_leggings": "Aluminum Brass Leg Armour", + "item.modernmetals.aluminumbrass_nugget": "Aluminum Brass Nugget", + "item.modernmetals.aluminumbrass_ore": "Aluminum Brass Ore", + "item.modernmetals.aluminumbrass_pickaxe": "Aluminum Brass Pickaxe", + "item.modernmetals.aluminumbrass_powder": "Aluminum Brass Dust", + "item.modernmetals.aluminumbrass_rod": "Aluminum Brass Rod", + "item.modernmetals.aluminumbrass_shears": "Aluminum Brass Shears", + "item.modernmetals.aluminumbrass_shield": "Aluminum Brass Shield", + "item.modernmetals.aluminumbrass_shovel": "Aluminum Brass Shovel", + "item.modernmetals.aluminumbrass_smallblend": "Tiny Pile of Aluminum Brass Blend", + "item.modernmetals.aluminumbrass_smallpowder": "Tiny Pile of Aluminum Brass Dust", + "item.modernmetals.aluminumbrass_sword": "Aluminum Brass Sword", + "item.modernmetals.aluminumbrass_trapdoor": "Aluminum Brass Trapdoor", + "material.antimony": "Antimony", + "item.modernmetals.antimony_arrow": "Antimony Arrow", + "item.modernmetals.antimony_axe": "Antimony Axe", + "item.modernmetals.antimony_bars": "Antimony Bars", + "item.modernmetals.antimony_block": "Block of Antimony", + "item.modernmetals.antimony_boots": "Antimony Boots", + "item.modernmetals.antimony_chestplate": "Antimony Chestplate", + "item.modernmetals.antimony_crackhammer": "Antimony Crack Hammer", + "item.modernmetals.antimony_door": "Antimony Door", + "item.modernmetals.antimony_helmet": "Antimony Helmet", + "item.modernmetals.antimony_hoe": "Antimony Hoe", + "item.modernmetals.antimony_ingot": "Antimony Ingot", + "item.modernmetals.antimony_leggings": "Antimony Leg Armour", + "item.modernmetals.antimony_nugget": "Antimony Nugget", + "item.modernmetals.antimony_ore": "Antimony Ore", + "item.modernmetals.antimony_pickaxe": "Antimony Pickaxe", + "item.modernmetals.antimony_powder": "Antimony Dust", + "item.modernmetals.antimony_shears": "Antimony Shears", + "item.modernmetals.antimony_shield": "Antimony Shield", + "item.modernmetals.antimony_shovel": "Antimony Shovel", + "item.modernmetals.antimony_smallpowder": "Tiny Pile of Antimony Dust", + "item.modernmetals.antimony_sword": "Antimony Sword", + "item.modernmetals.antimony_trapdoor": "Antimony Trapdoor", + "material.beryllium": "Beryllium", + "item.modernmetals.beryllium_arrow": "Beryllium Arrow", + "item.modernmetals.beryllium_axe": "Beryllium Axe", + "item.modernmetals.beryllium_bars": "Beryllium Bars", + "item.modernmetals.beryllium_blend": "Beryllium Blend", + "item.modernmetals.beryllium_block": "Block of Beryllium", + "item.modernmetals.beryllium_boots": "Beryllium Boots", + "item.modernmetals.beryllium_bolt": "Beryllium Bolt", + "item.modernmetals.beryllium_bow": "Beryllium Bow", + "item.modernmetals.beryllium_chestplate": "Beryllium Chestplate", + "item.modernmetals.beryllium_crackhammer": "Beryllium Crack Hammer", + "item.modernmetals.beryllium_crossbow": "Beryllium Crossbow", + "item.modernmetals.beryllium_door": "Beryllium Door", + "item.modernmetals.beryllium_fishing_rod": "Beryllium Fishing Rod", + "item.modernmetals.beryllium_gear": "Beryllium Gear", + "item.modernmetals.beryllium_helmet": "Beryllium Helmet", + "item.modernmetals.beryllium_hoe": "Beryllium Hoe", + "item.modernmetals.beryllium_horse_armor": "Beryllium Horse Armour", + "item.modernmetals.beryllium_ingot": "Beryllium Ingot", + "item.modernmetals.beryllium_leggings": "Beryllium Leg Armour", + "item.modernmetals.beryllium_nugget": "Beryllium Nugget", + "item.modernmetals.beryllium_ore": "Beryllium Ore", + "item.modernmetals.beryllium_pickaxe": "Beryllium Pickaxe", + "item.modernmetals.beryllium_powder": "Beryllium Dust", + "item.modernmetals.beryllium_rod": "Beryllium Rod", + "item.modernmetals.beryllium_shears": "Beryllium Shears", + "item.modernmetals.beryllium_shield": "Beryllium Shield", + "item.modernmetals.beryllium_shovel": "Beryllium Shovel", + "item.modernmetals.beryllium_smallblend": "Tiny Pile of Beryllium Blend", + "item.modernmetals.beryllium_smallpowder": "Tiny Pile of Beryllium Dust", + "item.modernmetals.beryllium_sword": "Beryllium Sword", + "item.modernmetals.beryllium_trapdoor": "Beryllium Trapdoor", + "material.bismuth": "Bismuth", + "item.modernmetals.bismuth_arrow": "Bismuth Arrow", + "item.modernmetals.bismuth_axe": "Bismuth Axe", + "item.modernmetals.bismuth_bars": "Bismuth Bars", + "item.modernmetals.bismuth_block": "Block of Bismuth", + "item.modernmetals.bismuth_boots": "Bismuth Boots", + "item.modernmetals.bismuth_chestplate": "Bismuth Chestplate", + "item.modernmetals.bismuth_crackhammer": "Bismuth Crack Hammer", + "item.modernmetals.bismuth_door": "Bismuth Door", + "item.modernmetals.bismuth_helmet": "Bismuth Helmet", + "item.modernmetals.bismuth_hoe": "Bismuth Hoe", + "item.modernmetals.bismuth_ingot": "Bismuth Ingot", + "item.modernmetals.bismuth_leggings": "Bismuth Leg Armour", + "item.modernmetals.bismuth_nugget": "Bismuth Nugget", + "item.modernmetals.bismuth_ore": "Bismuth Ore", + "item.modernmetals.bismuth_pickaxe": "Bismuth Pickaxe", + "item.modernmetals.bismuth_powder": "Bismuth Dust", + "item.modernmetals.bismuth_shears": "Bismuth Shears", + "item.modernmetals.bismuth_shovel": "Bismuth Shovel", + "item.modernmetals.bismuth_shield": "Bismuth Shield", + "item.modernmetals.bismuth_smallpowder": "Tiny Pile of Bismuth Dust", + "item.modernmetals.bismuth_sword": "Bismuth Sword", + "item.modernmetals.bismuth_trapdoor": "Bismuth Trapdoor", + "material.boron": "Boron", + "item.modernmetals.boron_arrow": "Boron Arrow", + "item.modernmetals.boron_axe": "Boron Axe", + "item.modernmetals.boron_bars": "Boron Bars", + "item.modernmetals.boron_blend": "Boron Blend", + "item.modernmetals.boron_block": "Block of Boron", + "item.modernmetals.boron_boots": "Boron Boots", + "item.modernmetals.boron_bolt": "Boron Bolt", + "item.modernmetals.boron_bow": "Boron Bow", + "item.modernmetals.boron_chestplate": "Boron Chestplate", + "item.modernmetals.boron_crackhammer": "Boron Crack Hammer", + "item.modernmetals.boron_crossbow": "Boron Crossbow", + "item.modernmetals.boron_door": "Boron Door", + "item.modernmetals.boron_fishing_rod": "Boron Fishing Rod", + "item.modernmetals.boron_gear": "Boron Gear", + "item.modernmetals.boron_helmet": "Boron Helmet", + "item.modernmetals.boron_hoe": "Boron Hoe", + "item.modernmetals.boron_horse_armor": "Boron Horse Armour", + "item.modernmetals.boron_ingot": "Boron Ingot", + "item.modernmetals.boron_leggings": "Boron Leg Armour", + "item.modernmetals.boron_nugget": "Boron Nugget", + "item.modernmetals.boron_ore": "Boron Ore", + "item.modernmetals.boron_pickaxe": "Boron Pickaxe", + "item.modernmetals.boron_powder": "Boron Dust", + "item.modernmetals.boron_rod": "Boron Rod", + "item.modernmetals.boron_shears": "Boron Shears", + "item.modernmetals.boron_shield": "Boron Shield", + "item.modernmetals.boron_shovel": "Boron Shovel", + "item.modernmetals.boron_smallblend": "Tiny Pile of Boron Blend", + "item.modernmetals.boron_smallpowder": "Tiny Pile of Boron Dust", + "item.modernmetals.boron_sword": "Boron Sword", + "item.modernmetals.boron_trapdoor": "Boron Trapdoor", + "material.cadmium": "Cadmium", + "item.modernmetals.cadmium_arrow": "Cadmium Arrow", + "item.modernmetals.cadmium_axe": "Cadmium Axe", + "item.modernmetals.cadmium_bars": "Cadmium Bars", + "item.modernmetals.cadmium_blend": "Cadmium Blend", + "item.modernmetals.cadmium_block": "Block of Cadmium", + "item.modernmetals.cadmium_bolt": "Cadmium Bolt", + "item.modernmetals.cadmium_boots": "Cadmium Boots", + "item.modernmetals.cadmium_bow": "Cadmium Bow", + "item.modernmetals.cadmium_chestplate": "Cadmium Chestplate", + "item.modernmetals.cadmium_crackhammer": "Cadmium Crack Hammer", + "item.modernmetals.cadmium_crossbow": "Cadmium Crossbow", + "item.modernmetals.cadmium_door": "Cadmium Door", + "item.modernmetals.cadmium_fishing_rod": "Cadmium Fishing Rod", + "item.modernmetals.cadmium_gear": "Cadmium Gear", + "item.modernmetals.cadmium_helmet": "Cadmium Helmet", + "item.modernmetals.cadmium_hoe": "Cadmium Hoe", + "item.modernmetals.cadmium_horse_armor": "Cadmium Horse Armour", + "item.modernmetals.cadmium_ingot": "Cadmium Ingot", + "item.modernmetals.cadmium_leggings": "Cadmium Leg Armour", + "item.modernmetals.cadmium_nugget": "Cadmium Nugget", + "item.modernmetals.cadmium_ore": "Cadmium Ore", + "item.modernmetals.cadmium_pickaxe": "Cadmium Pickaxe", + "item.modernmetals.cadmium_powder": "Cadmium Dust", + "item.modernmetals.cadmium_rod": "Cadmium Rod", + "item.modernmetals.cadmium_shears": "Cadmium Shears", + "item.modernmetals.cadmium_shovel": "Cadmium Shovel", + "item.modernmetals.cadmium_shield": "Cadmium Shield", + "item.modernmetals.cadmium_smallblend": "Tiny Pile of Cadmium Blend", + "item.modernmetals.cadmium_smallpowder": "Tiny Pile of Cadmium Dust", + "item.modernmetals.cadmium_sword": "Cadmium Sword", + "item.modernmetals.cadmium_trapdoor": "Cadmium Trapdoor", + "material.chromium": "Chromium", + "item.modernmetals.chromium_arrow": "Chromium Arrow", + "item.modernmetals.chromium_axe": "Chromium Axe", + "item.modernmetals.chromium_bars": "Chromium Bars", + "item.modernmetals.chromium_blend": "Chromium Blend", + "item.modernmetals.chromium_block": "Block of Chromium", + "item.modernmetals.chromium_bolt": "Chromium Bolt", + "item.modernmetals.chromium_boots": "Chromium Boots", + "item.modernmetals.chromium_bow": "Chromium Bow", + "item.modernmetals.chromium_chestplate": "Chromium Chestplate", + "item.modernmetals.chromium_crackhammer": "Chromium Crack Hammer", + "item.modernmetals.chromium_crossbow": "Chromium Crossbow", + "item.modernmetals.chromium_door": "Chromium Door", + "item.modernmetals.chromium_fishing_rod": "Chromium Fishing Rod", + "item.modernmetals.chromium_gear": "Chromium Gear", + "item.modernmetals.chromium_helmet": "Chromium Helmet", + "item.modernmetals.chromium_hoe": "Chromium Hoe", + "item.modernmetals.chromium_horse_armor": "Chromium Horse Armour", + "item.modernmetals.chromium_ingot": "Chromium Ingot", + "item.modernmetals.chromium_leggings": "Chromium Leg Armour", + "item.modernmetals.chromium_nugget": "Chromium Nugget", + "item.modernmetals.chromium_ore": "Chromium Ore", + "item.modernmetals.chromium_pickaxe": "Chromium Pickaxe", + "item.modernmetals.chromium_powder": "Chromium Dust", + "item.modernmetals.chromium_rod": "Chromium Rod", + "item.modernmetals.chromium_shears": "Chromium Shears", + "item.modernmetals.chromium_shield": "Chromium Shield", + "item.modernmetals.chromium_shovel": "Chromium Shovel", + "item.modernmetals.chromium_smallblend": "Tiny Pile of Chromium Blend", + "item.modernmetals.chromium_smallpowder": "Tiny Pile of Chromium Dust", + "item.modernmetals.chromium_sword": "Chromium Sword", + "item.modernmetals.chromium_trapdoor": "Chromium Trapdoor", + "material.galvanizedsteel": "Galvanized Steel", + "item.modernmetals.galvanizedsteel_arrow": "Galvanized Steel Arrow", + "item.modernmetals.galvanizedsteel_axe": "Galvanized Steel Axe", + "item.modernmetals.galvanizedsteel_bars": "Galvanized Steel Bars", + "item.modernmetals.galvanizedsteel_blend": "Galvanized Steel Blend", + "item.modernmetals.galvanizedsteel_block": "Block of Galvanized Steel", + "item.modernmetals.galvanizedsteel_bolt": "Galvanized Steel Bolt", + "item.modernmetals.galvanizedsteel_boots": "Galvanized Steel Boots", + "item.modernmetals.galvanizedsteel_bow": "Galvanized Steel Bow", + "item.modernmetals.galvanizedsteel_chestplate": "Galvanized Steel Chestplate", + "item.modernmetals.galvanizedsteel_crackhammer": "Galvanized Steel Crack Hammer", + "item.modernmetals.galvanizedsteel_crossbow": "Galvanized Steel Crossbow", + "item.modernmetals.galvanizedsteel_door": "Galvanized Steel Door", + "item.modernmetals.galvanizedsteel_fishing_rod": "Galvanized Steel Fishing Rod", + "item.modernmetals.galvanizedsteel_gear": "Galvanized Steel Gear", + "item.modernmetals.galvanizedsteel_helmet": "Galvanized Steel Helmet", + "item.modernmetals.galvanizedsteel_hoe": "Galvanized Steel Hoe", + "item.modernmetals.galvanizedsteel_horse_armor": "Galvanized Steel Horse Armour", + "item.modernmetals.galvanizedsteel_ingot": "Galvanized Steel Ingot", + "item.modernmetals.galvanizedsteel_leggings": "Galvanized Steel Leg Armour", + "item.modernmetals.galvanizedsteel_nugget": "Galvanized Steel Nugget", + "item.modernmetals.galvanizedsteel_ore": "Galvanized Steel Ore", + "item.modernmetals.galvanizedsteel_pickaxe": "Galvanized Steel Pickaxe", + "item.modernmetals.galvanizedsteel_powder": "Galvanized Steel Dust", + "item.modernmetals.galvanizedsteel_rod": "Galvanized Steel Rod", + "item.modernmetals.galvanizedsteel_shears": "Galvanized Steel Shears", + "item.modernmetals.galvanizedsteel_shield": "Galvanized Steel Shield", + "item.modernmetals.galvanizedsteel_shovel": "Galvanized Steel Shovel", + "item.modernmetals.galvanizedsteel_smallblend": "Tiny Pile of Galvanized Steel Blend", + "item.modernmetals.galvanizedsteel_smallpowder": "Tiny Pile of Galvanized Steel Dust", + "item.modernmetals.galvanizedsteel_sword": "Galvanized Steel Sword", + "item.modernmetals.galvanizedsteel_trapdoor": "Galvanized Steel Trapdoor", + "material.iridium": "Iridium", + "item.modernmetals.iridium_arrow": "Iridium Arrow", + "item.modernmetals.iridium_axe": "Iridium Axe", + "item.modernmetals.iridium_bars": "Iridium Bars", + "item.modernmetals.iridium_blend": "Iridium Blend", + "item.modernmetals.iridium_block": "Block of Iridium", + "item.modernmetals.iridium_bolt": "Iridium Bolt", + "item.modernmetals.iridium_boots": "Iridium Boots", + "item.modernmetals.iridium_bow": "Iridium Bow", + "item.modernmetals.iridium_chestplate": "Iridium Chestplate", + "item.modernmetals.iridium_crackhammer": "Iridium Crack Hammer", + "item.modernmetals.iridium_crossbow": "Iridium Crossbow", + "item.modernmetals.iridium_door": "Iridium Door", + "item.modernmetals.iridium_fishing_rod": "Iridium Fishing Rod", + "item.modernmetals.iridium_gear": "Iridium Gear", + "item.modernmetals.iridium_helmet": "Iridium Helmet", + "item.modernmetals.iridium_hoe": "Iridium Hoe", + "item.modernmetals.iridium_horse_armor": "Iridium Horse Armour", + "item.modernmetals.iridium_ingot": "Iridium Ingot", + "item.modernmetals.iridium_leggings": "Iridium Leg Armour", + "item.modernmetals.iridium_nugget": "Iridium Nugget", + "item.modernmetals.iridium_ore": "Iridium Ore", + "item.modernmetals.iridium_pickaxe": "Iridium Pickaxe", + "item.modernmetals.iridium_powder": "Iridium Dust", + "item.modernmetals.iridium_rod": "Iridium Rod", + "item.modernmetals.iridium_shears": "Iridium Shears", + "item.modernmetals.iridium_shield": "Iridium Shield", + "item.modernmetals.iridium_shovel": "Iridium Shovel", + "item.modernmetals.iridium_smallblend": "Tiny Pile of Iridium Blend", + "item.modernmetals.iridium_smallpowder": "Tiny Pile of Iridium Dust", + "item.modernmetals.iridium_sword": "Iridium Sword", + "item.modernmetals.iridium_trapdoor": "Iridium Trapdoor", + "material.magnesium": "Magnesium", + "item.modernmetals.magnesium_arrow": "Magnesium Arrow", + "item.modernmetals.magnesium_axe": "Magnesium Axe", + "item.modernmetals.magnesium_bars": "Magnesium Bars", + "item.modernmetals.magnesium_blend": "Magnesium Blend", + "item.modernmetals.magnesium_block": "Block of Magnesium", + "item.modernmetals.magnesium_boots": "Magnesium Boots", + "item.modernmetals.magnesium_bolt": "Magnesium Bolt", + "item.modernmetals.magnesium_bow": "Magnesium Bow", + "item.modernmetals.magnesium_chestplate": "Magnesium Chestplate", + "item.modernmetals.magnesium_crackhammer": "Magnesium Crack Hammer", + "item.modernmetals.magnesium_crossbow": "Magnesium Crossbow", + "item.modernmetals.magnesium_door": "Magnesium Door", + "item.modernmetals.magnesium_fishing_rod": "Magnesium Fishing Rod", + "item.modernmetals.magnesium_gear": "Magnesium Gear", + "item.modernmetals.magnesium_helmet": "Magnesium Helmet", + "item.modernmetals.magnesium_hoe": "Magnesium Hoe", + "item.modernmetals.magnesium_horse_armor": "Magnesium Horse Armour", + "item.modernmetals.magnesium_ingot": "Magnesium Ingot", + "item.modernmetals.magnesium_leggings": "Magnesium Leg Armour", + "item.modernmetals.magnesium_nugget": "Magnesium Nugget", + "item.modernmetals.magnesium_ore": "Magnesium Ore", + "item.modernmetals.magnesium_pickaxe": "Magnesium Pickaxe", + "item.modernmetals.magnesium_powder": "Magnesium Dust", + "item.modernmetals.magnesium_rod": "Magnesium Rod", + "item.modernmetals.magnesium_shears": "Magnesium Shears", + "item.modernmetals.magnesium_shield": "Magnesium Shield", + "item.modernmetals.magnesium_shovel": "Magnesium Shovel", + "item.modernmetals.magnesium_smallblend": "Tiny Pile of Magnesium Blend", + "item.modernmetals.magnesium_smallpowder": "Tiny Pile of Magnesium Dust", + "item.modernmetals.magnesium_sword": "Magnesium Sword", + "item.modernmetals.magnesium_trapdoor": "Magnesium Trapdoor", + "material.manganese": "Manganese", + "item.modernmetals.manganese_arrow": "Manganese Arrow", + "item.modernmetals.manganese_axe": "Manganese Axe", + "item.modernmetals.manganese_bars": "Manganese Bars", + "item.modernmetals.manganese_blend": "Manganese Blend", + "item.modernmetals.manganese_block": "Block of Manganese", + "item.modernmetals.manganese_bolt": "Manganese Bolt", + "item.modernmetals.manganese_boots": "Manganese Boots", + "item.modernmetals.manganese_bow": "Manganese Bow", + "item.modernmetals.manganese_chestplate": "Manganese Chestplate", + "item.modernmetals.manganese_crackhammer": "Manganese Crack Hammer", + "item.modernmetals.manganese_crossbow": "Manganese Crossbow", + "item.modernmetals.manganese_door": "Manganese Door", + "item.modernmetals.manganese_fishing_rod": "Manganese Fishing Rod", + "item.modernmetals.manganese_gear": "Manganese Gear", + "item.modernmetals.manganese_helmet": "Manganese Helmet", + "item.modernmetals.manganese_hoe": "Manganese Hoe", + "item.modernmetals.manganese_horse_armor": "Manganese Horse Armour", + "item.modernmetals.manganese_ingot": "Manganese Ingot", + "item.modernmetals.manganese_leggings": "Manganese Leg Armour", + "item.modernmetals.manganese_nugget": "Manganese Nugget", + "item.modernmetals.manganese_ore": "Manganese Ore", + "item.modernmetals.manganese_pickaxe": "Manganese Pickaxe", + "item.modernmetals.manganese_powder": "Manganese Dust", + "item.modernmetals.manganese_rod": "Manganese Rod", + "item.modernmetals.manganese_shears": "Manganese Shears", + "item.modernmetals.manganese_shield": "Manganese Shield", + "item.modernmetals.manganese_shovel": "Manganese Shovel", + "item.modernmetals.manganese_smallblend": "Tiny Pile of Manganese Blend", + "item.modernmetals.manganese_smallpowder": "Tiny Pile of Manganese Dust", + "item.modernmetals.manganese_sword": "Manganese Sword", + "item.modernmetals.manganese_trapdoor": "Manganese Trapdoor", + "material.nichrome": "Nichrome", + "item.modernmetals.nichrome_arrow": "Nichrome Arrow", + "item.modernmetals.nichrome_axe": "Nichrome Axe", + "item.modernmetals.nichrome_bars": "Nichrome Bars", + "item.modernmetals.nichrome_blend": "Nichrome Blend", + "item.modernmetals.nichrome_block": "Block of Nichrome", + "item.modernmetals.nichrome_bolt": "Nichrome Bolt", + "item.modernmetals.nichrome_boots": "Nichrome Boots", + "item.modernmetals.nichrome_bow": "Nichrome Bow", + "item.modernmetals.nichrome_chestplate": "Nichrome Chestplate", + "item.modernmetals.nichrome_crackhammer": "Nichrome Crack Hammer", + "item.modernmetals.nichrome_crossbow": "Nichrome Crossbow", + "item.modernmetals.nichrome_door": "Nichrome Door", + "item.modernmetals.nichrome_fishing_rod": "Nichrome Fishing Rod", + "item.modernmetals.nichrome_gear": "Nichrome Gear", + "item.modernmetals.nichrome_helmet": "Nichrome Helmet", + "item.modernmetals.nichrome_hoe": "Nichrome Hoe", + "item.modernmetals.nichrome_horse_armor": "Nichrome Horse Armour", + "item.modernmetals.nichrome_ingot": "Nichrome Ingot", + "item.modernmetals.nichrome_leggings": "Nichrome Leg Armour", + "item.modernmetals.nichrome_nugget": "Nichrome Nugget", + "item.modernmetals.nichrome_ore": "Nichrome Ore", + "item.modernmetals.nichrome_pickaxe": "Nichrome Pickaxe", + "item.modernmetals.nichrome_powder": "Nichrome Dust", + "item.modernmetals.nichrome_rod": "Nichrome Rod", + "item.modernmetals.nichrome_shears": "Nichrome Shears", + "item.modernmetals.nichrome_shield": "Nichrome Shield", + "item.modernmetals.nichrome_shovel": "Nichrome Shovel", + "item.modernmetals.nichrome_smallblend": "Tiny Pile of Nichrome Blend", + "item.modernmetals.nichrome_smallpowder": "Tiny Pile of Nichrome Dust", + "item.modernmetals.nichrome_sword": "Nichrome Sword", + "item.modernmetals.nichrome_trapdoor": "Nichrome Trapdoor", + "material.osmium": "Osmium", + "item.modernmetals.osmium_arrow": "Osmium Arrow", + "item.modernmetals.osmium_axe": "Osmium Axe", + "item.modernmetals.osmium_bars": "Osmium Bars", + "item.modernmetals.osmium_blend": "Osmium Blend", + "item.modernmetals.osmium_block": "Block of Osmium", + "item.modernmetals.osmium_boots": "Osmium Boots", + "item.modernmetals.osmium_bolt": "Osmium Bolt", + "item.modernmetals.osmium_bow": "Osmium Bow", + "item.modernmetals.osmium_chestplate": "Osmium Chestplate", + "item.modernmetals.osmium_crackhammer": "Osmium Crack Hammer", + "item.modernmetals.osmium_crossbow": "Osmium Crossbow", + "item.modernmetals.osmium_door": "Osmium Door", + "item.modernmetals.osmium_fishing_rod": "Osmium Fishing Rod", + "item.modernmetals.osmium_gear": "Osmium Gear", + "item.modernmetals.osmium_helmet": "Osmium Helmet", + "item.modernmetals.osmium_hoe": "Osmium Hoe", + "item.modernmetals.osmium_horse_armor": "Osmium Horse Armour", + "item.modernmetals.osmium_ingot": "Osmium Ingot", + "item.modernmetals.osmium_leggings": "Osmium Leg Armour", + "item.modernmetals.osmium_nugget": "Osmium Nugget", + "item.modernmetals.osmium_ore": "Osmium Ore", + "item.modernmetals.osmium_pickaxe": "Osmium Pickaxe", + "item.modernmetals.osmium_powder": "Osmium Dust", + "item.modernmetals.osmium_rod": "Osmium Rod", + "item.modernmetals.osmium_shears": "Osmium Shears", + "item.modernmetals.osmium_shield": "Osmium Shield", + "item.modernmetals.osmium_shovel": "Osmium Shovel", + "item.modernmetals.osmium_smallblend": "Tiny Pile of Osmium Blend", + "item.modernmetals.osmium_smallpowder": "Tiny Pile of Osmium Dust", + "item.modernmetals.osmium_sword": "Osmium Sword", + "item.modernmetals.osmium_trapdoor": "Osmium Trapdoor", + "material.pewter": "Pewter", + "item.modernmetals.pewter_arrow": "Pewter Arrow", + "item.modernmetals.pewter_axe": "Pewter Axe", + "item.modernmetals.pewter_bars": "Pewter Bars", + "item.modernmetals.pewter_blend": "Pewter Blend", + "item.modernmetals.pewter_block": "Block of Pewter", + "item.modernmetals.pewter_boots": "Pewter Boots", + "item.modernmetals.pewter_chestplate": "Pewter Chestplate", + "item.modernmetals.pewter_crackhammer": "Pewter Crack Hammer", + "item.modernmetals.pewter_door": "Pewter Door", + "item.modernmetals.pewter_helmet": "Pewter Helmet", + "item.modernmetals.pewter_hoe": "Pewter Hoe", + "item.modernmetals.pewter_ingot": "Pewter Ingot", + "item.modernmetals.pewter_leggings": "Pewter Leg Armour", + "item.modernmetals.pewter_nugget": "Pewter Nugget", + "item.modernmetals.pewter_ore": "Pewter Ore", + "item.modernmetals.pewter_pickaxe": "Pewter Pickaxe", + "item.modernmetals.pewter_powder": "Pewter Dust", + "item.modernmetals.pewter_shears": "Pewter Shears", + "item.modernmetals.pewter_shield": "Pewter Shield", + "item.modernmetals.pewter_shovel": "Pewter Shovel", + "item.modernmetals.pewter_smallpowder": "Tiny Pile of Pewter Dust", + "item.modernmetals.pewter_sword": "Pewter Sword", + "item.modernmetals.pewter_trapdoor": "Pewter Trapdoor", + "material.plutonium": "Plutonium", + "item.modernmetals.plutonium_arrow": "Plutonium Arrow", + "item.modernmetals.plutonium_axe": "Plutonium Axe", + "item.modernmetals.plutonium_bars": "Plutonium Bars", + "item.modernmetals.plutonium_blend": "Plutonium Blend", + "item.modernmetals.plutonium_block": "Block of Plutonium", + "item.modernmetals.plutonium_bolt": "Plutonium Bolt", + "item.modernmetals.plutonium_boots": "Plutonium Boots", + "item.modernmetals.plutonium_bow": "Plutonium Bow", + "item.modernmetals.plutonium_chestplate": "Plutonium Chestplate", + "item.modernmetals.plutonium_crackhammer": "Plutonium Crack Hammer", + "item.modernmetals.plutonium_crossbow": "Plutonium Crossbow", + "item.modernmetals.plutonium_door": "Plutonium Door", + "item.modernmetals.plutonium_fishing_rod": "Plutonium Fishing Rod", + "item.modernmetals.plutonium_gear": "Plutonium Gear", + "item.modernmetals.plutonium_helmet": "Plutonium Helmet", + "item.modernmetals.plutonium_hoe": "Plutonium Hoe", + "item.modernmetals.plutonium_horse_armor": "Plutonium Horse Armour", + "item.modernmetals.plutonium_ingot": "Plutonium Ingot", + "item.modernmetals.plutonium_leggings": "Plutonium Leg Armour", + "item.modernmetals.plutonium_nugget": "Plutonium Nugget", + "item.modernmetals.plutonium_ore": "Plutonium Ore", + "item.modernmetals.plutonium_pickaxe": "Plutonium Pickaxe", + "item.modernmetals.plutonium_powder": "Plutonium Dust", + "item.modernmetals.plutonium_rod": "Plutonium Rod", + "item.modernmetals.plutonium_shears": "Plutonium Shears", + "item.modernmetals.plutonium_shield": "Plutonium Shield", + "item.modernmetals.plutonium_shovel": "Plutonium Shovel", + "item.modernmetals.plutonium_smallblend": "Tiny Pile of Plutonium Blend", + "item.modernmetals.plutonium_smallpowder": "Tiny Pile of Plutonium Dust", + "item.modernmetals.plutonium_sword": "Plutonium Sword", + "item.modernmetals.plutonium_trapdoor": "Plutonium Trapdoor", + "material.rutile": "Rutile", + "item.modernmetals.rutile_arrow": "Rutile Arrow", + "item.modernmetals.rutile_axe": "Rutile Axe", + "item.modernmetals.rutile_bars": "Rutile Bars", + "item.modernmetals.rutile_blend": "Rutile Blend", + "item.modernmetals.rutile_block": "Block of Rutile", + "item.modernmetals.rutile_boots": "Rutile Boots", + "item.modernmetals.rutile_bolt": "Rutile Bolt", + "item.modernmetals.rutile_bow": "Rutile Bow", + "item.modernmetals.rutile_chestplate": "Rutile Chestplate", + "item.modernmetals.rutile_crackhammer": "Rutile Crack Hammer", + "item.modernmetals.rutile_crossbow": "Rutile Crossbow", + "item.modernmetals.rutile_door": "Rutile Door", + "item.modernmetals.rutile_fishing_rod": "Rutile Fishing Rod", + "item.modernmetals.rutile_gear": "Rutile Gear", + "item.modernmetals.rutile_helmet": "Rutile Helmet", + "item.modernmetals.rutile_hoe": "Rutile Hoe", + "item.modernmetals.rutile_horse_armor": "Rutile Horse Armour", + "item.modernmetals.rutile_ingot": "Rutile Ingot", + "item.modernmetals.rutile_leggings": "Rutile Leg Armour", + "item.modernmetals.rutile_nugget": "Rutile Nugget", + "item.modernmetals.rutile_ore": "Rutile Ore", + "item.modernmetals.rutile_pickaxe": "Rutile Pickaxe", + "item.modernmetals.rutile_powder": "Rutile Dust", + "item.modernmetals.rutile_rod": "Rutile Rod", + "item.modernmetals.rutile_shears": "Rutile Shears", + "item.modernmetals.rutile_shield": "Rutile Shield", + "item.modernmetals.rutile_shovel": "Rutile Shovel", + "item.modernmetals.rutile_smallblend": "Tiny Pile of Rutile Blend", + "item.modernmetals.rutile_smallpowder": "Tiny Pile of Rutile Dust", + "item.modernmetals.rutile_sword": "Rutile Sword", + "item.modernmetals.rutile_trapdoor": "Rutile Trapdoor", + "material.stainlesssteel": "Stainless Steel", + "item.modernmetals.stainlesssteel_arrow": "Stainless Steel Arrow", + "item.modernmetals.stainlesssteel_axe": "Stainless Steel Axe", + "item.modernmetals.stainlesssteel_bars": "Stainless Steel Bars", + "item.modernmetals.stainlesssteel_blend": "Stainless Steel Blend", + "item.modernmetals.stainlesssteel_block": "Block of Stainless Steel", + "item.modernmetals.stainlesssteel_bolt": "Stainless Steel Bolt", + "item.modernmetals.stainlesssteel_boots": "Stainless Steel Boots", + "item.modernmetals.stainlesssteel_bow": "Stainless Steel Bow", + "item.modernmetals.stainlesssteel_chestplate": "Stainless Steel Chestplate", + "item.modernmetals.stainlesssteel_crackhammer": "Stainless Steel Crack Hammer", + "item.modernmetals.stainlesssteel_crossbow": "Stainless Steel Crossbow", + "item.modernmetals.stainlesssteel_door": "Stainless Steel Door", + "item.modernmetals.stainlesssteel_fishing_rod": "Stainless Steel Fishing Rod", + "item.modernmetals.stainlesssteel_gear": "Stainless Steel Gear", + "item.modernmetals.stainlesssteel_helmet": "Stainless Steel Helmet", + "item.modernmetals.stainlesssteel_hoe": "Stainless Steel Hoe", + "item.modernmetals.stainlesssteel_horse_armor": "Stainless Steel Horse Armour", + "item.modernmetals.stainlesssteel_ingot": "Stainless Steel Ingot", + "item.modernmetals.stainlesssteel_leggings": "Stainless Steel Leg Armour", + "item.modernmetals.stainlesssteel_nugget": "Stainless Steel Nugget", + "item.modernmetals.stainlesssteel_ore": "Stainless Steel Ore", + "item.modernmetals.stainlesssteel_pickaxe": "Stainless Steel Pickaxe", + "item.modernmetals.stainlesssteel_powder": "Stainless Steel Dust", + "item.modernmetals.stainlesssteel_rod": "Stainless Steel Rod", + "item.modernmetals.stainlesssteel_shears": "Stainless Steel Shears", + "item.modernmetals.stainlesssteel_shield": "Stainless Steel Shield", + "item.modernmetals.stainlesssteel_shovel": "Stainless Steel Shovel", + "item.modernmetals.stainlesssteel_smallblend": "Tiny Pile of Stainless Steel Blend", + "item.modernmetals.stainlesssteel_smallpowder": "Tiny Pile of Stainless Steel Dust", + "item.modernmetals.stainlesssteel_sword": "Stainless Steel Sword", + "item.modernmetals.stainlesssteel_trapdoor": "Stainless Steel Trapdoor", + "material.tantalum": "Tantalum", + "item.modernmetals.tantalum_arrow": "Tantalum Arrow", + "item.modernmetals.tantalum_axe": "Tantalum Axe", + "item.modernmetals.tantalum_bars": "Tantalum Bars", + "item.modernmetals.tantalum_blend": "Tantalum Blend", + "item.modernmetals.tantalum_block": "Block of Tantalum", + "item.modernmetals.tantalum_bolt": "Tantalum Bolt", + "item.modernmetals.tantalum_boots": "Tantalum Boots", + "item.modernmetals.tantalum_bow": "Tantalum Bow", + "item.modernmetals.tantalum_chestplate": "Tantalum Chestplate", + "item.modernmetals.tantalum_crackhammer": "Tantalum Crack Hammer", + "item.modernmetals.tantalum_crossbow": "Tantalum Crossbow", + "item.modernmetals.tantalum_door": "Tantalum Door", + "item.modernmetals.tantalum_fishing_rod": "Tantalum Fishing Rod", + "item.modernmetals.tantalum_gear": "Tantalum Gear", + "item.modernmetals.tantalum_helmet": "Tantalum Helmet", + "item.modernmetals.tantalum_hoe": "Tantalum Hoe", + "item.modernmetals.tantalum_horse_armor": "Tantalum Horse Armour", + "item.modernmetals.tantalum_ingot": "Tantalum Ingot", + "item.modernmetals.tantalum_leggings": "Tantalum Leg Armour", + "item.modernmetals.tantalum_nugget": "Tantalum Nugget", + "item.modernmetals.tantalum_ore": "Tantalum Ore", + "item.modernmetals.tantalum_pickaxe": "Tantalum Pickaxe", + "item.modernmetals.tantalum_powder": "Tantalum Dust", + "item.modernmetals.tantalum_rod": "Tantalum Rod", + "item.modernmetals.tantalum_shears": "Tantalum Shears", + "item.modernmetals.tantalum_shield": "Tantalum Shield", + "item.modernmetals.tantalum_shovel": "Tantalum Shovel", + "item.modernmetals.tantalum_smallblend": "Tiny Pile of Tantalum Blend", + "item.modernmetals.tantalum_smallpowder": "Tiny Pile of Tantalum Dust", + "item.modernmetals.tantalum_sword": "Tantalum Sword", + "item.modernmetals.tantalum_trapdoor": "Tantalum Trapdoor", + "material.titanium": "Titanium", + "item.modernmetals.titanium_arrow": "Titanium Arrow", + "item.modernmetals.titanium_axe": "Titanium Axe", + "item.modernmetals.titanium_bars": "Titanium Bars", + "item.modernmetals.titanium_blend": "Titanium Blend", + "item.modernmetals.titanium_block": "Block of Titanium", + "item.modernmetals.titanium_boots": "Titanium Boots", + "item.modernmetals.titanium_bolt": "Titanium Bolt", + "item.modernmetals.titanium_bow": "Titanium Bow", + "item.modernmetals.titanium_chestplate": "Titanium Chestplate", + "item.modernmetals.titanium_crackhammer": "Titanium Crack Hammer", + "item.modernmetals.titanium_crossbow": "Titanium Crossbow", + "item.modernmetals.titanium_door": "Titanium Door", + "item.modernmetals.titanium_fishing_rod": "Titanium Fishing Rod", + "item.modernmetals.titanium_gear": "Titanium Gear", + "item.modernmetals.titanium_helmet": "Titanium Helmet", + "item.modernmetals.titanium_hoe": "Titanium Hoe", + "item.modernmetals.titanium_horse_armor": "Titanium Horse Armour", + "item.modernmetals.titanium_ingot": "Titanium Ingot", + "item.modernmetals.titanium_leggings": "Titanium Leg Armour", + "item.modernmetals.titanium_nugget": "Titanium Nugget", + "item.modernmetals.titanium_ore": "Titanium Ore", + "item.modernmetals.titanium_pickaxe": "Titanium Pickaxe", + "item.modernmetals.titanium_powder": "Titanium Dust", + "item.modernmetals.titanium_rod": "Titanium Rod", + "item.modernmetals.titanium_shears": "Titanium Shears", + "item.modernmetals.titanium_shield": "Titanium Shield", + "item.modernmetals.titanium_shovel": "Titanium Shovel", + "item.modernmetals.titanium_smallblend": "Tiny Pile of Titanium Blend", + "item.modernmetals.titanium_smallpowder": "Tiny Pile of Titanium Dust", + "item.modernmetals.titanium_sword": "Titanium Sword", + "item.modernmetals.titanium_trapdoor": "Titanium Trapdoor", + "material.tungsten": "Tungsten", + "item.modernmetals.tungsten_arrow": "Tungsten Arrow", + "item.modernmetals.tungsten_axe": "Tungsten Axe", + "item.modernmetals.tungsten_bars": "Tungsten Bars", + "item.modernmetals.tungsten_blend": "Tungsten Blend", + "item.modernmetals.tungsten_block": "Block of Tungsten", + "item.modernmetals.tungsten_boots": "Tungsten Boots", + "item.modernmetals.tungsten_bolt": "Tungsten Bolt", + "item.modernmetals.tungsten_bow": "Tungsten Bow", + "item.modernmetals.tungsten_chestplate": "Tungsten Chestplate", + "item.modernmetals.tungsten_crackhammer": "Tungsten Crack Hammer", + "item.modernmetals.tungsten_crossbow": "Tungsten Crossbow", + "item.modernmetals.tungsten_door": "Tungsten Door", + "item.modernmetals.tungsten_fishing_rod": "Tungsten Fishing Rod", + "item.modernmetals.tungsten_gear": "Tungsten Gear", + "item.modernmetals.tungsten_helmet": "Tungsten Helmet", + "item.modernmetals.tungsten_hoe": "Tungsten Hoe", + "item.modernmetals.tungsten_horse_armor": "Tungsten Horse Armour", + "item.modernmetals.tungsten_ingot": "Tungsten Ingot", + "item.modernmetals.tungsten_leggings": "Tungsten Leg Armour", + "item.modernmetals.tungsten_nugget": "Tungsten Nugget", + "item.modernmetals.tungsten_ore": "Tungsten Ore", + "item.modernmetals.tungsten_pickaxe": "Tungsten Pickaxe", + "item.modernmetals.tungsten_powder": "Tungsten Dust", + "item.modernmetals.tungsten_rod": "Tungsten Rod", + "item.modernmetals.tungsten_shears": "Tungsten Shears", + "item.modernmetals.tungsten_shield": "Tungsten Shield", + "item.modernmetals.tungsten_shovel": "Tungsten Shovel", + "item.modernmetals.tungsten_smallblend": "Tiny Pile of Tungsten Blend", + "item.modernmetals.tungsten_smallpowder": "Tiny Pile of Tungsten Dust", + "item.modernmetals.tungsten_sword": "Tungsten Sword", + "item.modernmetals.tungsten_trapdoor": "Tungsten Trapdoor", + "material.uranium": "Uranium", + "item.modernmetals.uranium_arrow": "Uranium Arrow", + "item.modernmetals.uranium_axe": "Uranium Axe", + "item.modernmetals.uranium_bars": "Uranium Bars", + "item.modernmetals.uranium_blend": "Uranium Blend", + "item.modernmetals.uranium_block": "Block of Uranium", + "item.modernmetals.uranium_boots": "Uranium Boots", + "item.modernmetals.uranium_bolt": "Uranium Bolt", + "item.modernmetals.uranium_bow": "Uranium Bow", + "item.modernmetals.uranium_chestplate": "Uranium Chestplate", + "item.modernmetals.uranium_crackhammer": "Uranium Crack Hammer", + "item.modernmetals.uranium_crossbow": "Uranium Crossbow", + "item.modernmetals.uranium_door": "Uranium Door", + "item.modernmetals.uranium_fishing_rod": "Uranium Fishing Rod", + "item.modernmetals.uranium_gear": "Uranium Gear", + "item.modernmetals.uranium_helmet": "Uranium Helmet", + "item.modernmetals.uranium_hoe": "Uranium Hoe", + "item.modernmetals.uranium_horse_armor": "Uranium Horse Armour", + "item.modernmetals.uranium_ingot": "Uranium Ingot", + "item.modernmetals.uranium_leggings": "Uranium Leg Armour", + "item.modernmetals.uranium_nugget": "Uranium Nugget", + "item.modernmetals.uranium_ore": "Uranium Ore", + "item.modernmetals.uranium_pickaxe": "Uranium Pickaxe", + "item.modernmetals.uranium_powder": "Uranium Dust", + "item.modernmetals.uranium_rod": "Uranium Rod", + "item.modernmetals.uranium_shears": "Uranium Shears", + "item.modernmetals.uranium_shield": "Uranium Shield", + "item.modernmetals.uranium_shovel": "Uranium Shovel", + "item.modernmetals.uranium_smallblend": "Tiny Pile of Uranium Blend", + "item.modernmetals.uranium_smallpowder": "Tiny Pile of Uranium Dust", + "item.modernmetals.uranium_sword": "Uranium Sword", + "item.modernmetals.uranium_trapdoor": "Uranium Trapdoor", + "material.zirconium": "Zirconium", + "item.modernmetals.zirconium_arrow": "Zirconium Arrow", + "item.modernmetals.zirconium_axe": "Zirconium Axe", + "item.modernmetals.zirconium_bars": "Zirconium Bars", + "item.modernmetals.zirconium_blend": "Zirconium Blend", + "item.modernmetals.zirconium_block": "Block of Zirconium", + "item.modernmetals.zirconium_bolt": "Zirconium Bolt", + "item.modernmetals.zirconium_boots": "Zirconium Boots", + "item.modernmetals.zirconium_bow": "Zirconium Bow", + "item.modernmetals.zirconium_chestplate": "Zirconium Chestplate", + "item.modernmetals.zirconium_crackhammer": "Zirconium Crack Hammer", + "item.modernmetals.zirconium_crossbow": "Zirconium Crossbow", + "item.modernmetals.zirconium_door": "Zirconium Door", + "item.modernmetals.zirconium_fishing_rod": "Zirconium Fishing Rod", + "item.modernmetals.zirconium_gear": "Zirconium Gear", + "item.modernmetals.zirconium_helmet": "Zirconium Helmet", + "item.modernmetals.zirconium_hoe": "Zirconium Hoe", + "item.modernmetals.zirconium_horse_armor": "Zirconium Horse Armour", + "item.modernmetals.zirconium_ingot": "Zirconium Ingot", + "item.modernmetals.zirconium_leggings": "Zirconium Leg Armour", + "item.modernmetals.zirconium_nugget": "Zirconium Nugget", + "item.modernmetals.zirconium_ore": "Zirconium Ore", + "item.modernmetals.zirconium_pickaxe": "Zirconium Pickaxe", + "item.modernmetals.zirconium_powder": "Zirconium Dust", + "item.modernmetals.zirconium_rod": "Zirconium Rod", + "item.modernmetals.zirconium_shears": "Zirconium Shears", + "item.modernmetals.zirconium_shield": "Zirconium Shield", + "item.modernmetals.zirconium_shovel": "Zirconium Shovel", + "item.modernmetals.zirconium_smallblend": "Tiny Pile of Zirconium Blend", + "item.modernmetals.zirconium_smallpowder": "Tiny Pile of Zirconium Dust", + "item.modernmetals.zirconium_sword": "Zirconium Sword", + "item.modernmetals.zirconium_trapdoor": "Zirconium Trapdoor", + "tile.modernmetals.aluminum_bars": "Aluminum Bars", + "block.modernmetals.aluminum_bars": "Aluminum Bars", + "tile.modernmetals.aluminum_block": "Block of Aluminum", + "block.modernmetals.aluminum_block": "Block of Aluminum", + "tile.modernmetals.aluminum_door": "Aluminum Door", + "block.modernmetals.aluminum_door": "Aluminum Door", + "tile.modernmetals.aluminum_ore": "Aluminum Ore", + "block.modernmetals.aluminum_ore": "Aluminum Ore", + "tile.modernmetals.aluminum_plate": "Aluminum Plate", + "block.modernmetals.aluminum_plate": "Aluminum Plate", + "tile.modernmetals.aluminum_trapdoor": "Aluminum Trapdoor", + "block.modernmetals.aluminum_trapdoor": "Aluminum Trapdoor", + "tile.modernmetals.aluminumbrass_bars": "Aluminum Brass Bars", + "block.modernmetals.aluminumbrass_bars": "Aluminum Brass Bars", + "tile.modernmetals.aluminumbrass_block": "Block of Aluminum Brass", + "block.modernmetals.aluminumbrass_block": "Block of Aluminum Brass", + "tile.modernmetals.aluminumbrass_door": "Aluminum Brass Door", + "block.modernmetals.aluminumbrass_door": "Aluminum Brass Door", + "tile.modernmetals.aluminumbrass_ore": "Aluminum Brass Ore", + "block.modernmetals.aluminumbrass_ore": "Aluminum Brass Ore", + "tile.modernmetals.aluminumbrass_plate": "Aluminum Brass Plate", + "block.modernmetals.aluminumbrass_plate": "Aluminum Brass Plate", + "tile.modernmetals.aluminumbrass_trapdoor": "Aluminum Brass Trapdoor", + "block.modernmetals.aluminumbrass_trapdoor": "Aluminum Brass Trapdoor", + "tile.modernmetals.boron_bars": "Boron Bars", + "block.modernmetals.boron_bars": "Boron Bars", + "tile.modernmetals.boron_block": "Block of Boron", + "block.modernmetals.boron_block": "Block of Boron", + "tile.modernmetals.boron_door": "Boron Door", + "block.modernmetals.boron_door": "Boron Door", + "tile.modernmetals.boron_ore": "Boron Ore", + "block.modernmetals.boron_ore": "Boron Ore", + "tile.modernmetals.boron_plate": "Boron Plate", + "block.modernmetals.boron_plate": "Boron Plate", + "tile.modernmetals.boron_trapdoor": "Boron Trapdoor", + "block.modernmetals.boron_trapdoor": "Boron Trapdoor", + "tile.modernmetals.cadmium_bars": "Cadmium Bars", + "block.modernmetals.cadmium_bars": "Cadmium Bars", + "tile.modernmetals.cadmium_block": "Block of Cadmium", + "block.modernmetals.cadmium_block": "Block of Cadmium", + "tile.modernmetals.cadmium_door": "Cadmium Door", + "block.modernmetals.cadmium_door": "Cadmium Door", + "tile.modernmetals.cadmium_ore": "Cadmium Ore", + "block.modernmetals.cadmium_ore": "Cadmium Ore", + "tile.modernmetals.cadmium_plate": "Cadmium Plate", + "block.modernmetals.cadmium_plate": "Cadmium Plate", + "tile.modernmetals.cadmium_trapdoor": "Cadmium Trapdoor", + "block.modernmetals.cadmium_trapdoor": "Cadmium Trapdoor", + "tile.modernmetals.chromium_bars": "Chromium Bars", + "block.modernmetals.chromium_bars": "Chromium Bars", + "tile.modernmetals.chromium_block": "Block of Chromium", + "block.modernmetals.chromium_block": "Block of Chromium", + "tile.modernmetals.chromium_door": "Chromium Door", + "block.modernmetals.chromium_door": "Chromium Door", + "tile.modernmetals.chromium_ore": "Chromium Ore", + "block.modernmetals.chromium_ore": "Chromium Ore", + "tile.modernmetals.chromium_plate": "Chromium Plate", + "block.modernmetals.chromium_plate": "Chromium Plate", + "tile.modernmetals.chromium_trapdoor": "Chromium Trapdoor", + "block.modernmetals.chromium_trapdoor": "Chromium Trapdoor", + "tile.modernmetals.galvanizedsteel_bars": "Galvanized Steel Bars", + "block.modernmetals.galvanizedsteel_bars": "Galvanized Steel Bars", + "tile.modernmetals.galvanizedsteel_block": "Block of Galvanized Steel", + "block.modernmetals.galvanizedsteel_block": "Block of Galvanized Steel", + "tile.modernmetals.galvanizedsteel_door": "Galvanized Steel Door", + "block.modernmetals.galvanizedsteel_door": "Galvanized Steel Door", + "tile.modernmetals.galvanizedsteel_ore": "Galvanized Steel Ore", + "block.modernmetals.galvanizedsteel_ore": "Galvanized Steel Ore", + "tile.modernmetals.galvanizedsteel_plate": "Galvanized Steel Plate", + "block.modernmetals.galvanizedsteel_plate": "Galvanized Steel Plate", + "tile.modernmetals.galvanizedsteel_trapdoor": "Galvanized Steel Trapdoor", + "block.modernmetals.galvanizedsteel_trapdoor": "Galvanized Steel Trapdoor", + "tile.modernmetals.iridium_bars": "Iridium Bars", + "block.modernmetals.iridium_bars": "Iridium Bars", + "tile.modernmetals.iridium_block": "Block of Iridium", + "block.modernmetals.iridium_block": "Block of Iridium", + "tile.modernmetals.iridium_door": "Iridium Door", + "block.modernmetals.iridium_door": "Iridium Door", + "tile.modernmetals.iridium_ore": "Iridium Ore", + "block.modernmetals.iridium_ore": "Iridium Ore", + "tile.modernmetals.iridium_plate": "Iridium Plate", + "block.modernmetals.iridium_plate": "Iridium Plate", + "tile.modernmetals.iridium_trapdoor": "Iridium Trapdoor", + "block.modernmetals.iridium_trapdoor": "Iridium Trapdoor", + "tile.modernmetals.magnesium_bars": "Magnesium Bars", + "block.modernmetals.magnesium_bars": "Magnesium Bars", + "tile.modernmetals.magnesium_block": "Block of Magnesium", + "block.modernmetals.magnesium_block": "Block of Magnesium", + "tile.modernmetals.magnesium_door": "Magnesium Door", + "block.modernmetals.magnesium_door": "Magnesium Door", + "tile.modernmetals.magnesium_ore": "Magnesium Ore", + "block.modernmetals.magnesium_ore": "Magnesium Ore", + "tile.modernmetals.magnesium_plate": "Magnesium Plate", + "block.modernmetals.magnesium_plate": "Magnesium Plate", + "tile.modernmetals.magnesium_trapdoor": "Magnesium Trapdoor", + "block.modernmetals.magnesium_trapdoor": "Magnesium Trapdoor", + "tile.modernmetals.manganese_bars": "Manganese Bars", + "block.modernmetals.manganese_bars": "Manganese Bars", + "tile.modernmetals.manganese_block": "Block of Manganese", + "block.modernmetals.manganese_block": "Block of Manganese", + "tile.modernmetals.manganese_door": "Manganese Door", + "block.modernmetals.manganese_door": "Manganese Door", + "tile.modernmetals.manganese_ore": "Manganese Ore", + "block.modernmetals.manganese_ore": "Manganese Ore", + "tile.modernmetals.manganese_plate": "Manganese Plate", + "block.modernmetals.manganese_plate": "Manganese Plate", + "tile.modernmetals.manganese_trapdoor": "Manganese Trapdoor", + "block.modernmetals.manganese_trapdoor": "Manganese Trapdoor", + "tile.modernmetals.nichrome_bars": "Nichrome Bars", + "block.modernmetals.nichrome_bars": "Nichrome Bars", + "tile.modernmetals.nichrome_block": "Block of Nichrome", + "block.modernmetals.nichrome_block": "Block of Nichrome", + "tile.modernmetals.nichrome_door": "Nichrome Door", + "block.modernmetals.nichrome_door": "Nichrome Door", + "tile.modernmetals.nichrome_ore": "Nichrome Ore", + "block.modernmetals.nichrome_ore": "Nichrome Ore", + "tile.modernmetals.nichrome_plate": "Nichrome Plate", + "block.modernmetals.nichrome_plate": "Nichrome Plate", + "tile.modernmetals.nichrome_trapdoor": "Nichrome Trapdoor", + "block.modernmetals.nichrome_trapdoor": "Nichrome Trapdoor", + "tile.modernmetals.osmium_bars": "Osmium Bars", + "block.modernmetals.osmium_bars": "Osmium Bars", + "tile.modernmetals.osmium_block": "Block of Osmium", + "block.modernmetals.osmium_block": "Block of Osmium", + "tile.modernmetals.osmium_door": "Osmium Door", + "block.modernmetals.osmium_door": "Osmium Door", + "tile.modernmetals.osmium_ore": "Osmium Ore", + "block.modernmetals.osmium_ore": "Osmium Ore", + "tile.modernmetals.osmium_plate": "Osmium Plate", + "block.modernmetals.osmium_plate": "Osmium Plate", + "tile.modernmetals.osmium_trapdoor": "Osmium Trapdoor", + "block.modernmetals.osmium_trapdoor": "Osmium Trapdoor", + "tile.modernmetals.plutonium_bars": "Plutonium Bars", + "block.modernmetals.plutonium_bars": "Plutonium Bars", + "tile.modernmetals.plutonium_block": "Block of Plutonium", + "block.modernmetals.plutonium_block": "Block of Plutonium", + "tile.modernmetals.plutonium_door": "Plutonium Door", + "block.modernmetals.plutonium_door": "Plutonium Door", + "tile.modernmetals.plutonium_ore": "Plutonium Ore", + "block.modernmetals.plutonium_ore": "Plutonium Ore", + "tile.modernmetals.plutonium_plate": "Plutonium Plate", + "block.modernmetals.plutonium_plate": "Plutonium Plate", + "tile.modernmetals.plutonium_trapdoor": "Plutonium Trapdoor", + "block.modernmetals.plutonium_trapdoor": "Plutonium Trapdoor", + "tile.modernmetals.rutile_bars": "Rutile Bars", + "block.modernmetals.rutile_bars": "Rutile Bars", + "tile.modernmetals.rutile_block": "Block of Rutile", + "block.modernmetals.rutile_block": "Block of Rutile", + "tile.modernmetals.rutile_door": "Rutile Door", + "block.modernmetals.rutile_door": "Rutile Door", + "tile.modernmetals.rutile_ore": "Rutile Ore", + "block.modernmetals.rutile_ore": "Rutile Ore", + "tile.modernmetals.rutile_plate": "Rutile Plate", + "block.modernmetals.rutile_plate": "Rutile Plate", + "tile.modernmetals.rutile_trapdoor": "Rutile Trapdoor", + "block.modernmetals.rutile_trapdoor": "Rutile Trapdoor", + "tile.modernmetals.stainlesssteel_bars": "Stainless Steel Bars", + "block.modernmetals.stainlesssteel_bars": "Stainless Steel Bars", + "tile.modernmetals.stainlesssteel_block": "Block of Stainless Steel", + "block.modernmetals.stainlesssteel_block": "Block of Stainless Steel", + "tile.modernmetals.stainlesssteel_door": "Stainless Steel Door", + "block.modernmetals.stainlesssteel_door": "Stainless Steel Door", + "tile.modernmetals.stainlesssteel_ore": "Stainless Steel Ore", + "block.modernmetals.stainlesssteel_ore": "Stainless Steel Ore", + "tile.modernmetals.stainlesssteel_plate": "Stainless Steel Plate", + "block.modernmetals.stainlesssteel_plate": "Stainless Steel Plate", + "tile.modernmetals.stainlesssteel_trapdoor": "Stainless Steel Trapdoor", + "block.modernmetals.stainlesssteel_trapdoor": "Stainless Steel Trapdoor", + "tile.modernmetals.tantalum_bars": "Tantalum Bars", + "block.modernmetals.tantalum_bars": "Tantalum Bars", + "tile.modernmetals.tantalum_block": "Block of Tantalum", + "block.modernmetals.tantalum_block": "Block of Tantalum", + "tile.modernmetals.tantalum_door": "Tantalum Door", + "block.modernmetals.tantalum_door": "Tantalum Door", + "tile.modernmetals.tantalum_ore": "Tantalum Ore", + "block.modernmetals.tantalum_ore": "Tantalum Ore", + "tile.modernmetals.tantalum_plate": "Tantalum Plate", + "block.modernmetals.tantalum_plate": "Tantalum Plate", + "tile.modernmetals.tantalum_trapdoor": "Tantalum Trapdoor", + "block.modernmetals.tantalum_trapdoor": "Tantalum Trapdoor", + "tile.modernmetals.titanium_bars": "Titanium Bars", + "block.modernmetals.titanium_bars": "Titanium Bars", + "tile.modernmetals.titanium_block": "Block of Titanium", + "block.modernmetals.titanium_block": "Block of Titanium", + "tile.modernmetals.titanium_door": "Titanium Door", + "block.modernmetals.titanium_door": "Titanium Door", + "tile.modernmetals.titanium_ore": "Titanium Ore", + "block.modernmetals.titanium_ore": "Titanium Ore", + "tile.modernmetals.titanium_plate": "Titanium Plate", + "block.modernmetals.titanium_plate": "Titanium Plate", + "tile.modernmetals.titanium_trapdoor": "Titanium Trapdoor", + "block.modernmetals.titanium_trapdoor": "Titanium Trapdoor", + "tile.modernmetals.tungsten_bars": "Tungsten Bars", + "block.modernmetals.tungsten_bars": "Tungsten Bars", + "tile.modernmetals.tungsten_block": "Block of Tungsten", + "block.modernmetals.tungsten_block": "Block of Tungsten", + "tile.modernmetals.tungsten_door": "Tungsten Door", + "block.modernmetals.tungsten_door": "Tungsten Door", + "tile.modernmetals.tungsten_ore": "Tungsten Ore", + "block.modernmetals.tungsten_ore": "Tungsten Ore", + "tile.modernmetals.tungsten_plate": "Tungsten Plate", + "block.modernmetals.tungsten_plate": "Tungsten Plate", + "tile.modernmetals.tungsten_trapdoor": "Tungsten Trapdoor", + "block.modernmetals.tungsten_trapdoor": "Tungsten Trapdoor", + "tile.modernmetals.uranium_bars": "Uranium Bars", + "block.modernmetals.uranium_bars": "Uranium Bars", + "tile.modernmetals.uranium_block": "Block of Uranium", + "block.modernmetals.uranium_block": "Block of Uranium", + "tile.modernmetals.uranium_door": "Uranium Door", + "block.modernmetals.uranium_door": "Uranium Door", + "tile.modernmetals.uranium_ore": "Uranium Ore", + "block.modernmetals.uranium_ore": "Uranium Ore", + "tile.modernmetals.uranium_plate": "Uranium Plate", + "block.modernmetals.uranium_plate": "Uranium Plate", + "tile.modernmetals.uranium_trapdoor": "Uranium Trapdoor", + "block.modernmetals.uranium_trapdoor": "Uranium Trapdoor", + "tile.modernmetals.zirconium_bars": "Zirconium Bars", + "block.modernmetals.zirconium_bars": "Zirconium Bars", + "tile.modernmetals.zirconium_block": "Block of Zirconium", + "block.modernmetals.zirconium_block": "Block of Zirconium", + "tile.modernmetals.zirconium_door": "Zirconium Door", + "block.modernmetals.zirconium_door": "Zirconium Door", + "tile.modernmetals.zirconium_ore": "Zirconium Ore", + "block.modernmetals.zirconium_ore": "Zirconium Ore", + "tile.modernmetals.zirconium_plate": "Zirconium Plate", + "block.modernmetals.zirconium_plate": "Zirconium Plate", + "tile.modernmetals.zirconium_trapdoor": "Zirconium Trapdoor", + "block.modernmetals.zirconium_trapdoor": "Zirconium Trapdoor", + "tooltip.aluminum.tool": "Nothing Special", + "tooltip.aluminumbrass.tool": "Nothing Special", + "tooltip.cadmium.tool": "Nothing Special", + "tooltip.chromium.tool": "Nothing Special", + "tooltip.galvanized_steel.tool": "Nothing Special", + "tooltip.iridium.tool": "Nothing Special", + "tooltip.magnesium.tool": "Nothing Special", + "tooltip.manganese.tool": "Nothing Special", + "tooltip.nichrome.tool": "Nothing Special", + "tooltip.osmium.tool": "Nothing Special", + "tooltip.plutonium.tool": "Nothing Special", + "tooltip.rutile.tool": "Nothing Special", + "tooltip.stainless_steel.tool": "Nothing Special", + "tooltip.tantalum.tool": "Nothing Special", + "tooltip.titanium.tool": "Nothing Special", + "tooltip.tungsten.tool": "Nothing Special", + "tooltip.uranium.tool": "Nothing Special", + "tooltip.zirconium.tool": "Nothing Special", + "tooltip.aluminum.armor": "Nothing Special", + "tooltip.aluminumbrass.armor": "Nothing Special", + "tooltip.cadmium.armor": "Nothing Special", + "tooltip.chromium.armor": "Nothing Special", + "tooltip.galvanized_steel.armor": "Nothing Special", + "tooltip.iridium.armor": "Nothing Special", + "tooltip.magnesium.armor": "Nothing Special", + "tooltip.manganese.armor": "Nothing Special", + "tooltip.nichrome.armor": "Nothing Special", + "tooltip.osmium.armor": "Nothing Special", + "tooltip.plutonium.armor": "Nothing Special", + "tooltip.rutile.armor": "Nothing Special", + "tooltip.stainless_steel.armor": "Nothing Special", + "tooltip.tantalum.armor": "Nothing Special", + "tooltip.titanium.armor": "Nothing Special", + "tooltip.tungsten.armor": "Nothing Special", + "tooltip.uranium.armor": "Nothing Special", + "tooltip.zirconium.armor": "Nothing Special", + "achievement.aluminumbrass_maker": "Aluminum Brass", + "achievement.galvanized_steel_maker": "Galvanized Steel", + "achievement.nichrome_maker": "Nichrome", + "achievement.stainless_steel_maker": "Stainless Steel", + "achievement.titanium_maker": "Titanium", + "achievement.aluminumbrass_maker.desc": "Combine Aluminum Dust and Brass Dust to make Aluminum Brass", + "achievement.galvanized_steel_maker.desc": "Combine Steel Dust and Zinc Dust to make Galvanized Steel", + "achievement.nichrome_maker.desc": "Combine Nickel Dust and Chromium Dust to make Nichrome", + "achievement.stainless_steel_maker.desc": "Combine Steel Dust and Chromium Dust to make Stainless Steel", + "achievement.titanium_maker.desc": "Combine Rutile Dust and Magnesium Dust to make Titanium", + "fluid.modernmetals.aluminum": "Molten Aluminum", + "fluid.modernmetals.aluminumbrass": "Molten Aluminum Brass", + "fluid.modernmetals.boron": "Molten Boron", + "fluid.modernmetals.beryllium": "Molten Beryllium", + "fluid.modernmetals.cadmium": "Molten Cadmium", + "fluid.modernmetals.chromium": "Molten Chromium", + "fluid.modernmetals.galvanizedsteel": "Molten Galvanized Steel", + "fluid.modernmetals.iridium": "Molten Iridium", + "fluid.modernmetals.magnesium": "Molten Magnesium", + "fluid.modernmetals.manganese": "Molten Manganese", + "fluid.modernmetals.nichrome": "Molten Nichrome", + "fluid.modernmetals.osmium": "Molten Osmium", + "fluid.modernmetals.plutonium": "Molten Plutonium", + "fluid.modernmetals.rutile": "Molten Rutile", + "fluid.modernmetals.stainlesssteel": "Molten Stainless Steel", + "fluid.modernmetals.tantalum": "Molten Tantalum", + "fluid.modernmetals.titanium": "Molten Titanium", + "fluid.modernmetals.tungsten": "Molten Tungsten", + "fluid.modernmetals.uranium": "Molten Uranium", + "fluid.modernmetals.zirconium": "Molten Zirconium", + "tile.modernmetals.aluminum": "Molten Aluminum", + "block.modernmetals.aluminum": "Molten Aluminum", + "tile.modernmetals.aluminumbrass": "Molten Aluminum Brass", + "block.modernmetals.aluminumbrass": "Molten Aluminum Brass", + "tile.modernmetals.boron": "Molten Boron", + "block.modernmetals.boron": "Molten Boron", + "tile.modernmetals.cadmium": "Molten Cadmium", + "block.modernmetals.cadmium": "Molten Cadmium", + "tile.modernmetals.chromium": "Molten Chromium", + "block.modernmetals.chromium": "Molten Chromium", + "tile.modernmetals.galvanizedsteel": "Molten Galvanized Steel", + "block.modernmetals.galvanizedsteel": "Molten Galvanized Steel", + "tile.modernmetals.iridium": "Molten Iridium", + "block.modernmetals.iridium": "Molten Iridium", + "tile.modernmetals.magnesium": "Molten Magnesium", + "block.modernmetals.magnesium": "Molten Magnesium", + "tile.modernmetals.manganese": "Molten Manganese", + "block.modernmetals.manganese": "Molten Manganese", + "tile.modernmetals.nichrome": "Molten Nichrome", + "block.modernmetals.nichrome": "Molten Nichrome", + "tile.modernmetals.osmium": "Molten Osmium", + "block.modernmetals.osmium": "Molten Osmium", + "tile.modernmetals.plutonium": "Molten Plutonium", + "block.modernmetals.plutonium": "Molten Plutonium", + "tile.modernmetals.rutile": "Molten Rutile", + "block.modernmetals.rutile": "Molten Rutile", + "tile.modernmetals.stainlesssteel": "Molten Stainless Steel", + "block.modernmetals.stainlesssteel": "Molten Stainless Steel", + "tile.modernmetals.tantalum": "Molten Tantalum", + "block.modernmetals.tantalum": "Molten Tantalum", + "tile.modernmetals.titanium": "Molten Titanium", + "block.modernmetals.titanium": "Molten Titanium", + "tile.modernmetals.tungsten": "Molten Tungsten", + "block.modernmetals.tungsten": "Molten Tungsten", + "tile.modernmetals.uranium": "Molten Uranium", + "block.modernmetals.uranium": "Molten Uranium", + "tile.modernmetals.zirconium": "Molten Zirconium", + "block.modernmetals.zirconium": "Molten Zirconium", + "item.modernmetals.aluminum_clump": "Aluminum Clump", + "item.modernmetals.aluminum_crushed": "Crushed Aluminum Ore", + "item.modernmetals.aluminum_crushed_purified": "Purified Crushed Aluminum Ore", + "item.modernmetals.aluminum_crystal": "Aluminum Crystal", + "item.modernmetals.aluminum_dense_plate": "Dense Aluminum Plate", + "item.modernmetals.aluminum_powder_dirty": "Dirty Aluminum Dust", + "item.modernmetals.aluminum_shard": "Aluminum Shard", + "item.modernmetals.aluminum_button": "Aluminum Button", + "item.modernmetals.aluminum_lever": "Aluminum Lever", + "item.modernmetals.aluminum_pressure_plate": "Aluminum Pressure Plate", + "item.modernmetals.aluminum_slab": "Aluminum Slab", + "item.modernmetals.aluminum_stairs": "Aluminum Stairs", + "item.modernmetals.aluminum_wall": "Aluminum Wall", + "tile.modernmetals.aluminum_button": "Aluminum Button", + "block.modernmetals.aluminum_button": "Aluminum Button", + "tile.modernmetals.aluminum_lever": "Aluminum Lever", + "block.modernmetals.aluminum_lever": "Aluminum Lever", + "tile.modernmetals.aluminum_pressure_plate": "Aluminum Pressure Plate", + "block.modernmetals.aluminum_pressure_plate": "Aluminum Pressure Plate", + "tile.modernmetals.aluminum_slab": "Aluminum Slab", + "block.modernmetals.aluminum_slab": "Aluminum Slab", + "tile.modernmetals.aluminum_stairs": "Aluminum Stairs", + "block.modernmetals.aluminum_stairs": "Aluminum Stairs", + "tile.modernmetals.aluminum_wall": "Aluminum Wall", + "block.modernmetals.aluminum_wall": "Aluminum Wall", + "item.modernmetals.aluminumbrass_clump": "Aluminum Brass Clump", + "item.modernmetals.aluminumbrass_crushed": "Crushed Aluminum Brass Ore", + "item.modernmetals.aluminumbrass_crushed_purified": "Purified Crushed Aluminum Brass Ore", + "item.modernmetals.aluminumbrass_crystal": "Aluminum Brass Crystal", + "item.modernmetals.aluminumbrass_dense_plate": "Dense Aluminum Brass Plate", + "item.modernmetals.aluminumbrass_powder_dirty": "Dirty Aluminum Brass Dust", + "item.modernmetals.aluminumbrass_shard": "Aluminum Brass Shard", + "item.modernmetals.aluminumbrass_button": "Aluminum Brass Button", + "item.modernmetals.aluminumbrass_lever": "Aluminum Brass Lever", + "item.modernmetals.aluminumbrass_pressure_plate": "Aluminum Brass Pressure Plate", + "item.modernmetals.aluminumbrass_slab": "Aluminum Brass Slab", + "item.modernmetals.aluminumbrass_stairs": "Aluminum Brass Stairs", + "item.modernmetals.aluminumbrass_wall": "Aluminum Brass Wall", + "tile.modernmetals.aluminumbrass_button": "Aluminum Brass Button", + "block.modernmetals.aluminumbrass_button": "Aluminum Brass Button", + "tile.modernmetals.aluminumbrass_lever": "Aluminum Brass Lever", + "block.modernmetals.aluminumbrass_lever": "Aluminum Brass Lever", + "tile.modernmetals.aluminumbrass_pressure_plate": "Aluminum Brass Pressure Plate", + "block.modernmetals.aluminumbrass_pressure_plate": "Aluminum Brass Pressure Plate", + "tile.modernmetals.aluminumbrass_slab": "Aluminum Brass Slab", + "block.modernmetals.aluminumbrass_slab": "Aluminum Brass Slab", + "tile.modernmetals.aluminumbrass_stairs": "Aluminum Brass Stairs", + "block.modernmetals.aluminumbrass_stairs": "Aluminum Brass Stairs", + "tile.modernmetals.aluminumbrass_wall": "Aluminum Brass Wall", + "block.modernmetals.aluminumbrass_wall": "Aluminum Brass Wall", + "tile.modernmetals.beryllium_bars": "Beryllium Bars", + "block.modernmetals.beryllium_bars": "Beryllium Bars", + "tile.modernmetals.beryllium_block": "Block of Beryllium", + "block.modernmetals.beryllium_block": "Block of Beryllium", + "tile.modernmetals.beryllium_door": "Beryllium Door", + "block.modernmetals.beryllium_door": "Beryllium Door", + "tile.modernmetals.beryllium_ore": "Beryllium Ore", + "block.modernmetals.beryllium_ore": "Beryllium Ore", + "tile.modernmetals.beryllium_plate": "Beryllium Plate", + "block.modernmetals.beryllium_plate": "Beryllium Plate", + "tile.modernmetals.beryllium_trapdoor": "Beryllium Trapdoor", + "block.modernmetals.beryllium_trapdoor": "Beryllium Trapdoor", + "item.modernmetals.beryllium_clump": "Beryllium Clump", + "item.modernmetals.beryllium_crushed": "Crushed Beryllium Ore", + "item.modernmetals.beryllium_crushed_purified": "Purified Crushed Beryllium Ore", + "item.modernmetals.beryllium_crystal": "Beryllium Crystal", + "item.modernmetals.beryllium_dense_plate": "Dense Beryllium Plate", + "item.modernmetals.beryllium_powder_dirty": "Dirty Beryllium Dust", + "item.modernmetals.beryllium_shard": "Beryllium Shard", + "item.modernmetals.beryllium_button": "Beryllium Button", + "item.modernmetals.beryllium_lever": "Beryllium Lever", + "item.modernmetals.beryllium_pressure_plate": "Beryllium Pressure Plate", + "item.modernmetals.beryllium_slab": "Beryllium Slab", + "item.modernmetals.beryllium_stairs": "Beryllium Stairs", + "item.modernmetals.beryllium_wall": "Beryllium Wall", + "tile.modernmetals.beryllium": "Molten Beryllium", + "block.modernmetals.beryllium": "Molten Beryllium", + "tile.modernmetals.beryllium_button": "Beryllium Button", + "block.modernmetals.beryllium_button": "Beryllium Button", + "tile.modernmetals.beryllium_lever": "Beryllium Lever", + "block.modernmetals.beryllium_lever": "Beryllium Lever", + "tile.modernmetals.beryllium_pressure_plate": "Beryllium Pressure Plate", + "block.modernmetals.beryllium_pressure_plate": "Beryllium Pressure Plate", + "tile.modernmetals.beryllium_slab": "Beryllium Slab", + "block.modernmetals.beryllium_slab": "Beryllium Slab", + "tile.modernmetals.beryllium_stairs": "Beryllium Stairs", + "block.modernmetals.beryllium_stairs": "Beryllium Stairs", + "tile.modernmetals.beryllium_wall": "Beryllium Wall", + "block.modernmetals.beryllium_wall": "Beryllium Wall", + "item.modernmetals.boron_clump": "Boron Clump", + "item.modernmetals.boron_crushed": "Crushed Boron Ore", + "item.modernmetals.boron_crushed_purified": "Purified Crushed Boron Ore", + "item.modernmetals.boron_crystal": "Boron Crystal", + "item.modernmetals.boron_dense_plate": "Dense Boron Plate", + "item.modernmetals.boron_powder_dirty": "Dirty Boron Dust", + "item.modernmetals.boron_shard": "Boron Shard", + "item.modernmetals.boron_button": "Boron Button", + "item.modernmetals.boron_lever": "Boron Lever", + "item.modernmetals.boron_pressure_plate": "Boron Pressure Plate", + "item.modernmetals.boron_slab": "Boron Slab", + "item.modernmetals.boron_stairs": "Boron Stairs", + "item.modernmetals.boron_wall": "Boron Wall", + "tile.modernmetals.boron_button": "Boron Button", + "block.modernmetals.boron_button": "Boron Button", + "tile.modernmetals.boron_lever": "Boron Lever", + "block.modernmetals.boron_lever": "Boron Lever", + "tile.modernmetals.boron_pressure_plate": "Boron Pressure Plate", + "block.modernmetals.boron_pressure_plate": "Boron Pressure Plate", + "tile.modernmetals.boron_slab": "Boron Slab", + "block.modernmetals.boron_slab": "Boron Slab", + "tile.modernmetals.boron_stairs": "Boron Stairs", + "block.modernmetals.boron_stairs": "Boron Stairs", + "tile.modernmetals.boron_wall": "Boron Wall", + "block.modernmetals.boron_wall": "Boron Wall", + "item.modernmetals.cadmium_clump": "Cadmium Clump", + "item.modernmetals.cadmium_crushed": "Crushed Cadmium Ore", + "item.modernmetals.cadmium_crushed_purified": "Purified Crushed Cadmium Ore", + "item.modernmetals.cadmium_crystal": "Cadmium Crystal", + "item.modernmetals.cadmium_dense_plate": "Dense Cadmium Plate", + "item.modernmetals.cadmium_powder_dirty": "Dirty Cadmium Dust", + "item.modernmetals.cadmium_shard": "Cadmium Shard", + "item.modernmetals.cadmium_button": "Cadmium Button", + "item.modernmetals.cadmium_lever": "Cadmium Lever", + "item.modernmetals.cadmium_pressure_plate": "Cadmium Pressure Plate", + "item.modernmetals.cadmium_slab": "Cadmium Slab", + "item.modernmetals.cadmium_stairs": "Cadmium Stairs", + "item.modernmetals.cadmium_wall": "Cadmium Wall", + "tile.modernmetals.cadmium_button": "Cadmium Button", + "block.modernmetals.cadmium_button": "Cadmium Button", + "tile.modernmetals.cadmium_lever": "Cadmium Lever", + "block.modernmetals.cadmium_lever": "Cadmium Lever", + "tile.modernmetals.cadmium_pressure_plate": "Cadmium Pressure Plate", + "block.modernmetals.cadmium_pressure_plate": "Cadmium Pressure Plate", + "tile.modernmetals.cadmium_slab": "Cadmium Slab", + "block.modernmetals.cadmium_slab": "Cadmium Slab", + "tile.modernmetals.cadmium_stairs": "Cadmium Stairs", + "block.modernmetals.cadmium_stairs": "Cadmium Stairs", + "tile.modernmetals.cadmium_wall": "Cadmium Wall", + "block.modernmetals.cadmium_wall": "Cadmium Wall", + "item.modernmetals.chromium_clump": "Chromium Clump", + "item.modernmetals.chromium_crushed": "Crushed Chromium Ore", + "item.modernmetals.chromium_crushed_purified": "Purified Crushed Chromium Ore", + "item.modernmetals.chromium_crystal": "Chromium Crystal", + "item.modernmetals.chromium_dense_plate": "Dense Chromium Plate", + "item.modernmetals.chromium_powder_dirty": "Dirty Chromium Dust", + "item.modernmetals.chromium_shard": "Chromium Shard", + "item.modernmetals.chromium_button": "Chromium Button", + "item.modernmetals.chromium_lever": "Chromium Lever", + "item.modernmetals.chromium_pressure_plate": "Chromium Pressure Plate", + "item.modernmetals.chromium_slab": "Chromium Slab", + "item.modernmetals.chromium_stairs": "Chromium Stairs", + "item.modernmetals.chromium_wall": "Chromium Wall", + "tile.modernmetals.chromium_button": "Chromium Button", + "block.modernmetals.chromium_button": "Chromium Button", + "tile.modernmetals.chromium_lever": "Chromium Lever", + "block.modernmetals.chromium_lever": "Chromium Lever", + "tile.modernmetals.chromium_pressure_plate": "Chromium Pressure Plate", + "block.modernmetals.chromium_pressure_plate": "Chromium Pressure Plate", + "tile.modernmetals.chromium_slab": "Chromium Slab", + "block.modernmetals.chromium_slab": "Chromium Slab", + "tile.modernmetals.chromium_stairs": "Chromium Stairs", + "block.modernmetals.chromium_stairs": "Chromium Stairs", + "tile.modernmetals.chromium_wall": "Chromium Wall", + "block.modernmetals.chromium_wall": "Chromium Wall", + "item.modernmetals.galvanizedsteel_clump": "Galvanized Steel Clump", + "item.modernmetals.galvanizedsteel_crushed": "Crushed Galvanized Steel Ore", + "item.modernmetals.galvanizedsteel_crushed_purified": "Purified Crushed Galvanized Steel Ore", + "item.modernmetals.galvanizedsteel_crystal": "Galvanized Steel Crystal", + "item.modernmetals.galvanizedsteel_dense_plate": "Dense Galvanized Steel Plate", + "item.modernmetals.galvanizedsteel_powder_dirty": "Dirty Galvanized Steel Dust", + "item.modernmetals.galvanizedsteel_shard": "Galvanized Steel Shard", + "item.modernmetals.galvanizedsteel_button": "Galvanized Steel Button", + "item.modernmetals.galvanizedsteel_lever": "Galvanized Steel Lever", + "item.modernmetals.galvanizedsteel_pressure_plate": "Galvanized Steel Pressure Plate", + "item.modernmetals.galvanizedsteel_slab": "Galvanized Steel Slab", + "item.modernmetals.galvanizedsteel_stairs": "Galvanized Steel Stairs", + "item.modernmetals.galvanizedsteel_wall": "Galvanized Steel Wall", + "tile.modernmetals.galvanizedsteel_button": "Galvanized Steel Button", + "block.modernmetals.galvanizedsteel_button": "Galvanized Steel Button", + "tile.modernmetals.galvanizedsteel_lever": "Galvanized Steel Lever", + "block.modernmetals.galvanizedsteel_lever": "Galvanized Steel Lever", + "tile.modernmetals.galvanizedsteel_pressure_plate": "Galvanized Steel Pressure Plate", + "block.modernmetals.galvanizedsteel_pressure_plate": "Galvanized Steel Pressure Plate", + "tile.modernmetals.galvanizedsteel_slab": "Galvanized Steel Slab", + "block.modernmetals.galvanizedsteel_slab": "Galvanized Steel Slab", + "tile.modernmetals.galvanizedsteel_stairs": "Galvanized Steel Stairs", + "block.modernmetals.galvanizedsteel_stairs": "Galvanized Steel Stairs", + "tile.modernmetals.galvanizedsteel_wall": "Galvanized Steel Wall", + "block.modernmetals.galvanizedsteel_wall": "Galvanized Steel Wall", + "item.modernmetals.iridium_clump": "Iridium Clump", + "item.modernmetals.iridium_crushed": "Crushed Iridium Ore", + "item.modernmetals.iridium_crushed_purified": "Purified Crushed Iridium Ore", + "item.modernmetals.iridium_crystal": "Iridium Crystal", + "item.modernmetals.iridium_dense_plate": "Dense Iridium Plate", + "item.modernmetals.iridium_powder_dirty": "Dirty Iridium Dust", + "item.modernmetals.iridium_shard": "Iridium Shard", + "item.modernmetals.iridium_button": "Iridium Button", + "item.modernmetals.iridium_lever": "Iridium Lever", + "item.modernmetals.iridium_pressure_plate": "Iridium Pressure Plate", + "item.modernmetals.iridium_slab": "Iridium Slab", + "item.modernmetals.iridium_stairs": "Iridium Stairs", + "item.modernmetals.iridium_wall": "Iridium Wall", + "tile.modernmetals.iridium_button": "Iridium Button", + "block.modernmetals.iridium_button": "Iridium Button", + "tile.modernmetals.iridium_lever": "Iridium Lever", + "block.modernmetals.iridium_lever": "Iridium Lever", + "tile.modernmetals.iridium_pressure_plate": "Iridium Pressure Plate", + "block.modernmetals.iridium_pressure_plate": "Iridium Pressure Plate", + "tile.modernmetals.iridium_slab": "Iridium Slab", + "block.modernmetals.iridium_slab": "Iridium Slab", + "tile.modernmetals.iridium_stairs": "Iridium Stairs", + "block.modernmetals.iridium_stairs": "Iridium Stairs", + "tile.modernmetals.iridium_wall": "Iridium Wall", + "block.modernmetals.iridium_wall": "Iridium Wall", + "item.modernmetals.magnesium_clump": "Magnesium Clump", + "item.modernmetals.magnesium_crushed": "Crushed Magnesium Ore", + "item.modernmetals.magnesium_crushed_purified": "Purified Crushed Magnesium Ore", + "item.modernmetals.magnesium_crystal": "Magnesium Crystal", + "item.modernmetals.magnesium_dense_plate": "Dense Magnesium Plate", + "item.modernmetals.magnesium_powder_dirty": "Dirty Magnesium Dust", + "item.modernmetals.magnesium_shard": "Magnesium Shard", + "item.modernmetals.magnesium_button": "Magnesium Button", + "item.modernmetals.magnesium_lever": "Magnesium Lever", + "item.modernmetals.magnesium_pressure_plate": "Magnesium Pressure Plate", + "item.modernmetals.magnesium_slab": "Magnesium Slab", + "item.modernmetals.magnesium_stairs": "Magnesium Stairs", + "item.modernmetals.magnesium_wall": "Magnesium Wall", + "tile.modernmetals.magnesium_button": "Magnesium Button", + "block.modernmetals.magnesium_button": "Magnesium Button", + "tile.modernmetals.magnesium_lever": "Magnesium Lever", + "block.modernmetals.magnesium_lever": "Magnesium Lever", + "tile.modernmetals.magnesium_pressure_plate": "Magnesium Pressure Plate", + "block.modernmetals.magnesium_pressure_plate": "Magnesium Pressure Plate", + "tile.modernmetals.magnesium_slab": "Magnesium Slab", + "block.modernmetals.magnesium_slab": "Magnesium Slab", + "tile.modernmetals.magnesium_stairs": "Magnesium Stairs", + "block.modernmetals.magnesium_stairs": "Magnesium Stairs", + "tile.modernmetals.magnesium_wall": "Magnesium Wall", + "block.modernmetals.magnesium_wall": "Magnesium Wall", + "item.modernmetals.manganese_clump": "Manganese Clump", + "item.modernmetals.manganese_crushed": "Crushed Manganese Ore", + "item.modernmetals.manganese_crushed_purified": "Purified Crushed Manganese Ore", + "item.modernmetals.manganese_crystal": "Manganese Crystal", + "item.modernmetals.manganese_dense_plate": "Dense Manganese Plate", + "item.modernmetals.manganese_powder_dirty": "Dirty Manganese Dust", + "item.modernmetals.manganese_shard": "Manganese Shard", + "item.modernmetals.manganese_button": "Manganese Button", + "item.modernmetals.manganese_lever": "Manganese Lever", + "item.modernmetals.manganese_pressure_plate": "Manganese Pressure Plate", + "item.modernmetals.manganese_slab": "Manganese Slab", + "item.modernmetals.manganese_stairs": "Manganese Stairs", + "item.modernmetals.manganese_wall": "Manganese Wall", + "tile.modernmetals.manganese_button": "Manganese Button", + "block.modernmetals.manganese_button": "Manganese Button", + "tile.modernmetals.manganese_lever": "Manganese Lever", + "block.modernmetals.manganese_lever": "Manganese Lever", + "tile.modernmetals.manganese_pressure_plate": "Manganese Pressure Plate", + "block.modernmetals.manganese_pressure_plate": "Manganese Pressure Plate", + "tile.modernmetals.manganese_slab": "Manganese Slab", + "block.modernmetals.manganese_slab": "Manganese Slab", + "tile.modernmetals.manganese_stairs": "Manganese Stairs", + "block.modernmetals.manganese_stairs": "Manganese Stairs", + "tile.modernmetals.manganese_wall": "Manganese Wall", + "block.modernmetals.manganese_wall": "Manganese Wall", + "item.modernmetals.nichrome_clump": "Nichrome Clump", + "item.modernmetals.nichrome_crushed": "Crushed Nichrome Ore", + "item.modernmetals.nichrome_crushed_purified": "Purified Crushed Nichrome Ore", + "item.modernmetals.nichrome_crystal": "Nichrome Crystal", + "item.modernmetals.nichrome_dense_plate": "Dense Nichrome Plate", + "item.modernmetals.nichrome_powder_dirty": "Dirty Nichrome Dust", + "item.modernmetals.nichrome_shard": "Nichrome Shard", + "item.modernmetals.nichrome_button": "Nichrome Button", + "item.modernmetals.nichrome_lever": "Nichrome Lever", + "item.modernmetals.nichrome_pressure_plate": "Nichrome Pressure Plate", + "item.modernmetals.nichrome_slab": "Nichrome Slab", + "item.modernmetals.nichrome_stairs": "Nichrome Stairs", + "item.modernmetals.nichrome_wall": "Nichrome Wall", + "tile.modernmetals.nichrome_button": "Nichrome Button", + "block.modernmetals.nichrome_button": "Nichrome Button", + "tile.modernmetals.nichrome_lever": "Nichrome Lever", + "block.modernmetals.nichrome_lever": "Nichrome Lever", + "tile.modernmetals.nichrome_pressure_plate": "Nichrome Pressure Plate", + "block.modernmetals.nichrome_pressure_plate": "Nichrome Pressure Plate", + "tile.modernmetals.nichrome_slab": "Nichrome Slab", + "block.modernmetals.nichrome_slab": "Nichrome Slab", + "tile.modernmetals.nichrome_stairs": "Nichrome Stairs", + "block.modernmetals.nichrome_stairs": "Nichrome Stairs", + "tile.modernmetals.nichrome_wall": "Nichrome Wall", + "block.modernmetals.nichrome_wall": "Nichrome Wall", + "item.modernmetals.osmium_clump": "Osmium Clump", + "item.modernmetals.osmium_crushed": "Crushed Osmium Ore", + "item.modernmetals.osmium_crushed_purified": "Purified Crushed Osmium Ore", + "item.modernmetals.osmium_crystal": "Osmium Crystal", + "item.modernmetals.osmium_dense_plate": "Dense Osmium Plate", + "item.modernmetals.osmium_powder_dirty": "Dirty Osmium Dust", + "item.modernmetals.osmium_shard": "Osmium Shard", + "item.modernmetals.osmium_button": "Osmium Button", + "item.modernmetals.osmium_lever": "Osmium Lever", + "item.modernmetals.osmium_pressure_plate": "Osmium Pressure Plate", + "item.modernmetals.osmium_slab": "Osmium Slab", + "item.modernmetals.osmium_stairs": "Osmium Stairs", + "item.modernmetals.osmium_wall": "Osmium Wall", + "tile.modernmetals.osmium_button": "Osmium Button", + "block.modernmetals.osmium_button": "Osmium Button", + "tile.modernmetals.osmium_lever": "Osmium Lever", + "block.modernmetals.osmium_lever": "Osmium Lever", + "tile.modernmetals.osmium_pressure_plate": "Osmium Pressure Plate", + "block.modernmetals.osmium_pressure_plate": "Osmium Pressure Plate", + "tile.modernmetals.osmium_slab": "Osmium Slab", + "block.modernmetals.osmium_slab": "Osmium Slab", + "tile.modernmetals.osmium_stairs": "Osmium Stairs", + "block.modernmetals.osmium_stairs": "Osmium Stairs", + "tile.modernmetals.osmium_wall": "Osmium Wall", + "block.modernmetals.osmium_wall": "Osmium Wall", + "item.modernmetals.plutonium_clump": "Plutonium Clump", + "item.modernmetals.plutonium_crushed": "Crushed Plutonium Ore", + "item.modernmetals.plutonium_crushed_purified": "Purified Crushed Plutonium Ore", + "item.modernmetals.plutonium_crystal": "Plutonium Crystal", + "item.modernmetals.plutonium_dense_plate": "Dense Plutonium Plate", + "item.modernmetals.plutonium_powder_dirty": "Dirty Plutonium Dust", + "item.modernmetals.plutonium_shard": "Plutonium Shard", + "item.modernmetals.plutonium_button": "Plutonium Button", + "item.modernmetals.plutonium_lever": "Plutonium Lever", + "item.modernmetals.plutonium_pressure_plate": "Plutonium Pressure Plate", + "item.modernmetals.plutonium_slab": "Plutonium Slab", + "item.modernmetals.plutonium_stairs": "Plutonium Stairs", + "item.modernmetals.plutonium_wall": "Plutonium Wall", + "tile.modernmetals.plutonium_button": "Plutonium Button", + "block.modernmetals.plutonium_button": "Plutonium Button", + "tile.modernmetals.plutonium_lever": "Plutonium Lever", + "block.modernmetals.plutonium_lever": "Plutonium Lever", + "tile.modernmetals.plutonium_pressure_plate": "Plutonium Pressure Plate", + "block.modernmetals.plutonium_pressure_plate": "Plutonium Pressure Plate", + "tile.modernmetals.plutonium_slab": "Plutonium Slab", + "block.modernmetals.plutonium_slab": "Plutonium Slab", + "tile.modernmetals.plutonium_stairs": "Plutonium Stairs", + "block.modernmetals.plutonium_stairs": "Plutonium Stairs", + "tile.modernmetals.plutonium_wall": "Plutonium Wall", + "block.modernmetals.plutonium_wall": "Plutonium Wall", + "item.modernmetals.rutile_clump": "Rutile Clump", + "item.modernmetals.rutile_crushed": "Crushed Rutile Ore", + "item.modernmetals.rutile_crushed_purified": "Purified Crushed Rutile Ore", + "item.modernmetals.rutile_crystal": "Rutile Crystal", + "item.modernmetals.rutile_dense_plate": "Dense Rutile Plate", + "item.modernmetals.rutile_powder_dirty": "Dirty Rutile Dust", + "item.modernmetals.rutile_shard": "Rutile Shard", + "item.modernmetals.rutile_button": "Rutile Button", + "item.modernmetals.rutile_lever": "Rutile Lever", + "item.modernmetals.rutile_pressure_plate": "Rutile Pressure Plate", + "item.modernmetals.rutile_slab": "Rutile Slab", + "item.modernmetals.rutile_stairs": "Rutile Stairs", + "item.modernmetals.rutile_wall": "Rutile Wall", + "tile.modernmetals.rutile_button": "Rutile Button", + "block.modernmetals.rutile_button": "Rutile Button", + "tile.modernmetals.rutile_lever": "Rutile Lever", + "block.modernmetals.rutile_lever": "Rutile Lever", + "tile.modernmetals.rutile_pressure_plate": "Rutile Pressure Plate", + "block.modernmetals.rutile_pressure_plate": "Rutile Pressure Plate", + "tile.modernmetals.rutile_slab": "Rutile Slab", + "block.modernmetals.rutile_slab": "Rutile Slab", + "tile.modernmetals.rutile_stairs": "Rutile Stairs", + "block.modernmetals.rutile_stairs": "Rutile Stairs", + "tile.modernmetals.rutile_wall": "Rutile Wall", + "block.modernmetals.rutile_wall": "Rutile Wall", + "item.modernmetals.stainlesssteel_clump": "Stainless Steel Clump", + "item.modernmetals.stainlesssteel_crushed": "Crushed Stainless Steel Ore", + "item.modernmetals.stainlesssteel_crushed_purified": "Purified Crushed Stainless Steel Ore", + "item.modernmetals.stainlesssteel_crystal": "Stainless Steel Crystal", + "item.modernmetals.stainlesssteel_dense_plate": "Dense Stainless Steel Plate", + "item.modernmetals.stainlesssteel_powder_dirty": "Dirty Stainless Steel Dust", + "item.modernmetals.stainlesssteel_shard": "Stainless Steel Shard", + "item.modernmetals.stainlesssteel_button": "Stainless Steel Button", + "item.modernmetals.stainlesssteel_lever": "Stainless Steel Lever", + "item.modernmetals.stainlesssteel_pressure_plate": "Stainless Steel Pressure Plate", + "item.modernmetals.stainlesssteel_slab": "Stainless Steel Slab", + "item.modernmetals.stainlesssteel_stairs": "Stainless Steel Stairs", + "item.modernmetals.stainlesssteel_wall": "Stainless Steel Wall", + "tile.modernmetals.stainlesssteel_button": "Stainless Steel Button", + "block.modernmetals.stainlesssteel_button": "Stainless Steel Button", + "tile.modernmetals.stainlesssteel_lever": "Stainless Steel Lever", + "block.modernmetals.stainlesssteel_lever": "Stainless Steel Lever", + "tile.modernmetals.stainlesssteel_pressure_plate": "Stainless Steel Pressure Plate", + "block.modernmetals.stainlesssteel_pressure_plate": "Stainless Steel Pressure Plate", + "tile.modernmetals.stainlesssteel_slab": "Stainless Steel Slab", + "block.modernmetals.stainlesssteel_slab": "Stainless Steel Slab", + "tile.modernmetals.stainlesssteel_stairs": "Stainless Steel Stairs", + "block.modernmetals.stainlesssteel_stairs": "Stainless Steel Stairs", + "tile.modernmetals.stainlesssteel_wall": "Stainless Steel Wall", + "block.modernmetals.stainlesssteel_wall": "Stainless Steel Wall", + "item.modernmetals.tantalum_clump": "Tantalum Clump", + "item.modernmetals.tantalum_crushed": "Crushed Tantalum Ore", + "item.modernmetals.tantalum_crushed_purified": "Purified Crushed Tantalum Ore", + "item.modernmetals.tantalum_crystal": "Tantalum Crystal", + "item.modernmetals.tantalum_dense_plate": "Dense Tantalum Plate", + "item.modernmetals.tantalum_powder_dirty": "Dirty Tantalum Dust", + "item.modernmetals.tantalum_shard": "Tantalum Shard", + "item.modernmetals.tantalum_button": "Tantalum Button", + "item.modernmetals.tantalum_lever": "Tantalum Lever", + "item.modernmetals.tantalum_pressure_plate": "Tantalum Pressure Plate", + "item.modernmetals.tantalum_slab": "Tantalum Slab", + "item.modernmetals.tantalum_stairs": "Tantalum Stairs", + "item.modernmetals.tantalum_wall": "Tantalum Wall", + "tile.modernmetals.tantalum_button": "Tantalum Button", + "block.modernmetals.tantalum_button": "Tantalum Button", + "tile.modernmetals.tantalum_lever": "Tantalum Lever", + "block.modernmetals.tantalum_lever": "Tantalum Lever", + "tile.modernmetals.tantalum_pressure_plate": "Tantalum Pressure Plate", + "block.modernmetals.tantalum_pressure_plate": "Tantalum Pressure Plate", + "tile.modernmetals.tantalum_slab": "Tantalum Slab", + "block.modernmetals.tantalum_slab": "Tantalum Slab", + "tile.modernmetals.tantalum_stairs": "Tantalum Stairs", + "block.modernmetals.tantalum_stairs": "Tantalum Stairs", + "tile.modernmetals.tantalum_wall": "Tantalum Wall", + "block.modernmetals.tantalum_wall": "Tantalum Wall", + "item.modernmetals.titanium_clump": "Titanium Clump", + "item.modernmetals.titanium_crushed": "Crushed Titanium Ore", + "item.modernmetals.titanium_crushed_purified": "Purified Crushed Titanium Ore", + "item.modernmetals.titanium_crystal": "Titanium Crystal", + "item.modernmetals.titanium_dense_plate": "Dense Titanium Plate", + "item.modernmetals.titanium_powder_dirty": "Dirty Titanium Dust", + "item.modernmetals.titanium_shard": "Titanium Shard", + "item.modernmetals.titanium_button": "Titanium Button", + "item.modernmetals.titanium_lever": "Titanium Lever", + "item.modernmetals.titanium_pressure_plate": "Titanium Pressure Plate", + "item.modernmetals.titanium_slab": "Titanium Slab", + "item.modernmetals.titanium_stairs": "Titanium Stairs", + "item.modernmetals.titanium_wall": "Titanium Wall", + "tile.modernmetals.titanium_button": "Titanium Button", + "block.modernmetals.titanium_button": "Titanium Button", + "tile.modernmetals.titanium_lever": "Titanium Lever", + "block.modernmetals.titanium_lever": "Titanium Lever", + "tile.modernmetals.titanium_pressure_plate": "Titanium Pressure Plate", + "block.modernmetals.titanium_pressure_plate": "Titanium Pressure Plate", + "tile.modernmetals.titanium_slab": "Titanium Slab", + "block.modernmetals.titanium_slab": "Titanium Slab", + "tile.modernmetals.titanium_stairs": "Titanium Stairs", + "block.modernmetals.titanium_stairs": "Titanium Stairs", + "tile.modernmetals.titanium_wall": "Titanium Wall", + "block.modernmetals.titanium_wall": "Titanium Wall", + "item.modernmetals.tungsten_clump": "Tungsten Clump", + "item.modernmetals.tungsten_crushed": "Crushed Tungsten Ore", + "item.modernmetals.tungsten_crushed_purified": "Purified Crushed Tungsten Ore", + "item.modernmetals.tungsten_crystal": "Tungsten Crystal", + "item.modernmetals.tungsten_dense_plate": "Dense Tungsten Plate", + "item.modernmetals.tungsten_powder_dirty": "Dirty Tungsten Dust", + "item.modernmetals.tungsten_shard": "Tungsten Shard", + "item.modernmetals.tungsten_button": "Tungsten Button", + "item.modernmetals.tungsten_lever": "Tungsten Lever", + "item.modernmetals.tungsten_pressure_plate": "Tungsten Pressure Plate", + "item.modernmetals.tungsten_slab": "Tungsten Slab", + "item.modernmetals.tungsten_stairs": "Tungsten Stairs", + "item.modernmetals.tungsten_wall": "Tungsten Wall", + "tile.modernmetals.tungsten_button": "Tungsten Button", + "block.modernmetals.tungsten_button": "Tungsten Button", + "tile.modernmetals.tungsten_lever": "Tungsten Lever", + "block.modernmetals.tungsten_lever": "Tungsten Lever", + "tile.modernmetals.tungsten_pressure_plate": "Tungsten Pressure Plate", + "block.modernmetals.tungsten_pressure_plate": "Tungsten Pressure Plate", + "tile.modernmetals.tungsten_slab": "Tungsten Slab", + "block.modernmetals.tungsten_slab": "Tungsten Slab", + "tile.modernmetals.tungsten_stairs": "Tungsten Stairs", + "block.modernmetals.tungsten_stairs": "Tungsten Stairs", + "tile.modernmetals.tungsten_wall": "Tungsten Wall", + "block.modernmetals.tungsten_wall": "Tungsten Wall", + "item.modernmetals.uranium_clump": "Uranium Clump", + "item.modernmetals.uranium_crushed": "Crushed Uranium Ore", + "item.modernmetals.uranium_crushed_purified": "Purified Crushed Uranium Ore", + "item.modernmetals.uranium_crystal": "Uranium Crystal", + "item.modernmetals.uranium_dense_plate": "Dense Uranium Plate", + "item.modernmetals.uranium_powder_dirty": "Dirty Uranium Dust", + "item.modernmetals.uranium_shard": "Uranium Shard", + "item.modernmetals.uranium_button": "Uranium Button", + "item.modernmetals.uranium_lever": "Uranium Lever", + "item.modernmetals.uranium_pressure_plate": "Uranium Pressure Plate", + "item.modernmetals.uranium_slab": "Uranium Slab", + "item.modernmetals.uranium_stairs": "Uranium Stairs", + "item.modernmetals.uranium_wall": "Uranium Wall", + "tile.modernmetals.uranium_button": "Uranium Button", + "block.modernmetals.uranium_button": "Uranium Button", + "tile.modernmetals.uranium_lever": "Uranium Lever", + "block.modernmetals.uranium_lever": "Uranium Lever", + "tile.modernmetals.uranium_pressure_plate": "Uranium Pressure Plate", + "block.modernmetals.uranium_pressure_plate": "Uranium Pressure Plate", + "tile.modernmetals.uranium_slab": "Uranium Slab", + "block.modernmetals.uranium_slab": "Uranium Slab", + "tile.modernmetals.uranium_stairs": "Uranium Stairs", + "block.modernmetals.uranium_stairs": "Uranium Stairs", + "tile.modernmetals.uranium_wall": "Uranium Wall", + "block.modernmetals.uranium_wall": "Uranium Wall", + "item.modernmetals.zirconium_clump": "Zirconium Clump", + "item.modernmetals.zirconium_crushed": "Crushed Zirconium Ore", + "item.modernmetals.zirconium_crushed_purified": "Purified Crushed Zirconium Ore", + "item.modernmetals.zirconium_crystal": "Zirconium Crystal", + "item.modernmetals.zirconium_dense_plate": "Dense Zirconium Plate", + "item.modernmetals.zirconium_powder_dirty": "Dirty Zirconium Dust", + "item.modernmetals.zirconium_shard": "Zirconium Shard", + "item.modernmetals.zirconium_button": "Zirconium Button", + "item.modernmetals.zirconium_lever": "Zirconium Lever", + "item.modernmetals.zirconium_pressure_plate": "Zirconium Pressure Plate", + "item.modernmetals.zirconium_slab": "Zirconium Slab", + "item.modernmetals.zirconium_stairs": "Zirconium Stairs", + "item.modernmetals.zirconium_wall": "Zirconium Wall", + "tile.modernmetals.zirconium_button": "Zirconium Button", + "block.modernmetals.zirconium_button": "Zirconium Button", + "tile.modernmetals.zirconium_lever": "Zirconium Lever", + "block.modernmetals.zirconium_lever": "Zirconium Lever", + "tile.modernmetals.zirconium_pressure_plate": "Zirconium Pressure Plate", + "block.modernmetals.zirconium_pressure_plate": "Zirconium Pressure Plate", + "tile.modernmetals.zirconium_slab": "Zirconium Slab", + "block.modernmetals.zirconium_slab": "Zirconium Slab", + "tile.modernmetals.zirconium_stairs": "Zirconium Stairs", + "block.modernmetals.zirconium_stairs": "Zirconium Stairs", + "tile.modernmetals.zirconium_wall": "Zirconium Wall", + "block.modernmetals.zirconium_wall": "Zirconium Wall", + "material.thorium": "Thorium", + "item.modernmetals.thorium_arrow": "Thorium Arrow", + "item.modernmetals.thorium_axe": "Thorium Axe", + "item.modernmetals.thorium_bars": "Thorium Bars", + "item.modernmetals.thorium_blend": "Thorium Blend", + "item.modernmetals.thorium_block": "Block of Thorium", + "item.modernmetals.thorium_boots": "Thorium Boots", + "item.modernmetals.thorium_bolt": "Thorium Bolt", + "item.modernmetals.thorium_bow": "Thorium Bow", + "item.modernmetals.thorium_chestplate": "Thorium Chestplate", + "item.modernmetals.thorium_crackhammer": "Thorium Crack Hammer", + "item.modernmetals.thorium_crossbow": "Thorium Crossbow", + "item.modernmetals.thorium_door": "Thorium Door", + "item.modernmetals.thorium_fishing_rod": "Thorium Fishing Rod", + "item.modernmetals.thorium_gear": "Thorium Gear", + "item.modernmetals.thorium_helmet": "Thorium Helmet", + "item.modernmetals.thorium_hoe": "Thorium Hoe", + "item.modernmetals.thorium_horse_armor": "Thorium Horse Armour", + "item.modernmetals.thorium_ingot": "Thorium Ingot", + "item.modernmetals.thorium_leggings": "Thorium Leg Armour", + "item.modernmetals.thorium_nugget": "Thorium Nugget", + "item.modernmetals.thorium_ore": "Thorium Ore", + "item.modernmetals.thorium_pickaxe": "Thorium Pickaxe", + "item.modernmetals.thorium_powder": "Thorium Dust", + "item.modernmetals.thorium_rod": "Thorium Rod", + "item.modernmetals.thorium_shears": "Thorium Shears", + "item.modernmetals.thorium_shield": "Thorium Shield", + "item.modernmetals.thorium_shovel": "Thorium Shovel", + "item.modernmetals.thorium_smallblend": "Tiny Pile of Thorium Blend", + "item.modernmetals.thorium_smallpowder": "Tiny Pile of Thorium Dust", + "item.modernmetals.thorium_sword": "Thorium Sword", + "item.modernmetals.thorium_trapdoor": "Thorium Trapdoor", + "tile.modernmetals.thorium_bars": "Thorium Bars", + "block.modernmetals.thorium_bars": "Thorium Bars", + "tile.modernmetals.thorium_block": "Block of Thorium", + "block.modernmetals.thorium_block": "Block of Thorium", + "tile.modernmetals.thorium_door": "Thorium Door", + "block.modernmetals.thorium_door": "Thorium Door", + "tile.modernmetals.thorium_ore": "Thorium Ore", + "block.modernmetals.thorium_ore": "Thorium Ore", + "tile.modernmetals.thorium_plate": "Thorium Plate", + "block.modernmetals.thorium_plate": "Thorium Plate", + "tile.modernmetals.thorium_trapdoor": "Thorium Trapdoor", + "block.modernmetals.thorium_trapdoor": "Thorium Trapdoor", + "fluid.modernmetals.thorium": "Molten Thorium", + "tile.modernmetals.thorium": "Molten Thorium", + "block.modernmetals.thorium": "Molten Thorium", + "item.modernmetals.thorium_clump": "Thorium Clump", + "item.modernmetals.thorium_crushed": "Crushed Thorium Ore", + "item.modernmetals.thorium_crushed_purified": "Purified Crushed Thorium Ore", + "item.modernmetals.thorium_crystal": "Thorium Crystal", + "item.modernmetals.thorium_dense_plate": "Dense Thorium Plate", + "item.modernmetals.thorium_powder_dirty": "Dirty Thorium Dust", + "item.modernmetals.thorium_shard": "Thorium Shard", + "item.modernmetals.thorium_button": "Thorium Button", + "item.modernmetals.thorium_lever": "Thorium Lever", + "item.modernmetals.thorium_pressure_plate": "Thorium Pressure Plate", + "item.modernmetals.thorium_slab": "Thorium Slab", + "item.modernmetals.thorium_stairs": "Thorium Stairs", + "item.modernmetals.thorium_wall": "Thorium Wall", + "tile.modernmetals.thorium_button": "Thorium Button", + "block.modernmetals.thorium_button": "Thorium Button", + "tile.modernmetals.thorium_lever": "Thorium Lever", + "block.modernmetals.thorium_lever": "Thorium Lever", + "tile.modernmetals.thorium_pressure_plate": "Thorium Pressure Plate", + "block.modernmetals.thorium_pressure_plate": "Thorium Pressure Plate", + "tile.modernmetals.thorium_slab": "Thorium Slab", + "block.modernmetals.thorium_slab": "Thorium Slab", + "tile.modernmetals.thorium_stairs": "Thorium Stairs", + "block.modernmetals.thorium_stairs": "Thorium Stairs", + "tile.modernmetals.thorium_wall": "Thorium Wall", + "block.modernmetals.thorium_wall": "Thorium Wall", + "item.modernmetals.aluminum_casing": "Aluminum Item Casing", + "item.modernmetals.aluminumbrass_casing": "Aluminum Brass Item Casing", + "item.modernmetals.boron_casing": "Boron Item Casing", + "item.modernmetals.beryllium_casing": "Beryllium Item Casing", + "item.modernmetals.cadmium_casing": "Cadmium Item Casing", + "item.modernmetals.chromium_casing": "Chromium Item Casing", + "item.modernmetals.galvanizedsteel_casing": "Galvanized Steel Item Casing", + "item.modernmetals.iridium_casing": "Iridium Item Casing", + "item.modernmetals.magnesium_casing": "Magnesium Item Casing", + "item.modernmetals.manganese_casing": "Manganese Item Casing", + "item.modernmetals.osmium_casing": "Osmium Item Casing", + "item.modernmetals.plutonium_casing": "Plutonium Item Casing", + "item.modernmetals.rutile_casing": "Rutile Item Casing", + "item.modernmetals.stainlesssteel_casing": "Stainless Steel Item Casing", + "item.modernmetals.tantalum_casing": "Tantalum Item Casing", + "item.modernmetals.thorium_casing": "Thorium Item Casing", + "item.modernmetals.titanium_casing": "Titanium Item Casing", + "item.modernmetals.tungsten_casing": "Tungsten Item Casing", + "item.modernmetals.uranium_casing": "Uranium Item Casing", + "item.modernmetals.zirconium_casing": "Zirconium Item Casing", + "item.modernmetals.aluminumbrass_scythe": "Aluminum Brass Sickle", + "item.modernmetals.aluminum_scythe": "Aluminum Sickle", + "item.modernmetals.beryllium_scythe": "Beryllium Sickle", + "item.modernmetals.boron_scythe": "Boron Sickle", + "item.modernmetals.cadmium_scythe": "Cadmium Sickle", + "item.modernmetals.chromium_scythe": "Chromium Sickle", + "item.modernmetals.galvanizedsteel_scythe": "Galvanized Steel Sickle", + "item.modernmetals.iridium_scythe": "Iridium Sickle", + "item.modernmetals.magnesium_scythe": "Magnesium Sickle", + "item.modernmetals.manganese_scythe": "Manganese Sickle", + "item.modernmetals.nichrome_scythe": "Nichrome Sickle", + "item.modernmetals.osmium_scythe": "Osmium Sickle", + "item.modernmetals.plutonium_scythe": "Plutonium Sickle", + "item.modernmetals.rutile_scythe": "Rutile Sickle", + "item.modernmetals.stainlesssteel_scythe": "Stainless Steel Sickle", + "item.modernmetals.tantalum_scythe": "Tantalum Sickle", + "item.modernmetals.thorium_scythe": "Thorium Sickle", + "item.modernmetals.titanium_scythe": "Titanium Sickle", + "item.modernmetals.tungsten_scythe": "Tungsten Sickle", + "item.modernmetals.uranium_scythe": "Uranium Sickle", + "item.modernmetals.zirconium_scythe": "Zirconium Sickle", + "gas.gasAluminum": "Aluminum Slurry", + "gas.gasBeryllium": "Beryllium Slurry", + "gas.gasBoron": "Boron Slurry", + "gas.gasCadmium": "Cadmium Slurry", + "gas.gasChromium": "Chromium Slurry", + "gas.gasIridium": "Iridium Slurry", + "gas.gasMagnesium": "Magnesium Slurry", + "gas.gasManganese": "Manganese Slurry", + "gas.gasPlutonium": "Plutonium Slurry", + "gas.gasRutile": "Rutile Slurry", + "gas.gasTantalum": "Tantalum Slurry", + "gas.gasThorium": "Thorium Slurry", + "gas.gasTitanium": "Titanium Slurry", + "gas.gasTungsten": "Tungsten Slurry", + "gas.gasUranium": "Uranium Slurry", + "gas.gasZirconium": "Zirconium Slurry", + "gas.cleanGasAluminum": "Clean Aluminum Slurry", + "gas.cleanGasBeryllium": "Clean Beryllium Slurry", + "gas.cleanGasBoron": "Clean Boron Slurry", + "gas.cleanGasCadmium": "Clean Cadmium Slurry", + "gas.cleanGasChromium": "Clean Chromium Slurry", + "gas.cleanGasIridium": "Clean Iridium Slurry", + "gas.cleanGasMagnesium": "Clean Magnesium Slurry", + "gas.cleanGasManganese": "Clean Manganese Slurry", + "gas.cleanGasPlutonium": "Clean Plutonium Slurry", + "gas.cleanGasRutile": "Clean Rutile Slurry", + "gas.cleanGasTantalum": "Clean Tantalum Slurry", + "gas.cleanGasThorium": "Clean Thorium Slurry", + "gas.cleanGasTitanium": "Clean Titanium Slurry", + "gas.cleanGasTungsten": "Clean Tungsten Slurry", + "gas.cleanGasUranium": "Clean Uranium Slurry", + "gas.cleanGasZirconium": "Clean Zirconium Slurry", + "gas.gasAdamantine": "Adamantine Slurry", + "gas.gasAntimony": "Antimony Slurry", + "gas.gasBismuth": "Bismuth Slurry", + "gas.gasColdiron": "Cold-Iron Slurry", + "gas.gasPlatinum": "Platinum Slurry", + "gas.gasNickel": "Nickel Slurry", + "gas.gasStarsteel": "Star-Steel Slurry", + "gas.gasZinc": "Zinc Slurry", + "gas.cleanGasAdamantine": "Clean Adamantine Slurry", + "gas.cleanGasAntimony": "Clean Antimony Slurry", + "gas.cleanGasBismuth": "Clean Bismuth Slurry", + "gas.cleanGasColdiron": "Clean Cold-Iron Slurry", + "gas.cleanGasPlatinum": "Clean Platinum Slurry", + "gas.cleanGasNickel": "Clean Nickel Slurry", + "gas.cleanGasStarsteel": "Clean Star-Steel Slurry", + "gas.cleanGasZinc": "Clean Zinc Slurry", + "config.modernmetals.title": "Modern Metals", + "config.modernmetals.description": "Restart to apply changes. Edit ores in OreSpawn.", + "config.modernmetals.content_mode": "Fantasy Level", + "config.modernmetals.content_mode.tooltip": "High Fantasy keeps all recipes. Low Fantasy restricts unrealistic equipment and structures. Requires a game restart.", + "high_fantasy": "High Fantasy", + "low_fantasy": "Low Fantasy", + "config.modernmetals.enable_thorium": "Enable Thorium", + "config.modernmetals.enable_boron": "Enable Boron", + "config.modernmetals.enable_beryllium": "Enable Beryllium", + "config.modernmetals.enable_cadmium": "Enable Cadmium", + "config.modernmetals.enable_nichrome": "Enable Nichrome", + "config.modernmetals.enable_aluminum": "Enable Aluminum", + "config.modernmetals.enable_aluminumbrass": "Enable Aluminum Brass", + "config.modernmetals.enable_chromium": "Enable Chromium", + "config.modernmetals.enable_galvanizedsteel": "Enable Galvanized Steel", + "config.modernmetals.enable_iridium": "Enable Iridium", + "config.modernmetals.enable_magnesium": "Enable Magnesium", + "config.modernmetals.enable_manganese": "Enable Manganese", + "config.modernmetals.enable_osmium": "Enable Osmium", + "config.modernmetals.enable_plutonium": "Enable Plutonium", + "config.modernmetals.enable_rutile": "Enable Rutile", + "config.modernmetals.enable_stainlesssteel": "Enable Stainless Steel", + "config.modernmetals.enable_tantalum": "Enable Tantalum", + "config.modernmetals.enable_titanium": "Enable Titanium", + "config.modernmetals.enable_tungsten": "Enable Tungsten", + "config.modernmetals.enable_uranium": "Enable Uranium", + "config.modernmetals.enable_zirconium": "Enable Zirconium", + "config.modernmetals.material.tooltip": "Controls which blocks, items and recipes are available for this material. Requires a game restart.", + "config.modernmetals.villager_trades": "Villager Trades", + "config.modernmetals.villager_trades.tooltip": "Let blacksmiths trade Modern Metals ingots and equipment. Requires a game restart.", + "config.modernmetals.connection.mismatch": "The server uses %s, but your game uses %s. Match the Fantasy Level in your mod settings and restart.", + "config.modernmetals.connection.protocol": "Modern Metals could not check the Fantasy Level. Use the same Modern Metals build on the server and client.", + "config.modernmetals.content_mode.high_fantasy": "High Fantasy", + "config.modernmetals.content_mode.low_fantasy": "Low Fantasy", + "config.modernmetals.inherited_mode": "Fantasy Level is set in Base Metals. Restart after changing settings." +} diff --git a/src/main/resources/assets/modernmetals/lang/en_ca.json b/src/main/resources/assets/modernmetals/lang/en_ca.json new file mode 100644 index 00000000..1587d2db --- /dev/null +++ b/src/main/resources/assets/modernmetals/lang/en_ca.json @@ -0,0 +1,1760 @@ +{ + "item.modernmetals.nichrome_casing": "Nichrome Item Casing", + "itemGroup.modernmetals.blocks": "Modern Metals Blocks", + "itemGroup.modernmetals.combat": "Modern Metals Combat", + "itemGroup.modernmetals.items": "Modern Metals Items", + "itemGroup.modernmetals.tools": "Modern Metals Tools", + "nei.modernmetals.recipehandler.crusher": "Crushed Blocks/Items", + "material.aluminum": "Aluminum", + "item.modernmetals.aluminum_arrow": "Aluminum Arrow", + "item.modernmetals.aluminum_axe": "Aluminum Axe", + "item.modernmetals.aluminum_bars": "Aluminum Bars", + "item.modernmetals.aluminum_blend": "Aluminum Blend", + "item.modernmetals.aluminum_block": "Block of Aluminum", + "item.modernmetals.aluminum_boots": "Aluminum Boots", + "item.modernmetals.aluminum_bolt": "Aluminum Bolt", + "item.modernmetals.aluminum_bow": "Aluminum Bow", + "item.modernmetals.aluminum_chestplate": "Aluminum Chestplate", + "item.modernmetals.aluminum_crackhammer": "Aluminum Crack Hammer", + "item.modernmetals.aluminum_crossbow": "Aluminum Crossbow", + "item.modernmetals.aluminum_door": "Aluminum Door", + "item.modernmetals.aluminum_fishing_rod": "Aluminum Fishing Rod", + "item.modernmetals.aluminum_gear": "Aluminum Gear", + "item.modernmetals.aluminum_helmet": "Aluminum Helmet", + "item.modernmetals.aluminum_hoe": "Aluminum Hoe", + "item.modernmetals.aluminum_horse_armor": "Aluminum Horse Armour", + "item.modernmetals.aluminum_ingot": "Aluminum Ingot", + "item.modernmetals.aluminum_leggings": "Aluminum Leg Armour", + "item.modernmetals.aluminum_nugget": "Aluminum Nugget", + "item.modernmetals.aluminum_ore": "Aluminum Ore", + "item.modernmetals.aluminum_pickaxe": "Aluminum Pickaxe", + "item.modernmetals.aluminum_powder": "Aluminum Dust", + "item.modernmetals.aluminum_rod": "Aluminum Rod", + "item.modernmetals.aluminum_shears": "Aluminum Shears", + "item.modernmetals.aluminum_shield": "Aluminum Shield", + "item.modernmetals.aluminum_shovel": "Aluminum Shovel", + "item.modernmetals.aluminum_smallblend": "Tiny Pile of Aluminum Blend", + "item.modernmetals.aluminum_smallpowder": "Tiny Pile of Aluminum Dust", + "item.modernmetals.aluminum_sword": "Aluminum Sword", + "item.modernmetals.aluminum_trapdoor": "Aluminum Trapdoor", + "material.aluminumbrass": "Aluminum Brass", + "item.modernmetals.aluminumbrass_arrow": "Aluminum Brass Arrow", + "item.modernmetals.aluminumbrass_axe": "Aluminum Brass Axe", + "item.modernmetals.aluminumbrass_bars": "Aluminum Brass Bars", + "item.modernmetals.aluminumbrass_blend": "Aluminum Brass Blend", + "item.modernmetals.aluminumbrass_block": "Block of Aluminum Brass", + "item.modernmetals.aluminumbrass_boots": "Aluminum Brass Boots", + "item.modernmetals.aluminumbrass_bolt": "Aluminum Brass Bolt", + "item.modernmetals.aluminumbrass_bow": "Aluminum Brass Bow", + "item.modernmetals.aluminumbrass_chestplate": "Aluminum Brass Chestplate", + "item.modernmetals.aluminumbrass_crackhammer": "Aluminum Brass Crack Hammer", + "item.modernmetals.aluminumbrass_crossbow": "Aluminum Brass Crossbow", + "item.modernmetals.aluminumbrass_door": "Aluminum Brass Door", + "item.modernmetals.aluminumbrass_fishing_rod": "Aluminum Brass Fishing Rod", + "item.modernmetals.aluminumbrass_gear": "Aluminum Brass Gear", + "item.modernmetals.aluminumbrass_helmet": "Aluminum Brass Helmet", + "item.modernmetals.aluminumbrass_hoe": "Aluminum Brass Hoe", + "item.modernmetals.aluminumbrass_horse_armor": "Aluminum Brass Horse Armour", + "item.modernmetals.aluminumbrass_ingot": "Aluminum Brass Ingot", + "item.modernmetals.aluminumbrass_leggings": "Aluminum Brass Leg Armour", + "item.modernmetals.aluminumbrass_nugget": "Aluminum Brass Nugget", + "item.modernmetals.aluminumbrass_ore": "Aluminum Brass Ore", + "item.modernmetals.aluminumbrass_pickaxe": "Aluminum Brass Pickaxe", + "item.modernmetals.aluminumbrass_powder": "Aluminum Brass Dust", + "item.modernmetals.aluminumbrass_rod": "Aluminum Brass Rod", + "item.modernmetals.aluminumbrass_shears": "Aluminum Brass Shears", + "item.modernmetals.aluminumbrass_shield": "Aluminum Brass Shield", + "item.modernmetals.aluminumbrass_shovel": "Aluminum Brass Shovel", + "item.modernmetals.aluminumbrass_smallblend": "Tiny Pile of Aluminum Brass Blend", + "item.modernmetals.aluminumbrass_smallpowder": "Tiny Pile of Aluminum Brass Dust", + "item.modernmetals.aluminumbrass_sword": "Aluminum Brass Sword", + "item.modernmetals.aluminumbrass_trapdoor": "Aluminum Brass Trapdoor", + "material.antimony": "Antimony", + "item.modernmetals.antimony_arrow": "Antimony Arrow", + "item.modernmetals.antimony_axe": "Antimony Axe", + "item.modernmetals.antimony_bars": "Antimony Bars", + "item.modernmetals.antimony_block": "Block of Antimony", + "item.modernmetals.antimony_boots": "Antimony Boots", + "item.modernmetals.antimony_chestplate": "Antimony Chestplate", + "item.modernmetals.antimony_crackhammer": "Antimony Crack Hammer", + "item.modernmetals.antimony_door": "Antimony Door", + "item.modernmetals.antimony_helmet": "Antimony Helmet", + "item.modernmetals.antimony_hoe": "Antimony Hoe", + "item.modernmetals.antimony_ingot": "Antimony Ingot", + "item.modernmetals.antimony_leggings": "Antimony Leg Armour", + "item.modernmetals.antimony_nugget": "Antimony Nugget", + "item.modernmetals.antimony_ore": "Antimony Ore", + "item.modernmetals.antimony_pickaxe": "Antimony Pickaxe", + "item.modernmetals.antimony_powder": "Antimony Dust", + "item.modernmetals.antimony_shears": "Antimony Shears", + "item.modernmetals.antimony_shield": "Antimony Shield", + "item.modernmetals.antimony_shovel": "Antimony Shovel", + "item.modernmetals.antimony_smallpowder": "Tiny Pile of Antimony Dust", + "item.modernmetals.antimony_sword": "Antimony Sword", + "item.modernmetals.antimony_trapdoor": "Antimony Trapdoor", + "material.beryllium": "Beryllium", + "item.modernmetals.beryllium_arrow": "Beryllium Arrow", + "item.modernmetals.beryllium_axe": "Beryllium Axe", + "item.modernmetals.beryllium_bars": "Beryllium Bars", + "item.modernmetals.beryllium_blend": "Beryllium Blend", + "item.modernmetals.beryllium_block": "Block of Beryllium", + "item.modernmetals.beryllium_boots": "Beryllium Boots", + "item.modernmetals.beryllium_bolt": "Beryllium Bolt", + "item.modernmetals.beryllium_bow": "Beryllium Bow", + "item.modernmetals.beryllium_chestplate": "Beryllium Chestplate", + "item.modernmetals.beryllium_crackhammer": "Beryllium Crack Hammer", + "item.modernmetals.beryllium_crossbow": "Beryllium Crossbow", + "item.modernmetals.beryllium_door": "Beryllium Door", + "item.modernmetals.beryllium_fishing_rod": "Beryllium Fishing Rod", + "item.modernmetals.beryllium_gear": "Beryllium Gear", + "item.modernmetals.beryllium_helmet": "Beryllium Helmet", + "item.modernmetals.beryllium_hoe": "Beryllium Hoe", + "item.modernmetals.beryllium_horse_armor": "Beryllium Horse Armour", + "item.modernmetals.beryllium_ingot": "Beryllium Ingot", + "item.modernmetals.beryllium_leggings": "Beryllium Leg Armour", + "item.modernmetals.beryllium_nugget": "Beryllium Nugget", + "item.modernmetals.beryllium_ore": "Beryllium Ore", + "item.modernmetals.beryllium_pickaxe": "Beryllium Pickaxe", + "item.modernmetals.beryllium_powder": "Beryllium Dust", + "item.modernmetals.beryllium_rod": "Beryllium Rod", + "item.modernmetals.beryllium_shears": "Beryllium Shears", + "item.modernmetals.beryllium_shield": "Beryllium Shield", + "item.modernmetals.beryllium_shovel": "Beryllium Shovel", + "item.modernmetals.beryllium_smallblend": "Tiny Pile of Beryllium Blend", + "item.modernmetals.beryllium_smallpowder": "Tiny Pile of Beryllium Dust", + "item.modernmetals.beryllium_sword": "Beryllium Sword", + "item.modernmetals.beryllium_trapdoor": "Beryllium Trapdoor", + "material.bismuth": "Bismuth", + "item.modernmetals.bismuth_arrow": "Bismuth Arrow", + "item.modernmetals.bismuth_axe": "Bismuth Axe", + "item.modernmetals.bismuth_bars": "Bismuth Bars", + "item.modernmetals.bismuth_block": "Block of Bismuth", + "item.modernmetals.bismuth_boots": "Bismuth Boots", + "item.modernmetals.bismuth_chestplate": "Bismuth Chestplate", + "item.modernmetals.bismuth_crackhammer": "Bismuth Crack Hammer", + "item.modernmetals.bismuth_door": "Bismuth Door", + "item.modernmetals.bismuth_helmet": "Bismuth Helmet", + "item.modernmetals.bismuth_hoe": "Bismuth Hoe", + "item.modernmetals.bismuth_ingot": "Bismuth Ingot", + "item.modernmetals.bismuth_leggings": "Bismuth Leg Armour", + "item.modernmetals.bismuth_nugget": "Bismuth Nugget", + "item.modernmetals.bismuth_ore": "Bismuth Ore", + "item.modernmetals.bismuth_pickaxe": "Bismuth Pickaxe", + "item.modernmetals.bismuth_powder": "Bismuth Dust", + "item.modernmetals.bismuth_shears": "Bismuth Shears", + "item.modernmetals.bismuth_shovel": "Bismuth Shovel", + "item.modernmetals.bismuth_shield": "Bismuth Shield", + "item.modernmetals.bismuth_smallpowder": "Tiny Pile of Bismuth Dust", + "item.modernmetals.bismuth_sword": "Bismuth Sword", + "item.modernmetals.bismuth_trapdoor": "Bismuth Trapdoor", + "material.boron": "Boron", + "item.modernmetals.boron_arrow": "Boron Arrow", + "item.modernmetals.boron_axe": "Boron Axe", + "item.modernmetals.boron_bars": "Boron Bars", + "item.modernmetals.boron_blend": "Boron Blend", + "item.modernmetals.boron_block": "Block of Boron", + "item.modernmetals.boron_boots": "Boron Boots", + "item.modernmetals.boron_bolt": "Boron Bolt", + "item.modernmetals.boron_bow": "Boron Bow", + "item.modernmetals.boron_chestplate": "Boron Chestplate", + "item.modernmetals.boron_crackhammer": "Boron Crack Hammer", + "item.modernmetals.boron_crossbow": "Boron Crossbow", + "item.modernmetals.boron_door": "Boron Door", + "item.modernmetals.boron_fishing_rod": "Boron Fishing Rod", + "item.modernmetals.boron_gear": "Boron Gear", + "item.modernmetals.boron_helmet": "Boron Helmet", + "item.modernmetals.boron_hoe": "Boron Hoe", + "item.modernmetals.boron_horse_armor": "Boron Horse Armour", + "item.modernmetals.boron_ingot": "Boron Ingot", + "item.modernmetals.boron_leggings": "Boron Leg Armour", + "item.modernmetals.boron_nugget": "Boron Nugget", + "item.modernmetals.boron_ore": "Boron Ore", + "item.modernmetals.boron_pickaxe": "Boron Pickaxe", + "item.modernmetals.boron_powder": "Boron Dust", + "item.modernmetals.boron_rod": "Boron Rod", + "item.modernmetals.boron_shears": "Boron Shears", + "item.modernmetals.boron_shield": "Boron Shield", + "item.modernmetals.boron_shovel": "Boron Shovel", + "item.modernmetals.boron_smallblend": "Tiny Pile of Boron Blend", + "item.modernmetals.boron_smallpowder": "Tiny Pile of Boron Dust", + "item.modernmetals.boron_sword": "Boron Sword", + "item.modernmetals.boron_trapdoor": "Boron Trapdoor", + "material.cadmium": "Cadmium", + "item.modernmetals.cadmium_arrow": "Cadmium Arrow", + "item.modernmetals.cadmium_axe": "Cadmium Axe", + "item.modernmetals.cadmium_bars": "Cadmium Bars", + "item.modernmetals.cadmium_blend": "Cadmium Blend", + "item.modernmetals.cadmium_block": "Block of Cadmium", + "item.modernmetals.cadmium_bolt": "Cadmium Bolt", + "item.modernmetals.cadmium_boots": "Cadmium Boots", + "item.modernmetals.cadmium_bow": "Cadmium Bow", + "item.modernmetals.cadmium_chestplate": "Cadmium Chestplate", + "item.modernmetals.cadmium_crackhammer": "Cadmium Crack Hammer", + "item.modernmetals.cadmium_crossbow": "Cadmium Crossbow", + "item.modernmetals.cadmium_door": "Cadmium Door", + "item.modernmetals.cadmium_fishing_rod": "Cadmium Fishing Rod", + "item.modernmetals.cadmium_gear": "Cadmium Gear", + "item.modernmetals.cadmium_helmet": "Cadmium Helmet", + "item.modernmetals.cadmium_hoe": "Cadmium Hoe", + "item.modernmetals.cadmium_horse_armor": "Cadmium Horse Armour", + "item.modernmetals.cadmium_ingot": "Cadmium Ingot", + "item.modernmetals.cadmium_leggings": "Cadmium Leg Armour", + "item.modernmetals.cadmium_nugget": "Cadmium Nugget", + "item.modernmetals.cadmium_ore": "Cadmium Ore", + "item.modernmetals.cadmium_pickaxe": "Cadmium Pickaxe", + "item.modernmetals.cadmium_powder": "Cadmium Dust", + "item.modernmetals.cadmium_rod": "Cadmium Rod", + "item.modernmetals.cadmium_shears": "Cadmium Shears", + "item.modernmetals.cadmium_shovel": "Cadmium Shovel", + "item.modernmetals.cadmium_shield": "Cadmium Shield", + "item.modernmetals.cadmium_smallblend": "Tiny Pile of Cadmium Blend", + "item.modernmetals.cadmium_smallpowder": "Tiny Pile of Cadmium Dust", + "item.modernmetals.cadmium_sword": "Cadmium Sword", + "item.modernmetals.cadmium_trapdoor": "Cadmium Trapdoor", + "material.chromium": "Chromium", + "item.modernmetals.chromium_arrow": "Chromium Arrow", + "item.modernmetals.chromium_axe": "Chromium Axe", + "item.modernmetals.chromium_bars": "Chromium Bars", + "item.modernmetals.chromium_blend": "Chromium Blend", + "item.modernmetals.chromium_block": "Block of Chromium", + "item.modernmetals.chromium_bolt": "Chromium Bolt", + "item.modernmetals.chromium_boots": "Chromium Boots", + "item.modernmetals.chromium_bow": "Chromium Bow", + "item.modernmetals.chromium_chestplate": "Chromium Chestplate", + "item.modernmetals.chromium_crackhammer": "Chromium Crack Hammer", + "item.modernmetals.chromium_crossbow": "Chromium Crossbow", + "item.modernmetals.chromium_door": "Chromium Door", + "item.modernmetals.chromium_fishing_rod": "Chromium Fishing Rod", + "item.modernmetals.chromium_gear": "Chromium Gear", + "item.modernmetals.chromium_helmet": "Chromium Helmet", + "item.modernmetals.chromium_hoe": "Chromium Hoe", + "item.modernmetals.chromium_horse_armor": "Chromium Horse Armour", + "item.modernmetals.chromium_ingot": "Chromium Ingot", + "item.modernmetals.chromium_leggings": "Chromium Leg Armour", + "item.modernmetals.chromium_nugget": "Chromium Nugget", + "item.modernmetals.chromium_ore": "Chromium Ore", + "item.modernmetals.chromium_pickaxe": "Chromium Pickaxe", + "item.modernmetals.chromium_powder": "Chromium Dust", + "item.modernmetals.chromium_rod": "Chromium Rod", + "item.modernmetals.chromium_shears": "Chromium Shears", + "item.modernmetals.chromium_shield": "Chromium Shield", + "item.modernmetals.chromium_shovel": "Chromium Shovel", + "item.modernmetals.chromium_smallblend": "Tiny Pile of Chromium Blend", + "item.modernmetals.chromium_smallpowder": "Tiny Pile of Chromium Dust", + "item.modernmetals.chromium_sword": "Chromium Sword", + "item.modernmetals.chromium_trapdoor": "Chromium Trapdoor", + "material.galvanizedsteel": "Galvanized Steel", + "item.modernmetals.galvanizedsteel_arrow": "Galvanized Steel Arrow", + "item.modernmetals.galvanizedsteel_axe": "Galvanized Steel Axe", + "item.modernmetals.galvanizedsteel_bars": "Galvanized Steel Bars", + "item.modernmetals.galvanizedsteel_blend": "Galvanized Steel Blend", + "item.modernmetals.galvanizedsteel_block": "Block of Galvanized Steel", + "item.modernmetals.galvanizedsteel_bolt": "Galvanized Steel Bolt", + "item.modernmetals.galvanizedsteel_boots": "Galvanized Steel Boots", + "item.modernmetals.galvanizedsteel_bow": "Galvanized Steel Bow", + "item.modernmetals.galvanizedsteel_chestplate": "Galvanized Steel Chestplate", + "item.modernmetals.galvanizedsteel_crackhammer": "Galvanized Steel Crack Hammer", + "item.modernmetals.galvanizedsteel_crossbow": "Galvanized Steel Crossbow", + "item.modernmetals.galvanizedsteel_door": "Galvanized Steel Door", + "item.modernmetals.galvanizedsteel_fishing_rod": "Galvanized Steel Fishing Rod", + "item.modernmetals.galvanizedsteel_gear": "Galvanized Steel Gear", + "item.modernmetals.galvanizedsteel_helmet": "Galvanized Steel Helmet", + "item.modernmetals.galvanizedsteel_hoe": "Galvanized Steel Hoe", + "item.modernmetals.galvanizedsteel_horse_armor": "Galvanized Steel Horse Armour", + "item.modernmetals.galvanizedsteel_ingot": "Galvanized Steel Ingot", + "item.modernmetals.galvanizedsteel_leggings": "Galvanized Steel Leg Armour", + "item.modernmetals.galvanizedsteel_nugget": "Galvanized Steel Nugget", + "item.modernmetals.galvanizedsteel_ore": "Galvanized Steel Ore", + "item.modernmetals.galvanizedsteel_pickaxe": "Galvanized Steel Pickaxe", + "item.modernmetals.galvanizedsteel_powder": "Galvanized Steel Dust", + "item.modernmetals.galvanizedsteel_rod": "Galvanized Steel Rod", + "item.modernmetals.galvanizedsteel_shears": "Galvanized Steel Shears", + "item.modernmetals.galvanizedsteel_shield": "Galvanized Steel Shield", + "item.modernmetals.galvanizedsteel_shovel": "Galvanized Steel Shovel", + "item.modernmetals.galvanizedsteel_smallblend": "Tiny Pile of Galvanized Steel Blend", + "item.modernmetals.galvanizedsteel_smallpowder": "Tiny Pile of Galvanized Steel Dust", + "item.modernmetals.galvanizedsteel_sword": "Galvanized Steel Sword", + "item.modernmetals.galvanizedsteel_trapdoor": "Galvanized Steel Trapdoor", + "material.iridium": "Iridium", + "item.modernmetals.iridium_arrow": "Iridium Arrow", + "item.modernmetals.iridium_axe": "Iridium Axe", + "item.modernmetals.iridium_bars": "Iridium Bars", + "item.modernmetals.iridium_blend": "Iridium Blend", + "item.modernmetals.iridium_block": "Block of Iridium", + "item.modernmetals.iridium_bolt": "Iridium Bolt", + "item.modernmetals.iridium_boots": "Iridium Boots", + "item.modernmetals.iridium_bow": "Iridium Bow", + "item.modernmetals.iridium_chestplate": "Iridium Chestplate", + "item.modernmetals.iridium_crackhammer": "Iridium Crack Hammer", + "item.modernmetals.iridium_crossbow": "Iridium Crossbow", + "item.modernmetals.iridium_door": "Iridium Door", + "item.modernmetals.iridium_fishing_rod": "Iridium Fishing Rod", + "item.modernmetals.iridium_gear": "Iridium Gear", + "item.modernmetals.iridium_helmet": "Iridium Helmet", + "item.modernmetals.iridium_hoe": "Iridium Hoe", + "item.modernmetals.iridium_horse_armor": "Iridium Horse Armour", + "item.modernmetals.iridium_ingot": "Iridium Ingot", + "item.modernmetals.iridium_leggings": "Iridium Leg Armour", + "item.modernmetals.iridium_nugget": "Iridium Nugget", + "item.modernmetals.iridium_ore": "Iridium Ore", + "item.modernmetals.iridium_pickaxe": "Iridium Pickaxe", + "item.modernmetals.iridium_powder": "Iridium Dust", + "item.modernmetals.iridium_rod": "Iridium Rod", + "item.modernmetals.iridium_shears": "Iridium Shears", + "item.modernmetals.iridium_shield": "Iridium Shield", + "item.modernmetals.iridium_shovel": "Iridium Shovel", + "item.modernmetals.iridium_smallblend": "Tiny Pile of Iridium Blend", + "item.modernmetals.iridium_smallpowder": "Tiny Pile of Iridium Dust", + "item.modernmetals.iridium_sword": "Iridium Sword", + "item.modernmetals.iridium_trapdoor": "Iridium Trapdoor", + "material.magnesium": "Magnesium", + "item.modernmetals.magnesium_arrow": "Magnesium Arrow", + "item.modernmetals.magnesium_axe": "Magnesium Axe", + "item.modernmetals.magnesium_bars": "Magnesium Bars", + "item.modernmetals.magnesium_blend": "Magnesium Blend", + "item.modernmetals.magnesium_block": "Block of Magnesium", + "item.modernmetals.magnesium_boots": "Magnesium Boots", + "item.modernmetals.magnesium_bolt": "Magnesium Bolt", + "item.modernmetals.magnesium_bow": "Magnesium Bow", + "item.modernmetals.magnesium_chestplate": "Magnesium Chestplate", + "item.modernmetals.magnesium_crackhammer": "Magnesium Crack Hammer", + "item.modernmetals.magnesium_crossbow": "Magnesium Crossbow", + "item.modernmetals.magnesium_door": "Magnesium Door", + "item.modernmetals.magnesium_fishing_rod": "Magnesium Fishing Rod", + "item.modernmetals.magnesium_gear": "Magnesium Gear", + "item.modernmetals.magnesium_helmet": "Magnesium Helmet", + "item.modernmetals.magnesium_hoe": "Magnesium Hoe", + "item.modernmetals.magnesium_horse_armor": "Magnesium Horse Armour", + "item.modernmetals.magnesium_ingot": "Magnesium Ingot", + "item.modernmetals.magnesium_leggings": "Magnesium Leg Armour", + "item.modernmetals.magnesium_nugget": "Magnesium Nugget", + "item.modernmetals.magnesium_ore": "Magnesium Ore", + "item.modernmetals.magnesium_pickaxe": "Magnesium Pickaxe", + "item.modernmetals.magnesium_powder": "Magnesium Dust", + "item.modernmetals.magnesium_rod": "Magnesium Rod", + "item.modernmetals.magnesium_shears": "Magnesium Shears", + "item.modernmetals.magnesium_shield": "Magnesium Shield", + "item.modernmetals.magnesium_shovel": "Magnesium Shovel", + "item.modernmetals.magnesium_smallblend": "Tiny Pile of Magnesium Blend", + "item.modernmetals.magnesium_smallpowder": "Tiny Pile of Magnesium Dust", + "item.modernmetals.magnesium_sword": "Magnesium Sword", + "item.modernmetals.magnesium_trapdoor": "Magnesium Trapdoor", + "material.manganese": "Manganese", + "item.modernmetals.manganese_arrow": "Manganese Arrow", + "item.modernmetals.manganese_axe": "Manganese Axe", + "item.modernmetals.manganese_bars": "Manganese Bars", + "item.modernmetals.manganese_blend": "Manganese Blend", + "item.modernmetals.manganese_block": "Block of Manganese", + "item.modernmetals.manganese_bolt": "Manganese Bolt", + "item.modernmetals.manganese_boots": "Manganese Boots", + "item.modernmetals.manganese_bow": "Manganese Bow", + "item.modernmetals.manganese_chestplate": "Manganese Chestplate", + "item.modernmetals.manganese_crackhammer": "Manganese Crack Hammer", + "item.modernmetals.manganese_crossbow": "Manganese Crossbow", + "item.modernmetals.manganese_door": "Manganese Door", + "item.modernmetals.manganese_fishing_rod": "Manganese Fishing Rod", + "item.modernmetals.manganese_gear": "Manganese Gear", + "item.modernmetals.manganese_helmet": "Manganese Helmet", + "item.modernmetals.manganese_hoe": "Manganese Hoe", + "item.modernmetals.manganese_horse_armor": "Manganese Horse Armour", + "item.modernmetals.manganese_ingot": "Manganese Ingot", + "item.modernmetals.manganese_leggings": "Manganese Leg Armour", + "item.modernmetals.manganese_nugget": "Manganese Nugget", + "item.modernmetals.manganese_ore": "Manganese Ore", + "item.modernmetals.manganese_pickaxe": "Manganese Pickaxe", + "item.modernmetals.manganese_powder": "Manganese Dust", + "item.modernmetals.manganese_rod": "Manganese Rod", + "item.modernmetals.manganese_shears": "Manganese Shears", + "item.modernmetals.manganese_shield": "Manganese Shield", + "item.modernmetals.manganese_shovel": "Manganese Shovel", + "item.modernmetals.manganese_smallblend": "Tiny Pile of Manganese Blend", + "item.modernmetals.manganese_smallpowder": "Tiny Pile of Manganese Dust", + "item.modernmetals.manganese_sword": "Manganese Sword", + "item.modernmetals.manganese_trapdoor": "Manganese Trapdoor", + "material.nichrome": "Nichrome", + "item.modernmetals.nichrome_arrow": "Nichrome Arrow", + "item.modernmetals.nichrome_axe": "Nichrome Axe", + "item.modernmetals.nichrome_bars": "Nichrome Bars", + "item.modernmetals.nichrome_blend": "Nichrome Blend", + "item.modernmetals.nichrome_block": "Block of Nichrome", + "item.modernmetals.nichrome_bolt": "Nichrome Bolt", + "item.modernmetals.nichrome_boots": "Nichrome Boots", + "item.modernmetals.nichrome_bow": "Nichrome Bow", + "item.modernmetals.nichrome_chestplate": "Nichrome Chestplate", + "item.modernmetals.nichrome_crackhammer": "Nichrome Crack Hammer", + "item.modernmetals.nichrome_crossbow": "Nichrome Crossbow", + "item.modernmetals.nichrome_door": "Nichrome Door", + "item.modernmetals.nichrome_fishing_rod": "Nichrome Fishing Rod", + "item.modernmetals.nichrome_gear": "Nichrome Gear", + "item.modernmetals.nichrome_helmet": "Nichrome Helmet", + "item.modernmetals.nichrome_hoe": "Nichrome Hoe", + "item.modernmetals.nichrome_horse_armor": "Nichrome Horse Armour", + "item.modernmetals.nichrome_ingot": "Nichrome Ingot", + "item.modernmetals.nichrome_leggings": "Nichrome Leg Armour", + "item.modernmetals.nichrome_nugget": "Nichrome Nugget", + "item.modernmetals.nichrome_ore": "Nichrome Ore", + "item.modernmetals.nichrome_pickaxe": "Nichrome Pickaxe", + "item.modernmetals.nichrome_powder": "Nichrome Dust", + "item.modernmetals.nichrome_rod": "Nichrome Rod", + "item.modernmetals.nichrome_shears": "Nichrome Shears", + "item.modernmetals.nichrome_shield": "Nichrome Shield", + "item.modernmetals.nichrome_shovel": "Nichrome Shovel", + "item.modernmetals.nichrome_smallblend": "Tiny Pile of Nichrome Blend", + "item.modernmetals.nichrome_smallpowder": "Tiny Pile of Nichrome Dust", + "item.modernmetals.nichrome_sword": "Nichrome Sword", + "item.modernmetals.nichrome_trapdoor": "Nichrome Trapdoor", + "material.osmium": "Osmium", + "item.modernmetals.osmium_arrow": "Osmium Arrow", + "item.modernmetals.osmium_axe": "Osmium Axe", + "item.modernmetals.osmium_bars": "Osmium Bars", + "item.modernmetals.osmium_blend": "Osmium Blend", + "item.modernmetals.osmium_block": "Block of Osmium", + "item.modernmetals.osmium_boots": "Osmium Boots", + "item.modernmetals.osmium_bolt": "Osmium Bolt", + "item.modernmetals.osmium_bow": "Osmium Bow", + "item.modernmetals.osmium_chestplate": "Osmium Chestplate", + "item.modernmetals.osmium_crackhammer": "Osmium Crack Hammer", + "item.modernmetals.osmium_crossbow": "Osmium Crossbow", + "item.modernmetals.osmium_door": "Osmium Door", + "item.modernmetals.osmium_fishing_rod": "Osmium Fishing Rod", + "item.modernmetals.osmium_gear": "Osmium Gear", + "item.modernmetals.osmium_helmet": "Osmium Helmet", + "item.modernmetals.osmium_hoe": "Osmium Hoe", + "item.modernmetals.osmium_horse_armor": "Osmium Horse Armour", + "item.modernmetals.osmium_ingot": "Osmium Ingot", + "item.modernmetals.osmium_leggings": "Osmium Leg Armour", + "item.modernmetals.osmium_nugget": "Osmium Nugget", + "item.modernmetals.osmium_ore": "Osmium Ore", + "item.modernmetals.osmium_pickaxe": "Osmium Pickaxe", + "item.modernmetals.osmium_powder": "Osmium Dust", + "item.modernmetals.osmium_rod": "Osmium Rod", + "item.modernmetals.osmium_shears": "Osmium Shears", + "item.modernmetals.osmium_shield": "Osmium Shield", + "item.modernmetals.osmium_shovel": "Osmium Shovel", + "item.modernmetals.osmium_smallblend": "Tiny Pile of Osmium Blend", + "item.modernmetals.osmium_smallpowder": "Tiny Pile of Osmium Dust", + "item.modernmetals.osmium_sword": "Osmium Sword", + "item.modernmetals.osmium_trapdoor": "Osmium Trapdoor", + "material.pewter": "Pewter", + "item.modernmetals.pewter_arrow": "Pewter Arrow", + "item.modernmetals.pewter_axe": "Pewter Axe", + "item.modernmetals.pewter_bars": "Pewter Bars", + "item.modernmetals.pewter_blend": "Pewter Blend", + "item.modernmetals.pewter_block": "Block of Pewter", + "item.modernmetals.pewter_boots": "Pewter Boots", + "item.modernmetals.pewter_chestplate": "Pewter Chestplate", + "item.modernmetals.pewter_crackhammer": "Pewter Crack Hammer", + "item.modernmetals.pewter_door": "Pewter Door", + "item.modernmetals.pewter_helmet": "Pewter Helmet", + "item.modernmetals.pewter_hoe": "Pewter Hoe", + "item.modernmetals.pewter_ingot": "Pewter Ingot", + "item.modernmetals.pewter_leggings": "Pewter Leg Armour", + "item.modernmetals.pewter_nugget": "Pewter Nugget", + "item.modernmetals.pewter_ore": "Pewter Ore", + "item.modernmetals.pewter_pickaxe": "Pewter Pickaxe", + "item.modernmetals.pewter_powder": "Pewter Dust", + "item.modernmetals.pewter_shears": "Pewter Shears", + "item.modernmetals.pewter_shield": "Pewter Shield", + "item.modernmetals.pewter_shovel": "Pewter Shovel", + "item.modernmetals.pewter_smallpowder": "Tiny Pile of Pewter Dust", + "item.modernmetals.pewter_sword": "Pewter Sword", + "item.modernmetals.pewter_trapdoor": "Pewter Trapdoor", + "material.plutonium": "Plutonium", + "item.modernmetals.plutonium_arrow": "Plutonium Arrow", + "item.modernmetals.plutonium_axe": "Plutonium Axe", + "item.modernmetals.plutonium_bars": "Plutonium Bars", + "item.modernmetals.plutonium_blend": "Plutonium Blend", + "item.modernmetals.plutonium_block": "Block of Plutonium", + "item.modernmetals.plutonium_bolt": "Plutonium Bolt", + "item.modernmetals.plutonium_boots": "Plutonium Boots", + "item.modernmetals.plutonium_bow": "Plutonium Bow", + "item.modernmetals.plutonium_chestplate": "Plutonium Chestplate", + "item.modernmetals.plutonium_crackhammer": "Plutonium Crack Hammer", + "item.modernmetals.plutonium_crossbow": "Plutonium Crossbow", + "item.modernmetals.plutonium_door": "Plutonium Door", + "item.modernmetals.plutonium_fishing_rod": "Plutonium Fishing Rod", + "item.modernmetals.plutonium_gear": "Plutonium Gear", + "item.modernmetals.plutonium_helmet": "Plutonium Helmet", + "item.modernmetals.plutonium_hoe": "Plutonium Hoe", + "item.modernmetals.plutonium_horse_armor": "Plutonium Horse Armour", + "item.modernmetals.plutonium_ingot": "Plutonium Ingot", + "item.modernmetals.plutonium_leggings": "Plutonium Leg Armour", + "item.modernmetals.plutonium_nugget": "Plutonium Nugget", + "item.modernmetals.plutonium_ore": "Plutonium Ore", + "item.modernmetals.plutonium_pickaxe": "Plutonium Pickaxe", + "item.modernmetals.plutonium_powder": "Plutonium Dust", + "item.modernmetals.plutonium_rod": "Plutonium Rod", + "item.modernmetals.plutonium_shears": "Plutonium Shears", + "item.modernmetals.plutonium_shield": "Plutonium Shield", + "item.modernmetals.plutonium_shovel": "Plutonium Shovel", + "item.modernmetals.plutonium_smallblend": "Tiny Pile of Plutonium Blend", + "item.modernmetals.plutonium_smallpowder": "Tiny Pile of Plutonium Dust", + "item.modernmetals.plutonium_sword": "Plutonium Sword", + "item.modernmetals.plutonium_trapdoor": "Plutonium Trapdoor", + "material.rutile": "Rutile", + "item.modernmetals.rutile_arrow": "Rutile Arrow", + "item.modernmetals.rutile_axe": "Rutile Axe", + "item.modernmetals.rutile_bars": "Rutile Bars", + "item.modernmetals.rutile_blend": "Rutile Blend", + "item.modernmetals.rutile_block": "Block of Rutile", + "item.modernmetals.rutile_boots": "Rutile Boots", + "item.modernmetals.rutile_bolt": "Rutile Bolt", + "item.modernmetals.rutile_bow": "Rutile Bow", + "item.modernmetals.rutile_chestplate": "Rutile Chestplate", + "item.modernmetals.rutile_crackhammer": "Rutile Crack Hammer", + "item.modernmetals.rutile_crossbow": "Rutile Crossbow", + "item.modernmetals.rutile_door": "Rutile Door", + "item.modernmetals.rutile_fishing_rod": "Rutile Fishing Rod", + "item.modernmetals.rutile_gear": "Rutile Gear", + "item.modernmetals.rutile_helmet": "Rutile Helmet", + "item.modernmetals.rutile_hoe": "Rutile Hoe", + "item.modernmetals.rutile_horse_armor": "Rutile Horse Armour", + "item.modernmetals.rutile_ingot": "Rutile Ingot", + "item.modernmetals.rutile_leggings": "Rutile Leg Armour", + "item.modernmetals.rutile_nugget": "Rutile Nugget", + "item.modernmetals.rutile_ore": "Rutile Ore", + "item.modernmetals.rutile_pickaxe": "Rutile Pickaxe", + "item.modernmetals.rutile_powder": "Rutile Dust", + "item.modernmetals.rutile_rod": "Rutile Rod", + "item.modernmetals.rutile_shears": "Rutile Shears", + "item.modernmetals.rutile_shield": "Rutile Shield", + "item.modernmetals.rutile_shovel": "Rutile Shovel", + "item.modernmetals.rutile_smallblend": "Tiny Pile of Rutile Blend", + "item.modernmetals.rutile_smallpowder": "Tiny Pile of Rutile Dust", + "item.modernmetals.rutile_sword": "Rutile Sword", + "item.modernmetals.rutile_trapdoor": "Rutile Trapdoor", + "material.stainlesssteel": "Stainless Steel", + "item.modernmetals.stainlesssteel_arrow": "Stainless Steel Arrow", + "item.modernmetals.stainlesssteel_axe": "Stainless Steel Axe", + "item.modernmetals.stainlesssteel_bars": "Stainless Steel Bars", + "item.modernmetals.stainlesssteel_blend": "Stainless Steel Blend", + "item.modernmetals.stainlesssteel_block": "Block of Stainless Steel", + "item.modernmetals.stainlesssteel_bolt": "Stainless Steel Bolt", + "item.modernmetals.stainlesssteel_boots": "Stainless Steel Boots", + "item.modernmetals.stainlesssteel_bow": "Stainless Steel Bow", + "item.modernmetals.stainlesssteel_chestplate": "Stainless Steel Chestplate", + "item.modernmetals.stainlesssteel_crackhammer": "Stainless Steel Crack Hammer", + "item.modernmetals.stainlesssteel_crossbow": "Stainless Steel Crossbow", + "item.modernmetals.stainlesssteel_door": "Stainless Steel Door", + "item.modernmetals.stainlesssteel_fishing_rod": "Stainless Steel Fishing Rod", + "item.modernmetals.stainlesssteel_gear": "Stainless Steel Gear", + "item.modernmetals.stainlesssteel_helmet": "Stainless Steel Helmet", + "item.modernmetals.stainlesssteel_hoe": "Stainless Steel Hoe", + "item.modernmetals.stainlesssteel_horse_armor": "Stainless Steel Horse Armour", + "item.modernmetals.stainlesssteel_ingot": "Stainless Steel Ingot", + "item.modernmetals.stainlesssteel_leggings": "Stainless Steel Leg Armour", + "item.modernmetals.stainlesssteel_nugget": "Stainless Steel Nugget", + "item.modernmetals.stainlesssteel_ore": "Stainless Steel Ore", + "item.modernmetals.stainlesssteel_pickaxe": "Stainless Steel Pickaxe", + "item.modernmetals.stainlesssteel_powder": "Stainless Steel Dust", + "item.modernmetals.stainlesssteel_rod": "Stainless Steel Rod", + "item.modernmetals.stainlesssteel_shears": "Stainless Steel Shears", + "item.modernmetals.stainlesssteel_shield": "Stainless Steel Shield", + "item.modernmetals.stainlesssteel_shovel": "Stainless Steel Shovel", + "item.modernmetals.stainlesssteel_smallblend": "Tiny Pile of Stainless Steel Blend", + "item.modernmetals.stainlesssteel_smallpowder": "Tiny Pile of Stainless Steel Dust", + "item.modernmetals.stainlesssteel_sword": "Stainless Steel Sword", + "item.modernmetals.stainlesssteel_trapdoor": "Stainless Steel Trapdoor", + "material.tantalum": "Tantalum", + "item.modernmetals.tantalum_arrow": "Tantalum Arrow", + "item.modernmetals.tantalum_axe": "Tantalum Axe", + "item.modernmetals.tantalum_bars": "Tantalum Bars", + "item.modernmetals.tantalum_blend": "Tantalum Blend", + "item.modernmetals.tantalum_block": "Block of Tantalum", + "item.modernmetals.tantalum_bolt": "Tantalum Bolt", + "item.modernmetals.tantalum_boots": "Tantalum Boots", + "item.modernmetals.tantalum_bow": "Tantalum Bow", + "item.modernmetals.tantalum_chestplate": "Tantalum Chestplate", + "item.modernmetals.tantalum_crackhammer": "Tantalum Crack Hammer", + "item.modernmetals.tantalum_crossbow": "Tantalum Crossbow", + "item.modernmetals.tantalum_door": "Tantalum Door", + "item.modernmetals.tantalum_fishing_rod": "Tantalum Fishing Rod", + "item.modernmetals.tantalum_gear": "Tantalum Gear", + "item.modernmetals.tantalum_helmet": "Tantalum Helmet", + "item.modernmetals.tantalum_hoe": "Tantalum Hoe", + "item.modernmetals.tantalum_horse_armor": "Tantalum Horse Armour", + "item.modernmetals.tantalum_ingot": "Tantalum Ingot", + "item.modernmetals.tantalum_leggings": "Tantalum Leg Armour", + "item.modernmetals.tantalum_nugget": "Tantalum Nugget", + "item.modernmetals.tantalum_ore": "Tantalum Ore", + "item.modernmetals.tantalum_pickaxe": "Tantalum Pickaxe", + "item.modernmetals.tantalum_powder": "Tantalum Dust", + "item.modernmetals.tantalum_rod": "Tantalum Rod", + "item.modernmetals.tantalum_shears": "Tantalum Shears", + "item.modernmetals.tantalum_shield": "Tantalum Shield", + "item.modernmetals.tantalum_shovel": "Tantalum Shovel", + "item.modernmetals.tantalum_smallblend": "Tiny Pile of Tantalum Blend", + "item.modernmetals.tantalum_smallpowder": "Tiny Pile of Tantalum Dust", + "item.modernmetals.tantalum_sword": "Tantalum Sword", + "item.modernmetals.tantalum_trapdoor": "Tantalum Trapdoor", + "material.titanium": "Titanium", + "item.modernmetals.titanium_arrow": "Titanium Arrow", + "item.modernmetals.titanium_axe": "Titanium Axe", + "item.modernmetals.titanium_bars": "Titanium Bars", + "item.modernmetals.titanium_blend": "Titanium Blend", + "item.modernmetals.titanium_block": "Block of Titanium", + "item.modernmetals.titanium_boots": "Titanium Boots", + "item.modernmetals.titanium_bolt": "Titanium Bolt", + "item.modernmetals.titanium_bow": "Titanium Bow", + "item.modernmetals.titanium_chestplate": "Titanium Chestplate", + "item.modernmetals.titanium_crackhammer": "Titanium Crack Hammer", + "item.modernmetals.titanium_crossbow": "Titanium Crossbow", + "item.modernmetals.titanium_door": "Titanium Door", + "item.modernmetals.titanium_fishing_rod": "Titanium Fishing Rod", + "item.modernmetals.titanium_gear": "Titanium Gear", + "item.modernmetals.titanium_helmet": "Titanium Helmet", + "item.modernmetals.titanium_hoe": "Titanium Hoe", + "item.modernmetals.titanium_horse_armor": "Titanium Horse Armour", + "item.modernmetals.titanium_ingot": "Titanium Ingot", + "item.modernmetals.titanium_leggings": "Titanium Leg Armour", + "item.modernmetals.titanium_nugget": "Titanium Nugget", + "item.modernmetals.titanium_ore": "Titanium Ore", + "item.modernmetals.titanium_pickaxe": "Titanium Pickaxe", + "item.modernmetals.titanium_powder": "Titanium Dust", + "item.modernmetals.titanium_rod": "Titanium Rod", + "item.modernmetals.titanium_shears": "Titanium Shears", + "item.modernmetals.titanium_shield": "Titanium Shield", + "item.modernmetals.titanium_shovel": "Titanium Shovel", + "item.modernmetals.titanium_smallblend": "Tiny Pile of Titanium Blend", + "item.modernmetals.titanium_smallpowder": "Tiny Pile of Titanium Dust", + "item.modernmetals.titanium_sword": "Titanium Sword", + "item.modernmetals.titanium_trapdoor": "Titanium Trapdoor", + "material.tungsten": "Tungsten", + "item.modernmetals.tungsten_arrow": "Tungsten Arrow", + "item.modernmetals.tungsten_axe": "Tungsten Axe", + "item.modernmetals.tungsten_bars": "Tungsten Bars", + "item.modernmetals.tungsten_blend": "Tungsten Blend", + "item.modernmetals.tungsten_block": "Block of Tungsten", + "item.modernmetals.tungsten_boots": "Tungsten Boots", + "item.modernmetals.tungsten_bolt": "Tungsten Bolt", + "item.modernmetals.tungsten_bow": "Tungsten Bow", + "item.modernmetals.tungsten_chestplate": "Tungsten Chestplate", + "item.modernmetals.tungsten_crackhammer": "Tungsten Crack Hammer", + "item.modernmetals.tungsten_crossbow": "Tungsten Crossbow", + "item.modernmetals.tungsten_door": "Tungsten Door", + "item.modernmetals.tungsten_fishing_rod": "Tungsten Fishing Rod", + "item.modernmetals.tungsten_gear": "Tungsten Gear", + "item.modernmetals.tungsten_helmet": "Tungsten Helmet", + "item.modernmetals.tungsten_hoe": "Tungsten Hoe", + "item.modernmetals.tungsten_horse_armor": "Tungsten Horse Armour", + "item.modernmetals.tungsten_ingot": "Tungsten Ingot", + "item.modernmetals.tungsten_leggings": "Tungsten Leg Armour", + "item.modernmetals.tungsten_nugget": "Tungsten Nugget", + "item.modernmetals.tungsten_ore": "Tungsten Ore", + "item.modernmetals.tungsten_pickaxe": "Tungsten Pickaxe", + "item.modernmetals.tungsten_powder": "Tungsten Dust", + "item.modernmetals.tungsten_rod": "Tungsten Rod", + "item.modernmetals.tungsten_shears": "Tungsten Shears", + "item.modernmetals.tungsten_shield": "Tungsten Shield", + "item.modernmetals.tungsten_shovel": "Tungsten Shovel", + "item.modernmetals.tungsten_smallblend": "Tiny Pile of Tungsten Blend", + "item.modernmetals.tungsten_smallpowder": "Tiny Pile of Tungsten Dust", + "item.modernmetals.tungsten_sword": "Tungsten Sword", + "item.modernmetals.tungsten_trapdoor": "Tungsten Trapdoor", + "material.uranium": "Uranium", + "item.modernmetals.uranium_arrow": "Uranium Arrow", + "item.modernmetals.uranium_axe": "Uranium Axe", + "item.modernmetals.uranium_bars": "Uranium Bars", + "item.modernmetals.uranium_blend": "Uranium Blend", + "item.modernmetals.uranium_block": "Block of Uranium", + "item.modernmetals.uranium_boots": "Uranium Boots", + "item.modernmetals.uranium_bolt": "Uranium Bolt", + "item.modernmetals.uranium_bow": "Uranium Bow", + "item.modernmetals.uranium_chestplate": "Uranium Chestplate", + "item.modernmetals.uranium_crackhammer": "Uranium Crack Hammer", + "item.modernmetals.uranium_crossbow": "Uranium Crossbow", + "item.modernmetals.uranium_door": "Uranium Door", + "item.modernmetals.uranium_fishing_rod": "Uranium Fishing Rod", + "item.modernmetals.uranium_gear": "Uranium Gear", + "item.modernmetals.uranium_helmet": "Uranium Helmet", + "item.modernmetals.uranium_hoe": "Uranium Hoe", + "item.modernmetals.uranium_horse_armor": "Uranium Horse Armour", + "item.modernmetals.uranium_ingot": "Uranium Ingot", + "item.modernmetals.uranium_leggings": "Uranium Leg Armour", + "item.modernmetals.uranium_nugget": "Uranium Nugget", + "item.modernmetals.uranium_ore": "Uranium Ore", + "item.modernmetals.uranium_pickaxe": "Uranium Pickaxe", + "item.modernmetals.uranium_powder": "Uranium Dust", + "item.modernmetals.uranium_rod": "Uranium Rod", + "item.modernmetals.uranium_shears": "Uranium Shears", + "item.modernmetals.uranium_shield": "Uranium Shield", + "item.modernmetals.uranium_shovel": "Uranium Shovel", + "item.modernmetals.uranium_smallblend": "Tiny Pile of Uranium Blend", + "item.modernmetals.uranium_smallpowder": "Tiny Pile of Uranium Dust", + "item.modernmetals.uranium_sword": "Uranium Sword", + "item.modernmetals.uranium_trapdoor": "Uranium Trapdoor", + "material.zirconium": "Zirconium", + "item.modernmetals.zirconium_arrow": "Zirconium Arrow", + "item.modernmetals.zirconium_axe": "Zirconium Axe", + "item.modernmetals.zirconium_bars": "Zirconium Bars", + "item.modernmetals.zirconium_blend": "Zirconium Blend", + "item.modernmetals.zirconium_block": "Block of Zirconium", + "item.modernmetals.zirconium_bolt": "Zirconium Bolt", + "item.modernmetals.zirconium_boots": "Zirconium Boots", + "item.modernmetals.zirconium_bow": "Zirconium Bow", + "item.modernmetals.zirconium_chestplate": "Zirconium Chestplate", + "item.modernmetals.zirconium_crackhammer": "Zirconium Crack Hammer", + "item.modernmetals.zirconium_crossbow": "Zirconium Crossbow", + "item.modernmetals.zirconium_door": "Zirconium Door", + "item.modernmetals.zirconium_fishing_rod": "Zirconium Fishing Rod", + "item.modernmetals.zirconium_gear": "Zirconium Gear", + "item.modernmetals.zirconium_helmet": "Zirconium Helmet", + "item.modernmetals.zirconium_hoe": "Zirconium Hoe", + "item.modernmetals.zirconium_horse_armor": "Zirconium Horse Armour", + "item.modernmetals.zirconium_ingot": "Zirconium Ingot", + "item.modernmetals.zirconium_leggings": "Zirconium Leg Armour", + "item.modernmetals.zirconium_nugget": "Zirconium Nugget", + "item.modernmetals.zirconium_ore": "Zirconium Ore", + "item.modernmetals.zirconium_pickaxe": "Zirconium Pickaxe", + "item.modernmetals.zirconium_powder": "Zirconium Dust", + "item.modernmetals.zirconium_rod": "Zirconium Rod", + "item.modernmetals.zirconium_shears": "Zirconium Shears", + "item.modernmetals.zirconium_shield": "Zirconium Shield", + "item.modernmetals.zirconium_shovel": "Zirconium Shovel", + "item.modernmetals.zirconium_smallblend": "Tiny Pile of Zirconium Blend", + "item.modernmetals.zirconium_smallpowder": "Tiny Pile of Zirconium Dust", + "item.modernmetals.zirconium_sword": "Zirconium Sword", + "item.modernmetals.zirconium_trapdoor": "Zirconium Trapdoor", + "tile.modernmetals.aluminum_bars": "Aluminum Bars", + "block.modernmetals.aluminum_bars": "Aluminum Bars", + "tile.modernmetals.aluminum_block": "Block of Aluminum", + "block.modernmetals.aluminum_block": "Block of Aluminum", + "tile.modernmetals.aluminum_door": "Aluminum Door", + "block.modernmetals.aluminum_door": "Aluminum Door", + "tile.modernmetals.aluminum_ore": "Aluminum Ore", + "block.modernmetals.aluminum_ore": "Aluminum Ore", + "tile.modernmetals.aluminum_plate": "Aluminum Plate", + "block.modernmetals.aluminum_plate": "Aluminum Plate", + "tile.modernmetals.aluminum_trapdoor": "Aluminum Trapdoor", + "block.modernmetals.aluminum_trapdoor": "Aluminum Trapdoor", + "tile.modernmetals.aluminumbrass_bars": "Aluminum Brass Bars", + "block.modernmetals.aluminumbrass_bars": "Aluminum Brass Bars", + "tile.modernmetals.aluminumbrass_block": "Block of Aluminum Brass", + "block.modernmetals.aluminumbrass_block": "Block of Aluminum Brass", + "tile.modernmetals.aluminumbrass_door": "Aluminum Brass Door", + "block.modernmetals.aluminumbrass_door": "Aluminum Brass Door", + "tile.modernmetals.aluminumbrass_ore": "Aluminum Brass Ore", + "block.modernmetals.aluminumbrass_ore": "Aluminum Brass Ore", + "tile.modernmetals.aluminumbrass_plate": "Aluminum Brass Plate", + "block.modernmetals.aluminumbrass_plate": "Aluminum Brass Plate", + "tile.modernmetals.aluminumbrass_trapdoor": "Aluminum Brass Trapdoor", + "block.modernmetals.aluminumbrass_trapdoor": "Aluminum Brass Trapdoor", + "tile.modernmetals.boron_bars": "Boron Bars", + "block.modernmetals.boron_bars": "Boron Bars", + "tile.modernmetals.boron_block": "Block of Boron", + "block.modernmetals.boron_block": "Block of Boron", + "tile.modernmetals.boron_door": "Boron Door", + "block.modernmetals.boron_door": "Boron Door", + "tile.modernmetals.boron_ore": "Boron Ore", + "block.modernmetals.boron_ore": "Boron Ore", + "tile.modernmetals.boron_plate": "Boron Plate", + "block.modernmetals.boron_plate": "Boron Plate", + "tile.modernmetals.boron_trapdoor": "Boron Trapdoor", + "block.modernmetals.boron_trapdoor": "Boron Trapdoor", + "tile.modernmetals.cadmium_bars": "Cadmium Bars", + "block.modernmetals.cadmium_bars": "Cadmium Bars", + "tile.modernmetals.cadmium_block": "Block of Cadmium", + "block.modernmetals.cadmium_block": "Block of Cadmium", + "tile.modernmetals.cadmium_door": "Cadmium Door", + "block.modernmetals.cadmium_door": "Cadmium Door", + "tile.modernmetals.cadmium_ore": "Cadmium Ore", + "block.modernmetals.cadmium_ore": "Cadmium Ore", + "tile.modernmetals.cadmium_plate": "Cadmium Plate", + "block.modernmetals.cadmium_plate": "Cadmium Plate", + "tile.modernmetals.cadmium_trapdoor": "Cadmium Trapdoor", + "block.modernmetals.cadmium_trapdoor": "Cadmium Trapdoor", + "tile.modernmetals.chromium_bars": "Chromium Bars", + "block.modernmetals.chromium_bars": "Chromium Bars", + "tile.modernmetals.chromium_block": "Block of Chromium", + "block.modernmetals.chromium_block": "Block of Chromium", + "tile.modernmetals.chromium_door": "Chromium Door", + "block.modernmetals.chromium_door": "Chromium Door", + "tile.modernmetals.chromium_ore": "Chromium Ore", + "block.modernmetals.chromium_ore": "Chromium Ore", + "tile.modernmetals.chromium_plate": "Chromium Plate", + "block.modernmetals.chromium_plate": "Chromium Plate", + "tile.modernmetals.chromium_trapdoor": "Chromium Trapdoor", + "block.modernmetals.chromium_trapdoor": "Chromium Trapdoor", + "tile.modernmetals.galvanizedsteel_bars": "Galvanized Steel Bars", + "block.modernmetals.galvanizedsteel_bars": "Galvanized Steel Bars", + "tile.modernmetals.galvanizedsteel_block": "Block of Galvanized Steel", + "block.modernmetals.galvanizedsteel_block": "Block of Galvanized Steel", + "tile.modernmetals.galvanizedsteel_door": "Galvanized Steel Door", + "block.modernmetals.galvanizedsteel_door": "Galvanized Steel Door", + "tile.modernmetals.galvanizedsteel_ore": "Galvanized Steel Ore", + "block.modernmetals.galvanizedsteel_ore": "Galvanized Steel Ore", + "tile.modernmetals.galvanizedsteel_plate": "Galvanized Steel Plate", + "block.modernmetals.galvanizedsteel_plate": "Galvanized Steel Plate", + "tile.modernmetals.galvanizedsteel_trapdoor": "Galvanized Steel Trapdoor", + "block.modernmetals.galvanizedsteel_trapdoor": "Galvanized Steel Trapdoor", + "tile.modernmetals.iridium_bars": "Iridium Bars", + "block.modernmetals.iridium_bars": "Iridium Bars", + "tile.modernmetals.iridium_block": "Block of Iridium", + "block.modernmetals.iridium_block": "Block of Iridium", + "tile.modernmetals.iridium_door": "Iridium Door", + "block.modernmetals.iridium_door": "Iridium Door", + "tile.modernmetals.iridium_ore": "Iridium Ore", + "block.modernmetals.iridium_ore": "Iridium Ore", + "tile.modernmetals.iridium_plate": "Iridium Plate", + "block.modernmetals.iridium_plate": "Iridium Plate", + "tile.modernmetals.iridium_trapdoor": "Iridium Trapdoor", + "block.modernmetals.iridium_trapdoor": "Iridium Trapdoor", + "tile.modernmetals.magnesium_bars": "Magnesium Bars", + "block.modernmetals.magnesium_bars": "Magnesium Bars", + "tile.modernmetals.magnesium_block": "Block of Magnesium", + "block.modernmetals.magnesium_block": "Block of Magnesium", + "tile.modernmetals.magnesium_door": "Magnesium Door", + "block.modernmetals.magnesium_door": "Magnesium Door", + "tile.modernmetals.magnesium_ore": "Magnesium Ore", + "block.modernmetals.magnesium_ore": "Magnesium Ore", + "tile.modernmetals.magnesium_plate": "Magnesium Plate", + "block.modernmetals.magnesium_plate": "Magnesium Plate", + "tile.modernmetals.magnesium_trapdoor": "Magnesium Trapdoor", + "block.modernmetals.magnesium_trapdoor": "Magnesium Trapdoor", + "tile.modernmetals.manganese_bars": "Manganese Bars", + "block.modernmetals.manganese_bars": "Manganese Bars", + "tile.modernmetals.manganese_block": "Block of Manganese", + "block.modernmetals.manganese_block": "Block of Manganese", + "tile.modernmetals.manganese_door": "Manganese Door", + "block.modernmetals.manganese_door": "Manganese Door", + "tile.modernmetals.manganese_ore": "Manganese Ore", + "block.modernmetals.manganese_ore": "Manganese Ore", + "tile.modernmetals.manganese_plate": "Manganese Plate", + "block.modernmetals.manganese_plate": "Manganese Plate", + "tile.modernmetals.manganese_trapdoor": "Manganese Trapdoor", + "block.modernmetals.manganese_trapdoor": "Manganese Trapdoor", + "tile.modernmetals.nichrome_bars": "Nichrome Bars", + "block.modernmetals.nichrome_bars": "Nichrome Bars", + "tile.modernmetals.nichrome_block": "Block of Nichrome", + "block.modernmetals.nichrome_block": "Block of Nichrome", + "tile.modernmetals.nichrome_door": "Nichrome Door", + "block.modernmetals.nichrome_door": "Nichrome Door", + "tile.modernmetals.nichrome_ore": "Nichrome Ore", + "block.modernmetals.nichrome_ore": "Nichrome Ore", + "tile.modernmetals.nichrome_plate": "Nichrome Plate", + "block.modernmetals.nichrome_plate": "Nichrome Plate", + "tile.modernmetals.nichrome_trapdoor": "Nichrome Trapdoor", + "block.modernmetals.nichrome_trapdoor": "Nichrome Trapdoor", + "tile.modernmetals.osmium_bars": "Osmium Bars", + "block.modernmetals.osmium_bars": "Osmium Bars", + "tile.modernmetals.osmium_block": "Block of Osmium", + "block.modernmetals.osmium_block": "Block of Osmium", + "tile.modernmetals.osmium_door": "Osmium Door", + "block.modernmetals.osmium_door": "Osmium Door", + "tile.modernmetals.osmium_ore": "Osmium Ore", + "block.modernmetals.osmium_ore": "Osmium Ore", + "tile.modernmetals.osmium_plate": "Osmium Plate", + "block.modernmetals.osmium_plate": "Osmium Plate", + "tile.modernmetals.osmium_trapdoor": "Osmium Trapdoor", + "block.modernmetals.osmium_trapdoor": "Osmium Trapdoor", + "tile.modernmetals.plutonium_bars": "Plutonium Bars", + "block.modernmetals.plutonium_bars": "Plutonium Bars", + "tile.modernmetals.plutonium_block": "Block of Plutonium", + "block.modernmetals.plutonium_block": "Block of Plutonium", + "tile.modernmetals.plutonium_door": "Plutonium Door", + "block.modernmetals.plutonium_door": "Plutonium Door", + "tile.modernmetals.plutonium_ore": "Plutonium Ore", + "block.modernmetals.plutonium_ore": "Plutonium Ore", + "tile.modernmetals.plutonium_plate": "Plutonium Plate", + "block.modernmetals.plutonium_plate": "Plutonium Plate", + "tile.modernmetals.plutonium_trapdoor": "Plutonium Trapdoor", + "block.modernmetals.plutonium_trapdoor": "Plutonium Trapdoor", + "tile.modernmetals.rutile_bars": "Rutile Bars", + "block.modernmetals.rutile_bars": "Rutile Bars", + "tile.modernmetals.rutile_block": "Block of Rutile", + "block.modernmetals.rutile_block": "Block of Rutile", + "tile.modernmetals.rutile_door": "Rutile Door", + "block.modernmetals.rutile_door": "Rutile Door", + "tile.modernmetals.rutile_ore": "Rutile Ore", + "block.modernmetals.rutile_ore": "Rutile Ore", + "tile.modernmetals.rutile_plate": "Rutile Plate", + "block.modernmetals.rutile_plate": "Rutile Plate", + "tile.modernmetals.rutile_trapdoor": "Rutile Trapdoor", + "block.modernmetals.rutile_trapdoor": "Rutile Trapdoor", + "tile.modernmetals.stainlesssteel_bars": "Stainless Steel Bars", + "block.modernmetals.stainlesssteel_bars": "Stainless Steel Bars", + "tile.modernmetals.stainlesssteel_block": "Block of Stainless Steel", + "block.modernmetals.stainlesssteel_block": "Block of Stainless Steel", + "tile.modernmetals.stainlesssteel_door": "Stainless Steel Door", + "block.modernmetals.stainlesssteel_door": "Stainless Steel Door", + "tile.modernmetals.stainlesssteel_ore": "Stainless Steel Ore", + "block.modernmetals.stainlesssteel_ore": "Stainless Steel Ore", + "tile.modernmetals.stainlesssteel_plate": "Stainless Steel Plate", + "block.modernmetals.stainlesssteel_plate": "Stainless Steel Plate", + "tile.modernmetals.stainlesssteel_trapdoor": "Stainless Steel Trapdoor", + "block.modernmetals.stainlesssteel_trapdoor": "Stainless Steel Trapdoor", + "tile.modernmetals.tantalum_bars": "Tantalum Bars", + "block.modernmetals.tantalum_bars": "Tantalum Bars", + "tile.modernmetals.tantalum_block": "Block of Tantalum", + "block.modernmetals.tantalum_block": "Block of Tantalum", + "tile.modernmetals.tantalum_door": "Tantalum Door", + "block.modernmetals.tantalum_door": "Tantalum Door", + "tile.modernmetals.tantalum_ore": "Tantalum Ore", + "block.modernmetals.tantalum_ore": "Tantalum Ore", + "tile.modernmetals.tantalum_plate": "Tantalum Plate", + "block.modernmetals.tantalum_plate": "Tantalum Plate", + "tile.modernmetals.tantalum_trapdoor": "Tantalum Trapdoor", + "block.modernmetals.tantalum_trapdoor": "Tantalum Trapdoor", + "tile.modernmetals.titanium_bars": "Titanium Bars", + "block.modernmetals.titanium_bars": "Titanium Bars", + "tile.modernmetals.titanium_block": "Block of Titanium", + "block.modernmetals.titanium_block": "Block of Titanium", + "tile.modernmetals.titanium_door": "Titanium Door", + "block.modernmetals.titanium_door": "Titanium Door", + "tile.modernmetals.titanium_ore": "Titanium Ore", + "block.modernmetals.titanium_ore": "Titanium Ore", + "tile.modernmetals.titanium_plate": "Titanium Plate", + "block.modernmetals.titanium_plate": "Titanium Plate", + "tile.modernmetals.titanium_trapdoor": "Titanium Trapdoor", + "block.modernmetals.titanium_trapdoor": "Titanium Trapdoor", + "tile.modernmetals.tungsten_bars": "Tungsten Bars", + "block.modernmetals.tungsten_bars": "Tungsten Bars", + "tile.modernmetals.tungsten_block": "Block of Tungsten", + "block.modernmetals.tungsten_block": "Block of Tungsten", + "tile.modernmetals.tungsten_door": "Tungsten Door", + "block.modernmetals.tungsten_door": "Tungsten Door", + "tile.modernmetals.tungsten_ore": "Tungsten Ore", + "block.modernmetals.tungsten_ore": "Tungsten Ore", + "tile.modernmetals.tungsten_plate": "Tungsten Plate", + "block.modernmetals.tungsten_plate": "Tungsten Plate", + "tile.modernmetals.tungsten_trapdoor": "Tungsten Trapdoor", + "block.modernmetals.tungsten_trapdoor": "Tungsten Trapdoor", + "tile.modernmetals.uranium_bars": "Uranium Bars", + "block.modernmetals.uranium_bars": "Uranium Bars", + "tile.modernmetals.uranium_block": "Block of Uranium", + "block.modernmetals.uranium_block": "Block of Uranium", + "tile.modernmetals.uranium_door": "Uranium Door", + "block.modernmetals.uranium_door": "Uranium Door", + "tile.modernmetals.uranium_ore": "Uranium Ore", + "block.modernmetals.uranium_ore": "Uranium Ore", + "tile.modernmetals.uranium_plate": "Uranium Plate", + "block.modernmetals.uranium_plate": "Uranium Plate", + "tile.modernmetals.uranium_trapdoor": "Uranium Trapdoor", + "block.modernmetals.uranium_trapdoor": "Uranium Trapdoor", + "tile.modernmetals.zirconium_bars": "Zirconium Bars", + "block.modernmetals.zirconium_bars": "Zirconium Bars", + "tile.modernmetals.zirconium_block": "Block of Zirconium", + "block.modernmetals.zirconium_block": "Block of Zirconium", + "tile.modernmetals.zirconium_door": "Zirconium Door", + "block.modernmetals.zirconium_door": "Zirconium Door", + "tile.modernmetals.zirconium_ore": "Zirconium Ore", + "block.modernmetals.zirconium_ore": "Zirconium Ore", + "tile.modernmetals.zirconium_plate": "Zirconium Plate", + "block.modernmetals.zirconium_plate": "Zirconium Plate", + "tile.modernmetals.zirconium_trapdoor": "Zirconium Trapdoor", + "block.modernmetals.zirconium_trapdoor": "Zirconium Trapdoor", + "tooltip.aluminum.tool": "Nothing Special", + "tooltip.aluminumbrass.tool": "Nothing Special", + "tooltip.cadmium.tool": "Nothing Special", + "tooltip.chromium.tool": "Nothing Special", + "tooltip.galvanized_steel.tool": "Nothing Special", + "tooltip.iridium.tool": "Nothing Special", + "tooltip.magnesium.tool": "Nothing Special", + "tooltip.manganese.tool": "Nothing Special", + "tooltip.nichrome.tool": "Nothing Special", + "tooltip.osmium.tool": "Nothing Special", + "tooltip.plutonium.tool": "Nothing Special", + "tooltip.rutile.tool": "Nothing Special", + "tooltip.stainless_steel.tool": "Nothing Special", + "tooltip.tantalum.tool": "Nothing Special", + "tooltip.titanium.tool": "Nothing Special", + "tooltip.tungsten.tool": "Nothing Special", + "tooltip.uranium.tool": "Nothing Special", + "tooltip.zirconium.tool": "Nothing Special", + "tooltip.aluminum.armor": "Nothing Special", + "tooltip.aluminumbrass.armor": "Nothing Special", + "tooltip.cadmium.armor": "Nothing Special", + "tooltip.chromium.armor": "Nothing Special", + "tooltip.galvanized_steel.armor": "Nothing Special", + "tooltip.iridium.armor": "Nothing Special", + "tooltip.magnesium.armor": "Nothing Special", + "tooltip.manganese.armor": "Nothing Special", + "tooltip.nichrome.armor": "Nothing Special", + "tooltip.osmium.armor": "Nothing Special", + "tooltip.plutonium.armor": "Nothing Special", + "tooltip.rutile.armor": "Nothing Special", + "tooltip.stainless_steel.armor": "Nothing Special", + "tooltip.tantalum.armor": "Nothing Special", + "tooltip.titanium.armor": "Nothing Special", + "tooltip.tungsten.armor": "Nothing Special", + "tooltip.uranium.armor": "Nothing Special", + "tooltip.zirconium.armor": "Nothing Special", + "achievement.aluminumbrass_maker": "Aluminum Brass", + "achievement.galvanized_steel_maker": "Galvanized Steel", + "achievement.nichrome_maker": "Nichrome", + "achievement.stainless_steel_maker": "Stainless Steel", + "achievement.titanium_maker": "Titanium", + "achievement.aluminumbrass_maker.desc": "Combine Aluminum Dust and Brass Dust to make Aluminum Brass", + "achievement.galvanized_steel_maker.desc": "Combine Steel Dust and Zinc Dust to make Galvanized Steel", + "achievement.nichrome_maker.desc": "Combine Nickel Dust and Chromium Dust to make Nichrome", + "achievement.stainless_steel_maker.desc": "Combine Steel Dust and Chromium Dust to make Stainless Steel", + "achievement.titanium_maker.desc": "Combine Rutile Dust and Magnesium Dust to make Titanium", + "fluid.modernmetals.aluminum": "Molten Aluminum", + "fluid.modernmetals.aluminumbrass": "Molten Aluminum Brass", + "fluid.modernmetals.boron": "Molten Boron", + "fluid.modernmetals.beryllium": "Molten Beryllium", + "fluid.modernmetals.cadmium": "Molten Cadmium", + "fluid.modernmetals.chromium": "Molten Chromium", + "fluid.modernmetals.galvanizedsteel": "Molten Galvanized Steel", + "fluid.modernmetals.iridium": "Molten Iridium", + "fluid.modernmetals.magnesium": "Molten Magnesium", + "fluid.modernmetals.manganese": "Molten Manganese", + "fluid.modernmetals.nichrome": "Molten Nichrome", + "fluid.modernmetals.osmium": "Molten Osmium", + "fluid.modernmetals.plutonium": "Molten Plutonium", + "fluid.modernmetals.rutile": "Molten Rutile", + "fluid.modernmetals.stainlesssteel": "Molten Stainless Steel", + "fluid.modernmetals.tantalum": "Molten Tantalum", + "fluid.modernmetals.titanium": "Molten Titanium", + "fluid.modernmetals.tungsten": "Molten Tungsten", + "fluid.modernmetals.uranium": "Molten Uranium", + "fluid.modernmetals.zirconium": "Molten Zirconium", + "tile.modernmetals.aluminum": "Molten Aluminum", + "block.modernmetals.aluminum": "Molten Aluminum", + "tile.modernmetals.aluminumbrass": "Molten Aluminum Brass", + "block.modernmetals.aluminumbrass": "Molten Aluminum Brass", + "tile.modernmetals.boron": "Molten Boron", + "block.modernmetals.boron": "Molten Boron", + "tile.modernmetals.cadmium": "Molten Cadmium", + "block.modernmetals.cadmium": "Molten Cadmium", + "tile.modernmetals.chromium": "Molten Chromium", + "block.modernmetals.chromium": "Molten Chromium", + "tile.modernmetals.galvanizedsteel": "Molten Galvanized Steel", + "block.modernmetals.galvanizedsteel": "Molten Galvanized Steel", + "tile.modernmetals.iridium": "Molten Iridium", + "block.modernmetals.iridium": "Molten Iridium", + "tile.modernmetals.magnesium": "Molten Magnesium", + "block.modernmetals.magnesium": "Molten Magnesium", + "tile.modernmetals.manganese": "Molten Manganese", + "block.modernmetals.manganese": "Molten Manganese", + "tile.modernmetals.nichrome": "Molten Nichrome", + "block.modernmetals.nichrome": "Molten Nichrome", + "tile.modernmetals.osmium": "Molten Osmium", + "block.modernmetals.osmium": "Molten Osmium", + "tile.modernmetals.plutonium": "Molten Plutonium", + "block.modernmetals.plutonium": "Molten Plutonium", + "tile.modernmetals.rutile": "Molten Rutile", + "block.modernmetals.rutile": "Molten Rutile", + "tile.modernmetals.stainlesssteel": "Molten Stainless Steel", + "block.modernmetals.stainlesssteel": "Molten Stainless Steel", + "tile.modernmetals.tantalum": "Molten Tantalum", + "block.modernmetals.tantalum": "Molten Tantalum", + "tile.modernmetals.titanium": "Molten Titanium", + "block.modernmetals.titanium": "Molten Titanium", + "tile.modernmetals.tungsten": "Molten Tungsten", + "block.modernmetals.tungsten": "Molten Tungsten", + "tile.modernmetals.uranium": "Molten Uranium", + "block.modernmetals.uranium": "Molten Uranium", + "tile.modernmetals.zirconium": "Molten Zirconium", + "block.modernmetals.zirconium": "Molten Zirconium", + "item.modernmetals.aluminum_clump": "Aluminum Clump", + "item.modernmetals.aluminum_crushed": "Crushed Aluminum Ore", + "item.modernmetals.aluminum_crushed_purified": "Purified Crushed Aluminum Ore", + "item.modernmetals.aluminum_crystal": "Aluminum Crystal", + "item.modernmetals.aluminum_dense_plate": "Dense Aluminum Plate", + "item.modernmetals.aluminum_powder_dirty": "Dirty Aluminum Dust", + "item.modernmetals.aluminum_shard": "Aluminum Shard", + "item.modernmetals.aluminum_button": "Aluminum Button", + "item.modernmetals.aluminum_lever": "Aluminum Lever", + "item.modernmetals.aluminum_pressure_plate": "Aluminum Pressure Plate", + "item.modernmetals.aluminum_slab": "Aluminum Slab", + "item.modernmetals.aluminum_stairs": "Aluminum Stairs", + "item.modernmetals.aluminum_wall": "Aluminum Wall", + "tile.modernmetals.aluminum_button": "Aluminum Button", + "block.modernmetals.aluminum_button": "Aluminum Button", + "tile.modernmetals.aluminum_lever": "Aluminum Lever", + "block.modernmetals.aluminum_lever": "Aluminum Lever", + "tile.modernmetals.aluminum_pressure_plate": "Aluminum Pressure Plate", + "block.modernmetals.aluminum_pressure_plate": "Aluminum Pressure Plate", + "tile.modernmetals.aluminum_slab": "Aluminum Slab", + "block.modernmetals.aluminum_slab": "Aluminum Slab", + "tile.modernmetals.aluminum_stairs": "Aluminum Stairs", + "block.modernmetals.aluminum_stairs": "Aluminum Stairs", + "tile.modernmetals.aluminum_wall": "Aluminum Wall", + "block.modernmetals.aluminum_wall": "Aluminum Wall", + "item.modernmetals.aluminumbrass_clump": "Aluminum Brass Clump", + "item.modernmetals.aluminumbrass_crushed": "Crushed Aluminum Brass Ore", + "item.modernmetals.aluminumbrass_crushed_purified": "Purified Crushed Aluminum Brass Ore", + "item.modernmetals.aluminumbrass_crystal": "Aluminum Brass Crystal", + "item.modernmetals.aluminumbrass_dense_plate": "Dense Aluminum Brass Plate", + "item.modernmetals.aluminumbrass_powder_dirty": "Dirty Aluminum Brass Dust", + "item.modernmetals.aluminumbrass_shard": "Aluminum Brass Shard", + "item.modernmetals.aluminumbrass_button": "Aluminum Brass Button", + "item.modernmetals.aluminumbrass_lever": "Aluminum Brass Lever", + "item.modernmetals.aluminumbrass_pressure_plate": "Aluminum Brass Pressure Plate", + "item.modernmetals.aluminumbrass_slab": "Aluminum Brass Slab", + "item.modernmetals.aluminumbrass_stairs": "Aluminum Brass Stairs", + "item.modernmetals.aluminumbrass_wall": "Aluminum Brass Wall", + "tile.modernmetals.aluminumbrass_button": "Aluminum Brass Button", + "block.modernmetals.aluminumbrass_button": "Aluminum Brass Button", + "tile.modernmetals.aluminumbrass_lever": "Aluminum Brass Lever", + "block.modernmetals.aluminumbrass_lever": "Aluminum Brass Lever", + "tile.modernmetals.aluminumbrass_pressure_plate": "Aluminum Brass Pressure Plate", + "block.modernmetals.aluminumbrass_pressure_plate": "Aluminum Brass Pressure Plate", + "tile.modernmetals.aluminumbrass_slab": "Aluminum Brass Slab", + "block.modernmetals.aluminumbrass_slab": "Aluminum Brass Slab", + "tile.modernmetals.aluminumbrass_stairs": "Aluminum Brass Stairs", + "block.modernmetals.aluminumbrass_stairs": "Aluminum Brass Stairs", + "tile.modernmetals.aluminumbrass_wall": "Aluminum Brass Wall", + "block.modernmetals.aluminumbrass_wall": "Aluminum Brass Wall", + "tile.modernmetals.beryllium_bars": "Beryllium Bars", + "block.modernmetals.beryllium_bars": "Beryllium Bars", + "tile.modernmetals.beryllium_block": "Block of Beryllium", + "block.modernmetals.beryllium_block": "Block of Beryllium", + "tile.modernmetals.beryllium_door": "Beryllium Door", + "block.modernmetals.beryllium_door": "Beryllium Door", + "tile.modernmetals.beryllium_ore": "Beryllium Ore", + "block.modernmetals.beryllium_ore": "Beryllium Ore", + "tile.modernmetals.beryllium_plate": "Beryllium Plate", + "block.modernmetals.beryllium_plate": "Beryllium Plate", + "tile.modernmetals.beryllium_trapdoor": "Beryllium Trapdoor", + "block.modernmetals.beryllium_trapdoor": "Beryllium Trapdoor", + "item.modernmetals.beryllium_clump": "Beryllium Clump", + "item.modernmetals.beryllium_crushed": "Crushed Beryllium Ore", + "item.modernmetals.beryllium_crushed_purified": "Purified Crushed Beryllium Ore", + "item.modernmetals.beryllium_crystal": "Beryllium Crystal", + "item.modernmetals.beryllium_dense_plate": "Dense Beryllium Plate", + "item.modernmetals.beryllium_powder_dirty": "Dirty Beryllium Dust", + "item.modernmetals.beryllium_shard": "Beryllium Shard", + "item.modernmetals.beryllium_button": "Beryllium Button", + "item.modernmetals.beryllium_lever": "Beryllium Lever", + "item.modernmetals.beryllium_pressure_plate": "Beryllium Pressure Plate", + "item.modernmetals.beryllium_slab": "Beryllium Slab", + "item.modernmetals.beryllium_stairs": "Beryllium Stairs", + "item.modernmetals.beryllium_wall": "Beryllium Wall", + "tile.modernmetals.beryllium": "Molten Beryllium", + "block.modernmetals.beryllium": "Molten Beryllium", + "tile.modernmetals.beryllium_button": "Beryllium Button", + "block.modernmetals.beryllium_button": "Beryllium Button", + "tile.modernmetals.beryllium_lever": "Beryllium Lever", + "block.modernmetals.beryllium_lever": "Beryllium Lever", + "tile.modernmetals.beryllium_pressure_plate": "Beryllium Pressure Plate", + "block.modernmetals.beryllium_pressure_plate": "Beryllium Pressure Plate", + "tile.modernmetals.beryllium_slab": "Beryllium Slab", + "block.modernmetals.beryllium_slab": "Beryllium Slab", + "tile.modernmetals.beryllium_stairs": "Beryllium Stairs", + "block.modernmetals.beryllium_stairs": "Beryllium Stairs", + "tile.modernmetals.beryllium_wall": "Beryllium Wall", + "block.modernmetals.beryllium_wall": "Beryllium Wall", + "item.modernmetals.boron_clump": "Boron Clump", + "item.modernmetals.boron_crushed": "Crushed Boron Ore", + "item.modernmetals.boron_crushed_purified": "Purified Crushed Boron Ore", + "item.modernmetals.boron_crystal": "Boron Crystal", + "item.modernmetals.boron_dense_plate": "Dense Boron Plate", + "item.modernmetals.boron_powder_dirty": "Dirty Boron Dust", + "item.modernmetals.boron_shard": "Boron Shard", + "item.modernmetals.boron_button": "Boron Button", + "item.modernmetals.boron_lever": "Boron Lever", + "item.modernmetals.boron_pressure_plate": "Boron Pressure Plate", + "item.modernmetals.boron_slab": "Boron Slab", + "item.modernmetals.boron_stairs": "Boron Stairs", + "item.modernmetals.boron_wall": "Boron Wall", + "tile.modernmetals.boron_button": "Boron Button", + "block.modernmetals.boron_button": "Boron Button", + "tile.modernmetals.boron_lever": "Boron Lever", + "block.modernmetals.boron_lever": "Boron Lever", + "tile.modernmetals.boron_pressure_plate": "Boron Pressure Plate", + "block.modernmetals.boron_pressure_plate": "Boron Pressure Plate", + "tile.modernmetals.boron_slab": "Boron Slab", + "block.modernmetals.boron_slab": "Boron Slab", + "tile.modernmetals.boron_stairs": "Boron Stairs", + "block.modernmetals.boron_stairs": "Boron Stairs", + "tile.modernmetals.boron_wall": "Boron Wall", + "block.modernmetals.boron_wall": "Boron Wall", + "item.modernmetals.cadmium_clump": "Cadmium Clump", + "item.modernmetals.cadmium_crushed": "Crushed Cadmium Ore", + "item.modernmetals.cadmium_crushed_purified": "Purified Crushed Cadmium Ore", + "item.modernmetals.cadmium_crystal": "Cadmium Crystal", + "item.modernmetals.cadmium_dense_plate": "Dense Cadmium Plate", + "item.modernmetals.cadmium_powder_dirty": "Dirty Cadmium Dust", + "item.modernmetals.cadmium_shard": "Cadmium Shard", + "item.modernmetals.cadmium_button": "Cadmium Button", + "item.modernmetals.cadmium_lever": "Cadmium Lever", + "item.modernmetals.cadmium_pressure_plate": "Cadmium Pressure Plate", + "item.modernmetals.cadmium_slab": "Cadmium Slab", + "item.modernmetals.cadmium_stairs": "Cadmium Stairs", + "item.modernmetals.cadmium_wall": "Cadmium Wall", + "tile.modernmetals.cadmium_button": "Cadmium Button", + "block.modernmetals.cadmium_button": "Cadmium Button", + "tile.modernmetals.cadmium_lever": "Cadmium Lever", + "block.modernmetals.cadmium_lever": "Cadmium Lever", + "tile.modernmetals.cadmium_pressure_plate": "Cadmium Pressure Plate", + "block.modernmetals.cadmium_pressure_plate": "Cadmium Pressure Plate", + "tile.modernmetals.cadmium_slab": "Cadmium Slab", + "block.modernmetals.cadmium_slab": "Cadmium Slab", + "tile.modernmetals.cadmium_stairs": "Cadmium Stairs", + "block.modernmetals.cadmium_stairs": "Cadmium Stairs", + "tile.modernmetals.cadmium_wall": "Cadmium Wall", + "block.modernmetals.cadmium_wall": "Cadmium Wall", + "item.modernmetals.chromium_clump": "Chromium Clump", + "item.modernmetals.chromium_crushed": "Crushed Chromium Ore", + "item.modernmetals.chromium_crushed_purified": "Purified Crushed Chromium Ore", + "item.modernmetals.chromium_crystal": "Chromium Crystal", + "item.modernmetals.chromium_dense_plate": "Dense Chromium Plate", + "item.modernmetals.chromium_powder_dirty": "Dirty Chromium Dust", + "item.modernmetals.chromium_shard": "Chromium Shard", + "item.modernmetals.chromium_button": "Chromium Button", + "item.modernmetals.chromium_lever": "Chromium Lever", + "item.modernmetals.chromium_pressure_plate": "Chromium Pressure Plate", + "item.modernmetals.chromium_slab": "Chromium Slab", + "item.modernmetals.chromium_stairs": "Chromium Stairs", + "item.modernmetals.chromium_wall": "Chromium Wall", + "tile.modernmetals.chromium_button": "Chromium Button", + "block.modernmetals.chromium_button": "Chromium Button", + "tile.modernmetals.chromium_lever": "Chromium Lever", + "block.modernmetals.chromium_lever": "Chromium Lever", + "tile.modernmetals.chromium_pressure_plate": "Chromium Pressure Plate", + "block.modernmetals.chromium_pressure_plate": "Chromium Pressure Plate", + "tile.modernmetals.chromium_slab": "Chromium Slab", + "block.modernmetals.chromium_slab": "Chromium Slab", + "tile.modernmetals.chromium_stairs": "Chromium Stairs", + "block.modernmetals.chromium_stairs": "Chromium Stairs", + "tile.modernmetals.chromium_wall": "Chromium Wall", + "block.modernmetals.chromium_wall": "Chromium Wall", + "item.modernmetals.galvanizedsteel_clump": "Galvanized Steel Clump", + "item.modernmetals.galvanizedsteel_crushed": "Crushed Galvanized Steel Ore", + "item.modernmetals.galvanizedsteel_crushed_purified": "Purified Crushed Galvanized Steel Ore", + "item.modernmetals.galvanizedsteel_crystal": "Galvanized Steel Crystal", + "item.modernmetals.galvanizedsteel_dense_plate": "Dense Galvanized Steel Plate", + "item.modernmetals.galvanizedsteel_powder_dirty": "Dirty Galvanized Steel Dust", + "item.modernmetals.galvanizedsteel_shard": "Galvanized Steel Shard", + "item.modernmetals.galvanizedsteel_button": "Galvanized Steel Button", + "item.modernmetals.galvanizedsteel_lever": "Galvanized Steel Lever", + "item.modernmetals.galvanizedsteel_pressure_plate": "Galvanized Steel Pressure Plate", + "item.modernmetals.galvanizedsteel_slab": "Galvanized Steel Slab", + "item.modernmetals.galvanizedsteel_stairs": "Galvanized Steel Stairs", + "item.modernmetals.galvanizedsteel_wall": "Galvanized Steel Wall", + "tile.modernmetals.galvanizedsteel_button": "Galvanized Steel Button", + "block.modernmetals.galvanizedsteel_button": "Galvanized Steel Button", + "tile.modernmetals.galvanizedsteel_lever": "Galvanized Steel Lever", + "block.modernmetals.galvanizedsteel_lever": "Galvanized Steel Lever", + "tile.modernmetals.galvanizedsteel_pressure_plate": "Galvanized Steel Pressure Plate", + "block.modernmetals.galvanizedsteel_pressure_plate": "Galvanized Steel Pressure Plate", + "tile.modernmetals.galvanizedsteel_slab": "Galvanized Steel Slab", + "block.modernmetals.galvanizedsteel_slab": "Galvanized Steel Slab", + "tile.modernmetals.galvanizedsteel_stairs": "Galvanized Steel Stairs", + "block.modernmetals.galvanizedsteel_stairs": "Galvanized Steel Stairs", + "tile.modernmetals.galvanizedsteel_wall": "Galvanized Steel Wall", + "block.modernmetals.galvanizedsteel_wall": "Galvanized Steel Wall", + "item.modernmetals.iridium_clump": "Iridium Clump", + "item.modernmetals.iridium_crushed": "Crushed Iridium Ore", + "item.modernmetals.iridium_crushed_purified": "Purified Crushed Iridium Ore", + "item.modernmetals.iridium_crystal": "Iridium Crystal", + "item.modernmetals.iridium_dense_plate": "Dense Iridium Plate", + "item.modernmetals.iridium_powder_dirty": "Dirty Iridium Dust", + "item.modernmetals.iridium_shard": "Iridium Shard", + "item.modernmetals.iridium_button": "Iridium Button", + "item.modernmetals.iridium_lever": "Iridium Lever", + "item.modernmetals.iridium_pressure_plate": "Iridium Pressure Plate", + "item.modernmetals.iridium_slab": "Iridium Slab", + "item.modernmetals.iridium_stairs": "Iridium Stairs", + "item.modernmetals.iridium_wall": "Iridium Wall", + "tile.modernmetals.iridium_button": "Iridium Button", + "block.modernmetals.iridium_button": "Iridium Button", + "tile.modernmetals.iridium_lever": "Iridium Lever", + "block.modernmetals.iridium_lever": "Iridium Lever", + "tile.modernmetals.iridium_pressure_plate": "Iridium Pressure Plate", + "block.modernmetals.iridium_pressure_plate": "Iridium Pressure Plate", + "tile.modernmetals.iridium_slab": "Iridium Slab", + "block.modernmetals.iridium_slab": "Iridium Slab", + "tile.modernmetals.iridium_stairs": "Iridium Stairs", + "block.modernmetals.iridium_stairs": "Iridium Stairs", + "tile.modernmetals.iridium_wall": "Iridium Wall", + "block.modernmetals.iridium_wall": "Iridium Wall", + "item.modernmetals.magnesium_clump": "Magnesium Clump", + "item.modernmetals.magnesium_crushed": "Crushed Magnesium Ore", + "item.modernmetals.magnesium_crushed_purified": "Purified Crushed Magnesium Ore", + "item.modernmetals.magnesium_crystal": "Magnesium Crystal", + "item.modernmetals.magnesium_dense_plate": "Dense Magnesium Plate", + "item.modernmetals.magnesium_powder_dirty": "Dirty Magnesium Dust", + "item.modernmetals.magnesium_shard": "Magnesium Shard", + "item.modernmetals.magnesium_button": "Magnesium Button", + "item.modernmetals.magnesium_lever": "Magnesium Lever", + "item.modernmetals.magnesium_pressure_plate": "Magnesium Pressure Plate", + "item.modernmetals.magnesium_slab": "Magnesium Slab", + "item.modernmetals.magnesium_stairs": "Magnesium Stairs", + "item.modernmetals.magnesium_wall": "Magnesium Wall", + "tile.modernmetals.magnesium_button": "Magnesium Button", + "block.modernmetals.magnesium_button": "Magnesium Button", + "tile.modernmetals.magnesium_lever": "Magnesium Lever", + "block.modernmetals.magnesium_lever": "Magnesium Lever", + "tile.modernmetals.magnesium_pressure_plate": "Magnesium Pressure Plate", + "block.modernmetals.magnesium_pressure_plate": "Magnesium Pressure Plate", + "tile.modernmetals.magnesium_slab": "Magnesium Slab", + "block.modernmetals.magnesium_slab": "Magnesium Slab", + "tile.modernmetals.magnesium_stairs": "Magnesium Stairs", + "block.modernmetals.magnesium_stairs": "Magnesium Stairs", + "tile.modernmetals.magnesium_wall": "Magnesium Wall", + "block.modernmetals.magnesium_wall": "Magnesium Wall", + "item.modernmetals.manganese_clump": "Manganese Clump", + "item.modernmetals.manganese_crushed": "Crushed Manganese Ore", + "item.modernmetals.manganese_crushed_purified": "Purified Crushed Manganese Ore", + "item.modernmetals.manganese_crystal": "Manganese Crystal", + "item.modernmetals.manganese_dense_plate": "Dense Manganese Plate", + "item.modernmetals.manganese_powder_dirty": "Dirty Manganese Dust", + "item.modernmetals.manganese_shard": "Manganese Shard", + "item.modernmetals.manganese_button": "Manganese Button", + "item.modernmetals.manganese_lever": "Manganese Lever", + "item.modernmetals.manganese_pressure_plate": "Manganese Pressure Plate", + "item.modernmetals.manganese_slab": "Manganese Slab", + "item.modernmetals.manganese_stairs": "Manganese Stairs", + "item.modernmetals.manganese_wall": "Manganese Wall", + "tile.modernmetals.manganese_button": "Manganese Button", + "block.modernmetals.manganese_button": "Manganese Button", + "tile.modernmetals.manganese_lever": "Manganese Lever", + "block.modernmetals.manganese_lever": "Manganese Lever", + "tile.modernmetals.manganese_pressure_plate": "Manganese Pressure Plate", + "block.modernmetals.manganese_pressure_plate": "Manganese Pressure Plate", + "tile.modernmetals.manganese_slab": "Manganese Slab", + "block.modernmetals.manganese_slab": "Manganese Slab", + "tile.modernmetals.manganese_stairs": "Manganese Stairs", + "block.modernmetals.manganese_stairs": "Manganese Stairs", + "tile.modernmetals.manganese_wall": "Manganese Wall", + "block.modernmetals.manganese_wall": "Manganese Wall", + "item.modernmetals.nichrome_clump": "Nichrome Clump", + "item.modernmetals.nichrome_crushed": "Crushed Nichrome Ore", + "item.modernmetals.nichrome_crushed_purified": "Purified Crushed Nichrome Ore", + "item.modernmetals.nichrome_crystal": "Nichrome Crystal", + "item.modernmetals.nichrome_dense_plate": "Dense Nichrome Plate", + "item.modernmetals.nichrome_powder_dirty": "Dirty Nichrome Dust", + "item.modernmetals.nichrome_shard": "Nichrome Shard", + "item.modernmetals.nichrome_button": "Nichrome Button", + "item.modernmetals.nichrome_lever": "Nichrome Lever", + "item.modernmetals.nichrome_pressure_plate": "Nichrome Pressure Plate", + "item.modernmetals.nichrome_slab": "Nichrome Slab", + "item.modernmetals.nichrome_stairs": "Nichrome Stairs", + "item.modernmetals.nichrome_wall": "Nichrome Wall", + "tile.modernmetals.nichrome_button": "Nichrome Button", + "block.modernmetals.nichrome_button": "Nichrome Button", + "tile.modernmetals.nichrome_lever": "Nichrome Lever", + "block.modernmetals.nichrome_lever": "Nichrome Lever", + "tile.modernmetals.nichrome_pressure_plate": "Nichrome Pressure Plate", + "block.modernmetals.nichrome_pressure_plate": "Nichrome Pressure Plate", + "tile.modernmetals.nichrome_slab": "Nichrome Slab", + "block.modernmetals.nichrome_slab": "Nichrome Slab", + "tile.modernmetals.nichrome_stairs": "Nichrome Stairs", + "block.modernmetals.nichrome_stairs": "Nichrome Stairs", + "tile.modernmetals.nichrome_wall": "Nichrome Wall", + "block.modernmetals.nichrome_wall": "Nichrome Wall", + "item.modernmetals.osmium_clump": "Osmium Clump", + "item.modernmetals.osmium_crushed": "Crushed Osmium Ore", + "item.modernmetals.osmium_crushed_purified": "Purified Crushed Osmium Ore", + "item.modernmetals.osmium_crystal": "Osmium Crystal", + "item.modernmetals.osmium_dense_plate": "Dense Osmium Plate", + "item.modernmetals.osmium_powder_dirty": "Dirty Osmium Dust", + "item.modernmetals.osmium_shard": "Osmium Shard", + "item.modernmetals.osmium_button": "Osmium Button", + "item.modernmetals.osmium_lever": "Osmium Lever", + "item.modernmetals.osmium_pressure_plate": "Osmium Pressure Plate", + "item.modernmetals.osmium_slab": "Osmium Slab", + "item.modernmetals.osmium_stairs": "Osmium Stairs", + "item.modernmetals.osmium_wall": "Osmium Wall", + "tile.modernmetals.osmium_button": "Osmium Button", + "block.modernmetals.osmium_button": "Osmium Button", + "tile.modernmetals.osmium_lever": "Osmium Lever", + "block.modernmetals.osmium_lever": "Osmium Lever", + "tile.modernmetals.osmium_pressure_plate": "Osmium Pressure Plate", + "block.modernmetals.osmium_pressure_plate": "Osmium Pressure Plate", + "tile.modernmetals.osmium_slab": "Osmium Slab", + "block.modernmetals.osmium_slab": "Osmium Slab", + "tile.modernmetals.osmium_stairs": "Osmium Stairs", + "block.modernmetals.osmium_stairs": "Osmium Stairs", + "tile.modernmetals.osmium_wall": "Osmium Wall", + "block.modernmetals.osmium_wall": "Osmium Wall", + "item.modernmetals.plutonium_clump": "Plutonium Clump", + "item.modernmetals.plutonium_crushed": "Crushed Plutonium Ore", + "item.modernmetals.plutonium_crushed_purified": "Purified Crushed Plutonium Ore", + "item.modernmetals.plutonium_crystal": "Plutonium Crystal", + "item.modernmetals.plutonium_dense_plate": "Dense Plutonium Plate", + "item.modernmetals.plutonium_powder_dirty": "Dirty Plutonium Dust", + "item.modernmetals.plutonium_shard": "Plutonium Shard", + "item.modernmetals.plutonium_button": "Plutonium Button", + "item.modernmetals.plutonium_lever": "Plutonium Lever", + "item.modernmetals.plutonium_pressure_plate": "Plutonium Pressure Plate", + "item.modernmetals.plutonium_slab": "Plutonium Slab", + "item.modernmetals.plutonium_stairs": "Plutonium Stairs", + "item.modernmetals.plutonium_wall": "Plutonium Wall", + "tile.modernmetals.plutonium_button": "Plutonium Button", + "block.modernmetals.plutonium_button": "Plutonium Button", + "tile.modernmetals.plutonium_lever": "Plutonium Lever", + "block.modernmetals.plutonium_lever": "Plutonium Lever", + "tile.modernmetals.plutonium_pressure_plate": "Plutonium Pressure Plate", + "block.modernmetals.plutonium_pressure_plate": "Plutonium Pressure Plate", + "tile.modernmetals.plutonium_slab": "Plutonium Slab", + "block.modernmetals.plutonium_slab": "Plutonium Slab", + "tile.modernmetals.plutonium_stairs": "Plutonium Stairs", + "block.modernmetals.plutonium_stairs": "Plutonium Stairs", + "tile.modernmetals.plutonium_wall": "Plutonium Wall", + "block.modernmetals.plutonium_wall": "Plutonium Wall", + "item.modernmetals.rutile_clump": "Rutile Clump", + "item.modernmetals.rutile_crushed": "Crushed Rutile Ore", + "item.modernmetals.rutile_crushed_purified": "Purified Crushed Rutile Ore", + "item.modernmetals.rutile_crystal": "Rutile Crystal", + "item.modernmetals.rutile_dense_plate": "Dense Rutile Plate", + "item.modernmetals.rutile_powder_dirty": "Dirty Rutile Dust", + "item.modernmetals.rutile_shard": "Rutile Shard", + "item.modernmetals.rutile_button": "Rutile Button", + "item.modernmetals.rutile_lever": "Rutile Lever", + "item.modernmetals.rutile_pressure_plate": "Rutile Pressure Plate", + "item.modernmetals.rutile_slab": "Rutile Slab", + "item.modernmetals.rutile_stairs": "Rutile Stairs", + "item.modernmetals.rutile_wall": "Rutile Wall", + "tile.modernmetals.rutile_button": "Rutile Button", + "block.modernmetals.rutile_button": "Rutile Button", + "tile.modernmetals.rutile_lever": "Rutile Lever", + "block.modernmetals.rutile_lever": "Rutile Lever", + "tile.modernmetals.rutile_pressure_plate": "Rutile Pressure Plate", + "block.modernmetals.rutile_pressure_plate": "Rutile Pressure Plate", + "tile.modernmetals.rutile_slab": "Rutile Slab", + "block.modernmetals.rutile_slab": "Rutile Slab", + "tile.modernmetals.rutile_stairs": "Rutile Stairs", + "block.modernmetals.rutile_stairs": "Rutile Stairs", + "tile.modernmetals.rutile_wall": "Rutile Wall", + "block.modernmetals.rutile_wall": "Rutile Wall", + "item.modernmetals.stainlesssteel_clump": "Stainless Steel Clump", + "item.modernmetals.stainlesssteel_crushed": "Crushed Stainless Steel Ore", + "item.modernmetals.stainlesssteel_crushed_purified": "Purified Crushed Stainless Steel Ore", + "item.modernmetals.stainlesssteel_crystal": "Stainless Steel Crystal", + "item.modernmetals.stainlesssteel_dense_plate": "Dense Stainless Steel Plate", + "item.modernmetals.stainlesssteel_powder_dirty": "Dirty Stainless Steel Dust", + "item.modernmetals.stainlesssteel_shard": "Stainless Steel Shard", + "item.modernmetals.stainlesssteel_button": "Stainless Steel Button", + "item.modernmetals.stainlesssteel_lever": "Stainless Steel Lever", + "item.modernmetals.stainlesssteel_pressure_plate": "Stainless Steel Pressure Plate", + "item.modernmetals.stainlesssteel_slab": "Stainless Steel Slab", + "item.modernmetals.stainlesssteel_stairs": "Stainless Steel Stairs", + "item.modernmetals.stainlesssteel_wall": "Stainless Steel Wall", + "tile.modernmetals.stainlesssteel_button": "Stainless Steel Button", + "block.modernmetals.stainlesssteel_button": "Stainless Steel Button", + "tile.modernmetals.stainlesssteel_lever": "Stainless Steel Lever", + "block.modernmetals.stainlesssteel_lever": "Stainless Steel Lever", + "tile.modernmetals.stainlesssteel_pressure_plate": "Stainless Steel Pressure Plate", + "block.modernmetals.stainlesssteel_pressure_plate": "Stainless Steel Pressure Plate", + "tile.modernmetals.stainlesssteel_slab": "Stainless Steel Slab", + "block.modernmetals.stainlesssteel_slab": "Stainless Steel Slab", + "tile.modernmetals.stainlesssteel_stairs": "Stainless Steel Stairs", + "block.modernmetals.stainlesssteel_stairs": "Stainless Steel Stairs", + "tile.modernmetals.stainlesssteel_wall": "Stainless Steel Wall", + "block.modernmetals.stainlesssteel_wall": "Stainless Steel Wall", + "item.modernmetals.tantalum_clump": "Tantalum Clump", + "item.modernmetals.tantalum_crushed": "Crushed Tantalum Ore", + "item.modernmetals.tantalum_crushed_purified": "Purified Crushed Tantalum Ore", + "item.modernmetals.tantalum_crystal": "Tantalum Crystal", + "item.modernmetals.tantalum_dense_plate": "Dense Tantalum Plate", + "item.modernmetals.tantalum_powder_dirty": "Dirty Tantalum Dust", + "item.modernmetals.tantalum_shard": "Tantalum Shard", + "item.modernmetals.tantalum_button": "Tantalum Button", + "item.modernmetals.tantalum_lever": "Tantalum Lever", + "item.modernmetals.tantalum_pressure_plate": "Tantalum Pressure Plate", + "item.modernmetals.tantalum_slab": "Tantalum Slab", + "item.modernmetals.tantalum_stairs": "Tantalum Stairs", + "item.modernmetals.tantalum_wall": "Tantalum Wall", + "tile.modernmetals.tantalum_button": "Tantalum Button", + "block.modernmetals.tantalum_button": "Tantalum Button", + "tile.modernmetals.tantalum_lever": "Tantalum Lever", + "block.modernmetals.tantalum_lever": "Tantalum Lever", + "tile.modernmetals.tantalum_pressure_plate": "Tantalum Pressure Plate", + "block.modernmetals.tantalum_pressure_plate": "Tantalum Pressure Plate", + "tile.modernmetals.tantalum_slab": "Tantalum Slab", + "block.modernmetals.tantalum_slab": "Tantalum Slab", + "tile.modernmetals.tantalum_stairs": "Tantalum Stairs", + "block.modernmetals.tantalum_stairs": "Tantalum Stairs", + "tile.modernmetals.tantalum_wall": "Tantalum Wall", + "block.modernmetals.tantalum_wall": "Tantalum Wall", + "item.modernmetals.titanium_clump": "Titanium Clump", + "item.modernmetals.titanium_crushed": "Crushed Titanium Ore", + "item.modernmetals.titanium_crushed_purified": "Purified Crushed Titanium Ore", + "item.modernmetals.titanium_crystal": "Titanium Crystal", + "item.modernmetals.titanium_dense_plate": "Dense Titanium Plate", + "item.modernmetals.titanium_powder_dirty": "Dirty Titanium Dust", + "item.modernmetals.titanium_shard": "Titanium Shard", + "item.modernmetals.titanium_button": "Titanium Button", + "item.modernmetals.titanium_lever": "Titanium Lever", + "item.modernmetals.titanium_pressure_plate": "Titanium Pressure Plate", + "item.modernmetals.titanium_slab": "Titanium Slab", + "item.modernmetals.titanium_stairs": "Titanium Stairs", + "item.modernmetals.titanium_wall": "Titanium Wall", + "tile.modernmetals.titanium_button": "Titanium Button", + "block.modernmetals.titanium_button": "Titanium Button", + "tile.modernmetals.titanium_lever": "Titanium Lever", + "block.modernmetals.titanium_lever": "Titanium Lever", + "tile.modernmetals.titanium_pressure_plate": "Titanium Pressure Plate", + "block.modernmetals.titanium_pressure_plate": "Titanium Pressure Plate", + "tile.modernmetals.titanium_slab": "Titanium Slab", + "block.modernmetals.titanium_slab": "Titanium Slab", + "tile.modernmetals.titanium_stairs": "Titanium Stairs", + "block.modernmetals.titanium_stairs": "Titanium Stairs", + "tile.modernmetals.titanium_wall": "Titanium Wall", + "block.modernmetals.titanium_wall": "Titanium Wall", + "item.modernmetals.tungsten_clump": "Tungsten Clump", + "item.modernmetals.tungsten_crushed": "Crushed Tungsten Ore", + "item.modernmetals.tungsten_crushed_purified": "Purified Crushed Tungsten Ore", + "item.modernmetals.tungsten_crystal": "Tungsten Crystal", + "item.modernmetals.tungsten_dense_plate": "Dense Tungsten Plate", + "item.modernmetals.tungsten_powder_dirty": "Dirty Tungsten Dust", + "item.modernmetals.tungsten_shard": "Tungsten Shard", + "item.modernmetals.tungsten_button": "Tungsten Button", + "item.modernmetals.tungsten_lever": "Tungsten Lever", + "item.modernmetals.tungsten_pressure_plate": "Tungsten Pressure Plate", + "item.modernmetals.tungsten_slab": "Tungsten Slab", + "item.modernmetals.tungsten_stairs": "Tungsten Stairs", + "item.modernmetals.tungsten_wall": "Tungsten Wall", + "tile.modernmetals.tungsten_button": "Tungsten Button", + "block.modernmetals.tungsten_button": "Tungsten Button", + "tile.modernmetals.tungsten_lever": "Tungsten Lever", + "block.modernmetals.tungsten_lever": "Tungsten Lever", + "tile.modernmetals.tungsten_pressure_plate": "Tungsten Pressure Plate", + "block.modernmetals.tungsten_pressure_plate": "Tungsten Pressure Plate", + "tile.modernmetals.tungsten_slab": "Tungsten Slab", + "block.modernmetals.tungsten_slab": "Tungsten Slab", + "tile.modernmetals.tungsten_stairs": "Tungsten Stairs", + "block.modernmetals.tungsten_stairs": "Tungsten Stairs", + "tile.modernmetals.tungsten_wall": "Tungsten Wall", + "block.modernmetals.tungsten_wall": "Tungsten Wall", + "item.modernmetals.uranium_clump": "Uranium Clump", + "item.modernmetals.uranium_crushed": "Crushed Uranium Ore", + "item.modernmetals.uranium_crushed_purified": "Purified Crushed Uranium Ore", + "item.modernmetals.uranium_crystal": "Uranium Crystal", + "item.modernmetals.uranium_dense_plate": "Dense Uranium Plate", + "item.modernmetals.uranium_powder_dirty": "Dirty Uranium Dust", + "item.modernmetals.uranium_shard": "Uranium Shard", + "item.modernmetals.uranium_button": "Uranium Button", + "item.modernmetals.uranium_lever": "Uranium Lever", + "item.modernmetals.uranium_pressure_plate": "Uranium Pressure Plate", + "item.modernmetals.uranium_slab": "Uranium Slab", + "item.modernmetals.uranium_stairs": "Uranium Stairs", + "item.modernmetals.uranium_wall": "Uranium Wall", + "tile.modernmetals.uranium_button": "Uranium Button", + "block.modernmetals.uranium_button": "Uranium Button", + "tile.modernmetals.uranium_lever": "Uranium Lever", + "block.modernmetals.uranium_lever": "Uranium Lever", + "tile.modernmetals.uranium_pressure_plate": "Uranium Pressure Plate", + "block.modernmetals.uranium_pressure_plate": "Uranium Pressure Plate", + "tile.modernmetals.uranium_slab": "Uranium Slab", + "block.modernmetals.uranium_slab": "Uranium Slab", + "tile.modernmetals.uranium_stairs": "Uranium Stairs", + "block.modernmetals.uranium_stairs": "Uranium Stairs", + "tile.modernmetals.uranium_wall": "Uranium Wall", + "block.modernmetals.uranium_wall": "Uranium Wall", + "item.modernmetals.zirconium_clump": "Zirconium Clump", + "item.modernmetals.zirconium_crushed": "Crushed Zirconium Ore", + "item.modernmetals.zirconium_crushed_purified": "Purified Crushed Zirconium Ore", + "item.modernmetals.zirconium_crystal": "Zirconium Crystal", + "item.modernmetals.zirconium_dense_plate": "Dense Zirconium Plate", + "item.modernmetals.zirconium_powder_dirty": "Dirty Zirconium Dust", + "item.modernmetals.zirconium_shard": "Zirconium Shard", + "item.modernmetals.zirconium_button": "Zirconium Button", + "item.modernmetals.zirconium_lever": "Zirconium Lever", + "item.modernmetals.zirconium_pressure_plate": "Zirconium Pressure Plate", + "item.modernmetals.zirconium_slab": "Zirconium Slab", + "item.modernmetals.zirconium_stairs": "Zirconium Stairs", + "item.modernmetals.zirconium_wall": "Zirconium Wall", + "tile.modernmetals.zirconium_button": "Zirconium Button", + "block.modernmetals.zirconium_button": "Zirconium Button", + "tile.modernmetals.zirconium_lever": "Zirconium Lever", + "block.modernmetals.zirconium_lever": "Zirconium Lever", + "tile.modernmetals.zirconium_pressure_plate": "Zirconium Pressure Plate", + "block.modernmetals.zirconium_pressure_plate": "Zirconium Pressure Plate", + "tile.modernmetals.zirconium_slab": "Zirconium Slab", + "block.modernmetals.zirconium_slab": "Zirconium Slab", + "tile.modernmetals.zirconium_stairs": "Zirconium Stairs", + "block.modernmetals.zirconium_stairs": "Zirconium Stairs", + "tile.modernmetals.zirconium_wall": "Zirconium Wall", + "block.modernmetals.zirconium_wall": "Zirconium Wall", + "material.thorium": "Thorium", + "item.modernmetals.thorium_arrow": "Thorium Arrow", + "item.modernmetals.thorium_axe": "Thorium Axe", + "item.modernmetals.thorium_bars": "Thorium Bars", + "item.modernmetals.thorium_blend": "Thorium Blend", + "item.modernmetals.thorium_block": "Block of Thorium", + "item.modernmetals.thorium_boots": "Thorium Boots", + "item.modernmetals.thorium_bolt": "Thorium Bolt", + "item.modernmetals.thorium_bow": "Thorium Bow", + "item.modernmetals.thorium_chestplate": "Thorium Chestplate", + "item.modernmetals.thorium_crackhammer": "Thorium Crack Hammer", + "item.modernmetals.thorium_crossbow": "Thorium Crossbow", + "item.modernmetals.thorium_door": "Thorium Door", + "item.modernmetals.thorium_fishing_rod": "Thorium Fishing Rod", + "item.modernmetals.thorium_gear": "Thorium Gear", + "item.modernmetals.thorium_helmet": "Thorium Helmet", + "item.modernmetals.thorium_hoe": "Thorium Hoe", + "item.modernmetals.thorium_horse_armor": "Thorium Horse Armour", + "item.modernmetals.thorium_ingot": "Thorium Ingot", + "item.modernmetals.thorium_leggings": "Thorium Leg Armour", + "item.modernmetals.thorium_nugget": "Thorium Nugget", + "item.modernmetals.thorium_ore": "Thorium Ore", + "item.modernmetals.thorium_pickaxe": "Thorium Pickaxe", + "item.modernmetals.thorium_powder": "Thorium Dust", + "item.modernmetals.thorium_rod": "Thorium Rod", + "item.modernmetals.thorium_shears": "Thorium Shears", + "item.modernmetals.thorium_shield": "Thorium Shield", + "item.modernmetals.thorium_shovel": "Thorium Shovel", + "item.modernmetals.thorium_smallblend": "Tiny Pile of Thorium Blend", + "item.modernmetals.thorium_smallpowder": "Tiny Pile of Thorium Dust", + "item.modernmetals.thorium_sword": "Thorium Sword", + "item.modernmetals.thorium_trapdoor": "Thorium Trapdoor", + "tile.modernmetals.thorium_bars": "Thorium Bars", + "block.modernmetals.thorium_bars": "Thorium Bars", + "tile.modernmetals.thorium_block": "Block of Thorium", + "block.modernmetals.thorium_block": "Block of Thorium", + "tile.modernmetals.thorium_door": "Thorium Door", + "block.modernmetals.thorium_door": "Thorium Door", + "tile.modernmetals.thorium_ore": "Thorium Ore", + "block.modernmetals.thorium_ore": "Thorium Ore", + "tile.modernmetals.thorium_plate": "Thorium Plate", + "block.modernmetals.thorium_plate": "Thorium Plate", + "tile.modernmetals.thorium_trapdoor": "Thorium Trapdoor", + "block.modernmetals.thorium_trapdoor": "Thorium Trapdoor", + "fluid.modernmetals.thorium": "Molten Thorium", + "tile.modernmetals.thorium": "Molten Thorium", + "block.modernmetals.thorium": "Molten Thorium", + "item.modernmetals.thorium_clump": "Thorium Clump", + "item.modernmetals.thorium_crushed": "Crushed Thorium Ore", + "item.modernmetals.thorium_crushed_purified": "Purified Crushed Thorium Ore", + "item.modernmetals.thorium_crystal": "Thorium Crystal", + "item.modernmetals.thorium_dense_plate": "Dense Thorium Plate", + "item.modernmetals.thorium_powder_dirty": "Dirty Thorium Dust", + "item.modernmetals.thorium_shard": "Thorium Shard", + "item.modernmetals.thorium_button": "Thorium Button", + "item.modernmetals.thorium_lever": "Thorium Lever", + "item.modernmetals.thorium_pressure_plate": "Thorium Pressure Plate", + "item.modernmetals.thorium_slab": "Thorium Slab", + "item.modernmetals.thorium_stairs": "Thorium Stairs", + "item.modernmetals.thorium_wall": "Thorium Wall", + "tile.modernmetals.thorium_button": "Thorium Button", + "block.modernmetals.thorium_button": "Thorium Button", + "tile.modernmetals.thorium_lever": "Thorium Lever", + "block.modernmetals.thorium_lever": "Thorium Lever", + "tile.modernmetals.thorium_pressure_plate": "Thorium Pressure Plate", + "block.modernmetals.thorium_pressure_plate": "Thorium Pressure Plate", + "tile.modernmetals.thorium_slab": "Thorium Slab", + "block.modernmetals.thorium_slab": "Thorium Slab", + "tile.modernmetals.thorium_stairs": "Thorium Stairs", + "block.modernmetals.thorium_stairs": "Thorium Stairs", + "tile.modernmetals.thorium_wall": "Thorium Wall", + "block.modernmetals.thorium_wall": "Thorium Wall", + "item.modernmetals.aluminum_casing": "Aluminum Item Casing", + "item.modernmetals.aluminumbrass_casing": "Aluminum Brass Item Casing", + "item.modernmetals.boron_casing": "Boron Item Casing", + "item.modernmetals.beryllium_casing": "Beryllium Item Casing", + "item.modernmetals.cadmium_casing": "Cadmium Item Casing", + "item.modernmetals.chromium_casing": "Chromium Item Casing", + "item.modernmetals.galvanizedsteel_casing": "Galvanized Steel Item Casing", + "item.modernmetals.iridium_casing": "Iridium Item Casing", + "item.modernmetals.magnesium_casing": "Magnesium Item Casing", + "item.modernmetals.manganese_casing": "Manganese Item Casing", + "item.modernmetals.osmium_casing": "Osmium Item Casing", + "item.modernmetals.plutonium_casing": "Plutonium Item Casing", + "item.modernmetals.rutile_casing": "Rutile Item Casing", + "item.modernmetals.stainlesssteel_casing": "Stainless Steel Item Casing", + "item.modernmetals.tantalum_casing": "Tantalum Item Casing", + "item.modernmetals.thorium_casing": "Thorium Item Casing", + "item.modernmetals.titanium_casing": "Titanium Item Casing", + "item.modernmetals.tungsten_casing": "Tungsten Item Casing", + "item.modernmetals.uranium_casing": "Uranium Item Casing", + "item.modernmetals.zirconium_casing": "Zirconium Item Casing", + "item.modernmetals.aluminumbrass_scythe": "Aluminum Brass Sickle", + "item.modernmetals.aluminum_scythe": "Aluminum Sickle", + "item.modernmetals.beryllium_scythe": "Beryllium Sickle", + "item.modernmetals.boron_scythe": "Boron Sickle", + "item.modernmetals.cadmium_scythe": "Cadmium Sickle", + "item.modernmetals.chromium_scythe": "Chromium Sickle", + "item.modernmetals.galvanizedsteel_scythe": "Galvanized Steel Sickle", + "item.modernmetals.iridium_scythe": "Iridium Sickle", + "item.modernmetals.magnesium_scythe": "Magnesium Sickle", + "item.modernmetals.manganese_scythe": "Manganese Sickle", + "item.modernmetals.nichrome_scythe": "Nichrome Sickle", + "item.modernmetals.osmium_scythe": "Osmium Sickle", + "item.modernmetals.plutonium_scythe": "Plutonium Sickle", + "item.modernmetals.rutile_scythe": "Rutile Sickle", + "item.modernmetals.stainlesssteel_scythe": "Stainless Steel Sickle", + "item.modernmetals.tantalum_scythe": "Tantalum Sickle", + "item.modernmetals.thorium_scythe": "Thorium Sickle", + "item.modernmetals.titanium_scythe": "Titanium Sickle", + "item.modernmetals.tungsten_scythe": "Tungsten Sickle", + "item.modernmetals.uranium_scythe": "Uranium Sickle", + "item.modernmetals.zirconium_scythe": "Zirconium Sickle", + "gas.gasAluminum": "Aluminum Slurry", + "gas.gasBeryllium": "Beryllium Slurry", + "gas.gasBoron": "Boron Slurry", + "gas.gasCadmium": "Cadmium Slurry", + "gas.gasChromium": "Chromium Slurry", + "gas.gasIridium": "Iridium Slurry", + "gas.gasMagnesium": "Magnesium Slurry", + "gas.gasManganese": "Manganese Slurry", + "gas.gasPlutonium": "Plutonium Slurry", + "gas.gasRutile": "Rutile Slurry", + "gas.gasTantalum": "Tantalum Slurry", + "gas.gasThorium": "Thorium Slurry", + "gas.gasTitanium": "Titanium Slurry", + "gas.gasTungsten": "Tungsten Slurry", + "gas.gasUranium": "Uranium Slurry", + "gas.gasZirconium": "Zirconium Slurry", + "gas.cleanGasAluminum": "Clean Aluminum Slurry", + "gas.cleanGasBeryllium": "Clean Beryllium Slurry", + "gas.cleanGasBoron": "Clean Boron Slurry", + "gas.cleanGasCadmium": "Clean Cadmium Slurry", + "gas.cleanGasChromium": "Clean Chromium Slurry", + "gas.cleanGasIridium": "Clean Iridium Slurry", + "gas.cleanGasMagnesium": "Clean Magnesium Slurry", + "gas.cleanGasManganese": "Clean Manganese Slurry", + "gas.cleanGasPlutonium": "Clean Plutonium Slurry", + "gas.cleanGasRutile": "Clean Rutile Slurry", + "gas.cleanGasTantalum": "Clean Tantalum Slurry", + "gas.cleanGasThorium": "Clean Thorium Slurry", + "gas.cleanGasTitanium": "Clean Titanium Slurry", + "gas.cleanGasTungsten": "Clean Tungsten Slurry", + "gas.cleanGasUranium": "Clean Uranium Slurry", + "gas.cleanGasZirconium": "Clean Zirconium Slurry", + "gas.gasAdamantine": "Adamantine Slurry", + "gas.gasAntimony": "Antimony Slurry", + "gas.gasBismuth": "Bismuth Slurry", + "gas.gasColdiron": "Cold-Iron Slurry", + "gas.gasPlatinum": "Platinum Slurry", + "gas.gasNickel": "Nickel Slurry", + "gas.gasStarsteel": "Star-Steel Slurry", + "gas.gasZinc": "Zinc Slurry", + "gas.cleanGasAdamantine": "Clean Adamantine Slurry", + "gas.cleanGasAntimony": "Clean Antimony Slurry", + "gas.cleanGasBismuth": "Clean Bismuth Slurry", + "gas.cleanGasColdiron": "Clean Cold-Iron Slurry", + "gas.cleanGasPlatinum": "Clean Platinum Slurry", + "gas.cleanGasNickel": "Clean Nickel Slurry", + "gas.cleanGasStarsteel": "Clean Star-Steel Slurry", + "gas.cleanGasZinc": "Clean Zinc Slurry", + "config.modernmetals.title": "Modern Metals", + "config.modernmetals.description": "Restart to apply changes. Edit ores in OreSpawn.", + "config.modernmetals.content_mode": "Fantasy Level", + "config.modernmetals.content_mode.tooltip": "High Fantasy keeps all recipes. Low Fantasy restricts unrealistic equipment and structures. Requires a game restart.", + "high_fantasy": "High Fantasy", + "low_fantasy": "Low Fantasy", + "config.modernmetals.enable_thorium": "Enable Thorium", + "config.modernmetals.enable_boron": "Enable Boron", + "config.modernmetals.enable_beryllium": "Enable Beryllium", + "config.modernmetals.enable_cadmium": "Enable Cadmium", + "config.modernmetals.enable_nichrome": "Enable Nichrome", + "config.modernmetals.enable_aluminum": "Enable Aluminum", + "config.modernmetals.enable_aluminumbrass": "Enable Aluminum Brass", + "config.modernmetals.enable_chromium": "Enable Chromium", + "config.modernmetals.enable_galvanizedsteel": "Enable Galvanized Steel", + "config.modernmetals.enable_iridium": "Enable Iridium", + "config.modernmetals.enable_magnesium": "Enable Magnesium", + "config.modernmetals.enable_manganese": "Enable Manganese", + "config.modernmetals.enable_osmium": "Enable Osmium", + "config.modernmetals.enable_plutonium": "Enable Plutonium", + "config.modernmetals.enable_rutile": "Enable Rutile", + "config.modernmetals.enable_stainlesssteel": "Enable Stainless Steel", + "config.modernmetals.enable_tantalum": "Enable Tantalum", + "config.modernmetals.enable_titanium": "Enable Titanium", + "config.modernmetals.enable_tungsten": "Enable Tungsten", + "config.modernmetals.enable_uranium": "Enable Uranium", + "config.modernmetals.enable_zirconium": "Enable Zirconium", + "config.modernmetals.material.tooltip": "Controls which blocks, items and recipes are available for this material. Requires a game restart.", + "config.modernmetals.villager_trades": "Villager Trades", + "config.modernmetals.villager_trades.tooltip": "Let blacksmiths trade Modern Metals ingots and equipment. Requires a game restart.", + "config.modernmetals.connection.mismatch": "The server uses %s, but your game uses %s. Match the Fantasy Level in your mod settings and restart.", + "config.modernmetals.connection.protocol": "Modern Metals could not check the Fantasy Level. Use the same Modern Metals build on the server and client.", + "config.modernmetals.content_mode.high_fantasy": "High Fantasy", + "config.modernmetals.content_mode.low_fantasy": "Low Fantasy", + "config.modernmetals.inherited_mode": "Fantasy Level is set in Base Metals. Restart after changing settings." +} diff --git a/src/main/resources/assets/modernmetals/lang/en_gb.json b/src/main/resources/assets/modernmetals/lang/en_gb.json new file mode 100644 index 00000000..bf0a1666 --- /dev/null +++ b/src/main/resources/assets/modernmetals/lang/en_gb.json @@ -0,0 +1,1760 @@ +{ + "item.modernmetals.nichrome_casing": "Nichrome Item Casing", + "itemGroup.modernmetals.blocks": "Modern Metals Blocks", + "itemGroup.modernmetals.combat": "Modern Metals Combat", + "itemGroup.modernmetals.items": "Modern Metals Items", + "itemGroup.modernmetals.tools": "Modern Metals Tools", + "nei.modernmetals.recipehandler.crusher": "Crushed Blocks/Items", + "material.aluminum": "Aluminum", + "item.modernmetals.aluminum_arrow": "Aluminum Arrow", + "item.modernmetals.aluminum_axe": "Aluminum Axe", + "item.modernmetals.aluminum_bars": "Aluminum Bars", + "item.modernmetals.aluminum_blend": "Aluminum Blend", + "item.modernmetals.aluminum_block": "Aluminum", + "item.modernmetals.aluminum_boots": "Aluminum Boots", + "item.modernmetals.aluminum_bolt": "Aluminum Bolt", + "item.modernmetals.aluminum_bow": "Aluminum Bow", + "item.modernmetals.aluminum_chestplate": "Aluminum Chestplate", + "item.modernmetals.aluminum_crackhammer": "Aluminum Crack Hammer", + "item.modernmetals.aluminum_crossbow": "Aluminum Crossbow", + "item.modernmetals.aluminum_door": "Aluminum Door", + "item.modernmetals.aluminum_fishing_rod": "Aluminum Fishing Rod", + "item.modernmetals.aluminum_gear": "Aluminum Gear", + "item.modernmetals.aluminum_helmet": "Aluminum Helmet", + "item.modernmetals.aluminum_hoe": "Aluminum Hoe", + "item.modernmetals.aluminum_horse_armor": "Aluminum Horse Armour", + "item.modernmetals.aluminum_ingot": "Aluminum Ingot", + "item.modernmetals.aluminum_leggings": "Aluminum Leg Armour", + "item.modernmetals.aluminum_nugget": "Aluminum Nugget", + "item.modernmetals.aluminum_ore": "Aluminum Ore", + "item.modernmetals.aluminum_pickaxe": "Aluminum Pickaxe", + "item.modernmetals.aluminum_powder": "Aluminum Dust", + "item.modernmetals.aluminum_rod": "Aluminum Rod", + "item.modernmetals.aluminum_shears": "Aluminum Shears", + "item.modernmetals.aluminum_shield": "Aluminum Shield", + "item.modernmetals.aluminum_shovel": "Aluminum Shovel", + "item.modernmetals.aluminum_smallblend": "Tiny Pile of Aluminum Blend", + "item.modernmetals.aluminum_smallpowder": "Tiny Pile of Aluminum Dust", + "item.modernmetals.aluminum_sword": "Aluminum Sword", + "item.modernmetals.aluminum_trapdoor": "Aluminum Trapdoor", + "material.aluminumbrass": "Aluminum Brass", + "item.modernmetals.aluminumbrass_arrow": "Aluminum Brass Arrow", + "item.modernmetals.aluminumbrass_axe": "Aluminum Brass Axe", + "item.modernmetals.aluminumbrass_bars": "Aluminum Brass Bars", + "item.modernmetals.aluminumbrass_blend": "Aluminum Brass Blend", + "item.modernmetals.aluminumbrass_block": "Aluminum Brass Block", + "item.modernmetals.aluminumbrass_boots": "Aluminum Brass Boots", + "item.modernmetals.aluminumbrass_bolt": "Aluminum Brass Bolt", + "item.modernmetals.aluminumbrass_bow": "Aluminum Brass Bow", + "item.modernmetals.aluminumbrass_chestplate": "Aluminum Brass Chestplate", + "item.modernmetals.aluminumbrass_crackhammer": "Aluminum Brass Crack Hammer", + "item.modernmetals.aluminumbrass_crossbow": "Aluminum Brass Crossbow", + "item.modernmetals.aluminumbrass_door": "Aluminum Brass Door", + "item.modernmetals.aluminumbrass_fishing_rod": "Aluminum Brass Fishing Rod", + "item.modernmetals.aluminumbrass_gear": "Aluminum Brass Gear", + "item.modernmetals.aluminumbrass_helmet": "Aluminum Brass Helmet", + "item.modernmetals.aluminumbrass_hoe": "Aluminum Brass Hoe", + "item.modernmetals.aluminumbrass_horse_armor": "Aluminum Brass Horse Armour", + "item.modernmetals.aluminumbrass_ingot": "Aluminum Brass Ingot", + "item.modernmetals.aluminumbrass_leggings": "Aluminum Brass Leg Armour", + "item.modernmetals.aluminumbrass_nugget": "Aluminum Brass Nugget", + "item.modernmetals.aluminumbrass_ore": "Aluminum Brass Ore", + "item.modernmetals.aluminumbrass_pickaxe": "Aluminum Brass Pickaxe", + "item.modernmetals.aluminumbrass_powder": "Aluminum Brass Dust", + "item.modernmetals.aluminumbrass_rod": "Aluminum Brass Rod", + "item.modernmetals.aluminumbrass_shears": "Aluminum Brass Shears", + "item.modernmetals.aluminumbrass_shield": "Aluminum Brass Shield", + "item.modernmetals.aluminumbrass_shovel": "Aluminum Brass Shovel", + "item.modernmetals.aluminumbrass_smallblend": "Tiny Pile of Aluminum Brass Blend", + "item.modernmetals.aluminumbrass_smallpowder": "Tiny Pile of Aluminum Brass Dust", + "item.modernmetals.aluminumbrass_sword": "Aluminum Brass Sword", + "item.modernmetals.aluminumbrass_trapdoor": "Aluminum Brass Trapdoor", + "material.antimony": "Antimony", + "item.modernmetals.antimony_arrow": "Antimony Arrow", + "item.modernmetals.antimony_axe": "Antimony Axe", + "item.modernmetals.antimony_bars": "Antimony Bars", + "item.modernmetals.antimony_block": "Antimony Block", + "item.modernmetals.antimony_boots": "Antimony Boots", + "item.modernmetals.antimony_chestplate": "Antimony Chestplate", + "item.modernmetals.antimony_crackhammer": "Antimony Crack Hammer", + "item.modernmetals.antimony_door": "Antimony Door", + "item.modernmetals.antimony_helmet": "Antimony Helmet", + "item.modernmetals.antimony_hoe": "Antimony Hoe", + "item.modernmetals.antimony_ingot": "Antimony Ingot", + "item.modernmetals.antimony_leggings": "Antimony Leg Armour", + "item.modernmetals.antimony_nugget": "Antimony Nugget", + "item.modernmetals.antimony_ore": "Antimony Ore", + "item.modernmetals.antimony_pickaxe": "Antimony Pickaxe", + "item.modernmetals.antimony_powder": "Antimony Dust", + "item.modernmetals.antimony_shears": "Antimony Shears", + "item.modernmetals.antimony_shield": "Antimony Shield", + "item.modernmetals.antimony_shovel": "Antimony Shovel", + "item.modernmetals.antimony_smallpowder": "Tiny Pile of Antimony Dust", + "item.modernmetals.antimony_sword": "Antimony Sword", + "item.modernmetals.antimony_trapdoor": "Antimony Trapdoor", + "material.beryllium": "Beryllium", + "item.modernmetals.beryllium_arrow": "Beryllium Arrow", + "item.modernmetals.beryllium_axe": "Beryllium Axe", + "item.modernmetals.beryllium_bars": "Beryllium Bars", + "item.modernmetals.beryllium_blend": "Beryllium Blend", + "item.modernmetals.beryllium_block": "Beryllium Block", + "item.modernmetals.beryllium_boots": "Beryllium Boots", + "item.modernmetals.beryllium_bolt": "Beryllium Bolt", + "item.modernmetals.beryllium_bow": "Beryllium Bow", + "item.modernmetals.beryllium_chestplate": "Beryllium Chestplate", + "item.modernmetals.beryllium_crackhammer": "Beryllium Crack Hammer", + "item.modernmetals.beryllium_crossbow": "Beryllium Crossbow", + "item.modernmetals.beryllium_door": "Beryllium Door", + "item.modernmetals.beryllium_fishing_rod": "Beryllium Fishing Rod", + "item.modernmetals.beryllium_gear": "Beryllium Gear", + "item.modernmetals.beryllium_helmet": "Beryllium Helmet", + "item.modernmetals.beryllium_hoe": "Beryllium Hoe", + "item.modernmetals.beryllium_horse_armor": "Beryllium Horse Armour", + "item.modernmetals.beryllium_ingot": "Beryllium Ingot", + "item.modernmetals.beryllium_leggings": "Beryllium Leg Armour", + "item.modernmetals.beryllium_nugget": "Beryllium Nugget", + "item.modernmetals.beryllium_ore": "Beryllium Ore", + "item.modernmetals.beryllium_pickaxe": "Beryllium Pickaxe", + "item.modernmetals.beryllium_powder": "Beryllium Dust", + "item.modernmetals.beryllium_rod": "Beryllium Rod", + "item.modernmetals.beryllium_shears": "Beryllium Shears", + "item.modernmetals.beryllium_shield": "Beryllium Shield", + "item.modernmetals.beryllium_shovel": "Beryllium Shovel", + "item.modernmetals.beryllium_smallblend": "Tiny Pile of Beryllium Blend", + "item.modernmetals.beryllium_smallpowder": "Tiny Pile of Beryllium Dust", + "item.modernmetals.beryllium_sword": "Beryllium Sword", + "item.modernmetals.beryllium_trapdoor": "Beryllium Trapdoor", + "material.bismuth": "Bismuth", + "item.modernmetals.bismuth_arrow": "Bismuth Arrow", + "item.modernmetals.bismuth_axe": "Bismuth Axe", + "item.modernmetals.bismuth_bars": "Bismuth Bars", + "item.modernmetals.bismuth_block": "Bismuth Block", + "item.modernmetals.bismuth_boots": "Bismuth Boots", + "item.modernmetals.bismuth_chestplate": "Bismuth Chestplate", + "item.modernmetals.bismuth_crackhammer": "Bismuth Crack Hammer", + "item.modernmetals.bismuth_door": "Bismuth Door", + "item.modernmetals.bismuth_helmet": "Bismuth Helmet", + "item.modernmetals.bismuth_hoe": "Bismuth Hoe", + "item.modernmetals.bismuth_ingot": "Bismuth Ingot", + "item.modernmetals.bismuth_leggings": "Bismuth Leg Armour", + "item.modernmetals.bismuth_nugget": "Bismuth Nugget", + "item.modernmetals.bismuth_ore": "Bismuth Ore", + "item.modernmetals.bismuth_pickaxe": "Bismuth Pickaxe", + "item.modernmetals.bismuth_powder": "Bismuth Dust", + "item.modernmetals.bismuth_shears": "Bismuth Shears", + "item.modernmetals.bismuth_shovel": "Bismuth Shovel", + "item.modernmetals.bismuth_shield": "Bismuth Shield", + "item.modernmetals.bismuth_smallpowder": "Tiny Pile of Bismuth Dust", + "item.modernmetals.bismuth_sword": "Bismuth Sword", + "item.modernmetals.bismuth_trapdoor": "Bismuth Trapdoor", + "material.boron": "Boron", + "item.modernmetals.boron_arrow": "Boron Arrow", + "item.modernmetals.boron_axe": "Boron Axe", + "item.modernmetals.boron_bars": "Boron Bars", + "item.modernmetals.boron_blend": "Boron Blend", + "item.modernmetals.boron_block": "Boron Block", + "item.modernmetals.boron_boots": "Boron Boots", + "item.modernmetals.boron_bolt": "Boron Bolt", + "item.modernmetals.boron_bow": "Boron Bow", + "item.modernmetals.boron_chestplate": "Boron Chestplate", + "item.modernmetals.boron_crackhammer": "Boron Crack Hammer", + "item.modernmetals.boron_crossbow": "Boron Crossbow", + "item.modernmetals.boron_door": "Boron Door", + "item.modernmetals.boron_fishing_rod": "Boron Fishing Rod", + "item.modernmetals.boron_gear": "Boron Gear", + "item.modernmetals.boron_helmet": "Boron Helmet", + "item.modernmetals.boron_hoe": "Boron Hoe", + "item.modernmetals.boron_horse_armor": "Boron Horse Armour", + "item.modernmetals.boron_ingot": "Boron Ingot", + "item.modernmetals.boron_leggings": "Boron Leg Armour", + "item.modernmetals.boron_nugget": "Boron Nugget", + "item.modernmetals.boron_ore": "Boron Ore", + "item.modernmetals.boron_pickaxe": "Boron Pickaxe", + "item.modernmetals.boron_powder": "Boron Dust", + "item.modernmetals.boron_rod": "Boron Rod", + "item.modernmetals.boron_shears": "Boron Shears", + "item.modernmetals.boron_shield": "Boron Shield", + "item.modernmetals.boron_shovel": "Boron Shovel", + "item.modernmetals.boron_smallblend": "Tiny Pile of Boron Blend", + "item.modernmetals.boron_smallpowder": "Tiny Pile of Boron Dust", + "item.modernmetals.boron_sword": "Boron Sword", + "item.modernmetals.boron_trapdoor": "Boron Trapdoor", + "material.cadmium": "Cadmium", + "item.modernmetals.cadmium_arrow": "Cadmium Arrow", + "item.modernmetals.cadmium_axe": "Cadmium Axe", + "item.modernmetals.cadmium_bars": "Cadmium Bars", + "item.modernmetals.cadmium_blend": "Cadmium Blend", + "item.modernmetals.cadmium_block": "Cadmium Block", + "item.modernmetals.cadmium_bolt": "Cadmium Bolt", + "item.modernmetals.cadmium_boots": "Cadmium Boots", + "item.modernmetals.cadmium_bow": "Cadmium Bow", + "item.modernmetals.cadmium_chestplate": "Cadmium Chestplate", + "item.modernmetals.cadmium_crackhammer": "Cadmium Crack Hammer", + "item.modernmetals.cadmium_crossbow": "Cadmium Crossbow", + "item.modernmetals.cadmium_door": "Cadmium Door", + "item.modernmetals.cadmium_fishing_rod": "Cadmium Fishing Rod", + "item.modernmetals.cadmium_gear": "Cadmium Gear", + "item.modernmetals.cadmium_helmet": "Cadmium Helmet", + "item.modernmetals.cadmium_hoe": "Cadmium Hoe", + "item.modernmetals.cadmium_horse_armor": "Cadmium Horse Armour", + "item.modernmetals.cadmium_ingot": "Cadmium Ingot", + "item.modernmetals.cadmium_leggings": "Cadmium Leg Armour", + "item.modernmetals.cadmium_nugget": "Cadmium Nugget", + "item.modernmetals.cadmium_ore": "Cadmium Ore", + "item.modernmetals.cadmium_pickaxe": "Cadmium Pickaxe", + "item.modernmetals.cadmium_powder": "Cadmium Dust", + "item.modernmetals.cadmium_rod": "Cadmium Rod", + "item.modernmetals.cadmium_shears": "Cadmium Shears", + "item.modernmetals.cadmium_shovel": "Cadmium Shovel", + "item.modernmetals.cadmium_shield": "Cadmium Shield", + "item.modernmetals.cadmium_smallblend": "Tiny Pile of Cadmium Blend", + "item.modernmetals.cadmium_smallpowder": "Tiny Pile of Cadmium Dust", + "item.modernmetals.cadmium_sword": "Cadmium Sword", + "item.modernmetals.cadmium_trapdoor": "Cadmium Trapdoor", + "material.chromium": "Chromium", + "item.modernmetals.chromium_arrow": "Chromium Arrow", + "item.modernmetals.chromium_axe": "Chromium Axe", + "item.modernmetals.chromium_bars": "Chromium Bars", + "item.modernmetals.chromium_blend": "Chromium Blend", + "item.modernmetals.chromium_block": "Chromium Block", + "item.modernmetals.chromium_bolt": "Chromium Bolt", + "item.modernmetals.chromium_boots": "Chromium Boots", + "item.modernmetals.chromium_bow": "Chromium Bow", + "item.modernmetals.chromium_chestplate": "Chromium Chestplate", + "item.modernmetals.chromium_crackhammer": "Chromium Crack Hammer", + "item.modernmetals.chromium_crossbow": "Chromium Crossbow", + "item.modernmetals.chromium_door": "Chromium Door", + "item.modernmetals.chromium_fishing_rod": "Chromium Fishing Rod", + "item.modernmetals.chromium_gear": "Chromium Gear", + "item.modernmetals.chromium_helmet": "Chromium Helmet", + "item.modernmetals.chromium_hoe": "Chromium Hoe", + "item.modernmetals.chromium_horse_armor": "Chromium Horse Armour", + "item.modernmetals.chromium_ingot": "Chromium Ingot", + "item.modernmetals.chromium_leggings": "Chromium Leg Armour", + "item.modernmetals.chromium_nugget": "Chromium Nugget", + "item.modernmetals.chromium_ore": "Chromium Ore", + "item.modernmetals.chromium_pickaxe": "Chromium Pickaxe", + "item.modernmetals.chromium_powder": "Chromium Dust", + "item.modernmetals.chromium_rod": "Chromium Rod", + "item.modernmetals.chromium_shears": "Chromium Shears", + "item.modernmetals.chromium_shield": "Chromium Shield", + "item.modernmetals.chromium_shovel": "Chromium Shovel", + "item.modernmetals.chromium_smallblend": "Tiny Pile of Chromium Blend", + "item.modernmetals.chromium_smallpowder": "Tiny Pile of Chromium Dust", + "item.modernmetals.chromium_sword": "Chromium Sword", + "item.modernmetals.chromium_trapdoor": "Chromium Trapdoor", + "material.galvanizedsteel": "Galvanized Steel", + "item.modernmetals.galvanizedsteel_arrow": "Galvanized Steel Arrow", + "item.modernmetals.galvanizedsteel_axe": "Galvanized Steel Axe", + "item.modernmetals.galvanizedsteel_bars": "Galvanized Steel Bars", + "item.modernmetals.galvanizedsteel_blend": "Galvanized Steel Blend", + "item.modernmetals.galvanizedsteel_block": "Galvanized Steel Block", + "item.modernmetals.galvanizedsteel_bolt": "Galvanized Steel Bolt", + "item.modernmetals.galvanizedsteel_boots": "Galvanized Steel Boots", + "item.modernmetals.galvanizedsteel_bow": "Galvanized Steel Bow", + "item.modernmetals.galvanizedsteel_chestplate": "Galvanized Steel Chestplate", + "item.modernmetals.galvanizedsteel_crackhammer": "Galvanized Steel Crack Hammer", + "item.modernmetals.galvanizedsteel_crossbow": "Galvanized Steel Crossbow", + "item.modernmetals.galvanizedsteel_door": "Galvanized Steel Door", + "item.modernmetals.galvanizedsteel_fishing_rod": "Galvanized Steel Fishing Rod", + "item.modernmetals.galvanizedsteel_gear": "Galvanized Steel Gear", + "item.modernmetals.galvanizedsteel_helmet": "Galvanized Steel Helmet", + "item.modernmetals.galvanizedsteel_hoe": "Galvanized Steel Hoe", + "item.modernmetals.galvanizedsteel_horse_armor": "Galvanized Steel Horse Armour", + "item.modernmetals.galvanizedsteel_ingot": "Galvanized Steel Ingot", + "item.modernmetals.galvanizedsteel_leggings": "Galvanized Steel Leg Armour", + "item.modernmetals.galvanizedsteel_nugget": "Galvanized Steel Nugget", + "item.modernmetals.galvanizedsteel_ore": "Galvanized Steel Ore", + "item.modernmetals.galvanizedsteel_pickaxe": "Galvanized Steel Pickaxe", + "item.modernmetals.galvanizedsteel_powder": "Galvanized Steel Dust", + "item.modernmetals.galvanizedsteel_rod": "Galvanized Steel Rod", + "item.modernmetals.galvanizedsteel_shears": "Galvanized Steel Shears", + "item.modernmetals.galvanizedsteel_shield": "Galvanized Steel Shield", + "item.modernmetals.galvanizedsteel_shovel": "Galvanized Steel Shovel", + "item.modernmetals.galvanizedsteel_smallblend": "Tiny Pile of Galvanized Steel Blend", + "item.modernmetals.galvanizedsteel_smallpowder": "Tiny Pile of Galvanized Steel Dust", + "item.modernmetals.galvanizedsteel_sword": "Galvanized Steel Sword", + "item.modernmetals.galvanizedsteel_trapdoor": "Galvanized Steel Trapdoor", + "material.iridium": "Iridium", + "item.modernmetals.iridium_arrow": "Iridium Arrow", + "item.modernmetals.iridium_axe": "Iridium Axe", + "item.modernmetals.iridium_bars": "Iridium Bars", + "item.modernmetals.iridium_blend": "Iridium Blend", + "item.modernmetals.iridium_block": "Iridium Block", + "item.modernmetals.iridium_bolt": "Iridium Bolt", + "item.modernmetals.iridium_boots": "Iridium Boots", + "item.modernmetals.iridium_bow": "Iridium Bow", + "item.modernmetals.iridium_chestplate": "Iridium Chestplate", + "item.modernmetals.iridium_crackhammer": "Iridium Crack Hammer", + "item.modernmetals.iridium_crossbow": "Iridium Crossbow", + "item.modernmetals.iridium_door": "Iridium Door", + "item.modernmetals.iridium_fishing_rod": "Iridium Fishing Rod", + "item.modernmetals.iridium_gear": "Iridium Gear", + "item.modernmetals.iridium_helmet": "Iridium Helmet", + "item.modernmetals.iridium_hoe": "Iridium Hoe", + "item.modernmetals.iridium_horse_armor": "Iridium Horse Armour", + "item.modernmetals.iridium_ingot": "Iridium Ingot", + "item.modernmetals.iridium_leggings": "Iridium Leg Armour", + "item.modernmetals.iridium_nugget": "Iridium Nugget", + "item.modernmetals.iridium_ore": "Iridium Ore", + "item.modernmetals.iridium_pickaxe": "Iridium Pickaxe", + "item.modernmetals.iridium_powder": "Iridium Dust", + "item.modernmetals.iridium_rod": "Iridium Rod", + "item.modernmetals.iridium_shears": "Iridium Shears", + "item.modernmetals.iridium_shield": "Iridium Shield", + "item.modernmetals.iridium_shovel": "Iridium Shovel", + "item.modernmetals.iridium_smallblend": "Tiny Pile of Iridium Blend", + "item.modernmetals.iridium_smallpowder": "Tiny Pile of Iridium Dust", + "item.modernmetals.iridium_sword": "Iridium Sword", + "item.modernmetals.iridium_trapdoor": "Iridium Trapdoor", + "material.magnesium": "Magnesium", + "item.modernmetals.magnesium_arrow": "Magnesium Arrow", + "item.modernmetals.magnesium_axe": "Magnesium Axe", + "item.modernmetals.magnesium_bars": "Magnesium Bars", + "item.modernmetals.magnesium_blend": "Magnesium Blend", + "item.modernmetals.magnesium_block": "Magnesium Block", + "item.modernmetals.magnesium_boots": "Magnesium Boots", + "item.modernmetals.magnesium_bolt": "Magnesium Bolt", + "item.modernmetals.magnesium_bow": "Magnesium Bow", + "item.modernmetals.magnesium_chestplate": "Magnesium Chestplate", + "item.modernmetals.magnesium_crackhammer": "Magnesium Crack Hammer", + "item.modernmetals.magnesium_crossbow": "Magnesium Crossbow", + "item.modernmetals.magnesium_door": "Magnesium Door", + "item.modernmetals.magnesium_fishing_rod": "Magnesium Fishing Rod", + "item.modernmetals.magnesium_gear": "Magnesium Gear", + "item.modernmetals.magnesium_helmet": "Magnesium Helmet", + "item.modernmetals.magnesium_hoe": "Magnesium Hoe", + "item.modernmetals.magnesium_horse_armor": "Magnesium Horse Armour", + "item.modernmetals.magnesium_ingot": "Magnesium Ingot", + "item.modernmetals.magnesium_leggings": "Magnesium Leg Armour", + "item.modernmetals.magnesium_nugget": "Magnesium Nugget", + "item.modernmetals.magnesium_ore": "Magnesium Ore", + "item.modernmetals.magnesium_pickaxe": "Magnesium Pickaxe", + "item.modernmetals.magnesium_powder": "Magnesium Dust", + "item.modernmetals.magnesium_rod": "Magnesium Rod", + "item.modernmetals.magnesium_shears": "Magnesium Shears", + "item.modernmetals.magnesium_shield": "Magnesium Shield", + "item.modernmetals.magnesium_shovel": "Magnesium Shovel", + "item.modernmetals.magnesium_smallblend": "Tiny Pile of Magnesium Blend", + "item.modernmetals.magnesium_smallpowder": "Tiny Pile of Magnesium Dust", + "item.modernmetals.magnesium_sword": "Magnesium Sword", + "item.modernmetals.magnesium_trapdoor": "Magnesium Trapdoor", + "material.manganese": "Manganese", + "item.modernmetals.manganese_arrow": "Manganese Arrow", + "item.modernmetals.manganese_axe": "Manganese Axe", + "item.modernmetals.manganese_bars": "Manganese Bars", + "item.modernmetals.manganese_blend": "Manganese Blend", + "item.modernmetals.manganese_block": "Manganese Block", + "item.modernmetals.manganese_bolt": "Manganese Bolt", + "item.modernmetals.manganese_boots": "Manganese Boots", + "item.modernmetals.manganese_bow": "Manganese Bow", + "item.modernmetals.manganese_chestplate": "Manganese Chestplate", + "item.modernmetals.manganese_crackhammer": "Manganese Crack Hammer", + "item.modernmetals.manganese_crossbow": "Manganese Crossbow", + "item.modernmetals.manganese_door": "Manganese Door", + "item.modernmetals.manganese_fishing_rod": "Manganese Fishing Rod", + "item.modernmetals.manganese_gear": "Manganese Gear", + "item.modernmetals.manganese_helmet": "Manganese Helmet", + "item.modernmetals.manganese_hoe": "Manganese Hoe", + "item.modernmetals.manganese_horse_armor": "Manganese Horse Armour", + "item.modernmetals.manganese_ingot": "Manganese Ingot", + "item.modernmetals.manganese_leggings": "Manganese Leg Armour", + "item.modernmetals.manganese_nugget": "Manganese Nugget", + "item.modernmetals.manganese_ore": "Manganese Ore", + "item.modernmetals.manganese_pickaxe": "Manganese Pickaxe", + "item.modernmetals.manganese_powder": "Manganese Dust", + "item.modernmetals.manganese_rod": "Manganese Rod", + "item.modernmetals.manganese_shears": "Manganese Shears", + "item.modernmetals.manganese_shield": "Manganese Shield", + "item.modernmetals.manganese_shovel": "Manganese Shovel", + "item.modernmetals.manganese_smallblend": "Tiny Pile of Manganese Blend", + "item.modernmetals.manganese_smallpowder": "Tiny Pile of Manganese Dust", + "item.modernmetals.manganese_sword": "Manganese Sword", + "item.modernmetals.manganese_trapdoor": "Manganese Trapdoor", + "material.nichrome": "Nichrome", + "item.modernmetals.nichrome_arrow": "Nichrome Arrow", + "item.modernmetals.nichrome_axe": "Nichrome Axe", + "item.modernmetals.nichrome_bars": "Nichrome Bars", + "item.modernmetals.nichrome_blend": "Nichrome Blend", + "item.modernmetals.nichrome_block": "Nichrome Block", + "item.modernmetals.nichrome_bolt": "Nichrome Bolt", + "item.modernmetals.nichrome_boots": "Nichrome Boots", + "item.modernmetals.nichrome_bow": "Nichrome Bow", + "item.modernmetals.nichrome_chestplate": "Nichrome Chestplate", + "item.modernmetals.nichrome_crackhammer": "Nichrome Crack Hammer", + "item.modernmetals.nichrome_crossbow": "Nichrome Crossbow", + "item.modernmetals.nichrome_door": "Nichrome Door", + "item.modernmetals.nichrome_fishing_rod": "Nichrome Fishing Rod", + "item.modernmetals.nichrome_gear": "Nichrome Gear", + "item.modernmetals.nichrome_helmet": "Nichrome Helmet", + "item.modernmetals.nichrome_hoe": "Nichrome Hoe", + "item.modernmetals.nichrome_horse_armor": "Nichrome Horse Armour", + "item.modernmetals.nichrome_ingot": "Nichrome Ingot", + "item.modernmetals.nichrome_leggings": "Nichrome Leg Armour", + "item.modernmetals.nichrome_nugget": "Nichrome Nugget", + "item.modernmetals.nichrome_ore": "Nichrome Ore", + "item.modernmetals.nichrome_pickaxe": "Nichrome Pickaxe", + "item.modernmetals.nichrome_powder": "Nichrome Dust", + "item.modernmetals.nichrome_rod": "Nichrome Rod", + "item.modernmetals.nichrome_shears": "Nichrome Shears", + "item.modernmetals.nichrome_shield": "Nichrome Shield", + "item.modernmetals.nichrome_shovel": "Nichrome Shovel", + "item.modernmetals.nichrome_smallblend": "Tiny Pile of Nichrome Blend", + "item.modernmetals.nichrome_smallpowder": "Tiny Pile of Nichrome Dust", + "item.modernmetals.nichrome_sword": "Nichrome Sword", + "item.modernmetals.nichrome_trapdoor": "Nichrome Trapdoor", + "material.osmium": "Osmium", + "item.modernmetals.osmium_arrow": "Osmium Arrow", + "item.modernmetals.osmium_axe": "Osmium Axe", + "item.modernmetals.osmium_bars": "Osmium Bars", + "item.modernmetals.osmium_blend": "Osmium Blend", + "item.modernmetals.osmium_block": "Osmium Block", + "item.modernmetals.osmium_boots": "Osmium Boots", + "item.modernmetals.osmium_bolt": "Osmium Bolt", + "item.modernmetals.osmium_bow": "Osmium Bow", + "item.modernmetals.osmium_chestplate": "Osmium Chestplate", + "item.modernmetals.osmium_crackhammer": "Osmium Crack Hammer", + "item.modernmetals.osmium_crossbow": "Osmium Crossbow", + "item.modernmetals.osmium_door": "Osmium Door", + "item.modernmetals.osmium_fishing_rod": "Osmium Fishing Rod", + "item.modernmetals.osmium_gear": "Osmium Gear", + "item.modernmetals.osmium_helmet": "Osmium Helmet", + "item.modernmetals.osmium_hoe": "Osmium Hoe", + "item.modernmetals.osmium_horse_armor": "Osmium Horse Armour", + "item.modernmetals.osmium_ingot": "Osmium Ingot", + "item.modernmetals.osmium_leggings": "Osmium Leg Armour", + "item.modernmetals.osmium_nugget": "Osmium Nugget", + "item.modernmetals.osmium_ore": "Osmium Ore", + "item.modernmetals.osmium_pickaxe": "Osmium Pickaxe", + "item.modernmetals.osmium_powder": "Osmium Dust", + "item.modernmetals.osmium_rod": "Osmium Rod", + "item.modernmetals.osmium_shears": "Osmium Shears", + "item.modernmetals.osmium_shield": "Osmium Shield", + "item.modernmetals.osmium_shovel": "Osmium Shovel", + "item.modernmetals.osmium_smallblend": "Tiny Pile of Osmium Blend", + "item.modernmetals.osmium_smallpowder": "Tiny Pile of Osmium Dust", + "item.modernmetals.osmium_sword": "Osmium Sword", + "item.modernmetals.osmium_trapdoor": "Osmium Trapdoor", + "material.pewter": "Pewter", + "item.modernmetals.pewter_arrow": "Pewter Arrow", + "item.modernmetals.pewter_axe": "Pewter Axe", + "item.modernmetals.pewter_bars": "Pewter Bars", + "item.modernmetals.pewter_blend": "Pewter Blend", + "item.modernmetals.pewter_block": "Pewter Block", + "item.modernmetals.pewter_boots": "Pewter Boots", + "item.modernmetals.pewter_chestplate": "Pewter Chestplate", + "item.modernmetals.pewter_crackhammer": "Pewter Crack Hammer", + "item.modernmetals.pewter_door": "Pewter Door", + "item.modernmetals.pewter_helmet": "Pewter Helmet", + "item.modernmetals.pewter_hoe": "Pewter Hoe", + "item.modernmetals.pewter_ingot": "Pewter Ingot", + "item.modernmetals.pewter_leggings": "Pewter Leg Armour", + "item.modernmetals.pewter_nugget": "Pewter Nugget", + "item.modernmetals.pewter_ore": "Pewter Ore", + "item.modernmetals.pewter_pickaxe": "Pewter Pickaxe", + "item.modernmetals.pewter_powder": "Pewter Dust", + "item.modernmetals.pewter_shears": "Pewter Shears", + "item.modernmetals.pewter_shield": "Pewter Shield", + "item.modernmetals.pewter_shovel": "Pewter Shovel", + "item.modernmetals.pewter_smallpowder": "Tiny Pile of Pewter Dust", + "item.modernmetals.pewter_sword": "Pewter Sword", + "item.modernmetals.pewter_trapdoor": "Pewter Trapdoor", + "material.plutonium": "Plutonium", + "item.modernmetals.plutonium_arrow": "Plutonium Arrow", + "item.modernmetals.plutonium_axe": "Plutonium Axe", + "item.modernmetals.plutonium_bars": "Plutonium Bars", + "item.modernmetals.plutonium_blend": "Plutonium Blend", + "item.modernmetals.plutonium_block": "Plutonium Block", + "item.modernmetals.plutonium_bolt": "Plutonium Bolt", + "item.modernmetals.plutonium_boots": "Plutonium Boots", + "item.modernmetals.plutonium_bow": "Plutonium Bow", + "item.modernmetals.plutonium_chestplate": "Plutonium Chestplate", + "item.modernmetals.plutonium_crackhammer": "Plutonium Crack Hammer", + "item.modernmetals.plutonium_crossbow": "Plutonium Crossbow", + "item.modernmetals.plutonium_door": "Plutonium Door", + "item.modernmetals.plutonium_fishing_rod": "Plutonium Fishing Rod", + "item.modernmetals.plutonium_gear": "Plutonium Gear", + "item.modernmetals.plutonium_helmet": "Plutonium Helmet", + "item.modernmetals.plutonium_hoe": "Plutonium Hoe", + "item.modernmetals.plutonium_horse_armor": "Plutonium Horse Armour", + "item.modernmetals.plutonium_ingot": "Plutonium Ingot", + "item.modernmetals.plutonium_leggings": "Plutonium Leg Armour", + "item.modernmetals.plutonium_nugget": "Plutonium Nugget", + "item.modernmetals.plutonium_ore": "Plutonium Ore", + "item.modernmetals.plutonium_pickaxe": "Plutonium Pickaxe", + "item.modernmetals.plutonium_powder": "Plutonium Dust", + "item.modernmetals.plutonium_rod": "Plutonium Rod", + "item.modernmetals.plutonium_shears": "Plutonium Shears", + "item.modernmetals.plutonium_shield": "Plutonium Shield", + "item.modernmetals.plutonium_shovel": "Plutonium Shovel", + "item.modernmetals.plutonium_smallblend": "Tiny Pile of Plutonium Blend", + "item.modernmetals.plutonium_smallpowder": "Tiny Pile of Plutonium Dust", + "item.modernmetals.plutonium_sword": "Plutonium Sword", + "item.modernmetals.plutonium_trapdoor": "Plutonium Trapdoor", + "material.rutile": "Rutile", + "item.modernmetals.rutile_arrow": "Rutile Arrow", + "item.modernmetals.rutile_axe": "Rutile Axe", + "item.modernmetals.rutile_bars": "Rutile Bars", + "item.modernmetals.rutile_blend": "Rutile Blend", + "item.modernmetals.rutile_block": "Rutile Block", + "item.modernmetals.rutile_boots": "Rutile Boots", + "item.modernmetals.rutile_bolt": "Rutile Bolt", + "item.modernmetals.rutile_bow": "Rutile Bow", + "item.modernmetals.rutile_chestplate": "Rutile Chestplate", + "item.modernmetals.rutile_crackhammer": "Rutile Crack Hammer", + "item.modernmetals.rutile_crossbow": "Rutile Crossbow", + "item.modernmetals.rutile_door": "Rutile Door", + "item.modernmetals.rutile_fishing_rod": "Rutile Fishing Rod", + "item.modernmetals.rutile_gear": "Rutile Gear", + "item.modernmetals.rutile_helmet": "Rutile Helmet", + "item.modernmetals.rutile_hoe": "Rutile Hoe", + "item.modernmetals.rutile_horse_armor": "Rutile Horse Armour", + "item.modernmetals.rutile_ingot": "Rutile Ingot", + "item.modernmetals.rutile_leggings": "Rutile Leg Armour", + "item.modernmetals.rutile_nugget": "Rutile Nugget", + "item.modernmetals.rutile_ore": "Rutile Ore", + "item.modernmetals.rutile_pickaxe": "Rutile Pickaxe", + "item.modernmetals.rutile_powder": "Rutile Dust", + "item.modernmetals.rutile_rod": "Rutile Rod", + "item.modernmetals.rutile_shears": "Rutile Shears", + "item.modernmetals.rutile_shield": "Rutile Shield", + "item.modernmetals.rutile_shovel": "Rutile Shovel", + "item.modernmetals.rutile_smallblend": "Tiny Pile of Rutile Blend", + "item.modernmetals.rutile_smallpowder": "Tiny Pile of Rutile Dust", + "item.modernmetals.rutile_sword": "Rutile Sword", + "item.modernmetals.rutile_trapdoor": "Rutile Trapdoor", + "material.stainlesssteel": "Stainless Steel", + "item.modernmetals.stainlesssteel_arrow": "Stainless Steel Arrow", + "item.modernmetals.stainlesssteel_axe": "Stainless Steel Axe", + "item.modernmetals.stainlesssteel_bars": "Stainless Steel Bars", + "item.modernmetals.stainlesssteel_blend": "Stainless Steel Blend", + "item.modernmetals.stainlesssteel_block": "Stainless Steel Block", + "item.modernmetals.stainlesssteel_bolt": "Stainless Steel Bolt", + "item.modernmetals.stainlesssteel_boots": "Stainless Steel Boots", + "item.modernmetals.stainlesssteel_bow": "Stainless Steel Bow", + "item.modernmetals.stainlesssteel_chestplate": "Stainless Steel Chestplate", + "item.modernmetals.stainlesssteel_crackhammer": "Stainless Steel Crack Hammer", + "item.modernmetals.stainlesssteel_crossbow": "Stainless Steel Crossbow", + "item.modernmetals.stainlesssteel_door": "Stainless Steel Door", + "item.modernmetals.stainlesssteel_fishing_rod": "Stainless Steel Fishing Rod", + "item.modernmetals.stainlesssteel_gear": "Stainless Steel Gear", + "item.modernmetals.stainlesssteel_helmet": "Stainless Steel Helmet", + "item.modernmetals.stainlesssteel_hoe": "Stainless Steel Hoe", + "item.modernmetals.stainlesssteel_horse_armor": "Stainless Steel Horse Armour", + "item.modernmetals.stainlesssteel_ingot": "Stainless Steel Ingot", + "item.modernmetals.stainlesssteel_leggings": "Stainless Steel Leg Armour", + "item.modernmetals.stainlesssteel_nugget": "Stainless Steel Nugget", + "item.modernmetals.stainlesssteel_ore": "Stainless Steel Ore", + "item.modernmetals.stainlesssteel_pickaxe": "Stainless Steel Pickaxe", + "item.modernmetals.stainlesssteel_powder": "Stainless Steel Dust", + "item.modernmetals.stainlesssteel_rod": "Stainless Steel Rod", + "item.modernmetals.stainlesssteel_shears": "Stainless Steel Shears", + "item.modernmetals.stainlesssteel_shield": "Stainless Steel Shield", + "item.modernmetals.stainlesssteel_shovel": "Stainless Steel Shovel", + "item.modernmetals.stainlesssteel_smallblend": "Tiny Pile of Stainless Steel Blend", + "item.modernmetals.stainlesssteel_smallpowder": "Tiny Pile of Stainless Steel Dust", + "item.modernmetals.stainlesssteel_sword": "Stainless Steel Sword", + "item.modernmetals.stainlesssteel_trapdoor": "Stainless Steel Trapdoor", + "material.tantalum": "Tantalum", + "item.modernmetals.tantalum_arrow": "Tantalum Arrow", + "item.modernmetals.tantalum_axe": "Tantalum Axe", + "item.modernmetals.tantalum_bars": "Tantalum Bars", + "item.modernmetals.tantalum_blend": "Tantalum Blend", + "item.modernmetals.tantalum_block": "Tantalum Block", + "item.modernmetals.tantalum_bolt": "Tantalum Bolt", + "item.modernmetals.tantalum_boots": "Tantalum Boots", + "item.modernmetals.tantalum_bow": "Tantalum Bow", + "item.modernmetals.tantalum_chestplate": "Tantalum Chestplate", + "item.modernmetals.tantalum_crackhammer": "Tantalum Crack Hammer", + "item.modernmetals.tantalum_crossbow": "Tantalum Crossbow", + "item.modernmetals.tantalum_door": "Tantalum Door", + "item.modernmetals.tantalum_fishing_rod": "Tantalum Fishing Rod", + "item.modernmetals.tantalum_gear": "Tantalum Gear", + "item.modernmetals.tantalum_helmet": "Tantalum Helmet", + "item.modernmetals.tantalum_hoe": "Tantalum Hoe", + "item.modernmetals.tantalum_horse_armor": "Tantalum Horse Armour", + "item.modernmetals.tantalum_ingot": "Tantalum Ingot", + "item.modernmetals.tantalum_leggings": "Tantalum Leg Armour", + "item.modernmetals.tantalum_nugget": "Tantalum Nugget", + "item.modernmetals.tantalum_ore": "Tantalum Ore", + "item.modernmetals.tantalum_pickaxe": "Tantalum Pickaxe", + "item.modernmetals.tantalum_powder": "Tantalum Dust", + "item.modernmetals.tantalum_rod": "Tantalum Rod", + "item.modernmetals.tantalum_shears": "Tantalum Shears", + "item.modernmetals.tantalum_shield": "Tantalum Shield", + "item.modernmetals.tantalum_shovel": "Tantalum Shovel", + "item.modernmetals.tantalum_smallblend": "Tiny Pile of Tantalum Blend", + "item.modernmetals.tantalum_smallpowder": "Tiny Pile of Tantalum Dust", + "item.modernmetals.tantalum_sword": "Tantalum Sword", + "item.modernmetals.tantalum_trapdoor": "Tantalum Trapdoor", + "material.titanium": "Titanium", + "item.modernmetals.titanium_arrow": "Titanium Arrow", + "item.modernmetals.titanium_axe": "Titanium Axe", + "item.modernmetals.titanium_bars": "Titanium Bars", + "item.modernmetals.titanium_blend": "Titanium Blend", + "item.modernmetals.titanium_block": "Titanium Block", + "item.modernmetals.titanium_boots": "Titanium Boots", + "item.modernmetals.titanium_bolt": "Titanium Bolt", + "item.modernmetals.titanium_bow": "Titanium Bow", + "item.modernmetals.titanium_chestplate": "Titanium Chestplate", + "item.modernmetals.titanium_crackhammer": "Titanium Crack Hammer", + "item.modernmetals.titanium_crossbow": "Titanium Crossbow", + "item.modernmetals.titanium_door": "Titanium Door", + "item.modernmetals.titanium_fishing_rod": "Titanium Fishing Rod", + "item.modernmetals.titanium_gear": "Titanium Gear", + "item.modernmetals.titanium_helmet": "Titanium Helmet", + "item.modernmetals.titanium_hoe": "Titanium Hoe", + "item.modernmetals.titanium_horse_armor": "Titanium Horse Armour", + "item.modernmetals.titanium_ingot": "Titanium Ingot", + "item.modernmetals.titanium_leggings": "Titanium Leg Armour", + "item.modernmetals.titanium_nugget": "Titanium Nugget", + "item.modernmetals.titanium_ore": "Titanium Ore", + "item.modernmetals.titanium_pickaxe": "Titanium Pickaxe", + "item.modernmetals.titanium_powder": "Titanium Dust", + "item.modernmetals.titanium_rod": "Titanium Rod", + "item.modernmetals.titanium_shears": "Titanium Shears", + "item.modernmetals.titanium_shield": "Titanium Shield", + "item.modernmetals.titanium_shovel": "Titanium Shovel", + "item.modernmetals.titanium_smallblend": "Tiny Pile of Titanium Blend", + "item.modernmetals.titanium_smallpowder": "Tiny Pile of Titanium Dust", + "item.modernmetals.titanium_sword": "Titanium Sword", + "item.modernmetals.titanium_trapdoor": "Titanium Trapdoor", + "material.tungsten": "Tungsten", + "item.modernmetals.tungsten_arrow": "Tungsten Arrow", + "item.modernmetals.tungsten_axe": "Tungsten Axe", + "item.modernmetals.tungsten_bars": "Tungsten Bars", + "item.modernmetals.tungsten_blend": "Tungsten Blend", + "item.modernmetals.tungsten_block": "Tungsten Block", + "item.modernmetals.tungsten_boots": "Tungsten Boots", + "item.modernmetals.tungsten_bolt": "Tungsten Bolt", + "item.modernmetals.tungsten_bow": "Tungsten Bow", + "item.modernmetals.tungsten_chestplate": "Tungsten Chestplate", + "item.modernmetals.tungsten_crackhammer": "Tungsten Crack Hammer", + "item.modernmetals.tungsten_crossbow": "Tungsten Crossbow", + "item.modernmetals.tungsten_door": "Tungsten Door", + "item.modernmetals.tungsten_fishing_rod": "Tungsten Fishing Rod", + "item.modernmetals.tungsten_gear": "Tungsten Gear", + "item.modernmetals.tungsten_helmet": "Tungsten Helmet", + "item.modernmetals.tungsten_hoe": "Tungsten Hoe", + "item.modernmetals.tungsten_horse_armor": "Tungsten Horse Armour", + "item.modernmetals.tungsten_ingot": "Tungsten Ingot", + "item.modernmetals.tungsten_leggings": "Tungsten Leg Armour", + "item.modernmetals.tungsten_nugget": "Tungsten Nugget", + "item.modernmetals.tungsten_ore": "Tungsten Ore", + "item.modernmetals.tungsten_pickaxe": "Tungsten Pickaxe", + "item.modernmetals.tungsten_powder": "Tungsten Dust", + "item.modernmetals.tungsten_rod": "Tungsten Rod", + "item.modernmetals.tungsten_shears": "Tungsten Shears", + "item.modernmetals.tungsten_shield": "Tungsten Shield", + "item.modernmetals.tungsten_shovel": "Tungsten Shovel", + "item.modernmetals.tungsten_smallblend": "Tiny Pile of Tungsten Blend", + "item.modernmetals.tungsten_smallpowder": "Tiny Pile of Tungsten Dust", + "item.modernmetals.tungsten_sword": "Tungsten Sword", + "item.modernmetals.tungsten_trapdoor": "Tungsten Trapdoor", + "material.uranium": "Uranium", + "item.modernmetals.uranium_arrow": "Uranium Arrow", + "item.modernmetals.uranium_axe": "Uranium Axe", + "item.modernmetals.uranium_bars": "Uranium Bars", + "item.modernmetals.uranium_blend": "Uranium Blend", + "item.modernmetals.uranium_block": "Uranium Block", + "item.modernmetals.uranium_boots": "Uranium Boots", + "item.modernmetals.uranium_bolt": "Uranium Bolt", + "item.modernmetals.uranium_bow": "Uranium Bow", + "item.modernmetals.uranium_chestplate": "Uranium Chestplate", + "item.modernmetals.uranium_crackhammer": "Uranium Crack Hammer", + "item.modernmetals.uranium_crossbow": "Uranium Crossbow", + "item.modernmetals.uranium_door": "Uranium Door", + "item.modernmetals.uranium_fishing_rod": "Uranium Fishing Rod", + "item.modernmetals.uranium_gear": "Uranium Gear", + "item.modernmetals.uranium_helmet": "Uranium Helmet", + "item.modernmetals.uranium_hoe": "Uranium Hoe", + "item.modernmetals.uranium_horse_armor": "Uranium Horse Armour", + "item.modernmetals.uranium_ingot": "Uranium Ingot", + "item.modernmetals.uranium_leggings": "Uranium Leg Armour", + "item.modernmetals.uranium_nugget": "Uranium Nugget", + "item.modernmetals.uranium_ore": "Uranium Ore", + "item.modernmetals.uranium_pickaxe": "Uranium Pickaxe", + "item.modernmetals.uranium_powder": "Uranium Dust", + "item.modernmetals.uranium_rod": "Uranium Rod", + "item.modernmetals.uranium_shears": "Uranium Shears", + "item.modernmetals.uranium_shield": "Uranium Shield", + "item.modernmetals.uranium_shovel": "Uranium Shovel", + "item.modernmetals.uranium_smallblend": "Tiny Pile of Uranium Blend", + "item.modernmetals.uranium_smallpowder": "Tiny Pile of Uranium Dust", + "item.modernmetals.uranium_sword": "Uranium Sword", + "item.modernmetals.uranium_trapdoor": "Uranium Trapdoor", + "material.zirconium": "Zirconium", + "item.modernmetals.zirconium_arrow": "Zirconium Arrow", + "item.modernmetals.zirconium_axe": "Zirconium Axe", + "item.modernmetals.zirconium_bars": "Zirconium Bars", + "item.modernmetals.zirconium_blend": "Zirconium Blend", + "item.modernmetals.zirconium_block": "Zirconium Block", + "item.modernmetals.zirconium_bolt": "Zirconium Bolt", + "item.modernmetals.zirconium_boots": "Zirconium Boots", + "item.modernmetals.zirconium_bow": "Zirconium Bow", + "item.modernmetals.zirconium_chestplate": "Zirconium Chestplate", + "item.modernmetals.zirconium_crackhammer": "Zirconium Crack Hammer", + "item.modernmetals.zirconium_crossbow": "Zirconium Crossbow", + "item.modernmetals.zirconium_door": "Zirconium Door", + "item.modernmetals.zirconium_fishing_rod": "Zirconium Fishing Rod", + "item.modernmetals.zirconium_gear": "Zirconium Gear", + "item.modernmetals.zirconium_helmet": "Zirconium Helmet", + "item.modernmetals.zirconium_hoe": "Zirconium Hoe", + "item.modernmetals.zirconium_horse_armor": "Zirconium Horse Armour", + "item.modernmetals.zirconium_ingot": "Zirconium Ingot", + "item.modernmetals.zirconium_leggings": "Zirconium Leg Armour", + "item.modernmetals.zirconium_nugget": "Zirconium Nugget", + "item.modernmetals.zirconium_ore": "Zirconium Ore", + "item.modernmetals.zirconium_pickaxe": "Zirconium Pickaxe", + "item.modernmetals.zirconium_powder": "Zirconium Dust", + "item.modernmetals.zirconium_rod": "Zirconium Rod", + "item.modernmetals.zirconium_shears": "Zirconium Shears", + "item.modernmetals.zirconium_shield": "Zirconium Shield", + "item.modernmetals.zirconium_shovel": "Zirconium Shovel", + "item.modernmetals.zirconium_smallblend": "Tiny Pile of Zirconium Blend", + "item.modernmetals.zirconium_smallpowder": "Tiny Pile of Zirconium Dust", + "item.modernmetals.zirconium_sword": "Zirconium Sword", + "item.modernmetals.zirconium_trapdoor": "Zirconium Trapdoor", + "tile.modernmetals.aluminum_bars": "Aluminum Bars", + "block.modernmetals.aluminum_bars": "Aluminum Bars", + "tile.modernmetals.aluminum_block": "Aluminum Block", + "block.modernmetals.aluminum_block": "Aluminum Block", + "tile.modernmetals.aluminum_door": "Aluminum Door", + "block.modernmetals.aluminum_door": "Aluminum Door", + "tile.modernmetals.aluminum_ore": "Aluminum Ore", + "block.modernmetals.aluminum_ore": "Aluminum Ore", + "tile.modernmetals.aluminum_plate": "Aluminum Plate", + "block.modernmetals.aluminum_plate": "Aluminum Plate", + "tile.modernmetals.aluminum_trapdoor": "Aluminum Trapdoor", + "block.modernmetals.aluminum_trapdoor": "Aluminum Trapdoor", + "tile.modernmetals.aluminumbrass_bars": "Aluminum Brass Bars", + "block.modernmetals.aluminumbrass_bars": "Aluminum Brass Bars", + "tile.modernmetals.aluminumbrass_block": "Aluminum Brass Block", + "block.modernmetals.aluminumbrass_block": "Aluminum Brass Block", + "tile.modernmetals.aluminumbrass_door": "Aluminum Brass Door", + "block.modernmetals.aluminumbrass_door": "Aluminum Brass Door", + "tile.modernmetals.aluminumbrass_ore": "Aluminum Brass Ore", + "block.modernmetals.aluminumbrass_ore": "Aluminum Brass Ore", + "tile.modernmetals.aluminumbrass_plate": "Aluminum Brass Plate", + "block.modernmetals.aluminumbrass_plate": "Aluminum Brass Plate", + "tile.modernmetals.aluminumbrass_trapdoor": "Aluminum Brass Trapdoor", + "block.modernmetals.aluminumbrass_trapdoor": "Aluminum Brass Trapdoor", + "tile.modernmetals.boron_bars": "Boron Bars", + "block.modernmetals.boron_bars": "Boron Bars", + "tile.modernmetals.boron_block": "Boron Block", + "block.modernmetals.boron_block": "Boron Block", + "tile.modernmetals.boron_door": "Boron Door", + "block.modernmetals.boron_door": "Boron Door", + "tile.modernmetals.boron_ore": "Boron Ore", + "block.modernmetals.boron_ore": "Boron Ore", + "tile.modernmetals.boron_plate": "Boron Plate", + "block.modernmetals.boron_plate": "Boron Plate", + "tile.modernmetals.boron_trapdoor": "Boron Trapdoor", + "block.modernmetals.boron_trapdoor": "Boron Trapdoor", + "tile.modernmetals.cadmium_bars": "Cadmium Bars", + "block.modernmetals.cadmium_bars": "Cadmium Bars", + "tile.modernmetals.cadmium_block": "Cadmium Block", + "block.modernmetals.cadmium_block": "Cadmium Block", + "tile.modernmetals.cadmium_door": "Cadmium Door", + "block.modernmetals.cadmium_door": "Cadmium Door", + "tile.modernmetals.cadmium_ore": "Cadmium Ore", + "block.modernmetals.cadmium_ore": "Cadmium Ore", + "tile.modernmetals.cadmium_plate": "Cadmium Plate", + "block.modernmetals.cadmium_plate": "Cadmium Plate", + "tile.modernmetals.cadmium_trapdoor": "Cadmium Trapdoor", + "block.modernmetals.cadmium_trapdoor": "Cadmium Trapdoor", + "tile.modernmetals.chromium_bars": "Chromium Bars", + "block.modernmetals.chromium_bars": "Chromium Bars", + "tile.modernmetals.chromium_block": "Chromium Block", + "block.modernmetals.chromium_block": "Chromium Block", + "tile.modernmetals.chromium_door": "Chromium Door", + "block.modernmetals.chromium_door": "Chromium Door", + "tile.modernmetals.chromium_ore": "Chromium Ore", + "block.modernmetals.chromium_ore": "Chromium Ore", + "tile.modernmetals.chromium_plate": "Chromium Plate", + "block.modernmetals.chromium_plate": "Chromium Plate", + "tile.modernmetals.chromium_trapdoor": "Chromium Trapdoor", + "block.modernmetals.chromium_trapdoor": "Chromium Trapdoor", + "tile.modernmetals.galvanizedsteel_bars": "Galvanized Steel Bars", + "block.modernmetals.galvanizedsteel_bars": "Galvanized Steel Bars", + "tile.modernmetals.galvanizedsteel_block": "Galvanized Steel Block", + "block.modernmetals.galvanizedsteel_block": "Galvanized Steel Block", + "tile.modernmetals.galvanizedsteel_door": "Galvanized Steel Door", + "block.modernmetals.galvanizedsteel_door": "Galvanized Steel Door", + "tile.modernmetals.galvanizedsteel_ore": "Galvanized Steel Ore", + "block.modernmetals.galvanizedsteel_ore": "Galvanized Steel Ore", + "tile.modernmetals.galvanizedsteel_plate": "Galvanized Steel Plate", + "block.modernmetals.galvanizedsteel_plate": "Galvanized Steel Plate", + "tile.modernmetals.galvanizedsteel_trapdoor": "Galvanized Steel Trapdoor", + "block.modernmetals.galvanizedsteel_trapdoor": "Galvanized Steel Trapdoor", + "tile.modernmetals.iridium_bars": "Iridium Bars", + "block.modernmetals.iridium_bars": "Iridium Bars", + "tile.modernmetals.iridium_block": "Iridium Block", + "block.modernmetals.iridium_block": "Iridium Block", + "tile.modernmetals.iridium_door": "Iridium Door", + "block.modernmetals.iridium_door": "Iridium Door", + "tile.modernmetals.iridium_ore": "Iridium Ore", + "block.modernmetals.iridium_ore": "Iridium Ore", + "tile.modernmetals.iridium_plate": "Iridium Plate", + "block.modernmetals.iridium_plate": "Iridium Plate", + "tile.modernmetals.iridium_trapdoor": "Iridium Trapdoor", + "block.modernmetals.iridium_trapdoor": "Iridium Trapdoor", + "tile.modernmetals.magnesium_bars": "Magnesium Bars", + "block.modernmetals.magnesium_bars": "Magnesium Bars", + "tile.modernmetals.magnesium_block": "Magnesium Block", + "block.modernmetals.magnesium_block": "Magnesium Block", + "tile.modernmetals.magnesium_door": "Magnesium Door", + "block.modernmetals.magnesium_door": "Magnesium Door", + "tile.modernmetals.magnesium_ore": "Magnesium Ore", + "block.modernmetals.magnesium_ore": "Magnesium Ore", + "tile.modernmetals.magnesium_plate": "Magnesium Plate", + "block.modernmetals.magnesium_plate": "Magnesium Plate", + "tile.modernmetals.magnesium_trapdoor": "Magnesium Trapdoor", + "block.modernmetals.magnesium_trapdoor": "Magnesium Trapdoor", + "tile.modernmetals.manganese_bars": "Manganese Bars", + "block.modernmetals.manganese_bars": "Manganese Bars", + "tile.modernmetals.manganese_block": "Manganese Block", + "block.modernmetals.manganese_block": "Manganese Block", + "tile.modernmetals.manganese_door": "Manganese Door", + "block.modernmetals.manganese_door": "Manganese Door", + "tile.modernmetals.manganese_ore": "Manganese Ore", + "block.modernmetals.manganese_ore": "Manganese Ore", + "tile.modernmetals.manganese_plate": "Manganese Plate", + "block.modernmetals.manganese_plate": "Manganese Plate", + "tile.modernmetals.manganese_trapdoor": "Manganese Trapdoor", + "block.modernmetals.manganese_trapdoor": "Manganese Trapdoor", + "tile.modernmetals.nichrome_bars": "Nichrome Bars", + "block.modernmetals.nichrome_bars": "Nichrome Bars", + "tile.modernmetals.nichrome_block": "Nichrome Block", + "block.modernmetals.nichrome_block": "Nichrome Block", + "tile.modernmetals.nichrome_door": "Nichrome Door", + "block.modernmetals.nichrome_door": "Nichrome Door", + "tile.modernmetals.nichrome_ore": "Nichrome Ore", + "block.modernmetals.nichrome_ore": "Nichrome Ore", + "tile.modernmetals.nichrome_plate": "Nichrome Plate", + "block.modernmetals.nichrome_plate": "Nichrome Plate", + "tile.modernmetals.nichrome_trapdoor": "Nichrome Trapdoor", + "block.modernmetals.nichrome_trapdoor": "Nichrome Trapdoor", + "tile.modernmetals.osmium_bars": "Osmium Bars", + "block.modernmetals.osmium_bars": "Osmium Bars", + "tile.modernmetals.osmium_block": "Osmium Block", + "block.modernmetals.osmium_block": "Osmium Block", + "tile.modernmetals.osmium_door": "Osmium Door", + "block.modernmetals.osmium_door": "Osmium Door", + "tile.modernmetals.osmium_ore": "Osmium Ore", + "block.modernmetals.osmium_ore": "Osmium Ore", + "tile.modernmetals.osmium_plate": "Osmium Plate", + "block.modernmetals.osmium_plate": "Osmium Plate", + "tile.modernmetals.osmium_trapdoor": "Osmium Trapdoor", + "block.modernmetals.osmium_trapdoor": "Osmium Trapdoor", + "tile.modernmetals.plutonium_bars": "Plutonium Bars", + "block.modernmetals.plutonium_bars": "Plutonium Bars", + "tile.modernmetals.plutonium_block": "Plutonium Block", + "block.modernmetals.plutonium_block": "Plutonium Block", + "tile.modernmetals.plutonium_door": "Plutonium Door", + "block.modernmetals.plutonium_door": "Plutonium Door", + "tile.modernmetals.plutonium_ore": "Plutonium Ore", + "block.modernmetals.plutonium_ore": "Plutonium Ore", + "tile.modernmetals.plutonium_plate": "Plutonium Plate", + "block.modernmetals.plutonium_plate": "Plutonium Plate", + "tile.modernmetals.plutonium_trapdoor": "Plutonium Trapdoor", + "block.modernmetals.plutonium_trapdoor": "Plutonium Trapdoor", + "tile.modernmetals.rutile_bars": "Rutile Bars", + "block.modernmetals.rutile_bars": "Rutile Bars", + "tile.modernmetals.rutile_block": "Rutile Block", + "block.modernmetals.rutile_block": "Rutile Block", + "tile.modernmetals.rutile_door": "Rutile Door", + "block.modernmetals.rutile_door": "Rutile Door", + "tile.modernmetals.rutile_ore": "Rutile Ore", + "block.modernmetals.rutile_ore": "Rutile Ore", + "tile.modernmetals.rutile_plate": "Rutile Plate", + "block.modernmetals.rutile_plate": "Rutile Plate", + "tile.modernmetals.rutile_trapdoor": "Rutile Trapdoor", + "block.modernmetals.rutile_trapdoor": "Rutile Trapdoor", + "tile.modernmetals.stainlesssteel_bars": "Stainless Steel Bars", + "block.modernmetals.stainlesssteel_bars": "Stainless Steel Bars", + "tile.modernmetals.stainlesssteel_block": "Stainless Steel Block", + "block.modernmetals.stainlesssteel_block": "Stainless Steel Block", + "tile.modernmetals.stainlesssteel_door": "Stainless Steel Door", + "block.modernmetals.stainlesssteel_door": "Stainless Steel Door", + "tile.modernmetals.stainlesssteel_ore": "Stainless Steel Ore", + "block.modernmetals.stainlesssteel_ore": "Stainless Steel Ore", + "tile.modernmetals.stainlesssteel_plate": "Stainless Steel Plate", + "block.modernmetals.stainlesssteel_plate": "Stainless Steel Plate", + "tile.modernmetals.stainlesssteel_trapdoor": "Stainless Steel Trapdoor", + "block.modernmetals.stainlesssteel_trapdoor": "Stainless Steel Trapdoor", + "tile.modernmetals.tantalum_bars": "Tantalum Bars", + "block.modernmetals.tantalum_bars": "Tantalum Bars", + "tile.modernmetals.tantalum_block": "Tantalum", + "block.modernmetals.tantalum_block": "Tantalum", + "tile.modernmetals.tantalum_door": "Tantalum Door", + "block.modernmetals.tantalum_door": "Tantalum Door", + "tile.modernmetals.tantalum_ore": "Tantalum Ore", + "block.modernmetals.tantalum_ore": "Tantalum Ore", + "tile.modernmetals.tantalum_plate": "Tantalum Plate", + "block.modernmetals.tantalum_plate": "Tantalum Plate", + "tile.modernmetals.tantalum_trapdoor": "Tantalum Trapdoor", + "block.modernmetals.tantalum_trapdoor": "Tantalum Trapdoor", + "tile.modernmetals.titanium_bars": "Titanium Bars", + "block.modernmetals.titanium_bars": "Titanium Bars", + "tile.modernmetals.titanium_block": "Titanium", + "block.modernmetals.titanium_block": "Titanium", + "tile.modernmetals.titanium_door": "Titanium Door", + "block.modernmetals.titanium_door": "Titanium Door", + "tile.modernmetals.titanium_ore": "Titanium Ore", + "block.modernmetals.titanium_ore": "Titanium Ore", + "tile.modernmetals.titanium_plate": "Titanium Plate", + "block.modernmetals.titanium_plate": "Titanium Plate", + "tile.modernmetals.titanium_trapdoor": "Titanium Trapdoor", + "block.modernmetals.titanium_trapdoor": "Titanium Trapdoor", + "tile.modernmetals.tungsten_bars": "Tungsten Bars", + "block.modernmetals.tungsten_bars": "Tungsten Bars", + "tile.modernmetals.tungsten_block": "Tungsten", + "block.modernmetals.tungsten_block": "Tungsten", + "tile.modernmetals.tungsten_door": "Tungsten Door", + "block.modernmetals.tungsten_door": "Tungsten Door", + "tile.modernmetals.tungsten_ore": "Tungsten Ore", + "block.modernmetals.tungsten_ore": "Tungsten Ore", + "tile.modernmetals.tungsten_plate": "Tungsten Plate", + "block.modernmetals.tungsten_plate": "Tungsten Plate", + "tile.modernmetals.tungsten_trapdoor": "Tungsten Trapdoor", + "block.modernmetals.tungsten_trapdoor": "Tungsten Trapdoor", + "tile.modernmetals.uranium_bars": "Uranium Bars", + "block.modernmetals.uranium_bars": "Uranium Bars", + "tile.modernmetals.uranium_block": "Uranium", + "block.modernmetals.uranium_block": "Uranium", + "tile.modernmetals.uranium_door": "Uranium Door", + "block.modernmetals.uranium_door": "Uranium Door", + "tile.modernmetals.uranium_ore": "Uranium Ore", + "block.modernmetals.uranium_ore": "Uranium Ore", + "tile.modernmetals.uranium_plate": "Uranium Plate", + "block.modernmetals.uranium_plate": "Uranium Plate", + "tile.modernmetals.uranium_trapdoor": "Uranium Trapdoor", + "block.modernmetals.uranium_trapdoor": "Uranium Trapdoor", + "tile.modernmetals.zirconium_bars": "Zirconium Bars", + "block.modernmetals.zirconium_bars": "Zirconium Bars", + "tile.modernmetals.zirconium_block": "Zirconium", + "block.modernmetals.zirconium_block": "Zirconium", + "tile.modernmetals.zirconium_door": "Zirconium Door", + "block.modernmetals.zirconium_door": "Zirconium Door", + "tile.modernmetals.zirconium_ore": "Zirconium Ore", + "block.modernmetals.zirconium_ore": "Zirconium Ore", + "tile.modernmetals.zirconium_plate": "Zirconium Plate", + "block.modernmetals.zirconium_plate": "Zirconium Plate", + "tile.modernmetals.zirconium_trapdoor": "Zirconium Trapdoor", + "block.modernmetals.zirconium_trapdoor": "Zirconium Trapdoor", + "tooltip.aluminum.tool": "Nothing Special", + "tooltip.aluminumbrass.tool": "Nothing Special", + "tooltip.cadmium.tool": "Nothing Special", + "tooltip.chromium.tool": "Nothing Special", + "tooltip.galvanized_steel.tool": "Nothing Special", + "tooltip.iridium.tool": "Nothing Special", + "tooltip.magnesium.tool": "Nothing Special", + "tooltip.manganese.tool": "Nothing Special", + "tooltip.nichrome.tool": "Nothing Special", + "tooltip.osmium.tool": "Nothing Special", + "tooltip.plutonium.tool": "Nothing Special", + "tooltip.rutile.tool": "Nothing Special", + "tooltip.stainless_steel.tool": "Nothing Special", + "tooltip.tantalum.tool": "Nothing Special", + "tooltip.titanium.tool": "Nothing Special", + "tooltip.tungsten.tool": "Nothing Special", + "tooltip.uranium.tool": "Nothing Special", + "tooltip.zirconium.tool": "Nothing Special", + "tooltip.aluminum.armor": "Nothing Special", + "tooltip.aluminumbrass.armor": "Nothing Special", + "tooltip.cadmium.armor": "Nothing Special", + "tooltip.chromium.armor": "Nothing Special", + "tooltip.galvanized_steel.armor": "Nothing Special", + "tooltip.iridium.armor": "Nothing Special", + "tooltip.magnesium.armor": "Nothing Special", + "tooltip.manganese.armor": "Nothing Special", + "tooltip.nichrome.armor": "Nothing Special", + "tooltip.osmium.armor": "Nothing Special", + "tooltip.plutonium.armor": "Nothing Special", + "tooltip.rutile.armor": "Nothing Special", + "tooltip.stainless_steel.armor": "Nothing Special", + "tooltip.tantalum.armor": "Nothing Special", + "tooltip.titanium.armor": "Nothing Special", + "tooltip.tungsten.armor": "Nothing Special", + "tooltip.uranium.armor": "Nothing Special", + "tooltip.zirconium.armor": "Nothing Special", + "achievement.aluminumbrass_maker": "Aluminum Brass", + "achievement.galvanized_steel_maker": "Galvanized Steel", + "achievement.nichrome_maker": "Nichrome", + "achievement.stainless_steel_maker": "Stainless Steel", + "achievement.titanium_maker": "Titanium", + "achievement.aluminumbrass_maker.desc": "Combine Aluminum Dust and Brass Dust to make Aluminum Brass", + "achievement.galvanized_steel_maker.desc": "Combine Steel Dust and Zinc Dust to make Galvanized Steel", + "achievement.nichrome_maker.desc": "Combine Nickel Dust and Chromium Dust to make Nichrome", + "achievement.stainless_steel_maker.desc": "Combine Steel Dust and Chromium Dust to make Stainless Steel", + "achievement.titanium_maker.desc": "Combine Rutile Dust and Magnesium Dust to make Titanium", + "fluid.modernmetals.aluminum": "Molten Aluminum", + "fluid.modernmetals.aluminumbrass": "Molten Aluminum Brass", + "fluid.modernmetals.boron": "Molten Boron", + "fluid.modernmetals.beryllium": "Molten Beryllium", + "fluid.modernmetals.cadmium": "Molten Cadmium", + "fluid.modernmetals.chromium": "Molten Chromium", + "fluid.modernmetals.galvanizedsteel": "Molten Galvanized Steel", + "fluid.modernmetals.iridium": "Molten Iridium", + "fluid.modernmetals.magnesium": "Molten Magnesium", + "fluid.modernmetals.manganese": "Molten Manganese", + "fluid.modernmetals.nichrome": "Molten Nichrome", + "fluid.modernmetals.osmium": "Molten Osmium", + "fluid.modernmetals.plutonium": "Molten Plutonium", + "fluid.modernmetals.rutile": "Molten Rutile", + "fluid.modernmetals.stainlesssteel": "Molten Stainless Steel", + "fluid.modernmetals.tantalum": "Molten Tantalum", + "fluid.modernmetals.titanium": "Molten Titanium", + "fluid.modernmetals.tungsten": "Molten Tungsten", + "fluid.modernmetals.uranium": "Molten Uranium", + "fluid.modernmetals.zirconium": "Molten Zirconium", + "tile.modernmetals.aluminum": "Molten Aluminum", + "block.modernmetals.aluminum": "Molten Aluminum", + "tile.modernmetals.aluminumbrass": "Molten Aluminum Brass", + "block.modernmetals.aluminumbrass": "Molten Aluminum Brass", + "tile.modernmetals.boron": "Molten Boron", + "block.modernmetals.boron": "Molten Boron", + "tile.modernmetals.cadmium": "Molten Cadmium", + "block.modernmetals.cadmium": "Molten Cadmium", + "tile.modernmetals.chromium": "Molten Chromium", + "block.modernmetals.chromium": "Molten Chromium", + "tile.modernmetals.galvanizedsteel": "Molten Galvanized Steel", + "block.modernmetals.galvanizedsteel": "Molten Galvanized Steel", + "tile.modernmetals.iridium": "Molten Iridium", + "block.modernmetals.iridium": "Molten Iridium", + "tile.modernmetals.magnesium": "Molten Magnesium", + "block.modernmetals.magnesium": "Molten Magnesium", + "tile.modernmetals.manganese": "Molten Manganese", + "block.modernmetals.manganese": "Molten Manganese", + "tile.modernmetals.nichrome": "Molten Nichrome", + "block.modernmetals.nichrome": "Molten Nichrome", + "tile.modernmetals.osmium": "Molten Osmium", + "block.modernmetals.osmium": "Molten Osmium", + "tile.modernmetals.plutonium": "Molten Plutonium", + "block.modernmetals.plutonium": "Molten Plutonium", + "tile.modernmetals.rutile": "Molten Rutile", + "block.modernmetals.rutile": "Molten Rutile", + "tile.modernmetals.stainlesssteel": "Molten Stainless Steel", + "block.modernmetals.stainlesssteel": "Molten Stainless Steel", + "tile.modernmetals.tantalum": "Molten Tantalum", + "block.modernmetals.tantalum": "Molten Tantalum", + "tile.modernmetals.titanium": "Molten Titanium", + "block.modernmetals.titanium": "Molten Titanium", + "tile.modernmetals.tungsten": "Molten Tungsten", + "block.modernmetals.tungsten": "Molten Tungsten", + "tile.modernmetals.uranium": "Molten Uranium", + "block.modernmetals.uranium": "Molten Uranium", + "tile.modernmetals.zirconium": "Molten Zirconium", + "block.modernmetals.zirconium": "Molten Zirconium", + "item.modernmetals.aluminum_clump": "Aluminum Clump", + "item.modernmetals.aluminum_crushed": "Crushed Aluminum Ore", + "item.modernmetals.aluminum_crushed_purified": "Purified Crushed Aluminum Ore", + "item.modernmetals.aluminum_crystal": "Aluminum Crystal", + "item.modernmetals.aluminum_dense_plate": "Dense Aluminum Plate", + "item.modernmetals.aluminum_powder_dirty": "Dirty Aluminum Dust", + "item.modernmetals.aluminum_shard": "Aluminum Shard", + "item.modernmetals.aluminum_button": "Aluminum Button", + "item.modernmetals.aluminum_lever": "Aluminum Lever", + "item.modernmetals.aluminum_pressure_plate": "Aluminum Pressure Plate", + "item.modernmetals.aluminum_slab": "Aluminum Slab", + "item.modernmetals.aluminum_stairs": "Aluminum Stairs", + "item.modernmetals.aluminum_wall": "Aluminum Wall", + "tile.modernmetals.aluminum_button": "Aluminum Button", + "block.modernmetals.aluminum_button": "Aluminum Button", + "tile.modernmetals.aluminum_lever": "Aluminum Lever", + "block.modernmetals.aluminum_lever": "Aluminum Lever", + "tile.modernmetals.aluminum_pressure_plate": "Aluminum Pressure Plate", + "block.modernmetals.aluminum_pressure_plate": "Aluminum Pressure Plate", + "tile.modernmetals.aluminum_slab": "Aluminum Slab", + "block.modernmetals.aluminum_slab": "Aluminum Slab", + "tile.modernmetals.aluminum_stairs": "Aluminum Stairs", + "block.modernmetals.aluminum_stairs": "Aluminum Stairs", + "tile.modernmetals.aluminum_wall": "Aluminum Wall", + "block.modernmetals.aluminum_wall": "Aluminum Wall", + "item.modernmetals.aluminumbrass_clump": "Aluminum Brass Clump", + "item.modernmetals.aluminumbrass_crushed": "Crushed Aluminum Brass Ore", + "item.modernmetals.aluminumbrass_crushed_purified": "Purified Crushed Aluminum Brass Ore", + "item.modernmetals.aluminumbrass_crystal": "Aluminum Brass Crystal", + "item.modernmetals.aluminumbrass_dense_plate": "Dense Aluminum Brass Plate", + "item.modernmetals.aluminumbrass_powder_dirty": "Dirty Aluminum Brass Dust", + "item.modernmetals.aluminumbrass_shard": "Aluminum Brass Shard", + "item.modernmetals.aluminumbrass_button": "Aluminum Brass Button", + "item.modernmetals.aluminumbrass_lever": "Aluminum Brass Lever", + "item.modernmetals.aluminumbrass_pressure_plate": "Aluminum Brass Pressure Plate", + "item.modernmetals.aluminumbrass_slab": "Aluminum Brass Slab", + "item.modernmetals.aluminumbrass_stairs": "Aluminum Brass Stairs", + "item.modernmetals.aluminumbrass_wall": "Aluminum Brass Wall", + "tile.modernmetals.aluminumbrass_button": "Aluminum Brass Button", + "block.modernmetals.aluminumbrass_button": "Aluminum Brass Button", + "tile.modernmetals.aluminumbrass_lever": "Aluminum Brass Lever", + "block.modernmetals.aluminumbrass_lever": "Aluminum Brass Lever", + "tile.modernmetals.aluminumbrass_pressure_plate": "Aluminum Brass Pressure Plate", + "block.modernmetals.aluminumbrass_pressure_plate": "Aluminum Brass Pressure Plate", + "tile.modernmetals.aluminumbrass_slab": "Aluminum Brass Slab", + "block.modernmetals.aluminumbrass_slab": "Aluminum Brass Slab", + "tile.modernmetals.aluminumbrass_stairs": "Aluminum Brass Stairs", + "block.modernmetals.aluminumbrass_stairs": "Aluminum Brass Stairs", + "tile.modernmetals.aluminumbrass_wall": "Aluminum Brass Wall", + "block.modernmetals.aluminumbrass_wall": "Aluminum Brass Wall", + "tile.modernmetals.beryllium_bars": "Beryllium Bars", + "block.modernmetals.beryllium_bars": "Beryllium Bars", + "tile.modernmetals.beryllium_block": "Beryllium", + "block.modernmetals.beryllium_block": "Beryllium", + "tile.modernmetals.beryllium_door": "Beryllium Door", + "block.modernmetals.beryllium_door": "Beryllium Door", + "tile.modernmetals.beryllium_ore": "Beryllium Ore", + "block.modernmetals.beryllium_ore": "Beryllium Ore", + "tile.modernmetals.beryllium_plate": "Beryllium Plate", + "block.modernmetals.beryllium_plate": "Beryllium Plate", + "tile.modernmetals.beryllium_trapdoor": "Beryllium Trapdoor", + "block.modernmetals.beryllium_trapdoor": "Beryllium Trapdoor", + "item.modernmetals.beryllium_clump": "Beryllium Clump", + "item.modernmetals.beryllium_crushed": "Crushed Beryllium Ore", + "item.modernmetals.beryllium_crushed_purified": "Purified Crushed Beryllium Ore", + "item.modernmetals.beryllium_crystal": "Beryllium Crystal", + "item.modernmetals.beryllium_dense_plate": "Dense Beryllium Plate", + "item.modernmetals.beryllium_powder_dirty": "Dirty Beryllium Dust", + "item.modernmetals.beryllium_shard": "Beryllium Shard", + "item.modernmetals.beryllium_button": "Beryllium Button", + "item.modernmetals.beryllium_lever": "Beryllium Lever", + "item.modernmetals.beryllium_pressure_plate": "Beryllium Pressure Plate", + "item.modernmetals.beryllium_slab": "Beryllium Slab", + "item.modernmetals.beryllium_stairs": "Beryllium Stairs", + "item.modernmetals.beryllium_wall": "Beryllium Wall", + "tile.modernmetals.beryllium": "Molten Beryllium", + "block.modernmetals.beryllium": "Molten Beryllium", + "tile.modernmetals.beryllium_button": "Beryllium Button", + "block.modernmetals.beryllium_button": "Beryllium Button", + "tile.modernmetals.beryllium_lever": "Beryllium Lever", + "block.modernmetals.beryllium_lever": "Beryllium Lever", + "tile.modernmetals.beryllium_pressure_plate": "Beryllium Pressure Plate", + "block.modernmetals.beryllium_pressure_plate": "Beryllium Pressure Plate", + "tile.modernmetals.beryllium_slab": "Beryllium Slab", + "block.modernmetals.beryllium_slab": "Beryllium Slab", + "tile.modernmetals.beryllium_stairs": "Beryllium Stairs", + "block.modernmetals.beryllium_stairs": "Beryllium Stairs", + "tile.modernmetals.beryllium_wall": "Beryllium Wall", + "block.modernmetals.beryllium_wall": "Beryllium Wall", + "item.modernmetals.boron_clump": "Boron Clump", + "item.modernmetals.boron_crushed": "Crushed Boron Ore", + "item.modernmetals.boron_crushed_purified": "Purified Crushed Boron Ore", + "item.modernmetals.boron_crystal": "Boron Crystal", + "item.modernmetals.boron_dense_plate": "Dense Boron Plate", + "item.modernmetals.boron_powder_dirty": "Dirty Boron Dust", + "item.modernmetals.boron_shard": "Boron Shard", + "item.modernmetals.boron_button": "Boron Button", + "item.modernmetals.boron_lever": "Boron Lever", + "item.modernmetals.boron_pressure_plate": "Boron Pressure Plate", + "item.modernmetals.boron_slab": "Boron Slab", + "item.modernmetals.boron_stairs": "Boron Stairs", + "item.modernmetals.boron_wall": "Boron Wall", + "tile.modernmetals.boron_button": "Boron Button", + "block.modernmetals.boron_button": "Boron Button", + "tile.modernmetals.boron_lever": "Boron Lever", + "block.modernmetals.boron_lever": "Boron Lever", + "tile.modernmetals.boron_pressure_plate": "Boron Pressure Plate", + "block.modernmetals.boron_pressure_plate": "Boron Pressure Plate", + "tile.modernmetals.boron_slab": "Boron Slab", + "block.modernmetals.boron_slab": "Boron Slab", + "tile.modernmetals.boron_stairs": "Boron Stairs", + "block.modernmetals.boron_stairs": "Boron Stairs", + "tile.modernmetals.boron_wall": "Boron Wall", + "block.modernmetals.boron_wall": "Boron Wall", + "item.modernmetals.cadmium_clump": "Cadmium Clump", + "item.modernmetals.cadmium_crushed": "Crushed Cadmium Ore", + "item.modernmetals.cadmium_crushed_purified": "Purified Crushed Cadmium Ore", + "item.modernmetals.cadmium_crystal": "Cadmium Crystal", + "item.modernmetals.cadmium_dense_plate": "Dense Cadmium Plate", + "item.modernmetals.cadmium_powder_dirty": "Dirty Cadmium Dust", + "item.modernmetals.cadmium_shard": "Cadmium Shard", + "item.modernmetals.cadmium_button": "Cadmium Button", + "item.modernmetals.cadmium_lever": "Cadmium Lever", + "item.modernmetals.cadmium_pressure_plate": "Cadmium Pressure Plate", + "item.modernmetals.cadmium_slab": "Cadmium Slab", + "item.modernmetals.cadmium_stairs": "Cadmium Stairs", + "item.modernmetals.cadmium_wall": "Cadmium Wall", + "tile.modernmetals.cadmium_button": "Cadmium Button", + "block.modernmetals.cadmium_button": "Cadmium Button", + "tile.modernmetals.cadmium_lever": "Cadmium Lever", + "block.modernmetals.cadmium_lever": "Cadmium Lever", + "tile.modernmetals.cadmium_pressure_plate": "Cadmium Pressure Plate", + "block.modernmetals.cadmium_pressure_plate": "Cadmium Pressure Plate", + "tile.modernmetals.cadmium_slab": "Cadmium Slab", + "block.modernmetals.cadmium_slab": "Cadmium Slab", + "tile.modernmetals.cadmium_stairs": "Cadmium Stairs", + "block.modernmetals.cadmium_stairs": "Cadmium Stairs", + "tile.modernmetals.cadmium_wall": "Cadmium Wall", + "block.modernmetals.cadmium_wall": "Cadmium Wall", + "item.modernmetals.chromium_clump": "Chromium Clump", + "item.modernmetals.chromium_crushed": "Crushed Chromium Ore", + "item.modernmetals.chromium_crushed_purified": "Purified Crushed Chromium Ore", + "item.modernmetals.chromium_crystal": "Chromium Crystal", + "item.modernmetals.chromium_dense_plate": "Dense Chromium Plate", + "item.modernmetals.chromium_powder_dirty": "Dirty Chromium Dust", + "item.modernmetals.chromium_shard": "Chromium Shard", + "item.modernmetals.chromium_button": "Chromium Button", + "item.modernmetals.chromium_lever": "Chromium Lever", + "item.modernmetals.chromium_pressure_plate": "Chromium Pressure Plate", + "item.modernmetals.chromium_slab": "Chromium Slab", + "item.modernmetals.chromium_stairs": "Chromium Stairs", + "item.modernmetals.chromium_wall": "Chromium Wall", + "tile.modernmetals.chromium_button": "Chromium Button", + "block.modernmetals.chromium_button": "Chromium Button", + "tile.modernmetals.chromium_lever": "Chromium Lever", + "block.modernmetals.chromium_lever": "Chromium Lever", + "tile.modernmetals.chromium_pressure_plate": "Chromium Pressure Plate", + "block.modernmetals.chromium_pressure_plate": "Chromium Pressure Plate", + "tile.modernmetals.chromium_slab": "Chromium Slab", + "block.modernmetals.chromium_slab": "Chromium Slab", + "tile.modernmetals.chromium_stairs": "Chromium Stairs", + "block.modernmetals.chromium_stairs": "Chromium Stairs", + "tile.modernmetals.chromium_wall": "Chromium Wall", + "block.modernmetals.chromium_wall": "Chromium Wall", + "item.modernmetals.galvanizedsteel_clump": "Galvanized Steel Clump", + "item.modernmetals.galvanizedsteel_crushed": "Crushed Galvanized Steel Ore", + "item.modernmetals.galvanizedsteel_crushed_purified": "Purified Crushed Galvanized Steel Ore", + "item.modernmetals.galvanizedsteel_crystal": "Galvanized Steel Crystal", + "item.modernmetals.galvanizedsteel_dense_plate": "Dense Galvanized Steel Plate", + "item.modernmetals.galvanizedsteel_powder_dirty": "Dirty Galvanized Steel Dust", + "item.modernmetals.galvanizedsteel_shard": "Galvanized Steel Shard", + "item.modernmetals.galvanizedsteel_button": "Galvanized Steel Button", + "item.modernmetals.galvanizedsteel_lever": "Galvanized Steel Lever", + "item.modernmetals.galvanizedsteel_pressure_plate": "Galvanized Steel Pressure Plate", + "item.modernmetals.galvanizedsteel_slab": "Galvanized Steel Slab", + "item.modernmetals.galvanizedsteel_stairs": "Galvanized Steel Stairs", + "item.modernmetals.galvanizedsteel_wall": "Galvanized Steel Wall", + "tile.modernmetals.galvanizedsteel_button": "Galvanized Steel Button", + "block.modernmetals.galvanizedsteel_button": "Galvanized Steel Button", + "tile.modernmetals.galvanizedsteel_lever": "Galvanized Steel Lever", + "block.modernmetals.galvanizedsteel_lever": "Galvanized Steel Lever", + "tile.modernmetals.galvanizedsteel_pressure_plate": "Galvanized Steel Pressure Plate", + "block.modernmetals.galvanizedsteel_pressure_plate": "Galvanized Steel Pressure Plate", + "tile.modernmetals.galvanizedsteel_slab": "Galvanized Steel Slab", + "block.modernmetals.galvanizedsteel_slab": "Galvanized Steel Slab", + "tile.modernmetals.galvanizedsteel_stairs": "Galvanized Steel Stairs", + "block.modernmetals.galvanizedsteel_stairs": "Galvanized Steel Stairs", + "tile.modernmetals.galvanizedsteel_wall": "Galvanized Steel Wall", + "block.modernmetals.galvanizedsteel_wall": "Galvanized Steel Wall", + "item.modernmetals.iridium_clump": "Iridium Clump", + "item.modernmetals.iridium_crushed": "Crushed Iridium Ore", + "item.modernmetals.iridium_crushed_purified": "Purified Crushed Iridium Ore", + "item.modernmetals.iridium_crystal": "Iridium Crystal", + "item.modernmetals.iridium_dense_plate": "Dense Iridium Plate", + "item.modernmetals.iridium_powder_dirty": "Dirty Iridium Dust", + "item.modernmetals.iridium_shard": "Iridium Shard", + "item.modernmetals.iridium_button": "Iridium Button", + "item.modernmetals.iridium_lever": "Iridium Lever", + "item.modernmetals.iridium_pressure_plate": "Iridium Pressure Plate", + "item.modernmetals.iridium_slab": "Iridium Slab", + "item.modernmetals.iridium_stairs": "Iridium Stairs", + "item.modernmetals.iridium_wall": "Iridium Wall", + "tile.modernmetals.iridium_button": "Iridium Button", + "block.modernmetals.iridium_button": "Iridium Button", + "tile.modernmetals.iridium_lever": "Iridium Lever", + "block.modernmetals.iridium_lever": "Iridium Lever", + "tile.modernmetals.iridium_pressure_plate": "Iridium Pressure Plate", + "block.modernmetals.iridium_pressure_plate": "Iridium Pressure Plate", + "tile.modernmetals.iridium_slab": "Iridium Slab", + "block.modernmetals.iridium_slab": "Iridium Slab", + "tile.modernmetals.iridium_stairs": "Iridium Stairs", + "block.modernmetals.iridium_stairs": "Iridium Stairs", + "tile.modernmetals.iridium_wall": "Iridium Wall", + "block.modernmetals.iridium_wall": "Iridium Wall", + "item.modernmetals.magnesium_clump": "Magnesium Clump", + "item.modernmetals.magnesium_crushed": "Crushed Magnesium Ore", + "item.modernmetals.magnesium_crushed_purified": "Purified Crushed Magnesium Ore", + "item.modernmetals.magnesium_crystal": "Magnesium Crystal", + "item.modernmetals.magnesium_dense_plate": "Dense Magnesium Plate", + "item.modernmetals.magnesium_powder_dirty": "Dirty Magnesium Dust", + "item.modernmetals.magnesium_shard": "Magnesium Shard", + "item.modernmetals.magnesium_button": "Magnesium Button", + "item.modernmetals.magnesium_lever": "Magnesium Lever", + "item.modernmetals.magnesium_pressure_plate": "Magnesium Pressure Plate", + "item.modernmetals.magnesium_slab": "Magnesium Slab", + "item.modernmetals.magnesium_stairs": "Magnesium Stairs", + "item.modernmetals.magnesium_wall": "Magnesium Wall", + "tile.modernmetals.magnesium_button": "Magnesium Button", + "block.modernmetals.magnesium_button": "Magnesium Button", + "tile.modernmetals.magnesium_lever": "Magnesium Lever", + "block.modernmetals.magnesium_lever": "Magnesium Lever", + "tile.modernmetals.magnesium_pressure_plate": "Magnesium Pressure Plate", + "block.modernmetals.magnesium_pressure_plate": "Magnesium Pressure Plate", + "tile.modernmetals.magnesium_slab": "Magnesium Slab", + "block.modernmetals.magnesium_slab": "Magnesium Slab", + "tile.modernmetals.magnesium_stairs": "Magnesium Stairs", + "block.modernmetals.magnesium_stairs": "Magnesium Stairs", + "tile.modernmetals.magnesium_wall": "Magnesium Wall", + "block.modernmetals.magnesium_wall": "Magnesium Wall", + "item.modernmetals.manganese_clump": "Manganese Clump", + "item.modernmetals.manganese_crushed": "Crushed Manganese Ore", + "item.modernmetals.manganese_crushed_purified": "Purified Crushed Manganese Ore", + "item.modernmetals.manganese_crystal": "Manganese Crystal", + "item.modernmetals.manganese_dense_plate": "Dense Manganese Plate", + "item.modernmetals.manganese_powder_dirty": "Dirty Manganese Dust", + "item.modernmetals.manganese_shard": "Manganese Shard", + "item.modernmetals.manganese_button": "Manganese Button", + "item.modernmetals.manganese_lever": "Manganese Lever", + "item.modernmetals.manganese_pressure_plate": "Manganese Pressure Plate", + "item.modernmetals.manganese_slab": "Manganese Slab", + "item.modernmetals.manganese_stairs": "Manganese Stairs", + "item.modernmetals.manganese_wall": "Manganese Wall", + "tile.modernmetals.manganese_button": "Manganese Button", + "block.modernmetals.manganese_button": "Manganese Button", + "tile.modernmetals.manganese_lever": "Manganese Lever", + "block.modernmetals.manganese_lever": "Manganese Lever", + "tile.modernmetals.manganese_pressure_plate": "Manganese Pressure Plate", + "block.modernmetals.manganese_pressure_plate": "Manganese Pressure Plate", + "tile.modernmetals.manganese_slab": "Manganese Slab", + "block.modernmetals.manganese_slab": "Manganese Slab", + "tile.modernmetals.manganese_stairs": "Manganese Stairs", + "block.modernmetals.manganese_stairs": "Manganese Stairs", + "tile.modernmetals.manganese_wall": "Manganese Wall", + "block.modernmetals.manganese_wall": "Manganese Wall", + "item.modernmetals.nichrome_clump": "Nichrome Clump", + "item.modernmetals.nichrome_crushed": "Crushed Nichrome Ore", + "item.modernmetals.nichrome_crushed_purified": "Purified Crushed Nichrome Ore", + "item.modernmetals.nichrome_crystal": "Nichrome Crystal", + "item.modernmetals.nichrome_dense_plate": "Dense Nichrome Plate", + "item.modernmetals.nichrome_powder_dirty": "Dirty Nichrome Dust", + "item.modernmetals.nichrome_shard": "Nichrome Shard", + "item.modernmetals.nichrome_button": "Nichrome Button", + "item.modernmetals.nichrome_lever": "Nichrome Lever", + "item.modernmetals.nichrome_pressure_plate": "Nichrome Pressure Plate", + "item.modernmetals.nichrome_slab": "Nichrome Slab", + "item.modernmetals.nichrome_stairs": "Nichrome Stairs", + "item.modernmetals.nichrome_wall": "Nichrome Wall", + "tile.modernmetals.nichrome_button": "Nichrome Button", + "block.modernmetals.nichrome_button": "Nichrome Button", + "tile.modernmetals.nichrome_lever": "Nichrome Lever", + "block.modernmetals.nichrome_lever": "Nichrome Lever", + "tile.modernmetals.nichrome_pressure_plate": "Nichrome Pressure Plate", + "block.modernmetals.nichrome_pressure_plate": "Nichrome Pressure Plate", + "tile.modernmetals.nichrome_slab": "Nichrome Slab", + "block.modernmetals.nichrome_slab": "Nichrome Slab", + "tile.modernmetals.nichrome_stairs": "Nichrome Stairs", + "block.modernmetals.nichrome_stairs": "Nichrome Stairs", + "tile.modernmetals.nichrome_wall": "Nichrome Wall", + "block.modernmetals.nichrome_wall": "Nichrome Wall", + "item.modernmetals.osmium_clump": "Osmium Clump", + "item.modernmetals.osmium_crushed": "Crushed Osmium Ore", + "item.modernmetals.osmium_crushed_purified": "Purified Crushed Osmium Ore", + "item.modernmetals.osmium_crystal": "Osmium Crystal", + "item.modernmetals.osmium_dense_plate": "Dense Osmium Plate", + "item.modernmetals.osmium_powder_dirty": "Dirty Osmium Dust", + "item.modernmetals.osmium_shard": "Osmium Shard", + "item.modernmetals.osmium_button": "Osmium Button", + "item.modernmetals.osmium_lever": "Osmium Lever", + "item.modernmetals.osmium_pressure_plate": "Osmium Pressure Plate", + "item.modernmetals.osmium_slab": "Osmium Slab", + "item.modernmetals.osmium_stairs": "Osmium Stairs", + "item.modernmetals.osmium_wall": "Osmium Wall", + "tile.modernmetals.osmium_button": "Osmium Button", + "block.modernmetals.osmium_button": "Osmium Button", + "tile.modernmetals.osmium_lever": "Osmium Lever", + "block.modernmetals.osmium_lever": "Osmium Lever", + "tile.modernmetals.osmium_pressure_plate": "Osmium Pressure Plate", + "block.modernmetals.osmium_pressure_plate": "Osmium Pressure Plate", + "tile.modernmetals.osmium_slab": "Osmium Slab", + "block.modernmetals.osmium_slab": "Osmium Slab", + "tile.modernmetals.osmium_stairs": "Osmium Stairs", + "block.modernmetals.osmium_stairs": "Osmium Stairs", + "tile.modernmetals.osmium_wall": "Osmium Wall", + "block.modernmetals.osmium_wall": "Osmium Wall", + "item.modernmetals.plutonium_clump": "Plutonium Clump", + "item.modernmetals.plutonium_crushed": "Crushed Plutonium Ore", + "item.modernmetals.plutonium_crushed_purified": "Purified Crushed Plutonium Ore", + "item.modernmetals.plutonium_crystal": "Plutonium Crystal", + "item.modernmetals.plutonium_dense_plate": "Dense Plutonium Plate", + "item.modernmetals.plutonium_powder_dirty": "Dirty Plutonium Dust", + "item.modernmetals.plutonium_shard": "Plutonium Shard", + "item.modernmetals.plutonium_button": "Plutonium Button", + "item.modernmetals.plutonium_lever": "Plutonium Lever", + "item.modernmetals.plutonium_pressure_plate": "Plutonium Pressure Plate", + "item.modernmetals.plutonium_slab": "Plutonium Slab", + "item.modernmetals.plutonium_stairs": "Plutonium Stairs", + "item.modernmetals.plutonium_wall": "Plutonium Wall", + "tile.modernmetals.plutonium_button": "Plutonium Button", + "block.modernmetals.plutonium_button": "Plutonium Button", + "tile.modernmetals.plutonium_lever": "Plutonium Lever", + "block.modernmetals.plutonium_lever": "Plutonium Lever", + "tile.modernmetals.plutonium_pressure_plate": "Plutonium Pressure Plate", + "block.modernmetals.plutonium_pressure_plate": "Plutonium Pressure Plate", + "tile.modernmetals.plutonium_slab": "Plutonium Slab", + "block.modernmetals.plutonium_slab": "Plutonium Slab", + "tile.modernmetals.plutonium_stairs": "Plutonium Stairs", + "block.modernmetals.plutonium_stairs": "Plutonium Stairs", + "tile.modernmetals.plutonium_wall": "Plutonium Wall", + "block.modernmetals.plutonium_wall": "Plutonium Wall", + "item.modernmetals.rutile_clump": "Rutile Clump", + "item.modernmetals.rutile_crushed": "Crushed Rutile Ore", + "item.modernmetals.rutile_crushed_purified": "Purified Crushed Rutile Ore", + "item.modernmetals.rutile_crystal": "Rutile Crystal", + "item.modernmetals.rutile_dense_plate": "Dense Rutile Plate", + "item.modernmetals.rutile_powder_dirty": "Dirty Rutile Dust", + "item.modernmetals.rutile_shard": "Rutile Shard", + "item.modernmetals.rutile_button": "Rutile Button", + "item.modernmetals.rutile_lever": "Rutile Lever", + "item.modernmetals.rutile_pressure_plate": "Rutile Pressure Plate", + "item.modernmetals.rutile_slab": "Rutile Slab", + "item.modernmetals.rutile_stairs": "Rutile Stairs", + "item.modernmetals.rutile_wall": "Rutile Wall", + "tile.modernmetals.rutile_button": "Rutile Button", + "block.modernmetals.rutile_button": "Rutile Button", + "tile.modernmetals.rutile_lever": "Rutile Lever", + "block.modernmetals.rutile_lever": "Rutile Lever", + "tile.modernmetals.rutile_pressure_plate": "Rutile Pressure Plate", + "block.modernmetals.rutile_pressure_plate": "Rutile Pressure Plate", + "tile.modernmetals.rutile_slab": "Rutile Slab", + "block.modernmetals.rutile_slab": "Rutile Slab", + "tile.modernmetals.rutile_stairs": "Rutile Stairs", + "block.modernmetals.rutile_stairs": "Rutile Stairs", + "tile.modernmetals.rutile_wall": "Rutile Wall", + "block.modernmetals.rutile_wall": "Rutile Wall", + "item.modernmetals.stainlesssteel_clump": "Stainless Steel Clump", + "item.modernmetals.stainlesssteel_crushed": "Crushed Stainless Steel Ore", + "item.modernmetals.stainlesssteel_crushed_purified": "Purified Crushed Stainless Steel Ore", + "item.modernmetals.stainlesssteel_crystal": "Stainless Steel Crystal", + "item.modernmetals.stainlesssteel_dense_plate": "Dense Stainless Steel Plate", + "item.modernmetals.stainlesssteel_powder_dirty": "Dirty Stainless Steel Dust", + "item.modernmetals.stainlesssteel_shard": "Stainless Steel Shard", + "item.modernmetals.stainlesssteel_button": "Stainless Steel Button", + "item.modernmetals.stainlesssteel_lever": "Stainless Steel Lever", + "item.modernmetals.stainlesssteel_pressure_plate": "Stainless Steel Pressure Plate", + "item.modernmetals.stainlesssteel_slab": "Stainless Steel Slab", + "item.modernmetals.stainlesssteel_stairs": "Stainless Steel Stairs", + "item.modernmetals.stainlesssteel_wall": "Stainless Steel Wall", + "tile.modernmetals.stainlesssteel_button": "Stainless Steel Button", + "block.modernmetals.stainlesssteel_button": "Stainless Steel Button", + "tile.modernmetals.stainlesssteel_lever": "Stainless Steel Lever", + "block.modernmetals.stainlesssteel_lever": "Stainless Steel Lever", + "tile.modernmetals.stainlesssteel_pressure_plate": "Stainless Steel Pressure Plate", + "block.modernmetals.stainlesssteel_pressure_plate": "Stainless Steel Pressure Plate", + "tile.modernmetals.stainlesssteel_slab": "Stainless Steel Slab", + "block.modernmetals.stainlesssteel_slab": "Stainless Steel Slab", + "tile.modernmetals.stainlesssteel_stairs": "Stainless Steel Stairs", + "block.modernmetals.stainlesssteel_stairs": "Stainless Steel Stairs", + "tile.modernmetals.stainlesssteel_wall": "Stainless Steel Wall", + "block.modernmetals.stainlesssteel_wall": "Stainless Steel Wall", + "item.modernmetals.tantalum_clump": "Tantalum Clump", + "item.modernmetals.tantalum_crushed": "Crushed Tantalum Ore", + "item.modernmetals.tantalum_crushed_purified": "Purified Crushed Tantalum Ore", + "item.modernmetals.tantalum_crystal": "Tantalum Crystal", + "item.modernmetals.tantalum_dense_plate": "Dense Tantalum Plate", + "item.modernmetals.tantalum_powder_dirty": "Dirty Tantalum Dust", + "item.modernmetals.tantalum_shard": "Tantalum Shard", + "item.modernmetals.tantalum_button": "Tantalum Button", + "item.modernmetals.tantalum_lever": "Tantalum Lever", + "item.modernmetals.tantalum_pressure_plate": "Tantalum Pressure Plate", + "item.modernmetals.tantalum_slab": "Tantalum Slab", + "item.modernmetals.tantalum_stairs": "Tantalum Stairs", + "item.modernmetals.tantalum_wall": "Tantalum Wall", + "tile.modernmetals.tantalum_button": "Tantalum Button", + "block.modernmetals.tantalum_button": "Tantalum Button", + "tile.modernmetals.tantalum_lever": "Tantalum Lever", + "block.modernmetals.tantalum_lever": "Tantalum Lever", + "tile.modernmetals.tantalum_pressure_plate": "Tantalum Pressure Plate", + "block.modernmetals.tantalum_pressure_plate": "Tantalum Pressure Plate", + "tile.modernmetals.tantalum_slab": "Tantalum Slab", + "block.modernmetals.tantalum_slab": "Tantalum Slab", + "tile.modernmetals.tantalum_stairs": "Tantalum Stairs", + "block.modernmetals.tantalum_stairs": "Tantalum Stairs", + "tile.modernmetals.tantalum_wall": "Tantalum Wall", + "block.modernmetals.tantalum_wall": "Tantalum Wall", + "item.modernmetals.titanium_clump": "Titanium Clump", + "item.modernmetals.titanium_crushed": "Crushed Titanium Ore", + "item.modernmetals.titanium_crushed_purified": "Purified Crushed Titanium Ore", + "item.modernmetals.titanium_crystal": "Titanium Crystal", + "item.modernmetals.titanium_dense_plate": "Dense Titanium Plate", + "item.modernmetals.titanium_powder_dirty": "Dirty Titanium Dust", + "item.modernmetals.titanium_shard": "Titanium Shard", + "item.modernmetals.titanium_button": "Titanium Button", + "item.modernmetals.titanium_lever": "Titanium Lever", + "item.modernmetals.titanium_pressure_plate": "Titanium Pressure Plate", + "item.modernmetals.titanium_slab": "Titanium Slab", + "item.modernmetals.titanium_stairs": "Titanium Stairs", + "item.modernmetals.titanium_wall": "Titanium Wall", + "tile.modernmetals.titanium_button": "Titanium Button", + "block.modernmetals.titanium_button": "Titanium Button", + "tile.modernmetals.titanium_lever": "Titanium Lever", + "block.modernmetals.titanium_lever": "Titanium Lever", + "tile.modernmetals.titanium_pressure_plate": "Titanium Pressure Plate", + "block.modernmetals.titanium_pressure_plate": "Titanium Pressure Plate", + "tile.modernmetals.titanium_slab": "Titanium Slab", + "block.modernmetals.titanium_slab": "Titanium Slab", + "tile.modernmetals.titanium_stairs": "Titanium Stairs", + "block.modernmetals.titanium_stairs": "Titanium Stairs", + "tile.modernmetals.titanium_wall": "Titanium Wall", + "block.modernmetals.titanium_wall": "Titanium Wall", + "item.modernmetals.tungsten_clump": "Tungsten Clump", + "item.modernmetals.tungsten_crushed": "Crushed Tungsten Ore", + "item.modernmetals.tungsten_crushed_purified": "Purified Crushed Tungsten Ore", + "item.modernmetals.tungsten_crystal": "Tungsten Crystal", + "item.modernmetals.tungsten_dense_plate": "Dense Tungsten Plate", + "item.modernmetals.tungsten_powder_dirty": "Dirty Tungsten Dust", + "item.modernmetals.tungsten_shard": "Tungsten Shard", + "item.modernmetals.tungsten_button": "Tungsten Button", + "item.modernmetals.tungsten_lever": "Tungsten Lever", + "item.modernmetals.tungsten_pressure_plate": "Tungsten Pressure Plate", + "item.modernmetals.tungsten_slab": "Tungsten Slab", + "item.modernmetals.tungsten_stairs": "Tungsten Stairs", + "item.modernmetals.tungsten_wall": "Tungsten Wall", + "tile.modernmetals.tungsten_button": "Tungsten Button", + "block.modernmetals.tungsten_button": "Tungsten Button", + "tile.modernmetals.tungsten_lever": "Tungsten Lever", + "block.modernmetals.tungsten_lever": "Tungsten Lever", + "tile.modernmetals.tungsten_pressure_plate": "Tungsten Pressure Plate", + "block.modernmetals.tungsten_pressure_plate": "Tungsten Pressure Plate", + "tile.modernmetals.tungsten_slab": "Tungsten Slab", + "block.modernmetals.tungsten_slab": "Tungsten Slab", + "tile.modernmetals.tungsten_stairs": "Tungsten Stairs", + "block.modernmetals.tungsten_stairs": "Tungsten Stairs", + "tile.modernmetals.tungsten_wall": "Tungsten Wall", + "block.modernmetals.tungsten_wall": "Tungsten Wall", + "item.modernmetals.uranium_clump": "Uranium Clump", + "item.modernmetals.uranium_crushed": "Crushed Uranium Ore", + "item.modernmetals.uranium_crushed_purified": "Purified Crushed Uranium Ore", + "item.modernmetals.uranium_crystal": "Uranium Crystal", + "item.modernmetals.uranium_dense_plate": "Dense Uranium Plate", + "item.modernmetals.uranium_powder_dirty": "Dirty Uranium Dust", + "item.modernmetals.uranium_shard": "Uranium Shard", + "item.modernmetals.uranium_button": "Uranium Button", + "item.modernmetals.uranium_lever": "Uranium Lever", + "item.modernmetals.uranium_pressure_plate": "Uranium Pressure Plate", + "item.modernmetals.uranium_slab": "Uranium Slab", + "item.modernmetals.uranium_stairs": "Uranium Stairs", + "item.modernmetals.uranium_wall": "Uranium Wall", + "tile.modernmetals.uranium_button": "Uranium Button", + "block.modernmetals.uranium_button": "Uranium Button", + "tile.modernmetals.uranium_lever": "Uranium Lever", + "block.modernmetals.uranium_lever": "Uranium Lever", + "tile.modernmetals.uranium_pressure_plate": "Uranium Pressure Plate", + "block.modernmetals.uranium_pressure_plate": "Uranium Pressure Plate", + "tile.modernmetals.uranium_slab": "Uranium Slab", + "block.modernmetals.uranium_slab": "Uranium Slab", + "tile.modernmetals.uranium_stairs": "Uranium Stairs", + "block.modernmetals.uranium_stairs": "Uranium Stairs", + "tile.modernmetals.uranium_wall": "Uranium Wall", + "block.modernmetals.uranium_wall": "Uranium Wall", + "item.modernmetals.zirconium_clump": "Zirconium Clump", + "item.modernmetals.zirconium_crushed": "Crushed Zirconium Ore", + "item.modernmetals.zirconium_crushed_purified": "Purified Crushed Zirconium Ore", + "item.modernmetals.zirconium_crystal": "Zirconium Crystal", + "item.modernmetals.zirconium_dense_plate": "Dense Zirconium Plate", + "item.modernmetals.zirconium_powder_dirty": "Dirty Zirconium Dust", + "item.modernmetals.zirconium_shard": "Zirconium Shard", + "item.modernmetals.zirconium_button": "Zirconium Button", + "item.modernmetals.zirconium_lever": "Zirconium Lever", + "item.modernmetals.zirconium_pressure_plate": "Zirconium Pressure Plate", + "item.modernmetals.zirconium_slab": "Zirconium Slab", + "item.modernmetals.zirconium_stairs": "Zirconium Stairs", + "item.modernmetals.zirconium_wall": "Zirconium Wall", + "tile.modernmetals.zirconium_button": "Zirconium Button", + "block.modernmetals.zirconium_button": "Zirconium Button", + "tile.modernmetals.zirconium_lever": "Zirconium Lever", + "block.modernmetals.zirconium_lever": "Zirconium Lever", + "tile.modernmetals.zirconium_pressure_plate": "Zirconium Pressure Plate", + "block.modernmetals.zirconium_pressure_plate": "Zirconium Pressure Plate", + "tile.modernmetals.zirconium_slab": "Zirconium Slab", + "block.modernmetals.zirconium_slab": "Zirconium Slab", + "tile.modernmetals.zirconium_stairs": "Zirconium Stairs", + "block.modernmetals.zirconium_stairs": "Zirconium Stairs", + "tile.modernmetals.zirconium_wall": "Zirconium Wall", + "block.modernmetals.zirconium_wall": "Zirconium Wall", + "material.thorium": "Thorium", + "item.modernmetals.thorium_arrow": "Thorium Arrow", + "item.modernmetals.thorium_axe": "Thorium Axe", + "item.modernmetals.thorium_bars": "Thorium Bars", + "item.modernmetals.thorium_blend": "Thorium Blend", + "item.modernmetals.thorium_block": "Thorium", + "item.modernmetals.thorium_boots": "Thorium Boots", + "item.modernmetals.thorium_bolt": "Thorium Bolt", + "item.modernmetals.thorium_bow": "Thorium Bow", + "item.modernmetals.thorium_chestplate": "Thorium Chestplate", + "item.modernmetals.thorium_crackhammer": "Thorium Crack Hammer", + "item.modernmetals.thorium_crossbow": "Thorium Crossbow", + "item.modernmetals.thorium_door": "Thorium Door", + "item.modernmetals.thorium_fishing_rod": "Thorium Fishing Rod", + "item.modernmetals.thorium_gear": "Thorium Gear", + "item.modernmetals.thorium_helmet": "Thorium Helmet", + "item.modernmetals.thorium_hoe": "Thorium Hoe", + "item.modernmetals.thorium_horse_armor": "Thorium Horse Armour", + "item.modernmetals.thorium_ingot": "Thorium Ingot", + "item.modernmetals.thorium_leggings": "Thorium Leg Armour", + "item.modernmetals.thorium_nugget": "Thorium Nugget", + "item.modernmetals.thorium_ore": "Thorium Ore", + "item.modernmetals.thorium_pickaxe": "Thorium Pickaxe", + "item.modernmetals.thorium_powder": "Thorium Dust", + "item.modernmetals.thorium_rod": "Thorium Rod", + "item.modernmetals.thorium_shears": "Thorium Shears", + "item.modernmetals.thorium_shield": "Thorium Shield", + "item.modernmetals.thorium_shovel": "Thorium Shovel", + "item.modernmetals.thorium_smallblend": "Tiny Pile of Thorium Blend", + "item.modernmetals.thorium_smallpowder": "Tiny Pile of Thorium Dust", + "item.modernmetals.thorium_sword": "Thorium Sword", + "item.modernmetals.thorium_trapdoor": "Thorium Trapdoor", + "tile.modernmetals.thorium_bars": "Thorium Bars", + "block.modernmetals.thorium_bars": "Thorium Bars", + "tile.modernmetals.thorium_block": "Thorium", + "block.modernmetals.thorium_block": "Thorium", + "tile.modernmetals.thorium_door": "Thorium Door", + "block.modernmetals.thorium_door": "Thorium Door", + "tile.modernmetals.thorium_ore": "Thorium Ore", + "block.modernmetals.thorium_ore": "Thorium Ore", + "tile.modernmetals.thorium_plate": "Thorium Plate", + "block.modernmetals.thorium_plate": "Thorium Plate", + "tile.modernmetals.thorium_trapdoor": "Thorium Trapdoor", + "block.modernmetals.thorium_trapdoor": "Thorium Trapdoor", + "fluid.modernmetals.thorium": "Molten Thorium", + "tile.modernmetals.thorium": "Molten Thorium", + "block.modernmetals.thorium": "Molten Thorium", + "item.modernmetals.thorium_clump": "Thorium Clump", + "item.modernmetals.thorium_crushed": "Crushed Thorium Ore", + "item.modernmetals.thorium_crushed_purified": "Purified Crushed Thorium Ore", + "item.modernmetals.thorium_crystal": "Thorium Crystal", + "item.modernmetals.thorium_dense_plate": "Dense Thorium Plate", + "item.modernmetals.thorium_powder_dirty": "Dirty Thorium Dust", + "item.modernmetals.thorium_shard": "Thorium Shard", + "item.modernmetals.thorium_button": "Thorium Button", + "item.modernmetals.thorium_lever": "Thorium Lever", + "item.modernmetals.thorium_pressure_plate": "Thorium Pressure Plate", + "item.modernmetals.thorium_slab": "Thorium Slab", + "item.modernmetals.thorium_stairs": "Thorium Stairs", + "item.modernmetals.thorium_wall": "Thorium Wall", + "tile.modernmetals.thorium_button": "Thorium Button", + "block.modernmetals.thorium_button": "Thorium Button", + "tile.modernmetals.thorium_lever": "Thorium Lever", + "block.modernmetals.thorium_lever": "Thorium Lever", + "tile.modernmetals.thorium_pressure_plate": "Thorium Pressure Plate", + "block.modernmetals.thorium_pressure_plate": "Thorium Pressure Plate", + "tile.modernmetals.thorium_slab": "Thorium Slab", + "block.modernmetals.thorium_slab": "Thorium Slab", + "tile.modernmetals.thorium_stairs": "Thorium Stairs", + "block.modernmetals.thorium_stairs": "Thorium Stairs", + "tile.modernmetals.thorium_wall": "Thorium Wall", + "block.modernmetals.thorium_wall": "Thorium Wall", + "item.modernmetals.aluminum_casing": "Aluminum Item Casing", + "item.modernmetals.aluminumbrass_casing": "Aluminum Brass Item Casing", + "item.modernmetals.boron_casing": "Boron Item Casing", + "item.modernmetals.beryllium_casing": "Beryllium Item Casing", + "item.modernmetals.cadmium_casing": "Cadmium Item Casing", + "item.modernmetals.chromium_casing": "Chromium Item Casing", + "item.modernmetals.galvanizedsteel_casing": "Galvanized Steel Item Casing", + "item.modernmetals.iridium_casing": "Iridium Item Casing", + "item.modernmetals.magnesium_casing": "Magnesium Item Casing", + "item.modernmetals.manganese_casing": "Manganese Item Casing", + "item.modernmetals.osmium_casing": "Osmium Item Casing", + "item.modernmetals.plutonium_casing": "Plutonium Item Casing", + "item.modernmetals.rutile_casing": "Rutile Item Casing", + "item.modernmetals.stainlesssteel_casing": "Stainless Steel Item Casing", + "item.modernmetals.tantalum_casing": "Tantalum Item Casing", + "item.modernmetals.thorium_casing": "Thorium Item Casing", + "item.modernmetals.titanium_casing": "Titanium Item Casing", + "item.modernmetals.tungsten_casing": "Tungsten Item Casing", + "item.modernmetals.uranium_casing": "Uranium Item Casing", + "item.modernmetals.zirconium_casing": "Zirconium Item Casing", + "item.modernmetals.aluminumbrass_scythe": "Aluminum Brass Sickle", + "item.modernmetals.aluminum_scythe": "Aluminum Sickle", + "item.modernmetals.beryllium_scythe": "Beryllium Sickle", + "item.modernmetals.boron_scythe": "Boron Sickle", + "item.modernmetals.cadmium_scythe": "Cadmium Sickle", + "item.modernmetals.chromium_scythe": "Chromium Sickle", + "item.modernmetals.galvanizedsteel_scythe": "Galvanized Steel Sickle", + "item.modernmetals.iridium_scythe": "Iridium Sickle", + "item.modernmetals.magnesium_scythe": "Magnesium Sickle", + "item.modernmetals.manganese_scythe": "Manganese Sickle", + "item.modernmetals.nichrome_scythe": "Nichrome Sickle", + "item.modernmetals.osmium_scythe": "Osmium Sickle", + "item.modernmetals.plutonium_scythe": "Plutonium Sickle", + "item.modernmetals.rutile_scythe": "Rutile Sickle", + "item.modernmetals.stainlesssteel_scythe": "Stainless Steel Sickle", + "item.modernmetals.tantalum_scythe": "Tantalum Sickle", + "item.modernmetals.thorium_scythe": "Thorium Sickle", + "item.modernmetals.titanium_scythe": "Titanium Sickle", + "item.modernmetals.tungsten_scythe": "Tungsten Sickle", + "item.modernmetals.uranium_scythe": "Uranium Sickle", + "item.modernmetals.zirconium_scythe": "Zirconium Sickle", + "gas.gasAluminum": "Aluminum Slurry", + "gas.gasBeryllium": "Beryllium Slurry", + "gas.gasBoron": "Boron Slurry", + "gas.gasCadmium": "Cadmium Slurry", + "gas.gasChromium": "Chromium Slurry", + "gas.gasIridium": "Iridium Slurry", + "gas.gasMagnesium": "Magnesium Slurry", + "gas.gasManganese": "Manganese Slurry", + "gas.gasPlutonium": "Plutonium Slurry", + "gas.gasRutile": "Rutile Slurry", + "gas.gasTantalum": "Tantalum Slurry", + "gas.gasThorium": "Thorium Slurry", + "gas.gasTitanium": "Titanium Slurry", + "gas.gasTungsten": "Tungsten Slurry", + "gas.gasUranium": "Uranium Slurry", + "gas.gasZirconium": "Zirconium Slurry", + "gas.cleanGasAluminum": "Clean Aluminum Slurry", + "gas.cleanGasBeryllium": "Clean Beryllium Slurry", + "gas.cleanGasBoron": "Clean Boron Slurry", + "gas.cleanGasCadmium": "Clean Cadmium Slurry", + "gas.cleanGasChromium": "Clean Chromium Slurry", + "gas.cleanGasIridium": "Clean Iridium Slurry", + "gas.cleanGasMagnesium": "Clean Magnesium Slurry", + "gas.cleanGasManganese": "Clean Manganese Slurry", + "gas.cleanGasPlutonium": "Clean Plutonium Slurry", + "gas.cleanGasRutile": "Clean Rutile Slurry", + "gas.cleanGasTantalum": "Clean Tantalum Slurry", + "gas.cleanGasThorium": "Clean Thorium Slurry", + "gas.cleanGasTitanium": "Clean Titanium Slurry", + "gas.cleanGasTungsten": "Clean Tungsten Slurry", + "gas.cleanGasUranium": "Clean Uranium Slurry", + "gas.cleanGasZirconium": "Clean Zirconium Slurry", + "gas.gasAdamantine": "Adamantine Slurry", + "gas.gasAntimony": "Antimony Slurry", + "gas.gasBismuth": "Bismuth Slurry", + "gas.gasColdiron": "Cold-Iron Slurry", + "gas.gasPlatinum": "Platinum Slurry", + "gas.gasNickel": "Nickel Slurry", + "gas.gasStarsteel": "Star-Steel Slurry", + "gas.gasZinc": "Zinc Slurry", + "gas.cleanGasAdamantine": "Clean Adamantine Slurry", + "gas.cleanGasAntimony": "Clean Antimony Slurry", + "gas.cleanGasBismuth": "Clean Bismuth Slurry", + "gas.cleanGasColdiron": "Clean Cold-Iron Slurry", + "gas.cleanGasPlatinum": "Clean Platinum Slurry", + "gas.cleanGasNickel": "Clean Nickel Slurry", + "gas.cleanGasStarsteel": "Clean Star-Steel Slurry", + "gas.cleanGasZinc": "Clean Zinc Slurry", + "config.modernmetals.title": "Modern Metals", + "config.modernmetals.description": "Restart to apply changes. Edit ores in OreSpawn.", + "config.modernmetals.content_mode": "Fantasy Level", + "config.modernmetals.content_mode.tooltip": "High Fantasy keeps all recipes. Low Fantasy restricts unrealistic equipment and structures. Requires a game restart.", + "high_fantasy": "High Fantasy", + "low_fantasy": "Low Fantasy", + "config.modernmetals.enable_thorium": "Enable Thorium", + "config.modernmetals.enable_boron": "Enable Boron", + "config.modernmetals.enable_beryllium": "Enable Beryllium", + "config.modernmetals.enable_cadmium": "Enable Cadmium", + "config.modernmetals.enable_nichrome": "Enable Nichrome", + "config.modernmetals.enable_aluminum": "Enable Aluminum", + "config.modernmetals.enable_aluminumbrass": "Enable Aluminum Brass", + "config.modernmetals.enable_chromium": "Enable Chromium", + "config.modernmetals.enable_galvanizedsteel": "Enable Galvanized Steel", + "config.modernmetals.enable_iridium": "Enable Iridium", + "config.modernmetals.enable_magnesium": "Enable Magnesium", + "config.modernmetals.enable_manganese": "Enable Manganese", + "config.modernmetals.enable_osmium": "Enable Osmium", + "config.modernmetals.enable_plutonium": "Enable Plutonium", + "config.modernmetals.enable_rutile": "Enable Rutile", + "config.modernmetals.enable_stainlesssteel": "Enable Stainless Steel", + "config.modernmetals.enable_tantalum": "Enable Tantalum", + "config.modernmetals.enable_titanium": "Enable Titanium", + "config.modernmetals.enable_tungsten": "Enable Tungsten", + "config.modernmetals.enable_uranium": "Enable Uranium", + "config.modernmetals.enable_zirconium": "Enable Zirconium", + "config.modernmetals.material.tooltip": "Controls which blocks, items and recipes are available for this material. Requires a game restart.", + "config.modernmetals.villager_trades": "Villager Trades", + "config.modernmetals.villager_trades.tooltip": "Let blacksmiths trade Modern Metals ingots and equipment. Requires a game restart.", + "config.modernmetals.connection.mismatch": "The server uses %s, but your game uses %s. Match the Fantasy Level in your mod settings and restart.", + "config.modernmetals.connection.protocol": "Modern Metals could not check the Fantasy Level. Use the same Modern Metals build on the server and client.", + "config.modernmetals.content_mode.high_fantasy": "High Fantasy", + "config.modernmetals.content_mode.low_fantasy": "Low Fantasy", + "config.modernmetals.inherited_mode": "Fantasy Level is set in Base Metals. Restart after changing settings." +} diff --git a/src/main/resources/assets/modernmetals/lang/en_nz.json b/src/main/resources/assets/modernmetals/lang/en_nz.json new file mode 100644 index 00000000..1587d2db --- /dev/null +++ b/src/main/resources/assets/modernmetals/lang/en_nz.json @@ -0,0 +1,1760 @@ +{ + "item.modernmetals.nichrome_casing": "Nichrome Item Casing", + "itemGroup.modernmetals.blocks": "Modern Metals Blocks", + "itemGroup.modernmetals.combat": "Modern Metals Combat", + "itemGroup.modernmetals.items": "Modern Metals Items", + "itemGroup.modernmetals.tools": "Modern Metals Tools", + "nei.modernmetals.recipehandler.crusher": "Crushed Blocks/Items", + "material.aluminum": "Aluminum", + "item.modernmetals.aluminum_arrow": "Aluminum Arrow", + "item.modernmetals.aluminum_axe": "Aluminum Axe", + "item.modernmetals.aluminum_bars": "Aluminum Bars", + "item.modernmetals.aluminum_blend": "Aluminum Blend", + "item.modernmetals.aluminum_block": "Block of Aluminum", + "item.modernmetals.aluminum_boots": "Aluminum Boots", + "item.modernmetals.aluminum_bolt": "Aluminum Bolt", + "item.modernmetals.aluminum_bow": "Aluminum Bow", + "item.modernmetals.aluminum_chestplate": "Aluminum Chestplate", + "item.modernmetals.aluminum_crackhammer": "Aluminum Crack Hammer", + "item.modernmetals.aluminum_crossbow": "Aluminum Crossbow", + "item.modernmetals.aluminum_door": "Aluminum Door", + "item.modernmetals.aluminum_fishing_rod": "Aluminum Fishing Rod", + "item.modernmetals.aluminum_gear": "Aluminum Gear", + "item.modernmetals.aluminum_helmet": "Aluminum Helmet", + "item.modernmetals.aluminum_hoe": "Aluminum Hoe", + "item.modernmetals.aluminum_horse_armor": "Aluminum Horse Armour", + "item.modernmetals.aluminum_ingot": "Aluminum Ingot", + "item.modernmetals.aluminum_leggings": "Aluminum Leg Armour", + "item.modernmetals.aluminum_nugget": "Aluminum Nugget", + "item.modernmetals.aluminum_ore": "Aluminum Ore", + "item.modernmetals.aluminum_pickaxe": "Aluminum Pickaxe", + "item.modernmetals.aluminum_powder": "Aluminum Dust", + "item.modernmetals.aluminum_rod": "Aluminum Rod", + "item.modernmetals.aluminum_shears": "Aluminum Shears", + "item.modernmetals.aluminum_shield": "Aluminum Shield", + "item.modernmetals.aluminum_shovel": "Aluminum Shovel", + "item.modernmetals.aluminum_smallblend": "Tiny Pile of Aluminum Blend", + "item.modernmetals.aluminum_smallpowder": "Tiny Pile of Aluminum Dust", + "item.modernmetals.aluminum_sword": "Aluminum Sword", + "item.modernmetals.aluminum_trapdoor": "Aluminum Trapdoor", + "material.aluminumbrass": "Aluminum Brass", + "item.modernmetals.aluminumbrass_arrow": "Aluminum Brass Arrow", + "item.modernmetals.aluminumbrass_axe": "Aluminum Brass Axe", + "item.modernmetals.aluminumbrass_bars": "Aluminum Brass Bars", + "item.modernmetals.aluminumbrass_blend": "Aluminum Brass Blend", + "item.modernmetals.aluminumbrass_block": "Block of Aluminum Brass", + "item.modernmetals.aluminumbrass_boots": "Aluminum Brass Boots", + "item.modernmetals.aluminumbrass_bolt": "Aluminum Brass Bolt", + "item.modernmetals.aluminumbrass_bow": "Aluminum Brass Bow", + "item.modernmetals.aluminumbrass_chestplate": "Aluminum Brass Chestplate", + "item.modernmetals.aluminumbrass_crackhammer": "Aluminum Brass Crack Hammer", + "item.modernmetals.aluminumbrass_crossbow": "Aluminum Brass Crossbow", + "item.modernmetals.aluminumbrass_door": "Aluminum Brass Door", + "item.modernmetals.aluminumbrass_fishing_rod": "Aluminum Brass Fishing Rod", + "item.modernmetals.aluminumbrass_gear": "Aluminum Brass Gear", + "item.modernmetals.aluminumbrass_helmet": "Aluminum Brass Helmet", + "item.modernmetals.aluminumbrass_hoe": "Aluminum Brass Hoe", + "item.modernmetals.aluminumbrass_horse_armor": "Aluminum Brass Horse Armour", + "item.modernmetals.aluminumbrass_ingot": "Aluminum Brass Ingot", + "item.modernmetals.aluminumbrass_leggings": "Aluminum Brass Leg Armour", + "item.modernmetals.aluminumbrass_nugget": "Aluminum Brass Nugget", + "item.modernmetals.aluminumbrass_ore": "Aluminum Brass Ore", + "item.modernmetals.aluminumbrass_pickaxe": "Aluminum Brass Pickaxe", + "item.modernmetals.aluminumbrass_powder": "Aluminum Brass Dust", + "item.modernmetals.aluminumbrass_rod": "Aluminum Brass Rod", + "item.modernmetals.aluminumbrass_shears": "Aluminum Brass Shears", + "item.modernmetals.aluminumbrass_shield": "Aluminum Brass Shield", + "item.modernmetals.aluminumbrass_shovel": "Aluminum Brass Shovel", + "item.modernmetals.aluminumbrass_smallblend": "Tiny Pile of Aluminum Brass Blend", + "item.modernmetals.aluminumbrass_smallpowder": "Tiny Pile of Aluminum Brass Dust", + "item.modernmetals.aluminumbrass_sword": "Aluminum Brass Sword", + "item.modernmetals.aluminumbrass_trapdoor": "Aluminum Brass Trapdoor", + "material.antimony": "Antimony", + "item.modernmetals.antimony_arrow": "Antimony Arrow", + "item.modernmetals.antimony_axe": "Antimony Axe", + "item.modernmetals.antimony_bars": "Antimony Bars", + "item.modernmetals.antimony_block": "Block of Antimony", + "item.modernmetals.antimony_boots": "Antimony Boots", + "item.modernmetals.antimony_chestplate": "Antimony Chestplate", + "item.modernmetals.antimony_crackhammer": "Antimony Crack Hammer", + "item.modernmetals.antimony_door": "Antimony Door", + "item.modernmetals.antimony_helmet": "Antimony Helmet", + "item.modernmetals.antimony_hoe": "Antimony Hoe", + "item.modernmetals.antimony_ingot": "Antimony Ingot", + "item.modernmetals.antimony_leggings": "Antimony Leg Armour", + "item.modernmetals.antimony_nugget": "Antimony Nugget", + "item.modernmetals.antimony_ore": "Antimony Ore", + "item.modernmetals.antimony_pickaxe": "Antimony Pickaxe", + "item.modernmetals.antimony_powder": "Antimony Dust", + "item.modernmetals.antimony_shears": "Antimony Shears", + "item.modernmetals.antimony_shield": "Antimony Shield", + "item.modernmetals.antimony_shovel": "Antimony Shovel", + "item.modernmetals.antimony_smallpowder": "Tiny Pile of Antimony Dust", + "item.modernmetals.antimony_sword": "Antimony Sword", + "item.modernmetals.antimony_trapdoor": "Antimony Trapdoor", + "material.beryllium": "Beryllium", + "item.modernmetals.beryllium_arrow": "Beryllium Arrow", + "item.modernmetals.beryllium_axe": "Beryllium Axe", + "item.modernmetals.beryllium_bars": "Beryllium Bars", + "item.modernmetals.beryllium_blend": "Beryllium Blend", + "item.modernmetals.beryllium_block": "Block of Beryllium", + "item.modernmetals.beryllium_boots": "Beryllium Boots", + "item.modernmetals.beryllium_bolt": "Beryllium Bolt", + "item.modernmetals.beryllium_bow": "Beryllium Bow", + "item.modernmetals.beryllium_chestplate": "Beryllium Chestplate", + "item.modernmetals.beryllium_crackhammer": "Beryllium Crack Hammer", + "item.modernmetals.beryllium_crossbow": "Beryllium Crossbow", + "item.modernmetals.beryllium_door": "Beryllium Door", + "item.modernmetals.beryllium_fishing_rod": "Beryllium Fishing Rod", + "item.modernmetals.beryllium_gear": "Beryllium Gear", + "item.modernmetals.beryllium_helmet": "Beryllium Helmet", + "item.modernmetals.beryllium_hoe": "Beryllium Hoe", + "item.modernmetals.beryllium_horse_armor": "Beryllium Horse Armour", + "item.modernmetals.beryllium_ingot": "Beryllium Ingot", + "item.modernmetals.beryllium_leggings": "Beryllium Leg Armour", + "item.modernmetals.beryllium_nugget": "Beryllium Nugget", + "item.modernmetals.beryllium_ore": "Beryllium Ore", + "item.modernmetals.beryllium_pickaxe": "Beryllium Pickaxe", + "item.modernmetals.beryllium_powder": "Beryllium Dust", + "item.modernmetals.beryllium_rod": "Beryllium Rod", + "item.modernmetals.beryllium_shears": "Beryllium Shears", + "item.modernmetals.beryllium_shield": "Beryllium Shield", + "item.modernmetals.beryllium_shovel": "Beryllium Shovel", + "item.modernmetals.beryllium_smallblend": "Tiny Pile of Beryllium Blend", + "item.modernmetals.beryllium_smallpowder": "Tiny Pile of Beryllium Dust", + "item.modernmetals.beryllium_sword": "Beryllium Sword", + "item.modernmetals.beryllium_trapdoor": "Beryllium Trapdoor", + "material.bismuth": "Bismuth", + "item.modernmetals.bismuth_arrow": "Bismuth Arrow", + "item.modernmetals.bismuth_axe": "Bismuth Axe", + "item.modernmetals.bismuth_bars": "Bismuth Bars", + "item.modernmetals.bismuth_block": "Block of Bismuth", + "item.modernmetals.bismuth_boots": "Bismuth Boots", + "item.modernmetals.bismuth_chestplate": "Bismuth Chestplate", + "item.modernmetals.bismuth_crackhammer": "Bismuth Crack Hammer", + "item.modernmetals.bismuth_door": "Bismuth Door", + "item.modernmetals.bismuth_helmet": "Bismuth Helmet", + "item.modernmetals.bismuth_hoe": "Bismuth Hoe", + "item.modernmetals.bismuth_ingot": "Bismuth Ingot", + "item.modernmetals.bismuth_leggings": "Bismuth Leg Armour", + "item.modernmetals.bismuth_nugget": "Bismuth Nugget", + "item.modernmetals.bismuth_ore": "Bismuth Ore", + "item.modernmetals.bismuth_pickaxe": "Bismuth Pickaxe", + "item.modernmetals.bismuth_powder": "Bismuth Dust", + "item.modernmetals.bismuth_shears": "Bismuth Shears", + "item.modernmetals.bismuth_shovel": "Bismuth Shovel", + "item.modernmetals.bismuth_shield": "Bismuth Shield", + "item.modernmetals.bismuth_smallpowder": "Tiny Pile of Bismuth Dust", + "item.modernmetals.bismuth_sword": "Bismuth Sword", + "item.modernmetals.bismuth_trapdoor": "Bismuth Trapdoor", + "material.boron": "Boron", + "item.modernmetals.boron_arrow": "Boron Arrow", + "item.modernmetals.boron_axe": "Boron Axe", + "item.modernmetals.boron_bars": "Boron Bars", + "item.modernmetals.boron_blend": "Boron Blend", + "item.modernmetals.boron_block": "Block of Boron", + "item.modernmetals.boron_boots": "Boron Boots", + "item.modernmetals.boron_bolt": "Boron Bolt", + "item.modernmetals.boron_bow": "Boron Bow", + "item.modernmetals.boron_chestplate": "Boron Chestplate", + "item.modernmetals.boron_crackhammer": "Boron Crack Hammer", + "item.modernmetals.boron_crossbow": "Boron Crossbow", + "item.modernmetals.boron_door": "Boron Door", + "item.modernmetals.boron_fishing_rod": "Boron Fishing Rod", + "item.modernmetals.boron_gear": "Boron Gear", + "item.modernmetals.boron_helmet": "Boron Helmet", + "item.modernmetals.boron_hoe": "Boron Hoe", + "item.modernmetals.boron_horse_armor": "Boron Horse Armour", + "item.modernmetals.boron_ingot": "Boron Ingot", + "item.modernmetals.boron_leggings": "Boron Leg Armour", + "item.modernmetals.boron_nugget": "Boron Nugget", + "item.modernmetals.boron_ore": "Boron Ore", + "item.modernmetals.boron_pickaxe": "Boron Pickaxe", + "item.modernmetals.boron_powder": "Boron Dust", + "item.modernmetals.boron_rod": "Boron Rod", + "item.modernmetals.boron_shears": "Boron Shears", + "item.modernmetals.boron_shield": "Boron Shield", + "item.modernmetals.boron_shovel": "Boron Shovel", + "item.modernmetals.boron_smallblend": "Tiny Pile of Boron Blend", + "item.modernmetals.boron_smallpowder": "Tiny Pile of Boron Dust", + "item.modernmetals.boron_sword": "Boron Sword", + "item.modernmetals.boron_trapdoor": "Boron Trapdoor", + "material.cadmium": "Cadmium", + "item.modernmetals.cadmium_arrow": "Cadmium Arrow", + "item.modernmetals.cadmium_axe": "Cadmium Axe", + "item.modernmetals.cadmium_bars": "Cadmium Bars", + "item.modernmetals.cadmium_blend": "Cadmium Blend", + "item.modernmetals.cadmium_block": "Block of Cadmium", + "item.modernmetals.cadmium_bolt": "Cadmium Bolt", + "item.modernmetals.cadmium_boots": "Cadmium Boots", + "item.modernmetals.cadmium_bow": "Cadmium Bow", + "item.modernmetals.cadmium_chestplate": "Cadmium Chestplate", + "item.modernmetals.cadmium_crackhammer": "Cadmium Crack Hammer", + "item.modernmetals.cadmium_crossbow": "Cadmium Crossbow", + "item.modernmetals.cadmium_door": "Cadmium Door", + "item.modernmetals.cadmium_fishing_rod": "Cadmium Fishing Rod", + "item.modernmetals.cadmium_gear": "Cadmium Gear", + "item.modernmetals.cadmium_helmet": "Cadmium Helmet", + "item.modernmetals.cadmium_hoe": "Cadmium Hoe", + "item.modernmetals.cadmium_horse_armor": "Cadmium Horse Armour", + "item.modernmetals.cadmium_ingot": "Cadmium Ingot", + "item.modernmetals.cadmium_leggings": "Cadmium Leg Armour", + "item.modernmetals.cadmium_nugget": "Cadmium Nugget", + "item.modernmetals.cadmium_ore": "Cadmium Ore", + "item.modernmetals.cadmium_pickaxe": "Cadmium Pickaxe", + "item.modernmetals.cadmium_powder": "Cadmium Dust", + "item.modernmetals.cadmium_rod": "Cadmium Rod", + "item.modernmetals.cadmium_shears": "Cadmium Shears", + "item.modernmetals.cadmium_shovel": "Cadmium Shovel", + "item.modernmetals.cadmium_shield": "Cadmium Shield", + "item.modernmetals.cadmium_smallblend": "Tiny Pile of Cadmium Blend", + "item.modernmetals.cadmium_smallpowder": "Tiny Pile of Cadmium Dust", + "item.modernmetals.cadmium_sword": "Cadmium Sword", + "item.modernmetals.cadmium_trapdoor": "Cadmium Trapdoor", + "material.chromium": "Chromium", + "item.modernmetals.chromium_arrow": "Chromium Arrow", + "item.modernmetals.chromium_axe": "Chromium Axe", + "item.modernmetals.chromium_bars": "Chromium Bars", + "item.modernmetals.chromium_blend": "Chromium Blend", + "item.modernmetals.chromium_block": "Block of Chromium", + "item.modernmetals.chromium_bolt": "Chromium Bolt", + "item.modernmetals.chromium_boots": "Chromium Boots", + "item.modernmetals.chromium_bow": "Chromium Bow", + "item.modernmetals.chromium_chestplate": "Chromium Chestplate", + "item.modernmetals.chromium_crackhammer": "Chromium Crack Hammer", + "item.modernmetals.chromium_crossbow": "Chromium Crossbow", + "item.modernmetals.chromium_door": "Chromium Door", + "item.modernmetals.chromium_fishing_rod": "Chromium Fishing Rod", + "item.modernmetals.chromium_gear": "Chromium Gear", + "item.modernmetals.chromium_helmet": "Chromium Helmet", + "item.modernmetals.chromium_hoe": "Chromium Hoe", + "item.modernmetals.chromium_horse_armor": "Chromium Horse Armour", + "item.modernmetals.chromium_ingot": "Chromium Ingot", + "item.modernmetals.chromium_leggings": "Chromium Leg Armour", + "item.modernmetals.chromium_nugget": "Chromium Nugget", + "item.modernmetals.chromium_ore": "Chromium Ore", + "item.modernmetals.chromium_pickaxe": "Chromium Pickaxe", + "item.modernmetals.chromium_powder": "Chromium Dust", + "item.modernmetals.chromium_rod": "Chromium Rod", + "item.modernmetals.chromium_shears": "Chromium Shears", + "item.modernmetals.chromium_shield": "Chromium Shield", + "item.modernmetals.chromium_shovel": "Chromium Shovel", + "item.modernmetals.chromium_smallblend": "Tiny Pile of Chromium Blend", + "item.modernmetals.chromium_smallpowder": "Tiny Pile of Chromium Dust", + "item.modernmetals.chromium_sword": "Chromium Sword", + "item.modernmetals.chromium_trapdoor": "Chromium Trapdoor", + "material.galvanizedsteel": "Galvanized Steel", + "item.modernmetals.galvanizedsteel_arrow": "Galvanized Steel Arrow", + "item.modernmetals.galvanizedsteel_axe": "Galvanized Steel Axe", + "item.modernmetals.galvanizedsteel_bars": "Galvanized Steel Bars", + "item.modernmetals.galvanizedsteel_blend": "Galvanized Steel Blend", + "item.modernmetals.galvanizedsteel_block": "Block of Galvanized Steel", + "item.modernmetals.galvanizedsteel_bolt": "Galvanized Steel Bolt", + "item.modernmetals.galvanizedsteel_boots": "Galvanized Steel Boots", + "item.modernmetals.galvanizedsteel_bow": "Galvanized Steel Bow", + "item.modernmetals.galvanizedsteel_chestplate": "Galvanized Steel Chestplate", + "item.modernmetals.galvanizedsteel_crackhammer": "Galvanized Steel Crack Hammer", + "item.modernmetals.galvanizedsteel_crossbow": "Galvanized Steel Crossbow", + "item.modernmetals.galvanizedsteel_door": "Galvanized Steel Door", + "item.modernmetals.galvanizedsteel_fishing_rod": "Galvanized Steel Fishing Rod", + "item.modernmetals.galvanizedsteel_gear": "Galvanized Steel Gear", + "item.modernmetals.galvanizedsteel_helmet": "Galvanized Steel Helmet", + "item.modernmetals.galvanizedsteel_hoe": "Galvanized Steel Hoe", + "item.modernmetals.galvanizedsteel_horse_armor": "Galvanized Steel Horse Armour", + "item.modernmetals.galvanizedsteel_ingot": "Galvanized Steel Ingot", + "item.modernmetals.galvanizedsteel_leggings": "Galvanized Steel Leg Armour", + "item.modernmetals.galvanizedsteel_nugget": "Galvanized Steel Nugget", + "item.modernmetals.galvanizedsteel_ore": "Galvanized Steel Ore", + "item.modernmetals.galvanizedsteel_pickaxe": "Galvanized Steel Pickaxe", + "item.modernmetals.galvanizedsteel_powder": "Galvanized Steel Dust", + "item.modernmetals.galvanizedsteel_rod": "Galvanized Steel Rod", + "item.modernmetals.galvanizedsteel_shears": "Galvanized Steel Shears", + "item.modernmetals.galvanizedsteel_shield": "Galvanized Steel Shield", + "item.modernmetals.galvanizedsteel_shovel": "Galvanized Steel Shovel", + "item.modernmetals.galvanizedsteel_smallblend": "Tiny Pile of Galvanized Steel Blend", + "item.modernmetals.galvanizedsteel_smallpowder": "Tiny Pile of Galvanized Steel Dust", + "item.modernmetals.galvanizedsteel_sword": "Galvanized Steel Sword", + "item.modernmetals.galvanizedsteel_trapdoor": "Galvanized Steel Trapdoor", + "material.iridium": "Iridium", + "item.modernmetals.iridium_arrow": "Iridium Arrow", + "item.modernmetals.iridium_axe": "Iridium Axe", + "item.modernmetals.iridium_bars": "Iridium Bars", + "item.modernmetals.iridium_blend": "Iridium Blend", + "item.modernmetals.iridium_block": "Block of Iridium", + "item.modernmetals.iridium_bolt": "Iridium Bolt", + "item.modernmetals.iridium_boots": "Iridium Boots", + "item.modernmetals.iridium_bow": "Iridium Bow", + "item.modernmetals.iridium_chestplate": "Iridium Chestplate", + "item.modernmetals.iridium_crackhammer": "Iridium Crack Hammer", + "item.modernmetals.iridium_crossbow": "Iridium Crossbow", + "item.modernmetals.iridium_door": "Iridium Door", + "item.modernmetals.iridium_fishing_rod": "Iridium Fishing Rod", + "item.modernmetals.iridium_gear": "Iridium Gear", + "item.modernmetals.iridium_helmet": "Iridium Helmet", + "item.modernmetals.iridium_hoe": "Iridium Hoe", + "item.modernmetals.iridium_horse_armor": "Iridium Horse Armour", + "item.modernmetals.iridium_ingot": "Iridium Ingot", + "item.modernmetals.iridium_leggings": "Iridium Leg Armour", + "item.modernmetals.iridium_nugget": "Iridium Nugget", + "item.modernmetals.iridium_ore": "Iridium Ore", + "item.modernmetals.iridium_pickaxe": "Iridium Pickaxe", + "item.modernmetals.iridium_powder": "Iridium Dust", + "item.modernmetals.iridium_rod": "Iridium Rod", + "item.modernmetals.iridium_shears": "Iridium Shears", + "item.modernmetals.iridium_shield": "Iridium Shield", + "item.modernmetals.iridium_shovel": "Iridium Shovel", + "item.modernmetals.iridium_smallblend": "Tiny Pile of Iridium Blend", + "item.modernmetals.iridium_smallpowder": "Tiny Pile of Iridium Dust", + "item.modernmetals.iridium_sword": "Iridium Sword", + "item.modernmetals.iridium_trapdoor": "Iridium Trapdoor", + "material.magnesium": "Magnesium", + "item.modernmetals.magnesium_arrow": "Magnesium Arrow", + "item.modernmetals.magnesium_axe": "Magnesium Axe", + "item.modernmetals.magnesium_bars": "Magnesium Bars", + "item.modernmetals.magnesium_blend": "Magnesium Blend", + "item.modernmetals.magnesium_block": "Block of Magnesium", + "item.modernmetals.magnesium_boots": "Magnesium Boots", + "item.modernmetals.magnesium_bolt": "Magnesium Bolt", + "item.modernmetals.magnesium_bow": "Magnesium Bow", + "item.modernmetals.magnesium_chestplate": "Magnesium Chestplate", + "item.modernmetals.magnesium_crackhammer": "Magnesium Crack Hammer", + "item.modernmetals.magnesium_crossbow": "Magnesium Crossbow", + "item.modernmetals.magnesium_door": "Magnesium Door", + "item.modernmetals.magnesium_fishing_rod": "Magnesium Fishing Rod", + "item.modernmetals.magnesium_gear": "Magnesium Gear", + "item.modernmetals.magnesium_helmet": "Magnesium Helmet", + "item.modernmetals.magnesium_hoe": "Magnesium Hoe", + "item.modernmetals.magnesium_horse_armor": "Magnesium Horse Armour", + "item.modernmetals.magnesium_ingot": "Magnesium Ingot", + "item.modernmetals.magnesium_leggings": "Magnesium Leg Armour", + "item.modernmetals.magnesium_nugget": "Magnesium Nugget", + "item.modernmetals.magnesium_ore": "Magnesium Ore", + "item.modernmetals.magnesium_pickaxe": "Magnesium Pickaxe", + "item.modernmetals.magnesium_powder": "Magnesium Dust", + "item.modernmetals.magnesium_rod": "Magnesium Rod", + "item.modernmetals.magnesium_shears": "Magnesium Shears", + "item.modernmetals.magnesium_shield": "Magnesium Shield", + "item.modernmetals.magnesium_shovel": "Magnesium Shovel", + "item.modernmetals.magnesium_smallblend": "Tiny Pile of Magnesium Blend", + "item.modernmetals.magnesium_smallpowder": "Tiny Pile of Magnesium Dust", + "item.modernmetals.magnesium_sword": "Magnesium Sword", + "item.modernmetals.magnesium_trapdoor": "Magnesium Trapdoor", + "material.manganese": "Manganese", + "item.modernmetals.manganese_arrow": "Manganese Arrow", + "item.modernmetals.manganese_axe": "Manganese Axe", + "item.modernmetals.manganese_bars": "Manganese Bars", + "item.modernmetals.manganese_blend": "Manganese Blend", + "item.modernmetals.manganese_block": "Block of Manganese", + "item.modernmetals.manganese_bolt": "Manganese Bolt", + "item.modernmetals.manganese_boots": "Manganese Boots", + "item.modernmetals.manganese_bow": "Manganese Bow", + "item.modernmetals.manganese_chestplate": "Manganese Chestplate", + "item.modernmetals.manganese_crackhammer": "Manganese Crack Hammer", + "item.modernmetals.manganese_crossbow": "Manganese Crossbow", + "item.modernmetals.manganese_door": "Manganese Door", + "item.modernmetals.manganese_fishing_rod": "Manganese Fishing Rod", + "item.modernmetals.manganese_gear": "Manganese Gear", + "item.modernmetals.manganese_helmet": "Manganese Helmet", + "item.modernmetals.manganese_hoe": "Manganese Hoe", + "item.modernmetals.manganese_horse_armor": "Manganese Horse Armour", + "item.modernmetals.manganese_ingot": "Manganese Ingot", + "item.modernmetals.manganese_leggings": "Manganese Leg Armour", + "item.modernmetals.manganese_nugget": "Manganese Nugget", + "item.modernmetals.manganese_ore": "Manganese Ore", + "item.modernmetals.manganese_pickaxe": "Manganese Pickaxe", + "item.modernmetals.manganese_powder": "Manganese Dust", + "item.modernmetals.manganese_rod": "Manganese Rod", + "item.modernmetals.manganese_shears": "Manganese Shears", + "item.modernmetals.manganese_shield": "Manganese Shield", + "item.modernmetals.manganese_shovel": "Manganese Shovel", + "item.modernmetals.manganese_smallblend": "Tiny Pile of Manganese Blend", + "item.modernmetals.manganese_smallpowder": "Tiny Pile of Manganese Dust", + "item.modernmetals.manganese_sword": "Manganese Sword", + "item.modernmetals.manganese_trapdoor": "Manganese Trapdoor", + "material.nichrome": "Nichrome", + "item.modernmetals.nichrome_arrow": "Nichrome Arrow", + "item.modernmetals.nichrome_axe": "Nichrome Axe", + "item.modernmetals.nichrome_bars": "Nichrome Bars", + "item.modernmetals.nichrome_blend": "Nichrome Blend", + "item.modernmetals.nichrome_block": "Block of Nichrome", + "item.modernmetals.nichrome_bolt": "Nichrome Bolt", + "item.modernmetals.nichrome_boots": "Nichrome Boots", + "item.modernmetals.nichrome_bow": "Nichrome Bow", + "item.modernmetals.nichrome_chestplate": "Nichrome Chestplate", + "item.modernmetals.nichrome_crackhammer": "Nichrome Crack Hammer", + "item.modernmetals.nichrome_crossbow": "Nichrome Crossbow", + "item.modernmetals.nichrome_door": "Nichrome Door", + "item.modernmetals.nichrome_fishing_rod": "Nichrome Fishing Rod", + "item.modernmetals.nichrome_gear": "Nichrome Gear", + "item.modernmetals.nichrome_helmet": "Nichrome Helmet", + "item.modernmetals.nichrome_hoe": "Nichrome Hoe", + "item.modernmetals.nichrome_horse_armor": "Nichrome Horse Armour", + "item.modernmetals.nichrome_ingot": "Nichrome Ingot", + "item.modernmetals.nichrome_leggings": "Nichrome Leg Armour", + "item.modernmetals.nichrome_nugget": "Nichrome Nugget", + "item.modernmetals.nichrome_ore": "Nichrome Ore", + "item.modernmetals.nichrome_pickaxe": "Nichrome Pickaxe", + "item.modernmetals.nichrome_powder": "Nichrome Dust", + "item.modernmetals.nichrome_rod": "Nichrome Rod", + "item.modernmetals.nichrome_shears": "Nichrome Shears", + "item.modernmetals.nichrome_shield": "Nichrome Shield", + "item.modernmetals.nichrome_shovel": "Nichrome Shovel", + "item.modernmetals.nichrome_smallblend": "Tiny Pile of Nichrome Blend", + "item.modernmetals.nichrome_smallpowder": "Tiny Pile of Nichrome Dust", + "item.modernmetals.nichrome_sword": "Nichrome Sword", + "item.modernmetals.nichrome_trapdoor": "Nichrome Trapdoor", + "material.osmium": "Osmium", + "item.modernmetals.osmium_arrow": "Osmium Arrow", + "item.modernmetals.osmium_axe": "Osmium Axe", + "item.modernmetals.osmium_bars": "Osmium Bars", + "item.modernmetals.osmium_blend": "Osmium Blend", + "item.modernmetals.osmium_block": "Block of Osmium", + "item.modernmetals.osmium_boots": "Osmium Boots", + "item.modernmetals.osmium_bolt": "Osmium Bolt", + "item.modernmetals.osmium_bow": "Osmium Bow", + "item.modernmetals.osmium_chestplate": "Osmium Chestplate", + "item.modernmetals.osmium_crackhammer": "Osmium Crack Hammer", + "item.modernmetals.osmium_crossbow": "Osmium Crossbow", + "item.modernmetals.osmium_door": "Osmium Door", + "item.modernmetals.osmium_fishing_rod": "Osmium Fishing Rod", + "item.modernmetals.osmium_gear": "Osmium Gear", + "item.modernmetals.osmium_helmet": "Osmium Helmet", + "item.modernmetals.osmium_hoe": "Osmium Hoe", + "item.modernmetals.osmium_horse_armor": "Osmium Horse Armour", + "item.modernmetals.osmium_ingot": "Osmium Ingot", + "item.modernmetals.osmium_leggings": "Osmium Leg Armour", + "item.modernmetals.osmium_nugget": "Osmium Nugget", + "item.modernmetals.osmium_ore": "Osmium Ore", + "item.modernmetals.osmium_pickaxe": "Osmium Pickaxe", + "item.modernmetals.osmium_powder": "Osmium Dust", + "item.modernmetals.osmium_rod": "Osmium Rod", + "item.modernmetals.osmium_shears": "Osmium Shears", + "item.modernmetals.osmium_shield": "Osmium Shield", + "item.modernmetals.osmium_shovel": "Osmium Shovel", + "item.modernmetals.osmium_smallblend": "Tiny Pile of Osmium Blend", + "item.modernmetals.osmium_smallpowder": "Tiny Pile of Osmium Dust", + "item.modernmetals.osmium_sword": "Osmium Sword", + "item.modernmetals.osmium_trapdoor": "Osmium Trapdoor", + "material.pewter": "Pewter", + "item.modernmetals.pewter_arrow": "Pewter Arrow", + "item.modernmetals.pewter_axe": "Pewter Axe", + "item.modernmetals.pewter_bars": "Pewter Bars", + "item.modernmetals.pewter_blend": "Pewter Blend", + "item.modernmetals.pewter_block": "Block of Pewter", + "item.modernmetals.pewter_boots": "Pewter Boots", + "item.modernmetals.pewter_chestplate": "Pewter Chestplate", + "item.modernmetals.pewter_crackhammer": "Pewter Crack Hammer", + "item.modernmetals.pewter_door": "Pewter Door", + "item.modernmetals.pewter_helmet": "Pewter Helmet", + "item.modernmetals.pewter_hoe": "Pewter Hoe", + "item.modernmetals.pewter_ingot": "Pewter Ingot", + "item.modernmetals.pewter_leggings": "Pewter Leg Armour", + "item.modernmetals.pewter_nugget": "Pewter Nugget", + "item.modernmetals.pewter_ore": "Pewter Ore", + "item.modernmetals.pewter_pickaxe": "Pewter Pickaxe", + "item.modernmetals.pewter_powder": "Pewter Dust", + "item.modernmetals.pewter_shears": "Pewter Shears", + "item.modernmetals.pewter_shield": "Pewter Shield", + "item.modernmetals.pewter_shovel": "Pewter Shovel", + "item.modernmetals.pewter_smallpowder": "Tiny Pile of Pewter Dust", + "item.modernmetals.pewter_sword": "Pewter Sword", + "item.modernmetals.pewter_trapdoor": "Pewter Trapdoor", + "material.plutonium": "Plutonium", + "item.modernmetals.plutonium_arrow": "Plutonium Arrow", + "item.modernmetals.plutonium_axe": "Plutonium Axe", + "item.modernmetals.plutonium_bars": "Plutonium Bars", + "item.modernmetals.plutonium_blend": "Plutonium Blend", + "item.modernmetals.plutonium_block": "Block of Plutonium", + "item.modernmetals.plutonium_bolt": "Plutonium Bolt", + "item.modernmetals.plutonium_boots": "Plutonium Boots", + "item.modernmetals.plutonium_bow": "Plutonium Bow", + "item.modernmetals.plutonium_chestplate": "Plutonium Chestplate", + "item.modernmetals.plutonium_crackhammer": "Plutonium Crack Hammer", + "item.modernmetals.plutonium_crossbow": "Plutonium Crossbow", + "item.modernmetals.plutonium_door": "Plutonium Door", + "item.modernmetals.plutonium_fishing_rod": "Plutonium Fishing Rod", + "item.modernmetals.plutonium_gear": "Plutonium Gear", + "item.modernmetals.plutonium_helmet": "Plutonium Helmet", + "item.modernmetals.plutonium_hoe": "Plutonium Hoe", + "item.modernmetals.plutonium_horse_armor": "Plutonium Horse Armour", + "item.modernmetals.plutonium_ingot": "Plutonium Ingot", + "item.modernmetals.plutonium_leggings": "Plutonium Leg Armour", + "item.modernmetals.plutonium_nugget": "Plutonium Nugget", + "item.modernmetals.plutonium_ore": "Plutonium Ore", + "item.modernmetals.plutonium_pickaxe": "Plutonium Pickaxe", + "item.modernmetals.plutonium_powder": "Plutonium Dust", + "item.modernmetals.plutonium_rod": "Plutonium Rod", + "item.modernmetals.plutonium_shears": "Plutonium Shears", + "item.modernmetals.plutonium_shield": "Plutonium Shield", + "item.modernmetals.plutonium_shovel": "Plutonium Shovel", + "item.modernmetals.plutonium_smallblend": "Tiny Pile of Plutonium Blend", + "item.modernmetals.plutonium_smallpowder": "Tiny Pile of Plutonium Dust", + "item.modernmetals.plutonium_sword": "Plutonium Sword", + "item.modernmetals.plutonium_trapdoor": "Plutonium Trapdoor", + "material.rutile": "Rutile", + "item.modernmetals.rutile_arrow": "Rutile Arrow", + "item.modernmetals.rutile_axe": "Rutile Axe", + "item.modernmetals.rutile_bars": "Rutile Bars", + "item.modernmetals.rutile_blend": "Rutile Blend", + "item.modernmetals.rutile_block": "Block of Rutile", + "item.modernmetals.rutile_boots": "Rutile Boots", + "item.modernmetals.rutile_bolt": "Rutile Bolt", + "item.modernmetals.rutile_bow": "Rutile Bow", + "item.modernmetals.rutile_chestplate": "Rutile Chestplate", + "item.modernmetals.rutile_crackhammer": "Rutile Crack Hammer", + "item.modernmetals.rutile_crossbow": "Rutile Crossbow", + "item.modernmetals.rutile_door": "Rutile Door", + "item.modernmetals.rutile_fishing_rod": "Rutile Fishing Rod", + "item.modernmetals.rutile_gear": "Rutile Gear", + "item.modernmetals.rutile_helmet": "Rutile Helmet", + "item.modernmetals.rutile_hoe": "Rutile Hoe", + "item.modernmetals.rutile_horse_armor": "Rutile Horse Armour", + "item.modernmetals.rutile_ingot": "Rutile Ingot", + "item.modernmetals.rutile_leggings": "Rutile Leg Armour", + "item.modernmetals.rutile_nugget": "Rutile Nugget", + "item.modernmetals.rutile_ore": "Rutile Ore", + "item.modernmetals.rutile_pickaxe": "Rutile Pickaxe", + "item.modernmetals.rutile_powder": "Rutile Dust", + "item.modernmetals.rutile_rod": "Rutile Rod", + "item.modernmetals.rutile_shears": "Rutile Shears", + "item.modernmetals.rutile_shield": "Rutile Shield", + "item.modernmetals.rutile_shovel": "Rutile Shovel", + "item.modernmetals.rutile_smallblend": "Tiny Pile of Rutile Blend", + "item.modernmetals.rutile_smallpowder": "Tiny Pile of Rutile Dust", + "item.modernmetals.rutile_sword": "Rutile Sword", + "item.modernmetals.rutile_trapdoor": "Rutile Trapdoor", + "material.stainlesssteel": "Stainless Steel", + "item.modernmetals.stainlesssteel_arrow": "Stainless Steel Arrow", + "item.modernmetals.stainlesssteel_axe": "Stainless Steel Axe", + "item.modernmetals.stainlesssteel_bars": "Stainless Steel Bars", + "item.modernmetals.stainlesssteel_blend": "Stainless Steel Blend", + "item.modernmetals.stainlesssteel_block": "Block of Stainless Steel", + "item.modernmetals.stainlesssteel_bolt": "Stainless Steel Bolt", + "item.modernmetals.stainlesssteel_boots": "Stainless Steel Boots", + "item.modernmetals.stainlesssteel_bow": "Stainless Steel Bow", + "item.modernmetals.stainlesssteel_chestplate": "Stainless Steel Chestplate", + "item.modernmetals.stainlesssteel_crackhammer": "Stainless Steel Crack Hammer", + "item.modernmetals.stainlesssteel_crossbow": "Stainless Steel Crossbow", + "item.modernmetals.stainlesssteel_door": "Stainless Steel Door", + "item.modernmetals.stainlesssteel_fishing_rod": "Stainless Steel Fishing Rod", + "item.modernmetals.stainlesssteel_gear": "Stainless Steel Gear", + "item.modernmetals.stainlesssteel_helmet": "Stainless Steel Helmet", + "item.modernmetals.stainlesssteel_hoe": "Stainless Steel Hoe", + "item.modernmetals.stainlesssteel_horse_armor": "Stainless Steel Horse Armour", + "item.modernmetals.stainlesssteel_ingot": "Stainless Steel Ingot", + "item.modernmetals.stainlesssteel_leggings": "Stainless Steel Leg Armour", + "item.modernmetals.stainlesssteel_nugget": "Stainless Steel Nugget", + "item.modernmetals.stainlesssteel_ore": "Stainless Steel Ore", + "item.modernmetals.stainlesssteel_pickaxe": "Stainless Steel Pickaxe", + "item.modernmetals.stainlesssteel_powder": "Stainless Steel Dust", + "item.modernmetals.stainlesssteel_rod": "Stainless Steel Rod", + "item.modernmetals.stainlesssteel_shears": "Stainless Steel Shears", + "item.modernmetals.stainlesssteel_shield": "Stainless Steel Shield", + "item.modernmetals.stainlesssteel_shovel": "Stainless Steel Shovel", + "item.modernmetals.stainlesssteel_smallblend": "Tiny Pile of Stainless Steel Blend", + "item.modernmetals.stainlesssteel_smallpowder": "Tiny Pile of Stainless Steel Dust", + "item.modernmetals.stainlesssteel_sword": "Stainless Steel Sword", + "item.modernmetals.stainlesssteel_trapdoor": "Stainless Steel Trapdoor", + "material.tantalum": "Tantalum", + "item.modernmetals.tantalum_arrow": "Tantalum Arrow", + "item.modernmetals.tantalum_axe": "Tantalum Axe", + "item.modernmetals.tantalum_bars": "Tantalum Bars", + "item.modernmetals.tantalum_blend": "Tantalum Blend", + "item.modernmetals.tantalum_block": "Block of Tantalum", + "item.modernmetals.tantalum_bolt": "Tantalum Bolt", + "item.modernmetals.tantalum_boots": "Tantalum Boots", + "item.modernmetals.tantalum_bow": "Tantalum Bow", + "item.modernmetals.tantalum_chestplate": "Tantalum Chestplate", + "item.modernmetals.tantalum_crackhammer": "Tantalum Crack Hammer", + "item.modernmetals.tantalum_crossbow": "Tantalum Crossbow", + "item.modernmetals.tantalum_door": "Tantalum Door", + "item.modernmetals.tantalum_fishing_rod": "Tantalum Fishing Rod", + "item.modernmetals.tantalum_gear": "Tantalum Gear", + "item.modernmetals.tantalum_helmet": "Tantalum Helmet", + "item.modernmetals.tantalum_hoe": "Tantalum Hoe", + "item.modernmetals.tantalum_horse_armor": "Tantalum Horse Armour", + "item.modernmetals.tantalum_ingot": "Tantalum Ingot", + "item.modernmetals.tantalum_leggings": "Tantalum Leg Armour", + "item.modernmetals.tantalum_nugget": "Tantalum Nugget", + "item.modernmetals.tantalum_ore": "Tantalum Ore", + "item.modernmetals.tantalum_pickaxe": "Tantalum Pickaxe", + "item.modernmetals.tantalum_powder": "Tantalum Dust", + "item.modernmetals.tantalum_rod": "Tantalum Rod", + "item.modernmetals.tantalum_shears": "Tantalum Shears", + "item.modernmetals.tantalum_shield": "Tantalum Shield", + "item.modernmetals.tantalum_shovel": "Tantalum Shovel", + "item.modernmetals.tantalum_smallblend": "Tiny Pile of Tantalum Blend", + "item.modernmetals.tantalum_smallpowder": "Tiny Pile of Tantalum Dust", + "item.modernmetals.tantalum_sword": "Tantalum Sword", + "item.modernmetals.tantalum_trapdoor": "Tantalum Trapdoor", + "material.titanium": "Titanium", + "item.modernmetals.titanium_arrow": "Titanium Arrow", + "item.modernmetals.titanium_axe": "Titanium Axe", + "item.modernmetals.titanium_bars": "Titanium Bars", + "item.modernmetals.titanium_blend": "Titanium Blend", + "item.modernmetals.titanium_block": "Block of Titanium", + "item.modernmetals.titanium_boots": "Titanium Boots", + "item.modernmetals.titanium_bolt": "Titanium Bolt", + "item.modernmetals.titanium_bow": "Titanium Bow", + "item.modernmetals.titanium_chestplate": "Titanium Chestplate", + "item.modernmetals.titanium_crackhammer": "Titanium Crack Hammer", + "item.modernmetals.titanium_crossbow": "Titanium Crossbow", + "item.modernmetals.titanium_door": "Titanium Door", + "item.modernmetals.titanium_fishing_rod": "Titanium Fishing Rod", + "item.modernmetals.titanium_gear": "Titanium Gear", + "item.modernmetals.titanium_helmet": "Titanium Helmet", + "item.modernmetals.titanium_hoe": "Titanium Hoe", + "item.modernmetals.titanium_horse_armor": "Titanium Horse Armour", + "item.modernmetals.titanium_ingot": "Titanium Ingot", + "item.modernmetals.titanium_leggings": "Titanium Leg Armour", + "item.modernmetals.titanium_nugget": "Titanium Nugget", + "item.modernmetals.titanium_ore": "Titanium Ore", + "item.modernmetals.titanium_pickaxe": "Titanium Pickaxe", + "item.modernmetals.titanium_powder": "Titanium Dust", + "item.modernmetals.titanium_rod": "Titanium Rod", + "item.modernmetals.titanium_shears": "Titanium Shears", + "item.modernmetals.titanium_shield": "Titanium Shield", + "item.modernmetals.titanium_shovel": "Titanium Shovel", + "item.modernmetals.titanium_smallblend": "Tiny Pile of Titanium Blend", + "item.modernmetals.titanium_smallpowder": "Tiny Pile of Titanium Dust", + "item.modernmetals.titanium_sword": "Titanium Sword", + "item.modernmetals.titanium_trapdoor": "Titanium Trapdoor", + "material.tungsten": "Tungsten", + "item.modernmetals.tungsten_arrow": "Tungsten Arrow", + "item.modernmetals.tungsten_axe": "Tungsten Axe", + "item.modernmetals.tungsten_bars": "Tungsten Bars", + "item.modernmetals.tungsten_blend": "Tungsten Blend", + "item.modernmetals.tungsten_block": "Block of Tungsten", + "item.modernmetals.tungsten_boots": "Tungsten Boots", + "item.modernmetals.tungsten_bolt": "Tungsten Bolt", + "item.modernmetals.tungsten_bow": "Tungsten Bow", + "item.modernmetals.tungsten_chestplate": "Tungsten Chestplate", + "item.modernmetals.tungsten_crackhammer": "Tungsten Crack Hammer", + "item.modernmetals.tungsten_crossbow": "Tungsten Crossbow", + "item.modernmetals.tungsten_door": "Tungsten Door", + "item.modernmetals.tungsten_fishing_rod": "Tungsten Fishing Rod", + "item.modernmetals.tungsten_gear": "Tungsten Gear", + "item.modernmetals.tungsten_helmet": "Tungsten Helmet", + "item.modernmetals.tungsten_hoe": "Tungsten Hoe", + "item.modernmetals.tungsten_horse_armor": "Tungsten Horse Armour", + "item.modernmetals.tungsten_ingot": "Tungsten Ingot", + "item.modernmetals.tungsten_leggings": "Tungsten Leg Armour", + "item.modernmetals.tungsten_nugget": "Tungsten Nugget", + "item.modernmetals.tungsten_ore": "Tungsten Ore", + "item.modernmetals.tungsten_pickaxe": "Tungsten Pickaxe", + "item.modernmetals.tungsten_powder": "Tungsten Dust", + "item.modernmetals.tungsten_rod": "Tungsten Rod", + "item.modernmetals.tungsten_shears": "Tungsten Shears", + "item.modernmetals.tungsten_shield": "Tungsten Shield", + "item.modernmetals.tungsten_shovel": "Tungsten Shovel", + "item.modernmetals.tungsten_smallblend": "Tiny Pile of Tungsten Blend", + "item.modernmetals.tungsten_smallpowder": "Tiny Pile of Tungsten Dust", + "item.modernmetals.tungsten_sword": "Tungsten Sword", + "item.modernmetals.tungsten_trapdoor": "Tungsten Trapdoor", + "material.uranium": "Uranium", + "item.modernmetals.uranium_arrow": "Uranium Arrow", + "item.modernmetals.uranium_axe": "Uranium Axe", + "item.modernmetals.uranium_bars": "Uranium Bars", + "item.modernmetals.uranium_blend": "Uranium Blend", + "item.modernmetals.uranium_block": "Block of Uranium", + "item.modernmetals.uranium_boots": "Uranium Boots", + "item.modernmetals.uranium_bolt": "Uranium Bolt", + "item.modernmetals.uranium_bow": "Uranium Bow", + "item.modernmetals.uranium_chestplate": "Uranium Chestplate", + "item.modernmetals.uranium_crackhammer": "Uranium Crack Hammer", + "item.modernmetals.uranium_crossbow": "Uranium Crossbow", + "item.modernmetals.uranium_door": "Uranium Door", + "item.modernmetals.uranium_fishing_rod": "Uranium Fishing Rod", + "item.modernmetals.uranium_gear": "Uranium Gear", + "item.modernmetals.uranium_helmet": "Uranium Helmet", + "item.modernmetals.uranium_hoe": "Uranium Hoe", + "item.modernmetals.uranium_horse_armor": "Uranium Horse Armour", + "item.modernmetals.uranium_ingot": "Uranium Ingot", + "item.modernmetals.uranium_leggings": "Uranium Leg Armour", + "item.modernmetals.uranium_nugget": "Uranium Nugget", + "item.modernmetals.uranium_ore": "Uranium Ore", + "item.modernmetals.uranium_pickaxe": "Uranium Pickaxe", + "item.modernmetals.uranium_powder": "Uranium Dust", + "item.modernmetals.uranium_rod": "Uranium Rod", + "item.modernmetals.uranium_shears": "Uranium Shears", + "item.modernmetals.uranium_shield": "Uranium Shield", + "item.modernmetals.uranium_shovel": "Uranium Shovel", + "item.modernmetals.uranium_smallblend": "Tiny Pile of Uranium Blend", + "item.modernmetals.uranium_smallpowder": "Tiny Pile of Uranium Dust", + "item.modernmetals.uranium_sword": "Uranium Sword", + "item.modernmetals.uranium_trapdoor": "Uranium Trapdoor", + "material.zirconium": "Zirconium", + "item.modernmetals.zirconium_arrow": "Zirconium Arrow", + "item.modernmetals.zirconium_axe": "Zirconium Axe", + "item.modernmetals.zirconium_bars": "Zirconium Bars", + "item.modernmetals.zirconium_blend": "Zirconium Blend", + "item.modernmetals.zirconium_block": "Block of Zirconium", + "item.modernmetals.zirconium_bolt": "Zirconium Bolt", + "item.modernmetals.zirconium_boots": "Zirconium Boots", + "item.modernmetals.zirconium_bow": "Zirconium Bow", + "item.modernmetals.zirconium_chestplate": "Zirconium Chestplate", + "item.modernmetals.zirconium_crackhammer": "Zirconium Crack Hammer", + "item.modernmetals.zirconium_crossbow": "Zirconium Crossbow", + "item.modernmetals.zirconium_door": "Zirconium Door", + "item.modernmetals.zirconium_fishing_rod": "Zirconium Fishing Rod", + "item.modernmetals.zirconium_gear": "Zirconium Gear", + "item.modernmetals.zirconium_helmet": "Zirconium Helmet", + "item.modernmetals.zirconium_hoe": "Zirconium Hoe", + "item.modernmetals.zirconium_horse_armor": "Zirconium Horse Armour", + "item.modernmetals.zirconium_ingot": "Zirconium Ingot", + "item.modernmetals.zirconium_leggings": "Zirconium Leg Armour", + "item.modernmetals.zirconium_nugget": "Zirconium Nugget", + "item.modernmetals.zirconium_ore": "Zirconium Ore", + "item.modernmetals.zirconium_pickaxe": "Zirconium Pickaxe", + "item.modernmetals.zirconium_powder": "Zirconium Dust", + "item.modernmetals.zirconium_rod": "Zirconium Rod", + "item.modernmetals.zirconium_shears": "Zirconium Shears", + "item.modernmetals.zirconium_shield": "Zirconium Shield", + "item.modernmetals.zirconium_shovel": "Zirconium Shovel", + "item.modernmetals.zirconium_smallblend": "Tiny Pile of Zirconium Blend", + "item.modernmetals.zirconium_smallpowder": "Tiny Pile of Zirconium Dust", + "item.modernmetals.zirconium_sword": "Zirconium Sword", + "item.modernmetals.zirconium_trapdoor": "Zirconium Trapdoor", + "tile.modernmetals.aluminum_bars": "Aluminum Bars", + "block.modernmetals.aluminum_bars": "Aluminum Bars", + "tile.modernmetals.aluminum_block": "Block of Aluminum", + "block.modernmetals.aluminum_block": "Block of Aluminum", + "tile.modernmetals.aluminum_door": "Aluminum Door", + "block.modernmetals.aluminum_door": "Aluminum Door", + "tile.modernmetals.aluminum_ore": "Aluminum Ore", + "block.modernmetals.aluminum_ore": "Aluminum Ore", + "tile.modernmetals.aluminum_plate": "Aluminum Plate", + "block.modernmetals.aluminum_plate": "Aluminum Plate", + "tile.modernmetals.aluminum_trapdoor": "Aluminum Trapdoor", + "block.modernmetals.aluminum_trapdoor": "Aluminum Trapdoor", + "tile.modernmetals.aluminumbrass_bars": "Aluminum Brass Bars", + "block.modernmetals.aluminumbrass_bars": "Aluminum Brass Bars", + "tile.modernmetals.aluminumbrass_block": "Block of Aluminum Brass", + "block.modernmetals.aluminumbrass_block": "Block of Aluminum Brass", + "tile.modernmetals.aluminumbrass_door": "Aluminum Brass Door", + "block.modernmetals.aluminumbrass_door": "Aluminum Brass Door", + "tile.modernmetals.aluminumbrass_ore": "Aluminum Brass Ore", + "block.modernmetals.aluminumbrass_ore": "Aluminum Brass Ore", + "tile.modernmetals.aluminumbrass_plate": "Aluminum Brass Plate", + "block.modernmetals.aluminumbrass_plate": "Aluminum Brass Plate", + "tile.modernmetals.aluminumbrass_trapdoor": "Aluminum Brass Trapdoor", + "block.modernmetals.aluminumbrass_trapdoor": "Aluminum Brass Trapdoor", + "tile.modernmetals.boron_bars": "Boron Bars", + "block.modernmetals.boron_bars": "Boron Bars", + "tile.modernmetals.boron_block": "Block of Boron", + "block.modernmetals.boron_block": "Block of Boron", + "tile.modernmetals.boron_door": "Boron Door", + "block.modernmetals.boron_door": "Boron Door", + "tile.modernmetals.boron_ore": "Boron Ore", + "block.modernmetals.boron_ore": "Boron Ore", + "tile.modernmetals.boron_plate": "Boron Plate", + "block.modernmetals.boron_plate": "Boron Plate", + "tile.modernmetals.boron_trapdoor": "Boron Trapdoor", + "block.modernmetals.boron_trapdoor": "Boron Trapdoor", + "tile.modernmetals.cadmium_bars": "Cadmium Bars", + "block.modernmetals.cadmium_bars": "Cadmium Bars", + "tile.modernmetals.cadmium_block": "Block of Cadmium", + "block.modernmetals.cadmium_block": "Block of Cadmium", + "tile.modernmetals.cadmium_door": "Cadmium Door", + "block.modernmetals.cadmium_door": "Cadmium Door", + "tile.modernmetals.cadmium_ore": "Cadmium Ore", + "block.modernmetals.cadmium_ore": "Cadmium Ore", + "tile.modernmetals.cadmium_plate": "Cadmium Plate", + "block.modernmetals.cadmium_plate": "Cadmium Plate", + "tile.modernmetals.cadmium_trapdoor": "Cadmium Trapdoor", + "block.modernmetals.cadmium_trapdoor": "Cadmium Trapdoor", + "tile.modernmetals.chromium_bars": "Chromium Bars", + "block.modernmetals.chromium_bars": "Chromium Bars", + "tile.modernmetals.chromium_block": "Block of Chromium", + "block.modernmetals.chromium_block": "Block of Chromium", + "tile.modernmetals.chromium_door": "Chromium Door", + "block.modernmetals.chromium_door": "Chromium Door", + "tile.modernmetals.chromium_ore": "Chromium Ore", + "block.modernmetals.chromium_ore": "Chromium Ore", + "tile.modernmetals.chromium_plate": "Chromium Plate", + "block.modernmetals.chromium_plate": "Chromium Plate", + "tile.modernmetals.chromium_trapdoor": "Chromium Trapdoor", + "block.modernmetals.chromium_trapdoor": "Chromium Trapdoor", + "tile.modernmetals.galvanizedsteel_bars": "Galvanized Steel Bars", + "block.modernmetals.galvanizedsteel_bars": "Galvanized Steel Bars", + "tile.modernmetals.galvanizedsteel_block": "Block of Galvanized Steel", + "block.modernmetals.galvanizedsteel_block": "Block of Galvanized Steel", + "tile.modernmetals.galvanizedsteel_door": "Galvanized Steel Door", + "block.modernmetals.galvanizedsteel_door": "Galvanized Steel Door", + "tile.modernmetals.galvanizedsteel_ore": "Galvanized Steel Ore", + "block.modernmetals.galvanizedsteel_ore": "Galvanized Steel Ore", + "tile.modernmetals.galvanizedsteel_plate": "Galvanized Steel Plate", + "block.modernmetals.galvanizedsteel_plate": "Galvanized Steel Plate", + "tile.modernmetals.galvanizedsteel_trapdoor": "Galvanized Steel Trapdoor", + "block.modernmetals.galvanizedsteel_trapdoor": "Galvanized Steel Trapdoor", + "tile.modernmetals.iridium_bars": "Iridium Bars", + "block.modernmetals.iridium_bars": "Iridium Bars", + "tile.modernmetals.iridium_block": "Block of Iridium", + "block.modernmetals.iridium_block": "Block of Iridium", + "tile.modernmetals.iridium_door": "Iridium Door", + "block.modernmetals.iridium_door": "Iridium Door", + "tile.modernmetals.iridium_ore": "Iridium Ore", + "block.modernmetals.iridium_ore": "Iridium Ore", + "tile.modernmetals.iridium_plate": "Iridium Plate", + "block.modernmetals.iridium_plate": "Iridium Plate", + "tile.modernmetals.iridium_trapdoor": "Iridium Trapdoor", + "block.modernmetals.iridium_trapdoor": "Iridium Trapdoor", + "tile.modernmetals.magnesium_bars": "Magnesium Bars", + "block.modernmetals.magnesium_bars": "Magnesium Bars", + "tile.modernmetals.magnesium_block": "Block of Magnesium", + "block.modernmetals.magnesium_block": "Block of Magnesium", + "tile.modernmetals.magnesium_door": "Magnesium Door", + "block.modernmetals.magnesium_door": "Magnesium Door", + "tile.modernmetals.magnesium_ore": "Magnesium Ore", + "block.modernmetals.magnesium_ore": "Magnesium Ore", + "tile.modernmetals.magnesium_plate": "Magnesium Plate", + "block.modernmetals.magnesium_plate": "Magnesium Plate", + "tile.modernmetals.magnesium_trapdoor": "Magnesium Trapdoor", + "block.modernmetals.magnesium_trapdoor": "Magnesium Trapdoor", + "tile.modernmetals.manganese_bars": "Manganese Bars", + "block.modernmetals.manganese_bars": "Manganese Bars", + "tile.modernmetals.manganese_block": "Block of Manganese", + "block.modernmetals.manganese_block": "Block of Manganese", + "tile.modernmetals.manganese_door": "Manganese Door", + "block.modernmetals.manganese_door": "Manganese Door", + "tile.modernmetals.manganese_ore": "Manganese Ore", + "block.modernmetals.manganese_ore": "Manganese Ore", + "tile.modernmetals.manganese_plate": "Manganese Plate", + "block.modernmetals.manganese_plate": "Manganese Plate", + "tile.modernmetals.manganese_trapdoor": "Manganese Trapdoor", + "block.modernmetals.manganese_trapdoor": "Manganese Trapdoor", + "tile.modernmetals.nichrome_bars": "Nichrome Bars", + "block.modernmetals.nichrome_bars": "Nichrome Bars", + "tile.modernmetals.nichrome_block": "Block of Nichrome", + "block.modernmetals.nichrome_block": "Block of Nichrome", + "tile.modernmetals.nichrome_door": "Nichrome Door", + "block.modernmetals.nichrome_door": "Nichrome Door", + "tile.modernmetals.nichrome_ore": "Nichrome Ore", + "block.modernmetals.nichrome_ore": "Nichrome Ore", + "tile.modernmetals.nichrome_plate": "Nichrome Plate", + "block.modernmetals.nichrome_plate": "Nichrome Plate", + "tile.modernmetals.nichrome_trapdoor": "Nichrome Trapdoor", + "block.modernmetals.nichrome_trapdoor": "Nichrome Trapdoor", + "tile.modernmetals.osmium_bars": "Osmium Bars", + "block.modernmetals.osmium_bars": "Osmium Bars", + "tile.modernmetals.osmium_block": "Block of Osmium", + "block.modernmetals.osmium_block": "Block of Osmium", + "tile.modernmetals.osmium_door": "Osmium Door", + "block.modernmetals.osmium_door": "Osmium Door", + "tile.modernmetals.osmium_ore": "Osmium Ore", + "block.modernmetals.osmium_ore": "Osmium Ore", + "tile.modernmetals.osmium_plate": "Osmium Plate", + "block.modernmetals.osmium_plate": "Osmium Plate", + "tile.modernmetals.osmium_trapdoor": "Osmium Trapdoor", + "block.modernmetals.osmium_trapdoor": "Osmium Trapdoor", + "tile.modernmetals.plutonium_bars": "Plutonium Bars", + "block.modernmetals.plutonium_bars": "Plutonium Bars", + "tile.modernmetals.plutonium_block": "Block of Plutonium", + "block.modernmetals.plutonium_block": "Block of Plutonium", + "tile.modernmetals.plutonium_door": "Plutonium Door", + "block.modernmetals.plutonium_door": "Plutonium Door", + "tile.modernmetals.plutonium_ore": "Plutonium Ore", + "block.modernmetals.plutonium_ore": "Plutonium Ore", + "tile.modernmetals.plutonium_plate": "Plutonium Plate", + "block.modernmetals.plutonium_plate": "Plutonium Plate", + "tile.modernmetals.plutonium_trapdoor": "Plutonium Trapdoor", + "block.modernmetals.plutonium_trapdoor": "Plutonium Trapdoor", + "tile.modernmetals.rutile_bars": "Rutile Bars", + "block.modernmetals.rutile_bars": "Rutile Bars", + "tile.modernmetals.rutile_block": "Block of Rutile", + "block.modernmetals.rutile_block": "Block of Rutile", + "tile.modernmetals.rutile_door": "Rutile Door", + "block.modernmetals.rutile_door": "Rutile Door", + "tile.modernmetals.rutile_ore": "Rutile Ore", + "block.modernmetals.rutile_ore": "Rutile Ore", + "tile.modernmetals.rutile_plate": "Rutile Plate", + "block.modernmetals.rutile_plate": "Rutile Plate", + "tile.modernmetals.rutile_trapdoor": "Rutile Trapdoor", + "block.modernmetals.rutile_trapdoor": "Rutile Trapdoor", + "tile.modernmetals.stainlesssteel_bars": "Stainless Steel Bars", + "block.modernmetals.stainlesssteel_bars": "Stainless Steel Bars", + "tile.modernmetals.stainlesssteel_block": "Block of Stainless Steel", + "block.modernmetals.stainlesssteel_block": "Block of Stainless Steel", + "tile.modernmetals.stainlesssteel_door": "Stainless Steel Door", + "block.modernmetals.stainlesssteel_door": "Stainless Steel Door", + "tile.modernmetals.stainlesssteel_ore": "Stainless Steel Ore", + "block.modernmetals.stainlesssteel_ore": "Stainless Steel Ore", + "tile.modernmetals.stainlesssteel_plate": "Stainless Steel Plate", + "block.modernmetals.stainlesssteel_plate": "Stainless Steel Plate", + "tile.modernmetals.stainlesssteel_trapdoor": "Stainless Steel Trapdoor", + "block.modernmetals.stainlesssteel_trapdoor": "Stainless Steel Trapdoor", + "tile.modernmetals.tantalum_bars": "Tantalum Bars", + "block.modernmetals.tantalum_bars": "Tantalum Bars", + "tile.modernmetals.tantalum_block": "Block of Tantalum", + "block.modernmetals.tantalum_block": "Block of Tantalum", + "tile.modernmetals.tantalum_door": "Tantalum Door", + "block.modernmetals.tantalum_door": "Tantalum Door", + "tile.modernmetals.tantalum_ore": "Tantalum Ore", + "block.modernmetals.tantalum_ore": "Tantalum Ore", + "tile.modernmetals.tantalum_plate": "Tantalum Plate", + "block.modernmetals.tantalum_plate": "Tantalum Plate", + "tile.modernmetals.tantalum_trapdoor": "Tantalum Trapdoor", + "block.modernmetals.tantalum_trapdoor": "Tantalum Trapdoor", + "tile.modernmetals.titanium_bars": "Titanium Bars", + "block.modernmetals.titanium_bars": "Titanium Bars", + "tile.modernmetals.titanium_block": "Block of Titanium", + "block.modernmetals.titanium_block": "Block of Titanium", + "tile.modernmetals.titanium_door": "Titanium Door", + "block.modernmetals.titanium_door": "Titanium Door", + "tile.modernmetals.titanium_ore": "Titanium Ore", + "block.modernmetals.titanium_ore": "Titanium Ore", + "tile.modernmetals.titanium_plate": "Titanium Plate", + "block.modernmetals.titanium_plate": "Titanium Plate", + "tile.modernmetals.titanium_trapdoor": "Titanium Trapdoor", + "block.modernmetals.titanium_trapdoor": "Titanium Trapdoor", + "tile.modernmetals.tungsten_bars": "Tungsten Bars", + "block.modernmetals.tungsten_bars": "Tungsten Bars", + "tile.modernmetals.tungsten_block": "Block of Tungsten", + "block.modernmetals.tungsten_block": "Block of Tungsten", + "tile.modernmetals.tungsten_door": "Tungsten Door", + "block.modernmetals.tungsten_door": "Tungsten Door", + "tile.modernmetals.tungsten_ore": "Tungsten Ore", + "block.modernmetals.tungsten_ore": "Tungsten Ore", + "tile.modernmetals.tungsten_plate": "Tungsten Plate", + "block.modernmetals.tungsten_plate": "Tungsten Plate", + "tile.modernmetals.tungsten_trapdoor": "Tungsten Trapdoor", + "block.modernmetals.tungsten_trapdoor": "Tungsten Trapdoor", + "tile.modernmetals.uranium_bars": "Uranium Bars", + "block.modernmetals.uranium_bars": "Uranium Bars", + "tile.modernmetals.uranium_block": "Block of Uranium", + "block.modernmetals.uranium_block": "Block of Uranium", + "tile.modernmetals.uranium_door": "Uranium Door", + "block.modernmetals.uranium_door": "Uranium Door", + "tile.modernmetals.uranium_ore": "Uranium Ore", + "block.modernmetals.uranium_ore": "Uranium Ore", + "tile.modernmetals.uranium_plate": "Uranium Plate", + "block.modernmetals.uranium_plate": "Uranium Plate", + "tile.modernmetals.uranium_trapdoor": "Uranium Trapdoor", + "block.modernmetals.uranium_trapdoor": "Uranium Trapdoor", + "tile.modernmetals.zirconium_bars": "Zirconium Bars", + "block.modernmetals.zirconium_bars": "Zirconium Bars", + "tile.modernmetals.zirconium_block": "Block of Zirconium", + "block.modernmetals.zirconium_block": "Block of Zirconium", + "tile.modernmetals.zirconium_door": "Zirconium Door", + "block.modernmetals.zirconium_door": "Zirconium Door", + "tile.modernmetals.zirconium_ore": "Zirconium Ore", + "block.modernmetals.zirconium_ore": "Zirconium Ore", + "tile.modernmetals.zirconium_plate": "Zirconium Plate", + "block.modernmetals.zirconium_plate": "Zirconium Plate", + "tile.modernmetals.zirconium_trapdoor": "Zirconium Trapdoor", + "block.modernmetals.zirconium_trapdoor": "Zirconium Trapdoor", + "tooltip.aluminum.tool": "Nothing Special", + "tooltip.aluminumbrass.tool": "Nothing Special", + "tooltip.cadmium.tool": "Nothing Special", + "tooltip.chromium.tool": "Nothing Special", + "tooltip.galvanized_steel.tool": "Nothing Special", + "tooltip.iridium.tool": "Nothing Special", + "tooltip.magnesium.tool": "Nothing Special", + "tooltip.manganese.tool": "Nothing Special", + "tooltip.nichrome.tool": "Nothing Special", + "tooltip.osmium.tool": "Nothing Special", + "tooltip.plutonium.tool": "Nothing Special", + "tooltip.rutile.tool": "Nothing Special", + "tooltip.stainless_steel.tool": "Nothing Special", + "tooltip.tantalum.tool": "Nothing Special", + "tooltip.titanium.tool": "Nothing Special", + "tooltip.tungsten.tool": "Nothing Special", + "tooltip.uranium.tool": "Nothing Special", + "tooltip.zirconium.tool": "Nothing Special", + "tooltip.aluminum.armor": "Nothing Special", + "tooltip.aluminumbrass.armor": "Nothing Special", + "tooltip.cadmium.armor": "Nothing Special", + "tooltip.chromium.armor": "Nothing Special", + "tooltip.galvanized_steel.armor": "Nothing Special", + "tooltip.iridium.armor": "Nothing Special", + "tooltip.magnesium.armor": "Nothing Special", + "tooltip.manganese.armor": "Nothing Special", + "tooltip.nichrome.armor": "Nothing Special", + "tooltip.osmium.armor": "Nothing Special", + "tooltip.plutonium.armor": "Nothing Special", + "tooltip.rutile.armor": "Nothing Special", + "tooltip.stainless_steel.armor": "Nothing Special", + "tooltip.tantalum.armor": "Nothing Special", + "tooltip.titanium.armor": "Nothing Special", + "tooltip.tungsten.armor": "Nothing Special", + "tooltip.uranium.armor": "Nothing Special", + "tooltip.zirconium.armor": "Nothing Special", + "achievement.aluminumbrass_maker": "Aluminum Brass", + "achievement.galvanized_steel_maker": "Galvanized Steel", + "achievement.nichrome_maker": "Nichrome", + "achievement.stainless_steel_maker": "Stainless Steel", + "achievement.titanium_maker": "Titanium", + "achievement.aluminumbrass_maker.desc": "Combine Aluminum Dust and Brass Dust to make Aluminum Brass", + "achievement.galvanized_steel_maker.desc": "Combine Steel Dust and Zinc Dust to make Galvanized Steel", + "achievement.nichrome_maker.desc": "Combine Nickel Dust and Chromium Dust to make Nichrome", + "achievement.stainless_steel_maker.desc": "Combine Steel Dust and Chromium Dust to make Stainless Steel", + "achievement.titanium_maker.desc": "Combine Rutile Dust and Magnesium Dust to make Titanium", + "fluid.modernmetals.aluminum": "Molten Aluminum", + "fluid.modernmetals.aluminumbrass": "Molten Aluminum Brass", + "fluid.modernmetals.boron": "Molten Boron", + "fluid.modernmetals.beryllium": "Molten Beryllium", + "fluid.modernmetals.cadmium": "Molten Cadmium", + "fluid.modernmetals.chromium": "Molten Chromium", + "fluid.modernmetals.galvanizedsteel": "Molten Galvanized Steel", + "fluid.modernmetals.iridium": "Molten Iridium", + "fluid.modernmetals.magnesium": "Molten Magnesium", + "fluid.modernmetals.manganese": "Molten Manganese", + "fluid.modernmetals.nichrome": "Molten Nichrome", + "fluid.modernmetals.osmium": "Molten Osmium", + "fluid.modernmetals.plutonium": "Molten Plutonium", + "fluid.modernmetals.rutile": "Molten Rutile", + "fluid.modernmetals.stainlesssteel": "Molten Stainless Steel", + "fluid.modernmetals.tantalum": "Molten Tantalum", + "fluid.modernmetals.titanium": "Molten Titanium", + "fluid.modernmetals.tungsten": "Molten Tungsten", + "fluid.modernmetals.uranium": "Molten Uranium", + "fluid.modernmetals.zirconium": "Molten Zirconium", + "tile.modernmetals.aluminum": "Molten Aluminum", + "block.modernmetals.aluminum": "Molten Aluminum", + "tile.modernmetals.aluminumbrass": "Molten Aluminum Brass", + "block.modernmetals.aluminumbrass": "Molten Aluminum Brass", + "tile.modernmetals.boron": "Molten Boron", + "block.modernmetals.boron": "Molten Boron", + "tile.modernmetals.cadmium": "Molten Cadmium", + "block.modernmetals.cadmium": "Molten Cadmium", + "tile.modernmetals.chromium": "Molten Chromium", + "block.modernmetals.chromium": "Molten Chromium", + "tile.modernmetals.galvanizedsteel": "Molten Galvanized Steel", + "block.modernmetals.galvanizedsteel": "Molten Galvanized Steel", + "tile.modernmetals.iridium": "Molten Iridium", + "block.modernmetals.iridium": "Molten Iridium", + "tile.modernmetals.magnesium": "Molten Magnesium", + "block.modernmetals.magnesium": "Molten Magnesium", + "tile.modernmetals.manganese": "Molten Manganese", + "block.modernmetals.manganese": "Molten Manganese", + "tile.modernmetals.nichrome": "Molten Nichrome", + "block.modernmetals.nichrome": "Molten Nichrome", + "tile.modernmetals.osmium": "Molten Osmium", + "block.modernmetals.osmium": "Molten Osmium", + "tile.modernmetals.plutonium": "Molten Plutonium", + "block.modernmetals.plutonium": "Molten Plutonium", + "tile.modernmetals.rutile": "Molten Rutile", + "block.modernmetals.rutile": "Molten Rutile", + "tile.modernmetals.stainlesssteel": "Molten Stainless Steel", + "block.modernmetals.stainlesssteel": "Molten Stainless Steel", + "tile.modernmetals.tantalum": "Molten Tantalum", + "block.modernmetals.tantalum": "Molten Tantalum", + "tile.modernmetals.titanium": "Molten Titanium", + "block.modernmetals.titanium": "Molten Titanium", + "tile.modernmetals.tungsten": "Molten Tungsten", + "block.modernmetals.tungsten": "Molten Tungsten", + "tile.modernmetals.uranium": "Molten Uranium", + "block.modernmetals.uranium": "Molten Uranium", + "tile.modernmetals.zirconium": "Molten Zirconium", + "block.modernmetals.zirconium": "Molten Zirconium", + "item.modernmetals.aluminum_clump": "Aluminum Clump", + "item.modernmetals.aluminum_crushed": "Crushed Aluminum Ore", + "item.modernmetals.aluminum_crushed_purified": "Purified Crushed Aluminum Ore", + "item.modernmetals.aluminum_crystal": "Aluminum Crystal", + "item.modernmetals.aluminum_dense_plate": "Dense Aluminum Plate", + "item.modernmetals.aluminum_powder_dirty": "Dirty Aluminum Dust", + "item.modernmetals.aluminum_shard": "Aluminum Shard", + "item.modernmetals.aluminum_button": "Aluminum Button", + "item.modernmetals.aluminum_lever": "Aluminum Lever", + "item.modernmetals.aluminum_pressure_plate": "Aluminum Pressure Plate", + "item.modernmetals.aluminum_slab": "Aluminum Slab", + "item.modernmetals.aluminum_stairs": "Aluminum Stairs", + "item.modernmetals.aluminum_wall": "Aluminum Wall", + "tile.modernmetals.aluminum_button": "Aluminum Button", + "block.modernmetals.aluminum_button": "Aluminum Button", + "tile.modernmetals.aluminum_lever": "Aluminum Lever", + "block.modernmetals.aluminum_lever": "Aluminum Lever", + "tile.modernmetals.aluminum_pressure_plate": "Aluminum Pressure Plate", + "block.modernmetals.aluminum_pressure_plate": "Aluminum Pressure Plate", + "tile.modernmetals.aluminum_slab": "Aluminum Slab", + "block.modernmetals.aluminum_slab": "Aluminum Slab", + "tile.modernmetals.aluminum_stairs": "Aluminum Stairs", + "block.modernmetals.aluminum_stairs": "Aluminum Stairs", + "tile.modernmetals.aluminum_wall": "Aluminum Wall", + "block.modernmetals.aluminum_wall": "Aluminum Wall", + "item.modernmetals.aluminumbrass_clump": "Aluminum Brass Clump", + "item.modernmetals.aluminumbrass_crushed": "Crushed Aluminum Brass Ore", + "item.modernmetals.aluminumbrass_crushed_purified": "Purified Crushed Aluminum Brass Ore", + "item.modernmetals.aluminumbrass_crystal": "Aluminum Brass Crystal", + "item.modernmetals.aluminumbrass_dense_plate": "Dense Aluminum Brass Plate", + "item.modernmetals.aluminumbrass_powder_dirty": "Dirty Aluminum Brass Dust", + "item.modernmetals.aluminumbrass_shard": "Aluminum Brass Shard", + "item.modernmetals.aluminumbrass_button": "Aluminum Brass Button", + "item.modernmetals.aluminumbrass_lever": "Aluminum Brass Lever", + "item.modernmetals.aluminumbrass_pressure_plate": "Aluminum Brass Pressure Plate", + "item.modernmetals.aluminumbrass_slab": "Aluminum Brass Slab", + "item.modernmetals.aluminumbrass_stairs": "Aluminum Brass Stairs", + "item.modernmetals.aluminumbrass_wall": "Aluminum Brass Wall", + "tile.modernmetals.aluminumbrass_button": "Aluminum Brass Button", + "block.modernmetals.aluminumbrass_button": "Aluminum Brass Button", + "tile.modernmetals.aluminumbrass_lever": "Aluminum Brass Lever", + "block.modernmetals.aluminumbrass_lever": "Aluminum Brass Lever", + "tile.modernmetals.aluminumbrass_pressure_plate": "Aluminum Brass Pressure Plate", + "block.modernmetals.aluminumbrass_pressure_plate": "Aluminum Brass Pressure Plate", + "tile.modernmetals.aluminumbrass_slab": "Aluminum Brass Slab", + "block.modernmetals.aluminumbrass_slab": "Aluminum Brass Slab", + "tile.modernmetals.aluminumbrass_stairs": "Aluminum Brass Stairs", + "block.modernmetals.aluminumbrass_stairs": "Aluminum Brass Stairs", + "tile.modernmetals.aluminumbrass_wall": "Aluminum Brass Wall", + "block.modernmetals.aluminumbrass_wall": "Aluminum Brass Wall", + "tile.modernmetals.beryllium_bars": "Beryllium Bars", + "block.modernmetals.beryllium_bars": "Beryllium Bars", + "tile.modernmetals.beryllium_block": "Block of Beryllium", + "block.modernmetals.beryllium_block": "Block of Beryllium", + "tile.modernmetals.beryllium_door": "Beryllium Door", + "block.modernmetals.beryllium_door": "Beryllium Door", + "tile.modernmetals.beryllium_ore": "Beryllium Ore", + "block.modernmetals.beryllium_ore": "Beryllium Ore", + "tile.modernmetals.beryllium_plate": "Beryllium Plate", + "block.modernmetals.beryllium_plate": "Beryllium Plate", + "tile.modernmetals.beryllium_trapdoor": "Beryllium Trapdoor", + "block.modernmetals.beryllium_trapdoor": "Beryllium Trapdoor", + "item.modernmetals.beryllium_clump": "Beryllium Clump", + "item.modernmetals.beryllium_crushed": "Crushed Beryllium Ore", + "item.modernmetals.beryllium_crushed_purified": "Purified Crushed Beryllium Ore", + "item.modernmetals.beryllium_crystal": "Beryllium Crystal", + "item.modernmetals.beryllium_dense_plate": "Dense Beryllium Plate", + "item.modernmetals.beryllium_powder_dirty": "Dirty Beryllium Dust", + "item.modernmetals.beryllium_shard": "Beryllium Shard", + "item.modernmetals.beryllium_button": "Beryllium Button", + "item.modernmetals.beryllium_lever": "Beryllium Lever", + "item.modernmetals.beryllium_pressure_plate": "Beryllium Pressure Plate", + "item.modernmetals.beryllium_slab": "Beryllium Slab", + "item.modernmetals.beryllium_stairs": "Beryllium Stairs", + "item.modernmetals.beryllium_wall": "Beryllium Wall", + "tile.modernmetals.beryllium": "Molten Beryllium", + "block.modernmetals.beryllium": "Molten Beryllium", + "tile.modernmetals.beryllium_button": "Beryllium Button", + "block.modernmetals.beryllium_button": "Beryllium Button", + "tile.modernmetals.beryllium_lever": "Beryllium Lever", + "block.modernmetals.beryllium_lever": "Beryllium Lever", + "tile.modernmetals.beryllium_pressure_plate": "Beryllium Pressure Plate", + "block.modernmetals.beryllium_pressure_plate": "Beryllium Pressure Plate", + "tile.modernmetals.beryllium_slab": "Beryllium Slab", + "block.modernmetals.beryllium_slab": "Beryllium Slab", + "tile.modernmetals.beryllium_stairs": "Beryllium Stairs", + "block.modernmetals.beryllium_stairs": "Beryllium Stairs", + "tile.modernmetals.beryllium_wall": "Beryllium Wall", + "block.modernmetals.beryllium_wall": "Beryllium Wall", + "item.modernmetals.boron_clump": "Boron Clump", + "item.modernmetals.boron_crushed": "Crushed Boron Ore", + "item.modernmetals.boron_crushed_purified": "Purified Crushed Boron Ore", + "item.modernmetals.boron_crystal": "Boron Crystal", + "item.modernmetals.boron_dense_plate": "Dense Boron Plate", + "item.modernmetals.boron_powder_dirty": "Dirty Boron Dust", + "item.modernmetals.boron_shard": "Boron Shard", + "item.modernmetals.boron_button": "Boron Button", + "item.modernmetals.boron_lever": "Boron Lever", + "item.modernmetals.boron_pressure_plate": "Boron Pressure Plate", + "item.modernmetals.boron_slab": "Boron Slab", + "item.modernmetals.boron_stairs": "Boron Stairs", + "item.modernmetals.boron_wall": "Boron Wall", + "tile.modernmetals.boron_button": "Boron Button", + "block.modernmetals.boron_button": "Boron Button", + "tile.modernmetals.boron_lever": "Boron Lever", + "block.modernmetals.boron_lever": "Boron Lever", + "tile.modernmetals.boron_pressure_plate": "Boron Pressure Plate", + "block.modernmetals.boron_pressure_plate": "Boron Pressure Plate", + "tile.modernmetals.boron_slab": "Boron Slab", + "block.modernmetals.boron_slab": "Boron Slab", + "tile.modernmetals.boron_stairs": "Boron Stairs", + "block.modernmetals.boron_stairs": "Boron Stairs", + "tile.modernmetals.boron_wall": "Boron Wall", + "block.modernmetals.boron_wall": "Boron Wall", + "item.modernmetals.cadmium_clump": "Cadmium Clump", + "item.modernmetals.cadmium_crushed": "Crushed Cadmium Ore", + "item.modernmetals.cadmium_crushed_purified": "Purified Crushed Cadmium Ore", + "item.modernmetals.cadmium_crystal": "Cadmium Crystal", + "item.modernmetals.cadmium_dense_plate": "Dense Cadmium Plate", + "item.modernmetals.cadmium_powder_dirty": "Dirty Cadmium Dust", + "item.modernmetals.cadmium_shard": "Cadmium Shard", + "item.modernmetals.cadmium_button": "Cadmium Button", + "item.modernmetals.cadmium_lever": "Cadmium Lever", + "item.modernmetals.cadmium_pressure_plate": "Cadmium Pressure Plate", + "item.modernmetals.cadmium_slab": "Cadmium Slab", + "item.modernmetals.cadmium_stairs": "Cadmium Stairs", + "item.modernmetals.cadmium_wall": "Cadmium Wall", + "tile.modernmetals.cadmium_button": "Cadmium Button", + "block.modernmetals.cadmium_button": "Cadmium Button", + "tile.modernmetals.cadmium_lever": "Cadmium Lever", + "block.modernmetals.cadmium_lever": "Cadmium Lever", + "tile.modernmetals.cadmium_pressure_plate": "Cadmium Pressure Plate", + "block.modernmetals.cadmium_pressure_plate": "Cadmium Pressure Plate", + "tile.modernmetals.cadmium_slab": "Cadmium Slab", + "block.modernmetals.cadmium_slab": "Cadmium Slab", + "tile.modernmetals.cadmium_stairs": "Cadmium Stairs", + "block.modernmetals.cadmium_stairs": "Cadmium Stairs", + "tile.modernmetals.cadmium_wall": "Cadmium Wall", + "block.modernmetals.cadmium_wall": "Cadmium Wall", + "item.modernmetals.chromium_clump": "Chromium Clump", + "item.modernmetals.chromium_crushed": "Crushed Chromium Ore", + "item.modernmetals.chromium_crushed_purified": "Purified Crushed Chromium Ore", + "item.modernmetals.chromium_crystal": "Chromium Crystal", + "item.modernmetals.chromium_dense_plate": "Dense Chromium Plate", + "item.modernmetals.chromium_powder_dirty": "Dirty Chromium Dust", + "item.modernmetals.chromium_shard": "Chromium Shard", + "item.modernmetals.chromium_button": "Chromium Button", + "item.modernmetals.chromium_lever": "Chromium Lever", + "item.modernmetals.chromium_pressure_plate": "Chromium Pressure Plate", + "item.modernmetals.chromium_slab": "Chromium Slab", + "item.modernmetals.chromium_stairs": "Chromium Stairs", + "item.modernmetals.chromium_wall": "Chromium Wall", + "tile.modernmetals.chromium_button": "Chromium Button", + "block.modernmetals.chromium_button": "Chromium Button", + "tile.modernmetals.chromium_lever": "Chromium Lever", + "block.modernmetals.chromium_lever": "Chromium Lever", + "tile.modernmetals.chromium_pressure_plate": "Chromium Pressure Plate", + "block.modernmetals.chromium_pressure_plate": "Chromium Pressure Plate", + "tile.modernmetals.chromium_slab": "Chromium Slab", + "block.modernmetals.chromium_slab": "Chromium Slab", + "tile.modernmetals.chromium_stairs": "Chromium Stairs", + "block.modernmetals.chromium_stairs": "Chromium Stairs", + "tile.modernmetals.chromium_wall": "Chromium Wall", + "block.modernmetals.chromium_wall": "Chromium Wall", + "item.modernmetals.galvanizedsteel_clump": "Galvanized Steel Clump", + "item.modernmetals.galvanizedsteel_crushed": "Crushed Galvanized Steel Ore", + "item.modernmetals.galvanizedsteel_crushed_purified": "Purified Crushed Galvanized Steel Ore", + "item.modernmetals.galvanizedsteel_crystal": "Galvanized Steel Crystal", + "item.modernmetals.galvanizedsteel_dense_plate": "Dense Galvanized Steel Plate", + "item.modernmetals.galvanizedsteel_powder_dirty": "Dirty Galvanized Steel Dust", + "item.modernmetals.galvanizedsteel_shard": "Galvanized Steel Shard", + "item.modernmetals.galvanizedsteel_button": "Galvanized Steel Button", + "item.modernmetals.galvanizedsteel_lever": "Galvanized Steel Lever", + "item.modernmetals.galvanizedsteel_pressure_plate": "Galvanized Steel Pressure Plate", + "item.modernmetals.galvanizedsteel_slab": "Galvanized Steel Slab", + "item.modernmetals.galvanizedsteel_stairs": "Galvanized Steel Stairs", + "item.modernmetals.galvanizedsteel_wall": "Galvanized Steel Wall", + "tile.modernmetals.galvanizedsteel_button": "Galvanized Steel Button", + "block.modernmetals.galvanizedsteel_button": "Galvanized Steel Button", + "tile.modernmetals.galvanizedsteel_lever": "Galvanized Steel Lever", + "block.modernmetals.galvanizedsteel_lever": "Galvanized Steel Lever", + "tile.modernmetals.galvanizedsteel_pressure_plate": "Galvanized Steel Pressure Plate", + "block.modernmetals.galvanizedsteel_pressure_plate": "Galvanized Steel Pressure Plate", + "tile.modernmetals.galvanizedsteel_slab": "Galvanized Steel Slab", + "block.modernmetals.galvanizedsteel_slab": "Galvanized Steel Slab", + "tile.modernmetals.galvanizedsteel_stairs": "Galvanized Steel Stairs", + "block.modernmetals.galvanizedsteel_stairs": "Galvanized Steel Stairs", + "tile.modernmetals.galvanizedsteel_wall": "Galvanized Steel Wall", + "block.modernmetals.galvanizedsteel_wall": "Galvanized Steel Wall", + "item.modernmetals.iridium_clump": "Iridium Clump", + "item.modernmetals.iridium_crushed": "Crushed Iridium Ore", + "item.modernmetals.iridium_crushed_purified": "Purified Crushed Iridium Ore", + "item.modernmetals.iridium_crystal": "Iridium Crystal", + "item.modernmetals.iridium_dense_plate": "Dense Iridium Plate", + "item.modernmetals.iridium_powder_dirty": "Dirty Iridium Dust", + "item.modernmetals.iridium_shard": "Iridium Shard", + "item.modernmetals.iridium_button": "Iridium Button", + "item.modernmetals.iridium_lever": "Iridium Lever", + "item.modernmetals.iridium_pressure_plate": "Iridium Pressure Plate", + "item.modernmetals.iridium_slab": "Iridium Slab", + "item.modernmetals.iridium_stairs": "Iridium Stairs", + "item.modernmetals.iridium_wall": "Iridium Wall", + "tile.modernmetals.iridium_button": "Iridium Button", + "block.modernmetals.iridium_button": "Iridium Button", + "tile.modernmetals.iridium_lever": "Iridium Lever", + "block.modernmetals.iridium_lever": "Iridium Lever", + "tile.modernmetals.iridium_pressure_plate": "Iridium Pressure Plate", + "block.modernmetals.iridium_pressure_plate": "Iridium Pressure Plate", + "tile.modernmetals.iridium_slab": "Iridium Slab", + "block.modernmetals.iridium_slab": "Iridium Slab", + "tile.modernmetals.iridium_stairs": "Iridium Stairs", + "block.modernmetals.iridium_stairs": "Iridium Stairs", + "tile.modernmetals.iridium_wall": "Iridium Wall", + "block.modernmetals.iridium_wall": "Iridium Wall", + "item.modernmetals.magnesium_clump": "Magnesium Clump", + "item.modernmetals.magnesium_crushed": "Crushed Magnesium Ore", + "item.modernmetals.magnesium_crushed_purified": "Purified Crushed Magnesium Ore", + "item.modernmetals.magnesium_crystal": "Magnesium Crystal", + "item.modernmetals.magnesium_dense_plate": "Dense Magnesium Plate", + "item.modernmetals.magnesium_powder_dirty": "Dirty Magnesium Dust", + "item.modernmetals.magnesium_shard": "Magnesium Shard", + "item.modernmetals.magnesium_button": "Magnesium Button", + "item.modernmetals.magnesium_lever": "Magnesium Lever", + "item.modernmetals.magnesium_pressure_plate": "Magnesium Pressure Plate", + "item.modernmetals.magnesium_slab": "Magnesium Slab", + "item.modernmetals.magnesium_stairs": "Magnesium Stairs", + "item.modernmetals.magnesium_wall": "Magnesium Wall", + "tile.modernmetals.magnesium_button": "Magnesium Button", + "block.modernmetals.magnesium_button": "Magnesium Button", + "tile.modernmetals.magnesium_lever": "Magnesium Lever", + "block.modernmetals.magnesium_lever": "Magnesium Lever", + "tile.modernmetals.magnesium_pressure_plate": "Magnesium Pressure Plate", + "block.modernmetals.magnesium_pressure_plate": "Magnesium Pressure Plate", + "tile.modernmetals.magnesium_slab": "Magnesium Slab", + "block.modernmetals.magnesium_slab": "Magnesium Slab", + "tile.modernmetals.magnesium_stairs": "Magnesium Stairs", + "block.modernmetals.magnesium_stairs": "Magnesium Stairs", + "tile.modernmetals.magnesium_wall": "Magnesium Wall", + "block.modernmetals.magnesium_wall": "Magnesium Wall", + "item.modernmetals.manganese_clump": "Manganese Clump", + "item.modernmetals.manganese_crushed": "Crushed Manganese Ore", + "item.modernmetals.manganese_crushed_purified": "Purified Crushed Manganese Ore", + "item.modernmetals.manganese_crystal": "Manganese Crystal", + "item.modernmetals.manganese_dense_plate": "Dense Manganese Plate", + "item.modernmetals.manganese_powder_dirty": "Dirty Manganese Dust", + "item.modernmetals.manganese_shard": "Manganese Shard", + "item.modernmetals.manganese_button": "Manganese Button", + "item.modernmetals.manganese_lever": "Manganese Lever", + "item.modernmetals.manganese_pressure_plate": "Manganese Pressure Plate", + "item.modernmetals.manganese_slab": "Manganese Slab", + "item.modernmetals.manganese_stairs": "Manganese Stairs", + "item.modernmetals.manganese_wall": "Manganese Wall", + "tile.modernmetals.manganese_button": "Manganese Button", + "block.modernmetals.manganese_button": "Manganese Button", + "tile.modernmetals.manganese_lever": "Manganese Lever", + "block.modernmetals.manganese_lever": "Manganese Lever", + "tile.modernmetals.manganese_pressure_plate": "Manganese Pressure Plate", + "block.modernmetals.manganese_pressure_plate": "Manganese Pressure Plate", + "tile.modernmetals.manganese_slab": "Manganese Slab", + "block.modernmetals.manganese_slab": "Manganese Slab", + "tile.modernmetals.manganese_stairs": "Manganese Stairs", + "block.modernmetals.manganese_stairs": "Manganese Stairs", + "tile.modernmetals.manganese_wall": "Manganese Wall", + "block.modernmetals.manganese_wall": "Manganese Wall", + "item.modernmetals.nichrome_clump": "Nichrome Clump", + "item.modernmetals.nichrome_crushed": "Crushed Nichrome Ore", + "item.modernmetals.nichrome_crushed_purified": "Purified Crushed Nichrome Ore", + "item.modernmetals.nichrome_crystal": "Nichrome Crystal", + "item.modernmetals.nichrome_dense_plate": "Dense Nichrome Plate", + "item.modernmetals.nichrome_powder_dirty": "Dirty Nichrome Dust", + "item.modernmetals.nichrome_shard": "Nichrome Shard", + "item.modernmetals.nichrome_button": "Nichrome Button", + "item.modernmetals.nichrome_lever": "Nichrome Lever", + "item.modernmetals.nichrome_pressure_plate": "Nichrome Pressure Plate", + "item.modernmetals.nichrome_slab": "Nichrome Slab", + "item.modernmetals.nichrome_stairs": "Nichrome Stairs", + "item.modernmetals.nichrome_wall": "Nichrome Wall", + "tile.modernmetals.nichrome_button": "Nichrome Button", + "block.modernmetals.nichrome_button": "Nichrome Button", + "tile.modernmetals.nichrome_lever": "Nichrome Lever", + "block.modernmetals.nichrome_lever": "Nichrome Lever", + "tile.modernmetals.nichrome_pressure_plate": "Nichrome Pressure Plate", + "block.modernmetals.nichrome_pressure_plate": "Nichrome Pressure Plate", + "tile.modernmetals.nichrome_slab": "Nichrome Slab", + "block.modernmetals.nichrome_slab": "Nichrome Slab", + "tile.modernmetals.nichrome_stairs": "Nichrome Stairs", + "block.modernmetals.nichrome_stairs": "Nichrome Stairs", + "tile.modernmetals.nichrome_wall": "Nichrome Wall", + "block.modernmetals.nichrome_wall": "Nichrome Wall", + "item.modernmetals.osmium_clump": "Osmium Clump", + "item.modernmetals.osmium_crushed": "Crushed Osmium Ore", + "item.modernmetals.osmium_crushed_purified": "Purified Crushed Osmium Ore", + "item.modernmetals.osmium_crystal": "Osmium Crystal", + "item.modernmetals.osmium_dense_plate": "Dense Osmium Plate", + "item.modernmetals.osmium_powder_dirty": "Dirty Osmium Dust", + "item.modernmetals.osmium_shard": "Osmium Shard", + "item.modernmetals.osmium_button": "Osmium Button", + "item.modernmetals.osmium_lever": "Osmium Lever", + "item.modernmetals.osmium_pressure_plate": "Osmium Pressure Plate", + "item.modernmetals.osmium_slab": "Osmium Slab", + "item.modernmetals.osmium_stairs": "Osmium Stairs", + "item.modernmetals.osmium_wall": "Osmium Wall", + "tile.modernmetals.osmium_button": "Osmium Button", + "block.modernmetals.osmium_button": "Osmium Button", + "tile.modernmetals.osmium_lever": "Osmium Lever", + "block.modernmetals.osmium_lever": "Osmium Lever", + "tile.modernmetals.osmium_pressure_plate": "Osmium Pressure Plate", + "block.modernmetals.osmium_pressure_plate": "Osmium Pressure Plate", + "tile.modernmetals.osmium_slab": "Osmium Slab", + "block.modernmetals.osmium_slab": "Osmium Slab", + "tile.modernmetals.osmium_stairs": "Osmium Stairs", + "block.modernmetals.osmium_stairs": "Osmium Stairs", + "tile.modernmetals.osmium_wall": "Osmium Wall", + "block.modernmetals.osmium_wall": "Osmium Wall", + "item.modernmetals.plutonium_clump": "Plutonium Clump", + "item.modernmetals.plutonium_crushed": "Crushed Plutonium Ore", + "item.modernmetals.plutonium_crushed_purified": "Purified Crushed Plutonium Ore", + "item.modernmetals.plutonium_crystal": "Plutonium Crystal", + "item.modernmetals.plutonium_dense_plate": "Dense Plutonium Plate", + "item.modernmetals.plutonium_powder_dirty": "Dirty Plutonium Dust", + "item.modernmetals.plutonium_shard": "Plutonium Shard", + "item.modernmetals.plutonium_button": "Plutonium Button", + "item.modernmetals.plutonium_lever": "Plutonium Lever", + "item.modernmetals.plutonium_pressure_plate": "Plutonium Pressure Plate", + "item.modernmetals.plutonium_slab": "Plutonium Slab", + "item.modernmetals.plutonium_stairs": "Plutonium Stairs", + "item.modernmetals.plutonium_wall": "Plutonium Wall", + "tile.modernmetals.plutonium_button": "Plutonium Button", + "block.modernmetals.plutonium_button": "Plutonium Button", + "tile.modernmetals.plutonium_lever": "Plutonium Lever", + "block.modernmetals.plutonium_lever": "Plutonium Lever", + "tile.modernmetals.plutonium_pressure_plate": "Plutonium Pressure Plate", + "block.modernmetals.plutonium_pressure_plate": "Plutonium Pressure Plate", + "tile.modernmetals.plutonium_slab": "Plutonium Slab", + "block.modernmetals.plutonium_slab": "Plutonium Slab", + "tile.modernmetals.plutonium_stairs": "Plutonium Stairs", + "block.modernmetals.plutonium_stairs": "Plutonium Stairs", + "tile.modernmetals.plutonium_wall": "Plutonium Wall", + "block.modernmetals.plutonium_wall": "Plutonium Wall", + "item.modernmetals.rutile_clump": "Rutile Clump", + "item.modernmetals.rutile_crushed": "Crushed Rutile Ore", + "item.modernmetals.rutile_crushed_purified": "Purified Crushed Rutile Ore", + "item.modernmetals.rutile_crystal": "Rutile Crystal", + "item.modernmetals.rutile_dense_plate": "Dense Rutile Plate", + "item.modernmetals.rutile_powder_dirty": "Dirty Rutile Dust", + "item.modernmetals.rutile_shard": "Rutile Shard", + "item.modernmetals.rutile_button": "Rutile Button", + "item.modernmetals.rutile_lever": "Rutile Lever", + "item.modernmetals.rutile_pressure_plate": "Rutile Pressure Plate", + "item.modernmetals.rutile_slab": "Rutile Slab", + "item.modernmetals.rutile_stairs": "Rutile Stairs", + "item.modernmetals.rutile_wall": "Rutile Wall", + "tile.modernmetals.rutile_button": "Rutile Button", + "block.modernmetals.rutile_button": "Rutile Button", + "tile.modernmetals.rutile_lever": "Rutile Lever", + "block.modernmetals.rutile_lever": "Rutile Lever", + "tile.modernmetals.rutile_pressure_plate": "Rutile Pressure Plate", + "block.modernmetals.rutile_pressure_plate": "Rutile Pressure Plate", + "tile.modernmetals.rutile_slab": "Rutile Slab", + "block.modernmetals.rutile_slab": "Rutile Slab", + "tile.modernmetals.rutile_stairs": "Rutile Stairs", + "block.modernmetals.rutile_stairs": "Rutile Stairs", + "tile.modernmetals.rutile_wall": "Rutile Wall", + "block.modernmetals.rutile_wall": "Rutile Wall", + "item.modernmetals.stainlesssteel_clump": "Stainless Steel Clump", + "item.modernmetals.stainlesssteel_crushed": "Crushed Stainless Steel Ore", + "item.modernmetals.stainlesssteel_crushed_purified": "Purified Crushed Stainless Steel Ore", + "item.modernmetals.stainlesssteel_crystal": "Stainless Steel Crystal", + "item.modernmetals.stainlesssteel_dense_plate": "Dense Stainless Steel Plate", + "item.modernmetals.stainlesssteel_powder_dirty": "Dirty Stainless Steel Dust", + "item.modernmetals.stainlesssteel_shard": "Stainless Steel Shard", + "item.modernmetals.stainlesssteel_button": "Stainless Steel Button", + "item.modernmetals.stainlesssteel_lever": "Stainless Steel Lever", + "item.modernmetals.stainlesssteel_pressure_plate": "Stainless Steel Pressure Plate", + "item.modernmetals.stainlesssteel_slab": "Stainless Steel Slab", + "item.modernmetals.stainlesssteel_stairs": "Stainless Steel Stairs", + "item.modernmetals.stainlesssteel_wall": "Stainless Steel Wall", + "tile.modernmetals.stainlesssteel_button": "Stainless Steel Button", + "block.modernmetals.stainlesssteel_button": "Stainless Steel Button", + "tile.modernmetals.stainlesssteel_lever": "Stainless Steel Lever", + "block.modernmetals.stainlesssteel_lever": "Stainless Steel Lever", + "tile.modernmetals.stainlesssteel_pressure_plate": "Stainless Steel Pressure Plate", + "block.modernmetals.stainlesssteel_pressure_plate": "Stainless Steel Pressure Plate", + "tile.modernmetals.stainlesssteel_slab": "Stainless Steel Slab", + "block.modernmetals.stainlesssteel_slab": "Stainless Steel Slab", + "tile.modernmetals.stainlesssteel_stairs": "Stainless Steel Stairs", + "block.modernmetals.stainlesssteel_stairs": "Stainless Steel Stairs", + "tile.modernmetals.stainlesssteel_wall": "Stainless Steel Wall", + "block.modernmetals.stainlesssteel_wall": "Stainless Steel Wall", + "item.modernmetals.tantalum_clump": "Tantalum Clump", + "item.modernmetals.tantalum_crushed": "Crushed Tantalum Ore", + "item.modernmetals.tantalum_crushed_purified": "Purified Crushed Tantalum Ore", + "item.modernmetals.tantalum_crystal": "Tantalum Crystal", + "item.modernmetals.tantalum_dense_plate": "Dense Tantalum Plate", + "item.modernmetals.tantalum_powder_dirty": "Dirty Tantalum Dust", + "item.modernmetals.tantalum_shard": "Tantalum Shard", + "item.modernmetals.tantalum_button": "Tantalum Button", + "item.modernmetals.tantalum_lever": "Tantalum Lever", + "item.modernmetals.tantalum_pressure_plate": "Tantalum Pressure Plate", + "item.modernmetals.tantalum_slab": "Tantalum Slab", + "item.modernmetals.tantalum_stairs": "Tantalum Stairs", + "item.modernmetals.tantalum_wall": "Tantalum Wall", + "tile.modernmetals.tantalum_button": "Tantalum Button", + "block.modernmetals.tantalum_button": "Tantalum Button", + "tile.modernmetals.tantalum_lever": "Tantalum Lever", + "block.modernmetals.tantalum_lever": "Tantalum Lever", + "tile.modernmetals.tantalum_pressure_plate": "Tantalum Pressure Plate", + "block.modernmetals.tantalum_pressure_plate": "Tantalum Pressure Plate", + "tile.modernmetals.tantalum_slab": "Tantalum Slab", + "block.modernmetals.tantalum_slab": "Tantalum Slab", + "tile.modernmetals.tantalum_stairs": "Tantalum Stairs", + "block.modernmetals.tantalum_stairs": "Tantalum Stairs", + "tile.modernmetals.tantalum_wall": "Tantalum Wall", + "block.modernmetals.tantalum_wall": "Tantalum Wall", + "item.modernmetals.titanium_clump": "Titanium Clump", + "item.modernmetals.titanium_crushed": "Crushed Titanium Ore", + "item.modernmetals.titanium_crushed_purified": "Purified Crushed Titanium Ore", + "item.modernmetals.titanium_crystal": "Titanium Crystal", + "item.modernmetals.titanium_dense_plate": "Dense Titanium Plate", + "item.modernmetals.titanium_powder_dirty": "Dirty Titanium Dust", + "item.modernmetals.titanium_shard": "Titanium Shard", + "item.modernmetals.titanium_button": "Titanium Button", + "item.modernmetals.titanium_lever": "Titanium Lever", + "item.modernmetals.titanium_pressure_plate": "Titanium Pressure Plate", + "item.modernmetals.titanium_slab": "Titanium Slab", + "item.modernmetals.titanium_stairs": "Titanium Stairs", + "item.modernmetals.titanium_wall": "Titanium Wall", + "tile.modernmetals.titanium_button": "Titanium Button", + "block.modernmetals.titanium_button": "Titanium Button", + "tile.modernmetals.titanium_lever": "Titanium Lever", + "block.modernmetals.titanium_lever": "Titanium Lever", + "tile.modernmetals.titanium_pressure_plate": "Titanium Pressure Plate", + "block.modernmetals.titanium_pressure_plate": "Titanium Pressure Plate", + "tile.modernmetals.titanium_slab": "Titanium Slab", + "block.modernmetals.titanium_slab": "Titanium Slab", + "tile.modernmetals.titanium_stairs": "Titanium Stairs", + "block.modernmetals.titanium_stairs": "Titanium Stairs", + "tile.modernmetals.titanium_wall": "Titanium Wall", + "block.modernmetals.titanium_wall": "Titanium Wall", + "item.modernmetals.tungsten_clump": "Tungsten Clump", + "item.modernmetals.tungsten_crushed": "Crushed Tungsten Ore", + "item.modernmetals.tungsten_crushed_purified": "Purified Crushed Tungsten Ore", + "item.modernmetals.tungsten_crystal": "Tungsten Crystal", + "item.modernmetals.tungsten_dense_plate": "Dense Tungsten Plate", + "item.modernmetals.tungsten_powder_dirty": "Dirty Tungsten Dust", + "item.modernmetals.tungsten_shard": "Tungsten Shard", + "item.modernmetals.tungsten_button": "Tungsten Button", + "item.modernmetals.tungsten_lever": "Tungsten Lever", + "item.modernmetals.tungsten_pressure_plate": "Tungsten Pressure Plate", + "item.modernmetals.tungsten_slab": "Tungsten Slab", + "item.modernmetals.tungsten_stairs": "Tungsten Stairs", + "item.modernmetals.tungsten_wall": "Tungsten Wall", + "tile.modernmetals.tungsten_button": "Tungsten Button", + "block.modernmetals.tungsten_button": "Tungsten Button", + "tile.modernmetals.tungsten_lever": "Tungsten Lever", + "block.modernmetals.tungsten_lever": "Tungsten Lever", + "tile.modernmetals.tungsten_pressure_plate": "Tungsten Pressure Plate", + "block.modernmetals.tungsten_pressure_plate": "Tungsten Pressure Plate", + "tile.modernmetals.tungsten_slab": "Tungsten Slab", + "block.modernmetals.tungsten_slab": "Tungsten Slab", + "tile.modernmetals.tungsten_stairs": "Tungsten Stairs", + "block.modernmetals.tungsten_stairs": "Tungsten Stairs", + "tile.modernmetals.tungsten_wall": "Tungsten Wall", + "block.modernmetals.tungsten_wall": "Tungsten Wall", + "item.modernmetals.uranium_clump": "Uranium Clump", + "item.modernmetals.uranium_crushed": "Crushed Uranium Ore", + "item.modernmetals.uranium_crushed_purified": "Purified Crushed Uranium Ore", + "item.modernmetals.uranium_crystal": "Uranium Crystal", + "item.modernmetals.uranium_dense_plate": "Dense Uranium Plate", + "item.modernmetals.uranium_powder_dirty": "Dirty Uranium Dust", + "item.modernmetals.uranium_shard": "Uranium Shard", + "item.modernmetals.uranium_button": "Uranium Button", + "item.modernmetals.uranium_lever": "Uranium Lever", + "item.modernmetals.uranium_pressure_plate": "Uranium Pressure Plate", + "item.modernmetals.uranium_slab": "Uranium Slab", + "item.modernmetals.uranium_stairs": "Uranium Stairs", + "item.modernmetals.uranium_wall": "Uranium Wall", + "tile.modernmetals.uranium_button": "Uranium Button", + "block.modernmetals.uranium_button": "Uranium Button", + "tile.modernmetals.uranium_lever": "Uranium Lever", + "block.modernmetals.uranium_lever": "Uranium Lever", + "tile.modernmetals.uranium_pressure_plate": "Uranium Pressure Plate", + "block.modernmetals.uranium_pressure_plate": "Uranium Pressure Plate", + "tile.modernmetals.uranium_slab": "Uranium Slab", + "block.modernmetals.uranium_slab": "Uranium Slab", + "tile.modernmetals.uranium_stairs": "Uranium Stairs", + "block.modernmetals.uranium_stairs": "Uranium Stairs", + "tile.modernmetals.uranium_wall": "Uranium Wall", + "block.modernmetals.uranium_wall": "Uranium Wall", + "item.modernmetals.zirconium_clump": "Zirconium Clump", + "item.modernmetals.zirconium_crushed": "Crushed Zirconium Ore", + "item.modernmetals.zirconium_crushed_purified": "Purified Crushed Zirconium Ore", + "item.modernmetals.zirconium_crystal": "Zirconium Crystal", + "item.modernmetals.zirconium_dense_plate": "Dense Zirconium Plate", + "item.modernmetals.zirconium_powder_dirty": "Dirty Zirconium Dust", + "item.modernmetals.zirconium_shard": "Zirconium Shard", + "item.modernmetals.zirconium_button": "Zirconium Button", + "item.modernmetals.zirconium_lever": "Zirconium Lever", + "item.modernmetals.zirconium_pressure_plate": "Zirconium Pressure Plate", + "item.modernmetals.zirconium_slab": "Zirconium Slab", + "item.modernmetals.zirconium_stairs": "Zirconium Stairs", + "item.modernmetals.zirconium_wall": "Zirconium Wall", + "tile.modernmetals.zirconium_button": "Zirconium Button", + "block.modernmetals.zirconium_button": "Zirconium Button", + "tile.modernmetals.zirconium_lever": "Zirconium Lever", + "block.modernmetals.zirconium_lever": "Zirconium Lever", + "tile.modernmetals.zirconium_pressure_plate": "Zirconium Pressure Plate", + "block.modernmetals.zirconium_pressure_plate": "Zirconium Pressure Plate", + "tile.modernmetals.zirconium_slab": "Zirconium Slab", + "block.modernmetals.zirconium_slab": "Zirconium Slab", + "tile.modernmetals.zirconium_stairs": "Zirconium Stairs", + "block.modernmetals.zirconium_stairs": "Zirconium Stairs", + "tile.modernmetals.zirconium_wall": "Zirconium Wall", + "block.modernmetals.zirconium_wall": "Zirconium Wall", + "material.thorium": "Thorium", + "item.modernmetals.thorium_arrow": "Thorium Arrow", + "item.modernmetals.thorium_axe": "Thorium Axe", + "item.modernmetals.thorium_bars": "Thorium Bars", + "item.modernmetals.thorium_blend": "Thorium Blend", + "item.modernmetals.thorium_block": "Block of Thorium", + "item.modernmetals.thorium_boots": "Thorium Boots", + "item.modernmetals.thorium_bolt": "Thorium Bolt", + "item.modernmetals.thorium_bow": "Thorium Bow", + "item.modernmetals.thorium_chestplate": "Thorium Chestplate", + "item.modernmetals.thorium_crackhammer": "Thorium Crack Hammer", + "item.modernmetals.thorium_crossbow": "Thorium Crossbow", + "item.modernmetals.thorium_door": "Thorium Door", + "item.modernmetals.thorium_fishing_rod": "Thorium Fishing Rod", + "item.modernmetals.thorium_gear": "Thorium Gear", + "item.modernmetals.thorium_helmet": "Thorium Helmet", + "item.modernmetals.thorium_hoe": "Thorium Hoe", + "item.modernmetals.thorium_horse_armor": "Thorium Horse Armour", + "item.modernmetals.thorium_ingot": "Thorium Ingot", + "item.modernmetals.thorium_leggings": "Thorium Leg Armour", + "item.modernmetals.thorium_nugget": "Thorium Nugget", + "item.modernmetals.thorium_ore": "Thorium Ore", + "item.modernmetals.thorium_pickaxe": "Thorium Pickaxe", + "item.modernmetals.thorium_powder": "Thorium Dust", + "item.modernmetals.thorium_rod": "Thorium Rod", + "item.modernmetals.thorium_shears": "Thorium Shears", + "item.modernmetals.thorium_shield": "Thorium Shield", + "item.modernmetals.thorium_shovel": "Thorium Shovel", + "item.modernmetals.thorium_smallblend": "Tiny Pile of Thorium Blend", + "item.modernmetals.thorium_smallpowder": "Tiny Pile of Thorium Dust", + "item.modernmetals.thorium_sword": "Thorium Sword", + "item.modernmetals.thorium_trapdoor": "Thorium Trapdoor", + "tile.modernmetals.thorium_bars": "Thorium Bars", + "block.modernmetals.thorium_bars": "Thorium Bars", + "tile.modernmetals.thorium_block": "Block of Thorium", + "block.modernmetals.thorium_block": "Block of Thorium", + "tile.modernmetals.thorium_door": "Thorium Door", + "block.modernmetals.thorium_door": "Thorium Door", + "tile.modernmetals.thorium_ore": "Thorium Ore", + "block.modernmetals.thorium_ore": "Thorium Ore", + "tile.modernmetals.thorium_plate": "Thorium Plate", + "block.modernmetals.thorium_plate": "Thorium Plate", + "tile.modernmetals.thorium_trapdoor": "Thorium Trapdoor", + "block.modernmetals.thorium_trapdoor": "Thorium Trapdoor", + "fluid.modernmetals.thorium": "Molten Thorium", + "tile.modernmetals.thorium": "Molten Thorium", + "block.modernmetals.thorium": "Molten Thorium", + "item.modernmetals.thorium_clump": "Thorium Clump", + "item.modernmetals.thorium_crushed": "Crushed Thorium Ore", + "item.modernmetals.thorium_crushed_purified": "Purified Crushed Thorium Ore", + "item.modernmetals.thorium_crystal": "Thorium Crystal", + "item.modernmetals.thorium_dense_plate": "Dense Thorium Plate", + "item.modernmetals.thorium_powder_dirty": "Dirty Thorium Dust", + "item.modernmetals.thorium_shard": "Thorium Shard", + "item.modernmetals.thorium_button": "Thorium Button", + "item.modernmetals.thorium_lever": "Thorium Lever", + "item.modernmetals.thorium_pressure_plate": "Thorium Pressure Plate", + "item.modernmetals.thorium_slab": "Thorium Slab", + "item.modernmetals.thorium_stairs": "Thorium Stairs", + "item.modernmetals.thorium_wall": "Thorium Wall", + "tile.modernmetals.thorium_button": "Thorium Button", + "block.modernmetals.thorium_button": "Thorium Button", + "tile.modernmetals.thorium_lever": "Thorium Lever", + "block.modernmetals.thorium_lever": "Thorium Lever", + "tile.modernmetals.thorium_pressure_plate": "Thorium Pressure Plate", + "block.modernmetals.thorium_pressure_plate": "Thorium Pressure Plate", + "tile.modernmetals.thorium_slab": "Thorium Slab", + "block.modernmetals.thorium_slab": "Thorium Slab", + "tile.modernmetals.thorium_stairs": "Thorium Stairs", + "block.modernmetals.thorium_stairs": "Thorium Stairs", + "tile.modernmetals.thorium_wall": "Thorium Wall", + "block.modernmetals.thorium_wall": "Thorium Wall", + "item.modernmetals.aluminum_casing": "Aluminum Item Casing", + "item.modernmetals.aluminumbrass_casing": "Aluminum Brass Item Casing", + "item.modernmetals.boron_casing": "Boron Item Casing", + "item.modernmetals.beryllium_casing": "Beryllium Item Casing", + "item.modernmetals.cadmium_casing": "Cadmium Item Casing", + "item.modernmetals.chromium_casing": "Chromium Item Casing", + "item.modernmetals.galvanizedsteel_casing": "Galvanized Steel Item Casing", + "item.modernmetals.iridium_casing": "Iridium Item Casing", + "item.modernmetals.magnesium_casing": "Magnesium Item Casing", + "item.modernmetals.manganese_casing": "Manganese Item Casing", + "item.modernmetals.osmium_casing": "Osmium Item Casing", + "item.modernmetals.plutonium_casing": "Plutonium Item Casing", + "item.modernmetals.rutile_casing": "Rutile Item Casing", + "item.modernmetals.stainlesssteel_casing": "Stainless Steel Item Casing", + "item.modernmetals.tantalum_casing": "Tantalum Item Casing", + "item.modernmetals.thorium_casing": "Thorium Item Casing", + "item.modernmetals.titanium_casing": "Titanium Item Casing", + "item.modernmetals.tungsten_casing": "Tungsten Item Casing", + "item.modernmetals.uranium_casing": "Uranium Item Casing", + "item.modernmetals.zirconium_casing": "Zirconium Item Casing", + "item.modernmetals.aluminumbrass_scythe": "Aluminum Brass Sickle", + "item.modernmetals.aluminum_scythe": "Aluminum Sickle", + "item.modernmetals.beryllium_scythe": "Beryllium Sickle", + "item.modernmetals.boron_scythe": "Boron Sickle", + "item.modernmetals.cadmium_scythe": "Cadmium Sickle", + "item.modernmetals.chromium_scythe": "Chromium Sickle", + "item.modernmetals.galvanizedsteel_scythe": "Galvanized Steel Sickle", + "item.modernmetals.iridium_scythe": "Iridium Sickle", + "item.modernmetals.magnesium_scythe": "Magnesium Sickle", + "item.modernmetals.manganese_scythe": "Manganese Sickle", + "item.modernmetals.nichrome_scythe": "Nichrome Sickle", + "item.modernmetals.osmium_scythe": "Osmium Sickle", + "item.modernmetals.plutonium_scythe": "Plutonium Sickle", + "item.modernmetals.rutile_scythe": "Rutile Sickle", + "item.modernmetals.stainlesssteel_scythe": "Stainless Steel Sickle", + "item.modernmetals.tantalum_scythe": "Tantalum Sickle", + "item.modernmetals.thorium_scythe": "Thorium Sickle", + "item.modernmetals.titanium_scythe": "Titanium Sickle", + "item.modernmetals.tungsten_scythe": "Tungsten Sickle", + "item.modernmetals.uranium_scythe": "Uranium Sickle", + "item.modernmetals.zirconium_scythe": "Zirconium Sickle", + "gas.gasAluminum": "Aluminum Slurry", + "gas.gasBeryllium": "Beryllium Slurry", + "gas.gasBoron": "Boron Slurry", + "gas.gasCadmium": "Cadmium Slurry", + "gas.gasChromium": "Chromium Slurry", + "gas.gasIridium": "Iridium Slurry", + "gas.gasMagnesium": "Magnesium Slurry", + "gas.gasManganese": "Manganese Slurry", + "gas.gasPlutonium": "Plutonium Slurry", + "gas.gasRutile": "Rutile Slurry", + "gas.gasTantalum": "Tantalum Slurry", + "gas.gasThorium": "Thorium Slurry", + "gas.gasTitanium": "Titanium Slurry", + "gas.gasTungsten": "Tungsten Slurry", + "gas.gasUranium": "Uranium Slurry", + "gas.gasZirconium": "Zirconium Slurry", + "gas.cleanGasAluminum": "Clean Aluminum Slurry", + "gas.cleanGasBeryllium": "Clean Beryllium Slurry", + "gas.cleanGasBoron": "Clean Boron Slurry", + "gas.cleanGasCadmium": "Clean Cadmium Slurry", + "gas.cleanGasChromium": "Clean Chromium Slurry", + "gas.cleanGasIridium": "Clean Iridium Slurry", + "gas.cleanGasMagnesium": "Clean Magnesium Slurry", + "gas.cleanGasManganese": "Clean Manganese Slurry", + "gas.cleanGasPlutonium": "Clean Plutonium Slurry", + "gas.cleanGasRutile": "Clean Rutile Slurry", + "gas.cleanGasTantalum": "Clean Tantalum Slurry", + "gas.cleanGasThorium": "Clean Thorium Slurry", + "gas.cleanGasTitanium": "Clean Titanium Slurry", + "gas.cleanGasTungsten": "Clean Tungsten Slurry", + "gas.cleanGasUranium": "Clean Uranium Slurry", + "gas.cleanGasZirconium": "Clean Zirconium Slurry", + "gas.gasAdamantine": "Adamantine Slurry", + "gas.gasAntimony": "Antimony Slurry", + "gas.gasBismuth": "Bismuth Slurry", + "gas.gasColdiron": "Cold-Iron Slurry", + "gas.gasPlatinum": "Platinum Slurry", + "gas.gasNickel": "Nickel Slurry", + "gas.gasStarsteel": "Star-Steel Slurry", + "gas.gasZinc": "Zinc Slurry", + "gas.cleanGasAdamantine": "Clean Adamantine Slurry", + "gas.cleanGasAntimony": "Clean Antimony Slurry", + "gas.cleanGasBismuth": "Clean Bismuth Slurry", + "gas.cleanGasColdiron": "Clean Cold-Iron Slurry", + "gas.cleanGasPlatinum": "Clean Platinum Slurry", + "gas.cleanGasNickel": "Clean Nickel Slurry", + "gas.cleanGasStarsteel": "Clean Star-Steel Slurry", + "gas.cleanGasZinc": "Clean Zinc Slurry", + "config.modernmetals.title": "Modern Metals", + "config.modernmetals.description": "Restart to apply changes. Edit ores in OreSpawn.", + "config.modernmetals.content_mode": "Fantasy Level", + "config.modernmetals.content_mode.tooltip": "High Fantasy keeps all recipes. Low Fantasy restricts unrealistic equipment and structures. Requires a game restart.", + "high_fantasy": "High Fantasy", + "low_fantasy": "Low Fantasy", + "config.modernmetals.enable_thorium": "Enable Thorium", + "config.modernmetals.enable_boron": "Enable Boron", + "config.modernmetals.enable_beryllium": "Enable Beryllium", + "config.modernmetals.enable_cadmium": "Enable Cadmium", + "config.modernmetals.enable_nichrome": "Enable Nichrome", + "config.modernmetals.enable_aluminum": "Enable Aluminum", + "config.modernmetals.enable_aluminumbrass": "Enable Aluminum Brass", + "config.modernmetals.enable_chromium": "Enable Chromium", + "config.modernmetals.enable_galvanizedsteel": "Enable Galvanized Steel", + "config.modernmetals.enable_iridium": "Enable Iridium", + "config.modernmetals.enable_magnesium": "Enable Magnesium", + "config.modernmetals.enable_manganese": "Enable Manganese", + "config.modernmetals.enable_osmium": "Enable Osmium", + "config.modernmetals.enable_plutonium": "Enable Plutonium", + "config.modernmetals.enable_rutile": "Enable Rutile", + "config.modernmetals.enable_stainlesssteel": "Enable Stainless Steel", + "config.modernmetals.enable_tantalum": "Enable Tantalum", + "config.modernmetals.enable_titanium": "Enable Titanium", + "config.modernmetals.enable_tungsten": "Enable Tungsten", + "config.modernmetals.enable_uranium": "Enable Uranium", + "config.modernmetals.enable_zirconium": "Enable Zirconium", + "config.modernmetals.material.tooltip": "Controls which blocks, items and recipes are available for this material. Requires a game restart.", + "config.modernmetals.villager_trades": "Villager Trades", + "config.modernmetals.villager_trades.tooltip": "Let blacksmiths trade Modern Metals ingots and equipment. Requires a game restart.", + "config.modernmetals.connection.mismatch": "The server uses %s, but your game uses %s. Match the Fantasy Level in your mod settings and restart.", + "config.modernmetals.connection.protocol": "Modern Metals could not check the Fantasy Level. Use the same Modern Metals build on the server and client.", + "config.modernmetals.content_mode.high_fantasy": "High Fantasy", + "config.modernmetals.content_mode.low_fantasy": "Low Fantasy", + "config.modernmetals.inherited_mode": "Fantasy Level is set in Base Metals. Restart after changing settings." +} diff --git a/src/main/resources/assets/modernmetals/lang/en_pt.json b/src/main/resources/assets/modernmetals/lang/en_pt.json new file mode 100644 index 00000000..0743175b --- /dev/null +++ b/src/main/resources/assets/modernmetals/lang/en_pt.json @@ -0,0 +1,1760 @@ +{ + "item.modernmetals.nichrome_casing": "Nichrome Item Casing", + "itemGroup.modernmetals.blocks": "Modern Metals Blocks", + "itemGroup.modernmetals.combat": "Modern Metals Combat", + "itemGroup.modernmetals.items": "Modern Metals Items", + "itemGroup.modernmetals.tools": "Modern Metals Tools", + "nei.modernmetals.recipehandler.crusher": "Crushed Blocks/Items", + "material.aluminum": "Aluminum", + "item.modernmetals.aluminum_arrow": "Aluminum Arrow", + "item.modernmetals.aluminum_axe": "Aluminum Axe", + "item.modernmetals.aluminum_bars": "Aluminum Bars", + "item.modernmetals.aluminum_blend": "Aluminum Blend", + "item.modernmetals.aluminum_block": "Block o' Aluminum", + "item.modernmetals.aluminum_boots": "Aluminum Boots", + "item.modernmetals.aluminum_bolt": "Aluminum Bolt", + "item.modernmetals.aluminum_bow": "Aluminum Bow", + "item.modernmetals.aluminum_chestplate": "Aluminum Chestplate", + "item.modernmetals.aluminum_crackhammer": "Aluminum Crack Hammer", + "item.modernmetals.aluminum_crossbow": "Aluminum Crossbow", + "item.modernmetals.aluminum_door": "Aluminum Door", + "item.modernmetals.aluminum_fishing_rod": "Aluminum Fishing Rod", + "item.modernmetals.aluminum_gear": "Aluminum Gear", + "item.modernmetals.aluminum_helmet": "Aluminum Helmet", + "item.modernmetals.aluminum_hoe": "Aluminum Hoe", + "item.modernmetals.aluminum_horse_armor": "Aluminum Horse Armor", + "item.modernmetals.aluminum_ingot": "Aluminum Ingot", + "item.modernmetals.aluminum_leggings": "Aluminum Leg Armor", + "item.modernmetals.aluminum_nugget": "Aluminum Nugget", + "item.modernmetals.aluminum_ore": "Aluminum Ore", + "item.modernmetals.aluminum_pickaxe": "Aluminum Pickaxe", + "item.modernmetals.aluminum_powder": "Aluminum Dust", + "item.modernmetals.aluminum_rod": "Aluminum Rod", + "item.modernmetals.aluminum_shears": "Aluminum Shears", + "item.modernmetals.aluminum_shield": "Aluminum Shield", + "item.modernmetals.aluminum_shovel": "Aluminum Shovel", + "item.modernmetals.aluminum_smallblend": "Tiny Pile o' Aluminum Blend", + "item.modernmetals.aluminum_smallpowder": "Tiny Pile o' Aluminum Dust", + "item.modernmetals.aluminum_sword": "Aluminum Sword", + "item.modernmetals.aluminum_trapdoor": "Aluminum Trapdoor", + "material.aluminumbrass": "Aluminum Brass", + "item.modernmetals.aluminumbrass_arrow": "Aluminum Brass Arrow", + "item.modernmetals.aluminumbrass_axe": "Aluminum Brass Axe", + "item.modernmetals.aluminumbrass_bars": "Aluminum Brass Bars", + "item.modernmetals.aluminumbrass_blend": "Aluminum Brass Blend", + "item.modernmetals.aluminumbrass_block": "Block o' Aluminum Brass", + "item.modernmetals.aluminumbrass_boots": "Aluminum Brass Boots", + "item.modernmetals.aluminumbrass_bolt": "Aluminum Brass Bolt", + "item.modernmetals.aluminumbrass_bow": "Aluminum Brass Bow", + "item.modernmetals.aluminumbrass_chestplate": "Aluminum Brass Chestplate", + "item.modernmetals.aluminumbrass_crackhammer": "Aluminum Brass Crack Hammer", + "item.modernmetals.aluminumbrass_crossbow": "Aluminum Brass Crossbow", + "item.modernmetals.aluminumbrass_door": "Aluminum Brass Door", + "item.modernmetals.aluminumbrass_fishing_rod": "Aluminum Brass Fishing Rod", + "item.modernmetals.aluminumbrass_gear": "Aluminum Brass Gear", + "item.modernmetals.aluminumbrass_helmet": "Aluminum Brass Helmet", + "item.modernmetals.aluminumbrass_hoe": "Aluminum Brass Hoe", + "item.modernmetals.aluminumbrass_horse_armor": "Aluminum Brass Horse Armor", + "item.modernmetals.aluminumbrass_ingot": "Aluminum Brass Ingot", + "item.modernmetals.aluminumbrass_leggings": "Aluminum Brass Leg Armor", + "item.modernmetals.aluminumbrass_nugget": "Aluminum Brass Nugget", + "item.modernmetals.aluminumbrass_ore": "Aluminum Brass Ore", + "item.modernmetals.aluminumbrass_pickaxe": "Aluminum Brass Pickaxe", + "item.modernmetals.aluminumbrass_powder": "Aluminum Brass Dust", + "item.modernmetals.aluminumbrass_rod": "Aluminum Brass Rod", + "item.modernmetals.aluminumbrass_shears": "Aluminum Brass Shears", + "item.modernmetals.aluminumbrass_shield": "Aluminum Brass Shield", + "item.modernmetals.aluminumbrass_shovel": "Aluminum Brass Shovel", + "item.modernmetals.aluminumbrass_smallblend": "Tiny Pile o' Aluminum Brass Blend", + "item.modernmetals.aluminumbrass_smallpowder": "Tiny Pile o' Aluminum Brass Dust", + "item.modernmetals.aluminumbrass_sword": "Aluminum Brass Sword", + "item.modernmetals.aluminumbrass_trapdoor": "Aluminum Brass Trapdoor", + "material.antimony": "Antimony", + "item.modernmetals.antimony_arrow": "Antimony Arrow", + "item.modernmetals.antimony_axe": "Antimony Axe", + "item.modernmetals.antimony_bars": "Antimony Bars", + "item.modernmetals.antimony_block": "Block o' Antimony", + "item.modernmetals.antimony_boots": "Antimony Boots", + "item.modernmetals.antimony_chestplate": "Antimony Chestplate", + "item.modernmetals.antimony_crackhammer": "Antimony Crack Hammer", + "item.modernmetals.antimony_door": "Antimony Door", + "item.modernmetals.antimony_helmet": "Antimony Helmet", + "item.modernmetals.antimony_hoe": "Antimony Hoe", + "item.modernmetals.antimony_ingot": "Antimony Ingot", + "item.modernmetals.antimony_leggings": "Antimony Leg Armor", + "item.modernmetals.antimony_nugget": "Antimony Nugget", + "item.modernmetals.antimony_ore": "Antimony Ore", + "item.modernmetals.antimony_pickaxe": "Antimony Pickaxe", + "item.modernmetals.antimony_powder": "Antimony Dust", + "item.modernmetals.antimony_shears": "Antimony Shears", + "item.modernmetals.antimony_shield": "Antimony Shield", + "item.modernmetals.antimony_shovel": "Antimony Shovel", + "item.modernmetals.antimony_smallpowder": "Tiny Pile o' Antimony Dust", + "item.modernmetals.antimony_sword": "Antimony Sword", + "item.modernmetals.antimony_trapdoor": "Antimony Trapdoor", + "material.beryllium": "Beryllium", + "item.modernmetals.beryllium_arrow": "Beryllium Arrow", + "item.modernmetals.beryllium_axe": "Beryllium Axe", + "item.modernmetals.beryllium_bars": "Beryllium Bars", + "item.modernmetals.beryllium_blend": "Beryllium Blend", + "item.modernmetals.beryllium_block": "Block o' Beryllium", + "item.modernmetals.beryllium_boots": "Beryllium Boots", + "item.modernmetals.beryllium_bolt": "Beryllium Bolt", + "item.modernmetals.beryllium_bow": "Beryllium Bow", + "item.modernmetals.beryllium_chestplate": "Beryllium Chestplate", + "item.modernmetals.beryllium_crackhammer": "Beryllium Crack Hammer", + "item.modernmetals.beryllium_crossbow": "Beryllium Crossbow", + "item.modernmetals.beryllium_door": "Beryllium Door", + "item.modernmetals.beryllium_fishing_rod": "Beryllium Fishing Rod", + "item.modernmetals.beryllium_gear": "Beryllium Gear", + "item.modernmetals.beryllium_helmet": "Beryllium Helmet", + "item.modernmetals.beryllium_hoe": "Beryllium Hoe", + "item.modernmetals.beryllium_horse_armor": "Beryllium Horse Armor", + "item.modernmetals.beryllium_ingot": "Beryllium Ingot", + "item.modernmetals.beryllium_leggings": "Beryllium Leg Armor", + "item.modernmetals.beryllium_nugget": "Beryllium Nugget", + "item.modernmetals.beryllium_ore": "Beryllium Ore", + "item.modernmetals.beryllium_pickaxe": "Beryllium Pickaxe", + "item.modernmetals.beryllium_powder": "Beryllium Dust", + "item.modernmetals.beryllium_rod": "Beryllium Rod", + "item.modernmetals.beryllium_shears": "Beryllium Shears", + "item.modernmetals.beryllium_shield": "Beryllium Shield", + "item.modernmetals.beryllium_shovel": "Beryllium Shovel", + "item.modernmetals.beryllium_smallblend": "Tiny Pile o' Beryllium Blend", + "item.modernmetals.beryllium_smallpowder": "Tiny Pile o' Beryllium Dust", + "item.modernmetals.beryllium_sword": "Beryllium Sword", + "item.modernmetals.beryllium_trapdoor": "Beryllium Trapdoor", + "material.bismuth": "Bismuth", + "item.modernmetals.bismuth_arrow": "Bismuth Arrow", + "item.modernmetals.bismuth_axe": "Bismuth Axe", + "item.modernmetals.bismuth_bars": "Bismuth Bars", + "item.modernmetals.bismuth_block": "Block o' Bismuth", + "item.modernmetals.bismuth_boots": "Bismuth Boots", + "item.modernmetals.bismuth_chestplate": "Bismuth Chestplate", + "item.modernmetals.bismuth_crackhammer": "Bismuth Crack Hammer", + "item.modernmetals.bismuth_door": "Bismuth Door", + "item.modernmetals.bismuth_helmet": "Bismuth Helmet", + "item.modernmetals.bismuth_hoe": "Bismuth Hoe", + "item.modernmetals.bismuth_ingot": "Bismuth Ingot", + "item.modernmetals.bismuth_leggings": "Bismuth Leg Armor", + "item.modernmetals.bismuth_nugget": "Bismuth Nugget", + "item.modernmetals.bismuth_ore": "Bismuth Ore", + "item.modernmetals.bismuth_pickaxe": "Bismuth Pickaxe", + "item.modernmetals.bismuth_powder": "Bismuth Dust", + "item.modernmetals.bismuth_shears": "Bismuth Shears", + "item.modernmetals.bismuth_shovel": "Bismuth Shovel", + "item.modernmetals.bismuth_shield": "Bismuth Shield", + "item.modernmetals.bismuth_smallpowder": "Tiny Pile o' Bismuth Dust", + "item.modernmetals.bismuth_sword": "Bismuth Sword", + "item.modernmetals.bismuth_trapdoor": "Bismuth Trapdoor", + "material.boron": "Boron", + "item.modernmetals.boron_arrow": "Boron Arrow", + "item.modernmetals.boron_axe": "Boron Axe", + "item.modernmetals.boron_bars": "Boron Bars", + "item.modernmetals.boron_blend": "Boron Blend", + "item.modernmetals.boron_block": "Block o' Boron", + "item.modernmetals.boron_boots": "Boron Boots", + "item.modernmetals.boron_bolt": "Boron Bolt", + "item.modernmetals.boron_bow": "Boron Bow", + "item.modernmetals.boron_chestplate": "Boron Chestplate", + "item.modernmetals.boron_crackhammer": "Boron Crack Hammer", + "item.modernmetals.boron_crossbow": "Boron Crossbow", + "item.modernmetals.boron_door": "Boron Door", + "item.modernmetals.boron_fishing_rod": "Boron Fishing Rod", + "item.modernmetals.boron_gear": "Boron Gear", + "item.modernmetals.boron_helmet": "Boron Helmet", + "item.modernmetals.boron_hoe": "Boron Hoe", + "item.modernmetals.boron_horse_armor": "Boron Horse Armor", + "item.modernmetals.boron_ingot": "Boron Ingot", + "item.modernmetals.boron_leggings": "Boron Leg Armor", + "item.modernmetals.boron_nugget": "Boron Nugget", + "item.modernmetals.boron_ore": "Boron Ore", + "item.modernmetals.boron_pickaxe": "Boron Pickaxe", + "item.modernmetals.boron_powder": "Boron Dust", + "item.modernmetals.boron_rod": "Boron Rod", + "item.modernmetals.boron_shears": "Boron Shears", + "item.modernmetals.boron_shield": "Boron Shield", + "item.modernmetals.boron_shovel": "Boron Shovel", + "item.modernmetals.boron_smallblend": "Tiny Pile o' Boron Blend", + "item.modernmetals.boron_smallpowder": "Tiny Pile o' Boron Dust", + "item.modernmetals.boron_sword": "Boron Sword", + "item.modernmetals.boron_trapdoor": "Boron Trapdoor", + "material.cadmium": "Cadmium", + "item.modernmetals.cadmium_arrow": "Cadmium Arrow", + "item.modernmetals.cadmium_axe": "Cadmium Axe", + "item.modernmetals.cadmium_bars": "Cadmium Bars", + "item.modernmetals.cadmium_blend": "Cadmium Blend", + "item.modernmetals.cadmium_block": "Block o' Cadmium", + "item.modernmetals.cadmium_bolt": "Cadmium Bolt", + "item.modernmetals.cadmium_boots": "Cadmium Boots", + "item.modernmetals.cadmium_bow": "Cadmium Bow", + "item.modernmetals.cadmium_chestplate": "Cadmium Chestplate", + "item.modernmetals.cadmium_crackhammer": "Cadmium Crack Hammer", + "item.modernmetals.cadmium_crossbow": "Cadmium Crossbow", + "item.modernmetals.cadmium_door": "Cadmium Door", + "item.modernmetals.cadmium_fishing_rod": "Cadmium Fishing Rod", + "item.modernmetals.cadmium_gear": "Cadmium Gear", + "item.modernmetals.cadmium_helmet": "Cadmium Helmet", + "item.modernmetals.cadmium_hoe": "Cadmium Hoe", + "item.modernmetals.cadmium_horse_armor": "Cadmium Horse Armor", + "item.modernmetals.cadmium_ingot": "Cadmium Ingot", + "item.modernmetals.cadmium_leggings": "Cadmium Leg Armor", + "item.modernmetals.cadmium_nugget": "Cadmium Nugget", + "item.modernmetals.cadmium_ore": "Cadmium Ore", + "item.modernmetals.cadmium_pickaxe": "Cadmium Pickaxe", + "item.modernmetals.cadmium_powder": "Cadmium Dust", + "item.modernmetals.cadmium_rod": "Cadmium Rod", + "item.modernmetals.cadmium_shears": "Cadmium Shears", + "item.modernmetals.cadmium_shovel": "Cadmium Shovel", + "item.modernmetals.cadmium_shield": "Cadmium Shield", + "item.modernmetals.cadmium_smallblend": "Tiny Pile o' Cadmium Blend", + "item.modernmetals.cadmium_smallpowder": "Tiny Pile o' Cadmium Dust", + "item.modernmetals.cadmium_sword": "Cadmium Sword", + "item.modernmetals.cadmium_trapdoor": "Cadmium Trapdoor", + "material.chromium": "Chromium", + "item.modernmetals.chromium_arrow": "Chromium Arrow", + "item.modernmetals.chromium_axe": "Chromium Axe", + "item.modernmetals.chromium_bars": "Chromium Bars", + "item.modernmetals.chromium_blend": "Chromium Blend", + "item.modernmetals.chromium_block": "Block o' Chromium", + "item.modernmetals.chromium_bolt": "Chromium Bolt", + "item.modernmetals.chromium_boots": "Chromium Boots", + "item.modernmetals.chromium_bow": "Chromium Bow", + "item.modernmetals.chromium_chestplate": "Chromium Chestplate", + "item.modernmetals.chromium_crackhammer": "Chromium Crack Hammer", + "item.modernmetals.chromium_crossbow": "Chromium Crossbow", + "item.modernmetals.chromium_door": "Chromium Door", + "item.modernmetals.chromium_fishing_rod": "Chromium Fishing Rod", + "item.modernmetals.chromium_gear": "Chromium Gear", + "item.modernmetals.chromium_helmet": "Chromium Helmet", + "item.modernmetals.chromium_hoe": "Chromium Hoe", + "item.modernmetals.chromium_horse_armor": "Chromium Horse Armor", + "item.modernmetals.chromium_ingot": "Chromium Ingot", + "item.modernmetals.chromium_leggings": "Chromium Leg Armor", + "item.modernmetals.chromium_nugget": "Chromium Nugget", + "item.modernmetals.chromium_ore": "Chromium Ore", + "item.modernmetals.chromium_pickaxe": "Chromium Pickaxe", + "item.modernmetals.chromium_powder": "Chromium Dust", + "item.modernmetals.chromium_rod": "Chromium Rod", + "item.modernmetals.chromium_shears": "Chromium Shears", + "item.modernmetals.chromium_shield": "Chromium Shield", + "item.modernmetals.chromium_shovel": "Chromium Shovel", + "item.modernmetals.chromium_smallblend": "Tiny Pile o' Chromium Blend", + "item.modernmetals.chromium_smallpowder": "Tiny Pile o' Chromium Dust", + "item.modernmetals.chromium_sword": "Chromium Sword", + "item.modernmetals.chromium_trapdoor": "Chromium Trapdoor", + "material.galvanizedsteel": "Galvanized Steel", + "item.modernmetals.galvanizedsteel_arrow": "Galvanized Steel Arrow", + "item.modernmetals.galvanizedsteel_axe": "Galvanized Steel Axe", + "item.modernmetals.galvanizedsteel_bars": "Galvanized Steel Bars", + "item.modernmetals.galvanizedsteel_blend": "Galvanized Steel Blend", + "item.modernmetals.galvanizedsteel_block": "Block o' Galvanized Steel", + "item.modernmetals.galvanizedsteel_bolt": "Galvanized Steel Bolt", + "item.modernmetals.galvanizedsteel_boots": "Galvanized Steel Boots", + "item.modernmetals.galvanizedsteel_bow": "Galvanized Steel Bow", + "item.modernmetals.galvanizedsteel_chestplate": "Galvanized Steel Chestplate", + "item.modernmetals.galvanizedsteel_crackhammer": "Galvanized Steel Crack Hammer", + "item.modernmetals.galvanizedsteel_crossbow": "Galvanized Steel Crossbow", + "item.modernmetals.galvanizedsteel_door": "Galvanized Steel Door", + "item.modernmetals.galvanizedsteel_fishing_rod": "Galvanized Steel Fishing Rod", + "item.modernmetals.galvanizedsteel_gear": "Galvanized Steel Gear", + "item.modernmetals.galvanizedsteel_helmet": "Galvanized Steel Helmet", + "item.modernmetals.galvanizedsteel_hoe": "Galvanized Steel Hoe", + "item.modernmetals.galvanizedsteel_horse_armor": "Galvanized Steel Horse Armor", + "item.modernmetals.galvanizedsteel_ingot": "Galvanized Steel Ingot", + "item.modernmetals.galvanizedsteel_leggings": "Galvanized Steel Leg Armor", + "item.modernmetals.galvanizedsteel_nugget": "Galvanized Steel Nugget", + "item.modernmetals.galvanizedsteel_ore": "Galvanized Steel Ore", + "item.modernmetals.galvanizedsteel_pickaxe": "Galvanized Steel Pickaxe", + "item.modernmetals.galvanizedsteel_powder": "Galvanized Steel Dust", + "item.modernmetals.galvanizedsteel_rod": "Galvanized Steel Rod", + "item.modernmetals.galvanizedsteel_shears": "Galvanized Steel Shears", + "item.modernmetals.galvanizedsteel_shield": "Galvanized Steel Shield", + "item.modernmetals.galvanizedsteel_shovel": "Galvanized Steel Shovel", + "item.modernmetals.galvanizedsteel_smallblend": "Tiny Pile o' Galvanized Steel Blend", + "item.modernmetals.galvanizedsteel_smallpowder": "Tiny Pile o' Galvanized Steel Dust", + "item.modernmetals.galvanizedsteel_sword": "Galvanized Steel Sword", + "item.modernmetals.galvanizedsteel_trapdoor": "Galvanized Steel Trapdoor", + "material.iridium": "Iridium", + "item.modernmetals.iridium_arrow": "Iridium Arrow", + "item.modernmetals.iridium_axe": "Iridium Axe", + "item.modernmetals.iridium_bars": "Iridium Bars", + "item.modernmetals.iridium_blend": "Iridium Blend", + "item.modernmetals.iridium_block": "Block o' Iridium", + "item.modernmetals.iridium_bolt": "Iridium Bolt", + "item.modernmetals.iridium_boots": "Iridium Boots", + "item.modernmetals.iridium_bow": "Iridium Bow", + "item.modernmetals.iridium_chestplate": "Iridium Chestplate", + "item.modernmetals.iridium_crackhammer": "Iridium Crack Hammer", + "item.modernmetals.iridium_crossbow": "Iridium Crossbow", + "item.modernmetals.iridium_door": "Iridium Door", + "item.modernmetals.iridium_fishing_rod": "Iridium Fishing Rod", + "item.modernmetals.iridium_gear": "Iridium Gear", + "item.modernmetals.iridium_helmet": "Iridium Helmet", + "item.modernmetals.iridium_hoe": "Iridium Hoe", + "item.modernmetals.iridium_horse_armor": "Iridium Horse Armor", + "item.modernmetals.iridium_ingot": "Iridium Ingot", + "item.modernmetals.iridium_leggings": "Iridium Leg Armor", + "item.modernmetals.iridium_nugget": "Iridium Nugget", + "item.modernmetals.iridium_ore": "Iridium Ore", + "item.modernmetals.iridium_pickaxe": "Iridium Pickaxe", + "item.modernmetals.iridium_powder": "Iridium Dust", + "item.modernmetals.iridium_rod": "Iridium Rod", + "item.modernmetals.iridium_shears": "Iridium Shears", + "item.modernmetals.iridium_shield": "Iridium Shield", + "item.modernmetals.iridium_shovel": "Iridium Shovel", + "item.modernmetals.iridium_smallblend": "Tiny Pile o' Iridium Blend", + "item.modernmetals.iridium_smallpowder": "Tiny Pile o' Iridium Dust", + "item.modernmetals.iridium_sword": "Iridium Sword", + "item.modernmetals.iridium_trapdoor": "Iridium Trapdoor", + "material.magnesium": "Magnesium", + "item.modernmetals.magnesium_arrow": "Magnesium Arrow", + "item.modernmetals.magnesium_axe": "Magnesium Axe", + "item.modernmetals.magnesium_bars": "Magnesium Bars", + "item.modernmetals.magnesium_blend": "Magnesium Blend", + "item.modernmetals.magnesium_block": "Block o' Magnesium", + "item.modernmetals.magnesium_boots": "Magnesium Boots", + "item.modernmetals.magnesium_bolt": "Magnesium Bolt", + "item.modernmetals.magnesium_bow": "Magnesium Bow", + "item.modernmetals.magnesium_chestplate": "Magnesium Chestplate", + "item.modernmetals.magnesium_crackhammer": "Magnesium Crack Hammer", + "item.modernmetals.magnesium_crossbow": "Magnesium Crossbow", + "item.modernmetals.magnesium_door": "Magnesium Door", + "item.modernmetals.magnesium_fishing_rod": "Magnesium Fishing Rod", + "item.modernmetals.magnesium_gear": "Magnesium Gear", + "item.modernmetals.magnesium_helmet": "Magnesium Helmet", + "item.modernmetals.magnesium_hoe": "Magnesium Hoe", + "item.modernmetals.magnesium_horse_armor": "Magnesium Horse Armor", + "item.modernmetals.magnesium_ingot": "Magnesium Ingot", + "item.modernmetals.magnesium_leggings": "Magnesium Leg Armor", + "item.modernmetals.magnesium_nugget": "Magnesium Nugget", + "item.modernmetals.magnesium_ore": "Magnesium Ore", + "item.modernmetals.magnesium_pickaxe": "Magnesium Pickaxe", + "item.modernmetals.magnesium_powder": "Magnesium Dust", + "item.modernmetals.magnesium_rod": "Magnesium Rod", + "item.modernmetals.magnesium_shears": "Magnesium Shears", + "item.modernmetals.magnesium_shield": "Magnesium Shield", + "item.modernmetals.magnesium_shovel": "Magnesium Shovel", + "item.modernmetals.magnesium_smallblend": "Tiny Pile o' Magnesium Blend", + "item.modernmetals.magnesium_smallpowder": "Tiny Pile o' Magnesium Dust", + "item.modernmetals.magnesium_sword": "Magnesium Sword", + "item.modernmetals.magnesium_trapdoor": "Magnesium Trapdoor", + "material.manganese": "Manganese", + "item.modernmetals.manganese_arrow": "Manganese Arrow", + "item.modernmetals.manganese_axe": "Manganese Axe", + "item.modernmetals.manganese_bars": "Manganese Bars", + "item.modernmetals.manganese_blend": "Manganese Blend", + "item.modernmetals.manganese_block": "Block o' Manganese", + "item.modernmetals.manganese_bolt": "Manganese Bolt", + "item.modernmetals.manganese_boots": "Manganese Boots", + "item.modernmetals.manganese_bow": "Manganese Bow", + "item.modernmetals.manganese_chestplate": "Manganese Chestplate", + "item.modernmetals.manganese_crackhammer": "Manganese Crack Hammer", + "item.modernmetals.manganese_crossbow": "Manganese Crossbow", + "item.modernmetals.manganese_door": "Manganese Door", + "item.modernmetals.manganese_fishing_rod": "Manganese Fishing Rod", + "item.modernmetals.manganese_gear": "Manganese Gear", + "item.modernmetals.manganese_helmet": "Manganese Helmet", + "item.modernmetals.manganese_hoe": "Manganese Hoe", + "item.modernmetals.manganese_horse_armor": "Manganese Horse Armor", + "item.modernmetals.manganese_ingot": "Manganese Ingot", + "item.modernmetals.manganese_leggings": "Manganese Leg Armor", + "item.modernmetals.manganese_nugget": "Manganese Nugget", + "item.modernmetals.manganese_ore": "Manganese Ore", + "item.modernmetals.manganese_pickaxe": "Manganese Pickaxe", + "item.modernmetals.manganese_powder": "Manganese Dust", + "item.modernmetals.manganese_rod": "Manganese Rod", + "item.modernmetals.manganese_shears": "Manganese Shears", + "item.modernmetals.manganese_shield": "Manganese Shield", + "item.modernmetals.manganese_shovel": "Manganese Shovel", + "item.modernmetals.manganese_smallblend": "Tiny Pile o' Manganese Blend", + "item.modernmetals.manganese_smallpowder": "Tiny Pile o' Manganese Dust", + "item.modernmetals.manganese_sword": "Manganese Sword", + "item.modernmetals.manganese_trapdoor": "Manganese Trapdoor", + "material.nichrome": "Nichrome", + "item.modernmetals.nichrome_arrow": "Nichrome Arrow", + "item.modernmetals.nichrome_axe": "Nichrome Axe", + "item.modernmetals.nichrome_bars": "Nichrome Bars", + "item.modernmetals.nichrome_blend": "Nichrome Blend", + "item.modernmetals.nichrome_block": "Block o' Nichrome", + "item.modernmetals.nichrome_bolt": "Nichrome Bolt", + "item.modernmetals.nichrome_boots": "Nichrome Boots", + "item.modernmetals.nichrome_bow": "Nichrome Bow", + "item.modernmetals.nichrome_chestplate": "Nichrome Chestplate", + "item.modernmetals.nichrome_crackhammer": "Nichrome Crack Hammer", + "item.modernmetals.nichrome_crossbow": "Nichrome Crossbow", + "item.modernmetals.nichrome_door": "Nichrome Door", + "item.modernmetals.nichrome_fishing_rod": "Nichrome Fishing Rod", + "item.modernmetals.nichrome_gear": "Nichrome Gear", + "item.modernmetals.nichrome_helmet": "Nichrome Helmet", + "item.modernmetals.nichrome_hoe": "Nichrome Hoe", + "item.modernmetals.nichrome_horse_armor": "Nichrome Horse Armor", + "item.modernmetals.nichrome_ingot": "Nichrome Ingot", + "item.modernmetals.nichrome_leggings": "Nichrome Leg Armor", + "item.modernmetals.nichrome_nugget": "Nichrome Nugget", + "item.modernmetals.nichrome_ore": "Nichrome Ore", + "item.modernmetals.nichrome_pickaxe": "Nichrome Pickaxe", + "item.modernmetals.nichrome_powder": "Nichrome Dust", + "item.modernmetals.nichrome_rod": "Nichrome Rod", + "item.modernmetals.nichrome_shears": "Nichrome Shears", + "item.modernmetals.nichrome_shield": "Nichrome Shield", + "item.modernmetals.nichrome_shovel": "Nichrome Shovel", + "item.modernmetals.nichrome_smallblend": "Tiny Pile o' Nichrome Blend", + "item.modernmetals.nichrome_smallpowder": "Tiny Pile o' Nichrome Dust", + "item.modernmetals.nichrome_sword": "Nichrome Sword", + "item.modernmetals.nichrome_trapdoor": "Nichrome Trapdoor", + "material.osmium": "Osmium", + "item.modernmetals.osmium_arrow": "Osmium Arrow", + "item.modernmetals.osmium_axe": "Osmium Axe", + "item.modernmetals.osmium_bars": "Osmium Bars", + "item.modernmetals.osmium_blend": "Osmium Blend", + "item.modernmetals.osmium_block": "Block o' Osmium", + "item.modernmetals.osmium_boots": "Osmium Boots", + "item.modernmetals.osmium_bolt": "Osmium Bolt", + "item.modernmetals.osmium_bow": "Osmium Bow", + "item.modernmetals.osmium_chestplate": "Osmium Chestplate", + "item.modernmetals.osmium_crackhammer": "Osmium Crack Hammer", + "item.modernmetals.osmium_crossbow": "Osmium Crossbow", + "item.modernmetals.osmium_door": "Osmium Door", + "item.modernmetals.osmium_fishing_rod": "Osmium Fishing Rod", + "item.modernmetals.osmium_gear": "Osmium Gear", + "item.modernmetals.osmium_helmet": "Osmium Helmet", + "item.modernmetals.osmium_hoe": "Osmium Hoe", + "item.modernmetals.osmium_horse_armor": "Osmium Horse Armor", + "item.modernmetals.osmium_ingot": "Osmium Ingot", + "item.modernmetals.osmium_leggings": "Osmium Leg Armor", + "item.modernmetals.osmium_nugget": "Osmium Nugget", + "item.modernmetals.osmium_ore": "Osmium Ore", + "item.modernmetals.osmium_pickaxe": "Osmium Pickaxe", + "item.modernmetals.osmium_powder": "Osmium Dust", + "item.modernmetals.osmium_rod": "Osmium Rod", + "item.modernmetals.osmium_shears": "Osmium Shears", + "item.modernmetals.osmium_shield": "Osmium Shield", + "item.modernmetals.osmium_shovel": "Osmium Shovel", + "item.modernmetals.osmium_smallblend": "Tiny Pile o' Osmium Blend", + "item.modernmetals.osmium_smallpowder": "Tiny Pile o' Osmium Dust", + "item.modernmetals.osmium_sword": "Osmium Sword", + "item.modernmetals.osmium_trapdoor": "Osmium Trapdoor", + "material.pewter": "Pewter", + "item.modernmetals.pewter_arrow": "Pewter Arrow", + "item.modernmetals.pewter_axe": "Pewter Axe", + "item.modernmetals.pewter_bars": "Pewter Bars", + "item.modernmetals.pewter_blend": "Pewter Blend", + "item.modernmetals.pewter_block": "Block o' Pewter", + "item.modernmetals.pewter_boots": "Pewter Boots", + "item.modernmetals.pewter_chestplate": "Pewter Chestplate", + "item.modernmetals.pewter_crackhammer": "Pewter Crack Hammer", + "item.modernmetals.pewter_door": "Pewter Door", + "item.modernmetals.pewter_helmet": "Pewter Helmet", + "item.modernmetals.pewter_hoe": "Pewter Hoe", + "item.modernmetals.pewter_ingot": "Pewter Ingot", + "item.modernmetals.pewter_leggings": "Pewter Leg Armor", + "item.modernmetals.pewter_nugget": "Pewter Nugget", + "item.modernmetals.pewter_ore": "Pewter Ore", + "item.modernmetals.pewter_pickaxe": "Pewter Pickaxe", + "item.modernmetals.pewter_powder": "Pewter Dust", + "item.modernmetals.pewter_shears": "Pewter Shears", + "item.modernmetals.pewter_shield": "Pewter Shield", + "item.modernmetals.pewter_shovel": "Pewter Shovel", + "item.modernmetals.pewter_smallpowder": "Tiny Pile o' Pewter Dust", + "item.modernmetals.pewter_sword": "Pewter Sword", + "item.modernmetals.pewter_trapdoor": "Pewter Trapdoor", + "material.plutonium": "Plutonium", + "item.modernmetals.plutonium_arrow": "Plutonium Arrow", + "item.modernmetals.plutonium_axe": "Plutonium Axe", + "item.modernmetals.plutonium_bars": "Plutonium Bars", + "item.modernmetals.plutonium_blend": "Plutonium Blend", + "item.modernmetals.plutonium_block": "Block o' Plutonium", + "item.modernmetals.plutonium_bolt": "Plutonium Bolt", + "item.modernmetals.plutonium_boots": "Plutonium Boots", + "item.modernmetals.plutonium_bow": "Plutonium Bow", + "item.modernmetals.plutonium_chestplate": "Plutonium Chestplate", + "item.modernmetals.plutonium_crackhammer": "Plutonium Crack Hammer", + "item.modernmetals.plutonium_crossbow": "Plutonium Crossbow", + "item.modernmetals.plutonium_door": "Plutonium Door", + "item.modernmetals.plutonium_fishing_rod": "Plutonium Fishing Rod", + "item.modernmetals.plutonium_gear": "Plutonium Gear", + "item.modernmetals.plutonium_helmet": "Plutonium Helmet", + "item.modernmetals.plutonium_hoe": "Plutonium Hoe", + "item.modernmetals.plutonium_horse_armor": "Plutonium Horse Armor", + "item.modernmetals.plutonium_ingot": "Plutonium Ingot", + "item.modernmetals.plutonium_leggings": "Plutonium Leg Armor", + "item.modernmetals.plutonium_nugget": "Plutonium Nugget", + "item.modernmetals.plutonium_ore": "Plutonium Ore", + "item.modernmetals.plutonium_pickaxe": "Plutonium Pickaxe", + "item.modernmetals.plutonium_powder": "Plutonium Dust", + "item.modernmetals.plutonium_rod": "Plutonium Rod", + "item.modernmetals.plutonium_shears": "Plutonium Shears", + "item.modernmetals.plutonium_shield": "Plutonium Shield", + "item.modernmetals.plutonium_shovel": "Plutonium Shovel", + "item.modernmetals.plutonium_smallblend": "Tiny Pile o' Plutonium Blend", + "item.modernmetals.plutonium_smallpowder": "Tiny Pile o' Plutonium Dust", + "item.modernmetals.plutonium_sword": "Plutonium Sword", + "item.modernmetals.plutonium_trapdoor": "Plutonium Trapdoor", + "material.rutile": "Rutile", + "item.modernmetals.rutile_arrow": "Rutile Arrow", + "item.modernmetals.rutile_axe": "Rutile Axe", + "item.modernmetals.rutile_bars": "Rutile Bars", + "item.modernmetals.rutile_blend": "Rutile Blend", + "item.modernmetals.rutile_block": "Block o' Rutile", + "item.modernmetals.rutile_boots": "Rutile Boots", + "item.modernmetals.rutile_bolt": "Rutile Bolt", + "item.modernmetals.rutile_bow": "Rutile Bow", + "item.modernmetals.rutile_chestplate": "Rutile Chestplate", + "item.modernmetals.rutile_crackhammer": "Rutile Crack Hammer", + "item.modernmetals.rutile_crossbow": "Rutile Crossbow", + "item.modernmetals.rutile_door": "Rutile Door", + "item.modernmetals.rutile_fishing_rod": "Rutile Fishing Rod", + "item.modernmetals.rutile_gear": "Rutile Gear", + "item.modernmetals.rutile_helmet": "Rutile Helmet", + "item.modernmetals.rutile_hoe": "Rutile Hoe", + "item.modernmetals.rutile_horse_armor": "Rutile Horse Armor", + "item.modernmetals.rutile_ingot": "Rutile Ingot", + "item.modernmetals.rutile_leggings": "Rutile Leg Armor", + "item.modernmetals.rutile_nugget": "Rutile Nugget", + "item.modernmetals.rutile_ore": "Rutile Ore", + "item.modernmetals.rutile_pickaxe": "Rutile Pickaxe", + "item.modernmetals.rutile_powder": "Rutile Dust", + "item.modernmetals.rutile_rod": "Rutile Rod", + "item.modernmetals.rutile_shears": "Rutile Shears", + "item.modernmetals.rutile_shield": "Rutile Shield", + "item.modernmetals.rutile_shovel": "Rutile Shovel", + "item.modernmetals.rutile_smallblend": "Tiny Pile o' Rutile Blend", + "item.modernmetals.rutile_smallpowder": "Tiny Pile o' Rutile Dust", + "item.modernmetals.rutile_sword": "Rutile Sword", + "item.modernmetals.rutile_trapdoor": "Rutile Trapdoor", + "material.stainlesssteel": "Stainless Steel", + "item.modernmetals.stainlesssteel_arrow": "Stainless Steel Arrow", + "item.modernmetals.stainlesssteel_axe": "Stainless Steel Axe", + "item.modernmetals.stainlesssteel_bars": "Stainless Steel Bars", + "item.modernmetals.stainlesssteel_blend": "Stainless Steel Blend", + "item.modernmetals.stainlesssteel_block": "Block o' Stainless Steel", + "item.modernmetals.stainlesssteel_bolt": "Stainless Steel Bolt", + "item.modernmetals.stainlesssteel_boots": "Stainless Steel Boots", + "item.modernmetals.stainlesssteel_bow": "Stainless Steel Bow", + "item.modernmetals.stainlesssteel_chestplate": "Stainless Steel Chestplate", + "item.modernmetals.stainlesssteel_crackhammer": "Stainless Steel Crack Hammer", + "item.modernmetals.stainlesssteel_crossbow": "Stainless Steel Crossbow", + "item.modernmetals.stainlesssteel_door": "Stainless Steel Door", + "item.modernmetals.stainlesssteel_fishing_rod": "Stainless Steel Fishing Rod", + "item.modernmetals.stainlesssteel_gear": "Stainless Steel Gear", + "item.modernmetals.stainlesssteel_helmet": "Stainless Steel Helmet", + "item.modernmetals.stainlesssteel_hoe": "Stainless Steel Hoe", + "item.modernmetals.stainlesssteel_horse_armor": "Stainless Steel Horse Armor", + "item.modernmetals.stainlesssteel_ingot": "Stainless Steel Ingot", + "item.modernmetals.stainlesssteel_leggings": "Stainless Steel Leg Armor", + "item.modernmetals.stainlesssteel_nugget": "Stainless Steel Nugget", + "item.modernmetals.stainlesssteel_ore": "Stainless Steel Ore", + "item.modernmetals.stainlesssteel_pickaxe": "Stainless Steel Pickaxe", + "item.modernmetals.stainlesssteel_powder": "Stainless Steel Dust", + "item.modernmetals.stainlesssteel_rod": "Stainless Steel Rod", + "item.modernmetals.stainlesssteel_shears": "Stainless Steel Shears", + "item.modernmetals.stainlesssteel_shield": "Stainless Steel Shield", + "item.modernmetals.stainlesssteel_shovel": "Stainless Steel Shovel", + "item.modernmetals.stainlesssteel_smallblend": "Tiny Pile o' Stainless Steel Blend", + "item.modernmetals.stainlesssteel_smallpowder": "Tiny Pile o' Stainless Steel Dust", + "item.modernmetals.stainlesssteel_sword": "Stainless Steel Sword", + "item.modernmetals.stainlesssteel_trapdoor": "Stainless Steel Trapdoor", + "material.tantalum": "Tantalum", + "item.modernmetals.tantalum_arrow": "Tantalum Arrow", + "item.modernmetals.tantalum_axe": "Tantalum Axe", + "item.modernmetals.tantalum_bars": "Tantalum Bars", + "item.modernmetals.tantalum_blend": "Tantalum Blend", + "item.modernmetals.tantalum_block": "Block o' Tantalum", + "item.modernmetals.tantalum_bolt": "Tantalum Bolt", + "item.modernmetals.tantalum_boots": "Tantalum Boots", + "item.modernmetals.tantalum_bow": "Tantalum Bow", + "item.modernmetals.tantalum_chestplate": "Tantalum Chestplate", + "item.modernmetals.tantalum_crackhammer": "Tantalum Crack Hammer", + "item.modernmetals.tantalum_crossbow": "Tantalum Crossbow", + "item.modernmetals.tantalum_door": "Tantalum Door", + "item.modernmetals.tantalum_fishing_rod": "Tantalum Fishing Rod", + "item.modernmetals.tantalum_gear": "Tantalum Gear", + "item.modernmetals.tantalum_helmet": "Tantalum Helmet", + "item.modernmetals.tantalum_hoe": "Tantalum Hoe", + "item.modernmetals.tantalum_horse_armor": "Tantalum Horse Armor", + "item.modernmetals.tantalum_ingot": "Tantalum Ingot", + "item.modernmetals.tantalum_leggings": "Tantalum Leg Armor", + "item.modernmetals.tantalum_nugget": "Tantalum Nugget", + "item.modernmetals.tantalum_ore": "Tantalum Ore", + "item.modernmetals.tantalum_pickaxe": "Tantalum Pickaxe", + "item.modernmetals.tantalum_powder": "Tantalum Dust", + "item.modernmetals.tantalum_rod": "Tantalum Rod", + "item.modernmetals.tantalum_shears": "Tantalum Shears", + "item.modernmetals.tantalum_shield": "Tantalum Shield", + "item.modernmetals.tantalum_shovel": "Tantalum Shovel", + "item.modernmetals.tantalum_smallblend": "Tiny Pile o' Tantalum Blend", + "item.modernmetals.tantalum_smallpowder": "Tiny Pile o' Tantalum Dust", + "item.modernmetals.tantalum_sword": "Tantalum Sword", + "item.modernmetals.tantalum_trapdoor": "Tantalum Trapdoor", + "material.titanium": "Titanium", + "item.modernmetals.titanium_arrow": "Titanium Arrow", + "item.modernmetals.titanium_axe": "Titanium Axe", + "item.modernmetals.titanium_bars": "Titanium Bars", + "item.modernmetals.titanium_blend": "Titanium Blend", + "item.modernmetals.titanium_block": "Block o' Titanium", + "item.modernmetals.titanium_boots": "Titanium Boots", + "item.modernmetals.titanium_bolt": "Titanium Bolt", + "item.modernmetals.titanium_bow": "Titanium Bow", + "item.modernmetals.titanium_chestplate": "Titanium Chestplate", + "item.modernmetals.titanium_crackhammer": "Titanium Crack Hammer", + "item.modernmetals.titanium_crossbow": "Titanium Crossbow", + "item.modernmetals.titanium_door": "Titanium Door", + "item.modernmetals.titanium_fishing_rod": "Titanium Fishing Rod", + "item.modernmetals.titanium_gear": "Titanium Gear", + "item.modernmetals.titanium_helmet": "Titanium Helmet", + "item.modernmetals.titanium_hoe": "Titanium Hoe", + "item.modernmetals.titanium_horse_armor": "Titanium Horse Armor", + "item.modernmetals.titanium_ingot": "Titanium Ingot", + "item.modernmetals.titanium_leggings": "Titanium Leg Armor", + "item.modernmetals.titanium_nugget": "Titanium Nugget", + "item.modernmetals.titanium_ore": "Titanium Ore", + "item.modernmetals.titanium_pickaxe": "Titanium Pickaxe", + "item.modernmetals.titanium_powder": "Titanium Dust", + "item.modernmetals.titanium_rod": "Titanium Rod", + "item.modernmetals.titanium_shears": "Titanium Shears", + "item.modernmetals.titanium_shield": "Titanium Shield", + "item.modernmetals.titanium_shovel": "Titanium Shovel", + "item.modernmetals.titanium_smallblend": "Tiny Pile o' Titanium Blend", + "item.modernmetals.titanium_smallpowder": "Tiny Pile o' Titanium Dust", + "item.modernmetals.titanium_sword": "Titanium Sword", + "item.modernmetals.titanium_trapdoor": "Titanium Trapdoor", + "material.tungsten": "Tungsten", + "item.modernmetals.tungsten_arrow": "Tungsten Arrow", + "item.modernmetals.tungsten_axe": "Tungsten Axe", + "item.modernmetals.tungsten_bars": "Tungsten Bars", + "item.modernmetals.tungsten_blend": "Tungsten Blend", + "item.modernmetals.tungsten_block": "Block o' Tungsten", + "item.modernmetals.tungsten_boots": "Tungsten Boots", + "item.modernmetals.tungsten_bolt": "Tungsten Bolt", + "item.modernmetals.tungsten_bow": "Tungsten Bow", + "item.modernmetals.tungsten_chestplate": "Tungsten Chestplate", + "item.modernmetals.tungsten_crackhammer": "Tungsten Crack Hammer", + "item.modernmetals.tungsten_crossbow": "Tungsten Crossbow", + "item.modernmetals.tungsten_door": "Tungsten Door", + "item.modernmetals.tungsten_fishing_rod": "Tungsten Fishing Rod", + "item.modernmetals.tungsten_gear": "Tungsten Gear", + "item.modernmetals.tungsten_helmet": "Tungsten Helmet", + "item.modernmetals.tungsten_hoe": "Tungsten Hoe", + "item.modernmetals.tungsten_horse_armor": "Tungsten Horse Armor", + "item.modernmetals.tungsten_ingot": "Tungsten Ingot", + "item.modernmetals.tungsten_leggings": "Tungsten Leg Armor", + "item.modernmetals.tungsten_nugget": "Tungsten Nugget", + "item.modernmetals.tungsten_ore": "Tungsten Ore", + "item.modernmetals.tungsten_pickaxe": "Tungsten Pickaxe", + "item.modernmetals.tungsten_powder": "Tungsten Dust", + "item.modernmetals.tungsten_rod": "Tungsten Rod", + "item.modernmetals.tungsten_shears": "Tungsten Shears", + "item.modernmetals.tungsten_shield": "Tungsten Shield", + "item.modernmetals.tungsten_shovel": "Tungsten Shovel", + "item.modernmetals.tungsten_smallblend": "Tiny Pile o' Tungsten Blend", + "item.modernmetals.tungsten_smallpowder": "Tiny Pile o' Tungsten Dust", + "item.modernmetals.tungsten_sword": "Tungsten Sword", + "item.modernmetals.tungsten_trapdoor": "Tungsten Trapdoor", + "material.uranium": "Uranium", + "item.modernmetals.uranium_arrow": "Uranium Arrow", + "item.modernmetals.uranium_axe": "Uranium Axe", + "item.modernmetals.uranium_bars": "Uranium Bars", + "item.modernmetals.uranium_blend": "Uranium Blend", + "item.modernmetals.uranium_block": "Block o' Uranium", + "item.modernmetals.uranium_boots": "Uranium Boots", + "item.modernmetals.uranium_bolt": "Uranium Bolt", + "item.modernmetals.uranium_bow": "Uranium Bow", + "item.modernmetals.uranium_chestplate": "Uranium Chestplate", + "item.modernmetals.uranium_crackhammer": "Uranium Crack Hammer", + "item.modernmetals.uranium_crossbow": "Uranium Crossbow", + "item.modernmetals.uranium_door": "Uranium Door", + "item.modernmetals.uranium_fishing_rod": "Uranium Fishing Rod", + "item.modernmetals.uranium_gear": "Uranium Gear", + "item.modernmetals.uranium_helmet": "Uranium Helmet", + "item.modernmetals.uranium_hoe": "Uranium Hoe", + "item.modernmetals.uranium_horse_armor": "Uranium Horse Armor", + "item.modernmetals.uranium_ingot": "Uranium Ingot", + "item.modernmetals.uranium_leggings": "Uranium Leg Armor", + "item.modernmetals.uranium_nugget": "Uranium Nugget", + "item.modernmetals.uranium_ore": "Uranium Ore", + "item.modernmetals.uranium_pickaxe": "Uranium Pickaxe", + "item.modernmetals.uranium_powder": "Uranium Dust", + "item.modernmetals.uranium_rod": "Uranium Rod", + "item.modernmetals.uranium_shears": "Uranium Shears", + "item.modernmetals.uranium_shield": "Uranium Shield", + "item.modernmetals.uranium_shovel": "Uranium Shovel", + "item.modernmetals.uranium_smallblend": "Tiny Pile o' Uranium Blend", + "item.modernmetals.uranium_smallpowder": "Tiny Pile o' Uranium Dust", + "item.modernmetals.uranium_sword": "Uranium Sword", + "item.modernmetals.uranium_trapdoor": "Uranium Trapdoor", + "material.zirconium": "Zirconium", + "item.modernmetals.zirconium_arrow": "Zirconium Arrow", + "item.modernmetals.zirconium_axe": "Zirconium Axe", + "item.modernmetals.zirconium_bars": "Zirconium Bars", + "item.modernmetals.zirconium_blend": "Zirconium Blend", + "item.modernmetals.zirconium_block": "Block o' Zirconium", + "item.modernmetals.zirconium_bolt": "Zirconium Bolt", + "item.modernmetals.zirconium_boots": "Zirconium Boots", + "item.modernmetals.zirconium_bow": "Zirconium Bow", + "item.modernmetals.zirconium_chestplate": "Zirconium Chestplate", + "item.modernmetals.zirconium_crackhammer": "Zirconium Crack Hammer", + "item.modernmetals.zirconium_crossbow": "Zirconium Crossbow", + "item.modernmetals.zirconium_door": "Zirconium Door", + "item.modernmetals.zirconium_fishing_rod": "Zirconium Fishing Rod", + "item.modernmetals.zirconium_gear": "Zirconium Gear", + "item.modernmetals.zirconium_helmet": "Zirconium Helmet", + "item.modernmetals.zirconium_hoe": "Zirconium Hoe", + "item.modernmetals.zirconium_horse_armor": "Zirconium Horse Armor", + "item.modernmetals.zirconium_ingot": "Zirconium Ingot", + "item.modernmetals.zirconium_leggings": "Zirconium Leg Armor", + "item.modernmetals.zirconium_nugget": "Zirconium Nugget", + "item.modernmetals.zirconium_ore": "Zirconium Ore", + "item.modernmetals.zirconium_pickaxe": "Zirconium Pickaxe", + "item.modernmetals.zirconium_powder": "Zirconium Dust", + "item.modernmetals.zirconium_rod": "Zirconium Rod", + "item.modernmetals.zirconium_shears": "Zirconium Shears", + "item.modernmetals.zirconium_shield": "Zirconium Shield", + "item.modernmetals.zirconium_shovel": "Zirconium Shovel", + "item.modernmetals.zirconium_smallblend": "Tiny Pile o' Zirconium Blend", + "item.modernmetals.zirconium_smallpowder": "Tiny Pile o' Zirconium Dust", + "item.modernmetals.zirconium_sword": "Zirconium Sword", + "item.modernmetals.zirconium_trapdoor": "Zirconium Trapdoor", + "tile.modernmetals.aluminum_bars": "Aluminum Bars", + "block.modernmetals.aluminum_bars": "Aluminum Bars", + "tile.modernmetals.aluminum_block": "Block o' Aluminum", + "block.modernmetals.aluminum_block": "Block o' Aluminum", + "tile.modernmetals.aluminum_door": "Aluminum Door", + "block.modernmetals.aluminum_door": "Aluminum Door", + "tile.modernmetals.aluminum_ore": "Aluminum Ore", + "block.modernmetals.aluminum_ore": "Aluminum Ore", + "tile.modernmetals.aluminum_plate": "Plate o' Aluminum", + "block.modernmetals.aluminum_plate": "Plate o' Aluminum", + "tile.modernmetals.aluminum_trapdoor": "Aluminum Trapdoor", + "block.modernmetals.aluminum_trapdoor": "Aluminum Trapdoor", + "tile.modernmetals.aluminumbrass_bars": "Aluminum Brass Bars", + "block.modernmetals.aluminumbrass_bars": "Aluminum Brass Bars", + "tile.modernmetals.aluminumbrass_block": "Block o' Aluminum Brass", + "block.modernmetals.aluminumbrass_block": "Block o' Aluminum Brass", + "tile.modernmetals.aluminumbrass_door": "Aluminum Brass Door", + "block.modernmetals.aluminumbrass_door": "Aluminum Brass Door", + "tile.modernmetals.aluminumbrass_ore": "Aluminum Brass Ore", + "block.modernmetals.aluminumbrass_ore": "Aluminum Brass Ore", + "tile.modernmetals.aluminumbrass_plate": "Plate o' Aluminum Brass", + "block.modernmetals.aluminumbrass_plate": "Plate o' Aluminum Brass", + "tile.modernmetals.aluminumbrass_trapdoor": "Aluminum Brass Trapdoor", + "block.modernmetals.aluminumbrass_trapdoor": "Aluminum Brass Trapdoor", + "tile.modernmetals.boron_bars": "Boron Bars", + "block.modernmetals.boron_bars": "Boron Bars", + "tile.modernmetals.boron_block": "Block o' Boron", + "block.modernmetals.boron_block": "Block o' Boron", + "tile.modernmetals.boron_door": "Boron Door", + "block.modernmetals.boron_door": "Boron Door", + "tile.modernmetals.boron_ore": "Boron Ore", + "block.modernmetals.boron_ore": "Boron Ore", + "tile.modernmetals.boron_plate": "Plate o' Boron", + "block.modernmetals.boron_plate": "Plate o' Boron", + "tile.modernmetals.boron_trapdoor": "Boron Trapdoor", + "block.modernmetals.boron_trapdoor": "Boron Trapdoor", + "tile.modernmetals.cadmium_bars": "Cadmium Bars", + "block.modernmetals.cadmium_bars": "Cadmium Bars", + "tile.modernmetals.cadmium_block": "Block o' Cadmium", + "block.modernmetals.cadmium_block": "Block o' Cadmium", + "tile.modernmetals.cadmium_door": "Cadmium Door", + "block.modernmetals.cadmium_door": "Cadmium Door", + "tile.modernmetals.cadmium_ore": "Cadmium Ore", + "block.modernmetals.cadmium_ore": "Cadmium Ore", + "tile.modernmetals.cadmium_plate": "Plate o' Cadmium", + "block.modernmetals.cadmium_plate": "Plate o' Cadmium", + "tile.modernmetals.cadmium_trapdoor": "Cadmium Trapdoor", + "block.modernmetals.cadmium_trapdoor": "Cadmium Trapdoor", + "tile.modernmetals.chromium_bars": "Chromium Bars", + "block.modernmetals.chromium_bars": "Chromium Bars", + "tile.modernmetals.chromium_block": "Block o' Chromium", + "block.modernmetals.chromium_block": "Block o' Chromium", + "tile.modernmetals.chromium_door": "Chromium Door", + "block.modernmetals.chromium_door": "Chromium Door", + "tile.modernmetals.chromium_ore": "Chromium Ore", + "block.modernmetals.chromium_ore": "Chromium Ore", + "tile.modernmetals.chromium_plate": "Plate o' Chromium", + "block.modernmetals.chromium_plate": "Plate o' Chromium", + "tile.modernmetals.chromium_trapdoor": "Chromium Trapdoor", + "block.modernmetals.chromium_trapdoor": "Chromium Trapdoor", + "tile.modernmetals.galvanizedsteel_bars": "Galvanized Steel Bars", + "block.modernmetals.galvanizedsteel_bars": "Galvanized Steel Bars", + "tile.modernmetals.galvanizedsteel_block": "Block o' Galvanized Steel", + "block.modernmetals.galvanizedsteel_block": "Block o' Galvanized Steel", + "tile.modernmetals.galvanizedsteel_door": "Galvanized Steel Door", + "block.modernmetals.galvanizedsteel_door": "Galvanized Steel Door", + "tile.modernmetals.galvanizedsteel_ore": "Galvanized Steel Ore", + "block.modernmetals.galvanizedsteel_ore": "Galvanized Steel Ore", + "tile.modernmetals.galvanizedsteel_plate": "Plate o' Galvanized Steel", + "block.modernmetals.galvanizedsteel_plate": "Plate o' Galvanized Steel", + "tile.modernmetals.galvanizedsteel_trapdoor": "Galvanized Steel Trapdoor", + "block.modernmetals.galvanizedsteel_trapdoor": "Galvanized Steel Trapdoor", + "tile.modernmetals.iridium_bars": "Iridium Bars", + "block.modernmetals.iridium_bars": "Iridium Bars", + "tile.modernmetals.iridium_block": "Block o' Iridium", + "block.modernmetals.iridium_block": "Block o' Iridium", + "tile.modernmetals.iridium_door": "Iridium Door", + "block.modernmetals.iridium_door": "Iridium Door", + "tile.modernmetals.iridium_ore": "Iridium Ore", + "block.modernmetals.iridium_ore": "Iridium Ore", + "tile.modernmetals.iridium_plate": "Plate o' Iridium", + "block.modernmetals.iridium_plate": "Plate o' Iridium", + "tile.modernmetals.iridium_trapdoor": "Iridium Trapdoor", + "block.modernmetals.iridium_trapdoor": "Iridium Trapdoor", + "tile.modernmetals.magnesium_bars": "Magnesium Bars", + "block.modernmetals.magnesium_bars": "Magnesium Bars", + "tile.modernmetals.magnesium_block": "Block o' Magnesium", + "block.modernmetals.magnesium_block": "Block o' Magnesium", + "tile.modernmetals.magnesium_door": "Magnesium Door", + "block.modernmetals.magnesium_door": "Magnesium Door", + "tile.modernmetals.magnesium_ore": "Magnesium Ore", + "block.modernmetals.magnesium_ore": "Magnesium Ore", + "tile.modernmetals.magnesium_plate": "Plate o' Magnesium", + "block.modernmetals.magnesium_plate": "Plate o' Magnesium", + "tile.modernmetals.magnesium_trapdoor": "Magnesium Trapdoor", + "block.modernmetals.magnesium_trapdoor": "Magnesium Trapdoor", + "tile.modernmetals.manganese_bars": "Manganese Bars", + "block.modernmetals.manganese_bars": "Manganese Bars", + "tile.modernmetals.manganese_block": "Block o' Manganese", + "block.modernmetals.manganese_block": "Block o' Manganese", + "tile.modernmetals.manganese_door": "Manganese Door", + "block.modernmetals.manganese_door": "Manganese Door", + "tile.modernmetals.manganese_ore": "Manganese Ore", + "block.modernmetals.manganese_ore": "Manganese Ore", + "tile.modernmetals.manganese_plate": "Plate o' Manganese", + "block.modernmetals.manganese_plate": "Plate o' Manganese", + "tile.modernmetals.manganese_trapdoor": "Manganese Trapdoor", + "block.modernmetals.manganese_trapdoor": "Manganese Trapdoor", + "tile.modernmetals.nichrome_bars": "Nichrome Bars", + "block.modernmetals.nichrome_bars": "Nichrome Bars", + "tile.modernmetals.nichrome_block": "Block o' Nichrome", + "block.modernmetals.nichrome_block": "Block o' Nichrome", + "tile.modernmetals.nichrome_door": "Nichrome Door", + "block.modernmetals.nichrome_door": "Nichrome Door", + "tile.modernmetals.nichrome_ore": "Nichrome Ore", + "block.modernmetals.nichrome_ore": "Nichrome Ore", + "tile.modernmetals.nichrome_plate": "Plate o' Nichrome", + "block.modernmetals.nichrome_plate": "Plate o' Nichrome", + "tile.modernmetals.nichrome_trapdoor": "Nichrome Trapdoor", + "block.modernmetals.nichrome_trapdoor": "Nichrome Trapdoor", + "tile.modernmetals.osmium_bars": "Osmium Bars", + "block.modernmetals.osmium_bars": "Osmium Bars", + "tile.modernmetals.osmium_block": "Block o' Osmium", + "block.modernmetals.osmium_block": "Block o' Osmium", + "tile.modernmetals.osmium_door": "Osmium Door", + "block.modernmetals.osmium_door": "Osmium Door", + "tile.modernmetals.osmium_ore": "Osmium Ore", + "block.modernmetals.osmium_ore": "Osmium Ore", + "tile.modernmetals.osmium_plate": "Plate o' Osmium", + "block.modernmetals.osmium_plate": "Plate o' Osmium", + "tile.modernmetals.osmium_trapdoor": "Osmium Trapdoor", + "block.modernmetals.osmium_trapdoor": "Osmium Trapdoor", + "tile.modernmetals.plutonium_bars": "Plutonium Bars", + "block.modernmetals.plutonium_bars": "Plutonium Bars", + "tile.modernmetals.plutonium_block": "Block o' Plutonium", + "block.modernmetals.plutonium_block": "Block o' Plutonium", + "tile.modernmetals.plutonium_door": "Plutonium Door", + "block.modernmetals.plutonium_door": "Plutonium Door", + "tile.modernmetals.plutonium_ore": "Plutonium Ore", + "block.modernmetals.plutonium_ore": "Plutonium Ore", + "tile.modernmetals.plutonium_plate": "Plate o' Plutonium", + "block.modernmetals.plutonium_plate": "Plate o' Plutonium", + "tile.modernmetals.plutonium_trapdoor": "Plutonium Trapdoor", + "block.modernmetals.plutonium_trapdoor": "Plutonium Trapdoor", + "tile.modernmetals.rutile_bars": "Rutile Bars", + "block.modernmetals.rutile_bars": "Rutile Bars", + "tile.modernmetals.rutile_block": "Block o' Rutile", + "block.modernmetals.rutile_block": "Block o' Rutile", + "tile.modernmetals.rutile_door": "Rutile Door", + "block.modernmetals.rutile_door": "Rutile Door", + "tile.modernmetals.rutile_ore": "Rutile Ore", + "block.modernmetals.rutile_ore": "Rutile Ore", + "tile.modernmetals.rutile_plate": "Plate o' Rutile", + "block.modernmetals.rutile_plate": "Plate o' Rutile", + "tile.modernmetals.rutile_trapdoor": "Rutile Trapdoor", + "block.modernmetals.rutile_trapdoor": "Rutile Trapdoor", + "tile.modernmetals.stainlesssteel_bars": "Stainless Steel Bars", + "block.modernmetals.stainlesssteel_bars": "Stainless Steel Bars", + "tile.modernmetals.stainlesssteel_block": "Block o' Stainless Steel", + "block.modernmetals.stainlesssteel_block": "Block o' Stainless Steel", + "tile.modernmetals.stainlesssteel_door": "Stainless Steel Door", + "block.modernmetals.stainlesssteel_door": "Stainless Steel Door", + "tile.modernmetals.stainlesssteel_ore": "Stainless Steel Ore", + "block.modernmetals.stainlesssteel_ore": "Stainless Steel Ore", + "tile.modernmetals.stainlesssteel_plate": "Plate o' Stainless Steel", + "block.modernmetals.stainlesssteel_plate": "Plate o' Stainless Steel", + "tile.modernmetals.stainlesssteel_trapdoor": "Stainless Steel Trapdoor", + "block.modernmetals.stainlesssteel_trapdoor": "Stainless Steel Trapdoor", + "tile.modernmetals.tantalum_bars": "Tantalum Bars", + "block.modernmetals.tantalum_bars": "Tantalum Bars", + "tile.modernmetals.tantalum_block": "Block o' Tantalum", + "block.modernmetals.tantalum_block": "Block o' Tantalum", + "tile.modernmetals.tantalum_door": "Tantalum Door", + "block.modernmetals.tantalum_door": "Tantalum Door", + "tile.modernmetals.tantalum_ore": "Tantalum Ore", + "block.modernmetals.tantalum_ore": "Tantalum Ore", + "tile.modernmetals.tantalum_plate": "Plate o' Tantalum", + "block.modernmetals.tantalum_plate": "Plate o' Tantalum", + "tile.modernmetals.tantalum_trapdoor": "Tantalum Trapdoor", + "block.modernmetals.tantalum_trapdoor": "Tantalum Trapdoor", + "tile.modernmetals.titanium_bars": "Titanium Bars", + "block.modernmetals.titanium_bars": "Titanium Bars", + "tile.modernmetals.titanium_block": "Block o' Titanium", + "block.modernmetals.titanium_block": "Block o' Titanium", + "tile.modernmetals.titanium_door": "Titanium Door", + "block.modernmetals.titanium_door": "Titanium Door", + "tile.modernmetals.titanium_ore": "Titanium Ore", + "block.modernmetals.titanium_ore": "Titanium Ore", + "tile.modernmetals.titanium_plate": "Plate o' Titanium", + "block.modernmetals.titanium_plate": "Plate o' Titanium", + "tile.modernmetals.titanium_trapdoor": "Titanium Trapdoor", + "block.modernmetals.titanium_trapdoor": "Titanium Trapdoor", + "tile.modernmetals.tungsten_bars": "Tungsten Bars", + "block.modernmetals.tungsten_bars": "Tungsten Bars", + "tile.modernmetals.tungsten_block": "Block o' Tungsten", + "block.modernmetals.tungsten_block": "Block o' Tungsten", + "tile.modernmetals.tungsten_door": "Tungsten Door", + "block.modernmetals.tungsten_door": "Tungsten Door", + "tile.modernmetals.tungsten_ore": "Tungsten Ore", + "block.modernmetals.tungsten_ore": "Tungsten Ore", + "tile.modernmetals.tungsten_plate": "Plate o' Tungsten", + "block.modernmetals.tungsten_plate": "Plate o' Tungsten", + "tile.modernmetals.tungsten_trapdoor": "Tungsten Trapdoor", + "block.modernmetals.tungsten_trapdoor": "Tungsten Trapdoor", + "tile.modernmetals.uranium_bars": "Uranium Bars", + "block.modernmetals.uranium_bars": "Uranium Bars", + "tile.modernmetals.uranium_block": "Block o' Uranium", + "block.modernmetals.uranium_block": "Block o' Uranium", + "tile.modernmetals.uranium_door": "Uranium Door", + "block.modernmetals.uranium_door": "Uranium Door", + "tile.modernmetals.uranium_ore": "Uranium Ore", + "block.modernmetals.uranium_ore": "Uranium Ore", + "tile.modernmetals.uranium_plate": "Plate o' Uranium", + "block.modernmetals.uranium_plate": "Plate o' Uranium", + "tile.modernmetals.uranium_trapdoor": "Uranium Trapdoor", + "block.modernmetals.uranium_trapdoor": "Uranium Trapdoor", + "tile.modernmetals.zirconium_bars": "Zirconium Bars", + "block.modernmetals.zirconium_bars": "Zirconium Bars", + "tile.modernmetals.zirconium_block": "Block o' Zirconium", + "block.modernmetals.zirconium_block": "Block o' Zirconium", + "tile.modernmetals.zirconium_door": "Zirconium Door", + "block.modernmetals.zirconium_door": "Zirconium Door", + "tile.modernmetals.zirconium_ore": "Zirconium Ore", + "block.modernmetals.zirconium_ore": "Zirconium Ore", + "tile.modernmetals.zirconium_plate": "Plate o' Zirconium", + "block.modernmetals.zirconium_plate": "Plate o' Zirconium", + "tile.modernmetals.zirconium_trapdoor": "Zirconium Trapdoor", + "block.modernmetals.zirconium_trapdoor": "Zirconium Trapdoor", + "tooltip.aluminum.tool": "Nothing Special", + "tooltip.aluminumbrass.tool": "Nothing Special", + "tooltip.cadmium.tool": "Nothing Special", + "tooltip.chromium.tool": "Nothing Special", + "tooltip.galvanized_steel.tool": "Nothing Special", + "tooltip.iridium.tool": "Nothing Special", + "tooltip.magnesium.tool": "Nothing Special", + "tooltip.manganese.tool": "Nothing Special", + "tooltip.nichrome.tool": "Nothing Special", + "tooltip.osmium.tool": "Nothing Special", + "tooltip.plutonium.tool": "Nothing Special", + "tooltip.rutile.tool": "Nothing Special", + "tooltip.stainless_steel.tool": "Nothing Special", + "tooltip.tantalum.tool": "Nothing Special", + "tooltip.titanium.tool": "Nothing Special", + "tooltip.tungsten.tool": "Nothing Special", + "tooltip.uranium.tool": "Nothing Special", + "tooltip.zirconium.tool": "Nothing Special", + "tooltip.aluminum.armor": "Nothing Special", + "tooltip.aluminumbrass.armor": "Nothing Special", + "tooltip.cadmium.armor": "Nothing Special", + "tooltip.chromium.armor": "Nothing Special", + "tooltip.galvanized_steel.armor": "Nothing Special", + "tooltip.iridium.armor": "Nothing Special", + "tooltip.magnesium.armor": "Nothing Special", + "tooltip.manganese.armor": "Nothing Special", + "tooltip.nichrome.armor": "Nothing Special", + "tooltip.osmium.armor": "Nothing Special", + "tooltip.plutonium.armor": "Nothing Special", + "tooltip.rutile.armor": "Nothing Special", + "tooltip.stainless_steel.armor": "Nothing Special", + "tooltip.tantalum.armor": "Nothing Special", + "tooltip.titanium.armor": "Nothing Special", + "tooltip.tungsten.armor": "Nothing Special", + "tooltip.uranium.armor": "Nothing Special", + "tooltip.zirconium.armor": "Nothing Special", + "achievement.aluminumbrass_maker": "Aluminum Brass", + "achievement.galvanized_steel_maker": "Galvanized Steel", + "achievement.nichrome_maker": "Nichrome", + "achievement.stainless_steel_maker": "Stainless Steel", + "achievement.titanium_maker": "Titanium", + "achievement.aluminumbrass_maker.desc": "Combine Aluminum Dust and Brass Dust to make Aluminum Brass", + "achievement.galvanized_steel_maker.desc": "Combine Steel Dust and Zinc Dust to make Galvanized Steel", + "achievement.nichrome_maker.desc": "Combine Nickel Dust and Chromium Dust to make Nichrome", + "achievement.stainless_steel_maker.desc": "Combine Steel Dust and Chromium Dust to make Stainless Steel", + "achievement.titanium_maker.desc": "Combine Rutile Dust and Magnesium Dust to make Titanium", + "fluid.modernmetals.aluminum": "Molten Aluminum", + "fluid.modernmetals.aluminumbrass": "Molten Aluminum Brass", + "fluid.modernmetals.boron": "Molten Boron", + "fluid.modernmetals.beryllium": "Molten Beryllium", + "fluid.modernmetals.cadmium": "Molten Cadmium", + "fluid.modernmetals.chromium": "Molten Chromium", + "fluid.modernmetals.galvanizedsteel": "Molten Galvanized Steel", + "fluid.modernmetals.iridium": "Molten Iridium", + "fluid.modernmetals.magnesium": "Molten Magnesium", + "fluid.modernmetals.manganese": "Molten Manganese", + "fluid.modernmetals.nichrome": "Molten Nichrome", + "fluid.modernmetals.osmium": "Molten Osmium", + "fluid.modernmetals.plutonium": "Molten Plutonium", + "fluid.modernmetals.rutile": "Molten Rutile", + "fluid.modernmetals.stainlesssteel": "Molten Stainless Steel", + "fluid.modernmetals.tantalum": "Molten Tantalum", + "fluid.modernmetals.titanium": "Molten Titanium", + "fluid.modernmetals.tungsten": "Molten Tungsten", + "fluid.modernmetals.uranium": "Molten Uranium", + "fluid.modernmetals.zirconium": "Molten Zirconium", + "tile.modernmetals.aluminum": "Molten Aluminum", + "block.modernmetals.aluminum": "Molten Aluminum", + "tile.modernmetals.aluminumbrass": "Molten Aluminum Brass", + "block.modernmetals.aluminumbrass": "Molten Aluminum Brass", + "tile.modernmetals.boron": "Molten Boron", + "block.modernmetals.boron": "Molten Boron", + "tile.modernmetals.cadmium": "Molten Cadmium", + "block.modernmetals.cadmium": "Molten Cadmium", + "tile.modernmetals.chromium": "Molten Chromium", + "block.modernmetals.chromium": "Molten Chromium", + "tile.modernmetals.galvanizedsteel": "Molten Galvanized Steel", + "block.modernmetals.galvanizedsteel": "Molten Galvanized Steel", + "tile.modernmetals.iridium": "Molten Iridium", + "block.modernmetals.iridium": "Molten Iridium", + "tile.modernmetals.magnesium": "Molten Magnesium", + "block.modernmetals.magnesium": "Molten Magnesium", + "tile.modernmetals.manganese": "Molten Manganese", + "block.modernmetals.manganese": "Molten Manganese", + "tile.modernmetals.nichrome": "Molten Nichrome", + "block.modernmetals.nichrome": "Molten Nichrome", + "tile.modernmetals.osmium": "Molten Osmium", + "block.modernmetals.osmium": "Molten Osmium", + "tile.modernmetals.plutonium": "Molten Plutonium", + "block.modernmetals.plutonium": "Molten Plutonium", + "tile.modernmetals.rutile": "Molten Rutile", + "block.modernmetals.rutile": "Molten Rutile", + "tile.modernmetals.stainlesssteel": "Molten Stainless Steel", + "block.modernmetals.stainlesssteel": "Molten Stainless Steel", + "tile.modernmetals.tantalum": "Molten Tantalum", + "block.modernmetals.tantalum": "Molten Tantalum", + "tile.modernmetals.titanium": "Molten Titanium", + "block.modernmetals.titanium": "Molten Titanium", + "tile.modernmetals.tungsten": "Molten Tungsten", + "block.modernmetals.tungsten": "Molten Tungsten", + "tile.modernmetals.uranium": "Molten Uranium", + "block.modernmetals.uranium": "Molten Uranium", + "tile.modernmetals.zirconium": "Molten Zirconium", + "block.modernmetals.zirconium": "Molten Zirconium", + "item.modernmetals.aluminum_clump": "Aluminum Clump", + "item.modernmetals.aluminum_crushed": "Crushed Aluminum Ore", + "item.modernmetals.aluminum_crushed_purified": "Purified Crushed Aluminum Ore", + "item.modernmetals.aluminum_crystal": "Aluminum Crystal", + "item.modernmetals.aluminum_dense_plate": "Dense Plate o' Aluminum", + "item.modernmetals.aluminum_powder_dirty": "Dirty Aluminum Dust", + "item.modernmetals.aluminum_shard": "Aluminum Shard", + "item.modernmetals.aluminum_button": "Aluminum Button", + "item.modernmetals.aluminum_lever": "Aluminum Lever", + "item.modernmetals.aluminum_pressure_plate": "Aluminum Pressure Plate", + "item.modernmetals.aluminum_slab": "Aluminum Slab", + "item.modernmetals.aluminum_stairs": "Aluminum Stairs", + "item.modernmetals.aluminum_wall": "Aluminum Wall", + "tile.modernmetals.aluminum_button": "Aluminum Button", + "block.modernmetals.aluminum_button": "Aluminum Button", + "tile.modernmetals.aluminum_lever": "Aluminum Lever", + "block.modernmetals.aluminum_lever": "Aluminum Lever", + "tile.modernmetals.aluminum_pressure_plate": "Aluminum Pressure Plate", + "block.modernmetals.aluminum_pressure_plate": "Aluminum Pressure Plate", + "tile.modernmetals.aluminum_slab": "Aluminum Slab", + "block.modernmetals.aluminum_slab": "Aluminum Slab", + "tile.modernmetals.aluminum_stairs": "Aluminum Stairs", + "block.modernmetals.aluminum_stairs": "Aluminum Stairs", + "tile.modernmetals.aluminum_wall": "Aluminum Wall", + "block.modernmetals.aluminum_wall": "Aluminum Wall", + "item.modernmetals.aluminumbrass_clump": "Aluminum Brass Clump", + "item.modernmetals.aluminumbrass_crushed": "Crushed Aluminum Brass Ore", + "item.modernmetals.aluminumbrass_crushed_purified": "Purified Crushed Aluminum Brass Ore", + "item.modernmetals.aluminumbrass_crystal": "Aluminum Brass Crystal", + "item.modernmetals.aluminumbrass_dense_plate": "Dense Plate o' Aluminum Brass", + "item.modernmetals.aluminumbrass_powder_dirty": "Dirty Aluminum Brass Dust", + "item.modernmetals.aluminumbrass_shard": "Aluminum Brass Shard", + "item.modernmetals.aluminumbrass_button": "Aluminum Brass Button", + "item.modernmetals.aluminumbrass_lever": "Aluminum Brass Lever", + "item.modernmetals.aluminumbrass_pressure_plate": "Aluminum Brass Pressure Plate", + "item.modernmetals.aluminumbrass_slab": "Aluminum Brass Slab", + "item.modernmetals.aluminumbrass_stairs": "Aluminum Brass Stairs", + "item.modernmetals.aluminumbrass_wall": "Aluminum Brass Wall", + "tile.modernmetals.aluminumbrass_button": "Aluminum Brass Button", + "block.modernmetals.aluminumbrass_button": "Aluminum Brass Button", + "tile.modernmetals.aluminumbrass_lever": "Aluminum Brass Lever", + "block.modernmetals.aluminumbrass_lever": "Aluminum Brass Lever", + "tile.modernmetals.aluminumbrass_pressure_plate": "Aluminum Brass Pressure Plate", + "block.modernmetals.aluminumbrass_pressure_plate": "Aluminum Brass Pressure Plate", + "tile.modernmetals.aluminumbrass_slab": "Aluminum Brass Slab", + "block.modernmetals.aluminumbrass_slab": "Aluminum Brass Slab", + "tile.modernmetals.aluminumbrass_stairs": "Aluminum Brass Stairs", + "block.modernmetals.aluminumbrass_stairs": "Aluminum Brass Stairs", + "tile.modernmetals.aluminumbrass_wall": "Aluminum Brass Wall", + "block.modernmetals.aluminumbrass_wall": "Aluminum Brass Wall", + "tile.modernmetals.beryllium_bars": "Beryllium Bars", + "block.modernmetals.beryllium_bars": "Beryllium Bars", + "tile.modernmetals.beryllium_block": "Block o' Beryllium", + "block.modernmetals.beryllium_block": "Block o' Beryllium", + "tile.modernmetals.beryllium_door": "Beryllium Door", + "block.modernmetals.beryllium_door": "Beryllium Door", + "tile.modernmetals.beryllium_ore": "Beryllium Ore", + "block.modernmetals.beryllium_ore": "Beryllium Ore", + "tile.modernmetals.beryllium_plate": "Plate o' Beryllium", + "block.modernmetals.beryllium_plate": "Plate o' Beryllium", + "tile.modernmetals.beryllium_trapdoor": "Beryllium Trapdoor", + "block.modernmetals.beryllium_trapdoor": "Beryllium Trapdoor", + "item.modernmetals.beryllium_clump": "Beryllium Clump", + "item.modernmetals.beryllium_crushed": "Crushed Beryllium Ore", + "item.modernmetals.beryllium_crushed_purified": "Purified Crushed Beryllium Ore", + "item.modernmetals.beryllium_crystal": "Beryllium Crystal", + "item.modernmetals.beryllium_dense_plate": "Dense Plate o' Beryllium", + "item.modernmetals.beryllium_powder_dirty": "Dirty Beryllium Dust", + "item.modernmetals.beryllium_shard": "Beryllium Shard", + "item.modernmetals.beryllium_button": "Beryllium Button", + "item.modernmetals.beryllium_lever": "Beryllium Lever", + "item.modernmetals.beryllium_pressure_plate": "Beryllium Pressure Plate", + "item.modernmetals.beryllium_slab": "Beryllium Slab", + "item.modernmetals.beryllium_stairs": "Beryllium Stairs", + "item.modernmetals.beryllium_wall": "Beryllium Wall", + "tile.modernmetals.beryllium": "Molten Beryllium", + "block.modernmetals.beryllium": "Molten Beryllium", + "tile.modernmetals.beryllium_button": "Beryllium Button", + "block.modernmetals.beryllium_button": "Beryllium Button", + "tile.modernmetals.beryllium_lever": "Beryllium Lever", + "block.modernmetals.beryllium_lever": "Beryllium Lever", + "tile.modernmetals.beryllium_pressure_plate": "Beryllium Pressure Plate", + "block.modernmetals.beryllium_pressure_plate": "Beryllium Pressure Plate", + "tile.modernmetals.beryllium_slab": "Beryllium Slab", + "block.modernmetals.beryllium_slab": "Beryllium Slab", + "tile.modernmetals.beryllium_stairs": "Beryllium Stairs", + "block.modernmetals.beryllium_stairs": "Beryllium Stairs", + "tile.modernmetals.beryllium_wall": "Beryllium Wall", + "block.modernmetals.beryllium_wall": "Beryllium Wall", + "item.modernmetals.boron_clump": "Boron Clump", + "item.modernmetals.boron_crushed": "Crushed Boron Ore", + "item.modernmetals.boron_crushed_purified": "Purified Crushed Boron Ore", + "item.modernmetals.boron_crystal": "Boron Crystal", + "item.modernmetals.boron_dense_plate": "Dense Plate o' Boron", + "item.modernmetals.boron_powder_dirty": "Dirty Boron Dust", + "item.modernmetals.boron_shard": "Boron Shard", + "item.modernmetals.boron_button": "Boron Button", + "item.modernmetals.boron_lever": "Boron Lever", + "item.modernmetals.boron_pressure_plate": "Boron Pressure Plate", + "item.modernmetals.boron_slab": "Boron Slab", + "item.modernmetals.boron_stairs": "Boron Stairs", + "item.modernmetals.boron_wall": "Boron Wall", + "tile.modernmetals.boron_button": "Boron Button", + "block.modernmetals.boron_button": "Boron Button", + "tile.modernmetals.boron_lever": "Boron Lever", + "block.modernmetals.boron_lever": "Boron Lever", + "tile.modernmetals.boron_pressure_plate": "Boron Pressure Plate", + "block.modernmetals.boron_pressure_plate": "Boron Pressure Plate", + "tile.modernmetals.boron_slab": "Boron Slab", + "block.modernmetals.boron_slab": "Boron Slab", + "tile.modernmetals.boron_stairs": "Boron Stairs", + "block.modernmetals.boron_stairs": "Boron Stairs", + "tile.modernmetals.boron_wall": "Boron Wall", + "block.modernmetals.boron_wall": "Boron Wall", + "item.modernmetals.cadmium_clump": "Cadmium Clump", + "item.modernmetals.cadmium_crushed": "Crushed Cadmium Ore", + "item.modernmetals.cadmium_crushed_purified": "Purified Crushed Cadmium Ore", + "item.modernmetals.cadmium_crystal": "Cadmium Crystal", + "item.modernmetals.cadmium_dense_plate": "Dense Plate o' Cadmium", + "item.modernmetals.cadmium_powder_dirty": "Dirty Cadmium Dust", + "item.modernmetals.cadmium_shard": "Cadmium Shard", + "item.modernmetals.cadmium_button": "Cadmium Button", + "item.modernmetals.cadmium_lever": "Cadmium Lever", + "item.modernmetals.cadmium_pressure_plate": "Cadmium Pressure Plate", + "item.modernmetals.cadmium_slab": "Cadmium Slab", + "item.modernmetals.cadmium_stairs": "Cadmium Stairs", + "item.modernmetals.cadmium_wall": "Cadmium Wall", + "tile.modernmetals.cadmium_button": "Cadmium Button", + "block.modernmetals.cadmium_button": "Cadmium Button", + "tile.modernmetals.cadmium_lever": "Cadmium Lever", + "block.modernmetals.cadmium_lever": "Cadmium Lever", + "tile.modernmetals.cadmium_pressure_plate": "Cadmium Pressure Plate", + "block.modernmetals.cadmium_pressure_plate": "Cadmium Pressure Plate", + "tile.modernmetals.cadmium_slab": "Cadmium Slab", + "block.modernmetals.cadmium_slab": "Cadmium Slab", + "tile.modernmetals.cadmium_stairs": "Cadmium Stairs", + "block.modernmetals.cadmium_stairs": "Cadmium Stairs", + "tile.modernmetals.cadmium_wall": "Cadmium Wall", + "block.modernmetals.cadmium_wall": "Cadmium Wall", + "item.modernmetals.chromium_clump": "Chromium Clump", + "item.modernmetals.chromium_crushed": "Crushed Chromium Ore", + "item.modernmetals.chromium_crushed_purified": "Purified Crushed Chromium Ore", + "item.modernmetals.chromium_crystal": "Chromium Crystal", + "item.modernmetals.chromium_dense_plate": "Dense Plate o' Chromium", + "item.modernmetals.chromium_powder_dirty": "Dirty Chromium Dust", + "item.modernmetals.chromium_shard": "Chromium Shard", + "item.modernmetals.chromium_button": "Chromium Button", + "item.modernmetals.chromium_lever": "Chromium Lever", + "item.modernmetals.chromium_pressure_plate": "Chromium Pressure Plate", + "item.modernmetals.chromium_slab": "Chromium Slab", + "item.modernmetals.chromium_stairs": "Chromium Stairs", + "item.modernmetals.chromium_wall": "Chromium Wall", + "tile.modernmetals.chromium_button": "Chromium Button", + "block.modernmetals.chromium_button": "Chromium Button", + "tile.modernmetals.chromium_lever": "Chromium Lever", + "block.modernmetals.chromium_lever": "Chromium Lever", + "tile.modernmetals.chromium_pressure_plate": "Chromium Pressure Plate", + "block.modernmetals.chromium_pressure_plate": "Chromium Pressure Plate", + "tile.modernmetals.chromium_slab": "Chromium Slab", + "block.modernmetals.chromium_slab": "Chromium Slab", + "tile.modernmetals.chromium_stairs": "Chromium Stairs", + "block.modernmetals.chromium_stairs": "Chromium Stairs", + "tile.modernmetals.chromium_wall": "Chromium Wall", + "block.modernmetals.chromium_wall": "Chromium Wall", + "item.modernmetals.galvanizedsteel_clump": "Galvanized Steel Clump", + "item.modernmetals.galvanizedsteel_crushed": "Crushed Galvanized Steel Ore", + "item.modernmetals.galvanizedsteel_crushed_purified": "Purified Crushed Galvanized Steel Ore", + "item.modernmetals.galvanizedsteel_crystal": "Galvanized Steel Crystal", + "item.modernmetals.galvanizedsteel_dense_plate": "Dense Plate o' Galvanized Steel", + "item.modernmetals.galvanizedsteel_powder_dirty": "Dirty Galvanized Steel Dust", + "item.modernmetals.galvanizedsteel_shard": "Galvanized Steel Shard", + "item.modernmetals.galvanizedsteel_button": "Galvanized Steel Button", + "item.modernmetals.galvanizedsteel_lever": "Galvanized Steel Lever", + "item.modernmetals.galvanizedsteel_pressure_plate": "Galvanized Steel Pressure Plate", + "item.modernmetals.galvanizedsteel_slab": "Galvanized Steel Slab", + "item.modernmetals.galvanizedsteel_stairs": "Galvanized Steel Stairs", + "item.modernmetals.galvanizedsteel_wall": "Galvanized Steel Wall", + "tile.modernmetals.galvanizedsteel_button": "Galvanized Steel Button", + "block.modernmetals.galvanizedsteel_button": "Galvanized Steel Button", + "tile.modernmetals.galvanizedsteel_lever": "Galvanized Steel Lever", + "block.modernmetals.galvanizedsteel_lever": "Galvanized Steel Lever", + "tile.modernmetals.galvanizedsteel_pressure_plate": "Galvanized Steel Pressure Plate", + "block.modernmetals.galvanizedsteel_pressure_plate": "Galvanized Steel Pressure Plate", + "tile.modernmetals.galvanizedsteel_slab": "Galvanized Steel Slab", + "block.modernmetals.galvanizedsteel_slab": "Galvanized Steel Slab", + "tile.modernmetals.galvanizedsteel_stairs": "Galvanized Steel Stairs", + "block.modernmetals.galvanizedsteel_stairs": "Galvanized Steel Stairs", + "tile.modernmetals.galvanizedsteel_wall": "Galvanized Steel Wall", + "block.modernmetals.galvanizedsteel_wall": "Galvanized Steel Wall", + "item.modernmetals.iridium_clump": "Iridium Clump", + "item.modernmetals.iridium_crushed": "Crushed Iridium Ore", + "item.modernmetals.iridium_crushed_purified": "Purified Crushed Iridium Ore", + "item.modernmetals.iridium_crystal": "Iridium Crystal", + "item.modernmetals.iridium_dense_plate": "Dense Plate o' Iridium", + "item.modernmetals.iridium_powder_dirty": "Dirty Iridium Dust", + "item.modernmetals.iridium_shard": "Iridium Shard", + "item.modernmetals.iridium_button": "Iridium Button", + "item.modernmetals.iridium_lever": "Iridium Lever", + "item.modernmetals.iridium_pressure_plate": "Iridium Pressure Plate", + "item.modernmetals.iridium_slab": "Iridium Slab", + "item.modernmetals.iridium_stairs": "Iridium Stairs", + "item.modernmetals.iridium_wall": "Iridium Wall", + "tile.modernmetals.iridium_button": "Iridium Button", + "block.modernmetals.iridium_button": "Iridium Button", + "tile.modernmetals.iridium_lever": "Iridium Lever", + "block.modernmetals.iridium_lever": "Iridium Lever", + "tile.modernmetals.iridium_pressure_plate": "Iridium Pressure Plate", + "block.modernmetals.iridium_pressure_plate": "Iridium Pressure Plate", + "tile.modernmetals.iridium_slab": "Iridium Slab", + "block.modernmetals.iridium_slab": "Iridium Slab", + "tile.modernmetals.iridium_stairs": "Iridium Stairs", + "block.modernmetals.iridium_stairs": "Iridium Stairs", + "tile.modernmetals.iridium_wall": "Iridium Wall", + "block.modernmetals.iridium_wall": "Iridium Wall", + "item.modernmetals.magnesium_clump": "Magnesium Clump", + "item.modernmetals.magnesium_crushed": "Crushed Magnesium Ore", + "item.modernmetals.magnesium_crushed_purified": "Purified Crushed Magnesium Ore", + "item.modernmetals.magnesium_crystal": "Magnesium Crystal", + "item.modernmetals.magnesium_dense_plate": "Dense Plate o' Magnesium", + "item.modernmetals.magnesium_powder_dirty": "Dirty Magnesium Dust", + "item.modernmetals.magnesium_shard": "Magnesium Shard", + "item.modernmetals.magnesium_button": "Magnesium Button", + "item.modernmetals.magnesium_lever": "Magnesium Lever", + "item.modernmetals.magnesium_pressure_plate": "Magnesium Pressure Plate", + "item.modernmetals.magnesium_slab": "Magnesium Slab", + "item.modernmetals.magnesium_stairs": "Magnesium Stairs", + "item.modernmetals.magnesium_wall": "Magnesium Wall", + "tile.modernmetals.magnesium_button": "Magnesium Button", + "block.modernmetals.magnesium_button": "Magnesium Button", + "tile.modernmetals.magnesium_lever": "Magnesium Lever", + "block.modernmetals.magnesium_lever": "Magnesium Lever", + "tile.modernmetals.magnesium_pressure_plate": "Magnesium Pressure Plate", + "block.modernmetals.magnesium_pressure_plate": "Magnesium Pressure Plate", + "tile.modernmetals.magnesium_slab": "Magnesium Slab", + "block.modernmetals.magnesium_slab": "Magnesium Slab", + "tile.modernmetals.magnesium_stairs": "Magnesium Stairs", + "block.modernmetals.magnesium_stairs": "Magnesium Stairs", + "tile.modernmetals.magnesium_wall": "Magnesium Wall", + "block.modernmetals.magnesium_wall": "Magnesium Wall", + "item.modernmetals.manganese_clump": "Manganese Clump", + "item.modernmetals.manganese_crushed": "Crushed Manganese Ore", + "item.modernmetals.manganese_crushed_purified": "Purified Crushed Manganese Ore", + "item.modernmetals.manganese_crystal": "Manganese Crystal", + "item.modernmetals.manganese_dense_plate": "Dense Plate o' Manganese", + "item.modernmetals.manganese_powder_dirty": "Dirty Manganese Dust", + "item.modernmetals.manganese_shard": "Manganese Shard", + "item.modernmetals.manganese_button": "Manganese Button", + "item.modernmetals.manganese_lever": "Manganese Lever", + "item.modernmetals.manganese_pressure_plate": "Manganese Pressure Plate", + "item.modernmetals.manganese_slab": "Manganese Slab", + "item.modernmetals.manganese_stairs": "Manganese Stairs", + "item.modernmetals.manganese_wall": "Manganese Wall", + "tile.modernmetals.manganese_button": "Manganese Button", + "block.modernmetals.manganese_button": "Manganese Button", + "tile.modernmetals.manganese_lever": "Manganese Lever", + "block.modernmetals.manganese_lever": "Manganese Lever", + "tile.modernmetals.manganese_pressure_plate": "Manganese Pressure Plate", + "block.modernmetals.manganese_pressure_plate": "Manganese Pressure Plate", + "tile.modernmetals.manganese_slab": "Manganese Slab", + "block.modernmetals.manganese_slab": "Manganese Slab", + "tile.modernmetals.manganese_stairs": "Manganese Stairs", + "block.modernmetals.manganese_stairs": "Manganese Stairs", + "tile.modernmetals.manganese_wall": "Manganese Wall", + "block.modernmetals.manganese_wall": "Manganese Wall", + "item.modernmetals.nichrome_clump": "Nichrome Clump", + "item.modernmetals.nichrome_crushed": "Crushed Nichrome Ore", + "item.modernmetals.nichrome_crushed_purified": "Purified Crushed Nichrome Ore", + "item.modernmetals.nichrome_crystal": "Nichrome Crystal", + "item.modernmetals.nichrome_dense_plate": "Dense Plate o' Nichrome", + "item.modernmetals.nichrome_powder_dirty": "Dirty Nichrome Dust", + "item.modernmetals.nichrome_shard": "Nichrome Shard", + "item.modernmetals.nichrome_button": "Nichrome Button", + "item.modernmetals.nichrome_lever": "Nichrome Lever", + "item.modernmetals.nichrome_pressure_plate": "Nichrome Pressure Plate", + "item.modernmetals.nichrome_slab": "Nichrome Slab", + "item.modernmetals.nichrome_stairs": "Nichrome Stairs", + "item.modernmetals.nichrome_wall": "Nichrome Wall", + "tile.modernmetals.nichrome_button": "Nichrome Button", + "block.modernmetals.nichrome_button": "Nichrome Button", + "tile.modernmetals.nichrome_lever": "Nichrome Lever", + "block.modernmetals.nichrome_lever": "Nichrome Lever", + "tile.modernmetals.nichrome_pressure_plate": "Nichrome Pressure Plate", + "block.modernmetals.nichrome_pressure_plate": "Nichrome Pressure Plate", + "tile.modernmetals.nichrome_slab": "Nichrome Slab", + "block.modernmetals.nichrome_slab": "Nichrome Slab", + "tile.modernmetals.nichrome_stairs": "Nichrome Stairs", + "block.modernmetals.nichrome_stairs": "Nichrome Stairs", + "tile.modernmetals.nichrome_wall": "Nichrome Wall", + "block.modernmetals.nichrome_wall": "Nichrome Wall", + "item.modernmetals.osmium_clump": "Osmium Clump", + "item.modernmetals.osmium_crushed": "Crushed Osmium Ore", + "item.modernmetals.osmium_crushed_purified": "Purified Crushed Osmium Ore", + "item.modernmetals.osmium_crystal": "Osmium Crystal", + "item.modernmetals.osmium_dense_plate": "Dense Plate o' Osmium", + "item.modernmetals.osmium_powder_dirty": "Dirty Osmium Dust", + "item.modernmetals.osmium_shard": "Osmium Shard", + "item.modernmetals.osmium_button": "Osmium Button", + "item.modernmetals.osmium_lever": "Osmium Lever", + "item.modernmetals.osmium_pressure_plate": "Osmium Pressure Plate", + "item.modernmetals.osmium_slab": "Osmium Slab", + "item.modernmetals.osmium_stairs": "Osmium Stairs", + "item.modernmetals.osmium_wall": "Osmium Wall", + "tile.modernmetals.osmium_button": "Osmium Button", + "block.modernmetals.osmium_button": "Osmium Button", + "tile.modernmetals.osmium_lever": "Osmium Lever", + "block.modernmetals.osmium_lever": "Osmium Lever", + "tile.modernmetals.osmium_pressure_plate": "Osmium Pressure Plate", + "block.modernmetals.osmium_pressure_plate": "Osmium Pressure Plate", + "tile.modernmetals.osmium_slab": "Osmium Slab", + "block.modernmetals.osmium_slab": "Osmium Slab", + "tile.modernmetals.osmium_stairs": "Osmium Stairs", + "block.modernmetals.osmium_stairs": "Osmium Stairs", + "tile.modernmetals.osmium_wall": "Osmium Wall", + "block.modernmetals.osmium_wall": "Osmium Wall", + "item.modernmetals.plutonium_clump": "Plutonium Clump", + "item.modernmetals.plutonium_crushed": "Crushed Plutonium Ore", + "item.modernmetals.plutonium_crushed_purified": "Purified Crushed Plutonium Ore", + "item.modernmetals.plutonium_crystal": "Plutonium Crystal", + "item.modernmetals.plutonium_dense_plate": "Dense Plate o' Plutonium", + "item.modernmetals.plutonium_powder_dirty": "Dirty Plutonium Dust", + "item.modernmetals.plutonium_shard": "Plutonium Shard", + "item.modernmetals.plutonium_button": "Plutonium Button", + "item.modernmetals.plutonium_lever": "Plutonium Lever", + "item.modernmetals.plutonium_pressure_plate": "Plutonium Pressure Plate", + "item.modernmetals.plutonium_slab": "Plutonium Slab", + "item.modernmetals.plutonium_stairs": "Plutonium Stairs", + "item.modernmetals.plutonium_wall": "Plutonium Wall", + "tile.modernmetals.plutonium_button": "Plutonium Button", + "block.modernmetals.plutonium_button": "Plutonium Button", + "tile.modernmetals.plutonium_lever": "Plutonium Lever", + "block.modernmetals.plutonium_lever": "Plutonium Lever", + "tile.modernmetals.plutonium_pressure_plate": "Plutonium Pressure Plate", + "block.modernmetals.plutonium_pressure_plate": "Plutonium Pressure Plate", + "tile.modernmetals.plutonium_slab": "Plutonium Slab", + "block.modernmetals.plutonium_slab": "Plutonium Slab", + "tile.modernmetals.plutonium_stairs": "Plutonium Stairs", + "block.modernmetals.plutonium_stairs": "Plutonium Stairs", + "tile.modernmetals.plutonium_wall": "Plutonium Wall", + "block.modernmetals.plutonium_wall": "Plutonium Wall", + "item.modernmetals.rutile_clump": "Rutile Clump", + "item.modernmetals.rutile_crushed": "Crushed Rutile Ore", + "item.modernmetals.rutile_crushed_purified": "Purified Crushed Rutile Ore", + "item.modernmetals.rutile_crystal": "Rutile Crystal", + "item.modernmetals.rutile_dense_plate": "Dense Plate o' Rutile", + "item.modernmetals.rutile_powder_dirty": "Dirty Rutile Dust", + "item.modernmetals.rutile_shard": "Rutile Shard", + "item.modernmetals.rutile_button": "Rutile Button", + "item.modernmetals.rutile_lever": "Rutile Lever", + "item.modernmetals.rutile_pressure_plate": "Rutile Pressure Plate", + "item.modernmetals.rutile_slab": "Rutile Slab", + "item.modernmetals.rutile_stairs": "Rutile Stairs", + "item.modernmetals.rutile_wall": "Rutile Wall", + "tile.modernmetals.rutile_button": "Rutile Button", + "block.modernmetals.rutile_button": "Rutile Button", + "tile.modernmetals.rutile_lever": "Rutile Lever", + "block.modernmetals.rutile_lever": "Rutile Lever", + "tile.modernmetals.rutile_pressure_plate": "Rutile Pressure Plate", + "block.modernmetals.rutile_pressure_plate": "Rutile Pressure Plate", + "tile.modernmetals.rutile_slab": "Rutile Slab", + "block.modernmetals.rutile_slab": "Rutile Slab", + "tile.modernmetals.rutile_stairs": "Rutile Stairs", + "block.modernmetals.rutile_stairs": "Rutile Stairs", + "tile.modernmetals.rutile_wall": "Rutile Wall", + "block.modernmetals.rutile_wall": "Rutile Wall", + "item.modernmetals.stainlesssteel_clump": "Stainless Steel Clump", + "item.modernmetals.stainlesssteel_crushed": "Crushed Stainless Steel Ore", + "item.modernmetals.stainlesssteel_crushed_purified": "Purified Crushed Stainless Steel Ore", + "item.modernmetals.stainlesssteel_crystal": "Stainless Steel Crystal", + "item.modernmetals.stainlesssteel_dense_plate": "Dense Plate o' Stainless Steel", + "item.modernmetals.stainlesssteel_powder_dirty": "Dirty Stainless Steel Dust", + "item.modernmetals.stainlesssteel_shard": "Stainless Steel Shard", + "item.modernmetals.stainlesssteel_button": "Stainless Steel Button", + "item.modernmetals.stainlesssteel_lever": "Stainless Steel Lever", + "item.modernmetals.stainlesssteel_pressure_plate": "Stainless Steel Pressure Plate", + "item.modernmetals.stainlesssteel_slab": "Stainless Steel Slab", + "item.modernmetals.stainlesssteel_stairs": "Stainless Steel Stairs", + "item.modernmetals.stainlesssteel_wall": "Stainless Steel Wall", + "tile.modernmetals.stainlesssteel_button": "Stainless Steel Button", + "block.modernmetals.stainlesssteel_button": "Stainless Steel Button", + "tile.modernmetals.stainlesssteel_lever": "Stainless Steel Lever", + "block.modernmetals.stainlesssteel_lever": "Stainless Steel Lever", + "tile.modernmetals.stainlesssteel_pressure_plate": "Stainless Steel Pressure Plate", + "block.modernmetals.stainlesssteel_pressure_plate": "Stainless Steel Pressure Plate", + "tile.modernmetals.stainlesssteel_slab": "Stainless Steel Slab", + "block.modernmetals.stainlesssteel_slab": "Stainless Steel Slab", + "tile.modernmetals.stainlesssteel_stairs": "Stainless Steel Stairs", + "block.modernmetals.stainlesssteel_stairs": "Stainless Steel Stairs", + "tile.modernmetals.stainlesssteel_wall": "Stainless Steel Wall", + "block.modernmetals.stainlesssteel_wall": "Stainless Steel Wall", + "item.modernmetals.tantalum_clump": "Tantalum Clump", + "item.modernmetals.tantalum_crushed": "Crushed Tantalum Ore", + "item.modernmetals.tantalum_crushed_purified": "Purified Crushed Tantalum Ore", + "item.modernmetals.tantalum_crystal": "Tantalum Crystal", + "item.modernmetals.tantalum_dense_plate": "Dense Plate o' Tantalum", + "item.modernmetals.tantalum_powder_dirty": "Dirty Tantalum Dust", + "item.modernmetals.tantalum_shard": "Tantalum Shard", + "item.modernmetals.tantalum_button": "Tantalum Button", + "item.modernmetals.tantalum_lever": "Tantalum Lever", + "item.modernmetals.tantalum_pressure_plate": "Tantalum Pressure Plate", + "item.modernmetals.tantalum_slab": "Tantalum Slab", + "item.modernmetals.tantalum_stairs": "Tantalum Stairs", + "item.modernmetals.tantalum_wall": "Tantalum Wall", + "tile.modernmetals.tantalum_button": "Tantalum Button", + "block.modernmetals.tantalum_button": "Tantalum Button", + "tile.modernmetals.tantalum_lever": "Tantalum Lever", + "block.modernmetals.tantalum_lever": "Tantalum Lever", + "tile.modernmetals.tantalum_pressure_plate": "Tantalum Pressure Plate", + "block.modernmetals.tantalum_pressure_plate": "Tantalum Pressure Plate", + "tile.modernmetals.tantalum_slab": "Tantalum Slab", + "block.modernmetals.tantalum_slab": "Tantalum Slab", + "tile.modernmetals.tantalum_stairs": "Tantalum Stairs", + "block.modernmetals.tantalum_stairs": "Tantalum Stairs", + "tile.modernmetals.tantalum_wall": "Tantalum Wall", + "block.modernmetals.tantalum_wall": "Tantalum Wall", + "item.modernmetals.titanium_clump": "Titanium Clump", + "item.modernmetals.titanium_crushed": "Crushed Titanium Ore", + "item.modernmetals.titanium_crushed_purified": "Purified Crushed Titanium Ore", + "item.modernmetals.titanium_crystal": "Titanium Crystal", + "item.modernmetals.titanium_dense_plate": "Dense Plate o' Titanium", + "item.modernmetals.titanium_powder_dirty": "Dirty Titanium Dust", + "item.modernmetals.titanium_shard": "Titanium Shard", + "item.modernmetals.titanium_button": "Titanium Button", + "item.modernmetals.titanium_lever": "Titanium Lever", + "item.modernmetals.titanium_pressure_plate": "Titanium Pressure Plate", + "item.modernmetals.titanium_slab": "Titanium Slab", + "item.modernmetals.titanium_stairs": "Titanium Stairs", + "item.modernmetals.titanium_wall": "Titanium Wall", + "tile.modernmetals.titanium_button": "Titanium Button", + "block.modernmetals.titanium_button": "Titanium Button", + "tile.modernmetals.titanium_lever": "Titanium Lever", + "block.modernmetals.titanium_lever": "Titanium Lever", + "tile.modernmetals.titanium_pressure_plate": "Titanium Pressure Plate", + "block.modernmetals.titanium_pressure_plate": "Titanium Pressure Plate", + "tile.modernmetals.titanium_slab": "Titanium Slab", + "block.modernmetals.titanium_slab": "Titanium Slab", + "tile.modernmetals.titanium_stairs": "Titanium Stairs", + "block.modernmetals.titanium_stairs": "Titanium Stairs", + "tile.modernmetals.titanium_wall": "Titanium Wall", + "block.modernmetals.titanium_wall": "Titanium Wall", + "item.modernmetals.tungsten_clump": "Tungsten Clump", + "item.modernmetals.tungsten_crushed": "Crushed Tungsten Ore", + "item.modernmetals.tungsten_crushed_purified": "Purified Crushed Tungsten Ore", + "item.modernmetals.tungsten_crystal": "Tungsten Crystal", + "item.modernmetals.tungsten_dense_plate": "Dense Plate o' Tungsten", + "item.modernmetals.tungsten_powder_dirty": "Dirty Tungsten Dust", + "item.modernmetals.tungsten_shard": "Tungsten Shard", + "item.modernmetals.tungsten_button": "Tungsten Button", + "item.modernmetals.tungsten_lever": "Tungsten Lever", + "item.modernmetals.tungsten_pressure_plate": "Tungsten Pressure Plate", + "item.modernmetals.tungsten_slab": "Tungsten Slab", + "item.modernmetals.tungsten_stairs": "Tungsten Stairs", + "item.modernmetals.tungsten_wall": "Tungsten Wall", + "tile.modernmetals.tungsten_button": "Tungsten Button", + "block.modernmetals.tungsten_button": "Tungsten Button", + "tile.modernmetals.tungsten_lever": "Tungsten Lever", + "block.modernmetals.tungsten_lever": "Tungsten Lever", + "tile.modernmetals.tungsten_pressure_plate": "Tungsten Pressure Plate", + "block.modernmetals.tungsten_pressure_plate": "Tungsten Pressure Plate", + "tile.modernmetals.tungsten_slab": "Tungsten Slab", + "block.modernmetals.tungsten_slab": "Tungsten Slab", + "tile.modernmetals.tungsten_stairs": "Tungsten Stairs", + "block.modernmetals.tungsten_stairs": "Tungsten Stairs", + "tile.modernmetals.tungsten_wall": "Tungsten Wall", + "block.modernmetals.tungsten_wall": "Tungsten Wall", + "item.modernmetals.uranium_clump": "Uranium Clump", + "item.modernmetals.uranium_crushed": "Crushed Uranium Ore", + "item.modernmetals.uranium_crushed_purified": "Purified Crushed Uranium Ore", + "item.modernmetals.uranium_crystal": "Uranium Crystal", + "item.modernmetals.uranium_dense_plate": "Dense Plate o' Uranium", + "item.modernmetals.uranium_powder_dirty": "Dirty Uranium Dust", + "item.modernmetals.uranium_shard": "Uranium Shard", + "item.modernmetals.uranium_button": "Uranium Button", + "item.modernmetals.uranium_lever": "Uranium Lever", + "item.modernmetals.uranium_pressure_plate": "Uranium Pressure Plate", + "item.modernmetals.uranium_slab": "Uranium Slab", + "item.modernmetals.uranium_stairs": "Uranium Stairs", + "item.modernmetals.uranium_wall": "Uranium Wall", + "tile.modernmetals.uranium_button": "Uranium Button", + "block.modernmetals.uranium_button": "Uranium Button", + "tile.modernmetals.uranium_lever": "Uranium Lever", + "block.modernmetals.uranium_lever": "Uranium Lever", + "tile.modernmetals.uranium_pressure_plate": "Uranium Pressure Plate", + "block.modernmetals.uranium_pressure_plate": "Uranium Pressure Plate", + "tile.modernmetals.uranium_slab": "Uranium Slab", + "block.modernmetals.uranium_slab": "Uranium Slab", + "tile.modernmetals.uranium_stairs": "Uranium Stairs", + "block.modernmetals.uranium_stairs": "Uranium Stairs", + "tile.modernmetals.uranium_wall": "Uranium Wall", + "block.modernmetals.uranium_wall": "Uranium Wall", + "item.modernmetals.zirconium_clump": "Zirconium Clump", + "item.modernmetals.zirconium_crushed": "Crushed Zirconium Ore", + "item.modernmetals.zirconium_crushed_purified": "Purified Crushed Zirconium Ore", + "item.modernmetals.zirconium_crystal": "Zirconium Crystal", + "item.modernmetals.zirconium_dense_plate": "Dense Plate o' Zirconium", + "item.modernmetals.zirconium_powder_dirty": "Dirty Zirconium Dust", + "item.modernmetals.zirconium_shard": "Zirconium Shard", + "item.modernmetals.zirconium_button": "Zirconium Button", + "item.modernmetals.zirconium_lever": "Zirconium Lever", + "item.modernmetals.zirconium_pressure_plate": "Zirconium Pressure Plate", + "item.modernmetals.zirconium_slab": "Zirconium Slab", + "item.modernmetals.zirconium_stairs": "Zirconium Stairs", + "item.modernmetals.zirconium_wall": "Zirconium Wall", + "tile.modernmetals.zirconium_button": "Zirconium Button", + "block.modernmetals.zirconium_button": "Zirconium Button", + "tile.modernmetals.zirconium_lever": "Zirconium Lever", + "block.modernmetals.zirconium_lever": "Zirconium Lever", + "tile.modernmetals.zirconium_pressure_plate": "Zirconium Pressure Plate", + "block.modernmetals.zirconium_pressure_plate": "Zirconium Pressure Plate", + "tile.modernmetals.zirconium_slab": "Zirconium Slab", + "block.modernmetals.zirconium_slab": "Zirconium Slab", + "tile.modernmetals.zirconium_stairs": "Zirconium Stairs", + "block.modernmetals.zirconium_stairs": "Zirconium Stairs", + "tile.modernmetals.zirconium_wall": "Zirconium Wall", + "block.modernmetals.zirconium_wall": "Zirconium Wall", + "material.thorium": "Thorium", + "item.modernmetals.thorium_arrow": "Thorium Arrow", + "item.modernmetals.thorium_axe": "Thorium Axe", + "item.modernmetals.thorium_bars": "Thorium Bars", + "item.modernmetals.thorium_blend": "Thorium Blend", + "item.modernmetals.thorium_block": "Block o' Thorium", + "item.modernmetals.thorium_boots": "Thorium Boots", + "item.modernmetals.thorium_bolt": "Thorium Bolt", + "item.modernmetals.thorium_bow": "Thorium Bow", + "item.modernmetals.thorium_chestplate": "Thorium Chestplate", + "item.modernmetals.thorium_crackhammer": "Thorium Crack Hammer", + "item.modernmetals.thorium_crossbow": "Thorium Crossbow", + "item.modernmetals.thorium_door": "Thorium Door", + "item.modernmetals.thorium_fishing_rod": "Thorium Fishing Rod", + "item.modernmetals.thorium_gear": "Thorium Gear", + "item.modernmetals.thorium_helmet": "Thorium Helmet", + "item.modernmetals.thorium_hoe": "Thorium Hoe", + "item.modernmetals.thorium_horse_armor": "Thorium Horse Armor", + "item.modernmetals.thorium_ingot": "Thorium Ingot", + "item.modernmetals.thorium_leggings": "Thorium Leg Armor", + "item.modernmetals.thorium_nugget": "Thorium Nugget", + "item.modernmetals.thorium_ore": "Thorium Ore", + "item.modernmetals.thorium_pickaxe": "Thorium Pickaxe", + "item.modernmetals.thorium_powder": "Thorium Dust", + "item.modernmetals.thorium_rod": "Thorium Rod", + "item.modernmetals.thorium_shears": "Thorium Shears", + "item.modernmetals.thorium_shield": "Thorium Shield", + "item.modernmetals.thorium_shovel": "Thorium Shovel", + "item.modernmetals.thorium_smallblend": "Tiny Pile o' Thorium Blend", + "item.modernmetals.thorium_smallpowder": "Tiny Pile o' Thorium Dust", + "item.modernmetals.thorium_sword": "Thorium Sword", + "item.modernmetals.thorium_trapdoor": "Thorium Trapdoor", + "tile.modernmetals.thorium_bars": "Thorium Bars", + "block.modernmetals.thorium_bars": "Thorium Bars", + "tile.modernmetals.thorium_block": "Block o' Thorium", + "block.modernmetals.thorium_block": "Block o' Thorium", + "tile.modernmetals.thorium_door": "Thorium Door", + "block.modernmetals.thorium_door": "Thorium Door", + "tile.modernmetals.thorium_ore": "Thorium Ore", + "block.modernmetals.thorium_ore": "Thorium Ore", + "tile.modernmetals.thorium_plate": "Plate o' Thorium", + "block.modernmetals.thorium_plate": "Plate o' Thorium", + "tile.modernmetals.thorium_trapdoor": "Thorium Trapdoor", + "block.modernmetals.thorium_trapdoor": "Thorium Trapdoor", + "fluid.modernmetals.thorium": "Molten Thorium", + "tile.modernmetals.thorium": "Molten Thorium", + "block.modernmetals.thorium": "Molten Thorium", + "item.modernmetals.thorium_clump": "Thorium Clump", + "item.modernmetals.thorium_crushed": "Crushed Thorium Ore", + "item.modernmetals.thorium_crushed_purified": "Purified Crushed Thorium Ore", + "item.modernmetals.thorium_crystal": "Thorium Crystal", + "item.modernmetals.thorium_dense_plate": "Dense Plate o' Thorium", + "item.modernmetals.thorium_powder_dirty": "Dirty Thorium Dust", + "item.modernmetals.thorium_shard": "Thorium Shard", + "item.modernmetals.thorium_button": "Thorium Button", + "item.modernmetals.thorium_lever": "Thorium Lever", + "item.modernmetals.thorium_pressure_plate": "Thorium Pressure Plate", + "item.modernmetals.thorium_slab": "Thorium Slab", + "item.modernmetals.thorium_stairs": "Thorium Stairs", + "item.modernmetals.thorium_wall": "Thorium Wall", + "tile.modernmetals.thorium_button": "Thorium Button", + "block.modernmetals.thorium_button": "Thorium Button", + "tile.modernmetals.thorium_lever": "Thorium Lever", + "block.modernmetals.thorium_lever": "Thorium Lever", + "tile.modernmetals.thorium_pressure_plate": "Thorium Pressure Plate", + "block.modernmetals.thorium_pressure_plate": "Thorium Pressure Plate", + "tile.modernmetals.thorium_slab": "Thorium Slab", + "block.modernmetals.thorium_slab": "Thorium Slab", + "tile.modernmetals.thorium_stairs": "Thorium Stairs", + "block.modernmetals.thorium_stairs": "Thorium Stairs", + "tile.modernmetals.thorium_wall": "Thorium Wall", + "block.modernmetals.thorium_wall": "Thorium Wall", + "item.modernmetals.aluminum_casing": "Aluminum Item Casing", + "item.modernmetals.aluminumbrass_casing": "Aluminum Brass Item Casing", + "item.modernmetals.boron_casing": "Boron Item Casing", + "item.modernmetals.beryllium_casing": "Beryllium Item Casing", + "item.modernmetals.cadmium_casing": "Cadmium Item Casing", + "item.modernmetals.chromium_casing": "Chromium Item Casing", + "item.modernmetals.galvanizedsteel_casing": "Galvanized Steel Item Casing", + "item.modernmetals.iridium_casing": "Iridium Item Casing", + "item.modernmetals.magnesium_casing": "Magnesium Item Casing", + "item.modernmetals.manganese_casing": "Manganese Item Casing", + "item.modernmetals.osmium_casing": "Osmium Item Casing", + "item.modernmetals.plutonium_casing": "Plutonium Item Casing", + "item.modernmetals.rutile_casing": "Rutile Item Casing", + "item.modernmetals.stainlesssteel_casing": "Stainless Steel Item Casing", + "item.modernmetals.tantalum_casing": "Tantalum Item Casing", + "item.modernmetals.thorium_casing": "Thorium Item Casing", + "item.modernmetals.titanium_casing": "Titanium Item Casing", + "item.modernmetals.tungsten_casing": "Tungsten Item Casing", + "item.modernmetals.uranium_casing": "Uranium Item Casing", + "item.modernmetals.zirconium_casing": "Zirconium Item Casing", + "item.modernmetals.aluminumbrass_scythe": "Aluminum Brass Sickle", + "item.modernmetals.aluminum_scythe": "Aluminum Sickle", + "item.modernmetals.beryllium_scythe": "Beryllium Sickle", + "item.modernmetals.boron_scythe": "Boron Sickle", + "item.modernmetals.cadmium_scythe": "Cadmium Sickle", + "item.modernmetals.chromium_scythe": "Chromium Sickle", + "item.modernmetals.galvanizedsteel_scythe": "Galvanized Steel Sickle", + "item.modernmetals.iridium_scythe": "Iridium Sickle", + "item.modernmetals.magnesium_scythe": "Magnesium Sickle", + "item.modernmetals.manganese_scythe": "Manganese Sickle", + "item.modernmetals.nichrome_scythe": "Nichrome Sickle", + "item.modernmetals.osmium_scythe": "Osmium Sickle", + "item.modernmetals.plutonium_scythe": "Plutonium Sickle", + "item.modernmetals.rutile_scythe": "Rutile Sickle", + "item.modernmetals.stainlesssteel_scythe": "Stainless Steel Sickle", + "item.modernmetals.tantalum_scythe": "Tantalum Sickle", + "item.modernmetals.thorium_scythe": "Thorium Sickle", + "item.modernmetals.titanium_scythe": "Titanium Sickle", + "item.modernmetals.tungsten_scythe": "Tungsten Sickle", + "item.modernmetals.uranium_scythe": "Uranium Sickle", + "item.modernmetals.zirconium_scythe": "Zirconium Sickle", + "gas.gasAluminum": "Aluminum Slurry", + "gas.gasBeryllium": "Beryllium Slurry", + "gas.gasBoron": "Boron Slurry", + "gas.gasCadmium": "Cadmium Slurry", + "gas.gasChromium": "Chromium Slurry", + "gas.gasIridium": "Iridium Slurry", + "gas.gasMagnesium": "Magnesium Slurry", + "gas.gasManganese": "Manganese Slurry", + "gas.gasPlutonium": "Plutonium Slurry", + "gas.gasRutile": "Rutile Slurry", + "gas.gasTantalum": "Tantalum Slurry", + "gas.gasThorium": "Thorium Slurry", + "gas.gasTitanium": "Titanium Slurry", + "gas.gasTungsten": "Tungsten Slurry", + "gas.gasUranium": "Uranium Slurry", + "gas.gasZirconium": "Zirconium Slurry", + "gas.cleanGasAluminum": "Clean Aluminum Slurry", + "gas.cleanGasBeryllium": "Clean Beryllium Slurry", + "gas.cleanGasBoron": "Clean Boron Slurry", + "gas.cleanGasCadmium": "Clean Cadmium Slurry", + "gas.cleanGasChromium": "Clean Chromium Slurry", + "gas.cleanGasIridium": "Clean Iridium Slurry", + "gas.cleanGasMagnesium": "Clean Magnesium Slurry", + "gas.cleanGasManganese": "Clean Manganese Slurry", + "gas.cleanGasPlutonium": "Clean Plutonium Slurry", + "gas.cleanGasRutile": "Clean Rutile Slurry", + "gas.cleanGasTantalum": "Clean Tantalum Slurry", + "gas.cleanGasThorium": "Clean Thorium Slurry", + "gas.cleanGasTitanium": "Clean Titanium Slurry", + "gas.cleanGasTungsten": "Clean Tungsten Slurry", + "gas.cleanGasUranium": "Clean Uranium Slurry", + "gas.cleanGasZirconium": "Clean Zirconium Slurry", + "gas.gasAdamantine": "Adamantine Slurry", + "gas.gasAntimony": "Antimony Slurry", + "gas.gasBismuth": "Bismuth Slurry", + "gas.gasColdiron": "Cold-Iron Slurry", + "gas.gasPlatinum": "Platinum Slurry", + "gas.gasNickel": "Nickel Slurry", + "gas.gasStarsteel": "Star-Steel Slurry", + "gas.gasZinc": "Zinc Slurry", + "gas.cleanGasAdamantine": "Clean Adamantine Slurry", + "gas.cleanGasAntimony": "Clean Antimony Slurry", + "gas.cleanGasBismuth": "Clean Bismuth Slurry", + "gas.cleanGasColdiron": "Clean Cold-Iron Slurry", + "gas.cleanGasPlatinum": "Clean Platinum Slurry", + "gas.cleanGasNickel": "Clean Nickel Slurry", + "gas.cleanGasStarsteel": "Clean Star-Steel Slurry", + "gas.cleanGasZinc": "Clean Zinc Slurry", + "config.modernmetals.title": "Modern Metals", + "config.modernmetals.description": "Restart to apply changes. Edit ores in OreSpawn.", + "config.modernmetals.content_mode": "Fantasy Level", + "config.modernmetals.content_mode.tooltip": "High Fantasy keeps all recipes. Low Fantasy restricts unrealistic equipment and structures. Requires a game restart.", + "high_fantasy": "High Fantasy", + "low_fantasy": "Low Fantasy", + "config.modernmetals.enable_thorium": "Enable Thorium", + "config.modernmetals.enable_boron": "Enable Boron", + "config.modernmetals.enable_beryllium": "Enable Beryllium", + "config.modernmetals.enable_cadmium": "Enable Cadmium", + "config.modernmetals.enable_nichrome": "Enable Nichrome", + "config.modernmetals.enable_aluminum": "Enable Aluminum", + "config.modernmetals.enable_aluminumbrass": "Enable Aluminum Brass", + "config.modernmetals.enable_chromium": "Enable Chromium", + "config.modernmetals.enable_galvanizedsteel": "Enable Galvanized Steel", + "config.modernmetals.enable_iridium": "Enable Iridium", + "config.modernmetals.enable_magnesium": "Enable Magnesium", + "config.modernmetals.enable_manganese": "Enable Manganese", + "config.modernmetals.enable_osmium": "Enable Osmium", + "config.modernmetals.enable_plutonium": "Enable Plutonium", + "config.modernmetals.enable_rutile": "Enable Rutile", + "config.modernmetals.enable_stainlesssteel": "Enable Stainless Steel", + "config.modernmetals.enable_tantalum": "Enable Tantalum", + "config.modernmetals.enable_titanium": "Enable Titanium", + "config.modernmetals.enable_tungsten": "Enable Tungsten", + "config.modernmetals.enable_uranium": "Enable Uranium", + "config.modernmetals.enable_zirconium": "Enable Zirconium", + "config.modernmetals.material.tooltip": "Controls which blocks, items and recipes are available for this material. Requires a game restart.", + "config.modernmetals.villager_trades": "Villager Trades", + "config.modernmetals.villager_trades.tooltip": "Let blacksmiths trade Modern Metals ingots and equipment. Requires a game restart.", + "config.modernmetals.connection.mismatch": "The server uses %s, but your game uses %s. Match the Fantasy Level in your mod settings and restart.", + "config.modernmetals.connection.protocol": "Modern Metals could not check the Fantasy Level. Use the same Modern Metals build on the server and client.", + "config.modernmetals.content_mode.high_fantasy": "High Fantasy", + "config.modernmetals.content_mode.low_fantasy": "Low Fantasy", + "config.modernmetals.inherited_mode": "Fantasy Level is set in Base Metals. Restart after changing settings." +} diff --git a/src/main/resources/assets/modernmetals/lang/en_us.json b/src/main/resources/assets/modernmetals/lang/en_us.json new file mode 100644 index 00000000..22483af7 --- /dev/null +++ b/src/main/resources/assets/modernmetals/lang/en_us.json @@ -0,0 +1,1771 @@ +{ + "item.modernmetals.nichrome_casing": "Nichrome Item Casing", + "item.modernmetals.coal_powder": "Coal Dust", + "itemGroup.modernmetals.blocks": "Modern Metals Blocks", + "itemGroup.modernmetals.combat": "Modern Metals Combat", + "itemGroup.modernmetals.items": "Modern Metals Items", + "itemGroup.modernmetals.tools": "Modern Metals Tools", + "nei.modernmetals.recipehandler.crusher": "Crushed Blocks/Items", + "material.aluminum": "Aluminum", + "item.modernmetals.aluminum_arrow": "Aluminum Arrow", + "item.modernmetals.aluminum_axe": "Aluminum Axe", + "item.modernmetals.aluminum_bars": "Aluminum Bars", + "item.modernmetals.aluminum_blend": "Aluminum Blend", + "item.modernmetals.aluminum_block": "Block of Aluminum", + "item.modernmetals.aluminum_boots": "Aluminum Boots", + "item.modernmetals.aluminum_bolt": "Aluminum Bolt", + "item.modernmetals.aluminum_bow": "Aluminum Bow", + "item.modernmetals.aluminum_chestplate": "Aluminum Chestplate", + "item.modernmetals.aluminum_crackhammer": "Aluminum Crack Hammer", + "item.modernmetals.aluminum_crossbow": "Aluminum Crossbow", + "item.modernmetals.aluminum_door": "Aluminum Door", + "item.modernmetals.aluminum_fishing_rod": "Aluminum Fishing Rod", + "item.modernmetals.aluminum_gear": "Aluminum Gear", + "item.modernmetals.aluminum_helmet": "Aluminum Helmet", + "item.modernmetals.aluminum_hoe": "Aluminum Hoe", + "item.modernmetals.aluminum_horse_armor": "Aluminum Horse Armor", + "item.modernmetals.aluminum_ingot": "Aluminum Ingot", + "item.modernmetals.aluminum_leggings": "Aluminum Leg Armor", + "item.modernmetals.aluminum_nugget": "Aluminum Nugget", + "item.modernmetals.aluminum_ore": "Aluminum Ore", + "item.modernmetals.aluminum_pickaxe": "Aluminum Pickaxe", + "item.modernmetals.aluminum_powder": "Aluminum Dust", + "item.modernmetals.aluminum_rod": "Aluminum Rod", + "item.modernmetals.aluminum_shears": "Aluminum Shears", + "item.modernmetals.aluminum_shield": "Aluminum Shield", + "item.modernmetals.aluminum_shovel": "Aluminum Shovel", + "item.modernmetals.aluminum_smallblend": "Tiny Pile of Aluminum Blend", + "item.modernmetals.aluminum_smallpowder": "Tiny Pile of Aluminum Dust", + "item.modernmetals.aluminum_sword": "Aluminum Sword", + "item.modernmetals.aluminum_trapdoor": "Aluminum Trapdoor", + "material.aluminumbrass": "Aluminum Brass", + "item.modernmetals.aluminumbrass_arrow": "Aluminum Brass Arrow", + "item.modernmetals.aluminumbrass_axe": "Aluminum Brass Axe", + "item.modernmetals.aluminumbrass_bars": "Aluminum Brass Bars", + "item.modernmetals.aluminumbrass_blend": "Aluminum Brass Blend", + "item.modernmetals.aluminumbrass_block": "Block of Aluminum Brass", + "item.modernmetals.aluminumbrass_boots": "Aluminum Brass Boots", + "item.modernmetals.aluminumbrass_bolt": "Aluminum Brass Bolt", + "item.modernmetals.aluminumbrass_bow": "Aluminum Brass Bow", + "item.modernmetals.aluminumbrass_chestplate": "Aluminum Brass Chestplate", + "item.modernmetals.aluminumbrass_crackhammer": "Aluminum Brass Crack Hammer", + "item.modernmetals.aluminumbrass_crossbow": "Aluminum Brass Crossbow", + "item.modernmetals.aluminumbrass_door": "Aluminum Brass Door", + "item.modernmetals.aluminumbrass_fishing_rod": "Aluminum Brass Fishing Rod", + "item.modernmetals.aluminumbrass_gear": "Aluminum Brass Gear", + "item.modernmetals.aluminumbrass_helmet": "Aluminum Brass Helmet", + "item.modernmetals.aluminumbrass_hoe": "Aluminum Brass Hoe", + "item.modernmetals.aluminumbrass_horse_armor": "Aluminum Brass Horse Armor", + "item.modernmetals.aluminumbrass_ingot": "Aluminum Brass Ingot", + "item.modernmetals.aluminumbrass_leggings": "Aluminum Brass Leg Armor", + "item.modernmetals.aluminumbrass_nugget": "Aluminum Brass Nugget", + "item.modernmetals.aluminumbrass_ore": "Aluminum Brass Ore", + "item.modernmetals.aluminumbrass_pickaxe": "Aluminum Brass Pickaxe", + "item.modernmetals.aluminumbrass_powder": "Aluminum Brass Dust", + "item.modernmetals.aluminumbrass_rod": "Aluminum Brass Rod", + "item.modernmetals.aluminumbrass_shears": "Aluminum Brass Shears", + "item.modernmetals.aluminumbrass_shield": "Aluminum Brass Shield", + "item.modernmetals.aluminumbrass_shovel": "Aluminum Brass Shovel", + "item.modernmetals.aluminumbrass_smallblend": "Tiny Pile of Aluminum Brass Blend", + "item.modernmetals.aluminumbrass_smallpowder": "Tiny Pile of Aluminum Brass Dust", + "item.modernmetals.aluminumbrass_sword": "Aluminum Brass Sword", + "item.modernmetals.aluminumbrass_trapdoor": "Aluminum Brass Trapdoor", + "material.antimony": "Antimony", + "item.modernmetals.antimony_arrow": "Antimony Arrow", + "item.modernmetals.antimony_axe": "Antimony Axe", + "item.modernmetals.antimony_bars": "Antimony Bars", + "item.modernmetals.antimony_block": "Block of Antimony", + "item.modernmetals.antimony_boots": "Antimony Boots", + "item.modernmetals.antimony_chestplate": "Antimony Chestplate", + "item.modernmetals.antimony_crackhammer": "Antimony Crack Hammer", + "item.modernmetals.antimony_door": "Antimony Door", + "item.modernmetals.antimony_helmet": "Antimony Helmet", + "item.modernmetals.antimony_hoe": "Antimony Hoe", + "item.modernmetals.antimony_ingot": "Antimony Ingot", + "item.modernmetals.antimony_leggings": "Antimony Leg Armor", + "item.modernmetals.antimony_nugget": "Antimony Nugget", + "item.modernmetals.antimony_ore": "Antimony Ore", + "item.modernmetals.antimony_pickaxe": "Antimony Pickaxe", + "item.modernmetals.antimony_powder": "Antimony Dust", + "item.modernmetals.antimony_shears": "Antimony Shears", + "item.modernmetals.antimony_shield": "Antimony Shield", + "item.modernmetals.antimony_shovel": "Antimony Shovel", + "item.modernmetals.antimony_smallpowder": "Tiny Pile of Antimony Dust", + "item.modernmetals.antimony_sword": "Antimony Sword", + "item.modernmetals.antimony_trapdoor": "Antimony Trapdoor", + "material.beryllium": "Beryllium", + "item.modernmetals.beryllium_arrow": "Beryllium Arrow", + "item.modernmetals.beryllium_axe": "Beryllium Axe", + "item.modernmetals.beryllium_bars": "Beryllium Bars", + "item.modernmetals.beryllium_blend": "Beryllium Blend", + "item.modernmetals.beryllium_block": "Block of Beryllium", + "item.modernmetals.beryllium_boots": "Beryllium Boots", + "item.modernmetals.beryllium_bolt": "Beryllium Bolt", + "item.modernmetals.beryllium_bow": "Beryllium Bow", + "item.modernmetals.beryllium_chestplate": "Beryllium Chestplate", + "item.modernmetals.beryllium_crackhammer": "Beryllium Crack Hammer", + "item.modernmetals.beryllium_crossbow": "Beryllium Crossbow", + "item.modernmetals.beryllium_door": "Beryllium Door", + "item.modernmetals.beryllium_fishing_rod": "Beryllium Fishing Rod", + "item.modernmetals.beryllium_gear": "Beryllium Gear", + "item.modernmetals.beryllium_helmet": "Beryllium Helmet", + "item.modernmetals.beryllium_hoe": "Beryllium Hoe", + "item.modernmetals.beryllium_horse_armor": "Beryllium Horse Armor", + "item.modernmetals.beryllium_ingot": "Beryllium Ingot", + "item.modernmetals.beryllium_leggings": "Beryllium Leg Armor", + "item.modernmetals.beryllium_nugget": "Beryllium Nugget", + "item.modernmetals.beryllium_ore": "Beryllium Ore", + "item.modernmetals.beryllium_pickaxe": "Beryllium Pickaxe", + "item.modernmetals.beryllium_powder": "Beryllium Dust", + "item.modernmetals.beryllium_rod": "Beryllium Rod", + "item.modernmetals.beryllium_shears": "Beryllium Shears", + "item.modernmetals.beryllium_shield": "Beryllium Shield", + "item.modernmetals.beryllium_shovel": "Beryllium Shovel", + "item.modernmetals.beryllium_smallblend": "Tiny Pile of Beryllium Blend", + "item.modernmetals.beryllium_smallpowder": "Tiny Pile of Beryllium Dust", + "item.modernmetals.beryllium_sword": "Beryllium Sword", + "item.modernmetals.beryllium_trapdoor": "Beryllium Trapdoor", + "material.bismuth": "Bismuth", + "item.modernmetals.bismuth_arrow": "Bismuth Arrow", + "item.modernmetals.bismuth_axe": "Bismuth Axe", + "item.modernmetals.bismuth_bars": "Bismuth Bars", + "item.modernmetals.bismuth_block": "Block of Bismuth", + "item.modernmetals.bismuth_boots": "Bismuth Boots", + "item.modernmetals.bismuth_chestplate": "Bismuth Chestplate", + "item.modernmetals.bismuth_crackhammer": "Bismuth Crack Hammer", + "item.modernmetals.bismuth_door": "Bismuth Door", + "item.modernmetals.bismuth_helmet": "Bismuth Helmet", + "item.modernmetals.bismuth_hoe": "Bismuth Hoe", + "item.modernmetals.bismuth_ingot": "Bismuth Ingot", + "item.modernmetals.bismuth_leggings": "Bismuth Leg Armor", + "item.modernmetals.bismuth_nugget": "Bismuth Nugget", + "item.modernmetals.bismuth_ore": "Bismuth Ore", + "item.modernmetals.bismuth_pickaxe": "Bismuth Pickaxe", + "item.modernmetals.bismuth_powder": "Bismuth Dust", + "item.modernmetals.bismuth_shears": "Bismuth Shears", + "item.modernmetals.bismuth_shovel": "Bismuth Shovel", + "item.modernmetals.bismuth_shield": "Bismuth Shield", + "item.modernmetals.bismuth_smallpowder": "Tiny Pile of Bismuth Dust", + "item.modernmetals.bismuth_sword": "Bismuth Sword", + "item.modernmetals.bismuth_trapdoor": "Bismuth Trapdoor", + "material.boron": "Boron", + "item.modernmetals.boron_arrow": "Boron Arrow", + "item.modernmetals.boron_axe": "Boron Axe", + "item.modernmetals.boron_bars": "Boron Bars", + "item.modernmetals.boron_blend": "Boron Blend", + "item.modernmetals.boron_block": "Block of Boron", + "item.modernmetals.boron_boots": "Boron Boots", + "item.modernmetals.boron_bolt": "Boron Bolt", + "item.modernmetals.boron_bow": "Boron Bow", + "item.modernmetals.boron_chestplate": "Boron Chestplate", + "item.modernmetals.boron_crackhammer": "Boron Crack Hammer", + "item.modernmetals.boron_crossbow": "Boron Crossbow", + "item.modernmetals.boron_door": "Boron Door", + "item.modernmetals.boron_fishing_rod": "Boron Fishing Rod", + "item.modernmetals.boron_gear": "Boron Gear", + "item.modernmetals.boron_helmet": "Boron Helmet", + "item.modernmetals.boron_hoe": "Boron Hoe", + "item.modernmetals.boron_horse_armor": "Boron Horse Armor", + "item.modernmetals.boron_ingot": "Boron Ingot", + "item.modernmetals.boron_leggings": "Boron Leg Armor", + "item.modernmetals.boron_nugget": "Boron Nugget", + "item.modernmetals.boron_ore": "Boron Ore", + "item.modernmetals.boron_pickaxe": "Boron Pickaxe", + "item.modernmetals.boron_powder": "Boron Dust", + "item.modernmetals.boron_rod": "Boron Rod", + "item.modernmetals.boron_shears": "Boron Shears", + "item.modernmetals.boron_shield": "Boron Shield", + "item.modernmetals.boron_shovel": "Boron Shovel", + "item.modernmetals.boron_smallblend": "Tiny Pile of Boron Blend", + "item.modernmetals.boron_smallpowder": "Tiny Pile of Boron Dust", + "item.modernmetals.boron_sword": "Boron Sword", + "item.modernmetals.boron_trapdoor": "Boron Trapdoor", + "material.cadmium": "Cadmium", + "item.modernmetals.cadmium_arrow": "Cadmium Arrow", + "item.modernmetals.cadmium_axe": "Cadmium Axe", + "item.modernmetals.cadmium_bars": "Cadmium Bars", + "item.modernmetals.cadmium_blend": "Cadmium Blend", + "item.modernmetals.cadmium_block": "Block of Cadmium", + "item.modernmetals.cadmium_bolt": "Cadmium Bolt", + "item.modernmetals.cadmium_boots": "Cadmium Boots", + "item.modernmetals.cadmium_bow": "Cadmium Bow", + "item.modernmetals.cadmium_chestplate": "Cadmium Chestplate", + "item.modernmetals.cadmium_crackhammer": "Cadmium Crack Hammer", + "item.modernmetals.cadmium_crossbow": "Cadmium Crossbow", + "item.modernmetals.cadmium_door": "Cadmium Door", + "item.modernmetals.cadmium_fishing_rod": "Cadmium Fishing Rod", + "item.modernmetals.cadmium_gear": "Cadmium Gear", + "item.modernmetals.cadmium_helmet": "Cadmium Helmet", + "item.modernmetals.cadmium_hoe": "Cadmium Hoe", + "item.modernmetals.cadmium_horse_armor": "Cadmium Horse Armor", + "item.modernmetals.cadmium_ingot": "Cadmium Ingot", + "item.modernmetals.cadmium_leggings": "Cadmium Leg Armor", + "item.modernmetals.cadmium_nugget": "Cadmium Nugget", + "item.modernmetals.cadmium_ore": "Cadmium Ore", + "item.modernmetals.cadmium_pickaxe": "Cadmium Pickaxe", + "item.modernmetals.cadmium_powder": "Cadmium Dust", + "item.modernmetals.cadmium_rod": "Cadmium Rod", + "item.modernmetals.cadmium_shears": "Cadmium Shears", + "item.modernmetals.cadmium_shovel": "Cadmium Shovel", + "item.modernmetals.cadmium_shield": "Cadmium Shield", + "item.modernmetals.cadmium_smallblend": "Tiny Pile of Cadmium Blend", + "item.modernmetals.cadmium_smallpowder": "Tiny Pile of Cadmium Dust", + "item.modernmetals.cadmium_sword": "Cadmium Sword", + "item.modernmetals.cadmium_trapdoor": "Cadmium Trapdoor", + "material.chromium": "Chromium", + "item.modernmetals.chromium_arrow": "Chromium Arrow", + "item.modernmetals.chromium_axe": "Chromium Axe", + "item.modernmetals.chromium_bars": "Chromium Bars", + "item.modernmetals.chromium_blend": "Chromium Blend", + "item.modernmetals.chromium_block": "Block of Chromium", + "item.modernmetals.chromium_bolt": "Chromium Bolt", + "item.modernmetals.chromium_boots": "Chromium Boots", + "item.modernmetals.chromium_bow": "Chromium Bow", + "item.modernmetals.chromium_chestplate": "Chromium Chestplate", + "item.modernmetals.chromium_crackhammer": "Chromium Crack Hammer", + "item.modernmetals.chromium_crossbow": "Chromium Crossbow", + "item.modernmetals.chromium_door": "Chromium Door", + "item.modernmetals.chromium_fishing_rod": "Chromium Fishing Rod", + "item.modernmetals.chromium_gear": "Chromium Gear", + "item.modernmetals.chromium_helmet": "Chromium Helmet", + "item.modernmetals.chromium_hoe": "Chromium Hoe", + "item.modernmetals.chromium_horse_armor": "Chromium Horse Armor", + "item.modernmetals.chromium_ingot": "Chromium Ingot", + "item.modernmetals.chromium_leggings": "Chromium Leg Armor", + "item.modernmetals.chromium_nugget": "Chromium Nugget", + "item.modernmetals.chromium_ore": "Chromium Ore", + "item.modernmetals.chromium_pickaxe": "Chromium Pickaxe", + "item.modernmetals.chromium_powder": "Chromium Dust", + "item.modernmetals.chromium_rod": "Chromium Rod", + "item.modernmetals.chromium_shears": "Chromium Shears", + "item.modernmetals.chromium_shield": "Chromium Shield", + "item.modernmetals.chromium_shovel": "Chromium Shovel", + "item.modernmetals.chromium_smallblend": "Tiny Pile of Chromium Blend", + "item.modernmetals.chromium_smallpowder": "Tiny Pile of Chromium Dust", + "item.modernmetals.chromium_sword": "Chromium Sword", + "item.modernmetals.chromium_trapdoor": "Chromium Trapdoor", + "material.galvanizedsteel": "Galvanized Steel", + "item.modernmetals.galvanizedsteel_arrow": "Galvanized Steel Arrow", + "item.modernmetals.galvanizedsteel_axe": "Galvanized Steel Axe", + "item.modernmetals.galvanizedsteel_bars": "Galvanized Steel Bars", + "item.modernmetals.galvanizedsteel_blend": "Galvanized Steel Blend", + "item.modernmetals.galvanizedsteel_block": "Block of Galvanized Steel", + "item.modernmetals.galvanizedsteel_bolt": "Galvanized Steel Bolt", + "item.modernmetals.galvanizedsteel_boots": "Galvanized Steel Boots", + "item.modernmetals.galvanizedsteel_bow": "Galvanized Steel Bow", + "item.modernmetals.galvanizedsteel_chestplate": "Galvanized Steel Chestplate", + "item.modernmetals.galvanizedsteel_crackhammer": "Galvanized Steel Crack Hammer", + "item.modernmetals.galvanizedsteel_crossbow": "Galvanized Steel Crossbow", + "item.modernmetals.galvanizedsteel_door": "Galvanized Steel Door", + "item.modernmetals.galvanizedsteel_fishing_rod": "Galvanized Steel Fishing Rod", + "item.modernmetals.galvanizedsteel_gear": "Galvanized Steel Gear", + "item.modernmetals.galvanizedsteel_helmet": "Galvanized Steel Helmet", + "item.modernmetals.galvanizedsteel_hoe": "Galvanized Steel Hoe", + "item.modernmetals.galvanizedsteel_horse_armor": "Galvanized Steel Horse Armor", + "item.modernmetals.galvanizedsteel_ingot": "Galvanized Steel Ingot", + "item.modernmetals.galvanizedsteel_leggings": "Galvanized Steel Leg Armor", + "item.modernmetals.galvanizedsteel_nugget": "Galvanized Steel Nugget", + "item.modernmetals.galvanizedsteel_ore": "Galvanized Steel Ore", + "item.modernmetals.galvanizedsteel_pickaxe": "Galvanized Steel Pickaxe", + "item.modernmetals.galvanizedsteel_powder": "Galvanized Steel Dust", + "item.modernmetals.galvanizedsteel_rod": "Galvanized Steel Rod", + "item.modernmetals.galvanizedsteel_shears": "Galvanized Steel Shears", + "item.modernmetals.galvanizedsteel_shield": "Galvanized Steel Shield", + "item.modernmetals.galvanizedsteel_shovel": "Galvanized Steel Shovel", + "item.modernmetals.galvanizedsteel_smallblend": "Tiny Pile of Galvanized Steel Blend", + "item.modernmetals.galvanizedsteel_smallpowder": "Tiny Pile of Galvanized Steel Dust", + "item.modernmetals.galvanizedsteel_sword": "Galvanized Steel Sword", + "item.modernmetals.galvanizedsteel_trapdoor": "Galvanized Steel Trapdoor", + "material.iridium": "Iridium", + "item.modernmetals.iridium_arrow": "Iridium Arrow", + "item.modernmetals.iridium_axe": "Iridium Axe", + "item.modernmetals.iridium_bars": "Iridium Bars", + "item.modernmetals.iridium_blend": "Iridium Blend", + "item.modernmetals.iridium_block": "Block of Iridium", + "item.modernmetals.iridium_bolt": "Iridium Bolt", + "item.modernmetals.iridium_boots": "Iridium Boots", + "item.modernmetals.iridium_bow": "Iridium Bow", + "item.modernmetals.iridium_chestplate": "Iridium Chestplate", + "item.modernmetals.iridium_crackhammer": "Iridium Crack Hammer", + "item.modernmetals.iridium_crossbow": "Iridium Crossbow", + "item.modernmetals.iridium_door": "Iridium Door", + "item.modernmetals.iridium_fishing_rod": "Iridium Fishing Rod", + "item.modernmetals.iridium_gear": "Iridium Gear", + "item.modernmetals.iridium_helmet": "Iridium Helmet", + "item.modernmetals.iridium_hoe": "Iridium Hoe", + "item.modernmetals.iridium_horse_armor": "Iridium Horse Armor", + "item.modernmetals.iridium_ingot": "Iridium Ingot", + "item.modernmetals.iridium_leggings": "Iridium Leg Armor", + "item.modernmetals.iridium_nugget": "Iridium Nugget", + "item.modernmetals.iridium_ore": "Iridium Ore", + "item.modernmetals.iridium_pickaxe": "Iridium Pickaxe", + "item.modernmetals.iridium_powder": "Iridium Dust", + "item.modernmetals.iridium_rod": "Iridium Rod", + "item.modernmetals.iridium_shears": "Iridium Shears", + "item.modernmetals.iridium_shield": "Iridium Shield", + "item.modernmetals.iridium_shovel": "Iridium Shovel", + "item.modernmetals.iridium_smallblend": "Tiny Pile of Iridium Blend", + "item.modernmetals.iridium_smallpowder": "Tiny Pile of Iridium Dust", + "item.modernmetals.iridium_sword": "Iridium Sword", + "item.modernmetals.iridium_trapdoor": "Iridium Trapdoor", + "material.magnesium": "Magnesium", + "item.modernmetals.magnesium_arrow": "Magnesium Arrow", + "item.modernmetals.magnesium_axe": "Magnesium Axe", + "item.modernmetals.magnesium_bars": "Magnesium Bars", + "item.modernmetals.magnesium_blend": "Magnesium Blend", + "item.modernmetals.magnesium_block": "Block of Magnesium", + "item.modernmetals.magnesium_boots": "Magnesium Boots", + "item.modernmetals.magnesium_bolt": "Magnesium Bolt", + "item.modernmetals.magnesium_bow": "Magnesium Bow", + "item.modernmetals.magnesium_chestplate": "Magnesium Chestplate", + "item.modernmetals.magnesium_crackhammer": "Magnesium Crack Hammer", + "item.modernmetals.magnesium_crossbow": "Magnesium Crossbow", + "item.modernmetals.magnesium_door": "Magnesium Door", + "item.modernmetals.magnesium_fishing_rod": "Magnesium Fishing Rod", + "item.modernmetals.magnesium_gear": "Magnesium Gear", + "item.modernmetals.magnesium_helmet": "Magnesium Helmet", + "item.modernmetals.magnesium_hoe": "Magnesium Hoe", + "item.modernmetals.magnesium_horse_armor": "Magnesium Horse Armor", + "item.modernmetals.magnesium_ingot": "Magnesium Ingot", + "item.modernmetals.magnesium_leggings": "Magnesium Leg Armor", + "item.modernmetals.magnesium_nugget": "Magnesium Nugget", + "item.modernmetals.magnesium_ore": "Magnesium Ore", + "item.modernmetals.magnesium_pickaxe": "Magnesium Pickaxe", + "item.modernmetals.magnesium_powder": "Magnesium Dust", + "item.modernmetals.magnesium_rod": "Magnesium Rod", + "item.modernmetals.magnesium_shears": "Magnesium Shears", + "item.modernmetals.magnesium_shield": "Magnesium Shield", + "item.modernmetals.magnesium_shovel": "Magnesium Shovel", + "item.modernmetals.magnesium_smallblend": "Tiny Pile of Magnesium Blend", + "item.modernmetals.magnesium_smallpowder": "Tiny Pile of Magnesium Dust", + "item.modernmetals.magnesium_sword": "Magnesium Sword", + "item.modernmetals.magnesium_trapdoor": "Magnesium Trapdoor", + "material.manganese": "Manganese", + "item.modernmetals.manganese_arrow": "Manganese Arrow", + "item.modernmetals.manganese_axe": "Manganese Axe", + "item.modernmetals.manganese_bars": "Manganese Bars", + "item.modernmetals.manganese_blend": "Manganese Blend", + "item.modernmetals.manganese_block": "Block of Manganese", + "item.modernmetals.manganese_bolt": "Manganese Bolt", + "item.modernmetals.manganese_boots": "Manganese Boots", + "item.modernmetals.manganese_bow": "Manganese Bow", + "item.modernmetals.manganese_chestplate": "Manganese Chestplate", + "item.modernmetals.manganese_crackhammer": "Manganese Crack Hammer", + "item.modernmetals.manganese_crossbow": "Manganese Crossbow", + "item.modernmetals.manganese_door": "Manganese Door", + "item.modernmetals.manganese_fishing_rod": "Manganese Fishing Rod", + "item.modernmetals.manganese_gear": "Manganese Gear", + "item.modernmetals.manganese_helmet": "Manganese Helmet", + "item.modernmetals.manganese_hoe": "Manganese Hoe", + "item.modernmetals.manganese_horse_armor": "Manganese Horse Armor", + "item.modernmetals.manganese_ingot": "Manganese Ingot", + "item.modernmetals.manganese_leggings": "Manganese Leg Armor", + "item.modernmetals.manganese_nugget": "Manganese Nugget", + "item.modernmetals.manganese_ore": "Manganese Ore", + "item.modernmetals.manganese_pickaxe": "Manganese Pickaxe", + "item.modernmetals.manganese_powder": "Manganese Dust", + "item.modernmetals.manganese_rod": "Manganese Rod", + "item.modernmetals.manganese_shears": "Manganese Shears", + "item.modernmetals.manganese_shield": "Manganese Shield", + "item.modernmetals.manganese_shovel": "Manganese Shovel", + "item.modernmetals.manganese_smallblend": "Tiny Pile of Manganese Blend", + "item.modernmetals.manganese_smallpowder": "Tiny Pile of Manganese Dust", + "item.modernmetals.manganese_sword": "Manganese Sword", + "item.modernmetals.manganese_trapdoor": "Manganese Trapdoor", + "material.nichrome": "Nichrome", + "item.modernmetals.nichrome_arrow": "Nichrome Arrow", + "item.modernmetals.nichrome_axe": "Nichrome Axe", + "item.modernmetals.nichrome_bars": "Nichrome Bars", + "item.modernmetals.nichrome_blend": "Nichrome Blend", + "item.modernmetals.nichrome_block": "Block of Nichrome", + "item.modernmetals.nichrome_bolt": "Nichrome Bolt", + "item.modernmetals.nichrome_boots": "Nichrome Boots", + "item.modernmetals.nichrome_bow": "Nichrome Bow", + "item.modernmetals.nichrome_chestplate": "Nichrome Chestplate", + "item.modernmetals.nichrome_crackhammer": "Nichrome Crack Hammer", + "item.modernmetals.nichrome_crossbow": "Nichrome Crossbow", + "item.modernmetals.nichrome_door": "Nichrome Door", + "item.modernmetals.nichrome_fishing_rod": "Nichrome Fishing Rod", + "item.modernmetals.nichrome_gear": "Nichrome Gear", + "item.modernmetals.nichrome_helmet": "Nichrome Helmet", + "item.modernmetals.nichrome_hoe": "Nichrome Hoe", + "item.modernmetals.nichrome_horse_armor": "Nichrome Horse Armor", + "item.modernmetals.nichrome_ingot": "Nichrome Ingot", + "item.modernmetals.nichrome_leggings": "Nichrome Leg Armor", + "item.modernmetals.nichrome_nugget": "Nichrome Nugget", + "item.modernmetals.nichrome_ore": "Nichrome Ore", + "item.modernmetals.nichrome_pickaxe": "Nichrome Pickaxe", + "item.modernmetals.nichrome_powder": "Nichrome Dust", + "item.modernmetals.nichrome_rod": "Nichrome Rod", + "item.modernmetals.nichrome_shears": "Nichrome Shears", + "item.modernmetals.nichrome_shield": "Nichrome Shield", + "item.modernmetals.nichrome_shovel": "Nichrome Shovel", + "item.modernmetals.nichrome_smallblend": "Tiny Pile of Nichrome Blend", + "item.modernmetals.nichrome_smallpowder": "Tiny Pile of Nichrome Dust", + "item.modernmetals.nichrome_sword": "Nichrome Sword", + "item.modernmetals.nichrome_trapdoor": "Nichrome Trapdoor", + "material.osmium": "Osmium", + "item.modernmetals.osmium_arrow": "Osmium Arrow", + "item.modernmetals.osmium_axe": "Osmium Axe", + "item.modernmetals.osmium_bars": "Osmium Bars", + "item.modernmetals.osmium_blend": "Osmium Blend", + "item.modernmetals.osmium_block": "Block of Osmium", + "item.modernmetals.osmium_boots": "Osmium Boots", + "item.modernmetals.osmium_bolt": "Osmium Bolt", + "item.modernmetals.osmium_bow": "Osmium Bow", + "item.modernmetals.osmium_chestplate": "Osmium Chestplate", + "item.modernmetals.osmium_crackhammer": "Osmium Crack Hammer", + "item.modernmetals.osmium_crossbow": "Osmium Crossbow", + "item.modernmetals.osmium_door": "Osmium Door", + "item.modernmetals.osmium_fishing_rod": "Osmium Fishing Rod", + "item.modernmetals.osmium_gear": "Osmium Gear", + "item.modernmetals.osmium_helmet": "Osmium Helmet", + "item.modernmetals.osmium_hoe": "Osmium Hoe", + "item.modernmetals.osmium_horse_armor": "Osmium Horse Armor", + "item.modernmetals.osmium_ingot": "Osmium Ingot", + "item.modernmetals.osmium_leggings": "Osmium Leg Armor", + "item.modernmetals.osmium_nugget": "Osmium Nugget", + "item.modernmetals.osmium_ore": "Osmium Ore", + "item.modernmetals.osmium_pickaxe": "Osmium Pickaxe", + "item.modernmetals.osmium_powder": "Osmium Dust", + "item.modernmetals.osmium_rod": "Osmium Rod", + "item.modernmetals.osmium_shears": "Osmium Shears", + "item.modernmetals.osmium_shield": "Osmium Shield", + "item.modernmetals.osmium_shovel": "Osmium Shovel", + "item.modernmetals.osmium_smallblend": "Tiny Pile of Osmium Blend", + "item.modernmetals.osmium_smallpowder": "Tiny Pile of Osmium Dust", + "item.modernmetals.osmium_sword": "Osmium Sword", + "item.modernmetals.osmium_trapdoor": "Osmium Trapdoor", + "material.pewter": "Pewter", + "item.modernmetals.pewter_arrow": "Pewter Arrow", + "item.modernmetals.pewter_axe": "Pewter Axe", + "item.modernmetals.pewter_bars": "Pewter Bars", + "item.modernmetals.pewter_blend": "Pewter Blend", + "item.modernmetals.pewter_block": "Block of Pewter", + "item.modernmetals.pewter_boots": "Pewter Boots", + "item.modernmetals.pewter_chestplate": "Pewter Chestplate", + "item.modernmetals.pewter_crackhammer": "Pewter Crack Hammer", + "item.modernmetals.pewter_door": "Pewter Door", + "item.modernmetals.pewter_helmet": "Pewter Helmet", + "item.modernmetals.pewter_hoe": "Pewter Hoe", + "item.modernmetals.pewter_ingot": "Pewter Ingot", + "item.modernmetals.pewter_leggings": "Pewter Leg Armor", + "item.modernmetals.pewter_nugget": "Pewter Nugget", + "item.modernmetals.pewter_ore": "Pewter Ore", + "item.modernmetals.pewter_pickaxe": "Pewter Pickaxe", + "item.modernmetals.pewter_powder": "Pewter Dust", + "item.modernmetals.pewter_shears": "Pewter Shears", + "item.modernmetals.pewter_shield": "Pewter Shield", + "item.modernmetals.pewter_shovel": "Pewter Shovel", + "item.modernmetals.pewter_smallpowder": "Tiny Pile of Pewter Dust", + "item.modernmetals.pewter_sword": "Pewter Sword", + "item.modernmetals.pewter_trapdoor": "Pewter Trapdoor", + "material.plutonium": "Plutonium", + "item.modernmetals.plutonium_arrow": "Plutonium Arrow", + "item.modernmetals.plutonium_axe": "Plutonium Axe", + "item.modernmetals.plutonium_bars": "Plutonium Bars", + "item.modernmetals.plutonium_blend": "Plutonium Blend", + "item.modernmetals.plutonium_block": "Block of Plutonium", + "item.modernmetals.plutonium_bolt": "Plutonium Bolt", + "item.modernmetals.plutonium_boots": "Plutonium Boots", + "item.modernmetals.plutonium_bow": "Plutonium Bow", + "item.modernmetals.plutonium_chestplate": "Plutonium Chestplate", + "item.modernmetals.plutonium_crackhammer": "Plutonium Crack Hammer", + "item.modernmetals.plutonium_crossbow": "Plutonium Crossbow", + "item.modernmetals.plutonium_door": "Plutonium Door", + "item.modernmetals.plutonium_fishing_rod": "Plutonium Fishing Rod", + "item.modernmetals.plutonium_gear": "Plutonium Gear", + "item.modernmetals.plutonium_helmet": "Plutonium Helmet", + "item.modernmetals.plutonium_hoe": "Plutonium Hoe", + "item.modernmetals.plutonium_horse_armor": "Plutonium Horse Armor", + "item.modernmetals.plutonium_ingot": "Plutonium Ingot", + "item.modernmetals.plutonium_leggings": "Plutonium Leg Armor", + "item.modernmetals.plutonium_nugget": "Plutonium Nugget", + "item.modernmetals.plutonium_ore": "Plutonium Ore", + "item.modernmetals.plutonium_pickaxe": "Plutonium Pickaxe", + "item.modernmetals.plutonium_powder": "Plutonium Dust", + "item.modernmetals.plutonium_rod": "Plutonium Rod", + "item.modernmetals.plutonium_shears": "Plutonium Shears", + "item.modernmetals.plutonium_shield": "Plutonium Shield", + "item.modernmetals.plutonium_shovel": "Plutonium Shovel", + "item.modernmetals.plutonium_smallblend": "Tiny Pile of Plutonium Blend", + "item.modernmetals.plutonium_smallpowder": "Tiny Pile of Plutonium Dust", + "item.modernmetals.plutonium_sword": "Plutonium Sword", + "item.modernmetals.plutonium_trapdoor": "Plutonium Trapdoor", + "material.rutile": "Rutile", + "item.modernmetals.rutile_arrow": "Rutile Arrow", + "item.modernmetals.rutile_axe": "Rutile Axe", + "item.modernmetals.rutile_bars": "Rutile Bars", + "item.modernmetals.rutile_blend": "Rutile Blend", + "item.modernmetals.rutile_block": "Block of Rutile", + "item.modernmetals.rutile_boots": "Rutile Boots", + "item.modernmetals.rutile_bolt": "Rutile Bolt", + "item.modernmetals.rutile_bow": "Rutile Bow", + "item.modernmetals.rutile_chestplate": "Rutile Chestplate", + "item.modernmetals.rutile_crackhammer": "Rutile Crack Hammer", + "item.modernmetals.rutile_crossbow": "Rutile Crossbow", + "item.modernmetals.rutile_door": "Rutile Door", + "item.modernmetals.rutile_fishing_rod": "Rutile Fishing Rod", + "item.modernmetals.rutile_gear": "Rutile Gear", + "item.modernmetals.rutile_helmet": "Rutile Helmet", + "item.modernmetals.rutile_hoe": "Rutile Hoe", + "item.modernmetals.rutile_horse_armor": "Rutile Horse Armor", + "item.modernmetals.rutile_ingot": "Rutile Ingot", + "item.modernmetals.rutile_leggings": "Rutile Leg Armor", + "item.modernmetals.rutile_nugget": "Rutile Nugget", + "item.modernmetals.rutile_ore": "Rutile Ore", + "item.modernmetals.rutile_pickaxe": "Rutile Pickaxe", + "item.modernmetals.rutile_powder": "Rutile Dust", + "item.modernmetals.rutile_rod": "Rutile Rod", + "item.modernmetals.rutile_shears": "Rutile Shears", + "item.modernmetals.rutile_shield": "Rutile Shield", + "item.modernmetals.rutile_shovel": "Rutile Shovel", + "item.modernmetals.rutile_smallblend": "Tiny Pile of Rutile Blend", + "item.modernmetals.rutile_smallpowder": "Tiny Pile of Rutile Dust", + "item.modernmetals.rutile_sword": "Rutile Sword", + "item.modernmetals.rutile_trapdoor": "Rutile Trapdoor", + "material.stainlesssteel": "Stainless Steel", + "item.modernmetals.stainlesssteel_arrow": "Stainless Steel Arrow", + "item.modernmetals.stainlesssteel_axe": "Stainless Steel Axe", + "item.modernmetals.stainlesssteel_bars": "Stainless Steel Bars", + "item.modernmetals.stainlesssteel_blend": "Stainless Steel Blend", + "item.modernmetals.stainlesssteel_block": "Block of Stainless Steel", + "item.modernmetals.stainlesssteel_bolt": "Stainless Steel Bolt", + "item.modernmetals.stainlesssteel_boots": "Stainless Steel Boots", + "item.modernmetals.stainlesssteel_bow": "Stainless Steel Bow", + "item.modernmetals.stainlesssteel_chestplate": "Stainless Steel Chestplate", + "item.modernmetals.stainlesssteel_crackhammer": "Stainless Steel Crack Hammer", + "item.modernmetals.stainlesssteel_crossbow": "Stainless Steel Crossbow", + "item.modernmetals.stainlesssteel_door": "Stainless Steel Door", + "item.modernmetals.stainlesssteel_fishing_rod": "Stainless Steel Fishing Rod", + "item.modernmetals.stainlesssteel_gear": "Stainless Steel Gear", + "item.modernmetals.stainlesssteel_helmet": "Stainless Steel Helmet", + "item.modernmetals.stainlesssteel_hoe": "Stainless Steel Hoe", + "item.modernmetals.stainlesssteel_horse_armor": "Stainless Steel Horse Armor", + "item.modernmetals.stainlesssteel_ingot": "Stainless Steel Ingot", + "item.modernmetals.stainlesssteel_leggings": "Stainless Steel Leg Armor", + "item.modernmetals.stainlesssteel_nugget": "Stainless Steel Nugget", + "item.modernmetals.stainlesssteel_ore": "Stainless Steel Ore", + "item.modernmetals.stainlesssteel_pickaxe": "Stainless Steel Pickaxe", + "item.modernmetals.stainlesssteel_powder": "Stainless Steel Dust", + "item.modernmetals.stainlesssteel_rod": "Stainless Steel Rod", + "item.modernmetals.stainlesssteel_shears": "Stainless Steel Shears", + "item.modernmetals.stainlesssteel_shield": "Stainless Steel Shield", + "item.modernmetals.stainlesssteel_shovel": "Stainless Steel Shovel", + "item.modernmetals.stainlesssteel_smallblend": "Tiny Pile of Stainless Steel Blend", + "item.modernmetals.stainlesssteel_smallpowder": "Tiny Pile of Stainless Steel Dust", + "item.modernmetals.stainlesssteel_sword": "Stainless Steel Sword", + "item.modernmetals.stainlesssteel_trapdoor": "Stainless Steel Trapdoor", + "material.tantalum": "Tantalum", + "item.modernmetals.tantalum_arrow": "Tantalum Arrow", + "item.modernmetals.tantalum_axe": "Tantalum Axe", + "item.modernmetals.tantalum_bars": "Tantalum Bars", + "item.modernmetals.tantalum_blend": "Tantalum Blend", + "item.modernmetals.tantalum_block": "Block of Tantalum", + "item.modernmetals.tantalum_bolt": "Tantalum Bolt", + "item.modernmetals.tantalum_boots": "Tantalum Boots", + "item.modernmetals.tantalum_bow": "Tantalum Bow", + "item.modernmetals.tantalum_chestplate": "Tantalum Chestplate", + "item.modernmetals.tantalum_crackhammer": "Tantalum Crack Hammer", + "item.modernmetals.tantalum_crossbow": "Tantalum Crossbow", + "item.modernmetals.tantalum_door": "Tantalum Door", + "item.modernmetals.tantalum_fishing_rod": "Tantalum Fishing Rod", + "item.modernmetals.tantalum_gear": "Tantalum Gear", + "item.modernmetals.tantalum_helmet": "Tantalum Helmet", + "item.modernmetals.tantalum_hoe": "Tantalum Hoe", + "item.modernmetals.tantalum_horse_armor": "Tantalum Horse Armor", + "item.modernmetals.tantalum_ingot": "Tantalum Ingot", + "item.modernmetals.tantalum_leggings": "Tantalum Leg Armor", + "item.modernmetals.tantalum_nugget": "Tantalum Nugget", + "item.modernmetals.tantalum_ore": "Tantalum Ore", + "item.modernmetals.tantalum_pickaxe": "Tantalum Pickaxe", + "item.modernmetals.tantalum_powder": "Tantalum Dust", + "item.modernmetals.tantalum_rod": "Tantalum Rod", + "item.modernmetals.tantalum_shears": "Tantalum Shears", + "item.modernmetals.tantalum_shield": "Tantalum Shield", + "item.modernmetals.tantalum_shovel": "Tantalum Shovel", + "item.modernmetals.tantalum_smallblend": "Tiny Pile of Tantalum Blend", + "item.modernmetals.tantalum_smallpowder": "Tiny Pile of Tantalum Dust", + "item.modernmetals.tantalum_sword": "Tantalum Sword", + "item.modernmetals.tantalum_trapdoor": "Tantalum Trapdoor", + "material.titanium": "Titanium", + "item.modernmetals.titanium_arrow": "Titanium Arrow", + "item.modernmetals.titanium_axe": "Titanium Axe", + "item.modernmetals.titanium_bars": "Titanium Bars", + "item.modernmetals.titanium_blend": "Titanium Blend", + "item.modernmetals.titanium_block": "Block of Titanium", + "item.modernmetals.titanium_boots": "Titanium Boots", + "item.modernmetals.titanium_bolt": "Titanium Bolt", + "item.modernmetals.titanium_bow": "Titanium Bow", + "item.modernmetals.titanium_chestplate": "Titanium Chestplate", + "item.modernmetals.titanium_crackhammer": "Titanium Crack Hammer", + "item.modernmetals.titanium_crossbow": "Titanium Crossbow", + "item.modernmetals.titanium_door": "Titanium Door", + "item.modernmetals.titanium_fishing_rod": "Titanium Fishing Rod", + "item.modernmetals.titanium_gear": "Titanium Gear", + "item.modernmetals.titanium_helmet": "Titanium Helmet", + "item.modernmetals.titanium_hoe": "Titanium Hoe", + "item.modernmetals.titanium_horse_armor": "Titanium Horse Armor", + "item.modernmetals.titanium_ingot": "Titanium Ingot", + "item.modernmetals.titanium_leggings": "Titanium Leg Armor", + "item.modernmetals.titanium_nugget": "Titanium Nugget", + "item.modernmetals.titanium_ore": "Titanium Ore", + "item.modernmetals.titanium_pickaxe": "Titanium Pickaxe", + "item.modernmetals.titanium_powder": "Titanium Dust", + "item.modernmetals.titanium_rod": "Titanium Rod", + "item.modernmetals.titanium_shears": "Titanium Shears", + "item.modernmetals.titanium_shield": "Titanium Shield", + "item.modernmetals.titanium_shovel": "Titanium Shovel", + "item.modernmetals.titanium_smallblend": "Tiny Pile of Titanium Blend", + "item.modernmetals.titanium_smallpowder": "Tiny Pile of Titanium Dust", + "item.modernmetals.titanium_sword": "Titanium Sword", + "item.modernmetals.titanium_trapdoor": "Titanium Trapdoor", + "material.tungsten": "Tungsten", + "item.modernmetals.tungsten_arrow": "Tungsten Arrow", + "item.modernmetals.tungsten_axe": "Tungsten Axe", + "item.modernmetals.tungsten_bars": "Tungsten Bars", + "item.modernmetals.tungsten_blend": "Tungsten Blend", + "item.modernmetals.tungsten_block": "Block of Tungsten", + "item.modernmetals.tungsten_boots": "Tungsten Boots", + "item.modernmetals.tungsten_bolt": "Tungsten Bolt", + "item.modernmetals.tungsten_bow": "Tungsten Bow", + "item.modernmetals.tungsten_chestplate": "Tungsten Chestplate", + "item.modernmetals.tungsten_crackhammer": "Tungsten Crack Hammer", + "item.modernmetals.tungsten_crossbow": "Tungsten Crossbow", + "item.modernmetals.tungsten_door": "Tungsten Door", + "item.modernmetals.tungsten_fishing_rod": "Tungsten Fishing Rod", + "item.modernmetals.tungsten_gear": "Tungsten Gear", + "item.modernmetals.tungsten_helmet": "Tungsten Helmet", + "item.modernmetals.tungsten_hoe": "Tungsten Hoe", + "item.modernmetals.tungsten_horse_armor": "Tungsten Horse Armor", + "item.modernmetals.tungsten_ingot": "Tungsten Ingot", + "item.modernmetals.tungsten_leggings": "Tungsten Leg Armor", + "item.modernmetals.tungsten_nugget": "Tungsten Nugget", + "item.modernmetals.tungsten_ore": "Tungsten Ore", + "item.modernmetals.tungsten_pickaxe": "Tungsten Pickaxe", + "item.modernmetals.tungsten_powder": "Tungsten Dust", + "item.modernmetals.tungsten_rod": "Tungsten Rod", + "item.modernmetals.tungsten_shears": "Tungsten Shears", + "item.modernmetals.tungsten_shield": "Tungsten Shield", + "item.modernmetals.tungsten_shovel": "Tungsten Shovel", + "item.modernmetals.tungsten_smallblend": "Tiny Pile of Tungsten Blend", + "item.modernmetals.tungsten_smallpowder": "Tiny Pile of Tungsten Dust", + "item.modernmetals.tungsten_sword": "Tungsten Sword", + "item.modernmetals.tungsten_trapdoor": "Tungsten Trapdoor", + "material.uranium": "Uranium", + "item.modernmetals.uranium_arrow": "Uranium Arrow", + "item.modernmetals.uranium_axe": "Uranium Axe", + "item.modernmetals.uranium_bars": "Uranium Bars", + "item.modernmetals.uranium_blend": "Uranium Blend", + "item.modernmetals.uranium_block": "Block of Uranium", + "item.modernmetals.uranium_boots": "Uranium Boots", + "item.modernmetals.uranium_bolt": "Uranium Bolt", + "item.modernmetals.uranium_bow": "Uranium Bow", + "item.modernmetals.uranium_chestplate": "Uranium Chestplate", + "item.modernmetals.uranium_crackhammer": "Uranium Crack Hammer", + "item.modernmetals.uranium_crossbow": "Uranium Crossbow", + "item.modernmetals.uranium_door": "Uranium Door", + "item.modernmetals.uranium_fishing_rod": "Uranium Fishing Rod", + "item.modernmetals.uranium_gear": "Uranium Gear", + "item.modernmetals.uranium_helmet": "Uranium Helmet", + "item.modernmetals.uranium_hoe": "Uranium Hoe", + "item.modernmetals.uranium_horse_armor": "Uranium Horse Armor", + "item.modernmetals.uranium_ingot": "Uranium Ingot", + "item.modernmetals.uranium_leggings": "Uranium Leg Armor", + "item.modernmetals.uranium_nugget": "Uranium Nugget", + "item.modernmetals.uranium_ore": "Uranium Ore", + "item.modernmetals.uranium_pickaxe": "Uranium Pickaxe", + "item.modernmetals.uranium_powder": "Uranium Dust", + "item.modernmetals.uranium_rod": "Uranium Rod", + "item.modernmetals.uranium_shears": "Uranium Shears", + "item.modernmetals.uranium_shield": "Uranium Shield", + "item.modernmetals.uranium_shovel": "Uranium Shovel", + "item.modernmetals.uranium_smallblend": "Tiny Pile of Uranium Blend", + "item.modernmetals.uranium_smallpowder": "Tiny Pile of Uranium Dust", + "item.modernmetals.uranium_sword": "Uranium Sword", + "item.modernmetals.uranium_trapdoor": "Uranium Trapdoor", + "material.zirconium": "Zirconium", + "item.modernmetals.zirconium_arrow": "Zirconium Arrow", + "item.modernmetals.zirconium_axe": "Zirconium Axe", + "item.modernmetals.zirconium_bars": "Zirconium Bars", + "item.modernmetals.zirconium_blend": "Zirconium Blend", + "item.modernmetals.zirconium_block": "Block of Zirconium", + "item.modernmetals.zirconium_bolt": "Zirconium Bolt", + "item.modernmetals.zirconium_boots": "Zirconium Boots", + "item.modernmetals.zirconium_bow": "Zirconium Bow", + "item.modernmetals.zirconium_chestplate": "Zirconium Chestplate", + "item.modernmetals.zirconium_crackhammer": "Zirconium Crack Hammer", + "item.modernmetals.zirconium_crossbow": "Zirconium Crossbow", + "item.modernmetals.zirconium_door": "Zirconium Door", + "item.modernmetals.zirconium_fishing_rod": "Zirconium Fishing Rod", + "item.modernmetals.zirconium_gear": "Zirconium Gear", + "item.modernmetals.zirconium_helmet": "Zirconium Helmet", + "item.modernmetals.zirconium_hoe": "Zirconium Hoe", + "item.modernmetals.zirconium_horse_armor": "Zirconium Horse Armor", + "item.modernmetals.zirconium_ingot": "Zirconium Ingot", + "item.modernmetals.zirconium_leggings": "Zirconium Leg Armor", + "item.modernmetals.zirconium_nugget": "Zirconium Nugget", + "item.modernmetals.zirconium_ore": "Zirconium Ore", + "item.modernmetals.zirconium_pickaxe": "Zirconium Pickaxe", + "item.modernmetals.zirconium_powder": "Zirconium Dust", + "item.modernmetals.zirconium_rod": "Zirconium Rod", + "item.modernmetals.zirconium_shears": "Zirconium Shears", + "item.modernmetals.zirconium_shield": "Zirconium Shield", + "item.modernmetals.zirconium_shovel": "Zirconium Shovel", + "item.modernmetals.zirconium_smallblend": "Tiny Pile of Zirconium Blend", + "item.modernmetals.zirconium_smallpowder": "Tiny Pile of Zirconium Dust", + "item.modernmetals.zirconium_sword": "Zirconium Sword", + "item.modernmetals.zirconium_trapdoor": "Zirconium Trapdoor", + "tile.modernmetals.aluminum_bars": "Aluminum Bars", + "block.modernmetals.aluminum_bars": "Aluminum Bars", + "tile.modernmetals.aluminum_block": "Block of Aluminum", + "block.modernmetals.aluminum_block": "Block of Aluminum", + "tile.modernmetals.aluminum_door": "Aluminum Door", + "block.modernmetals.aluminum_door": "Aluminum Door", + "tile.modernmetals.aluminum_ore": "Aluminum Ore", + "block.modernmetals.aluminum_ore": "Aluminum Ore", + "tile.modernmetals.aluminum_plate": "Aluminum Plate", + "block.modernmetals.aluminum_plate": "Aluminum Plate", + "tile.modernmetals.aluminum_trapdoor": "Aluminum Trapdoor", + "block.modernmetals.aluminum_trapdoor": "Aluminum Trapdoor", + "tile.modernmetals.aluminumbrass_bars": "Aluminum Brass Bars", + "block.modernmetals.aluminumbrass_bars": "Aluminum Brass Bars", + "tile.modernmetals.aluminumbrass_block": "Block of Aluminum Brass", + "block.modernmetals.aluminumbrass_block": "Block of Aluminum Brass", + "tile.modernmetals.aluminumbrass_door": "Aluminum Brass Door", + "block.modernmetals.aluminumbrass_door": "Aluminum Brass Door", + "tile.modernmetals.aluminumbrass_ore": "Aluminum Brass Ore", + "block.modernmetals.aluminumbrass_ore": "Aluminum Brass Ore", + "tile.modernmetals.aluminumbrass_plate": "Aluminum Brass Plate", + "block.modernmetals.aluminumbrass_plate": "Aluminum Brass Plate", + "tile.modernmetals.aluminumbrass_trapdoor": "Aluminum Brass Trapdoor", + "block.modernmetals.aluminumbrass_trapdoor": "Aluminum Brass Trapdoor", + "tile.modernmetals.boron_bars": "Boron Bars", + "block.modernmetals.boron_bars": "Boron Bars", + "tile.modernmetals.boron_block": "Block of Boron", + "block.modernmetals.boron_block": "Block of Boron", + "tile.modernmetals.boron_door": "Boron Door", + "block.modernmetals.boron_door": "Boron Door", + "tile.modernmetals.boron_ore": "Boron Ore", + "block.modernmetals.boron_ore": "Boron Ore", + "tile.modernmetals.boron_plate": "Boron Plate", + "block.modernmetals.boron_plate": "Boron Plate", + "tile.modernmetals.boron_trapdoor": "Boron Trapdoor", + "block.modernmetals.boron_trapdoor": "Boron Trapdoor", + "tile.modernmetals.cadmium_bars": "Cadmium Bars", + "block.modernmetals.cadmium_bars": "Cadmium Bars", + "tile.modernmetals.cadmium_block": "Block of Cadmium", + "block.modernmetals.cadmium_block": "Block of Cadmium", + "tile.modernmetals.cadmium_door": "Cadmium Door", + "block.modernmetals.cadmium_door": "Cadmium Door", + "tile.modernmetals.cadmium_ore": "Cadmium Ore", + "block.modernmetals.cadmium_ore": "Cadmium Ore", + "tile.modernmetals.cadmium_plate": "Cadmium Plate", + "block.modernmetals.cadmium_plate": "Cadmium Plate", + "tile.modernmetals.cadmium_trapdoor": "Cadmium Trapdoor", + "block.modernmetals.cadmium_trapdoor": "Cadmium Trapdoor", + "tile.modernmetals.chromium_bars": "Chromium Bars", + "block.modernmetals.chromium_bars": "Chromium Bars", + "tile.modernmetals.chromium_block": "Block of Chromium", + "block.modernmetals.chromium_block": "Block of Chromium", + "tile.modernmetals.chromium_door": "Chromium Door", + "block.modernmetals.chromium_door": "Chromium Door", + "tile.modernmetals.chromium_ore": "Chromium Ore", + "block.modernmetals.chromium_ore": "Chromium Ore", + "tile.modernmetals.chromium_plate": "Chromium Plate", + "block.modernmetals.chromium_plate": "Chromium Plate", + "tile.modernmetals.chromium_trapdoor": "Chromium Trapdoor", + "block.modernmetals.chromium_trapdoor": "Chromium Trapdoor", + "tile.modernmetals.galvanizedsteel_bars": "Galvanized Steel Bars", + "block.modernmetals.galvanizedsteel_bars": "Galvanized Steel Bars", + "tile.modernmetals.galvanizedsteel_block": "Block of Galvanized Steel", + "block.modernmetals.galvanizedsteel_block": "Block of Galvanized Steel", + "tile.modernmetals.galvanizedsteel_door": "Galvanized Steel Door", + "block.modernmetals.galvanizedsteel_door": "Galvanized Steel Door", + "tile.modernmetals.galvanizedsteel_ore": "Galvanized Steel Ore", + "block.modernmetals.galvanizedsteel_ore": "Galvanized Steel Ore", + "tile.modernmetals.galvanizedsteel_plate": "Galvanized Steel Plate", + "block.modernmetals.galvanizedsteel_plate": "Galvanized Steel Plate", + "tile.modernmetals.galvanizedsteel_trapdoor": "Galvanized Steel Trapdoor", + "block.modernmetals.galvanizedsteel_trapdoor": "Galvanized Steel Trapdoor", + "tile.modernmetals.iridium_bars": "Iridium Bars", + "block.modernmetals.iridium_bars": "Iridium Bars", + "tile.modernmetals.iridium_block": "Block of Iridium", + "block.modernmetals.iridium_block": "Block of Iridium", + "tile.modernmetals.iridium_door": "Iridium Door", + "block.modernmetals.iridium_door": "Iridium Door", + "tile.modernmetals.iridium_ore": "Iridium Ore", + "block.modernmetals.iridium_ore": "Iridium Ore", + "tile.modernmetals.iridium_plate": "Iridium Plate", + "block.modernmetals.iridium_plate": "Iridium Plate", + "tile.modernmetals.iridium_trapdoor": "Iridium Trapdoor", + "block.modernmetals.iridium_trapdoor": "Iridium Trapdoor", + "tile.modernmetals.magnesium_bars": "Magnesium Bars", + "block.modernmetals.magnesium_bars": "Magnesium Bars", + "tile.modernmetals.magnesium_block": "Block of Magnesium", + "block.modernmetals.magnesium_block": "Block of Magnesium", + "tile.modernmetals.magnesium_door": "Magnesium Door", + "block.modernmetals.magnesium_door": "Magnesium Door", + "tile.modernmetals.magnesium_ore": "Magnesium Ore", + "block.modernmetals.magnesium_ore": "Magnesium Ore", + "tile.modernmetals.magnesium_plate": "Magnesium Plate", + "block.modernmetals.magnesium_plate": "Magnesium Plate", + "tile.modernmetals.magnesium_trapdoor": "Magnesium Trapdoor", + "block.modernmetals.magnesium_trapdoor": "Magnesium Trapdoor", + "tile.modernmetals.manganese_bars": "Manganese Bars", + "block.modernmetals.manganese_bars": "Manganese Bars", + "tile.modernmetals.manganese_block": "Block of Manganese", + "block.modernmetals.manganese_block": "Block of Manganese", + "tile.modernmetals.manganese_door": "Manganese Door", + "block.modernmetals.manganese_door": "Manganese Door", + "tile.modernmetals.manganese_ore": "Manganese Ore", + "block.modernmetals.manganese_ore": "Manganese Ore", + "tile.modernmetals.manganese_plate": "Manganese Plate", + "block.modernmetals.manganese_plate": "Manganese Plate", + "tile.modernmetals.manganese_trapdoor": "Manganese Trapdoor", + "block.modernmetals.manganese_trapdoor": "Manganese Trapdoor", + "tile.modernmetals.nichrome_bars": "Nichrome Bars", + "block.modernmetals.nichrome_bars": "Nichrome Bars", + "tile.modernmetals.nichrome_block": "Block of Nichrome", + "block.modernmetals.nichrome_block": "Block of Nichrome", + "tile.modernmetals.nichrome_door": "Nichrome Door", + "block.modernmetals.nichrome_door": "Nichrome Door", + "tile.modernmetals.nichrome_ore": "Nichrome Ore", + "block.modernmetals.nichrome_ore": "Nichrome Ore", + "tile.modernmetals.nichrome_plate": "Nichrome Plate", + "block.modernmetals.nichrome_plate": "Nichrome Plate", + "tile.modernmetals.nichrome_trapdoor": "Nichrome Trapdoor", + "block.modernmetals.nichrome_trapdoor": "Nichrome Trapdoor", + "tile.modernmetals.osmium_bars": "Osmium Bars", + "block.modernmetals.osmium_bars": "Osmium Bars", + "tile.modernmetals.osmium_block": "Block of Osmium", + "block.modernmetals.osmium_block": "Block of Osmium", + "tile.modernmetals.osmium_door": "Osmium Door", + "block.modernmetals.osmium_door": "Osmium Door", + "tile.modernmetals.osmium_ore": "Osmium Ore", + "block.modernmetals.osmium_ore": "Osmium Ore", + "tile.modernmetals.osmium_plate": "Osmium Plate", + "block.modernmetals.osmium_plate": "Osmium Plate", + "tile.modernmetals.osmium_trapdoor": "Osmium Trapdoor", + "block.modernmetals.osmium_trapdoor": "Osmium Trapdoor", + "tile.modernmetals.plutonium_bars": "Plutonium Bars", + "block.modernmetals.plutonium_bars": "Plutonium Bars", + "tile.modernmetals.plutonium_block": "Block of Plutonium", + "block.modernmetals.plutonium_block": "Block of Plutonium", + "tile.modernmetals.plutonium_door": "Plutonium Door", + "block.modernmetals.plutonium_door": "Plutonium Door", + "tile.modernmetals.plutonium_ore": "Plutonium Ore", + "block.modernmetals.plutonium_ore": "Plutonium Ore", + "tile.modernmetals.plutonium_plate": "Plutonium Plate", + "block.modernmetals.plutonium_plate": "Plutonium Plate", + "tile.modernmetals.plutonium_trapdoor": "Plutonium Trapdoor", + "block.modernmetals.plutonium_trapdoor": "Plutonium Trapdoor", + "tile.modernmetals.rutile_bars": "Rutile Bars", + "block.modernmetals.rutile_bars": "Rutile Bars", + "tile.modernmetals.rutile_block": "Block of Rutile", + "block.modernmetals.rutile_block": "Block of Rutile", + "tile.modernmetals.rutile_door": "Rutile Door", + "block.modernmetals.rutile_door": "Rutile Door", + "tile.modernmetals.rutile_ore": "Rutile Ore", + "block.modernmetals.rutile_ore": "Rutile Ore", + "tile.modernmetals.rutile_plate": "Rutile Plate", + "block.modernmetals.rutile_plate": "Rutile Plate", + "tile.modernmetals.rutile_trapdoor": "Rutile Trapdoor", + "block.modernmetals.rutile_trapdoor": "Rutile Trapdoor", + "tile.modernmetals.stainlesssteel_bars": "Stainless Steel Bars", + "block.modernmetals.stainlesssteel_bars": "Stainless Steel Bars", + "tile.modernmetals.stainlesssteel_block": "Block of Stainless Steel", + "block.modernmetals.stainlesssteel_block": "Block of Stainless Steel", + "tile.modernmetals.stainlesssteel_door": "Stainless Steel Door", + "block.modernmetals.stainlesssteel_door": "Stainless Steel Door", + "tile.modernmetals.stainlesssteel_ore": "Stainless Steel Ore", + "block.modernmetals.stainlesssteel_ore": "Stainless Steel Ore", + "tile.modernmetals.stainlesssteel_plate": "Stainless Steel Plate", + "block.modernmetals.stainlesssteel_plate": "Stainless Steel Plate", + "tile.modernmetals.stainlesssteel_trapdoor": "Stainless Steel Trapdoor", + "block.modernmetals.stainlesssteel_trapdoor": "Stainless Steel Trapdoor", + "tile.modernmetals.tantalum_bars": "Tantalum Bars", + "block.modernmetals.tantalum_bars": "Tantalum Bars", + "tile.modernmetals.tantalum_block": "Block of Tantalum", + "block.modernmetals.tantalum_block": "Block of Tantalum", + "tile.modernmetals.tantalum_door": "Tantalum Door", + "block.modernmetals.tantalum_door": "Tantalum Door", + "tile.modernmetals.tantalum_ore": "Tantalum Ore", + "block.modernmetals.tantalum_ore": "Tantalum Ore", + "tile.modernmetals.tantalum_plate": "Tantalum Plate", + "block.modernmetals.tantalum_plate": "Tantalum Plate", + "tile.modernmetals.tantalum_trapdoor": "Tantalum Trapdoor", + "block.modernmetals.tantalum_trapdoor": "Tantalum Trapdoor", + "tile.modernmetals.titanium_bars": "Titanium Bars", + "block.modernmetals.titanium_bars": "Titanium Bars", + "tile.modernmetals.titanium_block": "Block of Titanium", + "block.modernmetals.titanium_block": "Block of Titanium", + "tile.modernmetals.titanium_door": "Titanium Door", + "block.modernmetals.titanium_door": "Titanium Door", + "tile.modernmetals.titanium_ore": "Titanium Ore", + "block.modernmetals.titanium_ore": "Titanium Ore", + "tile.modernmetals.titanium_plate": "Titanium Plate", + "block.modernmetals.titanium_plate": "Titanium Plate", + "tile.modernmetals.titanium_trapdoor": "Titanium Trapdoor", + "block.modernmetals.titanium_trapdoor": "Titanium Trapdoor", + "tile.modernmetals.tungsten_bars": "Tungsten Bars", + "block.modernmetals.tungsten_bars": "Tungsten Bars", + "tile.modernmetals.tungsten_block": "Block of Tungsten", + "block.modernmetals.tungsten_block": "Block of Tungsten", + "tile.modernmetals.tungsten_door": "Tungsten Door", + "block.modernmetals.tungsten_door": "Tungsten Door", + "tile.modernmetals.tungsten_ore": "Tungsten Ore", + "block.modernmetals.tungsten_ore": "Tungsten Ore", + "tile.modernmetals.tungsten_plate": "Tungsten Plate", + "block.modernmetals.tungsten_plate": "Tungsten Plate", + "tile.modernmetals.tungsten_trapdoor": "Tungsten Trapdoor", + "block.modernmetals.tungsten_trapdoor": "Tungsten Trapdoor", + "tile.modernmetals.uranium_bars": "Uranium Bars", + "block.modernmetals.uranium_bars": "Uranium Bars", + "tile.modernmetals.uranium_block": "Block of Uranium", + "block.modernmetals.uranium_block": "Block of Uranium", + "tile.modernmetals.uranium_door": "Uranium Door", + "block.modernmetals.uranium_door": "Uranium Door", + "tile.modernmetals.uranium_ore": "Uranium Ore", + "block.modernmetals.uranium_ore": "Uranium Ore", + "tile.modernmetals.uranium_plate": "Uranium Plate", + "block.modernmetals.uranium_plate": "Uranium Plate", + "tile.modernmetals.uranium_trapdoor": "Uranium Trapdoor", + "block.modernmetals.uranium_trapdoor": "Uranium Trapdoor", + "tile.modernmetals.zirconium_bars": "Zirconium Bars", + "block.modernmetals.zirconium_bars": "Zirconium Bars", + "tile.modernmetals.zirconium_block": "Block of Zirconium", + "block.modernmetals.zirconium_block": "Block of Zirconium", + "tile.modernmetals.zirconium_door": "Zirconium Door", + "block.modernmetals.zirconium_door": "Zirconium Door", + "tile.modernmetals.zirconium_ore": "Zirconium Ore", + "block.modernmetals.zirconium_ore": "Zirconium Ore", + "tile.modernmetals.zirconium_plate": "Zirconium Plate", + "block.modernmetals.zirconium_plate": "Zirconium Plate", + "tile.modernmetals.zirconium_trapdoor": "Zirconium Trapdoor", + "block.modernmetals.zirconium_trapdoor": "Zirconium Trapdoor", + "tooltip.aluminum.tool": "Nothing Special", + "tooltip.aluminumbrass.tool": "Nothing Special", + "tooltip.cadmium.tool": "Nothing Special", + "tooltip.chromium.tool": "Nothing Special", + "tooltip.galvanized_steel.tool": "Nothing Special", + "tooltip.iridium.tool": "Nothing Special", + "tooltip.magnesium.tool": "Nothing Special", + "tooltip.manganese.tool": "Nothing Special", + "tooltip.nichrome.tool": "Nothing Special", + "tooltip.osmium.tool": "Nothing Special", + "tooltip.plutonium.tool": "Nothing Special", + "tooltip.rutile.tool": "Nothing Special", + "tooltip.stainless_steel.tool": "Nothing Special", + "tooltip.tantalum.tool": "Nothing Special", + "tooltip.titanium.tool": "Nothing Special", + "tooltip.tungsten.tool": "Nothing Special", + "tooltip.uranium.tool": "Nothing Special", + "tooltip.zirconium.tool": "Nothing Special", + "tooltip.aluminum.armor": "Nothing Special", + "tooltip.aluminumbrass.armor": "Nothing Special", + "tooltip.cadmium.armor": "Nothing Special", + "tooltip.chromium.armor": "Nothing Special", + "tooltip.galvanized_steel.armor": "Nothing Special", + "tooltip.iridium.armor": "Nothing Special", + "tooltip.magnesium.armor": "Nothing Special", + "tooltip.manganese.armor": "Nothing Special", + "tooltip.nichrome.armor": "Nothing Special", + "tooltip.osmium.armor": "Nothing Special", + "tooltip.plutonium.armor": "Nothing Special", + "tooltip.rutile.armor": "Nothing Special", + "tooltip.stainless_steel.armor": "Nothing Special", + "tooltip.tantalum.armor": "Nothing Special", + "tooltip.titanium.armor": "Nothing Special", + "tooltip.tungsten.armor": "Nothing Special", + "tooltip.uranium.armor": "Nothing Special", + "tooltip.zirconium.armor": "Nothing Special", + "achievement.aluminumbrass_maker": "Aluminum Brass", + "achievement.galvanized_steel_maker": "Galvanized Steel", + "achievement.nichrome_maker": "Nichrome", + "achievement.stainless_steel_maker": "Stainless Steel", + "achievement.titanium_maker": "Titanium", + "achievement.aluminumbrass_maker.desc": "Combine Aluminum Dust and Brass Dust to make Aluminum Brass", + "achievement.galvanized_steel_maker.desc": "Combine Steel Dust and Zinc Dust to make Galvanized Steel", + "achievement.nichrome_maker.desc": "Combine Nickel Dust and Chromium Dust to make Nichrome", + "achievement.stainless_steel_maker.desc": "Combine Steel Dust and Chromium Dust to make Stainless Steel", + "achievement.titanium_maker.desc": "Combine Rutile Dust and Magnesium Dust to make Titanium", + "fluid.modernmetals.aluminum": "Molten Aluminum", + "fluid.modernmetals.aluminumbrass": "Molten Aluminum Brass", + "fluid.modernmetals.boron": "Molten Boron", + "fluid.modernmetals.beryllium": "Molten Beryllium", + "fluid.modernmetals.cadmium": "Molten Cadmium", + "fluid.modernmetals.chromium": "Molten Chromium", + "fluid.modernmetals.galvanizedsteel": "Molten Galvanized Steel", + "fluid.modernmetals.iridium": "Molten Iridium", + "fluid.modernmetals.magnesium": "Molten Magnesium", + "fluid.modernmetals.manganese": "Molten Manganese", + "fluid.modernmetals.nichrome": "Molten Nichrome", + "fluid.modernmetals.osmium": "Molten Osmium", + "fluid.modernmetals.plutonium": "Molten Plutonium", + "fluid.modernmetals.rutile": "Molten Rutile", + "fluid.modernmetals.stainlesssteel": "Molten Stainless Steel", + "fluid.modernmetals.tantalum": "Molten Tantalum", + "fluid.modernmetals.titanium": "Molten Titanium", + "fluid.modernmetals.tungsten": "Molten Tungsten", + "fluid.modernmetals.uranium": "Molten Uranium", + "fluid.modernmetals.zirconium": "Molten Zirconium", + "tile.modernmetals.aluminum": "Molten Aluminum", + "block.modernmetals.aluminum": "Molten Aluminum", + "tile.modernmetals.aluminumbrass": "Molten Aluminum Brass", + "block.modernmetals.aluminumbrass": "Molten Aluminum Brass", + "tile.modernmetals.boron": "Molten Boron", + "block.modernmetals.boron": "Molten Boron", + "tile.modernmetals.cadmium": "Molten Cadmium", + "block.modernmetals.cadmium": "Molten Cadmium", + "tile.modernmetals.chromium": "Molten Chromium", + "block.modernmetals.chromium": "Molten Chromium", + "tile.modernmetals.galvanizedsteel": "Molten Galvanized Steel", + "block.modernmetals.galvanizedsteel": "Molten Galvanized Steel", + "tile.modernmetals.iridium": "Molten Iridium", + "block.modernmetals.iridium": "Molten Iridium", + "tile.modernmetals.magnesium": "Molten Magnesium", + "block.modernmetals.magnesium": "Molten Magnesium", + "tile.modernmetals.manganese": "Molten Manganese", + "block.modernmetals.manganese": "Molten Manganese", + "tile.modernmetals.nichrome": "Molten Nichrome", + "block.modernmetals.nichrome": "Molten Nichrome", + "tile.modernmetals.osmium": "Molten Osmium", + "block.modernmetals.osmium": "Molten Osmium", + "tile.modernmetals.plutonium": "Molten Plutonium", + "block.modernmetals.plutonium": "Molten Plutonium", + "tile.modernmetals.rutile": "Molten Rutile", + "block.modernmetals.rutile": "Molten Rutile", + "tile.modernmetals.stainlesssteel": "Molten Stainless Steel", + "block.modernmetals.stainlesssteel": "Molten Stainless Steel", + "tile.modernmetals.tantalum": "Molten Tantalum", + "block.modernmetals.tantalum": "Molten Tantalum", + "tile.modernmetals.titanium": "Molten Titanium", + "block.modernmetals.titanium": "Molten Titanium", + "tile.modernmetals.tungsten": "Molten Tungsten", + "block.modernmetals.tungsten": "Molten Tungsten", + "tile.modernmetals.uranium": "Molten Uranium", + "block.modernmetals.uranium": "Molten Uranium", + "tile.modernmetals.zirconium": "Molten Zirconium", + "block.modernmetals.zirconium": "Molten Zirconium", + "item.modernmetals.aluminum_clump": "Aluminum Clump", + "item.modernmetals.aluminum_crushed": "Crushed Aluminum Ore", + "item.modernmetals.aluminum_crushed_purified": "Purified Crushed Aluminum Ore", + "item.modernmetals.aluminum_crystal": "Aluminum Crystal", + "item.modernmetals.aluminum_dense_plate": "Dense Aluminum Plate", + "item.modernmetals.aluminum_powder_dirty": "Dirty Aluminum Dust", + "item.modernmetals.aluminum_shard": "Aluminum Shard", + "item.modernmetals.aluminum_button": "Aluminum Button", + "item.modernmetals.aluminum_lever": "Aluminum Lever", + "item.modernmetals.aluminum_pressure_plate": "Aluminum Pressure Plate", + "item.modernmetals.aluminum_slab": "Aluminum Slab", + "item.modernmetals.aluminum_stairs": "Aluminum Stairs", + "item.modernmetals.aluminum_wall": "Aluminum Wall", + "tile.modernmetals.aluminum_button": "Aluminum Button", + "block.modernmetals.aluminum_button": "Aluminum Button", + "tile.modernmetals.aluminum_lever": "Aluminum Lever", + "block.modernmetals.aluminum_lever": "Aluminum Lever", + "tile.modernmetals.aluminum_pressure_plate": "Aluminum Pressure Plate", + "block.modernmetals.aluminum_pressure_plate": "Aluminum Pressure Plate", + "tile.modernmetals.aluminum_slab": "Aluminum Slab", + "block.modernmetals.aluminum_slab": "Aluminum Slab", + "tile.modernmetals.aluminum_stairs": "Aluminum Stairs", + "block.modernmetals.aluminum_stairs": "Aluminum Stairs", + "tile.modernmetals.aluminum_wall": "Aluminum Wall", + "block.modernmetals.aluminum_wall": "Aluminum Wall", + "item.modernmetals.aluminumbrass_clump": "Aluminum Brass Clump", + "item.modernmetals.aluminumbrass_crushed": "Crushed Aluminum Brass Ore", + "item.modernmetals.aluminumbrass_crushed_purified": "Purified Crushed Aluminum Brass Ore", + "item.modernmetals.aluminumbrass_crystal": "Aluminum Brass Crystal", + "item.modernmetals.aluminumbrass_dense_plate": "Dense Aluminum Brass Plate", + "item.modernmetals.aluminumbrass_powder_dirty": "Dirty Aluminum Brass Dust", + "item.modernmetals.aluminumbrass_shard": "Aluminum Brass Shard", + "item.modernmetals.aluminumbrass_button": "Aluminum Brass Button", + "item.modernmetals.aluminumbrass_lever": "Aluminum Brass Lever", + "item.modernmetals.aluminumbrass_pressure_plate": "Aluminum Brass Pressure Plate", + "item.modernmetals.aluminumbrass_slab": "Aluminum Brass Slab", + "item.modernmetals.aluminumbrass_stairs": "Aluminum Brass Stairs", + "item.modernmetals.aluminumbrass_wall": "Aluminum Brass Wall", + "tile.modernmetals.aluminumbrass_button": "Aluminum Brass Button", + "block.modernmetals.aluminumbrass_button": "Aluminum Brass Button", + "tile.modernmetals.aluminumbrass_lever": "Aluminum Brass Lever", + "block.modernmetals.aluminumbrass_lever": "Aluminum Brass Lever", + "tile.modernmetals.aluminumbrass_pressure_plate": "Aluminum Brass Pressure Plate", + "block.modernmetals.aluminumbrass_pressure_plate": "Aluminum Brass Pressure Plate", + "tile.modernmetals.aluminumbrass_slab": "Aluminum Brass Slab", + "block.modernmetals.aluminumbrass_slab": "Aluminum Brass Slab", + "tile.modernmetals.aluminumbrass_stairs": "Aluminum Brass Stairs", + "block.modernmetals.aluminumbrass_stairs": "Aluminum Brass Stairs", + "tile.modernmetals.aluminumbrass_wall": "Aluminum Brass Wall", + "block.modernmetals.aluminumbrass_wall": "Aluminum Brass Wall", + "tile.modernmetals.beryllium_bars": "Beryllium Bars", + "block.modernmetals.beryllium_bars": "Beryllium Bars", + "tile.modernmetals.beryllium_block": "Block of Beryllium", + "block.modernmetals.beryllium_block": "Block of Beryllium", + "tile.modernmetals.beryllium_door": "Beryllium Door", + "block.modernmetals.beryllium_door": "Beryllium Door", + "tile.modernmetals.beryllium_ore": "Beryllium Ore", + "block.modernmetals.beryllium_ore": "Beryllium Ore", + "tile.modernmetals.beryllium_plate": "Beryllium Plate", + "block.modernmetals.beryllium_plate": "Beryllium Plate", + "tile.modernmetals.beryllium_trapdoor": "Beryllium Trapdoor", + "block.modernmetals.beryllium_trapdoor": "Beryllium Trapdoor", + "item.modernmetals.beryllium_clump": "Beryllium Clump", + "item.modernmetals.beryllium_crushed": "Crushed Beryllium Ore", + "item.modernmetals.beryllium_crushed_purified": "Purified Crushed Beryllium Ore", + "item.modernmetals.beryllium_crystal": "Beryllium Crystal", + "item.modernmetals.beryllium_dense_plate": "Dense Beryllium Plate", + "item.modernmetals.beryllium_powder_dirty": "Dirty Beryllium Dust", + "item.modernmetals.beryllium_shard": "Beryllium Shard", + "item.modernmetals.beryllium_button": "Beryllium Button", + "item.modernmetals.beryllium_lever": "Beryllium Lever", + "item.modernmetals.beryllium_pressure_plate": "Beryllium Pressure Plate", + "item.modernmetals.beryllium_slab": "Beryllium Slab", + "item.modernmetals.beryllium_stairs": "Beryllium Stairs", + "item.modernmetals.beryllium_wall": "Beryllium Wall", + "tile.modernmetals.beryllium": "Molten Beryllium", + "block.modernmetals.beryllium": "Molten Beryllium", + "tile.modernmetals.beryllium_button": "Beryllium Button", + "block.modernmetals.beryllium_button": "Beryllium Button", + "tile.modernmetals.beryllium_lever": "Beryllium Lever", + "block.modernmetals.beryllium_lever": "Beryllium Lever", + "tile.modernmetals.beryllium_pressure_plate": "Beryllium Pressure Plate", + "block.modernmetals.beryllium_pressure_plate": "Beryllium Pressure Plate", + "tile.modernmetals.beryllium_slab": "Beryllium Slab", + "block.modernmetals.beryllium_slab": "Beryllium Slab", + "tile.modernmetals.beryllium_stairs": "Beryllium Stairs", + "block.modernmetals.beryllium_stairs": "Beryllium Stairs", + "tile.modernmetals.beryllium_wall": "Beryllium Wall", + "block.modernmetals.beryllium_wall": "Beryllium Wall", + "item.modernmetals.boron_clump": "Boron Clump", + "item.modernmetals.boron_crushed": "Crushed Boron Ore", + "item.modernmetals.boron_crushed_purified": "Purified Crushed Boron Ore", + "item.modernmetals.boron_crystal": "Boron Crystal", + "item.modernmetals.boron_dense_plate": "Dense Boron Plate", + "item.modernmetals.boron_powder_dirty": "Dirty Boron Dust", + "item.modernmetals.boron_shard": "Boron Shard", + "item.modernmetals.boron_button": "Boron Button", + "item.modernmetals.boron_lever": "Boron Lever", + "item.modernmetals.boron_pressure_plate": "Boron Pressure Plate", + "item.modernmetals.boron_slab": "Boron Slab", + "item.modernmetals.boron_stairs": "Boron Stairs", + "item.modernmetals.boron_wall": "Boron Wall", + "tile.modernmetals.boron_button": "Boron Button", + "block.modernmetals.boron_button": "Boron Button", + "tile.modernmetals.boron_lever": "Boron Lever", + "block.modernmetals.boron_lever": "Boron Lever", + "tile.modernmetals.boron_pressure_plate": "Boron Pressure Plate", + "block.modernmetals.boron_pressure_plate": "Boron Pressure Plate", + "tile.modernmetals.boron_slab": "Boron Slab", + "block.modernmetals.boron_slab": "Boron Slab", + "tile.modernmetals.boron_stairs": "Boron Stairs", + "block.modernmetals.boron_stairs": "Boron Stairs", + "tile.modernmetals.boron_wall": "Boron Wall", + "block.modernmetals.boron_wall": "Boron Wall", + "item.modernmetals.cadmium_clump": "Cadmium Clump", + "item.modernmetals.cadmium_crushed": "Crushed Cadmium Ore", + "item.modernmetals.cadmium_crushed_purified": "Purified Crushed Cadmium Ore", + "item.modernmetals.cadmium_crystal": "Cadmium Crystal", + "item.modernmetals.cadmium_dense_plate": "Dense Cadmium Plate", + "item.modernmetals.cadmium_powder_dirty": "Dirty Cadmium Dust", + "item.modernmetals.cadmium_shard": "Cadmium Shard", + "item.modernmetals.cadmium_button": "Cadmium Button", + "item.modernmetals.cadmium_lever": "Cadmium Lever", + "item.modernmetals.cadmium_pressure_plate": "Cadmium Pressure Plate", + "item.modernmetals.cadmium_slab": "Cadmium Slab", + "item.modernmetals.cadmium_stairs": "Cadmium Stairs", + "item.modernmetals.cadmium_wall": "Cadmium Wall", + "tile.modernmetals.cadmium_button": "Cadmium Button", + "block.modernmetals.cadmium_button": "Cadmium Button", + "tile.modernmetals.cadmium_lever": "Cadmium Lever", + "block.modernmetals.cadmium_lever": "Cadmium Lever", + "tile.modernmetals.cadmium_pressure_plate": "Cadmium Pressure Plate", + "block.modernmetals.cadmium_pressure_plate": "Cadmium Pressure Plate", + "tile.modernmetals.cadmium_slab": "Cadmium Slab", + "block.modernmetals.cadmium_slab": "Cadmium Slab", + "tile.modernmetals.cadmium_stairs": "Cadmium Stairs", + "block.modernmetals.cadmium_stairs": "Cadmium Stairs", + "tile.modernmetals.cadmium_wall": "Cadmium Wall", + "block.modernmetals.cadmium_wall": "Cadmium Wall", + "item.modernmetals.chromium_clump": "Chromium Clump", + "item.modernmetals.chromium_crushed": "Crushed Chromium Ore", + "item.modernmetals.chromium_crushed_purified": "Purified Crushed Chromium Ore", + "item.modernmetals.chromium_crystal": "Chromium Crystal", + "item.modernmetals.chromium_dense_plate": "Dense Chromium Plate", + "item.modernmetals.chromium_powder_dirty": "Dirty Chromium Dust", + "item.modernmetals.chromium_shard": "Chromium Shard", + "item.modernmetals.chromium_button": "Chromium Button", + "item.modernmetals.chromium_lever": "Chromium Lever", + "item.modernmetals.chromium_pressure_plate": "Chromium Pressure Plate", + "item.modernmetals.chromium_slab": "Chromium Slab", + "item.modernmetals.chromium_stairs": "Chromium Stairs", + "item.modernmetals.chromium_wall": "Chromium Wall", + "tile.modernmetals.chromium_button": "Chromium Button", + "block.modernmetals.chromium_button": "Chromium Button", + "tile.modernmetals.chromium_lever": "Chromium Lever", + "block.modernmetals.chromium_lever": "Chromium Lever", + "tile.modernmetals.chromium_pressure_plate": "Chromium Pressure Plate", + "block.modernmetals.chromium_pressure_plate": "Chromium Pressure Plate", + "tile.modernmetals.chromium_slab": "Chromium Slab", + "block.modernmetals.chromium_slab": "Chromium Slab", + "tile.modernmetals.chromium_stairs": "Chromium Stairs", + "block.modernmetals.chromium_stairs": "Chromium Stairs", + "tile.modernmetals.chromium_wall": "Chromium Wall", + "block.modernmetals.chromium_wall": "Chromium Wall", + "item.modernmetals.galvanizedsteel_clump": "Galvanized Steel Clump", + "item.modernmetals.galvanizedsteel_crushed": "Crushed Galvanized Steel Ore", + "item.modernmetals.galvanizedsteel_crushed_purified": "Purified Crushed Galvanized Steel Ore", + "item.modernmetals.galvanizedsteel_crystal": "Galvanized Steel Crystal", + "item.modernmetals.galvanizedsteel_dense_plate": "Dense Galvanized Steel Plate", + "item.modernmetals.galvanizedsteel_powder_dirty": "Dirty Galvanized Steel Dust", + "item.modernmetals.galvanizedsteel_shard": "Galvanized Steel Shard", + "item.modernmetals.galvanizedsteel_button": "Galvanized Steel Button", + "item.modernmetals.galvanizedsteel_lever": "Galvanized Steel Lever", + "item.modernmetals.galvanizedsteel_pressure_plate": "Galvanized Steel Pressure Plate", + "item.modernmetals.galvanizedsteel_slab": "Galvanized Steel Slab", + "item.modernmetals.galvanizedsteel_stairs": "Galvanized Steel Stairs", + "item.modernmetals.galvanizedsteel_wall": "Galvanized Steel Wall", + "tile.modernmetals.galvanizedsteel_button": "Galvanized Steel Button", + "block.modernmetals.galvanizedsteel_button": "Galvanized Steel Button", + "tile.modernmetals.galvanizedsteel_lever": "Galvanized Steel Lever", + "block.modernmetals.galvanizedsteel_lever": "Galvanized Steel Lever", + "tile.modernmetals.galvanizedsteel_pressure_plate": "Galvanized Steel Pressure Plate", + "block.modernmetals.galvanizedsteel_pressure_plate": "Galvanized Steel Pressure Plate", + "tile.modernmetals.galvanizedsteel_slab": "Galvanized Steel Slab", + "block.modernmetals.galvanizedsteel_slab": "Galvanized Steel Slab", + "tile.modernmetals.galvanizedsteel_stairs": "Galvanized Steel Stairs", + "block.modernmetals.galvanizedsteel_stairs": "Galvanized Steel Stairs", + "tile.modernmetals.galvanizedsteel_wall": "Galvanized Steel Wall", + "block.modernmetals.galvanizedsteel_wall": "Galvanized Steel Wall", + "item.modernmetals.iridium_clump": "Iridium Clump", + "item.modernmetals.iridium_crushed": "Crushed Iridium Ore", + "item.modernmetals.iridium_crushed_purified": "Purified Crushed Iridium Ore", + "item.modernmetals.iridium_crystal": "Iridium Crystal", + "item.modernmetals.iridium_dense_plate": "Dense Iridium Plate", + "item.modernmetals.iridium_powder_dirty": "Dirty Iridium Dust", + "item.modernmetals.iridium_shard": "Iridium Shard", + "item.modernmetals.iridium_button": "Iridium Button", + "item.modernmetals.iridium_lever": "Iridium Lever", + "item.modernmetals.iridium_pressure_plate": "Iridium Pressure Plate", + "item.modernmetals.iridium_slab": "Iridium Slab", + "item.modernmetals.iridium_stairs": "Iridium Stairs", + "item.modernmetals.iridium_wall": "Iridium Wall", + "tile.modernmetals.iridium_button": "Iridium Button", + "block.modernmetals.iridium_button": "Iridium Button", + "tile.modernmetals.iridium_lever": "Iridium Lever", + "block.modernmetals.iridium_lever": "Iridium Lever", + "tile.modernmetals.iridium_pressure_plate": "Iridium Pressure Plate", + "block.modernmetals.iridium_pressure_plate": "Iridium Pressure Plate", + "tile.modernmetals.iridium_slab": "Iridium Slab", + "block.modernmetals.iridium_slab": "Iridium Slab", + "tile.modernmetals.iridium_stairs": "Iridium Stairs", + "block.modernmetals.iridium_stairs": "Iridium Stairs", + "tile.modernmetals.iridium_wall": "Iridium Wall", + "block.modernmetals.iridium_wall": "Iridium Wall", + "item.modernmetals.magnesium_clump": "Magnesium Clump", + "item.modernmetals.magnesium_crushed": "Crushed Magnesium Ore", + "item.modernmetals.magnesium_crushed_purified": "Purified Crushed Magnesium Ore", + "item.modernmetals.magnesium_crystal": "Magnesium Crystal", + "item.modernmetals.magnesium_dense_plate": "Dense Magnesium Plate", + "item.modernmetals.magnesium_powder_dirty": "Dirty Magnesium Dust", + "item.modernmetals.magnesium_shard": "Magnesium Shard", + "item.modernmetals.magnesium_button": "Magnesium Button", + "item.modernmetals.magnesium_lever": "Magnesium Lever", + "item.modernmetals.magnesium_pressure_plate": "Magnesium Pressure Plate", + "item.modernmetals.magnesium_slab": "Magnesium Slab", + "item.modernmetals.magnesium_stairs": "Magnesium Stairs", + "item.modernmetals.magnesium_wall": "Magnesium Wall", + "tile.modernmetals.magnesium_button": "Magnesium Button", + "block.modernmetals.magnesium_button": "Magnesium Button", + "tile.modernmetals.magnesium_lever": "Magnesium Lever", + "block.modernmetals.magnesium_lever": "Magnesium Lever", + "tile.modernmetals.magnesium_pressure_plate": "Magnesium Pressure Plate", + "block.modernmetals.magnesium_pressure_plate": "Magnesium Pressure Plate", + "tile.modernmetals.magnesium_slab": "Magnesium Slab", + "block.modernmetals.magnesium_slab": "Magnesium Slab", + "tile.modernmetals.magnesium_stairs": "Magnesium Stairs", + "block.modernmetals.magnesium_stairs": "Magnesium Stairs", + "tile.modernmetals.magnesium_wall": "Magnesium Wall", + "block.modernmetals.magnesium_wall": "Magnesium Wall", + "item.modernmetals.manganese_clump": "Manganese Clump", + "item.modernmetals.manganese_crushed": "Crushed Manganese Ore", + "item.modernmetals.manganese_crushed_purified": "Purified Crushed Manganese Ore", + "item.modernmetals.manganese_crystal": "Manganese Crystal", + "item.modernmetals.manganese_dense_plate": "Dense Manganese Plate", + "item.modernmetals.manganese_powder_dirty": "Dirty Manganese Dust", + "item.modernmetals.manganese_shard": "Manganese Shard", + "item.modernmetals.manganese_button": "Manganese Button", + "item.modernmetals.manganese_lever": "Manganese Lever", + "item.modernmetals.manganese_pressure_plate": "Manganese Pressure Plate", + "item.modernmetals.manganese_slab": "Manganese Slab", + "item.modernmetals.manganese_stairs": "Manganese Stairs", + "item.modernmetals.manganese_wall": "Manganese Wall", + "tile.modernmetals.manganese_button": "Manganese Button", + "block.modernmetals.manganese_button": "Manganese Button", + "tile.modernmetals.manganese_lever": "Manganese Lever", + "block.modernmetals.manganese_lever": "Manganese Lever", + "tile.modernmetals.manganese_pressure_plate": "Manganese Pressure Plate", + "block.modernmetals.manganese_pressure_plate": "Manganese Pressure Plate", + "tile.modernmetals.manganese_slab": "Manganese Slab", + "block.modernmetals.manganese_slab": "Manganese Slab", + "tile.modernmetals.manganese_stairs": "Manganese Stairs", + "block.modernmetals.manganese_stairs": "Manganese Stairs", + "tile.modernmetals.manganese_wall": "Manganese Wall", + "block.modernmetals.manganese_wall": "Manganese Wall", + "item.modernmetals.nichrome_clump": "Nichrome Clump", + "item.modernmetals.nichrome_crushed": "Crushed Nichrome Ore", + "item.modernmetals.nichrome_crushed_purified": "Purified Crushed Nichrome Ore", + "item.modernmetals.nichrome_crystal": "Nichrome Crystal", + "item.modernmetals.nichrome_dense_plate": "Dense Nichrome Plate", + "item.modernmetals.nichrome_powder_dirty": "Dirty Nichrome Dust", + "item.modernmetals.nichrome_shard": "Nichrome Shard", + "item.modernmetals.nichrome_button": "Nichrome Button", + "item.modernmetals.nichrome_lever": "Nichrome Lever", + "item.modernmetals.nichrome_pressure_plate": "Nichrome Pressure Plate", + "item.modernmetals.nichrome_slab": "Nichrome Slab", + "item.modernmetals.nichrome_stairs": "Nichrome Stairs", + "item.modernmetals.nichrome_wall": "Nichrome Wall", + "tile.modernmetals.nichrome_button": "Nichrome Button", + "block.modernmetals.nichrome_button": "Nichrome Button", + "tile.modernmetals.nichrome_lever": "Nichrome Lever", + "block.modernmetals.nichrome_lever": "Nichrome Lever", + "tile.modernmetals.nichrome_pressure_plate": "Nichrome Pressure Plate", + "block.modernmetals.nichrome_pressure_plate": "Nichrome Pressure Plate", + "tile.modernmetals.nichrome_slab": "Nichrome Slab", + "block.modernmetals.nichrome_slab": "Nichrome Slab", + "tile.modernmetals.nichrome_stairs": "Nichrome Stairs", + "block.modernmetals.nichrome_stairs": "Nichrome Stairs", + "tile.modernmetals.nichrome_wall": "Nichrome Wall", + "block.modernmetals.nichrome_wall": "Nichrome Wall", + "item.modernmetals.osmium_clump": "Osmium Clump", + "item.modernmetals.osmium_crushed": "Crushed Osmium Ore", + "item.modernmetals.osmium_crushed_purified": "Purified Crushed Osmium Ore", + "item.modernmetals.osmium_crystal": "Osmium Crystal", + "item.modernmetals.osmium_dense_plate": "Dense Osmium Plate", + "item.modernmetals.osmium_powder_dirty": "Dirty Osmium Dust", + "item.modernmetals.osmium_shard": "Osmium Shard", + "item.modernmetals.osmium_button": "Osmium Button", + "item.modernmetals.osmium_lever": "Osmium Lever", + "item.modernmetals.osmium_pressure_plate": "Osmium Pressure Plate", + "item.modernmetals.osmium_slab": "Osmium Slab", + "item.modernmetals.osmium_stairs": "Osmium Stairs", + "item.modernmetals.osmium_wall": "Osmium Wall", + "tile.modernmetals.osmium_button": "Osmium Button", + "block.modernmetals.osmium_button": "Osmium Button", + "tile.modernmetals.osmium_lever": "Osmium Lever", + "block.modernmetals.osmium_lever": "Osmium Lever", + "tile.modernmetals.osmium_pressure_plate": "Osmium Pressure Plate", + "block.modernmetals.osmium_pressure_plate": "Osmium Pressure Plate", + "tile.modernmetals.osmium_slab": "Osmium Slab", + "block.modernmetals.osmium_slab": "Osmium Slab", + "tile.modernmetals.osmium_stairs": "Osmium Stairs", + "block.modernmetals.osmium_stairs": "Osmium Stairs", + "tile.modernmetals.osmium_wall": "Osmium Wall", + "block.modernmetals.osmium_wall": "Osmium Wall", + "item.modernmetals.plutonium_clump": "Plutonium Clump", + "item.modernmetals.plutonium_crushed": "Crushed Plutonium Ore", + "item.modernmetals.plutonium_crushed_purified": "Purified Crushed Plutonium Ore", + "item.modernmetals.plutonium_crystal": "Plutonium Crystal", + "item.modernmetals.plutonium_dense_plate": "Dense Plutonium Plate", + "item.modernmetals.plutonium_powder_dirty": "Dirty Plutonium Dust", + "item.modernmetals.plutonium_shard": "Plutonium Shard", + "item.modernmetals.plutonium_button": "Plutonium Button", + "item.modernmetals.plutonium_lever": "Plutonium Lever", + "item.modernmetals.plutonium_pressure_plate": "Plutonium Pressure Plate", + "item.modernmetals.plutonium_slab": "Plutonium Slab", + "item.modernmetals.plutonium_stairs": "Plutonium Stairs", + "item.modernmetals.plutonium_wall": "Plutonium Wall", + "tile.modernmetals.plutonium_button": "Plutonium Button", + "block.modernmetals.plutonium_button": "Plutonium Button", + "tile.modernmetals.plutonium_lever": "Plutonium Lever", + "block.modernmetals.plutonium_lever": "Plutonium Lever", + "tile.modernmetals.plutonium_pressure_plate": "Plutonium Pressure Plate", + "block.modernmetals.plutonium_pressure_plate": "Plutonium Pressure Plate", + "tile.modernmetals.plutonium_slab": "Plutonium Slab", + "block.modernmetals.plutonium_slab": "Plutonium Slab", + "tile.modernmetals.plutonium_stairs": "Plutonium Stairs", + "block.modernmetals.plutonium_stairs": "Plutonium Stairs", + "tile.modernmetals.plutonium_wall": "Plutonium Wall", + "block.modernmetals.plutonium_wall": "Plutonium Wall", + "item.modernmetals.rutile_clump": "Rutile Clump", + "item.modernmetals.rutile_crushed": "Crushed Rutile Ore", + "item.modernmetals.rutile_crushed_purified": "Purified Crushed Rutile Ore", + "item.modernmetals.rutile_crystal": "Rutile Crystal", + "item.modernmetals.rutile_dense_plate": "Dense Rutile Plate", + "item.modernmetals.rutile_powder_dirty": "Dirty Rutile Dust", + "item.modernmetals.rutile_shard": "Rutile Shard", + "item.modernmetals.rutile_button": "Rutile Button", + "item.modernmetals.rutile_lever": "Rutile Lever", + "item.modernmetals.rutile_pressure_plate": "Rutile Pressure Plate", + "item.modernmetals.rutile_slab": "Rutile Slab", + "item.modernmetals.rutile_stairs": "Rutile Stairs", + "item.modernmetals.rutile_wall": "Rutile Wall", + "tile.modernmetals.rutile_button": "Rutile Button", + "block.modernmetals.rutile_button": "Rutile Button", + "tile.modernmetals.rutile_lever": "Rutile Lever", + "block.modernmetals.rutile_lever": "Rutile Lever", + "tile.modernmetals.rutile_pressure_plate": "Rutile Pressure Plate", + "block.modernmetals.rutile_pressure_plate": "Rutile Pressure Plate", + "tile.modernmetals.rutile_slab": "Rutile Slab", + "block.modernmetals.rutile_slab": "Rutile Slab", + "tile.modernmetals.rutile_stairs": "Rutile Stairs", + "block.modernmetals.rutile_stairs": "Rutile Stairs", + "tile.modernmetals.rutile_wall": "Rutile Wall", + "block.modernmetals.rutile_wall": "Rutile Wall", + "item.modernmetals.stainlesssteel_clump": "Stainless Steel Clump", + "item.modernmetals.stainlesssteel_crushed": "Crushed Stainless Steel Ore", + "item.modernmetals.stainlesssteel_crushed_purified": "Purified Crushed Stainless Steel Ore", + "item.modernmetals.stainlesssteel_crystal": "Stainless Steel Crystal", + "item.modernmetals.stainlesssteel_dense_plate": "Dense Stainless Steel Plate", + "item.modernmetals.stainlesssteel_powder_dirty": "Dirty Stainless Steel Dust", + "item.modernmetals.stainlesssteel_shard": "Stainless Steel Shard", + "item.modernmetals.stainlesssteel_button": "Stainless Steel Button", + "item.modernmetals.stainlesssteel_lever": "Stainless Steel Lever", + "item.modernmetals.stainlesssteel_pressure_plate": "Stainless Steel Pressure Plate", + "item.modernmetals.stainlesssteel_slab": "Stainless Steel Slab", + "item.modernmetals.stainlesssteel_stairs": "Stainless Steel Stairs", + "item.modernmetals.stainlesssteel_wall": "Stainless Steel Wall", + "tile.modernmetals.stainlesssteel_button": "Stainless Steel Button", + "block.modernmetals.stainlesssteel_button": "Stainless Steel Button", + "tile.modernmetals.stainlesssteel_lever": "Stainless Steel Lever", + "block.modernmetals.stainlesssteel_lever": "Stainless Steel Lever", + "tile.modernmetals.stainlesssteel_pressure_plate": "Stainless Steel Pressure Plate", + "block.modernmetals.stainlesssteel_pressure_plate": "Stainless Steel Pressure Plate", + "tile.modernmetals.stainlesssteel_slab": "Stainless Steel Slab", + "block.modernmetals.stainlesssteel_slab": "Stainless Steel Slab", + "tile.modernmetals.stainlesssteel_stairs": "Stainless Steel Stairs", + "block.modernmetals.stainlesssteel_stairs": "Stainless Steel Stairs", + "tile.modernmetals.stainlesssteel_wall": "Stainless Steel Wall", + "block.modernmetals.stainlesssteel_wall": "Stainless Steel Wall", + "item.modernmetals.tantalum_clump": "Tantalum Clump", + "item.modernmetals.tantalum_crushed": "Crushed Tantalum Ore", + "item.modernmetals.tantalum_crushed_purified": "Purified Crushed Tantalum Ore", + "item.modernmetals.tantalum_crystal": "Tantalum Crystal", + "item.modernmetals.tantalum_dense_plate": "Dense Tantalum Plate", + "item.modernmetals.tantalum_powder_dirty": "Dirty Tantalum Dust", + "item.modernmetals.tantalum_shard": "Tantalum Shard", + "item.modernmetals.tantalum_button": "Tantalum Button", + "item.modernmetals.tantalum_lever": "Tantalum Lever", + "item.modernmetals.tantalum_pressure_plate": "Tantalum Pressure Plate", + "item.modernmetals.tantalum_slab": "Tantalum Slab", + "item.modernmetals.tantalum_stairs": "Tantalum Stairs", + "item.modernmetals.tantalum_wall": "Tantalum Wall", + "tile.modernmetals.tantalum_button": "Tantalum Button", + "block.modernmetals.tantalum_button": "Tantalum Button", + "tile.modernmetals.tantalum_lever": "Tantalum Lever", + "block.modernmetals.tantalum_lever": "Tantalum Lever", + "tile.modernmetals.tantalum_pressure_plate": "Tantalum Pressure Plate", + "block.modernmetals.tantalum_pressure_plate": "Tantalum Pressure Plate", + "tile.modernmetals.tantalum_slab": "Tantalum Slab", + "block.modernmetals.tantalum_slab": "Tantalum Slab", + "tile.modernmetals.tantalum_stairs": "Tantalum Stairs", + "block.modernmetals.tantalum_stairs": "Tantalum Stairs", + "tile.modernmetals.tantalum_wall": "Tantalum Wall", + "block.modernmetals.tantalum_wall": "Tantalum Wall", + "item.modernmetals.titanium_clump": "Titanium Clump", + "item.modernmetals.titanium_crushed": "Crushed Titanium Ore", + "item.modernmetals.titanium_crushed_purified": "Purified Crushed Titanium Ore", + "item.modernmetals.titanium_crystal": "Titanium Crystal", + "item.modernmetals.titanium_dense_plate": "Dense Titanium Plate", + "item.modernmetals.titanium_powder_dirty": "Dirty Titanium Dust", + "item.modernmetals.titanium_shard": "Titanium Shard", + "item.modernmetals.titanium_button": "Titanium Button", + "item.modernmetals.titanium_lever": "Titanium Lever", + "item.modernmetals.titanium_pressure_plate": "Titanium Pressure Plate", + "item.modernmetals.titanium_slab": "Titanium Slab", + "item.modernmetals.titanium_stairs": "Titanium Stairs", + "item.modernmetals.titanium_wall": "Titanium Wall", + "tile.modernmetals.titanium_button": "Titanium Button", + "block.modernmetals.titanium_button": "Titanium Button", + "tile.modernmetals.titanium_lever": "Titanium Lever", + "block.modernmetals.titanium_lever": "Titanium Lever", + "tile.modernmetals.titanium_pressure_plate": "Titanium Pressure Plate", + "block.modernmetals.titanium_pressure_plate": "Titanium Pressure Plate", + "tile.modernmetals.titanium_slab": "Titanium Slab", + "block.modernmetals.titanium_slab": "Titanium Slab", + "tile.modernmetals.titanium_stairs": "Titanium Stairs", + "block.modernmetals.titanium_stairs": "Titanium Stairs", + "tile.modernmetals.titanium_wall": "Titanium Wall", + "block.modernmetals.titanium_wall": "Titanium Wall", + "item.modernmetals.tungsten_clump": "Tungsten Clump", + "item.modernmetals.tungsten_crushed": "Crushed Tungsten Ore", + "item.modernmetals.tungsten_crushed_purified": "Purified Crushed Tungsten Ore", + "item.modernmetals.tungsten_crystal": "Tungsten Crystal", + "item.modernmetals.tungsten_dense_plate": "Dense Tungsten Plate", + "item.modernmetals.tungsten_powder_dirty": "Dirty Tungsten Dust", + "item.modernmetals.tungsten_shard": "Tungsten Shard", + "item.modernmetals.tungsten_button": "Tungsten Button", + "item.modernmetals.tungsten_lever": "Tungsten Lever", + "item.modernmetals.tungsten_pressure_plate": "Tungsten Pressure Plate", + "item.modernmetals.tungsten_slab": "Tungsten Slab", + "item.modernmetals.tungsten_stairs": "Tungsten Stairs", + "item.modernmetals.tungsten_wall": "Tungsten Wall", + "tile.modernmetals.tungsten_button": "Tungsten Button", + "block.modernmetals.tungsten_button": "Tungsten Button", + "tile.modernmetals.tungsten_lever": "Tungsten Lever", + "block.modernmetals.tungsten_lever": "Tungsten Lever", + "tile.modernmetals.tungsten_pressure_plate": "Tungsten Pressure Plate", + "block.modernmetals.tungsten_pressure_plate": "Tungsten Pressure Plate", + "tile.modernmetals.tungsten_slab": "Tungsten Slab", + "block.modernmetals.tungsten_slab": "Tungsten Slab", + "tile.modernmetals.tungsten_stairs": "Tungsten Stairs", + "block.modernmetals.tungsten_stairs": "Tungsten Stairs", + "tile.modernmetals.tungsten_wall": "Tungsten Wall", + "block.modernmetals.tungsten_wall": "Tungsten Wall", + "item.modernmetals.uranium_clump": "Uranium Clump", + "item.modernmetals.uranium_crushed": "Crushed Uranium Ore", + "item.modernmetals.uranium_crushed_purified": "Purified Crushed Uranium Ore", + "item.modernmetals.uranium_crystal": "Uranium Crystal", + "item.modernmetals.uranium_dense_plate": "Dense Uranium Plate", + "item.modernmetals.uranium_powder_dirty": "Dirty Uranium Dust", + "item.modernmetals.uranium_shard": "Uranium Shard", + "item.modernmetals.uranium_button": "Uranium Button", + "item.modernmetals.uranium_lever": "Uranium Lever", + "item.modernmetals.uranium_pressure_plate": "Uranium Pressure Plate", + "item.modernmetals.uranium_slab": "Uranium Slab", + "item.modernmetals.uranium_stairs": "Uranium Stairs", + "item.modernmetals.uranium_wall": "Uranium Wall", + "tile.modernmetals.uranium_button": "Uranium Button", + "block.modernmetals.uranium_button": "Uranium Button", + "tile.modernmetals.uranium_lever": "Uranium Lever", + "block.modernmetals.uranium_lever": "Uranium Lever", + "tile.modernmetals.uranium_pressure_plate": "Uranium Pressure Plate", + "block.modernmetals.uranium_pressure_plate": "Uranium Pressure Plate", + "tile.modernmetals.uranium_slab": "Uranium Slab", + "block.modernmetals.uranium_slab": "Uranium Slab", + "tile.modernmetals.uranium_stairs": "Uranium Stairs", + "block.modernmetals.uranium_stairs": "Uranium Stairs", + "tile.modernmetals.uranium_wall": "Uranium Wall", + "block.modernmetals.uranium_wall": "Uranium Wall", + "item.modernmetals.zirconium_clump": "Zirconium Clump", + "item.modernmetals.zirconium_crushed": "Crushed Zirconium Ore", + "item.modernmetals.zirconium_crushed_purified": "Purified Crushed Zirconium Ore", + "item.modernmetals.zirconium_crystal": "Zirconium Crystal", + "item.modernmetals.zirconium_dense_plate": "Dense Zirconium Plate", + "item.modernmetals.zirconium_powder_dirty": "Dirty Zirconium Dust", + "item.modernmetals.zirconium_shard": "Zirconium Shard", + "item.modernmetals.zirconium_button": "Zirconium Button", + "item.modernmetals.zirconium_lever": "Zirconium Lever", + "item.modernmetals.zirconium_pressure_plate": "Zirconium Pressure Plate", + "item.modernmetals.zirconium_slab": "Zirconium Slab", + "item.modernmetals.zirconium_stairs": "Zirconium Stairs", + "item.modernmetals.zirconium_wall": "Zirconium Wall", + "tile.modernmetals.zirconium_button": "Zirconium Button", + "block.modernmetals.zirconium_button": "Zirconium Button", + "tile.modernmetals.zirconium_lever": "Zirconium Lever", + "block.modernmetals.zirconium_lever": "Zirconium Lever", + "tile.modernmetals.zirconium_pressure_plate": "Zirconium Pressure Plate", + "block.modernmetals.zirconium_pressure_plate": "Zirconium Pressure Plate", + "tile.modernmetals.zirconium_slab": "Zirconium Slab", + "block.modernmetals.zirconium_slab": "Zirconium Slab", + "tile.modernmetals.zirconium_stairs": "Zirconium Stairs", + "block.modernmetals.zirconium_stairs": "Zirconium Stairs", + "tile.modernmetals.zirconium_wall": "Zirconium Wall", + "block.modernmetals.zirconium_wall": "Zirconium Wall", + "material.thorium": "Thorium", + "item.modernmetals.thorium_arrow": "Thorium Arrow", + "item.modernmetals.thorium_axe": "Thorium Axe", + "item.modernmetals.thorium_bars": "Thorium Bars", + "item.modernmetals.thorium_blend": "Thorium Blend", + "item.modernmetals.thorium_block": "Block of Thorium", + "item.modernmetals.thorium_boots": "Thorium Boots", + "item.modernmetals.thorium_bolt": "Thorium Bolt", + "item.modernmetals.thorium_bow": "Thorium Bow", + "item.modernmetals.thorium_chestplate": "Thorium Chestplate", + "item.modernmetals.thorium_crackhammer": "Thorium Crack Hammer", + "item.modernmetals.thorium_crossbow": "Thorium Crossbow", + "item.modernmetals.thorium_door": "Thorium Door", + "item.modernmetals.thorium_fishing_rod": "Thorium Fishing Rod", + "item.modernmetals.thorium_gear": "Thorium Gear", + "item.modernmetals.thorium_helmet": "Thorium Helmet", + "item.modernmetals.thorium_hoe": "Thorium Hoe", + "item.modernmetals.thorium_horse_armor": "Thorium Horse Armor", + "item.modernmetals.thorium_ingot": "Thorium Ingot", + "item.modernmetals.thorium_leggings": "Thorium Leg Armor", + "item.modernmetals.thorium_nugget": "Thorium Nugget", + "item.modernmetals.thorium_ore": "Thorium Ore", + "item.modernmetals.thorium_pickaxe": "Thorium Pickaxe", + "item.modernmetals.thorium_powder": "Thorium Dust", + "item.modernmetals.thorium_rod": "Thorium Rod", + "item.modernmetals.thorium_shears": "Thorium Shears", + "item.modernmetals.thorium_shield": "Thorium Shield", + "item.modernmetals.thorium_shovel": "Thorium Shovel", + "item.modernmetals.thorium_smallblend": "Tiny Pile of Thorium Blend", + "item.modernmetals.thorium_smallpowder": "Tiny Pile of Thorium Dust", + "item.modernmetals.thorium_sword": "Thorium Sword", + "item.modernmetals.thorium_trapdoor": "Thorium Trapdoor", + "tile.modernmetals.thorium_bars": "Thorium Bars", + "block.modernmetals.thorium_bars": "Thorium Bars", + "tile.modernmetals.thorium_block": "Block of Thorium", + "block.modernmetals.thorium_block": "Block of Thorium", + "tile.modernmetals.thorium_door": "Thorium Door", + "block.modernmetals.thorium_door": "Thorium Door", + "tile.modernmetals.thorium_ore": "Thorium Ore", + "block.modernmetals.thorium_ore": "Thorium Ore", + "tile.modernmetals.thorium_plate": "Thorium Plate", + "block.modernmetals.thorium_plate": "Thorium Plate", + "tile.modernmetals.thorium_trapdoor": "Thorium Trapdoor", + "block.modernmetals.thorium_trapdoor": "Thorium Trapdoor", + "fluid.modernmetals.thorium": "Molten Thorium", + "tile.modernmetals.thorium": "Molten Thorium", + "block.modernmetals.thorium": "Molten Thorium", + "item.modernmetals.thorium_clump": "Thorium Clump", + "item.modernmetals.thorium_crushed": "Crushed Thorium Ore", + "item.modernmetals.thorium_crushed_purified": "Purified Crushed Thorium Ore", + "item.modernmetals.thorium_crystal": "Thorium Crystal", + "item.modernmetals.thorium_dense_plate": "Dense Thorium Plate", + "item.modernmetals.thorium_powder_dirty": "Dirty Thorium Dust", + "item.modernmetals.thorium_shard": "Thorium Shard", + "item.modernmetals.thorium_button": "Thorium Button", + "item.modernmetals.thorium_lever": "Thorium Lever", + "item.modernmetals.thorium_pressure_plate": "Thorium Pressure Plate", + "item.modernmetals.thorium_slab": "Thorium Slab", + "item.modernmetals.thorium_stairs": "Thorium Stairs", + "item.modernmetals.thorium_wall": "Thorium Wall", + "tile.modernmetals.thorium_button": "Thorium Button", + "block.modernmetals.thorium_button": "Thorium Button", + "tile.modernmetals.thorium_lever": "Thorium Lever", + "block.modernmetals.thorium_lever": "Thorium Lever", + "tile.modernmetals.thorium_pressure_plate": "Thorium Pressure Plate", + "block.modernmetals.thorium_pressure_plate": "Thorium Pressure Plate", + "tile.modernmetals.thorium_slab": "Thorium Slab", + "block.modernmetals.thorium_slab": "Thorium Slab", + "tile.modernmetals.thorium_stairs": "Thorium Stairs", + "block.modernmetals.thorium_stairs": "Thorium Stairs", + "tile.modernmetals.thorium_wall": "Thorium Wall", + "block.modernmetals.thorium_wall": "Thorium Wall", + "item.modernmetals.aluminum_casing": "Aluminum Item Casing", + "item.modernmetals.aluminumbrass_casing": "Aluminum Brass Item Casing", + "item.modernmetals.boron_casing": "Boron Item Casing", + "item.modernmetals.beryllium_casing": "Beryllium Item Casing", + "item.modernmetals.cadmium_casing": "Cadmium Item Casing", + "item.modernmetals.chromium_casing": "Chromium Item Casing", + "item.modernmetals.galvanizedsteel_casing": "Galvanized Steel Item Casing", + "item.modernmetals.iridium_casing": "Iridium Item Casing", + "item.modernmetals.magnesium_casing": "Magnesium Item Casing", + "item.modernmetals.manganese_casing": "Manganese Item Casing", + "item.modernmetals.osmium_casing": "Osmium Item Casing", + "item.modernmetals.plutonium_casing": "Plutonium Item Casing", + "item.modernmetals.rutile_casing": "Rutile Item Casing", + "item.modernmetals.stainlesssteel_casing": "Stainless Steel Item Casing", + "item.modernmetals.tantalum_casing": "Tantalum Item Casing", + "item.modernmetals.thorium_casing": "Thorium Item Casing", + "item.modernmetals.titanium_casing": "Titanium Item Casing", + "item.modernmetals.tungsten_casing": "Tungsten Item Casing", + "item.modernmetals.uranium_casing": "Uranium Item Casing", + "item.modernmetals.zirconium_casing": "Zirconium Item Casing", + "item.modernmetals.aluminumbrass_scythe": "Aluminum Brass Sickle", + "item.modernmetals.aluminum_scythe": "Aluminum Sickle", + "item.modernmetals.beryllium_scythe": "Beryllium Sickle", + "item.modernmetals.boron_scythe": "Boron Sickle", + "item.modernmetals.cadmium_scythe": "Cadmium Sickle", + "item.modernmetals.chromium_scythe": "Chromium Sickle", + "item.modernmetals.galvanizedsteel_scythe": "Galvanized Steel Sickle", + "item.modernmetals.iridium_scythe": "Iridium Sickle", + "item.modernmetals.magnesium_scythe": "Magnesium Sickle", + "item.modernmetals.manganese_scythe": "Manganese Sickle", + "item.modernmetals.nichrome_scythe": "Nichrome Sickle", + "item.modernmetals.osmium_scythe": "Osmium Sickle", + "item.modernmetals.plutonium_scythe": "Plutonium Sickle", + "item.modernmetals.rutile_scythe": "Rutile Sickle", + "item.modernmetals.stainlesssteel_scythe": "Stainless Steel Sickle", + "item.modernmetals.tantalum_scythe": "Tantalum Sickle", + "item.modernmetals.thorium_scythe": "Thorium Sickle", + "item.modernmetals.titanium_scythe": "Titanium Sickle", + "item.modernmetals.tungsten_scythe": "Tungsten Sickle", + "item.modernmetals.uranium_scythe": "Uranium Sickle", + "item.modernmetals.zirconium_scythe": "Zirconium Sickle", + "gas.gasAluminum": "Aluminum Slurry", + "gas.gasBeryllium": "Beryllium Slurry", + "gas.gasBoron": "Boron Slurry", + "gas.gasCadmium": "Cadmium Slurry", + "gas.gasChromium": "Chromium Slurry", + "gas.gasIridium": "Iridium Slurry", + "gas.gasMagnesium": "Magnesium Slurry", + "gas.gasManganese": "Manganese Slurry", + "gas.gasPlutonium": "Plutonium Slurry", + "gas.gasRutile": "Rutile Slurry", + "gas.gasTantalum": "Tantalum Slurry", + "gas.gasThorium": "Thorium Slurry", + "gas.gasTitanium": "Titanium Slurry", + "gas.gasTungsten": "Tungsten Slurry", + "gas.gasUranium": "Uranium Slurry", + "gas.gasZirconium": "Zirconium Slurry", + "gas.cleanGasAluminum": "Clean Aluminum Slurry", + "gas.cleanGasBeryllium": "Clean Beryllium Slurry", + "gas.cleanGasBoron": "Clean Boron Slurry", + "gas.cleanGasCadmium": "Clean Cadmium Slurry", + "gas.cleanGasChromium": "Clean Chromium Slurry", + "gas.cleanGasIridium": "Clean Iridium Slurry", + "gas.cleanGasMagnesium": "Clean Magnesium Slurry", + "gas.cleanGasManganese": "Clean Manganese Slurry", + "gas.cleanGasPlutonium": "Clean Plutonium Slurry", + "gas.cleanGasRutile": "Clean Rutile Slurry", + "gas.cleanGasTantalum": "Clean Tantalum Slurry", + "gas.cleanGasThorium": "Clean Thorium Slurry", + "gas.cleanGasTitanium": "Clean Titanium Slurry", + "gas.cleanGasTungsten": "Clean Tungsten Slurry", + "gas.cleanGasUranium": "Clean Uranium Slurry", + "gas.cleanGasZirconium": "Clean Zirconium Slurry", + "config.modernmetals.title": "Modern Metals Settings", + "config.modernmetals.description": "Restart to apply changes. Edit ores in OreSpawn.", + "config.modernmetals.content_mode": "Fantasy Level", + "config.modernmetals.content_mode.tooltip": "High Fantasy keeps all recipes. Low Fantasy restricts unrealistic equipment and structures. Requires a game restart.", + "high_fantasy": "High Fantasy", + "low_fantasy": "Low Fantasy", + "config.modernmetals.enable_thorium": "Enable Thorium", + "config.modernmetals.enable_boron": "Enable Boron", + "config.modernmetals.enable_beryllium": "Enable Beryllium", + "config.modernmetals.enable_cadmium": "Enable Cadmium", + "config.modernmetals.enable_nichrome": "Enable Nichrome", + "config.modernmetals.enable_aluminum": "Enable Aluminum", + "config.modernmetals.enable_aluminumbrass": "Enable Aluminum Brass", + "config.modernmetals.enable_chromium": "Enable Chromium", + "config.modernmetals.enable_galvanizedsteel": "Enable Galvanized Steel", + "config.modernmetals.enable_iridium": "Enable Iridium", + "config.modernmetals.enable_magnesium": "Enable Magnesium", + "config.modernmetals.enable_manganese": "Enable Manganese", + "config.modernmetals.enable_osmium": "Enable Osmium", + "config.modernmetals.enable_plutonium": "Enable Plutonium", + "config.modernmetals.enable_rutile": "Enable Rutile", + "config.modernmetals.enable_stainlesssteel": "Enable Stainless Steel", + "config.modernmetals.enable_tantalum": "Enable Tantalum", + "config.modernmetals.enable_titanium": "Enable Titanium", + "config.modernmetals.enable_tungsten": "Enable Tungsten", + "config.modernmetals.enable_uranium": "Enable Uranium", + "config.modernmetals.enable_zirconium": "Enable Zirconium", + "config.modernmetals.material.tooltip": "Controls which blocks, items and recipes are available for this material. Requires a game restart.", + "config.modernmetals.villager_trades": "Villager Trades", + "config.modernmetals.villager_trades.tooltip": "Let blacksmiths trade Modern Metals ingots and equipment. Requires a game restart.", + "config.modernmetals.connection.mismatch": "Modern Metals Fantasy Level differs. The server uses %s and your client uses %s.", + "config.modernmetals.connection.protocol": "Modern Metals could not check the Fantasy Level. Use the same Modern Metals build on the server and client.", + "config.modernmetals.content_mode.high_fantasy": "High Fantasy", + "config.modernmetals.content_mode.low_fantasy": "Low Fantasy", + "config.modernmetals.inherited_mode": "Fantasy Level is set in Base Metals. Restart after changing settings.", + "config.modernmetals.contentMode": "Fantasy Level", + "config.modernmetals.high_fantasy": "High Fantasy", + "config.modernmetals.low_fantasy": "Low Fantasy", + "config.modernmetals.inherited": "Fantasy Level comes from Base Metals.", + "config.modernmetals.restart": "Restart Minecraft to apply changes.", + "item.modernmetals.aluminum_bucket": "Aluminum Bucket", + "item.modernmetals.aluminumbrass_bucket": "Aluminum Brass Bucket", + "item.modernmetals.beryllium_bucket": "Beryllium Bucket", + "item.modernmetals.boron_bucket": "Boron Bucket", + "item.modernmetals.cadmium_bucket": "Cadmium Bucket", + "item.modernmetals.chromium_bucket": "Chromium Bucket", + "item.modernmetals.galvanizedsteel_bucket": "Galvanized Steel Bucket", + "item.modernmetals.iridium_bucket": "Iridium Bucket", + "item.modernmetals.magnesium_bucket": "Magnesium Bucket", + "item.modernmetals.manganese_bucket": "Manganese Bucket", + "item.modernmetals.nichrome_bucket": "Nichrome Bucket", + "item.modernmetals.osmium_bucket": "Osmium Bucket", + "item.modernmetals.plutonium_bucket": "Plutonium Bucket", + "item.modernmetals.rutile_bucket": "Rutile Bucket", + "item.modernmetals.stainlesssteel_bucket": "Stainless Steel Bucket", + "item.modernmetals.tantalum_bucket": "Tantalum Bucket", + "item.modernmetals.thorium_bucket": "Thorium Bucket", + "item.modernmetals.titanium_bucket": "Titanium Bucket", + "item.modernmetals.tungsten_bucket": "Tungsten Bucket", + "item.modernmetals.uranium_bucket": "Uranium Bucket", + "item.modernmetals.zirconium_bucket": "Zirconium Bucket" +} diff --git a/src/main/resources/assets/modernmetals/lang/ru_ru.json b/src/main/resources/assets/modernmetals/lang/ru_ru.json new file mode 100644 index 00000000..51926da7 --- /dev/null +++ b/src/main/resources/assets/modernmetals/lang/ru_ru.json @@ -0,0 +1,1676 @@ +{ + "item.modernmetals.nichrome_casing": "Нихромовый корпус", + "itemGroup.modernmetals.items": "Modern Metals Предметы", + "itemGroup.modernmetals.tools": "Modern Metals Инструменты", + "itemGroup.modernmetals.blocks": "Modern Metals Блоки", + "nei.modernmetals.recipehandler.crusher": "Crushed Blocks/Items", + "material.aluminum": "Алюминий", + "item.modernmetals.aluminum_arrow": "Алюминиевая Стрела", + "item.modernmetals.aluminum_axe": "Алюминиевый Топор", + "item.modernmetals.aluminum_bars": "Алюминиевый Прутья", + "item.modernmetals.aluminum_blend": "Алюминиевый Смеси", + "item.modernmetals.aluminum_block": "Блок Алюминя", + "item.modernmetals.aluminum_boots": "Алюминиевый Ботинки", + "item.modernmetals.aluminum_bolt": "Алюминиевый Арбалетная Стрела", + "item.modernmetals.aluminum_bow": "Алюминиевый Лук", + "item.modernmetals.aluminum_chestplate": "Алюминиевый Нагрудник", + "item.modernmetals.aluminum_crackhammer": "Алюминиевый Измельчающий Молот", + "item.modernmetals.aluminum_crossbow": "Алюминиевый Арбалет", + "item.modernmetals.aluminum_door": "Алюминиевый Двери", + "item.modernmetals.aluminum_fishing_rod": "Алюминиевый Удочка", + "item.modernmetals.aluminum_gear": "Алюминиевый Шестерня", + "item.modernmetals.aluminum_helmet": "Алюминиевый Шлем", + "item.modernmetals.aluminum_hoe": "Алюминиевый Мотыга", + "item.modernmetals.aluminum_horse_armor": "Алюминиевый Конская Броня", + "item.modernmetals.aluminum_ingot": "Алюминиевый Слиток", + "item.modernmetals.aluminum_leggings": "Алюминиевый Поножки", + "item.modernmetals.aluminum_nugget": "Алюминиевый Самородок", + "item.modernmetals.aluminum_ore": "Алюминиевый Руда", + "item.modernmetals.aluminum_pickaxe": "Алюминиевый Кирка", + "item.modernmetals.aluminum_powder": "Измельчённый Алюминиевый", + "item.modernmetals.aluminum_rod": "Алюминиевый Стержень", + "item.modernmetals.aluminum_shears": "Алюминиевый Ножницы", + "item.modernmetals.aluminum_shield": "Алюминиевый Щит", + "item.modernmetals.aluminum_shovel": "Алюминиевый Лопата", + "item.modernmetals.aluminum_smallblend": "Маленькая Кучка Алюминиевый Смеси", + "item.modernmetals.aluminum_smallpowder": "Маленькая Кучка Измельчённого Алюминиевый", + "item.modernmetals.aluminum_sword": "Алюминиевый Меч", + "item.modernmetals.aluminum_trapdoor": "Алюминиевый Люк", + "material.aluminumbrass": "Алюминиевая Латунь", + "item.modernmetals.aluminumbrass_arrow": "Алюминиево-Латунный Стрела", + "item.modernmetals.aluminumbrass_axe": "Алюминиево-Латунный Топор", + "item.modernmetals.aluminumbrass_bars": "Алюминиево-Латунный Прутья", + "item.modernmetals.aluminumbrass_blend": "Алюминиево-Латунный Смеси", + "item.modernmetals.aluminumbrass_block": "Блок Алюминиево-Латунный", + "item.modernmetals.aluminumbrass_boots": "Алюминиево-Латунный Ботинки", + "item.modernmetals.aluminumbrass_bolt": "Алюминиево-Латунный Арбалетная Стрела", + "item.modernmetals.aluminumbrass_bow": "Алюминиево-Латунный Лук", + "item.modernmetals.aluminumbrass_chestplate": "Алюминиево-Латунный Нагрудник", + "item.modernmetals.aluminumbrass_crackhammer": "Алюминиево-Латунный Измельчающий Молот", + "item.modernmetals.aluminumbrass_crossbow": "Алюминиево-Латунный Арбалет", + "item.modernmetals.aluminumbrass_door": "Алюминиево-Латунный Двери", + "item.modernmetals.aluminumbrass_fishing_rod": "Алюминиево-Латунный Удочка", + "item.modernmetals.aluminumbrass_gear": "Алюминиево-Латунный Шестерня", + "item.modernmetals.aluminumbrass_helmet": "Алюминиево-Латунный Шлем", + "item.modernmetals.aluminumbrass_hoe": "Алюминиево-Латунный Мотыга", + "item.modernmetals.aluminumbrass_horse_armor": "Алюминиево-Латунный Конская Броня", + "item.modernmetals.aluminumbrass_ingot": "Алюминиево-Латунный Слиток", + "item.modernmetals.aluminumbrass_leggings": "Алюминиево-Латунный Поножки", + "item.modernmetals.aluminumbrass_nugget": "Алюминиево-Латунный Самородок", + "item.modernmetals.aluminumbrass_ore": "Алюминиево-Латунный Руда", + "item.modernmetals.aluminumbrass_pickaxe": "Алюминиево-Латунный Кирка", + "item.modernmetals.aluminumbrass_powder": "Измельчённый Алюминиево-Латунный", + "item.modernmetals.aluminumbrass_rod": "Алюминиево-Латунный Стержень", + "item.modernmetals.aluminumbrass_shears": "Алюминиево-Латунный Ножницы", + "item.modernmetals.aluminumbrass_shield": "Алюминиево-Латунный Щит", + "item.modernmetals.aluminumbrass_shovel": "Алюминиево-Латунный Лопата", + "item.modernmetals.aluminumbrass_smallblend": "Маленькая Кучка Алюминиево-Латунный Смеси", + "item.modernmetals.aluminumbrass_smallpowder": "Маленькая Кучка Измельчённого Алюминиево-Латунный", + "item.modernmetals.aluminumbrass_sword": "Алюминиево-Латунный Меч", + "item.modernmetals.aluminumbrass_trapdoor": "Алюминиево-Латунный Люк", + "material.antimony": "Antimony", + "item.modernmetals.antimony_arrow": "Antimony Стрела", + "item.modernmetals.antimony_axe": "Antimony Топор", + "item.modernmetals.antimony_bars": "Antimony Прутья", + "item.modernmetals.antimony_block": "Блок Antimony", + "item.modernmetals.antimony_boots": "Antimony Ботинки", + "item.modernmetals.antimony_chestplate": "Antimony Нагрудник", + "item.modernmetals.antimony_crackhammer": "Antimony Измельчающий Молот", + "item.modernmetals.antimony_door": "Antimony Двери", + "item.modernmetals.antimony_helmet": "Antimony Шлем", + "item.modernmetals.antimony_hoe": "Antimony Мотыга", + "item.modernmetals.antimony_ingot": "Antimony Слиток", + "item.modernmetals.antimony_leggings": "Antimony Поножки", + "item.modernmetals.antimony_nugget": "Antimony Самородок", + "item.modernmetals.antimony_ore": "Antimony Руда", + "item.modernmetals.antimony_pickaxe": "Antimony Кирка", + "item.modernmetals.antimony_powder": "Измельчённый Antimony", + "item.modernmetals.antimony_shears": "Antimony Ножницы", + "item.modernmetals.antimony_shield": "Antimony Щит", + "item.modernmetals.antimony_shovel": "Antimony Лопата", + "item.modernmetals.antimony_smallpowder": "Маленькая Кучка Измельчённого Antimony", + "item.modernmetals.antimony_sword": "Antimony Меч", + "item.modernmetals.antimony_trapdoor": "Antimony Люк", + "material.beryllium": "Beryllium", + "item.modernmetals.beryllium_arrow": "Beryllium Стрела", + "item.modernmetals.beryllium_axe": "Beryllium Топор", + "item.modernmetals.beryllium_bars": "Beryllium Прутья", + "item.modernmetals.beryllium_blend": "Beryllium Смеси", + "item.modernmetals.beryllium_block": "Блок Beryllium", + "item.modernmetals.beryllium_boots": "Beryllium Ботинки", + "item.modernmetals.beryllium_bolt": "Beryllium Арбалетная Стрела", + "item.modernmetals.beryllium_bow": "Beryllium Лук", + "item.modernmetals.beryllium_chestplate": "Beryllium Нагрудник", + "item.modernmetals.beryllium_crackhammer": "Beryllium Измельчающий Молот", + "item.modernmetals.beryllium_crossbow": "Beryllium Арбалет", + "item.modernmetals.beryllium_door": "Beryllium Двери", + "item.modernmetals.beryllium_fishing_rod": "Beryllium Удочка", + "item.modernmetals.beryllium_gear": "Beryllium Шестерня", + "item.modernmetals.beryllium_helmet": "Beryllium Шлем", + "item.modernmetals.beryllium_hoe": "Beryllium Мотыга", + "item.modernmetals.beryllium_horse_armor": "Beryllium Конская Броня", + "item.modernmetals.beryllium_ingot": "Beryllium Слиток", + "item.modernmetals.beryllium_leggings": "Beryllium Поножки", + "item.modernmetals.beryllium_nugget": "Beryllium Самородок", + "item.modernmetals.beryllium_ore": "Beryllium Руда", + "item.modernmetals.beryllium_pickaxe": "Beryllium Кирка", + "item.modernmetals.beryllium_powder": "Измельчённый Beryllium", + "item.modernmetals.beryllium_rod": "Beryllium Стержень", + "item.modernmetals.beryllium_shears": "Beryllium Ножницы", + "item.modernmetals.beryllium_shield": "Beryllium Щит", + "item.modernmetals.beryllium_shovel": "Beryllium Лопата", + "item.modernmetals.beryllium_smallblend": "Маленькая Кучка Beryllium Смеси", + "item.modernmetals.beryllium_smallpowder": "Маленькая Кучка Измельчённого Beryllium", + "item.modernmetals.beryllium_sword": "Beryllium Меч", + "item.modernmetals.beryllium_trapdoor": "Beryllium Люк", + "material.bismuth": "Bismuth", + "item.modernmetals.bismuth_arrow": "Bismuth Стрела", + "item.modernmetals.bismuth_axe": "Bismuth Топор", + "item.modernmetals.bismuth_bars": "Bismuth Прутья", + "item.modernmetals.bismuth_block": "Блок Bismuth", + "item.modernmetals.bismuth_boots": "Bismuth Ботинки", + "item.modernmetals.bismuth_chestplate": "Bismuth Нагрудник", + "item.modernmetals.bismuth_crackhammer": "Bismuth Измельчающий Молот", + "item.modernmetals.bismuth_door": "Bismuth Двери", + "item.modernmetals.bismuth_helmet": "Bismuth Шлем", + "item.modernmetals.bismuth_hoe": "Bismuth Мотыга", + "item.modernmetals.bismuth_ingot": "Bismuth Слиток", + "item.modernmetals.bismuth_leggings": "Bismuth Поножки", + "item.modernmetals.bismuth_nugget": "Bismuth Самородок", + "item.modernmetals.bismuth_ore": "Bismuth Руда", + "item.modernmetals.bismuth_pickaxe": "Bismuth Кирка", + "item.modernmetals.bismuth_powder": "Измельчённый Bismuth", + "item.modernmetals.bismuth_shears": "Bismuth Ножницы", + "item.modernmetals.bismuth_shovel": "Bismuth Лопата", + "item.modernmetals.bismuth_shield": "Bismuth Щит", + "item.modernmetals.bismuth_smallpowder": "Маленькая Кучка Измельчённого Bismuth", + "item.modernmetals.bismuth_sword": "Bismuth Меч", + "item.modernmetals.bismuth_trapdoor": "Bismuth Люк", + "material.boron": "Boron", + "item.modernmetals.boron_arrow": "Boron Стрела", + "item.modernmetals.boron_axe": "Boron Топор", + "item.modernmetals.boron_bars": "Boron Прутья", + "item.modernmetals.boron_blend": "Boron Смеси", + "item.modernmetals.boron_block": "Блок Boron", + "item.modernmetals.boron_boots": "Boron Ботинки", + "item.modernmetals.boron_bolt": "Boron Арбалетная Стрела", + "item.modernmetals.boron_bow": "Boron Лук", + "item.modernmetals.boron_chestplate": "Boron Нагрудник", + "item.modernmetals.boron_crackhammer": "Boron Измельчающий Молот", + "item.modernmetals.boron_crossbow": "Boron Арбалет", + "item.modernmetals.boron_door": "Boron Двери", + "item.modernmetals.boron_fishing_rod": "Boron Удочка", + "item.modernmetals.boron_gear": "Boron Шестерня", + "item.modernmetals.boron_helmet": "Boron Шлем", + "item.modernmetals.boron_hoe": "Boron Мотыга", + "item.modernmetals.boron_horse_armor": "Boron Конская Броня", + "item.modernmetals.boron_ingot": "Boron Слиток", + "item.modernmetals.boron_leggings": "Boron Поножки", + "item.modernmetals.boron_nugget": "Boron Самородок", + "item.modernmetals.boron_ore": "Boron Руда", + "item.modernmetals.boron_pickaxe": "Boron Кирка", + "item.modernmetals.boron_powder": "Измельчённый Boron", + "item.modernmetals.boron_rod": "Boron Стержень", + "item.modernmetals.boron_shears": "Boron Ножницы", + "item.modernmetals.boron_shield": "Boron Щит", + "item.modernmetals.boron_shovel": "Boron Лопата", + "item.modernmetals.boron_smallblend": "Маленькая Кучка Boron Смеси", + "item.modernmetals.boron_smallpowder": "Маленькая Кучка Измельчённого Boron", + "item.modernmetals.boron_sword": "Boron Меч", + "item.modernmetals.boron_trapdoor": "Boron Люк", + "material.cadmium": "Cadmium", + "item.modernmetals.cadmium_arrow": "Cadmium Стрела", + "item.modernmetals.cadmium_axe": "Cadmium Топор", + "item.modernmetals.cadmium_bars": "Cadmium Прутья", + "item.modernmetals.cadmium_blend": "Cadmium Смеси", + "item.modernmetals.cadmium_block": "Блок Cadmium", + "item.modernmetals.cadmium_bolt": "Cadmium Арбалетная Стрела", + "item.modernmetals.cadmium_boots": "Cadmium Ботинки", + "item.modernmetals.cadmium_bow": "Cadmium Лук", + "item.modernmetals.cadmium_chestplate": "Cadmium Нагрудник", + "item.modernmetals.cadmium_crackhammer": "Cadmium Измельчающий Молот", + "item.modernmetals.cadmium_crossbow": "Cadmium Арбалет", + "item.modernmetals.cadmium_door": "Cadmium Двери", + "item.modernmetals.cadmium_fishing_rod": "Cadmium Удочка", + "item.modernmetals.cadmium_gear": "Cadmium Шестерня", + "item.modernmetals.cadmium_helmet": "Cadmium Шлем", + "item.modernmetals.cadmium_hoe": "Cadmium Мотыга", + "item.modernmetals.cadmium_horse_armor": "Cadmium Конская Броня", + "item.modernmetals.cadmium_ingot": "Cadmium Слиток", + "item.modernmetals.cadmium_leggings": "Cadmium Поножки", + "item.modernmetals.cadmium_nugget": "Cadmium Самородок", + "item.modernmetals.cadmium_ore": "Cadmium Руда", + "item.modernmetals.cadmium_pickaxe": "Cadmium Кирка", + "item.modernmetals.cadmium_powder": "Измельчённый Cadmium", + "item.modernmetals.cadmium_rod": "Cadmium Стержень", + "item.modernmetals.cadmium_shears": "Cadmium Ножницы", + "item.modernmetals.cadmium_shovel": "Cadmium Лопата", + "item.modernmetals.cadmium_shield": "Cadmium Щит", + "item.modernmetals.cadmium_smallblend": "Маленькая Кучка Cadmium Смеси", + "item.modernmetals.cadmium_smallpowder": "Маленькая Кучка Измельчённого Cadmium", + "item.modernmetals.cadmium_sword": "Cadmium Меч", + "item.modernmetals.cadmium_trapdoor": "Cadmium Люк", + "material.chromium": "Chromium", + "item.modernmetals.chromium_arrow": "Chromium Стрела", + "item.modernmetals.chromium_axe": "Chromium Топор", + "item.modernmetals.chromium_bars": "Chromium Прутья", + "item.modernmetals.chromium_blend": "Chromium Смеси", + "item.modernmetals.chromium_block": "Блок Chromium", + "item.modernmetals.chromium_bolt": "Chromium Арбалетная Стрела", + "item.modernmetals.chromium_boots": "Chromium Ботинки", + "item.modernmetals.chromium_bow": "Chromium Лук", + "item.modernmetals.chromium_chestplate": "Chromium Нагрудник", + "item.modernmetals.chromium_crackhammer": "Chromium Измельчающий Молот", + "item.modernmetals.chromium_crossbow": "Chromium Арбалет", + "item.modernmetals.chromium_door": "Chromium Двери", + "item.modernmetals.chromium_fishing_rod": "Chromium Удочка", + "item.modernmetals.chromium_gear": "Chromium Шестерня", + "item.modernmetals.chromium_helmet": "Chromium Шлем", + "item.modernmetals.chromium_hoe": "Chromium Мотыга", + "item.modernmetals.chromium_horse_armor": "Chromium Конская Броня", + "item.modernmetals.chromium_ingot": "Chromium Слиток", + "item.modernmetals.chromium_leggings": "Chromium Поножки", + "item.modernmetals.chromium_nugget": "Chromium Самородок", + "item.modernmetals.chromium_ore": "Chromium Руда", + "item.modernmetals.chromium_pickaxe": "Chromium Кирка", + "item.modernmetals.chromium_powder": "Измельчённый Chromium", + "item.modernmetals.chromium_rod": "Chromium Стержень", + "item.modernmetals.chromium_shears": "Chromium Ножницы", + "item.modernmetals.chromium_shield": "Chromium Щит", + "item.modernmetals.chromium_shovel": "Chromium Лопата", + "item.modernmetals.chromium_smallblend": "Маленькая Кучка Chromium Смеси", + "item.modernmetals.chromium_smallpowder": "Маленькая Кучка Измельчённого Chromium", + "item.modernmetals.chromium_sword": "Chromium Меч", + "item.modernmetals.chromium_trapdoor": "Chromium Люк", + "material.galvanizedsteel": "Galvanized Steel", + "item.modernmetals.galvanizedsteel_arrow": "Galvanized Steel Стрела", + "item.modernmetals.galvanizedsteel_axe": "Galvanized Steel Топор", + "item.modernmetals.galvanizedsteel_bars": "Galvanized Steel Прутья", + "item.modernmetals.galvanizedsteel_blend": "Galvanized Steel Смеси", + "item.modernmetals.galvanizedsteel_block": "Блок Galvanized Steel", + "item.modernmetals.galvanizedsteel_bolt": "Galvanized Steel Арбалетная Стрела", + "item.modernmetals.galvanizedsteel_boots": "Galvanized Steel Ботинки", + "item.modernmetals.galvanizedsteel_bow": "Galvanized Steel Лук", + "item.modernmetals.galvanizedsteel_chestplate": "Galvanized Steel Нагрудник", + "item.modernmetals.galvanizedsteel_crackhammer": "Galvanized Steel Измельчающий Молот", + "item.modernmetals.galvanizedsteel_crossbow": "Galvanized Steel Арбалет", + "item.modernmetals.galvanizedsteel_door": "Galvanized Steel Двери", + "item.modernmetals.galvanizedsteel_fishing_rod": "Galvanized Steel Удочка", + "item.modernmetals.galvanizedsteel_gear": "Galvanized Steel Шестерня", + "item.modernmetals.galvanizedsteel_helmet": "Galvanized Steel Шлем", + "item.modernmetals.galvanizedsteel_hoe": "Galvanized Steel Мотыга", + "item.modernmetals.galvanizedsteel_horse_armor": "Galvanized Steel Конская Броня", + "item.modernmetals.galvanizedsteel_ingot": "Galvanized Steel Слиток", + "item.modernmetals.galvanizedsteel_leggings": "Galvanized Steel Поножки", + "item.modernmetals.galvanizedsteel_nugget": "Galvanized Steel Самородок", + "item.modernmetals.galvanizedsteel_ore": "Galvanized Steel Руда", + "item.modernmetals.galvanizedsteel_pickaxe": "Galvanized Steel Кирка", + "item.modernmetals.galvanizedsteel_powder": "Измельчённый Galvanized Steel", + "item.modernmetals.galvanizedsteel_rod": "Galvanized Steel Стержень", + "item.modernmetals.galvanizedsteel_shears": "Galvanized Steel Ножницы", + "item.modernmetals.galvanizedsteel_shield": "Galvanized Steel Щит", + "item.modernmetals.galvanizedsteel_shovel": "Galvanized Steel Лопата", + "item.modernmetals.galvanizedsteel_smallblend": "Маленькая Кучка Galvanized Steel Смеси", + "item.modernmetals.galvanizedsteel_smallpowder": "Маленькая Кучка Измельчённого Galvanized Steel", + "item.modernmetals.galvanizedsteel_sword": "Galvanized Steel Меч", + "item.modernmetals.galvanizedsteel_trapdoor": "Galvanized Steel Люк", + "material.iridium": "Iridium", + "item.modernmetals.iridium_arrow": "Iridium Стрела", + "item.modernmetals.iridium_axe": "Iridium Топор", + "item.modernmetals.iridium_bars": "Iridium Прутья", + "item.modernmetals.iridium_blend": "Iridium Смеси", + "item.modernmetals.iridium_block": "Блок Iridium", + "item.modernmetals.iridium_bolt": "Iridium Арбалетная Стрела", + "item.modernmetals.iridium_boots": "Iridium Ботинки", + "item.modernmetals.iridium_bow": "Iridium Лук", + "item.modernmetals.iridium_chestplate": "Iridium Нагрудник", + "item.modernmetals.iridium_crackhammer": "Iridium Измельчающий Молот", + "item.modernmetals.iridium_crossbow": "Iridium Арбалет", + "item.modernmetals.iridium_door": "Iridium Двери", + "item.modernmetals.iridium_fishing_rod": "Iridium Удочка", + "item.modernmetals.iridium_gear": "Iridium Шестерня", + "item.modernmetals.iridium_helmet": "Iridium Шлем", + "item.modernmetals.iridium_hoe": "Iridium Мотыга", + "item.modernmetals.iridium_horse_armor": "Iridium Конская Броня", + "item.modernmetals.iridium_ingot": "Iridium Слиток", + "item.modernmetals.iridium_leggings": "Iridium Поножки", + "item.modernmetals.iridium_nugget": "Iridium Самородок", + "item.modernmetals.iridium_ore": "Iridium Руда", + "item.modernmetals.iridium_pickaxe": "Iridium Кирка", + "item.modernmetals.iridium_powder": "Измельчённый Iridium", + "item.modernmetals.iridium_rod": "Iridium Стержень", + "item.modernmetals.iridium_shears": "Iridium Ножницы", + "item.modernmetals.iridium_shield": "Iridium Щит", + "item.modernmetals.iridium_shovel": "Iridium Лопата", + "item.modernmetals.iridium_smallblend": "Маленькая Кучка Iridium Смеси", + "item.modernmetals.iridium_smallpowder": "Маленькая Кучка Измельчённого Iridium", + "item.modernmetals.iridium_sword": "Iridium Меч", + "item.modernmetals.iridium_trapdoor": "Iridium Люк", + "material.magnesium": "Magnesium", + "item.modernmetals.magnesium_arrow": "Magnesium Стрела", + "item.modernmetals.magnesium_axe": "Magnesium Топор", + "item.modernmetals.magnesium_bars": "Magnesium Прутья", + "item.modernmetals.magnesium_blend": "Magnesium Смеси", + "item.modernmetals.magnesium_block": "Блок Magnesium", + "item.modernmetals.magnesium_boots": "Magnesium Ботинки", + "item.modernmetals.magnesium_bolt": "Magnesium Арбалетная Стрела", + "item.modernmetals.magnesium_bow": "Magnesium Лук", + "item.modernmetals.magnesium_chestplate": "Magnesium Нагрудник", + "item.modernmetals.magnesium_crackhammer": "Magnesium Измельчающий Молот", + "item.modernmetals.magnesium_crossbow": "Magnesium Арбалет", + "item.modernmetals.magnesium_door": "Magnesium Двери", + "item.modernmetals.magnesium_fishing_rod": "Magnesium Удочка", + "item.modernmetals.magnesium_gear": "Magnesium Шестерня", + "item.modernmetals.magnesium_helmet": "Magnesium Шлем", + "item.modernmetals.magnesium_hoe": "Magnesium Мотыга", + "item.modernmetals.magnesium_horse_armor": "Magnesium Конская Броня", + "item.modernmetals.magnesium_ingot": "Magnesium Слиток", + "item.modernmetals.magnesium_leggings": "Magnesium Поножки", + "item.modernmetals.magnesium_nugget": "Magnesium Самородок", + "item.modernmetals.magnesium_ore": "Magnesium Руда", + "item.modernmetals.magnesium_pickaxe": "Magnesium Кирка", + "item.modernmetals.magnesium_powder": "Измельчённый Magnesium", + "item.modernmetals.magnesium_rod": "Magnesium Стержень", + "item.modernmetals.magnesium_shears": "Magnesium Ножницы", + "item.modernmetals.magnesium_shield": "Magnesium Щит", + "item.modernmetals.magnesium_shovel": "Magnesium Лопата", + "item.modernmetals.magnesium_smallblend": "Маленькая Кучка Magnesium Смеси", + "item.modernmetals.magnesium_smallpowder": "Маленькая Кучка Измельчённого Magnesium", + "item.modernmetals.magnesium_sword": "Magnesium Меч", + "item.modernmetals.magnesium_trapdoor": "Magnesium Люк", + "material.manganese": "Manganese", + "item.modernmetals.manganese_arrow": "Manganese Стрела", + "item.modernmetals.manganese_axe": "Manganese Топор", + "item.modernmetals.manganese_bars": "Manganese Прутья", + "item.modernmetals.manganese_blend": "Manganese Смеси", + "item.modernmetals.manganese_block": "Блок Manganese", + "item.modernmetals.manganese_bolt": "Manganese Арбалетная Стрела", + "item.modernmetals.manganese_boots": "Manganese Ботинки", + "item.modernmetals.manganese_bow": "Manganese Лук", + "item.modernmetals.manganese_chestplate": "Manganese Нагрудник", + "item.modernmetals.manganese_crackhammer": "Manganese Измельчающий Молот", + "item.modernmetals.manganese_crossbow": "Manganese Арбалет", + "item.modernmetals.manganese_door": "Manganese Двери", + "item.modernmetals.manganese_fishing_rod": "Manganese Удочка", + "item.modernmetals.manganese_gear": "Manganese Шестерня", + "item.modernmetals.manganese_helmet": "Manganese Шлем", + "item.modernmetals.manganese_hoe": "Manganese Мотыга", + "item.modernmetals.manganese_horse_armor": "Manganese Конская Броня", + "item.modernmetals.manganese_ingot": "Manganese Слиток", + "item.modernmetals.manganese_leggings": "Manganese Поножки", + "item.modernmetals.manganese_nugget": "Manganese Самородок", + "item.modernmetals.manganese_ore": "Manganese Руда", + "item.modernmetals.manganese_pickaxe": "Manganese Кирка", + "item.modernmetals.manganese_powder": "Измельчённый Manganese", + "item.modernmetals.manganese_rod": "Manganese Стержень", + "item.modernmetals.manganese_shears": "Manganese Ножницы", + "item.modernmetals.manganese_shield": "Manganese Щит", + "item.modernmetals.manganese_shovel": "Manganese Лопата", + "item.modernmetals.manganese_smallblend": "Маленькая Кучка Manganese Смеси", + "item.modernmetals.manganese_smallpowder": "Маленькая Кучка Измельчённого Manganese", + "item.modernmetals.manganese_sword": "Manganese Меч", + "item.modernmetals.manganese_trapdoor": "Manganese Люк", + "material.nichrome": "Nichrome", + "item.modernmetals.nichrome_arrow": "Nichrome Стрела", + "item.modernmetals.nichrome_axe": "Nichrome Топор", + "item.modernmetals.nichrome_bars": "Nichrome Прутья", + "item.modernmetals.nichrome_blend": "Nichrome Смеси", + "item.modernmetals.nichrome_block": "Блок Nichrome", + "item.modernmetals.nichrome_bolt": "Nichrome Арбалетная Стрела", + "item.modernmetals.nichrome_boots": "Nichrome Ботинки", + "item.modernmetals.nichrome_bow": "Nichrome Лук", + "item.modernmetals.nichrome_chestplate": "Nichrome Нагрудник", + "item.modernmetals.nichrome_crackhammer": "Nichrome Измельчающий Молот", + "item.modernmetals.nichrome_crossbow": "Nichrome Арбалет", + "item.modernmetals.nichrome_door": "Nichrome Двери", + "item.modernmetals.nichrome_fishing_rod": "Nichrome Удочка", + "item.modernmetals.nichrome_gear": "Nichrome Шестерня", + "item.modernmetals.nichrome_helmet": "Nichrome Шлем", + "item.modernmetals.nichrome_hoe": "Nichrome Мотыга", + "item.modernmetals.nichrome_horse_armor": "Nichrome Конская Броня", + "item.modernmetals.nichrome_ingot": "Nichrome Слиток", + "item.modernmetals.nichrome_leggings": "Nichrome Поножки", + "item.modernmetals.nichrome_nugget": "Nichrome Самородок", + "item.modernmetals.nichrome_ore": "Nichrome Руда", + "item.modernmetals.nichrome_pickaxe": "Nichrome Кирка", + "item.modernmetals.nichrome_powder": "Измельчённый Nichrome", + "item.modernmetals.nichrome_rod": "Nichrome Стержень", + "item.modernmetals.nichrome_shears": "Nichrome Ножницы", + "item.modernmetals.nichrome_shield": "Nichrome Щит", + "item.modernmetals.nichrome_shovel": "Nichrome Лопата", + "item.modernmetals.nichrome_smallblend": "Маленькая Кучка Nichrome Смеси", + "item.modernmetals.nichrome_smallpowder": "Маленькая Кучка Измельчённого Nichrome", + "item.modernmetals.nichrome_sword": "Nichrome Меч", + "item.modernmetals.nichrome_trapdoor": "Nichrome Люк", + "material.osmium": "Osmium", + "item.modernmetals.osmium_arrow": "Osmium Стрела", + "item.modernmetals.osmium_axe": "Osmium Топор", + "item.modernmetals.osmium_bars": "Osmium Прутья", + "item.modernmetals.osmium_blend": "Osmium Смеси", + "item.modernmetals.osmium_block": "Блок Osmium", + "item.modernmetals.osmium_boots": "Osmium Ботинки", + "item.modernmetals.osmium_bolt": "Osmium Арбалетная Стрела", + "item.modernmetals.osmium_bow": "Osmium Лук", + "item.modernmetals.osmium_chestplate": "Osmium Нагрудник", + "item.modernmetals.osmium_crackhammer": "Osmium Измельчающий Молот", + "item.modernmetals.osmium_crossbow": "Osmium Арбалет", + "item.modernmetals.osmium_door": "Osmium Двери", + "item.modernmetals.osmium_fishing_rod": "Osmium Удочка", + "item.modernmetals.osmium_gear": "Osmium Шестерня", + "item.modernmetals.osmium_helmet": "Osmium Шлем", + "item.modernmetals.osmium_hoe": "Osmium Мотыга", + "item.modernmetals.osmium_horse_armor": "Osmium Конская Броня", + "item.modernmetals.osmium_ingot": "Osmium Слиток", + "item.modernmetals.osmium_leggings": "Osmium Поножки", + "item.modernmetals.osmium_nugget": "Osmium Самородок", + "item.modernmetals.osmium_ore": "Osmium Руда", + "item.modernmetals.osmium_pickaxe": "Osmium Кирка", + "item.modernmetals.osmium_powder": "Измельчённый Osmium", + "item.modernmetals.osmium_rod": "Osmium Стержень", + "item.modernmetals.osmium_shears": "Osmium Ножницы", + "item.modernmetals.osmium_shield": "Osmium Щит", + "item.modernmetals.osmium_shovel": "Osmium Лопата", + "item.modernmetals.osmium_smallblend": "Маленькая Кучка Osmium Смеси", + "item.modernmetals.osmium_smallpowder": "Маленькая Кучка Измельчённого Osmium", + "item.modernmetals.osmium_sword": "Osmium Меч", + "item.modernmetals.osmium_trapdoor": "Osmium Люк", + "material.pewter": "Pewter", + "item.modernmetals.pewter_arrow": "Pewter Стрела", + "item.modernmetals.pewter_axe": "Pewter Топор", + "item.modernmetals.pewter_bars": "Pewter Прутья", + "item.modernmetals.pewter_blend": "Pewter Смеси", + "item.modernmetals.pewter_block": "Блок Pewter", + "item.modernmetals.pewter_boots": "Pewter Ботинки", + "item.modernmetals.pewter_chestplate": "Pewter Нагрудник", + "item.modernmetals.pewter_crackhammer": "Pewter Измельчающий Молот", + "item.modernmetals.pewter_door": "Pewter Двери", + "item.modernmetals.pewter_helmet": "Pewter Шлем", + "item.modernmetals.pewter_hoe": "Pewter Мотыга", + "item.modernmetals.pewter_ingot": "Pewter Слиток", + "item.modernmetals.pewter_leggings": "Pewter Поножки", + "item.modernmetals.pewter_nugget": "Pewter Самородок", + "item.modernmetals.pewter_ore": "Pewter Руда", + "item.modernmetals.pewter_pickaxe": "Pewter Кирка", + "item.modernmetals.pewter_powder": "Измельчённый Pewter", + "item.modernmetals.pewter_shears": "Pewter Ножницы", + "item.modernmetals.pewter_shield": "Pewter Щит", + "item.modernmetals.pewter_shovel": "Pewter Лопата", + "item.modernmetals.pewter_smallpowder": "Маленькая Кучка Измельчённого Pewter", + "item.modernmetals.pewter_sword": "Pewter Меч", + "item.modernmetals.pewter_trapdoor": "Pewter Люк", + "material.plutonium": "Plutonium", + "item.modernmetals.plutonium_arrow": "Plutonium Стрела", + "item.modernmetals.plutonium_axe": "Plutonium Топор", + "item.modernmetals.plutonium_bars": "Plutonium Прутья", + "item.modernmetals.plutonium_blend": "Plutonium Смеси", + "item.modernmetals.plutonium_block": "Блок Plutonium", + "item.modernmetals.plutonium_bolt": "Plutonium Арбалетная Стрела", + "item.modernmetals.plutonium_boots": "Plutonium Ботинки", + "item.modernmetals.plutonium_bow": "Plutonium Лук", + "item.modernmetals.plutonium_chestplate": "Plutonium Нагрудник", + "item.modernmetals.plutonium_crackhammer": "Plutonium Измельчающий Молот", + "item.modernmetals.plutonium_crossbow": "Plutonium Арбалет", + "item.modernmetals.plutonium_door": "Plutonium Двери", + "item.modernmetals.plutonium_fishing_rod": "Plutonium Удочка", + "item.modernmetals.plutonium_gear": "Plutonium Шестерня", + "item.modernmetals.plutonium_helmet": "Plutonium Шлем", + "item.modernmetals.plutonium_hoe": "Plutonium Мотыга", + "item.modernmetals.plutonium_horse_armor": "Plutonium Конская Броня", + "item.modernmetals.plutonium_ingot": "Plutonium Слиток", + "item.modernmetals.plutonium_leggings": "Plutonium Поножки", + "item.modernmetals.plutonium_nugget": "Plutonium Самородок", + "item.modernmetals.plutonium_ore": "Plutonium Руда", + "item.modernmetals.plutonium_pickaxe": "Plutonium Кирка", + "item.modernmetals.plutonium_powder": "Измельчённый Plutonium", + "item.modernmetals.plutonium_rod": "Plutonium Стержень", + "item.modernmetals.plutonium_shears": "Plutonium Ножницы", + "item.modernmetals.plutonium_shield": "Plutonium Щит", + "item.modernmetals.plutonium_shovel": "Plutonium Лопата", + "item.modernmetals.plutonium_smallblend": "Маленькая Кучка Plutonium Смеси", + "item.modernmetals.plutonium_smallpowder": "Маленькая Кучка Измельчённого Plutonium", + "item.modernmetals.plutonium_sword": "Plutonium Меч", + "item.modernmetals.plutonium_trapdoor": "Plutonium Люк", + "material.rutile": "Rutile", + "item.modernmetals.rutile_arrow": "Rutile Стрела", + "item.modernmetals.rutile_axe": "Rutile Топор", + "item.modernmetals.rutile_bars": "Rutile Прутья", + "item.modernmetals.rutile_blend": "Rutile Смеси", + "item.modernmetals.rutile_block": "Блок Rutile", + "item.modernmetals.rutile_boots": "Rutile Ботинки", + "item.modernmetals.rutile_bolt": "Rutile Арбалетная Стрела", + "item.modernmetals.rutile_bow": "Rutile Лук", + "item.modernmetals.rutile_chestplate": "Rutile Нагрудник", + "item.modernmetals.rutile_crackhammer": "Rutile Измельчающий Молот", + "item.modernmetals.rutile_crossbow": "Rutile Арбалет", + "item.modernmetals.rutile_door": "Rutile Двери", + "item.modernmetals.rutile_fishing_rod": "Rutile Удочка", + "item.modernmetals.rutile_gear": "Rutile Шестерня", + "item.modernmetals.rutile_helmet": "Rutile Шлем", + "item.modernmetals.rutile_hoe": "Rutile Мотыга", + "item.modernmetals.rutile_horse_armor": "Rutile Конская Броня", + "item.modernmetals.rutile_ingot": "Rutile Слиток", + "item.modernmetals.rutile_leggings": "Rutile Поножки", + "item.modernmetals.rutile_nugget": "Rutile Самородок", + "item.modernmetals.rutile_ore": "Rutile Руда", + "item.modernmetals.rutile_pickaxe": "Rutile Кирка", + "item.modernmetals.rutile_powder": "Измельчённый Rutile", + "item.modernmetals.rutile_rod": "Rutile Стержень", + "item.modernmetals.rutile_shears": "Rutile Ножницы", + "item.modernmetals.rutile_shield": "Rutile Щит", + "item.modernmetals.rutile_shovel": "Rutile Лопата", + "item.modernmetals.rutile_smallblend": "Маленькая Кучка Rutile Смеси", + "item.modernmetals.rutile_smallpowder": "Маленькая Кучка Измельчённого Rutile", + "item.modernmetals.rutile_sword": "Rutile Меч", + "item.modernmetals.rutile_trapdoor": "Rutile Люк", + "material.stainlesssteel": "Stainless Steel", + "item.modernmetals.stainlesssteel_arrow": "Stainless Steel Стрела", + "item.modernmetals.stainlesssteel_axe": "Stainless Steel Топор", + "item.modernmetals.stainlesssteel_bars": "Stainless Steel Прутья", + "item.modernmetals.stainlesssteel_blend": "Stainless Steel Смеси", + "item.modernmetals.stainlesssteel_block": "Блок Stainless Steel", + "item.modernmetals.stainlesssteel_bolt": "Stainless Steel Арбалетная Стрела", + "item.modernmetals.stainlesssteel_boots": "Stainless Steel Ботинки", + "item.modernmetals.stainlesssteel_bow": "Stainless Steel Лук", + "item.modernmetals.stainlesssteel_chestplate": "Stainless Steel Нагрудник", + "item.modernmetals.stainlesssteel_crackhammer": "Stainless Steel Измельчающий Молот", + "item.modernmetals.stainlesssteel_crossbow": "Stainless Steel Арбалет", + "item.modernmetals.stainlesssteel_door": "Stainless Steel Двери", + "item.modernmetals.stainlesssteel_fishing_rod": "Stainless Steel Удочка", + "item.modernmetals.stainlesssteel_gear": "Stainless Steel Шестерня", + "item.modernmetals.stainlesssteel_helmet": "Stainless Steel Шлем", + "item.modernmetals.stainlesssteel_hoe": "Stainless Steel Мотыга", + "item.modernmetals.stainlesssteel_horse_armor": "Stainless Steel Конская Броня", + "item.modernmetals.stainlesssteel_ingot": "Stainless Steel Слиток", + "item.modernmetals.stainlesssteel_leggings": "Stainless Steel Поножки", + "item.modernmetals.stainlesssteel_nugget": "Stainless Steel Самородок", + "item.modernmetals.stainlesssteel_ore": "Stainless Steel Руда", + "item.modernmetals.stainlesssteel_pickaxe": "Stainless Steel Кирка", + "item.modernmetals.stainlesssteel_powder": "Измельчённый Stainless Steel", + "item.modernmetals.stainlesssteel_rod": "Stainless Steel Стержень", + "item.modernmetals.stainlesssteel_shears": "Stainless Steel Ножницы", + "item.modernmetals.stainlesssteel_shield": "Stainless Steel Щит", + "item.modernmetals.stainlesssteel_shovel": "Stainless Steel Лопата", + "item.modernmetals.stainlesssteel_smallblend": "Маленькая Кучка Stainless Steel Смеси", + "item.modernmetals.stainlesssteel_smallpowder": "Маленькая Кучка Измельчённого Stainless Steel", + "item.modernmetals.stainlesssteel_sword": "Stainless Steel Меч", + "item.modernmetals.stainlesssteel_trapdoor": "Stainless Steel Люк", + "material.tantalum": "Tantalum", + "item.modernmetals.tantalum_arrow": "Tantalum Стрела", + "item.modernmetals.tantalum_axe": "Tantalum Топор", + "item.modernmetals.tantalum_bars": "Tantalum Прутья", + "item.modernmetals.tantalum_blend": "Tantalum Смеси", + "item.modernmetals.tantalum_block": "Блок Tantalum", + "item.modernmetals.tantalum_bolt": "Tantalum Арбалетная Стрела", + "item.modernmetals.tantalum_boots": "Tantalum Ботинки", + "item.modernmetals.tantalum_bow": "Tantalum Лук", + "item.modernmetals.tantalum_chestplate": "Tantalum Нагрудник", + "item.modernmetals.tantalum_crackhammer": "Tantalum Измельчающий Молот", + "item.modernmetals.tantalum_crossbow": "Tantalum Арбалет", + "item.modernmetals.tantalum_door": "Tantalum Двери", + "item.modernmetals.tantalum_fishing_rod": "Tantalum Удочка", + "item.modernmetals.tantalum_gear": "Tantalum Шестерня", + "item.modernmetals.tantalum_helmet": "Tantalum Шлем", + "item.modernmetals.tantalum_hoe": "Tantalum Мотыга", + "item.modernmetals.tantalum_horse_armor": "Tantalum Конская Броня", + "item.modernmetals.tantalum_ingot": "Tantalum Слиток", + "item.modernmetals.tantalum_leggings": "Tantalum Поножки", + "item.modernmetals.tantalum_nugget": "Tantalum Самородок", + "item.modernmetals.tantalum_ore": "Tantalum Руда", + "item.modernmetals.tantalum_pickaxe": "Tantalum Кирка", + "item.modernmetals.tantalum_powder": "Измельчённый Tantalum", + "item.modernmetals.tantalum_rod": "Tantalum Стержень", + "item.modernmetals.tantalum_shears": "Tantalum Ножницы", + "item.modernmetals.tantalum_shield": "Tantalum Щит", + "item.modernmetals.tantalum_shovel": "Tantalum Лопата", + "item.modernmetals.tantalum_smallblend": "Маленькая Кучка Tantalum Смеси", + "item.modernmetals.tantalum_smallpowder": "Маленькая Кучка Измельчённого Tantalum", + "item.modernmetals.tantalum_sword": "Tantalum Меч", + "item.modernmetals.tantalum_trapdoor": "Tantalum Люк", + "material.titanium": "Titanium", + "item.modernmetals.titanium_arrow": "Titanium Стрела", + "item.modernmetals.titanium_axe": "Titanium Топор", + "item.modernmetals.titanium_bars": "Titanium Прутья", + "item.modernmetals.titanium_blend": "Titanium Смеси", + "item.modernmetals.titanium_block": "Блок Titanium", + "item.modernmetals.titanium_boots": "Titanium Ботинки", + "item.modernmetals.titanium_bolt": "Titanium Арбалетная Стрела", + "item.modernmetals.titanium_bow": "Titanium Лук", + "item.modernmetals.titanium_chestplate": "Titanium Нагрудник", + "item.modernmetals.titanium_crackhammer": "Titanium Измельчающий Молот", + "item.modernmetals.titanium_crossbow": "Titanium Арбалет", + "item.modernmetals.titanium_door": "Titanium Двери", + "item.modernmetals.titanium_fishing_rod": "Titanium Удочка", + "item.modernmetals.titanium_gear": "Titanium Шестерня", + "item.modernmetals.titanium_helmet": "Titanium Шлем", + "item.modernmetals.titanium_hoe": "Titanium Мотыга", + "item.modernmetals.titanium_horse_armor": "Titanium Конская Броня", + "item.modernmetals.titanium_ingot": "Titanium Слиток", + "item.modernmetals.titanium_leggings": "Titanium Поножки", + "item.modernmetals.titanium_nugget": "Titanium Самородок", + "item.modernmetals.titanium_ore": "Titanium Руда", + "item.modernmetals.titanium_pickaxe": "Titanium Кирка", + "item.modernmetals.titanium_powder": "Измельчённый Titanium", + "item.modernmetals.titanium_rod": "Titanium Стержень", + "item.modernmetals.titanium_shears": "Titanium Ножницы", + "item.modernmetals.titanium_shield": "Titanium Щит", + "item.modernmetals.titanium_shovel": "Titanium Лопата", + "item.modernmetals.titanium_smallblend": "Маленькая Кучка Titanium Смеси", + "item.modernmetals.titanium_smallpowder": "Маленькая Кучка Измельчённого Titanium", + "item.modernmetals.titanium_sword": "Titanium Меч", + "item.modernmetals.titanium_trapdoor": "Titanium Люк", + "material.tungsten": "Tungsten", + "item.modernmetals.tungsten_arrow": "Tungsten Стрела", + "item.modernmetals.tungsten_axe": "Tungsten Топор", + "item.modernmetals.tungsten_bars": "Tungsten Прутья", + "item.modernmetals.tungsten_blend": "Tungsten Смеси", + "item.modernmetals.tungsten_block": "Блок Tungsten", + "item.modernmetals.tungsten_boots": "Tungsten Ботинки", + "item.modernmetals.tungsten_bolt": "Tungsten Арбалетная Стрела", + "item.modernmetals.tungsten_bow": "Tungsten Лук", + "item.modernmetals.tungsten_chestplate": "Tungsten Нагрудник", + "item.modernmetals.tungsten_crackhammer": "Tungsten Измельчающий Молот", + "item.modernmetals.tungsten_crossbow": "Tungsten Арбалет", + "item.modernmetals.tungsten_door": "Tungsten Двери", + "item.modernmetals.tungsten_fishing_rod": "Tungsten Удочка", + "item.modernmetals.tungsten_gear": "Tungsten Шестерня", + "item.modernmetals.tungsten_helmet": "Tungsten Шлем", + "item.modernmetals.tungsten_hoe": "Tungsten Мотыга", + "item.modernmetals.tungsten_horse_armor": "Tungsten Конская Броня", + "item.modernmetals.tungsten_ingot": "Tungsten Слиток", + "item.modernmetals.tungsten_leggings": "Tungsten Поножки", + "item.modernmetals.tungsten_nugget": "Tungsten Самородок", + "item.modernmetals.tungsten_ore": "Tungsten Руда", + "item.modernmetals.tungsten_pickaxe": "Tungsten Кирка", + "item.modernmetals.tungsten_powder": "Измельчённый Tungsten", + "item.modernmetals.tungsten_rod": "Tungsten Стержень", + "item.modernmetals.tungsten_shears": "Tungsten Ножницы", + "item.modernmetals.tungsten_shield": "Tungsten Щит", + "item.modernmetals.tungsten_shovel": "Tungsten Лопата", + "item.modernmetals.tungsten_smallblend": "Маленькая Кучка Tungsten Смеси", + "item.modernmetals.tungsten_smallpowder": "Маленькая Кучка Измельчённого Tungsten", + "item.modernmetals.tungsten_sword": "Tungsten Меч", + "item.modernmetals.tungsten_trapdoor": "Tungsten Люк", + "material.uranium": "Uranium", + "item.modernmetals.uranium_arrow": "Uranium Стрела", + "item.modernmetals.uranium_axe": "Uranium Топор", + "item.modernmetals.uranium_bars": "Uranium Прутья", + "item.modernmetals.uranium_blend": "Uranium Смеси", + "item.modernmetals.uranium_block": "Блок Uranium", + "item.modernmetals.uranium_boots": "Uranium Ботинки", + "item.modernmetals.uranium_bolt": "Uranium Арбалетная Стрела", + "item.modernmetals.uranium_bow": "Uranium Лук", + "item.modernmetals.uranium_chestplate": "Uranium Нагрудник", + "item.modernmetals.uranium_crackhammer": "Uranium Измельчающий Молот", + "item.modernmetals.uranium_crossbow": "Uranium Арбалет", + "item.modernmetals.uranium_door": "Uranium Двери", + "item.modernmetals.uranium_fishing_rod": "Uranium Удочка", + "item.modernmetals.uranium_gear": "Uranium Шестерня", + "item.modernmetals.uranium_helmet": "Uranium Шлем", + "item.modernmetals.uranium_hoe": "Uranium Мотыга", + "item.modernmetals.uranium_horse_armor": "Uranium Конская Броня", + "item.modernmetals.uranium_ingot": "Uranium Слиток", + "item.modernmetals.uranium_leggings": "Uranium Поножки", + "item.modernmetals.uranium_nugget": "Uranium Самородок", + "item.modernmetals.uranium_ore": "Uranium Руда", + "item.modernmetals.uranium_pickaxe": "Uranium Кирка", + "item.modernmetals.uranium_powder": "Измельчённый Uranium", + "item.modernmetals.uranium_rod": "Uranium Стержень", + "item.modernmetals.uranium_shears": "Uranium Ножницы", + "item.modernmetals.uranium_shield": "Uranium Щит", + "item.modernmetals.uranium_shovel": "Uranium Лопата", + "item.modernmetals.uranium_smallblend": "Маленькая Кучка Uranium Смеси", + "item.modernmetals.uranium_smallpowder": "Маленькая Кучка Измельчённого Uranium", + "item.modernmetals.uranium_sword": "Uranium Меч", + "item.modernmetals.uranium_trapdoor": "Uranium Люк", + "material.zirconium": "Zirconium", + "item.modernmetals.zirconium_arrow": "Zirconium Стрела", + "item.modernmetals.zirconium_axe": "Zirconium Топор", + "item.modernmetals.zirconium_bars": "Zirconium Прутья", + "item.modernmetals.zirconium_blend": "Zirconium Смеси", + "item.modernmetals.zirconium_block": "Блок Zirconium", + "item.modernmetals.zirconium_bolt": "Zirconium Арбалетная Стрела", + "item.modernmetals.zirconium_boots": "Zirconium Ботинки", + "item.modernmetals.zirconium_bow": "Zirconium Лук", + "item.modernmetals.zirconium_chestplate": "Zirconium Нагрудник", + "item.modernmetals.zirconium_crackhammer": "Zirconium Измельчающий Молот", + "item.modernmetals.zirconium_crossbow": "Zirconium Арбалет", + "item.modernmetals.zirconium_door": "Zirconium Двери", + "item.modernmetals.zirconium_fishing_rod": "Zirconium Удочка", + "item.modernmetals.zirconium_gear": "Zirconium Шестерня", + "item.modernmetals.zirconium_helmet": "Zirconium Шлем", + "item.modernmetals.zirconium_hoe": "Zirconium Мотыга", + "item.modernmetals.zirconium_horse_armor": "Zirconium Конская Броня", + "item.modernmetals.zirconium_ingot": "Zirconium Слиток", + "item.modernmetals.zirconium_leggings": "Zirconium Поножки", + "item.modernmetals.zirconium_nugget": "Zirconium Самородок", + "item.modernmetals.zirconium_ore": "Zirconium Руда", + "item.modernmetals.zirconium_pickaxe": "Zirconium Кирка", + "item.modernmetals.zirconium_powder": "Измельчённый Zirconium", + "item.modernmetals.zirconium_rod": "Zirconium Стержень", + "item.modernmetals.zirconium_shears": "Zirconium Ножницы", + "item.modernmetals.zirconium_shield": "Zirconium Щит", + "item.modernmetals.zirconium_shovel": "Zirconium Лопата", + "item.modernmetals.zirconium_smallblend": "Маленькая Кучка Zirconium Смеси", + "item.modernmetals.zirconium_smallpowder": "Маленькая Кучка Измельчённого Zirconium", + "item.modernmetals.zirconium_sword": "Zirconium Меч", + "item.modernmetals.zirconium_trapdoor": "Zirconium Люк", + "tile.modernmetals.aluminum_bars": "Алюминиевый Прутья", + "block.modernmetals.aluminum_bars": "Алюминиевый Прутья", + "tile.modernmetals.aluminum_block": "Блок Алюминиевый", + "block.modernmetals.aluminum_block": "Блок Алюминиевый", + "tile.modernmetals.aluminum_door": "Алюминиевый Двери", + "block.modernmetals.aluminum_door": "Алюминиевый Двери", + "tile.modernmetals.aluminum_ore": "Алюминиевый Руда", + "block.modernmetals.aluminum_ore": "Алюминиевый Руда", + "tile.modernmetals.aluminum_plate": "Алюминиевый Plate", + "block.modernmetals.aluminum_plate": "Алюминиевый Plate", + "tile.modernmetals.aluminum_trapdoor": "Алюминиевый Люк", + "block.modernmetals.aluminum_trapdoor": "Алюминиевый Люк", + "tile.modernmetals.aluminumbrass_bars": "Алюминиево-Латунный Прутья", + "block.modernmetals.aluminumbrass_bars": "Алюминиево-Латунный Прутья", + "tile.modernmetals.aluminumbrass_block": "Блок Алюминиево-Латунный", + "block.modernmetals.aluminumbrass_block": "Блок Алюминиево-Латунный", + "tile.modernmetals.aluminumbrass_door": "Алюминиево-Латунный Двери", + "block.modernmetals.aluminumbrass_door": "Алюминиево-Латунный Двери", + "tile.modernmetals.aluminumbrass_ore": "Алюминиево-Латунный Руда", + "block.modernmetals.aluminumbrass_ore": "Алюминиево-Латунный Руда", + "tile.modernmetals.aluminumbrass_plate": "Алюминиево-Латунный Plate", + "block.modernmetals.aluminumbrass_plate": "Алюминиево-Латунный Plate", + "tile.modernmetals.aluminumbrass_trapdoor": "Алюминиево-Латунный Люк", + "block.modernmetals.aluminumbrass_trapdoor": "Алюминиево-Латунный Люк", + "tile.modernmetals.boron_bars": "Boron Прутья", + "block.modernmetals.boron_bars": "Boron Прутья", + "tile.modernmetals.boron_block": "Блок Boron", + "block.modernmetals.boron_block": "Блок Boron", + "tile.modernmetals.boron_door": "Boron Двери", + "block.modernmetals.boron_door": "Boron Двери", + "tile.modernmetals.boron_ore": "Boron Руда", + "block.modernmetals.boron_ore": "Boron Руда", + "tile.modernmetals.boron_plate": "Boron Plate", + "block.modernmetals.boron_plate": "Boron Plate", + "tile.modernmetals.boron_trapdoor": "Boron Люк", + "block.modernmetals.boron_trapdoor": "Boron Люк", + "tile.modernmetals.cadmium_bars": "Cadmium Прутья", + "block.modernmetals.cadmium_bars": "Cadmium Прутья", + "tile.modernmetals.cadmium_block": "Блок Cadmium", + "block.modernmetals.cadmium_block": "Блок Cadmium", + "tile.modernmetals.cadmium_door": "Cadmium Двери", + "block.modernmetals.cadmium_door": "Cadmium Двери", + "tile.modernmetals.cadmium_ore": "Cadmium Руда", + "block.modernmetals.cadmium_ore": "Cadmium Руда", + "tile.modernmetals.cadmium_plate": "Cadmium Plate", + "block.modernmetals.cadmium_plate": "Cadmium Plate", + "tile.modernmetals.cadmium_trapdoor": "Cadmium Люк", + "block.modernmetals.cadmium_trapdoor": "Cadmium Люк", + "tile.modernmetals.chromium_bars": "Chromium Прутья", + "block.modernmetals.chromium_bars": "Chromium Прутья", + "tile.modernmetals.chromium_block": "Блок Chromium", + "block.modernmetals.chromium_block": "Блок Chromium", + "tile.modernmetals.chromium_door": "Chromium Двери", + "block.modernmetals.chromium_door": "Chromium Двери", + "tile.modernmetals.chromium_ore": "Chromium Руда", + "block.modernmetals.chromium_ore": "Chromium Руда", + "tile.modernmetals.chromium_plate": "Chromium Plate", + "block.modernmetals.chromium_plate": "Chromium Plate", + "tile.modernmetals.chromium_trapdoor": "Chromium Люк", + "block.modernmetals.chromium_trapdoor": "Chromium Люк", + "tile.modernmetals.galvanizedsteel_bars": "Galvanized Steel Прутья", + "block.modernmetals.galvanizedsteel_bars": "Galvanized Steel Прутья", + "tile.modernmetals.galvanizedsteel_block": "Блок Galvanized Steel", + "block.modernmetals.galvanizedsteel_block": "Блок Galvanized Steel", + "tile.modernmetals.galvanizedsteel_door": "Galvanized Steel Двери", + "block.modernmetals.galvanizedsteel_door": "Galvanized Steel Двери", + "tile.modernmetals.galvanizedsteel_ore": "Galvanized Steel Руда", + "block.modernmetals.galvanizedsteel_ore": "Galvanized Steel Руда", + "tile.modernmetals.galvanizedsteel_plate": "Galvanized Steel Plate", + "block.modernmetals.galvanizedsteel_plate": "Galvanized Steel Plate", + "tile.modernmetals.galvanizedsteel_trapdoor": "Galvanized Steel Люк", + "block.modernmetals.galvanizedsteel_trapdoor": "Galvanized Steel Люк", + "tile.modernmetals.iridium_bars": "Iridium Прутья", + "block.modernmetals.iridium_bars": "Iridium Прутья", + "tile.modernmetals.iridium_block": "Блок Iridium", + "block.modernmetals.iridium_block": "Блок Iridium", + "tile.modernmetals.iridium_door": "Iridium Двери", + "block.modernmetals.iridium_door": "Iridium Двери", + "tile.modernmetals.iridium_ore": "Iridium Руда", + "block.modernmetals.iridium_ore": "Iridium Руда", + "tile.modernmetals.iridium_plate": "Iridium Plate", + "block.modernmetals.iridium_plate": "Iridium Plate", + "tile.modernmetals.iridium_trapdoor": "Iridium Люк", + "block.modernmetals.iridium_trapdoor": "Iridium Люк", + "tile.modernmetals.magnesium_bars": "Magnesium Прутья", + "block.modernmetals.magnesium_bars": "Magnesium Прутья", + "tile.modernmetals.magnesium_block": "Блок Magnesium", + "block.modernmetals.magnesium_block": "Блок Magnesium", + "tile.modernmetals.magnesium_door": "Magnesium Двери", + "block.modernmetals.magnesium_door": "Magnesium Двери", + "tile.modernmetals.magnesium_ore": "Magnesium Руда", + "block.modernmetals.magnesium_ore": "Magnesium Руда", + "tile.modernmetals.magnesium_plate": "Magnesium Plate", + "block.modernmetals.magnesium_plate": "Magnesium Plate", + "tile.modernmetals.magnesium_trapdoor": "Magnesium Люк", + "block.modernmetals.magnesium_trapdoor": "Magnesium Люк", + "tile.modernmetals.manganese_bars": "Manganese Прутья", + "block.modernmetals.manganese_bars": "Manganese Прутья", + "tile.modernmetals.manganese_block": "Блок Manganese", + "block.modernmetals.manganese_block": "Блок Manganese", + "tile.modernmetals.manganese_door": "Manganese Двери", + "block.modernmetals.manganese_door": "Manganese Двери", + "tile.modernmetals.manganese_ore": "Manganese Руда", + "block.modernmetals.manganese_ore": "Manganese Руда", + "tile.modernmetals.manganese_plate": "Manganese Plate", + "block.modernmetals.manganese_plate": "Manganese Plate", + "tile.modernmetals.manganese_trapdoor": "Manganese Люк", + "block.modernmetals.manganese_trapdoor": "Manganese Люк", + "tile.modernmetals.nichrome_bars": "Nichrome Прутья", + "block.modernmetals.nichrome_bars": "Nichrome Прутья", + "tile.modernmetals.nichrome_block": "Блок Nichrome", + "block.modernmetals.nichrome_block": "Блок Nichrome", + "tile.modernmetals.nichrome_door": "Nichrome Двери", + "block.modernmetals.nichrome_door": "Nichrome Двери", + "tile.modernmetals.nichrome_ore": "Nichrome Руда", + "block.modernmetals.nichrome_ore": "Nichrome Руда", + "tile.modernmetals.nichrome_plate": "Nichrome Plate", + "block.modernmetals.nichrome_plate": "Nichrome Plate", + "tile.modernmetals.nichrome_trapdoor": "Nichrome Люк", + "block.modernmetals.nichrome_trapdoor": "Nichrome Люк", + "tile.modernmetals.osmium_bars": "Osmium Прутья", + "block.modernmetals.osmium_bars": "Osmium Прутья", + "tile.modernmetals.osmium_block": "Блок Osmium", + "block.modernmetals.osmium_block": "Блок Osmium", + "tile.modernmetals.osmium_door": "Osmium Двери", + "block.modernmetals.osmium_door": "Osmium Двери", + "tile.modernmetals.osmium_ore": "Osmium Руда", + "block.modernmetals.osmium_ore": "Osmium Руда", + "tile.modernmetals.osmium_plate": "Osmium Plate", + "block.modernmetals.osmium_plate": "Osmium Plate", + "tile.modernmetals.osmium_trapdoor": "Osmium Люк", + "block.modernmetals.osmium_trapdoor": "Osmium Люк", + "tile.modernmetals.plutonium_bars": "Plutonium Прутья", + "block.modernmetals.plutonium_bars": "Plutonium Прутья", + "tile.modernmetals.plutonium_block": "Блок Plutonium", + "block.modernmetals.plutonium_block": "Блок Plutonium", + "tile.modernmetals.plutonium_door": "Plutonium Двери", + "block.modernmetals.plutonium_door": "Plutonium Двери", + "tile.modernmetals.plutonium_ore": "Plutonium Руда", + "block.modernmetals.plutonium_ore": "Plutonium Руда", + "tile.modernmetals.plutonium_plate": "Plutonium Plate", + "block.modernmetals.plutonium_plate": "Plutonium Plate", + "tile.modernmetals.plutonium_trapdoor": "Plutonium Люк", + "block.modernmetals.plutonium_trapdoor": "Plutonium Люк", + "tile.modernmetals.rutile_bars": "Rutile Прутья", + "block.modernmetals.rutile_bars": "Rutile Прутья", + "tile.modernmetals.rutile_block": "Блок Rutile", + "block.modernmetals.rutile_block": "Блок Rutile", + "tile.modernmetals.rutile_door": "Rutile Двери", + "block.modernmetals.rutile_door": "Rutile Двери", + "tile.modernmetals.rutile_ore": "Rutile Руда", + "block.modernmetals.rutile_ore": "Rutile Руда", + "tile.modernmetals.rutile_plate": "Rutile Plate", + "block.modernmetals.rutile_plate": "Rutile Plate", + "tile.modernmetals.rutile_trapdoor": "Rutile Люк", + "block.modernmetals.rutile_trapdoor": "Rutile Люк", + "tile.modernmetals.stainlesssteel_bars": "Stainless Steel Прутья", + "block.modernmetals.stainlesssteel_bars": "Stainless Steel Прутья", + "tile.modernmetals.stainlesssteel_block": "Блок Stainless Steel", + "block.modernmetals.stainlesssteel_block": "Блок Stainless Steel", + "tile.modernmetals.stainlesssteel_door": "Stainless Steel Двери", + "block.modernmetals.stainlesssteel_door": "Stainless Steel Двери", + "tile.modernmetals.stainlesssteel_ore": "Stainless Steel Руда", + "block.modernmetals.stainlesssteel_ore": "Stainless Steel Руда", + "tile.modernmetals.stainlesssteel_plate": "Stainless Steel Plate", + "block.modernmetals.stainlesssteel_plate": "Stainless Steel Plate", + "tile.modernmetals.stainlesssteel_trapdoor": "Stainless Steel Люк", + "block.modernmetals.stainlesssteel_trapdoor": "Stainless Steel Люк", + "tile.modernmetals.tantalum_bars": "Tantalum Прутья", + "block.modernmetals.tantalum_bars": "Tantalum Прутья", + "tile.modernmetals.tantalum_block": "Блок Tantalum", + "block.modernmetals.tantalum_block": "Блок Tantalum", + "tile.modernmetals.tantalum_door": "Tantalum Двери", + "block.modernmetals.tantalum_door": "Tantalum Двери", + "tile.modernmetals.tantalum_ore": "Tantalum Руда", + "block.modernmetals.tantalum_ore": "Tantalum Руда", + "tile.modernmetals.tantalum_plate": "Tantalum Plate", + "block.modernmetals.tantalum_plate": "Tantalum Plate", + "tile.modernmetals.tantalum_trapdoor": "Tantalum Люк", + "block.modernmetals.tantalum_trapdoor": "Tantalum Люк", + "tile.modernmetals.titanium_bars": "Titanium Прутья", + "block.modernmetals.titanium_bars": "Titanium Прутья", + "tile.modernmetals.titanium_block": "Блок Titanium", + "block.modernmetals.titanium_block": "Блок Titanium", + "tile.modernmetals.titanium_door": "Titanium Двери", + "block.modernmetals.titanium_door": "Titanium Двери", + "tile.modernmetals.titanium_ore": "Titanium Руда", + "block.modernmetals.titanium_ore": "Titanium Руда", + "tile.modernmetals.titanium_plate": "Titanium Plate", + "block.modernmetals.titanium_plate": "Titanium Plate", + "tile.modernmetals.titanium_trapdoor": "Titanium Люк", + "block.modernmetals.titanium_trapdoor": "Titanium Люк", + "tile.modernmetals.tungsten_bars": "Tungsten Прутья", + "block.modernmetals.tungsten_bars": "Tungsten Прутья", + "tile.modernmetals.tungsten_block": "Блок Tungsten", + "block.modernmetals.tungsten_block": "Блок Tungsten", + "tile.modernmetals.tungsten_door": "Tungsten Двери", + "block.modernmetals.tungsten_door": "Tungsten Двери", + "tile.modernmetals.tungsten_ore": "Tungsten Руда", + "block.modernmetals.tungsten_ore": "Tungsten Руда", + "tile.modernmetals.tungsten_plate": "Tungsten Plate", + "block.modernmetals.tungsten_plate": "Tungsten Plate", + "tile.modernmetals.tungsten_trapdoor": "Tungsten Люк", + "block.modernmetals.tungsten_trapdoor": "Tungsten Люк", + "tile.modernmetals.uranium_bars": "Uranium Прутья", + "block.modernmetals.uranium_bars": "Uranium Прутья", + "tile.modernmetals.uranium_block": "Блок Uranium", + "block.modernmetals.uranium_block": "Блок Uranium", + "tile.modernmetals.uranium_door": "Uranium Двери", + "block.modernmetals.uranium_door": "Uranium Двери", + "tile.modernmetals.uranium_ore": "Uranium Руда", + "block.modernmetals.uranium_ore": "Uranium Руда", + "tile.modernmetals.uranium_plate": "Uranium Plate", + "block.modernmetals.uranium_plate": "Uranium Plate", + "tile.modernmetals.uranium_trapdoor": "Uranium Люк", + "block.modernmetals.uranium_trapdoor": "Uranium Люк", + "tile.modernmetals.zirconium_bars": "Zirconium Прутья", + "block.modernmetals.zirconium_bars": "Zirconium Прутья", + "tile.modernmetals.zirconium_block": "Блок Zirconium", + "block.modernmetals.zirconium_block": "Блок Zirconium", + "tile.modernmetals.zirconium_door": "Zirconium Двери", + "block.modernmetals.zirconium_door": "Zirconium Двери", + "tile.modernmetals.zirconium_ore": "Zirconium Руда", + "block.modernmetals.zirconium_ore": "Zirconium Руда", + "tile.modernmetals.zirconium_plate": "Zirconium Plate", + "block.modernmetals.zirconium_plate": "Zirconium Plate", + "tile.modernmetals.zirconium_trapdoor": "Zirconium Люк", + "block.modernmetals.zirconium_trapdoor": "Zirconium Люк", + "tooltip.aluminum.tool": "Nothing Special", + "tooltip.aluminumbrass.tool": "Nothing Special", + "tooltip.cadmium.tool": "Nothing Special", + "tooltip.chromium.tool": "Nothing Special", + "tooltip.galvanized_steel.tool": "Nothing Special", + "tooltip.iridium.tool": "Nothing Special", + "tooltip.magnesium.tool": "Nothing Special", + "tooltip.manganese.tool": "Nothing Special", + "tooltip.nichrome.tool": "Nothing Special", + "tooltip.osmium.tool": "Nothing Special", + "tooltip.plutonium.tool": "Nothing Special", + "tooltip.rutile.tool": "Nothing Special", + "tooltip.stainless_steel.tool": "Nothing Special", + "tooltip.tantalum.tool": "Nothing Special", + "tooltip.titanium.tool": "Nothing Special", + "tooltip.tungsten.tool": "Nothing Special", + "tooltip.uranium.tool": "Nothing Special", + "tooltip.zirconium.tool": "Nothing Special", + "tooltip.aluminum.armor": "Nothing Special", + "tooltip.aluminumbrass.armor": "Nothing Special", + "tooltip.cadmium.armor": "Nothing Special", + "tooltip.chromium.armor": "Nothing Special", + "tooltip.galvanized_steel.armor": "Nothing Special", + "tooltip.iridium.armor": "Nothing Special", + "tooltip.magnesium.armor": "Nothing Special", + "tooltip.manganese.armor": "Nothing Special", + "tooltip.nichrome.armor": "Nothing Special", + "tooltip.osmium.armor": "Nothing Special", + "tooltip.plutonium.armor": "Nothing Special", + "tooltip.rutile.armor": "Nothing Special", + "tooltip.stainless_steel.armor": "Nothing Special", + "tooltip.tantalum.armor": "Nothing Special", + "tooltip.titanium.armor": "Nothing Special", + "tooltip.tungsten.armor": "Nothing Special", + "tooltip.uranium.armor": "Nothing Special", + "tooltip.zirconium.armor": "Nothing Special", + "achievement.aluminumbrass_maker": "Алюминиево-Латунный", + "achievement.galvanized_steel_maker": "Galvanized Steel", + "achievement.nichrome_maker": "Nichrome", + "achievement.stainless_steel_maker": "Stainless Steel", + "achievement.titanium_maker": "Titanium", + "achievement.aluminumbrass_maker.desc": "Combine powdered Алюминиевый and Brass to make Алюминиево-Латунный", + "achievement.galvanized_steel_maker.desc": "Combine powdered Steel and Zinc to make Galvanized Steel", + "achievement.nichrome_maker.desc": "Combine powdered Nickel and Chrome to make Nichrome", + "achievement.stainless_steel_maker.desc": "Combine powdered Steel and Chrome to make Stainless Steel", + "achievement.titanium_maker.desc": "Combine powdered Rutile and Magnesium to make Titanium", + "fluid.modernmetals.aluminum": "Molten Алюминиевый", + "fluid.modernmetals.aluminumbrass": "Molten Алюминиево-Латунный", + "fluid.modernmetals.boron": "Molten Boron", + "fluid.modernmetals.beryllium": "Molten Beryllium", + "fluid.modernmetals.cadmium": "Molten Cadmium", + "fluid.modernmetals.chromium": "Molten Chromium", + "fluid.modernmetals.galvanizedsteel": "Molten Galvanized Steel", + "fluid.modernmetals.iridium": "Molten Iridium", + "fluid.modernmetals.magnesium": "Molten Magnesium", + "fluid.modernmetals.manganese": "Molten Manganese", + "fluid.modernmetals.nichrome": "Molten Nichrome", + "fluid.modernmetals.osmium": "Molten Osmium", + "fluid.modernmetals.plutonium": "Molten Plutonium", + "fluid.modernmetals.rutile": "Molten Rutile", + "fluid.modernmetals.stainlesssteel": "Molten Stainless Steel", + "fluid.modernmetals.tantalum": "Molten Tantalum", + "fluid.modernmetals.titanium": "Molten Titanium", + "fluid.modernmetals.tungsten": "Molten Tungsten", + "fluid.modernmetals.uranium": "Molten Uranium", + "fluid.modernmetals.zirconium": "Molten Zirconium", + "tile.modernmetals.aluminum": "Molten Алюминиевый", + "block.modernmetals.aluminum": "Molten Алюминиевый", + "tile.modernmetals.aluminumbrass": "Molten Алюминиево-Латунный", + "block.modernmetals.aluminumbrass": "Molten Алюминиево-Латунный", + "tile.modernmetals.boron": "Molten Boron", + "block.modernmetals.boron": "Molten Boron", + "tile.modernmetals.cadmium": "Molten Cadmium", + "block.modernmetals.cadmium": "Molten Cadmium", + "tile.modernmetals.chromium": "Molten Chromium", + "block.modernmetals.chromium": "Molten Chromium", + "tile.modernmetals.galvanizedsteel": "Molten Galvanized Steel", + "block.modernmetals.galvanizedsteel": "Molten Galvanized Steel", + "tile.modernmetals.iridium": "Molten Iridium", + "block.modernmetals.iridium": "Molten Iridium", + "tile.modernmetals.magnesium": "Molten Magnesium", + "block.modernmetals.magnesium": "Molten Magnesium", + "tile.modernmetals.manganese": "Molten Manganese", + "block.modernmetals.manganese": "Molten Manganese", + "tile.modernmetals.nichrome": "Molten Nichrome", + "block.modernmetals.nichrome": "Molten Nichrome", + "tile.modernmetals.osmium": "Molten Osmium", + "block.modernmetals.osmium": "Molten Osmium", + "tile.modernmetals.plutonium": "Molten Plutonium", + "block.modernmetals.plutonium": "Molten Plutonium", + "tile.modernmetals.rutile": "Molten Rutile", + "block.modernmetals.rutile": "Molten Rutile", + "tile.modernmetals.stainlesssteel": "Molten Stainless Steel", + "block.modernmetals.stainlesssteel": "Molten Stainless Steel", + "tile.modernmetals.tantalum": "Molten Tantalum", + "block.modernmetals.tantalum": "Molten Tantalum", + "tile.modernmetals.titanium": "Molten Titanium", + "block.modernmetals.titanium": "Molten Titanium", + "tile.modernmetals.tungsten": "Molten Tungsten", + "block.modernmetals.tungsten": "Molten Tungsten", + "tile.modernmetals.uranium": "Molten Uranium", + "block.modernmetals.uranium": "Molten Uranium", + "tile.modernmetals.zirconium": "Molten Zirconium", + "block.modernmetals.zirconium": "Molten Zirconium", + "item.modernmetals.aluminum_clump": "Алюминиевый Clump", + "item.modernmetals.aluminum_crushed": "Crushed Алюминиевый Руда", + "item.modernmetals.aluminum_crushed_purified": "Purified Crushed Алюминиевый Руда", + "item.modernmetals.aluminum_crystal": "Алюминиевый Crystal", + "item.modernmetals.aluminum_dense_plate": "Dense Алюминиевый Plate", + "item.modernmetals.aluminum_powder_dirty": "Dirty Алюминиевый Dust", + "item.modernmetals.aluminum_shard": "Алюминиевый Shard", + "item.modernmetals.aluminum_button": "Алюминиевый Button", + "item.modernmetals.aluminum_lever": "Алюминиевый Lever", + "item.modernmetals.aluminum_pressure_plate": "Алюминиевый Pressure Plate", + "item.modernmetals.aluminum_slab": "Алюминиевый Slab", + "item.modernmetals.aluminum_stairs": "Алюминиевый Stairs", + "item.modernmetals.aluminum_wall": "Алюминиевый Wall", + "tile.modernmetals.aluminum_button": "Алюминиевый Button", + "block.modernmetals.aluminum_button": "Алюминиевый Button", + "tile.modernmetals.aluminum_lever": "Алюминиевый Lever", + "block.modernmetals.aluminum_lever": "Алюминиевый Lever", + "tile.modernmetals.aluminum_pressure_plate": "Алюминиевый Pressure Plate", + "block.modernmetals.aluminum_pressure_plate": "Алюминиевый Pressure Plate", + "tile.modernmetals.aluminum_slab": "Алюминиевый Slab", + "block.modernmetals.aluminum_slab": "Алюминиевый Slab", + "tile.modernmetals.aluminum_stairs": "Алюминиевый Stairs", + "block.modernmetals.aluminum_stairs": "Алюминиевый Stairs", + "tile.modernmetals.aluminum_wall": "Алюминиевый Wall", + "block.modernmetals.aluminum_wall": "Алюминиевый Wall", + "item.modernmetals.aluminumbrass_clump": "Алюминиево-Латунный Clump", + "item.modernmetals.aluminumbrass_crushed": "Crushed Алюминиево-Латунный Руда", + "item.modernmetals.aluminumbrass_crushed_purified": "Purified Crushed Алюминиево-Латунный Руда", + "item.modernmetals.aluminumbrass_crystal": "Алюминиево-Латунный Crystal", + "item.modernmetals.aluminumbrass_dense_plate": "Dense Алюминиево-Латунный Plate", + "item.modernmetals.aluminumbrass_powder_dirty": "Dirty Алюминиево-Латунный Dust", + "item.modernmetals.aluminumbrass_shard": "Алюминиево-Латунный Shard", + "item.modernmetals.aluminumbrass_button": "Алюминиево-Латунный Button", + "item.modernmetals.aluminumbrass_lever": "Алюминиево-Латунный Lever", + "item.modernmetals.aluminumbrass_pressure_plate": "Алюминиево-Латунный Pressure Plate", + "item.modernmetals.aluminumbrass_slab": "Алюминиево-Латунный Slab", + "item.modernmetals.aluminumbrass_stairs": "Алюминиево-Латунный Stairs", + "item.modernmetals.aluminumbrass_wall": "Алюминиево-Латунный Wall", + "tile.modernmetals.aluminumbrass_button": "Алюминиево-Латунный Button", + "block.modernmetals.aluminumbrass_button": "Алюминиево-Латунный Button", + "tile.modernmetals.aluminumbrass_lever": "Алюминиево-Латунный Lever", + "block.modernmetals.aluminumbrass_lever": "Алюминиево-Латунный Lever", + "tile.modernmetals.aluminumbrass_pressure_plate": "Алюминиево-Латунный Pressure Plate", + "block.modernmetals.aluminumbrass_pressure_plate": "Алюминиево-Латунный Pressure Plate", + "tile.modernmetals.aluminumbrass_slab": "Алюминиево-Латунный Slab", + "block.modernmetals.aluminumbrass_slab": "Алюминиево-Латунный Slab", + "tile.modernmetals.aluminumbrass_stairs": "Алюминиево-Латунный Stairs", + "block.modernmetals.aluminumbrass_stairs": "Алюминиево-Латунный Stairs", + "tile.modernmetals.aluminumbrass_wall": "Алюминиево-Латунный Wall", + "block.modernmetals.aluminumbrass_wall": "Алюминиево-Латунный Wall", + "tile.modernmetals.beryllium_bars": "Beryllium Прутья", + "block.modernmetals.beryllium_bars": "Beryllium Прутья", + "tile.modernmetals.beryllium_block": "Блок Beryllium", + "block.modernmetals.beryllium_block": "Блок Beryllium", + "tile.modernmetals.beryllium_door": "Beryllium Двери", + "block.modernmetals.beryllium_door": "Beryllium Двери", + "tile.modernmetals.beryllium_ore": "Beryllium Руда", + "block.modernmetals.beryllium_ore": "Beryllium Руда", + "tile.modernmetals.beryllium_plate": "Beryllium Plate", + "block.modernmetals.beryllium_plate": "Beryllium Plate", + "tile.modernmetals.beryllium_trapdoor": "Beryllium Люк", + "block.modernmetals.beryllium_trapdoor": "Beryllium Люк", + "item.modernmetals.beryllium_clump": "Beryllium Clump", + "item.modernmetals.beryllium_crushed": "Crushed Beryllium Руда", + "item.modernmetals.beryllium_crushed_purified": "Purified Crushed Beryllium Руда", + "item.modernmetals.beryllium_crystal": "Beryllium Crystal", + "item.modernmetals.beryllium_dense_plate": "Dense Beryllium Plate", + "item.modernmetals.beryllium_powder_dirty": "Dirty Beryllium Dust", + "item.modernmetals.beryllium_shard": "Beryllium Shard", + "item.modernmetals.beryllium_button": "Beryllium Button", + "item.modernmetals.beryllium_lever": "Beryllium Lever", + "item.modernmetals.beryllium_pressure_plate": "Beryllium Pressure Plate", + "item.modernmetals.beryllium_slab": "Beryllium Slab", + "item.modernmetals.beryllium_stairs": "Beryllium Stairs", + "item.modernmetals.beryllium_wall": "Beryllium Wall", + "tile.modernmetals.beryllium": "Molten Beryllium", + "block.modernmetals.beryllium": "Molten Beryllium", + "tile.modernmetals.beryllium_button": "Beryllium Button", + "block.modernmetals.beryllium_button": "Beryllium Button", + "tile.modernmetals.beryllium_lever": "Beryllium Lever", + "block.modernmetals.beryllium_lever": "Beryllium Lever", + "tile.modernmetals.beryllium_pressure_plate": "Beryllium Pressure Plate", + "block.modernmetals.beryllium_pressure_plate": "Beryllium Pressure Plate", + "tile.modernmetals.beryllium_slab": "Beryllium Slab", + "block.modernmetals.beryllium_slab": "Beryllium Slab", + "tile.modernmetals.beryllium_stairs": "Beryllium Stairs", + "block.modernmetals.beryllium_stairs": "Beryllium Stairs", + "tile.modernmetals.beryllium_wall": "Beryllium Wall", + "block.modernmetals.beryllium_wall": "Beryllium Wall", + "item.modernmetals.boron_clump": "Boron Clump", + "item.modernmetals.boron_crushed": "Crushed Boron Руда", + "item.modernmetals.boron_crushed_purified": "Purified Crushed Boron Руда", + "item.modernmetals.boron_crystal": "Boron Crystal", + "item.modernmetals.boron_dense_plate": "Dense Boron Plate", + "item.modernmetals.boron_powder_dirty": "Dirty Boron Dust", + "item.modernmetals.boron_shard": "Boron Shard", + "item.modernmetals.boron_button": "Boron Button", + "item.modernmetals.boron_lever": "Boron Lever", + "item.modernmetals.boron_pressure_plate": "Boron Pressure Plate", + "item.modernmetals.boron_slab": "Boron Slab", + "item.modernmetals.boron_stairs": "Boron Stairs", + "item.modernmetals.boron_wall": "Boron Wall", + "tile.modernmetals.boron_button": "Boron Button", + "block.modernmetals.boron_button": "Boron Button", + "tile.modernmetals.boron_lever": "Boron Lever", + "block.modernmetals.boron_lever": "Boron Lever", + "tile.modernmetals.boron_pressure_plate": "Boron Pressure Plate", + "block.modernmetals.boron_pressure_plate": "Boron Pressure Plate", + "tile.modernmetals.boron_slab": "Boron Slab", + "block.modernmetals.boron_slab": "Boron Slab", + "tile.modernmetals.boron_stairs": "Boron Stairs", + "block.modernmetals.boron_stairs": "Boron Stairs", + "tile.modernmetals.boron_wall": "Boron Wall", + "block.modernmetals.boron_wall": "Boron Wall", + "item.modernmetals.cadmium_clump": "Cadmium Clump", + "item.modernmetals.cadmium_crushed": "Crushed Cadmium Руда", + "item.modernmetals.cadmium_crushed_purified": "Purified Crushed Cadmium Руда", + "item.modernmetals.cadmium_crystal": "Cadmium Crystal", + "item.modernmetals.cadmium_dense_plate": "Dense Cadmium Plate", + "item.modernmetals.cadmium_powder_dirty": "Dirty Cadmium Dust", + "item.modernmetals.cadmium_shard": "Cadmium Shard", + "item.modernmetals.cadmium_button": "Cadmium Button", + "item.modernmetals.cadmium_lever": "Cadmium Lever", + "item.modernmetals.cadmium_pressure_plate": "Cadmium Pressure Plate", + "item.modernmetals.cadmium_slab": "Cadmium Slab", + "item.modernmetals.cadmium_stairs": "Cadmium Stairs", + "item.modernmetals.cadmium_wall": "Cadmium Wall", + "tile.modernmetals.cadmium_button": "Cadmium Button", + "block.modernmetals.cadmium_button": "Cadmium Button", + "tile.modernmetals.cadmium_lever": "Cadmium Lever", + "block.modernmetals.cadmium_lever": "Cadmium Lever", + "tile.modernmetals.cadmium_pressure_plate": "Cadmium Pressure Plate", + "block.modernmetals.cadmium_pressure_plate": "Cadmium Pressure Plate", + "tile.modernmetals.cadmium_slab": "Cadmium Slab", + "block.modernmetals.cadmium_slab": "Cadmium Slab", + "tile.modernmetals.cadmium_stairs": "Cadmium Stairs", + "block.modernmetals.cadmium_stairs": "Cadmium Stairs", + "tile.modernmetals.cadmium_wall": "Cadmium Wall", + "block.modernmetals.cadmium_wall": "Cadmium Wall", + "item.modernmetals.chromium_clump": "Chromium Clump", + "item.modernmetals.chromium_crushed": "Crushed Chromium Руда", + "item.modernmetals.chromium_crushed_purified": "Purified Crushed Chromium Руда", + "item.modernmetals.chromium_crystal": "Chromium Crystal", + "item.modernmetals.chromium_dense_plate": "Dense Chromium Plate", + "item.modernmetals.chromium_powder_dirty": "Dirty Chromium Dust", + "item.modernmetals.chromium_shard": "Chromium Shard", + "item.modernmetals.chromium_button": "Chromium Button", + "item.modernmetals.chromium_lever": "Chromium Lever", + "item.modernmetals.chromium_pressure_plate": "Chromium Pressure Plate", + "item.modernmetals.chromium_slab": "Chromium Slab", + "item.modernmetals.chromium_stairs": "Chromium Stairs", + "item.modernmetals.chromium_wall": "Chromium Wall", + "tile.modernmetals.chromium_button": "Chromium Button", + "block.modernmetals.chromium_button": "Chromium Button", + "tile.modernmetals.chromium_lever": "Chromium Lever", + "block.modernmetals.chromium_lever": "Chromium Lever", + "tile.modernmetals.chromium_pressure_plate": "Chromium Pressure Plate", + "block.modernmetals.chromium_pressure_plate": "Chromium Pressure Plate", + "tile.modernmetals.chromium_slab": "Chromium Slab", + "block.modernmetals.chromium_slab": "Chromium Slab", + "tile.modernmetals.chromium_stairs": "Chromium Stairs", + "block.modernmetals.chromium_stairs": "Chromium Stairs", + "tile.modernmetals.chromium_wall": "Chromium Wall", + "block.modernmetals.chromium_wall": "Chromium Wall", + "item.modernmetals.galvanizedsteel_clump": "Galvanized Steel Clump", + "item.modernmetals.galvanizedsteel_crushed": "Crushed Galvanized Steel Руда", + "item.modernmetals.galvanizedsteel_crushed_purified": "Purified Crushed Galvanized Steel Руда", + "item.modernmetals.galvanizedsteel_crystal": "Galvanized Steel Crystal", + "item.modernmetals.galvanizedsteel_dense_plate": "Dense Galvanized Steel Plate", + "item.modernmetals.galvanizedsteel_powder_dirty": "Dirty Galvanized Steel Dust", + "item.modernmetals.galvanizedsteel_shard": "Galvanized Steel Shard", + "item.modernmetals.galvanizedsteel_button": "Galvanized Steel Button", + "item.modernmetals.galvanizedsteel_lever": "Galvanized Steel Lever", + "item.modernmetals.galvanizedsteel_pressure_plate": "Galvanized Steel Pressure Plate", + "item.modernmetals.galvanizedsteel_slab": "Galvanized Steel Slab", + "item.modernmetals.galvanizedsteel_stairs": "Galvanized Steel Stairs", + "item.modernmetals.galvanizedsteel_wall": "Galvanized Steel Wall", + "tile.modernmetals.galvanizedsteel_button": "Galvanized Steel Button", + "block.modernmetals.galvanizedsteel_button": "Galvanized Steel Button", + "tile.modernmetals.galvanizedsteel_lever": "Galvanized Steel Lever", + "block.modernmetals.galvanizedsteel_lever": "Galvanized Steel Lever", + "tile.modernmetals.galvanizedsteel_pressure_plate": "Galvanized Steel Pressure Plate", + "block.modernmetals.galvanizedsteel_pressure_plate": "Galvanized Steel Pressure Plate", + "tile.modernmetals.galvanizedsteel_slab": "Galvanized Steel Slab", + "block.modernmetals.galvanizedsteel_slab": "Galvanized Steel Slab", + "tile.modernmetals.galvanizedsteel_stairs": "Galvanized Steel Stairs", + "block.modernmetals.galvanizedsteel_stairs": "Galvanized Steel Stairs", + "tile.modernmetals.galvanizedsteel_wall": "Galvanized Steel Wall", + "block.modernmetals.galvanizedsteel_wall": "Galvanized Steel Wall", + "item.modernmetals.iridium_clump": "Iridium Clump", + "item.modernmetals.iridium_crushed": "Crushed Iridium Руда", + "item.modernmetals.iridium_crushed_purified": "Purified Crushed Iridium Руда", + "item.modernmetals.iridium_crystal": "Iridium Crystal", + "item.modernmetals.iridium_dense_plate": "Dense Iridium Plate", + "item.modernmetals.iridium_powder_dirty": "Dirty Iridium Dust", + "item.modernmetals.iridium_shard": "Iridium Shard", + "item.modernmetals.iridium_button": "Iridium Button", + "item.modernmetals.iridium_lever": "Iridium Lever", + "item.modernmetals.iridium_pressure_plate": "Iridium Pressure Plate", + "item.modernmetals.iridium_slab": "Iridium Slab", + "item.modernmetals.iridium_stairs": "Iridium Stairs", + "item.modernmetals.iridium_wall": "Iridium Wall", + "tile.modernmetals.iridium_button": "Iridium Button", + "block.modernmetals.iridium_button": "Iridium Button", + "tile.modernmetals.iridium_lever": "Iridium Lever", + "block.modernmetals.iridium_lever": "Iridium Lever", + "tile.modernmetals.iridium_pressure_plate": "Iridium Pressure Plate", + "block.modernmetals.iridium_pressure_plate": "Iridium Pressure Plate", + "tile.modernmetals.iridium_slab": "Iridium Slab", + "block.modernmetals.iridium_slab": "Iridium Slab", + "tile.modernmetals.iridium_stairs": "Iridium Stairs", + "block.modernmetals.iridium_stairs": "Iridium Stairs", + "tile.modernmetals.iridium_wall": "Iridium Wall", + "block.modernmetals.iridium_wall": "Iridium Wall", + "item.modernmetals.magnesium_clump": "Magnesium Clump", + "item.modernmetals.magnesium_crushed": "Crushed Magnesium Руда", + "item.modernmetals.magnesium_crushed_purified": "Purified Crushed Magnesium Руда", + "item.modernmetals.magnesium_crystal": "Magnesium Crystal", + "item.modernmetals.magnesium_dense_plate": "Dense Magnesium Plate", + "item.modernmetals.magnesium_powder_dirty": "Dirty Magnesium Dust", + "item.modernmetals.magnesium_shard": "Magnesium Shard", + "item.modernmetals.magnesium_button": "Magnesium Button", + "item.modernmetals.magnesium_lever": "Magnesium Lever", + "item.modernmetals.magnesium_pressure_plate": "Magnesium Pressure Plate", + "item.modernmetals.magnesium_slab": "Magnesium Slab", + "item.modernmetals.magnesium_stairs": "Magnesium Stairs", + "item.modernmetals.magnesium_wall": "Magnesium Wall", + "tile.modernmetals.magnesium_button": "Magnesium Button", + "block.modernmetals.magnesium_button": "Magnesium Button", + "tile.modernmetals.magnesium_lever": "Magnesium Lever", + "block.modernmetals.magnesium_lever": "Magnesium Lever", + "tile.modernmetals.magnesium_pressure_plate": "Magnesium Pressure Plate", + "block.modernmetals.magnesium_pressure_plate": "Magnesium Pressure Plate", + "tile.modernmetals.magnesium_slab": "Magnesium Slab", + "block.modernmetals.magnesium_slab": "Magnesium Slab", + "tile.modernmetals.magnesium_stairs": "Magnesium Stairs", + "block.modernmetals.magnesium_stairs": "Magnesium Stairs", + "tile.modernmetals.magnesium_wall": "Magnesium Wall", + "block.modernmetals.magnesium_wall": "Magnesium Wall", + "item.modernmetals.manganese_clump": "Manganese Clump", + "item.modernmetals.manganese_crushed": "Crushed Manganese Руда", + "item.modernmetals.manganese_crushed_purified": "Purified Crushed Manganese Руда", + "item.modernmetals.manganese_crystal": "Manganese Crystal", + "item.modernmetals.manganese_dense_plate": "Dense Manganese Plate", + "item.modernmetals.manganese_powder_dirty": "Dirty Manganese Dust", + "item.modernmetals.manganese_shard": "Manganese Shard", + "item.modernmetals.manganese_button": "Manganese Button", + "item.modernmetals.manganese_lever": "Manganese Lever", + "item.modernmetals.manganese_pressure_plate": "Manganese Pressure Plate", + "item.modernmetals.manganese_slab": "Manganese Slab", + "item.modernmetals.manganese_stairs": "Manganese Stairs", + "item.modernmetals.manganese_wall": "Manganese Wall", + "tile.modernmetals.manganese_button": "Manganese Button", + "block.modernmetals.manganese_button": "Manganese Button", + "tile.modernmetals.manganese_lever": "Manganese Lever", + "block.modernmetals.manganese_lever": "Manganese Lever", + "tile.modernmetals.manganese_pressure_plate": "Manganese Pressure Plate", + "block.modernmetals.manganese_pressure_plate": "Manganese Pressure Plate", + "tile.modernmetals.manganese_slab": "Manganese Slab", + "block.modernmetals.manganese_slab": "Manganese Slab", + "tile.modernmetals.manganese_stairs": "Manganese Stairs", + "block.modernmetals.manganese_stairs": "Manganese Stairs", + "tile.modernmetals.manganese_wall": "Manganese Wall", + "block.modernmetals.manganese_wall": "Manganese Wall", + "item.modernmetals.nichrome_clump": "Nichrome Clump", + "item.modernmetals.nichrome_crushed": "Crushed Nichrome Руда", + "item.modernmetals.nichrome_crushed_purified": "Purified Crushed Nichrome Руда", + "item.modernmetals.nichrome_crystal": "Nichrome Crystal", + "item.modernmetals.nichrome_dense_plate": "Dense Nichrome Plate", + "item.modernmetals.nichrome_powder_dirty": "Dirty Nichrome Dust", + "item.modernmetals.nichrome_shard": "Nichrome Shard", + "item.modernmetals.nichrome_button": "Nichrome Button", + "item.modernmetals.nichrome_lever": "Nichrome Lever", + "item.modernmetals.nichrome_pressure_plate": "Nichrome Pressure Plate", + "item.modernmetals.nichrome_slab": "Nichrome Slab", + "item.modernmetals.nichrome_stairs": "Nichrome Stairs", + "item.modernmetals.nichrome_wall": "Nichrome Wall", + "tile.modernmetals.nichrome_button": "Nichrome Button", + "block.modernmetals.nichrome_button": "Nichrome Button", + "tile.modernmetals.nichrome_lever": "Nichrome Lever", + "block.modernmetals.nichrome_lever": "Nichrome Lever", + "tile.modernmetals.nichrome_pressure_plate": "Nichrome Pressure Plate", + "block.modernmetals.nichrome_pressure_plate": "Nichrome Pressure Plate", + "tile.modernmetals.nichrome_slab": "Nichrome Slab", + "block.modernmetals.nichrome_slab": "Nichrome Slab", + "tile.modernmetals.nichrome_stairs": "Nichrome Stairs", + "block.modernmetals.nichrome_stairs": "Nichrome Stairs", + "tile.modernmetals.nichrome_wall": "Nichrome Wall", + "block.modernmetals.nichrome_wall": "Nichrome Wall", + "item.modernmetals.osmium_clump": "Osmium Clump", + "item.modernmetals.osmium_crushed": "Crushed Osmium Руда", + "item.modernmetals.osmium_crushed_purified": "Purified Crushed Osmium Руда", + "item.modernmetals.osmium_crystal": "Osmium Crystal", + "item.modernmetals.osmium_dense_plate": "Dense Osmium Plate", + "item.modernmetals.osmium_powder_dirty": "Dirty Osmium Dust", + "item.modernmetals.osmium_shard": "Osmium Shard", + "item.modernmetals.osmium_button": "Osmium Button", + "item.modernmetals.osmium_lever": "Osmium Lever", + "item.modernmetals.osmium_pressure_plate": "Osmium Pressure Plate", + "item.modernmetals.osmium_slab": "Osmium Slab", + "item.modernmetals.osmium_stairs": "Osmium Stairs", + "item.modernmetals.osmium_wall": "Osmium Wall", + "tile.modernmetals.osmium_button": "Osmium Button", + "block.modernmetals.osmium_button": "Osmium Button", + "tile.modernmetals.osmium_lever": "Osmium Lever", + "block.modernmetals.osmium_lever": "Osmium Lever", + "tile.modernmetals.osmium_pressure_plate": "Osmium Pressure Plate", + "block.modernmetals.osmium_pressure_plate": "Osmium Pressure Plate", + "tile.modernmetals.osmium_slab": "Osmium Slab", + "block.modernmetals.osmium_slab": "Osmium Slab", + "tile.modernmetals.osmium_stairs": "Osmium Stairs", + "block.modernmetals.osmium_stairs": "Osmium Stairs", + "tile.modernmetals.osmium_wall": "Osmium Wall", + "block.modernmetals.osmium_wall": "Osmium Wall", + "item.modernmetals.plutonium_clump": "Plutonium Clump", + "item.modernmetals.plutonium_crushed": "Crushed Plutonium Руда", + "item.modernmetals.plutonium_crushed_purified": "Purified Crushed Plutonium Руда", + "item.modernmetals.plutonium_crystal": "Plutonium Crystal", + "item.modernmetals.plutonium_dense_plate": "Dense Plutonium Plate", + "item.modernmetals.plutonium_powder_dirty": "Dirty Plutonium Dust", + "item.modernmetals.plutonium_shard": "Plutonium Shard", + "item.modernmetals.plutonium_button": "Plutonium Button", + "item.modernmetals.plutonium_lever": "Plutonium Lever", + "item.modernmetals.plutonium_pressure_plate": "Plutonium Pressure Plate", + "item.modernmetals.plutonium_slab": "Plutonium Slab", + "item.modernmetals.plutonium_stairs": "Plutonium Stairs", + "item.modernmetals.plutonium_wall": "Plutonium Wall", + "tile.modernmetals.plutonium_button": "Plutonium Button", + "block.modernmetals.plutonium_button": "Plutonium Button", + "tile.modernmetals.plutonium_lever": "Plutonium Lever", + "block.modernmetals.plutonium_lever": "Plutonium Lever", + "tile.modernmetals.plutonium_pressure_plate": "Plutonium Pressure Plate", + "block.modernmetals.plutonium_pressure_plate": "Plutonium Pressure Plate", + "tile.modernmetals.plutonium_slab": "Plutonium Slab", + "block.modernmetals.plutonium_slab": "Plutonium Slab", + "tile.modernmetals.plutonium_stairs": "Plutonium Stairs", + "block.modernmetals.plutonium_stairs": "Plutonium Stairs", + "tile.modernmetals.plutonium_wall": "Plutonium Wall", + "block.modernmetals.plutonium_wall": "Plutonium Wall", + "item.modernmetals.rutile_clump": "Rutile Clump", + "item.modernmetals.rutile_crushed": "Crushed Rutile Руда", + "item.modernmetals.rutile_crushed_purified": "Purified Crushed Rutile Руда", + "item.modernmetals.rutile_crystal": "Rutile Crystal", + "item.modernmetals.rutile_dense_plate": "Dense Rutile Plate", + "item.modernmetals.rutile_powder_dirty": "Dirty Rutile Dust", + "item.modernmetals.rutile_shard": "Rutile Shard", + "item.modernmetals.rutile_button": "Rutile Button", + "item.modernmetals.rutile_lever": "Rutile Lever", + "item.modernmetals.rutile_pressure_plate": "Rutile Pressure Plate", + "item.modernmetals.rutile_slab": "Rutile Slab", + "item.modernmetals.rutile_stairs": "Rutile Stairs", + "item.modernmetals.rutile_wall": "Rutile Wall", + "tile.modernmetals.rutile_button": "Rutile Button", + "block.modernmetals.rutile_button": "Rutile Button", + "tile.modernmetals.rutile_lever": "Rutile Lever", + "block.modernmetals.rutile_lever": "Rutile Lever", + "tile.modernmetals.rutile_pressure_plate": "Rutile Pressure Plate", + "block.modernmetals.rutile_pressure_plate": "Rutile Pressure Plate", + "tile.modernmetals.rutile_slab": "Rutile Slab", + "block.modernmetals.rutile_slab": "Rutile Slab", + "tile.modernmetals.rutile_stairs": "Rutile Stairs", + "block.modernmetals.rutile_stairs": "Rutile Stairs", + "tile.modernmetals.rutile_wall": "Rutile Wall", + "block.modernmetals.rutile_wall": "Rutile Wall", + "item.modernmetals.stainlesssteel_clump": "Stainless Steel Clump", + "item.modernmetals.stainlesssteel_crushed": "Crushed Stainless Steel Руда", + "item.modernmetals.stainlesssteel_crushed_purified": "Purified Crushed Stainless Steel Руда", + "item.modernmetals.stainlesssteel_crystal": "Stainless Steel Crystal", + "item.modernmetals.stainlesssteel_dense_plate": "Dense Stainless Steel Plate", + "item.modernmetals.stainlesssteel_powder_dirty": "Dirty Stainless Steel Dust", + "item.modernmetals.stainlesssteel_shard": "Stainless Steel Shard", + "item.modernmetals.stainlesssteel_button": "Stainless Steel Button", + "item.modernmetals.stainlesssteel_lever": "Stainless Steel Lever", + "item.modernmetals.stainlesssteel_pressure_plate": "Stainless Steel Pressure Plate", + "item.modernmetals.stainlesssteel_slab": "Stainless Steel Slab", + "item.modernmetals.stainlesssteel_stairs": "Stainless Steel Stairs", + "item.modernmetals.stainlesssteel_wall": "Stainless Steel Wall", + "tile.modernmetals.stainlesssteel_button": "Stainless Steel Button", + "block.modernmetals.stainlesssteel_button": "Stainless Steel Button", + "tile.modernmetals.stainlesssteel_lever": "Stainless Steel Lever", + "block.modernmetals.stainlesssteel_lever": "Stainless Steel Lever", + "tile.modernmetals.stainlesssteel_pressure_plate": "Stainless Steel Pressure Plate", + "block.modernmetals.stainlesssteel_pressure_plate": "Stainless Steel Pressure Plate", + "tile.modernmetals.stainlesssteel_slab": "Stainless Steel Slab", + "block.modernmetals.stainlesssteel_slab": "Stainless Steel Slab", + "tile.modernmetals.stainlesssteel_stairs": "Stainless Steel Stairs", + "block.modernmetals.stainlesssteel_stairs": "Stainless Steel Stairs", + "tile.modernmetals.stainlesssteel_wall": "Stainless Steel Wall", + "block.modernmetals.stainlesssteel_wall": "Stainless Steel Wall", + "item.modernmetals.tantalum_clump": "Tantalum Clump", + "item.modernmetals.tantalum_crushed": "Crushed Tantalum Руда", + "item.modernmetals.tantalum_crushed_purified": "Purified Crushed Tantalum Руда", + "item.modernmetals.tantalum_crystal": "Tantalum Crystal", + "item.modernmetals.tantalum_dense_plate": "Dense Tantalum Plate", + "item.modernmetals.tantalum_powder_dirty": "Dirty Tantalum Dust", + "item.modernmetals.tantalum_shard": "Tantalum Shard", + "item.modernmetals.tantalum_button": "Tantalum Button", + "item.modernmetals.tantalum_lever": "Tantalum Lever", + "item.modernmetals.tantalum_pressure_plate": "Tantalum Pressure Plate", + "item.modernmetals.tantalum_slab": "Tantalum Slab", + "item.modernmetals.tantalum_stairs": "Tantalum Stairs", + "item.modernmetals.tantalum_wall": "Tantalum Wall", + "tile.modernmetals.tantalum_button": "Tantalum Button", + "block.modernmetals.tantalum_button": "Tantalum Button", + "tile.modernmetals.tantalum_lever": "Tantalum Lever", + "block.modernmetals.tantalum_lever": "Tantalum Lever", + "tile.modernmetals.tantalum_pressure_plate": "Tantalum Pressure Plate", + "block.modernmetals.tantalum_pressure_plate": "Tantalum Pressure Plate", + "tile.modernmetals.tantalum_slab": "Tantalum Slab", + "block.modernmetals.tantalum_slab": "Tantalum Slab", + "tile.modernmetals.tantalum_stairs": "Tantalum Stairs", + "block.modernmetals.tantalum_stairs": "Tantalum Stairs", + "tile.modernmetals.tantalum_wall": "Tantalum Wall", + "block.modernmetals.tantalum_wall": "Tantalum Wall", + "item.modernmetals.titanium_clump": "Titanium Clump", + "item.modernmetals.titanium_crushed": "Crushed Titanium Руда", + "item.modernmetals.titanium_crushed_purified": "Purified Crushed Titanium Руда", + "item.modernmetals.titanium_crystal": "Titanium Crystal", + "item.modernmetals.titanium_dense_plate": "Dense Titanium Plate", + "item.modernmetals.titanium_powder_dirty": "Dirty Titanium Dust", + "item.modernmetals.titanium_shard": "Titanium Shard", + "item.modernmetals.titanium_button": "Titanium Button", + "item.modernmetals.titanium_lever": "Titanium Lever", + "item.modernmetals.titanium_pressure_plate": "Titanium Pressure Plate", + "item.modernmetals.titanium_slab": "Titanium Slab", + "item.modernmetals.titanium_stairs": "Titanium Stairs", + "item.modernmetals.titanium_wall": "Titanium Wall", + "tile.modernmetals.titanium_button": "Titanium Button", + "block.modernmetals.titanium_button": "Titanium Button", + "tile.modernmetals.titanium_lever": "Titanium Lever", + "block.modernmetals.titanium_lever": "Titanium Lever", + "tile.modernmetals.titanium_pressure_plate": "Titanium Pressure Plate", + "block.modernmetals.titanium_pressure_plate": "Titanium Pressure Plate", + "tile.modernmetals.titanium_slab": "Titanium Slab", + "block.modernmetals.titanium_slab": "Titanium Slab", + "tile.modernmetals.titanium_stairs": "Titanium Stairs", + "block.modernmetals.titanium_stairs": "Titanium Stairs", + "tile.modernmetals.titanium_wall": "Titanium Wall", + "block.modernmetals.titanium_wall": "Titanium Wall", + "item.modernmetals.tungsten_clump": "Tungsten Clump", + "item.modernmetals.tungsten_crushed": "Crushed Tungsten Руда", + "item.modernmetals.tungsten_crushed_purified": "Purified Crushed Tungsten Руда", + "item.modernmetals.tungsten_crystal": "Tungsten Crystal", + "item.modernmetals.tungsten_dense_plate": "Dense Tungsten Plate", + "item.modernmetals.tungsten_powder_dirty": "Dirty Tungsten Dust", + "item.modernmetals.tungsten_shard": "Tungsten Shard", + "item.modernmetals.tungsten_button": "Tungsten Button", + "item.modernmetals.tungsten_lever": "Tungsten Lever", + "item.modernmetals.tungsten_pressure_plate": "Tungsten Pressure Plate", + "item.modernmetals.tungsten_slab": "Tungsten Slab", + "item.modernmetals.tungsten_stairs": "Tungsten Stairs", + "item.modernmetals.tungsten_wall": "Tungsten Wall", + "tile.modernmetals.tungsten_button": "Tungsten Button", + "block.modernmetals.tungsten_button": "Tungsten Button", + "tile.modernmetals.tungsten_lever": "Tungsten Lever", + "block.modernmetals.tungsten_lever": "Tungsten Lever", + "tile.modernmetals.tungsten_pressure_plate": "Tungsten Pressure Plate", + "block.modernmetals.tungsten_pressure_plate": "Tungsten Pressure Plate", + "tile.modernmetals.tungsten_slab": "Tungsten Slab", + "block.modernmetals.tungsten_slab": "Tungsten Slab", + "tile.modernmetals.tungsten_stairs": "Tungsten Stairs", + "block.modernmetals.tungsten_stairs": "Tungsten Stairs", + "tile.modernmetals.tungsten_wall": "Tungsten Wall", + "block.modernmetals.tungsten_wall": "Tungsten Wall", + "item.modernmetals.uranium_clump": "Uranium Clump", + "item.modernmetals.uranium_crushed": "Crushed Uranium Руда", + "item.modernmetals.uranium_crushed_purified": "Purified Crushed Uranium Руда", + "item.modernmetals.uranium_crystal": "Uranium Crystal", + "item.modernmetals.uranium_dense_plate": "Dense Uranium Plate", + "item.modernmetals.uranium_powder_dirty": "Dirty Uranium Dust", + "item.modernmetals.uranium_shard": "Uranium Shard", + "item.modernmetals.uranium_button": "Uranium Button", + "item.modernmetals.uranium_lever": "Uranium Lever", + "item.modernmetals.uranium_pressure_plate": "Uranium Pressure Plate", + "item.modernmetals.uranium_slab": "Uranium Slab", + "item.modernmetals.uranium_stairs": "Uranium Stairs", + "item.modernmetals.uranium_wall": "Uranium Wall", + "tile.modernmetals.uranium_button": "Uranium Button", + "block.modernmetals.uranium_button": "Uranium Button", + "tile.modernmetals.uranium_lever": "Uranium Lever", + "block.modernmetals.uranium_lever": "Uranium Lever", + "tile.modernmetals.uranium_pressure_plate": "Uranium Pressure Plate", + "block.modernmetals.uranium_pressure_plate": "Uranium Pressure Plate", + "tile.modernmetals.uranium_slab": "Uranium Slab", + "block.modernmetals.uranium_slab": "Uranium Slab", + "tile.modernmetals.uranium_stairs": "Uranium Stairs", + "block.modernmetals.uranium_stairs": "Uranium Stairs", + "tile.modernmetals.uranium_wall": "Uranium Wall", + "block.modernmetals.uranium_wall": "Uranium Wall", + "item.modernmetals.zirconium_clump": "Zirconium Clump", + "item.modernmetals.zirconium_crushed": "Crushed Zirconium Руда", + "item.modernmetals.zirconium_crushed_purified": "Purified Crushed Zirconium Руда", + "item.modernmetals.zirconium_crystal": "Zirconium Crystal", + "item.modernmetals.zirconium_dense_plate": "Dense Zirconium Plate", + "item.modernmetals.zirconium_powder_dirty": "Dirty Zirconium Dust", + "item.modernmetals.zirconium_shard": "Zirconium Shard", + "item.modernmetals.zirconium_button": "Zirconium Button", + "item.modernmetals.zirconium_lever": "Zirconium Lever", + "item.modernmetals.zirconium_pressure_plate": "Zirconium Pressure Plate", + "item.modernmetals.zirconium_slab": "Zirconium Slab", + "item.modernmetals.zirconium_stairs": "Zirconium Stairs", + "item.modernmetals.zirconium_wall": "Zirconium Wall", + "tile.modernmetals.zirconium_button": "Zirconium Button", + "block.modernmetals.zirconium_button": "Zirconium Button", + "tile.modernmetals.zirconium_lever": "Zirconium Lever", + "block.modernmetals.zirconium_lever": "Zirconium Lever", + "tile.modernmetals.zirconium_pressure_plate": "Zirconium Pressure Plate", + "block.modernmetals.zirconium_pressure_plate": "Zirconium Pressure Plate", + "tile.modernmetals.zirconium_slab": "Zirconium Slab", + "block.modernmetals.zirconium_slab": "Zirconium Slab", + "tile.modernmetals.zirconium_stairs": "Zirconium Stairs", + "block.modernmetals.zirconium_stairs": "Zirconium Stairs", + "tile.modernmetals.zirconium_wall": "Zirconium Wall", + "block.modernmetals.zirconium_wall": "Zirconium Wall", + "material.thorium": "Thorium", + "item.modernmetals.thorium_arrow": "Thorium Стрела", + "item.modernmetals.thorium_axe": "Thorium Топор", + "item.modernmetals.thorium_bars": "Thorium Прутья", + "item.modernmetals.thorium_blend": "Thorium Смеси", + "item.modernmetals.thorium_block": "Блок Thorium", + "item.modernmetals.thorium_boots": "Thorium Ботинки", + "item.modernmetals.thorium_bolt": "Thorium Арбалетная Стрела", + "item.modernmetals.thorium_bow": "Thorium Лук", + "item.modernmetals.thorium_chestplate": "Thorium Нагрудник", + "item.modernmetals.thorium_crackhammer": "Thorium Измельчающий Молот", + "item.modernmetals.thorium_crossbow": "Thorium Арбалет", + "item.modernmetals.thorium_door": "Thorium Двери", + "item.modernmetals.thorium_fishing_rod": "Thorium Удочка", + "item.modernmetals.thorium_gear": "Thorium Шестерня", + "item.modernmetals.thorium_helmet": "Thorium Шлем", + "item.modernmetals.thorium_hoe": "Thorium Мотыга", + "item.modernmetals.thorium_horse_armor": "Thorium Конская Броня", + "item.modernmetals.thorium_ingot": "Thorium Слиток", + "item.modernmetals.thorium_leggings": "Thorium Поножки", + "item.modernmetals.thorium_nugget": "Thorium Самородок", + "item.modernmetals.thorium_ore": "Thorium Руда", + "item.modernmetals.thorium_pickaxe": "Thorium Кирка", + "item.modernmetals.thorium_powder": "Измельчённый Thorium", + "item.modernmetals.thorium_rod": "Thorium Стержень", + "item.modernmetals.thorium_shears": "Thorium Ножницы", + "item.modernmetals.thorium_shield": "Thorium Щит", + "item.modernmetals.thorium_shovel": "Thorium Лопата", + "item.modernmetals.thorium_smallblend": "Маленькая Кучка Thorium Смеси", + "item.modernmetals.thorium_smallpowder": "Маленькая Кучка Измельчённого Thorium", + "item.modernmetals.thorium_sword": "Thorium Меч", + "item.modernmetals.thorium_trapdoor": "Thorium Люк", + "tile.modernmetals.thorium_bars": "Thorium Прутья", + "block.modernmetals.thorium_bars": "Thorium Прутья", + "tile.modernmetals.thorium_block": "Блок Thorium", + "block.modernmetals.thorium_block": "Блок Thorium", + "tile.modernmetals.thorium_door": "Thorium Двери", + "block.modernmetals.thorium_door": "Thorium Двери", + "tile.modernmetals.thorium_ore": "Thorium Руда", + "block.modernmetals.thorium_ore": "Thorium Руда", + "tile.modernmetals.thorium_plate": "Thorium Plate", + "block.modernmetals.thorium_plate": "Thorium Plate", + "tile.modernmetals.thorium_trapdoor": "Thorium Люк", + "block.modernmetals.thorium_trapdoor": "Thorium Люк", + "fluid.modernmetals.thorium": "Molten Thorium", + "tile.modernmetals.thorium": "Molten Thorium", + "block.modernmetals.thorium": "Molten Thorium", + "item.modernmetals.thorium_clump": "Thorium Clump", + "item.modernmetals.thorium_crushed": "Crushed Thorium Руда", + "item.modernmetals.thorium_crushed_purified": "Purified Crushed Thorium Руда", + "item.modernmetals.thorium_crystal": "Thorium Crystal", + "item.modernmetals.thorium_dense_plate": "Dense Thorium Plate", + "item.modernmetals.thorium_powder_dirty": "Dirty Thorium Dust", + "item.modernmetals.thorium_shard": "Thorium Shard", + "item.modernmetals.thorium_button": "Thorium Button", + "item.modernmetals.thorium_lever": "Thorium Lever", + "item.modernmetals.thorium_pressure_plate": "Thorium Pressure Plate", + "item.modernmetals.thorium_slab": "Thorium Slab", + "item.modernmetals.thorium_stairs": "Thorium Stairs", + "item.modernmetals.thorium_wall": "Thorium Wall", + "tile.modernmetals.thorium_button": "Thorium Button", + "block.modernmetals.thorium_button": "Thorium Button", + "tile.modernmetals.thorium_lever": "Thorium Lever", + "block.modernmetals.thorium_lever": "Thorium Lever", + "tile.modernmetals.thorium_pressure_plate": "Thorium Pressure Plate", + "block.modernmetals.thorium_pressure_plate": "Thorium Pressure Plate", + "tile.modernmetals.thorium_slab": "Thorium Slab", + "block.modernmetals.thorium_slab": "Thorium Slab", + "tile.modernmetals.thorium_stairs": "Thorium Stairs", + "block.modernmetals.thorium_stairs": "Thorium Stairs", + "tile.modernmetals.thorium_wall": "Thorium Wall", + "block.modernmetals.thorium_wall": "Thorium Wall", + "config.modernmetals.material.tooltip": "Включает блоки, предметы и рецепты этого материала. Требуется перезапуск игры.", + "config.modernmetals.title": "Modern Metals", + "config.modernmetals.description": "Для применения нужен перезапуск. Руды настраиваются в OreSpawn.", + "config.modernmetals.content_mode": "Уровень фэнтези", + "config.modernmetals.content_mode.tooltip": "Высокий уровень сохраняет все рецепты. Низкий ограничивает нереалистичное снаряжение и строительные блоки. Требуется перезапуск игры.", + "high_fantasy": "Высокий уровень фэнтези", + "low_fantasy": "Низкий уровень фэнтези", + "config.modernmetals.villager_trades": "Торговля с жителями", + "config.modernmetals.villager_trades.tooltip": "Кузнецы могут торговать слитками и снаряжением Modern Metals. Требуется перезапуск игры.", + "config.modernmetals.connection.mismatch": "Уровень на сервере — %s, в вашей игре — %s. Выберите тот же уровень в меню «Моды > Modern Metals > Настройки» и перезапустите игру.", + "config.modernmetals.connection.protocol": "Не удалось проверить уровень фэнтези Modern Metals. Установите одну и ту же сборку Modern Metals на клиенте и сервере.", + "config.modernmetals.enable_thorium": "Включить торий", + "config.modernmetals.enable_boron": "Включить бор", + "config.modernmetals.enable_beryllium": "Включить бериллий", + "config.modernmetals.enable_cadmium": "Включить кадмий", + "config.modernmetals.enable_nichrome": "Включить нихром", + "config.modernmetals.enable_aluminum": "Включить алюминий", + "config.modernmetals.enable_aluminumbrass": "Включить алюминиевую латунь", + "config.modernmetals.enable_chromium": "Включить хром", + "config.modernmetals.enable_galvanizedsteel": "Включить оцинкованную сталь", + "config.modernmetals.enable_iridium": "Включить иридий", + "config.modernmetals.enable_magnesium": "Включить магний", + "config.modernmetals.enable_manganese": "Включить марганец", + "config.modernmetals.enable_osmium": "Включить осмий", + "config.modernmetals.enable_plutonium": "Включить плутоний", + "config.modernmetals.enable_rutile": "Включить рутил", + "config.modernmetals.enable_stainlesssteel": "Включить нержавеющую сталь", + "config.modernmetals.enable_tantalum": "Включить тантал", + "config.modernmetals.enable_titanium": "Включить титан", + "config.modernmetals.enable_tungsten": "Включить вольфрам", + "config.modernmetals.enable_uranium": "Включить уран", + "config.modernmetals.enable_zirconium": "Включить цирконий", + "config.modernmetals.content_mode.high_fantasy": "Высокий уровень фэнтези", + "config.modernmetals.content_mode.low_fantasy": "Низкий уровень фэнтези", + "config.modernmetals.inherited_mode": "Уровень фэнтези задаётся в Base Metals. Перезапустите игру после изменений.", + "itemGroup.modernmetals.combat": "Modern Metals: боевое снаряжение", + "item.modernmetals.titanium_casing": "Корпус из материала «Титан»", + "item.modernmetals.beryllium_scythe": "Серп из материала «Бериллий»", + "item.modernmetals.boron_scythe": "Серп из материала «Бор»", + "item.modernmetals.thorium_scythe": "Серп из материала «Торий»", + "item.modernmetals.titanium_scythe": "Серп из материала «Титан»" +} diff --git a/src/main/resources/assets/modernmetals/lang/zh_cn.json b/src/main/resources/assets/modernmetals/lang/zh_cn.json new file mode 100644 index 00000000..9a349b23 --- /dev/null +++ b/src/main/resources/assets/modernmetals/lang/zh_cn.json @@ -0,0 +1,1676 @@ +{ + "item.modernmetals.nichrome_casing": "镍铬合金外壳", + "itemGroup.modernmetals.items": "Modern Metals", + "itemGroup.modernmetals.tools": "Modern Metals", + "itemGroup.modernmetals.blocks": "Modern Metals", + "nei.modernmetals.recipehandler.crusher": "粉碎的方块/物品", + "material.aluminum": "Aluminum", + "item.modernmetals.aluminum_arrow": "铝箭", + "item.modernmetals.aluminum_axe": "铝斧", + "item.modernmetals.aluminum_bars": "铝栏杆", + "item.modernmetals.aluminum_blend": "铝原粉", + "item.modernmetals.aluminum_block": "铝块", + "item.modernmetals.aluminum_boots": "铝靴子", + "item.modernmetals.aluminum_bolt": "铝弩箭", + "item.modernmetals.aluminum_bow": "铝弓", + "item.modernmetals.aluminum_chestplate": "铝胸甲", + "item.modernmetals.aluminum_crackhammer": "铝破裂锤", + "item.modernmetals.aluminum_crossbow": "铝弩", + "item.modernmetals.aluminum_door": "铝门", + "item.modernmetals.aluminum_fishing_rod": "铝钓鱼竿", + "item.modernmetals.aluminum_gear": "铝齿轮", + "item.modernmetals.aluminum_helmet": "铝头盔", + "item.modernmetals.aluminum_hoe": "铝锄", + "item.modernmetals.aluminum_horse_armor": "铝马铠", + "item.modernmetals.aluminum_ingot": "铝锭", + "item.modernmetals.aluminum_leggings": "铝护腿", + "item.modernmetals.aluminum_nugget": "铝粒", + "item.modernmetals.aluminum_ore": "铝矿石", + "item.modernmetals.aluminum_pickaxe": "铝镐", + "item.modernmetals.aluminum_powder": "铝粉", + "item.modernmetals.aluminum_rod": "铝棒", + "item.modernmetals.aluminum_shears": "铝剪刀", + "item.modernmetals.aluminum_shield": "铝盾", + "item.modernmetals.aluminum_shovel": "铝铲", + "item.modernmetals.aluminum_smallblend": "小堆铝原粉", + "item.modernmetals.aluminum_smallpowder": "小堆铝粉", + "item.modernmetals.aluminum_sword": "铝剑", + "item.modernmetals.aluminum_trapdoor": "铝活板门", + "material.aluminumbrass": "铝黄铜", + "item.modernmetals.aluminumbrass_arrow": "铝黄铜箭", + "item.modernmetals.aluminumbrass_axe": "铝黄铜斧", + "item.modernmetals.aluminumbrass_bars": "铝黄铜栏杆", + "item.modernmetals.aluminumbrass_blend": "铝黄铜原粉", + "item.modernmetals.aluminumbrass_block": "铝黄铜", + "item.modernmetals.aluminumbrass_boots": "铝黄铜靴子", + "item.modernmetals.aluminumbrass_bolt": "铝黄铜弩箭", + "item.modernmetals.aluminumbrass_bow": "铝黄铜弓", + "item.modernmetals.aluminumbrass_chestplate": "铝黄铜胸甲", + "item.modernmetals.aluminumbrass_crackhammer": "铝黄铜破裂锤", + "item.modernmetals.aluminumbrass_crossbow": "铝黄铜弩", + "item.modernmetals.aluminumbrass_door": "铝黄铜门", + "item.modernmetals.aluminumbrass_fishing_rod": "铝黄铜钓鱼竿", + "item.modernmetals.aluminumbrass_gear": "铝黄铜齿轮", + "item.modernmetals.aluminumbrass_helmet": "铝黄铜头盔", + "item.modernmetals.aluminumbrass_hoe": "铝黄铜锄", + "item.modernmetals.aluminumbrass_horse_armor": "铝黄铜马铠", + "item.modernmetals.aluminumbrass_ingot": "铝黄铜锭", + "item.modernmetals.aluminumbrass_leggings": "铝黄铜护腿", + "item.modernmetals.aluminumbrass_nugget": "铝黄铜粒", + "item.modernmetals.aluminumbrass_ore": "铝黄铜矿石", + "item.modernmetals.aluminumbrass_pickaxe": "铝黄铜镐", + "item.modernmetals.aluminumbrass_powder": "铝黄铜粉", + "item.modernmetals.aluminumbrass_rod": "铝黄铜棒", + "item.modernmetals.aluminumbrass_shears": "铝黄铜剪刀", + "item.modernmetals.aluminumbrass_shield": "铝黄铜盾", + "item.modernmetals.aluminumbrass_shovel": "铝黄铜铲", + "item.modernmetals.aluminumbrass_smallblend": "小堆铝黄铜原粉", + "item.modernmetals.aluminumbrass_smallpowder": "小堆铝黄铜粉", + "item.modernmetals.aluminumbrass_sword": "铝黄铜剑", + "item.modernmetals.aluminumbrass_trapdoor": "铝黄铜活板门", + "material.antimony": "锑", + "item.modernmetals.antimony_arrow": "锑箭", + "item.modernmetals.antimony_axe": "锑斧", + "item.modernmetals.antimony_bars": "锑栏杆", + "item.modernmetals.antimony_block": "锑块", + "item.modernmetals.antimony_boots": "锑靴子", + "item.modernmetals.antimony_chestplate": "锑胸甲", + "item.modernmetals.antimony_crackhammer": "锑破裂锤", + "item.modernmetals.antimony_door": "锑门", + "item.modernmetals.antimony_helmet": "锑头盔", + "item.modernmetals.antimony_hoe": "锑锄", + "item.modernmetals.antimony_ingot": "锑锭", + "item.modernmetals.antimony_leggings": "锑护腿", + "item.modernmetals.antimony_nugget": "锑粒", + "item.modernmetals.antimony_ore": "锑矿石", + "item.modernmetals.antimony_pickaxe": "锑镐", + "item.modernmetals.antimony_powder": "锑粉", + "item.modernmetals.antimony_shears": "锑剪刀", + "item.modernmetals.antimony_shield": "锑盾", + "item.modernmetals.antimony_shovel": "锑铲", + "item.modernmetals.antimony_smallpowder": "小堆锑粉", + "item.modernmetals.antimony_sword": "锑剑", + "item.modernmetals.antimony_trapdoor": "锑活板门", + "material.beryllium": "铍", + "item.modernmetals.beryllium_arrow": "铍箭", + "item.modernmetals.beryllium_axe": "铍斧", + "item.modernmetals.beryllium_bars": "铍栏杆", + "item.modernmetals.beryllium_blend": "铍原粉", + "item.modernmetals.beryllium_block": "铍块", + "item.modernmetals.beryllium_boots": "铍靴子", + "item.modernmetals.beryllium_bolt": "铍弩箭", + "item.modernmetals.beryllium_bow": "铍弓", + "item.modernmetals.beryllium_chestplate": "铍胸甲", + "item.modernmetals.beryllium_crackhammer": "铍破裂锤", + "item.modernmetals.beryllium_crossbow": "铍弩", + "item.modernmetals.beryllium_door": "铍门", + "item.modernmetals.beryllium_fishing_rod": "铍钓鱼竿", + "item.modernmetals.beryllium_gear": "铍齿轮", + "item.modernmetals.beryllium_helmet": "铍头盔", + "item.modernmetals.beryllium_hoe": "铍锄", + "item.modernmetals.beryllium_horse_armor": "铍马铠", + "item.modernmetals.beryllium_ingot": "铍锭", + "item.modernmetals.beryllium_leggings": "铍护腿", + "item.modernmetals.beryllium_nugget": "铍粒", + "item.modernmetals.beryllium_ore": "铍矿石", + "item.modernmetals.beryllium_pickaxe": "铍镐", + "item.modernmetals.beryllium_powder": "铍粉", + "item.modernmetals.beryllium_rod": "铍棒", + "item.modernmetals.beryllium_shears": "铍剪刀", + "item.modernmetals.beryllium_shield": "铍盾", + "item.modernmetals.beryllium_shovel": "铍铲", + "item.modernmetals.beryllium_smallblend": "小堆铍原粉", + "item.modernmetals.beryllium_smallpowder": "小堆铍粉", + "item.modernmetals.beryllium_sword": "铍剑", + "item.modernmetals.beryllium_trapdoor": "铍活板门", + "material.bismuth": "铋", + "item.modernmetals.bismuth_arrow": "铋箭", + "item.modernmetals.bismuth_axe": "铋斧", + "item.modernmetals.bismuth_bars": "铋栏杆", + "item.modernmetals.bismuth_block": "铋块", + "item.modernmetals.bismuth_boots": "铋靴子", + "item.modernmetals.bismuth_chestplate": "铋胸甲", + "item.modernmetals.bismuth_crackhammer": "铋破裂锤", + "item.modernmetals.bismuth_door": "铋门", + "item.modernmetals.bismuth_helmet": "铋头盔", + "item.modernmetals.bismuth_hoe": "铋锄", + "item.modernmetals.bismuth_ingot": "铋锭", + "item.modernmetals.bismuth_leggings": "铋护腿", + "item.modernmetals.bismuth_nugget": "铋粒", + "item.modernmetals.bismuth_ore": "铋矿石", + "item.modernmetals.bismuth_pickaxe": "铋镐", + "item.modernmetals.bismuth_powder": "铋粉", + "item.modernmetals.bismuth_shears": "铋剪刀", + "item.modernmetals.bismuth_shovel": "铋铲", + "item.modernmetals.bismuth_shield": "铋盾", + "item.modernmetals.bismuth_smallpowder": "小堆铋粉", + "item.modernmetals.bismuth_sword": "铋剑", + "item.modernmetals.bismuth_trapdoor": "铋活板门", + "material.boron": "硼", + "item.modernmetals.boron_arrow": "硼箭", + "item.modernmetals.boron_axe": "硼斧", + "item.modernmetals.boron_bars": "硼栏杆", + "item.modernmetals.boron_blend": "硼原粉", + "item.modernmetals.boron_block": "硼块", + "item.modernmetals.boron_boots": "硼靴子", + "item.modernmetals.boron_bolt": "硼弩箭", + "item.modernmetals.boron_bow": "硼弓", + "item.modernmetals.boron_chestplate": "硼胸甲", + "item.modernmetals.boron_crackhammer": "硼破裂锤", + "item.modernmetals.boron_crossbow": "硼弩", + "item.modernmetals.boron_door": "硼门", + "item.modernmetals.boron_fishing_rod": "硼钓鱼竿", + "item.modernmetals.boron_gear": "硼齿轮", + "item.modernmetals.boron_helmet": "硼头盔", + "item.modernmetals.boron_hoe": "硼锄", + "item.modernmetals.boron_horse_armor": "硼马铠", + "item.modernmetals.boron_ingot": "硼锭", + "item.modernmetals.boron_leggings": "硼护腿", + "item.modernmetals.boron_nugget": "硼粒", + "item.modernmetals.boron_ore": "硼矿石", + "item.modernmetals.boron_pickaxe": "硼镐", + "item.modernmetals.boron_powder": "硼粉", + "item.modernmetals.boron_rod": "硼棒", + "item.modernmetals.boron_shears": "硼剪刀", + "item.modernmetals.boron_shield": "硼盾", + "item.modernmetals.boron_shovel": "硼铲", + "item.modernmetals.boron_smallblend": "小堆硼原粉", + "item.modernmetals.boron_smallpowder": "小堆硼粉", + "item.modernmetals.boron_sword": "硼剑", + "item.modernmetals.boron_trapdoor": "硼活板门", + "material.cadmium": "镉", + "item.modernmetals.cadmium_arrow": "镉箭", + "item.modernmetals.cadmium_axe": "镉斧", + "item.modernmetals.cadmium_bars": "镉栏杆", + "item.modernmetals.cadmium_blend": "镉原粉", + "item.modernmetals.cadmium_block": "镉块", + "item.modernmetals.cadmium_bolt": "镉弩箭", + "item.modernmetals.cadmium_boots": "镉靴子", + "item.modernmetals.cadmium_bow": "镉弓", + "item.modernmetals.cadmium_chestplate": "镉胸甲", + "item.modernmetals.cadmium_crackhammer": "镉破裂锤", + "item.modernmetals.cadmium_crossbow": "镉弩", + "item.modernmetals.cadmium_door": "镉门", + "item.modernmetals.cadmium_fishing_rod": "镉钓鱼竿", + "item.modernmetals.cadmium_gear": "镉齿轮", + "item.modernmetals.cadmium_helmet": "镉头盔", + "item.modernmetals.cadmium_hoe": "镉锄", + "item.modernmetals.cadmium_horse_armor": "镉马铠", + "item.modernmetals.cadmium_ingot": "镉锭", + "item.modernmetals.cadmium_leggings": "镉护腿", + "item.modernmetals.cadmium_nugget": "镉粒", + "item.modernmetals.cadmium_ore": "镉矿石", + "item.modernmetals.cadmium_pickaxe": "镉镐", + "item.modernmetals.cadmium_powder": "镉粉", + "item.modernmetals.cadmium_rod": "镉棒", + "item.modernmetals.cadmium_shears": "镉剪刀", + "item.modernmetals.cadmium_shovel": "镉铲", + "item.modernmetals.cadmium_shield": "镉盾", + "item.modernmetals.cadmium_smallblend": "小堆镉原粉", + "item.modernmetals.cadmium_smallpowder": "小堆镉粉", + "item.modernmetals.cadmium_sword": "镉剑", + "item.modernmetals.cadmium_trapdoor": "镉活板门", + "material.chromium": "铬", + "item.modernmetals.chromium_arrow": "铬箭", + "item.modernmetals.chromium_axe": "铬斧", + "item.modernmetals.chromium_bars": "铬栏杆", + "item.modernmetals.chromium_blend": "铬原粉", + "item.modernmetals.chromium_block": "铬块", + "item.modernmetals.chromium_bolt": "铬弩箭", + "item.modernmetals.chromium_boots": "铬靴子", + "item.modernmetals.chromium_bow": "铬弓", + "item.modernmetals.chromium_chestplate": "铬胸甲", + "item.modernmetals.chromium_crackhammer": "铬破裂锤", + "item.modernmetals.chromium_crossbow": "铬弩", + "item.modernmetals.chromium_door": "铬门", + "item.modernmetals.chromium_fishing_rod": "铬钓鱼竿", + "item.modernmetals.chromium_gear": "铬齿轮", + "item.modernmetals.chromium_helmet": "铬头盔", + "item.modernmetals.chromium_hoe": "铬锄", + "item.modernmetals.chromium_horse_armor": "铬马铠", + "item.modernmetals.chromium_ingot": "铬锭", + "item.modernmetals.chromium_leggings": "铬护腿", + "item.modernmetals.chromium_nugget": "铬粒", + "item.modernmetals.chromium_ore": "铬矿石", + "item.modernmetals.chromium_pickaxe": "铬镐", + "item.modernmetals.chromium_powder": "铬粉", + "item.modernmetals.chromium_rod": "铬棒", + "item.modernmetals.chromium_shears": "铬剪刀", + "item.modernmetals.chromium_shield": "铬盾", + "item.modernmetals.chromium_shovel": "铬铲", + "item.modernmetals.chromium_smallblend": "小堆铬原粉", + "item.modernmetals.chromium_smallpowder": "小堆铬粉", + "item.modernmetals.chromium_sword": "铬剑", + "item.modernmetals.chromium_trapdoor": "铬活板门", + "material.galvanizedsteel": "镀锌钢", + "item.modernmetals.galvanizedsteel_arrow": "镀锌钢箭", + "item.modernmetals.galvanizedsteel_axe": "镀锌钢斧", + "item.modernmetals.galvanizedsteel_bars": "镀锌钢栏杆", + "item.modernmetals.galvanizedsteel_blend": "镀锌钢原粉", + "item.modernmetals.galvanizedsteel_block": "镀锌钢块", + "item.modernmetals.galvanizedsteel_bolt": "镀锌钢弩箭", + "item.modernmetals.galvanizedsteel_boots": "镀锌钢靴子", + "item.modernmetals.galvanizedsteel_bow": "镀锌钢弓", + "item.modernmetals.galvanizedsteel_chestplate": "镀锌钢胸甲", + "item.modernmetals.galvanizedsteel_crackhammer": "镀锌钢破裂锤", + "item.modernmetals.galvanizedsteel_crossbow": "镀锌钢弩", + "item.modernmetals.galvanizedsteel_door": "镀锌钢门", + "item.modernmetals.galvanizedsteel_fishing_rod": "镀锌钢钓鱼竿", + "item.modernmetals.galvanizedsteel_gear": "镀锌钢齿轮", + "item.modernmetals.galvanizedsteel_helmet": "镀锌钢头盔", + "item.modernmetals.galvanizedsteel_hoe": "镀锌钢锄", + "item.modernmetals.galvanizedsteel_horse_armor": "镀锌钢马铠", + "item.modernmetals.galvanizedsteel_ingot": "镀锌钢锭", + "item.modernmetals.galvanizedsteel_leggings": "镀锌钢护腿", + "item.modernmetals.galvanizedsteel_nugget": "镀锌钢粒", + "item.modernmetals.galvanizedsteel_ore": "镀锌钢矿石", + "item.modernmetals.galvanizedsteel_pickaxe": "镀锌钢镐", + "item.modernmetals.galvanizedsteel_powder": "镀锌钢粉", + "item.modernmetals.galvanizedsteel_rod": "镀锌钢棒", + "item.modernmetals.galvanizedsteel_shears": "镀锌钢剪刀", + "item.modernmetals.galvanizedsteel_shield": "镀锌钢盾", + "item.modernmetals.galvanizedsteel_shovel": "镀锌钢铲", + "item.modernmetals.galvanizedsteel_smallblend": "小堆镀锌钢原粉", + "item.modernmetals.galvanizedsteel_smallpowder": "小堆镀锌钢粉", + "item.modernmetals.galvanizedsteel_sword": "镀锌钢剑", + "item.modernmetals.galvanizedsteel_trapdoor": "镀锌钢活板门", + "material.iridium": "铱", + "item.modernmetals.iridium_arrow": "铱箭", + "item.modernmetals.iridium_axe": "铱斧", + "item.modernmetals.iridium_bars": "铱栏杆", + "item.modernmetals.iridium_blend": "铱原粉", + "item.modernmetals.iridium_block": "铱块", + "item.modernmetals.iridium_bolt": "铱弩箭", + "item.modernmetals.iridium_boots": "铱靴子", + "item.modernmetals.iridium_bow": "铱弓", + "item.modernmetals.iridium_chestplate": "铱胸甲", + "item.modernmetals.iridium_crackhammer": "铱破裂锤", + "item.modernmetals.iridium_crossbow": "铱弩", + "item.modernmetals.iridium_door": "铱门", + "item.modernmetals.iridium_fishing_rod": "铱钓鱼竿", + "item.modernmetals.iridium_gear": "铱齿轮", + "item.modernmetals.iridium_helmet": "铱头盔", + "item.modernmetals.iridium_hoe": "铱锄", + "item.modernmetals.iridium_horse_armor": "铱马铠", + "item.modernmetals.iridium_ingot": "铱锭", + "item.modernmetals.iridium_leggings": "铱护腿", + "item.modernmetals.iridium_nugget": "铱粒", + "item.modernmetals.iridium_ore": "铱矿石", + "item.modernmetals.iridium_pickaxe": "铱镐", + "item.modernmetals.iridium_powder": "铱粉", + "item.modernmetals.iridium_rod": "铱棒", + "item.modernmetals.iridium_shears": "铱剪刀", + "item.modernmetals.iridium_shield": "铱盾", + "item.modernmetals.iridium_shovel": "铱铲", + "item.modernmetals.iridium_smallblend": "小堆铱原粉", + "item.modernmetals.iridium_smallpowder": "小堆铱粉", + "item.modernmetals.iridium_sword": "铱剑", + "item.modernmetals.iridium_trapdoor": "铱活板门", + "material.magnesium": "镁", + "item.modernmetals.magnesium_arrow": "镁箭", + "item.modernmetals.magnesium_axe": "镁斧", + "item.modernmetals.magnesium_bars": "镁栏杆", + "item.modernmetals.magnesium_blend": "镁原粉", + "item.modernmetals.magnesium_block": "镁块", + "item.modernmetals.magnesium_boots": "镁靴子", + "item.modernmetals.magnesium_bolt": "镁弩箭", + "item.modernmetals.magnesium_bow": "镁弓", + "item.modernmetals.magnesium_chestplate": "镁胸甲", + "item.modernmetals.magnesium_crackhammer": "镁破裂锤", + "item.modernmetals.magnesium_crossbow": "镁弩", + "item.modernmetals.magnesium_door": "镁门", + "item.modernmetals.magnesium_fishing_rod": "镁钓鱼竿", + "item.modernmetals.magnesium_gear": "镁齿轮", + "item.modernmetals.magnesium_helmet": "镁头盔", + "item.modernmetals.magnesium_hoe": "镁锄", + "item.modernmetals.magnesium_horse_armor": "镁马铠", + "item.modernmetals.magnesium_ingot": "镁锭", + "item.modernmetals.magnesium_leggings": "镁护腿", + "item.modernmetals.magnesium_nugget": "镁粒", + "item.modernmetals.magnesium_ore": "镁矿石", + "item.modernmetals.magnesium_pickaxe": "镁镐", + "item.modernmetals.magnesium_powder": "镁粉", + "item.modernmetals.magnesium_rod": "镁棒", + "item.modernmetals.magnesium_shears": "镁剪刀", + "item.modernmetals.magnesium_shield": "镁盾", + "item.modernmetals.magnesium_shovel": "镁铲", + "item.modernmetals.magnesium_smallblend": "小堆镁原粉", + "item.modernmetals.magnesium_smallpowder": "小堆镁粉", + "item.modernmetals.magnesium_sword": "镁剑", + "item.modernmetals.magnesium_trapdoor": "镁活板门", + "material.manganese": "锰", + "item.modernmetals.manganese_arrow": "锰箭", + "item.modernmetals.manganese_axe": "锰斧", + "item.modernmetals.manganese_bars": "锰栏杆", + "item.modernmetals.manganese_blend": "锰原粉", + "item.modernmetals.manganese_block": "锰块", + "item.modernmetals.manganese_bolt": "锰弩箭", + "item.modernmetals.manganese_boots": "锰靴子", + "item.modernmetals.manganese_bow": "锰弓", + "item.modernmetals.manganese_chestplate": "锰胸甲", + "item.modernmetals.manganese_crackhammer": "锰破裂锤", + "item.modernmetals.manganese_crossbow": "锰弩", + "item.modernmetals.manganese_door": "锰门", + "item.modernmetals.manganese_fishing_rod": "锰钓鱼竿", + "item.modernmetals.manganese_gear": "锰齿轮", + "item.modernmetals.manganese_helmet": "锰头盔", + "item.modernmetals.manganese_hoe": "锰锄", + "item.modernmetals.manganese_horse_armor": "锰马铠", + "item.modernmetals.manganese_ingot": "锰锭", + "item.modernmetals.manganese_leggings": "锰护腿", + "item.modernmetals.manganese_nugget": "锰粒", + "item.modernmetals.manganese_ore": "锰矿石", + "item.modernmetals.manganese_pickaxe": "锰镐", + "item.modernmetals.manganese_powder": "锰粉", + "item.modernmetals.manganese_rod": "锰棒", + "item.modernmetals.manganese_shears": "锰剪刀", + "item.modernmetals.manganese_shield": "锰盾", + "item.modernmetals.manganese_shovel": "锰铲", + "item.modernmetals.manganese_smallblend": "小堆锰原粉", + "item.modernmetals.manganese_smallpowder": "小堆锰粉", + "item.modernmetals.manganese_sword": "锰剑", + "item.modernmetals.manganese_trapdoor": "锰活板门", + "material.nichrome": "镍铬合金", + "item.modernmetals.nichrome_arrow": "镍铬合金箭", + "item.modernmetals.nichrome_axe": "镍铬合金斧", + "item.modernmetals.nichrome_bars": "镍铬合金栏杆", + "item.modernmetals.nichrome_blend": "镍铬合金原粉", + "item.modernmetals.nichrome_block": "镍铬合金块", + "item.modernmetals.nichrome_bolt": "镍铬合金弩箭", + "item.modernmetals.nichrome_boots": "镍铬合金靴子", + "item.modernmetals.nichrome_bow": "镍铬合金弓", + "item.modernmetals.nichrome_chestplate": "镍铬合金胸甲", + "item.modernmetals.nichrome_crackhammer": "镍铬合金破裂锤", + "item.modernmetals.nichrome_crossbow": "镍铬合金弩", + "item.modernmetals.nichrome_door": "镍铬合金门", + "item.modernmetals.nichrome_fishing_rod": "镍铬合金钓鱼竿", + "item.modernmetals.nichrome_gear": "镍铬合金齿轮", + "item.modernmetals.nichrome_helmet": "镍铬合金头盔", + "item.modernmetals.nichrome_hoe": "镍铬合金锄", + "item.modernmetals.nichrome_horse_armor": "镍铬合金马铠", + "item.modernmetals.nichrome_ingot": "镍铬合金锭", + "item.modernmetals.nichrome_leggings": "镍铬合金护腿", + "item.modernmetals.nichrome_nugget": "镍铬合金粒", + "item.modernmetals.nichrome_ore": "镍铬合金矿石", + "item.modernmetals.nichrome_pickaxe": "镍铬合金镐", + "item.modernmetals.nichrome_powder": "镍铬合金粉", + "item.modernmetals.nichrome_rod": "镍铬合金棒", + "item.modernmetals.nichrome_shears": "镍铬合金剪刀", + "item.modernmetals.nichrome_shield": "镍铬合金盾", + "item.modernmetals.nichrome_shovel": "镍铬合金铲", + "item.modernmetals.nichrome_smallblend": "小堆镍铬合金原粉", + "item.modernmetals.nichrome_smallpowder": "小堆镍铬合金粉", + "item.modernmetals.nichrome_sword": "镍铬合金剑", + "item.modernmetals.nichrome_trapdoor": "镍铬合金活板门", + "material.osmium": "锇", + "item.modernmetals.osmium_arrow": "锇箭", + "item.modernmetals.osmium_axe": "锇斧", + "item.modernmetals.osmium_bars": "锇栏杆", + "item.modernmetals.osmium_blend": "锇原粉", + "item.modernmetals.osmium_block": "锇块", + "item.modernmetals.osmium_boots": "锇靴子", + "item.modernmetals.osmium_bolt": "锇弩箭", + "item.modernmetals.osmium_bow": "锇弓", + "item.modernmetals.osmium_chestplate": "锇胸甲", + "item.modernmetals.osmium_crackhammer": "锇破裂锤", + "item.modernmetals.osmium_crossbow": "锇弩", + "item.modernmetals.osmium_door": "锇门", + "item.modernmetals.osmium_fishing_rod": "锇钓鱼竿", + "item.modernmetals.osmium_gear": "锇齿轮", + "item.modernmetals.osmium_helmet": "锇头盔", + "item.modernmetals.osmium_hoe": "锇锄", + "item.modernmetals.osmium_horse_armor": "锇马铠", + "item.modernmetals.osmium_ingot": "锇锭", + "item.modernmetals.osmium_leggings": "锇护腿", + "item.modernmetals.osmium_nugget": "锇粒", + "item.modernmetals.osmium_ore": "锇矿石", + "item.modernmetals.osmium_pickaxe": "锇镐", + "item.modernmetals.osmium_powder": "锇粉", + "item.modernmetals.osmium_rod": "锇棒", + "item.modernmetals.osmium_shears": "锇剪刀", + "item.modernmetals.osmium_shield": "锇盾", + "item.modernmetals.osmium_shovel": "锇铲", + "item.modernmetals.osmium_smallblend": "小堆锇原粉", + "item.modernmetals.osmium_smallpowder": "小堆锇粉", + "item.modernmetals.osmium_sword": "锇剑", + "item.modernmetals.osmium_trapdoor": "锇活板门", + "material.pewter": "白镴", + "item.modernmetals.pewter_arrow": "白镴箭", + "item.modernmetals.pewter_axe": "白镴斧", + "item.modernmetals.pewter_bars": "白镴栏杆", + "item.modernmetals.pewter_blend": "白镴原粉", + "item.modernmetals.pewter_block": "白镴块", + "item.modernmetals.pewter_boots": "白镴靴子", + "item.modernmetals.pewter_chestplate": "白镴胸甲", + "item.modernmetals.pewter_crackhammer": "白镴破裂锤", + "item.modernmetals.pewter_door": "白镴门", + "item.modernmetals.pewter_helmet": "白镴头盔", + "item.modernmetals.pewter_hoe": "白镴锄", + "item.modernmetals.pewter_ingot": "白镴锭", + "item.modernmetals.pewter_leggings": "白镴护腿", + "item.modernmetals.pewter_nugget": "白镴粒", + "item.modernmetals.pewter_ore": "白镴矿石", + "item.modernmetals.pewter_pickaxe": "白镴镐", + "item.modernmetals.pewter_powder": "白镴粉", + "item.modernmetals.pewter_shears": "白镴剪刀", + "item.modernmetals.pewter_shield": "白镴盾", + "item.modernmetals.pewter_shovel": "白镴铲", + "item.modernmetals.pewter_smallpowder": "小堆白镴粉", + "item.modernmetals.pewter_sword": "白镴剑", + "item.modernmetals.pewter_trapdoor": "白镴活板门", + "material.plutonium": "钚", + "item.modernmetals.plutonium_arrow": "钚箭", + "item.modernmetals.plutonium_axe": "钚斧", + "item.modernmetals.plutonium_bars": "钚栏杆", + "item.modernmetals.plutonium_blend": "钚原粉", + "item.modernmetals.plutonium_block": "钚块", + "item.modernmetals.plutonium_bolt": "钚弩箭", + "item.modernmetals.plutonium_boots": "钚靴子", + "item.modernmetals.plutonium_bow": "钚弓", + "item.modernmetals.plutonium_chestplate": "钚胸甲", + "item.modernmetals.plutonium_crackhammer": "钚破裂锤", + "item.modernmetals.plutonium_crossbow": "钚弩", + "item.modernmetals.plutonium_door": "钚门", + "item.modernmetals.plutonium_fishing_rod": "钚钓鱼竿", + "item.modernmetals.plutonium_gear": "钚齿轮", + "item.modernmetals.plutonium_helmet": "钚头盔", + "item.modernmetals.plutonium_hoe": "钚锄", + "item.modernmetals.plutonium_horse_armor": "钚马铠", + "item.modernmetals.plutonium_ingot": "钚锭", + "item.modernmetals.plutonium_leggings": "钚护腿", + "item.modernmetals.plutonium_nugget": "钚粒", + "item.modernmetals.plutonium_ore": "钚矿石", + "item.modernmetals.plutonium_pickaxe": "钚镐", + "item.modernmetals.plutonium_powder": "钚粉", + "item.modernmetals.plutonium_rod": "钚棒", + "item.modernmetals.plutonium_shears": "钚剪刀", + "item.modernmetals.plutonium_shield": "钚盾", + "item.modernmetals.plutonium_shovel": "钚铲", + "item.modernmetals.plutonium_smallblend": "小堆钚原粉", + "item.modernmetals.plutonium_smallpowder": "小堆钚粉", + "item.modernmetals.plutonium_sword": "钚剑", + "item.modernmetals.plutonium_trapdoor": "钚活板门", + "material.rutile": "金红石", + "item.modernmetals.rutile_arrow": "金红石箭", + "item.modernmetals.rutile_axe": "金红石斧", + "item.modernmetals.rutile_bars": "金红石栏杆", + "item.modernmetals.rutile_blend": "金红石原粉", + "item.modernmetals.rutile_block": "金红石块", + "item.modernmetals.rutile_boots": "金红石靴子", + "item.modernmetals.rutile_bolt": "金红石弩箭", + "item.modernmetals.rutile_bow": "金红石弓", + "item.modernmetals.rutile_chestplate": "金红石胸甲", + "item.modernmetals.rutile_crackhammer": "金红石破裂锤", + "item.modernmetals.rutile_crossbow": "金红石弩", + "item.modernmetals.rutile_door": "金红石门", + "item.modernmetals.rutile_fishing_rod": "金红石钓鱼竿", + "item.modernmetals.rutile_gear": "金红石齿轮", + "item.modernmetals.rutile_helmet": "金红石头盔", + "item.modernmetals.rutile_hoe": "金红石锄", + "item.modernmetals.rutile_horse_armor": "金红石马铠", + "item.modernmetals.rutile_ingot": "金红石锭", + "item.modernmetals.rutile_leggings": "金红石护腿", + "item.modernmetals.rutile_nugget": "金红石粒", + "item.modernmetals.rutile_ore": "金红石矿石", + "item.modernmetals.rutile_pickaxe": "金红石镐", + "item.modernmetals.rutile_powder": "金红石粉", + "item.modernmetals.rutile_rod": "金红石棒", + "item.modernmetals.rutile_shears": "金红石剪刀", + "item.modernmetals.rutile_shield": "金红石盾", + "item.modernmetals.rutile_shovel": "金红石铲", + "item.modernmetals.rutile_smallblend": "小堆金红石原粉", + "item.modernmetals.rutile_smallpowder": "小堆金红石粉", + "item.modernmetals.rutile_sword": "金红石剑", + "item.modernmetals.rutile_trapdoor": "金红石活板门", + "material.stainlesssteel": "不锈钢", + "item.modernmetals.stainlesssteel_arrow": "不锈钢箭", + "item.modernmetals.stainlesssteel_axe": "不锈钢斧", + "item.modernmetals.stainlesssteel_bars": "不锈钢栏杆", + "item.modernmetals.stainlesssteel_blend": "不锈钢原粉", + "item.modernmetals.stainlesssteel_block": "不锈钢块", + "item.modernmetals.stainlesssteel_bolt": "不锈钢弩箭", + "item.modernmetals.stainlesssteel_boots": "不锈钢靴子", + "item.modernmetals.stainlesssteel_bow": "不锈钢弓", + "item.modernmetals.stainlesssteel_chestplate": "不锈钢胸甲", + "item.modernmetals.stainlesssteel_crackhammer": "不锈钢破裂锤", + "item.modernmetals.stainlesssteel_crossbow": "不锈钢弩", + "item.modernmetals.stainlesssteel_door": "不锈钢门", + "item.modernmetals.stainlesssteel_fishing_rod": "不锈钢钓鱼竿", + "item.modernmetals.stainlesssteel_gear": "不锈钢齿轮", + "item.modernmetals.stainlesssteel_helmet": "不锈钢头盔", + "item.modernmetals.stainlesssteel_hoe": "不锈钢锄", + "item.modernmetals.stainlesssteel_horse_armor": "不锈钢马铠", + "item.modernmetals.stainlesssteel_ingot": "不锈钢锭", + "item.modernmetals.stainlesssteel_leggings": "不锈钢护腿", + "item.modernmetals.stainlesssteel_nugget": "不锈钢粒", + "item.modernmetals.stainlesssteel_ore": "不锈钢矿石", + "item.modernmetals.stainlesssteel_pickaxe": "不锈钢镐", + "item.modernmetals.stainlesssteel_powder": "不锈钢粉", + "item.modernmetals.stainlesssteel_rod": "不锈钢棒", + "item.modernmetals.stainlesssteel_shears": "不锈钢剪刀", + "item.modernmetals.stainlesssteel_shield": "不锈钢盾", + "item.modernmetals.stainlesssteel_shovel": "不锈钢铲", + "item.modernmetals.stainlesssteel_smallblend": "小堆不锈钢原粉", + "item.modernmetals.stainlesssteel_smallpowder": "小堆不锈钢粉", + "item.modernmetals.stainlesssteel_sword": "不锈钢剑", + "item.modernmetals.stainlesssteel_trapdoor": "不锈钢活板门", + "material.tantalum": "钽", + "item.modernmetals.tantalum_arrow": "钽箭", + "item.modernmetals.tantalum_axe": "钽斧", + "item.modernmetals.tantalum_bars": "钽栏杆", + "item.modernmetals.tantalum_blend": "钽原粉", + "item.modernmetals.tantalum_block": "钽块", + "item.modernmetals.tantalum_bolt": "钽弩箭", + "item.modernmetals.tantalum_boots": "钽靴子", + "item.modernmetals.tantalum_bow": "钽弓", + "item.modernmetals.tantalum_chestplate": "钽胸甲", + "item.modernmetals.tantalum_crackhammer": "钽破裂锤", + "item.modernmetals.tantalum_crossbow": "钽弩", + "item.modernmetals.tantalum_door": "钽门", + "item.modernmetals.tantalum_fishing_rod": "钽钓鱼竿", + "item.modernmetals.tantalum_gear": "钽齿轮", + "item.modernmetals.tantalum_helmet": "钽头盔", + "item.modernmetals.tantalum_hoe": "钽锄", + "item.modernmetals.tantalum_horse_armor": "钽马铠", + "item.modernmetals.tantalum_ingot": "钽锭", + "item.modernmetals.tantalum_leggings": "钽护腿", + "item.modernmetals.tantalum_nugget": "钽粒", + "item.modernmetals.tantalum_ore": "钽矿石", + "item.modernmetals.tantalum_pickaxe": "钽镐", + "item.modernmetals.tantalum_powder": "钽粉", + "item.modernmetals.tantalum_rod": "钽棒", + "item.modernmetals.tantalum_shears": "钽剪刀", + "item.modernmetals.tantalum_shield": "钽盾", + "item.modernmetals.tantalum_shovel": "钽铲", + "item.modernmetals.tantalum_smallblend": "小堆钽原粉", + "item.modernmetals.tantalum_smallpowder": "小堆钽粉", + "item.modernmetals.tantalum_sword": "钽剑", + "item.modernmetals.tantalum_trapdoor": "钽活板门", + "material.titanium": "钛", + "item.modernmetals.titanium_arrow": "钛箭", + "item.modernmetals.titanium_axe": "钛斧", + "item.modernmetals.titanium_bars": "钛栏杆", + "item.modernmetals.titanium_blend": "钛原粉", + "item.modernmetals.titanium_block": "钛块", + "item.modernmetals.titanium_boots": "钛靴子", + "item.modernmetals.titanium_bolt": "钛弩箭", + "item.modernmetals.titanium_bow": "钛弓", + "item.modernmetals.titanium_chestplate": "钛胸甲", + "item.modernmetals.titanium_crackhammer": "钛破裂锤", + "item.modernmetals.titanium_crossbow": "钛弩", + "item.modernmetals.titanium_door": "钛门", + "item.modernmetals.titanium_fishing_rod": "钛钓鱼竿", + "item.modernmetals.titanium_gear": "钛齿轮", + "item.modernmetals.titanium_helmet": "钛头盔", + "item.modernmetals.titanium_hoe": "钛锄", + "item.modernmetals.titanium_horse_armor": "钛马铠", + "item.modernmetals.titanium_ingot": "钛锭", + "item.modernmetals.titanium_leggings": "钛护腿", + "item.modernmetals.titanium_nugget": "钛粒", + "item.modernmetals.titanium_ore": "钛矿石", + "item.modernmetals.titanium_pickaxe": "钛镐", + "item.modernmetals.titanium_powder": "钛粉", + "item.modernmetals.titanium_rod": "钛棒", + "item.modernmetals.titanium_shears": "钛剪刀", + "item.modernmetals.titanium_shield": "钛盾", + "item.modernmetals.titanium_shovel": "钛铲", + "item.modernmetals.titanium_smallblend": "小堆钛原粉", + "item.modernmetals.titanium_smallpowder": "小堆钛粉", + "item.modernmetals.titanium_sword": "钛剑", + "item.modernmetals.titanium_trapdoor": "钛活板门", + "material.tungsten": "钨", + "item.modernmetals.tungsten_arrow": "钨箭", + "item.modernmetals.tungsten_axe": "钨斧", + "item.modernmetals.tungsten_bars": "钨栏杆", + "item.modernmetals.tungsten_blend": "钨原粉", + "item.modernmetals.tungsten_block": "钨块", + "item.modernmetals.tungsten_boots": "钨靴子", + "item.modernmetals.tungsten_bolt": "钨弩箭", + "item.modernmetals.tungsten_bow": "钨弓", + "item.modernmetals.tungsten_chestplate": "钨胸甲", + "item.modernmetals.tungsten_crackhammer": "钨破裂锤", + "item.modernmetals.tungsten_crossbow": "钨弩", + "item.modernmetals.tungsten_door": "钨门", + "item.modernmetals.tungsten_fishing_rod": "钨钓鱼竿", + "item.modernmetals.tungsten_gear": "钨齿轮", + "item.modernmetals.tungsten_helmet": "钨头盔", + "item.modernmetals.tungsten_hoe": "钨锄", + "item.modernmetals.tungsten_horse_armor": "钨马铠", + "item.modernmetals.tungsten_ingot": "钨锭", + "item.modernmetals.tungsten_leggings": "钨护腿", + "item.modernmetals.tungsten_nugget": "钨粒", + "item.modernmetals.tungsten_ore": "钨矿石", + "item.modernmetals.tungsten_pickaxe": "钨镐", + "item.modernmetals.tungsten_powder": "钨粉", + "item.modernmetals.tungsten_rod": "钨棒", + "item.modernmetals.tungsten_shears": "钨剪刀", + "item.modernmetals.tungsten_shield": "钨盾", + "item.modernmetals.tungsten_shovel": "钨铲", + "item.modernmetals.tungsten_smallblend": "小堆钨原粉", + "item.modernmetals.tungsten_smallpowder": "小堆钨粉", + "item.modernmetals.tungsten_sword": "钨剑", + "item.modernmetals.tungsten_trapdoor": "钨活板门", + "material.uranium": "铀", + "item.modernmetals.uranium_arrow": "铀箭", + "item.modernmetals.uranium_axe": "铀斧", + "item.modernmetals.uranium_bars": "铀栏杆", + "item.modernmetals.uranium_blend": "铀原粉", + "item.modernmetals.uranium_block": "铀块", + "item.modernmetals.uranium_boots": "铀靴子", + "item.modernmetals.uranium_bolt": "铀弩箭", + "item.modernmetals.uranium_bow": "铀弓", + "item.modernmetals.uranium_chestplate": "铀胸甲", + "item.modernmetals.uranium_crackhammer": "铀破裂锤", + "item.modernmetals.uranium_crossbow": "铀弩", + "item.modernmetals.uranium_door": "铀门", + "item.modernmetals.uranium_fishing_rod": "铀钓鱼竿", + "item.modernmetals.uranium_gear": "铀齿轮", + "item.modernmetals.uranium_helmet": "铀头盔", + "item.modernmetals.uranium_hoe": "铀锄", + "item.modernmetals.uranium_horse_armor": "铀马铠", + "item.modernmetals.uranium_ingot": "铀锭", + "item.modernmetals.uranium_leggings": "铀护腿", + "item.modernmetals.uranium_nugget": "铀粒", + "item.modernmetals.uranium_ore": "铀矿石", + "item.modernmetals.uranium_pickaxe": "铀镐", + "item.modernmetals.uranium_powder": "铀粉", + "item.modernmetals.uranium_rod": "铀棒", + "item.modernmetals.uranium_shears": "铀剪刀", + "item.modernmetals.uranium_shield": "铀盾", + "item.modernmetals.uranium_shovel": "铀铲", + "item.modernmetals.uranium_smallblend": "小堆铀原粉", + "item.modernmetals.uranium_smallpowder": "小堆铀粉", + "item.modernmetals.uranium_sword": "铀剑", + "item.modernmetals.uranium_trapdoor": "铀活板门", + "material.zirconium": "锆", + "item.modernmetals.zirconium_arrow": "锆箭", + "item.modernmetals.zirconium_axe": "锆斧", + "item.modernmetals.zirconium_bars": "锆栏杆", + "item.modernmetals.zirconium_blend": "锆原粉", + "item.modernmetals.zirconium_block": "锆块", + "item.modernmetals.zirconium_bolt": "锆弩箭", + "item.modernmetals.zirconium_boots": "锆靴子", + "item.modernmetals.zirconium_bow": "锆弓", + "item.modernmetals.zirconium_chestplate": "锆胸甲", + "item.modernmetals.zirconium_crackhammer": "锆破裂锤", + "item.modernmetals.zirconium_crossbow": "锆弩", + "item.modernmetals.zirconium_door": "锆门", + "item.modernmetals.zirconium_fishing_rod": "锆钓鱼竿", + "item.modernmetals.zirconium_gear": "锆齿轮", + "item.modernmetals.zirconium_helmet": "锆头盔", + "item.modernmetals.zirconium_hoe": "锆锄", + "item.modernmetals.zirconium_horse_armor": "锆马铠", + "item.modernmetals.zirconium_ingot": "锆锭", + "item.modernmetals.zirconium_leggings": "锆护腿", + "item.modernmetals.zirconium_nugget": "锆粒", + "item.modernmetals.zirconium_ore": "锆矿石", + "item.modernmetals.zirconium_pickaxe": "锆镐", + "item.modernmetals.zirconium_powder": "锆粉", + "item.modernmetals.zirconium_rod": "锆棒", + "item.modernmetals.zirconium_shears": "锆剪刀", + "item.modernmetals.zirconium_shield": "锆盾", + "item.modernmetals.zirconium_shovel": "锆铲", + "item.modernmetals.zirconium_smallblend": "小堆锆原粉", + "item.modernmetals.zirconium_smallpowder": "小堆锆粉", + "item.modernmetals.zirconium_sword": "锆剑", + "item.modernmetals.zirconium_trapdoor": "锆活板门", + "tile.modernmetals.aluminum_bars": "铝栏杆", + "block.modernmetals.aluminum_bars": "铝栏杆", + "tile.modernmetals.aluminum_block": "铝块", + "block.modernmetals.aluminum_block": "铝块", + "tile.modernmetals.aluminum_door": "铝门", + "block.modernmetals.aluminum_door": "铝门", + "tile.modernmetals.aluminum_ore": "铝矿石", + "block.modernmetals.aluminum_ore": "铝矿石", + "tile.modernmetals.aluminum_plate": "铝板", + "block.modernmetals.aluminum_plate": "铝板", + "tile.modernmetals.aluminum_trapdoor": "铝活板门", + "block.modernmetals.aluminum_trapdoor": "铝活板门", + "tile.modernmetals.aluminumbrass_bars": "铝黄铜栏杆", + "block.modernmetals.aluminumbrass_bars": "铝黄铜栏杆", + "tile.modernmetals.aluminumbrass_block": "铝黄铜块", + "block.modernmetals.aluminumbrass_block": "铝黄铜块", + "tile.modernmetals.aluminumbrass_door": "铝黄铜门", + "block.modernmetals.aluminumbrass_door": "铝黄铜门", + "tile.modernmetals.aluminumbrass_ore": "铝黄铜矿石", + "block.modernmetals.aluminumbrass_ore": "铝黄铜矿石", + "tile.modernmetals.aluminumbrass_plate": "铝黄铜板", + "block.modernmetals.aluminumbrass_plate": "铝黄铜板", + "tile.modernmetals.aluminumbrass_trapdoor": "铝黄铜活板门", + "block.modernmetals.aluminumbrass_trapdoor": "铝黄铜活板门", + "tile.modernmetals.boron_bars": "硼栏杆", + "block.modernmetals.boron_bars": "硼栏杆", + "tile.modernmetals.boron_block": "硼块", + "block.modernmetals.boron_block": "硼块", + "tile.modernmetals.boron_door": "硼门", + "block.modernmetals.boron_door": "硼门", + "tile.modernmetals.boron_ore": "硼矿石", + "block.modernmetals.boron_ore": "硼矿石", + "tile.modernmetals.boron_plate": "硼板", + "block.modernmetals.boron_plate": "硼板", + "tile.modernmetals.boron_trapdoor": "硼活板门", + "block.modernmetals.boron_trapdoor": "硼活板门", + "tile.modernmetals.cadmium_bars": "镉栏杆", + "block.modernmetals.cadmium_bars": "镉栏杆", + "tile.modernmetals.cadmium_block": "镉块", + "block.modernmetals.cadmium_block": "镉块", + "tile.modernmetals.cadmium_door": "镉门", + "block.modernmetals.cadmium_door": "镉门", + "tile.modernmetals.cadmium_ore": "镉矿石", + "block.modernmetals.cadmium_ore": "镉矿石", + "tile.modernmetals.cadmium_plate": "镉板", + "block.modernmetals.cadmium_plate": "镉板", + "tile.modernmetals.cadmium_trapdoor": "镉活板门", + "block.modernmetals.cadmium_trapdoor": "镉活板门", + "tile.modernmetals.chromium_bars": "铬栏杆", + "block.modernmetals.chromium_bars": "铬栏杆", + "tile.modernmetals.chromium_block": "铬块", + "block.modernmetals.chromium_block": "铬块", + "tile.modernmetals.chromium_door": "铬门", + "block.modernmetals.chromium_door": "铬门", + "tile.modernmetals.chromium_ore": "铬矿石", + "block.modernmetals.chromium_ore": "铬矿石", + "tile.modernmetals.chromium_plate": "铬板", + "block.modernmetals.chromium_plate": "铬板", + "tile.modernmetals.chromium_trapdoor": "铬活板门", + "block.modernmetals.chromium_trapdoor": "铬活板门", + "tile.modernmetals.galvanizedsteel_bars": "镀锌钢栏杆", + "block.modernmetals.galvanizedsteel_bars": "镀锌钢栏杆", + "tile.modernmetals.galvanizedsteel_block": "镀锌钢块", + "block.modernmetals.galvanizedsteel_block": "镀锌钢块", + "tile.modernmetals.galvanizedsteel_door": "镀锌钢门", + "block.modernmetals.galvanizedsteel_door": "镀锌钢门", + "tile.modernmetals.galvanizedsteel_ore": "镀锌钢矿石", + "block.modernmetals.galvanizedsteel_ore": "镀锌钢矿石", + "tile.modernmetals.galvanizedsteel_plate": "镀锌钢板", + "block.modernmetals.galvanizedsteel_plate": "镀锌钢板", + "tile.modernmetals.galvanizedsteel_trapdoor": "镀锌钢活板门", + "block.modernmetals.galvanizedsteel_trapdoor": "镀锌钢活板门", + "tile.modernmetals.iridium_bars": "铱栏杆", + "block.modernmetals.iridium_bars": "铱栏杆", + "tile.modernmetals.iridium_block": "铱块", + "block.modernmetals.iridium_block": "铱块", + "tile.modernmetals.iridium_door": "铱门", + "block.modernmetals.iridium_door": "铱门", + "tile.modernmetals.iridium_ore": "铱矿石", + "block.modernmetals.iridium_ore": "铱矿石", + "tile.modernmetals.iridium_plate": "铱板", + "block.modernmetals.iridium_plate": "铱板", + "tile.modernmetals.iridium_trapdoor": "铱活板门", + "block.modernmetals.iridium_trapdoor": "铱活板门", + "tile.modernmetals.magnesium_bars": "镁栏杆", + "block.modernmetals.magnesium_bars": "镁栏杆", + "tile.modernmetals.magnesium_block": "镁块", + "block.modernmetals.magnesium_block": "镁块", + "tile.modernmetals.magnesium_door": "镁门", + "block.modernmetals.magnesium_door": "镁门", + "tile.modernmetals.magnesium_ore": "镁矿石", + "block.modernmetals.magnesium_ore": "镁矿石", + "tile.modernmetals.magnesium_plate": "镁板", + "block.modernmetals.magnesium_plate": "镁板", + "tile.modernmetals.magnesium_trapdoor": "镁活板门", + "block.modernmetals.magnesium_trapdoor": "镁活板门", + "tile.modernmetals.manganese_bars": "锰栏杆", + "block.modernmetals.manganese_bars": "锰栏杆", + "tile.modernmetals.manganese_block": "锰块", + "block.modernmetals.manganese_block": "锰块", + "tile.modernmetals.manganese_door": "锰门", + "block.modernmetals.manganese_door": "锰门", + "tile.modernmetals.manganese_ore": "锰矿石", + "block.modernmetals.manganese_ore": "锰矿石", + "tile.modernmetals.manganese_plate": "锰板", + "block.modernmetals.manganese_plate": "锰板", + "tile.modernmetals.manganese_trapdoor": "锰活板门", + "block.modernmetals.manganese_trapdoor": "锰活板门", + "tile.modernmetals.nichrome_bars": "镍铬合金栏杆", + "block.modernmetals.nichrome_bars": "镍铬合金栏杆", + "tile.modernmetals.nichrome_block": "镍铬合金块", + "block.modernmetals.nichrome_block": "镍铬合金块", + "tile.modernmetals.nichrome_door": "镍铬合金门", + "block.modernmetals.nichrome_door": "镍铬合金门", + "tile.modernmetals.nichrome_ore": "镍铬合金矿石", + "block.modernmetals.nichrome_ore": "镍铬合金矿石", + "tile.modernmetals.nichrome_plate": "镍铬合金板", + "block.modernmetals.nichrome_plate": "镍铬合金板", + "tile.modernmetals.nichrome_trapdoor": "镍铬合金活板门", + "block.modernmetals.nichrome_trapdoor": "镍铬合金活板门", + "tile.modernmetals.osmium_bars": "锇栏杆", + "block.modernmetals.osmium_bars": "锇栏杆", + "tile.modernmetals.osmium_block": "锇块", + "block.modernmetals.osmium_block": "锇块", + "tile.modernmetals.osmium_door": "锇门", + "block.modernmetals.osmium_door": "锇门", + "tile.modernmetals.osmium_ore": "锇矿石", + "block.modernmetals.osmium_ore": "锇矿石", + "tile.modernmetals.osmium_plate": "锇板", + "block.modernmetals.osmium_plate": "锇板", + "tile.modernmetals.osmium_trapdoor": "锇活板门", + "block.modernmetals.osmium_trapdoor": "锇活板门", + "tile.modernmetals.plutonium_bars": "钚栏杆", + "block.modernmetals.plutonium_bars": "钚栏杆", + "tile.modernmetals.plutonium_block": "钚块", + "block.modernmetals.plutonium_block": "钚块", + "tile.modernmetals.plutonium_door": "钚门", + "block.modernmetals.plutonium_door": "钚门", + "tile.modernmetals.plutonium_ore": "钚矿石", + "block.modernmetals.plutonium_ore": "钚矿石", + "tile.modernmetals.plutonium_plate": "钚板", + "block.modernmetals.plutonium_plate": "钚板", + "tile.modernmetals.plutonium_trapdoor": "钚活板门", + "block.modernmetals.plutonium_trapdoor": "钚活板门", + "tile.modernmetals.rutile_bars": "金红石栏杆", + "block.modernmetals.rutile_bars": "金红石栏杆", + "tile.modernmetals.rutile_block": "金红石块", + "block.modernmetals.rutile_block": "金红石块", + "tile.modernmetals.rutile_door": "金红石门", + "block.modernmetals.rutile_door": "金红石门", + "tile.modernmetals.rutile_ore": "金红石矿石", + "block.modernmetals.rutile_ore": "金红石矿石", + "tile.modernmetals.rutile_plate": "金红石板", + "block.modernmetals.rutile_plate": "金红石板", + "tile.modernmetals.rutile_trapdoor": "金红石活板门", + "block.modernmetals.rutile_trapdoor": "金红石活板门", + "tile.modernmetals.stainlesssteel_bars": "不锈钢栏杆", + "block.modernmetals.stainlesssteel_bars": "不锈钢栏杆", + "tile.modernmetals.stainlesssteel_block": "不锈钢块", + "block.modernmetals.stainlesssteel_block": "不锈钢块", + "tile.modernmetals.stainlesssteel_door": "不锈钢门", + "block.modernmetals.stainlesssteel_door": "不锈钢门", + "tile.modernmetals.stainlesssteel_ore": "不锈钢矿石", + "block.modernmetals.stainlesssteel_ore": "不锈钢矿石", + "tile.modernmetals.stainlesssteel_plate": "不锈钢板", + "block.modernmetals.stainlesssteel_plate": "不锈钢板", + "tile.modernmetals.stainlesssteel_trapdoor": "不锈钢活板门", + "block.modernmetals.stainlesssteel_trapdoor": "不锈钢活板门", + "tile.modernmetals.tantalum_bars": "钽栏杆", + "block.modernmetals.tantalum_bars": "钽栏杆", + "tile.modernmetals.tantalum_block": "钽块", + "block.modernmetals.tantalum_block": "钽块", + "tile.modernmetals.tantalum_door": "钽门", + "block.modernmetals.tantalum_door": "钽门", + "tile.modernmetals.tantalum_ore": "钽矿石", + "block.modernmetals.tantalum_ore": "钽矿石", + "tile.modernmetals.tantalum_plate": "钽板", + "block.modernmetals.tantalum_plate": "钽板", + "tile.modernmetals.tantalum_trapdoor": "钽活板门", + "block.modernmetals.tantalum_trapdoor": "钽活板门", + "tile.modernmetals.titanium_bars": "钛栏杆", + "block.modernmetals.titanium_bars": "钛栏杆", + "tile.modernmetals.titanium_block": "钛块", + "block.modernmetals.titanium_block": "钛块", + "tile.modernmetals.titanium_door": "钛门", + "block.modernmetals.titanium_door": "钛门", + "tile.modernmetals.titanium_ore": "钛矿石", + "block.modernmetals.titanium_ore": "钛矿石", + "tile.modernmetals.titanium_plate": "钛板", + "block.modernmetals.titanium_plate": "钛板", + "tile.modernmetals.titanium_trapdoor": "钛活板门", + "block.modernmetals.titanium_trapdoor": "钛活板门", + "tile.modernmetals.tungsten_bars": "钨栏杆", + "block.modernmetals.tungsten_bars": "钨栏杆", + "tile.modernmetals.tungsten_block": "钨块", + "block.modernmetals.tungsten_block": "钨块", + "tile.modernmetals.tungsten_door": "钨门", + "block.modernmetals.tungsten_door": "钨门", + "tile.modernmetals.tungsten_ore": "钨矿石", + "block.modernmetals.tungsten_ore": "钨矿石", + "tile.modernmetals.tungsten_plate": "钨板", + "block.modernmetals.tungsten_plate": "钨板", + "tile.modernmetals.tungsten_trapdoor": "钨活板门", + "block.modernmetals.tungsten_trapdoor": "钨活板门", + "tile.modernmetals.uranium_bars": "铀栏杆", + "block.modernmetals.uranium_bars": "铀栏杆", + "tile.modernmetals.uranium_block": "铀块", + "block.modernmetals.uranium_block": "铀块", + "tile.modernmetals.uranium_door": "铀门", + "block.modernmetals.uranium_door": "铀门", + "tile.modernmetals.uranium_ore": "铀矿石", + "block.modernmetals.uranium_ore": "铀矿石", + "tile.modernmetals.uranium_plate": "铀板", + "block.modernmetals.uranium_plate": "铀板", + "tile.modernmetals.uranium_trapdoor": "铀活板门", + "block.modernmetals.uranium_trapdoor": "铀活板门", + "tile.modernmetals.zirconium_bars": "锆栏杆", + "block.modernmetals.zirconium_bars": "锆栏杆", + "tile.modernmetals.zirconium_block": "锆块", + "block.modernmetals.zirconium_block": "锆块", + "tile.modernmetals.zirconium_door": "锆门", + "block.modernmetals.zirconium_door": "锆门", + "tile.modernmetals.zirconium_ore": "锆矿石", + "block.modernmetals.zirconium_ore": "锆矿石", + "tile.modernmetals.zirconium_plate": "锆板", + "block.modernmetals.zirconium_plate": "锆板", + "tile.modernmetals.zirconium_trapdoor": "锆活板门", + "block.modernmetals.zirconium_trapdoor": "锆活板门", + "tooltip.aluminum.tool": "没什么特殊之处", + "tooltip.aluminumbrass.tool": "没什么特殊之处", + "tooltip.cadmium.tool": "没什么特殊之处", + "tooltip.chromium.tool": "没什么特殊之处", + "tooltip.galvanized_steel.tool": "没什么特殊之处", + "tooltip.iridium.tool": "没什么特殊之处", + "tooltip.magnesium.tool": "没什么特殊之处", + "tooltip.manganese.tool": "没什么特殊之处", + "tooltip.nichrome.tool": "没什么特殊之处", + "tooltip.osmium.tool": "没什么特殊之处", + "tooltip.plutonium.tool": "没什么特殊之处", + "tooltip.rutile.tool": "没什么特殊之处", + "tooltip.stainless_steel.tool": "没什么特殊之处", + "tooltip.tantalum.tool": "没什么特殊之处", + "tooltip.titanium.tool": "没什么特殊之处", + "tooltip.tungsten.tool": "没什么特殊之处", + "tooltip.uranium.tool": "没什么特殊之处", + "tooltip.zirconium.tool": "没什么特殊之处", + "tooltip.aluminum.armor": "没什么特殊之处", + "tooltip.aluminumbrass.armor": "没什么特殊之处", + "tooltip.cadmium.armor": "没什么特殊之处", + "tooltip.chromium.armor": "没什么特殊之处", + "tooltip.galvanized_steel.armor": "没什么特殊之处", + "tooltip.iridium.armor": "没什么特殊之处", + "tooltip.magnesium.armor": "没什么特殊之处", + "tooltip.manganese.armor": "没什么特殊之处", + "tooltip.nichrome.armor": "没什么特殊之处", + "tooltip.osmium.armor": "没什么特殊之处", + "tooltip.plutonium.armor": "没什么特殊之处", + "tooltip.rutile.armor": "没什么特殊之处", + "tooltip.stainless_steel.armor": "没什么特殊之处", + "tooltip.tantalum.armor": "没什么特殊之处", + "tooltip.titanium.armor": "没什么特殊之处", + "tooltip.tungsten.armor": "没什么特殊之处", + "tooltip.uranium.armor": "没什么特殊之处", + "tooltip.zirconium.armor": "没什么特殊之处", + "achievement.aluminumbrass_maker": "铝黄铜", + "achievement.galvanized_steel_maker": "镀锌钢", + "achievement.nichrome_maker": "镍铬合金", + "achievement.stainless_steel_maker": "不锈钢", + "achievement.titanium_maker": "钛", + "achievement.aluminumbrass_maker.desc": "混合铝粉和黄铜粉，并烧制铝黄铜", + "achievement.galvanized_steel_maker.desc": "混合钢粉和锌粉，并烧制镀锌钢", + "achievement.nichrome_maker.desc": "混合镍粉和铬粉,并烧制镍铬合金", + "achievement.stainless_steel_maker.desc": "混合钢粉和铬粉，并烧制不锈钢", + "achievement.titanium_maker.desc": "混合金红石粉和镁粉，并烧制钛", + "fluid.modernmetals.aluminum": "熔融铝", + "fluid.modernmetals.aluminumbrass": "熔融铝黄铜", + "fluid.modernmetals.boron": "熔融硼", + "fluid.modernmetals.beryllium": "熔融铍", + "fluid.modernmetals.cadmium": "熔融镉", + "fluid.modernmetals.chromium": "熔融铬", + "fluid.modernmetals.galvanizedsteel": "熔融镀锌钢", + "fluid.modernmetals.iridium": "熔融铱", + "fluid.modernmetals.magnesium": "熔融镁", + "fluid.modernmetals.manganese": "熔融锰", + "fluid.modernmetals.nichrome": "熔融镍铬合金", + "fluid.modernmetals.osmium": "熔融锇", + "fluid.modernmetals.plutonium": "熔融钚", + "fluid.modernmetals.rutile": "熔融金红石", + "fluid.modernmetals.stainlesssteel": "熔融不锈钢", + "fluid.modernmetals.tantalum": "熔融钽", + "fluid.modernmetals.titanium": "熔融钛", + "fluid.modernmetals.tungsten": "熔融钨", + "fluid.modernmetals.uranium": "熔融铀", + "fluid.modernmetals.zirconium": "熔融锆", + "tile.modernmetals.aluminum": "熔融铝", + "block.modernmetals.aluminum": "熔融铝", + "tile.modernmetals.aluminumbrass": "熔融铝黄铜", + "block.modernmetals.aluminumbrass": "熔融铝黄铜", + "tile.modernmetals.boron": "熔融硼", + "block.modernmetals.boron": "熔融硼", + "tile.modernmetals.cadmium": "熔融镉", + "block.modernmetals.cadmium": "熔融镉", + "tile.modernmetals.chromium": "熔融铬", + "block.modernmetals.chromium": "熔融铬", + "tile.modernmetals.galvanizedsteel": "熔融镀锌钢", + "block.modernmetals.galvanizedsteel": "熔融镀锌钢", + "tile.modernmetals.iridium": "熔融铱", + "block.modernmetals.iridium": "熔融铱", + "tile.modernmetals.magnesium": "熔融镁", + "block.modernmetals.magnesium": "熔融镁", + "tile.modernmetals.manganese": "熔融锰", + "block.modernmetals.manganese": "熔融锰", + "tile.modernmetals.nichrome": "熔融镍铬合金", + "block.modernmetals.nichrome": "熔融镍铬合金", + "tile.modernmetals.osmium": "熔融锇", + "block.modernmetals.osmium": "熔融锇", + "tile.modernmetals.plutonium": "熔融钚", + "block.modernmetals.plutonium": "熔融钚", + "tile.modernmetals.rutile": "熔融金红石", + "block.modernmetals.rutile": "熔融金红石", + "tile.modernmetals.stainlesssteel": "熔融不锈钢", + "block.modernmetals.stainlesssteel": "熔融不锈钢", + "tile.modernmetals.tantalum": "熔融钽", + "block.modernmetals.tantalum": "熔融钽", + "tile.modernmetals.titanium": "熔融钛", + "block.modernmetals.titanium": "熔融钛", + "tile.modernmetals.tungsten": "熔融钨", + "block.modernmetals.tungsten": "熔融钨", + "tile.modernmetals.uranium": "熔融铀", + "block.modernmetals.uranium": "熔融铀", + "tile.modernmetals.zirconium": "熔融锆", + "block.modernmetals.zirconium": "熔融锆", + "item.modernmetals.aluminum_clump": "铝簇", + "item.modernmetals.aluminum_crushed": "破碎铝矿石", + "item.modernmetals.aluminum_crushed_purified": "纯净破碎铝矿石", + "item.modernmetals.aluminum_crystal": "铝晶体", + "item.modernmetals.aluminum_dense_plate": "致密铝板", + "item.modernmetals.aluminum_powder_dirty": "脏铝粉", + "item.modernmetals.aluminum_shard": "铝碎片", + "item.modernmetals.aluminum_button": "铝按钮", + "item.modernmetals.aluminum_lever": "铝拉杆", + "item.modernmetals.aluminum_pressure_plate": "铝压力板", + "item.modernmetals.aluminum_slab": "铝台阶", + "item.modernmetals.aluminum_stairs": "铝楼梯", + "item.modernmetals.aluminum_wall": "铝墙", + "tile.modernmetals.aluminum_button": "铝按钮", + "block.modernmetals.aluminum_button": "铝按钮", + "tile.modernmetals.aluminum_lever": "铝拉杆", + "block.modernmetals.aluminum_lever": "铝拉杆", + "tile.modernmetals.aluminum_pressure_plate": "铝压力板", + "block.modernmetals.aluminum_pressure_plate": "铝压力板", + "tile.modernmetals.aluminum_slab": "铝台阶", + "block.modernmetals.aluminum_slab": "铝台阶", + "tile.modernmetals.aluminum_stairs": "铝楼梯", + "block.modernmetals.aluminum_stairs": "铝楼梯", + "tile.modernmetals.aluminum_wall": "铝墙", + "block.modernmetals.aluminum_wall": "铝墙", + "item.modernmetals.aluminumbrass_clump": "铝黄铜簇", + "item.modernmetals.aluminumbrass_crushed": "破碎铝黄铜矿石", + "item.modernmetals.aluminumbrass_crushed_purified": "纯净破碎铝黄铜矿石", + "item.modernmetals.aluminumbrass_crystal": "铝黄铜晶体", + "item.modernmetals.aluminumbrass_dense_plate": "致密铝黄铜板", + "item.modernmetals.aluminumbrass_powder_dirty": "脏铝黄铜粉", + "item.modernmetals.aluminumbrass_shard": "铝黄铜碎片", + "item.modernmetals.aluminumbrass_button": "铝黄铜按钮", + "item.modernmetals.aluminumbrass_lever": "铝黄铜拉杆", + "item.modernmetals.aluminumbrass_pressure_plate": "铝黄铜压力板", + "item.modernmetals.aluminumbrass_slab": "铝黄铜台阶", + "item.modernmetals.aluminumbrass_stairs": "铝黄铜楼梯", + "item.modernmetals.aluminumbrass_wall": "铝黄铜墙", + "tile.modernmetals.aluminumbrass_button": "铝黄铜按钮", + "block.modernmetals.aluminumbrass_button": "铝黄铜按钮", + "tile.modernmetals.aluminumbrass_lever": "铝黄铜拉杆", + "block.modernmetals.aluminumbrass_lever": "铝黄铜拉杆", + "tile.modernmetals.aluminumbrass_pressure_plate": "铝黄铜压力板", + "block.modernmetals.aluminumbrass_pressure_plate": "铝黄铜压力板", + "tile.modernmetals.aluminumbrass_slab": "铝黄铜台阶", + "block.modernmetals.aluminumbrass_slab": "铝黄铜台阶", + "tile.modernmetals.aluminumbrass_stairs": "铝黄铜楼梯", + "block.modernmetals.aluminumbrass_stairs": "铝黄铜楼梯", + "tile.modernmetals.aluminumbrass_wall": "铝黄铜墙", + "block.modernmetals.aluminumbrass_wall": "铝黄铜墙", + "tile.modernmetals.beryllium_bars": "铍栏杆", + "block.modernmetals.beryllium_bars": "铍栏杆", + "tile.modernmetals.beryllium_block": "Blockof铍", + "block.modernmetals.beryllium_block": "Blockof铍", + "tile.modernmetals.beryllium_door": "铍门", + "block.modernmetals.beryllium_door": "铍门", + "tile.modernmetals.beryllium_ore": "铍矿石", + "block.modernmetals.beryllium_ore": "铍矿石", + "tile.modernmetals.beryllium_plate": "铍板", + "block.modernmetals.beryllium_plate": "铍板", + "tile.modernmetals.beryllium_trapdoor": "铍活板门", + "block.modernmetals.beryllium_trapdoor": "铍活板门", + "item.modernmetals.beryllium_clump": "铍簇", + "item.modernmetals.beryllium_crushed": "破碎铍矿石", + "item.modernmetals.beryllium_crushed_purified": "纯净破碎铍矿石", + "item.modernmetals.beryllium_crystal": "铍晶体", + "item.modernmetals.beryllium_dense_plate": "致密铍板", + "item.modernmetals.beryllium_powder_dirty": "脏铍粉", + "item.modernmetals.beryllium_shard": "铍碎片", + "item.modernmetals.beryllium_button": "铍按钮", + "item.modernmetals.beryllium_lever": "铍拉杆", + "item.modernmetals.beryllium_pressure_plate": "铍压力板", + "item.modernmetals.beryllium_slab": "铍台阶", + "item.modernmetals.beryllium_stairs": "铍楼梯", + "item.modernmetals.beryllium_wall": "铍墙", + "tile.modernmetals.beryllium": "熔融铍", + "block.modernmetals.beryllium": "熔融铍", + "tile.modernmetals.beryllium_button": "铍按钮", + "block.modernmetals.beryllium_button": "铍按钮", + "tile.modernmetals.beryllium_lever": "铍拉杆", + "block.modernmetals.beryllium_lever": "铍拉杆", + "tile.modernmetals.beryllium_pressure_plate": "铍压力板", + "block.modernmetals.beryllium_pressure_plate": "铍压力板", + "tile.modernmetals.beryllium_slab": "铍台阶", + "block.modernmetals.beryllium_slab": "铍台阶", + "tile.modernmetals.beryllium_stairs": "铍楼梯", + "block.modernmetals.beryllium_stairs": "铍楼梯", + "tile.modernmetals.beryllium_wall": "铍墙", + "block.modernmetals.beryllium_wall": "铍墙", + "item.modernmetals.boron_clump": "硼簇", + "item.modernmetals.boron_crushed": "破碎硼矿石", + "item.modernmetals.boron_crushed_purified": "纯净破碎硼矿石", + "item.modernmetals.boron_crystal": "硼晶体", + "item.modernmetals.boron_dense_plate": "致密硼板", + "item.modernmetals.boron_powder_dirty": "脏硼粉", + "item.modernmetals.boron_shard": "硼碎片", + "item.modernmetals.boron_button": "硼按钮", + "item.modernmetals.boron_lever": "硼拉杆", + "item.modernmetals.boron_pressure_plate": "硼压力板", + "item.modernmetals.boron_slab": "硼台阶", + "item.modernmetals.boron_stairs": "硼楼梯", + "item.modernmetals.boron_wall": "硼墙", + "tile.modernmetals.boron_button": "硼按钮", + "block.modernmetals.boron_button": "硼按钮", + "tile.modernmetals.boron_lever": "硼拉杆", + "block.modernmetals.boron_lever": "硼拉杆", + "tile.modernmetals.boron_pressure_plate": "硼压力板", + "block.modernmetals.boron_pressure_plate": "硼压力板", + "tile.modernmetals.boron_slab": "硼台阶", + "block.modernmetals.boron_slab": "硼台阶", + "tile.modernmetals.boron_stairs": "硼楼梯", + "block.modernmetals.boron_stairs": "硼楼梯", + "tile.modernmetals.boron_wall": "硼墙", + "block.modernmetals.boron_wall": "硼墙", + "item.modernmetals.cadmium_clump": "镉簇", + "item.modernmetals.cadmium_crushed": "破碎镉矿石", + "item.modernmetals.cadmium_crushed_purified": "纯净破碎镉矿石", + "item.modernmetals.cadmium_crystal": "镉晶体", + "item.modernmetals.cadmium_dense_plate": "致密镉板", + "item.modernmetals.cadmium_powder_dirty": "脏镉粉", + "item.modernmetals.cadmium_shard": "镉碎片", + "item.modernmetals.cadmium_button": "镉按钮", + "item.modernmetals.cadmium_lever": "镉拉杆", + "item.modernmetals.cadmium_pressure_plate": "镉压力板", + "item.modernmetals.cadmium_slab": "镉台阶", + "item.modernmetals.cadmium_stairs": "镉楼梯", + "item.modernmetals.cadmium_wall": "镉墙", + "tile.modernmetals.cadmium_button": "镉按钮", + "block.modernmetals.cadmium_button": "镉按钮", + "tile.modernmetals.cadmium_lever": "镉拉杆", + "block.modernmetals.cadmium_lever": "镉拉杆", + "tile.modernmetals.cadmium_pressure_plate": "镉压力板", + "block.modernmetals.cadmium_pressure_plate": "镉压力板", + "tile.modernmetals.cadmium_slab": "镉台阶", + "block.modernmetals.cadmium_slab": "镉台阶", + "tile.modernmetals.cadmium_stairs": "镉楼梯", + "block.modernmetals.cadmium_stairs": "镉楼梯", + "tile.modernmetals.cadmium_wall": "镉墙", + "block.modernmetals.cadmium_wall": "镉墙", + "item.modernmetals.chromium_clump": "铬簇", + "item.modernmetals.chromium_crushed": "破碎铬矿石", + "item.modernmetals.chromium_crushed_purified": "纯净破碎铬矿石", + "item.modernmetals.chromium_crystal": "铬晶体", + "item.modernmetals.chromium_dense_plate": "致密铬板", + "item.modernmetals.chromium_powder_dirty": "脏铬粉", + "item.modernmetals.chromium_shard": "铬碎片", + "item.modernmetals.chromium_button": "铬按钮", + "item.modernmetals.chromium_lever": "铬拉杆", + "item.modernmetals.chromium_pressure_plate": "铬压力板", + "item.modernmetals.chromium_slab": "铬台阶", + "item.modernmetals.chromium_stairs": "铬楼梯", + "item.modernmetals.chromium_wall": "铬墙", + "tile.modernmetals.chromium_button": "铬按钮", + "block.modernmetals.chromium_button": "铬按钮", + "tile.modernmetals.chromium_lever": "铬拉杆", + "block.modernmetals.chromium_lever": "铬拉杆", + "tile.modernmetals.chromium_pressure_plate": "铬压力板", + "block.modernmetals.chromium_pressure_plate": "铬压力板", + "tile.modernmetals.chromium_slab": "铬台阶", + "block.modernmetals.chromium_slab": "铬台阶", + "tile.modernmetals.chromium_stairs": "铬楼梯", + "block.modernmetals.chromium_stairs": "铬楼梯", + "tile.modernmetals.chromium_wall": "铬墙", + "block.modernmetals.chromium_wall": "铬墙", + "item.modernmetals.galvanizedsteel_clump": "镀锌钢簇", + "item.modernmetals.galvanizedsteel_crushed": "破碎镀锌钢矿石", + "item.modernmetals.galvanizedsteel_crushed_purified": "纯净破碎镀锌钢矿石", + "item.modernmetals.galvanizedsteel_crystal": "镀锌钢晶体", + "item.modernmetals.galvanizedsteel_dense_plate": "致密镀锌钢板", + "item.modernmetals.galvanizedsteel_powder_dirty": "脏镀锌钢粉", + "item.modernmetals.galvanizedsteel_shard": "镀锌钢碎片", + "item.modernmetals.galvanizedsteel_button": "镀锌钢按钮", + "item.modernmetals.galvanizedsteel_lever": "镀锌钢拉杆", + "item.modernmetals.galvanizedsteel_pressure_plate": "镀锌钢压力板", + "item.modernmetals.galvanizedsteel_slab": "镀锌钢台阶", + "item.modernmetals.galvanizedsteel_stairs": "镀锌钢楼梯", + "item.modernmetals.galvanizedsteel_wall": "镀锌钢墙", + "tile.modernmetals.galvanizedsteel_button": "镀锌钢按钮", + "block.modernmetals.galvanizedsteel_button": "镀锌钢按钮", + "tile.modernmetals.galvanizedsteel_lever": "镀锌钢拉杆", + "block.modernmetals.galvanizedsteel_lever": "镀锌钢拉杆", + "tile.modernmetals.galvanizedsteel_pressure_plate": "镀锌钢压力板", + "block.modernmetals.galvanizedsteel_pressure_plate": "镀锌钢压力板", + "tile.modernmetals.galvanizedsteel_slab": "镀锌钢台阶", + "block.modernmetals.galvanizedsteel_slab": "镀锌钢台阶", + "tile.modernmetals.galvanizedsteel_stairs": "镀锌钢楼梯", + "block.modernmetals.galvanizedsteel_stairs": "镀锌钢楼梯", + "tile.modernmetals.galvanizedsteel_wall": "镀锌钢墙", + "block.modernmetals.galvanizedsteel_wall": "镀锌钢墙", + "item.modernmetals.iridium_clump": "铱簇", + "item.modernmetals.iridium_crushed": "破碎铱矿石", + "item.modernmetals.iridium_crushed_purified": "纯净破碎铱矿石", + "item.modernmetals.iridium_crystal": "铱晶体", + "item.modernmetals.iridium_dense_plate": "致密铱板", + "item.modernmetals.iridium_powder_dirty": "脏铱粉", + "item.modernmetals.iridium_shard": "铱碎片", + "item.modernmetals.iridium_button": "铱按钮", + "item.modernmetals.iridium_lever": "铱拉杆", + "item.modernmetals.iridium_pressure_plate": "铱压力板", + "item.modernmetals.iridium_slab": "铱台阶", + "item.modernmetals.iridium_stairs": "铱楼梯", + "item.modernmetals.iridium_wall": "铱墙", + "tile.modernmetals.iridium_button": "铱按钮", + "block.modernmetals.iridium_button": "铱按钮", + "tile.modernmetals.iridium_lever": "铱拉杆", + "block.modernmetals.iridium_lever": "铱拉杆", + "tile.modernmetals.iridium_pressure_plate": "铱压力板", + "block.modernmetals.iridium_pressure_plate": "铱压力板", + "tile.modernmetals.iridium_slab": "铱台阶", + "block.modernmetals.iridium_slab": "铱台阶", + "tile.modernmetals.iridium_stairs": "铱楼梯", + "block.modernmetals.iridium_stairs": "铱楼梯", + "tile.modernmetals.iridium_wall": "铱墙", + "block.modernmetals.iridium_wall": "铱墙", + "item.modernmetals.magnesium_clump": "镁簇", + "item.modernmetals.magnesium_crushed": "破碎镁矿石", + "item.modernmetals.magnesium_crushed_purified": "纯净破碎镁矿石", + "item.modernmetals.magnesium_crystal": "镁晶体", + "item.modernmetals.magnesium_dense_plate": "致密镁板", + "item.modernmetals.magnesium_powder_dirty": "脏镁粉", + "item.modernmetals.magnesium_shard": "镁碎片", + "item.modernmetals.magnesium_button": "镁按钮", + "item.modernmetals.magnesium_lever": "镁拉杆", + "item.modernmetals.magnesium_pressure_plate": "镁压力板", + "item.modernmetals.magnesium_slab": "镁台阶", + "item.modernmetals.magnesium_stairs": "镁楼梯", + "item.modernmetals.magnesium_wall": "镁墙", + "tile.modernmetals.magnesium_button": "镁按钮", + "block.modernmetals.magnesium_button": "镁按钮", + "tile.modernmetals.magnesium_lever": "镁拉杆", + "block.modernmetals.magnesium_lever": "镁拉杆", + "tile.modernmetals.magnesium_pressure_plate": "镁压力板", + "block.modernmetals.magnesium_pressure_plate": "镁压力板", + "tile.modernmetals.magnesium_slab": "镁台阶", + "block.modernmetals.magnesium_slab": "镁台阶", + "tile.modernmetals.magnesium_stairs": "镁楼梯", + "block.modernmetals.magnesium_stairs": "镁楼梯", + "tile.modernmetals.magnesium_wall": "镁墙", + "block.modernmetals.magnesium_wall": "镁墙", + "item.modernmetals.manganese_clump": "锰簇", + "item.modernmetals.manganese_crushed": "破碎锰矿石", + "item.modernmetals.manganese_crushed_purified": "纯净破碎锰矿石", + "item.modernmetals.manganese_crystal": "锰晶体", + "item.modernmetals.manganese_dense_plate": "致密锰板", + "item.modernmetals.manganese_powder_dirty": "脏锰粉", + "item.modernmetals.manganese_shard": "锰碎片", + "item.modernmetals.manganese_button": "锰按钮", + "item.modernmetals.manganese_lever": "锰拉杆", + "item.modernmetals.manganese_pressure_plate": "锰压力板", + "item.modernmetals.manganese_slab": "锰台阶", + "item.modernmetals.manganese_stairs": "锰楼梯", + "item.modernmetals.manganese_wall": "锰墙", + "tile.modernmetals.manganese_button": "锰按钮", + "block.modernmetals.manganese_button": "锰按钮", + "tile.modernmetals.manganese_lever": "锰拉杆", + "block.modernmetals.manganese_lever": "锰拉杆", + "tile.modernmetals.manganese_pressure_plate": "锰压力板", + "block.modernmetals.manganese_pressure_plate": "锰压力板", + "tile.modernmetals.manganese_slab": "锰台阶", + "block.modernmetals.manganese_slab": "锰台阶", + "tile.modernmetals.manganese_stairs": "锰楼梯", + "block.modernmetals.manganese_stairs": "锰楼梯", + "tile.modernmetals.manganese_wall": "锰墙", + "block.modernmetals.manganese_wall": "锰墙", + "item.modernmetals.nichrome_clump": "镍铬合金簇", + "item.modernmetals.nichrome_crushed": "破碎镍铬合金矿石", + "item.modernmetals.nichrome_crushed_purified": "纯净破碎镍铬合金矿石", + "item.modernmetals.nichrome_crystal": "镍铬合金晶体", + "item.modernmetals.nichrome_dense_plate": "致密镍铬合金板", + "item.modernmetals.nichrome_powder_dirty": "脏镍铬合金粉", + "item.modernmetals.nichrome_shard": "镍铬合金碎片", + "item.modernmetals.nichrome_button": "镍铬合金按钮", + "item.modernmetals.nichrome_lever": "镍铬合金拉杆", + "item.modernmetals.nichrome_pressure_plate": "镍铬合金压力板", + "item.modernmetals.nichrome_slab": "镍铬合金台阶", + "item.modernmetals.nichrome_stairs": "镍铬合金楼梯", + "item.modernmetals.nichrome_wall": "镍铬合金墙", + "tile.modernmetals.nichrome_button": "镍铬合金按钮", + "block.modernmetals.nichrome_button": "镍铬合金按钮", + "tile.modernmetals.nichrome_lever": "镍铬合金拉杆", + "block.modernmetals.nichrome_lever": "镍铬合金拉杆", + "tile.modernmetals.nichrome_pressure_plate": "镍铬合金压力板", + "block.modernmetals.nichrome_pressure_plate": "镍铬合金压力板", + "tile.modernmetals.nichrome_slab": "镍铬合金台阶", + "block.modernmetals.nichrome_slab": "镍铬合金台阶", + "tile.modernmetals.nichrome_stairs": "镍铬合金楼梯", + "block.modernmetals.nichrome_stairs": "镍铬合金楼梯", + "tile.modernmetals.nichrome_wall": "镍铬合金墙", + "block.modernmetals.nichrome_wall": "镍铬合金墙", + "item.modernmetals.osmium_clump": "锇簇", + "item.modernmetals.osmium_crushed": "破碎锇矿石", + "item.modernmetals.osmium_crushed_purified": "纯净破碎锇矿石", + "item.modernmetals.osmium_crystal": "锇晶体", + "item.modernmetals.osmium_dense_plate": "致密锇板", + "item.modernmetals.osmium_powder_dirty": "脏锇粉", + "item.modernmetals.osmium_shard": "锇碎片", + "item.modernmetals.osmium_button": "锇按钮", + "item.modernmetals.osmium_lever": "锇拉杆", + "item.modernmetals.osmium_pressure_plate": "锇压力板", + "item.modernmetals.osmium_slab": "锇台阶", + "item.modernmetals.osmium_stairs": "锇楼梯", + "item.modernmetals.osmium_wall": "锇墙", + "tile.modernmetals.osmium_button": "锇按钮", + "block.modernmetals.osmium_button": "锇按钮", + "tile.modernmetals.osmium_lever": "锇拉杆", + "block.modernmetals.osmium_lever": "锇拉杆", + "tile.modernmetals.osmium_pressure_plate": "锇压力板", + "block.modernmetals.osmium_pressure_plate": "锇压力板", + "tile.modernmetals.osmium_slab": "锇台阶", + "block.modernmetals.osmium_slab": "锇台阶", + "tile.modernmetals.osmium_stairs": "锇楼梯", + "block.modernmetals.osmium_stairs": "锇楼梯", + "tile.modernmetals.osmium_wall": "锇墙", + "block.modernmetals.osmium_wall": "锇墙", + "item.modernmetals.plutonium_clump": "钚簇", + "item.modernmetals.plutonium_crushed": "破碎钚矿石", + "item.modernmetals.plutonium_crushed_purified": "纯净破碎钚矿石", + "item.modernmetals.plutonium_crystal": "钚晶体", + "item.modernmetals.plutonium_dense_plate": "致密钚板", + "item.modernmetals.plutonium_powder_dirty": "脏钚粉", + "item.modernmetals.plutonium_shard": "钚碎片", + "item.modernmetals.plutonium_button": "钚按钮", + "item.modernmetals.plutonium_lever": "钚拉杆", + "item.modernmetals.plutonium_pressure_plate": "钚压力板", + "item.modernmetals.plutonium_slab": "钚台阶", + "item.modernmetals.plutonium_stairs": "钚楼梯", + "item.modernmetals.plutonium_wall": "钚墙", + "tile.modernmetals.plutonium_button": "钚按钮", + "block.modernmetals.plutonium_button": "钚按钮", + "tile.modernmetals.plutonium_lever": "钚拉杆", + "block.modernmetals.plutonium_lever": "钚拉杆", + "tile.modernmetals.plutonium_pressure_plate": "钚压力板", + "block.modernmetals.plutonium_pressure_plate": "钚压力板", + "tile.modernmetals.plutonium_slab": "钚台阶", + "block.modernmetals.plutonium_slab": "钚台阶", + "tile.modernmetals.plutonium_stairs": "钚楼梯", + "block.modernmetals.plutonium_stairs": "钚楼梯", + "tile.modernmetals.plutonium_wall": "钚墙", + "block.modernmetals.plutonium_wall": "钚墙", + "item.modernmetals.rutile_clump": "金红石簇", + "item.modernmetals.rutile_crushed": "破碎金红石矿石", + "item.modernmetals.rutile_crushed_purified": "纯净破碎金红石矿石", + "item.modernmetals.rutile_crystal": "金红石晶体", + "item.modernmetals.rutile_dense_plate": "致密金红石板", + "item.modernmetals.rutile_powder_dirty": "脏金红石粉", + "item.modernmetals.rutile_shard": "金红石碎片", + "item.modernmetals.rutile_button": "金红石按钮", + "item.modernmetals.rutile_lever": "金红石拉杆", + "item.modernmetals.rutile_pressure_plate": "金红石压力板", + "item.modernmetals.rutile_slab": "金红石台阶", + "item.modernmetals.rutile_stairs": "金红石楼梯", + "item.modernmetals.rutile_wall": "金红石墙", + "tile.modernmetals.rutile_button": "金红石按钮", + "block.modernmetals.rutile_button": "金红石按钮", + "tile.modernmetals.rutile_lever": "金红石拉杆", + "block.modernmetals.rutile_lever": "金红石拉杆", + "tile.modernmetals.rutile_pressure_plate": "金红石压力板", + "block.modernmetals.rutile_pressure_plate": "金红石压力板", + "tile.modernmetals.rutile_slab": "金红石台阶", + "block.modernmetals.rutile_slab": "金红石台阶", + "tile.modernmetals.rutile_stairs": "金红石楼梯", + "block.modernmetals.rutile_stairs": "金红石楼梯", + "tile.modernmetals.rutile_wall": "金红石墙", + "block.modernmetals.rutile_wall": "金红石墙", + "item.modernmetals.stainlesssteel_clump": "不锈钢簇", + "item.modernmetals.stainlesssteel_crushed": "破碎不锈钢矿石", + "item.modernmetals.stainlesssteel_crushed_purified": "纯净破碎不锈钢矿石", + "item.modernmetals.stainlesssteel_crystal": "不锈钢晶体", + "item.modernmetals.stainlesssteel_dense_plate": "致密不锈钢板", + "item.modernmetals.stainlesssteel_powder_dirty": "脏不锈钢粉", + "item.modernmetals.stainlesssteel_shard": "不锈钢碎片", + "item.modernmetals.stainlesssteel_button": "不锈钢按钮", + "item.modernmetals.stainlesssteel_lever": "不锈钢拉杆", + "item.modernmetals.stainlesssteel_pressure_plate": "不锈钢压力板", + "item.modernmetals.stainlesssteel_slab": "不锈钢台阶", + "item.modernmetals.stainlesssteel_stairs": "不锈钢楼梯", + "item.modernmetals.stainlesssteel_wall": "不锈钢墙", + "tile.modernmetals.stainlesssteel_button": "不锈钢按钮", + "block.modernmetals.stainlesssteel_button": "不锈钢按钮", + "tile.modernmetals.stainlesssteel_lever": "不锈钢拉杆", + "block.modernmetals.stainlesssteel_lever": "不锈钢拉杆", + "tile.modernmetals.stainlesssteel_pressure_plate": "不锈钢压力板", + "block.modernmetals.stainlesssteel_pressure_plate": "不锈钢压力板", + "tile.modernmetals.stainlesssteel_slab": "不锈钢台阶", + "block.modernmetals.stainlesssteel_slab": "不锈钢台阶", + "tile.modernmetals.stainlesssteel_stairs": "不锈钢楼梯", + "block.modernmetals.stainlesssteel_stairs": "不锈钢楼梯", + "tile.modernmetals.stainlesssteel_wall": "不锈钢墙", + "block.modernmetals.stainlesssteel_wall": "不锈钢墙", + "item.modernmetals.tantalum_clump": "钽簇", + "item.modernmetals.tantalum_crushed": "破碎钽矿石", + "item.modernmetals.tantalum_crushed_purified": "纯净破碎钽矿石", + "item.modernmetals.tantalum_crystal": "钽晶体", + "item.modernmetals.tantalum_dense_plate": "致密钽板", + "item.modernmetals.tantalum_powder_dirty": "脏钽粉", + "item.modernmetals.tantalum_shard": "钽碎片", + "item.modernmetals.tantalum_button": "钽按钮", + "item.modernmetals.tantalum_lever": "钽拉杆", + "item.modernmetals.tantalum_pressure_plate": "钽压力板", + "item.modernmetals.tantalum_slab": "钽台阶", + "item.modernmetals.tantalum_stairs": "钽楼梯", + "item.modernmetals.tantalum_wall": "钽墙", + "tile.modernmetals.tantalum_button": "钽按钮", + "block.modernmetals.tantalum_button": "钽按钮", + "tile.modernmetals.tantalum_lever": "钽拉杆", + "block.modernmetals.tantalum_lever": "钽拉杆", + "tile.modernmetals.tantalum_pressure_plate": "钽压力板", + "block.modernmetals.tantalum_pressure_plate": "钽压力板", + "tile.modernmetals.tantalum_slab": "钽台阶", + "block.modernmetals.tantalum_slab": "钽台阶", + "tile.modernmetals.tantalum_stairs": "钽楼梯", + "block.modernmetals.tantalum_stairs": "钽楼梯", + "tile.modernmetals.tantalum_wall": "钽墙", + "block.modernmetals.tantalum_wall": "钽墙", + "item.modernmetals.titanium_clump": "钛簇", + "item.modernmetals.titanium_crushed": "破碎钛矿石", + "item.modernmetals.titanium_crushed_purified": "纯净破碎钛矿石", + "item.modernmetals.titanium_crystal": "钛晶体", + "item.modernmetals.titanium_dense_plate": "致密钛板", + "item.modernmetals.titanium_powder_dirty": "脏钛粉", + "item.modernmetals.titanium_shard": "钛碎片", + "item.modernmetals.titanium_button": "钛按钮", + "item.modernmetals.titanium_lever": "钛拉杆", + "item.modernmetals.titanium_pressure_plate": "钛压力板", + "item.modernmetals.titanium_slab": "钛台阶", + "item.modernmetals.titanium_stairs": "钛楼梯", + "item.modernmetals.titanium_wall": "钛墙", + "tile.modernmetals.titanium_button": "钛按钮", + "block.modernmetals.titanium_button": "钛按钮", + "tile.modernmetals.titanium_lever": "钛拉杆", + "block.modernmetals.titanium_lever": "钛拉杆", + "tile.modernmetals.titanium_pressure_plate": "钛压力板", + "block.modernmetals.titanium_pressure_plate": "钛压力板", + "tile.modernmetals.titanium_slab": "钛台阶", + "block.modernmetals.titanium_slab": "钛台阶", + "tile.modernmetals.titanium_stairs": "钛楼梯", + "block.modernmetals.titanium_stairs": "钛楼梯", + "tile.modernmetals.titanium_wall": "钛墙", + "block.modernmetals.titanium_wall": "钛墙", + "item.modernmetals.tungsten_clump": "钨簇", + "item.modernmetals.tungsten_crushed": "破碎钨矿石", + "item.modernmetals.tungsten_crushed_purified": "纯净破碎钨矿石", + "item.modernmetals.tungsten_crystal": "钨晶体", + "item.modernmetals.tungsten_dense_plate": "致密钨板", + "item.modernmetals.tungsten_powder_dirty": "脏钨粉", + "item.modernmetals.tungsten_shard": "钨碎片", + "item.modernmetals.tungsten_button": "钨按钮", + "item.modernmetals.tungsten_lever": "钨拉杆", + "item.modernmetals.tungsten_pressure_plate": "钨压力板", + "item.modernmetals.tungsten_slab": "钨台阶", + "item.modernmetals.tungsten_stairs": "钨楼梯", + "item.modernmetals.tungsten_wall": "钨墙", + "tile.modernmetals.tungsten_button": "钨按钮", + "block.modernmetals.tungsten_button": "钨按钮", + "tile.modernmetals.tungsten_lever": "钨拉杆", + "block.modernmetals.tungsten_lever": "钨拉杆", + "tile.modernmetals.tungsten_pressure_plate": "钨压力板", + "block.modernmetals.tungsten_pressure_plate": "钨压力板", + "tile.modernmetals.tungsten_slab": "钨台阶", + "block.modernmetals.tungsten_slab": "钨台阶", + "tile.modernmetals.tungsten_stairs": "钨楼梯", + "block.modernmetals.tungsten_stairs": "钨楼梯", + "tile.modernmetals.tungsten_wall": "钨墙", + "block.modernmetals.tungsten_wall": "钨墙", + "item.modernmetals.uranium_clump": "铀簇", + "item.modernmetals.uranium_crushed": "破碎铀矿石", + "item.modernmetals.uranium_crushed_purified": "纯净破碎铀矿石", + "item.modernmetals.uranium_crystal": "铀晶体", + "item.modernmetals.uranium_dense_plate": "致密铀板", + "item.modernmetals.uranium_powder_dirty": "脏铀粉", + "item.modernmetals.uranium_shard": "铀碎片", + "item.modernmetals.uranium_button": "铀按钮", + "item.modernmetals.uranium_lever": "铀拉杆", + "item.modernmetals.uranium_pressure_plate": "铀压力板", + "item.modernmetals.uranium_slab": "铀台阶", + "item.modernmetals.uranium_stairs": "铀楼梯", + "item.modernmetals.uranium_wall": "铀墙", + "tile.modernmetals.uranium_button": "铀按钮", + "block.modernmetals.uranium_button": "铀按钮", + "tile.modernmetals.uranium_lever": "铀拉杆", + "block.modernmetals.uranium_lever": "铀拉杆", + "tile.modernmetals.uranium_pressure_plate": "铀压力板", + "block.modernmetals.uranium_pressure_plate": "铀压力板", + "tile.modernmetals.uranium_slab": "铀台阶", + "block.modernmetals.uranium_slab": "铀台阶", + "tile.modernmetals.uranium_stairs": "铀楼梯", + "block.modernmetals.uranium_stairs": "铀楼梯", + "tile.modernmetals.uranium_wall": "铀墙", + "block.modernmetals.uranium_wall": "铀墙", + "item.modernmetals.zirconium_clump": "锆簇", + "item.modernmetals.zirconium_crushed": "破碎锆矿石", + "item.modernmetals.zirconium_crushed_purified": "纯净破碎锆矿石", + "item.modernmetals.zirconium_crystal": "锆晶体", + "item.modernmetals.zirconium_dense_plate": "致密锆板", + "item.modernmetals.zirconium_powder_dirty": "脏锆粉", + "item.modernmetals.zirconium_shard": "锆碎片", + "item.modernmetals.zirconium_button": "锆按钮", + "item.modernmetals.zirconium_lever": "锆拉杆", + "item.modernmetals.zirconium_pressure_plate": "锆压力板", + "item.modernmetals.zirconium_slab": "锆台阶", + "item.modernmetals.zirconium_stairs": "锆楼梯", + "item.modernmetals.zirconium_wall": "锆墙", + "tile.modernmetals.zirconium_button": "锆按钮", + "block.modernmetals.zirconium_button": "锆按钮", + "tile.modernmetals.zirconium_lever": "锆拉杆", + "block.modernmetals.zirconium_lever": "锆拉杆", + "tile.modernmetals.zirconium_pressure_plate": "锆压力板", + "block.modernmetals.zirconium_pressure_plate": "锆压力板", + "tile.modernmetals.zirconium_slab": "锆台阶", + "block.modernmetals.zirconium_slab": "锆台阶", + "tile.modernmetals.zirconium_stairs": "锆楼梯", + "block.modernmetals.zirconium_stairs": "锆楼梯", + "tile.modernmetals.zirconium_wall": "锆墙", + "block.modernmetals.zirconium_wall": "锆墙", + "material.thorium": "钍", + "item.modernmetals.thorium_arrow": "钍箭", + "item.modernmetals.thorium_axe": "钍斧", + "item.modernmetals.thorium_bars": "钍栏杆", + "item.modernmetals.thorium_blend": "钍原粉", + "item.modernmetals.thorium_block": "钍块", + "item.modernmetals.thorium_boots": "钍靴子", + "item.modernmetals.thorium_bolt": "钍弩箭", + "item.modernmetals.thorium_bow": "钍弓", + "item.modernmetals.thorium_chestplate": "钍胸甲", + "item.modernmetals.thorium_crackhammer": "钍破裂锤", + "item.modernmetals.thorium_crossbow": "钍弩", + "item.modernmetals.thorium_door": "钍门", + "item.modernmetals.thorium_fishing_rod": "钍钓鱼竿", + "item.modernmetals.thorium_gear": "钍齿轮", + "item.modernmetals.thorium_helmet": "钍头盔", + "item.modernmetals.thorium_hoe": "钍锄", + "item.modernmetals.thorium_horse_armor": "钍马铠", + "item.modernmetals.thorium_ingot": "钍锭", + "item.modernmetals.thorium_leggings": "钍护腿", + "item.modernmetals.thorium_nugget": "钍粒", + "item.modernmetals.thorium_ore": "钍矿石", + "item.modernmetals.thorium_pickaxe": "钍镐", + "item.modernmetals.thorium_powder": "钍粉", + "item.modernmetals.thorium_rod": "钍棒", + "item.modernmetals.thorium_shears": "钍剪刀", + "item.modernmetals.thorium_shield": "钍盾", + "item.modernmetals.thorium_shovel": "钍铲", + "item.modernmetals.thorium_smallblend": "小堆钍原粉", + "item.modernmetals.thorium_smallpowder": "小堆钍粉", + "item.modernmetals.thorium_sword": "钍剑", + "item.modernmetals.thorium_trapdoor": "钍活板门", + "tile.modernmetals.thorium_bars": "钍栏杆", + "block.modernmetals.thorium_bars": "钍栏杆", + "tile.modernmetals.thorium_block": "钍块", + "block.modernmetals.thorium_block": "钍块", + "tile.modernmetals.thorium_door": "钍门", + "block.modernmetals.thorium_door": "钍门", + "tile.modernmetals.thorium_ore": "钍矿石", + "block.modernmetals.thorium_ore": "钍矿石", + "tile.modernmetals.thorium_plate": "钍板", + "block.modernmetals.thorium_plate": "钍板", + "tile.modernmetals.thorium_trapdoor": "钍活板门", + "block.modernmetals.thorium_trapdoor": "钍活板门", + "fluid.modernmetals.thorium": "熔融钍", + "tile.modernmetals.thorium": "熔融钍", + "block.modernmetals.thorium": "熔融钍", + "item.modernmetals.thorium_clump": "钍簇", + "item.modernmetals.thorium_crushed": "破碎钍矿石", + "item.modernmetals.thorium_crushed_purified": "纯净破碎钍矿石", + "item.modernmetals.thorium_crystal": "钍晶体", + "item.modernmetals.thorium_dense_plate": "致密钍板", + "item.modernmetals.thorium_powder_dirty": "脏钍粉", + "item.modernmetals.thorium_shard": "钍碎片", + "item.modernmetals.thorium_button": "钍按钮", + "item.modernmetals.thorium_lever": "钍拉杆", + "item.modernmetals.thorium_pressure_plate": "钍压力板", + "item.modernmetals.thorium_slab": "钍台阶", + "item.modernmetals.thorium_stairs": "钍楼梯", + "item.modernmetals.thorium_wall": "钍墙", + "tile.modernmetals.thorium_button": "钍按钮", + "block.modernmetals.thorium_button": "钍按钮", + "tile.modernmetals.thorium_lever": "钍拉杆", + "block.modernmetals.thorium_lever": "钍拉杆", + "tile.modernmetals.thorium_pressure_plate": "钍压力板", + "block.modernmetals.thorium_pressure_plate": "钍压力板", + "tile.modernmetals.thorium_slab": "钍台阶", + "block.modernmetals.thorium_slab": "钍台阶", + "tile.modernmetals.thorium_stairs": "钍楼梯", + "block.modernmetals.thorium_stairs": "钍楼梯", + "tile.modernmetals.thorium_wall": "钍墙", + "block.modernmetals.thorium_wall": "钍墙", + "config.modernmetals.material.tooltip": "控制是否启用此材料的方块、物品和配方。需要重启游戏。", + "config.modernmetals.title": "Modern Metals", + "config.modernmetals.description": "重启游戏后应用更改。请在 OreSpawn 中设置矿石生成。", + "config.modernmetals.content_mode": "奇幻等级", + "config.modernmetals.content_mode.tooltip": "高奇幻保留全部配方。低奇幻限制不符合现实的装备和建筑部件。需要重启游戏。", + "high_fantasy": "高奇幻", + "low_fantasy": "低奇幻", + "config.modernmetals.villager_trades": "村民交易", + "config.modernmetals.villager_trades.tooltip": "允许铁匠交易 Modern Metals 的金属锭和装备。需要重启游戏。", + "config.modernmetals.connection.mismatch": "服务器使用%s，你的游戏使用%s。请在模组 > Modern Metals > 配置中选择与服务器一致的奇幻等级，然后重启游戏。", + "config.modernmetals.connection.protocol": "Modern Metals 无法核对奇幻等级。请在服务器和客户端使用相同构建版本的 Modern Metals。", + "config.modernmetals.enable_thorium": "启用钍", + "config.modernmetals.enable_boron": "启用硼", + "config.modernmetals.enable_beryllium": "启用铍", + "config.modernmetals.enable_cadmium": "启用镉", + "config.modernmetals.enable_nichrome": "启用镍铬合金", + "config.modernmetals.enable_aluminum": "启用铝", + "config.modernmetals.enable_aluminumbrass": "启用铝黄铜", + "config.modernmetals.enable_chromium": "启用铬", + "config.modernmetals.enable_galvanizedsteel": "启用镀锌钢", + "config.modernmetals.enable_iridium": "启用铱", + "config.modernmetals.enable_magnesium": "启用镁", + "config.modernmetals.enable_manganese": "启用锰", + "config.modernmetals.enable_osmium": "启用锇", + "config.modernmetals.enable_plutonium": "启用钚", + "config.modernmetals.enable_rutile": "启用金红石", + "config.modernmetals.enable_stainlesssteel": "启用不锈钢", + "config.modernmetals.enable_tantalum": "启用钽", + "config.modernmetals.enable_titanium": "启用钛", + "config.modernmetals.enable_tungsten": "启用钨", + "config.modernmetals.enable_uranium": "启用铀", + "config.modernmetals.enable_zirconium": "启用锆", + "config.modernmetals.content_mode.high_fantasy": "高奇幻", + "config.modernmetals.content_mode.low_fantasy": "低奇幻", + "config.modernmetals.inherited_mode": "幻想等级由 Base Metals 设置。更改设置后请重新启动游戏。", + "itemGroup.modernmetals.combat": "Modern Metals 战斗用品", + "item.modernmetals.titanium_casing": "钛外壳", + "item.modernmetals.beryllium_scythe": "铍镰刀", + "item.modernmetals.boron_scythe": "硼镰刀", + "item.modernmetals.thorium_scythe": "钍镰刀", + "item.modernmetals.titanium_scythe": "钛镰刀" +} diff --git a/src/main/resources/assets/modernmetals/models/block/aluminum_lever.json b/src/main/resources/assets/modernmetals/models/block/aluminum_lever.json index b5475bb5..ea3530f2 100644 --- a/src/main/resources/assets/modernmetals/models/block/aluminum_lever.json +++ b/src/main/resources/assets/modernmetals/models/block/aluminum_lever.json @@ -1,33 +1,155 @@ { - "ambientocclusion": false, - "textures": { - "particle": "modernmetals:blocks/aluminum_block", - "base": "modernmetals:blocks/aluminum_block", - "lever": "blocks/lever" + "ambientocclusion": false, + "textures": { + "particle": "modernmetals:blocks/aluminum_block", + "base": "modernmetals:blocks/aluminum_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" + } + } }, - "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" } - } + { + "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/modernmetals/models/block/aluminum_lever_off.json b/src/main/resources/assets/modernmetals/models/block/aluminum_lever_off.json index 89530c38..a23253a6 100644 --- a/src/main/resources/assets/modernmetals/models/block/aluminum_lever_off.json +++ b/src/main/resources/assets/modernmetals/models/block/aluminum_lever_off.json @@ -1,33 +1,155 @@ { - "ambientocclusion": false, - "textures": { - "particle": "modernmetals:blocks/aluminum_block", - "base": "modernmetals:blocks/aluminum_block", - "lever": "blocks/lever" + "ambientocclusion": false, + "textures": { + "particle": "modernmetals:blocks/aluminum_block", + "base": "modernmetals:blocks/aluminum_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" + } + } }, - "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" } - } + { + "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/modernmetals/models/block/aluminum_ore.json b/src/main/resources/assets/modernmetals/models/block/aluminum_ore.json new file mode 100644 index 00000000..c2f95566 --- /dev/null +++ b/src/main/resources/assets/modernmetals/models/block/aluminum_ore.json @@ -0,0 +1,8 @@ +{ + "parent": "modernmetals:block/ore_overlay", + "textures": { + "particle": "minecraft:block/stone", + "base": "minecraft:block/stone", + "overlay": "modernmetals:blocks/ore_overlays/aluminum_ore" + } +} diff --git a/src/main/resources/assets/modernmetals/models/block/aluminum_trapdoor_bottom.json b/src/main/resources/assets/modernmetals/models/block/aluminum_trapdoor_bottom.json index 634175cd..1f0bcadf 100644 --- a/src/main/resources/assets/modernmetals/models/block/aluminum_trapdoor_bottom.json +++ b/src/main/resources/assets/modernmetals/models/block/aluminum_trapdoor_bottom.json @@ -1,6 +1,6 @@ { - "parent": "block/trapdoor_bottom", - "textures": { - "texture": "modernmetals:blocks/aluminum_trapdoor" - } + "parent": "block/template_orientable_trapdoor_bottom", + "textures": { + "texture": "modernmetals:blocks/aluminum_trapdoor" + } } diff --git a/src/main/resources/assets/modernmetals/models/block/aluminum_trapdoor_open.json b/src/main/resources/assets/modernmetals/models/block/aluminum_trapdoor_open.json index b6d3d377..1cee3be4 100644 --- a/src/main/resources/assets/modernmetals/models/block/aluminum_trapdoor_open.json +++ b/src/main/resources/assets/modernmetals/models/block/aluminum_trapdoor_open.json @@ -1,6 +1,6 @@ { - "parent": "block/trapdoor_open", - "textures": { - "texture": "modernmetals:blocks/aluminum_trapdoor" - } + "parent": "block/template_orientable_trapdoor_open", + "textures": { + "texture": "modernmetals:blocks/aluminum_trapdoor" + } } diff --git a/src/main/resources/assets/modernmetals/models/block/aluminum_trapdoor_top.json b/src/main/resources/assets/modernmetals/models/block/aluminum_trapdoor_top.json index 9ec047bd..5c179f3c 100644 --- a/src/main/resources/assets/modernmetals/models/block/aluminum_trapdoor_top.json +++ b/src/main/resources/assets/modernmetals/models/block/aluminum_trapdoor_top.json @@ -1,6 +1,6 @@ { - "parent": "block/trapdoor_top", - "textures": { - "texture": "modernmetals:blocks/aluminum_trapdoor" - } + "parent": "block/template_orientable_trapdoor_top", + "textures": { + "texture": "modernmetals:blocks/aluminum_trapdoor" + } } diff --git a/src/main/resources/assets/modernmetals/models/block/aluminum_wall_post.json b/src/main/resources/assets/modernmetals/models/block/aluminum_wall_post.json index 9e809501..8136e9f9 100644 --- a/src/main/resources/assets/modernmetals/models/block/aluminum_wall_post.json +++ b/src/main/resources/assets/modernmetals/models/block/aluminum_wall_post.json @@ -1,6 +1,6 @@ { - "parent": "block/wall_post", - "textures": { - "wall": "modernmetals:blocks/aluminum_block" - } + "parent": "block/template_wall_post", + "textures": { + "wall": "modernmetals:blocks/aluminum_block" + } } diff --git a/src/main/resources/assets/modernmetals/models/block/aluminum_wall_side.json b/src/main/resources/assets/modernmetals/models/block/aluminum_wall_side.json index 3e90af97..29b72ced 100644 --- a/src/main/resources/assets/modernmetals/models/block/aluminum_wall_side.json +++ b/src/main/resources/assets/modernmetals/models/block/aluminum_wall_side.json @@ -1,6 +1,6 @@ { - "parent": "block/wall_side", - "textures": { - "wall": "modernmetals:blocks/aluminum_block" - } + "parent": "block/template_wall_side", + "textures": { + "wall": "modernmetals:blocks/aluminum_block" + } } diff --git a/src/main/resources/assets/modernmetals/models/block/aluminumbrass_lever.json b/src/main/resources/assets/modernmetals/models/block/aluminumbrass_lever.json index 491dbc94..6422bd1f 100644 --- a/src/main/resources/assets/modernmetals/models/block/aluminumbrass_lever.json +++ b/src/main/resources/assets/modernmetals/models/block/aluminumbrass_lever.json @@ -1,33 +1,155 @@ { - "ambientocclusion": false, - "textures": { - "particle": "modernmetals:blocks/aluminumbrass_block", - "base": "modernmetals:blocks/aluminumbrass_block", - "lever": "blocks/lever" + "ambientocclusion": false, + "textures": { + "particle": "modernmetals:blocks/aluminumbrass_block", + "base": "modernmetals:blocks/aluminumbrass_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" + } + } }, - "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" } - } + { + "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/modernmetals/models/block/aluminumbrass_lever_off.json b/src/main/resources/assets/modernmetals/models/block/aluminumbrass_lever_off.json index eae0b6da..cd2ced07 100644 --- a/src/main/resources/assets/modernmetals/models/block/aluminumbrass_lever_off.json +++ b/src/main/resources/assets/modernmetals/models/block/aluminumbrass_lever_off.json @@ -1,33 +1,155 @@ { - "ambientocclusion": false, - "textures": { - "particle": "modernmetals:blocks/aluminumbrass_block", - "base": "modernmetals:blocks/aluminumbrass_block", - "lever": "blocks/lever" + "ambientocclusion": false, + "textures": { + "particle": "modernmetals:blocks/aluminumbrass_block", + "base": "modernmetals:blocks/aluminumbrass_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" + } + } }, - "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" } - } + { + "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/modernmetals/models/block/aluminumbrass_ore.json b/src/main/resources/assets/modernmetals/models/block/aluminumbrass_ore.json new file mode 100644 index 00000000..e4d7e9f4 --- /dev/null +++ b/src/main/resources/assets/modernmetals/models/block/aluminumbrass_ore.json @@ -0,0 +1,8 @@ +{ + "parent": "modernmetals:block/ore_overlay", + "textures": { + "particle": "minecraft:block/stone", + "base": "minecraft:block/stone", + "overlay": "modernmetals:blocks/ore_overlays/aluminumbrass_ore" + } +} diff --git a/src/main/resources/assets/modernmetals/models/block/aluminumbrass_trapdoor_bottom.json b/src/main/resources/assets/modernmetals/models/block/aluminumbrass_trapdoor_bottom.json index fe518923..14c92e11 100644 --- a/src/main/resources/assets/modernmetals/models/block/aluminumbrass_trapdoor_bottom.json +++ b/src/main/resources/assets/modernmetals/models/block/aluminumbrass_trapdoor_bottom.json @@ -1,6 +1,6 @@ { - "parent": "block/trapdoor_bottom", - "textures": { - "texture": "modernmetals:blocks/aluminumbrass_trapdoor" - } + "parent": "block/template_orientable_trapdoor_bottom", + "textures": { + "texture": "modernmetals:blocks/aluminumbrass_trapdoor" + } } diff --git a/src/main/resources/assets/modernmetals/models/block/aluminumbrass_trapdoor_open.json b/src/main/resources/assets/modernmetals/models/block/aluminumbrass_trapdoor_open.json index 7a851680..cf2b4a66 100644 --- a/src/main/resources/assets/modernmetals/models/block/aluminumbrass_trapdoor_open.json +++ b/src/main/resources/assets/modernmetals/models/block/aluminumbrass_trapdoor_open.json @@ -1,6 +1,6 @@ { - "parent": "block/trapdoor_open", - "textures": { - "texture": "modernmetals:blocks/aluminumbrass_trapdoor" - } + "parent": "block/template_orientable_trapdoor_open", + "textures": { + "texture": "modernmetals:blocks/aluminumbrass_trapdoor" + } } diff --git a/src/main/resources/assets/modernmetals/models/block/aluminumbrass_trapdoor_top.json b/src/main/resources/assets/modernmetals/models/block/aluminumbrass_trapdoor_top.json index 9697d4a7..098a21c1 100644 --- a/src/main/resources/assets/modernmetals/models/block/aluminumbrass_trapdoor_top.json +++ b/src/main/resources/assets/modernmetals/models/block/aluminumbrass_trapdoor_top.json @@ -1,6 +1,6 @@ { - "parent": "block/trapdoor_top", - "textures": { - "texture": "modernmetals:blocks/aluminumbrass_trapdoor" - } + "parent": "block/template_orientable_trapdoor_top", + "textures": { + "texture": "modernmetals:blocks/aluminumbrass_trapdoor" + } } diff --git a/src/main/resources/assets/modernmetals/models/block/aluminumbrass_wall_post.json b/src/main/resources/assets/modernmetals/models/block/aluminumbrass_wall_post.json index 0e5fd9a7..f8e66c43 100644 --- a/src/main/resources/assets/modernmetals/models/block/aluminumbrass_wall_post.json +++ b/src/main/resources/assets/modernmetals/models/block/aluminumbrass_wall_post.json @@ -1,6 +1,6 @@ { - "parent": "block/wall_post", - "textures": { - "wall": "modernmetals:blocks/aluminumbrass_block" - } + "parent": "block/template_wall_post", + "textures": { + "wall": "modernmetals:blocks/aluminumbrass_block" + } } diff --git a/src/main/resources/assets/modernmetals/models/block/aluminumbrass_wall_side.json b/src/main/resources/assets/modernmetals/models/block/aluminumbrass_wall_side.json index b74e5269..52ac8517 100644 --- a/src/main/resources/assets/modernmetals/models/block/aluminumbrass_wall_side.json +++ b/src/main/resources/assets/modernmetals/models/block/aluminumbrass_wall_side.json @@ -1,6 +1,6 @@ { - "parent": "block/wall_side", - "textures": { - "wall": "modernmetals:blocks/aluminumbrass_block" - } + "parent": "block/template_wall_side", + "textures": { + "wall": "modernmetals:blocks/aluminumbrass_block" + } } diff --git a/src/main/resources/assets/modernmetals/models/block/beryllium_lever.json b/src/main/resources/assets/modernmetals/models/block/beryllium_lever.json index 4a1d2e2e..734adccd 100644 --- a/src/main/resources/assets/modernmetals/models/block/beryllium_lever.json +++ b/src/main/resources/assets/modernmetals/models/block/beryllium_lever.json @@ -1,33 +1,155 @@ { - "ambientocclusion": false, - "textures": { - "particle": "modernmetals:blocks/beryllium_block", - "base": "modernmetals:blocks/beryllium_block", - "lever": "blocks/lever" + "ambientocclusion": false, + "textures": { + "particle": "modernmetals:blocks/beryllium_block", + "base": "modernmetals:blocks/beryllium_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" + } + } }, - "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" } - } + { + "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/modernmetals/models/block/beryllium_lever_off.json b/src/main/resources/assets/modernmetals/models/block/beryllium_lever_off.json index 980136c2..f8343aff 100644 --- a/src/main/resources/assets/modernmetals/models/block/beryllium_lever_off.json +++ b/src/main/resources/assets/modernmetals/models/block/beryllium_lever_off.json @@ -1,33 +1,155 @@ { - "ambientocclusion": false, - "textures": { - "particle": "modernmetals:blocks/beryllium_block", - "base": "modernmetals:blocks/beryllium_block", - "lever": "blocks/lever" + "ambientocclusion": false, + "textures": { + "particle": "modernmetals:blocks/beryllium_block", + "base": "modernmetals:blocks/beryllium_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" + } + } }, - "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" } - } + { + "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/modernmetals/models/block/beryllium_ore.json b/src/main/resources/assets/modernmetals/models/block/beryllium_ore.json new file mode 100644 index 00000000..a349e3c2 --- /dev/null +++ b/src/main/resources/assets/modernmetals/models/block/beryllium_ore.json @@ -0,0 +1,8 @@ +{ + "parent": "modernmetals:block/ore_overlay", + "textures": { + "particle": "minecraft:block/stone", + "base": "minecraft:block/stone", + "overlay": "modernmetals:blocks/ore_overlays/beryllium_ore" + } +} diff --git a/src/main/resources/assets/modernmetals/models/block/beryllium_trapdoor_bottom.json b/src/main/resources/assets/modernmetals/models/block/beryllium_trapdoor_bottom.json index c2c03ce3..7ef6f9e8 100644 --- a/src/main/resources/assets/modernmetals/models/block/beryllium_trapdoor_bottom.json +++ b/src/main/resources/assets/modernmetals/models/block/beryllium_trapdoor_bottom.json @@ -1,6 +1,6 @@ { - "parent": "block/trapdoor_bottom", - "textures": { - "texture": "modernmetals:blocks/beryllium_trapdoor" - } + "parent": "block/template_orientable_trapdoor_bottom", + "textures": { + "texture": "modernmetals:blocks/beryllium_trapdoor" + } } diff --git a/src/main/resources/assets/modernmetals/models/block/beryllium_trapdoor_open.json b/src/main/resources/assets/modernmetals/models/block/beryllium_trapdoor_open.json index 5fda8afc..2220be86 100644 --- a/src/main/resources/assets/modernmetals/models/block/beryllium_trapdoor_open.json +++ b/src/main/resources/assets/modernmetals/models/block/beryllium_trapdoor_open.json @@ -1,6 +1,6 @@ { - "parent": "block/trapdoor_open", - "textures": { - "texture": "modernmetals:blocks/beryllium_trapdoor" - } + "parent": "block/template_orientable_trapdoor_open", + "textures": { + "texture": "modernmetals:blocks/beryllium_trapdoor" + } } diff --git a/src/main/resources/assets/modernmetals/models/block/beryllium_trapdoor_top.json b/src/main/resources/assets/modernmetals/models/block/beryllium_trapdoor_top.json index ee24e980..e8bad274 100644 --- a/src/main/resources/assets/modernmetals/models/block/beryllium_trapdoor_top.json +++ b/src/main/resources/assets/modernmetals/models/block/beryllium_trapdoor_top.json @@ -1,6 +1,6 @@ { - "parent": "block/trapdoor_top", - "textures": { - "texture": "modernmetals:blocks/beryllium_trapdoor" - } + "parent": "block/template_orientable_trapdoor_top", + "textures": { + "texture": "modernmetals:blocks/beryllium_trapdoor" + } } diff --git a/src/main/resources/assets/modernmetals/models/block/beryllium_wall_post.json b/src/main/resources/assets/modernmetals/models/block/beryllium_wall_post.json index ef94be67..6fea558e 100644 --- a/src/main/resources/assets/modernmetals/models/block/beryllium_wall_post.json +++ b/src/main/resources/assets/modernmetals/models/block/beryllium_wall_post.json @@ -1,6 +1,6 @@ { - "parent": "block/wall_post", - "textures": { - "wall": "modernmetals:blocks/beryllium_block" - } + "parent": "block/template_wall_post", + "textures": { + "wall": "modernmetals:blocks/beryllium_block" + } } diff --git a/src/main/resources/assets/modernmetals/models/block/beryllium_wall_side.json b/src/main/resources/assets/modernmetals/models/block/beryllium_wall_side.json index a7a13532..2a6ab646 100644 --- a/src/main/resources/assets/modernmetals/models/block/beryllium_wall_side.json +++ b/src/main/resources/assets/modernmetals/models/block/beryllium_wall_side.json @@ -1,6 +1,6 @@ { - "parent": "block/wall_side", - "textures": { - "wall": "modernmetals:blocks/beryllium_block" - } + "parent": "block/template_wall_side", + "textures": { + "wall": "modernmetals:blocks/beryllium_block" + } } diff --git a/src/main/resources/assets/modernmetals/models/block/boron_lever.json b/src/main/resources/assets/modernmetals/models/block/boron_lever.json index f0d58572..7c95f559 100644 --- a/src/main/resources/assets/modernmetals/models/block/boron_lever.json +++ b/src/main/resources/assets/modernmetals/models/block/boron_lever.json @@ -1,33 +1,155 @@ { - "ambientocclusion": false, - "textures": { - "particle": "modernmetals:blocks/boron_block", - "base": "modernmetals:blocks/boron_block", - "lever": "blocks/lever" + "ambientocclusion": false, + "textures": { + "particle": "modernmetals:blocks/boron_block", + "base": "modernmetals:blocks/boron_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" + } + } }, - "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" } - } + { + "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/modernmetals/models/block/boron_lever_off.json b/src/main/resources/assets/modernmetals/models/block/boron_lever_off.json index 86f06933..97bee4d0 100644 --- a/src/main/resources/assets/modernmetals/models/block/boron_lever_off.json +++ b/src/main/resources/assets/modernmetals/models/block/boron_lever_off.json @@ -1,33 +1,155 @@ { - "ambientocclusion": false, - "textures": { - "particle": "modernmetals:blocks/boron_block", - "base": "modernmetals:blocks/boron_block", - "lever": "blocks/lever" + "ambientocclusion": false, + "textures": { + "particle": "modernmetals:blocks/boron_block", + "base": "modernmetals:blocks/boron_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" + } + } }, - "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" } - } + { + "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/modernmetals/models/block/boron_ore.json b/src/main/resources/assets/modernmetals/models/block/boron_ore.json new file mode 100644 index 00000000..d48b0bb9 --- /dev/null +++ b/src/main/resources/assets/modernmetals/models/block/boron_ore.json @@ -0,0 +1,8 @@ +{ + "parent": "modernmetals:block/ore_overlay", + "textures": { + "particle": "minecraft:block/stone", + "base": "minecraft:block/stone", + "overlay": "modernmetals:blocks/ore_overlays/boron_ore" + } +} diff --git a/src/main/resources/assets/modernmetals/models/block/boron_trapdoor_bottom.json b/src/main/resources/assets/modernmetals/models/block/boron_trapdoor_bottom.json index 9f3132ee..5ce10edd 100644 --- a/src/main/resources/assets/modernmetals/models/block/boron_trapdoor_bottom.json +++ b/src/main/resources/assets/modernmetals/models/block/boron_trapdoor_bottom.json @@ -1,6 +1,6 @@ { - "parent": "block/trapdoor_bottom", - "textures": { - "texture": "modernmetals:blocks/boron_trapdoor" - } + "parent": "block/template_orientable_trapdoor_bottom", + "textures": { + "texture": "modernmetals:blocks/boron_trapdoor" + } } diff --git a/src/main/resources/assets/modernmetals/models/block/boron_trapdoor_open.json b/src/main/resources/assets/modernmetals/models/block/boron_trapdoor_open.json index 733da081..2a5025d1 100644 --- a/src/main/resources/assets/modernmetals/models/block/boron_trapdoor_open.json +++ b/src/main/resources/assets/modernmetals/models/block/boron_trapdoor_open.json @@ -1,6 +1,6 @@ { - "parent": "block/trapdoor_open", - "textures": { - "texture": "modernmetals:blocks/boron_trapdoor" - } + "parent": "block/template_orientable_trapdoor_open", + "textures": { + "texture": "modernmetals:blocks/boron_trapdoor" + } } diff --git a/src/main/resources/assets/modernmetals/models/block/boron_trapdoor_top.json b/src/main/resources/assets/modernmetals/models/block/boron_trapdoor_top.json index 12161a2c..0b95a20e 100644 --- a/src/main/resources/assets/modernmetals/models/block/boron_trapdoor_top.json +++ b/src/main/resources/assets/modernmetals/models/block/boron_trapdoor_top.json @@ -1,6 +1,6 @@ { - "parent": "block/trapdoor_top", - "textures": { - "texture": "modernmetals:blocks/boron_trapdoor" - } + "parent": "block/template_orientable_trapdoor_top", + "textures": { + "texture": "modernmetals:blocks/boron_trapdoor" + } } diff --git a/src/main/resources/assets/modernmetals/models/block/boron_wall_post.json b/src/main/resources/assets/modernmetals/models/block/boron_wall_post.json index 96b6e869..44555003 100644 --- a/src/main/resources/assets/modernmetals/models/block/boron_wall_post.json +++ b/src/main/resources/assets/modernmetals/models/block/boron_wall_post.json @@ -1,6 +1,6 @@ { - "parent": "block/wall_post", - "textures": { - "wall": "modernmetals:blocks/boron_block" - } + "parent": "block/template_wall_post", + "textures": { + "wall": "modernmetals:blocks/boron_block" + } } diff --git a/src/main/resources/assets/modernmetals/models/block/boron_wall_side.json b/src/main/resources/assets/modernmetals/models/block/boron_wall_side.json index c659922a..a8d8e741 100644 --- a/src/main/resources/assets/modernmetals/models/block/boron_wall_side.json +++ b/src/main/resources/assets/modernmetals/models/block/boron_wall_side.json @@ -1,6 +1,6 @@ { - "parent": "block/wall_side", - "textures": { - "wall": "modernmetals:blocks/boron_block" - } + "parent": "block/template_wall_side", + "textures": { + "wall": "modernmetals:blocks/boron_block" + } } diff --git a/src/main/resources/assets/modernmetals/models/block/cadmium_lever.json b/src/main/resources/assets/modernmetals/models/block/cadmium_lever.json index f658e149..51a459b7 100644 --- a/src/main/resources/assets/modernmetals/models/block/cadmium_lever.json +++ b/src/main/resources/assets/modernmetals/models/block/cadmium_lever.json @@ -1,33 +1,155 @@ { - "ambientocclusion": false, - "textures": { - "particle": "modernmetals:blocks/cadmium_block", - "base": "modernmetals:blocks/cadmium_block", - "lever": "blocks/lever" + "ambientocclusion": false, + "textures": { + "particle": "modernmetals:blocks/cadmium_block", + "base": "modernmetals:blocks/cadmium_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" + } + } }, - "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" } - } + { + "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/modernmetals/models/block/cadmium_lever_off.json b/src/main/resources/assets/modernmetals/models/block/cadmium_lever_off.json index e94f1dff..ce5eb218 100644 --- a/src/main/resources/assets/modernmetals/models/block/cadmium_lever_off.json +++ b/src/main/resources/assets/modernmetals/models/block/cadmium_lever_off.json @@ -1,33 +1,155 @@ { - "ambientocclusion": false, - "textures": { - "particle": "modernmetals:blocks/cadmium_block", - "base": "modernmetals:blocks/cadmium_block", - "lever": "blocks/lever" + "ambientocclusion": false, + "textures": { + "particle": "modernmetals:blocks/cadmium_block", + "base": "modernmetals:blocks/cadmium_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" + } + } }, - "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" } - } + { + "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/modernmetals/models/block/cadmium_ore.json b/src/main/resources/assets/modernmetals/models/block/cadmium_ore.json new file mode 100644 index 00000000..8a37626c --- /dev/null +++ b/src/main/resources/assets/modernmetals/models/block/cadmium_ore.json @@ -0,0 +1,8 @@ +{ + "parent": "modernmetals:block/ore_overlay", + "textures": { + "particle": "minecraft:block/stone", + "base": "minecraft:block/stone", + "overlay": "modernmetals:blocks/ore_overlays/cadmium_ore" + } +} diff --git a/src/main/resources/assets/modernmetals/models/block/cadmium_trapdoor_bottom.json b/src/main/resources/assets/modernmetals/models/block/cadmium_trapdoor_bottom.json index 09be2aa6..956db70e 100644 --- a/src/main/resources/assets/modernmetals/models/block/cadmium_trapdoor_bottom.json +++ b/src/main/resources/assets/modernmetals/models/block/cadmium_trapdoor_bottom.json @@ -1,6 +1,6 @@ { - "parent": "block/trapdoor_bottom", - "textures": { - "texture": "modernmetals:blocks/cadmium_trapdoor" - } + "parent": "block/template_orientable_trapdoor_bottom", + "textures": { + "texture": "modernmetals:blocks/cadmium_trapdoor" + } } diff --git a/src/main/resources/assets/modernmetals/models/block/cadmium_trapdoor_open.json b/src/main/resources/assets/modernmetals/models/block/cadmium_trapdoor_open.json index 606960bc..b736e24b 100644 --- a/src/main/resources/assets/modernmetals/models/block/cadmium_trapdoor_open.json +++ b/src/main/resources/assets/modernmetals/models/block/cadmium_trapdoor_open.json @@ -1,6 +1,6 @@ { - "parent": "block/trapdoor_open", - "textures": { - "texture": "modernmetals:blocks/cadmium_trapdoor" - } + "parent": "block/template_orientable_trapdoor_open", + "textures": { + "texture": "modernmetals:blocks/cadmium_trapdoor" + } } diff --git a/src/main/resources/assets/modernmetals/models/block/cadmium_trapdoor_top.json b/src/main/resources/assets/modernmetals/models/block/cadmium_trapdoor_top.json index edef8498..75e7ae80 100644 --- a/src/main/resources/assets/modernmetals/models/block/cadmium_trapdoor_top.json +++ b/src/main/resources/assets/modernmetals/models/block/cadmium_trapdoor_top.json @@ -1,6 +1,6 @@ { - "parent": "block/trapdoor_top", - "textures": { - "texture": "modernmetals:blocks/cadmium_trapdoor" - } + "parent": "block/template_orientable_trapdoor_top", + "textures": { + "texture": "modernmetals:blocks/cadmium_trapdoor" + } } diff --git a/src/main/resources/assets/modernmetals/models/block/cadmium_wall_post.json b/src/main/resources/assets/modernmetals/models/block/cadmium_wall_post.json index ad498eb0..9c26613c 100644 --- a/src/main/resources/assets/modernmetals/models/block/cadmium_wall_post.json +++ b/src/main/resources/assets/modernmetals/models/block/cadmium_wall_post.json @@ -1,6 +1,6 @@ { - "parent": "block/wall_post", - "textures": { - "wall": "modernmetals:blocks/cadmium_block" - } + "parent": "block/template_wall_post", + "textures": { + "wall": "modernmetals:blocks/cadmium_block" + } } diff --git a/src/main/resources/assets/modernmetals/models/block/cadmium_wall_side.json b/src/main/resources/assets/modernmetals/models/block/cadmium_wall_side.json index 2386790f..03be6d92 100644 --- a/src/main/resources/assets/modernmetals/models/block/cadmium_wall_side.json +++ b/src/main/resources/assets/modernmetals/models/block/cadmium_wall_side.json @@ -1,6 +1,6 @@ { - "parent": "block/wall_side", - "textures": { - "wall": "modernmetals:blocks/cadmium_block" - } + "parent": "block/template_wall_side", + "textures": { + "wall": "modernmetals:blocks/cadmium_block" + } } diff --git a/src/main/resources/assets/modernmetals/models/block/chromium_lever.json b/src/main/resources/assets/modernmetals/models/block/chromium_lever.json index 3cd2877c..4c324d62 100644 --- a/src/main/resources/assets/modernmetals/models/block/chromium_lever.json +++ b/src/main/resources/assets/modernmetals/models/block/chromium_lever.json @@ -1,33 +1,155 @@ { - "ambientocclusion": false, - "textures": { - "particle": "modernmetals:blocks/chromium_block", - "base": "modernmetals:blocks/chromium_block", - "lever": "blocks/lever" + "ambientocclusion": false, + "textures": { + "particle": "modernmetals:blocks/chromium_block", + "base": "modernmetals:blocks/chromium_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" + } + } }, - "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" } - } + { + "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/modernmetals/models/block/chromium_lever_off.json b/src/main/resources/assets/modernmetals/models/block/chromium_lever_off.json index 812fb383..85218e6a 100644 --- a/src/main/resources/assets/modernmetals/models/block/chromium_lever_off.json +++ b/src/main/resources/assets/modernmetals/models/block/chromium_lever_off.json @@ -1,33 +1,155 @@ { - "ambientocclusion": false, - "textures": { - "particle": "modernmetals:blocks/chromium_block", - "base": "modernmetals:blocks/chromium_block", - "lever": "blocks/lever" + "ambientocclusion": false, + "textures": { + "particle": "modernmetals:blocks/chromium_block", + "base": "modernmetals:blocks/chromium_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" + } + } }, - "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" } - } + { + "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/modernmetals/models/block/chromium_ore.json b/src/main/resources/assets/modernmetals/models/block/chromium_ore.json new file mode 100644 index 00000000..1bb7bd0e --- /dev/null +++ b/src/main/resources/assets/modernmetals/models/block/chromium_ore.json @@ -0,0 +1,8 @@ +{ + "parent": "modernmetals:block/ore_overlay", + "textures": { + "particle": "minecraft:block/stone", + "base": "minecraft:block/stone", + "overlay": "modernmetals:blocks/ore_overlays/chromium_ore" + } +} diff --git a/src/main/resources/assets/modernmetals/models/block/chromium_trapdoor_bottom.json b/src/main/resources/assets/modernmetals/models/block/chromium_trapdoor_bottom.json index f19a2d84..04d64cee 100644 --- a/src/main/resources/assets/modernmetals/models/block/chromium_trapdoor_bottom.json +++ b/src/main/resources/assets/modernmetals/models/block/chromium_trapdoor_bottom.json @@ -1,6 +1,6 @@ { - "parent": "block/trapdoor_bottom", - "textures": { - "texture": "modernmetals:blocks/chromium_trapdoor" - } + "parent": "block/template_orientable_trapdoor_bottom", + "textures": { + "texture": "modernmetals:blocks/chromium_trapdoor" + } } diff --git a/src/main/resources/assets/modernmetals/models/block/chromium_trapdoor_open.json b/src/main/resources/assets/modernmetals/models/block/chromium_trapdoor_open.json index 5aa2e40a..d2af42b9 100644 --- a/src/main/resources/assets/modernmetals/models/block/chromium_trapdoor_open.json +++ b/src/main/resources/assets/modernmetals/models/block/chromium_trapdoor_open.json @@ -1,6 +1,6 @@ { - "parent": "block/trapdoor_open", - "textures": { - "texture": "modernmetals:blocks/chromium_trapdoor" - } + "parent": "block/template_orientable_trapdoor_open", + "textures": { + "texture": "modernmetals:blocks/chromium_trapdoor" + } } diff --git a/src/main/resources/assets/modernmetals/models/block/chromium_trapdoor_top.json b/src/main/resources/assets/modernmetals/models/block/chromium_trapdoor_top.json index e0463a40..05fb365e 100644 --- a/src/main/resources/assets/modernmetals/models/block/chromium_trapdoor_top.json +++ b/src/main/resources/assets/modernmetals/models/block/chromium_trapdoor_top.json @@ -1,6 +1,6 @@ { - "parent": "block/trapdoor_top", - "textures": { - "texture": "modernmetals:blocks/chromium_trapdoor" - } + "parent": "block/template_orientable_trapdoor_top", + "textures": { + "texture": "modernmetals:blocks/chromium_trapdoor" + } } diff --git a/src/main/resources/assets/modernmetals/models/block/chromium_wall_post.json b/src/main/resources/assets/modernmetals/models/block/chromium_wall_post.json index 0c4a6caf..39c8f549 100644 --- a/src/main/resources/assets/modernmetals/models/block/chromium_wall_post.json +++ b/src/main/resources/assets/modernmetals/models/block/chromium_wall_post.json @@ -1,6 +1,6 @@ { - "parent": "block/wall_post", - "textures": { - "wall": "modernmetals:blocks/chromium_block" - } + "parent": "block/template_wall_post", + "textures": { + "wall": "modernmetals:blocks/chromium_block" + } } diff --git a/src/main/resources/assets/modernmetals/models/block/chromium_wall_side.json b/src/main/resources/assets/modernmetals/models/block/chromium_wall_side.json index 37c8a29e..010e7381 100644 --- a/src/main/resources/assets/modernmetals/models/block/chromium_wall_side.json +++ b/src/main/resources/assets/modernmetals/models/block/chromium_wall_side.json @@ -1,6 +1,6 @@ { - "parent": "block/wall_side", - "textures": { - "wall": "modernmetals:blocks/chromium_block" - } + "parent": "block/template_wall_side", + "textures": { + "wall": "modernmetals:blocks/chromium_block" + } } diff --git a/src/main/resources/assets/modernmetals/models/block/galvanizedsteel_lever.json b/src/main/resources/assets/modernmetals/models/block/galvanizedsteel_lever.json index 8d7df67d..965800b1 100644 --- a/src/main/resources/assets/modernmetals/models/block/galvanizedsteel_lever.json +++ b/src/main/resources/assets/modernmetals/models/block/galvanizedsteel_lever.json @@ -1,33 +1,155 @@ { - "ambientocclusion": false, - "textures": { - "particle": "modernmetals:blocks/galvanizedsteel_block", - "base": "modernmetals:blocks/galvanizedsteel_block", - "lever": "blocks/lever" + "ambientocclusion": false, + "textures": { + "particle": "modernmetals:blocks/galvanizedsteel_block", + "base": "modernmetals:blocks/galvanizedsteel_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" + } + } }, - "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" } - } + { + "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/modernmetals/models/block/galvanizedsteel_lever_off.json b/src/main/resources/assets/modernmetals/models/block/galvanizedsteel_lever_off.json index 148dff3d..1f52f02a 100644 --- a/src/main/resources/assets/modernmetals/models/block/galvanizedsteel_lever_off.json +++ b/src/main/resources/assets/modernmetals/models/block/galvanizedsteel_lever_off.json @@ -1,33 +1,155 @@ { - "ambientocclusion": false, - "textures": { - "particle": "modernmetals:blocks/galvanizedsteel_block", - "base": "modernmetals:blocks/galvanizedsteel_block", - "lever": "blocks/lever" + "ambientocclusion": false, + "textures": { + "particle": "modernmetals:blocks/galvanizedsteel_block", + "base": "modernmetals:blocks/galvanizedsteel_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" + } + } }, - "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" } - } + { + "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/modernmetals/models/block/galvanizedsteel_ore.json b/src/main/resources/assets/modernmetals/models/block/galvanizedsteel_ore.json new file mode 100644 index 00000000..aa816d5a --- /dev/null +++ b/src/main/resources/assets/modernmetals/models/block/galvanizedsteel_ore.json @@ -0,0 +1,3 @@ +{ + "parent": "modernmetals:block/galvanizedsteel_block" +} diff --git a/src/main/resources/assets/modernmetals/models/block/galvanizedsteel_trapdoor_bottom.json b/src/main/resources/assets/modernmetals/models/block/galvanizedsteel_trapdoor_bottom.json index b62e53ca..ffeb20f3 100644 --- a/src/main/resources/assets/modernmetals/models/block/galvanizedsteel_trapdoor_bottom.json +++ b/src/main/resources/assets/modernmetals/models/block/galvanizedsteel_trapdoor_bottom.json @@ -1,6 +1,6 @@ { - "parent": "block/trapdoor_bottom", - "textures": { - "texture": "modernmetals:blocks/galvanizedsteel_trapdoor" - } + "parent": "block/template_orientable_trapdoor_bottom", + "textures": { + "texture": "modernmetals:blocks/galvanizedsteel_trapdoor" + } } diff --git a/src/main/resources/assets/modernmetals/models/block/galvanizedsteel_trapdoor_open.json b/src/main/resources/assets/modernmetals/models/block/galvanizedsteel_trapdoor_open.json index 492a956c..17b8d006 100644 --- a/src/main/resources/assets/modernmetals/models/block/galvanizedsteel_trapdoor_open.json +++ b/src/main/resources/assets/modernmetals/models/block/galvanizedsteel_trapdoor_open.json @@ -1,6 +1,6 @@ { - "parent": "block/trapdoor_open", - "textures": { - "texture": "modernmetals:blocks/galvanizedsteel_trapdoor" - } + "parent": "block/template_orientable_trapdoor_open", + "textures": { + "texture": "modernmetals:blocks/galvanizedsteel_trapdoor" + } } diff --git a/src/main/resources/assets/modernmetals/models/block/galvanizedsteel_trapdoor_top.json b/src/main/resources/assets/modernmetals/models/block/galvanizedsteel_trapdoor_top.json index bc076424..bda50460 100644 --- a/src/main/resources/assets/modernmetals/models/block/galvanizedsteel_trapdoor_top.json +++ b/src/main/resources/assets/modernmetals/models/block/galvanizedsteel_trapdoor_top.json @@ -1,6 +1,6 @@ { - "parent": "block/trapdoor_top", - "textures": { - "texture": "modernmetals:blocks/galvanizedsteel_trapdoor" - } + "parent": "block/template_orientable_trapdoor_top", + "textures": { + "texture": "modernmetals:blocks/galvanizedsteel_trapdoor" + } } diff --git a/src/main/resources/assets/modernmetals/models/block/galvanizedsteel_wall_post.json b/src/main/resources/assets/modernmetals/models/block/galvanizedsteel_wall_post.json index 11008846..a1f92900 100644 --- a/src/main/resources/assets/modernmetals/models/block/galvanizedsteel_wall_post.json +++ b/src/main/resources/assets/modernmetals/models/block/galvanizedsteel_wall_post.json @@ -1,6 +1,6 @@ { - "parent": "block/wall_post", - "textures": { - "wall": "modernmetals:blocks/galvanizedsteel_block" - } + "parent": "block/template_wall_post", + "textures": { + "wall": "modernmetals:blocks/galvanizedsteel_block" + } } diff --git a/src/main/resources/assets/modernmetals/models/block/galvanizedsteel_wall_side.json b/src/main/resources/assets/modernmetals/models/block/galvanizedsteel_wall_side.json index 08d84145..cdeac6fa 100644 --- a/src/main/resources/assets/modernmetals/models/block/galvanizedsteel_wall_side.json +++ b/src/main/resources/assets/modernmetals/models/block/galvanizedsteel_wall_side.json @@ -1,6 +1,6 @@ { - "parent": "block/wall_side", - "textures": { - "wall": "modernmetals:blocks/galvanizedsteel_block" - } + "parent": "block/template_wall_side", + "textures": { + "wall": "modernmetals:blocks/galvanizedsteel_block" + } } diff --git a/src/main/resources/assets/modernmetals/models/block/half_slab_aluminum.json b/src/main/resources/assets/modernmetals/models/block/half_slab_aluminum.json index 15b59539..276ae6dc 100644 --- a/src/main/resources/assets/modernmetals/models/block/half_slab_aluminum.json +++ b/src/main/resources/assets/modernmetals/models/block/half_slab_aluminum.json @@ -1,8 +1,8 @@ { - "parent": "block/half_slab", - "textures": { - "bottom": "modernmetals:blocks/aluminum_block", - "top": "modernmetals:blocks/aluminum_block", - "side": "modernmetals:blocks/aluminum_block" - } + "parent": "block/slab", + "textures": { + "bottom": "modernmetals:blocks/aluminum_block", + "top": "modernmetals:blocks/aluminum_block", + "side": "modernmetals:blocks/aluminum_block" + } } diff --git a/src/main/resources/assets/modernmetals/models/block/half_slab_aluminumbrass.json b/src/main/resources/assets/modernmetals/models/block/half_slab_aluminumbrass.json index 7d24198b..a1181734 100644 --- a/src/main/resources/assets/modernmetals/models/block/half_slab_aluminumbrass.json +++ b/src/main/resources/assets/modernmetals/models/block/half_slab_aluminumbrass.json @@ -1,8 +1,8 @@ { - "parent": "block/half_slab", - "textures": { - "bottom": "modernmetals:blocks/aluminumbrass_block", - "top": "modernmetals:blocks/aluminumbrass_block", - "side": "modernmetals:blocks/aluminumbrass_block" - } + "parent": "block/slab", + "textures": { + "bottom": "modernmetals:blocks/aluminumbrass_block", + "top": "modernmetals:blocks/aluminumbrass_block", + "side": "modernmetals:blocks/aluminumbrass_block" + } } diff --git a/src/main/resources/assets/modernmetals/models/block/half_slab_beryllium.json b/src/main/resources/assets/modernmetals/models/block/half_slab_beryllium.json index e14aa78c..902320ef 100644 --- a/src/main/resources/assets/modernmetals/models/block/half_slab_beryllium.json +++ b/src/main/resources/assets/modernmetals/models/block/half_slab_beryllium.json @@ -1,8 +1,8 @@ { - "parent": "block/half_slab", - "textures": { - "bottom": "modernmetals:blocks/beryllium_block", - "top": "modernmetals:blocks/beryllium_block", - "side": "modernmetals:blocks/beryllium_block" - } + "parent": "block/slab", + "textures": { + "bottom": "modernmetals:blocks/beryllium_block", + "top": "modernmetals:blocks/beryllium_block", + "side": "modernmetals:blocks/beryllium_block" + } } diff --git a/src/main/resources/assets/modernmetals/models/block/half_slab_boron.json b/src/main/resources/assets/modernmetals/models/block/half_slab_boron.json index c1889973..380c88db 100644 --- a/src/main/resources/assets/modernmetals/models/block/half_slab_boron.json +++ b/src/main/resources/assets/modernmetals/models/block/half_slab_boron.json @@ -1,8 +1,8 @@ { - "parent": "block/half_slab", - "textures": { - "bottom": "modernmetals:blocks/boron_block", - "top": "modernmetals:blocks/boron_block", - "side": "modernmetals:blocks/boron_block" - } + "parent": "block/slab", + "textures": { + "bottom": "modernmetals:blocks/boron_block", + "top": "modernmetals:blocks/boron_block", + "side": "modernmetals:blocks/boron_block" + } } diff --git a/src/main/resources/assets/modernmetals/models/block/half_slab_cadmium.json b/src/main/resources/assets/modernmetals/models/block/half_slab_cadmium.json index 5faee6da..ac9ba71d 100644 --- a/src/main/resources/assets/modernmetals/models/block/half_slab_cadmium.json +++ b/src/main/resources/assets/modernmetals/models/block/half_slab_cadmium.json @@ -1,8 +1,8 @@ { - "parent": "block/half_slab", - "textures": { - "bottom": "modernmetals:blocks/cadmium_block", - "top": "modernmetals:blocks/cadmium_block", - "side": "modernmetals:blocks/cadmium_block" - } + "parent": "block/slab", + "textures": { + "bottom": "modernmetals:blocks/cadmium_block", + "top": "modernmetals:blocks/cadmium_block", + "side": "modernmetals:blocks/cadmium_block" + } } diff --git a/src/main/resources/assets/modernmetals/models/block/half_slab_chromium.json b/src/main/resources/assets/modernmetals/models/block/half_slab_chromium.json index 1a2414ce..4bbca9bd 100644 --- a/src/main/resources/assets/modernmetals/models/block/half_slab_chromium.json +++ b/src/main/resources/assets/modernmetals/models/block/half_slab_chromium.json @@ -1,8 +1,8 @@ { - "parent": "block/half_slab", - "textures": { - "bottom": "modernmetals:blocks/chromium_block", - "top": "modernmetals:blocks/chromium_block", - "side": "modernmetals:blocks/chromium_block" - } + "parent": "block/slab", + "textures": { + "bottom": "modernmetals:blocks/chromium_block", + "top": "modernmetals:blocks/chromium_block", + "side": "modernmetals:blocks/chromium_block" + } } diff --git a/src/main/resources/assets/modernmetals/models/block/half_slab_galvanizedsteel.json b/src/main/resources/assets/modernmetals/models/block/half_slab_galvanizedsteel.json index 8f527b78..74851f6d 100644 --- a/src/main/resources/assets/modernmetals/models/block/half_slab_galvanizedsteel.json +++ b/src/main/resources/assets/modernmetals/models/block/half_slab_galvanizedsteel.json @@ -1,8 +1,8 @@ { - "parent": "block/half_slab", - "textures": { - "bottom": "modernmetals:blocks/galvanizedsteel_block", - "top": "modernmetals:blocks/galvanizedsteel_block", - "side": "modernmetals:blocks/galvanizedsteel_block" - } + "parent": "block/slab", + "textures": { + "bottom": "modernmetals:blocks/galvanizedsteel_block", + "top": "modernmetals:blocks/galvanizedsteel_block", + "side": "modernmetals:blocks/galvanizedsteel_block" + } } diff --git a/src/main/resources/assets/modernmetals/models/block/half_slab_iridium.json b/src/main/resources/assets/modernmetals/models/block/half_slab_iridium.json index 5fdc3069..d402d976 100644 --- a/src/main/resources/assets/modernmetals/models/block/half_slab_iridium.json +++ b/src/main/resources/assets/modernmetals/models/block/half_slab_iridium.json @@ -1,8 +1,8 @@ { - "parent": "block/half_slab", - "textures": { - "bottom": "modernmetals:blocks/iridium_block", - "top": "modernmetals:blocks/iridium_block", - "side": "modernmetals:blocks/iridium_block" - } + "parent": "block/slab", + "textures": { + "bottom": "modernmetals:blocks/iridium_block", + "top": "modernmetals:blocks/iridium_block", + "side": "modernmetals:blocks/iridium_block" + } } diff --git a/src/main/resources/assets/modernmetals/models/block/half_slab_magnesium.json b/src/main/resources/assets/modernmetals/models/block/half_slab_magnesium.json index ea805929..0fa1300b 100644 --- a/src/main/resources/assets/modernmetals/models/block/half_slab_magnesium.json +++ b/src/main/resources/assets/modernmetals/models/block/half_slab_magnesium.json @@ -1,8 +1,8 @@ { - "parent": "block/half_slab", - "textures": { - "bottom": "modernmetals:blocks/magnesium_block", - "top": "modernmetals:blocks/magnesium_block", - "side": "modernmetals:blocks/magnesium_block" - } + "parent": "block/slab", + "textures": { + "bottom": "modernmetals:blocks/magnesium_block", + "top": "modernmetals:blocks/magnesium_block", + "side": "modernmetals:blocks/magnesium_block" + } } diff --git a/src/main/resources/assets/modernmetals/models/block/half_slab_manganese.json b/src/main/resources/assets/modernmetals/models/block/half_slab_manganese.json index eece73dc..95ae6a55 100644 --- a/src/main/resources/assets/modernmetals/models/block/half_slab_manganese.json +++ b/src/main/resources/assets/modernmetals/models/block/half_slab_manganese.json @@ -1,8 +1,8 @@ { - "parent": "block/half_slab", - "textures": { - "bottom": "modernmetals:blocks/manganese_block", - "top": "modernmetals:blocks/manganese_block", - "side": "modernmetals:blocks/manganese_block" - } + "parent": "block/slab", + "textures": { + "bottom": "modernmetals:blocks/manganese_block", + "top": "modernmetals:blocks/manganese_block", + "side": "modernmetals:blocks/manganese_block" + } } diff --git a/src/main/resources/assets/modernmetals/models/block/half_slab_nichrome.json b/src/main/resources/assets/modernmetals/models/block/half_slab_nichrome.json index 0228693d..c5edff17 100644 --- a/src/main/resources/assets/modernmetals/models/block/half_slab_nichrome.json +++ b/src/main/resources/assets/modernmetals/models/block/half_slab_nichrome.json @@ -1,8 +1,8 @@ { - "parent": "block/half_slab", - "textures": { - "bottom": "modernmetals:blocks/nichrome_block", - "top": "modernmetals:blocks/nichrome_block", - "side": "modernmetals:blocks/nichrome_block" - } + "parent": "block/slab", + "textures": { + "bottom": "modernmetals:blocks/nichrome_block", + "top": "modernmetals:blocks/nichrome_block", + "side": "modernmetals:blocks/nichrome_block" + } } diff --git a/src/main/resources/assets/modernmetals/models/block/half_slab_osmium.json b/src/main/resources/assets/modernmetals/models/block/half_slab_osmium.json index 67713622..4b9ddba5 100644 --- a/src/main/resources/assets/modernmetals/models/block/half_slab_osmium.json +++ b/src/main/resources/assets/modernmetals/models/block/half_slab_osmium.json @@ -1,8 +1,8 @@ { - "parent": "block/half_slab", - "textures": { - "bottom": "modernmetals:blocks/osmium_block", - "top": "modernmetals:blocks/osmium_block", - "side": "modernmetals:blocks/osmium_block" - } + "parent": "block/slab", + "textures": { + "bottom": "modernmetals:blocks/osmium_block", + "top": "modernmetals:blocks/osmium_block", + "side": "modernmetals:blocks/osmium_block" + } } diff --git a/src/main/resources/assets/modernmetals/models/block/half_slab_plutonium.json b/src/main/resources/assets/modernmetals/models/block/half_slab_plutonium.json index 09be70fd..fce0e646 100644 --- a/src/main/resources/assets/modernmetals/models/block/half_slab_plutonium.json +++ b/src/main/resources/assets/modernmetals/models/block/half_slab_plutonium.json @@ -1,8 +1,8 @@ { - "parent": "block/half_slab", - "textures": { - "bottom": "modernmetals:blocks/plutonium_block", - "top": "modernmetals:blocks/plutonium_block", - "side": "modernmetals:blocks/plutonium_block" - } + "parent": "block/slab", + "textures": { + "bottom": "modernmetals:blocks/plutonium_block", + "top": "modernmetals:blocks/plutonium_block", + "side": "modernmetals:blocks/plutonium_block" + } } diff --git a/src/main/resources/assets/modernmetals/models/block/half_slab_rutile.json b/src/main/resources/assets/modernmetals/models/block/half_slab_rutile.json index 1f62f5c4..57391a74 100644 --- a/src/main/resources/assets/modernmetals/models/block/half_slab_rutile.json +++ b/src/main/resources/assets/modernmetals/models/block/half_slab_rutile.json @@ -1,8 +1,8 @@ { - "parent": "block/half_slab", - "textures": { - "bottom": "modernmetals:blocks/rutile_block", - "top": "modernmetals:blocks/rutile_block", - "side": "modernmetals:blocks/rutile_block" - } + "parent": "block/slab", + "textures": { + "bottom": "modernmetals:blocks/rutile_block", + "top": "modernmetals:blocks/rutile_block", + "side": "modernmetals:blocks/rutile_block" + } } diff --git a/src/main/resources/assets/modernmetals/models/block/half_slab_stainlesssteel.json b/src/main/resources/assets/modernmetals/models/block/half_slab_stainlesssteel.json index cc74a5ee..f7618b8c 100644 --- a/src/main/resources/assets/modernmetals/models/block/half_slab_stainlesssteel.json +++ b/src/main/resources/assets/modernmetals/models/block/half_slab_stainlesssteel.json @@ -1,8 +1,8 @@ { - "parent": "block/half_slab", - "textures": { - "bottom": "modernmetals:blocks/stainlesssteel_block", - "top": "modernmetals:blocks/stainlesssteel_block", - "side": "modernmetals:blocks/stainlesssteel_block" - } + "parent": "block/slab", + "textures": { + "bottom": "modernmetals:blocks/stainlesssteel_block", + "top": "modernmetals:blocks/stainlesssteel_block", + "side": "modernmetals:blocks/stainlesssteel_block" + } } diff --git a/src/main/resources/assets/modernmetals/models/block/half_slab_tantalum.json b/src/main/resources/assets/modernmetals/models/block/half_slab_tantalum.json index 71f432e4..1eeed93a 100644 --- a/src/main/resources/assets/modernmetals/models/block/half_slab_tantalum.json +++ b/src/main/resources/assets/modernmetals/models/block/half_slab_tantalum.json @@ -1,8 +1,8 @@ { - "parent": "block/half_slab", - "textures": { - "bottom": "modernmetals:blocks/tantalum_block", - "top": "modernmetals:blocks/tantalum_block", - "side": "modernmetals:blocks/tantalum_block" - } + "parent": "block/slab", + "textures": { + "bottom": "modernmetals:blocks/tantalum_block", + "top": "modernmetals:blocks/tantalum_block", + "side": "modernmetals:blocks/tantalum_block" + } } diff --git a/src/main/resources/assets/modernmetals/models/block/half_slab_thorium.json b/src/main/resources/assets/modernmetals/models/block/half_slab_thorium.json index aa11f3eb..41324d42 100644 --- a/src/main/resources/assets/modernmetals/models/block/half_slab_thorium.json +++ b/src/main/resources/assets/modernmetals/models/block/half_slab_thorium.json @@ -1,8 +1,8 @@ { - "parent": "block/half_slab", - "textures": { - "bottom": "modernmetals:blocks/thorium_block", - "top": "modernmetals:blocks/thorium_block", - "side": "modernmetals:blocks/thorium_block" - } + "parent": "block/slab", + "textures": { + "bottom": "modernmetals:blocks/thorium_block", + "top": "modernmetals:blocks/thorium_block", + "side": "modernmetals:blocks/thorium_block" + } } diff --git a/src/main/resources/assets/modernmetals/models/block/half_slab_titanium.json b/src/main/resources/assets/modernmetals/models/block/half_slab_titanium.json index 0e896407..ed4c84c4 100644 --- a/src/main/resources/assets/modernmetals/models/block/half_slab_titanium.json +++ b/src/main/resources/assets/modernmetals/models/block/half_slab_titanium.json @@ -1,8 +1,8 @@ { - "parent": "block/half_slab", - "textures": { - "bottom": "modernmetals:blocks/titanium_block", - "top": "modernmetals:blocks/titanium_block", - "side": "modernmetals:blocks/titanium_block" - } + "parent": "block/slab", + "textures": { + "bottom": "modernmetals:blocks/titanium_block", + "top": "modernmetals:blocks/titanium_block", + "side": "modernmetals:blocks/titanium_block" + } } diff --git a/src/main/resources/assets/modernmetals/models/block/half_slab_tungsten.json b/src/main/resources/assets/modernmetals/models/block/half_slab_tungsten.json index 41aab915..33f6329a 100644 --- a/src/main/resources/assets/modernmetals/models/block/half_slab_tungsten.json +++ b/src/main/resources/assets/modernmetals/models/block/half_slab_tungsten.json @@ -1,8 +1,8 @@ { - "parent": "block/half_slab", - "textures": { - "bottom": "modernmetals:blocks/tungsten_block", - "top": "modernmetals:blocks/tungsten_block", - "side": "modernmetals:blocks/tungsten_block" - } + "parent": "block/slab", + "textures": { + "bottom": "modernmetals:blocks/tungsten_block", + "top": "modernmetals:blocks/tungsten_block", + "side": "modernmetals:blocks/tungsten_block" + } } diff --git a/src/main/resources/assets/modernmetals/models/block/half_slab_uranium.json b/src/main/resources/assets/modernmetals/models/block/half_slab_uranium.json index da7ae3df..2b40459b 100644 --- a/src/main/resources/assets/modernmetals/models/block/half_slab_uranium.json +++ b/src/main/resources/assets/modernmetals/models/block/half_slab_uranium.json @@ -1,8 +1,8 @@ { - "parent": "block/half_slab", - "textures": { - "bottom": "modernmetals:blocks/uranium_block", - "top": "modernmetals:blocks/uranium_block", - "side": "modernmetals:blocks/uranium_block" - } + "parent": "block/slab", + "textures": { + "bottom": "modernmetals:blocks/uranium_block", + "top": "modernmetals:blocks/uranium_block", + "side": "modernmetals:blocks/uranium_block" + } } diff --git a/src/main/resources/assets/modernmetals/models/block/half_slab_zirconium.json b/src/main/resources/assets/modernmetals/models/block/half_slab_zirconium.json index c3f2d829..5acb4905 100644 --- a/src/main/resources/assets/modernmetals/models/block/half_slab_zirconium.json +++ b/src/main/resources/assets/modernmetals/models/block/half_slab_zirconium.json @@ -1,8 +1,8 @@ { - "parent": "block/half_slab", - "textures": { - "bottom": "modernmetals:blocks/zirconium_block", - "top": "modernmetals:blocks/zirconium_block", - "side": "modernmetals:blocks/zirconium_block" - } + "parent": "block/slab", + "textures": { + "bottom": "modernmetals:blocks/zirconium_block", + "top": "modernmetals:blocks/zirconium_block", + "side": "modernmetals:blocks/zirconium_block" + } } diff --git a/src/main/resources/assets/modernmetals/models/block/iridium_lever.json b/src/main/resources/assets/modernmetals/models/block/iridium_lever.json index 53ec55df..d2b2804b 100644 --- a/src/main/resources/assets/modernmetals/models/block/iridium_lever.json +++ b/src/main/resources/assets/modernmetals/models/block/iridium_lever.json @@ -1,33 +1,155 @@ { - "ambientocclusion": false, - "textures": { - "particle": "modernmetals:blocks/iridium_block", - "base": "modernmetals:blocks/iridium_block", - "lever": "blocks/lever" + "ambientocclusion": false, + "textures": { + "particle": "modernmetals:blocks/iridium_block", + "base": "modernmetals:blocks/iridium_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" + } + } }, - "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" } - } + { + "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/modernmetals/models/block/iridium_lever_off.json b/src/main/resources/assets/modernmetals/models/block/iridium_lever_off.json index 195f8bec..659c288c 100644 --- a/src/main/resources/assets/modernmetals/models/block/iridium_lever_off.json +++ b/src/main/resources/assets/modernmetals/models/block/iridium_lever_off.json @@ -1,33 +1,155 @@ { - "ambientocclusion": false, - "textures": { - "particle": "modernmetals:blocks/iridium_block", - "base": "modernmetals:blocks/iridium_block", - "lever": "blocks/lever" + "ambientocclusion": false, + "textures": { + "particle": "modernmetals:blocks/iridium_block", + "base": "modernmetals:blocks/iridium_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" + } + } }, - "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" } - } + { + "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/modernmetals/models/block/iridium_ore.json b/src/main/resources/assets/modernmetals/models/block/iridium_ore.json new file mode 100644 index 00000000..8981d2d9 --- /dev/null +++ b/src/main/resources/assets/modernmetals/models/block/iridium_ore.json @@ -0,0 +1,8 @@ +{ + "parent": "modernmetals:block/ore_overlay", + "textures": { + "particle": "minecraft:block/stone", + "base": "minecraft:block/stone", + "overlay": "modernmetals:blocks/ore_overlays/iridium_ore" + } +} diff --git a/src/main/resources/assets/modernmetals/models/block/iridium_trapdoor_bottom.json b/src/main/resources/assets/modernmetals/models/block/iridium_trapdoor_bottom.json index 3905d7fa..123a3598 100644 --- a/src/main/resources/assets/modernmetals/models/block/iridium_trapdoor_bottom.json +++ b/src/main/resources/assets/modernmetals/models/block/iridium_trapdoor_bottom.json @@ -1,6 +1,6 @@ { - "parent": "block/trapdoor_bottom", - "textures": { - "texture": "modernmetals:blocks/iridium_trapdoor" - } + "parent": "block/template_orientable_trapdoor_bottom", + "textures": { + "texture": "modernmetals:blocks/iridium_trapdoor" + } } diff --git a/src/main/resources/assets/modernmetals/models/block/iridium_trapdoor_open.json b/src/main/resources/assets/modernmetals/models/block/iridium_trapdoor_open.json index 97b30a2a..f563a0f8 100644 --- a/src/main/resources/assets/modernmetals/models/block/iridium_trapdoor_open.json +++ b/src/main/resources/assets/modernmetals/models/block/iridium_trapdoor_open.json @@ -1,6 +1,6 @@ { - "parent": "block/trapdoor_open", - "textures": { - "texture": "modernmetals:blocks/iridium_trapdoor" - } + "parent": "block/template_orientable_trapdoor_open", + "textures": { + "texture": "modernmetals:blocks/iridium_trapdoor" + } } diff --git a/src/main/resources/assets/modernmetals/models/block/iridium_trapdoor_top.json b/src/main/resources/assets/modernmetals/models/block/iridium_trapdoor_top.json index 8824066a..018a4f85 100644 --- a/src/main/resources/assets/modernmetals/models/block/iridium_trapdoor_top.json +++ b/src/main/resources/assets/modernmetals/models/block/iridium_trapdoor_top.json @@ -1,6 +1,6 @@ { - "parent": "block/trapdoor_top", - "textures": { - "texture": "modernmetals:blocks/iridium_trapdoor" - } + "parent": "block/template_orientable_trapdoor_top", + "textures": { + "texture": "modernmetals:blocks/iridium_trapdoor" + } } diff --git a/src/main/resources/assets/modernmetals/models/block/iridium_wall_post.json b/src/main/resources/assets/modernmetals/models/block/iridium_wall_post.json index 3970e1ee..c1d36e00 100644 --- a/src/main/resources/assets/modernmetals/models/block/iridium_wall_post.json +++ b/src/main/resources/assets/modernmetals/models/block/iridium_wall_post.json @@ -1,6 +1,6 @@ { - "parent": "block/wall_post", - "textures": { - "wall": "modernmetals:blocks/iridium_block" - } + "parent": "block/template_wall_post", + "textures": { + "wall": "modernmetals:blocks/iridium_block" + } } diff --git a/src/main/resources/assets/modernmetals/models/block/iridium_wall_side.json b/src/main/resources/assets/modernmetals/models/block/iridium_wall_side.json index b6c21880..0f04968d 100644 --- a/src/main/resources/assets/modernmetals/models/block/iridium_wall_side.json +++ b/src/main/resources/assets/modernmetals/models/block/iridium_wall_side.json @@ -1,6 +1,6 @@ { - "parent": "block/wall_side", - "textures": { - "wall": "modernmetals:blocks/iridium_block" - } + "parent": "block/template_wall_side", + "textures": { + "wall": "modernmetals:blocks/iridium_block" + } } diff --git a/src/main/resources/assets/modernmetals/models/block/magnesium_lever.json b/src/main/resources/assets/modernmetals/models/block/magnesium_lever.json index 39709381..1d5d8ede 100644 --- a/src/main/resources/assets/modernmetals/models/block/magnesium_lever.json +++ b/src/main/resources/assets/modernmetals/models/block/magnesium_lever.json @@ -1,33 +1,155 @@ { - "ambientocclusion": false, - "textures": { - "particle": "modernmetals:blocks/magnesium_block", - "base": "modernmetals:blocks/magnesium_block", - "lever": "blocks/lever" + "ambientocclusion": false, + "textures": { + "particle": "modernmetals:blocks/magnesium_block", + "base": "modernmetals:blocks/magnesium_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" + } + } }, - "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" } - } + { + "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/modernmetals/models/block/magnesium_lever_off.json b/src/main/resources/assets/modernmetals/models/block/magnesium_lever_off.json index 9a64d8b9..ab6cb741 100644 --- a/src/main/resources/assets/modernmetals/models/block/magnesium_lever_off.json +++ b/src/main/resources/assets/modernmetals/models/block/magnesium_lever_off.json @@ -1,33 +1,155 @@ { - "ambientocclusion": false, - "textures": { - "particle": "modernmetals:blocks/magnesium_block", - "base": "modernmetals:blocks/magnesium_block", - "lever": "blocks/lever" + "ambientocclusion": false, + "textures": { + "particle": "modernmetals:blocks/magnesium_block", + "base": "modernmetals:blocks/magnesium_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" + } + } }, - "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" } - } + { + "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/modernmetals/models/block/magnesium_ore.json b/src/main/resources/assets/modernmetals/models/block/magnesium_ore.json new file mode 100644 index 00000000..77827877 --- /dev/null +++ b/src/main/resources/assets/modernmetals/models/block/magnesium_ore.json @@ -0,0 +1,8 @@ +{ + "parent": "modernmetals:block/ore_overlay", + "textures": { + "particle": "minecraft:block/stone", + "base": "minecraft:block/stone", + "overlay": "modernmetals:blocks/ore_overlays/magnesium_ore" + } +} diff --git a/src/main/resources/assets/modernmetals/models/block/magnesium_trapdoor_bottom.json b/src/main/resources/assets/modernmetals/models/block/magnesium_trapdoor_bottom.json index d73a31a1..ee093a2e 100644 --- a/src/main/resources/assets/modernmetals/models/block/magnesium_trapdoor_bottom.json +++ b/src/main/resources/assets/modernmetals/models/block/magnesium_trapdoor_bottom.json @@ -1,6 +1,6 @@ { - "parent": "block/trapdoor_bottom", - "textures": { - "texture": "modernmetals:blocks/magnesium_trapdoor" - } + "parent": "block/template_orientable_trapdoor_bottom", + "textures": { + "texture": "modernmetals:blocks/magnesium_trapdoor" + } } diff --git a/src/main/resources/assets/modernmetals/models/block/magnesium_trapdoor_open.json b/src/main/resources/assets/modernmetals/models/block/magnesium_trapdoor_open.json index 465056c2..8de1d1e7 100644 --- a/src/main/resources/assets/modernmetals/models/block/magnesium_trapdoor_open.json +++ b/src/main/resources/assets/modernmetals/models/block/magnesium_trapdoor_open.json @@ -1,6 +1,6 @@ { - "parent": "block/trapdoor_open", - "textures": { - "texture": "modernmetals:blocks/magnesium_trapdoor" - } + "parent": "block/template_orientable_trapdoor_open", + "textures": { + "texture": "modernmetals:blocks/magnesium_trapdoor" + } } diff --git a/src/main/resources/assets/modernmetals/models/block/magnesium_trapdoor_top.json b/src/main/resources/assets/modernmetals/models/block/magnesium_trapdoor_top.json index 9083a384..a683d829 100644 --- a/src/main/resources/assets/modernmetals/models/block/magnesium_trapdoor_top.json +++ b/src/main/resources/assets/modernmetals/models/block/magnesium_trapdoor_top.json @@ -1,6 +1,6 @@ { - "parent": "block/trapdoor_top", - "textures": { - "texture": "modernmetals:blocks/magnesium_trapdoor" - } + "parent": "block/template_orientable_trapdoor_top", + "textures": { + "texture": "modernmetals:blocks/magnesium_trapdoor" + } } diff --git a/src/main/resources/assets/modernmetals/models/block/magnesium_wall_post.json b/src/main/resources/assets/modernmetals/models/block/magnesium_wall_post.json index 2cc8c1ff..865aa677 100644 --- a/src/main/resources/assets/modernmetals/models/block/magnesium_wall_post.json +++ b/src/main/resources/assets/modernmetals/models/block/magnesium_wall_post.json @@ -1,6 +1,6 @@ { - "parent": "block/wall_post", - "textures": { - "wall": "modernmetals:blocks/magnesium_block" - } + "parent": "block/template_wall_post", + "textures": { + "wall": "modernmetals:blocks/magnesium_block" + } } diff --git a/src/main/resources/assets/modernmetals/models/block/magnesium_wall_side.json b/src/main/resources/assets/modernmetals/models/block/magnesium_wall_side.json index 490ddb61..9515cd0b 100644 --- a/src/main/resources/assets/modernmetals/models/block/magnesium_wall_side.json +++ b/src/main/resources/assets/modernmetals/models/block/magnesium_wall_side.json @@ -1,6 +1,6 @@ { - "parent": "block/wall_side", - "textures": { - "wall": "modernmetals:blocks/magnesium_block" - } + "parent": "block/template_wall_side", + "textures": { + "wall": "modernmetals:blocks/magnesium_block" + } } diff --git a/src/main/resources/assets/modernmetals/models/block/manganese_lever.json b/src/main/resources/assets/modernmetals/models/block/manganese_lever.json index 4bd5669a..b69f7a4b 100644 --- a/src/main/resources/assets/modernmetals/models/block/manganese_lever.json +++ b/src/main/resources/assets/modernmetals/models/block/manganese_lever.json @@ -1,33 +1,155 @@ { - "ambientocclusion": false, - "textures": { - "particle": "modernmetals:blocks/manganese_block", - "base": "modernmetals:blocks/manganese_block", - "lever": "blocks/lever" + "ambientocclusion": false, + "textures": { + "particle": "modernmetals:blocks/manganese_block", + "base": "modernmetals:blocks/manganese_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" + } + } }, - "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" } - } + { + "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/modernmetals/models/block/manganese_lever_off.json b/src/main/resources/assets/modernmetals/models/block/manganese_lever_off.json index b58b42f2..d1f25500 100644 --- a/src/main/resources/assets/modernmetals/models/block/manganese_lever_off.json +++ b/src/main/resources/assets/modernmetals/models/block/manganese_lever_off.json @@ -1,33 +1,155 @@ { - "ambientocclusion": false, - "textures": { - "particle": "modernmetals:blocks/manganese_block", - "base": "modernmetals:blocks/manganese_block", - "lever": "blocks/lever" + "ambientocclusion": false, + "textures": { + "particle": "modernmetals:blocks/manganese_block", + "base": "modernmetals:blocks/manganese_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" + } + } }, - "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" } - } + { + "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/modernmetals/models/block/manganese_ore.json b/src/main/resources/assets/modernmetals/models/block/manganese_ore.json new file mode 100644 index 00000000..265cbc94 --- /dev/null +++ b/src/main/resources/assets/modernmetals/models/block/manganese_ore.json @@ -0,0 +1,8 @@ +{ + "parent": "modernmetals:block/ore_overlay", + "textures": { + "particle": "minecraft:block/stone", + "base": "minecraft:block/stone", + "overlay": "modernmetals:blocks/ore_overlays/manganese_ore" + } +} diff --git a/src/main/resources/assets/modernmetals/models/block/manganese_trapdoor_bottom.json b/src/main/resources/assets/modernmetals/models/block/manganese_trapdoor_bottom.json index a37d3565..e5e7e97d 100644 --- a/src/main/resources/assets/modernmetals/models/block/manganese_trapdoor_bottom.json +++ b/src/main/resources/assets/modernmetals/models/block/manganese_trapdoor_bottom.json @@ -1,6 +1,6 @@ { - "parent": "block/trapdoor_bottom", - "textures": { - "texture": "modernmetals:blocks/manganese_trapdoor" - } + "parent": "block/template_orientable_trapdoor_bottom", + "textures": { + "texture": "modernmetals:blocks/manganese_trapdoor" + } } diff --git a/src/main/resources/assets/modernmetals/models/block/manganese_trapdoor_open.json b/src/main/resources/assets/modernmetals/models/block/manganese_trapdoor_open.json index fae1ef9a..22ec2532 100644 --- a/src/main/resources/assets/modernmetals/models/block/manganese_trapdoor_open.json +++ b/src/main/resources/assets/modernmetals/models/block/manganese_trapdoor_open.json @@ -1,6 +1,6 @@ { - "parent": "block/trapdoor_open", - "textures": { - "texture": "modernmetals:blocks/manganese_trapdoor" - } + "parent": "block/template_orientable_trapdoor_open", + "textures": { + "texture": "modernmetals:blocks/manganese_trapdoor" + } } diff --git a/src/main/resources/assets/modernmetals/models/block/manganese_trapdoor_top.json b/src/main/resources/assets/modernmetals/models/block/manganese_trapdoor_top.json index f1a23dfb..99a69edc 100644 --- a/src/main/resources/assets/modernmetals/models/block/manganese_trapdoor_top.json +++ b/src/main/resources/assets/modernmetals/models/block/manganese_trapdoor_top.json @@ -1,6 +1,6 @@ { - "parent": "block/trapdoor_top", - "textures": { - "texture": "modernmetals:blocks/manganese_trapdoor" - } + "parent": "block/template_orientable_trapdoor_top", + "textures": { + "texture": "modernmetals:blocks/manganese_trapdoor" + } } diff --git a/src/main/resources/assets/modernmetals/models/block/manganese_wall_post.json b/src/main/resources/assets/modernmetals/models/block/manganese_wall_post.json index e4cb844d..e1052415 100644 --- a/src/main/resources/assets/modernmetals/models/block/manganese_wall_post.json +++ b/src/main/resources/assets/modernmetals/models/block/manganese_wall_post.json @@ -1,6 +1,6 @@ { - "parent": "block/wall_post", - "textures": { - "wall": "modernmetals:blocks/manganese_block" - } + "parent": "block/template_wall_post", + "textures": { + "wall": "modernmetals:blocks/manganese_block" + } } diff --git a/src/main/resources/assets/modernmetals/models/block/manganese_wall_side.json b/src/main/resources/assets/modernmetals/models/block/manganese_wall_side.json index 02eb1b18..2c45cb0d 100644 --- a/src/main/resources/assets/modernmetals/models/block/manganese_wall_side.json +++ b/src/main/resources/assets/modernmetals/models/block/manganese_wall_side.json @@ -1,6 +1,6 @@ { - "parent": "block/wall_side", - "textures": { - "wall": "modernmetals:blocks/manganese_block" - } + "parent": "block/template_wall_side", + "textures": { + "wall": "modernmetals:blocks/manganese_block" + } } diff --git a/src/main/resources/assets/modernmetals/models/block/nichrome_lever.json b/src/main/resources/assets/modernmetals/models/block/nichrome_lever.json index 58612ba8..84762cdd 100644 --- a/src/main/resources/assets/modernmetals/models/block/nichrome_lever.json +++ b/src/main/resources/assets/modernmetals/models/block/nichrome_lever.json @@ -1,33 +1,155 @@ { - "ambientocclusion": false, - "textures": { - "particle": "modernmetals:blocks/nichrome_block", - "base": "modernmetals:blocks/nichrome_block", - "lever": "blocks/lever" + "ambientocclusion": false, + "textures": { + "particle": "modernmetals:blocks/nichrome_block", + "base": "modernmetals:blocks/nichrome_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" + } + } }, - "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" } - } + { + "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/modernmetals/models/block/nichrome_lever_off.json b/src/main/resources/assets/modernmetals/models/block/nichrome_lever_off.json index 1afa4538..5d969890 100644 --- a/src/main/resources/assets/modernmetals/models/block/nichrome_lever_off.json +++ b/src/main/resources/assets/modernmetals/models/block/nichrome_lever_off.json @@ -1,33 +1,155 @@ { - "ambientocclusion": false, - "textures": { - "particle": "modernmetals:blocks/nichrome_block", - "base": "modernmetals:blocks/nichrome_block", - "lever": "blocks/lever" + "ambientocclusion": false, + "textures": { + "particle": "modernmetals:blocks/nichrome_block", + "base": "modernmetals:blocks/nichrome_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" + } + } }, - "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" } - } + { + "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/modernmetals/models/block/nichrome_ore.json b/src/main/resources/assets/modernmetals/models/block/nichrome_ore.json new file mode 100644 index 00000000..0104e695 --- /dev/null +++ b/src/main/resources/assets/modernmetals/models/block/nichrome_ore.json @@ -0,0 +1,3 @@ +{ + "parent": "modernmetals:block/nichrome_block" +} diff --git a/src/main/resources/assets/modernmetals/models/block/nichrome_trapdoor_bottom.json b/src/main/resources/assets/modernmetals/models/block/nichrome_trapdoor_bottom.json index 11f98d01..bb8f6133 100644 --- a/src/main/resources/assets/modernmetals/models/block/nichrome_trapdoor_bottom.json +++ b/src/main/resources/assets/modernmetals/models/block/nichrome_trapdoor_bottom.json @@ -1,6 +1,6 @@ { - "parent": "block/trapdoor_bottom", - "textures": { - "texture": "modernmetals:blocks/nichrome_trapdoor" - } + "parent": "block/template_orientable_trapdoor_bottom", + "textures": { + "texture": "modernmetals:blocks/nichrome_trapdoor" + } } diff --git a/src/main/resources/assets/modernmetals/models/block/nichrome_trapdoor_open.json b/src/main/resources/assets/modernmetals/models/block/nichrome_trapdoor_open.json index 9022c051..42d68f73 100644 --- a/src/main/resources/assets/modernmetals/models/block/nichrome_trapdoor_open.json +++ b/src/main/resources/assets/modernmetals/models/block/nichrome_trapdoor_open.json @@ -1,6 +1,6 @@ { - "parent": "block/trapdoor_open", - "textures": { - "texture": "modernmetals:blocks/nichrome_trapdoor" - } + "parent": "block/template_orientable_trapdoor_open", + "textures": { + "texture": "modernmetals:blocks/nichrome_trapdoor" + } } diff --git a/src/main/resources/assets/modernmetals/models/block/nichrome_trapdoor_top.json b/src/main/resources/assets/modernmetals/models/block/nichrome_trapdoor_top.json index 7376def5..6508122e 100644 --- a/src/main/resources/assets/modernmetals/models/block/nichrome_trapdoor_top.json +++ b/src/main/resources/assets/modernmetals/models/block/nichrome_trapdoor_top.json @@ -1,6 +1,6 @@ { - "parent": "block/trapdoor_top", - "textures": { - "texture": "modernmetals:blocks/nichrome_trapdoor" - } + "parent": "block/template_orientable_trapdoor_top", + "textures": { + "texture": "modernmetals:blocks/nichrome_trapdoor" + } } diff --git a/src/main/resources/assets/modernmetals/models/block/nichrome_wall_post.json b/src/main/resources/assets/modernmetals/models/block/nichrome_wall_post.json index 648b4669..d5077270 100644 --- a/src/main/resources/assets/modernmetals/models/block/nichrome_wall_post.json +++ b/src/main/resources/assets/modernmetals/models/block/nichrome_wall_post.json @@ -1,6 +1,6 @@ { - "parent": "block/wall_post", - "textures": { - "wall": "modernmetals:blocks/nichrome_block" - } + "parent": "block/template_wall_post", + "textures": { + "wall": "modernmetals:blocks/nichrome_block" + } } diff --git a/src/main/resources/assets/modernmetals/models/block/nichrome_wall_side.json b/src/main/resources/assets/modernmetals/models/block/nichrome_wall_side.json index 6835e272..cf373099 100644 --- a/src/main/resources/assets/modernmetals/models/block/nichrome_wall_side.json +++ b/src/main/resources/assets/modernmetals/models/block/nichrome_wall_side.json @@ -1,6 +1,6 @@ { - "parent": "block/wall_side", - "textures": { - "wall": "modernmetals:blocks/nichrome_block" - } + "parent": "block/template_wall_side", + "textures": { + "wall": "modernmetals:blocks/nichrome_block" + } } diff --git a/src/main/resources/assets/modernmetals/models/block/ore_overlay.json b/src/main/resources/assets/modernmetals/models/block/ore_overlay.json new file mode 100644 index 00000000..540479a3 --- /dev/null +++ b/src/main/resources/assets/modernmetals/models/block/ore_overlay.json @@ -0,0 +1,153 @@ +{ + "parent": "minecraft:block/block", + "elements": [ + { + "from": [ + 0, + 0, + 0 + ], + "to": [ + 16, + 16, + 16 + ], + "faces": { + "down": { + "texture": "#base", + "cullface": "down", + "uv": [ + 0, + 0, + 16, + 16 + ] + }, + "up": { + "texture": "#base", + "cullface": "up", + "uv": [ + 0, + 0, + 16, + 16 + ] + }, + "north": { + "texture": "#base", + "cullface": "north", + "uv": [ + 0, + 0, + 16, + 16 + ] + }, + "south": { + "texture": "#base", + "cullface": "south", + "uv": [ + 0, + 0, + 16, + 16 + ] + }, + "west": { + "texture": "#base", + "cullface": "west", + "uv": [ + 0, + 0, + 16, + 16 + ] + }, + "east": { + "texture": "#base", + "cullface": "east", + "uv": [ + 0, + 0, + 16, + 16 + ] + } + } + }, + { + "from": [ + -0.05, + -0.05, + -0.05 + ], + "to": [ + 16.05, + 16.05, + 16.05 + ], + "faces": { + "down": { + "texture": "#overlay", + "cullface": "down", + "uv": [ + 0, + 0, + 16, + 16 + ] + }, + "up": { + "texture": "#overlay", + "cullface": "up", + "uv": [ + 0, + 0, + 16, + 16 + ] + }, + "north": { + "texture": "#overlay", + "cullface": "north", + "uv": [ + 0, + 0, + 16, + 16 + ] + }, + "south": { + "texture": "#overlay", + "cullface": "south", + "uv": [ + 0, + 0, + 16, + 16 + ] + }, + "west": { + "texture": "#overlay", + "cullface": "west", + "uv": [ + 0, + 0, + 16, + 16 + ] + }, + "east": { + "texture": "#overlay", + "cullface": "east", + "uv": [ + 0, + 0, + 16, + 16 + ] + } + } + } + ] +} diff --git a/src/main/resources/assets/modernmetals/models/block/osmium_lever.json b/src/main/resources/assets/modernmetals/models/block/osmium_lever.json index 8ea2a22d..3f221b20 100644 --- a/src/main/resources/assets/modernmetals/models/block/osmium_lever.json +++ b/src/main/resources/assets/modernmetals/models/block/osmium_lever.json @@ -1,33 +1,155 @@ { - "ambientocclusion": false, - "textures": { - "particle": "modernmetals:blocks/osmium_block", - "base": "modernmetals:blocks/osmium_block", - "lever": "blocks/lever" + "ambientocclusion": false, + "textures": { + "particle": "modernmetals:blocks/osmium_block", + "base": "modernmetals:blocks/osmium_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" + } + } }, - "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" } - } + { + "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/modernmetals/models/block/osmium_lever_off.json b/src/main/resources/assets/modernmetals/models/block/osmium_lever_off.json index e77d74e9..69826492 100644 --- a/src/main/resources/assets/modernmetals/models/block/osmium_lever_off.json +++ b/src/main/resources/assets/modernmetals/models/block/osmium_lever_off.json @@ -1,33 +1,155 @@ { - "ambientocclusion": false, - "textures": { - "particle": "modernmetals:blocks/osmium_block", - "base": "modernmetals:blocks/osmium_block", - "lever": "blocks/lever" + "ambientocclusion": false, + "textures": { + "particle": "modernmetals:blocks/osmium_block", + "base": "modernmetals:blocks/osmium_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" + } + } }, - "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" } - } + { + "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/modernmetals/models/block/osmium_ore.json b/src/main/resources/assets/modernmetals/models/block/osmium_ore.json new file mode 100644 index 00000000..5cdc64ec --- /dev/null +++ b/src/main/resources/assets/modernmetals/models/block/osmium_ore.json @@ -0,0 +1,8 @@ +{ + "parent": "modernmetals:block/ore_overlay", + "textures": { + "particle": "minecraft:block/stone", + "base": "minecraft:block/stone", + "overlay": "modernmetals:blocks/ore_overlays/osmium_ore" + } +} diff --git a/src/main/resources/assets/modernmetals/models/block/osmium_trapdoor_bottom.json b/src/main/resources/assets/modernmetals/models/block/osmium_trapdoor_bottom.json index 7a164a65..82d3d8b2 100644 --- a/src/main/resources/assets/modernmetals/models/block/osmium_trapdoor_bottom.json +++ b/src/main/resources/assets/modernmetals/models/block/osmium_trapdoor_bottom.json @@ -1,6 +1,6 @@ { - "parent": "block/trapdoor_bottom", - "textures": { - "texture": "modernmetals:blocks/osmium_trapdoor" - } + "parent": "block/template_orientable_trapdoor_bottom", + "textures": { + "texture": "modernmetals:blocks/osmium_trapdoor" + } } diff --git a/src/main/resources/assets/modernmetals/models/block/osmium_trapdoor_open.json b/src/main/resources/assets/modernmetals/models/block/osmium_trapdoor_open.json index e45c1163..4b981a26 100644 --- a/src/main/resources/assets/modernmetals/models/block/osmium_trapdoor_open.json +++ b/src/main/resources/assets/modernmetals/models/block/osmium_trapdoor_open.json @@ -1,6 +1,6 @@ { - "parent": "block/trapdoor_open", - "textures": { - "texture": "modernmetals:blocks/osmium_trapdoor" - } + "parent": "block/template_orientable_trapdoor_open", + "textures": { + "texture": "modernmetals:blocks/osmium_trapdoor" + } } diff --git a/src/main/resources/assets/modernmetals/models/block/osmium_trapdoor_top.json b/src/main/resources/assets/modernmetals/models/block/osmium_trapdoor_top.json index 2c35e0d4..790c8192 100644 --- a/src/main/resources/assets/modernmetals/models/block/osmium_trapdoor_top.json +++ b/src/main/resources/assets/modernmetals/models/block/osmium_trapdoor_top.json @@ -1,6 +1,6 @@ { - "parent": "block/trapdoor_top", - "textures": { - "texture": "modernmetals:blocks/osmium_trapdoor" - } + "parent": "block/template_orientable_trapdoor_top", + "textures": { + "texture": "modernmetals:blocks/osmium_trapdoor" + } } diff --git a/src/main/resources/assets/modernmetals/models/block/osmium_wall_post.json b/src/main/resources/assets/modernmetals/models/block/osmium_wall_post.json index 5a866657..c190ffd6 100644 --- a/src/main/resources/assets/modernmetals/models/block/osmium_wall_post.json +++ b/src/main/resources/assets/modernmetals/models/block/osmium_wall_post.json @@ -1,6 +1,6 @@ { - "parent": "block/wall_post", - "textures": { - "wall": "modernmetals:blocks/osmium_block" - } + "parent": "block/template_wall_post", + "textures": { + "wall": "modernmetals:blocks/osmium_block" + } } diff --git a/src/main/resources/assets/modernmetals/models/block/osmium_wall_side.json b/src/main/resources/assets/modernmetals/models/block/osmium_wall_side.json index c938cb6b..5b92cbf0 100644 --- a/src/main/resources/assets/modernmetals/models/block/osmium_wall_side.json +++ b/src/main/resources/assets/modernmetals/models/block/osmium_wall_side.json @@ -1,6 +1,6 @@ { - "parent": "block/wall_side", - "textures": { - "wall": "modernmetals:blocks/osmium_block" - } + "parent": "block/template_wall_side", + "textures": { + "wall": "modernmetals:blocks/osmium_block" + } } diff --git a/src/main/resources/assets/modernmetals/models/block/plutonium_lever.json b/src/main/resources/assets/modernmetals/models/block/plutonium_lever.json index 4b173a76..97330837 100644 --- a/src/main/resources/assets/modernmetals/models/block/plutonium_lever.json +++ b/src/main/resources/assets/modernmetals/models/block/plutonium_lever.json @@ -1,33 +1,155 @@ { - "ambientocclusion": false, - "textures": { - "particle": "modernmetals:blocks/plutonium_block", - "base": "modernmetals:blocks/plutonium_block", - "lever": "blocks/lever" + "ambientocclusion": false, + "textures": { + "particle": "modernmetals:blocks/plutonium_block", + "base": "modernmetals:blocks/plutonium_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" + } + } }, - "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" } - } + { + "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/modernmetals/models/block/plutonium_lever_off.json b/src/main/resources/assets/modernmetals/models/block/plutonium_lever_off.json index ba671e53..5cd5c72d 100644 --- a/src/main/resources/assets/modernmetals/models/block/plutonium_lever_off.json +++ b/src/main/resources/assets/modernmetals/models/block/plutonium_lever_off.json @@ -1,33 +1,155 @@ { - "ambientocclusion": false, - "textures": { - "particle": "modernmetals:blocks/plutonium_block", - "base": "modernmetals:blocks/plutonium_block", - "lever": "blocks/lever" + "ambientocclusion": false, + "textures": { + "particle": "modernmetals:blocks/plutonium_block", + "base": "modernmetals:blocks/plutonium_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" + } + } }, - "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" } - } + { + "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/modernmetals/models/block/plutonium_ore.json b/src/main/resources/assets/modernmetals/models/block/plutonium_ore.json new file mode 100644 index 00000000..71f0ee19 --- /dev/null +++ b/src/main/resources/assets/modernmetals/models/block/plutonium_ore.json @@ -0,0 +1,8 @@ +{ + "parent": "modernmetals:block/ore_overlay", + "textures": { + "particle": "minecraft:block/stone", + "base": "minecraft:block/stone", + "overlay": "modernmetals:blocks/ore_overlays/plutonium_ore" + } +} diff --git a/src/main/resources/assets/modernmetals/models/block/plutonium_trapdoor_bottom.json b/src/main/resources/assets/modernmetals/models/block/plutonium_trapdoor_bottom.json index 6ff84a93..e2a8d7c7 100644 --- a/src/main/resources/assets/modernmetals/models/block/plutonium_trapdoor_bottom.json +++ b/src/main/resources/assets/modernmetals/models/block/plutonium_trapdoor_bottom.json @@ -1,6 +1,6 @@ { - "parent": "block/trapdoor_bottom", - "textures": { - "texture": "modernmetals:blocks/plutonium_trapdoor" - } + "parent": "block/template_orientable_trapdoor_bottom", + "textures": { + "texture": "modernmetals:blocks/plutonium_trapdoor" + } } diff --git a/src/main/resources/assets/modernmetals/models/block/plutonium_trapdoor_open.json b/src/main/resources/assets/modernmetals/models/block/plutonium_trapdoor_open.json index 43a43c24..42fa9c3b 100644 --- a/src/main/resources/assets/modernmetals/models/block/plutonium_trapdoor_open.json +++ b/src/main/resources/assets/modernmetals/models/block/plutonium_trapdoor_open.json @@ -1,6 +1,6 @@ { - "parent": "block/trapdoor_open", - "textures": { - "texture": "modernmetals:blocks/plutonium_trapdoor" - } + "parent": "block/template_orientable_trapdoor_open", + "textures": { + "texture": "modernmetals:blocks/plutonium_trapdoor" + } } diff --git a/src/main/resources/assets/modernmetals/models/block/plutonium_trapdoor_top.json b/src/main/resources/assets/modernmetals/models/block/plutonium_trapdoor_top.json index bdb0f679..0fca4a20 100644 --- a/src/main/resources/assets/modernmetals/models/block/plutonium_trapdoor_top.json +++ b/src/main/resources/assets/modernmetals/models/block/plutonium_trapdoor_top.json @@ -1,6 +1,6 @@ { - "parent": "block/trapdoor_top", - "textures": { - "texture": "modernmetals:blocks/plutonium_trapdoor" - } + "parent": "block/template_orientable_trapdoor_top", + "textures": { + "texture": "modernmetals:blocks/plutonium_trapdoor" + } } diff --git a/src/main/resources/assets/modernmetals/models/block/plutonium_wall_post.json b/src/main/resources/assets/modernmetals/models/block/plutonium_wall_post.json index 3c0a9a28..9e5bf2e4 100644 --- a/src/main/resources/assets/modernmetals/models/block/plutonium_wall_post.json +++ b/src/main/resources/assets/modernmetals/models/block/plutonium_wall_post.json @@ -1,6 +1,6 @@ { - "parent": "block/wall_post", - "textures": { - "wall": "modernmetals:blocks/plutonium_block" - } + "parent": "block/template_wall_post", + "textures": { + "wall": "modernmetals:blocks/plutonium_block" + } } diff --git a/src/main/resources/assets/modernmetals/models/block/plutonium_wall_side.json b/src/main/resources/assets/modernmetals/models/block/plutonium_wall_side.json index 916a7302..4d75a5d0 100644 --- a/src/main/resources/assets/modernmetals/models/block/plutonium_wall_side.json +++ b/src/main/resources/assets/modernmetals/models/block/plutonium_wall_side.json @@ -1,6 +1,6 @@ { - "parent": "block/wall_side", - "textures": { - "wall": "modernmetals:blocks/plutonium_block" - } + "parent": "block/template_wall_side", + "textures": { + "wall": "modernmetals:blocks/plutonium_block" + } } diff --git a/src/main/resources/assets/modernmetals/models/block/rutile_lever.json b/src/main/resources/assets/modernmetals/models/block/rutile_lever.json index 7433fbf3..79bd61b4 100644 --- a/src/main/resources/assets/modernmetals/models/block/rutile_lever.json +++ b/src/main/resources/assets/modernmetals/models/block/rutile_lever.json @@ -1,33 +1,155 @@ { - "ambientocclusion": false, - "textures": { - "particle": "modernmetals:blocks/rutile_block", - "base": "modernmetals:blocks/rutile_block", - "lever": "blocks/lever" + "ambientocclusion": false, + "textures": { + "particle": "modernmetals:blocks/rutile_block", + "base": "modernmetals:blocks/rutile_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" + } + } }, - "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" } - } + { + "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/modernmetals/models/block/rutile_lever_off.json b/src/main/resources/assets/modernmetals/models/block/rutile_lever_off.json index 6f923e76..3c2edf80 100644 --- a/src/main/resources/assets/modernmetals/models/block/rutile_lever_off.json +++ b/src/main/resources/assets/modernmetals/models/block/rutile_lever_off.json @@ -1,33 +1,155 @@ { - "ambientocclusion": false, - "textures": { - "particle": "modernmetals:blocks/rutile_block", - "base": "modernmetals:blocks/rutile_block", - "lever": "blocks/lever" + "ambientocclusion": false, + "textures": { + "particle": "modernmetals:blocks/rutile_block", + "base": "modernmetals:blocks/rutile_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" + } + } }, - "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" } - } + { + "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/modernmetals/models/block/rutile_ore.json b/src/main/resources/assets/modernmetals/models/block/rutile_ore.json new file mode 100644 index 00000000..5c7db2a5 --- /dev/null +++ b/src/main/resources/assets/modernmetals/models/block/rutile_ore.json @@ -0,0 +1,8 @@ +{ + "parent": "modernmetals:block/ore_overlay", + "textures": { + "particle": "minecraft:block/stone", + "base": "minecraft:block/stone", + "overlay": "modernmetals:blocks/ore_overlays/rutile_ore" + } +} diff --git a/src/main/resources/assets/modernmetals/models/block/rutile_trapdoor_bottom.json b/src/main/resources/assets/modernmetals/models/block/rutile_trapdoor_bottom.json index aaad3c95..79f03c7d 100644 --- a/src/main/resources/assets/modernmetals/models/block/rutile_trapdoor_bottom.json +++ b/src/main/resources/assets/modernmetals/models/block/rutile_trapdoor_bottom.json @@ -1,6 +1,6 @@ { - "parent": "block/trapdoor_bottom", - "textures": { - "texture": "modernmetals:blocks/rutile_trapdoor" - } + "parent": "block/template_orientable_trapdoor_bottom", + "textures": { + "texture": "modernmetals:blocks/rutile_trapdoor" + } } diff --git a/src/main/resources/assets/modernmetals/models/block/rutile_trapdoor_open.json b/src/main/resources/assets/modernmetals/models/block/rutile_trapdoor_open.json index 936ebd5b..df486fa9 100644 --- a/src/main/resources/assets/modernmetals/models/block/rutile_trapdoor_open.json +++ b/src/main/resources/assets/modernmetals/models/block/rutile_trapdoor_open.json @@ -1,6 +1,6 @@ { - "parent": "block/trapdoor_open", - "textures": { - "texture": "modernmetals:blocks/rutile_trapdoor" - } + "parent": "block/template_orientable_trapdoor_open", + "textures": { + "texture": "modernmetals:blocks/rutile_trapdoor" + } } diff --git a/src/main/resources/assets/modernmetals/models/block/rutile_trapdoor_top.json b/src/main/resources/assets/modernmetals/models/block/rutile_trapdoor_top.json index 28781d3c..6078e080 100644 --- a/src/main/resources/assets/modernmetals/models/block/rutile_trapdoor_top.json +++ b/src/main/resources/assets/modernmetals/models/block/rutile_trapdoor_top.json @@ -1,6 +1,6 @@ { - "parent": "block/trapdoor_top", - "textures": { - "texture": "modernmetals:blocks/rutile_trapdoor" - } + "parent": "block/template_orientable_trapdoor_top", + "textures": { + "texture": "modernmetals:blocks/rutile_trapdoor" + } } diff --git a/src/main/resources/assets/modernmetals/models/block/rutile_wall_post.json b/src/main/resources/assets/modernmetals/models/block/rutile_wall_post.json index aac4210b..b553081f 100644 --- a/src/main/resources/assets/modernmetals/models/block/rutile_wall_post.json +++ b/src/main/resources/assets/modernmetals/models/block/rutile_wall_post.json @@ -1,6 +1,6 @@ { - "parent": "block/wall_post", - "textures": { - "wall": "modernmetals:blocks/rutile_block" - } + "parent": "block/template_wall_post", + "textures": { + "wall": "modernmetals:blocks/rutile_block" + } } diff --git a/src/main/resources/assets/modernmetals/models/block/rutile_wall_side.json b/src/main/resources/assets/modernmetals/models/block/rutile_wall_side.json index 6623b010..b133c080 100644 --- a/src/main/resources/assets/modernmetals/models/block/rutile_wall_side.json +++ b/src/main/resources/assets/modernmetals/models/block/rutile_wall_side.json @@ -1,6 +1,6 @@ { - "parent": "block/wall_side", - "textures": { - "wall": "modernmetals:blocks/rutile_block" - } + "parent": "block/template_wall_side", + "textures": { + "wall": "modernmetals:blocks/rutile_block" + } } diff --git a/src/main/resources/assets/modernmetals/models/block/stainlesssteel_lever.json b/src/main/resources/assets/modernmetals/models/block/stainlesssteel_lever.json index 7e40ac3c..e89c3b50 100644 --- a/src/main/resources/assets/modernmetals/models/block/stainlesssteel_lever.json +++ b/src/main/resources/assets/modernmetals/models/block/stainlesssteel_lever.json @@ -1,33 +1,155 @@ { - "ambientocclusion": false, - "textures": { - "particle": "modernmetals:blocks/stainlesssteel_block", - "base": "modernmetals:blocks/stainlesssteel_block", - "lever": "blocks/lever" + "ambientocclusion": false, + "textures": { + "particle": "modernmetals:blocks/stainlesssteel_block", + "base": "modernmetals:blocks/stainlesssteel_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" + } + } }, - "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" } - } + { + "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/modernmetals/models/block/stainlesssteel_lever_off.json b/src/main/resources/assets/modernmetals/models/block/stainlesssteel_lever_off.json index dc6c600f..fd68a3e1 100644 --- a/src/main/resources/assets/modernmetals/models/block/stainlesssteel_lever_off.json +++ b/src/main/resources/assets/modernmetals/models/block/stainlesssteel_lever_off.json @@ -1,33 +1,155 @@ { - "ambientocclusion": false, - "textures": { - "particle": "modernmetals:blocks/stainlesssteel_block", - "base": "modernmetals:blocks/stainlesssteel_block", - "lever": "blocks/lever" + "ambientocclusion": false, + "textures": { + "particle": "modernmetals:blocks/stainlesssteel_block", + "base": "modernmetals:blocks/stainlesssteel_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" + } + } }, - "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" } - } + { + "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/modernmetals/models/block/stainlesssteel_ore.json b/src/main/resources/assets/modernmetals/models/block/stainlesssteel_ore.json new file mode 100644 index 00000000..7b35e8cc --- /dev/null +++ b/src/main/resources/assets/modernmetals/models/block/stainlesssteel_ore.json @@ -0,0 +1,3 @@ +{ + "parent": "modernmetals:block/stainlesssteel_block" +} diff --git a/src/main/resources/assets/modernmetals/models/block/stainlesssteel_trapdoor_bottom.json b/src/main/resources/assets/modernmetals/models/block/stainlesssteel_trapdoor_bottom.json index 448f1c58..be6751b0 100644 --- a/src/main/resources/assets/modernmetals/models/block/stainlesssteel_trapdoor_bottom.json +++ b/src/main/resources/assets/modernmetals/models/block/stainlesssteel_trapdoor_bottom.json @@ -1,6 +1,6 @@ { - "parent": "block/trapdoor_bottom", - "textures": { - "texture": "modernmetals:blocks/stainlesssteel_trapdoor" - } + "parent": "block/template_orientable_trapdoor_bottom", + "textures": { + "texture": "modernmetals:blocks/stainlesssteel_trapdoor" + } } diff --git a/src/main/resources/assets/modernmetals/models/block/stainlesssteel_trapdoor_open.json b/src/main/resources/assets/modernmetals/models/block/stainlesssteel_trapdoor_open.json index b0cf4532..39da0043 100644 --- a/src/main/resources/assets/modernmetals/models/block/stainlesssteel_trapdoor_open.json +++ b/src/main/resources/assets/modernmetals/models/block/stainlesssteel_trapdoor_open.json @@ -1,6 +1,6 @@ { - "parent": "block/trapdoor_open", - "textures": { - "texture": "modernmetals:blocks/stainlesssteel_trapdoor" - } + "parent": "block/template_orientable_trapdoor_open", + "textures": { + "texture": "modernmetals:blocks/stainlesssteel_trapdoor" + } } diff --git a/src/main/resources/assets/modernmetals/models/block/stainlesssteel_trapdoor_top.json b/src/main/resources/assets/modernmetals/models/block/stainlesssteel_trapdoor_top.json index 1bc46430..88039fcd 100644 --- a/src/main/resources/assets/modernmetals/models/block/stainlesssteel_trapdoor_top.json +++ b/src/main/resources/assets/modernmetals/models/block/stainlesssteel_trapdoor_top.json @@ -1,6 +1,6 @@ { - "parent": "block/trapdoor_top", - "textures": { - "texture": "modernmetals:blocks/stainlesssteel_trapdoor" - } + "parent": "block/template_orientable_trapdoor_top", + "textures": { + "texture": "modernmetals:blocks/stainlesssteel_trapdoor" + } } diff --git a/src/main/resources/assets/modernmetals/models/block/stainlesssteel_wall_post.json b/src/main/resources/assets/modernmetals/models/block/stainlesssteel_wall_post.json index 8d90cce0..dc90c2d1 100644 --- a/src/main/resources/assets/modernmetals/models/block/stainlesssteel_wall_post.json +++ b/src/main/resources/assets/modernmetals/models/block/stainlesssteel_wall_post.json @@ -1,6 +1,6 @@ { - "parent": "block/wall_post", - "textures": { - "wall": "modernmetals:blocks/stainlesssteel_block" - } + "parent": "block/template_wall_post", + "textures": { + "wall": "modernmetals:blocks/stainlesssteel_block" + } } diff --git a/src/main/resources/assets/modernmetals/models/block/stainlesssteel_wall_side.json b/src/main/resources/assets/modernmetals/models/block/stainlesssteel_wall_side.json index 8cfa092c..38abc55e 100644 --- a/src/main/resources/assets/modernmetals/models/block/stainlesssteel_wall_side.json +++ b/src/main/resources/assets/modernmetals/models/block/stainlesssteel_wall_side.json @@ -1,6 +1,6 @@ { - "parent": "block/wall_side", - "textures": { - "wall": "modernmetals:blocks/stainlesssteel_block" - } + "parent": "block/template_wall_side", + "textures": { + "wall": "modernmetals:blocks/stainlesssteel_block" + } } diff --git a/src/main/resources/assets/modernmetals/models/block/tantalum_lever.json b/src/main/resources/assets/modernmetals/models/block/tantalum_lever.json index 6cc52020..a29f8c26 100644 --- a/src/main/resources/assets/modernmetals/models/block/tantalum_lever.json +++ b/src/main/resources/assets/modernmetals/models/block/tantalum_lever.json @@ -1,33 +1,155 @@ { - "ambientocclusion": false, - "textures": { - "particle": "modernmetals:blocks/tantalum_block", - "base": "modernmetals:blocks/tantalum_block", - "lever": "blocks/lever" + "ambientocclusion": false, + "textures": { + "particle": "modernmetals:blocks/tantalum_block", + "base": "modernmetals:blocks/tantalum_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" + } + } }, - "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" } - } + { + "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/modernmetals/models/block/tantalum_lever_off.json b/src/main/resources/assets/modernmetals/models/block/tantalum_lever_off.json index eaa0a140..e036c41a 100644 --- a/src/main/resources/assets/modernmetals/models/block/tantalum_lever_off.json +++ b/src/main/resources/assets/modernmetals/models/block/tantalum_lever_off.json @@ -1,33 +1,155 @@ { - "ambientocclusion": false, - "textures": { - "particle": "modernmetals:blocks/tantalum_block", - "base": "modernmetals:blocks/tantalum_block", - "lever": "blocks/lever" + "ambientocclusion": false, + "textures": { + "particle": "modernmetals:blocks/tantalum_block", + "base": "modernmetals:blocks/tantalum_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" + } + } }, - "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" } - } + { + "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/modernmetals/models/block/tantalum_ore.json b/src/main/resources/assets/modernmetals/models/block/tantalum_ore.json new file mode 100644 index 00000000..e0692f5d --- /dev/null +++ b/src/main/resources/assets/modernmetals/models/block/tantalum_ore.json @@ -0,0 +1,8 @@ +{ + "parent": "modernmetals:block/ore_overlay", + "textures": { + "particle": "minecraft:block/stone", + "base": "minecraft:block/stone", + "overlay": "modernmetals:blocks/ore_overlays/tantalum_ore" + } +} diff --git a/src/main/resources/assets/modernmetals/models/block/tantalum_trapdoor_bottom.json b/src/main/resources/assets/modernmetals/models/block/tantalum_trapdoor_bottom.json index f5a089da..1d8b9842 100644 --- a/src/main/resources/assets/modernmetals/models/block/tantalum_trapdoor_bottom.json +++ b/src/main/resources/assets/modernmetals/models/block/tantalum_trapdoor_bottom.json @@ -1,6 +1,6 @@ { - "parent": "block/trapdoor_bottom", - "textures": { - "texture": "modernmetals:blocks/tantalum_trapdoor" - } + "parent": "block/template_orientable_trapdoor_bottom", + "textures": { + "texture": "modernmetals:blocks/tantalum_trapdoor" + } } diff --git a/src/main/resources/assets/modernmetals/models/block/tantalum_trapdoor_open.json b/src/main/resources/assets/modernmetals/models/block/tantalum_trapdoor_open.json index b188a319..3c2c6f37 100644 --- a/src/main/resources/assets/modernmetals/models/block/tantalum_trapdoor_open.json +++ b/src/main/resources/assets/modernmetals/models/block/tantalum_trapdoor_open.json @@ -1,6 +1,6 @@ { - "parent": "block/trapdoor_open", - "textures": { - "texture": "modernmetals:blocks/tantalum_trapdoor" - } + "parent": "block/template_orientable_trapdoor_open", + "textures": { + "texture": "modernmetals:blocks/tantalum_trapdoor" + } } diff --git a/src/main/resources/assets/modernmetals/models/block/tantalum_trapdoor_top.json b/src/main/resources/assets/modernmetals/models/block/tantalum_trapdoor_top.json index 6d5a8c82..6af6b1e6 100644 --- a/src/main/resources/assets/modernmetals/models/block/tantalum_trapdoor_top.json +++ b/src/main/resources/assets/modernmetals/models/block/tantalum_trapdoor_top.json @@ -1,6 +1,6 @@ { - "parent": "block/trapdoor_top", - "textures": { - "texture": "modernmetals:blocks/tantalum_trapdoor" - } + "parent": "block/template_orientable_trapdoor_top", + "textures": { + "texture": "modernmetals:blocks/tantalum_trapdoor" + } } diff --git a/src/main/resources/assets/modernmetals/models/block/tantalum_wall_post.json b/src/main/resources/assets/modernmetals/models/block/tantalum_wall_post.json index fc03e971..819fe6f4 100644 --- a/src/main/resources/assets/modernmetals/models/block/tantalum_wall_post.json +++ b/src/main/resources/assets/modernmetals/models/block/tantalum_wall_post.json @@ -1,6 +1,6 @@ { - "parent": "block/wall_post", - "textures": { - "wall": "modernmetals:blocks/tantalum_block" - } + "parent": "block/template_wall_post", + "textures": { + "wall": "modernmetals:blocks/tantalum_block" + } } diff --git a/src/main/resources/assets/modernmetals/models/block/tantalum_wall_side.json b/src/main/resources/assets/modernmetals/models/block/tantalum_wall_side.json index 776f1589..31fa99ea 100644 --- a/src/main/resources/assets/modernmetals/models/block/tantalum_wall_side.json +++ b/src/main/resources/assets/modernmetals/models/block/tantalum_wall_side.json @@ -1,6 +1,6 @@ { - "parent": "block/wall_side", - "textures": { - "wall": "modernmetals:blocks/tantalum_block" - } + "parent": "block/template_wall_side", + "textures": { + "wall": "modernmetals:blocks/tantalum_block" + } } diff --git a/src/main/resources/assets/modernmetals/models/block/thorium_lever.json b/src/main/resources/assets/modernmetals/models/block/thorium_lever.json index 1001271d..d35629ef 100644 --- a/src/main/resources/assets/modernmetals/models/block/thorium_lever.json +++ b/src/main/resources/assets/modernmetals/models/block/thorium_lever.json @@ -1,33 +1,155 @@ { - "ambientocclusion": false, - "textures": { - "particle": "modernmetals:blocks/thorium_block", - "base": "modernmetals:blocks/thorium_block", - "lever": "blocks/lever" + "ambientocclusion": false, + "textures": { + "particle": "modernmetals:blocks/thorium_block", + "base": "modernmetals:blocks/thorium_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" + } + } }, - "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" } - } + { + "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/modernmetals/models/block/thorium_lever_off.json b/src/main/resources/assets/modernmetals/models/block/thorium_lever_off.json index d12ea241..9fc6f9c3 100644 --- a/src/main/resources/assets/modernmetals/models/block/thorium_lever_off.json +++ b/src/main/resources/assets/modernmetals/models/block/thorium_lever_off.json @@ -1,33 +1,155 @@ { - "ambientocclusion": false, - "textures": { - "particle": "modernmetals:blocks/thorium_block", - "base": "modernmetals:blocks/thorium_block", - "lever": "blocks/lever" + "ambientocclusion": false, + "textures": { + "particle": "modernmetals:blocks/thorium_block", + "base": "modernmetals:blocks/thorium_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" + } + } }, - "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" } - } + { + "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/modernmetals/models/block/thorium_trapdoor_bottom.json b/src/main/resources/assets/modernmetals/models/block/thorium_trapdoor_bottom.json index 9a99b53a..6c4f6b78 100644 --- a/src/main/resources/assets/modernmetals/models/block/thorium_trapdoor_bottom.json +++ b/src/main/resources/assets/modernmetals/models/block/thorium_trapdoor_bottom.json @@ -1,6 +1,6 @@ { - "parent": "block/trapdoor_bottom", - "textures": { - "texture": "modernmetals:blocks/thorium_trapdoor" - } + "parent": "block/template_orientable_trapdoor_bottom", + "textures": { + "texture": "modernmetals:blocks/thorium_trapdoor" + } } diff --git a/src/main/resources/assets/modernmetals/models/block/thorium_trapdoor_open.json b/src/main/resources/assets/modernmetals/models/block/thorium_trapdoor_open.json index 10d17c51..fafd64d9 100644 --- a/src/main/resources/assets/modernmetals/models/block/thorium_trapdoor_open.json +++ b/src/main/resources/assets/modernmetals/models/block/thorium_trapdoor_open.json @@ -1,6 +1,6 @@ { - "parent": "block/trapdoor_open", - "textures": { - "texture": "modernmetals:blocks/thorium_trapdoor" - } + "parent": "block/template_orientable_trapdoor_open", + "textures": { + "texture": "modernmetals:blocks/thorium_trapdoor" + } } diff --git a/src/main/resources/assets/modernmetals/models/block/thorium_trapdoor_top.json b/src/main/resources/assets/modernmetals/models/block/thorium_trapdoor_top.json index d85847fb..a33ec259 100644 --- a/src/main/resources/assets/modernmetals/models/block/thorium_trapdoor_top.json +++ b/src/main/resources/assets/modernmetals/models/block/thorium_trapdoor_top.json @@ -1,6 +1,6 @@ { - "parent": "block/trapdoor_top", - "textures": { - "texture": "modernmetals:blocks/thorium_trapdoor" - } + "parent": "block/template_orientable_trapdoor_top", + "textures": { + "texture": "modernmetals:blocks/thorium_trapdoor" + } } diff --git a/src/main/resources/assets/modernmetals/models/block/thorium_wall_post.json b/src/main/resources/assets/modernmetals/models/block/thorium_wall_post.json index 7f3d1843..78517db7 100644 --- a/src/main/resources/assets/modernmetals/models/block/thorium_wall_post.json +++ b/src/main/resources/assets/modernmetals/models/block/thorium_wall_post.json @@ -1,6 +1,6 @@ { - "parent": "block/wall_post", - "textures": { - "wall": "modernmetals:blocks/thorium_block" - } + "parent": "block/template_wall_post", + "textures": { + "wall": "modernmetals:blocks/thorium_block" + } } diff --git a/src/main/resources/assets/modernmetals/models/block/thorium_wall_side.json b/src/main/resources/assets/modernmetals/models/block/thorium_wall_side.json index 9a5c60b0..e562fa81 100644 --- a/src/main/resources/assets/modernmetals/models/block/thorium_wall_side.json +++ b/src/main/resources/assets/modernmetals/models/block/thorium_wall_side.json @@ -1,6 +1,6 @@ { - "parent": "block/wall_side", - "textures": { - "wall": "modernmetals:blocks/thorium_block" - } + "parent": "block/template_wall_side", + "textures": { + "wall": "modernmetals:blocks/thorium_block" + } } diff --git a/src/main/resources/assets/modernmetals/models/block/titanium_lever.json b/src/main/resources/assets/modernmetals/models/block/titanium_lever.json index d6e74642..9f24bdb5 100644 --- a/src/main/resources/assets/modernmetals/models/block/titanium_lever.json +++ b/src/main/resources/assets/modernmetals/models/block/titanium_lever.json @@ -1,33 +1,155 @@ { - "ambientocclusion": false, - "textures": { - "particle": "modernmetals:blocks/titanium_block", - "base": "modernmetals:blocks/titanium_block", - "lever": "blocks/lever" + "ambientocclusion": false, + "textures": { + "particle": "modernmetals:blocks/titanium_block", + "base": "modernmetals:blocks/titanium_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" + } + } }, - "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" } - } + { + "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/modernmetals/models/block/titanium_lever_off.json b/src/main/resources/assets/modernmetals/models/block/titanium_lever_off.json index d7783169..de2fb7f3 100644 --- a/src/main/resources/assets/modernmetals/models/block/titanium_lever_off.json +++ b/src/main/resources/assets/modernmetals/models/block/titanium_lever_off.json @@ -1,33 +1,155 @@ { - "ambientocclusion": false, - "textures": { - "particle": "modernmetals:blocks/titanium_block", - "base": "modernmetals:blocks/titanium_block", - "lever": "blocks/lever" + "ambientocclusion": false, + "textures": { + "particle": "modernmetals:blocks/titanium_block", + "base": "modernmetals:blocks/titanium_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" + } + } }, - "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" } - } + { + "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/modernmetals/models/block/titanium_ore.json b/src/main/resources/assets/modernmetals/models/block/titanium_ore.json new file mode 100644 index 00000000..2917d9e1 --- /dev/null +++ b/src/main/resources/assets/modernmetals/models/block/titanium_ore.json @@ -0,0 +1,8 @@ +{ + "parent": "modernmetals:block/ore_overlay", + "textures": { + "particle": "minecraft:block/stone", + "base": "minecraft:block/stone", + "overlay": "modernmetals:blocks/ore_overlays/titanium_ore" + } +} diff --git a/src/main/resources/assets/modernmetals/models/block/titanium_trapdoor_bottom.json b/src/main/resources/assets/modernmetals/models/block/titanium_trapdoor_bottom.json index becba5e3..1a9da68f 100644 --- a/src/main/resources/assets/modernmetals/models/block/titanium_trapdoor_bottom.json +++ b/src/main/resources/assets/modernmetals/models/block/titanium_trapdoor_bottom.json @@ -1,6 +1,6 @@ { - "parent": "block/trapdoor_bottom", - "textures": { - "texture": "modernmetals:blocks/titanium_trapdoor" - } + "parent": "block/template_orientable_trapdoor_bottom", + "textures": { + "texture": "modernmetals:blocks/titanium_trapdoor" + } } diff --git a/src/main/resources/assets/modernmetals/models/block/titanium_trapdoor_open.json b/src/main/resources/assets/modernmetals/models/block/titanium_trapdoor_open.json index 9434fbf0..ca14bedb 100644 --- a/src/main/resources/assets/modernmetals/models/block/titanium_trapdoor_open.json +++ b/src/main/resources/assets/modernmetals/models/block/titanium_trapdoor_open.json @@ -1,6 +1,6 @@ { - "parent": "block/trapdoor_open", - "textures": { - "texture": "modernmetals:blocks/titanium_trapdoor" - } + "parent": "block/template_orientable_trapdoor_open", + "textures": { + "texture": "modernmetals:blocks/titanium_trapdoor" + } } diff --git a/src/main/resources/assets/modernmetals/models/block/titanium_trapdoor_top.json b/src/main/resources/assets/modernmetals/models/block/titanium_trapdoor_top.json index d3ceeb3f..8da0aef7 100644 --- a/src/main/resources/assets/modernmetals/models/block/titanium_trapdoor_top.json +++ b/src/main/resources/assets/modernmetals/models/block/titanium_trapdoor_top.json @@ -1,6 +1,6 @@ { - "parent": "block/trapdoor_top", - "textures": { - "texture": "modernmetals:blocks/titanium_trapdoor" - } + "parent": "block/template_orientable_trapdoor_top", + "textures": { + "texture": "modernmetals:blocks/titanium_trapdoor" + } } diff --git a/src/main/resources/assets/modernmetals/models/block/titanium_wall_post.json b/src/main/resources/assets/modernmetals/models/block/titanium_wall_post.json index 9cc280c1..5c452e3e 100644 --- a/src/main/resources/assets/modernmetals/models/block/titanium_wall_post.json +++ b/src/main/resources/assets/modernmetals/models/block/titanium_wall_post.json @@ -1,6 +1,6 @@ { - "parent": "block/wall_post", - "textures": { - "wall": "modernmetals:blocks/titanium_block" - } + "parent": "block/template_wall_post", + "textures": { + "wall": "modernmetals:blocks/titanium_block" + } } diff --git a/src/main/resources/assets/modernmetals/models/block/titanium_wall_side.json b/src/main/resources/assets/modernmetals/models/block/titanium_wall_side.json index 9cec6271..8abe5bb5 100644 --- a/src/main/resources/assets/modernmetals/models/block/titanium_wall_side.json +++ b/src/main/resources/assets/modernmetals/models/block/titanium_wall_side.json @@ -1,6 +1,6 @@ { - "parent": "block/wall_side", - "textures": { - "wall": "modernmetals:blocks/titanium_block" - } + "parent": "block/template_wall_side", + "textures": { + "wall": "modernmetals:blocks/titanium_block" + } } diff --git a/src/main/resources/assets/modernmetals/models/block/tungsten_lever.json b/src/main/resources/assets/modernmetals/models/block/tungsten_lever.json index 061a57ad..c81f26f3 100644 --- a/src/main/resources/assets/modernmetals/models/block/tungsten_lever.json +++ b/src/main/resources/assets/modernmetals/models/block/tungsten_lever.json @@ -1,33 +1,155 @@ { - "ambientocclusion": false, - "textures": { - "particle": "modernmetals:blocks/tungsten_block", - "base": "modernmetals:blocks/tungsten_block", - "lever": "blocks/lever" + "ambientocclusion": false, + "textures": { + "particle": "modernmetals:blocks/tungsten_block", + "base": "modernmetals:blocks/tungsten_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" + } + } }, - "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" } - } + { + "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/modernmetals/models/block/tungsten_lever_off.json b/src/main/resources/assets/modernmetals/models/block/tungsten_lever_off.json index add260b8..f3b8bdf7 100644 --- a/src/main/resources/assets/modernmetals/models/block/tungsten_lever_off.json +++ b/src/main/resources/assets/modernmetals/models/block/tungsten_lever_off.json @@ -1,33 +1,155 @@ { - "ambientocclusion": false, - "textures": { - "particle": "modernmetals:blocks/tungsten_block", - "base": "modernmetals:blocks/tungsten_block", - "lever": "blocks/lever" + "ambientocclusion": false, + "textures": { + "particle": "modernmetals:blocks/tungsten_block", + "base": "modernmetals:blocks/tungsten_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" + } + } }, - "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" } - } + { + "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/modernmetals/models/block/tungsten_ore.json b/src/main/resources/assets/modernmetals/models/block/tungsten_ore.json new file mode 100644 index 00000000..eacbc4f3 --- /dev/null +++ b/src/main/resources/assets/modernmetals/models/block/tungsten_ore.json @@ -0,0 +1,8 @@ +{ + "parent": "modernmetals:block/ore_overlay", + "textures": { + "particle": "minecraft:block/stone", + "base": "minecraft:block/stone", + "overlay": "modernmetals:blocks/ore_overlays/tungsten_ore" + } +} diff --git a/src/main/resources/assets/modernmetals/models/block/tungsten_trapdoor_bottom.json b/src/main/resources/assets/modernmetals/models/block/tungsten_trapdoor_bottom.json index 6ef8b232..4df843f5 100644 --- a/src/main/resources/assets/modernmetals/models/block/tungsten_trapdoor_bottom.json +++ b/src/main/resources/assets/modernmetals/models/block/tungsten_trapdoor_bottom.json @@ -1,6 +1,6 @@ { - "parent": "block/trapdoor_bottom", - "textures": { - "texture": "modernmetals:blocks/tungsten_trapdoor" - } + "parent": "block/template_orientable_trapdoor_bottom", + "textures": { + "texture": "modernmetals:blocks/tungsten_trapdoor" + } } diff --git a/src/main/resources/assets/modernmetals/models/block/tungsten_trapdoor_open.json b/src/main/resources/assets/modernmetals/models/block/tungsten_trapdoor_open.json index ec92977d..aac63fb8 100644 --- a/src/main/resources/assets/modernmetals/models/block/tungsten_trapdoor_open.json +++ b/src/main/resources/assets/modernmetals/models/block/tungsten_trapdoor_open.json @@ -1,6 +1,6 @@ { - "parent": "block/trapdoor_open", - "textures": { - "texture": "modernmetals:blocks/tungsten_trapdoor" - } + "parent": "block/template_orientable_trapdoor_open", + "textures": { + "texture": "modernmetals:blocks/tungsten_trapdoor" + } } diff --git a/src/main/resources/assets/modernmetals/models/block/tungsten_trapdoor_top.json b/src/main/resources/assets/modernmetals/models/block/tungsten_trapdoor_top.json index d3103f1b..7185a158 100644 --- a/src/main/resources/assets/modernmetals/models/block/tungsten_trapdoor_top.json +++ b/src/main/resources/assets/modernmetals/models/block/tungsten_trapdoor_top.json @@ -1,6 +1,6 @@ { - "parent": "block/trapdoor_top", - "textures": { - "texture": "modernmetals:blocks/tungsten_trapdoor" - } + "parent": "block/template_orientable_trapdoor_top", + "textures": { + "texture": "modernmetals:blocks/tungsten_trapdoor" + } } diff --git a/src/main/resources/assets/modernmetals/models/block/tungsten_wall_post.json b/src/main/resources/assets/modernmetals/models/block/tungsten_wall_post.json index fd51c565..96fbcf82 100644 --- a/src/main/resources/assets/modernmetals/models/block/tungsten_wall_post.json +++ b/src/main/resources/assets/modernmetals/models/block/tungsten_wall_post.json @@ -1,6 +1,6 @@ { - "parent": "block/wall_post", - "textures": { - "wall": "modernmetals:blocks/tungsten_block" - } + "parent": "block/template_wall_post", + "textures": { + "wall": "modernmetals:blocks/tungsten_block" + } } diff --git a/src/main/resources/assets/modernmetals/models/block/tungsten_wall_side.json b/src/main/resources/assets/modernmetals/models/block/tungsten_wall_side.json index 4ab76079..143b7b00 100644 --- a/src/main/resources/assets/modernmetals/models/block/tungsten_wall_side.json +++ b/src/main/resources/assets/modernmetals/models/block/tungsten_wall_side.json @@ -1,6 +1,6 @@ { - "parent": "block/wall_side", - "textures": { - "wall": "modernmetals:blocks/tungsten_block" - } + "parent": "block/template_wall_side", + "textures": { + "wall": "modernmetals:blocks/tungsten_block" + } } diff --git a/src/main/resources/assets/modernmetals/models/block/upper_slab_aluminum.json b/src/main/resources/assets/modernmetals/models/block/upper_slab_aluminum.json index 73526682..781f238f 100644 --- a/src/main/resources/assets/modernmetals/models/block/upper_slab_aluminum.json +++ b/src/main/resources/assets/modernmetals/models/block/upper_slab_aluminum.json @@ -1,8 +1,8 @@ { - "parent": "block/upper_slab", - "textures": { - "bottom": "modernmetals:blocks/aluminum_block", - "top": "modernmetals:blocks/aluminum_block", - "side": "modernmetals:blocks/aluminum_block" - } + "parent": "block/slab_top", + "textures": { + "bottom": "modernmetals:blocks/aluminum_block", + "top": "modernmetals:blocks/aluminum_block", + "side": "modernmetals:blocks/aluminum_block" + } } diff --git a/src/main/resources/assets/modernmetals/models/block/upper_slab_aluminumbrass.json b/src/main/resources/assets/modernmetals/models/block/upper_slab_aluminumbrass.json index 3848e767..fe7b8589 100644 --- a/src/main/resources/assets/modernmetals/models/block/upper_slab_aluminumbrass.json +++ b/src/main/resources/assets/modernmetals/models/block/upper_slab_aluminumbrass.json @@ -1,8 +1,8 @@ { - "parent": "block/upper_slab", - "textures": { - "bottom": "modernmetals:blocks/aluminumbrass_block", - "top": "modernmetals:blocks/aluminumbrass_block", - "side": "modernmetals:blocks/aluminumbrass_block" - } + "parent": "block/slab_top", + "textures": { + "bottom": "modernmetals:blocks/aluminumbrass_block", + "top": "modernmetals:blocks/aluminumbrass_block", + "side": "modernmetals:blocks/aluminumbrass_block" + } } diff --git a/src/main/resources/assets/modernmetals/models/block/upper_slab_beryllium.json b/src/main/resources/assets/modernmetals/models/block/upper_slab_beryllium.json index a8c5ad6b..019a5b20 100644 --- a/src/main/resources/assets/modernmetals/models/block/upper_slab_beryllium.json +++ b/src/main/resources/assets/modernmetals/models/block/upper_slab_beryllium.json @@ -1,8 +1,8 @@ { - "parent": "block/upper_slab", - "textures": { - "bottom": "modernmetals:blocks/beryllium_block", - "top": "modernmetals:blocks/beryllium_block", - "side": "modernmetals:blocks/beryllium_block" - } + "parent": "block/slab_top", + "textures": { + "bottom": "modernmetals:blocks/beryllium_block", + "top": "modernmetals:blocks/beryllium_block", + "side": "modernmetals:blocks/beryllium_block" + } } diff --git a/src/main/resources/assets/modernmetals/models/block/upper_slab_boron.json b/src/main/resources/assets/modernmetals/models/block/upper_slab_boron.json index dbffcdf4..a8bef33a 100644 --- a/src/main/resources/assets/modernmetals/models/block/upper_slab_boron.json +++ b/src/main/resources/assets/modernmetals/models/block/upper_slab_boron.json @@ -1,8 +1,8 @@ { - "parent": "block/upper_slab", - "textures": { - "bottom": "modernmetals:blocks/boron_block", - "top": "modernmetals:blocks/boron_block", - "side": "modernmetals:blocks/boron_block" - } + "parent": "block/slab_top", + "textures": { + "bottom": "modernmetals:blocks/boron_block", + "top": "modernmetals:blocks/boron_block", + "side": "modernmetals:blocks/boron_block" + } } diff --git a/src/main/resources/assets/modernmetals/models/block/upper_slab_cadmium.json b/src/main/resources/assets/modernmetals/models/block/upper_slab_cadmium.json index c7e66ae1..c4fca88d 100644 --- a/src/main/resources/assets/modernmetals/models/block/upper_slab_cadmium.json +++ b/src/main/resources/assets/modernmetals/models/block/upper_slab_cadmium.json @@ -1,8 +1,8 @@ { - "parent": "block/upper_slab", - "textures": { - "bottom": "modernmetals:blocks/cadmium_block", - "top": "modernmetals:blocks/cadmium_block", - "side": "modernmetals:blocks/cadmium_block" - } + "parent": "block/slab_top", + "textures": { + "bottom": "modernmetals:blocks/cadmium_block", + "top": "modernmetals:blocks/cadmium_block", + "side": "modernmetals:blocks/cadmium_block" + } } diff --git a/src/main/resources/assets/modernmetals/models/block/upper_slab_chromium.json b/src/main/resources/assets/modernmetals/models/block/upper_slab_chromium.json index b9b30f65..47f002ee 100644 --- a/src/main/resources/assets/modernmetals/models/block/upper_slab_chromium.json +++ b/src/main/resources/assets/modernmetals/models/block/upper_slab_chromium.json @@ -1,8 +1,8 @@ { - "parent": "block/upper_slab", - "textures": { - "bottom": "modernmetals:blocks/chromium_block", - "top": "modernmetals:blocks/chromium_block", - "side": "modernmetals:blocks/chromium_block" - } + "parent": "block/slab_top", + "textures": { + "bottom": "modernmetals:blocks/chromium_block", + "top": "modernmetals:blocks/chromium_block", + "side": "modernmetals:blocks/chromium_block" + } } diff --git a/src/main/resources/assets/modernmetals/models/block/upper_slab_galvanizedsteel.json b/src/main/resources/assets/modernmetals/models/block/upper_slab_galvanizedsteel.json index e4449d93..de5f84ca 100644 --- a/src/main/resources/assets/modernmetals/models/block/upper_slab_galvanizedsteel.json +++ b/src/main/resources/assets/modernmetals/models/block/upper_slab_galvanizedsteel.json @@ -1,8 +1,8 @@ { - "parent": "block/upper_slab", - "textures": { - "bottom": "modernmetals:blocks/galvanizedsteel_block", - "top": "modernmetals:blocks/galvanizedsteel_block", - "side": "modernmetals:blocks/galvanizedsteel_block" - } + "parent": "block/slab_top", + "textures": { + "bottom": "modernmetals:blocks/galvanizedsteel_block", + "top": "modernmetals:blocks/galvanizedsteel_block", + "side": "modernmetals:blocks/galvanizedsteel_block" + } } diff --git a/src/main/resources/assets/modernmetals/models/block/upper_slab_iridium.json b/src/main/resources/assets/modernmetals/models/block/upper_slab_iridium.json index bc4da9e7..4247d798 100644 --- a/src/main/resources/assets/modernmetals/models/block/upper_slab_iridium.json +++ b/src/main/resources/assets/modernmetals/models/block/upper_slab_iridium.json @@ -1,8 +1,8 @@ { - "parent": "block/upper_slab", - "textures": { - "bottom": "modernmetals:blocks/iridium_block", - "top": "modernmetals:blocks/iridium_block", - "side": "modernmetals:blocks/iridium_block" - } + "parent": "block/slab_top", + "textures": { + "bottom": "modernmetals:blocks/iridium_block", + "top": "modernmetals:blocks/iridium_block", + "side": "modernmetals:blocks/iridium_block" + } } diff --git a/src/main/resources/assets/modernmetals/models/block/upper_slab_magnesium.json b/src/main/resources/assets/modernmetals/models/block/upper_slab_magnesium.json index 0f826de6..c993a1c9 100644 --- a/src/main/resources/assets/modernmetals/models/block/upper_slab_magnesium.json +++ b/src/main/resources/assets/modernmetals/models/block/upper_slab_magnesium.json @@ -1,8 +1,8 @@ { - "parent": "block/upper_slab", - "textures": { - "bottom": "modernmetals:blocks/magnesium_block", - "top": "modernmetals:blocks/magnesium_block", - "side": "modernmetals:blocks/magnesium_block" - } + "parent": "block/slab_top", + "textures": { + "bottom": "modernmetals:blocks/magnesium_block", + "top": "modernmetals:blocks/magnesium_block", + "side": "modernmetals:blocks/magnesium_block" + } } diff --git a/src/main/resources/assets/modernmetals/models/block/upper_slab_manganese.json b/src/main/resources/assets/modernmetals/models/block/upper_slab_manganese.json index a61bf1d3..d9f44e51 100644 --- a/src/main/resources/assets/modernmetals/models/block/upper_slab_manganese.json +++ b/src/main/resources/assets/modernmetals/models/block/upper_slab_manganese.json @@ -1,8 +1,8 @@ { - "parent": "block/upper_slab", - "textures": { - "bottom": "modernmetals:blocks/manganese_block", - "top": "modernmetals:blocks/manganese_block", - "side": "modernmetals:blocks/manganese_block" - } + "parent": "block/slab_top", + "textures": { + "bottom": "modernmetals:blocks/manganese_block", + "top": "modernmetals:blocks/manganese_block", + "side": "modernmetals:blocks/manganese_block" + } } diff --git a/src/main/resources/assets/modernmetals/models/block/upper_slab_nichrome.json b/src/main/resources/assets/modernmetals/models/block/upper_slab_nichrome.json index 574a5eef..8c39f690 100644 --- a/src/main/resources/assets/modernmetals/models/block/upper_slab_nichrome.json +++ b/src/main/resources/assets/modernmetals/models/block/upper_slab_nichrome.json @@ -1,8 +1,8 @@ { - "parent": "block/upper_slab", - "textures": { - "bottom": "modernmetals:blocks/nichrome_block", - "top": "modernmetals:blocks/nichrome_block", - "side": "modernmetals:blocks/nichrome_block" - } + "parent": "block/slab_top", + "textures": { + "bottom": "modernmetals:blocks/nichrome_block", + "top": "modernmetals:blocks/nichrome_block", + "side": "modernmetals:blocks/nichrome_block" + } } diff --git a/src/main/resources/assets/modernmetals/models/block/upper_slab_osmium.json b/src/main/resources/assets/modernmetals/models/block/upper_slab_osmium.json index 2ba03db3..146090c2 100644 --- a/src/main/resources/assets/modernmetals/models/block/upper_slab_osmium.json +++ b/src/main/resources/assets/modernmetals/models/block/upper_slab_osmium.json @@ -1,8 +1,8 @@ { - "parent": "block/upper_slab", - "textures": { - "bottom": "modernmetals:blocks/osmium_block", - "top": "modernmetals:blocks/osmium_block", - "side": "modernmetals:blocks/osmium_block" - } + "parent": "block/slab_top", + "textures": { + "bottom": "modernmetals:blocks/osmium_block", + "top": "modernmetals:blocks/osmium_block", + "side": "modernmetals:blocks/osmium_block" + } } diff --git a/src/main/resources/assets/modernmetals/models/block/upper_slab_plutonium.json b/src/main/resources/assets/modernmetals/models/block/upper_slab_plutonium.json index 15c44e34..017ce8de 100644 --- a/src/main/resources/assets/modernmetals/models/block/upper_slab_plutonium.json +++ b/src/main/resources/assets/modernmetals/models/block/upper_slab_plutonium.json @@ -1,8 +1,8 @@ { - "parent": "block/upper_slab", - "textures": { - "bottom": "modernmetals:blocks/plutonium_block", - "top": "modernmetals:blocks/plutonium_block", - "side": "modernmetals:blocks/plutonium_block" - } + "parent": "block/slab_top", + "textures": { + "bottom": "modernmetals:blocks/plutonium_block", + "top": "modernmetals:blocks/plutonium_block", + "side": "modernmetals:blocks/plutonium_block" + } } diff --git a/src/main/resources/assets/modernmetals/models/block/upper_slab_rutile.json b/src/main/resources/assets/modernmetals/models/block/upper_slab_rutile.json index ea096b93..af87956c 100644 --- a/src/main/resources/assets/modernmetals/models/block/upper_slab_rutile.json +++ b/src/main/resources/assets/modernmetals/models/block/upper_slab_rutile.json @@ -1,8 +1,8 @@ { - "parent": "block/upper_slab", - "textures": { - "bottom": "modernmetals:blocks/rutile_block", - "top": "modernmetals:blocks/rutile_block", - "side": "modernmetals:blocks/rutile_block" - } + "parent": "block/slab_top", + "textures": { + "bottom": "modernmetals:blocks/rutile_block", + "top": "modernmetals:blocks/rutile_block", + "side": "modernmetals:blocks/rutile_block" + } } diff --git a/src/main/resources/assets/modernmetals/models/block/upper_slab_stainlesssteel.json b/src/main/resources/assets/modernmetals/models/block/upper_slab_stainlesssteel.json index 173275ed..d3b95aba 100644 --- a/src/main/resources/assets/modernmetals/models/block/upper_slab_stainlesssteel.json +++ b/src/main/resources/assets/modernmetals/models/block/upper_slab_stainlesssteel.json @@ -1,8 +1,8 @@ { - "parent": "block/upper_slab", - "textures": { - "bottom": "modernmetals:blocks/stainlesssteel_block", - "top": "modernmetals:blocks/stainlesssteel_block", - "side": "modernmetals:blocks/stainlesssteel_block" - } + "parent": "block/slab_top", + "textures": { + "bottom": "modernmetals:blocks/stainlesssteel_block", + "top": "modernmetals:blocks/stainlesssteel_block", + "side": "modernmetals:blocks/stainlesssteel_block" + } } diff --git a/src/main/resources/assets/modernmetals/models/block/upper_slab_tantalum.json b/src/main/resources/assets/modernmetals/models/block/upper_slab_tantalum.json index d96209db..1600ab37 100644 --- a/src/main/resources/assets/modernmetals/models/block/upper_slab_tantalum.json +++ b/src/main/resources/assets/modernmetals/models/block/upper_slab_tantalum.json @@ -1,8 +1,8 @@ { - "parent": "block/upper_slab", - "textures": { - "bottom": "modernmetals:blocks/tantalum_block", - "top": "modernmetals:blocks/tantalum_block", - "side": "modernmetals:blocks/tantalum_block" - } + "parent": "block/slab_top", + "textures": { + "bottom": "modernmetals:blocks/tantalum_block", + "top": "modernmetals:blocks/tantalum_block", + "side": "modernmetals:blocks/tantalum_block" + } } diff --git a/src/main/resources/assets/modernmetals/models/block/upper_slab_thorium.json b/src/main/resources/assets/modernmetals/models/block/upper_slab_thorium.json index d9dfdc67..9f5629ca 100644 --- a/src/main/resources/assets/modernmetals/models/block/upper_slab_thorium.json +++ b/src/main/resources/assets/modernmetals/models/block/upper_slab_thorium.json @@ -1,8 +1,8 @@ { - "parent": "block/upper_slab", - "textures": { - "bottom": "modernmetals:blocks/thorium_block", - "top": "modernmetals:blocks/thorium_block", - "side": "modernmetals:blocks/thorium_block" - } + "parent": "block/slab_top", + "textures": { + "bottom": "modernmetals:blocks/thorium_block", + "top": "modernmetals:blocks/thorium_block", + "side": "modernmetals:blocks/thorium_block" + } } diff --git a/src/main/resources/assets/modernmetals/models/block/upper_slab_titanium.json b/src/main/resources/assets/modernmetals/models/block/upper_slab_titanium.json index 5caf0720..1e046869 100644 --- a/src/main/resources/assets/modernmetals/models/block/upper_slab_titanium.json +++ b/src/main/resources/assets/modernmetals/models/block/upper_slab_titanium.json @@ -1,8 +1,8 @@ { - "parent": "block/upper_slab", - "textures": { - "bottom": "modernmetals:blocks/titanium_block", - "top": "modernmetals:blocks/titanium_block", - "side": "modernmetals:blocks/titanium_block" - } + "parent": "block/slab_top", + "textures": { + "bottom": "modernmetals:blocks/titanium_block", + "top": "modernmetals:blocks/titanium_block", + "side": "modernmetals:blocks/titanium_block" + } } diff --git a/src/main/resources/assets/modernmetals/models/block/upper_slab_tungsten.json b/src/main/resources/assets/modernmetals/models/block/upper_slab_tungsten.json index d2abd080..d4f33284 100644 --- a/src/main/resources/assets/modernmetals/models/block/upper_slab_tungsten.json +++ b/src/main/resources/assets/modernmetals/models/block/upper_slab_tungsten.json @@ -1,8 +1,8 @@ { - "parent": "block/upper_slab", - "textures": { - "bottom": "modernmetals:blocks/tungsten_block", - "top": "modernmetals:blocks/tungsten_block", - "side": "modernmetals:blocks/tungsten_block" - } + "parent": "block/slab_top", + "textures": { + "bottom": "modernmetals:blocks/tungsten_block", + "top": "modernmetals:blocks/tungsten_block", + "side": "modernmetals:blocks/tungsten_block" + } } diff --git a/src/main/resources/assets/modernmetals/models/block/upper_slab_uranium.json b/src/main/resources/assets/modernmetals/models/block/upper_slab_uranium.json index e3321726..52039c93 100644 --- a/src/main/resources/assets/modernmetals/models/block/upper_slab_uranium.json +++ b/src/main/resources/assets/modernmetals/models/block/upper_slab_uranium.json @@ -1,8 +1,8 @@ { - "parent": "block/upper_slab", - "textures": { - "bottom": "modernmetals:blocks/uranium_block", - "top": "modernmetals:blocks/uranium_block", - "side": "modernmetals:blocks/uranium_block" - } + "parent": "block/slab_top", + "textures": { + "bottom": "modernmetals:blocks/uranium_block", + "top": "modernmetals:blocks/uranium_block", + "side": "modernmetals:blocks/uranium_block" + } } diff --git a/src/main/resources/assets/modernmetals/models/block/upper_slab_zirconium.json b/src/main/resources/assets/modernmetals/models/block/upper_slab_zirconium.json index 72e6e82a..05051644 100644 --- a/src/main/resources/assets/modernmetals/models/block/upper_slab_zirconium.json +++ b/src/main/resources/assets/modernmetals/models/block/upper_slab_zirconium.json @@ -1,8 +1,8 @@ { - "parent": "block/upper_slab", - "textures": { - "bottom": "modernmetals:blocks/zirconium_block", - "top": "modernmetals:blocks/zirconium_block", - "side": "modernmetals:blocks/zirconium_block" - } + "parent": "block/slab_top", + "textures": { + "bottom": "modernmetals:blocks/zirconium_block", + "top": "modernmetals:blocks/zirconium_block", + "side": "modernmetals:blocks/zirconium_block" + } } diff --git a/src/main/resources/assets/modernmetals/models/block/uranium_lever.json b/src/main/resources/assets/modernmetals/models/block/uranium_lever.json index e44eea8f..e13458ce 100644 --- a/src/main/resources/assets/modernmetals/models/block/uranium_lever.json +++ b/src/main/resources/assets/modernmetals/models/block/uranium_lever.json @@ -1,33 +1,155 @@ { - "ambientocclusion": false, - "textures": { - "particle": "modernmetals:blocks/uranium_block", - "base": "modernmetals:blocks/uranium_block", - "lever": "blocks/lever" + "ambientocclusion": false, + "textures": { + "particle": "modernmetals:blocks/uranium_block", + "base": "modernmetals:blocks/uranium_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" + } + } }, - "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" } - } + { + "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/modernmetals/models/block/uranium_lever_off.json b/src/main/resources/assets/modernmetals/models/block/uranium_lever_off.json index 0bd95ec2..1be3df80 100644 --- a/src/main/resources/assets/modernmetals/models/block/uranium_lever_off.json +++ b/src/main/resources/assets/modernmetals/models/block/uranium_lever_off.json @@ -1,33 +1,155 @@ { - "ambientocclusion": false, - "textures": { - "particle": "modernmetals:blocks/uranium_block", - "base": "modernmetals:blocks/uranium_block", - "lever": "blocks/lever" + "ambientocclusion": false, + "textures": { + "particle": "modernmetals:blocks/uranium_block", + "base": "modernmetals:blocks/uranium_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" + } + } }, - "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" } - } + { + "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/modernmetals/models/block/uranium_ore.json b/src/main/resources/assets/modernmetals/models/block/uranium_ore.json new file mode 100644 index 00000000..ad072f42 --- /dev/null +++ b/src/main/resources/assets/modernmetals/models/block/uranium_ore.json @@ -0,0 +1,8 @@ +{ + "parent": "modernmetals:block/ore_overlay", + "textures": { + "particle": "minecraft:block/stone", + "base": "minecraft:block/stone", + "overlay": "modernmetals:blocks/ore_overlays/uranium_ore" + } +} diff --git a/src/main/resources/assets/modernmetals/models/block/uranium_trapdoor_bottom.json b/src/main/resources/assets/modernmetals/models/block/uranium_trapdoor_bottom.json index 63fbab82..207ada8a 100644 --- a/src/main/resources/assets/modernmetals/models/block/uranium_trapdoor_bottom.json +++ b/src/main/resources/assets/modernmetals/models/block/uranium_trapdoor_bottom.json @@ -1,6 +1,6 @@ { - "parent": "block/trapdoor_bottom", - "textures": { - "texture": "modernmetals:blocks/uranium_trapdoor" - } + "parent": "block/template_orientable_trapdoor_bottom", + "textures": { + "texture": "modernmetals:blocks/uranium_trapdoor" + } } diff --git a/src/main/resources/assets/modernmetals/models/block/uranium_trapdoor_open.json b/src/main/resources/assets/modernmetals/models/block/uranium_trapdoor_open.json index d03722d2..63f1a0b0 100644 --- a/src/main/resources/assets/modernmetals/models/block/uranium_trapdoor_open.json +++ b/src/main/resources/assets/modernmetals/models/block/uranium_trapdoor_open.json @@ -1,6 +1,6 @@ { - "parent": "block/trapdoor_open", - "textures": { - "texture": "modernmetals:blocks/uranium_trapdoor" - } + "parent": "block/template_orientable_trapdoor_open", + "textures": { + "texture": "modernmetals:blocks/uranium_trapdoor" + } } diff --git a/src/main/resources/assets/modernmetals/models/block/uranium_trapdoor_top.json b/src/main/resources/assets/modernmetals/models/block/uranium_trapdoor_top.json index c07b36cd..a867570b 100644 --- a/src/main/resources/assets/modernmetals/models/block/uranium_trapdoor_top.json +++ b/src/main/resources/assets/modernmetals/models/block/uranium_trapdoor_top.json @@ -1,6 +1,6 @@ { - "parent": "block/trapdoor_top", - "textures": { - "texture": "modernmetals:blocks/uranium_trapdoor" - } + "parent": "block/template_orientable_trapdoor_top", + "textures": { + "texture": "modernmetals:blocks/uranium_trapdoor" + } } diff --git a/src/main/resources/assets/modernmetals/models/block/uranium_wall_post.json b/src/main/resources/assets/modernmetals/models/block/uranium_wall_post.json index a0abe4eb..94ea48b8 100644 --- a/src/main/resources/assets/modernmetals/models/block/uranium_wall_post.json +++ b/src/main/resources/assets/modernmetals/models/block/uranium_wall_post.json @@ -1,6 +1,6 @@ { - "parent": "block/wall_post", - "textures": { - "wall": "modernmetals:blocks/uranium_block" - } + "parent": "block/template_wall_post", + "textures": { + "wall": "modernmetals:blocks/uranium_block" + } } diff --git a/src/main/resources/assets/modernmetals/models/block/uranium_wall_side.json b/src/main/resources/assets/modernmetals/models/block/uranium_wall_side.json index fed68a03..4c078691 100644 --- a/src/main/resources/assets/modernmetals/models/block/uranium_wall_side.json +++ b/src/main/resources/assets/modernmetals/models/block/uranium_wall_side.json @@ -1,6 +1,6 @@ { - "parent": "block/wall_side", - "textures": { - "wall": "modernmetals:blocks/uranium_block" - } + "parent": "block/template_wall_side", + "textures": { + "wall": "modernmetals:blocks/uranium_block" + } } diff --git a/src/main/resources/assets/modernmetals/models/block/zirconium_lever.json b/src/main/resources/assets/modernmetals/models/block/zirconium_lever.json index 29939ff2..9f8ce14e 100644 --- a/src/main/resources/assets/modernmetals/models/block/zirconium_lever.json +++ b/src/main/resources/assets/modernmetals/models/block/zirconium_lever.json @@ -1,33 +1,155 @@ { - "ambientocclusion": false, - "textures": { - "particle": "modernmetals:blocks/zirconium_block", - "base": "modernmetals:blocks/zirconium_block", - "lever": "blocks/lever" + "ambientocclusion": false, + "textures": { + "particle": "modernmetals:blocks/zirconium_block", + "base": "modernmetals:blocks/zirconium_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" + } + } }, - "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" } - } + { + "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/modernmetals/models/block/zirconium_lever_off.json b/src/main/resources/assets/modernmetals/models/block/zirconium_lever_off.json index b360e9fd..b824df10 100644 --- a/src/main/resources/assets/modernmetals/models/block/zirconium_lever_off.json +++ b/src/main/resources/assets/modernmetals/models/block/zirconium_lever_off.json @@ -1,33 +1,155 @@ { - "ambientocclusion": false, - "textures": { - "particle": "modernmetals:blocks/zirconium_block", - "base": "modernmetals:blocks/zirconium_block", - "lever": "blocks/lever" + "ambientocclusion": false, + "textures": { + "particle": "modernmetals:blocks/zirconium_block", + "base": "modernmetals:blocks/zirconium_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" + } + } }, - "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" } - } + { + "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/modernmetals/models/block/zirconium_ore.json b/src/main/resources/assets/modernmetals/models/block/zirconium_ore.json new file mode 100644 index 00000000..45ce5f15 --- /dev/null +++ b/src/main/resources/assets/modernmetals/models/block/zirconium_ore.json @@ -0,0 +1,8 @@ +{ + "parent": "modernmetals:block/ore_overlay", + "textures": { + "particle": "minecraft:block/stone", + "base": "minecraft:block/stone", + "overlay": "modernmetals:blocks/ore_overlays/zirconium_ore" + } +} diff --git a/src/main/resources/assets/modernmetals/models/block/zirconium_trapdoor_bottom.json b/src/main/resources/assets/modernmetals/models/block/zirconium_trapdoor_bottom.json index 205f3f8b..6246a04f 100644 --- a/src/main/resources/assets/modernmetals/models/block/zirconium_trapdoor_bottom.json +++ b/src/main/resources/assets/modernmetals/models/block/zirconium_trapdoor_bottom.json @@ -1,6 +1,6 @@ { - "parent": "block/trapdoor_bottom", - "textures": { - "texture": "modernmetals:blocks/zirconium_trapdoor" - } + "parent": "block/template_orientable_trapdoor_bottom", + "textures": { + "texture": "modernmetals:blocks/zirconium_trapdoor" + } } diff --git a/src/main/resources/assets/modernmetals/models/block/zirconium_trapdoor_open.json b/src/main/resources/assets/modernmetals/models/block/zirconium_trapdoor_open.json index 28a54602..cb59c030 100644 --- a/src/main/resources/assets/modernmetals/models/block/zirconium_trapdoor_open.json +++ b/src/main/resources/assets/modernmetals/models/block/zirconium_trapdoor_open.json @@ -1,6 +1,6 @@ { - "parent": "block/trapdoor_open", - "textures": { - "texture": "modernmetals:blocks/zirconium_trapdoor" - } + "parent": "block/template_orientable_trapdoor_open", + "textures": { + "texture": "modernmetals:blocks/zirconium_trapdoor" + } } diff --git a/src/main/resources/assets/modernmetals/models/block/zirconium_trapdoor_top.json b/src/main/resources/assets/modernmetals/models/block/zirconium_trapdoor_top.json index e9e7fed8..8e0fc6b2 100644 --- a/src/main/resources/assets/modernmetals/models/block/zirconium_trapdoor_top.json +++ b/src/main/resources/assets/modernmetals/models/block/zirconium_trapdoor_top.json @@ -1,6 +1,6 @@ { - "parent": "block/trapdoor_top", - "textures": { - "texture": "modernmetals:blocks/zirconium_trapdoor" - } + "parent": "block/template_orientable_trapdoor_top", + "textures": { + "texture": "modernmetals:blocks/zirconium_trapdoor" + } } diff --git a/src/main/resources/assets/modernmetals/models/block/zirconium_wall_post.json b/src/main/resources/assets/modernmetals/models/block/zirconium_wall_post.json index 9bc9411f..3f06de6c 100644 --- a/src/main/resources/assets/modernmetals/models/block/zirconium_wall_post.json +++ b/src/main/resources/assets/modernmetals/models/block/zirconium_wall_post.json @@ -1,6 +1,6 @@ { - "parent": "block/wall_post", - "textures": { - "wall": "modernmetals:blocks/zirconium_block" - } + "parent": "block/template_wall_post", + "textures": { + "wall": "modernmetals:blocks/zirconium_block" + } } diff --git a/src/main/resources/assets/modernmetals/models/block/zirconium_wall_side.json b/src/main/resources/assets/modernmetals/models/block/zirconium_wall_side.json index 73b08f92..b85a60c2 100644 --- a/src/main/resources/assets/modernmetals/models/block/zirconium_wall_side.json +++ b/src/main/resources/assets/modernmetals/models/block/zirconium_wall_side.json @@ -1,6 +1,6 @@ { - "parent": "block/wall_side", - "textures": { - "wall": "modernmetals:blocks/zirconium_block" - } + "parent": "block/template_wall_side", + "textures": { + "wall": "modernmetals:blocks/zirconium_block" + } } diff --git a/src/main/resources/assets/modernmetals/models/item/aluminum.json b/src/main/resources/assets/modernmetals/models/item/aluminum.json new file mode 100644 index 00000000..494629b8 --- /dev/null +++ b/src/main/resources/assets/modernmetals/models/item/aluminum.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "modernmetals:blocks/aluminum_block" + } +} diff --git a/src/main/resources/assets/modernmetals/models/item/aluminum_bucket.json b/src/main/resources/assets/modernmetals/models/item/aluminum_bucket.json new file mode 100644 index 00000000..9df490d8 --- /dev/null +++ b/src/main/resources/assets/modernmetals/models/item/aluminum_bucket.json @@ -0,0 +1,8 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "minecraft:item/bucket", + "layer1": "modernmetals:items/bucket_fluid", + "layer2": "modernmetals:items/bucket_overlay" + } +} diff --git a/src/main/resources/assets/modernmetals/models/item/aluminum_lever.json b/src/main/resources/assets/modernmetals/models/item/aluminum_lever.json index 291e6b44..917be899 100644 --- a/src/main/resources/assets/modernmetals/models/item/aluminum_lever.json +++ b/src/main/resources/assets/modernmetals/models/item/aluminum_lever.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", - "textures": { - "layer0": "blocks/lever" - } + "parent": "item/generated", + "textures": { + "layer0": "minecraft:block/lever" + } } diff --git a/src/main/resources/assets/modernmetals/models/item/aluminumbrass.json b/src/main/resources/assets/modernmetals/models/item/aluminumbrass.json new file mode 100644 index 00000000..1585d28e --- /dev/null +++ b/src/main/resources/assets/modernmetals/models/item/aluminumbrass.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "modernmetals:blocks/aluminumbrass_block" + } +} diff --git a/src/main/resources/assets/modernmetals/models/item/aluminumbrass_bucket.json b/src/main/resources/assets/modernmetals/models/item/aluminumbrass_bucket.json new file mode 100644 index 00000000..9df490d8 --- /dev/null +++ b/src/main/resources/assets/modernmetals/models/item/aluminumbrass_bucket.json @@ -0,0 +1,8 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "minecraft:item/bucket", + "layer1": "modernmetals:items/bucket_fluid", + "layer2": "modernmetals:items/bucket_overlay" + } +} diff --git a/src/main/resources/assets/modernmetals/models/item/aluminumbrass_lever.json b/src/main/resources/assets/modernmetals/models/item/aluminumbrass_lever.json index 291e6b44..917be899 100644 --- a/src/main/resources/assets/modernmetals/models/item/aluminumbrass_lever.json +++ b/src/main/resources/assets/modernmetals/models/item/aluminumbrass_lever.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", - "textures": { - "layer0": "blocks/lever" - } + "parent": "item/generated", + "textures": { + "layer0": "minecraft:block/lever" + } } diff --git a/src/main/resources/assets/modernmetals/models/item/beryllium.json b/src/main/resources/assets/modernmetals/models/item/beryllium.json new file mode 100644 index 00000000..fda79e6f --- /dev/null +++ b/src/main/resources/assets/modernmetals/models/item/beryllium.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "modernmetals:blocks/beryllium_block" + } +} diff --git a/src/main/resources/assets/modernmetals/models/item/beryllium_bucket.json b/src/main/resources/assets/modernmetals/models/item/beryllium_bucket.json new file mode 100644 index 00000000..9df490d8 --- /dev/null +++ b/src/main/resources/assets/modernmetals/models/item/beryllium_bucket.json @@ -0,0 +1,8 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "minecraft:item/bucket", + "layer1": "modernmetals:items/bucket_fluid", + "layer2": "modernmetals:items/bucket_overlay" + } +} diff --git a/src/main/resources/assets/modernmetals/models/item/beryllium_lever.json b/src/main/resources/assets/modernmetals/models/item/beryllium_lever.json index 291e6b44..917be899 100644 --- a/src/main/resources/assets/modernmetals/models/item/beryllium_lever.json +++ b/src/main/resources/assets/modernmetals/models/item/beryllium_lever.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", - "textures": { - "layer0": "blocks/lever" - } + "parent": "item/generated", + "textures": { + "layer0": "minecraft:block/lever" + } } diff --git a/src/main/resources/assets/modernmetals/models/item/boron.json b/src/main/resources/assets/modernmetals/models/item/boron.json new file mode 100644 index 00000000..a786fd6c --- /dev/null +++ b/src/main/resources/assets/modernmetals/models/item/boron.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "modernmetals:blocks/boron_block" + } +} diff --git a/src/main/resources/assets/modernmetals/models/item/boron_bucket.json b/src/main/resources/assets/modernmetals/models/item/boron_bucket.json new file mode 100644 index 00000000..9df490d8 --- /dev/null +++ b/src/main/resources/assets/modernmetals/models/item/boron_bucket.json @@ -0,0 +1,8 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "minecraft:item/bucket", + "layer1": "modernmetals:items/bucket_fluid", + "layer2": "modernmetals:items/bucket_overlay" + } +} diff --git a/src/main/resources/assets/modernmetals/models/item/boron_lever.json b/src/main/resources/assets/modernmetals/models/item/boron_lever.json index 291e6b44..917be899 100644 --- a/src/main/resources/assets/modernmetals/models/item/boron_lever.json +++ b/src/main/resources/assets/modernmetals/models/item/boron_lever.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", - "textures": { - "layer0": "blocks/lever" - } + "parent": "item/generated", + "textures": { + "layer0": "minecraft:block/lever" + } } diff --git a/src/main/resources/assets/modernmetals/models/item/cadmium.json b/src/main/resources/assets/modernmetals/models/item/cadmium.json new file mode 100644 index 00000000..4bbc631f --- /dev/null +++ b/src/main/resources/assets/modernmetals/models/item/cadmium.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "modernmetals:blocks/cadmium_block" + } +} diff --git a/src/main/resources/assets/modernmetals/models/item/cadmium_bucket.json b/src/main/resources/assets/modernmetals/models/item/cadmium_bucket.json new file mode 100644 index 00000000..9df490d8 --- /dev/null +++ b/src/main/resources/assets/modernmetals/models/item/cadmium_bucket.json @@ -0,0 +1,8 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "minecraft:item/bucket", + "layer1": "modernmetals:items/bucket_fluid", + "layer2": "modernmetals:items/bucket_overlay" + } +} diff --git a/src/main/resources/assets/modernmetals/models/item/cadmium_lever.json b/src/main/resources/assets/modernmetals/models/item/cadmium_lever.json index 291e6b44..917be899 100644 --- a/src/main/resources/assets/modernmetals/models/item/cadmium_lever.json +++ b/src/main/resources/assets/modernmetals/models/item/cadmium_lever.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", - "textures": { - "layer0": "blocks/lever" - } + "parent": "item/generated", + "textures": { + "layer0": "minecraft:block/lever" + } } diff --git a/src/main/resources/assets/modernmetals/models/item/chromium.json b/src/main/resources/assets/modernmetals/models/item/chromium.json new file mode 100644 index 00000000..db23ed6d --- /dev/null +++ b/src/main/resources/assets/modernmetals/models/item/chromium.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "modernmetals:blocks/chromium_block" + } +} diff --git a/src/main/resources/assets/modernmetals/models/item/chromium_bucket.json b/src/main/resources/assets/modernmetals/models/item/chromium_bucket.json new file mode 100644 index 00000000..9df490d8 --- /dev/null +++ b/src/main/resources/assets/modernmetals/models/item/chromium_bucket.json @@ -0,0 +1,8 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "minecraft:item/bucket", + "layer1": "modernmetals:items/bucket_fluid", + "layer2": "modernmetals:items/bucket_overlay" + } +} diff --git a/src/main/resources/assets/modernmetals/models/item/chromium_lever.json b/src/main/resources/assets/modernmetals/models/item/chromium_lever.json index 291e6b44..917be899 100644 --- a/src/main/resources/assets/modernmetals/models/item/chromium_lever.json +++ b/src/main/resources/assets/modernmetals/models/item/chromium_lever.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", - "textures": { - "layer0": "blocks/lever" - } + "parent": "item/generated", + "textures": { + "layer0": "minecraft:block/lever" + } } diff --git a/src/main/resources/assets/modernmetals/models/item/coal_powder.json b/src/main/resources/assets/modernmetals/models/item/coal_powder.json new file mode 100644 index 00000000..48372400 --- /dev/null +++ b/src/main/resources/assets/modernmetals/models/item/coal_powder.json @@ -0,0 +1,4 @@ +{ + "parent": "item/generated", + "textures": { "layer0": "modernmetals:items/coal_powder" } +} diff --git a/src/main/resources/assets/modernmetals/models/item/galvanizedsteel.json b/src/main/resources/assets/modernmetals/models/item/galvanizedsteel.json new file mode 100644 index 00000000..28485df5 --- /dev/null +++ b/src/main/resources/assets/modernmetals/models/item/galvanizedsteel.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "modernmetals:blocks/galvanizedsteel_block" + } +} diff --git a/src/main/resources/assets/modernmetals/models/item/galvanizedsteel_bucket.json b/src/main/resources/assets/modernmetals/models/item/galvanizedsteel_bucket.json new file mode 100644 index 00000000..9df490d8 --- /dev/null +++ b/src/main/resources/assets/modernmetals/models/item/galvanizedsteel_bucket.json @@ -0,0 +1,8 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "minecraft:item/bucket", + "layer1": "modernmetals:items/bucket_fluid", + "layer2": "modernmetals:items/bucket_overlay" + } +} diff --git a/src/main/resources/assets/modernmetals/models/item/galvanizedsteel_lever.json b/src/main/resources/assets/modernmetals/models/item/galvanizedsteel_lever.json index 291e6b44..917be899 100644 --- a/src/main/resources/assets/modernmetals/models/item/galvanizedsteel_lever.json +++ b/src/main/resources/assets/modernmetals/models/item/galvanizedsteel_lever.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", - "textures": { - "layer0": "blocks/lever" - } + "parent": "item/generated", + "textures": { + "layer0": "minecraft:block/lever" + } } diff --git a/src/main/resources/assets/modernmetals/models/item/iridium.json b/src/main/resources/assets/modernmetals/models/item/iridium.json new file mode 100644 index 00000000..d493caee --- /dev/null +++ b/src/main/resources/assets/modernmetals/models/item/iridium.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "modernmetals:blocks/iridium_block" + } +} diff --git a/src/main/resources/assets/modernmetals/models/item/iridium_bucket.json b/src/main/resources/assets/modernmetals/models/item/iridium_bucket.json new file mode 100644 index 00000000..9df490d8 --- /dev/null +++ b/src/main/resources/assets/modernmetals/models/item/iridium_bucket.json @@ -0,0 +1,8 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "minecraft:item/bucket", + "layer1": "modernmetals:items/bucket_fluid", + "layer2": "modernmetals:items/bucket_overlay" + } +} diff --git a/src/main/resources/assets/modernmetals/models/item/iridium_lever.json b/src/main/resources/assets/modernmetals/models/item/iridium_lever.json index 291e6b44..917be899 100644 --- a/src/main/resources/assets/modernmetals/models/item/iridium_lever.json +++ b/src/main/resources/assets/modernmetals/models/item/iridium_lever.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", - "textures": { - "layer0": "blocks/lever" - } + "parent": "item/generated", + "textures": { + "layer0": "minecraft:block/lever" + } } diff --git a/src/main/resources/assets/modernmetals/models/item/magnesium.json b/src/main/resources/assets/modernmetals/models/item/magnesium.json new file mode 100644 index 00000000..4cbf2655 --- /dev/null +++ b/src/main/resources/assets/modernmetals/models/item/magnesium.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "modernmetals:blocks/magnesium_block" + } +} diff --git a/src/main/resources/assets/modernmetals/models/item/magnesium_bucket.json b/src/main/resources/assets/modernmetals/models/item/magnesium_bucket.json new file mode 100644 index 00000000..9df490d8 --- /dev/null +++ b/src/main/resources/assets/modernmetals/models/item/magnesium_bucket.json @@ -0,0 +1,8 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "minecraft:item/bucket", + "layer1": "modernmetals:items/bucket_fluid", + "layer2": "modernmetals:items/bucket_overlay" + } +} diff --git a/src/main/resources/assets/modernmetals/models/item/magnesium_lever.json b/src/main/resources/assets/modernmetals/models/item/magnesium_lever.json index 291e6b44..917be899 100644 --- a/src/main/resources/assets/modernmetals/models/item/magnesium_lever.json +++ b/src/main/resources/assets/modernmetals/models/item/magnesium_lever.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", - "textures": { - "layer0": "blocks/lever" - } + "parent": "item/generated", + "textures": { + "layer0": "minecraft:block/lever" + } } diff --git a/src/main/resources/assets/modernmetals/models/item/manganese.json b/src/main/resources/assets/modernmetals/models/item/manganese.json new file mode 100644 index 00000000..c3ba52bd --- /dev/null +++ b/src/main/resources/assets/modernmetals/models/item/manganese.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "modernmetals:blocks/manganese_block" + } +} diff --git a/src/main/resources/assets/modernmetals/models/item/manganese_bucket.json b/src/main/resources/assets/modernmetals/models/item/manganese_bucket.json new file mode 100644 index 00000000..9df490d8 --- /dev/null +++ b/src/main/resources/assets/modernmetals/models/item/manganese_bucket.json @@ -0,0 +1,8 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "minecraft:item/bucket", + "layer1": "modernmetals:items/bucket_fluid", + "layer2": "modernmetals:items/bucket_overlay" + } +} diff --git a/src/main/resources/assets/modernmetals/models/item/manganese_lever.json b/src/main/resources/assets/modernmetals/models/item/manganese_lever.json index 291e6b44..917be899 100644 --- a/src/main/resources/assets/modernmetals/models/item/manganese_lever.json +++ b/src/main/resources/assets/modernmetals/models/item/manganese_lever.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", - "textures": { - "layer0": "blocks/lever" - } + "parent": "item/generated", + "textures": { + "layer0": "minecraft:block/lever" + } } diff --git a/src/main/resources/assets/modernmetals/models/item/nichrome.json b/src/main/resources/assets/modernmetals/models/item/nichrome.json new file mode 100644 index 00000000..20ed5cc0 --- /dev/null +++ b/src/main/resources/assets/modernmetals/models/item/nichrome.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "modernmetals:blocks/nichrome_block" + } +} diff --git a/src/main/resources/assets/modernmetals/models/item/nichrome_bucket.json b/src/main/resources/assets/modernmetals/models/item/nichrome_bucket.json new file mode 100644 index 00000000..9df490d8 --- /dev/null +++ b/src/main/resources/assets/modernmetals/models/item/nichrome_bucket.json @@ -0,0 +1,8 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "minecraft:item/bucket", + "layer1": "modernmetals:items/bucket_fluid", + "layer2": "modernmetals:items/bucket_overlay" + } +} diff --git a/src/main/resources/assets/modernmetals/models/item/nichrome_lever.json b/src/main/resources/assets/modernmetals/models/item/nichrome_lever.json index 291e6b44..917be899 100644 --- a/src/main/resources/assets/modernmetals/models/item/nichrome_lever.json +++ b/src/main/resources/assets/modernmetals/models/item/nichrome_lever.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", - "textures": { - "layer0": "blocks/lever" - } + "parent": "item/generated", + "textures": { + "layer0": "minecraft:block/lever" + } } diff --git a/src/main/resources/assets/modernmetals/models/item/osmium.json b/src/main/resources/assets/modernmetals/models/item/osmium.json new file mode 100644 index 00000000..9f8a1a64 --- /dev/null +++ b/src/main/resources/assets/modernmetals/models/item/osmium.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "modernmetals:blocks/osmium_block" + } +} diff --git a/src/main/resources/assets/modernmetals/models/item/osmium_bucket.json b/src/main/resources/assets/modernmetals/models/item/osmium_bucket.json new file mode 100644 index 00000000..9df490d8 --- /dev/null +++ b/src/main/resources/assets/modernmetals/models/item/osmium_bucket.json @@ -0,0 +1,8 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "minecraft:item/bucket", + "layer1": "modernmetals:items/bucket_fluid", + "layer2": "modernmetals:items/bucket_overlay" + } +} diff --git a/src/main/resources/assets/modernmetals/models/item/osmium_lever.json b/src/main/resources/assets/modernmetals/models/item/osmium_lever.json index 291e6b44..917be899 100644 --- a/src/main/resources/assets/modernmetals/models/item/osmium_lever.json +++ b/src/main/resources/assets/modernmetals/models/item/osmium_lever.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", - "textures": { - "layer0": "blocks/lever" - } + "parent": "item/generated", + "textures": { + "layer0": "minecraft:block/lever" + } } diff --git a/src/main/resources/assets/modernmetals/models/item/plutonium.json b/src/main/resources/assets/modernmetals/models/item/plutonium.json new file mode 100644 index 00000000..8c8d5571 --- /dev/null +++ b/src/main/resources/assets/modernmetals/models/item/plutonium.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "modernmetals:blocks/plutonium_block" + } +} diff --git a/src/main/resources/assets/modernmetals/models/item/plutonium_bucket.json b/src/main/resources/assets/modernmetals/models/item/plutonium_bucket.json new file mode 100644 index 00000000..9df490d8 --- /dev/null +++ b/src/main/resources/assets/modernmetals/models/item/plutonium_bucket.json @@ -0,0 +1,8 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "minecraft:item/bucket", + "layer1": "modernmetals:items/bucket_fluid", + "layer2": "modernmetals:items/bucket_overlay" + } +} diff --git a/src/main/resources/assets/modernmetals/models/item/plutonium_lever.json b/src/main/resources/assets/modernmetals/models/item/plutonium_lever.json index 291e6b44..917be899 100644 --- a/src/main/resources/assets/modernmetals/models/item/plutonium_lever.json +++ b/src/main/resources/assets/modernmetals/models/item/plutonium_lever.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", - "textures": { - "layer0": "blocks/lever" - } + "parent": "item/generated", + "textures": { + "layer0": "minecraft:block/lever" + } } diff --git a/src/main/resources/assets/modernmetals/models/item/rutile.json b/src/main/resources/assets/modernmetals/models/item/rutile.json new file mode 100644 index 00000000..985b9f13 --- /dev/null +++ b/src/main/resources/assets/modernmetals/models/item/rutile.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "modernmetals:blocks/rutile_block" + } +} diff --git a/src/main/resources/assets/modernmetals/models/item/rutile_bucket.json b/src/main/resources/assets/modernmetals/models/item/rutile_bucket.json new file mode 100644 index 00000000..9df490d8 --- /dev/null +++ b/src/main/resources/assets/modernmetals/models/item/rutile_bucket.json @@ -0,0 +1,8 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "minecraft:item/bucket", + "layer1": "modernmetals:items/bucket_fluid", + "layer2": "modernmetals:items/bucket_overlay" + } +} diff --git a/src/main/resources/assets/modernmetals/models/item/rutile_lever.json b/src/main/resources/assets/modernmetals/models/item/rutile_lever.json index 291e6b44..917be899 100644 --- a/src/main/resources/assets/modernmetals/models/item/rutile_lever.json +++ b/src/main/resources/assets/modernmetals/models/item/rutile_lever.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", - "textures": { - "layer0": "blocks/lever" - } + "parent": "item/generated", + "textures": { + "layer0": "minecraft:block/lever" + } } diff --git a/src/main/resources/assets/modernmetals/models/item/stainlesssteel.json b/src/main/resources/assets/modernmetals/models/item/stainlesssteel.json new file mode 100644 index 00000000..c5654408 --- /dev/null +++ b/src/main/resources/assets/modernmetals/models/item/stainlesssteel.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "modernmetals:blocks/stainlesssteel_block" + } +} diff --git a/src/main/resources/assets/modernmetals/models/item/stainlesssteel_bucket.json b/src/main/resources/assets/modernmetals/models/item/stainlesssteel_bucket.json new file mode 100644 index 00000000..9df490d8 --- /dev/null +++ b/src/main/resources/assets/modernmetals/models/item/stainlesssteel_bucket.json @@ -0,0 +1,8 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "minecraft:item/bucket", + "layer1": "modernmetals:items/bucket_fluid", + "layer2": "modernmetals:items/bucket_overlay" + } +} diff --git a/src/main/resources/assets/modernmetals/models/item/stainlesssteel_lever.json b/src/main/resources/assets/modernmetals/models/item/stainlesssteel_lever.json index 291e6b44..917be899 100644 --- a/src/main/resources/assets/modernmetals/models/item/stainlesssteel_lever.json +++ b/src/main/resources/assets/modernmetals/models/item/stainlesssteel_lever.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", - "textures": { - "layer0": "blocks/lever" - } + "parent": "item/generated", + "textures": { + "layer0": "minecraft:block/lever" + } } diff --git a/src/main/resources/assets/modernmetals/models/item/tantalum.json b/src/main/resources/assets/modernmetals/models/item/tantalum.json new file mode 100644 index 00000000..dd8447d8 --- /dev/null +++ b/src/main/resources/assets/modernmetals/models/item/tantalum.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "modernmetals:blocks/tantalum_block" + } +} diff --git a/src/main/resources/assets/modernmetals/models/item/tantalum_bucket.json b/src/main/resources/assets/modernmetals/models/item/tantalum_bucket.json new file mode 100644 index 00000000..9df490d8 --- /dev/null +++ b/src/main/resources/assets/modernmetals/models/item/tantalum_bucket.json @@ -0,0 +1,8 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "minecraft:item/bucket", + "layer1": "modernmetals:items/bucket_fluid", + "layer2": "modernmetals:items/bucket_overlay" + } +} diff --git a/src/main/resources/assets/modernmetals/models/item/tantalum_lever.json b/src/main/resources/assets/modernmetals/models/item/tantalum_lever.json index 291e6b44..917be899 100644 --- a/src/main/resources/assets/modernmetals/models/item/tantalum_lever.json +++ b/src/main/resources/assets/modernmetals/models/item/tantalum_lever.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", - "textures": { - "layer0": "blocks/lever" - } + "parent": "item/generated", + "textures": { + "layer0": "minecraft:block/lever" + } } diff --git a/src/main/resources/assets/modernmetals/models/item/thorium.json b/src/main/resources/assets/modernmetals/models/item/thorium.json new file mode 100644 index 00000000..4838d4e9 --- /dev/null +++ b/src/main/resources/assets/modernmetals/models/item/thorium.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "modernmetals:blocks/thorium_block" + } +} diff --git a/src/main/resources/assets/modernmetals/models/item/thorium_bucket.json b/src/main/resources/assets/modernmetals/models/item/thorium_bucket.json new file mode 100644 index 00000000..9df490d8 --- /dev/null +++ b/src/main/resources/assets/modernmetals/models/item/thorium_bucket.json @@ -0,0 +1,8 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "minecraft:item/bucket", + "layer1": "modernmetals:items/bucket_fluid", + "layer2": "modernmetals:items/bucket_overlay" + } +} diff --git a/src/main/resources/assets/modernmetals/models/item/thorium_lever.json b/src/main/resources/assets/modernmetals/models/item/thorium_lever.json index 291e6b44..917be899 100644 --- a/src/main/resources/assets/modernmetals/models/item/thorium_lever.json +++ b/src/main/resources/assets/modernmetals/models/item/thorium_lever.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", - "textures": { - "layer0": "blocks/lever" - } + "parent": "item/generated", + "textures": { + "layer0": "minecraft:block/lever" + } } diff --git a/src/main/resources/assets/modernmetals/models/item/titanium.json b/src/main/resources/assets/modernmetals/models/item/titanium.json new file mode 100644 index 00000000..309d8914 --- /dev/null +++ b/src/main/resources/assets/modernmetals/models/item/titanium.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "modernmetals:blocks/titanium_block" + } +} diff --git a/src/main/resources/assets/modernmetals/models/item/titanium_bucket.json b/src/main/resources/assets/modernmetals/models/item/titanium_bucket.json new file mode 100644 index 00000000..9df490d8 --- /dev/null +++ b/src/main/resources/assets/modernmetals/models/item/titanium_bucket.json @@ -0,0 +1,8 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "minecraft:item/bucket", + "layer1": "modernmetals:items/bucket_fluid", + "layer2": "modernmetals:items/bucket_overlay" + } +} diff --git a/src/main/resources/assets/modernmetals/models/item/titanium_lever.json b/src/main/resources/assets/modernmetals/models/item/titanium_lever.json index 291e6b44..917be899 100644 --- a/src/main/resources/assets/modernmetals/models/item/titanium_lever.json +++ b/src/main/resources/assets/modernmetals/models/item/titanium_lever.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", - "textures": { - "layer0": "blocks/lever" - } + "parent": "item/generated", + "textures": { + "layer0": "minecraft:block/lever" + } } diff --git a/src/main/resources/assets/modernmetals/models/item/tungsten.json b/src/main/resources/assets/modernmetals/models/item/tungsten.json new file mode 100644 index 00000000..39d683eb --- /dev/null +++ b/src/main/resources/assets/modernmetals/models/item/tungsten.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "modernmetals:blocks/tungsten_block" + } +} diff --git a/src/main/resources/assets/modernmetals/models/item/tungsten_bucket.json b/src/main/resources/assets/modernmetals/models/item/tungsten_bucket.json new file mode 100644 index 00000000..9df490d8 --- /dev/null +++ b/src/main/resources/assets/modernmetals/models/item/tungsten_bucket.json @@ -0,0 +1,8 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "minecraft:item/bucket", + "layer1": "modernmetals:items/bucket_fluid", + "layer2": "modernmetals:items/bucket_overlay" + } +} diff --git a/src/main/resources/assets/modernmetals/models/item/tungsten_lever.json b/src/main/resources/assets/modernmetals/models/item/tungsten_lever.json index 291e6b44..917be899 100644 --- a/src/main/resources/assets/modernmetals/models/item/tungsten_lever.json +++ b/src/main/resources/assets/modernmetals/models/item/tungsten_lever.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", - "textures": { - "layer0": "blocks/lever" - } + "parent": "item/generated", + "textures": { + "layer0": "minecraft:block/lever" + } } diff --git a/src/main/resources/assets/modernmetals/models/item/uranium.json b/src/main/resources/assets/modernmetals/models/item/uranium.json new file mode 100644 index 00000000..ff9f7b5b --- /dev/null +++ b/src/main/resources/assets/modernmetals/models/item/uranium.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "modernmetals:blocks/uranium_block" + } +} diff --git a/src/main/resources/assets/modernmetals/models/item/uranium_bucket.json b/src/main/resources/assets/modernmetals/models/item/uranium_bucket.json new file mode 100644 index 00000000..9df490d8 --- /dev/null +++ b/src/main/resources/assets/modernmetals/models/item/uranium_bucket.json @@ -0,0 +1,8 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "minecraft:item/bucket", + "layer1": "modernmetals:items/bucket_fluid", + "layer2": "modernmetals:items/bucket_overlay" + } +} diff --git a/src/main/resources/assets/modernmetals/models/item/uranium_lever.json b/src/main/resources/assets/modernmetals/models/item/uranium_lever.json index 291e6b44..917be899 100644 --- a/src/main/resources/assets/modernmetals/models/item/uranium_lever.json +++ b/src/main/resources/assets/modernmetals/models/item/uranium_lever.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", - "textures": { - "layer0": "blocks/lever" - } + "parent": "item/generated", + "textures": { + "layer0": "minecraft:block/lever" + } } diff --git a/src/main/resources/assets/modernmetals/models/item/zirconium.json b/src/main/resources/assets/modernmetals/models/item/zirconium.json new file mode 100644 index 00000000..f1f1b95b --- /dev/null +++ b/src/main/resources/assets/modernmetals/models/item/zirconium.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "modernmetals:blocks/zirconium_block" + } +} diff --git a/src/main/resources/assets/modernmetals/models/item/zirconium_bucket.json b/src/main/resources/assets/modernmetals/models/item/zirconium_bucket.json new file mode 100644 index 00000000..9df490d8 --- /dev/null +++ b/src/main/resources/assets/modernmetals/models/item/zirconium_bucket.json @@ -0,0 +1,8 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "minecraft:item/bucket", + "layer1": "modernmetals:items/bucket_fluid", + "layer2": "modernmetals:items/bucket_overlay" + } +} diff --git a/src/main/resources/assets/modernmetals/models/item/zirconium_lever.json b/src/main/resources/assets/modernmetals/models/item/zirconium_lever.json index 291e6b44..917be899 100644 --- a/src/main/resources/assets/modernmetals/models/item/zirconium_lever.json +++ b/src/main/resources/assets/modernmetals/models/item/zirconium_lever.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", - "textures": { - "layer0": "blocks/lever" - } + "parent": "item/generated", + "textures": { + "layer0": "minecraft:block/lever" + } } diff --git a/src/main/resources/assets/modernmetals/textures/items/bucket_fluid.png b/src/main/resources/assets/modernmetals/textures/items/bucket_fluid.png new file mode 100644 index 00000000..1899e092 Binary files /dev/null and b/src/main/resources/assets/modernmetals/textures/items/bucket_fluid.png differ diff --git a/src/main/resources/assets/modernmetals/textures/items/bucket_overlay.png b/src/main/resources/assets/modernmetals/textures/items/bucket_overlay.png new file mode 100644 index 00000000..813723ff Binary files /dev/null and b/src/main/resources/assets/modernmetals/textures/items/bucket_overlay.png differ diff --git a/src/main/resources/assets/modernmetals/textures/items/coal_powder.png b/src/main/resources/assets/modernmetals/textures/items/coal_powder.png new file mode 100644 index 00000000..f82b991d Binary files /dev/null and b/src/main/resources/assets/modernmetals/textures/items/coal_powder.png differ diff --git a/src/main/resources/coremods/modernmetals_113_compatibility.js b/src/main/resources/coremods/modernmetals_113_compatibility.js new file mode 100644 index 00000000..84482399 --- /dev/null +++ b/src/main/resources/coremods/modernmetals_113_compatibility.js @@ -0,0 +1,181 @@ +var Opcodes = Java.type('org.objectweb.asm.Opcodes'); +var InsnNode = Java.type('org.objectweb.asm.tree.InsnNode'); +var InsnList = Java.type('org.objectweb.asm.tree.InsnList'); +var JumpInsnNode = Java.type('org.objectweb.asm.tree.JumpInsnNode'); +var LabelNode = Java.type('org.objectweb.asm.tree.LabelNode'); +var MethodInsnNode = Java.type('org.objectweb.asm.tree.MethodInsnNode'); +var VarInsnNode = Java.type('org.objectweb.asm.tree.VarInsnNode'); + +function initializeCoreMod() { + return { + 'modernmetals_forge25_leaves_fixer': { + 'target': { 'type': 'CLASS', 'name': 'net.minecraft.util.datafix.fixes.LeavesFix$Section' }, + 'transformer': function(classNode) { + var patched = false; + for (var i = 0; i < classNode.methods.size(); ++i) { + var method = classNode.methods.get(i); + if (method.desc !== '(Lcom/mojang/datafixers/Typed;)Lcom/mojang/datafixers/Typed;') continue; + for (var instruction = method.instructions.getFirst(); instruction !== null; + instruction = instruction.getNext()) { + // Some Forge installations already contain the corrected erased overload. + if (instruction.getOpcode() === Opcodes.INVOKEVIRTUAL + && instruction.owner === 'com/mojang/datafixers/Typed' && instruction.name === 'set' + && instruction.desc === '(Lcom/mojang/datafixers/OpticFinder;' + + 'Ljava/lang/Object;)Lcom/mojang/datafixers/Typed;') { + patched = true; + continue; + } + if (instruction.getOpcode() !== Opcodes.CHECKCAST + || instruction.desc !== 'com/mojang/datafixers/Typed') continue; + var call = instruction.getNext(); + while (call !== null && call.getOpcode() < 0) call = call.getNext(); + if (call === null || call.getOpcode() !== Opcodes.INVOKEVIRTUAL + || call.owner !== 'com/mojang/datafixers/Typed' || call.name !== 'set' + || call.desc !== '(Lcom/mojang/datafixers/OpticFinder;' + + 'Lcom/mojang/datafixers/Typed;)Lcom/mojang/datafixers/Typed;') continue; + method.instructions.remove(instruction); + call.desc = '(Lcom/mojang/datafixers/OpticFinder;' + + 'Ljava/lang/Object;)Lcom/mojang/datafixers/Typed;'; + patched = true; + break; + } + } + if (!patched) throw new Error('Modern Metals could not repair the Forge 25 leaves data fixer'); + return classNode; + } + }, + 'modernmetals_legacy_world_info': { + 'target': { 'type': 'CLASS', 'name': 'net.minecraft.world.storage.SaveFormatOld' }, + 'transformer': function(classNode) { + for (var i = 0; i < classNode.methods.size(); ++i) { + var method = classNode.methods.get(i); + if (method.desc !== '(Ljava/io/File;Lcom/mojang/datafixers/DataFixer;' + + 'Lnet/minecraft/world/storage/SaveHandler;)Lnet/minecraft/world/storage/WorldInfo;') continue; + var prefix = new InsnList(); + prefix.add(new VarInsnNode(Opcodes.ALOAD, 0)); + prefix.add(new MethodInsnNode(Opcodes.INVOKESTATIC, + 'zone/moddev/mc/modernmetals/migration/LegacyWorldDataHook', + 'prepareLegacyWorld', '(Ljava/io/File;)V', false)); + method.instructions.insert(prefix); + } + return classNode; + } + }, + 'modernmetals_legacy_chunk_status': { + 'target': { 'type': 'CLASS', 'name': 'net.minecraft.world.chunk.storage.AnvilChunkLoader' }, + 'transformer': function(classNode) { + var descriptor = '(Lnet/minecraft/world/dimension/DimensionType;' + + 'Lnet/minecraft/world/storage/WorldSavedDataStorage;II)' + + 'Lnet/minecraft/nbt/NBTTagCompound;'; + var patchedRead = false; + var patchedReturn = false; + for (var i = 0; i < classNode.methods.size(); ++i) { + var method = classNode.methods.get(i); + if (method.desc !== descriptor) continue; + for (var instruction = method.instructions.getFirst(); instruction !== null; + instruction = instruction.getNext()) { + var previous = instruction.getPrevious(); + if (instruction.getOpcode() === Opcodes.ASTORE && previous !== null + && previous.getOpcode() === Opcodes.INVOKESTATIC + && previous.owner === 'net/minecraft/nbt/CompressedStreamTools' + && previous.desc.endsWith(')Lnet/minecraft/nbt/NBTTagCompound;')) { + var prepare = new InsnList(); + prepare.add(new VarInsnNode(Opcodes.ALOAD, instruction.var)); + prepare.add(new MethodInsnNode(Opcodes.INVOKESTATIC, + 'zone/moddev/mc/modernmetals/migration/LegacyWorldDataHook', + 'prepareLegacyChunk', '(Lnet/minecraft/nbt/NBTTagCompound;)V', false)); + method.instructions.insert(instruction, prepare); + patchedRead = true; + } else if (instruction.getOpcode() === Opcodes.ARETURN) { + method.instructions.insertBefore(instruction, new MethodInsnNode(Opcodes.INVOKESTATIC, + 'zone/moddev/mc/modernmetals/migration/LegacyWorldDataHook', + 'finalizeLegacyChunk', + '(Lnet/minecraft/nbt/NBTTagCompound;)Lnet/minecraft/nbt/NBTTagCompound;', false)); + patchedReturn = true; + } + } + } + if (!patchedRead || !patchedReturn) throw new Error('Modern Metals could not patch the Forge 25 legacy chunk loader'); + return classNode; + } + }, + 'modernmetals_legacy_worldgen_guard': { + 'target': { 'type': 'CLASS', 'name': 'net.minecraft.world.gen.WorldGenRegion' }, + 'transformer': function(classNode) { + var descriptor = '(Lnet/minecraft/util/math/BlockPos;' + + 'Lnet/minecraft/block/state/IBlockState;I)Z'; + var patched = false; + for (var i = 0; i < classNode.methods.size(); ++i) { + var method = classNode.methods.get(i); + if (method.desc !== descriptor) continue; + var allowed = new LabelNode(); + var prefix = new InsnList(); + prefix.add(new VarInsnNode(Opcodes.ALOAD, 0)); + prefix.add(new VarInsnNode(Opcodes.ALOAD, 1)); + prefix.add(new MethodInsnNode(Opcodes.INVOKESTATIC, + 'zone/moddev/mc/modernmetals/migration/LegacyWorldDataHook', + 'shouldBlockWorldgenWrite', + '(Lnet/minecraft/world/gen/WorldGenRegion;Lnet/minecraft/util/math/BlockPos;)Z', false)); + prefix.add(new JumpInsnNode(Opcodes.IFEQ, allowed)); + prefix.add(new InsnNode(Opcodes.ICONST_0)); + prefix.add(new InsnNode(Opcodes.IRETURN)); + prefix.add(allowed); + method.instructions.insert(prefix); + patched = true; + } + if (!patched) throw new Error('Modern Metals could not patch the Forge 25 legacy-world write guard'); + return classNode; + } + }, + 'modernmetals_molten_metal_renderer': { + 'target': { 'type': 'CLASS', 'name': 'net.minecraft.client.renderer.BlockFluidRenderer' }, + 'transformer': function(classNode) { + var descriptor = '(Lnet/minecraft/world/IWorldReader;Lnet/minecraft/util/math/BlockPos;' + + 'Lnet/minecraft/client/renderer/BufferBuilder;Lnet/minecraft/fluid/IFluidState;)Z'; + for (var i = 0; i < classNode.methods.size(); ++i) { + var method = classNode.methods.get(i); + if (method.name !== 'render' || method.desc !== descriptor) continue; + var flag = false, sprites = false, color = false; + for (var instruction = method.instructions.getFirst(); instruction !== null; + instruction = instruction.getNext()) { + if (!flag && instruction.getOpcode() === Opcodes.ISTORE && instruction.var === 5) { + var hookFlag = new InsnList(); + hookFlag.add(new VarInsnNode(Opcodes.ALOAD, 4)); + hookFlag.add(new VarInsnNode(Opcodes.ILOAD, 5)); + hookFlag.add(new MethodInsnNode(Opcodes.INVOKESTATIC, + 'zone/moddev/mc/modernmetals/client/ClientMoltenMetalRenderer', + 'useOpaqueFluidPath', '(Lnet/minecraft/fluid/IFluidState;Z)Z', false)); + hookFlag.add(new VarInsnNode(Opcodes.ISTORE, 5)); + method.instructions.insert(instruction, hookFlag); + flag = true; + } else if (!sprites && instruction.getOpcode() === Opcodes.ASTORE && instruction.var === 6) { + var hookSprites = new InsnList(); + hookSprites.add(new VarInsnNode(Opcodes.ALOAD, 4)); + hookSprites.add(new VarInsnNode(Opcodes.ALOAD, 6)); + hookSprites.add(new MethodInsnNode(Opcodes.INVOKESTATIC, + 'zone/moddev/mc/modernmetals/client/ClientMoltenMetalRenderer', + 'overrideSprites', + '(Lnet/minecraft/fluid/IFluidState;[Lnet/minecraft/client/renderer/texture/TextureAtlasSprite;)' + + '[Lnet/minecraft/client/renderer/texture/TextureAtlasSprite;', false)); + hookSprites.add(new VarInsnNode(Opcodes.ASTORE, 6)); + method.instructions.insert(instruction, hookSprites); + sprites = true; + } else if (!color && instruction.getOpcode() === Opcodes.ISTORE && instruction.var === 7) { + var hookColor = new InsnList(); + hookColor.add(new VarInsnNode(Opcodes.ALOAD, 4)); + hookColor.add(new VarInsnNode(Opcodes.ILOAD, 7)); + hookColor.add(new MethodInsnNode(Opcodes.INVOKESTATIC, + 'zone/moddev/mc/modernmetals/client/ClientMoltenMetalRenderer', + 'overrideColor', '(Lnet/minecraft/fluid/IFluidState;I)I', false)); + hookColor.add(new VarInsnNode(Opcodes.ISTORE, 7)); + method.instructions.insert(instruction, hookColor); + color = true; + } + } + if (!flag || !sprites || !color) throw new Error('Modern Metals could not patch the Forge 25 fluid renderer'); + } + return classNode; + } + } + }; +} diff --git a/src/main/resources/data/basemetals/tags/blocks/crackhammer_crushable.json b/src/main/resources/data/basemetals/tags/blocks/crackhammer_crushable.json new file mode 100644 index 00000000..1181b684 --- /dev/null +++ b/src/main/resources/data/basemetals/tags/blocks/crackhammer_crushable.json @@ -0,0 +1,43 @@ +{ + "replace": false, + "values": [ + "modernmetals:aluminum_block", + "modernmetals:aluminum_ore", + "modernmetals:aluminumbrass_block", + "modernmetals:beryllium_block", + "modernmetals:beryllium_ore", + "modernmetals:boron_block", + "modernmetals:boron_ore", + "modernmetals:cadmium_block", + "modernmetals:cadmium_ore", + "modernmetals:chromium_block", + "modernmetals:chromium_ore", + "modernmetals:galvanizedsteel_block", + "modernmetals:iridium_block", + "modernmetals:iridium_ore", + "modernmetals:magnesium_block", + "modernmetals:magnesium_ore", + "modernmetals:manganese_block", + "modernmetals:manganese_ore", + "modernmetals:nichrome_block", + "modernmetals:osmium_block", + "modernmetals:osmium_ore", + "modernmetals:plutonium_block", + "modernmetals:plutonium_ore", + "modernmetals:rutile_block", + "modernmetals:rutile_ore", + "modernmetals:stainlesssteel_block", + "modernmetals:tantalum_block", + "modernmetals:tantalum_ore", + "modernmetals:thorium_block", + "modernmetals:thorium_ore", + "modernmetals:titanium_block", + "modernmetals:titanium_ore", + "modernmetals:tungsten_block", + "modernmetals:tungsten_ore", + "modernmetals:uranium_block", + "modernmetals:uranium_ore", + "modernmetals:zirconium_block", + "modernmetals:zirconium_ore" + ] +} diff --git a/src/main/resources/data/forge/tags/items/dusts/coal.json b/src/main/resources/data/forge/tags/items/dusts/coal.json new file mode 100644 index 00000000..c1695b3a --- /dev/null +++ b/src/main/resources/data/forge/tags/items/dusts/coal.json @@ -0,0 +1,4 @@ +{ + "replace": false, + "values": ["modernmetals:coal_powder"] +} diff --git a/src/main/resources/data/modernmetals/migration/registry_1_12.json b/src/main/resources/data/modernmetals/migration/registry_1_12.json new file mode 100644 index 00000000..90d974e0 --- /dev/null +++ b/src/main/resources/data/modernmetals/migration/registry_1_12.json @@ -0,0 +1,1217 @@ +{ + "blocks": [ + "aluminum", + "aluminum_bars", + "aluminum_block", + "aluminum_button", + "aluminum_door", + "aluminum_lever", + "aluminum_ore", + "aluminum_plate", + "aluminum_pressure_plate", + "aluminum_slab", + "aluminum_stairs", + "aluminum_trapdoor", + "aluminum_wall", + "aluminumbrass", + "aluminumbrass_bars", + "aluminumbrass_block", + "aluminumbrass_button", + "aluminumbrass_door", + "aluminumbrass_lever", + "aluminumbrass_plate", + "aluminumbrass_pressure_plate", + "aluminumbrass_slab", + "aluminumbrass_stairs", + "aluminumbrass_trapdoor", + "aluminumbrass_wall", + "beryllium", + "beryllium_bars", + "beryllium_block", + "beryllium_button", + "beryllium_door", + "beryllium_lever", + "beryllium_ore", + "beryllium_plate", + "beryllium_pressure_plate", + "beryllium_slab", + "beryllium_stairs", + "beryllium_trapdoor", + "beryllium_wall", + "boron", + "boron_bars", + "boron_block", + "boron_button", + "boron_door", + "boron_lever", + "boron_ore", + "boron_plate", + "boron_pressure_plate", + "boron_slab", + "boron_stairs", + "boron_trapdoor", + "boron_wall", + "cadmium", + "cadmium_bars", + "cadmium_block", + "cadmium_button", + "cadmium_door", + "cadmium_lever", + "cadmium_ore", + "cadmium_plate", + "cadmium_pressure_plate", + "cadmium_slab", + "cadmium_stairs", + "cadmium_trapdoor", + "cadmium_wall", + "chromium", + "chromium_bars", + "chromium_block", + "chromium_button", + "chromium_door", + "chromium_lever", + "chromium_ore", + "chromium_plate", + "chromium_pressure_plate", + "chromium_slab", + "chromium_stairs", + "chromium_trapdoor", + "chromium_wall", + "double_aluminum_slab", + "double_aluminumbrass_slab", + "double_beryllium_slab", + "double_boron_slab", + "double_cadmium_slab", + "double_chromium_slab", + "double_galvanizedsteel_slab", + "double_iridium_slab", + "double_magnesium_slab", + "double_manganese_slab", + "double_nichrome_slab", + "double_osmium_slab", + "double_plutonium_slab", + "double_rutile_slab", + "double_stainlesssteel_slab", + "double_tantalum_slab", + "double_thorium_slab", + "double_titanium_slab", + "double_tungsten_slab", + "double_uranium_slab", + "double_zirconium_slab", + "galvanizedsteel", + "galvanizedsteel_bars", + "galvanizedsteel_block", + "galvanizedsteel_button", + "galvanizedsteel_door", + "galvanizedsteel_lever", + "galvanizedsteel_plate", + "galvanizedsteel_pressure_plate", + "galvanizedsteel_slab", + "galvanizedsteel_stairs", + "galvanizedsteel_trapdoor", + "galvanizedsteel_wall", + "iridium", + "iridium_bars", + "iridium_block", + "iridium_button", + "iridium_door", + "iridium_lever", + "iridium_ore", + "iridium_plate", + "iridium_pressure_plate", + "iridium_slab", + "iridium_stairs", + "iridium_trapdoor", + "iridium_wall", + "magnesium", + "magnesium_bars", + "magnesium_block", + "magnesium_button", + "magnesium_door", + "magnesium_lever", + "magnesium_ore", + "magnesium_plate", + "magnesium_pressure_plate", + "magnesium_slab", + "magnesium_stairs", + "magnesium_trapdoor", + "magnesium_wall", + "manganese", + "manganese_bars", + "manganese_block", + "manganese_button", + "manganese_door", + "manganese_lever", + "manganese_ore", + "manganese_plate", + "manganese_pressure_plate", + "manganese_slab", + "manganese_stairs", + "manganese_trapdoor", + "manganese_wall", + "nichrome", + "nichrome_bars", + "nichrome_block", + "nichrome_button", + "nichrome_door", + "nichrome_lever", + "nichrome_plate", + "nichrome_pressure_plate", + "nichrome_slab", + "nichrome_stairs", + "nichrome_trapdoor", + "nichrome_wall", + "osmium", + "osmium_bars", + "osmium_block", + "osmium_button", + "osmium_door", + "osmium_lever", + "osmium_ore", + "osmium_plate", + "osmium_pressure_plate", + "osmium_slab", + "osmium_stairs", + "osmium_trapdoor", + "osmium_wall", + "plutonium", + "plutonium_bars", + "plutonium_block", + "plutonium_button", + "plutonium_door", + "plutonium_lever", + "plutonium_ore", + "plutonium_plate", + "plutonium_pressure_plate", + "plutonium_slab", + "plutonium_stairs", + "plutonium_trapdoor", + "plutonium_wall", + "rutile", + "rutile_bars", + "rutile_block", + "rutile_button", + "rutile_door", + "rutile_lever", + "rutile_ore", + "rutile_plate", + "rutile_pressure_plate", + "rutile_slab", + "rutile_stairs", + "rutile_trapdoor", + "rutile_wall", + "stainlesssteel", + "stainlesssteel_bars", + "stainlesssteel_block", + "stainlesssteel_button", + "stainlesssteel_door", + "stainlesssteel_lever", + "stainlesssteel_plate", + "stainlesssteel_pressure_plate", + "stainlesssteel_slab", + "stainlesssteel_stairs", + "stainlesssteel_trapdoor", + "stainlesssteel_wall", + "tantalum", + "tantalum_bars", + "tantalum_block", + "tantalum_button", + "tantalum_door", + "tantalum_lever", + "tantalum_ore", + "tantalum_plate", + "tantalum_pressure_plate", + "tantalum_slab", + "tantalum_stairs", + "tantalum_trapdoor", + "tantalum_wall", + "thorium", + "thorium_bars", + "thorium_block", + "thorium_button", + "thorium_door", + "thorium_lever", + "thorium_ore", + "thorium_plate", + "thorium_pressure_plate", + "thorium_slab", + "thorium_stairs", + "thorium_trapdoor", + "thorium_wall", + "titanium", + "titanium_bars", + "titanium_block", + "titanium_button", + "titanium_door", + "titanium_lever", + "titanium_ore", + "titanium_plate", + "titanium_pressure_plate", + "titanium_slab", + "titanium_stairs", + "titanium_trapdoor", + "titanium_wall", + "tungsten", + "tungsten_bars", + "tungsten_block", + "tungsten_button", + "tungsten_door", + "tungsten_lever", + "tungsten_ore", + "tungsten_plate", + "tungsten_pressure_plate", + "tungsten_slab", + "tungsten_stairs", + "tungsten_trapdoor", + "tungsten_wall", + "uranium", + "uranium_bars", + "uranium_block", + "uranium_button", + "uranium_door", + "uranium_lever", + "uranium_ore", + "uranium_plate", + "uranium_pressure_plate", + "uranium_slab", + "uranium_stairs", + "uranium_trapdoor", + "uranium_wall", + "zirconium", + "zirconium_bars", + "zirconium_block", + "zirconium_button", + "zirconium_door", + "zirconium_lever", + "zirconium_ore", + "zirconium_plate", + "zirconium_pressure_plate", + "zirconium_slab", + "zirconium_stairs", + "zirconium_trapdoor", + "zirconium_wall" + ], + "items": [ + "aluminum", + "aluminum_arrow", + "aluminum_axe", + "aluminum_bars", + "aluminum_block", + "aluminum_bolt", + "aluminum_boots", + "aluminum_bow", + "aluminum_button", + "aluminum_casing", + "aluminum_chestplate", + "aluminum_clump", + "aluminum_crackhammer", + "aluminum_crossbow", + "aluminum_crushed", + "aluminum_crushed_purified", + "aluminum_crystal", + "aluminum_dense_plate", + "aluminum_door", + "aluminum_fishing_rod", + "aluminum_gear", + "aluminum_helmet", + "aluminum_hoe", + "aluminum_horse_armor", + "aluminum_ingot", + "aluminum_leggings", + "aluminum_lever", + "aluminum_nugget", + "aluminum_ore", + "aluminum_pickaxe", + "aluminum_plate", + "aluminum_powder", + "aluminum_powder_dirty", + "aluminum_pressure_plate", + "aluminum_rod", + "aluminum_shard", + "aluminum_shears", + "aluminum_shield", + "aluminum_shovel", + "aluminum_slab", + "aluminum_smallpowder", + "aluminum_stairs", + "aluminum_sword", + "aluminum_trapdoor", + "aluminum_wall", + "aluminumbrass", + "aluminumbrass_arrow", + "aluminumbrass_axe", + "aluminumbrass_bars", + "aluminumbrass_blend", + "aluminumbrass_block", + "aluminumbrass_bolt", + "aluminumbrass_boots", + "aluminumbrass_bow", + "aluminumbrass_button", + "aluminumbrass_casing", + "aluminumbrass_chestplate", + "aluminumbrass_crackhammer", + "aluminumbrass_crossbow", + "aluminumbrass_dense_plate", + "aluminumbrass_door", + "aluminumbrass_fishing_rod", + "aluminumbrass_gear", + "aluminumbrass_helmet", + "aluminumbrass_hoe", + "aluminumbrass_horse_armor", + "aluminumbrass_ingot", + "aluminumbrass_leggings", + "aluminumbrass_lever", + "aluminumbrass_nugget", + "aluminumbrass_pickaxe", + "aluminumbrass_plate", + "aluminumbrass_powder", + "aluminumbrass_pressure_plate", + "aluminumbrass_rod", + "aluminumbrass_shears", + "aluminumbrass_shield", + "aluminumbrass_shovel", + "aluminumbrass_slab", + "aluminumbrass_smallblend", + "aluminumbrass_smallpowder", + "aluminumbrass_stairs", + "aluminumbrass_sword", + "aluminumbrass_trapdoor", + "aluminumbrass_wall", + "beryllium", + "beryllium_arrow", + "beryllium_axe", + "beryllium_bars", + "beryllium_block", + "beryllium_bolt", + "beryllium_boots", + "beryllium_bow", + "beryllium_button", + "beryllium_casing", + "beryllium_chestplate", + "beryllium_clump", + "beryllium_crackhammer", + "beryllium_crossbow", + "beryllium_crushed", + "beryllium_crushed_purified", + "beryllium_crystal", + "beryllium_dense_plate", + "beryllium_door", + "beryllium_fishing_rod", + "beryllium_gear", + "beryllium_helmet", + "beryllium_hoe", + "beryllium_horse_armor", + "beryllium_ingot", + "beryllium_leggings", + "beryllium_lever", + "beryllium_nugget", + "beryllium_ore", + "beryllium_pickaxe", + "beryllium_plate", + "beryllium_powder", + "beryllium_powder_dirty", + "beryllium_pressure_plate", + "beryllium_rod", + "beryllium_shard", + "beryllium_shears", + "beryllium_shield", + "beryllium_shovel", + "beryllium_slab", + "beryllium_smallpowder", + "beryllium_stairs", + "beryllium_sword", + "beryllium_trapdoor", + "beryllium_wall", + "boron", + "boron_arrow", + "boron_axe", + "boron_bars", + "boron_block", + "boron_bolt", + "boron_boots", + "boron_bow", + "boron_button", + "boron_casing", + "boron_chestplate", + "boron_clump", + "boron_crackhammer", + "boron_crossbow", + "boron_crushed", + "boron_crushed_purified", + "boron_crystal", + "boron_dense_plate", + "boron_door", + "boron_fishing_rod", + "boron_gear", + "boron_helmet", + "boron_hoe", + "boron_horse_armor", + "boron_ingot", + "boron_leggings", + "boron_lever", + "boron_nugget", + "boron_ore", + "boron_pickaxe", + "boron_plate", + "boron_powder", + "boron_powder_dirty", + "boron_pressure_plate", + "boron_rod", + "boron_shard", + "boron_shears", + "boron_shield", + "boron_shovel", + "boron_slab", + "boron_smallpowder", + "boron_stairs", + "boron_sword", + "boron_trapdoor", + "boron_wall", + "cadmium", + "cadmium_arrow", + "cadmium_axe", + "cadmium_bars", + "cadmium_block", + "cadmium_bolt", + "cadmium_boots", + "cadmium_bow", + "cadmium_button", + "cadmium_casing", + "cadmium_chestplate", + "cadmium_clump", + "cadmium_crackhammer", + "cadmium_crossbow", + "cadmium_crushed", + "cadmium_crushed_purified", + "cadmium_crystal", + "cadmium_dense_plate", + "cadmium_door", + "cadmium_fishing_rod", + "cadmium_gear", + "cadmium_helmet", + "cadmium_hoe", + "cadmium_horse_armor", + "cadmium_ingot", + "cadmium_leggings", + "cadmium_lever", + "cadmium_nugget", + "cadmium_ore", + "cadmium_pickaxe", + "cadmium_plate", + "cadmium_powder", + "cadmium_powder_dirty", + "cadmium_pressure_plate", + "cadmium_rod", + "cadmium_shard", + "cadmium_shears", + "cadmium_shield", + "cadmium_shovel", + "cadmium_slab", + "cadmium_smallpowder", + "cadmium_stairs", + "cadmium_sword", + "cadmium_trapdoor", + "cadmium_wall", + "chromium", + "chromium_arrow", + "chromium_axe", + "chromium_bars", + "chromium_block", + "chromium_bolt", + "chromium_boots", + "chromium_bow", + "chromium_button", + "chromium_casing", + "chromium_chestplate", + "chromium_clump", + "chromium_crackhammer", + "chromium_crossbow", + "chromium_crushed", + "chromium_crushed_purified", + "chromium_crystal", + "chromium_dense_plate", + "chromium_door", + "chromium_fishing_rod", + "chromium_gear", + "chromium_helmet", + "chromium_hoe", + "chromium_horse_armor", + "chromium_ingot", + "chromium_leggings", + "chromium_lever", + "chromium_nugget", + "chromium_ore", + "chromium_pickaxe", + "chromium_plate", + "chromium_powder", + "chromium_powder_dirty", + "chromium_pressure_plate", + "chromium_rod", + "chromium_shard", + "chromium_shears", + "chromium_shield", + "chromium_shovel", + "chromium_slab", + "chromium_smallpowder", + "chromium_stairs", + "chromium_sword", + "chromium_trapdoor", + "chromium_wall", + "galvanizedsteel", + "galvanizedsteel_arrow", + "galvanizedsteel_axe", + "galvanizedsteel_bars", + "galvanizedsteel_blend", + "galvanizedsteel_block", + "galvanizedsteel_bolt", + "galvanizedsteel_boots", + "galvanizedsteel_bow", + "galvanizedsteel_button", + "galvanizedsteel_casing", + "galvanizedsteel_chestplate", + "galvanizedsteel_crackhammer", + "galvanizedsteel_crossbow", + "galvanizedsteel_dense_plate", + "galvanizedsteel_door", + "galvanizedsteel_fishing_rod", + "galvanizedsteel_gear", + "galvanizedsteel_helmet", + "galvanizedsteel_hoe", + "galvanizedsteel_horse_armor", + "galvanizedsteel_ingot", + "galvanizedsteel_leggings", + "galvanizedsteel_lever", + "galvanizedsteel_nugget", + "galvanizedsteel_pickaxe", + "galvanizedsteel_plate", + "galvanizedsteel_powder", + "galvanizedsteel_pressure_plate", + "galvanizedsteel_rod", + "galvanizedsteel_shears", + "galvanizedsteel_shield", + "galvanizedsteel_shovel", + "galvanizedsteel_slab", + "galvanizedsteel_smallblend", + "galvanizedsteel_smallpowder", + "galvanizedsteel_stairs", + "galvanizedsteel_sword", + "galvanizedsteel_trapdoor", + "galvanizedsteel_wall", + "iridium", + "iridium_arrow", + "iridium_axe", + "iridium_bars", + "iridium_block", + "iridium_bolt", + "iridium_boots", + "iridium_bow", + "iridium_button", + "iridium_casing", + "iridium_chestplate", + "iridium_clump", + "iridium_crackhammer", + "iridium_crossbow", + "iridium_crushed", + "iridium_crushed_purified", + "iridium_crystal", + "iridium_dense_plate", + "iridium_door", + "iridium_fishing_rod", + "iridium_gear", + "iridium_helmet", + "iridium_hoe", + "iridium_horse_armor", + "iridium_ingot", + "iridium_leggings", + "iridium_lever", + "iridium_nugget", + "iridium_ore", + "iridium_pickaxe", + "iridium_plate", + "iridium_powder", + "iridium_powder_dirty", + "iridium_pressure_plate", + "iridium_rod", + "iridium_shard", + "iridium_shears", + "iridium_shield", + "iridium_shovel", + "iridium_slab", + "iridium_smallpowder", + "iridium_stairs", + "iridium_sword", + "iridium_trapdoor", + "iridium_wall", + "magnesium", + "magnesium_arrow", + "magnesium_axe", + "magnesium_bars", + "magnesium_block", + "magnesium_bolt", + "magnesium_boots", + "magnesium_bow", + "magnesium_button", + "magnesium_casing", + "magnesium_chestplate", + "magnesium_clump", + "magnesium_crackhammer", + "magnesium_crossbow", + "magnesium_crushed", + "magnesium_crushed_purified", + "magnesium_crystal", + "magnesium_dense_plate", + "magnesium_door", + "magnesium_fishing_rod", + "magnesium_gear", + "magnesium_helmet", + "magnesium_hoe", + "magnesium_horse_armor", + "magnesium_ingot", + "magnesium_leggings", + "magnesium_lever", + "magnesium_nugget", + "magnesium_ore", + "magnesium_pickaxe", + "magnesium_plate", + "magnesium_powder", + "magnesium_powder_dirty", + "magnesium_pressure_plate", + "magnesium_rod", + "magnesium_shard", + "magnesium_shears", + "magnesium_shield", + "magnesium_shovel", + "magnesium_slab", + "magnesium_smallpowder", + "magnesium_stairs", + "magnesium_sword", + "magnesium_trapdoor", + "magnesium_wall", + "manganese", + "manganese_arrow", + "manganese_axe", + "manganese_bars", + "manganese_block", + "manganese_bolt", + "manganese_boots", + "manganese_bow", + "manganese_button", + "manganese_casing", + "manganese_chestplate", + "manganese_clump", + "manganese_crackhammer", + "manganese_crossbow", + "manganese_crushed", + "manganese_crushed_purified", + "manganese_crystal", + "manganese_dense_plate", + "manganese_door", + "manganese_fishing_rod", + "manganese_gear", + "manganese_helmet", + "manganese_hoe", + "manganese_horse_armor", + "manganese_ingot", + "manganese_leggings", + "manganese_lever", + "manganese_nugget", + "manganese_ore", + "manganese_pickaxe", + "manganese_plate", + "manganese_powder", + "manganese_powder_dirty", + "manganese_pressure_plate", + "manganese_rod", + "manganese_shard", + "manganese_shears", + "manganese_shield", + "manganese_shovel", + "manganese_slab", + "manganese_smallpowder", + "manganese_stairs", + "manganese_sword", + "manganese_trapdoor", + "manganese_wall", + "nichrome", + "nichrome_arrow", + "nichrome_axe", + "nichrome_bars", + "nichrome_blend", + "nichrome_block", + "nichrome_bolt", + "nichrome_boots", + "nichrome_bow", + "nichrome_button", + "nichrome_casing", + "nichrome_chestplate", + "nichrome_crackhammer", + "nichrome_crossbow", + "nichrome_dense_plate", + "nichrome_door", + "nichrome_fishing_rod", + "nichrome_gear", + "nichrome_helmet", + "nichrome_hoe", + "nichrome_horse_armor", + "nichrome_ingot", + "nichrome_leggings", + "nichrome_lever", + "nichrome_nugget", + "nichrome_pickaxe", + "nichrome_plate", + "nichrome_powder", + "nichrome_pressure_plate", + "nichrome_rod", + "nichrome_shears", + "nichrome_shield", + "nichrome_shovel", + "nichrome_slab", + "nichrome_smallblend", + "nichrome_smallpowder", + "nichrome_stairs", + "nichrome_sword", + "nichrome_trapdoor", + "nichrome_wall", + "osmium", + "osmium_arrow", + "osmium_axe", + "osmium_bars", + "osmium_block", + "osmium_bolt", + "osmium_boots", + "osmium_bow", + "osmium_button", + "osmium_casing", + "osmium_chestplate", + "osmium_crackhammer", + "osmium_crossbow", + "osmium_crushed", + "osmium_crushed_purified", + "osmium_dense_plate", + "osmium_door", + "osmium_fishing_rod", + "osmium_gear", + "osmium_helmet", + "osmium_hoe", + "osmium_horse_armor", + "osmium_ingot", + "osmium_leggings", + "osmium_lever", + "osmium_nugget", + "osmium_ore", + "osmium_pickaxe", + "osmium_plate", + "osmium_powder", + "osmium_pressure_plate", + "osmium_rod", + "osmium_shears", + "osmium_shield", + "osmium_shovel", + "osmium_slab", + "osmium_smallpowder", + "osmium_stairs", + "osmium_sword", + "osmium_trapdoor", + "osmium_wall", + "plutonium", + "plutonium_arrow", + "plutonium_axe", + "plutonium_bars", + "plutonium_block", + "plutonium_bolt", + "plutonium_boots", + "plutonium_bow", + "plutonium_button", + "plutonium_casing", + "plutonium_chestplate", + "plutonium_clump", + "plutonium_crackhammer", + "plutonium_crossbow", + "plutonium_crushed", + "plutonium_crushed_purified", + "plutonium_crystal", + "plutonium_dense_plate", + "plutonium_door", + "plutonium_fishing_rod", + "plutonium_gear", + "plutonium_helmet", + "plutonium_hoe", + "plutonium_horse_armor", + "plutonium_ingot", + "plutonium_leggings", + "plutonium_lever", + "plutonium_nugget", + "plutonium_ore", + "plutonium_pickaxe", + "plutonium_plate", + "plutonium_powder", + "plutonium_powder_dirty", + "plutonium_pressure_plate", + "plutonium_rod", + "plutonium_shard", + "plutonium_shears", + "plutonium_shield", + "plutonium_shovel", + "plutonium_slab", + "plutonium_smallpowder", + "plutonium_stairs", + "plutonium_sword", + "plutonium_trapdoor", + "plutonium_wall", + "rutile", + "rutile_arrow", + "rutile_axe", + "rutile_bars", + "rutile_block", + "rutile_bolt", + "rutile_boots", + "rutile_bow", + "rutile_button", + "rutile_casing", + "rutile_chestplate", + "rutile_clump", + "rutile_crackhammer", + "rutile_crossbow", + "rutile_crushed", + "rutile_crushed_purified", + "rutile_crystal", + "rutile_dense_plate", + "rutile_door", + "rutile_fishing_rod", + "rutile_gear", + "rutile_helmet", + "rutile_hoe", + "rutile_horse_armor", + "rutile_ingot", + "rutile_leggings", + "rutile_lever", + "rutile_nugget", + "rutile_ore", + "rutile_pickaxe", + "rutile_plate", + "rutile_powder", + "rutile_powder_dirty", + "rutile_pressure_plate", + "rutile_rod", + "rutile_shard", + "rutile_shears", + "rutile_shield", + "rutile_shovel", + "rutile_slab", + "rutile_smallpowder", + "rutile_stairs", + "rutile_sword", + "rutile_trapdoor", + "rutile_wall", + "stainlesssteel", + "stainlesssteel_arrow", + "stainlesssteel_axe", + "stainlesssteel_bars", + "stainlesssteel_blend", + "stainlesssteel_block", + "stainlesssteel_bolt", + "stainlesssteel_boots", + "stainlesssteel_bow", + "stainlesssteel_button", + "stainlesssteel_casing", + "stainlesssteel_chestplate", + "stainlesssteel_crackhammer", + "stainlesssteel_crossbow", + "stainlesssteel_dense_plate", + "stainlesssteel_door", + "stainlesssteel_fishing_rod", + "stainlesssteel_gear", + "stainlesssteel_helmet", + "stainlesssteel_hoe", + "stainlesssteel_horse_armor", + "stainlesssteel_ingot", + "stainlesssteel_leggings", + "stainlesssteel_lever", + "stainlesssteel_nugget", + "stainlesssteel_pickaxe", + "stainlesssteel_plate", + "stainlesssteel_powder", + "stainlesssteel_pressure_plate", + "stainlesssteel_rod", + "stainlesssteel_shears", + "stainlesssteel_shield", + "stainlesssteel_shovel", + "stainlesssteel_slab", + "stainlesssteel_smallblend", + "stainlesssteel_smallpowder", + "stainlesssteel_stairs", + "stainlesssteel_sword", + "stainlesssteel_trapdoor", + "stainlesssteel_wall", + "tantalum", + "tantalum_arrow", + "tantalum_axe", + "tantalum_bars", + "tantalum_block", + "tantalum_bolt", + "tantalum_boots", + "tantalum_bow", + "tantalum_button", + "tantalum_casing", + "tantalum_chestplate", + "tantalum_clump", + "tantalum_crackhammer", + "tantalum_crossbow", + "tantalum_crushed", + "tantalum_crushed_purified", + "tantalum_crystal", + "tantalum_dense_plate", + "tantalum_door", + "tantalum_fishing_rod", + "tantalum_gear", + "tantalum_helmet", + "tantalum_hoe", + "tantalum_horse_armor", + "tantalum_ingot", + "tantalum_leggings", + "tantalum_lever", + "tantalum_nugget", + "tantalum_ore", + "tantalum_pickaxe", + "tantalum_plate", + "tantalum_powder", + "tantalum_powder_dirty", + "tantalum_pressure_plate", + "tantalum_rod", + "tantalum_shard", + "tantalum_shears", + "tantalum_shield", + "tantalum_shovel", + "tantalum_slab", + "tantalum_smallpowder", + "tantalum_stairs", + "tantalum_sword", + "tantalum_trapdoor", + "tantalum_wall", + "thorium", + "thorium_arrow", + "thorium_axe", + "thorium_bars", + "thorium_block", + "thorium_bolt", + "thorium_boots", + "thorium_bow", + "thorium_button", + "thorium_casing", + "thorium_chestplate", + "thorium_clump", + "thorium_crackhammer", + "thorium_crossbow", + "thorium_crushed", + "thorium_crushed_purified", + "thorium_crystal", + "thorium_dense_plate", + "thorium_door", + "thorium_fishing_rod", + "thorium_gear", + "thorium_helmet", + "thorium_hoe", + "thorium_horse_armor", + "thorium_ingot", + "thorium_leggings", + "thorium_lever", + "thorium_nugget", + "thorium_ore", + "thorium_pickaxe", + "thorium_plate", + "thorium_powder", + "thorium_powder_dirty", + "thorium_pressure_plate", + "thorium_rod", + "thorium_shard", + "thorium_shears", + "thorium_shield", + "thorium_shovel", + "thorium_slab", + "thorium_smallpowder", + "thorium_stairs", + "thorium_sword", + "thorium_trapdoor", + "thorium_wall", + "titanium", + "titanium_arrow", + "titanium_axe", + "titanium_bars", + "titanium_blend", + "titanium_block", + "titanium_bolt", + "titanium_boots", + "titanium_bow", + "titanium_button", + "titanium_casing", + "titanium_chestplate", + "titanium_clump", + "titanium_crackhammer", + "titanium_crossbow", + "titanium_crushed", + "titanium_crushed_purified", + "titanium_crystal", + "titanium_dense_plate", + "titanium_door", + "titanium_fishing_rod", + "titanium_gear", + "titanium_helmet", + "titanium_hoe", + "titanium_horse_armor", + "titanium_ingot", + "titanium_leggings", + "titanium_lever", + "titanium_nugget", + "titanium_ore", + "titanium_pickaxe", + "titanium_plate", + "titanium_powder", + "titanium_powder_dirty", + "titanium_pressure_plate", + "titanium_rod", + "titanium_shard", + "titanium_shears", + "titanium_shield", + "titanium_shovel", + "titanium_slab", + "titanium_smallblend", + "titanium_smallpowder", + "titanium_stairs", + "titanium_sword", + "titanium_trapdoor", + "titanium_wall", + "tungsten", + "tungsten_arrow", + "tungsten_axe", + "tungsten_bars", + "tungsten_block", + "tungsten_bolt", + "tungsten_boots", + "tungsten_bow", + "tungsten_button", + "tungsten_casing", + "tungsten_chestplate", + "tungsten_clump", + "tungsten_crackhammer", + "tungsten_crossbow", + "tungsten_crushed", + "tungsten_crushed_purified", + "tungsten_crystal", + "tungsten_dense_plate", + "tungsten_door", + "tungsten_fishing_rod", + "tungsten_gear", + "tungsten_helmet", + "tungsten_hoe", + "tungsten_horse_armor", + "tungsten_ingot", + "tungsten_leggings", + "tungsten_lever", + "tungsten_nugget", + "tungsten_ore", + "tungsten_pickaxe", + "tungsten_plate", + "tungsten_powder", + "tungsten_powder_dirty", + "tungsten_pressure_plate", + "tungsten_rod", + "tungsten_shard", + "tungsten_shears", + "tungsten_shield", + "tungsten_shovel", + "tungsten_slab", + "tungsten_smallpowder", + "tungsten_stairs", + "tungsten_sword", + "tungsten_trapdoor", + "tungsten_wall", + "uranium", + "uranium_arrow", + "uranium_axe", + "uranium_bars", + "uranium_block", + "uranium_bolt", + "uranium_boots", + "uranium_bow", + "uranium_button", + "uranium_casing", + "uranium_chestplate", + "uranium_clump", + "uranium_crackhammer", + "uranium_crossbow", + "uranium_crystal", + "uranium_dense_plate", + "uranium_door", + "uranium_fishing_rod", + "uranium_gear", + "uranium_helmet", + "uranium_hoe", + "uranium_horse_armor", + "uranium_ingot", + "uranium_leggings", + "uranium_lever", + "uranium_nugget", + "uranium_ore", + "uranium_pickaxe", + "uranium_plate", + "uranium_powder", + "uranium_powder_dirty", + "uranium_pressure_plate", + "uranium_rod", + "uranium_shard", + "uranium_shears", + "uranium_shield", + "uranium_shovel", + "uranium_slab", + "uranium_smallpowder", + "uranium_stairs", + "uranium_sword", + "uranium_trapdoor", + "uranium_wall", + "zirconium", + "zirconium_arrow", + "zirconium_axe", + "zirconium_bars", + "zirconium_block", + "zirconium_bolt", + "zirconium_boots", + "zirconium_bow", + "zirconium_button", + "zirconium_casing", + "zirconium_chestplate", + "zirconium_clump", + "zirconium_crackhammer", + "zirconium_crossbow", + "zirconium_crushed", + "zirconium_crushed_purified", + "zirconium_crystal", + "zirconium_dense_plate", + "zirconium_door", + "zirconium_fishing_rod", + "zirconium_gear", + "zirconium_helmet", + "zirconium_hoe", + "zirconium_horse_armor", + "zirconium_ingot", + "zirconium_leggings", + "zirconium_lever", + "zirconium_nugget", + "zirconium_ore", + "zirconium_pickaxe", + "zirconium_plate", + "zirconium_powder", + "zirconium_powder_dirty", + "zirconium_pressure_plate", + "zirconium_rod", + "zirconium_shard", + "zirconium_shears", + "zirconium_shield", + "zirconium_shovel", + "zirconium_slab", + "zirconium_smallpowder", + "zirconium_stairs", + "zirconium_sword", + "zirconium_trapdoor", + "zirconium_wall" + ] +} diff --git a/src/main/resources/data/modernmetals/orespawn/provider.json b/src/main/resources/data/modernmetals/orespawn/provider.json new file mode 100644 index 00000000..997076a5 --- /dev/null +++ b/src/main/resources/data/modernmetals/orespawn/provider.json @@ -0,0 +1,517 @@ +{ + "schema_version": 5, + "provider_modid": "modernmetals", + "provider_revision": 1, + "ores": { + "modernmetals:legacy/boron_ore": { + "block": "modernmetals:boron_ore", + "enabled": true, + "source_mod": "modernmetals", + "retrogen": false, + "material": "orespawn:boron", + "dimension_selectors": { + "orespawn:all_except_nether_end": { + "enabled": true, + "min_y": 0, + "max_y": 31, + "frequency": 8.0, + "min_quantity": 1, + "max_quantity": 15, + "placement_channel": "orespawn:standard", + "pattern": "default", + "host_blocks": [ + "minecraft:stone", + "minecraft:netherrack", + "minecraft:end_stone" + ], + "host_families": [ + "sedimentary", + "metamorphic", + "igneous_intrusive", + "igneous_volcanic" + ] + } + } + }, + "modernmetals:legacy/thorium_ore": { + "block": "modernmetals:thorium_ore", + "enabled": true, + "source_mod": "modernmetals", + "retrogen": false, + "material": "orespawn:thorium", + "dimension_selectors": { + "orespawn:all_except_nether_end": { + "enabled": true, + "min_y": 0, + "max_y": 31, + "frequency": 8.0, + "min_quantity": 4, + "max_quantity": 11, + "placement_channel": "orespawn:standard", + "pattern": "default", + "host_blocks": [ + "minecraft:stone", + "minecraft:netherrack", + "minecraft:end_stone" + ], + "host_families": [ + "sedimentary", + "metamorphic", + "igneous_intrusive", + "igneous_volcanic" + ] + } + } + }, + "modernmetals:legacy/beryllium_ore": { + "block": "modernmetals:beryllium_ore", + "enabled": true, + "source_mod": "modernmetals", + "retrogen": false, + "material": "orespawn:beryllium", + "dimension_selectors": { + "orespawn:all_except_nether_end": { + "enabled": true, + "min_y": 0, + "max_y": 127, + "frequency": 20.0, + "min_quantity": 2, + "max_quantity": 7, + "placement_channel": "orespawn:standard", + "pattern": "default", + "host_blocks": [ + "minecraft:stone", + "minecraft:netherrack", + "minecraft:end_stone" + ], + "host_families": [ + "sedimentary", + "metamorphic", + "igneous_intrusive", + "igneous_volcanic" + ] + } + } + }, + "modernmetals:legacy/aluminum_ore": { + "block": "modernmetals:aluminum_ore", + "enabled": true, + "source_mod": "modernmetals", + "retrogen": false, + "material": "orespawn:aluminum", + "dimension_selectors": { + "orespawn:all_except_nether_end": { + "enabled": true, + "min_y": 0, + "max_y": 95, + "frequency": 8.0, + "min_quantity": 2, + "max_quantity": 17, + "placement_channel": "orespawn:standard", + "pattern": "default", + "host_blocks": [ + "minecraft:stone", + "minecraft:netherrack", + "minecraft:end_stone" + ], + "host_families": [ + "sedimentary", + "metamorphic", + "igneous_intrusive", + "igneous_volcanic" + ] + } + } + }, + "modernmetals:legacy/cadmium_ore": { + "block": "modernmetals:cadmium_ore", + "enabled": true, + "source_mod": "modernmetals", + "retrogen": false, + "material": "orespawn:cadmium", + "dimension_selectors": { + "orespawn:all_except_nether_end": { + "enabled": true, + "min_y": 0, + "max_y": 95, + "frequency": 8.0, + "min_quantity": 1, + "max_quantity": 11, + "placement_channel": "orespawn:standard", + "pattern": "default", + "host_blocks": [ + "minecraft:stone", + "minecraft:netherrack", + "minecraft:end_stone" + ], + "host_families": [ + "sedimentary", + "metamorphic", + "igneous_intrusive", + "igneous_volcanic" + ] + } + } + }, + "modernmetals:legacy/chromium_ore": { + "block": "modernmetals:chromium_ore", + "enabled": true, + "source_mod": "modernmetals", + "retrogen": false, + "material": "orespawn:chromium", + "dimension_selectors": { + "orespawn:all_except_nether_end": { + "enabled": true, + "min_y": 0, + "max_y": 31, + "frequency": 3.0, + "min_quantity": 1, + "max_quantity": 5, + "placement_channel": "orespawn:standard", + "pattern": "default", + "host_blocks": [ + "minecraft:stone", + "minecraft:netherrack", + "minecraft:end_stone" + ], + "host_families": [ + "sedimentary", + "metamorphic", + "igneous_intrusive", + "igneous_volcanic" + ] + } + } + }, + "modernmetals:legacy/iridium_ore": { + "block": "modernmetals:iridium_ore", + "enabled": true, + "source_mod": "modernmetals", + "retrogen": false, + "material": "orespawn:iridium", + "dimension_selectors": { + "orespawn:all_except_nether_end": { + "enabled": true, + "min_y": 0, + "max_y": 63, + "frequency": 5.0, + "min_quantity": 2, + "max_quantity": 9, + "placement_channel": "orespawn:standard", + "pattern": "default", + "host_blocks": [ + "minecraft:stone", + "minecraft:netherrack", + "minecraft:end_stone" + ], + "host_families": [ + "sedimentary", + "metamorphic", + "igneous_intrusive", + "igneous_volcanic" + ] + } + } + }, + "modernmetals:legacy/magnesium_ore": { + "block": "modernmetals:magnesium_ore", + "enabled": true, + "source_mod": "modernmetals", + "retrogen": false, + "material": "orespawn:magnesium", + "dimension_selectors": { + "orespawn:all_except_nether_end": { + "enabled": true, + "min_y": 0, + "max_y": 95, + "frequency": 8.0, + "min_quantity": 2, + "max_quantity": 9, + "placement_channel": "orespawn:standard", + "pattern": "default", + "host_blocks": [ + "minecraft:stone", + "minecraft:netherrack", + "minecraft:end_stone" + ], + "host_families": [ + "sedimentary", + "metamorphic", + "igneous_intrusive", + "igneous_volcanic" + ] + } + } + }, + "modernmetals:legacy/manganese_ore": { + "block": "modernmetals:manganese_ore", + "enabled": true, + "source_mod": "modernmetals", + "retrogen": false, + "material": "orespawn:manganese", + "dimension_selectors": { + "orespawn:all_except_nether_end": { + "enabled": true, + "min_y": 0, + "max_y": 63, + "frequency": 6.0, + "min_quantity": 2, + "max_quantity": 9, + "placement_channel": "orespawn:standard", + "pattern": "default", + "host_blocks": [ + "minecraft:stone", + "minecraft:netherrack", + "minecraft:end_stone" + ], + "host_families": [ + "sedimentary", + "metamorphic", + "igneous_intrusive", + "igneous_volcanic" + ] + } + } + }, + "modernmetals:legacy/osmium_ore": { + "block": "modernmetals:osmium_ore", + "enabled": true, + "source_mod": "modernmetals", + "retrogen": false, + "material": "orespawn:osmium", + "dimension_selectors": { + "orespawn:all_except_nether_end": { + "enabled": true, + "min_y": 0, + "max_y": 95, + "frequency": 8.0, + "min_quantity": 6, + "max_quantity": 13, + "placement_channel": "orespawn:standard", + "pattern": "default", + "host_blocks": [ + "minecraft:stone", + "minecraft:netherrack", + "minecraft:end_stone" + ], + "host_families": [ + "sedimentary", + "metamorphic", + "igneous_intrusive", + "igneous_volcanic" + ] + } + } + }, + "modernmetals:legacy/plutonium_ore": { + "block": "modernmetals:plutonium_ore", + "enabled": true, + "source_mod": "modernmetals", + "retrogen": false, + "material": "orespawn:plutonium", + "dimension_selectors": { + "orespawn:all_except_nether_end": { + "enabled": true, + "min_y": 0, + "max_y": 31, + "frequency": 4.0, + "min_quantity": 1, + "max_quantity": 5, + "placement_channel": "orespawn:standard", + "pattern": "default", + "host_blocks": [ + "minecraft:stone", + "minecraft:netherrack", + "minecraft:end_stone" + ], + "host_families": [ + "sedimentary", + "metamorphic", + "igneous_intrusive", + "igneous_volcanic" + ] + } + } + }, + "modernmetals:legacy/rutile_ore": { + "block": "modernmetals:rutile_ore", + "enabled": true, + "source_mod": "modernmetals", + "retrogen": false, + "material": "orespawn:rutile", + "dimension_selectors": { + "orespawn:all_except_nether_end": { + "enabled": true, + "min_y": 0, + "max_y": 63, + "frequency": 6.0, + "min_quantity": 2, + "max_quantity": 9, + "placement_channel": "orespawn:standard", + "pattern": "default", + "host_blocks": [ + "minecraft:stone", + "minecraft:netherrack", + "minecraft:end_stone" + ], + "host_families": [ + "sedimentary", + "metamorphic", + "igneous_intrusive", + "igneous_volcanic" + ] + } + } + }, + "modernmetals:legacy/tantalum_ore": { + "block": "modernmetals:tantalum_ore", + "enabled": true, + "source_mod": "modernmetals", + "retrogen": false, + "material": "orespawn:tantalum", + "dimension_selectors": { + "orespawn:all_except_nether_end": { + "enabled": true, + "min_y": 0, + "max_y": 63, + "frequency": 6.0, + "min_quantity": 2, + "max_quantity": 9, + "placement_channel": "orespawn:standard", + "pattern": "default", + "host_blocks": [ + "minecraft:stone", + "minecraft:netherrack", + "minecraft:end_stone" + ], + "host_families": [ + "sedimentary", + "metamorphic", + "igneous_intrusive", + "igneous_volcanic" + ] + } + } + }, + "modernmetals:legacy/tungsten_ore": { + "block": "modernmetals:tungsten_ore", + "enabled": true, + "source_mod": "modernmetals", + "retrogen": false, + "material": "orespawn:tungsten", + "dimension_selectors": { + "orespawn:all_except_nether_end": { + "enabled": true, + "min_y": 0, + "max_y": 31, + "frequency": 6.0, + "min_quantity": 1, + "max_quantity": 7, + "placement_channel": "orespawn:standard", + "pattern": "default", + "host_blocks": [ + "minecraft:stone", + "minecraft:netherrack", + "minecraft:end_stone" + ], + "host_families": [ + "sedimentary", + "metamorphic", + "igneous_intrusive", + "igneous_volcanic" + ] + } + } + }, + "modernmetals:legacy/uranium_ore": { + "block": "modernmetals:uranium_ore", + "enabled": true, + "source_mod": "modernmetals", + "retrogen": false, + "material": "orespawn:uranium", + "dimension_selectors": { + "orespawn:all_except_nether_end": { + "enabled": true, + "min_y": 0, + "max_y": 31, + "frequency": 6.0, + "min_quantity": 1, + "max_quantity": 5, + "placement_channel": "orespawn:standard", + "pattern": "default", + "host_blocks": [ + "minecraft:stone", + "minecraft:netherrack", + "minecraft:end_stone" + ], + "host_families": [ + "sedimentary", + "metamorphic", + "igneous_intrusive", + "igneous_volcanic" + ] + } + } + }, + "modernmetals:legacy/zirconium_ore": { + "block": "modernmetals:zirconium_ore", + "enabled": true, + "source_mod": "modernmetals", + "retrogen": false, + "material": "orespawn:zirconium", + "dimension_selectors": { + "orespawn:all_except_nether_end": { + "enabled": true, + "min_y": 0, + "max_y": 63, + "frequency": 6.0, + "min_quantity": 4, + "max_quantity": 11, + "placement_channel": "orespawn:standard", + "pattern": "default", + "host_blocks": [ + "minecraft:stone", + "minecraft:netherrack", + "minecraft:end_stone" + ], + "host_families": [ + "sedimentary", + "metamorphic", + "igneous_intrusive", + "igneous_volcanic" + ] + } + } + }, + "modernmetals:legacy/titanium_ore": { + "block": "modernmetals:titanium_ore", + "enabled": false, + "source_mod": "modernmetals", + "retrogen": false, + "material": "orespawn:titanium", + "dimension_selectors": { + "orespawn:all_except_nether_end": { + "enabled": true, + "min_y": 0, + "max_y": 63, + "frequency": 6.0, + "min_quantity": 2, + "max_quantity": 9, + "placement_channel": "orespawn:standard", + "pattern": "default", + "host_blocks": [ + "minecraft:stone", + "minecraft:netherrack", + "minecraft:end_stone" + ], + "host_families": [ + "sedimentary", + "metamorphic", + "igneous_intrusive", + "igneous_volcanic" + ] + } + } + } + } +} diff --git a/src/main/resources/data/modernmetals/recipes/crushing/coal_ore.json b/src/main/resources/data/modernmetals/recipes/crushing/coal_ore.json new file mode 100644 index 00000000..b704e7dd --- /dev/null +++ b/src/main/resources/data/modernmetals/recipes/crushing/coal_ore.json @@ -0,0 +1,11 @@ +{ + "type": "modernmetals:crushing", + "conditions": [ + { + "type": "forge:not", + "value": { "type": "forge:mod_loaded", "modid": "basemetals" } + } + ], + "ingredient": { "item": "minecraft:coal_ore" }, + "result": { "item": "modernmetals:coal_powder", "count": 2 } +} diff --git a/src/main/resources/data/modernmetals/tags/blocks/crackhammer_crushable.json b/src/main/resources/data/modernmetals/tags/blocks/crackhammer_crushable.json new file mode 100644 index 00000000..954580c1 --- /dev/null +++ b/src/main/resources/data/modernmetals/tags/blocks/crackhammer_crushable.json @@ -0,0 +1,61 @@ +{ + "replace": false, + "values": [ + "#forge:ores", + "#forge:storage_blocks", + "minecraft:andesite", + "minecraft:coal_ore", + "minecraft:cobblestone", + "minecraft:diamond_ore", + "minecraft:diorite", + "minecraft:emerald_ore", + "minecraft:end_stone", + "minecraft:gold_ore", + "minecraft:granite", + "minecraft:gravel", + "minecraft:iron_ore", + "minecraft:lapis_ore", + "minecraft:nether_quartz_ore", + "minecraft:netherrack", + "minecraft:redstone_ore", + "minecraft:stone", + "modernmetals:aluminum_block", + "modernmetals:aluminum_ore", + "modernmetals:aluminumbrass_block", + "modernmetals:beryllium_block", + "modernmetals:beryllium_ore", + "modernmetals:boron_block", + "modernmetals:boron_ore", + "modernmetals:cadmium_block", + "modernmetals:cadmium_ore", + "modernmetals:chromium_block", + "modernmetals:chromium_ore", + "modernmetals:galvanizedsteel_block", + "modernmetals:iridium_block", + "modernmetals:iridium_ore", + "modernmetals:magnesium_block", + "modernmetals:magnesium_ore", + "modernmetals:manganese_block", + "modernmetals:manganese_ore", + "modernmetals:nichrome_block", + "modernmetals:osmium_block", + "modernmetals:osmium_ore", + "modernmetals:plutonium_block", + "modernmetals:plutonium_ore", + "modernmetals:rutile_block", + "modernmetals:rutile_ore", + "modernmetals:stainlesssteel_block", + "modernmetals:tantalum_block", + "modernmetals:tantalum_ore", + "modernmetals:thorium_block", + "modernmetals:thorium_ore", + "modernmetals:titanium_block", + "modernmetals:titanium_ore", + "modernmetals:tungsten_block", + "modernmetals:tungsten_ore", + "modernmetals:uranium_block", + "modernmetals:uranium_ore", + "modernmetals:zirconium_block", + "modernmetals:zirconium_ore" + ] +} diff --git a/src/main/resources/data/modernmetals/tags/blocks/scythe_harvestable.json b/src/main/resources/data/modernmetals/tags/blocks/scythe_harvestable.json new file mode 100644 index 00000000..7eec16a9 --- /dev/null +++ b/src/main/resources/data/modernmetals/tags/blocks/scythe_harvestable.json @@ -0,0 +1,81 @@ +{ + "replace": false, + "values": [ + "#minecraft:leaves", + "#minecraft:saplings", + "minecraft:oak_sapling", + "minecraft:spruce_sapling", + "minecraft:birch_sapling", + "minecraft:jungle_sapling", + "minecraft:acacia_sapling", + "minecraft:dark_oak_sapling", + "minecraft:oak_leaves", + "minecraft:spruce_leaves", + "minecraft:birch_leaves", + "minecraft:jungle_leaves", + "minecraft:acacia_leaves", + "minecraft:dark_oak_leaves", + "minecraft:cobweb", + "minecraft:grass", + "minecraft:fern", + "minecraft:dead_bush", + "minecraft:seagrass", + "minecraft:tall_seagrass", + "minecraft:dandelion", + "minecraft:poppy", + "minecraft:blue_orchid", + "minecraft:allium", + "minecraft:azure_bluet", + "minecraft:red_tulip", + "minecraft:orange_tulip", + "minecraft:white_tulip", + "minecraft:pink_tulip", + "minecraft:oxeye_daisy", + "minecraft:brown_mushroom", + "minecraft:red_mushroom", + "minecraft:wheat", + "minecraft:cactus", + "minecraft:sugar_cane", + "minecraft:pumpkin", + "minecraft:carved_pumpkin", + "minecraft:jack_o_lantern", + "minecraft:melon", + "minecraft:attached_pumpkin_stem", + "minecraft:attached_melon_stem", + "minecraft:pumpkin_stem", + "minecraft:melon_stem", + "minecraft:vine", + "minecraft:lily_pad", + "minecraft:nether_wart", + "minecraft:cocoa", + "minecraft:carrots", + "minecraft:potatoes", + "minecraft:sunflower", + "minecraft:lilac", + "minecraft:rose_bush", + "minecraft:peony", + "minecraft:tall_grass", + "minecraft:large_fern", + "minecraft:chorus_plant", + "minecraft:chorus_flower", + "minecraft:beetroots", + "minecraft:kelp", + "minecraft:kelp_plant", + "minecraft:tube_coral", + "minecraft:brain_coral", + "minecraft:bubble_coral", + "minecraft:fire_coral", + "minecraft:horn_coral", + "minecraft:tube_coral_fan", + "minecraft:brain_coral_fan", + "minecraft:bubble_coral_fan", + "minecraft:fire_coral_fan", + "minecraft:horn_coral_fan", + "minecraft:tube_coral_wall_fan", + "minecraft:brain_coral_wall_fan", + "minecraft:bubble_coral_wall_fan", + "minecraft:fire_coral_wall_fan", + "minecraft:horn_coral_wall_fan", + "minecraft:sea_pickle" + ] +} diff --git a/src/main/resources/pack.mcmeta b/src/main/resources/pack.mcmeta index 6361a04d..9e028e73 100644 --- a/src/main/resources/pack.mcmeta +++ b/src/main/resources/pack.mcmeta @@ -1,6 +1 @@ -{ - "pack":{ - "pack_format":3, - "description":"Modern Metals" - } -} +{"pack":{"pack_format":4,"description":"Modern Metals resources"}} diff --git a/tools/generate_113_recipe_data.js b/tools/generate_113_recipe_data.js new file mode 100644 index 00000000..30b37d5f --- /dev/null +++ b/tools/generate_113_recipe_data.js @@ -0,0 +1,221 @@ +const fs = require('fs'); +const path = require('path'); + +const root = path.resolve(__dirname, '..'); +const output = path.join(root, 'build', 'generated', 'recipe-data'); +if (!output.startsWith(root + path.sep + 'build' + path.sep)) { + throw new Error('Recipe output must be inside the project build directory'); +} +fs.rmSync(output, { recursive: true, force: true }); + +function files(directory) { + if (!fs.existsSync(directory)) return []; + return fs.readdirSync(directory, { withFileTypes: true }).sort((a, b) => a.name.localeCompare(b.name)) + .flatMap(entry => entry.isDirectory() ? files(path.join(directory, entry.name)) + : entry.name.endsWith('.json') ? [path.join(directory, entry.name)] : []); +} + +function write(relative, value) { + const file = path.join(output, relative); + fs.mkdirSync(path.dirname(file), { recursive: true }); + fs.writeFileSync(file, JSON.stringify(value, null, 2) + '\n', 'utf8'); +} + +const recipes = new Map(); +for (const directory of ['src/main/resources', 'src/generated/resources']) { + const base = path.join(root, directory, 'data', 'modernmetals', 'recipes'); + for (const file of files(base)) { + recipes.set(path.relative(base, file).replace(/\\/g, '/').slice(0, -5), + JSON.parse(fs.readFileSync(file, 'utf8'))); + } +} + +function add(name, recipe) { + if (recipes.has(name)) throw new Error('Supplemental recipe duplicates ' + name); + recipes.set(name, recipe); + write('data/modernmetals/recipes/' + name + '.json', recipe); +} + +const catalogue = fs.readFileSync(path.join(root, + 'src/main/java/zone/moddev/mc/modernmetals/material/MaterialCatalogue.java'), 'utf8'); +const materials = [...catalogue.matchAll(/new MaterialDefinition\("([a-z]+)", Kind\.([A-Z_]+)/g)] + .map(match => ({ name: match[1], alloy: match[2] === 'ALLOY' || match[2] === 'SPECIAL' })); +if (materials.length !== 21) throw new Error('Expected the complete 21-material catalogue'); + +// Shared roots include ores and storage blocks contributed by other mods. +// Define our contributions even when Modern Metals is installed on its own. +for (const category of ['ores', 'storage_blocks']) { + const entries = new Set(); + if (category === 'storage_blocks') { + for (const material of materials) { + const id = 'storage_blocks/' + material.name; + write('data/forge/tags/blocks/' + id + '.json', { + replace: false, values: ['modernmetals:' + material.name + '_block'] + }); + entries.add('#forge:' + id); + } + } + for (const directory of ['src/main/resources', 'src/generated/resources']) { + const base = path.join(root, directory, 'data/forge/tags/blocks', category); + for (const file of files(base)) { + entries.add('#forge:' + category + '/' + path.relative(base, file).replace(/\\/g, '/').slice(0, -5)); + } + } + write('data/forge/tags/blocks/' + category + '.json', { replace: false, values: [...entries].sort() }); +} + +const craftingByOutput = new Map(); +for (const outer of recipes.values()) { + const recipe = outer.recipe || outer; + if (!recipe.type.startsWith('minecraft:crafting_')) continue; + const id = recipe.result.item; + if (!craftingByOutput.has(id)) craftingByOutput.set(id, []); + craftingByOutput.get(id).push(recipe); +} + +function materialUnits(material, form, seen = []) { + const basic = { ingot: 9, nugget: 1, block: 81, powder: 9, smallpowder: 1 }; + if (Object.hasOwn(basic, form)) return basic[form]; + if (seen.includes(form)) return 0; + const costs = (craftingByOutput.get('modernmetals:' + material + '_' + form) || []) + .map(recipe => { + const ingredients = recipe.pattern + ? recipe.pattern.flatMap(row => [...row].filter(s => s !== ' ').map(s => recipe.key[s])) + : recipe.ingredients; + return ingredients.reduce((sum, ingredient) => + sum + ingredientUnits(material, ingredient, [...seen, form]), 0) / (recipe.result.count || 1); + }).filter(cost => cost > 0); + return costs.length ? Math.min(...costs) : 0; +} + +function ingredientUnits(material, ingredient, seen) { + if (Array.isArray(ingredient)) { + return Math.min(...ingredient.map(value => ingredientUnits(material, value, seen))); + } + const id = ingredient.tag || ingredient.item; + const tag = id.match(/^forge:([^/]+)\/([a-z]+)$/); + const item = id.match(/^modernmetals:([a-z]+)_(.+)$/); + const forms = { ingots: 'ingot', nuggets: 'nugget', storage_blocks: 'block', rods: 'rod', + gears: 'gear', plates: 'plate' }; + if (tag && tag[2] === material && forms[tag[1]]) { + return materialUnits(material, forms[tag[1]], seen); + } + return item && item[1] === material ? materialUnits(material, item[2], seen) : 0; +} + +const recyclingForms = ['axe', 'boots', 'helmet', 'sword', 'shovel', 'pickaxe', 'hoe', 'leggings', + 'chestplate', 'crackhammer', 'shears', 'rod', 'gear', 'slab', 'button', 'lever', 'wall', 'pressure_plate', + 'door', 'trapdoor', 'horse_armor', 'fishing_rod', 'bars', 'plate', 'bow', 'crossbow', 'arrow', 'bolt']; +for (const material of materials) { + const name = material.name; + write('data/forge/tags/items/plates/' + name + '.json', + { replace: false, values: ['modernmetals:' + name + '_plate'] }); + add('crushing/' + name + '_block', { + type: 'modernmetals:crushing', ingredient: { tag: 'forge:storage_blocks/' + name }, + result: { item: 'modernmetals:' + name + '_powder', count: 9 } + }); + for (const form of material.alloy ? ['smallpowder', 'smallblend'] : ['smallpowder']) { + add('smelting/' + name + '_' + form, { + type: 'minecraft:smelting', ingredient: { item: 'modernmetals:' + name + '_' + form }, + result: 'modernmetals:' + name + '_nugget', experience: 0.05, cookingtime: 200 + }); + } + for (const form of recyclingForms) { + let units = Math.floor(materialUnits(name, form)); + // Preserve the losses in the historical ranged-weapon recycling recipes. + if (form === 'bow' || form === 'fishing_rod' || form === 'lever') units = Math.min(units, 9); + if (form === 'arrow') units = Math.min(units, 1); + if (form === 'bolt') units = Math.min(units, 2); + if (!units) throw new Error('Cannot establish recycling cost for ' + name + '_' + form); + let resultForm = units >= 9 ? 'ingot' : 'nugget'; + let count = units >= 9 ? Math.floor(units / 9) : units; + if ((form === 'wall' || form === 'crackhammer') && units >= 81) { + resultForm = 'block'; + count = Math.floor(units / 81); + } + add('smelting/' + name + '_' + form + '_recycling', { + type: 'modernmetals:legacy_smelting', ingredient: { item: 'modernmetals:' + name + '_' + form }, + result: { item: 'modernmetals:' + name + '_' + resultForm, count }, + experience: 0.05, cookingtime: 200 + }); + } + for (const form of ['helmet', 'chestplate', 'leggings', 'boots', 'shield']) { + add(name + '_' + form + '_plate_repair', { + type: 'modernmetals:plate_repair', target: 'modernmetals:' + name + '_' + form, + plate: { tag: 'forge:plates/' + name } + }); + } +} + +write('data/forge/tags/items/plates.json', + { replace: false, values: materials.map(material => '#forge:plates/' + material.name) }); + +const standalone = [{ type: 'forge:not', value: { type: 'forge:mod_loaded', modid: 'basemetals' } }]; +for (const [form, item, count] of [['coal', 'minecraft:coal', 1], ['coal_block', 'minecraft:coal_block', 9]]) { + add('crushing/' + form, { type: 'modernmetals:crushing', conditions: standalone, + ingredient: { item }, result: { item: 'modernmetals:coal_powder', count } }); +} +add('coal_block_dust', { type: 'modernmetals:content_crafting', conditions: standalone, + recipe: { type: 'minecraft:crafting_shaped', pattern: ['xxx', 'xxx', 'xxx'], + key: { x: { tag: 'forge:dusts/coal' } }, result: { item: 'minecraft:coal_block' }, + group: 'minecraft:coal_block' } }); + +// Optional alloy ingredients need valid, empty tags in a standalone installation. +for (const name of ['copper', 'steel', 'zinc', 'nickel']) { + const relative = 'data/forge/tags/items/dusts/' + name + '.json'; + if (!['src/main/resources', 'src/generated/resources'].some(directory => + fs.existsSync(path.join(root, directory, relative)))) { + write(relative, { replace: false, values: [] }); + } +} +write('data/forge/tags/items/blends/steel.json', { replace: false, values: [] }); + +const aliases = { + aluminum: ['aluminium', 'bauxite'], + aluminumbrass: ['aluminiumbrass', 'alubrass'], + galvanizedsteel: ['galvinizedsteel'], + tungsten: ['wolfram'] +}; +for (const file of files(path.join(root, 'src/generated/resources/data/forge/tags'))) { + const material = path.basename(file, '.json'); + for (const alias of aliases[material] || []) { + const relative = path.relative(path.join(root, 'src/generated/resources'), file).replace(/\\/g, '/'); + const tag = relative.split('/tags/')[1].replace(/^(items|blocks)\//, '').slice(0, -5); + write(relative.replace('/' + material + '.json', '/' + alias + '.json'), + { replace: false, values: ['#forge:' + tag] }); + } +} + +let unlocks = 0; +for (const [name, outer] of recipes) { + const recipe = outer.recipe || outer; + const crafting = recipe.type.startsWith('minecraft:crafting_'); + const smelting = ['minecraft:smelting', 'modernmetals:legacy_smelting'].includes(recipe.type); + if (!crafting && !smelting) continue; + const criteria = { has_recipe: { trigger: 'minecraft:recipe_unlocked', + conditions: { recipe: 'modernmetals:' + name } } }; + if (crafting && name !== 'coal_block_dust') { + criteria.has_material = { trigger: 'minecraft:inventory_changed', + conditions: { items: [{ tag: 'forge:ingots/' + name.split('_')[0] }] } }; + } + const ingredients = recipe.key ? Object.values(recipe.key) : recipe.ingredients || [recipe.ingredient]; + const choices = ingredients.flat().filter(value => value.item || value.tag); + const relevant = choices.filter(value => !['minecraft:stick', 'minecraft:string', 'minecraft:feather'].includes(value.item) + && value.tag !== 'forge:rods/wooden'); + const unique = new Map((relevant.length ? relevant : choices).map(value => [JSON.stringify(value), value])); + let ingredientIndex = 0; + for (const value of unique.values()) { + // Append new blend discovery without renumbering the earned dust criteria. + const blend = name.endsWith('_blend_base') && value.tag?.startsWith('forge:blends/'); + const key = blend ? 'has_blend_' + value.tag.split('/')[1] : 'has_ingredient_' + (++ingredientIndex); + criteria[key] = { + trigger: 'minecraft:inventory_changed', conditions: { items: [value] } + }; + } + write('data/modernmetals/advancements/recipes/' + name + '.json', { + parent: 'minecraft:recipes/root', criteria, requirements: [Object.keys(criteria)], + rewards: { recipes: ['modernmetals:' + name] } + }); + unlocks++; +} +console.log('Generated ' + recipes.size + ' recipes with ' + unlocks + ' recipe unlocks'); diff --git a/tools/test_113_recipe_data.js b/tools/test_113_recipe_data.js new file mode 100644 index 00000000..e5226bee --- /dev/null +++ b/tools/test_113_recipe_data.js @@ -0,0 +1,116 @@ +const assert = require('node:assert/strict'); +const test = require('node:test'); +const fs = require('node:fs'); +const path = require('node:path'); + +const root = path.resolve(__dirname, '..'); +const generated = path.join(root, 'build/generated/recipe-data'); +function resource(relative) { + for (const directory of [generated, path.join(root, 'src/generated/resources'), path.join(root, 'src/main/resources')]) { + const file = path.join(directory, relative); + if (fs.existsSync(file)) return JSON.parse(fs.readFileSync(file, 'utf8')); + } + throw new Error('Missing resource ' + relative); +} +function recipe(name) { + return resource('data/modernmetals/recipes/' + name + '.json'); +} + +test('hammer ore roots include the complete material tags for other mods to extend', () => { + const crushable = resource('data/modernmetals/tags/blocks/crackhammer_crushable.json'); + assert.ok(crushable.values.includes('#forge:ores')); + assert.ok(crushable.values.includes('#forge:storage_blocks')); + const ores = resource('data/forge/tags/blocks/ores.json'); + const blocks = resource('data/forge/tags/blocks/storage_blocks.json'); + assert.ok(ores.values.includes('#forge:ores/beryllium')); + assert.ok(ores.values.includes('#forge:ores/chromium')); + assert.ok(blocks.values.includes('#forge:storage_blocks/galvanizedsteel')); + assert.equal(ores.replace, false); + assert.equal(blocks.replace, false); +}); + +test('beryllium dust discovers processing and its furnace recipe', () => { + for (const name of ['beryllium_smallpowder', 'smelting/beryllium_powder']) { + const advancement = resource('data/modernmetals/advancements/recipes/' + name + '.json'); + assert.deepEqual(advancement.rewards.recipes, ['modernmetals:' + name]); + assert.ok(advancement.criteria.has_ingredient_1); + assert.ok(advancement.requirements[0].includes('has_ingredient_1')); + } + assert.equal(recipe('smelting/beryllium_powder').result, 'modernmetals:beryllium_ingot'); +}); + +test('coal processing has one owner and conserves the vanilla coal block quantity', () => { + for (const name of ['coal_block_dust', 'crushing/coal', 'crushing/coal_block']) { + assert.deepEqual(recipe(name).conditions, + [{ type: 'forge:not', value: { type: 'forge:mod_loaded', modid: 'basemetals' } }]); + } + assert.deepEqual(recipe('coal_block_dust').recipe.pattern, ['xxx', 'xxx', 'xxx']); + assert.equal(recipe('coal_block_dust').recipe.result.item, 'minecraft:coal_block'); + assert.equal(recipe('crushing/coal').result.count, 1); + assert.equal(recipe('crushing/coal_block').result.count, 9); +}); + +test('the five alloy formulas keep their historical ingredients and yields', () => { + for (const [name, tags, count] of [ + ['aluminumbrass', ['aluminum', 'aluminum', 'aluminum', 'copper'], 4], + ['galvanizedsteel', ['steel', 'zinc'], 2], + ['nichrome', ['nickel', 'chromium'], 2], + ['stainlesssteel', ['steel', 'chromium'], 2], + ['titanium', ['rutile', 'magnesium'], 1] + ]) { + const value = recipe(name + '_blend_base').recipe; + assert.deepEqual(value.ingredients.map(ingredient => { + const canonical = Array.isArray(ingredient) ? ingredient[0] : ingredient; + return canonical.tag.replace('forge:dusts/', ''); + }), tags); + assert.equal(value.result.count || 1, count); + assert.equal(recipe('smelting/' + name + '_smallblend').result, 'modernmetals:' + name + '_nugget'); + } +}); + +test('steel blends can be used directly in downstream alloys without changing the yield', () => { + for (const name of ['galvanizedsteel', 'stainlesssteel']) { + const value = recipe(name + '_blend_base'); + assert.deepEqual(value.recipe.ingredients[0], [ + { tag: 'forge:dusts/steel' }, { tag: 'forge:blends/steel' } + ]); + assert.equal(value.recipe.result.count, 2); + assert.deepEqual(value.conditions[0], { + type: 'forge:or', values: [ + { type: 'modernmetals:non_empty_tag', tag: 'forge:dusts/steel' }, + { type: 'modernmetals:non_empty_tag', tag: 'forge:blends/steel' } + ] + }); + const unlock = resource('data/modernmetals/advancements/recipes/' + name + '_blend_base.json'); + assert.equal(unlock.criteria.has_blend_steel.conditions.items[0].tag, 'forge:blends/steel'); + assert.equal(unlock.criteria.has_ingredient_1.conditions.items[0].tag, 'forge:dusts/steel'); + assert.equal(unlock.criteria.has_ingredient_2.conditions.items[0].tag, + name === 'stainlesssteel' ? 'forge:dusts/chromium' : 'forge:dusts/zinc'); + } + assert.deepEqual(resource('data/forge/tags/items/blends/steel.json').values, []); +}); + +test('native recycling and repair quantities follow the registered crafting costs', () => { + for (const [form, count] of [['rod', 2], ['plate', 3], ['gear', 6], ['door', 2]]) { + const value = recipe('smelting/beryllium_' + form + '_recycling'); + assert.deepEqual(value.result, { item: 'modernmetals:beryllium_ingot', count }); + } + assert.deepEqual(recipe('beryllium_shield_plate_repair').plate, { tag: 'forge:plates/beryllium' }); + assert.deepEqual(resource('data/forge/tags/items/plates/beryllium.json').values, ['modernmetals:beryllium_plate']); + assert.equal(fs.existsSync(path.join(generated, + 'data/modernmetals/advancements/recipes/beryllium_shield_plate_repair.json')), false); +}); + +test('metal buttons retain the two-nugget recycling recipe', () => { + const materials = 'aluminum aluminumbrass beryllium boron cadmium chromium galvanizedsteel iridium magnesium manganese nichrome osmium plutonium rutile stainlesssteel tantalum thorium titanium tungsten uranium zirconium'.split(' '); + for (const material of materials) { + assert.deepEqual(recipe('smelting/' + material + '_button_recycling').result, + { item: 'modernmetals:' + material + '_nugget', count: 2 }); + } +}); + +test('standalone optional alloy tags are declared without adding external materials', () => { + for (const metal of ['copper', 'steel', 'zinc', 'nickel']) { + assert.deepEqual(resource('data/forge/tags/items/dusts/' + metal + '.json').values, []); + } +}); diff --git a/tools/test_fluid_registration.js b/tools/test_fluid_registration.js new file mode 100644 index 00000000..593e3796 --- /dev/null +++ b/tools/test_fluid_registration.js @@ -0,0 +1,27 @@ +const assert = require('node:assert/strict'); +const test = require('node:test'); +const fs = require('node:fs'); +const path = require('node:path'); + +const source = path.join(__dirname, '../src/main/java/zone/moddev/mc/modernmetals'); +const mod = fs.readFileSync(path.join(source, 'ModernMetals.java'), 'utf8'); +const content = fs.readFileSync(path.join(source, 'content/ModContent.java'), 'utf8'); + +test('network channel creation waits for the sequential setup queue', () => { + assert.ok(!mod.includes(' ContentModeNetwork.register();')); + assert.ok(mod.includes('DeferredWorkQueue.runLater(ContentModeNetwork::register);')); +}); + +test('parallel mod construction does not register fluids', () => { + assert.doesNotMatch(mod, /initializeFluids\s*\(/); +}); + +test('the sequential block registration event binds fluids before block factories run', () => { + assert.match(content, /@SubscribeEvent\s+public static void registerBlocks\(RegistryEvent\.Register event\)\s*\{\s*initializeFluids\(\);/); + assert.equal((content.match(/initializeFluids\(\);/g) || []).length, 1); +}); + +test('fluid registration cannot be called from another startup stage', () => { + assert.match(content, /private static void initializeFluids\(\)/); + assert.match(content, /if \(isBound\(content\.source\(\)\)\) continue;/); +}); diff --git a/tools/validation/port113/convert_resources.py b/tools/validation/port113/convert_resources.py new file mode 100644 index 00000000..0abb844b --- /dev/null +++ b/tools/validation/port113/convert_resources.py @@ -0,0 +1,245 @@ +"""Translate the released 1.12.2 models and recipes to Forge 25 resource formats.""" +import argparse +import json +import re +from pathlib import Path +from zipfile import ZipFile + +MOD = "modernmetals" +ASSETS = f"assets/{MOD}/" +MATERIAL_FORMS = { + "ingot": ("ingots", "ingot"), "nugget": ("nuggets", "nugget"), + "dust": ("dusts", "powder"), "powder": ("dusts", "powder"), + "dustTiny": ("tiny_dusts", "smallpowder"), "block": ("storage_blocks", "block"), + "rod": ("rods", "rod"), "gear": ("gears", "gear"), + "blend": ("blends", "blend"), "smallblend": ("small_blends", "smallblend"), +} +BASE_DUSTS = {"copper", "nickel", "steel", "zinc"} +MODEL_RENAMES = { + "block/trapdoor_bottom": "block/template_orientable_trapdoor_bottom", + "block/trapdoor_top": "block/template_orientable_trapdoor_top", + "block/trapdoor_open": "block/template_orientable_trapdoor_open", + "block/half_slab": "block/slab", + "block/upper_slab": "block/slab_top", + "block/wall_post": "block/template_wall_post", + "block/wall_side": "block/template_wall_side", + "blocks/lever": "minecraft:block/lever" +} +ALLOY_ORES = {"galvanizedsteel_ore", "nichrome_ore", "stainlesssteel_ore"} + + +def json_file(path, data): + if path.exists() and json.loads(path.read_text(encoding="utf-8-sig")) == data: + return + path.parent.mkdir(parents=True, exist_ok=True) + path.write_text(json.dumps(data, ensure_ascii=False, indent=2) + "\n", encoding="utf-8", newline="\n") + + +def model_data(value): + if isinstance(value, dict): + return {key: model_data(entry) for key, entry in value.items()} + if isinstance(value, list): + return [model_data(entry) for entry in value] + if isinstance(value, str): + value = value.replace("minecraft:blocks/", "minecraft:block/").replace("minecraft:items/", "minecraft:item/") + if value.startswith("basemetals:block/"): + value = value.replace("basemetals:", "modernmetals:", 1) + value = MODEL_RENAMES.get(value, value) + if value == "builtin/generated": + return "item/generated" + return value + + +def tag(directory, registry, path, values): + json_file(directory / f"data/forge/tags/{registry}/{path}.json", {"replace": False, "values": sorted(values)}) + + +def ingredient(entry, tags): + if isinstance(entry, list): + return [ingredient(value, tags) for value in entry] + if "ore" in entry: + ore = entry["ore"] + if ore == "stickWood": + return {"item": "minecraft:stick"} + if ore == "plankWood": + return {"tag": "minecraft:planks"} + category, material = re.fullmatch(r"([a-z]+(?:Tiny)?)([A-Z][A-Za-z]+)", ore).groups() + material = material.lower() + kind, form = MATERIAL_FORMS[category] + path = f"{kind}/{material}" + if material not in BASE_DUSTS: + tags.setdefault(path, set()).add(f"{MOD}:{material}_{form}") + return {"tag": f"forge:{path}"} + if entry.get("item") == "minecraft:wool" and entry.get("data") == 32767: + colours = ("white", "orange", "magenta", "light_blue", "yellow", "lime", "pink", + "gray", "light_gray", "cyan", "purple", "blue", "brown", "green", "red", "black") + return [{"item": f"minecraft:{colour}_wool"} for colour in colours] + data = entry.get("data", 0) + if data: + raise ValueError(f"Unmapped item metadata in recipe ingredient {entry}") + return {"item": entry["item"]} + + +def translate_recipe(raw, tags): + output = raw["result"] + if output.get("data", 0): + raise ValueError(f"Unmapped recipe output metadata {output}") + result = {"item": output["item"]} + if "count" in output: + result["count"] = output["count"] + recipe = {"result": result} + if "key" in raw: + recipe["type"] = "minecraft:crafting_shaped" + recipe["pattern"] = raw["pattern"] + recipe["key"] = {key: ingredient(value, tags) for key, value in raw["key"].items()} + else: + recipe["type"] = "minecraft:crafting_shapeless" + recipe["ingredients"] = [ingredient(value, tags) for value in raw["ingredients"]] + serialized = {"type": "modernmetals:content_crafting", "recipe": recipe} + required = sorted({match.group(1) for match in re.finditer( + r'"tag": "(forge:dusts/[^"]+)"', json.dumps(recipe)) + if match.group(1).split("/")[-1] in BASE_DUSTS}) + if required: + serialized["conditions"] = [{"type": "modernmetals:non_empty_tag", "tag": name} for name in required] + return serialized + + +def modern_model(source, material): + return (source.replace("basemetals:", "modernmetals:").replace("copper", material)) + + +def main(): + parser = argparse.ArgumentParser() + parser.add_argument("release", type=Path, help="Published Modern Metals 2.5.2.112021 game jar") + parser.add_argument("base_metals", type=Path, help="Base Metals Forge 25 checkout") + args = parser.parse_args() + project = Path(__file__).resolve().parents[3] + resources = project / "src/main/resources" + generated = project / "src/generated/resources" + own = resources / ASSETS + data = generated / "data/modernmetals" + registry = json.loads((resources / "data/modernmetals/migration/registry_1_12.json").read_text(encoding="utf-8")) + blocks = set(registry["blocks"]) | ALLOY_ORES + blocks = {block for block in blocks if not block.startswith("double_")} + items = set(registry["items"]) | ALLOY_ORES + materials = sorted(name for name in blocks if "_" not in name) + items.update(f"{name}_scythe" for name in materials) + + tags = {} + with ZipFile(args.release) as release: + for name in release.namelist(): + if not name.startswith(ASSETS): + continue + relative = name.removeprefix(ASSETS) + if relative.startswith("models/") and relative.endswith(".json"): + json_file(own / relative, model_data(json.loads(release.read(name)))) + elif relative.startswith("textures/") and not name.endswith("/") and not (own / relative).exists(): + output = own / relative + output.parent.mkdir(parents=True, exist_ok=True) + output.write_bytes(release.read(name)) + elif relative.startswith("lang/") and relative.endswith(".lang"): + locale = Path(relative).stem.lower() + translations = {} + for line in release.read(name).decode("utf-8-sig").splitlines(): + key, sep, value = line.partition("=") + if not sep or key.startswith("#"): + continue + key = key.strip().removesuffix(".name") + translations[key] = value + if key.startswith("tile."): + translations["block." + key[5:]] = value + json_file(own / "lang" / f"{locale}.json", translations) + elif relative.startswith("recipes/") and relative.endswith(".json") and not Path(relative).name.startswith("_"): + raw = json.loads(release.read(name)) + if raw["result"]["item"].removeprefix("modernmetals:") in items: + json_file(data / relative, translate_recipe(raw, tags)) + + for folder in ("main", "generated"): + source = args.base_metals / f"src/{folder}/resources/assets/basemetals" + for path in (source / "blockstates").glob("copper*.json"): + for material in materials: + name = path.stem.replace("copper", material) + if name in blocks and not name.endswith("_ore"): + blockstate = json.loads(modern_model(path.read_text(encoding="utf-8"), material)) + json_file(own / "blockstates" / f"{name}.json", blockstate) + # Convert names used by the state files that had different names in the 1.12 pack. + for state_path in (own / "blockstates").glob("*.json"): + if state_path.stem not in blocks: + continue + if state_path.stem.endswith("_ore"): + name = state_path.stem + json_file(state_path, {"variants": {"": {"model": f"{MOD}:block/{name}"}}}) + if name in ALLOY_ORES: + json_file(own / "models/block" / f"{name}.json", { + "parent": f"{MOD}:block/{name.removesuffix('_ore')}_block" + }) + json_file(own / "models/item" / f"{name}.json", {"parent": f"{MOD}:block/{name}"}) + state = state_path.read_text(encoding="utf-8") + for model in set(re.findall(r'"model": "modernmetals:block/([^"]+)"', state)): + target = own / "models/block" / f"{model}.json" + if target.exists(): + continue + material = next((name for name in materials if model.startswith(name + "_")), None) + if material is None: + continue + # The 1.13 slab uses a single state container for bottom, top and double. + model_aliases = { + material + "_slab": "half_slab_" + material, + material + "_slab_top": "upper_slab_" + material, + material + "_lever_off": material + "_lever", + } + if model in model_aliases and (own / "models/block" / (model_aliases[model] + ".json")).exists(): + json_file(target, {"parent": f"{MOD}:block/{model_aliases[model]}"}) + continue + copper_name = "copper" + model[len(material):] + for folder in ("main", "generated"): + donor = args.base_metals / f"src/{folder}/resources/assets/basemetals/models/block/{copper_name}.json" + if donor.exists(): + value = json.loads(modern_model(donor.read_text(encoding="utf-8"), material)) + if "textures" in value: + value["textures"] = {k: v.replace("modernmetals:block/", "modernmetals:blocks/") + for k, v in value["textures"].items()} + json_file(target, value) + break + + for material in materials: + for form in ("block", "plate", "bars", "door", "trapdoor", "button", "slab", "lever", + "pressure_plate", "stairs", "wall", "ore"): + name = f"{material}_{form}" + if name not in blocks: + continue + if form == "ore": + tags.setdefault(f"ores/{material}", set()).add(f"{MOD}:{name}") + tag(generated, "blocks", f"ores/{material}", {f"{MOD}:{name}"}) + for item in (f"{material}_{form}" for form in ("powder", "ingot", "ore", "blend")): + if item not in items or item.endswith("_ingot") or item in ALLOY_ORES: + continue + json_file(data / f"recipes/smelting/{item}.json", { + "type": "minecraft:smelting", "ingredient": {"item": f"{MOD}:{item}"}, + "result": f"{MOD}:{material}_ingot", "experience": 0.45, "cookingtime": 200, + }) + for form, output in (("ore", "powder"), ("ingot", "powder"), ("nugget", "smallpowder")): + name = f"{material}_{form}" + if name not in items or name in ALLOY_ORES: + continue + json_file(data / f"recipes/crushing/{name}.json", { + "type": "modernmetals:crushing", "ingredient": {"item": f"{MOD}:{name}"}, + "result": {"item": f"{MOD}:{material}_{output}", "count": 2 if form == "ore" else 1}, + }) + + tags["ores/chrome"] = tags["ores/chromium"] + for kind in ("ingots", "nuggets", "dusts", "tiny_dusts", "storage_blocks", "rods", "gears"): + if f"{kind}/chromium" in tags: + tags[f"{kind}/chrome"] = tags[f"{kind}/chromium"] + tag(generated, "blocks", "ores/chrome", {"modernmetals:chromium_ore"}) + for path, values in tags.items(): + unknown = values.difference({f"{MOD}:{item}" for item in items}) + if unknown: + raise ValueError(f"Unknown Modern Metals tag entries for {path}: {unknown}") + tag(generated, "items", path, values) + for material in sorted(BASE_DUSTS): + tag(generated, "items", f"dusts/{material}", set()) + + +if __name__ == "__main__": + main() diff --git a/tools/validation/port113/mining-levels/MiningLevelChecks.java b/tools/validation/port113/mining-levels/MiningLevelChecks.java new file mode 100644 index 00000000..a53d92c6 --- /dev/null +++ b/tools/validation/port113/mining-levels/MiningLevelChecks.java @@ -0,0 +1,43 @@ +package validation; + +import java.util.ArrayList; +import java.util.List; +import zone.moddev.mc.modernmetals.material.MaterialCatalogue; +import zone.moddev.mc.modernmetals.material.MaterialDefinition; + +/** Independent acceptance table for the reviewed 1.13.2 mining policy. */ +public final class MiningLevelChecks { + public static void main(String[] args) throws Exception { + List failures = new ArrayList<>(); + String[] expected = { + "aluminum:0:0:1", "aluminumbrass:1:1:1", "beryllium:1:1:1", + "boron:1:2:1", "cadmium:0:0:1", "chromium:1:2:1", + "galvanizedsteel:2:2:1", "iridium:1:2:1", "magnesium:0:0:1", + "manganese:1:1:1", "nichrome:2:2:1", "osmium:1:2:1", + "plutonium:1:1:1", "rutile:1:2:1", "stainlesssteel:2:2:1", + "tantalum:1:1:1", "thorium:1:1:1", "titanium:2:2:1", + "tungsten:1:2:1", "uranium:1:1:1", "zirconium:1:1:1" + }; + if (MaterialCatalogue.ALL.size() != expected.length) failures.add("Incomplete material audit"); + for (int index = 0; index < expected.length; index++) { + String[] row = expected[index].split(":"); + MaterialDefinition material = MaterialCatalogue.ALL.get(index); + if (!material.name().equals(row[0])) failures.add("Unexpected catalogue order: " + material.name()); + check(failures, material.name(), "tool", Integer.parseInt(row[1]), material.toolLevel()); + check(failures, material.name(), "solid block", Integer.parseInt(row[2]), material.requiredHarvestLevel()); + int ore; + try { + ore = (Integer) material.getClass().getMethod("requiredOreHarvestLevel").invoke(material); + } catch (NoSuchMethodException legacy) { + ore = material.requiredHarvestLevel(); + } + check(failures, material.name(), "ore", Integer.parseInt(row[3]), ore); + } + if (!failures.isEmpty()) throw new AssertionError(String.join("\n", failures)); + System.out.println("MINING_LEVEL_CHECKS PASS: 21 complete material profiles"); + } + + private static void check(List failures, String name, String form, int expected, int actual) { + if (expected != actual) failures.add(name + " " + form + ": expected " + expected + ", was " + actual); + } +} diff --git a/tools/validation/port113/mining-probe/MetalMiningProbe.java b/tools/validation/port113/mining-probe/MetalMiningProbe.java new file mode 100644 index 00000000..9f906be7 --- /dev/null +++ b/tools/validation/port113/mining-probe/MetalMiningProbe.java @@ -0,0 +1,199 @@ +package test; + +import java.io.File; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.InputStreamReader; +import java.nio.charset.StandardCharsets; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.UUID; +import com.google.gson.JsonElement; +import com.google.gson.JsonObject; +import com.google.gson.JsonParser; +import com.mojang.authlib.GameProfile; +import net.minecraft.block.Block; +import net.minecraft.block.state.IBlockState; +import net.minecraft.entity.item.EntityItem; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.init.Enchantments; +import net.minecraft.nbt.CompressedStreamTools; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.network.EnumPacketDirection; +import net.minecraft.network.NetHandlerPlayServer; +import net.minecraft.network.NetworkManager; +import net.minecraft.util.EnumHand; +import net.minecraft.util.ResourceLocation; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.text.TextComponentString; +import net.minecraft.world.GameType; +import net.minecraft.world.WorldServer; +import net.minecraft.world.dimension.DimensionType; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.common.ToolType; +import net.minecraftforge.common.util.FakePlayer; +import net.minecraftforge.fml.common.Mod; +import net.minecraftforge.fml.event.server.FMLServerStartedEvent; +import net.minecraftforge.registries.ForgeRegistries; + +/** Isolated packaged probe. Test resources and this class stay out of the mod jars. */ +@Mod("metalminingprobe") +public final class MetalMiningProbe { + private final List failures = new ArrayList<>(); + private final Map profiles = new HashMap<>(); + private int checks; + private int blocks; + private int tools; + private WorldServer world; + private FakePlayer player; + + public MetalMiningProbe() { MinecraftForge.EVENT_BUS.addListener(this::started); } + + private void started(FMLServerStartedEvent event) { + world = event.getServer().getWorld(DimensionType.OVERWORLD); + player = new FakePlayer(world, new GameProfile(UUID.randomUUID(), "MetalMiningProbe")); + new NetHandlerPlayServer(event.getServer(), new NetworkManager(EnumPacketDirection.SERVERBOUND), player); + player.interactionManager.setGameType(GameType.SURVIVAL); + player.onGround = true; + try { + JsonObject root = new JsonParser().parse(new InputStreamReader( + getClass().getResourceAsStream("/mining-profiles.json"), StandardCharsets.UTF_8)).getAsJsonObject(); + for (Map.Entry mod : root.entrySet()) { + String namespace = mod.getKey().equals("modern") ? "modernmetals" : "basemetals"; + for (Map.Entry row : mod.getValue().getAsJsonObject().entrySet()) { + profiles.put(namespace + ":" + row.getKey(), new int[]{row.getValue().getAsJsonArray().get(0).getAsInt(), + row.getValue().getAsJsonArray().get(1).getAsInt(), row.getValue().getAsJsonArray().get(2).getAsInt()}); + } + } + savedStack(); + List targets = new ArrayList<>(); + for (String target : new String[]{"minecraft:iron_ore", "minecraft:diamond_ore", "minecraft:obsidian", + "modernmetals:boron_ore", "modernmetals:tungsten_block", "basemetals:copper_ore", + "basemetals:adamantine_ore"}) targets.add(target); + for (Block block : ForgeRegistries.BLOCKS) { + if (block.getRegistryName().getNamespace().equals("basegems") + && block.getRegistryName().getPath().endsWith("_ore")) targets.add(block.getRegistryName().toString()); + } + for (Block block : ForgeRegistries.BLOCKS) { + String material = material(block.getRegistryName()); + if (material == null) continue; + int required = profiles.get(material)[block.getRegistryName().getPath().endsWith("_ore") ? 2 : 1]; + boolean checked = false; + for (IBlockState state : block.getStateContainer().getValidStates()) { + if (state.getHarvestTool() != ToolType.PICKAXE) continue; + check(state.getHarvestLevel() == required, block.getRegistryName() + " requires " + + state.getHarvestLevel() + " instead of " + required); + checked = true; + } + if (checked) blocks++; + } + for (Item item : ForgeRegistries.ITEMS) { + String material = material(item.getRegistryName()); + if (material == null) continue; + ItemStack stack = new ItemStack(item); + int expected = profiles.get(material)[0]; + boolean checked = false; + for (ToolType type : item.getToolTypes(stack)) { + check(item.getHarvestLevel(stack, type, player, null) == expected, + item.getRegistryName() + " " + type + " tier mismatch"); + checked = true; + } + if (!checked) continue; + tools++; + if (item.getToolTypes(stack).contains(ToolType.PICKAXE)) { + player.setHeldItem(EnumHand.MAIN_HAND, stack); + for (String target : targets) { + ResourceLocation id = new ResourceLocation(target); + if (!ForgeRegistries.BLOCKS.containsKey(id)) continue; + IBlockState state = ForgeRegistries.BLOCKS.getValue(id).getDefaultState(); + BlockPos pos = new BlockPos(0, 180, 0); + world.setBlockState(pos, state, 3); + check(state.canHarvestBlock(world, pos, player) == (expected >= state.getHarvestLevel()), + item.getRegistryName() + " harvest permission for " + target); + } + } + } + if (Boolean.getBoolean("miningaudit.low")) { + String namespace = ForgeRegistries.ITEMS.containsKey(new ResourceLocation("basemetals:steel_crackhammer")) + ? "basemetals" : "modernmetals"; + String owner = namespace.equals("basemetals") ? "BaseMetalsConfig" : "ModernMetalsConfig"; + Object mode = Class.forName("zone.moddev.mc." + namespace + ".config." + owner).getMethod("activeMode").invoke(null); + check(mode.toString().toLowerCase(java.util.Locale.ROOT).contains("low"), "Low Fantasy was not loaded: " + mode); + } + jasper(); + check(blocks > 0 && tools > 0, "No registered metal blocks or tools were checked"); + event.getServer().saveAllWorlds(true); + } catch (Throwable error) { + failures.add(error.toString()); + error.printStackTrace(); + } finally { + for (String failure : failures) System.out.println("METAL_MINING_CASE FAIL " + failure); + System.out.println("METAL_MINING_PROBE " + (failures.isEmpty() ? "PASS" : "FAIL") + + " checks=" + checks + " blocks=" + blocks + " tools=" + tools + " failures=" + failures.size()); + if (event.getServer().isDedicatedServer()) event.getServer().initiateShutdown(); + } + } + + private String material(ResourceLocation id) { + for (String name : profiles.keySet()) { + ResourceLocation material = new ResourceLocation(name); + if (id.getNamespace().equals(material.getNamespace()) && (id.getPath().startsWith(material.getPath() + "_") + || id.getPath().startsWith("double_" + material.getPath() + "_"))) return name; + } + return null; + } + + private void savedStack() throws Exception { + boolean modern = ForgeRegistries.ITEMS.containsKey(new ResourceLocation("modernmetals:galvanizedsteel_crackhammer")); + String id = modern ? "modernmetals:galvanizedsteel_crackhammer" : "basemetals:tin_crackhammer"; + File file = new File("mining-stack.nbt"); + NBTTagCompound stored; + if (file.isFile()) { + try (FileInputStream input = new FileInputStream(file)) { stored = CompressedStreamTools.readCompressed(input); } + } else { + ItemStack stack = new ItemStack(ForgeRegistries.ITEMS.getValue(new ResourceLocation(id))); + stack.setDamage(7); + stack.setDisplayName(new TextComponentString("Mining audit hammer")); + stack.addEnchantment(Enchantments.UNBREAKING, 3); + stack.getOrCreateTag().setString("AuditMarker", "saved before mining-policy update"); + stored = stack.write(new NBTTagCompound()); + try (FileOutputStream output = new FileOutputStream(file)) { CompressedStreamTools.writeCompressed(stored, output); } + } + ItemStack loaded = ItemStack.read(stored); + check(stored.equals(loaded.write(new NBTTagCompound())), "Saved item NBT changed"); + check(loaded.getDamage() == 7 && loaded.getTag().getString("AuditMarker").equals("saved before mining-policy update"), + "Saved item lost durability or custom data"); + int expected = modern ? 2 : 0; + int actual = loaded.getItem().getHarvestLevel(loaded, ToolType.PICKAXE, player, null); + check(actual == expected, "Saved " + id + " tier " + actual + " expected " + expected); + System.out.println("METAL_SAVED_STACK " + id + " tier=" + actual + " damage=" + loaded.getDamage()); + } + + private void jasper() { + ResourceLocation ore = new ResourceLocation("basegems:jasper_ore"); + ResourceLocation hammer = new ResourceLocation("modernmetals:galvanizedsteel_crackhammer"); + if (!ForgeRegistries.BLOCKS.containsKey(ore) || !ForgeRegistries.ITEMS.containsKey(hammer)) return; + BlockPos pos = new BlockPos(5, 180, 5); + world.setBlockState(pos, ForgeRegistries.BLOCKS.getValue(ore).getDefaultState(), 3); + ItemStack tool = new ItemStack(ForgeRegistries.ITEMS.getValue(hammer)); + player.setHeldItem(EnumHand.MAIN_HAND, tool); + player.interactionManager.tryHarvestBlock(pos); + int count = 0; + for (EntityItem drop : world.getEntitiesWithinAABB(EntityItem.class, new AxisAlignedBB(pos).grow(0.4))) { + check(drop.getItem().getItem().getRegistryName().toString().equals("basegems:jasper_powder"), "Wrong Jasper output"); + count += drop.getItem().getCount(); + drop.remove(); + } + check(count == 2 && tool.getDamage() == 1, "Galvanized steel did not crush Jasper with one durability: " + count); + System.out.println("METAL_JASPER galvanizedsteel powder=" + count + " damage=" + tool.getDamage()); + } + + private void check(boolean condition, String message) { + checks++; + if (!condition) failures.add(message); + } +} diff --git a/tools/validation/port113/runtime-probe/test/HammerHarvestProbe.java b/tools/validation/port113/runtime-probe/test/HammerHarvestProbe.java new file mode 100644 index 00000000..4a9fab71 --- /dev/null +++ b/tools/validation/port113/runtime-probe/test/HammerHarvestProbe.java @@ -0,0 +1,132 @@ +package test; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashMap; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import java.util.UUID; + +import com.mojang.authlib.GameProfile; +import net.minecraft.block.Block; +import net.minecraft.block.state.IBlockState; +import net.minecraft.entity.item.EntityItem; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.network.EnumPacketDirection; +import net.minecraft.network.NetHandlerPlayServer; +import net.minecraft.network.NetworkManager; +import net.minecraft.util.EnumHand; +import net.minecraft.util.ResourceLocation; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.GameType; +import net.minecraft.world.WorldServer; +import net.minecraft.world.dimension.DimensionType; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.common.util.FakePlayer; +import net.minecraftforge.fml.ModList; +import net.minecraftforge.fml.common.Mod; +import net.minecraftforge.fml.event.server.FMLServerStartedEvent; +import net.minecraftforge.registries.ForgeRegistries; + +/** Packaged survival regression probe; never include this mod in release jars. */ +@Mod("hammerharvestprobe") +public final class HammerHarvestProbe { + private final List failures = new ArrayList<>(); + private int checks; + private int positions; + private WorldServer world; + private FakePlayer player; + + public HammerHarvestProbe() { MinecraftForge.EVENT_BUS.addListener(this::started); } + + private void started(FMLServerStartedEvent event) { + world = event.getServer().getWorld(DimensionType.OVERWORLD); + player = new FakePlayer(world, new GameProfile(UUID.randomUUID(), "HammerHarvestProbe")); + new NetHandlerPlayServer(event.getServer(), new NetworkManager(EnumPacketDirection.SERVERBOUND), player); + player.interactionManager.setGameType(GameType.SURVIVAL); + player.onGround = true; + try { + Map gems = new LinkedHashMap<>(); + add(gems, 0, "amber lepidolite"); + add(gems, 1, "agate carnelian garnet jade malachite moldavite moonstone opal peridot tanzanite turquoise"); + add(gems, 2, "alexandrite amethyst ametrine aquamarine beryl bluetopaz citrine goldenberyl heliodor indicolite iolite jasper morganite onyx ruby sapphire spinel topaz violetsapphire"); + add(gems, 3, "blackdiamond"); + check(gems.size() == 33, "Incomplete legacy gem catalogue"); + List tools = new ArrayList<>(Arrays.asList("minecraft:stone_pickaxe", "minecraft:iron_pickaxe")); + if (ModList.get().isLoaded("modernmetals")) tools.addAll(Arrays.asList( + "modernmetals:galvanizedsteel_crackhammer", "modernmetals:stainlesssteel_crackhammer", + "modernmetals:titanium_crackhammer", "modernmetals:boron_crackhammer")); + if (ModList.get().isLoaded("basemetals")) tools.addAll(Arrays.asList( + "basemetals:stone_crackhammer", "basemetals:iron_crackhammer")); + for (Map.Entry gem : gems.entrySet()) { + String name = gem.getKey(); + for (String form : Arrays.asList("ore", "block", "plate", "bars", "door", "trapdoor", + "button", "lever", "pressure_plate", "slab", "stairs", "wall")) { + Block block = block("basegems:" + name + "_" + form); + for (IBlockState state : block.getStateContainer().getValidStates()) + check(state.getHarvestLevel() == gem.getValue(), name + "_" + form + + " tier " + state.getHarvestLevel() + " expected " + gem.getValue()); + } + check(block("basegems:double_" + name + "_slab").getDefaultState().getHarvestLevel() + == gem.getValue(), name + " double slab tier"); + for (String tool : tools) mine(name, gem.getValue(), tool); + } + event.getServer().saveAllWorlds(true); + } catch (Throwable error) { + failures.add(error.toString()); + error.printStackTrace(); + } finally { + for (String failure : failures) System.out.println("HAMMER_HARVEST_CASE FAIL " + failure); + System.out.println("HAMMER_HARVEST_PROBE " + (failures.isEmpty() ? "PASS" : "FAIL") + + " checks=" + checks + " failures=" + failures.size()); + if (event.getServer().isDedicatedServer()) event.getServer().initiateShutdown(); + } + } + + private void mine(String gem, int requiredTier, String toolId) { + BlockPos pos = new BlockPos((positions % 12) * 3, 180, (positions++ / 12) * 3); + IBlockState state = block("basegems:" + gem + "_ore").getDefaultState(); + world.setBlockState(pos, state, 3); + Item toolItem = ForgeRegistries.ITEMS.getValue(new ResourceLocation(toolId)); + ItemStack tool = new ItemStack(toolItem); + player.setHeldItem(EnumHand.MAIN_HAND, tool); + int tier = toolId.contains("boron") || toolId.contains("stone_") ? 1 : 2; + boolean expected = tier >= requiredTier; + boolean canHarvest = state.canHarvestBlock(world, pos, player); + float speed = toolItem.getDestroySpeed(tool, state); + check(canHarvest == expected, toolId + " harvest permission for " + gem); + boolean hammer = toolId.endsWith("crackhammer"); + if (hammer) check(expected ? speed > 1.0F : speed == 1.0F, + toolId + " speed " + speed + " on " + gem + " expected " + (expected ? ">1" : "1")); + player.interactionManager.tryHarvestBlock(pos); + Map drops = new HashMap<>(); + for (EntityItem entity : world.getEntitiesWithinAABB(EntityItem.class, new AxisAlignedBB(pos).grow(0.4))) { + ItemStack stack = entity.getItem(); + drops.merge(stack.getItem().getRegistryName().toString(), stack.getCount(), Integer::sum); + entity.remove(); + } + String output = "basegems:" + gem + (hammer ? "_powder" : "_ingot"); + check(expected ? drops.size() == 1 && drops.getOrDefault(output, 0) == (hammer ? 2 : 1) + : drops.isEmpty(), toolId + " mining " + gem + " produced " + drops); + if (expected && hammer) check(tool.getDamage() == 1, toolId + " durability on " + gem); + check(world.isAirBlock(pos), "Ore remained after survival break: " + gem); + if ("jasper".equals(gem)) System.out.println("HAMMER_JASPER " + toolId + " tier=" + tier + + " required=" + requiredTier + " harvest=" + canHarvest + " speed=" + speed + " drops=" + drops); + } + + private static void add(Map gems, int tier, String names) { + for (String name : names.split(" ")) gems.put(name, tier); + } + + private static Block block(String id) { + return ForgeRegistries.BLOCKS.getValue(new ResourceLocation(id)); + } + + private void check(boolean condition, String message) { + checks++; + if (!condition) failures.add(message); + } +} diff --git a/tools/validation/port113/verify_legacy_world.py b/tools/validation/port113/verify_legacy_world.py new file mode 100644 index 00000000..4edcdb89 --- /dev/null +++ b/tools/validation/port113/verify_legacy_world.py @@ -0,0 +1,262 @@ +"""Compare Modern Metals data in a source Forge save and its upgraded copy.""" +import argparse +from collections import Counter +from io import BytesIO +import gzip +import json +from pathlib import Path +import zlib + +import nbtlib +import numpy as np + +PREFIX = "modernmetals:" +FACING = ("down", "up", "north", "south", "west", "east") +HORIZONTAL = ("south", "west", "north", "east") +DOOR = ("east", "south", "west", "north") +TRAPDOOR = ("north", "south", "west", "east") +FLUIDS = { + "aluminum", "aluminumbrass", "beryllium", "boron", "cadmium", "chromium", "galvanizedsteel", + "iridium", "magnesium", "manganese", "nichrome", "osmium", "plutonium", "rutile", + "stainlesssteel", "tantalum", "thorium", "titanium", "tungsten", "uranium", "zirconium", +} + + +def canonical(name): + name = name.lower().removeprefix(PREFIX) + if name == "alubrass": + name = "aluminumbrass" + for old, new in (("_door_item", "_door"), ("_horsearmor", "_horse_armor"), ("_fishingrod", "_fishing_rod")): + if name.endswith(old): + name = name.removesuffix(old) + new + break + return PREFIX + name + + +def region_chunks(path): + with path.open("rb") as stream: + offsets = stream.read(4096) + for offset in range(0, 4096, 4): + sector = int.from_bytes(offsets[offset:offset + 3], "big") + if not sector: + continue + stream.seek(4096 * sector) + length = int.from_bytes(stream.read(4), "big") + scheme = stream.read(1)[0] + payload = stream.read(length - 1) + if scheme == 1: + payload = gzip.decompress(payload) + elif scheme == 2: + payload = zlib.decompress(payload) + else: + raise ValueError(f"Unknown chunk compression {scheme} in {path}") + yield nbtlib.File.parse(BytesIO(payload)) + + +def region_records(world): + paths = list((world / "region").glob("*.mca")) + for dimension in world.glob("DIM*"): + paths.extend((dimension / "region").glob("*.mca")) + for path in sorted(paths): + dimension = str(path.parent.parent.relative_to(world)) + for root in region_chunks(path): + level = root["Level"] + yield (dimension, int(level["xPos"]), int(level["zPos"])), level + + +def nibble_array(nbt): + if nbt is None: + return np.zeros(4096, dtype=np.uint16) + raw = np.asarray(nbt, dtype=np.uint8) + result = np.empty(4096, dtype=np.uint16) + result[::2] = raw & 15 + result[1::2] = raw >> 4 + return result + + +def expected_state(name, meta): + path = name.removeprefix(PREFIX) + state = {} + if path.startswith("double_"): + name = PREFIX + path.removeprefix("double_") + state["type"] = "double" + elif path.endswith("_slab"): + state["type"] = "top" if meta & 8 else "bottom" + elif path.endswith("_plate") and not path.endswith("_pressure_plate"): + state["facing"] = FACING[(meta & 7) % 6] + elif path.endswith("_stairs"): + state = {"facing": FACING[5 - (meta & 3)], "half": "top" if meta & 4 else "bottom"} + elif path.endswith("_door"): + if meta & 8: + state = {"half": "upper", "hinge": "right" if meta & 1 else "left", "powered": str(bool(meta & 2)).lower()} + else: + state = {"half": "lower", "facing": DOOR[meta & 3], "open": str(bool(meta & 4)).lower()} + elif path.endswith("_trapdoor"): + state = {"facing": TRAPDOOR[meta & 3], "half": "top" if meta & 8 else "bottom", "open": str(bool(meta & 4)).lower()} + elif path.endswith("_button"): + attach = ("down", "east", "west", "south", "north", "up", "up", "up")[meta & 7] + state = {"face": {"down": "ceiling", "up": "floor"}.get(attach, "wall"), "powered": str(bool(meta & 8)).lower()} + if attach not in {"up", "down"}: + state["facing"] = attach + elif path.endswith("_lever"): + orientation = meta & 7 + attach, face = ( + ("ceiling", "east"), ("wall", "east"), ("wall", "west"), ("wall", "south"), + ("wall", "north"), ("floor", "north"), ("floor", "east"), ("ceiling", "north"), + )[orientation] + state = {"face": attach, "facing": face, "powered": str(bool(meta & 8)).lower()} + elif path.endswith("_pressure_plate"): + state["powered"] = str(meta > 0).lower() + elif path in FLUIDS: + state["level"] = str(meta) + return name, state + + +def saved_stacks(value, old_items): + if isinstance(value, nbtlib.Compound): + item_id = value.get("id", "") + if "Count" in value: + if isinstance(item_id, nbtlib.Numeric): + item_id = old_items.get(int(item_id), "") + name = str(item_id).lower() + tag = value.get("tag", {}) + if name == "forge:bucketfilled": + fluid = canonical(str(tag.get("FluidName", ""))) + if fluid.removeprefix(PREFIX) in FLUIDS: + name = fluid + "_bucket" + if name.startswith(PREFIX): + properties = {key: entry.snbt() for key, entry in tag.items() + if key != "Damage" and (str(item_id).lower() != "forge:bucketfilled" + or key not in {"FluidName", "Amount"})} + yield (canonical(name), int(value["Count"]), int(tag.get("Damage", value.get("Damage", 0))), + int(value.get("Slot", -1)), json.dumps(properties, sort_keys=True)) + for child in value.values(): + yield from saved_stacks(child, old_items) + elif isinstance(value, nbtlib.List): + for child in value: + yield from saved_stacks(child, old_items) + + +def loose_stacks(world, item_ids): + files = [(world / "level.dat", "Data.Player")] + files.extend((path, str(path.relative_to(world))) for path in (world / "playerdata").glob("*.dat")) + for path, location in files: + data = nbtlib.load(path) + if location == "Data.Player": + data = data["Data"].get("Player", nbtlib.Compound()) + for stack in saved_stacks(data, item_ids): + yield location, stack + + +def legacy_states(level, block_ids): + ids = list(block_ids) + for section in level.get("Sections", []): + if "Blocks" not in section: + continue + numeric = np.asarray(section["Blocks"], dtype=np.uint8).astype(np.uint16) + numeric |= nibble_array(section.get("Add")) << 8 + matches = np.flatnonzero(np.isin(numeric, ids)) + if not len(matches): + continue + meta = nibble_array(section.get("Data")) + section_y = int(section["Y"]) + for index in matches: + name = canonical(block_ids[numeric[index]]) + yield (section_y, int(index)), expected_state(name, int(meta[index])) + + +def join_legacy_door_expectations(states): + for (section, index), (name, properties) in states.items(): + if not name.endswith("_door") or properties.get("half") != "lower": + continue + index_above = index + 256 + other_name, other = states.get((section + index_above // 4096, index_above % 4096), ("", {})) + if other_name == name and other.get("half") == "upper": + properties.update({key: other[key] for key in ("hinge", "powered")}) + other.update({key: properties[key] for key in ("facing", "open")}) + + +def actual_states(level, locations): + sections = {int(section["Y"]): section for section in level.get("Sections", [])} + for section_y, index in locations: + section = sections.get(section_y, {}) + palette = section.get("Palette", []) + block_states = section.get("BlockStates", []) + if not palette or not len(block_states): + yield "", {} + continue + bits = max(4, (len(palette) - 1).bit_length()) + long_index, offset = divmod(index * bits, 64) + combined = (int(block_states[long_index]) & ((1 << 64) - 1)) >> offset + if offset + bits > 64: + combined |= int(block_states[long_index + 1]) << (64 - offset) + entry = palette[combined & ((1 << bits) - 1)] + yield str(entry["Name"]), dict(entry.get("Properties", {})) + + +def compare(source, upgraded, before_registry, include_properties=True): + block_ids = {number: name for name, number in before_registry["blocks"].items()} + item_ids = {number: name for name, number in before_registry["items"].items()} + # Store only the chunks with Modern Metals data, then stream the upgraded regions. + expected = {} + state_counts = Counter() + for chunk, level in region_records(source): + blocks = dict(legacy_states(level, block_ids)) + join_legacy_door_expectations(blocks) + stacks = Counter(saved_stacks(level, item_ids)) + if blocks or stacks: + expected[chunk] = blocks, stacks + state_counts.update(name for name, _ in blocks.values()) + errors = Counter() + block_count = 0 + stack_count = 0 + sample = [] + for chunk, level in region_records(upgraded): + if chunk not in expected: + continue + blocks, stacks = expected.pop(chunk) + for (location, (name, properties)), (current_name, current_properties) in zip( + blocks.items(), actual_states(level, blocks)): + block_count += 1 + if current_name != name: + key = ("block", name, current_name) + errors[key] += 1 + if len(sample) < 12: + sample.append((chunk, location, key)) + elif include_properties: + for key, value in properties.items(): + actual = current_properties.get(key) + if actual != value: + errors["property", name, key, value, str(actual)] += 1 + stack_count += sum(stacks.values()) + for item, count in (stacks - Counter(saved_stacks(level, {}))).items(): + errors["chunk stack", *item] += count + for location in expected: + errors["unconverted chunk", *location] += 1 + expected_loose = Counter(loose_stacks(source, item_ids)) + stack_count += sum(expected_loose.values()) + for (location, item), count in (expected_loose - Counter(loose_stacks(upgraded, {}))).items(): + errors["player stack", location, *item] += count + return {"blocks": block_count, "stacks": stack_count, "block_types": dict(state_counts), + "errors": [(key, value) for key, value in errors.most_common()], "samples": sample} + + +def main(): + parser = argparse.ArgumentParser() + parser.add_argument("source", type=Path) + parser.add_argument("upgraded", type=Path) + parser.add_argument("--identity-only", action="store_true") + args = parser.parse_args() + registry = nbtlib.load(args.source / "level.dat")["FML"]["Registries"] + rows = {} + for kind in ("blocks", "items"): + rows[kind] = {str(entry["K"]): int(entry["V"]) for entry in registry[f"minecraft:{kind}"]["ids"] + if str(entry["K"]).lower().startswith(PREFIX)} + result = compare(args.source, args.upgraded, rows, not args.identity_only) + print(json.dumps(result, indent=2)) + if result["errors"]: + raise SystemExit(1) + + +if __name__ == "__main__": + main()