diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 937c56bcb..6ce6057e2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,19 +1,19 @@ -name: Base Metals 1.21.11 CI +name: Base Metals 26.1.2 CI on: push: branches: - - master-1.21.11 + - master-26.1.2 - 'feature/**' pull_request: branches: - - master-1.21.11 + - master-26.1.2 permissions: contents: read concurrency: - group: basemetals-1.21.11-${{ github.workflow }}-${{ github.ref }} + group: basemetals-26.1.2-${{ github.workflow }}-${{ github.ref }} cancel-in-progress: true jobs: @@ -26,24 +26,12 @@ jobs: - name: Check out source uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7 - - name: Install Java 25 for Mavenizer + - name: Install pinned Java 25 runtime and toolchain uses: actions/setup-java@b6effb05e454b25005698d916606bdc6ffcbf961 # v5 with: distribution: temurin java-version: '25.0.3+9.0.LTS' - - name: Install Java 8 for the development launcher helper - uses: actions/setup-java@b6effb05e454b25005698d916606bdc6ffcbf961 # v5 - with: - distribution: temurin - java-version: '8.0.502+7' - - - name: Install pinned Java 21 runtime and toolchain - uses: actions/setup-java@b6effb05e454b25005698d916606bdc6ffcbf961 # v5 - with: - distribution: temurin - java-version: '21.0.7+6.0.LTS' - - name: Set up Gradle uses: gradle/actions/setup-gradle@9c971963bec38e04b3d30dcc455b5382be2fdbfb # v6 @@ -71,9 +59,9 @@ jobs: --no-daemon --stacktrace first="$RUNNER_TEMP/basemetals-first" mkdir -p "$first" - cp build/libs/BaseMetals-3.1.1.121111.jar "$first/" - cp build/libs/BaseMetals-3.1.1.121111-sources.jar "$first/" - cp build/libs/BaseMetals-3.1.1.121111-javadoc.jar "$first/" + cp build/libs/BaseMetals-3.1.1.2601021.jar "$first/" + cp build/libs/BaseMetals-3.1.1.2601021-sources.jar "$first/" + cp build/libs/BaseMetals-3.1.1.2601021-javadoc.jar "$first/" cp build/release/SHA256SUMS "$first/" - name: Rebuild and prove byte-identical archives @@ -81,9 +69,9 @@ jobs: ./gradlew clean assemble verifyReleaseArtifacts writeReleaseChecksums \ -PorespawnVerificationRepository="${{ steps.orespawn.outputs.repository }}" \ --no-daemon --stacktrace - cmp "$RUNNER_TEMP/basemetals-first/BaseMetals-3.1.1.121111.jar" build/libs/BaseMetals-3.1.1.121111.jar - cmp "$RUNNER_TEMP/basemetals-first/BaseMetals-3.1.1.121111-sources.jar" build/libs/BaseMetals-3.1.1.121111-sources.jar - cmp "$RUNNER_TEMP/basemetals-first/BaseMetals-3.1.1.121111-javadoc.jar" build/libs/BaseMetals-3.1.1.121111-javadoc.jar + cmp "$RUNNER_TEMP/basemetals-first/BaseMetals-3.1.1.2601021.jar" build/libs/BaseMetals-3.1.1.2601021.jar + cmp "$RUNNER_TEMP/basemetals-first/BaseMetals-3.1.1.2601021-sources.jar" build/libs/BaseMetals-3.1.1.2601021-sources.jar + cmp "$RUNNER_TEMP/basemetals-first/BaseMetals-3.1.1.2601021-javadoc.jar" build/libs/BaseMetals-3.1.1.2601021-javadoc.jar cmp "$RUNNER_TEMP/basemetals-first/SHA256SUMS" build/release/SHA256SUMS - name: Run all required GameTests @@ -95,14 +83,14 @@ jobs: - name: Install official Forge packaged runtimes id: forge-runtimes run: | - server_runtime="$RUNNER_TEMP/forge-1.21.11-61.1.0-server" - client_runtime="$RUNNER_TEMP/forge-1.21.11-61.1.0-client" - installer="$RUNNER_TEMP/forge-1.21.11-61.1.0-installer.jar" + server_runtime="$RUNNER_TEMP/forge-26.1.2-64.0.9-server" + client_runtime="$RUNNER_TEMP/forge-26.1.2-64.0.9-client" + installer="$RUNNER_TEMP/forge-26.1.2-64.0.9-installer.jar" mkdir -p "$server_runtime" "$client_runtime" curl --fail --location --retry 3 \ --output "$installer" \ - https://maven.minecraftforge.net/net/minecraftforge/forge/1.21.11-61.1.0/forge-1.21.11-61.1.0-installer.jar - echo "8BD1724EAEAF26F51DACFB7FDC46D79E9B640705B70D5F0019ED38907145EB48 $installer" | sha256sum --check --strict + https://maven.minecraftforge.net/net/minecraftforge/forge/26.1.2-64.0.9/forge-26.1.2-64.0.9-installer.jar + echo "608BC9F028A0EF8DCD1A49C6EB85DDFCFA3B3BCD8AE27FC1B2AE02888ED8CB0A $installer" | sha256sum --check --strict ( cd "$server_runtime" java -jar "$installer" --installServer @@ -147,13 +135,13 @@ jobs: - name: Upload audited release candidate uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7 with: - name: BaseMetals-1.21.11-${{ github.sha }} + name: BaseMetals-26.1.2-${{ github.sha }} if-no-files-found: error retention-days: 30 path: | - build/libs/BaseMetals-3.1.1.121111.jar - build/libs/BaseMetals-3.1.1.121111-sources.jar - build/libs/BaseMetals-3.1.1.121111-javadoc.jar + build/libs/BaseMetals-3.1.1.2601021.jar + build/libs/BaseMetals-3.1.1.2601021-sources.jar + build/libs/BaseMetals-3.1.1.2601021-javadoc.jar build/release/SHA256SUMS CHANGELOG.txt @@ -161,7 +149,7 @@ jobs: if: failure() uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7 with: - name: BaseMetals-1.21.11-diagnostics-${{ github.sha }} + name: BaseMetals-26.1.2-diagnostics-${{ github.sha }} if-no-files-found: ignore retention-days: 14 path: | diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index a8f9d82b7..51315cef4 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -3,11 +3,11 @@ name: CodeQL on: push: branches: - - master-1.21.11 + - master-26.1.2 - 'feature/**' pull_request: branches: - - master-1.21.11 + - master-26.1.2 permissions: actions: read @@ -24,24 +24,12 @@ jobs: - name: Check out source uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7 - - name: Install Java 25 for Mavenizer + - name: Install pinned Java 25 runtime and toolchain uses: actions/setup-java@b6effb05e454b25005698d916606bdc6ffcbf961 # v5 with: distribution: temurin java-version: '25.0.3+9.0.LTS' - - name: Install Java 8 for the development launcher helper - uses: actions/setup-java@b6effb05e454b25005698d916606bdc6ffcbf961 # v5 - with: - distribution: temurin - java-version: '8.0.502+7' - - - name: Install pinned Java 21 runtime and toolchain - uses: actions/setup-java@b6effb05e454b25005698d916606bdc6ffcbf961 # v5 - with: - distribution: temurin - java-version: '21.0.7+6.0.LTS' - - name: Set up Gradle uses: gradle/actions/setup-gradle@9c971963bec38e04b3d30dcc455b5382be2fdbfb # v6 diff --git a/.github/workflows/validate-gradle-build.yml b/.github/workflows/validate-gradle-build.yml index b37dfc947..531f53fed 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.21.11 + - master-26.1.2 - 'feature/**' pull_request: branches: - - master-1.21.11 + - master-26.1.2 permissions: contents: read diff --git a/CHANGELOG.txt b/CHANGELOG.txt index dd4450ea3..3c097cafe 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -1,3 +1,14 @@ +Base Metals 3.1.1.2601021 + +- Port the released 1.21.11 version to Minecraft 26.1.2, Forge 64 and Java 25. +- Keep raw metals, Kiri's ore overlays, filled buckets, High/Low Fantasy and the existing gameplay fixes. +- Move smith offers to Minecraft's data-driven trades, keeping their prices, quantities and profession levels. +- Update recipe codecs, configuration drawing and fluid rendering for the newer APIs. +- Keep legacy Forge ingredient tags working through the current common tags. +- Prepare legacy inventories before Minecraft moves player and dimension files into the new world layout. +- Keep current player data and native world-capability files authoritative during upgrades. +- Use published OreSpawn 4.1.0.2601021 with the same eleven rules and copper defaults. + Base Metals 3.1.1.121111 - Port the released 1.21.1 version to Minecraft 1.21.11 and Forge 61, keeping Java 21. diff --git a/README.md b/README.md index b01a4f3a9..d3c06cd46 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ [![Discord](https://img.shields.io/badge/Discord-MMD-green.svg?style=flat&logo=Discord)](https://discord.moddev.zone) [![CurseForge downloads](https://cf.way2muchnoise.eu/full_base-metals_downloads.svg)](https://www.curseforge.com/minecraft/mc-mods/base-metals) [![Supported Minecraft versions](https://cf.way2muchnoise.eu/versions/Minecraft_base-metals_all.svg)](https://www.curseforge.com/minecraft/mc-mods/base-metals) -[![Build, test, and audit](https://github.com/MinecraftModDevelopmentMods/BaseMetals/actions/workflows/ci.yml/badge.svg?branch=master-1.21.11)](https://github.com/MinecraftModDevelopmentMods/BaseMetals/actions/workflows/ci.yml?query=branch%3Amaster-1.21.11) +[![Build, test, and audit](https://github.com/MinecraftModDevelopmentMods/BaseMetals/actions/workflows/ci.yml/badge.svg?branch=master-26.1.2)](https://github.com/MinecraftModDevelopmentMods/BaseMetals/actions/workflows/ci.yml?query=branch%3Amaster-26.1.2) # Base Metals @@ -12,23 +12,23 @@ shields, bows, crossbows, arrows, and bolts. The mod also includes Crack Hammers, scythes, metal anvils, the human detector, villager trades, advancements, and structure loot. -This is the Minecraft 1.21.11 Forge version, `3.1.1.121111`. It keeps the -fixes and features from the released 1.21.1 version, including raw metals, ore +This is the Minecraft 26.1.2 Forge version, `3.1.1.2601021`. It keeps the +fixes and features from the released 1.21.11 version, including raw metals, ore texture overlays and High/Low Fantasy modes. Existing Base Metals items and blocks keep their registry IDs. OreSpawn handles ore generation; MMDLib and Additional Loot Tables are no longer needed. ## Requirements -- Minecraft `1.21.11` -- Forge `61.1.0` or newer in the Minecraft 1.21.11 Forge 61 line -- A current Java 21 runtime -- OreSpawn `[4.1.0.121111,5.0.0)` on both client and server +- Minecraft `26.1.2` +- Forge `64.0.9` or newer in the Minecraft 26.1.2 Forge 64 line +- A current Java 25 runtime +- OreSpawn `[4.1.0.2601021,5.0.0)` on both client and server -The port has also been checked against Forge `61.2.4`. +The build uses Forge `64.0.9` and is also tested on `64.1.5`. -This version uses OreSpawn `4.1.0.121111`. Put -`BaseMetals-3.1.1.121111.jar` and a compatible OreSpawn JAR in the `mods` +This version uses OreSpawn `4.1.0.2601021`. Put +`BaseMetals-3.1.1.2601021.jar` and a compatible OreSpawn JAR in the `mods` directory. MMDLib and Additional Loot Tables must not be carried forward from an older installation. Mineralogy is optional. @@ -42,9 +42,9 @@ Base Metals provides 22 materials: - Fantasy materials: Adamantine, Aquarium, Cold Iron, Mithril, and Starsteel. All existing items and blocks stay registered, including when Low Fantasy -limits which items you can make. Recipes use Forge tags, so compatible ores, -ingots, powders, plates, rods, gears and other components from different mods -can be used together. +limits which items you can make. Recipes use shared common tags, with legacy +Forge tag names kept as aliases. Compatible ores, ingots, powders, plates, +rods, gears and other components from different mods can be used together. Where vanilla has the same copper forms, recipes now produce vanilla ingots, blocks, nuggets, tools, armour, horse armour, bars, doors, trapdoors, cut-copper @@ -150,7 +150,7 @@ Forge item, block, and fluid tags are Base Metals' public compatibility API. Compatible tags and the existing recipe data for Mekanism, Thermal, Tinkers' Construct and Ender IO are retained, but their Java integrations are not enabled -in this Forge 1.21.11 port. Do not add jars made for older Minecraft versions or +in this Forge 26.1.2 port. Do not add jars made for older Minecraft versions or NeoForge to this instance. No optional integration API is required to compile or launch Base Metals. @@ -164,9 +164,7 @@ contracts. ## Building and contributing Base Metals uses ForgeGradle `7.0.34`, Gradle `9.6.1`, official Minecraft -mappings, and the Java 21 toolchain. Initial Minecraft setup also uses Java 25 -for Mavenizer. ForgeGradle also needs Java 8 for its setup helper; it does not -compile the mod or run Minecraft with Java 8. A normal command-line +mappings, and Java 25 for the build tools and Minecraft. A normal command-line build resolves the published OreSpawn release from CurseMaven: ```text @@ -179,7 +177,7 @@ Generate and verify Eclipse launches with: ./gradlew prepareEclipse ``` -IntelliJ users can import the Gradle project with Java 21 and run +IntelliJ users can import the Gradle project with Java 25 and run `./gradlew prepareIntelliJ` to add client and server configurations. Both IDEs use the same Gradle-managed Forge bootstrap and assets. @@ -203,7 +201,7 @@ early splash window. Minecraft still opens its game window and runs the full world check. Ordinary client launches keep the normal splash screen. Release artifacts use Maven coordinate -`zone.moddev.mc.basemetals:BaseMetals:3.1.1.121111`. +`zone.moddev.mc.basemetals:BaseMetals:3.1.1.2601021`. Report defects and compatibility problems through the [Base Metals issue tracker](https://github.com/MinecraftModDevelopmentMods/BaseMetals/issues). diff --git a/build.gradle b/build.gradle index a03e8b10a..9e5e6f300 100644 --- a/build.gradle +++ b/build.gradle @@ -9,14 +9,14 @@ plugins { ext.mavenizerCompatibilityJar = layout.projectDirectory.file( 'ci-fixtures/tools/minecraft-mavenizer-0.5.21-orespawn-compat.jar') ext.mavenizerCompatibilitySha256 = - 'B36CA046DB72E30F27BD38E02B4AE34274ADB51AE1D65BAF9E1D07763755682E' + 'BB0DACB3DEB2A711CA67DD402D5FDAB5A9847C37C7B9B596DEC7CF37378FA085' ext.mavenizerFixtureChecksums = [ 'minecraft-mavenizer-0.5.21-orespawn-compat.jar': mavenizerCompatibilitySha256, - 'minecraft-source-compatibility.json': '88F2EE4C6B7C903EB1C7D693C0BEEFC0EFC601C1023FB197F7CBA187B1142DB7', - 'minecraft-mavenizer-0.5.21-orespawn-compat.patch': '88F9035C8545CF1CBC7342C14F2F95076C4E415EDB7A74D585409CFC3F1BDD5C', + 'minecraft-source-compatibility.json': '21D1F5984E735BCEA1B1EFB9F965655796B39538FC91AAED1C3474004710423D', + 'minecraft-mavenizer-0.5.21-orespawn-compat.patch': '7C8EC895E79DF31AFD2CA3B505B43573C7052718A24050832189AAA2D3CC6137', 'LICENSE-MAVENIZER.txt': '20C17D8B8C48A600800DFD14F95D5CB9FF47066A9641DDEAB48DC54AEC96E331', - 'README.md': 'A097E126C606BDC86B34F5DDFB9580228A7C5BC866C6509C6BB362152EBACED7' + 'README.md': '7686880D2B0F6BD6ACAFA4F0AB7585189767813174BC36DB675FEC0142440A77' ] // Mavenizer runs during configuration, so verify its inputs before configuring Forge. mavenizerFixtureChecksums.each { name, expected -> @@ -27,7 +27,7 @@ mavenizerFixtureChecksums.each { name, expected -> } } -// Forge 61 needs no source repairs. The sealed fixture records that result +// Forge 64 needs no source repairs. The sealed fixture records that result // and stays separate from the mod and its runtime dependencies. fgtools.configure('mavenizer') { classpath.from(mavenizerCompatibilityJar) @@ -67,20 +67,28 @@ ext.release_tag = project.mod_version java { toolchain { - languageVersion = JavaLanguageVersion.of(21) + languageVersion = JavaLanguageVersion.of(25) vendor = JvmVendorSpec.ADOPTIUM } withSourcesJar() withJavadocJar() } +// Keep the development launcher on the same JDK as Minecraft and Gradle. +fgtools.configure('slimelauncher') { + javaLauncher.set(javaToolchains.launcherFor { + languageVersion = JavaLanguageVersion.of(25) + vendor = JvmVendorSpec.ADOPTIUM + }) +} + tasks.withType(JavaCompile).configureEach { javaCompiler = javaToolchains.compilerFor { - languageVersion = JavaLanguageVersion.of(21) + languageVersion = JavaLanguageVersion.of(25) vendor = JvmVendorSpec.ADOPTIUM } - sourceCompatibility = JavaVersion.VERSION_21 - targetCompatibility = JavaVersion.VERSION_21 + sourceCompatibility = JavaVersion.VERSION_25 + targetCompatibility = JavaVersion.VERSION_25 options.encoding = 'UTF-8' options.compilerArgs.addAll(['-Xmaxerrs', '1000']) } @@ -369,6 +377,7 @@ sourceSets.main.resources { } // Keep the top-level build readable; each script owns one build concern. +apply from: 'gradle/ide/merged-output.gradle' apply from: 'gradle/dependencies.gradle' apply from: 'gradle/release/artifacts.gradle' apply from: 'gradle/release/publishing.gradle' diff --git a/ci-fixtures/tools/README.md b/ci-fixtures/tools/README.md index c115eb9e7..4258c43c7 100644 --- a/ci-fixtures/tools/README.md +++ b/ci-fixtures/tools/README.md @@ -2,7 +2,7 @@ This directory contains a build-only derivative of MinecraftForge's MinecraftMavenizer `0.5.21`. It is used only while ForgeGradle prepares the -exact Forge `1.21.11-61.1.0` development dependency and is excluded from every +exact Forge `26.1.2-64.0.9` development dependency and is excluded from every OreSpawn publication artifact. ## Provenance and licence @@ -21,14 +21,14 @@ declaration and one accessor in that record. Missing, partial, duplicate or ambiguous states fail preparation. Targets without an explicit rule set are left unchanged. -Forge `1.21.11-61.1.0` compiles without source compatibility edits. Its explicit +Forge `26.1.2-64.0.9` compiles without source compatibility edits. Its explicit zero-rule entry proves that result is intentional and target-qualified rather than an accidental fall-through. A marker beside Mavenizer's output records the target and manifest SHA-256. Reprocessing the same source is idempotent. The derivative also propagates Gradle offline mode when the build sets -`ORESPAWN_MAVENIZER_OFFLINE=true`. Mavenizer itself runs on Java 25; OreSpawn -and Minecraft 1.21.11 continue to compile for Java 21. +`ORESPAWN_MAVENIZER_OFFLINE=true`. Mavenizer, OreSpawn and Minecraft 26.1.2 all +run and compile with Java 25. ## Rebuild diff --git a/ci-fixtures/tools/minecraft-mavenizer-0.5.21-orespawn-compat.jar b/ci-fixtures/tools/minecraft-mavenizer-0.5.21-orespawn-compat.jar index 067437747..37a70e0cc 100644 Binary files a/ci-fixtures/tools/minecraft-mavenizer-0.5.21-orespawn-compat.jar and b/ci-fixtures/tools/minecraft-mavenizer-0.5.21-orespawn-compat.jar differ diff --git a/ci-fixtures/tools/minecraft-mavenizer-0.5.21-orespawn-compat.patch b/ci-fixtures/tools/minecraft-mavenizer-0.5.21-orespawn-compat.patch index 067736433..f8c2c8acb 100644 --- a/ci-fixtures/tools/minecraft-mavenizer-0.5.21-orespawn-compat.patch +++ b/ci-fixtures/tools/minecraft-mavenizer-0.5.21-orespawn-compat.patch @@ -371,7 +371,7 @@ index 0000000..702d759 +{ + "schema": 1, + "targets": { -+ "net.minecraftforge:forge:1.21.11-61.1.0": { ++ "net.minecraftforge:forge:26.1.2-64.0.9": { + "expectedApplications": 0, + "rules": [] + } diff --git a/ci-fixtures/tools/minecraft-source-compatibility.json b/ci-fixtures/tools/minecraft-source-compatibility.json index 4d6c9e88a..0901331f0 100644 --- a/ci-fixtures/tools/minecraft-source-compatibility.json +++ b/ci-fixtures/tools/minecraft-source-compatibility.json @@ -1,7 +1,7 @@ { "schema": 1, "targets": { - "net.minecraftforge:forge:1.21.11-61.1.0": { + "net.minecraftforge:forge:26.1.2-64.0.9": { "expectedApplications": 0, "rules": [] } diff --git a/docs/COMPATIBILITY.md b/docs/COMPATIBILITY.md index d83e52bf7..50fa1e123 100644 --- a/docs/COMPATIBILITY.md +++ b/docs/COMPATIBILITY.md @@ -1,10 +1,13 @@ # Optional compatibility -Base Metals' permanent public contract is data-driven. Recipes consume Forge -tags for ingots, nuggets, ores, storage blocks, dusts, small dusts, blends, +Base Metals' permanent public contract is data-driven. The current `c:` common +tags and the retained `forge:` aliases cover ingots, nuggets, ores, storage blocks, dusts, small dusts, blends, plates, rods, gears, casings, dense plates, crushed and purified ores, crystals, shards, clumps, dirty dusts, and molten fluids. +Both names lead to the same material entries. Existing recipes using the old +Forge names still work, while other mods can use the current common tags. + Adamantite, Adamantium, Adamant, Quicksilver, and steel-sprocket names are forwarding tags. Copper-consuming recipes accept `forge:ingots/copper`. Copper ingots, nuggets, tools, armour, horse armour, bars, storage blocks, doors, @@ -20,7 +23,7 @@ recycling recipes also accept the appropriate vanilla equivalent. The tags and existing integration data for Mekanism, Thermal, Tinkers' Construct and Ender IO remain available for future compatibility work. Their Java API hooks -and runtime jars are not included in this Forge 1.21.11 port. Do not substitute +and runtime jars are not included in this Forge 26.1.2 port. Do not substitute jars made for older Minecraft versions or NeoForge. Other processors can use the shared Forge tags without a direct Java integration. diff --git a/docs/MIGRATION.md b/docs/MIGRATION.md index bd944f13c..09d110c5a 100644 --- a/docs/MIGRATION.md +++ b/docs/MIGRATION.md @@ -2,7 +2,7 @@ Always upgrade a copy and retain the original legacy world. Install Base Metals 3.1.1 and OreSpawn 4.1.0, but do not carry MMDLib, Additional Loot Tables, the -OreSpawn 3 plugin, or the old native fallback generator into the 1.21.11 instance. +OreSpawn 3 plugin, or the old native fallback generator into the 26.1.2 instance. Minecraft's data fixer cannot identify third-party numeric block IDs from before the 1.13 flattening. Base Metals snapshots those positions, runs @@ -126,8 +126,8 @@ Modern worlds do not need the old numeric-ID conversion. Base Metals only runs it after confirming an older source save. A leftover `level.dat_old` does not replace the current player or turn on legacy terrain protection. -For a genuine upgrade, the original single-player record is captured before -Minecraft reads it. The world-local migration sidecar keeps the source version +For a genuine upgrade, legacy inventories are normalized before Minecraft moves +the player files and converts their item data. The world-local migration sidecar keeps the source version and saved registry map for reloads and chunks opened later; it does not store a player record. A saved registry map from an earlier upgrade takes precedence over an older backup. @@ -135,3 +135,19 @@ over an older backup. Chunk reading uses Minecraft's supported region formats. Empty region files are left alone, and backups include external chunk files when their region needs conversion. + +## Minecraft 26.1 storage changes + +Minecraft moves default dimensions into `dimensions/minecraft` and player files +into `players/data`. Base Metals prepares legacy items before that move, rather +than restoring an older player record afterward. Current player data and an +existing native capability file always take precedence over older copies. + +Older Forge world-capability files are copied into the new namespaced location +when the current world metadata confirms an upgrade from the previous storage +format. The source files are kept for recovery. A modern world with leftover +old files does not activate this step. + +If an older single-player save has its player only in `level.dat`, Base Metals +preserves a separate player file before Minecraft converts the folders. An +existing player file always wins; a stale backup cannot restore an older player. diff --git a/docs/VERSIONS.md b/docs/VERSIONS.md index 04a6d99b7..15887a0e4 100644 --- a/docs/VERSIONS.md +++ b/docs/VERSIONS.md @@ -1,22 +1,22 @@ # Supported versions -Base Metals `3.1.1.121111` targets Minecraft 1.21.11, Forge 61.1.0 and Java 21. -Packaged client, server and save-upgrade checks also pass on Forge 61.2.4. -OreSpawn `4.1.0.121111` is the exact build and test dependency. Clients and -servers need OreSpawn `[4.1.0.121111,5.0.0)`. +Base Metals `3.1.1.2601021` targets Minecraft 26.1.2, Forge 64.0.9 and Java 25. +Forge 64.1.5 is the additional compatibility target. +OreSpawn `4.1.0.2601021` is the exact build and test dependency. Clients and +servers need OreSpawn `[4.1.0.2601021,5.0.0)`. -The pinned CurseForge artifact is project 245586, file 9268464: -`curse.maven:mmd-orespawn-245586:9268464`. +The pinned CurseForge artifact is project 245586, file 9299079: +`curse.maven:mmd-orespawn-245586:9299079`. Its SHA-256 is -`DE39929057288CEA110196C9E9D708E129B80BC360A2E53976337FFA6A84A67B`. +`6D5CE2017C3314968083D140309E2F1A54BC239AC65C48944C995E9ECF937948`. Release artifacts use Maven coordinate -`zone.moddev.mc.basemetals:BaseMetals:3.1.1.121111`. +`zone.moddev.mc.basemetals:BaseMetals:3.1.1.2601021`. The provider remains schema 3, revision 1. OreSpawn 4.1 is needed for the configuration-screen API; the provider's eleven rule IDs and 1.18 distributions have not changed. -The data pack uses format `94.1`. Forge wraps client mod resources with the -native resource-pack format `75.0`. The resource metadata retains the minor -version rather than rounding the data format down to `94`. +The data pack uses format `101.1`. Forge wraps client mod resources with the +native resource-pack format `84.0`. The resource metadata retains the minor +version rather than rounding the data format down to `101`. diff --git a/docs/WORLDGEN.md b/docs/WORLDGEN.md index a6e565cb5..a6804c651 100644 --- a/docs/WORLDGEN.md +++ b/docs/WORLDGEN.md @@ -1,8 +1,8 @@ # OreSpawn world generation -Base Metals requires OreSpawn `[4.1.0.121111,5.0.0)` and packages provider schema 3, +Base Metals requires OreSpawn `[4.1.0.2601021,5.0.0)` and packages provider schema 3, revision 1 at `data/basemetals/orespawn/provider.json`. Builds and tests use the -published OreSpawn `4.1.0.121111` release. The provider is checked against the +published OreSpawn `4.1.0.2601021` release. The provider is checked against the included 4.1.0 schema. The provider declares ores only: it has no rocks, geomes, biome rules, terrain diff --git a/docs/schemas/orespawn-4.1.0/README.md b/docs/schemas/orespawn-4.1.0/README.md index 7629b7b74..a724e48f9 100644 --- a/docs/schemas/orespawn-4.1.0/README.md +++ b/docs/schemas/orespawn-4.1.0/README.md @@ -1,9 +1,9 @@ # OreSpawn 4.1.0 schemas -These public schemas match OreSpawn 4.1.0.121111. The Base Metals provider +These public schemas match OreSpawn 4.1.0.2601021. The Base Metals provider still uses schema 3 and revision 1; its ore rules have not changed. The build validates the provider against this snapshot. OreSpawn 4.1 is also needed for the Base Metals configuration button in its world-creation screen. -Source: [OreSpawn 4.1.0.121111](https://github.com/MinecraftModDevelopmentMods/OreSpawn/releases/tag/4.1.0.121111). +Source: [OreSpawn 4.1.0.2601021](https://github.com/MinecraftModDevelopmentMods/OreSpawn/releases/tag/4.1.0.2601021). diff --git a/gradle.properties b/gradle.properties index db7f0b26c..e905e3fba 100644 --- a/gradle.properties +++ b/gradle.properties @@ -5,38 +5,38 @@ org.gradle.daemon=false org.gradle.configuration-cache=false org.gradle.caching=true org.gradle.parallel=false -net.minecraftforge.gradle.merge-source-sets=false +net.minecraftforge.gradle.merge-source-sets=true ## Environment Properties # The Minecraft version must agree with the Forge version to get a valid artifact -minecraft_version=1.21.11 +minecraft_version=26.1.2 # The Minecraft version range can use any release version of Minecraft as bounds. # Snapshots, pre-releases, and release candidates are not guaranteed to sort properly # as they do not follow standard versioning conventions. -minecraft_version_range=[1.21.11,1.22) +minecraft_version_range=[26.1.2,26.2) # The Forge version must agree with the Minecraft version to get a valid artifact -forge_version=61.1.0 -forge_installer_sha256=8BD1724EAEAF26F51DACFB7FDC46D79E9B640705B70D5F0019ED38907145EB48 +forge_version=64.0.9 +forge_installer_sha256=608BC9F028A0EF8DCD1A49C6EB85DDFCFA3B3BCD8AE27FC1B2AE02888ED8CB0A # Release metadata consumed by the generic dispatcher. loader_name=forge loader_code=1 -java_version=21 -java_toolchain_version=21.0.7+6 -gradle_java_version=21 +java_version=25 +java_toolchain_version=25.0.3+9 +gradle_java_version=25 curseforge_project_id=240967 # Exact released OreSpawn used for development and qualification. Runtime # metadata intentionally remains compatible with supported OreSpawn 4 builds. -orespawn_version=4.1.0.121111 +orespawn_version=4.1.0.2601021 orespawn_curse_project_id=245586 -orespawn_curse_file_id=9268464 -orespawn_sha256=DE39929057288CEA110196C9E9D708E129B80BC360A2E53976337FFA6A84A67B +orespawn_curse_file_id=9299079 +orespawn_sha256=6D5CE2017C3314968083D140309E2F1A54BC239AC65C48944C995E9ECF937948 # The Forge version range can use any version of Forge as bounds or match the loader version range -forge_version_range=[61.1.0,62) +forge_version_range=[64.0.9,65) # The loader version range can only use the major version of Forge/FML as bounds -loader_version_range=[61,62) +loader_version_range=[64,65) # The mapping channel to use for mappings. # The default set of supported mapping channels are ["official", "snapshot", "snapshot_nodoc", "stable", "stable_nodoc"]. # Additional mapping channels can be registered through the "channelProviders" extension in a Gradle plugin. @@ -54,7 +54,7 @@ loader_version_range=[61,62) mapping_channel=official # The mapping version to query from the mapping channel. # This must match the format required by the mapping channel. -mapping_version=1.21.11 +mapping_version=26.1.2 ## Mod Properties @@ -67,7 +67,7 @@ mod_name=Base Metals # The license of the mod. Review your options at https://choosealicense.com/. All Rights Reserved is the default. mod_license=LGPL-2.1 # The mod version. See https://semver.org/ -mod_version=3.1.1.121111 +mod_version=3.1.1.2601021 # The group ID for the mod. It is only important when publishing as an artifact to a Maven repository. # This should match the base package used for the mod sources. # See https://maven.apache.org/guides/mini/guide-naming-conventions.html @@ -77,7 +77,7 @@ mod_authors=Cyanobacterium, jriwanek, dshadowwolf, GetDizzy611, SkyBlade1978, th # The description of the mod. This is a simple multiline text string that is used for display purposes in the mod list. mod_description=Adds historically common metals, fantasy metals, alloys, tools, armour, and OreSpawn-powered deposits. -# Forge 61 uses official runtime names. +# Forge 64 uses official runtime names. reobf=false -mcp_version=20251223.124241 -java_setup_version=21.0.7+6.0.LTS +mcp_version=20260409.101008 +java_setup_version=25.0.3+9.0.LTS diff --git a/gradle/README.md b/gradle/README.md index 977083dfa..5de5afe6a 100644 --- a/gradle/README.md +++ b/gradle/README.md @@ -13,6 +13,7 @@ the remaining build concerns small enough to review independently. - `ide/eclipse.gradle` normalizes ForgeGradle's Eclipse launches and checks that production runs cannot see validation-only code. - `ide/intellij.gradle` generates Gradle-backed client and server configurations. +- `ide/merged-output.gradle` stages compiled classes before merging Forge's mod output. Applied-script order is intentional. Artifact setup publishes an immutable `baseMetalsRelease` map consumed by publishing and packaged-runtime checks. @@ -31,13 +32,13 @@ flower, sapling and leaf tags include suitable new plants. Normal client and server launches load only Base Metals and OreSpawn. The optional-mod profile has its own run folder, but no optional integration mods -are pinned for Forge 1.21.11. The Mekanism, Tinkers, Thermal and Ender IO Java +are pinned for Forge 26.1.2. The Mekanism, Tinkers, Thermal and Ender IO Java integrations are not enabled here; their dormant data remains available for future integration work. -Filled buckets use three atlas aliases from the vanilla bucket and Forge masks. -They keep the bucket and molten fluid on the block atlas without copying those -textures, so resource packs can still replace them. +Filled buckets use item-atlas aliases for the vanilla bucket, Forge masks and +molten fluids. The fluid blocks keep their own block-atlas sprites. Neither +path copies the textures, so resource packs can still replace them. Run `prepareEclipse` after importing the project or refreshing Gradle. It generates the launches, copies processed resources and checks that ordinary diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle index ef3387683..4da004036 100644 --- a/gradle/dependencies.gradle +++ b/gradle/dependencies.gradle @@ -54,12 +54,12 @@ dependencies { implementation minecraft.dependency("net.minecraftforge:forge:${minecraft_version}-${forge_version}") // OreSpawn remains an ordinary hard mod dependency in metadata and is - // never shaded into Base Metals. Use the published 1.21.11 release in + // never shaded into Base Metals. Use the published 26.1.2 release in // development so clean checkouts exercise the same artifact as players. implementation "curse.maven:mmd-orespawn-${orespawn_curse_project_id}:${orespawn_curse_file_id}" orespawnRelease "curse.maven:mmd-orespawn-${orespawn_curse_project_id}:${orespawn_curse_file_id}" - // Optional Java integrations are not enabled in this Forge 1.21.11 port. + // Optional Java integrations are not enabled in this Forge 26.1.2 port. testImplementation platform('org.junit:junit-bom:5.10.2') testImplementation 'org.junit.jupiter:junit-jupiter' testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.10.2' diff --git a/gradle/ide/eclipse.gradle b/gradle/ide/eclipse.gradle index e7442b776..fe1025132 100644 --- a/gradle/ide/eclipse.gradle +++ b/gradle/ide/eclipse.gradle @@ -5,13 +5,31 @@ import groovy.xml.XmlUtil def eclipseWorkspaceProjectName = projectDir.name // ForgeGradle 7 Eclipse launches are normalized after generation: they use the -// configured Gradle cache and Java 21, load only bin/main, and exclude all unit, +// configured Gradle cache and Java 25, load only bin/main, and exclude all unit, // GameTest, integrated-smoke, and upgrade-smoke code from production launches. eclipse { classpath { downloadSources = true downloadJavadoc = true + defaultOutputDir = file('bin/default') file.whenMerged { classpath -> + classpath.entries.findAll { it instanceof org.gradle.plugins.ide.eclipse.model.Output }.each { + it.path = 'bin/default' + } + classpath.entries.removeAll { entry -> + entry instanceof org.gradle.plugins.ide.eclipse.model.SourceFolder + && entry.path in ['src/main/resources', 'src/generated/resources'] + } + String processedPath = relativePath(sourceSets.main.output.resourcesDir).replace('\\', '/') + if (!classpath.entries.any { it.path == processedPath }) { + classpath.entries.add(new org.gradle.plugins.ide.eclipse.model.SourceFolder(processedPath, 'bin/main')) + } + classpath.entries.findAll { + it instanceof org.gradle.plugins.ide.eclipse.model.SourceFolder + }.each { entry -> + entry.output = entry.path == 'src/main/java' || entry.path == processedPath + ? 'bin/main' : "bin/${entry.path.split('/')[1]}" + } classpath.entries.findAll { entry -> String path = entry.path?.replace('\\', '/') ?: '' path.startsWith('src/test/') || path.startsWith('src/gametest/') @@ -73,7 +91,7 @@ def verifyDevelopmentRunProfiles = tasks.register('verifyDevelopmentRunProfiles' || optionalDevelopmentArtifacts.any { expected -> !optionalClient.classpath.files.any { it.name.contains("${expected.module}-${expected.file}") } }) { - throw new GradleException('The optional client must load the pinned 1.21.11 dependencies') + throw new GradleException('The optional client must load the pinned 26.1.2 dependencies') } } } @@ -110,10 +128,9 @@ def syncForgeEclipseLaunches = tasks.register('syncForgeEclipseLaunches') { '' ].join('\r\n'), 'UTF-8') - File processedResources = layout.buildDirectory.dir('resources/main').get().asFile copy { - from processedResources - from sourceSets.main.output.classesDirs + from sourceSets.main.output + duplicatesStrategy = DuplicatesStrategy.EXCLUDE into mainOutput } ['Client', 'Server', 'OptionalModsClient'].each { String runName -> @@ -306,7 +323,7 @@ def verifyEclipseProductionClasspath = tasks.register('verifyEclipseProductionCl } } - File processed = layout.buildDirectory.dir('resources/main').get().asFile + File processed = sourceSets.main.output.resourcesDir ['META-INF/mods.toml', 'data/basemetals/orespawn/provider.json', 'data/basemetals/recipe/stone_crackhammer.json'].each { name -> File expected = new File(processed, name) @@ -317,7 +334,7 @@ def verifyEclipseProductionClasspath = tasks.register('verifyEclipseProductionCl } } String metadata = new File(projectDir, 'bin/main/META-INF/mods.toml').getText('UTF-8') - if (metadata.contains('${') || !metadata.contains('version="3.1.1.121111"')) { + if (metadata.contains('${') || !metadata.contains('version="3.1.1.2601021"')) { throw new GradleException('Eclipse output contains unresolved or invalid Base Metals version metadata') } } diff --git a/gradle/ide/merged-output.gradle b/gradle/ide/merged-output.gradle new file mode 100644 index 000000000..97b1d15b3 --- /dev/null +++ b/gradle/ide/merged-output.gradle @@ -0,0 +1,19 @@ +// Compile away from Forge's merged resource root so either task can clean its output safely. +sourceSets.configureEach { sourceSet -> + def compiledClasses = layout.buildDirectory.dir("compiled-classes/${sourceSet.name}") + tasks.named(sourceSet.compileJavaTaskName, JavaCompile).configure { + destinationDirectory.set(compiledClasses) + } + + def mergeClasses = tasks.register("merge${sourceSet.name.capitalize()}Classes") { + dependsOn tasks.named(sourceSet.compileJavaTaskName) + dependsOn tasks.named(sourceSet.processResourcesTaskName) + doLast { + copy { + from compiledClasses + into sourceSet.output.resourcesDir + } + } + } + tasks.named(sourceSet.classesTaskName).configure { dependsOn mergeClasses } +} diff --git a/gradle/release/artifacts.gradle b/gradle/release/artifacts.gradle index 83ddede2b..7911fecab 100644 --- a/gradle/release/artifacts.gradle +++ b/gradle/release/artifacts.gradle @@ -60,7 +60,7 @@ tasks.named('jar', Jar) { 'Implementation-Title' : 'Base Metals', 'Implementation-Version': project.version, 'Implementation-Vendor' : project.mod_authors, - 'Built-On-Java' : '21', + 'Built-On-Java' : '25', 'Built-On' : "${project.minecraft_version}-${project.forge_version}", 'Build-Target' : "minecraft-${project.minecraft_version}-${project.loader_name}-${project.forge_version}-java-${project.java_version}" ]) @@ -150,14 +150,14 @@ def configuredOreSpawnIdentity = [ sha256: project.orespawn_sha256.toString() ] -tasks.register('verifyJava21Toolchain') { +tasks.register('verifyJava25Toolchain') { group = 'verification' description = 'Verifies the exact Java product toolchain used for Base Metals compilation.' dependsOn tasks.named('compileJava') doLast { def metadata = tasks.named('compileJava', JavaCompile).get().javaCompiler.get().metadata - if (configuredJavaToolchainVersion != '21.0.7+6' - || metadata.languageVersion.asInt() != 21 + if (configuredJavaToolchainVersion != '25.0.3+9' + || metadata.languageVersion.asInt() != 25 || !(metadata.jvmVersion in [configuredJavaToolchainVersion, configuredJavaToolchainVersion + '-LTS']) || !metadata.vendor.toString().toLowerCase(Locale.ROOT).contains('temurin')) { throw new GradleException("Expected Eclipse Temurin ${configuredJavaToolchainVersion}, found " + @@ -184,7 +184,7 @@ tasks.register('verifyMavenCoordinates') { tasks.register('verifyMavenizerCompatibilityFixture') { group = 'verification' - description = 'Verifies the checksum-sealed Forge 1.21.11 Mavenizer compatibility fixture.' + description = 'Verifies the checksum-sealed Forge 26.1.2 Mavenizer compatibility fixture.' inputs.file project.ext.mavenizerCompatibilityJar doLast { File fixture = project.ext.mavenizerCompatibilityJar.asFile @@ -198,23 +198,23 @@ tasks.register('verifyMavenizerCompatibilityFixture') { tasks.register('verifyReleaseConfiguration') { group = 'verification' - description = 'Verifies the exact Base Metals 1.21.11 release identity.' + description = 'Verifies the exact Base Metals 26.1.2 release identity.' dependsOn tasks.named('verifyMavenizerCompatibilityFixture') - dependsOn tasks.named('verifyJava21Toolchain') + dependsOn tasks.named('verifyJava25Toolchain') doLast { - if (configuredReleaseIdentity.modVersion != '3.1.1.121111' + if (configuredReleaseIdentity.modVersion != '3.1.1.2601021' || configuredReleaseIdentity.modGroup != expectedMavenGroup - || configuredReleaseIdentity.minecraftVersion != '1.21.11' - || configuredReleaseIdentity.forgeVersion != '61.1.0' - || configuredReleaseIdentity.forgeInstallerSha256 != '8BD1724EAEAF26F51DACFB7FDC46D79E9B640705B70D5F0019ED38907145EB48' + || configuredReleaseIdentity.minecraftVersion != '26.1.2' + || configuredReleaseIdentity.forgeVersion != '64.0.9' + || configuredReleaseIdentity.forgeInstallerSha256 != '608BC9F028A0EF8DCD1A49C6EB85DDFCFA3B3BCD8AE27FC1B2AE02888ED8CB0A' || configuredReleaseIdentity.mappingChannel != 'official' - || configuredReleaseIdentity.mappingVersion != '1.21.11' + || configuredReleaseIdentity.mappingVersion != '26.1.2' || configuredReleaseIdentity.loaderName != 'forge' || configuredReleaseIdentity.loaderCode != '1' - || configuredReleaseIdentity.javaVersion != '21' - || configuredReleaseIdentity.gradleJavaVersion != '21' + || configuredReleaseIdentity.javaVersion != '25' + || configuredReleaseIdentity.gradleJavaVersion != '25' || configuredReleaseIdentity.curseForgeProjectId != '240967') { - throw new GradleException('Unexpected Base Metals 1.21.11 release identity') + throw new GradleException('Unexpected Base Metals 26.1.2 release identity') } } } @@ -223,10 +223,10 @@ tasks.register('verifyReleaseDependencies') { group = 'verification' description = 'Resolves and verifies the exact released OreSpawn qualification dependency.' doLast { - if (configuredOreSpawnIdentity.version != '4.1.0.121111' + if (configuredOreSpawnIdentity.version != '4.1.0.2601021' || configuredOreSpawnIdentity.curseProjectId != '245586' - || configuredOreSpawnIdentity.curseFileId != '9268464' - || configuredOreSpawnIdentity.sha256 != 'DE39929057288CEA110196C9E9D708E129B80BC360A2E53976337FFA6A84A67B') { + || configuredOreSpawnIdentity.curseFileId != '9299079' + || configuredOreSpawnIdentity.sha256 != '6D5CE2017C3314968083D140309E2F1A54BC239AC65C48944C995E9ECF937948') { throw new GradleException('Unexpected OreSpawn release coordinates') } File artifact = configurations.orespawnRelease.resolvedConfiguration.resolvedArtifacts @@ -294,7 +294,7 @@ tasks.register('verifyReleaseArtifacts') { new DataInputStream(zip.getInputStream(entry)).withCloseable { input -> if (input.readInt() != (int) 0xCAFEBABE) throw new GradleException("Invalid class: ${entry.name}") input.readUnsignedShort() - if (input.readUnsignedShort() != 65) throw new GradleException("Class is not Java 21: ${entry.name}") + if (input.readUnsignedShort() != 69) throw new GradleException("Class is not Java 25: ${entry.name}") } } def names = zip.entries().toList().collect { it.name } as Set @@ -320,14 +320,14 @@ tasks.register('verifyReleaseArtifacts') { if (manifest.mainAttributes.getValue('Maven-Artifact') != expectedMavenCoordinate) { throw new GradleException('Release manifest contains the wrong Maven coordinate') } - String expectedBuildTarget = 'minecraft-1.21.11-forge-61.1.0-java-21' + String expectedBuildTarget = 'minecraft-26.1.2-forge-64.0.9-java-25' if (manifest.mainAttributes.getValue('Build-Target') != expectedBuildTarget) { throw new GradleException('Release manifest contains the wrong stable build target') } String modsToml = zip.getInputStream(zip.getEntry('META-INF/mods.toml')).getText('UTF-8') if (modsToml.contains('${') - || !modsToml.contains('version="3.1.1.121111"') - || !modsToml.contains('versionRange="[4.1.0.121111,5.0.0)"')) { + || !modsToml.contains('version="3.1.1.2601021"') + || !modsToml.contains('versionRange="[4.1.0.2601021,5.0.0)"')) { throw new GradleException('Release mods.toml contains unresolved or incompatible metadata') } def provider = new JsonSlurper().parse(zip.getInputStream( diff --git a/gradle/verification/packaged-runtime.gradle b/gradle/verification/packaged-runtime.gradle index ad9aa2aa4..5e353283f 100644 --- a/gradle/verification/packaged-runtime.gradle +++ b/gradle/verification/packaged-runtime.gradle @@ -6,8 +6,8 @@ def releaseJar = release.releaseJar def packagedServerSmokeProbe = release.packagedServerSmokeProbe def packagedClientSmokeProbe = release.packagedClientSmokeProbe -def java21Launcher = javaToolchains.launcherFor { - languageVersion = JavaLanguageVersion.of(21) +def java25Launcher = javaToolchains.launcherFor { + languageVersion = JavaLanguageVersion.of(25) vendor = JvmVendorSpec.ADOPTIUM } @@ -134,8 +134,8 @@ def packagedServerStartupSmoke = tasks.register('packagedServerStartupSmoke', Ex doFirst { File runtime = requireRuntimeDirectory(packagedForgeServerRuntime, 'packagedForgeServerRuntime') File libraries = new File(runtime, 'libraries') - File forgeDirectory = new File(libraries, 'net/minecraftforge/forge/1.21.11-61.1.0') - File launcher = new File(forgeDirectory, 'forge-1.21.11-61.1.0-server.jar') + File forgeDirectory = new File(libraries, 'net/minecraftforge/forge/26.1.2-64.0.9') + File launcher = new File(forgeDirectory, 'forge-26.1.2-64.0.9-server.jar') File sourceArguments = new File(forgeDirectory, System.getProperty('os.name').toLowerCase(Locale.ROOT).contains('windows') ? 'win_args.txt' : 'unix_args.txt') @@ -165,7 +165,7 @@ def packagedServerStartupSmoke = tasks.register('packagedServerStartupSmoke', Ex } } workingDir runDirectory - commandLine java21Launcher.get().executablePath.asFile.absolutePath, + commandLine java25Launcher.get().executablePath.asFile.absolutePath, '-Xms512m', '-Xmx2g', "@${absoluteArguments.absolutePath}", 'nogui' } doLast { @@ -174,9 +174,9 @@ def packagedServerStartupSmoke = tasks.register('packagedServerStartupSmoke', Ex if (!marker.isFile()) throw new GradleException('Packaged dedicated-server completion marker is missing') Properties values = new Properties() marker.withInputStream { values.load(it) } - if (values.getProperty('basemetals') != '3.1.1.121111' - || values.getProperty('orespawn') != '4.1.0.121111' - || values.getProperty('forge') != '61.1.0') { + if (values.getProperty('basemetals') != '3.1.1.2601021' + || values.getProperty('orespawn') != '4.1.0.2601021' + || values.getProperty('forge') != '64.0.9') { throw new GradleException("Packaged dedicated-server versions are wrong: ${values}") } verifyPackagedLog(runDirectory, 'BASEMETALS_PACKAGED_SERVER_SMOKE PASS', @@ -219,7 +219,7 @@ def preparePackagedClientSmoke = tasks.register('preparePackagedClientSmoke') { File hostPack = new File(runDirectory, 'resourcepacks/basemetals-host-test') File texture = new File(hostPack, 'assets/minecraft/textures/block/stone.png') texture.parentFile.mkdirs() - new java.util.zip.ZipFile(new File(runtime, 'versions/1.21.11/1.21.11.jar')).withCloseable { zip -> + new java.util.zip.ZipFile(new File(runtime, 'versions/26.1.2/26.1.2.jar')).withCloseable { zip -> texture.bytes = zip.getInputStream(zip.getEntry('assets/minecraft/textures/block/dirt.png')).bytes } new File(hostPack, 'pack.mcmeta').setText( @@ -243,13 +243,13 @@ def packagedClientStartupSmoke = tasks.register('packagedClientStartupSmoke', Ex dependsOn preparePackagedClientSmoke doFirst { File runtime = requireRuntimeDirectory(packagedForgeClientRuntime, 'packagedForgeClientRuntime') - String forgeVersionId = ['1.21.11-forge-61.1.0', 'forge-61.1.0'].find { candidate -> + String forgeVersionId = ['26.1.2-forge-64.0.9', 'forge-64.0.9'].find { candidate -> new File(runtime, "versions/${candidate}/${candidate}.json").isFile() } - if (forgeVersionId == null) throw new GradleException('Official client runtime has no Forge 61.1.0 profile') + if (forgeVersionId == null) throw new GradleException('Official client runtime has no Forge 64.0.9 profile') File forgeJsonFile = new File(runtime, "versions/${forgeVersionId}/${forgeVersionId}.json") - File baseJsonFile = new File(runtime, 'versions/1.21.11/1.21.11.json') - File baseJar = new File(runtime, 'versions/1.21.11/1.21.11.jar') + File baseJsonFile = new File(runtime, 'versions/26.1.2/26.1.2.json') + File baseJar = new File(runtime, 'versions/26.1.2/26.1.2.jar') File nativesDirectory = new File(runtime, "natives/${forgeVersionId}") [forgeJsonFile, baseJsonFile, baseJar, new File(runtime, 'libraries'), new File(runtime, 'assets'), nativesDirectory].each { @@ -312,7 +312,7 @@ def packagedClientStartupSmoke = tasks.register('packagedClientStartupSmoke', Ex File runDirectory = packagedClientRunDirectory.get().asFile workingDir runDirectory File clientJava = packagedClientJavaExecutable.isPresent() - ? file(packagedClientJavaExecutable.get()) : java21Launcher.get().executablePath.asFile + ? file(packagedClientJavaExecutable.get()) : java25Launcher.get().executablePath.asFile if (!clientJava.isFile()) { throw new GradleException("packagedClientJavaExecutable does not name a Java executable: ${clientJava}") } diff --git a/src/dataGenerator/java/zone/moddev/mc/basemetals/data/BMBlockStateProvider.java b/src/dataGenerator/java/zone/moddev/mc/basemetals/data/BMBlockStateProvider.java index 4e76b1885..456341f19 100644 --- a/src/dataGenerator/java/zone/moddev/mc/basemetals/data/BMBlockStateProvider.java +++ b/src/dataGenerator/java/zone/moddev/mc/basemetals/data/BMBlockStateProvider.java @@ -86,8 +86,10 @@ private static JsonObject cube(float from, float to, String texture) { } JsonObject faces = new JsonObject(); + JsonArray uv = new JsonArray(); + for (int coordinate : new int[] {0, 0, 16, 16}) uv.add(coordinate); for (String direction : List.of("down", "up", "north", "south", "west", "east")) { - faces.add(direction, object("texture", texture, "cullface", direction)); + faces.add(direction, object("texture", texture, "cullface", direction, "uv", uv)); } return object("from", start, "to", end, "faces", faces); diff --git a/src/dataGenerator/java/zone/moddev/mc/basemetals/data/BaseMetalsDataGenerators.java b/src/dataGenerator/java/zone/moddev/mc/basemetals/data/BaseMetalsDataGenerators.java index a741b2b55..646d4fc95 100644 --- a/src/dataGenerator/java/zone/moddev/mc/basemetals/data/BaseMetalsDataGenerators.java +++ b/src/dataGenerator/java/zone/moddev/mc/basemetals/data/BaseMetalsDataGenerators.java @@ -43,6 +43,9 @@ public static void gather(GatherDataEvent event) { generator.addProvider(true, new BaseMetalsDataGenerators(generator.getPackOutput())); } generator.addProvider(true, new GeneratedData(generator.getPackOutput())); + if (event.includeServer()) { + generator.addProvider(true, new SmithTradeProvider(generator.getPackOutput())); + } } @Override @@ -160,12 +163,12 @@ private void writeItemAssets(CachedOutput cache) throws IOException { if (id.endsWith("_bucket")) { String fluidName = id.substring(0, id.length() - 7); - // Keep the bucket and its fluid on one atlas. The aliases still use resource-pack textures. + // The bucket and fluid share the item atlas; aliases still follow resource packs. save(cache, object("parent", "forge:item/bucket", "fluid", "basemetals:" + fluidName, "loader", "forge:fluid_container", "textures", object( - "base", "basemetals:block/bucket_base", - "fluid", "basemetals:block/bucket_fluid", - "cover", "basemetals:block/bucket_cover", + "base", "basemetals:item/bucket_base", + "fluid", "basemetals:item/bucket_fluid", + "cover", "basemetals:item/bucket_cover", "particle", "#base")), "models/item/" + id + ".json"); int colour = ((MetalFluidType) ModContent.fluids().get(fluidName) .source().get().getFluidType()).colour(); diff --git a/src/dataGenerator/java/zone/moddev/mc/basemetals/data/GeneratedData.java b/src/dataGenerator/java/zone/moddev/mc/basemetals/data/GeneratedData.java index b2eb923fe..7d1169432 100644 --- a/src/dataGenerator/java/zone/moddev/mc/basemetals/data/GeneratedData.java +++ b/src/dataGenerator/java/zone/moddev/mc/basemetals/data/GeneratedData.java @@ -82,6 +82,7 @@ public java.util.concurrent.CompletableFuture run(CachedOutput cache) { writeFluidBlockstates(cache); writeLoot(cache); writeTags(cache); + writeCommonTagAliases(cache); writeRecipes(cache); writeRawProcessing(cache); writeTinkersMaterials(cache); @@ -294,14 +295,20 @@ private void writeEnchantmentTags(CachedOutput cache) throws IOException { addAggregate(families, "enchantable/bow", name); } if (item instanceof FishingRodItem) addAggregate(families, "enchantable/fishing", name); - if (item.getDefaultInstance().isDamageableItem()) addAggregate(families, "enchantable/durability", name); + var form = zone.moddev.mc.basemetals.config.MaterialForm.fromPath(id); + boolean damageable = switch (form) { + case AXE, BOOTS, BOW, CHESTPLATE, CRACKHAMMER, CROSSBOW, FISHING_ROD, + HELMET, HOE, LEGGINGS, PICKAXE, SCYTHE, SHEARS, SHIELD, SHOVEL, SWORD -> true; + default -> false; + }; + if (damageable) addAggregate(families, "enchantable/durability", name); if (item instanceof zone.moddev.mc.basemetals.content.MaterialItems.Armor) { - String family = switch (item.components().get(net.minecraft.core.component.DataComponents.EQUIPPABLE).slot()) { - case HEAD -> "head_armor"; - case CHEST -> "chest_armor"; - case LEGS -> "leg_armor"; - case FEET -> "foot_armor"; + String family = switch (form) { + case HELMET -> "head_armor"; + case CHESTPLATE -> "chest_armor"; + case LEGGINGS -> "leg_armor"; + case BOOTS -> "foot_armor"; default -> null; }; if (family != null) addAggregate(families, family, name); @@ -1614,7 +1621,7 @@ private void writeManifest(CachedOutput cache) throws IOException { JsonObject root = new JsonObject(); root.addProperty("format", 1); - root.addProperty("source", "Base Metals 1.21.11 catalogue"); + root.addProperty("source", "Base Metals 26.1.2 catalogue"); root.add("blocks", array(blocks)); root.add("items", array(items)); root.add("fluids", array(ModContent.fluids().keySet().stream().flatMap(id -> @@ -1664,8 +1671,36 @@ private void tag(CachedOutput cache, String namespace, String path, List JsonObject root = new JsonObject(); root.addProperty("replace", false); - root.add("values", array(List.copyOf(compatible))); - save(cache, root, "data/" + namespace + "/tags/" + path + ".json"); + if (namespace.equals("forge")) { + root.add("values", array(compatible.stream().map(value -> + value.startsWith("#forge:") ? "#c:" + value.substring(7) : value).toList())); + save(cache, root, "data/c/tags/" + path + ".json"); + save(cache, object("replace", false, "values", array(List.of("#c:" + path.substring(path.indexOf('/') + 1)))), + "data/forge/tags/" + path + ".json"); + } else { + root.add("values", array(List.copyOf(compatible))); + save(cache, root, "data/" + namespace + "/tags/" + path + ".json"); + } + } + + private void writeCommonTagAliases(CachedOutput cache) throws IOException { + for (String path : List.of("rods/wooden", "ores/netherite_scrap", "storage_blocks/coal", "ores/coal", + "gems/diamond", "ores/diamond", "gems/emerald", "ores/emerald", "nuggets/gold", "ingots/gold", + "ores/gold", "nuggets/iron", "ingots/iron", "ores/iron", "storage_blocks/lapis", "ores/lapis", + "gems/quartz", "ores/quartz", "storage_blocks/redstone", "ores/redstone")) { + save(cache, object("replace", false, "values", array(List.of("#c:" + path))), + "data/forge/tags/item/" + path + ".json"); + if (path.startsWith("ores/") || path.startsWith("storage_blocks/")) { + save(cache, object("replace", false, "values", array(List.of("#c:" + path))), + "data/forge/tags/block/" + path + ".json"); + } + } + for (String kind : List.of("item", "block")) { + for (var alias : Map.of("cobblestone", "cobblestones", "gravel", "gravels", "stone", "stones").entrySet()) { + save(cache, object("replace", false, "values", array(List.of("#c:" + alias.getValue()))), + "data/forge/tags/" + kind + "/" + alias.getKey() + ".json"); + } + } } private void uncheckedTag(CachedOutput cache, String namespace, String path, List values) { try { tag(cache, namespace, path, values); } catch (IOException e) { throw new RuntimeException(e); } diff --git a/src/dataGenerator/java/zone/moddev/mc/basemetals/data/SmithTradeProvider.java b/src/dataGenerator/java/zone/moddev/mc/basemetals/data/SmithTradeProvider.java new file mode 100644 index 000000000..312c900e8 --- /dev/null +++ b/src/dataGenerator/java/zone/moddev/mc/basemetals/data/SmithTradeProvider.java @@ -0,0 +1,65 @@ +package zone.moddev.mc.basemetals.data; + +import java.nio.file.Path; +import java.util.ArrayList; +import java.util.LinkedHashMap; +import java.util.Map; +import java.util.concurrent.CompletableFuture; + +import com.google.gson.JsonArray; +import com.google.gson.JsonObject; +import net.minecraft.data.CachedOutput; +import net.minecraft.data.DataProvider; +import net.minecraft.data.PackOutput; +import zone.moddev.mc.basemetals.trade.BaseMetalsTrades; + +import static zone.moddev.mc.basemetals.data.BaseMetalsDataGenerators.object; + +/** Appends Base Metals offers to the vanilla smith trade sets. */ +final class SmithTradeProvider implements DataProvider { + private final Path output; + + SmithTradeProvider(PackOutput output) { + this.output = output.getOutputFolder(); + } + + @Override + public CompletableFuture run(CachedOutput cache) { + var writes = new ArrayList>(); + Map tags = new LinkedHashMap<>(); + + for (var offer : BaseMetalsTrades.offers()) { + JsonObject trade = object( + "wants", object("id", "minecraft:emerald", "count", offer.emeralds()), + "gives", object("id", offer.item(), "count", offer.count()), + "max_uses", offer.enchanted() ? 3 : 6, + "xp", offer.enchanted() ? 15 : 5, + "reputation_discount", 0.2, + "merchant_predicate", object("condition", "basemetals:trade_enabled", "item", offer.item())); + + if (offer.enchanted()) { + JsonArray modifiers = new JsonArray(); + modifiers.add(object("function", "minecraft:enchant_with_levels", + "levels", object("type", "minecraft:uniform", "min", 5, "max", 19), + "options", "#minecraft:on_random_loot", "include_additional_cost_component", true)); + trade.add("given_item_modifiers", modifiers); + } + + writes.add(DataProvider.saveStable(cache, trade, + output.resolve("data/basemetals/villager_trade/" + offer.id() + ".json"))); + tags.computeIfAbsent(offer.profession() + "/level_" + offer.level(), key -> new JsonArray()) + .add("basemetals:" + offer.id()); + } + + tags.forEach((name, entries) -> writes.add(DataProvider.saveStable(cache, + object("replace", false, "values", entries), + output.resolve("data/minecraft/tags/villager_trade/" + name + ".json")))); + + return CompletableFuture.allOf(writes.toArray(CompletableFuture[]::new)); + } + + @Override + public String getName() { + return "Base Metals smith trades"; + } +} diff --git a/src/gametest/java/zone/moddev/mc/basemetals/compat/CompatibilityRecipeGameTests.java b/src/gametest/java/zone/moddev/mc/basemetals/compat/CompatibilityRecipeGameTests.java index 48337cb14..31039013f 100644 --- a/src/gametest/java/zone/moddev/mc/basemetals/compat/CompatibilityRecipeGameTests.java +++ b/src/gametest/java/zone/moddev/mc/basemetals/compat/CompatibilityRecipeGameTests.java @@ -33,7 +33,7 @@ public static void enderIoRecipesLoadWhenInstalled(GameTestHelper helper) { private static void requireRecipeCount(GameTestHelper helper, String modId, String recipeFolder, long expected) { - if (!ModList.get().isLoaded(modId)) { + if (!ModList.isLoaded(modId)) { helper.succeed(); return; } diff --git a/src/gametest/java/zone/moddev/mc/basemetals/content/BaseMetalsGameTests.java b/src/gametest/java/zone/moddev/mc/basemetals/content/BaseMetalsGameTests.java index e736800f6..b2be9fd83 100644 --- a/src/gametest/java/zone/moddev/mc/basemetals/content/BaseMetalsGameTests.java +++ b/src/gametest/java/zone/moddev/mc/basemetals/content/BaseMetalsGameTests.java @@ -60,7 +60,6 @@ import net.minecraft.world.item.context.BlockPlaceContext; import net.minecraft.world.item.context.UseOnContext; import net.minecraft.world.entity.npc.villager.VillagerProfession; -import net.minecraft.world.entity.npc.villager.VillagerTrades.ItemListing; import net.minecraft.world.level.block.Blocks; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.SoundType; @@ -76,7 +75,6 @@ import net.minecraftforge.event.entity.living.LivingHurtEvent; import net.minecraftforge.event.entity.player.PlayerEvent; import net.minecraftforge.event.level.BlockEvent; -import net.minecraftforge.event.village.VillagerTradesEvent; import net.minecraftforge.gametest.GameTestNamespace; import net.minecraftforge.gametest.GameTestDontPrefix; import net.minecraftforge.registries.ForgeRegistries; @@ -274,7 +272,7 @@ public static void stoneCrackhammerCraftsFromTheLegacyMiddleColumnPattern(GameTe require(helper, recipe.orElseThrow().id().identifier().equals( Identifier.fromNamespaceAndPath(BaseMetals.MOD_ID, "stone_crackhammer")), "The legacy stone crackhammer pattern matched the wrong recipe"); - ItemStack output = recipe.orElseThrow().value().assemble(crafting.asCraftInput(), net.minecraft.core.RegistryAccess.EMPTY); + ItemStack output = recipe.orElseThrow().value().assemble(crafting.asCraftInput()); require(helper, output.is(ModContent.item("stone_crackhammer").get()), "The legacy middle-column pattern returned the wrong item"); helper.succeed(); @@ -595,15 +593,39 @@ public static void customAnvilsWearWithoutChangingTheirSavedIdentity(GameTestHel @GameTest(structure = EMPTY) public static void smithsRetainTheLegacyMercuryIngotSale(GameTestHelper helper) { - Int2ObjectOpenHashMap> trades = new Int2ObjectOpenHashMap<>(); - for (int level = 1; level <= 5; level++) trades.put(level, new ArrayList<>()); - BaseMetalsTrades.add(new VillagerTradesEvent(trades, VillagerProfession.ARMORER)); var trader = EntityType.VILLAGER.create(helper.getLevel(), net.minecraft.world.entity.EntitySpawnReason.COMMAND); - boolean found = trades.values().stream().flatMap(List::stream) - .map(listing -> listing.getOffer(helper.getLevel(), trader, net.minecraft.util.RandomSource.create(0L))) - .anyMatch(offer -> offer != null - && offer.getResult().is(ModContent.item("mercury_ingot").get()) - && offer.getResult().getCount() == 12); + var parameters = new net.minecraft.world.level.storage.loot.LootParams.Builder(helper.getLevel()) + .withParameter(net.minecraft.world.level.storage.loot.parameters.LootContextParams.ORIGIN, trader.position()) + .withParameter(net.minecraft.world.level.storage.loot.parameters.LootContextParams.THIS_ENTITY, trader) + .withParameter(net.minecraft.world.level.storage.loot.parameters.LootContextParams.ADDITIONAL_COST_COMPONENT_ALLOWED, + net.minecraft.util.Unit.INSTANCE) + .create(net.minecraft.world.level.storage.loot.parameters.LootContextParamSets.VILLAGER_TRADE); + var context = new net.minecraft.world.level.storage.loot.LootContext.Builder(parameters) + .create(java.util.Optional.empty()); + var trades = helper.getLevel().registryAccess().lookupOrThrow(net.minecraft.core.registries.Registries.VILLAGER_TRADE); + boolean found = false; + + for (var definition : BaseMetalsTrades.offers()) { + var id = Identifier.fromNamespaceAndPath(BaseMetals.MOD_ID, definition.id()); + var trade = trades.getOrThrow(net.minecraft.resources.ResourceKey.create( + net.minecraft.core.registries.Registries.VILLAGER_TRADE, id)).value(); + var offer = trade.getOffer(context); + boolean permitted = zone.moddev.mc.basemetals.config.ContentPolicy.active().allows(definition.item().toString()); + require(helper, (offer != null) == permitted, "Trade policy changed for " + id); + if (offer == null) continue; + + require(helper, ForgeRegistries.ITEMS.getKey(offer.getResult().getItem()).equals(definition.item()) + && offer.getResult().getCount() == definition.count(), "Trade result changed for " + id); + int price = offer.getBaseCostA().getCount(); + require(helper, definition.enchanted() + ? price >= Math.min(64, definition.emeralds() + 5) && price <= Math.min(64, definition.emeralds() + 19) + : price == definition.emeralds(), "Trade price changed for " + id); + require(helper, offer.getMaxUses() == (definition.enchanted() ? 3 : 6) + && offer.getXp() == (definition.enchanted() ? 15 : 5), "Trade use or experience changed for " + id); + if (definition.enchanted()) require(helper, offer.getResult().isEnchanted(), "Trade lost its enchantments: " + id); + + if (definition.id().equals("armorer/mercury_ingot")) found = offer.getResult().getCount() == 12; + } require(helper, found, "Armorer lost the legacy 12-Mercury-ingot sale"); helper.succeed(); } @@ -645,7 +667,7 @@ public static void plateRepairKeepsAllItemDataAndResetsDamage(GameTestHelper hel if (!(recipe.orElseThrow().value() instanceof PlateRepairRecipe repair)) return; require(helper, repair.matches(crafting.asCraftInput(), helper.getLevel()), "Plate-repair recipe rejected a damaged item and matching plate"); - ItemStack output = repair.assemble(crafting.asCraftInput(), net.minecraft.core.RegistryAccess.EMPTY); + ItemStack output = repair.assemble(crafting.asCraftInput()); require(helper, output.is(ModContent.item("adamantine_chestplate").get()), "Plate repair returned the wrong armor item"); require(helper, output.getDamageValue() == 0, "Plate repair did not fully restore durability"); @@ -898,11 +920,11 @@ private static void assertCrushingRecipe(GameTestHelper helper, ItemStack input, var recipe = helper.getLevel().getServer().getRecipeManager().getRecipeFor( CrushingRecipe.TYPE.get(), new net.minecraft.world.item.crafting.SingleRecipeInput(input), helper.getLevel()); require(helper, recipe.isPresent(), "No crushing recipe loaded for " + input); - ItemStack result = recipe.orElseThrow().value().assemble(new net.minecraft.world.item.crafting.SingleRecipeInput(ItemStack.EMPTY), helper.getLevel().registryAccess()); + ItemStack result = recipe.orElseThrow().value().assemble(new net.minecraft.world.item.crafting.SingleRecipeInput(ItemStack.EMPTY)); Identifier expectedId = expectedItem.contains(":") ? Identifier.parse(expectedItem) : Identifier.fromNamespaceAndPath(BaseMetals.MOD_ID, expectedItem); - require(helper, ForgeRegistries.ITEMS.getKey(recipe.orElseThrow().value().assemble(new net.minecraft.world.item.crafting.SingleRecipeInput(ItemStack.EMPTY), helper.getLevel().registryAccess()).getItem()).equals( + require(helper, ForgeRegistries.ITEMS.getKey(recipe.orElseThrow().value().assemble(new net.minecraft.world.item.crafting.SingleRecipeInput(ItemStack.EMPTY)).getItem()).equals( expectedId), input + " crushed to the wrong output"); require(helper, result.getCount() == expectedCount, input + " crushed to " + result.getCount() + " items instead of " + expectedCount); @@ -924,7 +946,7 @@ private static void assertSmeltingRecipe(GameTestHelper helper, ItemStack input, RecipeType.SMELTING, new net.minecraft.world.item.crafting.SingleRecipeInput(input), helper.getLevel()); require(helper, recipe.isPresent(), "No furnace recipe loaded for " + input); if (recipe.isEmpty()) return; - ItemStack result = recipe.orElseThrow().value().assemble(new net.minecraft.world.item.crafting.SingleRecipeInput(ItemStack.EMPTY), helper.getLevel().registryAccess()); + ItemStack result = recipe.orElseThrow().value().assemble(new net.minecraft.world.item.crafting.SingleRecipeInput(ItemStack.EMPTY)); Identifier actualItem = ForgeRegistries.ITEMS.getKey(result.getItem()); require(helper, actualItem.equals(Identifier.parse(expectedItem)), input + " smelted to " + actualItem + " instead of " + expectedItem); @@ -938,7 +960,7 @@ private static void assertSmeltingRecipeInTag(GameTestHelper helper, ItemStack i RecipeType.SMELTING, new net.minecraft.world.item.crafting.SingleRecipeInput(input), helper.getLevel()); require(helper, recipe.isPresent(), "No furnace recipe loaded for " + input); if (recipe.isEmpty()) return; - ItemStack result = recipe.orElseThrow().value().assemble(new net.minecraft.world.item.crafting.SingleRecipeInput(ItemStack.EMPTY), helper.getLevel().registryAccess()); + ItemStack result = recipe.orElseThrow().value().assemble(new net.minecraft.world.item.crafting.SingleRecipeInput(ItemStack.EMPTY)); TagKey tag = TagKey.create( net.minecraft.core.registries.Registries.ITEM, Identifier.parse(expectedTag)); Identifier actualItem = ForgeRegistries.ITEMS.getKey(result.getItem()); diff --git a/src/gametest/java/zone/moddev/mc/basemetals/content/ForwardPortGameTests.java b/src/gametest/java/zone/moddev/mc/basemetals/content/ForwardPortGameTests.java index bb3421ccf..c1f0ff169 100644 --- a/src/gametest/java/zone/moddev/mc/basemetals/content/ForwardPortGameTests.java +++ b/src/gametest/java/zone/moddev/mc/basemetals/content/ForwardPortGameTests.java @@ -122,7 +122,7 @@ public static void vanillaCopperKeepsExistingRecipeChainsUsable(GameTestHelper h var recipe = level.getServer().getRecipeManager().byKey(net.minecraft.resources.ResourceKey.create(net.minecraft.core.registries.Registries.RECIPE, Identifier.fromNamespaceAndPath( BaseMetals.MOD_ID, recipeId))).orElseThrow(); require(helper, ((net.minecraft.world.item.crafting.CraftingRecipe) recipe.value()).assemble( - net.minecraft.world.item.crafting.CraftingInput.EMPTY, level.registryAccess()).is(vanilla), + net.minecraft.world.item.crafting.CraftingInput.EMPTY).is(vanilla), recipeId + " still crafts the old duplicate item"); } @@ -131,7 +131,7 @@ public static void vanillaCopperKeepsExistingRecipeChainsUsable(GameTestHelper h var input = CraftingInput.of(3, 1, List.of(ingot.copy(), ingot.copy(), ingot.copy())); var plate = level.getServer().getRecipeManager().getRecipeFor(RecipeType.CRAFTING, - input, level).orElseThrow().value().assemble(input, level.registryAccess()); + input, level).orElseThrow().value().assemble(input); require(helper, plate.is(ModContent.item("copper_plate").get()) && plate.getCount() == 3, "Copper plate crafting rejected a supported ingot"); } @@ -140,7 +140,7 @@ public static void vanillaCopperKeepsExistingRecipeChainsUsable(GameTestHelper h ModContent.item("copper_trapdoor").get(), 4).entrySet()) { var input = new SingleRecipeInput(entry.getKey().getDefaultInstance()); ItemStack recycled = level.getServer().getRecipeManager().getRecipeFor(RecipeType.SMELTING, - input, level).orElseThrow().value().assemble(input, level.registryAccess()); + input, level).orElseThrow().value().assemble(input); require(helper, recycled.is(Items.COPPER_INGOT) && recycled.getCount() == entry.getValue(), "Copper trapdoor recycling used the wrong material value"); } diff --git a/src/generated/resources/assets/basemetals/models/block/adamantine_ore.json b/src/generated/resources/assets/basemetals/models/block/adamantine_ore.json index 38938b06f..4033b465a 100644 --- a/src/generated/resources/assets/basemetals/models/block/adamantine_ore.json +++ b/src/generated/resources/assets/basemetals/models/block/adamantine_ore.json @@ -5,27 +5,63 @@ "faces": { "down": { "cullface": "down", - "texture": "#base" + "texture": "#base", + "uv": [ + 0, + 0, + 16, + 16 + ] }, "east": { "cullface": "east", - "texture": "#base" + "texture": "#base", + "uv": [ + 0, + 0, + 16, + 16 + ] }, "north": { "cullface": "north", - "texture": "#base" + "texture": "#base", + "uv": [ + 0, + 0, + 16, + 16 + ] }, "south": { "cullface": "south", - "texture": "#base" + "texture": "#base", + "uv": [ + 0, + 0, + 16, + 16 + ] }, "up": { "cullface": "up", - "texture": "#base" + "texture": "#base", + "uv": [ + 0, + 0, + 16, + 16 + ] }, "west": { "cullface": "west", - "texture": "#base" + "texture": "#base", + "uv": [ + 0, + 0, + 16, + 16 + ] } }, "from": [ @@ -43,27 +79,63 @@ "faces": { "down": { "cullface": "down", - "texture": "#overlay" + "texture": "#overlay", + "uv": [ + 0, + 0, + 16, + 16 + ] }, "east": { "cullface": "east", - "texture": "#overlay" + "texture": "#overlay", + "uv": [ + 0, + 0, + 16, + 16 + ] }, "north": { "cullface": "north", - "texture": "#overlay" + "texture": "#overlay", + "uv": [ + 0, + 0, + 16, + 16 + ] }, "south": { "cullface": "south", - "texture": "#overlay" + "texture": "#overlay", + "uv": [ + 0, + 0, + 16, + 16 + ] }, "up": { "cullface": "up", - "texture": "#overlay" + "texture": "#overlay", + "uv": [ + 0, + 0, + 16, + 16 + ] }, "west": { "cullface": "west", - "texture": "#overlay" + "texture": "#overlay", + "uv": [ + 0, + 0, + 16, + 16 + ] } }, "from": [ diff --git a/src/generated/resources/assets/basemetals/models/block/antimony_ore.json b/src/generated/resources/assets/basemetals/models/block/antimony_ore.json index 455751585..24248e7a2 100644 --- a/src/generated/resources/assets/basemetals/models/block/antimony_ore.json +++ b/src/generated/resources/assets/basemetals/models/block/antimony_ore.json @@ -5,27 +5,63 @@ "faces": { "down": { "cullface": "down", - "texture": "#base" + "texture": "#base", + "uv": [ + 0, + 0, + 16, + 16 + ] }, "east": { "cullface": "east", - "texture": "#base" + "texture": "#base", + "uv": [ + 0, + 0, + 16, + 16 + ] }, "north": { "cullface": "north", - "texture": "#base" + "texture": "#base", + "uv": [ + 0, + 0, + 16, + 16 + ] }, "south": { "cullface": "south", - "texture": "#base" + "texture": "#base", + "uv": [ + 0, + 0, + 16, + 16 + ] }, "up": { "cullface": "up", - "texture": "#base" + "texture": "#base", + "uv": [ + 0, + 0, + 16, + 16 + ] }, "west": { "cullface": "west", - "texture": "#base" + "texture": "#base", + "uv": [ + 0, + 0, + 16, + 16 + ] } }, "from": [ @@ -43,27 +79,63 @@ "faces": { "down": { "cullface": "down", - "texture": "#overlay" + "texture": "#overlay", + "uv": [ + 0, + 0, + 16, + 16 + ] }, "east": { "cullface": "east", - "texture": "#overlay" + "texture": "#overlay", + "uv": [ + 0, + 0, + 16, + 16 + ] }, "north": { "cullface": "north", - "texture": "#overlay" + "texture": "#overlay", + "uv": [ + 0, + 0, + 16, + 16 + ] }, "south": { "cullface": "south", - "texture": "#overlay" + "texture": "#overlay", + "uv": [ + 0, + 0, + 16, + 16 + ] }, "up": { "cullface": "up", - "texture": "#overlay" + "texture": "#overlay", + "uv": [ + 0, + 0, + 16, + 16 + ] }, "west": { "cullface": "west", - "texture": "#overlay" + "texture": "#overlay", + "uv": [ + 0, + 0, + 16, + 16 + ] } }, "from": [ diff --git a/src/generated/resources/assets/basemetals/models/block/bismuth_ore.json b/src/generated/resources/assets/basemetals/models/block/bismuth_ore.json index a87766ff3..86902ae3e 100644 --- a/src/generated/resources/assets/basemetals/models/block/bismuth_ore.json +++ b/src/generated/resources/assets/basemetals/models/block/bismuth_ore.json @@ -5,27 +5,63 @@ "faces": { "down": { "cullface": "down", - "texture": "#base" + "texture": "#base", + "uv": [ + 0, + 0, + 16, + 16 + ] }, "east": { "cullface": "east", - "texture": "#base" + "texture": "#base", + "uv": [ + 0, + 0, + 16, + 16 + ] }, "north": { "cullface": "north", - "texture": "#base" + "texture": "#base", + "uv": [ + 0, + 0, + 16, + 16 + ] }, "south": { "cullface": "south", - "texture": "#base" + "texture": "#base", + "uv": [ + 0, + 0, + 16, + 16 + ] }, "up": { "cullface": "up", - "texture": "#base" + "texture": "#base", + "uv": [ + 0, + 0, + 16, + 16 + ] }, "west": { "cullface": "west", - "texture": "#base" + "texture": "#base", + "uv": [ + 0, + 0, + 16, + 16 + ] } }, "from": [ @@ -43,27 +79,63 @@ "faces": { "down": { "cullface": "down", - "texture": "#overlay" + "texture": "#overlay", + "uv": [ + 0, + 0, + 16, + 16 + ] }, "east": { "cullface": "east", - "texture": "#overlay" + "texture": "#overlay", + "uv": [ + 0, + 0, + 16, + 16 + ] }, "north": { "cullface": "north", - "texture": "#overlay" + "texture": "#overlay", + "uv": [ + 0, + 0, + 16, + 16 + ] }, "south": { "cullface": "south", - "texture": "#overlay" + "texture": "#overlay", + "uv": [ + 0, + 0, + 16, + 16 + ] }, "up": { "cullface": "up", - "texture": "#overlay" + "texture": "#overlay", + "uv": [ + 0, + 0, + 16, + 16 + ] }, "west": { "cullface": "west", - "texture": "#overlay" + "texture": "#overlay", + "uv": [ + 0, + 0, + 16, + 16 + ] } }, "from": [ diff --git a/src/generated/resources/assets/basemetals/models/block/coldiron_ore.json b/src/generated/resources/assets/basemetals/models/block/coldiron_ore.json index b56f8029a..1bdcba558 100644 --- a/src/generated/resources/assets/basemetals/models/block/coldiron_ore.json +++ b/src/generated/resources/assets/basemetals/models/block/coldiron_ore.json @@ -5,27 +5,63 @@ "faces": { "down": { "cullface": "down", - "texture": "#base" + "texture": "#base", + "uv": [ + 0, + 0, + 16, + 16 + ] }, "east": { "cullface": "east", - "texture": "#base" + "texture": "#base", + "uv": [ + 0, + 0, + 16, + 16 + ] }, "north": { "cullface": "north", - "texture": "#base" + "texture": "#base", + "uv": [ + 0, + 0, + 16, + 16 + ] }, "south": { "cullface": "south", - "texture": "#base" + "texture": "#base", + "uv": [ + 0, + 0, + 16, + 16 + ] }, "up": { "cullface": "up", - "texture": "#base" + "texture": "#base", + "uv": [ + 0, + 0, + 16, + 16 + ] }, "west": { "cullface": "west", - "texture": "#base" + "texture": "#base", + "uv": [ + 0, + 0, + 16, + 16 + ] } }, "from": [ @@ -43,27 +79,63 @@ "faces": { "down": { "cullface": "down", - "texture": "#overlay" + "texture": "#overlay", + "uv": [ + 0, + 0, + 16, + 16 + ] }, "east": { "cullface": "east", - "texture": "#overlay" + "texture": "#overlay", + "uv": [ + 0, + 0, + 16, + 16 + ] }, "north": { "cullface": "north", - "texture": "#overlay" + "texture": "#overlay", + "uv": [ + 0, + 0, + 16, + 16 + ] }, "south": { "cullface": "south", - "texture": "#overlay" + "texture": "#overlay", + "uv": [ + 0, + 0, + 16, + 16 + ] }, "up": { "cullface": "up", - "texture": "#overlay" + "texture": "#overlay", + "uv": [ + 0, + 0, + 16, + 16 + ] }, "west": { "cullface": "west", - "texture": "#overlay" + "texture": "#overlay", + "uv": [ + 0, + 0, + 16, + 16 + ] } }, "from": [ diff --git a/src/generated/resources/assets/basemetals/models/block/copper_ore.json b/src/generated/resources/assets/basemetals/models/block/copper_ore.json index 362a244c4..31b334020 100644 --- a/src/generated/resources/assets/basemetals/models/block/copper_ore.json +++ b/src/generated/resources/assets/basemetals/models/block/copper_ore.json @@ -5,27 +5,63 @@ "faces": { "down": { "cullface": "down", - "texture": "#base" + "texture": "#base", + "uv": [ + 0, + 0, + 16, + 16 + ] }, "east": { "cullface": "east", - "texture": "#base" + "texture": "#base", + "uv": [ + 0, + 0, + 16, + 16 + ] }, "north": { "cullface": "north", - "texture": "#base" + "texture": "#base", + "uv": [ + 0, + 0, + 16, + 16 + ] }, "south": { "cullface": "south", - "texture": "#base" + "texture": "#base", + "uv": [ + 0, + 0, + 16, + 16 + ] }, "up": { "cullface": "up", - "texture": "#base" + "texture": "#base", + "uv": [ + 0, + 0, + 16, + 16 + ] }, "west": { "cullface": "west", - "texture": "#base" + "texture": "#base", + "uv": [ + 0, + 0, + 16, + 16 + ] } }, "from": [ @@ -43,27 +79,63 @@ "faces": { "down": { "cullface": "down", - "texture": "#overlay" + "texture": "#overlay", + "uv": [ + 0, + 0, + 16, + 16 + ] }, "east": { "cullface": "east", - "texture": "#overlay" + "texture": "#overlay", + "uv": [ + 0, + 0, + 16, + 16 + ] }, "north": { "cullface": "north", - "texture": "#overlay" + "texture": "#overlay", + "uv": [ + 0, + 0, + 16, + 16 + ] }, "south": { "cullface": "south", - "texture": "#overlay" + "texture": "#overlay", + "uv": [ + 0, + 0, + 16, + 16 + ] }, "up": { "cullface": "up", - "texture": "#overlay" + "texture": "#overlay", + "uv": [ + 0, + 0, + 16, + 16 + ] }, "west": { "cullface": "west", - "texture": "#overlay" + "texture": "#overlay", + "uv": [ + 0, + 0, + 16, + 16 + ] } }, "from": [ diff --git a/src/generated/resources/assets/basemetals/models/block/lead_ore.json b/src/generated/resources/assets/basemetals/models/block/lead_ore.json index 2ab4c2fd3..aa4412623 100644 --- a/src/generated/resources/assets/basemetals/models/block/lead_ore.json +++ b/src/generated/resources/assets/basemetals/models/block/lead_ore.json @@ -5,27 +5,63 @@ "faces": { "down": { "cullface": "down", - "texture": "#base" + "texture": "#base", + "uv": [ + 0, + 0, + 16, + 16 + ] }, "east": { "cullface": "east", - "texture": "#base" + "texture": "#base", + "uv": [ + 0, + 0, + 16, + 16 + ] }, "north": { "cullface": "north", - "texture": "#base" + "texture": "#base", + "uv": [ + 0, + 0, + 16, + 16 + ] }, "south": { "cullface": "south", - "texture": "#base" + "texture": "#base", + "uv": [ + 0, + 0, + 16, + 16 + ] }, "up": { "cullface": "up", - "texture": "#base" + "texture": "#base", + "uv": [ + 0, + 0, + 16, + 16 + ] }, "west": { "cullface": "west", - "texture": "#base" + "texture": "#base", + "uv": [ + 0, + 0, + 16, + 16 + ] } }, "from": [ @@ -43,27 +79,63 @@ "faces": { "down": { "cullface": "down", - "texture": "#overlay" + "texture": "#overlay", + "uv": [ + 0, + 0, + 16, + 16 + ] }, "east": { "cullface": "east", - "texture": "#overlay" + "texture": "#overlay", + "uv": [ + 0, + 0, + 16, + 16 + ] }, "north": { "cullface": "north", - "texture": "#overlay" + "texture": "#overlay", + "uv": [ + 0, + 0, + 16, + 16 + ] }, "south": { "cullface": "south", - "texture": "#overlay" + "texture": "#overlay", + "uv": [ + 0, + 0, + 16, + 16 + ] }, "up": { "cullface": "up", - "texture": "#overlay" + "texture": "#overlay", + "uv": [ + 0, + 0, + 16, + 16 + ] }, "west": { "cullface": "west", - "texture": "#overlay" + "texture": "#overlay", + "uv": [ + 0, + 0, + 16, + 16 + ] } }, "from": [ diff --git a/src/generated/resources/assets/basemetals/models/block/mercury_ore.json b/src/generated/resources/assets/basemetals/models/block/mercury_ore.json index b47f3936b..0b8c7582b 100644 --- a/src/generated/resources/assets/basemetals/models/block/mercury_ore.json +++ b/src/generated/resources/assets/basemetals/models/block/mercury_ore.json @@ -5,27 +5,63 @@ "faces": { "down": { "cullface": "down", - "texture": "#base" + "texture": "#base", + "uv": [ + 0, + 0, + 16, + 16 + ] }, "east": { "cullface": "east", - "texture": "#base" + "texture": "#base", + "uv": [ + 0, + 0, + 16, + 16 + ] }, "north": { "cullface": "north", - "texture": "#base" + "texture": "#base", + "uv": [ + 0, + 0, + 16, + 16 + ] }, "south": { "cullface": "south", - "texture": "#base" + "texture": "#base", + "uv": [ + 0, + 0, + 16, + 16 + ] }, "up": { "cullface": "up", - "texture": "#base" + "texture": "#base", + "uv": [ + 0, + 0, + 16, + 16 + ] }, "west": { "cullface": "west", - "texture": "#base" + "texture": "#base", + "uv": [ + 0, + 0, + 16, + 16 + ] } }, "from": [ @@ -43,27 +79,63 @@ "faces": { "down": { "cullface": "down", - "texture": "#overlay" + "texture": "#overlay", + "uv": [ + 0, + 0, + 16, + 16 + ] }, "east": { "cullface": "east", - "texture": "#overlay" + "texture": "#overlay", + "uv": [ + 0, + 0, + 16, + 16 + ] }, "north": { "cullface": "north", - "texture": "#overlay" + "texture": "#overlay", + "uv": [ + 0, + 0, + 16, + 16 + ] }, "south": { "cullface": "south", - "texture": "#overlay" + "texture": "#overlay", + "uv": [ + 0, + 0, + 16, + 16 + ] }, "up": { "cullface": "up", - "texture": "#overlay" + "texture": "#overlay", + "uv": [ + 0, + 0, + 16, + 16 + ] }, "west": { "cullface": "west", - "texture": "#overlay" + "texture": "#overlay", + "uv": [ + 0, + 0, + 16, + 16 + ] } }, "from": [ diff --git a/src/generated/resources/assets/basemetals/models/block/nickel_ore.json b/src/generated/resources/assets/basemetals/models/block/nickel_ore.json index ac67f042f..0dbfe076c 100644 --- a/src/generated/resources/assets/basemetals/models/block/nickel_ore.json +++ b/src/generated/resources/assets/basemetals/models/block/nickel_ore.json @@ -5,27 +5,63 @@ "faces": { "down": { "cullface": "down", - "texture": "#base" + "texture": "#base", + "uv": [ + 0, + 0, + 16, + 16 + ] }, "east": { "cullface": "east", - "texture": "#base" + "texture": "#base", + "uv": [ + 0, + 0, + 16, + 16 + ] }, "north": { "cullface": "north", - "texture": "#base" + "texture": "#base", + "uv": [ + 0, + 0, + 16, + 16 + ] }, "south": { "cullface": "south", - "texture": "#base" + "texture": "#base", + "uv": [ + 0, + 0, + 16, + 16 + ] }, "up": { "cullface": "up", - "texture": "#base" + "texture": "#base", + "uv": [ + 0, + 0, + 16, + 16 + ] }, "west": { "cullface": "west", - "texture": "#base" + "texture": "#base", + "uv": [ + 0, + 0, + 16, + 16 + ] } }, "from": [ @@ -43,27 +79,63 @@ "faces": { "down": { "cullface": "down", - "texture": "#overlay" + "texture": "#overlay", + "uv": [ + 0, + 0, + 16, + 16 + ] }, "east": { "cullface": "east", - "texture": "#overlay" + "texture": "#overlay", + "uv": [ + 0, + 0, + 16, + 16 + ] }, "north": { "cullface": "north", - "texture": "#overlay" + "texture": "#overlay", + "uv": [ + 0, + 0, + 16, + 16 + ] }, "south": { "cullface": "south", - "texture": "#overlay" + "texture": "#overlay", + "uv": [ + 0, + 0, + 16, + 16 + ] }, "up": { "cullface": "up", - "texture": "#overlay" + "texture": "#overlay", + "uv": [ + 0, + 0, + 16, + 16 + ] }, "west": { "cullface": "west", - "texture": "#overlay" + "texture": "#overlay", + "uv": [ + 0, + 0, + 16, + 16 + ] } }, "from": [ diff --git a/src/generated/resources/assets/basemetals/models/block/platinum_ore.json b/src/generated/resources/assets/basemetals/models/block/platinum_ore.json index 5518797ba..e64915cb4 100644 --- a/src/generated/resources/assets/basemetals/models/block/platinum_ore.json +++ b/src/generated/resources/assets/basemetals/models/block/platinum_ore.json @@ -5,27 +5,63 @@ "faces": { "down": { "cullface": "down", - "texture": "#base" + "texture": "#base", + "uv": [ + 0, + 0, + 16, + 16 + ] }, "east": { "cullface": "east", - "texture": "#base" + "texture": "#base", + "uv": [ + 0, + 0, + 16, + 16 + ] }, "north": { "cullface": "north", - "texture": "#base" + "texture": "#base", + "uv": [ + 0, + 0, + 16, + 16 + ] }, "south": { "cullface": "south", - "texture": "#base" + "texture": "#base", + "uv": [ + 0, + 0, + 16, + 16 + ] }, "up": { "cullface": "up", - "texture": "#base" + "texture": "#base", + "uv": [ + 0, + 0, + 16, + 16 + ] }, "west": { "cullface": "west", - "texture": "#base" + "texture": "#base", + "uv": [ + 0, + 0, + 16, + 16 + ] } }, "from": [ @@ -43,27 +79,63 @@ "faces": { "down": { "cullface": "down", - "texture": "#overlay" + "texture": "#overlay", + "uv": [ + 0, + 0, + 16, + 16 + ] }, "east": { "cullface": "east", - "texture": "#overlay" + "texture": "#overlay", + "uv": [ + 0, + 0, + 16, + 16 + ] }, "north": { "cullface": "north", - "texture": "#overlay" + "texture": "#overlay", + "uv": [ + 0, + 0, + 16, + 16 + ] }, "south": { "cullface": "south", - "texture": "#overlay" + "texture": "#overlay", + "uv": [ + 0, + 0, + 16, + 16 + ] }, "up": { "cullface": "up", - "texture": "#overlay" + "texture": "#overlay", + "uv": [ + 0, + 0, + 16, + 16 + ] }, "west": { "cullface": "west", - "texture": "#overlay" + "texture": "#overlay", + "uv": [ + 0, + 0, + 16, + 16 + ] } }, "from": [ diff --git a/src/generated/resources/assets/basemetals/models/block/silver_ore.json b/src/generated/resources/assets/basemetals/models/block/silver_ore.json index 58f56a520..a05533feb 100644 --- a/src/generated/resources/assets/basemetals/models/block/silver_ore.json +++ b/src/generated/resources/assets/basemetals/models/block/silver_ore.json @@ -5,27 +5,63 @@ "faces": { "down": { "cullface": "down", - "texture": "#base" + "texture": "#base", + "uv": [ + 0, + 0, + 16, + 16 + ] }, "east": { "cullface": "east", - "texture": "#base" + "texture": "#base", + "uv": [ + 0, + 0, + 16, + 16 + ] }, "north": { "cullface": "north", - "texture": "#base" + "texture": "#base", + "uv": [ + 0, + 0, + 16, + 16 + ] }, "south": { "cullface": "south", - "texture": "#base" + "texture": "#base", + "uv": [ + 0, + 0, + 16, + 16 + ] }, "up": { "cullface": "up", - "texture": "#base" + "texture": "#base", + "uv": [ + 0, + 0, + 16, + 16 + ] }, "west": { "cullface": "west", - "texture": "#base" + "texture": "#base", + "uv": [ + 0, + 0, + 16, + 16 + ] } }, "from": [ @@ -43,27 +79,63 @@ "faces": { "down": { "cullface": "down", - "texture": "#overlay" + "texture": "#overlay", + "uv": [ + 0, + 0, + 16, + 16 + ] }, "east": { "cullface": "east", - "texture": "#overlay" + "texture": "#overlay", + "uv": [ + 0, + 0, + 16, + 16 + ] }, "north": { "cullface": "north", - "texture": "#overlay" + "texture": "#overlay", + "uv": [ + 0, + 0, + 16, + 16 + ] }, "south": { "cullface": "south", - "texture": "#overlay" + "texture": "#overlay", + "uv": [ + 0, + 0, + 16, + 16 + ] }, "up": { "cullface": "up", - "texture": "#overlay" + "texture": "#overlay", + "uv": [ + 0, + 0, + 16, + 16 + ] }, "west": { "cullface": "west", - "texture": "#overlay" + "texture": "#overlay", + "uv": [ + 0, + 0, + 16, + 16 + ] } }, "from": [ diff --git a/src/generated/resources/assets/basemetals/models/block/starsteel_ore.json b/src/generated/resources/assets/basemetals/models/block/starsteel_ore.json index e01d9c6ac..22ae1d7b4 100644 --- a/src/generated/resources/assets/basemetals/models/block/starsteel_ore.json +++ b/src/generated/resources/assets/basemetals/models/block/starsteel_ore.json @@ -5,27 +5,63 @@ "faces": { "down": { "cullface": "down", - "texture": "#base" + "texture": "#base", + "uv": [ + 0, + 0, + 16, + 16 + ] }, "east": { "cullface": "east", - "texture": "#base" + "texture": "#base", + "uv": [ + 0, + 0, + 16, + 16 + ] }, "north": { "cullface": "north", - "texture": "#base" + "texture": "#base", + "uv": [ + 0, + 0, + 16, + 16 + ] }, "south": { "cullface": "south", - "texture": "#base" + "texture": "#base", + "uv": [ + 0, + 0, + 16, + 16 + ] }, "up": { "cullface": "up", - "texture": "#base" + "texture": "#base", + "uv": [ + 0, + 0, + 16, + 16 + ] }, "west": { "cullface": "west", - "texture": "#base" + "texture": "#base", + "uv": [ + 0, + 0, + 16, + 16 + ] } }, "from": [ @@ -43,27 +79,63 @@ "faces": { "down": { "cullface": "down", - "texture": "#overlay" + "texture": "#overlay", + "uv": [ + 0, + 0, + 16, + 16 + ] }, "east": { "cullface": "east", - "texture": "#overlay" + "texture": "#overlay", + "uv": [ + 0, + 0, + 16, + 16 + ] }, "north": { "cullface": "north", - "texture": "#overlay" + "texture": "#overlay", + "uv": [ + 0, + 0, + 16, + 16 + ] }, "south": { "cullface": "south", - "texture": "#overlay" + "texture": "#overlay", + "uv": [ + 0, + 0, + 16, + 16 + ] }, "up": { "cullface": "up", - "texture": "#overlay" + "texture": "#overlay", + "uv": [ + 0, + 0, + 16, + 16 + ] }, "west": { "cullface": "west", - "texture": "#overlay" + "texture": "#overlay", + "uv": [ + 0, + 0, + 16, + 16 + ] } }, "from": [ diff --git a/src/generated/resources/assets/basemetals/models/block/tin_ore.json b/src/generated/resources/assets/basemetals/models/block/tin_ore.json index 28ec4ab66..378a6d634 100644 --- a/src/generated/resources/assets/basemetals/models/block/tin_ore.json +++ b/src/generated/resources/assets/basemetals/models/block/tin_ore.json @@ -5,27 +5,63 @@ "faces": { "down": { "cullface": "down", - "texture": "#base" + "texture": "#base", + "uv": [ + 0, + 0, + 16, + 16 + ] }, "east": { "cullface": "east", - "texture": "#base" + "texture": "#base", + "uv": [ + 0, + 0, + 16, + 16 + ] }, "north": { "cullface": "north", - "texture": "#base" + "texture": "#base", + "uv": [ + 0, + 0, + 16, + 16 + ] }, "south": { "cullface": "south", - "texture": "#base" + "texture": "#base", + "uv": [ + 0, + 0, + 16, + 16 + ] }, "up": { "cullface": "up", - "texture": "#base" + "texture": "#base", + "uv": [ + 0, + 0, + 16, + 16 + ] }, "west": { "cullface": "west", - "texture": "#base" + "texture": "#base", + "uv": [ + 0, + 0, + 16, + 16 + ] } }, "from": [ @@ -43,27 +79,63 @@ "faces": { "down": { "cullface": "down", - "texture": "#overlay" + "texture": "#overlay", + "uv": [ + 0, + 0, + 16, + 16 + ] }, "east": { "cullface": "east", - "texture": "#overlay" + "texture": "#overlay", + "uv": [ + 0, + 0, + 16, + 16 + ] }, "north": { "cullface": "north", - "texture": "#overlay" + "texture": "#overlay", + "uv": [ + 0, + 0, + 16, + 16 + ] }, "south": { "cullface": "south", - "texture": "#overlay" + "texture": "#overlay", + "uv": [ + 0, + 0, + 16, + 16 + ] }, "up": { "cullface": "up", - "texture": "#overlay" + "texture": "#overlay", + "uv": [ + 0, + 0, + 16, + 16 + ] }, "west": { "cullface": "west", - "texture": "#overlay" + "texture": "#overlay", + "uv": [ + 0, + 0, + 16, + 16 + ] } }, "from": [ diff --git a/src/generated/resources/assets/basemetals/models/block/zinc_ore.json b/src/generated/resources/assets/basemetals/models/block/zinc_ore.json index 92d25d448..f33ed463a 100644 --- a/src/generated/resources/assets/basemetals/models/block/zinc_ore.json +++ b/src/generated/resources/assets/basemetals/models/block/zinc_ore.json @@ -5,27 +5,63 @@ "faces": { "down": { "cullface": "down", - "texture": "#base" + "texture": "#base", + "uv": [ + 0, + 0, + 16, + 16 + ] }, "east": { "cullface": "east", - "texture": "#base" + "texture": "#base", + "uv": [ + 0, + 0, + 16, + 16 + ] }, "north": { "cullface": "north", - "texture": "#base" + "texture": "#base", + "uv": [ + 0, + 0, + 16, + 16 + ] }, "south": { "cullface": "south", - "texture": "#base" + "texture": "#base", + "uv": [ + 0, + 0, + 16, + 16 + ] }, "up": { "cullface": "up", - "texture": "#base" + "texture": "#base", + "uv": [ + 0, + 0, + 16, + 16 + ] }, "west": { "cullface": "west", - "texture": "#base" + "texture": "#base", + "uv": [ + 0, + 0, + 16, + 16 + ] } }, "from": [ @@ -43,27 +79,63 @@ "faces": { "down": { "cullface": "down", - "texture": "#overlay" + "texture": "#overlay", + "uv": [ + 0, + 0, + 16, + 16 + ] }, "east": { "cullface": "east", - "texture": "#overlay" + "texture": "#overlay", + "uv": [ + 0, + 0, + 16, + 16 + ] }, "north": { "cullface": "north", - "texture": "#overlay" + "texture": "#overlay", + "uv": [ + 0, + 0, + 16, + 16 + ] }, "south": { "cullface": "south", - "texture": "#overlay" + "texture": "#overlay", + "uv": [ + 0, + 0, + 16, + 16 + ] }, "up": { "cullface": "up", - "texture": "#overlay" + "texture": "#overlay", + "uv": [ + 0, + 0, + 16, + 16 + ] }, "west": { "cullface": "west", - "texture": "#overlay" + "texture": "#overlay", + "uv": [ + 0, + 0, + 16, + 16 + ] } }, "from": [ diff --git a/src/generated/resources/assets/basemetals/models/item/adamantine_bucket.json b/src/generated/resources/assets/basemetals/models/item/adamantine_bucket.json index 6189fbf5b..31a86e9ed 100644 --- a/src/generated/resources/assets/basemetals/models/item/adamantine_bucket.json +++ b/src/generated/resources/assets/basemetals/models/item/adamantine_bucket.json @@ -3,9 +3,9 @@ "fluid": "basemetals:adamantine", "loader": "forge:fluid_container", "textures": { - "base": "basemetals:block/bucket_base", - "cover": "basemetals:block/bucket_cover", - "fluid": "basemetals:block/bucket_fluid", + "base": "basemetals:item/bucket_base", + "cover": "basemetals:item/bucket_cover", + "fluid": "basemetals:item/bucket_fluid", "particle": "#base" } } \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/models/item/antimony_bucket.json b/src/generated/resources/assets/basemetals/models/item/antimony_bucket.json index 9c801169f..267d96c8e 100644 --- a/src/generated/resources/assets/basemetals/models/item/antimony_bucket.json +++ b/src/generated/resources/assets/basemetals/models/item/antimony_bucket.json @@ -3,9 +3,9 @@ "fluid": "basemetals:antimony", "loader": "forge:fluid_container", "textures": { - "base": "basemetals:block/bucket_base", - "cover": "basemetals:block/bucket_cover", - "fluid": "basemetals:block/bucket_fluid", + "base": "basemetals:item/bucket_base", + "cover": "basemetals:item/bucket_cover", + "fluid": "basemetals:item/bucket_fluid", "particle": "#base" } } \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/models/item/aquarium_bucket.json b/src/generated/resources/assets/basemetals/models/item/aquarium_bucket.json index f0f8958a3..11e5421f7 100644 --- a/src/generated/resources/assets/basemetals/models/item/aquarium_bucket.json +++ b/src/generated/resources/assets/basemetals/models/item/aquarium_bucket.json @@ -3,9 +3,9 @@ "fluid": "basemetals:aquarium", "loader": "forge:fluid_container", "textures": { - "base": "basemetals:block/bucket_base", - "cover": "basemetals:block/bucket_cover", - "fluid": "basemetals:block/bucket_fluid", + "base": "basemetals:item/bucket_base", + "cover": "basemetals:item/bucket_cover", + "fluid": "basemetals:item/bucket_fluid", "particle": "#base" } } \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/models/item/bismuth_bucket.json b/src/generated/resources/assets/basemetals/models/item/bismuth_bucket.json index faf44cfec..912dd61ff 100644 --- a/src/generated/resources/assets/basemetals/models/item/bismuth_bucket.json +++ b/src/generated/resources/assets/basemetals/models/item/bismuth_bucket.json @@ -3,9 +3,9 @@ "fluid": "basemetals:bismuth", "loader": "forge:fluid_container", "textures": { - "base": "basemetals:block/bucket_base", - "cover": "basemetals:block/bucket_cover", - "fluid": "basemetals:block/bucket_fluid", + "base": "basemetals:item/bucket_base", + "cover": "basemetals:item/bucket_cover", + "fluid": "basemetals:item/bucket_fluid", "particle": "#base" } } \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/models/item/brass_bucket.json b/src/generated/resources/assets/basemetals/models/item/brass_bucket.json index c1edc4f57..13756ddfe 100644 --- a/src/generated/resources/assets/basemetals/models/item/brass_bucket.json +++ b/src/generated/resources/assets/basemetals/models/item/brass_bucket.json @@ -3,9 +3,9 @@ "fluid": "basemetals:brass", "loader": "forge:fluid_container", "textures": { - "base": "basemetals:block/bucket_base", - "cover": "basemetals:block/bucket_cover", - "fluid": "basemetals:block/bucket_fluid", + "base": "basemetals:item/bucket_base", + "cover": "basemetals:item/bucket_cover", + "fluid": "basemetals:item/bucket_fluid", "particle": "#base" } } \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/models/item/bronze_bucket.json b/src/generated/resources/assets/basemetals/models/item/bronze_bucket.json index 2fbbf5531..475e2a5db 100644 --- a/src/generated/resources/assets/basemetals/models/item/bronze_bucket.json +++ b/src/generated/resources/assets/basemetals/models/item/bronze_bucket.json @@ -3,9 +3,9 @@ "fluid": "basemetals:bronze", "loader": "forge:fluid_container", "textures": { - "base": "basemetals:block/bucket_base", - "cover": "basemetals:block/bucket_cover", - "fluid": "basemetals:block/bucket_fluid", + "base": "basemetals:item/bucket_base", + "cover": "basemetals:item/bucket_cover", + "fluid": "basemetals:item/bucket_fluid", "particle": "#base" } } \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/models/item/charcoal_bucket.json b/src/generated/resources/assets/basemetals/models/item/charcoal_bucket.json index 02f22ecfc..3cc65c4fa 100644 --- a/src/generated/resources/assets/basemetals/models/item/charcoal_bucket.json +++ b/src/generated/resources/assets/basemetals/models/item/charcoal_bucket.json @@ -3,9 +3,9 @@ "fluid": "basemetals:charcoal", "loader": "forge:fluid_container", "textures": { - "base": "basemetals:block/bucket_base", - "cover": "basemetals:block/bucket_cover", - "fluid": "basemetals:block/bucket_fluid", + "base": "basemetals:item/bucket_base", + "cover": "basemetals:item/bucket_cover", + "fluid": "basemetals:item/bucket_fluid", "particle": "#base" } } \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/models/item/coal_bucket.json b/src/generated/resources/assets/basemetals/models/item/coal_bucket.json index b63543af1..347a1c997 100644 --- a/src/generated/resources/assets/basemetals/models/item/coal_bucket.json +++ b/src/generated/resources/assets/basemetals/models/item/coal_bucket.json @@ -3,9 +3,9 @@ "fluid": "basemetals:coal", "loader": "forge:fluid_container", "textures": { - "base": "basemetals:block/bucket_base", - "cover": "basemetals:block/bucket_cover", - "fluid": "basemetals:block/bucket_fluid", + "base": "basemetals:item/bucket_base", + "cover": "basemetals:item/bucket_cover", + "fluid": "basemetals:item/bucket_fluid", "particle": "#base" } } \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/models/item/coldiron_bucket.json b/src/generated/resources/assets/basemetals/models/item/coldiron_bucket.json index a085cf78e..d63d805e0 100644 --- a/src/generated/resources/assets/basemetals/models/item/coldiron_bucket.json +++ b/src/generated/resources/assets/basemetals/models/item/coldiron_bucket.json @@ -3,9 +3,9 @@ "fluid": "basemetals:coldiron", "loader": "forge:fluid_container", "textures": { - "base": "basemetals:block/bucket_base", - "cover": "basemetals:block/bucket_cover", - "fluid": "basemetals:block/bucket_fluid", + "base": "basemetals:item/bucket_base", + "cover": "basemetals:item/bucket_cover", + "fluid": "basemetals:item/bucket_fluid", "particle": "#base" } } \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/models/item/copper_bucket.json b/src/generated/resources/assets/basemetals/models/item/copper_bucket.json index cee2b5830..9b4d6211f 100644 --- a/src/generated/resources/assets/basemetals/models/item/copper_bucket.json +++ b/src/generated/resources/assets/basemetals/models/item/copper_bucket.json @@ -3,9 +3,9 @@ "fluid": "basemetals:copper", "loader": "forge:fluid_container", "textures": { - "base": "basemetals:block/bucket_base", - "cover": "basemetals:block/bucket_cover", - "fluid": "basemetals:block/bucket_fluid", + "base": "basemetals:item/bucket_base", + "cover": "basemetals:item/bucket_cover", + "fluid": "basemetals:item/bucket_fluid", "particle": "#base" } } \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/models/item/cupronickel_bucket.json b/src/generated/resources/assets/basemetals/models/item/cupronickel_bucket.json index 64d0e29e8..2b054114a 100644 --- a/src/generated/resources/assets/basemetals/models/item/cupronickel_bucket.json +++ b/src/generated/resources/assets/basemetals/models/item/cupronickel_bucket.json @@ -3,9 +3,9 @@ "fluid": "basemetals:cupronickel", "loader": "forge:fluid_container", "textures": { - "base": "basemetals:block/bucket_base", - "cover": "basemetals:block/bucket_cover", - "fluid": "basemetals:block/bucket_fluid", + "base": "basemetals:item/bucket_base", + "cover": "basemetals:item/bucket_cover", + "fluid": "basemetals:item/bucket_fluid", "particle": "#base" } } \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/models/item/diamond_bucket.json b/src/generated/resources/assets/basemetals/models/item/diamond_bucket.json index e42b1c8c1..791ea5ab4 100644 --- a/src/generated/resources/assets/basemetals/models/item/diamond_bucket.json +++ b/src/generated/resources/assets/basemetals/models/item/diamond_bucket.json @@ -3,9 +3,9 @@ "fluid": "basemetals:diamond", "loader": "forge:fluid_container", "textures": { - "base": "basemetals:block/bucket_base", - "cover": "basemetals:block/bucket_cover", - "fluid": "basemetals:block/bucket_fluid", + "base": "basemetals:item/bucket_base", + "cover": "basemetals:item/bucket_cover", + "fluid": "basemetals:item/bucket_fluid", "particle": "#base" } } \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/models/item/electrum_bucket.json b/src/generated/resources/assets/basemetals/models/item/electrum_bucket.json index 10f68ae65..c0bf29f4b 100644 --- a/src/generated/resources/assets/basemetals/models/item/electrum_bucket.json +++ b/src/generated/resources/assets/basemetals/models/item/electrum_bucket.json @@ -3,9 +3,9 @@ "fluid": "basemetals:electrum", "loader": "forge:fluid_container", "textures": { - "base": "basemetals:block/bucket_base", - "cover": "basemetals:block/bucket_cover", - "fluid": "basemetals:block/bucket_fluid", + "base": "basemetals:item/bucket_base", + "cover": "basemetals:item/bucket_cover", + "fluid": "basemetals:item/bucket_fluid", "particle": "#base" } } \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/models/item/emerald_bucket.json b/src/generated/resources/assets/basemetals/models/item/emerald_bucket.json index 4819f55d0..a18519006 100644 --- a/src/generated/resources/assets/basemetals/models/item/emerald_bucket.json +++ b/src/generated/resources/assets/basemetals/models/item/emerald_bucket.json @@ -3,9 +3,9 @@ "fluid": "basemetals:emerald", "loader": "forge:fluid_container", "textures": { - "base": "basemetals:block/bucket_base", - "cover": "basemetals:block/bucket_cover", - "fluid": "basemetals:block/bucket_fluid", + "base": "basemetals:item/bucket_base", + "cover": "basemetals:item/bucket_cover", + "fluid": "basemetals:item/bucket_fluid", "particle": "#base" } } \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/models/item/ender_bucket.json b/src/generated/resources/assets/basemetals/models/item/ender_bucket.json index 98b071e5c..c4d990adf 100644 --- a/src/generated/resources/assets/basemetals/models/item/ender_bucket.json +++ b/src/generated/resources/assets/basemetals/models/item/ender_bucket.json @@ -3,9 +3,9 @@ "fluid": "basemetals:ender", "loader": "forge:fluid_container", "textures": { - "base": "basemetals:block/bucket_base", - "cover": "basemetals:block/bucket_cover", - "fluid": "basemetals:block/bucket_fluid", + "base": "basemetals:item/bucket_base", + "cover": "basemetals:item/bucket_cover", + "fluid": "basemetals:item/bucket_fluid", "particle": "#base" } } \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/models/item/gold_bucket.json b/src/generated/resources/assets/basemetals/models/item/gold_bucket.json index fdfd6b11c..71e573a82 100644 --- a/src/generated/resources/assets/basemetals/models/item/gold_bucket.json +++ b/src/generated/resources/assets/basemetals/models/item/gold_bucket.json @@ -3,9 +3,9 @@ "fluid": "basemetals:gold", "loader": "forge:fluid_container", "textures": { - "base": "basemetals:block/bucket_base", - "cover": "basemetals:block/bucket_cover", - "fluid": "basemetals:block/bucket_fluid", + "base": "basemetals:item/bucket_base", + "cover": "basemetals:item/bucket_cover", + "fluid": "basemetals:item/bucket_fluid", "particle": "#base" } } \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/models/item/invar_bucket.json b/src/generated/resources/assets/basemetals/models/item/invar_bucket.json index 01ef40419..ada22f4c9 100644 --- a/src/generated/resources/assets/basemetals/models/item/invar_bucket.json +++ b/src/generated/resources/assets/basemetals/models/item/invar_bucket.json @@ -3,9 +3,9 @@ "fluid": "basemetals:invar", "loader": "forge:fluid_container", "textures": { - "base": "basemetals:block/bucket_base", - "cover": "basemetals:block/bucket_cover", - "fluid": "basemetals:block/bucket_fluid", + "base": "basemetals:item/bucket_base", + "cover": "basemetals:item/bucket_cover", + "fluid": "basemetals:item/bucket_fluid", "particle": "#base" } } \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/models/item/iron_bucket.json b/src/generated/resources/assets/basemetals/models/item/iron_bucket.json index 20b4bbaed..a7764bd92 100644 --- a/src/generated/resources/assets/basemetals/models/item/iron_bucket.json +++ b/src/generated/resources/assets/basemetals/models/item/iron_bucket.json @@ -3,9 +3,9 @@ "fluid": "basemetals:iron", "loader": "forge:fluid_container", "textures": { - "base": "basemetals:block/bucket_base", - "cover": "basemetals:block/bucket_cover", - "fluid": "basemetals:block/bucket_fluid", + "base": "basemetals:item/bucket_base", + "cover": "basemetals:item/bucket_cover", + "fluid": "basemetals:item/bucket_fluid", "particle": "#base" } } \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/models/item/lapis_bucket.json b/src/generated/resources/assets/basemetals/models/item/lapis_bucket.json index d5b7c1e66..e7dc6d846 100644 --- a/src/generated/resources/assets/basemetals/models/item/lapis_bucket.json +++ b/src/generated/resources/assets/basemetals/models/item/lapis_bucket.json @@ -3,9 +3,9 @@ "fluid": "basemetals:lapis", "loader": "forge:fluid_container", "textures": { - "base": "basemetals:block/bucket_base", - "cover": "basemetals:block/bucket_cover", - "fluid": "basemetals:block/bucket_fluid", + "base": "basemetals:item/bucket_base", + "cover": "basemetals:item/bucket_cover", + "fluid": "basemetals:item/bucket_fluid", "particle": "#base" } } \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/models/item/lead_bucket.json b/src/generated/resources/assets/basemetals/models/item/lead_bucket.json index d9b0dafc2..9efb0f2a2 100644 --- a/src/generated/resources/assets/basemetals/models/item/lead_bucket.json +++ b/src/generated/resources/assets/basemetals/models/item/lead_bucket.json @@ -3,9 +3,9 @@ "fluid": "basemetals:lead", "loader": "forge:fluid_container", "textures": { - "base": "basemetals:block/bucket_base", - "cover": "basemetals:block/bucket_cover", - "fluid": "basemetals:block/bucket_fluid", + "base": "basemetals:item/bucket_base", + "cover": "basemetals:item/bucket_cover", + "fluid": "basemetals:item/bucket_fluid", "particle": "#base" } } \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/models/item/mercury_bucket.json b/src/generated/resources/assets/basemetals/models/item/mercury_bucket.json index c3ff8e3be..d064bbfa9 100644 --- a/src/generated/resources/assets/basemetals/models/item/mercury_bucket.json +++ b/src/generated/resources/assets/basemetals/models/item/mercury_bucket.json @@ -3,9 +3,9 @@ "fluid": "basemetals:mercury", "loader": "forge:fluid_container", "textures": { - "base": "basemetals:block/bucket_base", - "cover": "basemetals:block/bucket_cover", - "fluid": "basemetals:block/bucket_fluid", + "base": "basemetals:item/bucket_base", + "cover": "basemetals:item/bucket_cover", + "fluid": "basemetals:item/bucket_fluid", "particle": "#base" } } \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/models/item/mithril_bucket.json b/src/generated/resources/assets/basemetals/models/item/mithril_bucket.json index b55870164..171e652b9 100644 --- a/src/generated/resources/assets/basemetals/models/item/mithril_bucket.json +++ b/src/generated/resources/assets/basemetals/models/item/mithril_bucket.json @@ -3,9 +3,9 @@ "fluid": "basemetals:mithril", "loader": "forge:fluid_container", "textures": { - "base": "basemetals:block/bucket_base", - "cover": "basemetals:block/bucket_cover", - "fluid": "basemetals:block/bucket_fluid", + "base": "basemetals:item/bucket_base", + "cover": "basemetals:item/bucket_cover", + "fluid": "basemetals:item/bucket_fluid", "particle": "#base" } } \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/models/item/nickel_bucket.json b/src/generated/resources/assets/basemetals/models/item/nickel_bucket.json index 93e334d14..470e1506b 100644 --- a/src/generated/resources/assets/basemetals/models/item/nickel_bucket.json +++ b/src/generated/resources/assets/basemetals/models/item/nickel_bucket.json @@ -3,9 +3,9 @@ "fluid": "basemetals:nickel", "loader": "forge:fluid_container", "textures": { - "base": "basemetals:block/bucket_base", - "cover": "basemetals:block/bucket_cover", - "fluid": "basemetals:block/bucket_fluid", + "base": "basemetals:item/bucket_base", + "cover": "basemetals:item/bucket_cover", + "fluid": "basemetals:item/bucket_fluid", "particle": "#base" } } \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/models/item/obsidian_bucket.json b/src/generated/resources/assets/basemetals/models/item/obsidian_bucket.json index 3ce26c804..2dcf0a502 100644 --- a/src/generated/resources/assets/basemetals/models/item/obsidian_bucket.json +++ b/src/generated/resources/assets/basemetals/models/item/obsidian_bucket.json @@ -3,9 +3,9 @@ "fluid": "basemetals:obsidian", "loader": "forge:fluid_container", "textures": { - "base": "basemetals:block/bucket_base", - "cover": "basemetals:block/bucket_cover", - "fluid": "basemetals:block/bucket_fluid", + "base": "basemetals:item/bucket_base", + "cover": "basemetals:item/bucket_cover", + "fluid": "basemetals:item/bucket_fluid", "particle": "#base" } } \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/models/item/pewter_bucket.json b/src/generated/resources/assets/basemetals/models/item/pewter_bucket.json index 988591909..1bdaccce1 100644 --- a/src/generated/resources/assets/basemetals/models/item/pewter_bucket.json +++ b/src/generated/resources/assets/basemetals/models/item/pewter_bucket.json @@ -3,9 +3,9 @@ "fluid": "basemetals:pewter", "loader": "forge:fluid_container", "textures": { - "base": "basemetals:block/bucket_base", - "cover": "basemetals:block/bucket_cover", - "fluid": "basemetals:block/bucket_fluid", + "base": "basemetals:item/bucket_base", + "cover": "basemetals:item/bucket_cover", + "fluid": "basemetals:item/bucket_fluid", "particle": "#base" } } \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/models/item/platinum_bucket.json b/src/generated/resources/assets/basemetals/models/item/platinum_bucket.json index 274339b5b..0fb7094ec 100644 --- a/src/generated/resources/assets/basemetals/models/item/platinum_bucket.json +++ b/src/generated/resources/assets/basemetals/models/item/platinum_bucket.json @@ -3,9 +3,9 @@ "fluid": "basemetals:platinum", "loader": "forge:fluid_container", "textures": { - "base": "basemetals:block/bucket_base", - "cover": "basemetals:block/bucket_cover", - "fluid": "basemetals:block/bucket_fluid", + "base": "basemetals:item/bucket_base", + "cover": "basemetals:item/bucket_cover", + "fluid": "basemetals:item/bucket_fluid", "particle": "#base" } } \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/models/item/prismarine_bucket.json b/src/generated/resources/assets/basemetals/models/item/prismarine_bucket.json index f966edbb3..1596637b2 100644 --- a/src/generated/resources/assets/basemetals/models/item/prismarine_bucket.json +++ b/src/generated/resources/assets/basemetals/models/item/prismarine_bucket.json @@ -3,9 +3,9 @@ "fluid": "basemetals:prismarine", "loader": "forge:fluid_container", "textures": { - "base": "basemetals:block/bucket_base", - "cover": "basemetals:block/bucket_cover", - "fluid": "basemetals:block/bucket_fluid", + "base": "basemetals:item/bucket_base", + "cover": "basemetals:item/bucket_cover", + "fluid": "basemetals:item/bucket_fluid", "particle": "#base" } } \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/models/item/quartz_bucket.json b/src/generated/resources/assets/basemetals/models/item/quartz_bucket.json index 0748a6cef..a0571195b 100644 --- a/src/generated/resources/assets/basemetals/models/item/quartz_bucket.json +++ b/src/generated/resources/assets/basemetals/models/item/quartz_bucket.json @@ -3,9 +3,9 @@ "fluid": "basemetals:quartz", "loader": "forge:fluid_container", "textures": { - "base": "basemetals:block/bucket_base", - "cover": "basemetals:block/bucket_cover", - "fluid": "basemetals:block/bucket_fluid", + "base": "basemetals:item/bucket_base", + "cover": "basemetals:item/bucket_cover", + "fluid": "basemetals:item/bucket_fluid", "particle": "#base" } } \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/models/item/redstone_bucket.json b/src/generated/resources/assets/basemetals/models/item/redstone_bucket.json index 322699fc2..a5c231ade 100644 --- a/src/generated/resources/assets/basemetals/models/item/redstone_bucket.json +++ b/src/generated/resources/assets/basemetals/models/item/redstone_bucket.json @@ -3,9 +3,9 @@ "fluid": "basemetals:redstone", "loader": "forge:fluid_container", "textures": { - "base": "basemetals:block/bucket_base", - "cover": "basemetals:block/bucket_cover", - "fluid": "basemetals:block/bucket_fluid", + "base": "basemetals:item/bucket_base", + "cover": "basemetals:item/bucket_cover", + "fluid": "basemetals:item/bucket_fluid", "particle": "#base" } } \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/models/item/silver_bucket.json b/src/generated/resources/assets/basemetals/models/item/silver_bucket.json index cc80031fb..62439d0da 100644 --- a/src/generated/resources/assets/basemetals/models/item/silver_bucket.json +++ b/src/generated/resources/assets/basemetals/models/item/silver_bucket.json @@ -3,9 +3,9 @@ "fluid": "basemetals:silver", "loader": "forge:fluid_container", "textures": { - "base": "basemetals:block/bucket_base", - "cover": "basemetals:block/bucket_cover", - "fluid": "basemetals:block/bucket_fluid", + "base": "basemetals:item/bucket_base", + "cover": "basemetals:item/bucket_cover", + "fluid": "basemetals:item/bucket_fluid", "particle": "#base" } } \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/models/item/starsteel_bucket.json b/src/generated/resources/assets/basemetals/models/item/starsteel_bucket.json index bf8e559fd..b1f8dd288 100644 --- a/src/generated/resources/assets/basemetals/models/item/starsteel_bucket.json +++ b/src/generated/resources/assets/basemetals/models/item/starsteel_bucket.json @@ -3,9 +3,9 @@ "fluid": "basemetals:starsteel", "loader": "forge:fluid_container", "textures": { - "base": "basemetals:block/bucket_base", - "cover": "basemetals:block/bucket_cover", - "fluid": "basemetals:block/bucket_fluid", + "base": "basemetals:item/bucket_base", + "cover": "basemetals:item/bucket_cover", + "fluid": "basemetals:item/bucket_fluid", "particle": "#base" } } \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/models/item/steel_bucket.json b/src/generated/resources/assets/basemetals/models/item/steel_bucket.json index 034678326..be2f23556 100644 --- a/src/generated/resources/assets/basemetals/models/item/steel_bucket.json +++ b/src/generated/resources/assets/basemetals/models/item/steel_bucket.json @@ -3,9 +3,9 @@ "fluid": "basemetals:steel", "loader": "forge:fluid_container", "textures": { - "base": "basemetals:block/bucket_base", - "cover": "basemetals:block/bucket_cover", - "fluid": "basemetals:block/bucket_fluid", + "base": "basemetals:item/bucket_base", + "cover": "basemetals:item/bucket_cover", + "fluid": "basemetals:item/bucket_fluid", "particle": "#base" } } \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/models/item/stone_bucket.json b/src/generated/resources/assets/basemetals/models/item/stone_bucket.json index 81ed6d08d..aa28e8efc 100644 --- a/src/generated/resources/assets/basemetals/models/item/stone_bucket.json +++ b/src/generated/resources/assets/basemetals/models/item/stone_bucket.json @@ -3,9 +3,9 @@ "fluid": "basemetals:stone", "loader": "forge:fluid_container", "textures": { - "base": "basemetals:block/bucket_base", - "cover": "basemetals:block/bucket_cover", - "fluid": "basemetals:block/bucket_fluid", + "base": "basemetals:item/bucket_base", + "cover": "basemetals:item/bucket_cover", + "fluid": "basemetals:item/bucket_fluid", "particle": "#base" } } \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/models/item/tin_bucket.json b/src/generated/resources/assets/basemetals/models/item/tin_bucket.json index b700e66a7..01fc1d012 100644 --- a/src/generated/resources/assets/basemetals/models/item/tin_bucket.json +++ b/src/generated/resources/assets/basemetals/models/item/tin_bucket.json @@ -3,9 +3,9 @@ "fluid": "basemetals:tin", "loader": "forge:fluid_container", "textures": { - "base": "basemetals:block/bucket_base", - "cover": "basemetals:block/bucket_cover", - "fluid": "basemetals:block/bucket_fluid", + "base": "basemetals:item/bucket_base", + "cover": "basemetals:item/bucket_cover", + "fluid": "basemetals:item/bucket_fluid", "particle": "#base" } } \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/models/item/wood_bucket.json b/src/generated/resources/assets/basemetals/models/item/wood_bucket.json index b67b08a9a..e11fae192 100644 --- a/src/generated/resources/assets/basemetals/models/item/wood_bucket.json +++ b/src/generated/resources/assets/basemetals/models/item/wood_bucket.json @@ -3,9 +3,9 @@ "fluid": "basemetals:wood", "loader": "forge:fluid_container", "textures": { - "base": "basemetals:block/bucket_base", - "cover": "basemetals:block/bucket_cover", - "fluid": "basemetals:block/bucket_fluid", + "base": "basemetals:item/bucket_base", + "cover": "basemetals:item/bucket_cover", + "fluid": "basemetals:item/bucket_fluid", "particle": "#base" } } \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/models/item/zinc_bucket.json b/src/generated/resources/assets/basemetals/models/item/zinc_bucket.json index 3034062b4..9c5bf1a1a 100644 --- a/src/generated/resources/assets/basemetals/models/item/zinc_bucket.json +++ b/src/generated/resources/assets/basemetals/models/item/zinc_bucket.json @@ -3,9 +3,9 @@ "fluid": "basemetals:zinc", "loader": "forge:fluid_container", "textures": { - "base": "basemetals:block/bucket_base", - "cover": "basemetals:block/bucket_cover", - "fluid": "basemetals:block/bucket_fluid", + "base": "basemetals:item/bucket_base", + "cover": "basemetals:item/bucket_cover", + "fluid": "basemetals:item/bucket_fluid", "particle": "#base" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/registry_manifest.json b/src/generated/resources/data/basemetals/registry_manifest.json index 73da84d33..525ccb8da 100644 --- a/src/generated/resources/data/basemetals/registry_manifest.json +++ b/src/generated/resources/data/basemetals/registry_manifest.json @@ -1735,5 +1735,5 @@ "basemetals:wood", "basemetals:stone" ], - "source": "Base Metals 1.21.11 catalogue" + "source": "Base Metals 26.1.2 catalogue" } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/armorer/antimony_boots.json b/src/generated/resources/data/basemetals/villager_trade/armorer/antimony_boots.json new file mode 100644 index 000000000..788fedb56 --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/armorer/antimony_boots.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 1, + "id": "basemetals:antimony_boots" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:antimony_boots" + }, + "reputation_discount": 0.2, + "wants": { + "count": 1, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/armorer/antimony_chestplate.json b/src/generated/resources/data/basemetals/villager_trade/armorer/antimony_chestplate.json new file mode 100644 index 000000000..8d19aa1ef --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/armorer/antimony_chestplate.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 1, + "id": "basemetals:antimony_chestplate" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:antimony_chestplate" + }, + "reputation_discount": 0.2, + "wants": { + "count": 1, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/armorer/antimony_helmet.json b/src/generated/resources/data/basemetals/villager_trade/armorer/antimony_helmet.json new file mode 100644 index 000000000..e135ed795 --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/armorer/antimony_helmet.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 1, + "id": "basemetals:antimony_helmet" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:antimony_helmet" + }, + "reputation_discount": 0.2, + "wants": { + "count": 1, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/armorer/antimony_ingot.json b/src/generated/resources/data/basemetals/villager_trade/armorer/antimony_ingot.json new file mode 100644 index 000000000..906eab34a --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/armorer/antimony_ingot.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 12, + "id": "basemetals:antimony_ingot" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:antimony_ingot" + }, + "reputation_discount": 0.2, + "wants": { + "count": 1, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/armorer/antimony_leggings.json b/src/generated/resources/data/basemetals/villager_trade/armorer/antimony_leggings.json new file mode 100644 index 000000000..0db3004ad --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/armorer/antimony_leggings.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 1, + "id": "basemetals:antimony_leggings" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:antimony_leggings" + }, + "reputation_discount": 0.2, + "wants": { + "count": 1, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/armorer/bismuth_boots.json b/src/generated/resources/data/basemetals/villager_trade/armorer/bismuth_boots.json new file mode 100644 index 000000000..a156e3d57 --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/armorer/bismuth_boots.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 1, + "id": "basemetals:bismuth_boots" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:bismuth_boots" + }, + "reputation_discount": 0.2, + "wants": { + "count": 1, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/armorer/bismuth_chestplate.json b/src/generated/resources/data/basemetals/villager_trade/armorer/bismuth_chestplate.json new file mode 100644 index 000000000..6f9fadb20 --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/armorer/bismuth_chestplate.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 1, + "id": "basemetals:bismuth_chestplate" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:bismuth_chestplate" + }, + "reputation_discount": 0.2, + "wants": { + "count": 1, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/armorer/bismuth_helmet.json b/src/generated/resources/data/basemetals/villager_trade/armorer/bismuth_helmet.json new file mode 100644 index 000000000..38b98d8e3 --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/armorer/bismuth_helmet.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 1, + "id": "basemetals:bismuth_helmet" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:bismuth_helmet" + }, + "reputation_discount": 0.2, + "wants": { + "count": 1, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/armorer/bismuth_ingot.json b/src/generated/resources/data/basemetals/villager_trade/armorer/bismuth_ingot.json new file mode 100644 index 000000000..eec39bfa5 --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/armorer/bismuth_ingot.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 12, + "id": "basemetals:bismuth_ingot" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:bismuth_ingot" + }, + "reputation_discount": 0.2, + "wants": { + "count": 1, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/armorer/bismuth_leggings.json b/src/generated/resources/data/basemetals/villager_trade/armorer/bismuth_leggings.json new file mode 100644 index 000000000..d3ccbc8ca --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/armorer/bismuth_leggings.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 1, + "id": "basemetals:bismuth_leggings" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:bismuth_leggings" + }, + "reputation_discount": 0.2, + "wants": { + "count": 1, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/armorer/brass_boots.json b/src/generated/resources/data/basemetals/villager_trade/armorer/brass_boots.json new file mode 100644 index 000000000..4c7bbeb7a --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/armorer/brass_boots.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 1, + "id": "basemetals:brass_boots" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:brass_boots" + }, + "reputation_discount": 0.2, + "wants": { + "count": 4, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/armorer/brass_boots_enchanted.json b/src/generated/resources/data/basemetals/villager_trade/armorer/brass_boots_enchanted.json new file mode 100644 index 000000000..f64cadedb --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/armorer/brass_boots_enchanted.json @@ -0,0 +1,29 @@ +{ + "given_item_modifiers": [ + { + "function": "minecraft:enchant_with_levels", + "include_additional_cost_component": true, + "levels": { + "type": "minecraft:uniform", + "max": 19, + "min": 5 + }, + "options": "#minecraft:on_random_loot" + } + ], + "gives": { + "count": 1, + "id": "basemetals:brass_boots" + }, + "max_uses": 3, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:brass_boots" + }, + "reputation_discount": 0.2, + "wants": { + "count": 11, + "id": "minecraft:emerald" + }, + "xp": 15 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/armorer/brass_chestplate.json b/src/generated/resources/data/basemetals/villager_trade/armorer/brass_chestplate.json new file mode 100644 index 000000000..fd1e255f0 --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/armorer/brass_chestplate.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 1, + "id": "basemetals:brass_chestplate" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:brass_chestplate" + }, + "reputation_discount": 0.2, + "wants": { + "count": 4, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/armorer/brass_chestplate_enchanted.json b/src/generated/resources/data/basemetals/villager_trade/armorer/brass_chestplate_enchanted.json new file mode 100644 index 000000000..605d1f033 --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/armorer/brass_chestplate_enchanted.json @@ -0,0 +1,29 @@ +{ + "given_item_modifiers": [ + { + "function": "minecraft:enchant_with_levels", + "include_additional_cost_component": true, + "levels": { + "type": "minecraft:uniform", + "max": 19, + "min": 5 + }, + "options": "#minecraft:on_random_loot" + } + ], + "gives": { + "count": 1, + "id": "basemetals:brass_chestplate" + }, + "max_uses": 3, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:brass_chestplate" + }, + "reputation_discount": 0.2, + "wants": { + "count": 11, + "id": "minecraft:emerald" + }, + "xp": 15 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/armorer/brass_helmet.json b/src/generated/resources/data/basemetals/villager_trade/armorer/brass_helmet.json new file mode 100644 index 000000000..6129737b3 --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/armorer/brass_helmet.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 1, + "id": "basemetals:brass_helmet" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:brass_helmet" + }, + "reputation_discount": 0.2, + "wants": { + "count": 4, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/armorer/brass_helmet_enchanted.json b/src/generated/resources/data/basemetals/villager_trade/armorer/brass_helmet_enchanted.json new file mode 100644 index 000000000..3ab197271 --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/armorer/brass_helmet_enchanted.json @@ -0,0 +1,29 @@ +{ + "given_item_modifiers": [ + { + "function": "minecraft:enchant_with_levels", + "include_additional_cost_component": true, + "levels": { + "type": "minecraft:uniform", + "max": 19, + "min": 5 + }, + "options": "#minecraft:on_random_loot" + } + ], + "gives": { + "count": 1, + "id": "basemetals:brass_helmet" + }, + "max_uses": 3, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:brass_helmet" + }, + "reputation_discount": 0.2, + "wants": { + "count": 11, + "id": "minecraft:emerald" + }, + "xp": 15 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/armorer/brass_ingot.json b/src/generated/resources/data/basemetals/villager_trade/armorer/brass_ingot.json new file mode 100644 index 000000000..f31550371 --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/armorer/brass_ingot.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 12, + "id": "basemetals:brass_ingot" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:brass_ingot" + }, + "reputation_discount": 0.2, + "wants": { + "count": 3, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/armorer/brass_leggings.json b/src/generated/resources/data/basemetals/villager_trade/armorer/brass_leggings.json new file mode 100644 index 000000000..d08a486cb --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/armorer/brass_leggings.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 1, + "id": "basemetals:brass_leggings" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:brass_leggings" + }, + "reputation_discount": 0.2, + "wants": { + "count": 4, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/armorer/brass_leggings_enchanted.json b/src/generated/resources/data/basemetals/villager_trade/armorer/brass_leggings_enchanted.json new file mode 100644 index 000000000..182e9591f --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/armorer/brass_leggings_enchanted.json @@ -0,0 +1,29 @@ +{ + "given_item_modifiers": [ + { + "function": "minecraft:enchant_with_levels", + "include_additional_cost_component": true, + "levels": { + "type": "minecraft:uniform", + "max": 19, + "min": 5 + }, + "options": "#minecraft:on_random_loot" + } + ], + "gives": { + "count": 1, + "id": "basemetals:brass_leggings" + }, + "max_uses": 3, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:brass_leggings" + }, + "reputation_discount": 0.2, + "wants": { + "count": 11, + "id": "minecraft:emerald" + }, + "xp": 15 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/armorer/bronze_boots.json b/src/generated/resources/data/basemetals/villager_trade/armorer/bronze_boots.json new file mode 100644 index 000000000..55f53a054 --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/armorer/bronze_boots.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 1, + "id": "basemetals:bronze_boots" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:bronze_boots" + }, + "reputation_discount": 0.2, + "wants": { + "count": 7, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/armorer/bronze_chestplate.json b/src/generated/resources/data/basemetals/villager_trade/armorer/bronze_chestplate.json new file mode 100644 index 000000000..5a6b9a692 --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/armorer/bronze_chestplate.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 1, + "id": "basemetals:bronze_chestplate" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:bronze_chestplate" + }, + "reputation_discount": 0.2, + "wants": { + "count": 7, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/armorer/bronze_helmet.json b/src/generated/resources/data/basemetals/villager_trade/armorer/bronze_helmet.json new file mode 100644 index 000000000..fa8ad28ea --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/armorer/bronze_helmet.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 1, + "id": "basemetals:bronze_helmet" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:bronze_helmet" + }, + "reputation_discount": 0.2, + "wants": { + "count": 7, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/armorer/bronze_ingot.json b/src/generated/resources/data/basemetals/villager_trade/armorer/bronze_ingot.json new file mode 100644 index 000000000..2cd520423 --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/armorer/bronze_ingot.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 12, + "id": "basemetals:bronze_ingot" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:bronze_ingot" + }, + "reputation_discount": 0.2, + "wants": { + "count": 3, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/armorer/bronze_leggings.json b/src/generated/resources/data/basemetals/villager_trade/armorer/bronze_leggings.json new file mode 100644 index 000000000..757e999c0 --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/armorer/bronze_leggings.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 1, + "id": "basemetals:bronze_leggings" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:bronze_leggings" + }, + "reputation_discount": 0.2, + "wants": { + "count": 7, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/armorer/charcoal_powder.json b/src/generated/resources/data/basemetals/villager_trade/armorer/charcoal_powder.json new file mode 100644 index 000000000..0fc482acf --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/armorer/charcoal_powder.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 10, + "id": "basemetals:charcoal_powder" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:charcoal_powder" + }, + "reputation_discount": 0.2, + "wants": { + "count": 1, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/armorer/coal_powder.json b/src/generated/resources/data/basemetals/villager_trade/armorer/coal_powder.json new file mode 100644 index 000000000..efdd5be54 --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/armorer/coal_powder.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 10, + "id": "basemetals:coal_powder" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:coal_powder" + }, + "reputation_discount": 0.2, + "wants": { + "count": 1, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/armorer/copper_boots.json b/src/generated/resources/data/basemetals/villager_trade/armorer/copper_boots.json new file mode 100644 index 000000000..ffdb742d5 --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/armorer/copper_boots.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 1, + "id": "basemetals:copper_boots" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:copper_boots" + }, + "reputation_discount": 0.2, + "wants": { + "count": 4, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/armorer/copper_chestplate.json b/src/generated/resources/data/basemetals/villager_trade/armorer/copper_chestplate.json new file mode 100644 index 000000000..ee9867515 --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/armorer/copper_chestplate.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 1, + "id": "basemetals:copper_chestplate" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:copper_chestplate" + }, + "reputation_discount": 0.2, + "wants": { + "count": 4, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/armorer/copper_helmet.json b/src/generated/resources/data/basemetals/villager_trade/armorer/copper_helmet.json new file mode 100644 index 000000000..f2283a7a6 --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/armorer/copper_helmet.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 1, + "id": "basemetals:copper_helmet" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:copper_helmet" + }, + "reputation_discount": 0.2, + "wants": { + "count": 4, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/armorer/copper_ingot.json b/src/generated/resources/data/basemetals/villager_trade/armorer/copper_ingot.json new file mode 100644 index 000000000..ae935fc33 --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/armorer/copper_ingot.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 12, + "id": "minecraft:copper_ingot" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "minecraft:copper_ingot" + }, + "reputation_discount": 0.2, + "wants": { + "count": 2, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/armorer/copper_leggings.json b/src/generated/resources/data/basemetals/villager_trade/armorer/copper_leggings.json new file mode 100644 index 000000000..0635be4bd --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/armorer/copper_leggings.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 1, + "id": "basemetals:copper_leggings" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:copper_leggings" + }, + "reputation_discount": 0.2, + "wants": { + "count": 4, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/armorer/cupronickel_boots.json b/src/generated/resources/data/basemetals/villager_trade/armorer/cupronickel_boots.json new file mode 100644 index 000000000..47ed23691 --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/armorer/cupronickel_boots.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 1, + "id": "basemetals:cupronickel_boots" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:cupronickel_boots" + }, + "reputation_discount": 0.2, + "wants": { + "count": 7, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/armorer/cupronickel_boots_enchanted.json b/src/generated/resources/data/basemetals/villager_trade/armorer/cupronickel_boots_enchanted.json new file mode 100644 index 000000000..77de259bd --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/armorer/cupronickel_boots_enchanted.json @@ -0,0 +1,29 @@ +{ + "given_item_modifiers": [ + { + "function": "minecraft:enchant_with_levels", + "include_additional_cost_component": true, + "levels": { + "type": "minecraft:uniform", + "max": 19, + "min": 5 + }, + "options": "#minecraft:on_random_loot" + } + ], + "gives": { + "count": 1, + "id": "basemetals:cupronickel_boots" + }, + "max_uses": 3, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:cupronickel_boots" + }, + "reputation_discount": 0.2, + "wants": { + "count": 14, + "id": "minecraft:emerald" + }, + "xp": 15 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/armorer/cupronickel_chestplate.json b/src/generated/resources/data/basemetals/villager_trade/armorer/cupronickel_chestplate.json new file mode 100644 index 000000000..0b95ee65c --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/armorer/cupronickel_chestplate.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 1, + "id": "basemetals:cupronickel_chestplate" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:cupronickel_chestplate" + }, + "reputation_discount": 0.2, + "wants": { + "count": 7, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/armorer/cupronickel_chestplate_enchanted.json b/src/generated/resources/data/basemetals/villager_trade/armorer/cupronickel_chestplate_enchanted.json new file mode 100644 index 000000000..f9c2acf0d --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/armorer/cupronickel_chestplate_enchanted.json @@ -0,0 +1,29 @@ +{ + "given_item_modifiers": [ + { + "function": "minecraft:enchant_with_levels", + "include_additional_cost_component": true, + "levels": { + "type": "minecraft:uniform", + "max": 19, + "min": 5 + }, + "options": "#minecraft:on_random_loot" + } + ], + "gives": { + "count": 1, + "id": "basemetals:cupronickel_chestplate" + }, + "max_uses": 3, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:cupronickel_chestplate" + }, + "reputation_discount": 0.2, + "wants": { + "count": 14, + "id": "minecraft:emerald" + }, + "xp": 15 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/armorer/cupronickel_helmet.json b/src/generated/resources/data/basemetals/villager_trade/armorer/cupronickel_helmet.json new file mode 100644 index 000000000..85be6cec9 --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/armorer/cupronickel_helmet.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 1, + "id": "basemetals:cupronickel_helmet" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:cupronickel_helmet" + }, + "reputation_discount": 0.2, + "wants": { + "count": 7, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/armorer/cupronickel_helmet_enchanted.json b/src/generated/resources/data/basemetals/villager_trade/armorer/cupronickel_helmet_enchanted.json new file mode 100644 index 000000000..78046b2d6 --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/armorer/cupronickel_helmet_enchanted.json @@ -0,0 +1,29 @@ +{ + "given_item_modifiers": [ + { + "function": "minecraft:enchant_with_levels", + "include_additional_cost_component": true, + "levels": { + "type": "minecraft:uniform", + "max": 19, + "min": 5 + }, + "options": "#minecraft:on_random_loot" + } + ], + "gives": { + "count": 1, + "id": "basemetals:cupronickel_helmet" + }, + "max_uses": 3, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:cupronickel_helmet" + }, + "reputation_discount": 0.2, + "wants": { + "count": 14, + "id": "minecraft:emerald" + }, + "xp": 15 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/armorer/cupronickel_ingot.json b/src/generated/resources/data/basemetals/villager_trade/armorer/cupronickel_ingot.json new file mode 100644 index 000000000..202f39beb --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/armorer/cupronickel_ingot.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 12, + "id": "basemetals:cupronickel_ingot" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:cupronickel_ingot" + }, + "reputation_discount": 0.2, + "wants": { + "count": 4, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/armorer/cupronickel_leggings.json b/src/generated/resources/data/basemetals/villager_trade/armorer/cupronickel_leggings.json new file mode 100644 index 000000000..92d8eb0f3 --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/armorer/cupronickel_leggings.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 1, + "id": "basemetals:cupronickel_leggings" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:cupronickel_leggings" + }, + "reputation_discount": 0.2, + "wants": { + "count": 7, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/armorer/cupronickel_leggings_enchanted.json b/src/generated/resources/data/basemetals/villager_trade/armorer/cupronickel_leggings_enchanted.json new file mode 100644 index 000000000..03fc8a144 --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/armorer/cupronickel_leggings_enchanted.json @@ -0,0 +1,29 @@ +{ + "given_item_modifiers": [ + { + "function": "minecraft:enchant_with_levels", + "include_additional_cost_component": true, + "levels": { + "type": "minecraft:uniform", + "max": 19, + "min": 5 + }, + "options": "#minecraft:on_random_loot" + } + ], + "gives": { + "count": 1, + "id": "basemetals:cupronickel_leggings" + }, + "max_uses": 3, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:cupronickel_leggings" + }, + "reputation_discount": 0.2, + "wants": { + "count": 14, + "id": "minecraft:emerald" + }, + "xp": 15 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/armorer/electrum_boots.json b/src/generated/resources/data/basemetals/villager_trade/armorer/electrum_boots.json new file mode 100644 index 000000000..43c0e4205 --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/armorer/electrum_boots.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 1, + "id": "basemetals:electrum_boots" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:electrum_boots" + }, + "reputation_discount": 0.2, + "wants": { + "count": 6, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/armorer/electrum_boots_enchanted.json b/src/generated/resources/data/basemetals/villager_trade/armorer/electrum_boots_enchanted.json new file mode 100644 index 000000000..f921be574 --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/armorer/electrum_boots_enchanted.json @@ -0,0 +1,29 @@ +{ + "given_item_modifiers": [ + { + "function": "minecraft:enchant_with_levels", + "include_additional_cost_component": true, + "levels": { + "type": "minecraft:uniform", + "max": 19, + "min": 5 + }, + "options": "#minecraft:on_random_loot" + } + ], + "gives": { + "count": 1, + "id": "basemetals:electrum_boots" + }, + "max_uses": 3, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:electrum_boots" + }, + "reputation_discount": 0.2, + "wants": { + "count": 13, + "id": "minecraft:emerald" + }, + "xp": 15 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/armorer/electrum_chestplate.json b/src/generated/resources/data/basemetals/villager_trade/armorer/electrum_chestplate.json new file mode 100644 index 000000000..eb1974444 --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/armorer/electrum_chestplate.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 1, + "id": "basemetals:electrum_chestplate" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:electrum_chestplate" + }, + "reputation_discount": 0.2, + "wants": { + "count": 6, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/armorer/electrum_chestplate_enchanted.json b/src/generated/resources/data/basemetals/villager_trade/armorer/electrum_chestplate_enchanted.json new file mode 100644 index 000000000..042cecefc --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/armorer/electrum_chestplate_enchanted.json @@ -0,0 +1,29 @@ +{ + "given_item_modifiers": [ + { + "function": "minecraft:enchant_with_levels", + "include_additional_cost_component": true, + "levels": { + "type": "minecraft:uniform", + "max": 19, + "min": 5 + }, + "options": "#minecraft:on_random_loot" + } + ], + "gives": { + "count": 1, + "id": "basemetals:electrum_chestplate" + }, + "max_uses": 3, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:electrum_chestplate" + }, + "reputation_discount": 0.2, + "wants": { + "count": 13, + "id": "minecraft:emerald" + }, + "xp": 15 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/armorer/electrum_helmet.json b/src/generated/resources/data/basemetals/villager_trade/armorer/electrum_helmet.json new file mode 100644 index 000000000..48bb9ff59 --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/armorer/electrum_helmet.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 1, + "id": "basemetals:electrum_helmet" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:electrum_helmet" + }, + "reputation_discount": 0.2, + "wants": { + "count": 6, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/armorer/electrum_helmet_enchanted.json b/src/generated/resources/data/basemetals/villager_trade/armorer/electrum_helmet_enchanted.json new file mode 100644 index 000000000..e50d4a0fa --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/armorer/electrum_helmet_enchanted.json @@ -0,0 +1,29 @@ +{ + "given_item_modifiers": [ + { + "function": "minecraft:enchant_with_levels", + "include_additional_cost_component": true, + "levels": { + "type": "minecraft:uniform", + "max": 19, + "min": 5 + }, + "options": "#minecraft:on_random_loot" + } + ], + "gives": { + "count": 1, + "id": "basemetals:electrum_helmet" + }, + "max_uses": 3, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:electrum_helmet" + }, + "reputation_discount": 0.2, + "wants": { + "count": 13, + "id": "minecraft:emerald" + }, + "xp": 15 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/armorer/electrum_ingot.json b/src/generated/resources/data/basemetals/villager_trade/armorer/electrum_ingot.json new file mode 100644 index 000000000..de2af531e --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/armorer/electrum_ingot.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 12, + "id": "basemetals:electrum_ingot" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:electrum_ingot" + }, + "reputation_discount": 0.2, + "wants": { + "count": 4, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/armorer/electrum_leggings.json b/src/generated/resources/data/basemetals/villager_trade/armorer/electrum_leggings.json new file mode 100644 index 000000000..47b36d62a --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/armorer/electrum_leggings.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 1, + "id": "basemetals:electrum_leggings" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:electrum_leggings" + }, + "reputation_discount": 0.2, + "wants": { + "count": 6, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/armorer/electrum_leggings_enchanted.json b/src/generated/resources/data/basemetals/villager_trade/armorer/electrum_leggings_enchanted.json new file mode 100644 index 000000000..5be0d990e --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/armorer/electrum_leggings_enchanted.json @@ -0,0 +1,29 @@ +{ + "given_item_modifiers": [ + { + "function": "minecraft:enchant_with_levels", + "include_additional_cost_component": true, + "levels": { + "type": "minecraft:uniform", + "max": 19, + "min": 5 + }, + "options": "#minecraft:on_random_loot" + } + ], + "gives": { + "count": 1, + "id": "basemetals:electrum_leggings" + }, + "max_uses": 3, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:electrum_leggings" + }, + "reputation_discount": 0.2, + "wants": { + "count": 13, + "id": "minecraft:emerald" + }, + "xp": 15 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/armorer/invar_boots.json b/src/generated/resources/data/basemetals/villager_trade/armorer/invar_boots.json new file mode 100644 index 000000000..143ca299e --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/armorer/invar_boots.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 1, + "id": "basemetals:invar_boots" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:invar_boots" + }, + "reputation_discount": 0.2, + "wants": { + "count": 9, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/armorer/invar_chestplate.json b/src/generated/resources/data/basemetals/villager_trade/armorer/invar_chestplate.json new file mode 100644 index 000000000..43966279b --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/armorer/invar_chestplate.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 1, + "id": "basemetals:invar_chestplate" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:invar_chestplate" + }, + "reputation_discount": 0.2, + "wants": { + "count": 9, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/armorer/invar_helmet.json b/src/generated/resources/data/basemetals/villager_trade/armorer/invar_helmet.json new file mode 100644 index 000000000..8563daef7 --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/armorer/invar_helmet.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 1, + "id": "basemetals:invar_helmet" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:invar_helmet" + }, + "reputation_discount": 0.2, + "wants": { + "count": 9, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/armorer/invar_ingot.json b/src/generated/resources/data/basemetals/villager_trade/armorer/invar_ingot.json new file mode 100644 index 000000000..6bafcb756 --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/armorer/invar_ingot.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 12, + "id": "basemetals:invar_ingot" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:invar_ingot" + }, + "reputation_discount": 0.2, + "wants": { + "count": 5, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/armorer/invar_leggings.json b/src/generated/resources/data/basemetals/villager_trade/armorer/invar_leggings.json new file mode 100644 index 000000000..d1fb4d082 --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/armorer/invar_leggings.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 1, + "id": "basemetals:invar_leggings" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:invar_leggings" + }, + "reputation_discount": 0.2, + "wants": { + "count": 9, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/armorer/lead_boots.json b/src/generated/resources/data/basemetals/villager_trade/armorer/lead_boots.json new file mode 100644 index 000000000..e7431d3b0 --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/armorer/lead_boots.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 1, + "id": "basemetals:lead_boots" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:lead_boots" + }, + "reputation_discount": 0.2, + "wants": { + "count": 1, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/armorer/lead_chestplate.json b/src/generated/resources/data/basemetals/villager_trade/armorer/lead_chestplate.json new file mode 100644 index 000000000..802db43be --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/armorer/lead_chestplate.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 1, + "id": "basemetals:lead_chestplate" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:lead_chestplate" + }, + "reputation_discount": 0.2, + "wants": { + "count": 1, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/armorer/lead_helmet.json b/src/generated/resources/data/basemetals/villager_trade/armorer/lead_helmet.json new file mode 100644 index 000000000..0221c3e01 --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/armorer/lead_helmet.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 1, + "id": "basemetals:lead_helmet" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:lead_helmet" + }, + "reputation_discount": 0.2, + "wants": { + "count": 1, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/armorer/lead_ingot.json b/src/generated/resources/data/basemetals/villager_trade/armorer/lead_ingot.json new file mode 100644 index 000000000..d5eb2fa56 --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/armorer/lead_ingot.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 12, + "id": "basemetals:lead_ingot" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:lead_ingot" + }, + "reputation_discount": 0.2, + "wants": { + "count": 1, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/armorer/lead_leggings.json b/src/generated/resources/data/basemetals/villager_trade/armorer/lead_leggings.json new file mode 100644 index 000000000..e403a2110 --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/armorer/lead_leggings.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 1, + "id": "basemetals:lead_leggings" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:lead_leggings" + }, + "reputation_discount": 0.2, + "wants": { + "count": 1, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/armorer/mercury_ingot.json b/src/generated/resources/data/basemetals/villager_trade/armorer/mercury_ingot.json new file mode 100644 index 000000000..4d3ac83c7 --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/armorer/mercury_ingot.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 12, + "id": "basemetals:mercury_ingot" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:mercury_ingot" + }, + "reputation_discount": 0.2, + "wants": { + "count": 1, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/armorer/nickel_boots.json b/src/generated/resources/data/basemetals/villager_trade/armorer/nickel_boots.json new file mode 100644 index 000000000..337b274f0 --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/armorer/nickel_boots.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 1, + "id": "basemetals:nickel_boots" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:nickel_boots" + }, + "reputation_discount": 0.2, + "wants": { + "count": 5, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/armorer/nickel_boots_enchanted.json b/src/generated/resources/data/basemetals/villager_trade/armorer/nickel_boots_enchanted.json new file mode 100644 index 000000000..222989195 --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/armorer/nickel_boots_enchanted.json @@ -0,0 +1,29 @@ +{ + "given_item_modifiers": [ + { + "function": "minecraft:enchant_with_levels", + "include_additional_cost_component": true, + "levels": { + "type": "minecraft:uniform", + "max": 19, + "min": 5 + }, + "options": "#minecraft:on_random_loot" + } + ], + "gives": { + "count": 1, + "id": "basemetals:nickel_boots" + }, + "max_uses": 3, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:nickel_boots" + }, + "reputation_discount": 0.2, + "wants": { + "count": 12, + "id": "minecraft:emerald" + }, + "xp": 15 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/armorer/nickel_chestplate.json b/src/generated/resources/data/basemetals/villager_trade/armorer/nickel_chestplate.json new file mode 100644 index 000000000..e56a7a8d4 --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/armorer/nickel_chestplate.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 1, + "id": "basemetals:nickel_chestplate" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:nickel_chestplate" + }, + "reputation_discount": 0.2, + "wants": { + "count": 5, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/armorer/nickel_chestplate_enchanted.json b/src/generated/resources/data/basemetals/villager_trade/armorer/nickel_chestplate_enchanted.json new file mode 100644 index 000000000..a237edb4d --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/armorer/nickel_chestplate_enchanted.json @@ -0,0 +1,29 @@ +{ + "given_item_modifiers": [ + { + "function": "minecraft:enchant_with_levels", + "include_additional_cost_component": true, + "levels": { + "type": "minecraft:uniform", + "max": 19, + "min": 5 + }, + "options": "#minecraft:on_random_loot" + } + ], + "gives": { + "count": 1, + "id": "basemetals:nickel_chestplate" + }, + "max_uses": 3, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:nickel_chestplate" + }, + "reputation_discount": 0.2, + "wants": { + "count": 12, + "id": "minecraft:emerald" + }, + "xp": 15 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/armorer/nickel_helmet.json b/src/generated/resources/data/basemetals/villager_trade/armorer/nickel_helmet.json new file mode 100644 index 000000000..3909f0b8e --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/armorer/nickel_helmet.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 1, + "id": "basemetals:nickel_helmet" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:nickel_helmet" + }, + "reputation_discount": 0.2, + "wants": { + "count": 5, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/armorer/nickel_helmet_enchanted.json b/src/generated/resources/data/basemetals/villager_trade/armorer/nickel_helmet_enchanted.json new file mode 100644 index 000000000..7807eb27f --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/armorer/nickel_helmet_enchanted.json @@ -0,0 +1,29 @@ +{ + "given_item_modifiers": [ + { + "function": "minecraft:enchant_with_levels", + "include_additional_cost_component": true, + "levels": { + "type": "minecraft:uniform", + "max": 19, + "min": 5 + }, + "options": "#minecraft:on_random_loot" + } + ], + "gives": { + "count": 1, + "id": "basemetals:nickel_helmet" + }, + "max_uses": 3, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:nickel_helmet" + }, + "reputation_discount": 0.2, + "wants": { + "count": 12, + "id": "minecraft:emerald" + }, + "xp": 15 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/armorer/nickel_ingot.json b/src/generated/resources/data/basemetals/villager_trade/armorer/nickel_ingot.json new file mode 100644 index 000000000..3686cce1f --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/armorer/nickel_ingot.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 12, + "id": "basemetals:nickel_ingot" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:nickel_ingot" + }, + "reputation_discount": 0.2, + "wants": { + "count": 3, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/armorer/nickel_leggings.json b/src/generated/resources/data/basemetals/villager_trade/armorer/nickel_leggings.json new file mode 100644 index 000000000..22a646f5d --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/armorer/nickel_leggings.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 1, + "id": "basemetals:nickel_leggings" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:nickel_leggings" + }, + "reputation_discount": 0.2, + "wants": { + "count": 5, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/armorer/nickel_leggings_enchanted.json b/src/generated/resources/data/basemetals/villager_trade/armorer/nickel_leggings_enchanted.json new file mode 100644 index 000000000..1c73e166a --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/armorer/nickel_leggings_enchanted.json @@ -0,0 +1,29 @@ +{ + "given_item_modifiers": [ + { + "function": "minecraft:enchant_with_levels", + "include_additional_cost_component": true, + "levels": { + "type": "minecraft:uniform", + "max": 19, + "min": 5 + }, + "options": "#minecraft:on_random_loot" + } + ], + "gives": { + "count": 1, + "id": "basemetals:nickel_leggings" + }, + "max_uses": 3, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:nickel_leggings" + }, + "reputation_discount": 0.2, + "wants": { + "count": 12, + "id": "minecraft:emerald" + }, + "xp": 15 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/armorer/pewter_boots.json b/src/generated/resources/data/basemetals/villager_trade/armorer/pewter_boots.json new file mode 100644 index 000000000..63fd2a396 --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/armorer/pewter_boots.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 1, + "id": "basemetals:pewter_boots" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:pewter_boots" + }, + "reputation_discount": 0.2, + "wants": { + "count": 1, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/armorer/pewter_chestplate.json b/src/generated/resources/data/basemetals/villager_trade/armorer/pewter_chestplate.json new file mode 100644 index 000000000..6b70183d0 --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/armorer/pewter_chestplate.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 1, + "id": "basemetals:pewter_chestplate" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:pewter_chestplate" + }, + "reputation_discount": 0.2, + "wants": { + "count": 1, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/armorer/pewter_helmet.json b/src/generated/resources/data/basemetals/villager_trade/armorer/pewter_helmet.json new file mode 100644 index 000000000..b3ff4728f --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/armorer/pewter_helmet.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 1, + "id": "basemetals:pewter_helmet" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:pewter_helmet" + }, + "reputation_discount": 0.2, + "wants": { + "count": 1, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/armorer/pewter_ingot.json b/src/generated/resources/data/basemetals/villager_trade/armorer/pewter_ingot.json new file mode 100644 index 000000000..bbe3b8b98 --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/armorer/pewter_ingot.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 12, + "id": "basemetals:pewter_ingot" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:pewter_ingot" + }, + "reputation_discount": 0.2, + "wants": { + "count": 1, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/armorer/pewter_leggings.json b/src/generated/resources/data/basemetals/villager_trade/armorer/pewter_leggings.json new file mode 100644 index 000000000..d8799b7c1 --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/armorer/pewter_leggings.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 1, + "id": "basemetals:pewter_leggings" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:pewter_leggings" + }, + "reputation_discount": 0.2, + "wants": { + "count": 1, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/armorer/silver_boots.json b/src/generated/resources/data/basemetals/villager_trade/armorer/silver_boots.json new file mode 100644 index 000000000..7366eeae0 --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/armorer/silver_boots.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 1, + "id": "basemetals:silver_boots" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:silver_boots" + }, + "reputation_discount": 0.2, + "wants": { + "count": 5, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/armorer/silver_boots_enchanted.json b/src/generated/resources/data/basemetals/villager_trade/armorer/silver_boots_enchanted.json new file mode 100644 index 000000000..90f239b6a --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/armorer/silver_boots_enchanted.json @@ -0,0 +1,29 @@ +{ + "given_item_modifiers": [ + { + "function": "minecraft:enchant_with_levels", + "include_additional_cost_component": true, + "levels": { + "type": "minecraft:uniform", + "max": 19, + "min": 5 + }, + "options": "#minecraft:on_random_loot" + } + ], + "gives": { + "count": 1, + "id": "basemetals:silver_boots" + }, + "max_uses": 3, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:silver_boots" + }, + "reputation_discount": 0.2, + "wants": { + "count": 12, + "id": "minecraft:emerald" + }, + "xp": 15 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/armorer/silver_chestplate.json b/src/generated/resources/data/basemetals/villager_trade/armorer/silver_chestplate.json new file mode 100644 index 000000000..94348d447 --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/armorer/silver_chestplate.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 1, + "id": "basemetals:silver_chestplate" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:silver_chestplate" + }, + "reputation_discount": 0.2, + "wants": { + "count": 5, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/armorer/silver_chestplate_enchanted.json b/src/generated/resources/data/basemetals/villager_trade/armorer/silver_chestplate_enchanted.json new file mode 100644 index 000000000..b6b1ac378 --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/armorer/silver_chestplate_enchanted.json @@ -0,0 +1,29 @@ +{ + "given_item_modifiers": [ + { + "function": "minecraft:enchant_with_levels", + "include_additional_cost_component": true, + "levels": { + "type": "minecraft:uniform", + "max": 19, + "min": 5 + }, + "options": "#minecraft:on_random_loot" + } + ], + "gives": { + "count": 1, + "id": "basemetals:silver_chestplate" + }, + "max_uses": 3, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:silver_chestplate" + }, + "reputation_discount": 0.2, + "wants": { + "count": 12, + "id": "minecraft:emerald" + }, + "xp": 15 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/armorer/silver_helmet.json b/src/generated/resources/data/basemetals/villager_trade/armorer/silver_helmet.json new file mode 100644 index 000000000..30874b295 --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/armorer/silver_helmet.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 1, + "id": "basemetals:silver_helmet" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:silver_helmet" + }, + "reputation_discount": 0.2, + "wants": { + "count": 5, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/armorer/silver_helmet_enchanted.json b/src/generated/resources/data/basemetals/villager_trade/armorer/silver_helmet_enchanted.json new file mode 100644 index 000000000..bb260f53c --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/armorer/silver_helmet_enchanted.json @@ -0,0 +1,29 @@ +{ + "given_item_modifiers": [ + { + "function": "minecraft:enchant_with_levels", + "include_additional_cost_component": true, + "levels": { + "type": "minecraft:uniform", + "max": 19, + "min": 5 + }, + "options": "#minecraft:on_random_loot" + } + ], + "gives": { + "count": 1, + "id": "basemetals:silver_helmet" + }, + "max_uses": 3, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:silver_helmet" + }, + "reputation_discount": 0.2, + "wants": { + "count": 12, + "id": "minecraft:emerald" + }, + "xp": 15 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/armorer/silver_ingot.json b/src/generated/resources/data/basemetals/villager_trade/armorer/silver_ingot.json new file mode 100644 index 000000000..c2577020f --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/armorer/silver_ingot.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 12, + "id": "basemetals:silver_ingot" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:silver_ingot" + }, + "reputation_discount": 0.2, + "wants": { + "count": 3, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/armorer/silver_leggings.json b/src/generated/resources/data/basemetals/villager_trade/armorer/silver_leggings.json new file mode 100644 index 000000000..f4dcfc9cf --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/armorer/silver_leggings.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 1, + "id": "basemetals:silver_leggings" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:silver_leggings" + }, + "reputation_discount": 0.2, + "wants": { + "count": 5, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/armorer/silver_leggings_enchanted.json b/src/generated/resources/data/basemetals/villager_trade/armorer/silver_leggings_enchanted.json new file mode 100644 index 000000000..bdaffafc4 --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/armorer/silver_leggings_enchanted.json @@ -0,0 +1,29 @@ +{ + "given_item_modifiers": [ + { + "function": "minecraft:enchant_with_levels", + "include_additional_cost_component": true, + "levels": { + "type": "minecraft:uniform", + "max": 19, + "min": 5 + }, + "options": "#minecraft:on_random_loot" + } + ], + "gives": { + "count": 1, + "id": "basemetals:silver_leggings" + }, + "max_uses": 3, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:silver_leggings" + }, + "reputation_discount": 0.2, + "wants": { + "count": 12, + "id": "minecraft:emerald" + }, + "xp": 15 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/armorer/steel_boots.json b/src/generated/resources/data/basemetals/villager_trade/armorer/steel_boots.json new file mode 100644 index 000000000..60b607258 --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/armorer/steel_boots.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 1, + "id": "basemetals:steel_boots" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:steel_boots" + }, + "reputation_discount": 0.2, + "wants": { + "count": 9, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/armorer/steel_chestplate.json b/src/generated/resources/data/basemetals/villager_trade/armorer/steel_chestplate.json new file mode 100644 index 000000000..336a95955 --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/armorer/steel_chestplate.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 1, + "id": "basemetals:steel_chestplate" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:steel_chestplate" + }, + "reputation_discount": 0.2, + "wants": { + "count": 9, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/armorer/steel_helmet.json b/src/generated/resources/data/basemetals/villager_trade/armorer/steel_helmet.json new file mode 100644 index 000000000..b12f769d8 --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/armorer/steel_helmet.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 1, + "id": "basemetals:steel_helmet" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:steel_helmet" + }, + "reputation_discount": 0.2, + "wants": { + "count": 9, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/armorer/steel_ingot.json b/src/generated/resources/data/basemetals/villager_trade/armorer/steel_ingot.json new file mode 100644 index 000000000..e2da706a2 --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/armorer/steel_ingot.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 12, + "id": "basemetals:steel_ingot" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:steel_ingot" + }, + "reputation_discount": 0.2, + "wants": { + "count": 5, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/armorer/steel_leggings.json b/src/generated/resources/data/basemetals/villager_trade/armorer/steel_leggings.json new file mode 100644 index 000000000..6db646bcf --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/armorer/steel_leggings.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 1, + "id": "basemetals:steel_leggings" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:steel_leggings" + }, + "reputation_discount": 0.2, + "wants": { + "count": 9, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/armorer/tin_boots.json b/src/generated/resources/data/basemetals/villager_trade/armorer/tin_boots.json new file mode 100644 index 000000000..9f7f4bcef --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/armorer/tin_boots.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 1, + "id": "basemetals:tin_boots" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:tin_boots" + }, + "reputation_discount": 0.2, + "wants": { + "count": 2, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/armorer/tin_chestplate.json b/src/generated/resources/data/basemetals/villager_trade/armorer/tin_chestplate.json new file mode 100644 index 000000000..eba53abfd --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/armorer/tin_chestplate.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 1, + "id": "basemetals:tin_chestplate" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:tin_chestplate" + }, + "reputation_discount": 0.2, + "wants": { + "count": 2, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/armorer/tin_helmet.json b/src/generated/resources/data/basemetals/villager_trade/armorer/tin_helmet.json new file mode 100644 index 000000000..5d0ecbf87 --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/armorer/tin_helmet.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 1, + "id": "basemetals:tin_helmet" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:tin_helmet" + }, + "reputation_discount": 0.2, + "wants": { + "count": 2, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/armorer/tin_ingot.json b/src/generated/resources/data/basemetals/villager_trade/armorer/tin_ingot.json new file mode 100644 index 000000000..4e4d34d26 --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/armorer/tin_ingot.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 12, + "id": "basemetals:tin_ingot" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:tin_ingot" + }, + "reputation_discount": 0.2, + "wants": { + "count": 1, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/armorer/tin_leggings.json b/src/generated/resources/data/basemetals/villager_trade/armorer/tin_leggings.json new file mode 100644 index 000000000..52867c79d --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/armorer/tin_leggings.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 1, + "id": "basemetals:tin_leggings" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:tin_leggings" + }, + "reputation_discount": 0.2, + "wants": { + "count": 2, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/armorer/zinc_boots.json b/src/generated/resources/data/basemetals/villager_trade/armorer/zinc_boots.json new file mode 100644 index 000000000..2c5fef42e --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/armorer/zinc_boots.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 1, + "id": "basemetals:zinc_boots" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:zinc_boots" + }, + "reputation_discount": 0.2, + "wants": { + "count": 1, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/armorer/zinc_chestplate.json b/src/generated/resources/data/basemetals/villager_trade/armorer/zinc_chestplate.json new file mode 100644 index 000000000..8b369b38c --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/armorer/zinc_chestplate.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 1, + "id": "basemetals:zinc_chestplate" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:zinc_chestplate" + }, + "reputation_discount": 0.2, + "wants": { + "count": 1, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/armorer/zinc_helmet.json b/src/generated/resources/data/basemetals/villager_trade/armorer/zinc_helmet.json new file mode 100644 index 000000000..721e159ab --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/armorer/zinc_helmet.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 1, + "id": "basemetals:zinc_helmet" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:zinc_helmet" + }, + "reputation_discount": 0.2, + "wants": { + "count": 1, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/armorer/zinc_ingot.json b/src/generated/resources/data/basemetals/villager_trade/armorer/zinc_ingot.json new file mode 100644 index 000000000..93fa944ca --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/armorer/zinc_ingot.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 12, + "id": "basemetals:zinc_ingot" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:zinc_ingot" + }, + "reputation_discount": 0.2, + "wants": { + "count": 1, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/armorer/zinc_leggings.json b/src/generated/resources/data/basemetals/villager_trade/armorer/zinc_leggings.json new file mode 100644 index 000000000..56f008adb --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/armorer/zinc_leggings.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 1, + "id": "basemetals:zinc_leggings" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:zinc_leggings" + }, + "reputation_discount": 0.2, + "wants": { + "count": 1, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/toolsmith/antimony_axe.json b/src/generated/resources/data/basemetals/villager_trade/toolsmith/antimony_axe.json new file mode 100644 index 000000000..b6a12c655 --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/toolsmith/antimony_axe.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 1, + "id": "basemetals:antimony_axe" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:antimony_axe" + }, + "reputation_discount": 0.2, + "wants": { + "count": 1, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/toolsmith/antimony_crackhammer.json b/src/generated/resources/data/basemetals/villager_trade/toolsmith/antimony_crackhammer.json new file mode 100644 index 000000000..e926a1f87 --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/toolsmith/antimony_crackhammer.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 1, + "id": "basemetals:antimony_crackhammer" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:antimony_crackhammer" + }, + "reputation_discount": 0.2, + "wants": { + "count": 1, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/toolsmith/antimony_hoe.json b/src/generated/resources/data/basemetals/villager_trade/toolsmith/antimony_hoe.json new file mode 100644 index 000000000..25ecd0cbf --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/toolsmith/antimony_hoe.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 1, + "id": "basemetals:antimony_hoe" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:antimony_hoe" + }, + "reputation_discount": 0.2, + "wants": { + "count": 1, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/toolsmith/antimony_ingot.json b/src/generated/resources/data/basemetals/villager_trade/toolsmith/antimony_ingot.json new file mode 100644 index 000000000..906eab34a --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/toolsmith/antimony_ingot.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 12, + "id": "basemetals:antimony_ingot" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:antimony_ingot" + }, + "reputation_discount": 0.2, + "wants": { + "count": 1, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/toolsmith/antimony_pickaxe.json b/src/generated/resources/data/basemetals/villager_trade/toolsmith/antimony_pickaxe.json new file mode 100644 index 000000000..44bdf90ee --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/toolsmith/antimony_pickaxe.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 1, + "id": "basemetals:antimony_pickaxe" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:antimony_pickaxe" + }, + "reputation_discount": 0.2, + "wants": { + "count": 1, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/toolsmith/antimony_shovel.json b/src/generated/resources/data/basemetals/villager_trade/toolsmith/antimony_shovel.json new file mode 100644 index 000000000..9b0ae5684 --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/toolsmith/antimony_shovel.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 1, + "id": "basemetals:antimony_shovel" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:antimony_shovel" + }, + "reputation_discount": 0.2, + "wants": { + "count": 1, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/toolsmith/bismuth_axe.json b/src/generated/resources/data/basemetals/villager_trade/toolsmith/bismuth_axe.json new file mode 100644 index 000000000..e70b45254 --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/toolsmith/bismuth_axe.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 1, + "id": "basemetals:bismuth_axe" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:bismuth_axe" + }, + "reputation_discount": 0.2, + "wants": { + "count": 1, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/toolsmith/bismuth_crackhammer.json b/src/generated/resources/data/basemetals/villager_trade/toolsmith/bismuth_crackhammer.json new file mode 100644 index 000000000..41b63d6c9 --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/toolsmith/bismuth_crackhammer.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 1, + "id": "basemetals:bismuth_crackhammer" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:bismuth_crackhammer" + }, + "reputation_discount": 0.2, + "wants": { + "count": 1, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/toolsmith/bismuth_hoe.json b/src/generated/resources/data/basemetals/villager_trade/toolsmith/bismuth_hoe.json new file mode 100644 index 000000000..9389d6a68 --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/toolsmith/bismuth_hoe.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 1, + "id": "basemetals:bismuth_hoe" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:bismuth_hoe" + }, + "reputation_discount": 0.2, + "wants": { + "count": 1, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/toolsmith/bismuth_ingot.json b/src/generated/resources/data/basemetals/villager_trade/toolsmith/bismuth_ingot.json new file mode 100644 index 000000000..eec39bfa5 --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/toolsmith/bismuth_ingot.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 12, + "id": "basemetals:bismuth_ingot" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:bismuth_ingot" + }, + "reputation_discount": 0.2, + "wants": { + "count": 1, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/toolsmith/bismuth_pickaxe.json b/src/generated/resources/data/basemetals/villager_trade/toolsmith/bismuth_pickaxe.json new file mode 100644 index 000000000..c84daf7b5 --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/toolsmith/bismuth_pickaxe.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 1, + "id": "basemetals:bismuth_pickaxe" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:bismuth_pickaxe" + }, + "reputation_discount": 0.2, + "wants": { + "count": 1, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/toolsmith/bismuth_shovel.json b/src/generated/resources/data/basemetals/villager_trade/toolsmith/bismuth_shovel.json new file mode 100644 index 000000000..3d8c27941 --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/toolsmith/bismuth_shovel.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 1, + "id": "basemetals:bismuth_shovel" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:bismuth_shovel" + }, + "reputation_discount": 0.2, + "wants": { + "count": 1, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/toolsmith/brass_axe.json b/src/generated/resources/data/basemetals/villager_trade/toolsmith/brass_axe.json new file mode 100644 index 000000000..ea984801c --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/toolsmith/brass_axe.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 1, + "id": "basemetals:brass_axe" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:brass_axe" + }, + "reputation_discount": 0.2, + "wants": { + "count": 3, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/toolsmith/brass_axe_enchanted.json b/src/generated/resources/data/basemetals/villager_trade/toolsmith/brass_axe_enchanted.json new file mode 100644 index 000000000..e463d7423 --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/toolsmith/brass_axe_enchanted.json @@ -0,0 +1,29 @@ +{ + "given_item_modifiers": [ + { + "function": "minecraft:enchant_with_levels", + "include_additional_cost_component": true, + "levels": { + "type": "minecraft:uniform", + "max": 19, + "min": 5 + }, + "options": "#minecraft:on_random_loot" + } + ], + "gives": { + "count": 1, + "id": "basemetals:brass_axe" + }, + "max_uses": 3, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:brass_axe" + }, + "reputation_discount": 0.2, + "wants": { + "count": 10, + "id": "minecraft:emerald" + }, + "xp": 15 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/toolsmith/brass_crackhammer.json b/src/generated/resources/data/basemetals/villager_trade/toolsmith/brass_crackhammer.json new file mode 100644 index 000000000..02c8c6e13 --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/toolsmith/brass_crackhammer.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 1, + "id": "basemetals:brass_crackhammer" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:brass_crackhammer" + }, + "reputation_discount": 0.2, + "wants": { + "count": 3, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/toolsmith/brass_crackhammer_enchanted.json b/src/generated/resources/data/basemetals/villager_trade/toolsmith/brass_crackhammer_enchanted.json new file mode 100644 index 000000000..4c4f3ec26 --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/toolsmith/brass_crackhammer_enchanted.json @@ -0,0 +1,29 @@ +{ + "given_item_modifiers": [ + { + "function": "minecraft:enchant_with_levels", + "include_additional_cost_component": true, + "levels": { + "type": "minecraft:uniform", + "max": 19, + "min": 5 + }, + "options": "#minecraft:on_random_loot" + } + ], + "gives": { + "count": 1, + "id": "basemetals:brass_crackhammer" + }, + "max_uses": 3, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:brass_crackhammer" + }, + "reputation_discount": 0.2, + "wants": { + "count": 10, + "id": "minecraft:emerald" + }, + "xp": 15 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/toolsmith/brass_hoe.json b/src/generated/resources/data/basemetals/villager_trade/toolsmith/brass_hoe.json new file mode 100644 index 000000000..1cf9f9de2 --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/toolsmith/brass_hoe.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 1, + "id": "basemetals:brass_hoe" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:brass_hoe" + }, + "reputation_discount": 0.2, + "wants": { + "count": 3, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/toolsmith/brass_hoe_enchanted.json b/src/generated/resources/data/basemetals/villager_trade/toolsmith/brass_hoe_enchanted.json new file mode 100644 index 000000000..e0a2d1233 --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/toolsmith/brass_hoe_enchanted.json @@ -0,0 +1,29 @@ +{ + "given_item_modifiers": [ + { + "function": "minecraft:enchant_with_levels", + "include_additional_cost_component": true, + "levels": { + "type": "minecraft:uniform", + "max": 19, + "min": 5 + }, + "options": "#minecraft:on_random_loot" + } + ], + "gives": { + "count": 1, + "id": "basemetals:brass_hoe" + }, + "max_uses": 3, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:brass_hoe" + }, + "reputation_discount": 0.2, + "wants": { + "count": 10, + "id": "minecraft:emerald" + }, + "xp": 15 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/toolsmith/brass_ingot.json b/src/generated/resources/data/basemetals/villager_trade/toolsmith/brass_ingot.json new file mode 100644 index 000000000..f31550371 --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/toolsmith/brass_ingot.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 12, + "id": "basemetals:brass_ingot" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:brass_ingot" + }, + "reputation_discount": 0.2, + "wants": { + "count": 3, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/toolsmith/brass_pickaxe.json b/src/generated/resources/data/basemetals/villager_trade/toolsmith/brass_pickaxe.json new file mode 100644 index 000000000..acc2ee93a --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/toolsmith/brass_pickaxe.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 1, + "id": "basemetals:brass_pickaxe" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:brass_pickaxe" + }, + "reputation_discount": 0.2, + "wants": { + "count": 3, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/toolsmith/brass_pickaxe_enchanted.json b/src/generated/resources/data/basemetals/villager_trade/toolsmith/brass_pickaxe_enchanted.json new file mode 100644 index 000000000..068ccd8bc --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/toolsmith/brass_pickaxe_enchanted.json @@ -0,0 +1,29 @@ +{ + "given_item_modifiers": [ + { + "function": "minecraft:enchant_with_levels", + "include_additional_cost_component": true, + "levels": { + "type": "minecraft:uniform", + "max": 19, + "min": 5 + }, + "options": "#minecraft:on_random_loot" + } + ], + "gives": { + "count": 1, + "id": "basemetals:brass_pickaxe" + }, + "max_uses": 3, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:brass_pickaxe" + }, + "reputation_discount": 0.2, + "wants": { + "count": 10, + "id": "minecraft:emerald" + }, + "xp": 15 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/toolsmith/brass_shovel.json b/src/generated/resources/data/basemetals/villager_trade/toolsmith/brass_shovel.json new file mode 100644 index 000000000..81a866020 --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/toolsmith/brass_shovel.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 1, + "id": "basemetals:brass_shovel" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:brass_shovel" + }, + "reputation_discount": 0.2, + "wants": { + "count": 3, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/toolsmith/brass_shovel_enchanted.json b/src/generated/resources/data/basemetals/villager_trade/toolsmith/brass_shovel_enchanted.json new file mode 100644 index 000000000..b05df8248 --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/toolsmith/brass_shovel_enchanted.json @@ -0,0 +1,29 @@ +{ + "given_item_modifiers": [ + { + "function": "minecraft:enchant_with_levels", + "include_additional_cost_component": true, + "levels": { + "type": "minecraft:uniform", + "max": 19, + "min": 5 + }, + "options": "#minecraft:on_random_loot" + } + ], + "gives": { + "count": 1, + "id": "basemetals:brass_shovel" + }, + "max_uses": 3, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:brass_shovel" + }, + "reputation_discount": 0.2, + "wants": { + "count": 10, + "id": "minecraft:emerald" + }, + "xp": 15 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/toolsmith/bronze_axe.json b/src/generated/resources/data/basemetals/villager_trade/toolsmith/bronze_axe.json new file mode 100644 index 000000000..43a984de4 --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/toolsmith/bronze_axe.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 1, + "id": "basemetals:bronze_axe" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:bronze_axe" + }, + "reputation_discount": 0.2, + "wants": { + "count": 3, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/toolsmith/bronze_crackhammer.json b/src/generated/resources/data/basemetals/villager_trade/toolsmith/bronze_crackhammer.json new file mode 100644 index 000000000..a16a9d415 --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/toolsmith/bronze_crackhammer.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 1, + "id": "basemetals:bronze_crackhammer" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:bronze_crackhammer" + }, + "reputation_discount": 0.2, + "wants": { + "count": 3, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/toolsmith/bronze_hoe.json b/src/generated/resources/data/basemetals/villager_trade/toolsmith/bronze_hoe.json new file mode 100644 index 000000000..aba019ef7 --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/toolsmith/bronze_hoe.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 1, + "id": "basemetals:bronze_hoe" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:bronze_hoe" + }, + "reputation_discount": 0.2, + "wants": { + "count": 3, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/toolsmith/bronze_ingot.json b/src/generated/resources/data/basemetals/villager_trade/toolsmith/bronze_ingot.json new file mode 100644 index 000000000..2cd520423 --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/toolsmith/bronze_ingot.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 12, + "id": "basemetals:bronze_ingot" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:bronze_ingot" + }, + "reputation_discount": 0.2, + "wants": { + "count": 3, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/toolsmith/bronze_pickaxe.json b/src/generated/resources/data/basemetals/villager_trade/toolsmith/bronze_pickaxe.json new file mode 100644 index 000000000..4ff6b1581 --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/toolsmith/bronze_pickaxe.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 1, + "id": "basemetals:bronze_pickaxe" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:bronze_pickaxe" + }, + "reputation_discount": 0.2, + "wants": { + "count": 3, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/toolsmith/bronze_shovel.json b/src/generated/resources/data/basemetals/villager_trade/toolsmith/bronze_shovel.json new file mode 100644 index 000000000..28e21c298 --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/toolsmith/bronze_shovel.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 1, + "id": "basemetals:bronze_shovel" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:bronze_shovel" + }, + "reputation_discount": 0.2, + "wants": { + "count": 3, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/toolsmith/charcoal_powder.json b/src/generated/resources/data/basemetals/villager_trade/toolsmith/charcoal_powder.json new file mode 100644 index 000000000..0fc482acf --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/toolsmith/charcoal_powder.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 10, + "id": "basemetals:charcoal_powder" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:charcoal_powder" + }, + "reputation_discount": 0.2, + "wants": { + "count": 1, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/toolsmith/coal_powder.json b/src/generated/resources/data/basemetals/villager_trade/toolsmith/coal_powder.json new file mode 100644 index 000000000..efdd5be54 --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/toolsmith/coal_powder.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 10, + "id": "basemetals:coal_powder" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:coal_powder" + }, + "reputation_discount": 0.2, + "wants": { + "count": 1, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/toolsmith/copper_axe.json b/src/generated/resources/data/basemetals/villager_trade/toolsmith/copper_axe.json new file mode 100644 index 000000000..e9bf4a370 --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/toolsmith/copper_axe.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 1, + "id": "basemetals:copper_axe" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:copper_axe" + }, + "reputation_discount": 0.2, + "wants": { + "count": 2, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/toolsmith/copper_crackhammer.json b/src/generated/resources/data/basemetals/villager_trade/toolsmith/copper_crackhammer.json new file mode 100644 index 000000000..825f3e2ed --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/toolsmith/copper_crackhammer.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 1, + "id": "basemetals:copper_crackhammer" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:copper_crackhammer" + }, + "reputation_discount": 0.2, + "wants": { + "count": 2, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/toolsmith/copper_hoe.json b/src/generated/resources/data/basemetals/villager_trade/toolsmith/copper_hoe.json new file mode 100644 index 000000000..0c3938fc1 --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/toolsmith/copper_hoe.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 1, + "id": "basemetals:copper_hoe" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:copper_hoe" + }, + "reputation_discount": 0.2, + "wants": { + "count": 2, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/toolsmith/copper_ingot.json b/src/generated/resources/data/basemetals/villager_trade/toolsmith/copper_ingot.json new file mode 100644 index 000000000..ae935fc33 --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/toolsmith/copper_ingot.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 12, + "id": "minecraft:copper_ingot" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "minecraft:copper_ingot" + }, + "reputation_discount": 0.2, + "wants": { + "count": 2, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/toolsmith/copper_pickaxe.json b/src/generated/resources/data/basemetals/villager_trade/toolsmith/copper_pickaxe.json new file mode 100644 index 000000000..c76d91fd3 --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/toolsmith/copper_pickaxe.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 1, + "id": "basemetals:copper_pickaxe" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:copper_pickaxe" + }, + "reputation_discount": 0.2, + "wants": { + "count": 2, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/toolsmith/copper_shovel.json b/src/generated/resources/data/basemetals/villager_trade/toolsmith/copper_shovel.json new file mode 100644 index 000000000..a34a371f5 --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/toolsmith/copper_shovel.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 1, + "id": "basemetals:copper_shovel" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:copper_shovel" + }, + "reputation_discount": 0.2, + "wants": { + "count": 2, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/toolsmith/cupronickel_axe.json b/src/generated/resources/data/basemetals/villager_trade/toolsmith/cupronickel_axe.json new file mode 100644 index 000000000..1a90ff34e --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/toolsmith/cupronickel_axe.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 1, + "id": "basemetals:cupronickel_axe" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:cupronickel_axe" + }, + "reputation_discount": 0.2, + "wants": { + "count": 4, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/toolsmith/cupronickel_axe_enchanted.json b/src/generated/resources/data/basemetals/villager_trade/toolsmith/cupronickel_axe_enchanted.json new file mode 100644 index 000000000..056d5252a --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/toolsmith/cupronickel_axe_enchanted.json @@ -0,0 +1,29 @@ +{ + "given_item_modifiers": [ + { + "function": "minecraft:enchant_with_levels", + "include_additional_cost_component": true, + "levels": { + "type": "minecraft:uniform", + "max": 19, + "min": 5 + }, + "options": "#minecraft:on_random_loot" + } + ], + "gives": { + "count": 1, + "id": "basemetals:cupronickel_axe" + }, + "max_uses": 3, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:cupronickel_axe" + }, + "reputation_discount": 0.2, + "wants": { + "count": 11, + "id": "minecraft:emerald" + }, + "xp": 15 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/toolsmith/cupronickel_crackhammer.json b/src/generated/resources/data/basemetals/villager_trade/toolsmith/cupronickel_crackhammer.json new file mode 100644 index 000000000..d2ba2fea7 --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/toolsmith/cupronickel_crackhammer.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 1, + "id": "basemetals:cupronickel_crackhammer" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:cupronickel_crackhammer" + }, + "reputation_discount": 0.2, + "wants": { + "count": 4, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/toolsmith/cupronickel_crackhammer_enchanted.json b/src/generated/resources/data/basemetals/villager_trade/toolsmith/cupronickel_crackhammer_enchanted.json new file mode 100644 index 000000000..3f2716a1e --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/toolsmith/cupronickel_crackhammer_enchanted.json @@ -0,0 +1,29 @@ +{ + "given_item_modifiers": [ + { + "function": "minecraft:enchant_with_levels", + "include_additional_cost_component": true, + "levels": { + "type": "minecraft:uniform", + "max": 19, + "min": 5 + }, + "options": "#minecraft:on_random_loot" + } + ], + "gives": { + "count": 1, + "id": "basemetals:cupronickel_crackhammer" + }, + "max_uses": 3, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:cupronickel_crackhammer" + }, + "reputation_discount": 0.2, + "wants": { + "count": 11, + "id": "minecraft:emerald" + }, + "xp": 15 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/toolsmith/cupronickel_hoe.json b/src/generated/resources/data/basemetals/villager_trade/toolsmith/cupronickel_hoe.json new file mode 100644 index 000000000..3ecfc35c8 --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/toolsmith/cupronickel_hoe.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 1, + "id": "basemetals:cupronickel_hoe" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:cupronickel_hoe" + }, + "reputation_discount": 0.2, + "wants": { + "count": 4, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/toolsmith/cupronickel_hoe_enchanted.json b/src/generated/resources/data/basemetals/villager_trade/toolsmith/cupronickel_hoe_enchanted.json new file mode 100644 index 000000000..0553c430b --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/toolsmith/cupronickel_hoe_enchanted.json @@ -0,0 +1,29 @@ +{ + "given_item_modifiers": [ + { + "function": "minecraft:enchant_with_levels", + "include_additional_cost_component": true, + "levels": { + "type": "minecraft:uniform", + "max": 19, + "min": 5 + }, + "options": "#minecraft:on_random_loot" + } + ], + "gives": { + "count": 1, + "id": "basemetals:cupronickel_hoe" + }, + "max_uses": 3, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:cupronickel_hoe" + }, + "reputation_discount": 0.2, + "wants": { + "count": 11, + "id": "minecraft:emerald" + }, + "xp": 15 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/toolsmith/cupronickel_ingot.json b/src/generated/resources/data/basemetals/villager_trade/toolsmith/cupronickel_ingot.json new file mode 100644 index 000000000..202f39beb --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/toolsmith/cupronickel_ingot.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 12, + "id": "basemetals:cupronickel_ingot" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:cupronickel_ingot" + }, + "reputation_discount": 0.2, + "wants": { + "count": 4, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/toolsmith/cupronickel_pickaxe.json b/src/generated/resources/data/basemetals/villager_trade/toolsmith/cupronickel_pickaxe.json new file mode 100644 index 000000000..2c012a187 --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/toolsmith/cupronickel_pickaxe.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 1, + "id": "basemetals:cupronickel_pickaxe" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:cupronickel_pickaxe" + }, + "reputation_discount": 0.2, + "wants": { + "count": 4, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/toolsmith/cupronickel_pickaxe_enchanted.json b/src/generated/resources/data/basemetals/villager_trade/toolsmith/cupronickel_pickaxe_enchanted.json new file mode 100644 index 000000000..5bae3b53a --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/toolsmith/cupronickel_pickaxe_enchanted.json @@ -0,0 +1,29 @@ +{ + "given_item_modifiers": [ + { + "function": "minecraft:enchant_with_levels", + "include_additional_cost_component": true, + "levels": { + "type": "minecraft:uniform", + "max": 19, + "min": 5 + }, + "options": "#minecraft:on_random_loot" + } + ], + "gives": { + "count": 1, + "id": "basemetals:cupronickel_pickaxe" + }, + "max_uses": 3, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:cupronickel_pickaxe" + }, + "reputation_discount": 0.2, + "wants": { + "count": 11, + "id": "minecraft:emerald" + }, + "xp": 15 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/toolsmith/cupronickel_shovel.json b/src/generated/resources/data/basemetals/villager_trade/toolsmith/cupronickel_shovel.json new file mode 100644 index 000000000..c6c743e5a --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/toolsmith/cupronickel_shovel.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 1, + "id": "basemetals:cupronickel_shovel" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:cupronickel_shovel" + }, + "reputation_discount": 0.2, + "wants": { + "count": 4, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/toolsmith/cupronickel_shovel_enchanted.json b/src/generated/resources/data/basemetals/villager_trade/toolsmith/cupronickel_shovel_enchanted.json new file mode 100644 index 000000000..2f67af622 --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/toolsmith/cupronickel_shovel_enchanted.json @@ -0,0 +1,29 @@ +{ + "given_item_modifiers": [ + { + "function": "minecraft:enchant_with_levels", + "include_additional_cost_component": true, + "levels": { + "type": "minecraft:uniform", + "max": 19, + "min": 5 + }, + "options": "#minecraft:on_random_loot" + } + ], + "gives": { + "count": 1, + "id": "basemetals:cupronickel_shovel" + }, + "max_uses": 3, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:cupronickel_shovel" + }, + "reputation_discount": 0.2, + "wants": { + "count": 11, + "id": "minecraft:emerald" + }, + "xp": 15 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/toolsmith/electrum_axe.json b/src/generated/resources/data/basemetals/villager_trade/toolsmith/electrum_axe.json new file mode 100644 index 000000000..6084d0b4b --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/toolsmith/electrum_axe.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 1, + "id": "basemetals:electrum_axe" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:electrum_axe" + }, + "reputation_discount": 0.2, + "wants": { + "count": 4, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/toolsmith/electrum_axe_enchanted.json b/src/generated/resources/data/basemetals/villager_trade/toolsmith/electrum_axe_enchanted.json new file mode 100644 index 000000000..da17957ba --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/toolsmith/electrum_axe_enchanted.json @@ -0,0 +1,29 @@ +{ + "given_item_modifiers": [ + { + "function": "minecraft:enchant_with_levels", + "include_additional_cost_component": true, + "levels": { + "type": "minecraft:uniform", + "max": 19, + "min": 5 + }, + "options": "#minecraft:on_random_loot" + } + ], + "gives": { + "count": 1, + "id": "basemetals:electrum_axe" + }, + "max_uses": 3, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:electrum_axe" + }, + "reputation_discount": 0.2, + "wants": { + "count": 11, + "id": "minecraft:emerald" + }, + "xp": 15 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/toolsmith/electrum_crackhammer.json b/src/generated/resources/data/basemetals/villager_trade/toolsmith/electrum_crackhammer.json new file mode 100644 index 000000000..0402eedc4 --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/toolsmith/electrum_crackhammer.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 1, + "id": "basemetals:electrum_crackhammer" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:electrum_crackhammer" + }, + "reputation_discount": 0.2, + "wants": { + "count": 4, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/toolsmith/electrum_crackhammer_enchanted.json b/src/generated/resources/data/basemetals/villager_trade/toolsmith/electrum_crackhammer_enchanted.json new file mode 100644 index 000000000..20e0ddffc --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/toolsmith/electrum_crackhammer_enchanted.json @@ -0,0 +1,29 @@ +{ + "given_item_modifiers": [ + { + "function": "minecraft:enchant_with_levels", + "include_additional_cost_component": true, + "levels": { + "type": "minecraft:uniform", + "max": 19, + "min": 5 + }, + "options": "#minecraft:on_random_loot" + } + ], + "gives": { + "count": 1, + "id": "basemetals:electrum_crackhammer" + }, + "max_uses": 3, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:electrum_crackhammer" + }, + "reputation_discount": 0.2, + "wants": { + "count": 11, + "id": "minecraft:emerald" + }, + "xp": 15 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/toolsmith/electrum_hoe.json b/src/generated/resources/data/basemetals/villager_trade/toolsmith/electrum_hoe.json new file mode 100644 index 000000000..862ff1015 --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/toolsmith/electrum_hoe.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 1, + "id": "basemetals:electrum_hoe" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:electrum_hoe" + }, + "reputation_discount": 0.2, + "wants": { + "count": 4, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/toolsmith/electrum_hoe_enchanted.json b/src/generated/resources/data/basemetals/villager_trade/toolsmith/electrum_hoe_enchanted.json new file mode 100644 index 000000000..cae9b920e --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/toolsmith/electrum_hoe_enchanted.json @@ -0,0 +1,29 @@ +{ + "given_item_modifiers": [ + { + "function": "minecraft:enchant_with_levels", + "include_additional_cost_component": true, + "levels": { + "type": "minecraft:uniform", + "max": 19, + "min": 5 + }, + "options": "#minecraft:on_random_loot" + } + ], + "gives": { + "count": 1, + "id": "basemetals:electrum_hoe" + }, + "max_uses": 3, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:electrum_hoe" + }, + "reputation_discount": 0.2, + "wants": { + "count": 11, + "id": "minecraft:emerald" + }, + "xp": 15 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/toolsmith/electrum_ingot.json b/src/generated/resources/data/basemetals/villager_trade/toolsmith/electrum_ingot.json new file mode 100644 index 000000000..de2af531e --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/toolsmith/electrum_ingot.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 12, + "id": "basemetals:electrum_ingot" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:electrum_ingot" + }, + "reputation_discount": 0.2, + "wants": { + "count": 4, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/toolsmith/electrum_pickaxe.json b/src/generated/resources/data/basemetals/villager_trade/toolsmith/electrum_pickaxe.json new file mode 100644 index 000000000..cf3454ba4 --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/toolsmith/electrum_pickaxe.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 1, + "id": "basemetals:electrum_pickaxe" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:electrum_pickaxe" + }, + "reputation_discount": 0.2, + "wants": { + "count": 4, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/toolsmith/electrum_pickaxe_enchanted.json b/src/generated/resources/data/basemetals/villager_trade/toolsmith/electrum_pickaxe_enchanted.json new file mode 100644 index 000000000..ca9bbb919 --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/toolsmith/electrum_pickaxe_enchanted.json @@ -0,0 +1,29 @@ +{ + "given_item_modifiers": [ + { + "function": "minecraft:enchant_with_levels", + "include_additional_cost_component": true, + "levels": { + "type": "minecraft:uniform", + "max": 19, + "min": 5 + }, + "options": "#minecraft:on_random_loot" + } + ], + "gives": { + "count": 1, + "id": "basemetals:electrum_pickaxe" + }, + "max_uses": 3, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:electrum_pickaxe" + }, + "reputation_discount": 0.2, + "wants": { + "count": 11, + "id": "minecraft:emerald" + }, + "xp": 15 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/toolsmith/electrum_shovel.json b/src/generated/resources/data/basemetals/villager_trade/toolsmith/electrum_shovel.json new file mode 100644 index 000000000..d6389bd2b --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/toolsmith/electrum_shovel.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 1, + "id": "basemetals:electrum_shovel" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:electrum_shovel" + }, + "reputation_discount": 0.2, + "wants": { + "count": 4, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/toolsmith/electrum_shovel_enchanted.json b/src/generated/resources/data/basemetals/villager_trade/toolsmith/electrum_shovel_enchanted.json new file mode 100644 index 000000000..2456deb4b --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/toolsmith/electrum_shovel_enchanted.json @@ -0,0 +1,29 @@ +{ + "given_item_modifiers": [ + { + "function": "minecraft:enchant_with_levels", + "include_additional_cost_component": true, + "levels": { + "type": "minecraft:uniform", + "max": 19, + "min": 5 + }, + "options": "#minecraft:on_random_loot" + } + ], + "gives": { + "count": 1, + "id": "basemetals:electrum_shovel" + }, + "max_uses": 3, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:electrum_shovel" + }, + "reputation_discount": 0.2, + "wants": { + "count": 11, + "id": "minecraft:emerald" + }, + "xp": 15 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/toolsmith/invar_axe.json b/src/generated/resources/data/basemetals/villager_trade/toolsmith/invar_axe.json new file mode 100644 index 000000000..ae719daab --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/toolsmith/invar_axe.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 1, + "id": "basemetals:invar_axe" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:invar_axe" + }, + "reputation_discount": 0.2, + "wants": { + "count": 5, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/toolsmith/invar_crackhammer.json b/src/generated/resources/data/basemetals/villager_trade/toolsmith/invar_crackhammer.json new file mode 100644 index 000000000..b486ad337 --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/toolsmith/invar_crackhammer.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 1, + "id": "basemetals:invar_crackhammer" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:invar_crackhammer" + }, + "reputation_discount": 0.2, + "wants": { + "count": 5, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/toolsmith/invar_hoe.json b/src/generated/resources/data/basemetals/villager_trade/toolsmith/invar_hoe.json new file mode 100644 index 000000000..b5fcdbbd4 --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/toolsmith/invar_hoe.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 1, + "id": "basemetals:invar_hoe" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:invar_hoe" + }, + "reputation_discount": 0.2, + "wants": { + "count": 5, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/toolsmith/invar_ingot.json b/src/generated/resources/data/basemetals/villager_trade/toolsmith/invar_ingot.json new file mode 100644 index 000000000..6bafcb756 --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/toolsmith/invar_ingot.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 12, + "id": "basemetals:invar_ingot" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:invar_ingot" + }, + "reputation_discount": 0.2, + "wants": { + "count": 5, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/toolsmith/invar_pickaxe.json b/src/generated/resources/data/basemetals/villager_trade/toolsmith/invar_pickaxe.json new file mode 100644 index 000000000..cd17cb7f3 --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/toolsmith/invar_pickaxe.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 1, + "id": "basemetals:invar_pickaxe" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:invar_pickaxe" + }, + "reputation_discount": 0.2, + "wants": { + "count": 5, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/toolsmith/invar_shovel.json b/src/generated/resources/data/basemetals/villager_trade/toolsmith/invar_shovel.json new file mode 100644 index 000000000..d14a7765d --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/toolsmith/invar_shovel.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 1, + "id": "basemetals:invar_shovel" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:invar_shovel" + }, + "reputation_discount": 0.2, + "wants": { + "count": 5, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/toolsmith/lead_axe.json b/src/generated/resources/data/basemetals/villager_trade/toolsmith/lead_axe.json new file mode 100644 index 000000000..9446c81dd --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/toolsmith/lead_axe.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 1, + "id": "basemetals:lead_axe" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:lead_axe" + }, + "reputation_discount": 0.2, + "wants": { + "count": 1, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/toolsmith/lead_crackhammer.json b/src/generated/resources/data/basemetals/villager_trade/toolsmith/lead_crackhammer.json new file mode 100644 index 000000000..512bfac19 --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/toolsmith/lead_crackhammer.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 1, + "id": "basemetals:lead_crackhammer" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:lead_crackhammer" + }, + "reputation_discount": 0.2, + "wants": { + "count": 1, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/toolsmith/lead_hoe.json b/src/generated/resources/data/basemetals/villager_trade/toolsmith/lead_hoe.json new file mode 100644 index 000000000..081097ed2 --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/toolsmith/lead_hoe.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 1, + "id": "basemetals:lead_hoe" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:lead_hoe" + }, + "reputation_discount": 0.2, + "wants": { + "count": 1, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/toolsmith/lead_ingot.json b/src/generated/resources/data/basemetals/villager_trade/toolsmith/lead_ingot.json new file mode 100644 index 000000000..d5eb2fa56 --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/toolsmith/lead_ingot.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 12, + "id": "basemetals:lead_ingot" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:lead_ingot" + }, + "reputation_discount": 0.2, + "wants": { + "count": 1, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/toolsmith/lead_pickaxe.json b/src/generated/resources/data/basemetals/villager_trade/toolsmith/lead_pickaxe.json new file mode 100644 index 000000000..26b36da61 --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/toolsmith/lead_pickaxe.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 1, + "id": "basemetals:lead_pickaxe" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:lead_pickaxe" + }, + "reputation_discount": 0.2, + "wants": { + "count": 1, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/toolsmith/lead_shovel.json b/src/generated/resources/data/basemetals/villager_trade/toolsmith/lead_shovel.json new file mode 100644 index 000000000..135e81b84 --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/toolsmith/lead_shovel.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 1, + "id": "basemetals:lead_shovel" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:lead_shovel" + }, + "reputation_discount": 0.2, + "wants": { + "count": 1, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/toolsmith/mercury_ingot.json b/src/generated/resources/data/basemetals/villager_trade/toolsmith/mercury_ingot.json new file mode 100644 index 000000000..4d3ac83c7 --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/toolsmith/mercury_ingot.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 12, + "id": "basemetals:mercury_ingot" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:mercury_ingot" + }, + "reputation_discount": 0.2, + "wants": { + "count": 1, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/toolsmith/nickel_axe.json b/src/generated/resources/data/basemetals/villager_trade/toolsmith/nickel_axe.json new file mode 100644 index 000000000..6b7818103 --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/toolsmith/nickel_axe.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 1, + "id": "basemetals:nickel_axe" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:nickel_axe" + }, + "reputation_discount": 0.2, + "wants": { + "count": 3, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/toolsmith/nickel_axe_enchanted.json b/src/generated/resources/data/basemetals/villager_trade/toolsmith/nickel_axe_enchanted.json new file mode 100644 index 000000000..097dfec9d --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/toolsmith/nickel_axe_enchanted.json @@ -0,0 +1,29 @@ +{ + "given_item_modifiers": [ + { + "function": "minecraft:enchant_with_levels", + "include_additional_cost_component": true, + "levels": { + "type": "minecraft:uniform", + "max": 19, + "min": 5 + }, + "options": "#minecraft:on_random_loot" + } + ], + "gives": { + "count": 1, + "id": "basemetals:nickel_axe" + }, + "max_uses": 3, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:nickel_axe" + }, + "reputation_discount": 0.2, + "wants": { + "count": 10, + "id": "minecraft:emerald" + }, + "xp": 15 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/toolsmith/nickel_crackhammer.json b/src/generated/resources/data/basemetals/villager_trade/toolsmith/nickel_crackhammer.json new file mode 100644 index 000000000..29f41b7b5 --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/toolsmith/nickel_crackhammer.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 1, + "id": "basemetals:nickel_crackhammer" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:nickel_crackhammer" + }, + "reputation_discount": 0.2, + "wants": { + "count": 3, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/toolsmith/nickel_crackhammer_enchanted.json b/src/generated/resources/data/basemetals/villager_trade/toolsmith/nickel_crackhammer_enchanted.json new file mode 100644 index 000000000..d84493a48 --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/toolsmith/nickel_crackhammer_enchanted.json @@ -0,0 +1,29 @@ +{ + "given_item_modifiers": [ + { + "function": "minecraft:enchant_with_levels", + "include_additional_cost_component": true, + "levels": { + "type": "minecraft:uniform", + "max": 19, + "min": 5 + }, + "options": "#minecraft:on_random_loot" + } + ], + "gives": { + "count": 1, + "id": "basemetals:nickel_crackhammer" + }, + "max_uses": 3, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:nickel_crackhammer" + }, + "reputation_discount": 0.2, + "wants": { + "count": 10, + "id": "minecraft:emerald" + }, + "xp": 15 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/toolsmith/nickel_hoe.json b/src/generated/resources/data/basemetals/villager_trade/toolsmith/nickel_hoe.json new file mode 100644 index 000000000..d39978e60 --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/toolsmith/nickel_hoe.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 1, + "id": "basemetals:nickel_hoe" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:nickel_hoe" + }, + "reputation_discount": 0.2, + "wants": { + "count": 3, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/toolsmith/nickel_hoe_enchanted.json b/src/generated/resources/data/basemetals/villager_trade/toolsmith/nickel_hoe_enchanted.json new file mode 100644 index 000000000..217f85835 --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/toolsmith/nickel_hoe_enchanted.json @@ -0,0 +1,29 @@ +{ + "given_item_modifiers": [ + { + "function": "minecraft:enchant_with_levels", + "include_additional_cost_component": true, + "levels": { + "type": "minecraft:uniform", + "max": 19, + "min": 5 + }, + "options": "#minecraft:on_random_loot" + } + ], + "gives": { + "count": 1, + "id": "basemetals:nickel_hoe" + }, + "max_uses": 3, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:nickel_hoe" + }, + "reputation_discount": 0.2, + "wants": { + "count": 10, + "id": "minecraft:emerald" + }, + "xp": 15 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/toolsmith/nickel_ingot.json b/src/generated/resources/data/basemetals/villager_trade/toolsmith/nickel_ingot.json new file mode 100644 index 000000000..3686cce1f --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/toolsmith/nickel_ingot.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 12, + "id": "basemetals:nickel_ingot" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:nickel_ingot" + }, + "reputation_discount": 0.2, + "wants": { + "count": 3, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/toolsmith/nickel_pickaxe.json b/src/generated/resources/data/basemetals/villager_trade/toolsmith/nickel_pickaxe.json new file mode 100644 index 000000000..445932ba8 --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/toolsmith/nickel_pickaxe.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 1, + "id": "basemetals:nickel_pickaxe" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:nickel_pickaxe" + }, + "reputation_discount": 0.2, + "wants": { + "count": 3, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/toolsmith/nickel_pickaxe_enchanted.json b/src/generated/resources/data/basemetals/villager_trade/toolsmith/nickel_pickaxe_enchanted.json new file mode 100644 index 000000000..759a26191 --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/toolsmith/nickel_pickaxe_enchanted.json @@ -0,0 +1,29 @@ +{ + "given_item_modifiers": [ + { + "function": "minecraft:enchant_with_levels", + "include_additional_cost_component": true, + "levels": { + "type": "minecraft:uniform", + "max": 19, + "min": 5 + }, + "options": "#minecraft:on_random_loot" + } + ], + "gives": { + "count": 1, + "id": "basemetals:nickel_pickaxe" + }, + "max_uses": 3, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:nickel_pickaxe" + }, + "reputation_discount": 0.2, + "wants": { + "count": 10, + "id": "minecraft:emerald" + }, + "xp": 15 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/toolsmith/nickel_shovel.json b/src/generated/resources/data/basemetals/villager_trade/toolsmith/nickel_shovel.json new file mode 100644 index 000000000..e76af4018 --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/toolsmith/nickel_shovel.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 1, + "id": "basemetals:nickel_shovel" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:nickel_shovel" + }, + "reputation_discount": 0.2, + "wants": { + "count": 3, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/toolsmith/nickel_shovel_enchanted.json b/src/generated/resources/data/basemetals/villager_trade/toolsmith/nickel_shovel_enchanted.json new file mode 100644 index 000000000..5c555c06d --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/toolsmith/nickel_shovel_enchanted.json @@ -0,0 +1,29 @@ +{ + "given_item_modifiers": [ + { + "function": "minecraft:enchant_with_levels", + "include_additional_cost_component": true, + "levels": { + "type": "minecraft:uniform", + "max": 19, + "min": 5 + }, + "options": "#minecraft:on_random_loot" + } + ], + "gives": { + "count": 1, + "id": "basemetals:nickel_shovel" + }, + "max_uses": 3, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:nickel_shovel" + }, + "reputation_discount": 0.2, + "wants": { + "count": 10, + "id": "minecraft:emerald" + }, + "xp": 15 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/toolsmith/pewter_axe.json b/src/generated/resources/data/basemetals/villager_trade/toolsmith/pewter_axe.json new file mode 100644 index 000000000..5a12f6840 --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/toolsmith/pewter_axe.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 1, + "id": "basemetals:pewter_axe" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:pewter_axe" + }, + "reputation_discount": 0.2, + "wants": { + "count": 1, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/toolsmith/pewter_crackhammer.json b/src/generated/resources/data/basemetals/villager_trade/toolsmith/pewter_crackhammer.json new file mode 100644 index 000000000..a2341f95a --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/toolsmith/pewter_crackhammer.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 1, + "id": "basemetals:pewter_crackhammer" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:pewter_crackhammer" + }, + "reputation_discount": 0.2, + "wants": { + "count": 1, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/toolsmith/pewter_hoe.json b/src/generated/resources/data/basemetals/villager_trade/toolsmith/pewter_hoe.json new file mode 100644 index 000000000..26a9522bd --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/toolsmith/pewter_hoe.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 1, + "id": "basemetals:pewter_hoe" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:pewter_hoe" + }, + "reputation_discount": 0.2, + "wants": { + "count": 1, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/toolsmith/pewter_ingot.json b/src/generated/resources/data/basemetals/villager_trade/toolsmith/pewter_ingot.json new file mode 100644 index 000000000..bbe3b8b98 --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/toolsmith/pewter_ingot.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 12, + "id": "basemetals:pewter_ingot" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:pewter_ingot" + }, + "reputation_discount": 0.2, + "wants": { + "count": 1, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/toolsmith/pewter_pickaxe.json b/src/generated/resources/data/basemetals/villager_trade/toolsmith/pewter_pickaxe.json new file mode 100644 index 000000000..5ee1aa480 --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/toolsmith/pewter_pickaxe.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 1, + "id": "basemetals:pewter_pickaxe" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:pewter_pickaxe" + }, + "reputation_discount": 0.2, + "wants": { + "count": 1, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/toolsmith/pewter_shovel.json b/src/generated/resources/data/basemetals/villager_trade/toolsmith/pewter_shovel.json new file mode 100644 index 000000000..17bc5e11d --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/toolsmith/pewter_shovel.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 1, + "id": "basemetals:pewter_shovel" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:pewter_shovel" + }, + "reputation_discount": 0.2, + "wants": { + "count": 1, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/toolsmith/silver_axe.json b/src/generated/resources/data/basemetals/villager_trade/toolsmith/silver_axe.json new file mode 100644 index 000000000..db4882924 --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/toolsmith/silver_axe.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 1, + "id": "basemetals:silver_axe" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:silver_axe" + }, + "reputation_discount": 0.2, + "wants": { + "count": 3, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/toolsmith/silver_axe_enchanted.json b/src/generated/resources/data/basemetals/villager_trade/toolsmith/silver_axe_enchanted.json new file mode 100644 index 000000000..541d3e2b0 --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/toolsmith/silver_axe_enchanted.json @@ -0,0 +1,29 @@ +{ + "given_item_modifiers": [ + { + "function": "minecraft:enchant_with_levels", + "include_additional_cost_component": true, + "levels": { + "type": "minecraft:uniform", + "max": 19, + "min": 5 + }, + "options": "#minecraft:on_random_loot" + } + ], + "gives": { + "count": 1, + "id": "basemetals:silver_axe" + }, + "max_uses": 3, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:silver_axe" + }, + "reputation_discount": 0.2, + "wants": { + "count": 10, + "id": "minecraft:emerald" + }, + "xp": 15 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/toolsmith/silver_crackhammer.json b/src/generated/resources/data/basemetals/villager_trade/toolsmith/silver_crackhammer.json new file mode 100644 index 000000000..976672eb4 --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/toolsmith/silver_crackhammer.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 1, + "id": "basemetals:silver_crackhammer" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:silver_crackhammer" + }, + "reputation_discount": 0.2, + "wants": { + "count": 3, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/toolsmith/silver_crackhammer_enchanted.json b/src/generated/resources/data/basemetals/villager_trade/toolsmith/silver_crackhammer_enchanted.json new file mode 100644 index 000000000..fcd7e98ae --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/toolsmith/silver_crackhammer_enchanted.json @@ -0,0 +1,29 @@ +{ + "given_item_modifiers": [ + { + "function": "minecraft:enchant_with_levels", + "include_additional_cost_component": true, + "levels": { + "type": "minecraft:uniform", + "max": 19, + "min": 5 + }, + "options": "#minecraft:on_random_loot" + } + ], + "gives": { + "count": 1, + "id": "basemetals:silver_crackhammer" + }, + "max_uses": 3, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:silver_crackhammer" + }, + "reputation_discount": 0.2, + "wants": { + "count": 10, + "id": "minecraft:emerald" + }, + "xp": 15 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/toolsmith/silver_hoe.json b/src/generated/resources/data/basemetals/villager_trade/toolsmith/silver_hoe.json new file mode 100644 index 000000000..f36696b50 --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/toolsmith/silver_hoe.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 1, + "id": "basemetals:silver_hoe" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:silver_hoe" + }, + "reputation_discount": 0.2, + "wants": { + "count": 3, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/toolsmith/silver_hoe_enchanted.json b/src/generated/resources/data/basemetals/villager_trade/toolsmith/silver_hoe_enchanted.json new file mode 100644 index 000000000..7cfd3628c --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/toolsmith/silver_hoe_enchanted.json @@ -0,0 +1,29 @@ +{ + "given_item_modifiers": [ + { + "function": "minecraft:enchant_with_levels", + "include_additional_cost_component": true, + "levels": { + "type": "minecraft:uniform", + "max": 19, + "min": 5 + }, + "options": "#minecraft:on_random_loot" + } + ], + "gives": { + "count": 1, + "id": "basemetals:silver_hoe" + }, + "max_uses": 3, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:silver_hoe" + }, + "reputation_discount": 0.2, + "wants": { + "count": 10, + "id": "minecraft:emerald" + }, + "xp": 15 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/toolsmith/silver_ingot.json b/src/generated/resources/data/basemetals/villager_trade/toolsmith/silver_ingot.json new file mode 100644 index 000000000..c2577020f --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/toolsmith/silver_ingot.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 12, + "id": "basemetals:silver_ingot" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:silver_ingot" + }, + "reputation_discount": 0.2, + "wants": { + "count": 3, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/toolsmith/silver_pickaxe.json b/src/generated/resources/data/basemetals/villager_trade/toolsmith/silver_pickaxe.json new file mode 100644 index 000000000..933e04c35 --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/toolsmith/silver_pickaxe.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 1, + "id": "basemetals:silver_pickaxe" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:silver_pickaxe" + }, + "reputation_discount": 0.2, + "wants": { + "count": 3, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/toolsmith/silver_pickaxe_enchanted.json b/src/generated/resources/data/basemetals/villager_trade/toolsmith/silver_pickaxe_enchanted.json new file mode 100644 index 000000000..16ee2186c --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/toolsmith/silver_pickaxe_enchanted.json @@ -0,0 +1,29 @@ +{ + "given_item_modifiers": [ + { + "function": "minecraft:enchant_with_levels", + "include_additional_cost_component": true, + "levels": { + "type": "minecraft:uniform", + "max": 19, + "min": 5 + }, + "options": "#minecraft:on_random_loot" + } + ], + "gives": { + "count": 1, + "id": "basemetals:silver_pickaxe" + }, + "max_uses": 3, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:silver_pickaxe" + }, + "reputation_discount": 0.2, + "wants": { + "count": 10, + "id": "minecraft:emerald" + }, + "xp": 15 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/toolsmith/silver_shovel.json b/src/generated/resources/data/basemetals/villager_trade/toolsmith/silver_shovel.json new file mode 100644 index 000000000..c1a038758 --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/toolsmith/silver_shovel.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 1, + "id": "basemetals:silver_shovel" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:silver_shovel" + }, + "reputation_discount": 0.2, + "wants": { + "count": 3, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/toolsmith/silver_shovel_enchanted.json b/src/generated/resources/data/basemetals/villager_trade/toolsmith/silver_shovel_enchanted.json new file mode 100644 index 000000000..88e4a3427 --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/toolsmith/silver_shovel_enchanted.json @@ -0,0 +1,29 @@ +{ + "given_item_modifiers": [ + { + "function": "minecraft:enchant_with_levels", + "include_additional_cost_component": true, + "levels": { + "type": "minecraft:uniform", + "max": 19, + "min": 5 + }, + "options": "#minecraft:on_random_loot" + } + ], + "gives": { + "count": 1, + "id": "basemetals:silver_shovel" + }, + "max_uses": 3, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:silver_shovel" + }, + "reputation_discount": 0.2, + "wants": { + "count": 10, + "id": "minecraft:emerald" + }, + "xp": 15 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/toolsmith/steel_axe.json b/src/generated/resources/data/basemetals/villager_trade/toolsmith/steel_axe.json new file mode 100644 index 000000000..a13fc7d57 --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/toolsmith/steel_axe.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 1, + "id": "basemetals:steel_axe" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:steel_axe" + }, + "reputation_discount": 0.2, + "wants": { + "count": 5, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/toolsmith/steel_crackhammer.json b/src/generated/resources/data/basemetals/villager_trade/toolsmith/steel_crackhammer.json new file mode 100644 index 000000000..b27fc974c --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/toolsmith/steel_crackhammer.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 1, + "id": "basemetals:steel_crackhammer" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:steel_crackhammer" + }, + "reputation_discount": 0.2, + "wants": { + "count": 5, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/toolsmith/steel_hoe.json b/src/generated/resources/data/basemetals/villager_trade/toolsmith/steel_hoe.json new file mode 100644 index 000000000..6ae041f48 --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/toolsmith/steel_hoe.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 1, + "id": "basemetals:steel_hoe" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:steel_hoe" + }, + "reputation_discount": 0.2, + "wants": { + "count": 5, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/toolsmith/steel_ingot.json b/src/generated/resources/data/basemetals/villager_trade/toolsmith/steel_ingot.json new file mode 100644 index 000000000..e2da706a2 --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/toolsmith/steel_ingot.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 12, + "id": "basemetals:steel_ingot" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:steel_ingot" + }, + "reputation_discount": 0.2, + "wants": { + "count": 5, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/toolsmith/steel_pickaxe.json b/src/generated/resources/data/basemetals/villager_trade/toolsmith/steel_pickaxe.json new file mode 100644 index 000000000..4d7096765 --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/toolsmith/steel_pickaxe.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 1, + "id": "basemetals:steel_pickaxe" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:steel_pickaxe" + }, + "reputation_discount": 0.2, + "wants": { + "count": 5, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/toolsmith/steel_shovel.json b/src/generated/resources/data/basemetals/villager_trade/toolsmith/steel_shovel.json new file mode 100644 index 000000000..16c6fb15b --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/toolsmith/steel_shovel.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 1, + "id": "basemetals:steel_shovel" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:steel_shovel" + }, + "reputation_discount": 0.2, + "wants": { + "count": 5, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/toolsmith/tin_axe.json b/src/generated/resources/data/basemetals/villager_trade/toolsmith/tin_axe.json new file mode 100644 index 000000000..684171abb --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/toolsmith/tin_axe.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 1, + "id": "basemetals:tin_axe" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:tin_axe" + }, + "reputation_discount": 0.2, + "wants": { + "count": 1, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/toolsmith/tin_crackhammer.json b/src/generated/resources/data/basemetals/villager_trade/toolsmith/tin_crackhammer.json new file mode 100644 index 000000000..6ca2048ee --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/toolsmith/tin_crackhammer.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 1, + "id": "basemetals:tin_crackhammer" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:tin_crackhammer" + }, + "reputation_discount": 0.2, + "wants": { + "count": 1, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/toolsmith/tin_hoe.json b/src/generated/resources/data/basemetals/villager_trade/toolsmith/tin_hoe.json new file mode 100644 index 000000000..6d5c934cd --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/toolsmith/tin_hoe.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 1, + "id": "basemetals:tin_hoe" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:tin_hoe" + }, + "reputation_discount": 0.2, + "wants": { + "count": 1, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/toolsmith/tin_ingot.json b/src/generated/resources/data/basemetals/villager_trade/toolsmith/tin_ingot.json new file mode 100644 index 000000000..4e4d34d26 --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/toolsmith/tin_ingot.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 12, + "id": "basemetals:tin_ingot" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:tin_ingot" + }, + "reputation_discount": 0.2, + "wants": { + "count": 1, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/toolsmith/tin_pickaxe.json b/src/generated/resources/data/basemetals/villager_trade/toolsmith/tin_pickaxe.json new file mode 100644 index 000000000..b71250151 --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/toolsmith/tin_pickaxe.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 1, + "id": "basemetals:tin_pickaxe" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:tin_pickaxe" + }, + "reputation_discount": 0.2, + "wants": { + "count": 1, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/toolsmith/tin_shovel.json b/src/generated/resources/data/basemetals/villager_trade/toolsmith/tin_shovel.json new file mode 100644 index 000000000..361ee2e62 --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/toolsmith/tin_shovel.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 1, + "id": "basemetals:tin_shovel" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:tin_shovel" + }, + "reputation_discount": 0.2, + "wants": { + "count": 1, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/toolsmith/zinc_axe.json b/src/generated/resources/data/basemetals/villager_trade/toolsmith/zinc_axe.json new file mode 100644 index 000000000..deea61906 --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/toolsmith/zinc_axe.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 1, + "id": "basemetals:zinc_axe" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:zinc_axe" + }, + "reputation_discount": 0.2, + "wants": { + "count": 1, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/toolsmith/zinc_crackhammer.json b/src/generated/resources/data/basemetals/villager_trade/toolsmith/zinc_crackhammer.json new file mode 100644 index 000000000..63a3752d3 --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/toolsmith/zinc_crackhammer.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 1, + "id": "basemetals:zinc_crackhammer" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:zinc_crackhammer" + }, + "reputation_discount": 0.2, + "wants": { + "count": 1, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/toolsmith/zinc_hoe.json b/src/generated/resources/data/basemetals/villager_trade/toolsmith/zinc_hoe.json new file mode 100644 index 000000000..5597d9998 --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/toolsmith/zinc_hoe.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 1, + "id": "basemetals:zinc_hoe" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:zinc_hoe" + }, + "reputation_discount": 0.2, + "wants": { + "count": 1, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/toolsmith/zinc_ingot.json b/src/generated/resources/data/basemetals/villager_trade/toolsmith/zinc_ingot.json new file mode 100644 index 000000000..93fa944ca --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/toolsmith/zinc_ingot.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 12, + "id": "basemetals:zinc_ingot" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:zinc_ingot" + }, + "reputation_discount": 0.2, + "wants": { + "count": 1, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/toolsmith/zinc_pickaxe.json b/src/generated/resources/data/basemetals/villager_trade/toolsmith/zinc_pickaxe.json new file mode 100644 index 000000000..0e6c89d4d --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/toolsmith/zinc_pickaxe.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 1, + "id": "basemetals:zinc_pickaxe" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:zinc_pickaxe" + }, + "reputation_discount": 0.2, + "wants": { + "count": 1, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/toolsmith/zinc_shovel.json b/src/generated/resources/data/basemetals/villager_trade/toolsmith/zinc_shovel.json new file mode 100644 index 000000000..890ce9ce8 --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/toolsmith/zinc_shovel.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 1, + "id": "basemetals:zinc_shovel" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:zinc_shovel" + }, + "reputation_discount": 0.2, + "wants": { + "count": 1, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/weaponsmith/antimony_bow.json b/src/generated/resources/data/basemetals/villager_trade/weaponsmith/antimony_bow.json new file mode 100644 index 000000000..3d012d3b4 --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/weaponsmith/antimony_bow.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 1, + "id": "basemetals:antimony_bow" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:antimony_bow" + }, + "reputation_discount": 0.2, + "wants": { + "count": 1, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/weaponsmith/antimony_crossbow.json b/src/generated/resources/data/basemetals/villager_trade/weaponsmith/antimony_crossbow.json new file mode 100644 index 000000000..5063dd1c8 --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/weaponsmith/antimony_crossbow.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 1, + "id": "basemetals:antimony_crossbow" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:antimony_crossbow" + }, + "reputation_discount": 0.2, + "wants": { + "count": 1, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/weaponsmith/antimony_ingot.json b/src/generated/resources/data/basemetals/villager_trade/weaponsmith/antimony_ingot.json new file mode 100644 index 000000000..906eab34a --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/weaponsmith/antimony_ingot.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 12, + "id": "basemetals:antimony_ingot" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:antimony_ingot" + }, + "reputation_discount": 0.2, + "wants": { + "count": 1, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/weaponsmith/antimony_sword.json b/src/generated/resources/data/basemetals/villager_trade/weaponsmith/antimony_sword.json new file mode 100644 index 000000000..1271a9fb3 --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/weaponsmith/antimony_sword.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 1, + "id": "basemetals:antimony_sword" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:antimony_sword" + }, + "reputation_discount": 0.2, + "wants": { + "count": 1, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/weaponsmith/bismuth_bow.json b/src/generated/resources/data/basemetals/villager_trade/weaponsmith/bismuth_bow.json new file mode 100644 index 000000000..07a76cfee --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/weaponsmith/bismuth_bow.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 1, + "id": "basemetals:bismuth_bow" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:bismuth_bow" + }, + "reputation_discount": 0.2, + "wants": { + "count": 1, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/weaponsmith/bismuth_crossbow.json b/src/generated/resources/data/basemetals/villager_trade/weaponsmith/bismuth_crossbow.json new file mode 100644 index 000000000..3dc232729 --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/weaponsmith/bismuth_crossbow.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 1, + "id": "basemetals:bismuth_crossbow" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:bismuth_crossbow" + }, + "reputation_discount": 0.2, + "wants": { + "count": 1, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/weaponsmith/bismuth_ingot.json b/src/generated/resources/data/basemetals/villager_trade/weaponsmith/bismuth_ingot.json new file mode 100644 index 000000000..eec39bfa5 --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/weaponsmith/bismuth_ingot.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 12, + "id": "basemetals:bismuth_ingot" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:bismuth_ingot" + }, + "reputation_discount": 0.2, + "wants": { + "count": 1, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/weaponsmith/bismuth_sword.json b/src/generated/resources/data/basemetals/villager_trade/weaponsmith/bismuth_sword.json new file mode 100644 index 000000000..7f63974ef --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/weaponsmith/bismuth_sword.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 1, + "id": "basemetals:bismuth_sword" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:bismuth_sword" + }, + "reputation_discount": 0.2, + "wants": { + "count": 1, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/weaponsmith/brass_bow.json b/src/generated/resources/data/basemetals/villager_trade/weaponsmith/brass_bow.json new file mode 100644 index 000000000..e7ed3240e --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/weaponsmith/brass_bow.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 1, + "id": "basemetals:brass_bow" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:brass_bow" + }, + "reputation_discount": 0.2, + "wants": { + "count": 3, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/weaponsmith/brass_bow_enchanted.json b/src/generated/resources/data/basemetals/villager_trade/weaponsmith/brass_bow_enchanted.json new file mode 100644 index 000000000..8f08eeb98 --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/weaponsmith/brass_bow_enchanted.json @@ -0,0 +1,29 @@ +{ + "given_item_modifiers": [ + { + "function": "minecraft:enchant_with_levels", + "include_additional_cost_component": true, + "levels": { + "type": "minecraft:uniform", + "max": 19, + "min": 5 + }, + "options": "#minecraft:on_random_loot" + } + ], + "gives": { + "count": 1, + "id": "basemetals:brass_bow" + }, + "max_uses": 3, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:brass_bow" + }, + "reputation_discount": 0.2, + "wants": { + "count": 9, + "id": "minecraft:emerald" + }, + "xp": 15 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/weaponsmith/brass_crossbow.json b/src/generated/resources/data/basemetals/villager_trade/weaponsmith/brass_crossbow.json new file mode 100644 index 000000000..9ec1d72a8 --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/weaponsmith/brass_crossbow.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 1, + "id": "basemetals:brass_crossbow" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:brass_crossbow" + }, + "reputation_discount": 0.2, + "wants": { + "count": 3, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/weaponsmith/brass_crossbow_enchanted.json b/src/generated/resources/data/basemetals/villager_trade/weaponsmith/brass_crossbow_enchanted.json new file mode 100644 index 000000000..86ebf4640 --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/weaponsmith/brass_crossbow_enchanted.json @@ -0,0 +1,29 @@ +{ + "given_item_modifiers": [ + { + "function": "minecraft:enchant_with_levels", + "include_additional_cost_component": true, + "levels": { + "type": "minecraft:uniform", + "max": 19, + "min": 5 + }, + "options": "#minecraft:on_random_loot" + } + ], + "gives": { + "count": 1, + "id": "basemetals:brass_crossbow" + }, + "max_uses": 3, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:brass_crossbow" + }, + "reputation_discount": 0.2, + "wants": { + "count": 9, + "id": "minecraft:emerald" + }, + "xp": 15 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/weaponsmith/brass_ingot.json b/src/generated/resources/data/basemetals/villager_trade/weaponsmith/brass_ingot.json new file mode 100644 index 000000000..f31550371 --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/weaponsmith/brass_ingot.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 12, + "id": "basemetals:brass_ingot" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:brass_ingot" + }, + "reputation_discount": 0.2, + "wants": { + "count": 3, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/weaponsmith/brass_sword.json b/src/generated/resources/data/basemetals/villager_trade/weaponsmith/brass_sword.json new file mode 100644 index 000000000..5b9635a0d --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/weaponsmith/brass_sword.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 1, + "id": "basemetals:brass_sword" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:brass_sword" + }, + "reputation_discount": 0.2, + "wants": { + "count": 2, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/weaponsmith/brass_sword_enchanted.json b/src/generated/resources/data/basemetals/villager_trade/weaponsmith/brass_sword_enchanted.json new file mode 100644 index 000000000..98724d670 --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/weaponsmith/brass_sword_enchanted.json @@ -0,0 +1,29 @@ +{ + "given_item_modifiers": [ + { + "function": "minecraft:enchant_with_levels", + "include_additional_cost_component": true, + "levels": { + "type": "minecraft:uniform", + "max": 19, + "min": 5 + }, + "options": "#minecraft:on_random_loot" + } + ], + "gives": { + "count": 1, + "id": "basemetals:brass_sword" + }, + "max_uses": 3, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:brass_sword" + }, + "reputation_discount": 0.2, + "wants": { + "count": 9, + "id": "minecraft:emerald" + }, + "xp": 15 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/weaponsmith/bronze_bow.json b/src/generated/resources/data/basemetals/villager_trade/weaponsmith/bronze_bow.json new file mode 100644 index 000000000..c95735f1f --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/weaponsmith/bronze_bow.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 1, + "id": "basemetals:bronze_bow" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:bronze_bow" + }, + "reputation_discount": 0.2, + "wants": { + "count": 3, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/weaponsmith/bronze_crossbow.json b/src/generated/resources/data/basemetals/villager_trade/weaponsmith/bronze_crossbow.json new file mode 100644 index 000000000..704170c48 --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/weaponsmith/bronze_crossbow.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 1, + "id": "basemetals:bronze_crossbow" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:bronze_crossbow" + }, + "reputation_discount": 0.2, + "wants": { + "count": 3, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/weaponsmith/bronze_ingot.json b/src/generated/resources/data/basemetals/villager_trade/weaponsmith/bronze_ingot.json new file mode 100644 index 000000000..2cd520423 --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/weaponsmith/bronze_ingot.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 12, + "id": "basemetals:bronze_ingot" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:bronze_ingot" + }, + "reputation_discount": 0.2, + "wants": { + "count": 3, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/weaponsmith/bronze_sword.json b/src/generated/resources/data/basemetals/villager_trade/weaponsmith/bronze_sword.json new file mode 100644 index 000000000..600d308e7 --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/weaponsmith/bronze_sword.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 1, + "id": "basemetals:bronze_sword" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:bronze_sword" + }, + "reputation_discount": 0.2, + "wants": { + "count": 3, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/weaponsmith/charcoal_powder.json b/src/generated/resources/data/basemetals/villager_trade/weaponsmith/charcoal_powder.json new file mode 100644 index 000000000..0fc482acf --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/weaponsmith/charcoal_powder.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 10, + "id": "basemetals:charcoal_powder" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:charcoal_powder" + }, + "reputation_discount": 0.2, + "wants": { + "count": 1, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/weaponsmith/coal_powder.json b/src/generated/resources/data/basemetals/villager_trade/weaponsmith/coal_powder.json new file mode 100644 index 000000000..efdd5be54 --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/weaponsmith/coal_powder.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 10, + "id": "basemetals:coal_powder" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:coal_powder" + }, + "reputation_discount": 0.2, + "wants": { + "count": 1, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/weaponsmith/copper_bow.json b/src/generated/resources/data/basemetals/villager_trade/weaponsmith/copper_bow.json new file mode 100644 index 000000000..4b5f06670 --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/weaponsmith/copper_bow.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 1, + "id": "basemetals:copper_bow" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:copper_bow" + }, + "reputation_discount": 0.2, + "wants": { + "count": 2, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/weaponsmith/copper_crossbow.json b/src/generated/resources/data/basemetals/villager_trade/weaponsmith/copper_crossbow.json new file mode 100644 index 000000000..60a275e26 --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/weaponsmith/copper_crossbow.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 1, + "id": "basemetals:copper_crossbow" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:copper_crossbow" + }, + "reputation_discount": 0.2, + "wants": { + "count": 2, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/weaponsmith/copper_ingot.json b/src/generated/resources/data/basemetals/villager_trade/weaponsmith/copper_ingot.json new file mode 100644 index 000000000..ae935fc33 --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/weaponsmith/copper_ingot.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 12, + "id": "minecraft:copper_ingot" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "minecraft:copper_ingot" + }, + "reputation_discount": 0.2, + "wants": { + "count": 2, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/weaponsmith/copper_sword.json b/src/generated/resources/data/basemetals/villager_trade/weaponsmith/copper_sword.json new file mode 100644 index 000000000..09e242c71 --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/weaponsmith/copper_sword.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 1, + "id": "basemetals:copper_sword" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:copper_sword" + }, + "reputation_discount": 0.2, + "wants": { + "count": 1, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/weaponsmith/cupronickel_bow.json b/src/generated/resources/data/basemetals/villager_trade/weaponsmith/cupronickel_bow.json new file mode 100644 index 000000000..f322930f3 --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/weaponsmith/cupronickel_bow.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 1, + "id": "basemetals:cupronickel_bow" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:cupronickel_bow" + }, + "reputation_discount": 0.2, + "wants": { + "count": 4, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/weaponsmith/cupronickel_bow_enchanted.json b/src/generated/resources/data/basemetals/villager_trade/weaponsmith/cupronickel_bow_enchanted.json new file mode 100644 index 000000000..356fe38d4 --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/weaponsmith/cupronickel_bow_enchanted.json @@ -0,0 +1,29 @@ +{ + "given_item_modifiers": [ + { + "function": "minecraft:enchant_with_levels", + "include_additional_cost_component": true, + "levels": { + "type": "minecraft:uniform", + "max": 19, + "min": 5 + }, + "options": "#minecraft:on_random_loot" + } + ], + "gives": { + "count": 1, + "id": "basemetals:cupronickel_bow" + }, + "max_uses": 3, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:cupronickel_bow" + }, + "reputation_discount": 0.2, + "wants": { + "count": 10, + "id": "minecraft:emerald" + }, + "xp": 15 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/weaponsmith/cupronickel_crossbow.json b/src/generated/resources/data/basemetals/villager_trade/weaponsmith/cupronickel_crossbow.json new file mode 100644 index 000000000..9ce4aa5be --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/weaponsmith/cupronickel_crossbow.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 1, + "id": "basemetals:cupronickel_crossbow" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:cupronickel_crossbow" + }, + "reputation_discount": 0.2, + "wants": { + "count": 4, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/weaponsmith/cupronickel_crossbow_enchanted.json b/src/generated/resources/data/basemetals/villager_trade/weaponsmith/cupronickel_crossbow_enchanted.json new file mode 100644 index 000000000..066ca21b5 --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/weaponsmith/cupronickel_crossbow_enchanted.json @@ -0,0 +1,29 @@ +{ + "given_item_modifiers": [ + { + "function": "minecraft:enchant_with_levels", + "include_additional_cost_component": true, + "levels": { + "type": "minecraft:uniform", + "max": 19, + "min": 5 + }, + "options": "#minecraft:on_random_loot" + } + ], + "gives": { + "count": 1, + "id": "basemetals:cupronickel_crossbow" + }, + "max_uses": 3, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:cupronickel_crossbow" + }, + "reputation_discount": 0.2, + "wants": { + "count": 10, + "id": "minecraft:emerald" + }, + "xp": 15 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/weaponsmith/cupronickel_ingot.json b/src/generated/resources/data/basemetals/villager_trade/weaponsmith/cupronickel_ingot.json new file mode 100644 index 000000000..202f39beb --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/weaponsmith/cupronickel_ingot.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 12, + "id": "basemetals:cupronickel_ingot" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:cupronickel_ingot" + }, + "reputation_discount": 0.2, + "wants": { + "count": 4, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/weaponsmith/cupronickel_sword.json b/src/generated/resources/data/basemetals/villager_trade/weaponsmith/cupronickel_sword.json new file mode 100644 index 000000000..a010481fb --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/weaponsmith/cupronickel_sword.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 1, + "id": "basemetals:cupronickel_sword" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:cupronickel_sword" + }, + "reputation_discount": 0.2, + "wants": { + "count": 3, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/weaponsmith/cupronickel_sword_enchanted.json b/src/generated/resources/data/basemetals/villager_trade/weaponsmith/cupronickel_sword_enchanted.json new file mode 100644 index 000000000..c41ba3538 --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/weaponsmith/cupronickel_sword_enchanted.json @@ -0,0 +1,29 @@ +{ + "given_item_modifiers": [ + { + "function": "minecraft:enchant_with_levels", + "include_additional_cost_component": true, + "levels": { + "type": "minecraft:uniform", + "max": 19, + "min": 5 + }, + "options": "#minecraft:on_random_loot" + } + ], + "gives": { + "count": 1, + "id": "basemetals:cupronickel_sword" + }, + "max_uses": 3, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:cupronickel_sword" + }, + "reputation_discount": 0.2, + "wants": { + "count": 10, + "id": "minecraft:emerald" + }, + "xp": 15 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/weaponsmith/electrum_bow.json b/src/generated/resources/data/basemetals/villager_trade/weaponsmith/electrum_bow.json new file mode 100644 index 000000000..7ec20d69d --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/weaponsmith/electrum_bow.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 1, + "id": "basemetals:electrum_bow" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:electrum_bow" + }, + "reputation_discount": 0.2, + "wants": { + "count": 4, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/weaponsmith/electrum_bow_enchanted.json b/src/generated/resources/data/basemetals/villager_trade/weaponsmith/electrum_bow_enchanted.json new file mode 100644 index 000000000..fa5663783 --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/weaponsmith/electrum_bow_enchanted.json @@ -0,0 +1,29 @@ +{ + "given_item_modifiers": [ + { + "function": "minecraft:enchant_with_levels", + "include_additional_cost_component": true, + "levels": { + "type": "minecraft:uniform", + "max": 19, + "min": 5 + }, + "options": "#minecraft:on_random_loot" + } + ], + "gives": { + "count": 1, + "id": "basemetals:electrum_bow" + }, + "max_uses": 3, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:electrum_bow" + }, + "reputation_discount": 0.2, + "wants": { + "count": 10, + "id": "minecraft:emerald" + }, + "xp": 15 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/weaponsmith/electrum_crossbow.json b/src/generated/resources/data/basemetals/villager_trade/weaponsmith/electrum_crossbow.json new file mode 100644 index 000000000..f5e91ea0e --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/weaponsmith/electrum_crossbow.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 1, + "id": "basemetals:electrum_crossbow" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:electrum_crossbow" + }, + "reputation_discount": 0.2, + "wants": { + "count": 4, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/weaponsmith/electrum_crossbow_enchanted.json b/src/generated/resources/data/basemetals/villager_trade/weaponsmith/electrum_crossbow_enchanted.json new file mode 100644 index 000000000..d3f2fb990 --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/weaponsmith/electrum_crossbow_enchanted.json @@ -0,0 +1,29 @@ +{ + "given_item_modifiers": [ + { + "function": "minecraft:enchant_with_levels", + "include_additional_cost_component": true, + "levels": { + "type": "minecraft:uniform", + "max": 19, + "min": 5 + }, + "options": "#minecraft:on_random_loot" + } + ], + "gives": { + "count": 1, + "id": "basemetals:electrum_crossbow" + }, + "max_uses": 3, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:electrum_crossbow" + }, + "reputation_discount": 0.2, + "wants": { + "count": 10, + "id": "minecraft:emerald" + }, + "xp": 15 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/weaponsmith/electrum_ingot.json b/src/generated/resources/data/basemetals/villager_trade/weaponsmith/electrum_ingot.json new file mode 100644 index 000000000..de2af531e --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/weaponsmith/electrum_ingot.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 12, + "id": "basemetals:electrum_ingot" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:electrum_ingot" + }, + "reputation_discount": 0.2, + "wants": { + "count": 4, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/weaponsmith/electrum_sword.json b/src/generated/resources/data/basemetals/villager_trade/weaponsmith/electrum_sword.json new file mode 100644 index 000000000..941112ef6 --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/weaponsmith/electrum_sword.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 1, + "id": "basemetals:electrum_sword" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:electrum_sword" + }, + "reputation_discount": 0.2, + "wants": { + "count": 3, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/weaponsmith/electrum_sword_enchanted.json b/src/generated/resources/data/basemetals/villager_trade/weaponsmith/electrum_sword_enchanted.json new file mode 100644 index 000000000..5a5845120 --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/weaponsmith/electrum_sword_enchanted.json @@ -0,0 +1,29 @@ +{ + "given_item_modifiers": [ + { + "function": "minecraft:enchant_with_levels", + "include_additional_cost_component": true, + "levels": { + "type": "minecraft:uniform", + "max": 19, + "min": 5 + }, + "options": "#minecraft:on_random_loot" + } + ], + "gives": { + "count": 1, + "id": "basemetals:electrum_sword" + }, + "max_uses": 3, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:electrum_sword" + }, + "reputation_discount": 0.2, + "wants": { + "count": 10, + "id": "minecraft:emerald" + }, + "xp": 15 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/weaponsmith/invar_bow.json b/src/generated/resources/data/basemetals/villager_trade/weaponsmith/invar_bow.json new file mode 100644 index 000000000..1ce3ead71 --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/weaponsmith/invar_bow.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 1, + "id": "basemetals:invar_bow" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:invar_bow" + }, + "reputation_discount": 0.2, + "wants": { + "count": 5, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/weaponsmith/invar_crossbow.json b/src/generated/resources/data/basemetals/villager_trade/weaponsmith/invar_crossbow.json new file mode 100644 index 000000000..695aa5390 --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/weaponsmith/invar_crossbow.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 1, + "id": "basemetals:invar_crossbow" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:invar_crossbow" + }, + "reputation_discount": 0.2, + "wants": { + "count": 5, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/weaponsmith/invar_ingot.json b/src/generated/resources/data/basemetals/villager_trade/weaponsmith/invar_ingot.json new file mode 100644 index 000000000..6bafcb756 --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/weaponsmith/invar_ingot.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 12, + "id": "basemetals:invar_ingot" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:invar_ingot" + }, + "reputation_discount": 0.2, + "wants": { + "count": 5, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/weaponsmith/invar_sword.json b/src/generated/resources/data/basemetals/villager_trade/weaponsmith/invar_sword.json new file mode 100644 index 000000000..db9fdd6ba --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/weaponsmith/invar_sword.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 1, + "id": "basemetals:invar_sword" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:invar_sword" + }, + "reputation_discount": 0.2, + "wants": { + "count": 5, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/weaponsmith/lead_bow.json b/src/generated/resources/data/basemetals/villager_trade/weaponsmith/lead_bow.json new file mode 100644 index 000000000..6f095af94 --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/weaponsmith/lead_bow.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 1, + "id": "basemetals:lead_bow" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:lead_bow" + }, + "reputation_discount": 0.2, + "wants": { + "count": 1, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/weaponsmith/lead_crossbow.json b/src/generated/resources/data/basemetals/villager_trade/weaponsmith/lead_crossbow.json new file mode 100644 index 000000000..b05739350 --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/weaponsmith/lead_crossbow.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 1, + "id": "basemetals:lead_crossbow" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:lead_crossbow" + }, + "reputation_discount": 0.2, + "wants": { + "count": 1, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/weaponsmith/lead_ingot.json b/src/generated/resources/data/basemetals/villager_trade/weaponsmith/lead_ingot.json new file mode 100644 index 000000000..d5eb2fa56 --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/weaponsmith/lead_ingot.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 12, + "id": "basemetals:lead_ingot" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:lead_ingot" + }, + "reputation_discount": 0.2, + "wants": { + "count": 1, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/weaponsmith/lead_sword.json b/src/generated/resources/data/basemetals/villager_trade/weaponsmith/lead_sword.json new file mode 100644 index 000000000..d4308b4e9 --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/weaponsmith/lead_sword.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 1, + "id": "basemetals:lead_sword" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:lead_sword" + }, + "reputation_discount": 0.2, + "wants": { + "count": 1, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/weaponsmith/mercury_ingot.json b/src/generated/resources/data/basemetals/villager_trade/weaponsmith/mercury_ingot.json new file mode 100644 index 000000000..4d3ac83c7 --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/weaponsmith/mercury_ingot.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 12, + "id": "basemetals:mercury_ingot" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:mercury_ingot" + }, + "reputation_discount": 0.2, + "wants": { + "count": 1, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/weaponsmith/nickel_bow.json b/src/generated/resources/data/basemetals/villager_trade/weaponsmith/nickel_bow.json new file mode 100644 index 000000000..f21811deb --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/weaponsmith/nickel_bow.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 1, + "id": "basemetals:nickel_bow" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:nickel_bow" + }, + "reputation_discount": 0.2, + "wants": { + "count": 3, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/weaponsmith/nickel_bow_enchanted.json b/src/generated/resources/data/basemetals/villager_trade/weaponsmith/nickel_bow_enchanted.json new file mode 100644 index 000000000..3181c2e68 --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/weaponsmith/nickel_bow_enchanted.json @@ -0,0 +1,29 @@ +{ + "given_item_modifiers": [ + { + "function": "minecraft:enchant_with_levels", + "include_additional_cost_component": true, + "levels": { + "type": "minecraft:uniform", + "max": 19, + "min": 5 + }, + "options": "#minecraft:on_random_loot" + } + ], + "gives": { + "count": 1, + "id": "basemetals:nickel_bow" + }, + "max_uses": 3, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:nickel_bow" + }, + "reputation_discount": 0.2, + "wants": { + "count": 9, + "id": "minecraft:emerald" + }, + "xp": 15 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/weaponsmith/nickel_crossbow.json b/src/generated/resources/data/basemetals/villager_trade/weaponsmith/nickel_crossbow.json new file mode 100644 index 000000000..5e4be4565 --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/weaponsmith/nickel_crossbow.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 1, + "id": "basemetals:nickel_crossbow" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:nickel_crossbow" + }, + "reputation_discount": 0.2, + "wants": { + "count": 3, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/weaponsmith/nickel_crossbow_enchanted.json b/src/generated/resources/data/basemetals/villager_trade/weaponsmith/nickel_crossbow_enchanted.json new file mode 100644 index 000000000..05eb63977 --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/weaponsmith/nickel_crossbow_enchanted.json @@ -0,0 +1,29 @@ +{ + "given_item_modifiers": [ + { + "function": "minecraft:enchant_with_levels", + "include_additional_cost_component": true, + "levels": { + "type": "minecraft:uniform", + "max": 19, + "min": 5 + }, + "options": "#minecraft:on_random_loot" + } + ], + "gives": { + "count": 1, + "id": "basemetals:nickel_crossbow" + }, + "max_uses": 3, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:nickel_crossbow" + }, + "reputation_discount": 0.2, + "wants": { + "count": 9, + "id": "minecraft:emerald" + }, + "xp": 15 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/weaponsmith/nickel_ingot.json b/src/generated/resources/data/basemetals/villager_trade/weaponsmith/nickel_ingot.json new file mode 100644 index 000000000..3686cce1f --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/weaponsmith/nickel_ingot.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 12, + "id": "basemetals:nickel_ingot" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:nickel_ingot" + }, + "reputation_discount": 0.2, + "wants": { + "count": 3, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/weaponsmith/nickel_sword.json b/src/generated/resources/data/basemetals/villager_trade/weaponsmith/nickel_sword.json new file mode 100644 index 000000000..acaed5220 --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/weaponsmith/nickel_sword.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 1, + "id": "basemetals:nickel_sword" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:nickel_sword" + }, + "reputation_discount": 0.2, + "wants": { + "count": 2, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/weaponsmith/nickel_sword_enchanted.json b/src/generated/resources/data/basemetals/villager_trade/weaponsmith/nickel_sword_enchanted.json new file mode 100644 index 000000000..c259489ae --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/weaponsmith/nickel_sword_enchanted.json @@ -0,0 +1,29 @@ +{ + "given_item_modifiers": [ + { + "function": "minecraft:enchant_with_levels", + "include_additional_cost_component": true, + "levels": { + "type": "minecraft:uniform", + "max": 19, + "min": 5 + }, + "options": "#minecraft:on_random_loot" + } + ], + "gives": { + "count": 1, + "id": "basemetals:nickel_sword" + }, + "max_uses": 3, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:nickel_sword" + }, + "reputation_discount": 0.2, + "wants": { + "count": 9, + "id": "minecraft:emerald" + }, + "xp": 15 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/weaponsmith/pewter_bow.json b/src/generated/resources/data/basemetals/villager_trade/weaponsmith/pewter_bow.json new file mode 100644 index 000000000..dfdc6ccd0 --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/weaponsmith/pewter_bow.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 1, + "id": "basemetals:pewter_bow" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:pewter_bow" + }, + "reputation_discount": 0.2, + "wants": { + "count": 1, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/weaponsmith/pewter_crossbow.json b/src/generated/resources/data/basemetals/villager_trade/weaponsmith/pewter_crossbow.json new file mode 100644 index 000000000..981d9cb48 --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/weaponsmith/pewter_crossbow.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 1, + "id": "basemetals:pewter_crossbow" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:pewter_crossbow" + }, + "reputation_discount": 0.2, + "wants": { + "count": 1, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/weaponsmith/pewter_ingot.json b/src/generated/resources/data/basemetals/villager_trade/weaponsmith/pewter_ingot.json new file mode 100644 index 000000000..bbe3b8b98 --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/weaponsmith/pewter_ingot.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 12, + "id": "basemetals:pewter_ingot" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:pewter_ingot" + }, + "reputation_discount": 0.2, + "wants": { + "count": 1, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/weaponsmith/pewter_sword.json b/src/generated/resources/data/basemetals/villager_trade/weaponsmith/pewter_sword.json new file mode 100644 index 000000000..a6b90a3ce --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/weaponsmith/pewter_sword.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 1, + "id": "basemetals:pewter_sword" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:pewter_sword" + }, + "reputation_discount": 0.2, + "wants": { + "count": 1, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/weaponsmith/silver_bow.json b/src/generated/resources/data/basemetals/villager_trade/weaponsmith/silver_bow.json new file mode 100644 index 000000000..2728f57a7 --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/weaponsmith/silver_bow.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 1, + "id": "basemetals:silver_bow" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:silver_bow" + }, + "reputation_discount": 0.2, + "wants": { + "count": 3, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/weaponsmith/silver_bow_enchanted.json b/src/generated/resources/data/basemetals/villager_trade/weaponsmith/silver_bow_enchanted.json new file mode 100644 index 000000000..210bc90f9 --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/weaponsmith/silver_bow_enchanted.json @@ -0,0 +1,29 @@ +{ + "given_item_modifiers": [ + { + "function": "minecraft:enchant_with_levels", + "include_additional_cost_component": true, + "levels": { + "type": "minecraft:uniform", + "max": 19, + "min": 5 + }, + "options": "#minecraft:on_random_loot" + } + ], + "gives": { + "count": 1, + "id": "basemetals:silver_bow" + }, + "max_uses": 3, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:silver_bow" + }, + "reputation_discount": 0.2, + "wants": { + "count": 9, + "id": "minecraft:emerald" + }, + "xp": 15 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/weaponsmith/silver_crossbow.json b/src/generated/resources/data/basemetals/villager_trade/weaponsmith/silver_crossbow.json new file mode 100644 index 000000000..cc4c27a43 --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/weaponsmith/silver_crossbow.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 1, + "id": "basemetals:silver_crossbow" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:silver_crossbow" + }, + "reputation_discount": 0.2, + "wants": { + "count": 3, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/weaponsmith/silver_crossbow_enchanted.json b/src/generated/resources/data/basemetals/villager_trade/weaponsmith/silver_crossbow_enchanted.json new file mode 100644 index 000000000..dacaa86a7 --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/weaponsmith/silver_crossbow_enchanted.json @@ -0,0 +1,29 @@ +{ + "given_item_modifiers": [ + { + "function": "minecraft:enchant_with_levels", + "include_additional_cost_component": true, + "levels": { + "type": "minecraft:uniform", + "max": 19, + "min": 5 + }, + "options": "#minecraft:on_random_loot" + } + ], + "gives": { + "count": 1, + "id": "basemetals:silver_crossbow" + }, + "max_uses": 3, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:silver_crossbow" + }, + "reputation_discount": 0.2, + "wants": { + "count": 9, + "id": "minecraft:emerald" + }, + "xp": 15 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/weaponsmith/silver_ingot.json b/src/generated/resources/data/basemetals/villager_trade/weaponsmith/silver_ingot.json new file mode 100644 index 000000000..c2577020f --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/weaponsmith/silver_ingot.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 12, + "id": "basemetals:silver_ingot" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:silver_ingot" + }, + "reputation_discount": 0.2, + "wants": { + "count": 3, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/weaponsmith/silver_sword.json b/src/generated/resources/data/basemetals/villager_trade/weaponsmith/silver_sword.json new file mode 100644 index 000000000..30ceb84f9 --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/weaponsmith/silver_sword.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 1, + "id": "basemetals:silver_sword" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:silver_sword" + }, + "reputation_discount": 0.2, + "wants": { + "count": 2, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/weaponsmith/silver_sword_enchanted.json b/src/generated/resources/data/basemetals/villager_trade/weaponsmith/silver_sword_enchanted.json new file mode 100644 index 000000000..86b698834 --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/weaponsmith/silver_sword_enchanted.json @@ -0,0 +1,29 @@ +{ + "given_item_modifiers": [ + { + "function": "minecraft:enchant_with_levels", + "include_additional_cost_component": true, + "levels": { + "type": "minecraft:uniform", + "max": 19, + "min": 5 + }, + "options": "#minecraft:on_random_loot" + } + ], + "gives": { + "count": 1, + "id": "basemetals:silver_sword" + }, + "max_uses": 3, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:silver_sword" + }, + "reputation_discount": 0.2, + "wants": { + "count": 9, + "id": "minecraft:emerald" + }, + "xp": 15 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/weaponsmith/steel_bow.json b/src/generated/resources/data/basemetals/villager_trade/weaponsmith/steel_bow.json new file mode 100644 index 000000000..aa1820576 --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/weaponsmith/steel_bow.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 1, + "id": "basemetals:steel_bow" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:steel_bow" + }, + "reputation_discount": 0.2, + "wants": { + "count": 5, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/weaponsmith/steel_crossbow.json b/src/generated/resources/data/basemetals/villager_trade/weaponsmith/steel_crossbow.json new file mode 100644 index 000000000..a8e4270bd --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/weaponsmith/steel_crossbow.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 1, + "id": "basemetals:steel_crossbow" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:steel_crossbow" + }, + "reputation_discount": 0.2, + "wants": { + "count": 5, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/weaponsmith/steel_ingot.json b/src/generated/resources/data/basemetals/villager_trade/weaponsmith/steel_ingot.json new file mode 100644 index 000000000..e2da706a2 --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/weaponsmith/steel_ingot.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 12, + "id": "basemetals:steel_ingot" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:steel_ingot" + }, + "reputation_discount": 0.2, + "wants": { + "count": 5, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/weaponsmith/steel_sword.json b/src/generated/resources/data/basemetals/villager_trade/weaponsmith/steel_sword.json new file mode 100644 index 000000000..2d2ac0a69 --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/weaponsmith/steel_sword.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 1, + "id": "basemetals:steel_sword" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:steel_sword" + }, + "reputation_discount": 0.2, + "wants": { + "count": 5, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/weaponsmith/tin_bow.json b/src/generated/resources/data/basemetals/villager_trade/weaponsmith/tin_bow.json new file mode 100644 index 000000000..4ede80164 --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/weaponsmith/tin_bow.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 1, + "id": "basemetals:tin_bow" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:tin_bow" + }, + "reputation_discount": 0.2, + "wants": { + "count": 1, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/weaponsmith/tin_crossbow.json b/src/generated/resources/data/basemetals/villager_trade/weaponsmith/tin_crossbow.json new file mode 100644 index 000000000..976af6cc8 --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/weaponsmith/tin_crossbow.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 1, + "id": "basemetals:tin_crossbow" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:tin_crossbow" + }, + "reputation_discount": 0.2, + "wants": { + "count": 1, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/weaponsmith/tin_ingot.json b/src/generated/resources/data/basemetals/villager_trade/weaponsmith/tin_ingot.json new file mode 100644 index 000000000..4e4d34d26 --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/weaponsmith/tin_ingot.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 12, + "id": "basemetals:tin_ingot" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:tin_ingot" + }, + "reputation_discount": 0.2, + "wants": { + "count": 1, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/weaponsmith/tin_sword.json b/src/generated/resources/data/basemetals/villager_trade/weaponsmith/tin_sword.json new file mode 100644 index 000000000..4dfbfd959 --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/weaponsmith/tin_sword.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 1, + "id": "basemetals:tin_sword" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:tin_sword" + }, + "reputation_discount": 0.2, + "wants": { + "count": 1, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/weaponsmith/zinc_bow.json b/src/generated/resources/data/basemetals/villager_trade/weaponsmith/zinc_bow.json new file mode 100644 index 000000000..b24b7a0d6 --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/weaponsmith/zinc_bow.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 1, + "id": "basemetals:zinc_bow" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:zinc_bow" + }, + "reputation_discount": 0.2, + "wants": { + "count": 1, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/weaponsmith/zinc_crossbow.json b/src/generated/resources/data/basemetals/villager_trade/weaponsmith/zinc_crossbow.json new file mode 100644 index 000000000..7b87cb777 --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/weaponsmith/zinc_crossbow.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 1, + "id": "basemetals:zinc_crossbow" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:zinc_crossbow" + }, + "reputation_discount": 0.2, + "wants": { + "count": 1, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/weaponsmith/zinc_ingot.json b/src/generated/resources/data/basemetals/villager_trade/weaponsmith/zinc_ingot.json new file mode 100644 index 000000000..93fa944ca --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/weaponsmith/zinc_ingot.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 12, + "id": "basemetals:zinc_ingot" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:zinc_ingot" + }, + "reputation_discount": 0.2, + "wants": { + "count": 1, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/villager_trade/weaponsmith/zinc_sword.json b/src/generated/resources/data/basemetals/villager_trade/weaponsmith/zinc_sword.json new file mode 100644 index 000000000..3b6e4c9c3 --- /dev/null +++ b/src/generated/resources/data/basemetals/villager_trade/weaponsmith/zinc_sword.json @@ -0,0 +1,17 @@ +{ + "gives": { + "count": 1, + "id": "basemetals:zinc_sword" + }, + "max_uses": 6, + "merchant_predicate": { + "condition": "basemetals:trade_enabled", + "item": "basemetals:zinc_sword" + }, + "reputation_discount": 0.2, + "wants": { + "count": 1, + "id": "minecraft:emerald" + }, + "xp": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/block/bars/copper.json b/src/generated/resources/data/c/tags/block/bars/copper.json new file mode 100644 index 000000000..b5a995f14 --- /dev/null +++ b/src/generated/resources/data/c/tags/block/bars/copper.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "basemetals:copper_bars", + "minecraft:copper_bars" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/block/doors/copper.json b/src/generated/resources/data/c/tags/block/doors/copper.json new file mode 100644 index 000000000..989979572 --- /dev/null +++ b/src/generated/resources/data/c/tags/block/doors/copper.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "basemetals:copper_door", + "minecraft:copper_door" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/block/end_stones.json b/src/generated/resources/data/c/tags/block/end_stones.json new file mode 100644 index 000000000..146dcd9a6 --- /dev/null +++ b/src/generated/resources/data/c/tags/block/end_stones.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:end_stone" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/block/netherrack.json b/src/generated/resources/data/c/tags/block/netherrack.json new file mode 100644 index 000000000..d54c65bbb --- /dev/null +++ b/src/generated/resources/data/c/tags/block/netherrack.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:netherrack" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/block/ores.json b/src/generated/resources/data/c/tags/block/ores.json new file mode 100644 index 000000000..5c11dac0a --- /dev/null +++ b/src/generated/resources/data/c/tags/block/ores.json @@ -0,0 +1,18 @@ +{ + "replace": false, + "values": [ + "#c:ores/adamantine", + "#c:ores/antimony", + "#c:ores/bismuth", + "#c:ores/coldiron", + "#c:ores/copper", + "#c:ores/lead", + "#c:ores/mercury", + "#c:ores/nickel", + "#c:ores/platinum", + "#c:ores/silver", + "#c:ores/starsteel", + "#c:ores/tin", + "#c:ores/zinc" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/block/ores/adamantine.json b/src/generated/resources/data/c/tags/block/ores/adamantine.json new file mode 100644 index 000000000..fdc15c972 --- /dev/null +++ b/src/generated/resources/data/c/tags/block/ores/adamantine.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:adamantine_ore" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/block/ores/antimony.json b/src/generated/resources/data/c/tags/block/ores/antimony.json new file mode 100644 index 000000000..d535177f5 --- /dev/null +++ b/src/generated/resources/data/c/tags/block/ores/antimony.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:antimony_ore" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/block/ores/bismuth.json b/src/generated/resources/data/c/tags/block/ores/bismuth.json new file mode 100644 index 000000000..a43ac8ddb --- /dev/null +++ b/src/generated/resources/data/c/tags/block/ores/bismuth.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:bismuth_ore" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/block/ores/coldiron.json b/src/generated/resources/data/c/tags/block/ores/coldiron.json new file mode 100644 index 000000000..968821106 --- /dev/null +++ b/src/generated/resources/data/c/tags/block/ores/coldiron.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:coldiron_ore" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/block/ores/copper.json b/src/generated/resources/data/c/tags/block/ores/copper.json new file mode 100644 index 000000000..c2e8c464f --- /dev/null +++ b/src/generated/resources/data/c/tags/block/ores/copper.json @@ -0,0 +1,8 @@ +{ + "replace": false, + "values": [ + "basemetals:copper_ore", + "minecraft:copper_ore", + "minecraft:deepslate_copper_ore" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/block/ores/lead.json b/src/generated/resources/data/c/tags/block/ores/lead.json new file mode 100644 index 000000000..71aad861f --- /dev/null +++ b/src/generated/resources/data/c/tags/block/ores/lead.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:lead_ore" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/block/ores/mercury.json b/src/generated/resources/data/c/tags/block/ores/mercury.json new file mode 100644 index 000000000..ddd01f06b --- /dev/null +++ b/src/generated/resources/data/c/tags/block/ores/mercury.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:mercury_ore" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/block/ores/nickel.json b/src/generated/resources/data/c/tags/block/ores/nickel.json new file mode 100644 index 000000000..4f0eff4f1 --- /dev/null +++ b/src/generated/resources/data/c/tags/block/ores/nickel.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:nickel_ore" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/block/ores/platinum.json b/src/generated/resources/data/c/tags/block/ores/platinum.json new file mode 100644 index 000000000..0c92650c7 --- /dev/null +++ b/src/generated/resources/data/c/tags/block/ores/platinum.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:platinum_ore" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/block/ores/silver.json b/src/generated/resources/data/c/tags/block/ores/silver.json new file mode 100644 index 000000000..4a586b22a --- /dev/null +++ b/src/generated/resources/data/c/tags/block/ores/silver.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:silver_ore" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/block/ores/starsteel.json b/src/generated/resources/data/c/tags/block/ores/starsteel.json new file mode 100644 index 000000000..7e82e1027 --- /dev/null +++ b/src/generated/resources/data/c/tags/block/ores/starsteel.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:starsteel_ore" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/block/ores/tin.json b/src/generated/resources/data/c/tags/block/ores/tin.json new file mode 100644 index 000000000..db8843130 --- /dev/null +++ b/src/generated/resources/data/c/tags/block/ores/tin.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:tin_ore" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/block/ores/zinc.json b/src/generated/resources/data/c/tags/block/ores/zinc.json new file mode 100644 index 000000000..27c70fae4 --- /dev/null +++ b/src/generated/resources/data/c/tags/block/ores/zinc.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:zinc_ore" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/block/slabs/copper.json b/src/generated/resources/data/c/tags/block/slabs/copper.json new file mode 100644 index 000000000..6695810f9 --- /dev/null +++ b/src/generated/resources/data/c/tags/block/slabs/copper.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "basemetals:copper_slab", + "minecraft:cut_copper_slab" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/block/stairs/copper.json b/src/generated/resources/data/c/tags/block/stairs/copper.json new file mode 100644 index 000000000..96357a57a --- /dev/null +++ b/src/generated/resources/data/c/tags/block/stairs/copper.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "basemetals:copper_stairs", + "minecraft:cut_copper_stairs" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/block/storage_blocks.json b/src/generated/resources/data/c/tags/block/storage_blocks.json new file mode 100644 index 000000000..b7f3a8c10 --- /dev/null +++ b/src/generated/resources/data/c/tags/block/storage_blocks.json @@ -0,0 +1,26 @@ +{ + "replace": false, + "values": [ + "#c:storage_blocks/adamantine", + "#c:storage_blocks/antimony", + "#c:storage_blocks/aquarium", + "#c:storage_blocks/bismuth", + "#c:storage_blocks/brass", + "#c:storage_blocks/bronze", + "#c:storage_blocks/coldiron", + "#c:storage_blocks/copper", + "#c:storage_blocks/cupronickel", + "#c:storage_blocks/electrum", + "#c:storage_blocks/invar", + "#c:storage_blocks/lead", + "#c:storage_blocks/mithril", + "#c:storage_blocks/nickel", + "#c:storage_blocks/pewter", + "#c:storage_blocks/platinum", + "#c:storage_blocks/silver", + "#c:storage_blocks/starsteel", + "#c:storage_blocks/steel", + "#c:storage_blocks/tin", + "#c:storage_blocks/zinc" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/block/storage_blocks/adamantine.json b/src/generated/resources/data/c/tags/block/storage_blocks/adamantine.json new file mode 100644 index 000000000..17dd5862b --- /dev/null +++ b/src/generated/resources/data/c/tags/block/storage_blocks/adamantine.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:adamantine_block" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/block/storage_blocks/antimony.json b/src/generated/resources/data/c/tags/block/storage_blocks/antimony.json new file mode 100644 index 000000000..daa0b4252 --- /dev/null +++ b/src/generated/resources/data/c/tags/block/storage_blocks/antimony.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:antimony_block" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/block/storage_blocks/aquarium.json b/src/generated/resources/data/c/tags/block/storage_blocks/aquarium.json new file mode 100644 index 000000000..d963cc8b6 --- /dev/null +++ b/src/generated/resources/data/c/tags/block/storage_blocks/aquarium.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:aquarium_block" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/block/storage_blocks/bismuth.json b/src/generated/resources/data/c/tags/block/storage_blocks/bismuth.json new file mode 100644 index 000000000..950cf31a4 --- /dev/null +++ b/src/generated/resources/data/c/tags/block/storage_blocks/bismuth.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:bismuth_block" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/block/storage_blocks/brass.json b/src/generated/resources/data/c/tags/block/storage_blocks/brass.json new file mode 100644 index 000000000..8997b5d35 --- /dev/null +++ b/src/generated/resources/data/c/tags/block/storage_blocks/brass.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:brass_block" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/block/storage_blocks/bronze.json b/src/generated/resources/data/c/tags/block/storage_blocks/bronze.json new file mode 100644 index 000000000..bc8bff634 --- /dev/null +++ b/src/generated/resources/data/c/tags/block/storage_blocks/bronze.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:bronze_block" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/block/storage_blocks/charcoal.json b/src/generated/resources/data/c/tags/block/storage_blocks/charcoal.json new file mode 100644 index 000000000..c09411d1a --- /dev/null +++ b/src/generated/resources/data/c/tags/block/storage_blocks/charcoal.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:charcoal_block" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/block/storage_blocks/coldiron.json b/src/generated/resources/data/c/tags/block/storage_blocks/coldiron.json new file mode 100644 index 000000000..0951a5514 --- /dev/null +++ b/src/generated/resources/data/c/tags/block/storage_blocks/coldiron.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:coldiron_block" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/block/storage_blocks/copper.json b/src/generated/resources/data/c/tags/block/storage_blocks/copper.json new file mode 100644 index 000000000..c094f1f5e --- /dev/null +++ b/src/generated/resources/data/c/tags/block/storage_blocks/copper.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "basemetals:copper_block", + "minecraft:copper_block" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/block/storage_blocks/cupronickel.json b/src/generated/resources/data/c/tags/block/storage_blocks/cupronickel.json new file mode 100644 index 000000000..68717af17 --- /dev/null +++ b/src/generated/resources/data/c/tags/block/storage_blocks/cupronickel.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:cupronickel_block" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/block/storage_blocks/diamond.json b/src/generated/resources/data/c/tags/block/storage_blocks/diamond.json new file mode 100644 index 000000000..bc1977755 --- /dev/null +++ b/src/generated/resources/data/c/tags/block/storage_blocks/diamond.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:diamond_block" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/block/storage_blocks/electrum.json b/src/generated/resources/data/c/tags/block/storage_blocks/electrum.json new file mode 100644 index 000000000..b154028ba --- /dev/null +++ b/src/generated/resources/data/c/tags/block/storage_blocks/electrum.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:electrum_block" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/block/storage_blocks/emerald.json b/src/generated/resources/data/c/tags/block/storage_blocks/emerald.json new file mode 100644 index 000000000..30e292c55 --- /dev/null +++ b/src/generated/resources/data/c/tags/block/storage_blocks/emerald.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:emerald_block" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/block/storage_blocks/gold.json b/src/generated/resources/data/c/tags/block/storage_blocks/gold.json new file mode 100644 index 000000000..863d47ad2 --- /dev/null +++ b/src/generated/resources/data/c/tags/block/storage_blocks/gold.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:gold_block" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/block/storage_blocks/invar.json b/src/generated/resources/data/c/tags/block/storage_blocks/invar.json new file mode 100644 index 000000000..82f524f08 --- /dev/null +++ b/src/generated/resources/data/c/tags/block/storage_blocks/invar.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:invar_block" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/block/storage_blocks/iron.json b/src/generated/resources/data/c/tags/block/storage_blocks/iron.json new file mode 100644 index 000000000..f9e01c6a9 --- /dev/null +++ b/src/generated/resources/data/c/tags/block/storage_blocks/iron.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:iron_block" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/block/storage_blocks/lead.json b/src/generated/resources/data/c/tags/block/storage_blocks/lead.json new file mode 100644 index 000000000..49532fa3e --- /dev/null +++ b/src/generated/resources/data/c/tags/block/storage_blocks/lead.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:lead_block" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/block/storage_blocks/mithril.json b/src/generated/resources/data/c/tags/block/storage_blocks/mithril.json new file mode 100644 index 000000000..06355311f --- /dev/null +++ b/src/generated/resources/data/c/tags/block/storage_blocks/mithril.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:mithril_block" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/block/storage_blocks/nickel.json b/src/generated/resources/data/c/tags/block/storage_blocks/nickel.json new file mode 100644 index 000000000..1a3a3bffd --- /dev/null +++ b/src/generated/resources/data/c/tags/block/storage_blocks/nickel.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:nickel_block" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/block/storage_blocks/obsidian.json b/src/generated/resources/data/c/tags/block/storage_blocks/obsidian.json new file mode 100644 index 000000000..03a3719e3 --- /dev/null +++ b/src/generated/resources/data/c/tags/block/storage_blocks/obsidian.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:obsidian" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/block/storage_blocks/pewter.json b/src/generated/resources/data/c/tags/block/storage_blocks/pewter.json new file mode 100644 index 000000000..03d48f873 --- /dev/null +++ b/src/generated/resources/data/c/tags/block/storage_blocks/pewter.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:pewter_block" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/block/storage_blocks/platinum.json b/src/generated/resources/data/c/tags/block/storage_blocks/platinum.json new file mode 100644 index 000000000..2127f7b12 --- /dev/null +++ b/src/generated/resources/data/c/tags/block/storage_blocks/platinum.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:platinum_block" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/block/storage_blocks/quartz.json b/src/generated/resources/data/c/tags/block/storage_blocks/quartz.json new file mode 100644 index 000000000..1321f2077 --- /dev/null +++ b/src/generated/resources/data/c/tags/block/storage_blocks/quartz.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:quartz_block" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/block/storage_blocks/silver.json b/src/generated/resources/data/c/tags/block/storage_blocks/silver.json new file mode 100644 index 000000000..50cd38aeb --- /dev/null +++ b/src/generated/resources/data/c/tags/block/storage_blocks/silver.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:silver_block" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/block/storage_blocks/starsteel.json b/src/generated/resources/data/c/tags/block/storage_blocks/starsteel.json new file mode 100644 index 000000000..451d897d3 --- /dev/null +++ b/src/generated/resources/data/c/tags/block/storage_blocks/starsteel.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:starsteel_block" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/block/storage_blocks/steel.json b/src/generated/resources/data/c/tags/block/storage_blocks/steel.json new file mode 100644 index 000000000..fd64726d3 --- /dev/null +++ b/src/generated/resources/data/c/tags/block/storage_blocks/steel.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:steel_block" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/block/storage_blocks/tin.json b/src/generated/resources/data/c/tags/block/storage_blocks/tin.json new file mode 100644 index 000000000..9880ef345 --- /dev/null +++ b/src/generated/resources/data/c/tags/block/storage_blocks/tin.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:tin_block" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/block/storage_blocks/zinc.json b/src/generated/resources/data/c/tags/block/storage_blocks/zinc.json new file mode 100644 index 000000000..9d9179250 --- /dev/null +++ b/src/generated/resources/data/c/tags/block/storage_blocks/zinc.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:zinc_block" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/block/trapdoors/copper.json b/src/generated/resources/data/c/tags/block/trapdoors/copper.json new file mode 100644 index 000000000..0bb1f00b1 --- /dev/null +++ b/src/generated/resources/data/c/tags/block/trapdoors/copper.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "basemetals:copper_trapdoor", + "minecraft:copper_trapdoor" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/fluid/molten_adamantine.json b/src/generated/resources/data/c/tags/fluid/molten_adamantine.json new file mode 100644 index 000000000..d1dc1ab9f --- /dev/null +++ b/src/generated/resources/data/c/tags/fluid/molten_adamantine.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "basemetals:adamantine", + "basemetals:flowing_adamantine" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/fluid/molten_antimony.json b/src/generated/resources/data/c/tags/fluid/molten_antimony.json new file mode 100644 index 000000000..f56e72a23 --- /dev/null +++ b/src/generated/resources/data/c/tags/fluid/molten_antimony.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "basemetals:antimony", + "basemetals:flowing_antimony" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/fluid/molten_aquarium.json b/src/generated/resources/data/c/tags/fluid/molten_aquarium.json new file mode 100644 index 000000000..227060d19 --- /dev/null +++ b/src/generated/resources/data/c/tags/fluid/molten_aquarium.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "basemetals:aquarium", + "basemetals:flowing_aquarium" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/fluid/molten_bismuth.json b/src/generated/resources/data/c/tags/fluid/molten_bismuth.json new file mode 100644 index 000000000..1e45002e5 --- /dev/null +++ b/src/generated/resources/data/c/tags/fluid/molten_bismuth.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "basemetals:bismuth", + "basemetals:flowing_bismuth" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/fluid/molten_brass.json b/src/generated/resources/data/c/tags/fluid/molten_brass.json new file mode 100644 index 000000000..005173b87 --- /dev/null +++ b/src/generated/resources/data/c/tags/fluid/molten_brass.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "basemetals:brass", + "basemetals:flowing_brass" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/fluid/molten_bronze.json b/src/generated/resources/data/c/tags/fluid/molten_bronze.json new file mode 100644 index 000000000..1fa7eec8b --- /dev/null +++ b/src/generated/resources/data/c/tags/fluid/molten_bronze.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "basemetals:bronze", + "basemetals:flowing_bronze" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/fluid/molten_coldiron.json b/src/generated/resources/data/c/tags/fluid/molten_coldiron.json new file mode 100644 index 000000000..233e59a5f --- /dev/null +++ b/src/generated/resources/data/c/tags/fluid/molten_coldiron.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "basemetals:coldiron", + "basemetals:flowing_coldiron" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/fluid/molten_copper.json b/src/generated/resources/data/c/tags/fluid/molten_copper.json new file mode 100644 index 000000000..c301950e4 --- /dev/null +++ b/src/generated/resources/data/c/tags/fluid/molten_copper.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "basemetals:copper", + "basemetals:flowing_copper" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/fluid/molten_cupronickel.json b/src/generated/resources/data/c/tags/fluid/molten_cupronickel.json new file mode 100644 index 000000000..2b94f3224 --- /dev/null +++ b/src/generated/resources/data/c/tags/fluid/molten_cupronickel.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "basemetals:cupronickel", + "basemetals:flowing_cupronickel" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/fluid/molten_electrum.json b/src/generated/resources/data/c/tags/fluid/molten_electrum.json new file mode 100644 index 000000000..7c5b8585e --- /dev/null +++ b/src/generated/resources/data/c/tags/fluid/molten_electrum.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "basemetals:electrum", + "basemetals:flowing_electrum" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/fluid/molten_invar.json b/src/generated/resources/data/c/tags/fluid/molten_invar.json new file mode 100644 index 000000000..1bf9a13e7 --- /dev/null +++ b/src/generated/resources/data/c/tags/fluid/molten_invar.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "basemetals:flowing_invar", + "basemetals:invar" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/fluid/molten_lead.json b/src/generated/resources/data/c/tags/fluid/molten_lead.json new file mode 100644 index 000000000..13eb7f05c --- /dev/null +++ b/src/generated/resources/data/c/tags/fluid/molten_lead.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "basemetals:flowing_lead", + "basemetals:lead" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/fluid/molten_mercury.json b/src/generated/resources/data/c/tags/fluid/molten_mercury.json new file mode 100644 index 000000000..ffd1cb3d3 --- /dev/null +++ b/src/generated/resources/data/c/tags/fluid/molten_mercury.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "basemetals:flowing_mercury", + "basemetals:mercury" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/fluid/molten_mithril.json b/src/generated/resources/data/c/tags/fluid/molten_mithril.json new file mode 100644 index 000000000..94d582923 --- /dev/null +++ b/src/generated/resources/data/c/tags/fluid/molten_mithril.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "basemetals:flowing_mithril", + "basemetals:mithril" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/fluid/molten_nickel.json b/src/generated/resources/data/c/tags/fluid/molten_nickel.json new file mode 100644 index 000000000..abfb550d2 --- /dev/null +++ b/src/generated/resources/data/c/tags/fluid/molten_nickel.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "basemetals:flowing_nickel", + "basemetals:nickel" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/fluid/molten_pewter.json b/src/generated/resources/data/c/tags/fluid/molten_pewter.json new file mode 100644 index 000000000..e153f8415 --- /dev/null +++ b/src/generated/resources/data/c/tags/fluid/molten_pewter.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "basemetals:flowing_pewter", + "basemetals:pewter" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/fluid/molten_platinum.json b/src/generated/resources/data/c/tags/fluid/molten_platinum.json new file mode 100644 index 000000000..5fa6aee13 --- /dev/null +++ b/src/generated/resources/data/c/tags/fluid/molten_platinum.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "basemetals:flowing_platinum", + "basemetals:platinum" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/fluid/molten_silver.json b/src/generated/resources/data/c/tags/fluid/molten_silver.json new file mode 100644 index 000000000..c8e05b678 --- /dev/null +++ b/src/generated/resources/data/c/tags/fluid/molten_silver.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "basemetals:flowing_silver", + "basemetals:silver" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/fluid/molten_starsteel.json b/src/generated/resources/data/c/tags/fluid/molten_starsteel.json new file mode 100644 index 000000000..8d55d7410 --- /dev/null +++ b/src/generated/resources/data/c/tags/fluid/molten_starsteel.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "basemetals:flowing_starsteel", + "basemetals:starsteel" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/fluid/molten_steel.json b/src/generated/resources/data/c/tags/fluid/molten_steel.json new file mode 100644 index 000000000..ea628b1a1 --- /dev/null +++ b/src/generated/resources/data/c/tags/fluid/molten_steel.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "basemetals:flowing_steel", + "basemetals:steel" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/fluid/molten_tin.json b/src/generated/resources/data/c/tags/fluid/molten_tin.json new file mode 100644 index 000000000..fb80921a9 --- /dev/null +++ b/src/generated/resources/data/c/tags/fluid/molten_tin.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "basemetals:flowing_tin", + "basemetals:tin" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/fluid/molten_zinc.json b/src/generated/resources/data/c/tags/fluid/molten_zinc.json new file mode 100644 index 000000000..78efdeae7 --- /dev/null +++ b/src/generated/resources/data/c/tags/fluid/molten_zinc.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "basemetals:flowing_zinc", + "basemetals:zinc" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/armors/boots/copper.json b/src/generated/resources/data/c/tags/item/armors/boots/copper.json new file mode 100644 index 000000000..727a028f1 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/armors/boots/copper.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "basemetals:copper_boots", + "minecraft:copper_boots" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/armors/chestplates/copper.json b/src/generated/resources/data/c/tags/item/armors/chestplates/copper.json new file mode 100644 index 000000000..dceb963c6 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/armors/chestplates/copper.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "basemetals:copper_chestplate", + "minecraft:copper_chestplate" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/armors/helmets/copper.json b/src/generated/resources/data/c/tags/item/armors/helmets/copper.json new file mode 100644 index 000000000..ebc5e4b73 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/armors/helmets/copper.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "basemetals:copper_helmet", + "minecraft:copper_helmet" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/armors/horse/copper.json b/src/generated/resources/data/c/tags/item/armors/horse/copper.json new file mode 100644 index 000000000..8a80963dd --- /dev/null +++ b/src/generated/resources/data/c/tags/item/armors/horse/copper.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "basemetals:copper_horse_armor", + "minecraft:copper_horse_armor" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/armors/leggings/copper.json b/src/generated/resources/data/c/tags/item/armors/leggings/copper.json new file mode 100644 index 000000000..463d0d7c4 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/armors/leggings/copper.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "basemetals:copper_leggings", + "minecraft:copper_leggings" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/bars/copper.json b/src/generated/resources/data/c/tags/item/bars/copper.json new file mode 100644 index 000000000..b5a995f14 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/bars/copper.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "basemetals:copper_bars", + "minecraft:copper_bars" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/blends/aquarium.json b/src/generated/resources/data/c/tags/item/blends/aquarium.json new file mode 100644 index 000000000..50832ddff --- /dev/null +++ b/src/generated/resources/data/c/tags/item/blends/aquarium.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:aquarium_blend" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/blends/brass.json b/src/generated/resources/data/c/tags/item/blends/brass.json new file mode 100644 index 000000000..e95a0cec1 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/blends/brass.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:brass_blend" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/blends/bronze.json b/src/generated/resources/data/c/tags/item/blends/bronze.json new file mode 100644 index 000000000..8e1f26f25 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/blends/bronze.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:bronze_blend" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/blends/cupronickel.json b/src/generated/resources/data/c/tags/item/blends/cupronickel.json new file mode 100644 index 000000000..5272f1b77 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/blends/cupronickel.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:cupronickel_blend" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/blends/diamond.json b/src/generated/resources/data/c/tags/item/blends/diamond.json new file mode 100644 index 000000000..7a576cf38 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/blends/diamond.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:diamond_blend" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/blends/electrum.json b/src/generated/resources/data/c/tags/item/blends/electrum.json new file mode 100644 index 000000000..f9dcffea4 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/blends/electrum.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:electrum_blend" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/blends/gold.json b/src/generated/resources/data/c/tags/item/blends/gold.json new file mode 100644 index 000000000..94ecf0b7a --- /dev/null +++ b/src/generated/resources/data/c/tags/item/blends/gold.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:gold_blend" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/blends/invar.json b/src/generated/resources/data/c/tags/item/blends/invar.json new file mode 100644 index 000000000..7a4447868 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/blends/invar.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:invar_blend" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/blends/iron.json b/src/generated/resources/data/c/tags/item/blends/iron.json new file mode 100644 index 000000000..63418172c --- /dev/null +++ b/src/generated/resources/data/c/tags/item/blends/iron.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:iron_blend" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/blends/mithril.json b/src/generated/resources/data/c/tags/item/blends/mithril.json new file mode 100644 index 000000000..ce89bb42c --- /dev/null +++ b/src/generated/resources/data/c/tags/item/blends/mithril.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:mithril_blend" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/blends/pewter.json b/src/generated/resources/data/c/tags/item/blends/pewter.json new file mode 100644 index 000000000..a9322a019 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/blends/pewter.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:pewter_blend" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/blends/steel.json b/src/generated/resources/data/c/tags/item/blends/steel.json new file mode 100644 index 000000000..f15603abc --- /dev/null +++ b/src/generated/resources/data/c/tags/item/blends/steel.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:steel_blend" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/casings/adamantine.json b/src/generated/resources/data/c/tags/item/casings/adamantine.json new file mode 100644 index 000000000..c66dcf98b --- /dev/null +++ b/src/generated/resources/data/c/tags/item/casings/adamantine.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:adamantine_casing" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/casings/antimony.json b/src/generated/resources/data/c/tags/item/casings/antimony.json new file mode 100644 index 000000000..6eec77687 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/casings/antimony.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:antimony_casing" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/casings/bismuth.json b/src/generated/resources/data/c/tags/item/casings/bismuth.json new file mode 100644 index 000000000..ed9c401c9 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/casings/bismuth.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:bismuth_casing" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/casings/coldiron.json b/src/generated/resources/data/c/tags/item/casings/coldiron.json new file mode 100644 index 000000000..d0632d38f --- /dev/null +++ b/src/generated/resources/data/c/tags/item/casings/coldiron.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:coldiron_casing" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/casings/nickel.json b/src/generated/resources/data/c/tags/item/casings/nickel.json new file mode 100644 index 000000000..c8054ecff --- /dev/null +++ b/src/generated/resources/data/c/tags/item/casings/nickel.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:nickel_casing" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/casings/platinum.json b/src/generated/resources/data/c/tags/item/casings/platinum.json new file mode 100644 index 000000000..18e6a5693 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/casings/platinum.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:platinum_casing" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/casings/starsteel.json b/src/generated/resources/data/c/tags/item/casings/starsteel.json new file mode 100644 index 000000000..7eb0da9dc --- /dev/null +++ b/src/generated/resources/data/c/tags/item/casings/starsteel.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:starsteel_casing" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/casings/zinc.json b/src/generated/resources/data/c/tags/item/casings/zinc.json new file mode 100644 index 000000000..f8f5d91ae --- /dev/null +++ b/src/generated/resources/data/c/tags/item/casings/zinc.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:zinc_casing" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/clumps/adamantine.json b/src/generated/resources/data/c/tags/item/clumps/adamantine.json new file mode 100644 index 000000000..a3f36cafd --- /dev/null +++ b/src/generated/resources/data/c/tags/item/clumps/adamantine.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:adamantine_clump" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/clumps/antimony.json b/src/generated/resources/data/c/tags/item/clumps/antimony.json new file mode 100644 index 000000000..2acae9f1a --- /dev/null +++ b/src/generated/resources/data/c/tags/item/clumps/antimony.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:antimony_clump" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/clumps/bismuth.json b/src/generated/resources/data/c/tags/item/clumps/bismuth.json new file mode 100644 index 000000000..8ad9832ed --- /dev/null +++ b/src/generated/resources/data/c/tags/item/clumps/bismuth.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:bismuth_clump" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/clumps/coldiron.json b/src/generated/resources/data/c/tags/item/clumps/coldiron.json new file mode 100644 index 000000000..558c911b3 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/clumps/coldiron.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:coldiron_clump" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/clumps/nickel.json b/src/generated/resources/data/c/tags/item/clumps/nickel.json new file mode 100644 index 000000000..503848433 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/clumps/nickel.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:nickel_clump" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/clumps/platinum.json b/src/generated/resources/data/c/tags/item/clumps/platinum.json new file mode 100644 index 000000000..628d150d6 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/clumps/platinum.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:platinum_clump" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/clumps/starsteel.json b/src/generated/resources/data/c/tags/item/clumps/starsteel.json new file mode 100644 index 000000000..f3ac598ea --- /dev/null +++ b/src/generated/resources/data/c/tags/item/clumps/starsteel.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:starsteel_clump" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/clumps/zinc.json b/src/generated/resources/data/c/tags/item/clumps/zinc.json new file mode 100644 index 000000000..fb68cca4d --- /dev/null +++ b/src/generated/resources/data/c/tags/item/clumps/zinc.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:zinc_clump" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/crushed_ores/adamantine.json b/src/generated/resources/data/c/tags/item/crushed_ores/adamantine.json new file mode 100644 index 000000000..29f455cda --- /dev/null +++ b/src/generated/resources/data/c/tags/item/crushed_ores/adamantine.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:adamantine_crushed" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/crushed_ores/antimony.json b/src/generated/resources/data/c/tags/item/crushed_ores/antimony.json new file mode 100644 index 000000000..27ac1442b --- /dev/null +++ b/src/generated/resources/data/c/tags/item/crushed_ores/antimony.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:antimony_crushed" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/crushed_ores/bismuth.json b/src/generated/resources/data/c/tags/item/crushed_ores/bismuth.json new file mode 100644 index 000000000..8f3e95882 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/crushed_ores/bismuth.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:bismuth_crushed" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/crushed_ores/coldiron.json b/src/generated/resources/data/c/tags/item/crushed_ores/coldiron.json new file mode 100644 index 000000000..6b79dbb19 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/crushed_ores/coldiron.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:coldiron_crushed" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/crushed_ores/nickel.json b/src/generated/resources/data/c/tags/item/crushed_ores/nickel.json new file mode 100644 index 000000000..a7615b9f1 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/crushed_ores/nickel.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:nickel_crushed" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/crushed_ores/platinum.json b/src/generated/resources/data/c/tags/item/crushed_ores/platinum.json new file mode 100644 index 000000000..e4b423ba8 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/crushed_ores/platinum.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:platinum_crushed" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/crushed_ores/starsteel.json b/src/generated/resources/data/c/tags/item/crushed_ores/starsteel.json new file mode 100644 index 000000000..f44770915 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/crushed_ores/starsteel.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:starsteel_crushed" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/crushed_ores/zinc.json b/src/generated/resources/data/c/tags/item/crushed_ores/zinc.json new file mode 100644 index 000000000..1b878843b --- /dev/null +++ b/src/generated/resources/data/c/tags/item/crushed_ores/zinc.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:zinc_crushed" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/crystals/adamantine.json b/src/generated/resources/data/c/tags/item/crystals/adamantine.json new file mode 100644 index 000000000..3ac475075 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/crystals/adamantine.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:adamantine_crystal" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/crystals/antimony.json b/src/generated/resources/data/c/tags/item/crystals/antimony.json new file mode 100644 index 000000000..a2744fd58 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/crystals/antimony.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:antimony_crystal" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/crystals/bismuth.json b/src/generated/resources/data/c/tags/item/crystals/bismuth.json new file mode 100644 index 000000000..00ee661e2 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/crystals/bismuth.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:bismuth_crystal" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/crystals/coldiron.json b/src/generated/resources/data/c/tags/item/crystals/coldiron.json new file mode 100644 index 000000000..48242f67d --- /dev/null +++ b/src/generated/resources/data/c/tags/item/crystals/coldiron.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:coldiron_crystal" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/crystals/nickel.json b/src/generated/resources/data/c/tags/item/crystals/nickel.json new file mode 100644 index 000000000..e8c2cd3c3 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/crystals/nickel.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:nickel_crystal" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/crystals/platinum.json b/src/generated/resources/data/c/tags/item/crystals/platinum.json new file mode 100644 index 000000000..9e4d92ead --- /dev/null +++ b/src/generated/resources/data/c/tags/item/crystals/platinum.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:platinum_crystal" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/crystals/starsteel.json b/src/generated/resources/data/c/tags/item/crystals/starsteel.json new file mode 100644 index 000000000..d292b2ba1 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/crystals/starsteel.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:starsteel_crystal" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/crystals/zinc.json b/src/generated/resources/data/c/tags/item/crystals/zinc.json new file mode 100644 index 000000000..0263465c8 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/crystals/zinc.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:zinc_crystal" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/dense_plates/adamantine.json b/src/generated/resources/data/c/tags/item/dense_plates/adamantine.json new file mode 100644 index 000000000..e42ec28b8 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/dense_plates/adamantine.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:adamantine_dense_plate" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/dense_plates/antimony.json b/src/generated/resources/data/c/tags/item/dense_plates/antimony.json new file mode 100644 index 000000000..c603f93c5 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/dense_plates/antimony.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:antimony_dense_plate" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/dense_plates/bismuth.json b/src/generated/resources/data/c/tags/item/dense_plates/bismuth.json new file mode 100644 index 000000000..24e8e6ee5 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/dense_plates/bismuth.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:bismuth_dense_plate" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/dense_plates/coldiron.json b/src/generated/resources/data/c/tags/item/dense_plates/coldiron.json new file mode 100644 index 000000000..1e4c58328 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/dense_plates/coldiron.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:coldiron_dense_plate" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/dense_plates/nickel.json b/src/generated/resources/data/c/tags/item/dense_plates/nickel.json new file mode 100644 index 000000000..fc6021b83 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/dense_plates/nickel.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:nickel_dense_plate" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/dense_plates/platinum.json b/src/generated/resources/data/c/tags/item/dense_plates/platinum.json new file mode 100644 index 000000000..0a9d60ff3 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/dense_plates/platinum.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:platinum_dense_plate" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/dense_plates/starsteel.json b/src/generated/resources/data/c/tags/item/dense_plates/starsteel.json new file mode 100644 index 000000000..707fe9bed --- /dev/null +++ b/src/generated/resources/data/c/tags/item/dense_plates/starsteel.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:starsteel_dense_plate" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/dense_plates/zinc.json b/src/generated/resources/data/c/tags/item/dense_plates/zinc.json new file mode 100644 index 000000000..7851273a2 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/dense_plates/zinc.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:zinc_dense_plate" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/dirty_dusts/adamantine.json b/src/generated/resources/data/c/tags/item/dirty_dusts/adamantine.json new file mode 100644 index 000000000..a2a353e23 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/dirty_dusts/adamantine.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:adamantine_powder_dirty" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/dirty_dusts/antimony.json b/src/generated/resources/data/c/tags/item/dirty_dusts/antimony.json new file mode 100644 index 000000000..7f78fe44b --- /dev/null +++ b/src/generated/resources/data/c/tags/item/dirty_dusts/antimony.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:antimony_powder_dirty" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/dirty_dusts/bismuth.json b/src/generated/resources/data/c/tags/item/dirty_dusts/bismuth.json new file mode 100644 index 000000000..52b5964c1 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/dirty_dusts/bismuth.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:bismuth_powder_dirty" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/dirty_dusts/coldiron.json b/src/generated/resources/data/c/tags/item/dirty_dusts/coldiron.json new file mode 100644 index 000000000..22bc99cd1 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/dirty_dusts/coldiron.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:coldiron_powder_dirty" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/dirty_dusts/nickel.json b/src/generated/resources/data/c/tags/item/dirty_dusts/nickel.json new file mode 100644 index 000000000..de68b2990 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/dirty_dusts/nickel.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:nickel_powder_dirty" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/dirty_dusts/platinum.json b/src/generated/resources/data/c/tags/item/dirty_dusts/platinum.json new file mode 100644 index 000000000..dce15cc7f --- /dev/null +++ b/src/generated/resources/data/c/tags/item/dirty_dusts/platinum.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:platinum_powder_dirty" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/dirty_dusts/starsteel.json b/src/generated/resources/data/c/tags/item/dirty_dusts/starsteel.json new file mode 100644 index 000000000..ab2a35e3d --- /dev/null +++ b/src/generated/resources/data/c/tags/item/dirty_dusts/starsteel.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:starsteel_powder_dirty" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/dirty_dusts/zinc.json b/src/generated/resources/data/c/tags/item/dirty_dusts/zinc.json new file mode 100644 index 000000000..16087ba28 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/dirty_dusts/zinc.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:zinc_powder_dirty" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/doors/copper.json b/src/generated/resources/data/c/tags/item/doors/copper.json new file mode 100644 index 000000000..989979572 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/doors/copper.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "basemetals:copper_door", + "minecraft:copper_door" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/dusts.json b/src/generated/resources/data/c/tags/item/dusts.json new file mode 100644 index 000000000..ccc6e3a5d --- /dev/null +++ b/src/generated/resources/data/c/tags/item/dusts.json @@ -0,0 +1,27 @@ +{ + "replace": false, + "values": [ + "#c:dusts/adamantine", + "#c:dusts/antimony", + "#c:dusts/aquarium", + "#c:dusts/bismuth", + "#c:dusts/brass", + "#c:dusts/bronze", + "#c:dusts/coldiron", + "#c:dusts/copper", + "#c:dusts/cupronickel", + "#c:dusts/electrum", + "#c:dusts/invar", + "#c:dusts/lead", + "#c:dusts/mercury", + "#c:dusts/mithril", + "#c:dusts/nickel", + "#c:dusts/pewter", + "#c:dusts/platinum", + "#c:dusts/silver", + "#c:dusts/starsteel", + "#c:dusts/steel", + "#c:dusts/tin", + "#c:dusts/zinc" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/dusts/adamant.json b/src/generated/resources/data/c/tags/item/dusts/adamant.json new file mode 100644 index 000000000..2b27a40f1 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/dusts/adamant.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "#c:dusts/adamantine" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/dusts/adamantine.json b/src/generated/resources/data/c/tags/item/dusts/adamantine.json new file mode 100644 index 000000000..7a12d73b8 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/dusts/adamantine.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:adamantine_powder" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/dusts/adamantite.json b/src/generated/resources/data/c/tags/item/dusts/adamantite.json new file mode 100644 index 000000000..2b27a40f1 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/dusts/adamantite.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "#c:dusts/adamantine" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/dusts/adamantium.json b/src/generated/resources/data/c/tags/item/dusts/adamantium.json new file mode 100644 index 000000000..2b27a40f1 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/dusts/adamantium.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "#c:dusts/adamantine" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/dusts/antimony.json b/src/generated/resources/data/c/tags/item/dusts/antimony.json new file mode 100644 index 000000000..c46354f69 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/dusts/antimony.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:antimony_powder" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/dusts/aquarium.json b/src/generated/resources/data/c/tags/item/dusts/aquarium.json new file mode 100644 index 000000000..30be920bb --- /dev/null +++ b/src/generated/resources/data/c/tags/item/dusts/aquarium.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:aquarium_powder" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/dusts/bismuth.json b/src/generated/resources/data/c/tags/item/dusts/bismuth.json new file mode 100644 index 000000000..9aca19d44 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/dusts/bismuth.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:bismuth_powder" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/dusts/brass.json b/src/generated/resources/data/c/tags/item/dusts/brass.json new file mode 100644 index 000000000..1a80d1c54 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/dusts/brass.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:brass_powder" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/dusts/bronze.json b/src/generated/resources/data/c/tags/item/dusts/bronze.json new file mode 100644 index 000000000..1635d83f2 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/dusts/bronze.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:bronze_powder" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/dusts/charcoal.json b/src/generated/resources/data/c/tags/item/dusts/charcoal.json new file mode 100644 index 000000000..06596960c --- /dev/null +++ b/src/generated/resources/data/c/tags/item/dusts/charcoal.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:charcoal_powder" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/dusts/coal.json b/src/generated/resources/data/c/tags/item/dusts/coal.json new file mode 100644 index 000000000..9f5fcc2c3 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/dusts/coal.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:coal_powder" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/dusts/coldiron.json b/src/generated/resources/data/c/tags/item/dusts/coldiron.json new file mode 100644 index 000000000..fa47ba151 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/dusts/coldiron.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:coldiron_powder" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/dusts/copper.json b/src/generated/resources/data/c/tags/item/dusts/copper.json new file mode 100644 index 000000000..eead9e694 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/dusts/copper.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:copper_powder" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/dusts/cupronickel.json b/src/generated/resources/data/c/tags/item/dusts/cupronickel.json new file mode 100644 index 000000000..f64e91baa --- /dev/null +++ b/src/generated/resources/data/c/tags/item/dusts/cupronickel.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:cupronickel_powder" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/dusts/diamond.json b/src/generated/resources/data/c/tags/item/dusts/diamond.json new file mode 100644 index 000000000..bbd19860c --- /dev/null +++ b/src/generated/resources/data/c/tags/item/dusts/diamond.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:diamond_powder" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/dusts/electrum.json b/src/generated/resources/data/c/tags/item/dusts/electrum.json new file mode 100644 index 000000000..1bf25edf9 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/dusts/electrum.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:electrum_powder" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/dusts/emerald.json b/src/generated/resources/data/c/tags/item/dusts/emerald.json new file mode 100644 index 000000000..66f4d628c --- /dev/null +++ b/src/generated/resources/data/c/tags/item/dusts/emerald.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:emerald_powder" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/dusts/gold.json b/src/generated/resources/data/c/tags/item/dusts/gold.json new file mode 100644 index 000000000..6d2655704 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/dusts/gold.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:gold_powder" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/dusts/invar.json b/src/generated/resources/data/c/tags/item/dusts/invar.json new file mode 100644 index 000000000..98561d267 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/dusts/invar.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:invar_powder" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/dusts/iron.json b/src/generated/resources/data/c/tags/item/dusts/iron.json new file mode 100644 index 000000000..8888bc2ed --- /dev/null +++ b/src/generated/resources/data/c/tags/item/dusts/iron.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:iron_powder" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/dusts/lapis.json b/src/generated/resources/data/c/tags/item/dusts/lapis.json new file mode 100644 index 000000000..e46a64722 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/dusts/lapis.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:lapis_lazuli" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/dusts/lead.json b/src/generated/resources/data/c/tags/item/dusts/lead.json new file mode 100644 index 000000000..baffe4fe5 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/dusts/lead.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:lead_powder" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/dusts/mercury.json b/src/generated/resources/data/c/tags/item/dusts/mercury.json new file mode 100644 index 000000000..965c050af --- /dev/null +++ b/src/generated/resources/data/c/tags/item/dusts/mercury.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:mercury_powder" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/dusts/mithril.json b/src/generated/resources/data/c/tags/item/dusts/mithril.json new file mode 100644 index 000000000..5d453985d --- /dev/null +++ b/src/generated/resources/data/c/tags/item/dusts/mithril.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:mithril_powder" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/dusts/nickel.json b/src/generated/resources/data/c/tags/item/dusts/nickel.json new file mode 100644 index 000000000..4f2eb7719 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/dusts/nickel.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:nickel_powder" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/dusts/obsidian.json b/src/generated/resources/data/c/tags/item/dusts/obsidian.json new file mode 100644 index 000000000..f2d7369e7 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/dusts/obsidian.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:obsidian_powder" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/dusts/pewter.json b/src/generated/resources/data/c/tags/item/dusts/pewter.json new file mode 100644 index 000000000..211ba81ef --- /dev/null +++ b/src/generated/resources/data/c/tags/item/dusts/pewter.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:pewter_powder" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/dusts/platinum.json b/src/generated/resources/data/c/tags/item/dusts/platinum.json new file mode 100644 index 000000000..112f08c5c --- /dev/null +++ b/src/generated/resources/data/c/tags/item/dusts/platinum.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:platinum_powder" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/dusts/prismarine.json b/src/generated/resources/data/c/tags/item/dusts/prismarine.json new file mode 100644 index 000000000..09f011cae --- /dev/null +++ b/src/generated/resources/data/c/tags/item/dusts/prismarine.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:prismarine_shard" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/dusts/quartz.json b/src/generated/resources/data/c/tags/item/dusts/quartz.json new file mode 100644 index 000000000..7696a1574 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/dusts/quartz.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:quartz_powder" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/dusts/redstone.json b/src/generated/resources/data/c/tags/item/dusts/redstone.json new file mode 100644 index 000000000..2703f553a --- /dev/null +++ b/src/generated/resources/data/c/tags/item/dusts/redstone.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:redstone" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/dusts/silver.json b/src/generated/resources/data/c/tags/item/dusts/silver.json new file mode 100644 index 000000000..20891bb1f --- /dev/null +++ b/src/generated/resources/data/c/tags/item/dusts/silver.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:silver_powder" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/dusts/starsteel.json b/src/generated/resources/data/c/tags/item/dusts/starsteel.json new file mode 100644 index 000000000..432482dc2 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/dusts/starsteel.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:starsteel_powder" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/dusts/steel.json b/src/generated/resources/data/c/tags/item/dusts/steel.json new file mode 100644 index 000000000..53083daee --- /dev/null +++ b/src/generated/resources/data/c/tags/item/dusts/steel.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:steel_powder" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/dusts/tin.json b/src/generated/resources/data/c/tags/item/dusts/tin.json new file mode 100644 index 000000000..8379ef0b1 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/dusts/tin.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:tin_powder" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/dusts/zinc.json b/src/generated/resources/data/c/tags/item/dusts/zinc.json new file mode 100644 index 000000000..4114acc8a --- /dev/null +++ b/src/generated/resources/data/c/tags/item/dusts/zinc.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:zinc_powder" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/gears.json b/src/generated/resources/data/c/tags/item/gears.json new file mode 100644 index 000000000..e531c61e3 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/gears.json @@ -0,0 +1,34 @@ +{ + "replace": false, + "values": [ + "#c:gears/adamantine", + "#c:gears/antimony", + "#c:gears/aquarium", + "#c:gears/bismuth", + "#c:gears/brass", + "#c:gears/bronze", + "#c:gears/coldiron", + "#c:gears/copper", + "#c:gears/cupronickel", + "#c:gears/diamond", + "#c:gears/electrum", + "#c:gears/emerald", + "#c:gears/gold", + "#c:gears/invar", + "#c:gears/iron", + "#c:gears/lead", + "#c:gears/mithril", + "#c:gears/nickel", + "#c:gears/obsidian", + "#c:gears/pewter", + "#c:gears/platinum", + "#c:gears/quartz", + "#c:gears/silver", + "#c:gears/starsteel", + "#c:gears/steel", + "#c:gears/stone", + "#c:gears/tin", + "#c:gears/wood", + "#c:gears/zinc" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/gears/adamantine.json b/src/generated/resources/data/c/tags/item/gears/adamantine.json new file mode 100644 index 000000000..446eebe23 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/gears/adamantine.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:adamantine_gear" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/gears/antimony.json b/src/generated/resources/data/c/tags/item/gears/antimony.json new file mode 100644 index 000000000..9db6f6b61 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/gears/antimony.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:antimony_gear" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/gears/aquarium.json b/src/generated/resources/data/c/tags/item/gears/aquarium.json new file mode 100644 index 000000000..6d0d300e5 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/gears/aquarium.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:aquarium_gear" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/gears/bismuth.json b/src/generated/resources/data/c/tags/item/gears/bismuth.json new file mode 100644 index 000000000..164235b2a --- /dev/null +++ b/src/generated/resources/data/c/tags/item/gears/bismuth.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:bismuth_gear" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/gears/brass.json b/src/generated/resources/data/c/tags/item/gears/brass.json new file mode 100644 index 000000000..ed952e546 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/gears/brass.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:brass_gear" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/gears/bronze.json b/src/generated/resources/data/c/tags/item/gears/bronze.json new file mode 100644 index 000000000..e58ecb664 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/gears/bronze.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:bronze_gear" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/gears/coldiron.json b/src/generated/resources/data/c/tags/item/gears/coldiron.json new file mode 100644 index 000000000..6c2d8ca01 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/gears/coldiron.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:coldiron_gear" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/gears/copper.json b/src/generated/resources/data/c/tags/item/gears/copper.json new file mode 100644 index 000000000..f9c334048 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/gears/copper.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:copper_gear" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/gears/cupronickel.json b/src/generated/resources/data/c/tags/item/gears/cupronickel.json new file mode 100644 index 000000000..ba73e4fc9 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/gears/cupronickel.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:cupronickel_gear" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/gears/diamond.json b/src/generated/resources/data/c/tags/item/gears/diamond.json new file mode 100644 index 000000000..a66e87251 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/gears/diamond.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:diamond_gear" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/gears/electrum.json b/src/generated/resources/data/c/tags/item/gears/electrum.json new file mode 100644 index 000000000..0d00c41ff --- /dev/null +++ b/src/generated/resources/data/c/tags/item/gears/electrum.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:electrum_gear" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/gears/emerald.json b/src/generated/resources/data/c/tags/item/gears/emerald.json new file mode 100644 index 000000000..0ca981f44 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/gears/emerald.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:emerald_gear" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/gears/gold.json b/src/generated/resources/data/c/tags/item/gears/gold.json new file mode 100644 index 000000000..b32bd9994 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/gears/gold.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:gold_gear" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/gears/invar.json b/src/generated/resources/data/c/tags/item/gears/invar.json new file mode 100644 index 000000000..54397f15a --- /dev/null +++ b/src/generated/resources/data/c/tags/item/gears/invar.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:invar_gear" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/gears/iron.json b/src/generated/resources/data/c/tags/item/gears/iron.json new file mode 100644 index 000000000..ad315a928 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/gears/iron.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:iron_gear" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/gears/lead.json b/src/generated/resources/data/c/tags/item/gears/lead.json new file mode 100644 index 000000000..d87d66822 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/gears/lead.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:lead_gear" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/gears/mithril.json b/src/generated/resources/data/c/tags/item/gears/mithril.json new file mode 100644 index 000000000..5cbfe4f63 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/gears/mithril.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:mithril_gear" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/gears/nickel.json b/src/generated/resources/data/c/tags/item/gears/nickel.json new file mode 100644 index 000000000..ae81bb2a0 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/gears/nickel.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:nickel_gear" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/gears/obsidian.json b/src/generated/resources/data/c/tags/item/gears/obsidian.json new file mode 100644 index 000000000..2f088ed18 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/gears/obsidian.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:obsidian_gear" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/gears/pewter.json b/src/generated/resources/data/c/tags/item/gears/pewter.json new file mode 100644 index 000000000..3ef65b487 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/gears/pewter.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:pewter_gear" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/gears/platinum.json b/src/generated/resources/data/c/tags/item/gears/platinum.json new file mode 100644 index 000000000..876b869b0 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/gears/platinum.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:platinum_gear" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/gears/quartz.json b/src/generated/resources/data/c/tags/item/gears/quartz.json new file mode 100644 index 000000000..c7b0ddc89 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/gears/quartz.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:quartz_gear" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/gears/silver.json b/src/generated/resources/data/c/tags/item/gears/silver.json new file mode 100644 index 000000000..3f90df160 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/gears/silver.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:silver_gear" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/gears/starsteel.json b/src/generated/resources/data/c/tags/item/gears/starsteel.json new file mode 100644 index 000000000..6d5d7c229 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/gears/starsteel.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:starsteel_gear" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/gears/steel.json b/src/generated/resources/data/c/tags/item/gears/steel.json new file mode 100644 index 000000000..4724d5b5c --- /dev/null +++ b/src/generated/resources/data/c/tags/item/gears/steel.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:steel_gear" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/gears/stone.json b/src/generated/resources/data/c/tags/item/gears/stone.json new file mode 100644 index 000000000..fc619906b --- /dev/null +++ b/src/generated/resources/data/c/tags/item/gears/stone.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:stone_gear" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/gears/tin.json b/src/generated/resources/data/c/tags/item/gears/tin.json new file mode 100644 index 000000000..399aa36ab --- /dev/null +++ b/src/generated/resources/data/c/tags/item/gears/tin.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:tin_gear" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/gears/wood.json b/src/generated/resources/data/c/tags/item/gears/wood.json new file mode 100644 index 000000000..09dd2a104 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/gears/wood.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:wood_gear" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/gears/zinc.json b/src/generated/resources/data/c/tags/item/gears/zinc.json new file mode 100644 index 000000000..1c4381351 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/gears/zinc.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:zinc_gear" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/ingots.json b/src/generated/resources/data/c/tags/item/ingots.json new file mode 100644 index 000000000..bdccb7e62 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/ingots.json @@ -0,0 +1,27 @@ +{ + "replace": false, + "values": [ + "#c:ingots/adamantine", + "#c:ingots/antimony", + "#c:ingots/aquarium", + "#c:ingots/bismuth", + "#c:ingots/brass", + "#c:ingots/bronze", + "#c:ingots/coldiron", + "#c:ingots/copper", + "#c:ingots/cupronickel", + "#c:ingots/electrum", + "#c:ingots/invar", + "#c:ingots/lead", + "#c:ingots/mercury", + "#c:ingots/mithril", + "#c:ingots/nickel", + "#c:ingots/pewter", + "#c:ingots/platinum", + "#c:ingots/silver", + "#c:ingots/starsteel", + "#c:ingots/steel", + "#c:ingots/tin", + "#c:ingots/zinc" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/ingots/adamant.json b/src/generated/resources/data/c/tags/item/ingots/adamant.json new file mode 100644 index 000000000..09b1c8103 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/ingots/adamant.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "#c:ingots/adamantine" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/ingots/adamantine.json b/src/generated/resources/data/c/tags/item/ingots/adamantine.json new file mode 100644 index 000000000..87c5eab06 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/ingots/adamantine.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:adamantine_ingot" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/ingots/adamantite.json b/src/generated/resources/data/c/tags/item/ingots/adamantite.json new file mode 100644 index 000000000..09b1c8103 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/ingots/adamantite.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "#c:ingots/adamantine" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/ingots/adamantium.json b/src/generated/resources/data/c/tags/item/ingots/adamantium.json new file mode 100644 index 000000000..09b1c8103 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/ingots/adamantium.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "#c:ingots/adamantine" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/ingots/antimony.json b/src/generated/resources/data/c/tags/item/ingots/antimony.json new file mode 100644 index 000000000..7488c5d55 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/ingots/antimony.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:antimony_ingot" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/ingots/aquarium.json b/src/generated/resources/data/c/tags/item/ingots/aquarium.json new file mode 100644 index 000000000..7dfc7e416 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/ingots/aquarium.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:aquarium_ingot" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/ingots/bismuth.json b/src/generated/resources/data/c/tags/item/ingots/bismuth.json new file mode 100644 index 000000000..a613fcf3d --- /dev/null +++ b/src/generated/resources/data/c/tags/item/ingots/bismuth.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:bismuth_ingot" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/ingots/brass.json b/src/generated/resources/data/c/tags/item/ingots/brass.json new file mode 100644 index 000000000..a3476e3b0 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/ingots/brass.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:brass_ingot" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/ingots/bronze.json b/src/generated/resources/data/c/tags/item/ingots/bronze.json new file mode 100644 index 000000000..b429f6e59 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/ingots/bronze.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:bronze_ingot" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/ingots/coldiron.json b/src/generated/resources/data/c/tags/item/ingots/coldiron.json new file mode 100644 index 000000000..c35ec2558 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/ingots/coldiron.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:coldiron_ingot" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/ingots/copper.json b/src/generated/resources/data/c/tags/item/ingots/copper.json new file mode 100644 index 000000000..496ae1b47 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/ingots/copper.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "basemetals:copper_ingot", + "minecraft:copper_ingot" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/ingots/cupronickel.json b/src/generated/resources/data/c/tags/item/ingots/cupronickel.json new file mode 100644 index 000000000..067f75e15 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/ingots/cupronickel.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:cupronickel_ingot" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/ingots/electrum.json b/src/generated/resources/data/c/tags/item/ingots/electrum.json new file mode 100644 index 000000000..9f8e34815 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/ingots/electrum.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:electrum_ingot" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/ingots/invar.json b/src/generated/resources/data/c/tags/item/ingots/invar.json new file mode 100644 index 000000000..f05ebdb0e --- /dev/null +++ b/src/generated/resources/data/c/tags/item/ingots/invar.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:invar_ingot" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/ingots/lead.json b/src/generated/resources/data/c/tags/item/ingots/lead.json new file mode 100644 index 000000000..2cb7b8e1f --- /dev/null +++ b/src/generated/resources/data/c/tags/item/ingots/lead.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:lead_ingot" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/ingots/mercury.json b/src/generated/resources/data/c/tags/item/ingots/mercury.json new file mode 100644 index 000000000..f6b42bbe7 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/ingots/mercury.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:mercury_ingot" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/ingots/mithril.json b/src/generated/resources/data/c/tags/item/ingots/mithril.json new file mode 100644 index 000000000..4c04c2352 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/ingots/mithril.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:mithril_ingot" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/ingots/nickel.json b/src/generated/resources/data/c/tags/item/ingots/nickel.json new file mode 100644 index 000000000..73bfd7e6c --- /dev/null +++ b/src/generated/resources/data/c/tags/item/ingots/nickel.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:nickel_ingot" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/ingots/obsidian.json b/src/generated/resources/data/c/tags/item/ingots/obsidian.json new file mode 100644 index 000000000..c09196458 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/ingots/obsidian.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:obsidian_ingot" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/ingots/pewter.json b/src/generated/resources/data/c/tags/item/ingots/pewter.json new file mode 100644 index 000000000..f1463d86e --- /dev/null +++ b/src/generated/resources/data/c/tags/item/ingots/pewter.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:pewter_ingot" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/ingots/platinum.json b/src/generated/resources/data/c/tags/item/ingots/platinum.json new file mode 100644 index 000000000..0c4142bea --- /dev/null +++ b/src/generated/resources/data/c/tags/item/ingots/platinum.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:platinum_ingot" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/ingots/quicksilver.json b/src/generated/resources/data/c/tags/item/ingots/quicksilver.json new file mode 100644 index 000000000..a2667518f --- /dev/null +++ b/src/generated/resources/data/c/tags/item/ingots/quicksilver.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "#c:ingots/mercury" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/ingots/redstone.json b/src/generated/resources/data/c/tags/item/ingots/redstone.json new file mode 100644 index 000000000..835cab6fb --- /dev/null +++ b/src/generated/resources/data/c/tags/item/ingots/redstone.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:redstone_ingot" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/ingots/silver.json b/src/generated/resources/data/c/tags/item/ingots/silver.json new file mode 100644 index 000000000..fab1b9901 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/ingots/silver.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:silver_ingot" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/ingots/starsteel.json b/src/generated/resources/data/c/tags/item/ingots/starsteel.json new file mode 100644 index 000000000..eecbc953a --- /dev/null +++ b/src/generated/resources/data/c/tags/item/ingots/starsteel.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:starsteel_ingot" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/ingots/steel.json b/src/generated/resources/data/c/tags/item/ingots/steel.json new file mode 100644 index 000000000..ed1d8374e --- /dev/null +++ b/src/generated/resources/data/c/tags/item/ingots/steel.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:steel_ingot" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/ingots/tin.json b/src/generated/resources/data/c/tags/item/ingots/tin.json new file mode 100644 index 000000000..ba21c22b6 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/ingots/tin.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:tin_ingot" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/ingots/zinc.json b/src/generated/resources/data/c/tags/item/ingots/zinc.json new file mode 100644 index 000000000..66938ac39 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/ingots/zinc.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:zinc_ingot" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/materials/diamond.json b/src/generated/resources/data/c/tags/item/materials/diamond.json new file mode 100644 index 000000000..a0b7317d8 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/materials/diamond.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:diamond" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/materials/emerald.json b/src/generated/resources/data/c/tags/item/materials/emerald.json new file mode 100644 index 000000000..838caf0bd --- /dev/null +++ b/src/generated/resources/data/c/tags/item/materials/emerald.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:emerald" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/materials/gold.json b/src/generated/resources/data/c/tags/item/materials/gold.json new file mode 100644 index 000000000..d88f9571a --- /dev/null +++ b/src/generated/resources/data/c/tags/item/materials/gold.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:gold_ingot" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/materials/iron.json b/src/generated/resources/data/c/tags/item/materials/iron.json new file mode 100644 index 000000000..549adc471 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/materials/iron.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:iron_ingot" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/materials/obsidian.json b/src/generated/resources/data/c/tags/item/materials/obsidian.json new file mode 100644 index 000000000..c09196458 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/materials/obsidian.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:obsidian_ingot" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/materials/quartz.json b/src/generated/resources/data/c/tags/item/materials/quartz.json new file mode 100644 index 000000000..49ac1fd15 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/materials/quartz.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:quartz" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/nuggets.json b/src/generated/resources/data/c/tags/item/nuggets.json new file mode 100644 index 000000000..d69b92a37 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/nuggets.json @@ -0,0 +1,27 @@ +{ + "replace": false, + "values": [ + "#c:nuggets/adamantine", + "#c:nuggets/antimony", + "#c:nuggets/aquarium", + "#c:nuggets/bismuth", + "#c:nuggets/brass", + "#c:nuggets/bronze", + "#c:nuggets/coldiron", + "#c:nuggets/copper", + "#c:nuggets/cupronickel", + "#c:nuggets/electrum", + "#c:nuggets/invar", + "#c:nuggets/lead", + "#c:nuggets/mercury", + "#c:nuggets/mithril", + "#c:nuggets/nickel", + "#c:nuggets/pewter", + "#c:nuggets/platinum", + "#c:nuggets/silver", + "#c:nuggets/starsteel", + "#c:nuggets/steel", + "#c:nuggets/tin", + "#c:nuggets/zinc" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/nuggets/adamant.json b/src/generated/resources/data/c/tags/item/nuggets/adamant.json new file mode 100644 index 000000000..293155ae1 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/nuggets/adamant.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "#c:nuggets/adamantine" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/nuggets/adamantine.json b/src/generated/resources/data/c/tags/item/nuggets/adamantine.json new file mode 100644 index 000000000..671d73ed9 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/nuggets/adamantine.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:adamantine_nugget" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/nuggets/adamantite.json b/src/generated/resources/data/c/tags/item/nuggets/adamantite.json new file mode 100644 index 000000000..293155ae1 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/nuggets/adamantite.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "#c:nuggets/adamantine" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/nuggets/adamantium.json b/src/generated/resources/data/c/tags/item/nuggets/adamantium.json new file mode 100644 index 000000000..293155ae1 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/nuggets/adamantium.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "#c:nuggets/adamantine" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/nuggets/antimony.json b/src/generated/resources/data/c/tags/item/nuggets/antimony.json new file mode 100644 index 000000000..c94a48b71 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/nuggets/antimony.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:antimony_nugget" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/nuggets/aquarium.json b/src/generated/resources/data/c/tags/item/nuggets/aquarium.json new file mode 100644 index 000000000..7f2da1221 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/nuggets/aquarium.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:aquarium_nugget" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/nuggets/bismuth.json b/src/generated/resources/data/c/tags/item/nuggets/bismuth.json new file mode 100644 index 000000000..b9263281c --- /dev/null +++ b/src/generated/resources/data/c/tags/item/nuggets/bismuth.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:bismuth_nugget" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/nuggets/brass.json b/src/generated/resources/data/c/tags/item/nuggets/brass.json new file mode 100644 index 000000000..de2968704 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/nuggets/brass.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:brass_nugget" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/nuggets/bronze.json b/src/generated/resources/data/c/tags/item/nuggets/bronze.json new file mode 100644 index 000000000..6f643fb04 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/nuggets/bronze.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:bronze_nugget" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/nuggets/charcoal.json b/src/generated/resources/data/c/tags/item/nuggets/charcoal.json new file mode 100644 index 000000000..baeced49e --- /dev/null +++ b/src/generated/resources/data/c/tags/item/nuggets/charcoal.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:charcoal_nugget" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/nuggets/coal.json b/src/generated/resources/data/c/tags/item/nuggets/coal.json new file mode 100644 index 000000000..c979b5f18 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/nuggets/coal.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:coal_nugget" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/nuggets/coldiron.json b/src/generated/resources/data/c/tags/item/nuggets/coldiron.json new file mode 100644 index 000000000..48e157f23 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/nuggets/coldiron.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:coldiron_nugget" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/nuggets/copper.json b/src/generated/resources/data/c/tags/item/nuggets/copper.json new file mode 100644 index 000000000..b67eb8a32 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/nuggets/copper.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "basemetals:copper_nugget", + "minecraft:copper_nugget" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/nuggets/cupronickel.json b/src/generated/resources/data/c/tags/item/nuggets/cupronickel.json new file mode 100644 index 000000000..8d26a090f --- /dev/null +++ b/src/generated/resources/data/c/tags/item/nuggets/cupronickel.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:cupronickel_nugget" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/nuggets/diamond.json b/src/generated/resources/data/c/tags/item/nuggets/diamond.json new file mode 100644 index 000000000..4cb0b9697 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/nuggets/diamond.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:diamond_nugget" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/nuggets/electrum.json b/src/generated/resources/data/c/tags/item/nuggets/electrum.json new file mode 100644 index 000000000..58447b735 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/nuggets/electrum.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:electrum_nugget" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/nuggets/emerald.json b/src/generated/resources/data/c/tags/item/nuggets/emerald.json new file mode 100644 index 000000000..ed561b4a8 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/nuggets/emerald.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:emerald_nugget" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/nuggets/invar.json b/src/generated/resources/data/c/tags/item/nuggets/invar.json new file mode 100644 index 000000000..249b4cfb0 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/nuggets/invar.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:invar_nugget" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/nuggets/lead.json b/src/generated/resources/data/c/tags/item/nuggets/lead.json new file mode 100644 index 000000000..1f47348b4 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/nuggets/lead.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:lead_nugget" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/nuggets/mercury.json b/src/generated/resources/data/c/tags/item/nuggets/mercury.json new file mode 100644 index 000000000..57bafefc0 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/nuggets/mercury.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:mercury_nugget" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/nuggets/mithril.json b/src/generated/resources/data/c/tags/item/nuggets/mithril.json new file mode 100644 index 000000000..8d772ccff --- /dev/null +++ b/src/generated/resources/data/c/tags/item/nuggets/mithril.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:mithril_nugget" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/nuggets/nickel.json b/src/generated/resources/data/c/tags/item/nuggets/nickel.json new file mode 100644 index 000000000..18dfd8ebf --- /dev/null +++ b/src/generated/resources/data/c/tags/item/nuggets/nickel.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:nickel_nugget" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/nuggets/obsidian.json b/src/generated/resources/data/c/tags/item/nuggets/obsidian.json new file mode 100644 index 000000000..d34c485f4 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/nuggets/obsidian.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:obsidian_nugget" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/nuggets/pewter.json b/src/generated/resources/data/c/tags/item/nuggets/pewter.json new file mode 100644 index 000000000..005d9ddd1 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/nuggets/pewter.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:pewter_nugget" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/nuggets/platinum.json b/src/generated/resources/data/c/tags/item/nuggets/platinum.json new file mode 100644 index 000000000..192cf9b7b --- /dev/null +++ b/src/generated/resources/data/c/tags/item/nuggets/platinum.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:platinum_nugget" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/nuggets/quartz.json b/src/generated/resources/data/c/tags/item/nuggets/quartz.json new file mode 100644 index 000000000..658a31bc5 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/nuggets/quartz.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:quartz_nugget" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/nuggets/silver.json b/src/generated/resources/data/c/tags/item/nuggets/silver.json new file mode 100644 index 000000000..470b94b1c --- /dev/null +++ b/src/generated/resources/data/c/tags/item/nuggets/silver.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:silver_nugget" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/nuggets/starsteel.json b/src/generated/resources/data/c/tags/item/nuggets/starsteel.json new file mode 100644 index 000000000..231be5aeb --- /dev/null +++ b/src/generated/resources/data/c/tags/item/nuggets/starsteel.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:starsteel_nugget" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/nuggets/steel.json b/src/generated/resources/data/c/tags/item/nuggets/steel.json new file mode 100644 index 000000000..07ca19592 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/nuggets/steel.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:steel_nugget" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/nuggets/tin.json b/src/generated/resources/data/c/tags/item/nuggets/tin.json new file mode 100644 index 000000000..6be0657be --- /dev/null +++ b/src/generated/resources/data/c/tags/item/nuggets/tin.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:tin_nugget" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/nuggets/zinc.json b/src/generated/resources/data/c/tags/item/nuggets/zinc.json new file mode 100644 index 000000000..47a62d15d --- /dev/null +++ b/src/generated/resources/data/c/tags/item/nuggets/zinc.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:zinc_nugget" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/ores.json b/src/generated/resources/data/c/tags/item/ores.json new file mode 100644 index 000000000..5c11dac0a --- /dev/null +++ b/src/generated/resources/data/c/tags/item/ores.json @@ -0,0 +1,18 @@ +{ + "replace": false, + "values": [ + "#c:ores/adamantine", + "#c:ores/antimony", + "#c:ores/bismuth", + "#c:ores/coldiron", + "#c:ores/copper", + "#c:ores/lead", + "#c:ores/mercury", + "#c:ores/nickel", + "#c:ores/platinum", + "#c:ores/silver", + "#c:ores/starsteel", + "#c:ores/tin", + "#c:ores/zinc" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/ores/adamantine.json b/src/generated/resources/data/c/tags/item/ores/adamantine.json new file mode 100644 index 000000000..fdc15c972 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/ores/adamantine.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:adamantine_ore" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/ores/antimony.json b/src/generated/resources/data/c/tags/item/ores/antimony.json new file mode 100644 index 000000000..d535177f5 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/ores/antimony.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:antimony_ore" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/ores/bismuth.json b/src/generated/resources/data/c/tags/item/ores/bismuth.json new file mode 100644 index 000000000..a43ac8ddb --- /dev/null +++ b/src/generated/resources/data/c/tags/item/ores/bismuth.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:bismuth_ore" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/ores/coldiron.json b/src/generated/resources/data/c/tags/item/ores/coldiron.json new file mode 100644 index 000000000..968821106 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/ores/coldiron.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:coldiron_ore" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/ores/copper.json b/src/generated/resources/data/c/tags/item/ores/copper.json new file mode 100644 index 000000000..c2e8c464f --- /dev/null +++ b/src/generated/resources/data/c/tags/item/ores/copper.json @@ -0,0 +1,8 @@ +{ + "replace": false, + "values": [ + "basemetals:copper_ore", + "minecraft:copper_ore", + "minecraft:deepslate_copper_ore" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/ores/lead.json b/src/generated/resources/data/c/tags/item/ores/lead.json new file mode 100644 index 000000000..71aad861f --- /dev/null +++ b/src/generated/resources/data/c/tags/item/ores/lead.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:lead_ore" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/ores/mercury.json b/src/generated/resources/data/c/tags/item/ores/mercury.json new file mode 100644 index 000000000..ddd01f06b --- /dev/null +++ b/src/generated/resources/data/c/tags/item/ores/mercury.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:mercury_ore" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/ores/nickel.json b/src/generated/resources/data/c/tags/item/ores/nickel.json new file mode 100644 index 000000000..4f0eff4f1 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/ores/nickel.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:nickel_ore" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/ores/platinum.json b/src/generated/resources/data/c/tags/item/ores/platinum.json new file mode 100644 index 000000000..0c92650c7 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/ores/platinum.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:platinum_ore" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/ores/silver.json b/src/generated/resources/data/c/tags/item/ores/silver.json new file mode 100644 index 000000000..4a586b22a --- /dev/null +++ b/src/generated/resources/data/c/tags/item/ores/silver.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:silver_ore" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/ores/starsteel.json b/src/generated/resources/data/c/tags/item/ores/starsteel.json new file mode 100644 index 000000000..7e82e1027 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/ores/starsteel.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:starsteel_ore" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/ores/tin.json b/src/generated/resources/data/c/tags/item/ores/tin.json new file mode 100644 index 000000000..db8843130 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/ores/tin.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:tin_ore" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/ores/zinc.json b/src/generated/resources/data/c/tags/item/ores/zinc.json new file mode 100644 index 000000000..27c70fae4 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/ores/zinc.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:zinc_ore" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/plates.json b/src/generated/resources/data/c/tags/item/plates.json new file mode 100644 index 000000000..c7138b2e8 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/plates.json @@ -0,0 +1,30 @@ +{ + "replace": false, + "values": [ + "#c:plates/adamantine", + "#c:plates/antimony", + "#c:plates/aquarium", + "#c:plates/bismuth", + "#c:plates/brass", + "#c:plates/bronze", + "#c:plates/coldiron", + "#c:plates/copper", + "#c:plates/cupronickel", + "#c:plates/diamond", + "#c:plates/electrum", + "#c:plates/emerald", + "#c:plates/gold", + "#c:plates/invar", + "#c:plates/iron", + "#c:plates/lead", + "#c:plates/mithril", + "#c:plates/nickel", + "#c:plates/pewter", + "#c:plates/platinum", + "#c:plates/silver", + "#c:plates/starsteel", + "#c:plates/steel", + "#c:plates/tin", + "#c:plates/zinc" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/plates/adamantine.json b/src/generated/resources/data/c/tags/item/plates/adamantine.json new file mode 100644 index 000000000..bc59eb20a --- /dev/null +++ b/src/generated/resources/data/c/tags/item/plates/adamantine.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:adamantine_plate" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/plates/antimony.json b/src/generated/resources/data/c/tags/item/plates/antimony.json new file mode 100644 index 000000000..ba6e5ce57 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/plates/antimony.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:antimony_plate" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/plates/aquarium.json b/src/generated/resources/data/c/tags/item/plates/aquarium.json new file mode 100644 index 000000000..01ca72763 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/plates/aquarium.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:aquarium_plate" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/plates/bismuth.json b/src/generated/resources/data/c/tags/item/plates/bismuth.json new file mode 100644 index 000000000..512f9c66d --- /dev/null +++ b/src/generated/resources/data/c/tags/item/plates/bismuth.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:bismuth_plate" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/plates/brass.json b/src/generated/resources/data/c/tags/item/plates/brass.json new file mode 100644 index 000000000..9462b1479 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/plates/brass.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:brass_plate" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/plates/bronze.json b/src/generated/resources/data/c/tags/item/plates/bronze.json new file mode 100644 index 000000000..f2884324e --- /dev/null +++ b/src/generated/resources/data/c/tags/item/plates/bronze.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:bronze_plate" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/plates/coldiron.json b/src/generated/resources/data/c/tags/item/plates/coldiron.json new file mode 100644 index 000000000..a726b9261 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/plates/coldiron.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:coldiron_plate" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/plates/copper.json b/src/generated/resources/data/c/tags/item/plates/copper.json new file mode 100644 index 000000000..df9d3e96e --- /dev/null +++ b/src/generated/resources/data/c/tags/item/plates/copper.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:copper_plate" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/plates/cupronickel.json b/src/generated/resources/data/c/tags/item/plates/cupronickel.json new file mode 100644 index 000000000..67a870a18 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/plates/cupronickel.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:cupronickel_plate" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/plates/diamond.json b/src/generated/resources/data/c/tags/item/plates/diamond.json new file mode 100644 index 000000000..5e8aecc98 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/plates/diamond.json @@ -0,0 +1,4 @@ +{ + "replace": false, + "values": [] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/plates/electrum.json b/src/generated/resources/data/c/tags/item/plates/electrum.json new file mode 100644 index 000000000..306f56385 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/plates/electrum.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:electrum_plate" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/plates/emerald.json b/src/generated/resources/data/c/tags/item/plates/emerald.json new file mode 100644 index 000000000..5e8aecc98 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/plates/emerald.json @@ -0,0 +1,4 @@ +{ + "replace": false, + "values": [] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/plates/gold.json b/src/generated/resources/data/c/tags/item/plates/gold.json new file mode 100644 index 000000000..cd845c490 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/plates/gold.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:gold_plate" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/plates/invar.json b/src/generated/resources/data/c/tags/item/plates/invar.json new file mode 100644 index 000000000..446eb0ccf --- /dev/null +++ b/src/generated/resources/data/c/tags/item/plates/invar.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:invar_plate" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/plates/iron.json b/src/generated/resources/data/c/tags/item/plates/iron.json new file mode 100644 index 000000000..1250b462e --- /dev/null +++ b/src/generated/resources/data/c/tags/item/plates/iron.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:iron_plate" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/plates/lead.json b/src/generated/resources/data/c/tags/item/plates/lead.json new file mode 100644 index 000000000..c8e0ce7a9 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/plates/lead.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:lead_plate" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/plates/mithril.json b/src/generated/resources/data/c/tags/item/plates/mithril.json new file mode 100644 index 000000000..bb8f12849 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/plates/mithril.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:mithril_plate" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/plates/nickel.json b/src/generated/resources/data/c/tags/item/plates/nickel.json new file mode 100644 index 000000000..ee16328c6 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/plates/nickel.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:nickel_plate" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/plates/pewter.json b/src/generated/resources/data/c/tags/item/plates/pewter.json new file mode 100644 index 000000000..d06bc9d31 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/plates/pewter.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:pewter_plate" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/plates/platinum.json b/src/generated/resources/data/c/tags/item/plates/platinum.json new file mode 100644 index 000000000..5ac036d27 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/plates/platinum.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:platinum_plate" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/plates/silver.json b/src/generated/resources/data/c/tags/item/plates/silver.json new file mode 100644 index 000000000..5203a23b4 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/plates/silver.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:silver_plate" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/plates/starsteel.json b/src/generated/resources/data/c/tags/item/plates/starsteel.json new file mode 100644 index 000000000..6679f936c --- /dev/null +++ b/src/generated/resources/data/c/tags/item/plates/starsteel.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:starsteel_plate" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/plates/steel.json b/src/generated/resources/data/c/tags/item/plates/steel.json new file mode 100644 index 000000000..067c2e062 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/plates/steel.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:steel_plate" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/plates/tin.json b/src/generated/resources/data/c/tags/item/plates/tin.json new file mode 100644 index 000000000..61c7daa64 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/plates/tin.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:tin_plate" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/plates/zinc.json b/src/generated/resources/data/c/tags/item/plates/zinc.json new file mode 100644 index 000000000..a96c80dd6 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/plates/zinc.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:zinc_plate" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/purified_ores/adamantine.json b/src/generated/resources/data/c/tags/item/purified_ores/adamantine.json new file mode 100644 index 000000000..511af44c1 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/purified_ores/adamantine.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:adamantine_crushed_purified" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/purified_ores/antimony.json b/src/generated/resources/data/c/tags/item/purified_ores/antimony.json new file mode 100644 index 000000000..f3e66bb83 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/purified_ores/antimony.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:antimony_crushed_purified" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/purified_ores/bismuth.json b/src/generated/resources/data/c/tags/item/purified_ores/bismuth.json new file mode 100644 index 000000000..eb09ed145 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/purified_ores/bismuth.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:bismuth_crushed_purified" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/purified_ores/coldiron.json b/src/generated/resources/data/c/tags/item/purified_ores/coldiron.json new file mode 100644 index 000000000..a6a37144b --- /dev/null +++ b/src/generated/resources/data/c/tags/item/purified_ores/coldiron.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:coldiron_crushed_purified" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/purified_ores/nickel.json b/src/generated/resources/data/c/tags/item/purified_ores/nickel.json new file mode 100644 index 000000000..b786d4035 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/purified_ores/nickel.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:nickel_crushed_purified" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/purified_ores/platinum.json b/src/generated/resources/data/c/tags/item/purified_ores/platinum.json new file mode 100644 index 000000000..42fc2f4ba --- /dev/null +++ b/src/generated/resources/data/c/tags/item/purified_ores/platinum.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:platinum_crushed_purified" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/purified_ores/starsteel.json b/src/generated/resources/data/c/tags/item/purified_ores/starsteel.json new file mode 100644 index 000000000..cfb376892 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/purified_ores/starsteel.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:starsteel_crushed_purified" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/purified_ores/zinc.json b/src/generated/resources/data/c/tags/item/purified_ores/zinc.json new file mode 100644 index 000000000..09342b965 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/purified_ores/zinc.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:zinc_crushed_purified" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/raw_materials.json b/src/generated/resources/data/c/tags/item/raw_materials.json new file mode 100644 index 000000000..e96ef9252 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/raw_materials.json @@ -0,0 +1,20 @@ +{ + "replace": false, + "values": [ + "#c:raw_materials/adamantine", + "#c:raw_materials/antimony", + "#c:raw_materials/bismuth", + "#c:raw_materials/coldiron", + "#c:raw_materials/copper", + "#c:raw_materials/gold", + "#c:raw_materials/iron", + "#c:raw_materials/lead", + "#c:raw_materials/mercury", + "#c:raw_materials/nickel", + "#c:raw_materials/platinum", + "#c:raw_materials/silver", + "#c:raw_materials/starsteel", + "#c:raw_materials/tin", + "#c:raw_materials/zinc" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/raw_materials/adamantine.json b/src/generated/resources/data/c/tags/item/raw_materials/adamantine.json new file mode 100644 index 000000000..f80d90c95 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/raw_materials/adamantine.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:adamantine_raw" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/raw_materials/antimony.json b/src/generated/resources/data/c/tags/item/raw_materials/antimony.json new file mode 100644 index 000000000..4b316dffc --- /dev/null +++ b/src/generated/resources/data/c/tags/item/raw_materials/antimony.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:antimony_raw" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/raw_materials/bismuth.json b/src/generated/resources/data/c/tags/item/raw_materials/bismuth.json new file mode 100644 index 000000000..db000039b --- /dev/null +++ b/src/generated/resources/data/c/tags/item/raw_materials/bismuth.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:bismuth_raw" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/raw_materials/coldiron.json b/src/generated/resources/data/c/tags/item/raw_materials/coldiron.json new file mode 100644 index 000000000..209ad7b42 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/raw_materials/coldiron.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:coldiron_raw" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/raw_materials/copper.json b/src/generated/resources/data/c/tags/item/raw_materials/copper.json new file mode 100644 index 000000000..cb1b852f3 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/raw_materials/copper.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:raw_copper" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/raw_materials/gold.json b/src/generated/resources/data/c/tags/item/raw_materials/gold.json new file mode 100644 index 000000000..3ac772464 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/raw_materials/gold.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:raw_gold" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/raw_materials/iron.json b/src/generated/resources/data/c/tags/item/raw_materials/iron.json new file mode 100644 index 000000000..9c072749c --- /dev/null +++ b/src/generated/resources/data/c/tags/item/raw_materials/iron.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:raw_iron" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/raw_materials/lead.json b/src/generated/resources/data/c/tags/item/raw_materials/lead.json new file mode 100644 index 000000000..724f10c8d --- /dev/null +++ b/src/generated/resources/data/c/tags/item/raw_materials/lead.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:lead_raw" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/raw_materials/mercury.json b/src/generated/resources/data/c/tags/item/raw_materials/mercury.json new file mode 100644 index 000000000..96e7d2152 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/raw_materials/mercury.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:mercury_raw" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/raw_materials/nickel.json b/src/generated/resources/data/c/tags/item/raw_materials/nickel.json new file mode 100644 index 000000000..bd5a551f4 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/raw_materials/nickel.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:nickel_raw" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/raw_materials/platinum.json b/src/generated/resources/data/c/tags/item/raw_materials/platinum.json new file mode 100644 index 000000000..5bf2a4199 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/raw_materials/platinum.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:platinum_raw" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/raw_materials/silver.json b/src/generated/resources/data/c/tags/item/raw_materials/silver.json new file mode 100644 index 000000000..e13329a01 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/raw_materials/silver.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:silver_raw" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/raw_materials/starsteel.json b/src/generated/resources/data/c/tags/item/raw_materials/starsteel.json new file mode 100644 index 000000000..0623ad482 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/raw_materials/starsteel.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:starsteel_raw" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/raw_materials/tin.json b/src/generated/resources/data/c/tags/item/raw_materials/tin.json new file mode 100644 index 000000000..a87a04ee9 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/raw_materials/tin.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:tin_raw" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/raw_materials/zinc.json b/src/generated/resources/data/c/tags/item/raw_materials/zinc.json new file mode 100644 index 000000000..26a38f08d --- /dev/null +++ b/src/generated/resources/data/c/tags/item/raw_materials/zinc.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:zinc_raw" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/rods.json b/src/generated/resources/data/c/tags/item/rods.json new file mode 100644 index 000000000..da949cc4e --- /dev/null +++ b/src/generated/resources/data/c/tags/item/rods.json @@ -0,0 +1,32 @@ +{ + "replace": false, + "values": [ + "#c:rods/adamantine", + "#c:rods/antimony", + "#c:rods/aquarium", + "#c:rods/bismuth", + "#c:rods/brass", + "#c:rods/bronze", + "#c:rods/coldiron", + "#c:rods/copper", + "#c:rods/cupronickel", + "#c:rods/diamond", + "#c:rods/electrum", + "#c:rods/emerald", + "#c:rods/gold", + "#c:rods/invar", + "#c:rods/iron", + "#c:rods/lead", + "#c:rods/mithril", + "#c:rods/nickel", + "#c:rods/obsidian", + "#c:rods/pewter", + "#c:rods/platinum", + "#c:rods/quartz", + "#c:rods/silver", + "#c:rods/starsteel", + "#c:rods/steel", + "#c:rods/tin", + "#c:rods/zinc" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/rods/adamantine.json b/src/generated/resources/data/c/tags/item/rods/adamantine.json new file mode 100644 index 000000000..155845241 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/rods/adamantine.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:adamantine_rod" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/rods/antimony.json b/src/generated/resources/data/c/tags/item/rods/antimony.json new file mode 100644 index 000000000..b54b3ddc6 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/rods/antimony.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:antimony_rod" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/rods/aquarium.json b/src/generated/resources/data/c/tags/item/rods/aquarium.json new file mode 100644 index 000000000..0145ddfcf --- /dev/null +++ b/src/generated/resources/data/c/tags/item/rods/aquarium.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:aquarium_rod" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/rods/bismuth.json b/src/generated/resources/data/c/tags/item/rods/bismuth.json new file mode 100644 index 000000000..21f032b68 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/rods/bismuth.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:bismuth_rod" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/rods/brass.json b/src/generated/resources/data/c/tags/item/rods/brass.json new file mode 100644 index 000000000..1b3311de2 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/rods/brass.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:brass_rod" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/rods/bronze.json b/src/generated/resources/data/c/tags/item/rods/bronze.json new file mode 100644 index 000000000..def4450c9 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/rods/bronze.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:bronze_rod" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/rods/coldiron.json b/src/generated/resources/data/c/tags/item/rods/coldiron.json new file mode 100644 index 000000000..f30fa836d --- /dev/null +++ b/src/generated/resources/data/c/tags/item/rods/coldiron.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:coldiron_rod" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/rods/copper.json b/src/generated/resources/data/c/tags/item/rods/copper.json new file mode 100644 index 000000000..ea5ca9569 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/rods/copper.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:copper_rod" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/rods/cupronickel.json b/src/generated/resources/data/c/tags/item/rods/cupronickel.json new file mode 100644 index 000000000..d1546a2d2 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/rods/cupronickel.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:cupronickel_rod" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/rods/diamond.json b/src/generated/resources/data/c/tags/item/rods/diamond.json new file mode 100644 index 000000000..560e10f2c --- /dev/null +++ b/src/generated/resources/data/c/tags/item/rods/diamond.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:diamond_rod" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/rods/electrum.json b/src/generated/resources/data/c/tags/item/rods/electrum.json new file mode 100644 index 000000000..4c4379836 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/rods/electrum.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:electrum_rod" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/rods/emerald.json b/src/generated/resources/data/c/tags/item/rods/emerald.json new file mode 100644 index 000000000..08ce6801f --- /dev/null +++ b/src/generated/resources/data/c/tags/item/rods/emerald.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:emerald_rod" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/rods/gold.json b/src/generated/resources/data/c/tags/item/rods/gold.json new file mode 100644 index 000000000..3de25cd29 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/rods/gold.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:gold_rod" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/rods/invar.json b/src/generated/resources/data/c/tags/item/rods/invar.json new file mode 100644 index 000000000..08723d56a --- /dev/null +++ b/src/generated/resources/data/c/tags/item/rods/invar.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:invar_rod" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/rods/iron.json b/src/generated/resources/data/c/tags/item/rods/iron.json new file mode 100644 index 000000000..e0b426639 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/rods/iron.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:iron_rod" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/rods/lead.json b/src/generated/resources/data/c/tags/item/rods/lead.json new file mode 100644 index 000000000..50401db7a --- /dev/null +++ b/src/generated/resources/data/c/tags/item/rods/lead.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:lead_rod" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/rods/mithril.json b/src/generated/resources/data/c/tags/item/rods/mithril.json new file mode 100644 index 000000000..2f174bcd7 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/rods/mithril.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:mithril_rod" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/rods/nickel.json b/src/generated/resources/data/c/tags/item/rods/nickel.json new file mode 100644 index 000000000..cd16127d9 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/rods/nickel.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:nickel_rod" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/rods/obsidian.json b/src/generated/resources/data/c/tags/item/rods/obsidian.json new file mode 100644 index 000000000..7fc6eaaba --- /dev/null +++ b/src/generated/resources/data/c/tags/item/rods/obsidian.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:obsidian_rod" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/rods/pewter.json b/src/generated/resources/data/c/tags/item/rods/pewter.json new file mode 100644 index 000000000..6f80d9cbf --- /dev/null +++ b/src/generated/resources/data/c/tags/item/rods/pewter.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:pewter_rod" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/rods/platinum.json b/src/generated/resources/data/c/tags/item/rods/platinum.json new file mode 100644 index 000000000..2f16c8ae3 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/rods/platinum.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:platinum_rod" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/rods/quartz.json b/src/generated/resources/data/c/tags/item/rods/quartz.json new file mode 100644 index 000000000..cf6923723 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/rods/quartz.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:quartz_rod" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/rods/silver.json b/src/generated/resources/data/c/tags/item/rods/silver.json new file mode 100644 index 000000000..62589aec3 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/rods/silver.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:silver_rod" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/rods/starsteel.json b/src/generated/resources/data/c/tags/item/rods/starsteel.json new file mode 100644 index 000000000..9c7fdfe0b --- /dev/null +++ b/src/generated/resources/data/c/tags/item/rods/starsteel.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:starsteel_rod" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/rods/steel.json b/src/generated/resources/data/c/tags/item/rods/steel.json new file mode 100644 index 000000000..7c079636e --- /dev/null +++ b/src/generated/resources/data/c/tags/item/rods/steel.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:steel_rod" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/rods/stone.json b/src/generated/resources/data/c/tags/item/rods/stone.json new file mode 100644 index 000000000..69e04110a --- /dev/null +++ b/src/generated/resources/data/c/tags/item/rods/stone.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:stone_rod" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/rods/tin.json b/src/generated/resources/data/c/tags/item/rods/tin.json new file mode 100644 index 000000000..5f7c69bf0 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/rods/tin.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:tin_rod" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/rods/zinc.json b/src/generated/resources/data/c/tags/item/rods/zinc.json new file mode 100644 index 000000000..42ddcbd2c --- /dev/null +++ b/src/generated/resources/data/c/tags/item/rods/zinc.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:zinc_rod" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/shards/adamantine.json b/src/generated/resources/data/c/tags/item/shards/adamantine.json new file mode 100644 index 000000000..f27ac1d88 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/shards/adamantine.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:adamantine_shard" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/shards/antimony.json b/src/generated/resources/data/c/tags/item/shards/antimony.json new file mode 100644 index 000000000..c6928626a --- /dev/null +++ b/src/generated/resources/data/c/tags/item/shards/antimony.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:antimony_shard" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/shards/bismuth.json b/src/generated/resources/data/c/tags/item/shards/bismuth.json new file mode 100644 index 000000000..29ef420b4 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/shards/bismuth.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:bismuth_shard" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/shards/coldiron.json b/src/generated/resources/data/c/tags/item/shards/coldiron.json new file mode 100644 index 000000000..58d4a4d6e --- /dev/null +++ b/src/generated/resources/data/c/tags/item/shards/coldiron.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:coldiron_shard" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/shards/nickel.json b/src/generated/resources/data/c/tags/item/shards/nickel.json new file mode 100644 index 000000000..dd00186b6 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/shards/nickel.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:nickel_shard" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/shards/platinum.json b/src/generated/resources/data/c/tags/item/shards/platinum.json new file mode 100644 index 000000000..b3fa11e8b --- /dev/null +++ b/src/generated/resources/data/c/tags/item/shards/platinum.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:platinum_shard" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/shards/starsteel.json b/src/generated/resources/data/c/tags/item/shards/starsteel.json new file mode 100644 index 000000000..0c476e76f --- /dev/null +++ b/src/generated/resources/data/c/tags/item/shards/starsteel.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:starsteel_shard" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/shards/zinc.json b/src/generated/resources/data/c/tags/item/shards/zinc.json new file mode 100644 index 000000000..a894d790b --- /dev/null +++ b/src/generated/resources/data/c/tags/item/shards/zinc.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:zinc_shard" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/slabs/copper.json b/src/generated/resources/data/c/tags/item/slabs/copper.json new file mode 100644 index 000000000..6695810f9 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/slabs/copper.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "basemetals:copper_slab", + "minecraft:cut_copper_slab" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/small_blends/aquarium.json b/src/generated/resources/data/c/tags/item/small_blends/aquarium.json new file mode 100644 index 000000000..31093bec0 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/small_blends/aquarium.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:aquarium_smallblend" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/small_blends/brass.json b/src/generated/resources/data/c/tags/item/small_blends/brass.json new file mode 100644 index 000000000..ac3ec2b57 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/small_blends/brass.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:brass_smallblend" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/small_blends/bronze.json b/src/generated/resources/data/c/tags/item/small_blends/bronze.json new file mode 100644 index 000000000..851c73e56 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/small_blends/bronze.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:bronze_smallblend" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/small_blends/cupronickel.json b/src/generated/resources/data/c/tags/item/small_blends/cupronickel.json new file mode 100644 index 000000000..931b08073 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/small_blends/cupronickel.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:cupronickel_smallblend" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/small_blends/diamond.json b/src/generated/resources/data/c/tags/item/small_blends/diamond.json new file mode 100644 index 000000000..c759ec2d1 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/small_blends/diamond.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:diamond_smallblend" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/small_blends/electrum.json b/src/generated/resources/data/c/tags/item/small_blends/electrum.json new file mode 100644 index 000000000..2fc258057 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/small_blends/electrum.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:electrum_smallblend" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/small_blends/gold.json b/src/generated/resources/data/c/tags/item/small_blends/gold.json new file mode 100644 index 000000000..7c0461e79 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/small_blends/gold.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:gold_smallblend" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/small_blends/invar.json b/src/generated/resources/data/c/tags/item/small_blends/invar.json new file mode 100644 index 000000000..251543a59 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/small_blends/invar.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:invar_smallblend" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/small_blends/iron.json b/src/generated/resources/data/c/tags/item/small_blends/iron.json new file mode 100644 index 000000000..83f7adec6 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/small_blends/iron.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:iron_smallblend" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/small_blends/mithril.json b/src/generated/resources/data/c/tags/item/small_blends/mithril.json new file mode 100644 index 000000000..167bae264 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/small_blends/mithril.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:mithril_smallblend" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/small_blends/pewter.json b/src/generated/resources/data/c/tags/item/small_blends/pewter.json new file mode 100644 index 000000000..a46d9ac79 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/small_blends/pewter.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:pewter_smallblend" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/small_blends/steel.json b/src/generated/resources/data/c/tags/item/small_blends/steel.json new file mode 100644 index 000000000..6adc9a639 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/small_blends/steel.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:steel_smallblend" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/sprockets/steel.json b/src/generated/resources/data/c/tags/item/sprockets/steel.json new file mode 100644 index 000000000..111f0cbc6 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/sprockets/steel.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "#c:gears/steel" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/stairs/copper.json b/src/generated/resources/data/c/tags/item/stairs/copper.json new file mode 100644 index 000000000..96357a57a --- /dev/null +++ b/src/generated/resources/data/c/tags/item/stairs/copper.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "basemetals:copper_stairs", + "minecraft:cut_copper_stairs" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/storage_blocks.json b/src/generated/resources/data/c/tags/item/storage_blocks.json new file mode 100644 index 000000000..b7f3a8c10 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/storage_blocks.json @@ -0,0 +1,26 @@ +{ + "replace": false, + "values": [ + "#c:storage_blocks/adamantine", + "#c:storage_blocks/antimony", + "#c:storage_blocks/aquarium", + "#c:storage_blocks/bismuth", + "#c:storage_blocks/brass", + "#c:storage_blocks/bronze", + "#c:storage_blocks/coldiron", + "#c:storage_blocks/copper", + "#c:storage_blocks/cupronickel", + "#c:storage_blocks/electrum", + "#c:storage_blocks/invar", + "#c:storage_blocks/lead", + "#c:storage_blocks/mithril", + "#c:storage_blocks/nickel", + "#c:storage_blocks/pewter", + "#c:storage_blocks/platinum", + "#c:storage_blocks/silver", + "#c:storage_blocks/starsteel", + "#c:storage_blocks/steel", + "#c:storage_blocks/tin", + "#c:storage_blocks/zinc" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/storage_blocks/adamantine.json b/src/generated/resources/data/c/tags/item/storage_blocks/adamantine.json new file mode 100644 index 000000000..17dd5862b --- /dev/null +++ b/src/generated/resources/data/c/tags/item/storage_blocks/adamantine.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:adamantine_block" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/storage_blocks/antimony.json b/src/generated/resources/data/c/tags/item/storage_blocks/antimony.json new file mode 100644 index 000000000..daa0b4252 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/storage_blocks/antimony.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:antimony_block" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/storage_blocks/aquarium.json b/src/generated/resources/data/c/tags/item/storage_blocks/aquarium.json new file mode 100644 index 000000000..d963cc8b6 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/storage_blocks/aquarium.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:aquarium_block" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/storage_blocks/bismuth.json b/src/generated/resources/data/c/tags/item/storage_blocks/bismuth.json new file mode 100644 index 000000000..950cf31a4 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/storage_blocks/bismuth.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:bismuth_block" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/storage_blocks/brass.json b/src/generated/resources/data/c/tags/item/storage_blocks/brass.json new file mode 100644 index 000000000..8997b5d35 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/storage_blocks/brass.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:brass_block" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/storage_blocks/bronze.json b/src/generated/resources/data/c/tags/item/storage_blocks/bronze.json new file mode 100644 index 000000000..bc8bff634 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/storage_blocks/bronze.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:bronze_block" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/storage_blocks/charcoal.json b/src/generated/resources/data/c/tags/item/storage_blocks/charcoal.json new file mode 100644 index 000000000..c09411d1a --- /dev/null +++ b/src/generated/resources/data/c/tags/item/storage_blocks/charcoal.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:charcoal_block" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/storage_blocks/coldiron.json b/src/generated/resources/data/c/tags/item/storage_blocks/coldiron.json new file mode 100644 index 000000000..0951a5514 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/storage_blocks/coldiron.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:coldiron_block" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/storage_blocks/copper.json b/src/generated/resources/data/c/tags/item/storage_blocks/copper.json new file mode 100644 index 000000000..c094f1f5e --- /dev/null +++ b/src/generated/resources/data/c/tags/item/storage_blocks/copper.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "basemetals:copper_block", + "minecraft:copper_block" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/storage_blocks/cupronickel.json b/src/generated/resources/data/c/tags/item/storage_blocks/cupronickel.json new file mode 100644 index 000000000..68717af17 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/storage_blocks/cupronickel.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:cupronickel_block" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/storage_blocks/diamond.json b/src/generated/resources/data/c/tags/item/storage_blocks/diamond.json new file mode 100644 index 000000000..bc1977755 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/storage_blocks/diamond.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:diamond_block" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/storage_blocks/electrum.json b/src/generated/resources/data/c/tags/item/storage_blocks/electrum.json new file mode 100644 index 000000000..b154028ba --- /dev/null +++ b/src/generated/resources/data/c/tags/item/storage_blocks/electrum.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:electrum_block" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/storage_blocks/emerald.json b/src/generated/resources/data/c/tags/item/storage_blocks/emerald.json new file mode 100644 index 000000000..30e292c55 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/storage_blocks/emerald.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:emerald_block" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/storage_blocks/gold.json b/src/generated/resources/data/c/tags/item/storage_blocks/gold.json new file mode 100644 index 000000000..863d47ad2 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/storage_blocks/gold.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:gold_block" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/storage_blocks/invar.json b/src/generated/resources/data/c/tags/item/storage_blocks/invar.json new file mode 100644 index 000000000..82f524f08 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/storage_blocks/invar.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:invar_block" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/storage_blocks/iron.json b/src/generated/resources/data/c/tags/item/storage_blocks/iron.json new file mode 100644 index 000000000..f9e01c6a9 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/storage_blocks/iron.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:iron_block" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/storage_blocks/lead.json b/src/generated/resources/data/c/tags/item/storage_blocks/lead.json new file mode 100644 index 000000000..49532fa3e --- /dev/null +++ b/src/generated/resources/data/c/tags/item/storage_blocks/lead.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:lead_block" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/storage_blocks/mithril.json b/src/generated/resources/data/c/tags/item/storage_blocks/mithril.json new file mode 100644 index 000000000..06355311f --- /dev/null +++ b/src/generated/resources/data/c/tags/item/storage_blocks/mithril.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:mithril_block" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/storage_blocks/nickel.json b/src/generated/resources/data/c/tags/item/storage_blocks/nickel.json new file mode 100644 index 000000000..1a3a3bffd --- /dev/null +++ b/src/generated/resources/data/c/tags/item/storage_blocks/nickel.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:nickel_block" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/storage_blocks/obsidian.json b/src/generated/resources/data/c/tags/item/storage_blocks/obsidian.json new file mode 100644 index 000000000..03a3719e3 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/storage_blocks/obsidian.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:obsidian" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/storage_blocks/pewter.json b/src/generated/resources/data/c/tags/item/storage_blocks/pewter.json new file mode 100644 index 000000000..03d48f873 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/storage_blocks/pewter.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:pewter_block" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/storage_blocks/platinum.json b/src/generated/resources/data/c/tags/item/storage_blocks/platinum.json new file mode 100644 index 000000000..2127f7b12 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/storage_blocks/platinum.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:platinum_block" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/storage_blocks/quartz.json b/src/generated/resources/data/c/tags/item/storage_blocks/quartz.json new file mode 100644 index 000000000..1321f2077 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/storage_blocks/quartz.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:quartz_block" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/storage_blocks/silver.json b/src/generated/resources/data/c/tags/item/storage_blocks/silver.json new file mode 100644 index 000000000..50cd38aeb --- /dev/null +++ b/src/generated/resources/data/c/tags/item/storage_blocks/silver.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:silver_block" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/storage_blocks/starsteel.json b/src/generated/resources/data/c/tags/item/storage_blocks/starsteel.json new file mode 100644 index 000000000..451d897d3 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/storage_blocks/starsteel.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:starsteel_block" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/storage_blocks/steel.json b/src/generated/resources/data/c/tags/item/storage_blocks/steel.json new file mode 100644 index 000000000..fd64726d3 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/storage_blocks/steel.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:steel_block" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/storage_blocks/tin.json b/src/generated/resources/data/c/tags/item/storage_blocks/tin.json new file mode 100644 index 000000000..9880ef345 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/storage_blocks/tin.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:tin_block" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/storage_blocks/zinc.json b/src/generated/resources/data/c/tags/item/storage_blocks/zinc.json new file mode 100644 index 000000000..9d9179250 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/storage_blocks/zinc.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:zinc_block" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/tiny_dusts.json b/src/generated/resources/data/c/tags/item/tiny_dusts.json new file mode 100644 index 000000000..c067cabd9 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/tiny_dusts.json @@ -0,0 +1,27 @@ +{ + "replace": false, + "values": [ + "#c:tiny_dusts/adamantine", + "#c:tiny_dusts/antimony", + "#c:tiny_dusts/aquarium", + "#c:tiny_dusts/bismuth", + "#c:tiny_dusts/brass", + "#c:tiny_dusts/bronze", + "#c:tiny_dusts/coldiron", + "#c:tiny_dusts/copper", + "#c:tiny_dusts/cupronickel", + "#c:tiny_dusts/electrum", + "#c:tiny_dusts/invar", + "#c:tiny_dusts/lead", + "#c:tiny_dusts/mercury", + "#c:tiny_dusts/mithril", + "#c:tiny_dusts/nickel", + "#c:tiny_dusts/pewter", + "#c:tiny_dusts/platinum", + "#c:tiny_dusts/silver", + "#c:tiny_dusts/starsteel", + "#c:tiny_dusts/steel", + "#c:tiny_dusts/tin", + "#c:tiny_dusts/zinc" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/tiny_dusts/adamantine.json b/src/generated/resources/data/c/tags/item/tiny_dusts/adamantine.json new file mode 100644 index 000000000..96545cb5a --- /dev/null +++ b/src/generated/resources/data/c/tags/item/tiny_dusts/adamantine.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:adamantine_smallpowder" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/tiny_dusts/antimony.json b/src/generated/resources/data/c/tags/item/tiny_dusts/antimony.json new file mode 100644 index 000000000..a897df884 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/tiny_dusts/antimony.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:antimony_smallpowder" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/tiny_dusts/aquarium.json b/src/generated/resources/data/c/tags/item/tiny_dusts/aquarium.json new file mode 100644 index 000000000..1d2cedbd7 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/tiny_dusts/aquarium.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:aquarium_smallpowder" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/tiny_dusts/bismuth.json b/src/generated/resources/data/c/tags/item/tiny_dusts/bismuth.json new file mode 100644 index 000000000..7ade6c090 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/tiny_dusts/bismuth.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:bismuth_smallpowder" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/tiny_dusts/brass.json b/src/generated/resources/data/c/tags/item/tiny_dusts/brass.json new file mode 100644 index 000000000..21c853629 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/tiny_dusts/brass.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:brass_smallpowder" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/tiny_dusts/bronze.json b/src/generated/resources/data/c/tags/item/tiny_dusts/bronze.json new file mode 100644 index 000000000..e61dc6643 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/tiny_dusts/bronze.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:bronze_smallpowder" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/tiny_dusts/charcoal.json b/src/generated/resources/data/c/tags/item/tiny_dusts/charcoal.json new file mode 100644 index 000000000..9942839a2 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/tiny_dusts/charcoal.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:charcoal_smallpowder" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/tiny_dusts/coal.json b/src/generated/resources/data/c/tags/item/tiny_dusts/coal.json new file mode 100644 index 000000000..a544382c5 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/tiny_dusts/coal.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:coal_smallpowder" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/tiny_dusts/coldiron.json b/src/generated/resources/data/c/tags/item/tiny_dusts/coldiron.json new file mode 100644 index 000000000..43fd9743f --- /dev/null +++ b/src/generated/resources/data/c/tags/item/tiny_dusts/coldiron.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:coldiron_smallpowder" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/tiny_dusts/copper.json b/src/generated/resources/data/c/tags/item/tiny_dusts/copper.json new file mode 100644 index 000000000..625956454 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/tiny_dusts/copper.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:copper_smallpowder" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/tiny_dusts/cupronickel.json b/src/generated/resources/data/c/tags/item/tiny_dusts/cupronickel.json new file mode 100644 index 000000000..55cc68848 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/tiny_dusts/cupronickel.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:cupronickel_smallpowder" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/tiny_dusts/diamond.json b/src/generated/resources/data/c/tags/item/tiny_dusts/diamond.json new file mode 100644 index 000000000..25e745196 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/tiny_dusts/diamond.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:diamond_smallpowder" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/tiny_dusts/electrum.json b/src/generated/resources/data/c/tags/item/tiny_dusts/electrum.json new file mode 100644 index 000000000..b701af809 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/tiny_dusts/electrum.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:electrum_smallpowder" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/tiny_dusts/emerald.json b/src/generated/resources/data/c/tags/item/tiny_dusts/emerald.json new file mode 100644 index 000000000..aa7671f32 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/tiny_dusts/emerald.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:emerald_smallpowder" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/tiny_dusts/gold.json b/src/generated/resources/data/c/tags/item/tiny_dusts/gold.json new file mode 100644 index 000000000..3a925a9c5 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/tiny_dusts/gold.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:gold_smallpowder" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/tiny_dusts/invar.json b/src/generated/resources/data/c/tags/item/tiny_dusts/invar.json new file mode 100644 index 000000000..fe3577fe2 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/tiny_dusts/invar.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:invar_smallpowder" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/tiny_dusts/iron.json b/src/generated/resources/data/c/tags/item/tiny_dusts/iron.json new file mode 100644 index 000000000..14f1652f2 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/tiny_dusts/iron.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:iron_smallpowder" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/tiny_dusts/lapis.json b/src/generated/resources/data/c/tags/item/tiny_dusts/lapis.json new file mode 100644 index 000000000..056f3bcdd --- /dev/null +++ b/src/generated/resources/data/c/tags/item/tiny_dusts/lapis.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:lapis_smallpowder" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/tiny_dusts/lead.json b/src/generated/resources/data/c/tags/item/tiny_dusts/lead.json new file mode 100644 index 000000000..5a6239f4c --- /dev/null +++ b/src/generated/resources/data/c/tags/item/tiny_dusts/lead.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:lead_smallpowder" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/tiny_dusts/mercury.json b/src/generated/resources/data/c/tags/item/tiny_dusts/mercury.json new file mode 100644 index 000000000..52dbbac29 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/tiny_dusts/mercury.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:mercury_smallpowder" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/tiny_dusts/mithril.json b/src/generated/resources/data/c/tags/item/tiny_dusts/mithril.json new file mode 100644 index 000000000..94d5288cd --- /dev/null +++ b/src/generated/resources/data/c/tags/item/tiny_dusts/mithril.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:mithril_smallpowder" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/tiny_dusts/nickel.json b/src/generated/resources/data/c/tags/item/tiny_dusts/nickel.json new file mode 100644 index 000000000..8bb776ea8 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/tiny_dusts/nickel.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:nickel_smallpowder" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/tiny_dusts/obsidian.json b/src/generated/resources/data/c/tags/item/tiny_dusts/obsidian.json new file mode 100644 index 000000000..c56ba5ab7 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/tiny_dusts/obsidian.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:obsidian_smallpowder" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/tiny_dusts/pewter.json b/src/generated/resources/data/c/tags/item/tiny_dusts/pewter.json new file mode 100644 index 000000000..642642c48 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/tiny_dusts/pewter.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:pewter_smallpowder" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/tiny_dusts/platinum.json b/src/generated/resources/data/c/tags/item/tiny_dusts/platinum.json new file mode 100644 index 000000000..5a2b690f5 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/tiny_dusts/platinum.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:platinum_smallpowder" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/tiny_dusts/quartz.json b/src/generated/resources/data/c/tags/item/tiny_dusts/quartz.json new file mode 100644 index 000000000..f557e5408 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/tiny_dusts/quartz.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:quartz_smallpowder" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/tiny_dusts/redstone.json b/src/generated/resources/data/c/tags/item/tiny_dusts/redstone.json new file mode 100644 index 000000000..7316e8407 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/tiny_dusts/redstone.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:redstone_smallpowder" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/tiny_dusts/silver.json b/src/generated/resources/data/c/tags/item/tiny_dusts/silver.json new file mode 100644 index 000000000..3f7cba057 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/tiny_dusts/silver.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:silver_smallpowder" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/tiny_dusts/starsteel.json b/src/generated/resources/data/c/tags/item/tiny_dusts/starsteel.json new file mode 100644 index 000000000..80c3f16ba --- /dev/null +++ b/src/generated/resources/data/c/tags/item/tiny_dusts/starsteel.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:starsteel_smallpowder" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/tiny_dusts/steel.json b/src/generated/resources/data/c/tags/item/tiny_dusts/steel.json new file mode 100644 index 000000000..738450af6 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/tiny_dusts/steel.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:steel_smallpowder" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/tiny_dusts/tin.json b/src/generated/resources/data/c/tags/item/tiny_dusts/tin.json new file mode 100644 index 000000000..9c927e059 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/tiny_dusts/tin.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:tin_smallpowder" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/tiny_dusts/zinc.json b/src/generated/resources/data/c/tags/item/tiny_dusts/zinc.json new file mode 100644 index 000000000..65e1e2c53 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/tiny_dusts/zinc.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "basemetals:zinc_smallpowder" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/tools/axes/copper.json b/src/generated/resources/data/c/tags/item/tools/axes/copper.json new file mode 100644 index 000000000..1cfda9ea7 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/tools/axes/copper.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "basemetals:copper_axe", + "minecraft:copper_axe" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/tools/hoes/copper.json b/src/generated/resources/data/c/tags/item/tools/hoes/copper.json new file mode 100644 index 000000000..8ff1d2ec7 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/tools/hoes/copper.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "basemetals:copper_hoe", + "minecraft:copper_hoe" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/tools/pickaxes/copper.json b/src/generated/resources/data/c/tags/item/tools/pickaxes/copper.json new file mode 100644 index 000000000..3edbba3ae --- /dev/null +++ b/src/generated/resources/data/c/tags/item/tools/pickaxes/copper.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "basemetals:copper_pickaxe", + "minecraft:copper_pickaxe" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/tools/shovels/copper.json b/src/generated/resources/data/c/tags/item/tools/shovels/copper.json new file mode 100644 index 000000000..e375f6e5e --- /dev/null +++ b/src/generated/resources/data/c/tags/item/tools/shovels/copper.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "basemetals:copper_shovel", + "minecraft:copper_shovel" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/tools/swords/copper.json b/src/generated/resources/data/c/tags/item/tools/swords/copper.json new file mode 100644 index 000000000..ffb0412c0 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/tools/swords/copper.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "basemetals:copper_sword", + "minecraft:copper_sword" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/trapdoors/copper.json b/src/generated/resources/data/c/tags/item/trapdoors/copper.json new file mode 100644 index 000000000..0bb1f00b1 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/trapdoors/copper.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "basemetals:copper_trapdoor", + "minecraft:copper_trapdoor" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/block/bars/copper.json b/src/generated/resources/data/forge/tags/block/bars/copper.json index b5a995f14..3d25aba31 100644 --- a/src/generated/resources/data/forge/tags/block/bars/copper.json +++ b/src/generated/resources/data/forge/tags/block/bars/copper.json @@ -1,7 +1,6 @@ { "replace": false, "values": [ - "basemetals:copper_bars", - "minecraft:copper_bars" + "#c:bars/copper" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/block/cobblestone.json b/src/generated/resources/data/forge/tags/block/cobblestone.json new file mode 100644 index 000000000..f7d76ce2a --- /dev/null +++ b/src/generated/resources/data/forge/tags/block/cobblestone.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "#c:cobblestones" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/block/doors/copper.json b/src/generated/resources/data/forge/tags/block/doors/copper.json index 989979572..99c0b4f03 100644 --- a/src/generated/resources/data/forge/tags/block/doors/copper.json +++ b/src/generated/resources/data/forge/tags/block/doors/copper.json @@ -1,7 +1,6 @@ { "replace": false, "values": [ - "basemetals:copper_door", - "minecraft:copper_door" + "#c:doors/copper" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/block/end_stones.json b/src/generated/resources/data/forge/tags/block/end_stones.json index 146dcd9a6..510b0d141 100644 --- a/src/generated/resources/data/forge/tags/block/end_stones.json +++ b/src/generated/resources/data/forge/tags/block/end_stones.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "minecraft:end_stone" + "#c:end_stones" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/block/gravel.json b/src/generated/resources/data/forge/tags/block/gravel.json new file mode 100644 index 000000000..6c45551dc --- /dev/null +++ b/src/generated/resources/data/forge/tags/block/gravel.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "#c:gravels" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/block/netherrack.json b/src/generated/resources/data/forge/tags/block/netherrack.json index d54c65bbb..fd10a7eb1 100644 --- a/src/generated/resources/data/forge/tags/block/netherrack.json +++ b/src/generated/resources/data/forge/tags/block/netherrack.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "minecraft:netherrack" + "#c:netherrack" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/block/ores.json b/src/generated/resources/data/forge/tags/block/ores.json index bf700473b..9195d9493 100644 --- a/src/generated/resources/data/forge/tags/block/ores.json +++ b/src/generated/resources/data/forge/tags/block/ores.json @@ -1,18 +1,6 @@ { "replace": false, "values": [ - "#forge:ores/adamantine", - "#forge:ores/antimony", - "#forge:ores/bismuth", - "#forge:ores/coldiron", - "#forge:ores/copper", - "#forge:ores/lead", - "#forge:ores/mercury", - "#forge:ores/nickel", - "#forge:ores/platinum", - "#forge:ores/silver", - "#forge:ores/starsteel", - "#forge:ores/tin", - "#forge:ores/zinc" + "#c:ores" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/block/ores/adamantine.json b/src/generated/resources/data/forge/tags/block/ores/adamantine.json index fdc15c972..0cdb81b98 100644 --- a/src/generated/resources/data/forge/tags/block/ores/adamantine.json +++ b/src/generated/resources/data/forge/tags/block/ores/adamantine.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:adamantine_ore" + "#c:ores/adamantine" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/block/ores/antimony.json b/src/generated/resources/data/forge/tags/block/ores/antimony.json index d535177f5..e856b7bfe 100644 --- a/src/generated/resources/data/forge/tags/block/ores/antimony.json +++ b/src/generated/resources/data/forge/tags/block/ores/antimony.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:antimony_ore" + "#c:ores/antimony" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/block/ores/bismuth.json b/src/generated/resources/data/forge/tags/block/ores/bismuth.json index a43ac8ddb..bf0973a95 100644 --- a/src/generated/resources/data/forge/tags/block/ores/bismuth.json +++ b/src/generated/resources/data/forge/tags/block/ores/bismuth.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:bismuth_ore" + "#c:ores/bismuth" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/block/ores/coal.json b/src/generated/resources/data/forge/tags/block/ores/coal.json new file mode 100644 index 000000000..36f1a46d0 --- /dev/null +++ b/src/generated/resources/data/forge/tags/block/ores/coal.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "#c:ores/coal" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/block/ores/coldiron.json b/src/generated/resources/data/forge/tags/block/ores/coldiron.json index 968821106..8e63ac1b0 100644 --- a/src/generated/resources/data/forge/tags/block/ores/coldiron.json +++ b/src/generated/resources/data/forge/tags/block/ores/coldiron.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:coldiron_ore" + "#c:ores/coldiron" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/block/ores/copper.json b/src/generated/resources/data/forge/tags/block/ores/copper.json index c2e8c464f..204b49e0d 100644 --- a/src/generated/resources/data/forge/tags/block/ores/copper.json +++ b/src/generated/resources/data/forge/tags/block/ores/copper.json @@ -1,8 +1,6 @@ { "replace": false, "values": [ - "basemetals:copper_ore", - "minecraft:copper_ore", - "minecraft:deepslate_copper_ore" + "#c:ores/copper" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/block/ores/diamond.json b/src/generated/resources/data/forge/tags/block/ores/diamond.json new file mode 100644 index 000000000..c52006d3e --- /dev/null +++ b/src/generated/resources/data/forge/tags/block/ores/diamond.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "#c:ores/diamond" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/block/ores/emerald.json b/src/generated/resources/data/forge/tags/block/ores/emerald.json new file mode 100644 index 000000000..4de5b41d5 --- /dev/null +++ b/src/generated/resources/data/forge/tags/block/ores/emerald.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "#c:ores/emerald" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/block/ores/gold.json b/src/generated/resources/data/forge/tags/block/ores/gold.json new file mode 100644 index 000000000..cbc8b035f --- /dev/null +++ b/src/generated/resources/data/forge/tags/block/ores/gold.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "#c:ores/gold" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/block/ores/iron.json b/src/generated/resources/data/forge/tags/block/ores/iron.json new file mode 100644 index 000000000..34488eebb --- /dev/null +++ b/src/generated/resources/data/forge/tags/block/ores/iron.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "#c:ores/iron" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/block/ores/lapis.json b/src/generated/resources/data/forge/tags/block/ores/lapis.json new file mode 100644 index 000000000..ff0f4ac6e --- /dev/null +++ b/src/generated/resources/data/forge/tags/block/ores/lapis.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "#c:ores/lapis" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/block/ores/lead.json b/src/generated/resources/data/forge/tags/block/ores/lead.json index 71aad861f..50b0d90a4 100644 --- a/src/generated/resources/data/forge/tags/block/ores/lead.json +++ b/src/generated/resources/data/forge/tags/block/ores/lead.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:lead_ore" + "#c:ores/lead" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/block/ores/mercury.json b/src/generated/resources/data/forge/tags/block/ores/mercury.json index ddd01f06b..b43feadb9 100644 --- a/src/generated/resources/data/forge/tags/block/ores/mercury.json +++ b/src/generated/resources/data/forge/tags/block/ores/mercury.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:mercury_ore" + "#c:ores/mercury" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/block/ores/netherite_scrap.json b/src/generated/resources/data/forge/tags/block/ores/netherite_scrap.json new file mode 100644 index 000000000..7c1f62c97 --- /dev/null +++ b/src/generated/resources/data/forge/tags/block/ores/netherite_scrap.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "#c:ores/netherite_scrap" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/block/ores/nickel.json b/src/generated/resources/data/forge/tags/block/ores/nickel.json index 4f0eff4f1..892a815ac 100644 --- a/src/generated/resources/data/forge/tags/block/ores/nickel.json +++ b/src/generated/resources/data/forge/tags/block/ores/nickel.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:nickel_ore" + "#c:ores/nickel" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/block/ores/platinum.json b/src/generated/resources/data/forge/tags/block/ores/platinum.json index 0c92650c7..46ef81778 100644 --- a/src/generated/resources/data/forge/tags/block/ores/platinum.json +++ b/src/generated/resources/data/forge/tags/block/ores/platinum.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:platinum_ore" + "#c:ores/platinum" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/block/ores/quartz.json b/src/generated/resources/data/forge/tags/block/ores/quartz.json new file mode 100644 index 000000000..9c6749f10 --- /dev/null +++ b/src/generated/resources/data/forge/tags/block/ores/quartz.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "#c:ores/quartz" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/block/ores/redstone.json b/src/generated/resources/data/forge/tags/block/ores/redstone.json new file mode 100644 index 000000000..820676434 --- /dev/null +++ b/src/generated/resources/data/forge/tags/block/ores/redstone.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "#c:ores/redstone" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/block/ores/silver.json b/src/generated/resources/data/forge/tags/block/ores/silver.json index 4a586b22a..356d4218c 100644 --- a/src/generated/resources/data/forge/tags/block/ores/silver.json +++ b/src/generated/resources/data/forge/tags/block/ores/silver.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:silver_ore" + "#c:ores/silver" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/block/ores/starsteel.json b/src/generated/resources/data/forge/tags/block/ores/starsteel.json index 7e82e1027..a679e2198 100644 --- a/src/generated/resources/data/forge/tags/block/ores/starsteel.json +++ b/src/generated/resources/data/forge/tags/block/ores/starsteel.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:starsteel_ore" + "#c:ores/starsteel" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/block/ores/tin.json b/src/generated/resources/data/forge/tags/block/ores/tin.json index db8843130..b82e201e5 100644 --- a/src/generated/resources/data/forge/tags/block/ores/tin.json +++ b/src/generated/resources/data/forge/tags/block/ores/tin.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:tin_ore" + "#c:ores/tin" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/block/ores/zinc.json b/src/generated/resources/data/forge/tags/block/ores/zinc.json index 27c70fae4..35f02111d 100644 --- a/src/generated/resources/data/forge/tags/block/ores/zinc.json +++ b/src/generated/resources/data/forge/tags/block/ores/zinc.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:zinc_ore" + "#c:ores/zinc" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/block/slabs/copper.json b/src/generated/resources/data/forge/tags/block/slabs/copper.json index 6695810f9..04df3c23a 100644 --- a/src/generated/resources/data/forge/tags/block/slabs/copper.json +++ b/src/generated/resources/data/forge/tags/block/slabs/copper.json @@ -1,7 +1,6 @@ { "replace": false, "values": [ - "basemetals:copper_slab", - "minecraft:cut_copper_slab" + "#c:slabs/copper" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/block/stairs/copper.json b/src/generated/resources/data/forge/tags/block/stairs/copper.json index 96357a57a..691f379e2 100644 --- a/src/generated/resources/data/forge/tags/block/stairs/copper.json +++ b/src/generated/resources/data/forge/tags/block/stairs/copper.json @@ -1,7 +1,6 @@ { "replace": false, "values": [ - "basemetals:copper_stairs", - "minecraft:cut_copper_stairs" + "#c:stairs/copper" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/block/stone.json b/src/generated/resources/data/forge/tags/block/stone.json new file mode 100644 index 000000000..a3f20d9b0 --- /dev/null +++ b/src/generated/resources/data/forge/tags/block/stone.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "#c:stones" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/block/storage_blocks.json b/src/generated/resources/data/forge/tags/block/storage_blocks.json index 6819493b3..0a7be0f93 100644 --- a/src/generated/resources/data/forge/tags/block/storage_blocks.json +++ b/src/generated/resources/data/forge/tags/block/storage_blocks.json @@ -1,26 +1,6 @@ { "replace": false, "values": [ - "#forge:storage_blocks/adamantine", - "#forge:storage_blocks/antimony", - "#forge:storage_blocks/aquarium", - "#forge:storage_blocks/bismuth", - "#forge:storage_blocks/brass", - "#forge:storage_blocks/bronze", - "#forge:storage_blocks/coldiron", - "#forge:storage_blocks/copper", - "#forge:storage_blocks/cupronickel", - "#forge:storage_blocks/electrum", - "#forge:storage_blocks/invar", - "#forge:storage_blocks/lead", - "#forge:storage_blocks/mithril", - "#forge:storage_blocks/nickel", - "#forge:storage_blocks/pewter", - "#forge:storage_blocks/platinum", - "#forge:storage_blocks/silver", - "#forge:storage_blocks/starsteel", - "#forge:storage_blocks/steel", - "#forge:storage_blocks/tin", - "#forge:storage_blocks/zinc" + "#c:storage_blocks" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/block/storage_blocks/adamantine.json b/src/generated/resources/data/forge/tags/block/storage_blocks/adamantine.json index 17dd5862b..6cbae665c 100644 --- a/src/generated/resources/data/forge/tags/block/storage_blocks/adamantine.json +++ b/src/generated/resources/data/forge/tags/block/storage_blocks/adamantine.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:adamantine_block" + "#c:storage_blocks/adamantine" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/block/storage_blocks/antimony.json b/src/generated/resources/data/forge/tags/block/storage_blocks/antimony.json index daa0b4252..92079b6d5 100644 --- a/src/generated/resources/data/forge/tags/block/storage_blocks/antimony.json +++ b/src/generated/resources/data/forge/tags/block/storage_blocks/antimony.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:antimony_block" + "#c:storage_blocks/antimony" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/block/storage_blocks/aquarium.json b/src/generated/resources/data/forge/tags/block/storage_blocks/aquarium.json index d963cc8b6..9df0dc0fc 100644 --- a/src/generated/resources/data/forge/tags/block/storage_blocks/aquarium.json +++ b/src/generated/resources/data/forge/tags/block/storage_blocks/aquarium.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:aquarium_block" + "#c:storage_blocks/aquarium" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/block/storage_blocks/bismuth.json b/src/generated/resources/data/forge/tags/block/storage_blocks/bismuth.json index 950cf31a4..479994a14 100644 --- a/src/generated/resources/data/forge/tags/block/storage_blocks/bismuth.json +++ b/src/generated/resources/data/forge/tags/block/storage_blocks/bismuth.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:bismuth_block" + "#c:storage_blocks/bismuth" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/block/storage_blocks/brass.json b/src/generated/resources/data/forge/tags/block/storage_blocks/brass.json index 8997b5d35..f90263733 100644 --- a/src/generated/resources/data/forge/tags/block/storage_blocks/brass.json +++ b/src/generated/resources/data/forge/tags/block/storage_blocks/brass.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:brass_block" + "#c:storage_blocks/brass" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/block/storage_blocks/bronze.json b/src/generated/resources/data/forge/tags/block/storage_blocks/bronze.json index bc8bff634..4e5f2c42a 100644 --- a/src/generated/resources/data/forge/tags/block/storage_blocks/bronze.json +++ b/src/generated/resources/data/forge/tags/block/storage_blocks/bronze.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:bronze_block" + "#c:storage_blocks/bronze" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/block/storage_blocks/charcoal.json b/src/generated/resources/data/forge/tags/block/storage_blocks/charcoal.json index c09411d1a..897f6aea5 100644 --- a/src/generated/resources/data/forge/tags/block/storage_blocks/charcoal.json +++ b/src/generated/resources/data/forge/tags/block/storage_blocks/charcoal.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:charcoal_block" + "#c:storage_blocks/charcoal" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/block/storage_blocks/coal.json b/src/generated/resources/data/forge/tags/block/storage_blocks/coal.json new file mode 100644 index 000000000..4d100642a --- /dev/null +++ b/src/generated/resources/data/forge/tags/block/storage_blocks/coal.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "#c:storage_blocks/coal" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/block/storage_blocks/coldiron.json b/src/generated/resources/data/forge/tags/block/storage_blocks/coldiron.json index 0951a5514..0d72b6ed5 100644 --- a/src/generated/resources/data/forge/tags/block/storage_blocks/coldiron.json +++ b/src/generated/resources/data/forge/tags/block/storage_blocks/coldiron.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:coldiron_block" + "#c:storage_blocks/coldiron" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/block/storage_blocks/copper.json b/src/generated/resources/data/forge/tags/block/storage_blocks/copper.json index c094f1f5e..7c58756fc 100644 --- a/src/generated/resources/data/forge/tags/block/storage_blocks/copper.json +++ b/src/generated/resources/data/forge/tags/block/storage_blocks/copper.json @@ -1,7 +1,6 @@ { "replace": false, "values": [ - "basemetals:copper_block", - "minecraft:copper_block" + "#c:storage_blocks/copper" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/block/storage_blocks/cupronickel.json b/src/generated/resources/data/forge/tags/block/storage_blocks/cupronickel.json index 68717af17..6a5844987 100644 --- a/src/generated/resources/data/forge/tags/block/storage_blocks/cupronickel.json +++ b/src/generated/resources/data/forge/tags/block/storage_blocks/cupronickel.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:cupronickel_block" + "#c:storage_blocks/cupronickel" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/block/storage_blocks/diamond.json b/src/generated/resources/data/forge/tags/block/storage_blocks/diamond.json index bc1977755..fd4b4eaf4 100644 --- a/src/generated/resources/data/forge/tags/block/storage_blocks/diamond.json +++ b/src/generated/resources/data/forge/tags/block/storage_blocks/diamond.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "minecraft:diamond_block" + "#c:storage_blocks/diamond" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/block/storage_blocks/electrum.json b/src/generated/resources/data/forge/tags/block/storage_blocks/electrum.json index b154028ba..0cc551a53 100644 --- a/src/generated/resources/data/forge/tags/block/storage_blocks/electrum.json +++ b/src/generated/resources/data/forge/tags/block/storage_blocks/electrum.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:electrum_block" + "#c:storage_blocks/electrum" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/block/storage_blocks/emerald.json b/src/generated/resources/data/forge/tags/block/storage_blocks/emerald.json index 30e292c55..15fc307f1 100644 --- a/src/generated/resources/data/forge/tags/block/storage_blocks/emerald.json +++ b/src/generated/resources/data/forge/tags/block/storage_blocks/emerald.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "minecraft:emerald_block" + "#c:storage_blocks/emerald" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/block/storage_blocks/gold.json b/src/generated/resources/data/forge/tags/block/storage_blocks/gold.json index 863d47ad2..c62bf5027 100644 --- a/src/generated/resources/data/forge/tags/block/storage_blocks/gold.json +++ b/src/generated/resources/data/forge/tags/block/storage_blocks/gold.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "minecraft:gold_block" + "#c:storage_blocks/gold" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/block/storage_blocks/invar.json b/src/generated/resources/data/forge/tags/block/storage_blocks/invar.json index 82f524f08..7234cbd4f 100644 --- a/src/generated/resources/data/forge/tags/block/storage_blocks/invar.json +++ b/src/generated/resources/data/forge/tags/block/storage_blocks/invar.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:invar_block" + "#c:storage_blocks/invar" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/block/storage_blocks/iron.json b/src/generated/resources/data/forge/tags/block/storage_blocks/iron.json index f9e01c6a9..177b66643 100644 --- a/src/generated/resources/data/forge/tags/block/storage_blocks/iron.json +++ b/src/generated/resources/data/forge/tags/block/storage_blocks/iron.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "minecraft:iron_block" + "#c:storage_blocks/iron" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/block/storage_blocks/lapis.json b/src/generated/resources/data/forge/tags/block/storage_blocks/lapis.json new file mode 100644 index 000000000..d18456d3b --- /dev/null +++ b/src/generated/resources/data/forge/tags/block/storage_blocks/lapis.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "#c:storage_blocks/lapis" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/block/storage_blocks/lead.json b/src/generated/resources/data/forge/tags/block/storage_blocks/lead.json index 49532fa3e..be187d7e0 100644 --- a/src/generated/resources/data/forge/tags/block/storage_blocks/lead.json +++ b/src/generated/resources/data/forge/tags/block/storage_blocks/lead.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:lead_block" + "#c:storage_blocks/lead" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/block/storage_blocks/mithril.json b/src/generated/resources/data/forge/tags/block/storage_blocks/mithril.json index 06355311f..68f193e18 100644 --- a/src/generated/resources/data/forge/tags/block/storage_blocks/mithril.json +++ b/src/generated/resources/data/forge/tags/block/storage_blocks/mithril.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:mithril_block" + "#c:storage_blocks/mithril" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/block/storage_blocks/nickel.json b/src/generated/resources/data/forge/tags/block/storage_blocks/nickel.json index 1a3a3bffd..dfeb37a69 100644 --- a/src/generated/resources/data/forge/tags/block/storage_blocks/nickel.json +++ b/src/generated/resources/data/forge/tags/block/storage_blocks/nickel.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:nickel_block" + "#c:storage_blocks/nickel" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/block/storage_blocks/obsidian.json b/src/generated/resources/data/forge/tags/block/storage_blocks/obsidian.json index 03a3719e3..23bb1f731 100644 --- a/src/generated/resources/data/forge/tags/block/storage_blocks/obsidian.json +++ b/src/generated/resources/data/forge/tags/block/storage_blocks/obsidian.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "minecraft:obsidian" + "#c:storage_blocks/obsidian" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/block/storage_blocks/pewter.json b/src/generated/resources/data/forge/tags/block/storage_blocks/pewter.json index 03d48f873..01137bae6 100644 --- a/src/generated/resources/data/forge/tags/block/storage_blocks/pewter.json +++ b/src/generated/resources/data/forge/tags/block/storage_blocks/pewter.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:pewter_block" + "#c:storage_blocks/pewter" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/block/storage_blocks/platinum.json b/src/generated/resources/data/forge/tags/block/storage_blocks/platinum.json index 2127f7b12..2da8f1ef9 100644 --- a/src/generated/resources/data/forge/tags/block/storage_blocks/platinum.json +++ b/src/generated/resources/data/forge/tags/block/storage_blocks/platinum.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:platinum_block" + "#c:storage_blocks/platinum" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/block/storage_blocks/quartz.json b/src/generated/resources/data/forge/tags/block/storage_blocks/quartz.json index 1321f2077..9432b4954 100644 --- a/src/generated/resources/data/forge/tags/block/storage_blocks/quartz.json +++ b/src/generated/resources/data/forge/tags/block/storage_blocks/quartz.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "minecraft:quartz_block" + "#c:storage_blocks/quartz" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/block/storage_blocks/redstone.json b/src/generated/resources/data/forge/tags/block/storage_blocks/redstone.json new file mode 100644 index 000000000..395c52182 --- /dev/null +++ b/src/generated/resources/data/forge/tags/block/storage_blocks/redstone.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "#c:storage_blocks/redstone" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/block/storage_blocks/silver.json b/src/generated/resources/data/forge/tags/block/storage_blocks/silver.json index 50cd38aeb..2cf6d15c6 100644 --- a/src/generated/resources/data/forge/tags/block/storage_blocks/silver.json +++ b/src/generated/resources/data/forge/tags/block/storage_blocks/silver.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:silver_block" + "#c:storage_blocks/silver" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/block/storage_blocks/starsteel.json b/src/generated/resources/data/forge/tags/block/storage_blocks/starsteel.json index 451d897d3..06eb1eca1 100644 --- a/src/generated/resources/data/forge/tags/block/storage_blocks/starsteel.json +++ b/src/generated/resources/data/forge/tags/block/storage_blocks/starsteel.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:starsteel_block" + "#c:storage_blocks/starsteel" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/block/storage_blocks/steel.json b/src/generated/resources/data/forge/tags/block/storage_blocks/steel.json index fd64726d3..122208d8b 100644 --- a/src/generated/resources/data/forge/tags/block/storage_blocks/steel.json +++ b/src/generated/resources/data/forge/tags/block/storage_blocks/steel.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:steel_block" + "#c:storage_blocks/steel" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/block/storage_blocks/tin.json b/src/generated/resources/data/forge/tags/block/storage_blocks/tin.json index 9880ef345..2de053df3 100644 --- a/src/generated/resources/data/forge/tags/block/storage_blocks/tin.json +++ b/src/generated/resources/data/forge/tags/block/storage_blocks/tin.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:tin_block" + "#c:storage_blocks/tin" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/block/storage_blocks/zinc.json b/src/generated/resources/data/forge/tags/block/storage_blocks/zinc.json index 9d9179250..ef4fc844a 100644 --- a/src/generated/resources/data/forge/tags/block/storage_blocks/zinc.json +++ b/src/generated/resources/data/forge/tags/block/storage_blocks/zinc.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:zinc_block" + "#c:storage_blocks/zinc" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/block/trapdoors/copper.json b/src/generated/resources/data/forge/tags/block/trapdoors/copper.json index 0bb1f00b1..1077ba13e 100644 --- a/src/generated/resources/data/forge/tags/block/trapdoors/copper.json +++ b/src/generated/resources/data/forge/tags/block/trapdoors/copper.json @@ -1,7 +1,6 @@ { "replace": false, "values": [ - "basemetals:copper_trapdoor", - "minecraft:copper_trapdoor" + "#c:trapdoors/copper" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/fluid/molten_adamantine.json b/src/generated/resources/data/forge/tags/fluid/molten_adamantine.json index d1dc1ab9f..2f957119e 100644 --- a/src/generated/resources/data/forge/tags/fluid/molten_adamantine.json +++ b/src/generated/resources/data/forge/tags/fluid/molten_adamantine.json @@ -1,7 +1,6 @@ { "replace": false, "values": [ - "basemetals:adamantine", - "basemetals:flowing_adamantine" + "#c:molten_adamantine" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/fluid/molten_antimony.json b/src/generated/resources/data/forge/tags/fluid/molten_antimony.json index f56e72a23..0cbf860f9 100644 --- a/src/generated/resources/data/forge/tags/fluid/molten_antimony.json +++ b/src/generated/resources/data/forge/tags/fluid/molten_antimony.json @@ -1,7 +1,6 @@ { "replace": false, "values": [ - "basemetals:antimony", - "basemetals:flowing_antimony" + "#c:molten_antimony" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/fluid/molten_aquarium.json b/src/generated/resources/data/forge/tags/fluid/molten_aquarium.json index 227060d19..637244d87 100644 --- a/src/generated/resources/data/forge/tags/fluid/molten_aquarium.json +++ b/src/generated/resources/data/forge/tags/fluid/molten_aquarium.json @@ -1,7 +1,6 @@ { "replace": false, "values": [ - "basemetals:aquarium", - "basemetals:flowing_aquarium" + "#c:molten_aquarium" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/fluid/molten_bismuth.json b/src/generated/resources/data/forge/tags/fluid/molten_bismuth.json index 1e45002e5..560ac5b69 100644 --- a/src/generated/resources/data/forge/tags/fluid/molten_bismuth.json +++ b/src/generated/resources/data/forge/tags/fluid/molten_bismuth.json @@ -1,7 +1,6 @@ { "replace": false, "values": [ - "basemetals:bismuth", - "basemetals:flowing_bismuth" + "#c:molten_bismuth" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/fluid/molten_brass.json b/src/generated/resources/data/forge/tags/fluid/molten_brass.json index 005173b87..6debbc13d 100644 --- a/src/generated/resources/data/forge/tags/fluid/molten_brass.json +++ b/src/generated/resources/data/forge/tags/fluid/molten_brass.json @@ -1,7 +1,6 @@ { "replace": false, "values": [ - "basemetals:brass", - "basemetals:flowing_brass" + "#c:molten_brass" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/fluid/molten_bronze.json b/src/generated/resources/data/forge/tags/fluid/molten_bronze.json index 1fa7eec8b..678c7f628 100644 --- a/src/generated/resources/data/forge/tags/fluid/molten_bronze.json +++ b/src/generated/resources/data/forge/tags/fluid/molten_bronze.json @@ -1,7 +1,6 @@ { "replace": false, "values": [ - "basemetals:bronze", - "basemetals:flowing_bronze" + "#c:molten_bronze" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/fluid/molten_coldiron.json b/src/generated/resources/data/forge/tags/fluid/molten_coldiron.json index 233e59a5f..948193fe1 100644 --- a/src/generated/resources/data/forge/tags/fluid/molten_coldiron.json +++ b/src/generated/resources/data/forge/tags/fluid/molten_coldiron.json @@ -1,7 +1,6 @@ { "replace": false, "values": [ - "basemetals:coldiron", - "basemetals:flowing_coldiron" + "#c:molten_coldiron" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/fluid/molten_copper.json b/src/generated/resources/data/forge/tags/fluid/molten_copper.json index c301950e4..53dbccf5a 100644 --- a/src/generated/resources/data/forge/tags/fluid/molten_copper.json +++ b/src/generated/resources/data/forge/tags/fluid/molten_copper.json @@ -1,7 +1,6 @@ { "replace": false, "values": [ - "basemetals:copper", - "basemetals:flowing_copper" + "#c:molten_copper" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/fluid/molten_cupronickel.json b/src/generated/resources/data/forge/tags/fluid/molten_cupronickel.json index 2b94f3224..1247aa6f9 100644 --- a/src/generated/resources/data/forge/tags/fluid/molten_cupronickel.json +++ b/src/generated/resources/data/forge/tags/fluid/molten_cupronickel.json @@ -1,7 +1,6 @@ { "replace": false, "values": [ - "basemetals:cupronickel", - "basemetals:flowing_cupronickel" + "#c:molten_cupronickel" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/fluid/molten_electrum.json b/src/generated/resources/data/forge/tags/fluid/molten_electrum.json index 7c5b8585e..a597aff42 100644 --- a/src/generated/resources/data/forge/tags/fluid/molten_electrum.json +++ b/src/generated/resources/data/forge/tags/fluid/molten_electrum.json @@ -1,7 +1,6 @@ { "replace": false, "values": [ - "basemetals:electrum", - "basemetals:flowing_electrum" + "#c:molten_electrum" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/fluid/molten_invar.json b/src/generated/resources/data/forge/tags/fluid/molten_invar.json index 1bf9a13e7..0fe54bb6e 100644 --- a/src/generated/resources/data/forge/tags/fluid/molten_invar.json +++ b/src/generated/resources/data/forge/tags/fluid/molten_invar.json @@ -1,7 +1,6 @@ { "replace": false, "values": [ - "basemetals:flowing_invar", - "basemetals:invar" + "#c:molten_invar" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/fluid/molten_lead.json b/src/generated/resources/data/forge/tags/fluid/molten_lead.json index 13eb7f05c..39accafa4 100644 --- a/src/generated/resources/data/forge/tags/fluid/molten_lead.json +++ b/src/generated/resources/data/forge/tags/fluid/molten_lead.json @@ -1,7 +1,6 @@ { "replace": false, "values": [ - "basemetals:flowing_lead", - "basemetals:lead" + "#c:molten_lead" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/fluid/molten_mercury.json b/src/generated/resources/data/forge/tags/fluid/molten_mercury.json index ffd1cb3d3..b82e3f26a 100644 --- a/src/generated/resources/data/forge/tags/fluid/molten_mercury.json +++ b/src/generated/resources/data/forge/tags/fluid/molten_mercury.json @@ -1,7 +1,6 @@ { "replace": false, "values": [ - "basemetals:flowing_mercury", - "basemetals:mercury" + "#c:molten_mercury" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/fluid/molten_mithril.json b/src/generated/resources/data/forge/tags/fluid/molten_mithril.json index 94d582923..09f2f5c03 100644 --- a/src/generated/resources/data/forge/tags/fluid/molten_mithril.json +++ b/src/generated/resources/data/forge/tags/fluid/molten_mithril.json @@ -1,7 +1,6 @@ { "replace": false, "values": [ - "basemetals:flowing_mithril", - "basemetals:mithril" + "#c:molten_mithril" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/fluid/molten_nickel.json b/src/generated/resources/data/forge/tags/fluid/molten_nickel.json index abfb550d2..a426746e7 100644 --- a/src/generated/resources/data/forge/tags/fluid/molten_nickel.json +++ b/src/generated/resources/data/forge/tags/fluid/molten_nickel.json @@ -1,7 +1,6 @@ { "replace": false, "values": [ - "basemetals:flowing_nickel", - "basemetals:nickel" + "#c:molten_nickel" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/fluid/molten_pewter.json b/src/generated/resources/data/forge/tags/fluid/molten_pewter.json index e153f8415..f85dab096 100644 --- a/src/generated/resources/data/forge/tags/fluid/molten_pewter.json +++ b/src/generated/resources/data/forge/tags/fluid/molten_pewter.json @@ -1,7 +1,6 @@ { "replace": false, "values": [ - "basemetals:flowing_pewter", - "basemetals:pewter" + "#c:molten_pewter" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/fluid/molten_platinum.json b/src/generated/resources/data/forge/tags/fluid/molten_platinum.json index 5fa6aee13..b6cddae08 100644 --- a/src/generated/resources/data/forge/tags/fluid/molten_platinum.json +++ b/src/generated/resources/data/forge/tags/fluid/molten_platinum.json @@ -1,7 +1,6 @@ { "replace": false, "values": [ - "basemetals:flowing_platinum", - "basemetals:platinum" + "#c:molten_platinum" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/fluid/molten_silver.json b/src/generated/resources/data/forge/tags/fluid/molten_silver.json index c8e05b678..025495c36 100644 --- a/src/generated/resources/data/forge/tags/fluid/molten_silver.json +++ b/src/generated/resources/data/forge/tags/fluid/molten_silver.json @@ -1,7 +1,6 @@ { "replace": false, "values": [ - "basemetals:flowing_silver", - "basemetals:silver" + "#c:molten_silver" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/fluid/molten_starsteel.json b/src/generated/resources/data/forge/tags/fluid/molten_starsteel.json index 8d55d7410..df7e93f44 100644 --- a/src/generated/resources/data/forge/tags/fluid/molten_starsteel.json +++ b/src/generated/resources/data/forge/tags/fluid/molten_starsteel.json @@ -1,7 +1,6 @@ { "replace": false, "values": [ - "basemetals:flowing_starsteel", - "basemetals:starsteel" + "#c:molten_starsteel" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/fluid/molten_steel.json b/src/generated/resources/data/forge/tags/fluid/molten_steel.json index ea628b1a1..fe8defbed 100644 --- a/src/generated/resources/data/forge/tags/fluid/molten_steel.json +++ b/src/generated/resources/data/forge/tags/fluid/molten_steel.json @@ -1,7 +1,6 @@ { "replace": false, "values": [ - "basemetals:flowing_steel", - "basemetals:steel" + "#c:molten_steel" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/fluid/molten_tin.json b/src/generated/resources/data/forge/tags/fluid/molten_tin.json index fb80921a9..c8ec23ac1 100644 --- a/src/generated/resources/data/forge/tags/fluid/molten_tin.json +++ b/src/generated/resources/data/forge/tags/fluid/molten_tin.json @@ -1,7 +1,6 @@ { "replace": false, "values": [ - "basemetals:flowing_tin", - "basemetals:tin" + "#c:molten_tin" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/fluid/molten_zinc.json b/src/generated/resources/data/forge/tags/fluid/molten_zinc.json index 78efdeae7..11018f657 100644 --- a/src/generated/resources/data/forge/tags/fluid/molten_zinc.json +++ b/src/generated/resources/data/forge/tags/fluid/molten_zinc.json @@ -1,7 +1,6 @@ { "replace": false, "values": [ - "basemetals:flowing_zinc", - "basemetals:zinc" + "#c:molten_zinc" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/armors/boots/copper.json b/src/generated/resources/data/forge/tags/item/armors/boots/copper.json index 727a028f1..277c7617d 100644 --- a/src/generated/resources/data/forge/tags/item/armors/boots/copper.json +++ b/src/generated/resources/data/forge/tags/item/armors/boots/copper.json @@ -1,7 +1,6 @@ { "replace": false, "values": [ - "basemetals:copper_boots", - "minecraft:copper_boots" + "#c:armors/boots/copper" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/armors/chestplates/copper.json b/src/generated/resources/data/forge/tags/item/armors/chestplates/copper.json index dceb963c6..9cfdca9a5 100644 --- a/src/generated/resources/data/forge/tags/item/armors/chestplates/copper.json +++ b/src/generated/resources/data/forge/tags/item/armors/chestplates/copper.json @@ -1,7 +1,6 @@ { "replace": false, "values": [ - "basemetals:copper_chestplate", - "minecraft:copper_chestplate" + "#c:armors/chestplates/copper" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/armors/helmets/copper.json b/src/generated/resources/data/forge/tags/item/armors/helmets/copper.json index ebc5e4b73..733dbbe1b 100644 --- a/src/generated/resources/data/forge/tags/item/armors/helmets/copper.json +++ b/src/generated/resources/data/forge/tags/item/armors/helmets/copper.json @@ -1,7 +1,6 @@ { "replace": false, "values": [ - "basemetals:copper_helmet", - "minecraft:copper_helmet" + "#c:armors/helmets/copper" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/armors/horse/copper.json b/src/generated/resources/data/forge/tags/item/armors/horse/copper.json index 8a80963dd..ecd0e65a9 100644 --- a/src/generated/resources/data/forge/tags/item/armors/horse/copper.json +++ b/src/generated/resources/data/forge/tags/item/armors/horse/copper.json @@ -1,7 +1,6 @@ { "replace": false, "values": [ - "basemetals:copper_horse_armor", - "minecraft:copper_horse_armor" + "#c:armors/horse/copper" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/armors/leggings/copper.json b/src/generated/resources/data/forge/tags/item/armors/leggings/copper.json index 463d0d7c4..853a4551e 100644 --- a/src/generated/resources/data/forge/tags/item/armors/leggings/copper.json +++ b/src/generated/resources/data/forge/tags/item/armors/leggings/copper.json @@ -1,7 +1,6 @@ { "replace": false, "values": [ - "basemetals:copper_leggings", - "minecraft:copper_leggings" + "#c:armors/leggings/copper" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/bars/copper.json b/src/generated/resources/data/forge/tags/item/bars/copper.json index b5a995f14..3d25aba31 100644 --- a/src/generated/resources/data/forge/tags/item/bars/copper.json +++ b/src/generated/resources/data/forge/tags/item/bars/copper.json @@ -1,7 +1,6 @@ { "replace": false, "values": [ - "basemetals:copper_bars", - "minecraft:copper_bars" + "#c:bars/copper" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/blends/aquarium.json b/src/generated/resources/data/forge/tags/item/blends/aquarium.json index 50832ddff..e2b90598a 100644 --- a/src/generated/resources/data/forge/tags/item/blends/aquarium.json +++ b/src/generated/resources/data/forge/tags/item/blends/aquarium.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:aquarium_blend" + "#c:blends/aquarium" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/blends/brass.json b/src/generated/resources/data/forge/tags/item/blends/brass.json index e95a0cec1..49ea86dfd 100644 --- a/src/generated/resources/data/forge/tags/item/blends/brass.json +++ b/src/generated/resources/data/forge/tags/item/blends/brass.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:brass_blend" + "#c:blends/brass" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/blends/bronze.json b/src/generated/resources/data/forge/tags/item/blends/bronze.json index 8e1f26f25..202117520 100644 --- a/src/generated/resources/data/forge/tags/item/blends/bronze.json +++ b/src/generated/resources/data/forge/tags/item/blends/bronze.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:bronze_blend" + "#c:blends/bronze" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/blends/cupronickel.json b/src/generated/resources/data/forge/tags/item/blends/cupronickel.json index 5272f1b77..eca9f0c8f 100644 --- a/src/generated/resources/data/forge/tags/item/blends/cupronickel.json +++ b/src/generated/resources/data/forge/tags/item/blends/cupronickel.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:cupronickel_blend" + "#c:blends/cupronickel" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/blends/diamond.json b/src/generated/resources/data/forge/tags/item/blends/diamond.json index 7a576cf38..bf3f562eb 100644 --- a/src/generated/resources/data/forge/tags/item/blends/diamond.json +++ b/src/generated/resources/data/forge/tags/item/blends/diamond.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:diamond_blend" + "#c:blends/diamond" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/blends/electrum.json b/src/generated/resources/data/forge/tags/item/blends/electrum.json index f9dcffea4..3359a49c3 100644 --- a/src/generated/resources/data/forge/tags/item/blends/electrum.json +++ b/src/generated/resources/data/forge/tags/item/blends/electrum.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:electrum_blend" + "#c:blends/electrum" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/blends/gold.json b/src/generated/resources/data/forge/tags/item/blends/gold.json index 94ecf0b7a..4047fc54a 100644 --- a/src/generated/resources/data/forge/tags/item/blends/gold.json +++ b/src/generated/resources/data/forge/tags/item/blends/gold.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:gold_blend" + "#c:blends/gold" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/blends/invar.json b/src/generated/resources/data/forge/tags/item/blends/invar.json index 7a4447868..0ff583421 100644 --- a/src/generated/resources/data/forge/tags/item/blends/invar.json +++ b/src/generated/resources/data/forge/tags/item/blends/invar.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:invar_blend" + "#c:blends/invar" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/blends/iron.json b/src/generated/resources/data/forge/tags/item/blends/iron.json index 63418172c..76055ae01 100644 --- a/src/generated/resources/data/forge/tags/item/blends/iron.json +++ b/src/generated/resources/data/forge/tags/item/blends/iron.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:iron_blend" + "#c:blends/iron" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/blends/mithril.json b/src/generated/resources/data/forge/tags/item/blends/mithril.json index ce89bb42c..b5695c2f5 100644 --- a/src/generated/resources/data/forge/tags/item/blends/mithril.json +++ b/src/generated/resources/data/forge/tags/item/blends/mithril.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:mithril_blend" + "#c:blends/mithril" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/blends/pewter.json b/src/generated/resources/data/forge/tags/item/blends/pewter.json index a9322a019..f1a7c411f 100644 --- a/src/generated/resources/data/forge/tags/item/blends/pewter.json +++ b/src/generated/resources/data/forge/tags/item/blends/pewter.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:pewter_blend" + "#c:blends/pewter" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/blends/steel.json b/src/generated/resources/data/forge/tags/item/blends/steel.json index f15603abc..505e25604 100644 --- a/src/generated/resources/data/forge/tags/item/blends/steel.json +++ b/src/generated/resources/data/forge/tags/item/blends/steel.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:steel_blend" + "#c:blends/steel" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/casings/adamantine.json b/src/generated/resources/data/forge/tags/item/casings/adamantine.json index c66dcf98b..faa87b2b9 100644 --- a/src/generated/resources/data/forge/tags/item/casings/adamantine.json +++ b/src/generated/resources/data/forge/tags/item/casings/adamantine.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:adamantine_casing" + "#c:casings/adamantine" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/casings/antimony.json b/src/generated/resources/data/forge/tags/item/casings/antimony.json index 6eec77687..db0208606 100644 --- a/src/generated/resources/data/forge/tags/item/casings/antimony.json +++ b/src/generated/resources/data/forge/tags/item/casings/antimony.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:antimony_casing" + "#c:casings/antimony" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/casings/bismuth.json b/src/generated/resources/data/forge/tags/item/casings/bismuth.json index ed9c401c9..e276c88a7 100644 --- a/src/generated/resources/data/forge/tags/item/casings/bismuth.json +++ b/src/generated/resources/data/forge/tags/item/casings/bismuth.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:bismuth_casing" + "#c:casings/bismuth" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/casings/coldiron.json b/src/generated/resources/data/forge/tags/item/casings/coldiron.json index d0632d38f..501257f9c 100644 --- a/src/generated/resources/data/forge/tags/item/casings/coldiron.json +++ b/src/generated/resources/data/forge/tags/item/casings/coldiron.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:coldiron_casing" + "#c:casings/coldiron" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/casings/nickel.json b/src/generated/resources/data/forge/tags/item/casings/nickel.json index c8054ecff..89d31f8a7 100644 --- a/src/generated/resources/data/forge/tags/item/casings/nickel.json +++ b/src/generated/resources/data/forge/tags/item/casings/nickel.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:nickel_casing" + "#c:casings/nickel" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/casings/platinum.json b/src/generated/resources/data/forge/tags/item/casings/platinum.json index 18e6a5693..da764005d 100644 --- a/src/generated/resources/data/forge/tags/item/casings/platinum.json +++ b/src/generated/resources/data/forge/tags/item/casings/platinum.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:platinum_casing" + "#c:casings/platinum" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/casings/starsteel.json b/src/generated/resources/data/forge/tags/item/casings/starsteel.json index 7eb0da9dc..24814e9f1 100644 --- a/src/generated/resources/data/forge/tags/item/casings/starsteel.json +++ b/src/generated/resources/data/forge/tags/item/casings/starsteel.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:starsteel_casing" + "#c:casings/starsteel" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/casings/zinc.json b/src/generated/resources/data/forge/tags/item/casings/zinc.json index f8f5d91ae..a78a5b392 100644 --- a/src/generated/resources/data/forge/tags/item/casings/zinc.json +++ b/src/generated/resources/data/forge/tags/item/casings/zinc.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:zinc_casing" + "#c:casings/zinc" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/clumps/adamantine.json b/src/generated/resources/data/forge/tags/item/clumps/adamantine.json index a3f36cafd..c8844cfa7 100644 --- a/src/generated/resources/data/forge/tags/item/clumps/adamantine.json +++ b/src/generated/resources/data/forge/tags/item/clumps/adamantine.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:adamantine_clump" + "#c:clumps/adamantine" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/clumps/antimony.json b/src/generated/resources/data/forge/tags/item/clumps/antimony.json index 2acae9f1a..87cd5c401 100644 --- a/src/generated/resources/data/forge/tags/item/clumps/antimony.json +++ b/src/generated/resources/data/forge/tags/item/clumps/antimony.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:antimony_clump" + "#c:clumps/antimony" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/clumps/bismuth.json b/src/generated/resources/data/forge/tags/item/clumps/bismuth.json index 8ad9832ed..74e3a7ab3 100644 --- a/src/generated/resources/data/forge/tags/item/clumps/bismuth.json +++ b/src/generated/resources/data/forge/tags/item/clumps/bismuth.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:bismuth_clump" + "#c:clumps/bismuth" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/clumps/coldiron.json b/src/generated/resources/data/forge/tags/item/clumps/coldiron.json index 558c911b3..e64bf28a3 100644 --- a/src/generated/resources/data/forge/tags/item/clumps/coldiron.json +++ b/src/generated/resources/data/forge/tags/item/clumps/coldiron.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:coldiron_clump" + "#c:clumps/coldiron" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/clumps/nickel.json b/src/generated/resources/data/forge/tags/item/clumps/nickel.json index 503848433..d647b89d3 100644 --- a/src/generated/resources/data/forge/tags/item/clumps/nickel.json +++ b/src/generated/resources/data/forge/tags/item/clumps/nickel.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:nickel_clump" + "#c:clumps/nickel" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/clumps/platinum.json b/src/generated/resources/data/forge/tags/item/clumps/platinum.json index 628d150d6..bee6f5dea 100644 --- a/src/generated/resources/data/forge/tags/item/clumps/platinum.json +++ b/src/generated/resources/data/forge/tags/item/clumps/platinum.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:platinum_clump" + "#c:clumps/platinum" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/clumps/starsteel.json b/src/generated/resources/data/forge/tags/item/clumps/starsteel.json index f3ac598ea..3305e0e38 100644 --- a/src/generated/resources/data/forge/tags/item/clumps/starsteel.json +++ b/src/generated/resources/data/forge/tags/item/clumps/starsteel.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:starsteel_clump" + "#c:clumps/starsteel" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/clumps/zinc.json b/src/generated/resources/data/forge/tags/item/clumps/zinc.json index fb68cca4d..198273c0b 100644 --- a/src/generated/resources/data/forge/tags/item/clumps/zinc.json +++ b/src/generated/resources/data/forge/tags/item/clumps/zinc.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:zinc_clump" + "#c:clumps/zinc" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/cobblestone.json b/src/generated/resources/data/forge/tags/item/cobblestone.json new file mode 100644 index 000000000..f7d76ce2a --- /dev/null +++ b/src/generated/resources/data/forge/tags/item/cobblestone.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "#c:cobblestones" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/crushed_ores/adamantine.json b/src/generated/resources/data/forge/tags/item/crushed_ores/adamantine.json index 29f455cda..ba8c57a69 100644 --- a/src/generated/resources/data/forge/tags/item/crushed_ores/adamantine.json +++ b/src/generated/resources/data/forge/tags/item/crushed_ores/adamantine.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:adamantine_crushed" + "#c:crushed_ores/adamantine" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/crushed_ores/antimony.json b/src/generated/resources/data/forge/tags/item/crushed_ores/antimony.json index 27ac1442b..20f5ee42a 100644 --- a/src/generated/resources/data/forge/tags/item/crushed_ores/antimony.json +++ b/src/generated/resources/data/forge/tags/item/crushed_ores/antimony.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:antimony_crushed" + "#c:crushed_ores/antimony" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/crushed_ores/bismuth.json b/src/generated/resources/data/forge/tags/item/crushed_ores/bismuth.json index 8f3e95882..9a7c7802b 100644 --- a/src/generated/resources/data/forge/tags/item/crushed_ores/bismuth.json +++ b/src/generated/resources/data/forge/tags/item/crushed_ores/bismuth.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:bismuth_crushed" + "#c:crushed_ores/bismuth" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/crushed_ores/coldiron.json b/src/generated/resources/data/forge/tags/item/crushed_ores/coldiron.json index 6b79dbb19..0ed26f388 100644 --- a/src/generated/resources/data/forge/tags/item/crushed_ores/coldiron.json +++ b/src/generated/resources/data/forge/tags/item/crushed_ores/coldiron.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:coldiron_crushed" + "#c:crushed_ores/coldiron" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/crushed_ores/nickel.json b/src/generated/resources/data/forge/tags/item/crushed_ores/nickel.json index a7615b9f1..f0b9e20a4 100644 --- a/src/generated/resources/data/forge/tags/item/crushed_ores/nickel.json +++ b/src/generated/resources/data/forge/tags/item/crushed_ores/nickel.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:nickel_crushed" + "#c:crushed_ores/nickel" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/crushed_ores/platinum.json b/src/generated/resources/data/forge/tags/item/crushed_ores/platinum.json index e4b423ba8..78366637d 100644 --- a/src/generated/resources/data/forge/tags/item/crushed_ores/platinum.json +++ b/src/generated/resources/data/forge/tags/item/crushed_ores/platinum.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:platinum_crushed" + "#c:crushed_ores/platinum" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/crushed_ores/starsteel.json b/src/generated/resources/data/forge/tags/item/crushed_ores/starsteel.json index f44770915..087c2af90 100644 --- a/src/generated/resources/data/forge/tags/item/crushed_ores/starsteel.json +++ b/src/generated/resources/data/forge/tags/item/crushed_ores/starsteel.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:starsteel_crushed" + "#c:crushed_ores/starsteel" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/crushed_ores/zinc.json b/src/generated/resources/data/forge/tags/item/crushed_ores/zinc.json index 1b878843b..4a3d8c31c 100644 --- a/src/generated/resources/data/forge/tags/item/crushed_ores/zinc.json +++ b/src/generated/resources/data/forge/tags/item/crushed_ores/zinc.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:zinc_crushed" + "#c:crushed_ores/zinc" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/crystals/adamantine.json b/src/generated/resources/data/forge/tags/item/crystals/adamantine.json index 3ac475075..bb30aa819 100644 --- a/src/generated/resources/data/forge/tags/item/crystals/adamantine.json +++ b/src/generated/resources/data/forge/tags/item/crystals/adamantine.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:adamantine_crystal" + "#c:crystals/adamantine" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/crystals/antimony.json b/src/generated/resources/data/forge/tags/item/crystals/antimony.json index a2744fd58..7035f7f40 100644 --- a/src/generated/resources/data/forge/tags/item/crystals/antimony.json +++ b/src/generated/resources/data/forge/tags/item/crystals/antimony.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:antimony_crystal" + "#c:crystals/antimony" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/crystals/bismuth.json b/src/generated/resources/data/forge/tags/item/crystals/bismuth.json index 00ee661e2..b573b61f9 100644 --- a/src/generated/resources/data/forge/tags/item/crystals/bismuth.json +++ b/src/generated/resources/data/forge/tags/item/crystals/bismuth.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:bismuth_crystal" + "#c:crystals/bismuth" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/crystals/coldiron.json b/src/generated/resources/data/forge/tags/item/crystals/coldiron.json index 48242f67d..0899fb351 100644 --- a/src/generated/resources/data/forge/tags/item/crystals/coldiron.json +++ b/src/generated/resources/data/forge/tags/item/crystals/coldiron.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:coldiron_crystal" + "#c:crystals/coldiron" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/crystals/nickel.json b/src/generated/resources/data/forge/tags/item/crystals/nickel.json index e8c2cd3c3..d7267242c 100644 --- a/src/generated/resources/data/forge/tags/item/crystals/nickel.json +++ b/src/generated/resources/data/forge/tags/item/crystals/nickel.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:nickel_crystal" + "#c:crystals/nickel" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/crystals/platinum.json b/src/generated/resources/data/forge/tags/item/crystals/platinum.json index 9e4d92ead..a6523e0f9 100644 --- a/src/generated/resources/data/forge/tags/item/crystals/platinum.json +++ b/src/generated/resources/data/forge/tags/item/crystals/platinum.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:platinum_crystal" + "#c:crystals/platinum" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/crystals/starsteel.json b/src/generated/resources/data/forge/tags/item/crystals/starsteel.json index d292b2ba1..ac8328c1f 100644 --- a/src/generated/resources/data/forge/tags/item/crystals/starsteel.json +++ b/src/generated/resources/data/forge/tags/item/crystals/starsteel.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:starsteel_crystal" + "#c:crystals/starsteel" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/crystals/zinc.json b/src/generated/resources/data/forge/tags/item/crystals/zinc.json index 0263465c8..9b3b565c7 100644 --- a/src/generated/resources/data/forge/tags/item/crystals/zinc.json +++ b/src/generated/resources/data/forge/tags/item/crystals/zinc.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:zinc_crystal" + "#c:crystals/zinc" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/dense_plates/adamantine.json b/src/generated/resources/data/forge/tags/item/dense_plates/adamantine.json index e42ec28b8..62d928d5f 100644 --- a/src/generated/resources/data/forge/tags/item/dense_plates/adamantine.json +++ b/src/generated/resources/data/forge/tags/item/dense_plates/adamantine.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:adamantine_dense_plate" + "#c:dense_plates/adamantine" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/dense_plates/antimony.json b/src/generated/resources/data/forge/tags/item/dense_plates/antimony.json index c603f93c5..9b4149238 100644 --- a/src/generated/resources/data/forge/tags/item/dense_plates/antimony.json +++ b/src/generated/resources/data/forge/tags/item/dense_plates/antimony.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:antimony_dense_plate" + "#c:dense_plates/antimony" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/dense_plates/bismuth.json b/src/generated/resources/data/forge/tags/item/dense_plates/bismuth.json index 24e8e6ee5..1cc011969 100644 --- a/src/generated/resources/data/forge/tags/item/dense_plates/bismuth.json +++ b/src/generated/resources/data/forge/tags/item/dense_plates/bismuth.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:bismuth_dense_plate" + "#c:dense_plates/bismuth" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/dense_plates/coldiron.json b/src/generated/resources/data/forge/tags/item/dense_plates/coldiron.json index 1e4c58328..5f3774988 100644 --- a/src/generated/resources/data/forge/tags/item/dense_plates/coldiron.json +++ b/src/generated/resources/data/forge/tags/item/dense_plates/coldiron.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:coldiron_dense_plate" + "#c:dense_plates/coldiron" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/dense_plates/nickel.json b/src/generated/resources/data/forge/tags/item/dense_plates/nickel.json index fc6021b83..caf4d0187 100644 --- a/src/generated/resources/data/forge/tags/item/dense_plates/nickel.json +++ b/src/generated/resources/data/forge/tags/item/dense_plates/nickel.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:nickel_dense_plate" + "#c:dense_plates/nickel" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/dense_plates/platinum.json b/src/generated/resources/data/forge/tags/item/dense_plates/platinum.json index 0a9d60ff3..e0e823a4f 100644 --- a/src/generated/resources/data/forge/tags/item/dense_plates/platinum.json +++ b/src/generated/resources/data/forge/tags/item/dense_plates/platinum.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:platinum_dense_plate" + "#c:dense_plates/platinum" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/dense_plates/starsteel.json b/src/generated/resources/data/forge/tags/item/dense_plates/starsteel.json index 707fe9bed..505ed6561 100644 --- a/src/generated/resources/data/forge/tags/item/dense_plates/starsteel.json +++ b/src/generated/resources/data/forge/tags/item/dense_plates/starsteel.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:starsteel_dense_plate" + "#c:dense_plates/starsteel" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/dense_plates/zinc.json b/src/generated/resources/data/forge/tags/item/dense_plates/zinc.json index 7851273a2..c5bcfc8e4 100644 --- a/src/generated/resources/data/forge/tags/item/dense_plates/zinc.json +++ b/src/generated/resources/data/forge/tags/item/dense_plates/zinc.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:zinc_dense_plate" + "#c:dense_plates/zinc" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/dirty_dusts/adamantine.json b/src/generated/resources/data/forge/tags/item/dirty_dusts/adamantine.json index a2a353e23..073b8c15e 100644 --- a/src/generated/resources/data/forge/tags/item/dirty_dusts/adamantine.json +++ b/src/generated/resources/data/forge/tags/item/dirty_dusts/adamantine.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:adamantine_powder_dirty" + "#c:dirty_dusts/adamantine" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/dirty_dusts/antimony.json b/src/generated/resources/data/forge/tags/item/dirty_dusts/antimony.json index 7f78fe44b..f9e7aabd2 100644 --- a/src/generated/resources/data/forge/tags/item/dirty_dusts/antimony.json +++ b/src/generated/resources/data/forge/tags/item/dirty_dusts/antimony.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:antimony_powder_dirty" + "#c:dirty_dusts/antimony" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/dirty_dusts/bismuth.json b/src/generated/resources/data/forge/tags/item/dirty_dusts/bismuth.json index 52b5964c1..7e0247645 100644 --- a/src/generated/resources/data/forge/tags/item/dirty_dusts/bismuth.json +++ b/src/generated/resources/data/forge/tags/item/dirty_dusts/bismuth.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:bismuth_powder_dirty" + "#c:dirty_dusts/bismuth" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/dirty_dusts/coldiron.json b/src/generated/resources/data/forge/tags/item/dirty_dusts/coldiron.json index 22bc99cd1..e75f95f29 100644 --- a/src/generated/resources/data/forge/tags/item/dirty_dusts/coldiron.json +++ b/src/generated/resources/data/forge/tags/item/dirty_dusts/coldiron.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:coldiron_powder_dirty" + "#c:dirty_dusts/coldiron" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/dirty_dusts/nickel.json b/src/generated/resources/data/forge/tags/item/dirty_dusts/nickel.json index de68b2990..87c79f2df 100644 --- a/src/generated/resources/data/forge/tags/item/dirty_dusts/nickel.json +++ b/src/generated/resources/data/forge/tags/item/dirty_dusts/nickel.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:nickel_powder_dirty" + "#c:dirty_dusts/nickel" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/dirty_dusts/platinum.json b/src/generated/resources/data/forge/tags/item/dirty_dusts/platinum.json index dce15cc7f..0df081f87 100644 --- a/src/generated/resources/data/forge/tags/item/dirty_dusts/platinum.json +++ b/src/generated/resources/data/forge/tags/item/dirty_dusts/platinum.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:platinum_powder_dirty" + "#c:dirty_dusts/platinum" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/dirty_dusts/starsteel.json b/src/generated/resources/data/forge/tags/item/dirty_dusts/starsteel.json index ab2a35e3d..ea6a740fa 100644 --- a/src/generated/resources/data/forge/tags/item/dirty_dusts/starsteel.json +++ b/src/generated/resources/data/forge/tags/item/dirty_dusts/starsteel.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:starsteel_powder_dirty" + "#c:dirty_dusts/starsteel" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/dirty_dusts/zinc.json b/src/generated/resources/data/forge/tags/item/dirty_dusts/zinc.json index 16087ba28..4a6fe69ad 100644 --- a/src/generated/resources/data/forge/tags/item/dirty_dusts/zinc.json +++ b/src/generated/resources/data/forge/tags/item/dirty_dusts/zinc.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:zinc_powder_dirty" + "#c:dirty_dusts/zinc" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/doors/copper.json b/src/generated/resources/data/forge/tags/item/doors/copper.json index 989979572..99c0b4f03 100644 --- a/src/generated/resources/data/forge/tags/item/doors/copper.json +++ b/src/generated/resources/data/forge/tags/item/doors/copper.json @@ -1,7 +1,6 @@ { "replace": false, "values": [ - "basemetals:copper_door", - "minecraft:copper_door" + "#c:doors/copper" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/dusts.json b/src/generated/resources/data/forge/tags/item/dusts.json index ab64db69a..7972d05cf 100644 --- a/src/generated/resources/data/forge/tags/item/dusts.json +++ b/src/generated/resources/data/forge/tags/item/dusts.json @@ -1,27 +1,6 @@ { "replace": false, "values": [ - "#forge:dusts/adamantine", - "#forge:dusts/antimony", - "#forge:dusts/aquarium", - "#forge:dusts/bismuth", - "#forge:dusts/brass", - "#forge:dusts/bronze", - "#forge:dusts/coldiron", - "#forge:dusts/copper", - "#forge:dusts/cupronickel", - "#forge:dusts/electrum", - "#forge:dusts/invar", - "#forge:dusts/lead", - "#forge:dusts/mercury", - "#forge:dusts/mithril", - "#forge:dusts/nickel", - "#forge:dusts/pewter", - "#forge:dusts/platinum", - "#forge:dusts/silver", - "#forge:dusts/starsteel", - "#forge:dusts/steel", - "#forge:dusts/tin", - "#forge:dusts/zinc" + "#c:dusts" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/dusts/adamant.json b/src/generated/resources/data/forge/tags/item/dusts/adamant.json index 6a9eeb2b8..d8e36092e 100644 --- a/src/generated/resources/data/forge/tags/item/dusts/adamant.json +++ b/src/generated/resources/data/forge/tags/item/dusts/adamant.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "#forge:dusts/adamantine" + "#c:dusts/adamant" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/dusts/adamantine.json b/src/generated/resources/data/forge/tags/item/dusts/adamantine.json index 7a12d73b8..2b27a40f1 100644 --- a/src/generated/resources/data/forge/tags/item/dusts/adamantine.json +++ b/src/generated/resources/data/forge/tags/item/dusts/adamantine.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:adamantine_powder" + "#c:dusts/adamantine" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/dusts/adamantite.json b/src/generated/resources/data/forge/tags/item/dusts/adamantite.json index 6a9eeb2b8..27e799694 100644 --- a/src/generated/resources/data/forge/tags/item/dusts/adamantite.json +++ b/src/generated/resources/data/forge/tags/item/dusts/adamantite.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "#forge:dusts/adamantine" + "#c:dusts/adamantite" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/dusts/adamantium.json b/src/generated/resources/data/forge/tags/item/dusts/adamantium.json index 6a9eeb2b8..989fe1af3 100644 --- a/src/generated/resources/data/forge/tags/item/dusts/adamantium.json +++ b/src/generated/resources/data/forge/tags/item/dusts/adamantium.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "#forge:dusts/adamantine" + "#c:dusts/adamantium" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/dusts/antimony.json b/src/generated/resources/data/forge/tags/item/dusts/antimony.json index c46354f69..f7633e275 100644 --- a/src/generated/resources/data/forge/tags/item/dusts/antimony.json +++ b/src/generated/resources/data/forge/tags/item/dusts/antimony.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:antimony_powder" + "#c:dusts/antimony" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/dusts/aquarium.json b/src/generated/resources/data/forge/tags/item/dusts/aquarium.json index 30be920bb..8a0719cef 100644 --- a/src/generated/resources/data/forge/tags/item/dusts/aquarium.json +++ b/src/generated/resources/data/forge/tags/item/dusts/aquarium.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:aquarium_powder" + "#c:dusts/aquarium" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/dusts/bismuth.json b/src/generated/resources/data/forge/tags/item/dusts/bismuth.json index 9aca19d44..a8a2649d7 100644 --- a/src/generated/resources/data/forge/tags/item/dusts/bismuth.json +++ b/src/generated/resources/data/forge/tags/item/dusts/bismuth.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:bismuth_powder" + "#c:dusts/bismuth" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/dusts/brass.json b/src/generated/resources/data/forge/tags/item/dusts/brass.json index 1a80d1c54..611c29f0b 100644 --- a/src/generated/resources/data/forge/tags/item/dusts/brass.json +++ b/src/generated/resources/data/forge/tags/item/dusts/brass.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:brass_powder" + "#c:dusts/brass" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/dusts/bronze.json b/src/generated/resources/data/forge/tags/item/dusts/bronze.json index 1635d83f2..690fa0578 100644 --- a/src/generated/resources/data/forge/tags/item/dusts/bronze.json +++ b/src/generated/resources/data/forge/tags/item/dusts/bronze.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:bronze_powder" + "#c:dusts/bronze" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/dusts/charcoal.json b/src/generated/resources/data/forge/tags/item/dusts/charcoal.json index 06596960c..3bcb6bc07 100644 --- a/src/generated/resources/data/forge/tags/item/dusts/charcoal.json +++ b/src/generated/resources/data/forge/tags/item/dusts/charcoal.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:charcoal_powder" + "#c:dusts/charcoal" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/dusts/coal.json b/src/generated/resources/data/forge/tags/item/dusts/coal.json index 9f5fcc2c3..bb00348ac 100644 --- a/src/generated/resources/data/forge/tags/item/dusts/coal.json +++ b/src/generated/resources/data/forge/tags/item/dusts/coal.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:coal_powder" + "#c:dusts/coal" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/dusts/coldiron.json b/src/generated/resources/data/forge/tags/item/dusts/coldiron.json index fa47ba151..0ceda11be 100644 --- a/src/generated/resources/data/forge/tags/item/dusts/coldiron.json +++ b/src/generated/resources/data/forge/tags/item/dusts/coldiron.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:coldiron_powder" + "#c:dusts/coldiron" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/dusts/copper.json b/src/generated/resources/data/forge/tags/item/dusts/copper.json index eead9e694..db7571d97 100644 --- a/src/generated/resources/data/forge/tags/item/dusts/copper.json +++ b/src/generated/resources/data/forge/tags/item/dusts/copper.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:copper_powder" + "#c:dusts/copper" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/dusts/cupronickel.json b/src/generated/resources/data/forge/tags/item/dusts/cupronickel.json index f64e91baa..08e8f21f2 100644 --- a/src/generated/resources/data/forge/tags/item/dusts/cupronickel.json +++ b/src/generated/resources/data/forge/tags/item/dusts/cupronickel.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:cupronickel_powder" + "#c:dusts/cupronickel" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/dusts/diamond.json b/src/generated/resources/data/forge/tags/item/dusts/diamond.json index bbd19860c..71af90a53 100644 --- a/src/generated/resources/data/forge/tags/item/dusts/diamond.json +++ b/src/generated/resources/data/forge/tags/item/dusts/diamond.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:diamond_powder" + "#c:dusts/diamond" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/dusts/electrum.json b/src/generated/resources/data/forge/tags/item/dusts/electrum.json index 1bf25edf9..a745aa2ff 100644 --- a/src/generated/resources/data/forge/tags/item/dusts/electrum.json +++ b/src/generated/resources/data/forge/tags/item/dusts/electrum.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:electrum_powder" + "#c:dusts/electrum" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/dusts/emerald.json b/src/generated/resources/data/forge/tags/item/dusts/emerald.json index 66f4d628c..88978cef6 100644 --- a/src/generated/resources/data/forge/tags/item/dusts/emerald.json +++ b/src/generated/resources/data/forge/tags/item/dusts/emerald.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:emerald_powder" + "#c:dusts/emerald" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/dusts/gold.json b/src/generated/resources/data/forge/tags/item/dusts/gold.json index 6d2655704..b6d7c633e 100644 --- a/src/generated/resources/data/forge/tags/item/dusts/gold.json +++ b/src/generated/resources/data/forge/tags/item/dusts/gold.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:gold_powder" + "#c:dusts/gold" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/dusts/invar.json b/src/generated/resources/data/forge/tags/item/dusts/invar.json index 98561d267..d8f41909b 100644 --- a/src/generated/resources/data/forge/tags/item/dusts/invar.json +++ b/src/generated/resources/data/forge/tags/item/dusts/invar.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:invar_powder" + "#c:dusts/invar" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/dusts/iron.json b/src/generated/resources/data/forge/tags/item/dusts/iron.json index 8888bc2ed..602cefc21 100644 --- a/src/generated/resources/data/forge/tags/item/dusts/iron.json +++ b/src/generated/resources/data/forge/tags/item/dusts/iron.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:iron_powder" + "#c:dusts/iron" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/dusts/lapis.json b/src/generated/resources/data/forge/tags/item/dusts/lapis.json index e46a64722..02644b3d1 100644 --- a/src/generated/resources/data/forge/tags/item/dusts/lapis.json +++ b/src/generated/resources/data/forge/tags/item/dusts/lapis.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "minecraft:lapis_lazuli" + "#c:dusts/lapis" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/dusts/lead.json b/src/generated/resources/data/forge/tags/item/dusts/lead.json index baffe4fe5..12b72e245 100644 --- a/src/generated/resources/data/forge/tags/item/dusts/lead.json +++ b/src/generated/resources/data/forge/tags/item/dusts/lead.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:lead_powder" + "#c:dusts/lead" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/dusts/mercury.json b/src/generated/resources/data/forge/tags/item/dusts/mercury.json index 965c050af..c058753a5 100644 --- a/src/generated/resources/data/forge/tags/item/dusts/mercury.json +++ b/src/generated/resources/data/forge/tags/item/dusts/mercury.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:mercury_powder" + "#c:dusts/mercury" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/dusts/mithril.json b/src/generated/resources/data/forge/tags/item/dusts/mithril.json index 5d453985d..426b3897c 100644 --- a/src/generated/resources/data/forge/tags/item/dusts/mithril.json +++ b/src/generated/resources/data/forge/tags/item/dusts/mithril.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:mithril_powder" + "#c:dusts/mithril" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/dusts/nickel.json b/src/generated/resources/data/forge/tags/item/dusts/nickel.json index 4f2eb7719..190ac3666 100644 --- a/src/generated/resources/data/forge/tags/item/dusts/nickel.json +++ b/src/generated/resources/data/forge/tags/item/dusts/nickel.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:nickel_powder" + "#c:dusts/nickel" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/dusts/obsidian.json b/src/generated/resources/data/forge/tags/item/dusts/obsidian.json index f2d7369e7..ce6067a5d 100644 --- a/src/generated/resources/data/forge/tags/item/dusts/obsidian.json +++ b/src/generated/resources/data/forge/tags/item/dusts/obsidian.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:obsidian_powder" + "#c:dusts/obsidian" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/dusts/pewter.json b/src/generated/resources/data/forge/tags/item/dusts/pewter.json index 211ba81ef..dde89d61e 100644 --- a/src/generated/resources/data/forge/tags/item/dusts/pewter.json +++ b/src/generated/resources/data/forge/tags/item/dusts/pewter.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:pewter_powder" + "#c:dusts/pewter" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/dusts/platinum.json b/src/generated/resources/data/forge/tags/item/dusts/platinum.json index 112f08c5c..b858c6ad3 100644 --- a/src/generated/resources/data/forge/tags/item/dusts/platinum.json +++ b/src/generated/resources/data/forge/tags/item/dusts/platinum.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:platinum_powder" + "#c:dusts/platinum" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/dusts/prismarine.json b/src/generated/resources/data/forge/tags/item/dusts/prismarine.json index 09f011cae..62c5ecb1e 100644 --- a/src/generated/resources/data/forge/tags/item/dusts/prismarine.json +++ b/src/generated/resources/data/forge/tags/item/dusts/prismarine.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "minecraft:prismarine_shard" + "#c:dusts/prismarine" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/dusts/quartz.json b/src/generated/resources/data/forge/tags/item/dusts/quartz.json index 7696a1574..aa9bc53ab 100644 --- a/src/generated/resources/data/forge/tags/item/dusts/quartz.json +++ b/src/generated/resources/data/forge/tags/item/dusts/quartz.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:quartz_powder" + "#c:dusts/quartz" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/dusts/redstone.json b/src/generated/resources/data/forge/tags/item/dusts/redstone.json index 2703f553a..c1dd279f3 100644 --- a/src/generated/resources/data/forge/tags/item/dusts/redstone.json +++ b/src/generated/resources/data/forge/tags/item/dusts/redstone.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "minecraft:redstone" + "#c:dusts/redstone" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/dusts/silver.json b/src/generated/resources/data/forge/tags/item/dusts/silver.json index 20891bb1f..3ea5d0a03 100644 --- a/src/generated/resources/data/forge/tags/item/dusts/silver.json +++ b/src/generated/resources/data/forge/tags/item/dusts/silver.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:silver_powder" + "#c:dusts/silver" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/dusts/starsteel.json b/src/generated/resources/data/forge/tags/item/dusts/starsteel.json index 432482dc2..9ed89eb7d 100644 --- a/src/generated/resources/data/forge/tags/item/dusts/starsteel.json +++ b/src/generated/resources/data/forge/tags/item/dusts/starsteel.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:starsteel_powder" + "#c:dusts/starsteel" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/dusts/steel.json b/src/generated/resources/data/forge/tags/item/dusts/steel.json index 53083daee..ef7a5e1dd 100644 --- a/src/generated/resources/data/forge/tags/item/dusts/steel.json +++ b/src/generated/resources/data/forge/tags/item/dusts/steel.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:steel_powder" + "#c:dusts/steel" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/dusts/tin.json b/src/generated/resources/data/forge/tags/item/dusts/tin.json index 8379ef0b1..f06298af0 100644 --- a/src/generated/resources/data/forge/tags/item/dusts/tin.json +++ b/src/generated/resources/data/forge/tags/item/dusts/tin.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:tin_powder" + "#c:dusts/tin" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/dusts/zinc.json b/src/generated/resources/data/forge/tags/item/dusts/zinc.json index 4114acc8a..809bbe196 100644 --- a/src/generated/resources/data/forge/tags/item/dusts/zinc.json +++ b/src/generated/resources/data/forge/tags/item/dusts/zinc.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:zinc_powder" + "#c:dusts/zinc" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/gears.json b/src/generated/resources/data/forge/tags/item/gears.json index 5e1505e00..d1ab98bab 100644 --- a/src/generated/resources/data/forge/tags/item/gears.json +++ b/src/generated/resources/data/forge/tags/item/gears.json @@ -1,34 +1,6 @@ { "replace": false, "values": [ - "#forge:gears/adamantine", - "#forge:gears/antimony", - "#forge:gears/aquarium", - "#forge:gears/bismuth", - "#forge:gears/brass", - "#forge:gears/bronze", - "#forge:gears/coldiron", - "#forge:gears/copper", - "#forge:gears/cupronickel", - "#forge:gears/diamond", - "#forge:gears/electrum", - "#forge:gears/emerald", - "#forge:gears/gold", - "#forge:gears/invar", - "#forge:gears/iron", - "#forge:gears/lead", - "#forge:gears/mithril", - "#forge:gears/nickel", - "#forge:gears/obsidian", - "#forge:gears/pewter", - "#forge:gears/platinum", - "#forge:gears/quartz", - "#forge:gears/silver", - "#forge:gears/starsteel", - "#forge:gears/steel", - "#forge:gears/stone", - "#forge:gears/tin", - "#forge:gears/wood", - "#forge:gears/zinc" + "#c:gears" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/gears/adamantine.json b/src/generated/resources/data/forge/tags/item/gears/adamantine.json index 446eebe23..217c99add 100644 --- a/src/generated/resources/data/forge/tags/item/gears/adamantine.json +++ b/src/generated/resources/data/forge/tags/item/gears/adamantine.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:adamantine_gear" + "#c:gears/adamantine" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/gears/antimony.json b/src/generated/resources/data/forge/tags/item/gears/antimony.json index 9db6f6b61..aed3c990e 100644 --- a/src/generated/resources/data/forge/tags/item/gears/antimony.json +++ b/src/generated/resources/data/forge/tags/item/gears/antimony.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:antimony_gear" + "#c:gears/antimony" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/gears/aquarium.json b/src/generated/resources/data/forge/tags/item/gears/aquarium.json index 6d0d300e5..ecaa77f0b 100644 --- a/src/generated/resources/data/forge/tags/item/gears/aquarium.json +++ b/src/generated/resources/data/forge/tags/item/gears/aquarium.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:aquarium_gear" + "#c:gears/aquarium" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/gears/bismuth.json b/src/generated/resources/data/forge/tags/item/gears/bismuth.json index 164235b2a..b76d16b76 100644 --- a/src/generated/resources/data/forge/tags/item/gears/bismuth.json +++ b/src/generated/resources/data/forge/tags/item/gears/bismuth.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:bismuth_gear" + "#c:gears/bismuth" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/gears/brass.json b/src/generated/resources/data/forge/tags/item/gears/brass.json index ed952e546..ad033856b 100644 --- a/src/generated/resources/data/forge/tags/item/gears/brass.json +++ b/src/generated/resources/data/forge/tags/item/gears/brass.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:brass_gear" + "#c:gears/brass" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/gears/bronze.json b/src/generated/resources/data/forge/tags/item/gears/bronze.json index e58ecb664..ca9a85e7e 100644 --- a/src/generated/resources/data/forge/tags/item/gears/bronze.json +++ b/src/generated/resources/data/forge/tags/item/gears/bronze.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:bronze_gear" + "#c:gears/bronze" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/gears/coldiron.json b/src/generated/resources/data/forge/tags/item/gears/coldiron.json index 6c2d8ca01..673a33587 100644 --- a/src/generated/resources/data/forge/tags/item/gears/coldiron.json +++ b/src/generated/resources/data/forge/tags/item/gears/coldiron.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:coldiron_gear" + "#c:gears/coldiron" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/gears/copper.json b/src/generated/resources/data/forge/tags/item/gears/copper.json index f9c334048..24ead053d 100644 --- a/src/generated/resources/data/forge/tags/item/gears/copper.json +++ b/src/generated/resources/data/forge/tags/item/gears/copper.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:copper_gear" + "#c:gears/copper" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/gears/cupronickel.json b/src/generated/resources/data/forge/tags/item/gears/cupronickel.json index ba73e4fc9..16f9d90b1 100644 --- a/src/generated/resources/data/forge/tags/item/gears/cupronickel.json +++ b/src/generated/resources/data/forge/tags/item/gears/cupronickel.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:cupronickel_gear" + "#c:gears/cupronickel" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/gears/diamond.json b/src/generated/resources/data/forge/tags/item/gears/diamond.json index a66e87251..d151082b6 100644 --- a/src/generated/resources/data/forge/tags/item/gears/diamond.json +++ b/src/generated/resources/data/forge/tags/item/gears/diamond.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:diamond_gear" + "#c:gears/diamond" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/gears/electrum.json b/src/generated/resources/data/forge/tags/item/gears/electrum.json index 0d00c41ff..9a2fadf84 100644 --- a/src/generated/resources/data/forge/tags/item/gears/electrum.json +++ b/src/generated/resources/data/forge/tags/item/gears/electrum.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:electrum_gear" + "#c:gears/electrum" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/gears/emerald.json b/src/generated/resources/data/forge/tags/item/gears/emerald.json index 0ca981f44..2227ebb80 100644 --- a/src/generated/resources/data/forge/tags/item/gears/emerald.json +++ b/src/generated/resources/data/forge/tags/item/gears/emerald.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:emerald_gear" + "#c:gears/emerald" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/gears/gold.json b/src/generated/resources/data/forge/tags/item/gears/gold.json index b32bd9994..ca3d87992 100644 --- a/src/generated/resources/data/forge/tags/item/gears/gold.json +++ b/src/generated/resources/data/forge/tags/item/gears/gold.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:gold_gear" + "#c:gears/gold" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/gears/invar.json b/src/generated/resources/data/forge/tags/item/gears/invar.json index 54397f15a..c56a8b9b3 100644 --- a/src/generated/resources/data/forge/tags/item/gears/invar.json +++ b/src/generated/resources/data/forge/tags/item/gears/invar.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:invar_gear" + "#c:gears/invar" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/gears/iron.json b/src/generated/resources/data/forge/tags/item/gears/iron.json index ad315a928..fba099b27 100644 --- a/src/generated/resources/data/forge/tags/item/gears/iron.json +++ b/src/generated/resources/data/forge/tags/item/gears/iron.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:iron_gear" + "#c:gears/iron" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/gears/lead.json b/src/generated/resources/data/forge/tags/item/gears/lead.json index d87d66822..8692f43fa 100644 --- a/src/generated/resources/data/forge/tags/item/gears/lead.json +++ b/src/generated/resources/data/forge/tags/item/gears/lead.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:lead_gear" + "#c:gears/lead" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/gears/mithril.json b/src/generated/resources/data/forge/tags/item/gears/mithril.json index 5cbfe4f63..f5341c41e 100644 --- a/src/generated/resources/data/forge/tags/item/gears/mithril.json +++ b/src/generated/resources/data/forge/tags/item/gears/mithril.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:mithril_gear" + "#c:gears/mithril" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/gears/nickel.json b/src/generated/resources/data/forge/tags/item/gears/nickel.json index ae81bb2a0..f84391ae6 100644 --- a/src/generated/resources/data/forge/tags/item/gears/nickel.json +++ b/src/generated/resources/data/forge/tags/item/gears/nickel.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:nickel_gear" + "#c:gears/nickel" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/gears/obsidian.json b/src/generated/resources/data/forge/tags/item/gears/obsidian.json index 2f088ed18..de8bed69b 100644 --- a/src/generated/resources/data/forge/tags/item/gears/obsidian.json +++ b/src/generated/resources/data/forge/tags/item/gears/obsidian.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:obsidian_gear" + "#c:gears/obsidian" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/gears/pewter.json b/src/generated/resources/data/forge/tags/item/gears/pewter.json index 3ef65b487..42706918e 100644 --- a/src/generated/resources/data/forge/tags/item/gears/pewter.json +++ b/src/generated/resources/data/forge/tags/item/gears/pewter.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:pewter_gear" + "#c:gears/pewter" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/gears/platinum.json b/src/generated/resources/data/forge/tags/item/gears/platinum.json index 876b869b0..249269e01 100644 --- a/src/generated/resources/data/forge/tags/item/gears/platinum.json +++ b/src/generated/resources/data/forge/tags/item/gears/platinum.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:platinum_gear" + "#c:gears/platinum" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/gears/quartz.json b/src/generated/resources/data/forge/tags/item/gears/quartz.json index c7b0ddc89..582e3a228 100644 --- a/src/generated/resources/data/forge/tags/item/gears/quartz.json +++ b/src/generated/resources/data/forge/tags/item/gears/quartz.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:quartz_gear" + "#c:gears/quartz" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/gears/silver.json b/src/generated/resources/data/forge/tags/item/gears/silver.json index 3f90df160..12e89ba24 100644 --- a/src/generated/resources/data/forge/tags/item/gears/silver.json +++ b/src/generated/resources/data/forge/tags/item/gears/silver.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:silver_gear" + "#c:gears/silver" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/gears/starsteel.json b/src/generated/resources/data/forge/tags/item/gears/starsteel.json index 6d5d7c229..9a78765d6 100644 --- a/src/generated/resources/data/forge/tags/item/gears/starsteel.json +++ b/src/generated/resources/data/forge/tags/item/gears/starsteel.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:starsteel_gear" + "#c:gears/starsteel" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/gears/steel.json b/src/generated/resources/data/forge/tags/item/gears/steel.json index 4724d5b5c..111f0cbc6 100644 --- a/src/generated/resources/data/forge/tags/item/gears/steel.json +++ b/src/generated/resources/data/forge/tags/item/gears/steel.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:steel_gear" + "#c:gears/steel" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/gears/stone.json b/src/generated/resources/data/forge/tags/item/gears/stone.json index fc619906b..29cf5ba2d 100644 --- a/src/generated/resources/data/forge/tags/item/gears/stone.json +++ b/src/generated/resources/data/forge/tags/item/gears/stone.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:stone_gear" + "#c:gears/stone" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/gears/tin.json b/src/generated/resources/data/forge/tags/item/gears/tin.json index 399aa36ab..18bc016e6 100644 --- a/src/generated/resources/data/forge/tags/item/gears/tin.json +++ b/src/generated/resources/data/forge/tags/item/gears/tin.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:tin_gear" + "#c:gears/tin" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/gears/wood.json b/src/generated/resources/data/forge/tags/item/gears/wood.json index 09dd2a104..7e26ee4f8 100644 --- a/src/generated/resources/data/forge/tags/item/gears/wood.json +++ b/src/generated/resources/data/forge/tags/item/gears/wood.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:wood_gear" + "#c:gears/wood" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/gears/zinc.json b/src/generated/resources/data/forge/tags/item/gears/zinc.json index 1c4381351..ecb34140e 100644 --- a/src/generated/resources/data/forge/tags/item/gears/zinc.json +++ b/src/generated/resources/data/forge/tags/item/gears/zinc.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:zinc_gear" + "#c:gears/zinc" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/gems/diamond.json b/src/generated/resources/data/forge/tags/item/gems/diamond.json new file mode 100644 index 000000000..f467a10d1 --- /dev/null +++ b/src/generated/resources/data/forge/tags/item/gems/diamond.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "#c:gems/diamond" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/gems/emerald.json b/src/generated/resources/data/forge/tags/item/gems/emerald.json new file mode 100644 index 000000000..a1ac19e9f --- /dev/null +++ b/src/generated/resources/data/forge/tags/item/gems/emerald.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "#c:gems/emerald" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/gems/quartz.json b/src/generated/resources/data/forge/tags/item/gems/quartz.json new file mode 100644 index 000000000..325da8d61 --- /dev/null +++ b/src/generated/resources/data/forge/tags/item/gems/quartz.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "#c:gems/quartz" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/gravel.json b/src/generated/resources/data/forge/tags/item/gravel.json new file mode 100644 index 000000000..6c45551dc --- /dev/null +++ b/src/generated/resources/data/forge/tags/item/gravel.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "#c:gravels" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/ingots.json b/src/generated/resources/data/forge/tags/item/ingots.json index 00d465c3d..56144d04f 100644 --- a/src/generated/resources/data/forge/tags/item/ingots.json +++ b/src/generated/resources/data/forge/tags/item/ingots.json @@ -1,27 +1,6 @@ { "replace": false, "values": [ - "#forge:ingots/adamantine", - "#forge:ingots/antimony", - "#forge:ingots/aquarium", - "#forge:ingots/bismuth", - "#forge:ingots/brass", - "#forge:ingots/bronze", - "#forge:ingots/coldiron", - "#forge:ingots/copper", - "#forge:ingots/cupronickel", - "#forge:ingots/electrum", - "#forge:ingots/invar", - "#forge:ingots/lead", - "#forge:ingots/mercury", - "#forge:ingots/mithril", - "#forge:ingots/nickel", - "#forge:ingots/pewter", - "#forge:ingots/platinum", - "#forge:ingots/silver", - "#forge:ingots/starsteel", - "#forge:ingots/steel", - "#forge:ingots/tin", - "#forge:ingots/zinc" + "#c:ingots" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/ingots/adamant.json b/src/generated/resources/data/forge/tags/item/ingots/adamant.json index 6c3d3b7ac..175b9d406 100644 --- a/src/generated/resources/data/forge/tags/item/ingots/adamant.json +++ b/src/generated/resources/data/forge/tags/item/ingots/adamant.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "#forge:ingots/adamantine" + "#c:ingots/adamant" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/ingots/adamantine.json b/src/generated/resources/data/forge/tags/item/ingots/adamantine.json index 87c5eab06..09b1c8103 100644 --- a/src/generated/resources/data/forge/tags/item/ingots/adamantine.json +++ b/src/generated/resources/data/forge/tags/item/ingots/adamantine.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:adamantine_ingot" + "#c:ingots/adamantine" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/ingots/adamantite.json b/src/generated/resources/data/forge/tags/item/ingots/adamantite.json index 6c3d3b7ac..9caffd0db 100644 --- a/src/generated/resources/data/forge/tags/item/ingots/adamantite.json +++ b/src/generated/resources/data/forge/tags/item/ingots/adamantite.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "#forge:ingots/adamantine" + "#c:ingots/adamantite" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/ingots/adamantium.json b/src/generated/resources/data/forge/tags/item/ingots/adamantium.json index 6c3d3b7ac..c1c1d4b37 100644 --- a/src/generated/resources/data/forge/tags/item/ingots/adamantium.json +++ b/src/generated/resources/data/forge/tags/item/ingots/adamantium.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "#forge:ingots/adamantine" + "#c:ingots/adamantium" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/ingots/antimony.json b/src/generated/resources/data/forge/tags/item/ingots/antimony.json index 7488c5d55..fa764e239 100644 --- a/src/generated/resources/data/forge/tags/item/ingots/antimony.json +++ b/src/generated/resources/data/forge/tags/item/ingots/antimony.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:antimony_ingot" + "#c:ingots/antimony" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/ingots/aquarium.json b/src/generated/resources/data/forge/tags/item/ingots/aquarium.json index 7dfc7e416..4a266a726 100644 --- a/src/generated/resources/data/forge/tags/item/ingots/aquarium.json +++ b/src/generated/resources/data/forge/tags/item/ingots/aquarium.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:aquarium_ingot" + "#c:ingots/aquarium" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/ingots/bismuth.json b/src/generated/resources/data/forge/tags/item/ingots/bismuth.json index a613fcf3d..5ed132c57 100644 --- a/src/generated/resources/data/forge/tags/item/ingots/bismuth.json +++ b/src/generated/resources/data/forge/tags/item/ingots/bismuth.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:bismuth_ingot" + "#c:ingots/bismuth" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/ingots/brass.json b/src/generated/resources/data/forge/tags/item/ingots/brass.json index a3476e3b0..d1624bdc4 100644 --- a/src/generated/resources/data/forge/tags/item/ingots/brass.json +++ b/src/generated/resources/data/forge/tags/item/ingots/brass.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:brass_ingot" + "#c:ingots/brass" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/ingots/bronze.json b/src/generated/resources/data/forge/tags/item/ingots/bronze.json index b429f6e59..87e0d3b6e 100644 --- a/src/generated/resources/data/forge/tags/item/ingots/bronze.json +++ b/src/generated/resources/data/forge/tags/item/ingots/bronze.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:bronze_ingot" + "#c:ingots/bronze" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/ingots/coldiron.json b/src/generated/resources/data/forge/tags/item/ingots/coldiron.json index c35ec2558..72ff18155 100644 --- a/src/generated/resources/data/forge/tags/item/ingots/coldiron.json +++ b/src/generated/resources/data/forge/tags/item/ingots/coldiron.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:coldiron_ingot" + "#c:ingots/coldiron" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/ingots/copper.json b/src/generated/resources/data/forge/tags/item/ingots/copper.json index 496ae1b47..6682938cc 100644 --- a/src/generated/resources/data/forge/tags/item/ingots/copper.json +++ b/src/generated/resources/data/forge/tags/item/ingots/copper.json @@ -1,7 +1,6 @@ { "replace": false, "values": [ - "basemetals:copper_ingot", - "minecraft:copper_ingot" + "#c:ingots/copper" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/ingots/cupronickel.json b/src/generated/resources/data/forge/tags/item/ingots/cupronickel.json index 067f75e15..b5a5eb817 100644 --- a/src/generated/resources/data/forge/tags/item/ingots/cupronickel.json +++ b/src/generated/resources/data/forge/tags/item/ingots/cupronickel.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:cupronickel_ingot" + "#c:ingots/cupronickel" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/ingots/electrum.json b/src/generated/resources/data/forge/tags/item/ingots/electrum.json index 9f8e34815..21483d382 100644 --- a/src/generated/resources/data/forge/tags/item/ingots/electrum.json +++ b/src/generated/resources/data/forge/tags/item/ingots/electrum.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:electrum_ingot" + "#c:ingots/electrum" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/ingots/gold.json b/src/generated/resources/data/forge/tags/item/ingots/gold.json new file mode 100644 index 000000000..5aaee1c71 --- /dev/null +++ b/src/generated/resources/data/forge/tags/item/ingots/gold.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "#c:ingots/gold" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/ingots/invar.json b/src/generated/resources/data/forge/tags/item/ingots/invar.json index f05ebdb0e..31e903aca 100644 --- a/src/generated/resources/data/forge/tags/item/ingots/invar.json +++ b/src/generated/resources/data/forge/tags/item/ingots/invar.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:invar_ingot" + "#c:ingots/invar" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/ingots/iron.json b/src/generated/resources/data/forge/tags/item/ingots/iron.json new file mode 100644 index 000000000..0afb4a375 --- /dev/null +++ b/src/generated/resources/data/forge/tags/item/ingots/iron.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "#c:ingots/iron" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/ingots/lead.json b/src/generated/resources/data/forge/tags/item/ingots/lead.json index 2cb7b8e1f..74f70b955 100644 --- a/src/generated/resources/data/forge/tags/item/ingots/lead.json +++ b/src/generated/resources/data/forge/tags/item/ingots/lead.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:lead_ingot" + "#c:ingots/lead" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/ingots/mercury.json b/src/generated/resources/data/forge/tags/item/ingots/mercury.json index f6b42bbe7..a2667518f 100644 --- a/src/generated/resources/data/forge/tags/item/ingots/mercury.json +++ b/src/generated/resources/data/forge/tags/item/ingots/mercury.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:mercury_ingot" + "#c:ingots/mercury" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/ingots/mithril.json b/src/generated/resources/data/forge/tags/item/ingots/mithril.json index 4c04c2352..1f4d9650d 100644 --- a/src/generated/resources/data/forge/tags/item/ingots/mithril.json +++ b/src/generated/resources/data/forge/tags/item/ingots/mithril.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:mithril_ingot" + "#c:ingots/mithril" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/ingots/nickel.json b/src/generated/resources/data/forge/tags/item/ingots/nickel.json index 73bfd7e6c..68f942a1a 100644 --- a/src/generated/resources/data/forge/tags/item/ingots/nickel.json +++ b/src/generated/resources/data/forge/tags/item/ingots/nickel.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:nickel_ingot" + "#c:ingots/nickel" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/ingots/obsidian.json b/src/generated/resources/data/forge/tags/item/ingots/obsidian.json index c09196458..6429b869f 100644 --- a/src/generated/resources/data/forge/tags/item/ingots/obsidian.json +++ b/src/generated/resources/data/forge/tags/item/ingots/obsidian.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:obsidian_ingot" + "#c:ingots/obsidian" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/ingots/pewter.json b/src/generated/resources/data/forge/tags/item/ingots/pewter.json index f1463d86e..b9b33be3c 100644 --- a/src/generated/resources/data/forge/tags/item/ingots/pewter.json +++ b/src/generated/resources/data/forge/tags/item/ingots/pewter.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:pewter_ingot" + "#c:ingots/pewter" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/ingots/platinum.json b/src/generated/resources/data/forge/tags/item/ingots/platinum.json index 0c4142bea..c2f9bfe4b 100644 --- a/src/generated/resources/data/forge/tags/item/ingots/platinum.json +++ b/src/generated/resources/data/forge/tags/item/ingots/platinum.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:platinum_ingot" + "#c:ingots/platinum" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/ingots/quicksilver.json b/src/generated/resources/data/forge/tags/item/ingots/quicksilver.json index 312a542f1..b53f164d9 100644 --- a/src/generated/resources/data/forge/tags/item/ingots/quicksilver.json +++ b/src/generated/resources/data/forge/tags/item/ingots/quicksilver.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "#forge:ingots/mercury" + "#c:ingots/quicksilver" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/ingots/redstone.json b/src/generated/resources/data/forge/tags/item/ingots/redstone.json index 835cab6fb..6775b99c8 100644 --- a/src/generated/resources/data/forge/tags/item/ingots/redstone.json +++ b/src/generated/resources/data/forge/tags/item/ingots/redstone.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:redstone_ingot" + "#c:ingots/redstone" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/ingots/silver.json b/src/generated/resources/data/forge/tags/item/ingots/silver.json index fab1b9901..ea70f856e 100644 --- a/src/generated/resources/data/forge/tags/item/ingots/silver.json +++ b/src/generated/resources/data/forge/tags/item/ingots/silver.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:silver_ingot" + "#c:ingots/silver" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/ingots/starsteel.json b/src/generated/resources/data/forge/tags/item/ingots/starsteel.json index eecbc953a..f31e118c3 100644 --- a/src/generated/resources/data/forge/tags/item/ingots/starsteel.json +++ b/src/generated/resources/data/forge/tags/item/ingots/starsteel.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:starsteel_ingot" + "#c:ingots/starsteel" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/ingots/steel.json b/src/generated/resources/data/forge/tags/item/ingots/steel.json index ed1d8374e..4479af4ea 100644 --- a/src/generated/resources/data/forge/tags/item/ingots/steel.json +++ b/src/generated/resources/data/forge/tags/item/ingots/steel.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:steel_ingot" + "#c:ingots/steel" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/ingots/tin.json b/src/generated/resources/data/forge/tags/item/ingots/tin.json index ba21c22b6..c660c0c80 100644 --- a/src/generated/resources/data/forge/tags/item/ingots/tin.json +++ b/src/generated/resources/data/forge/tags/item/ingots/tin.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:tin_ingot" + "#c:ingots/tin" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/ingots/zinc.json b/src/generated/resources/data/forge/tags/item/ingots/zinc.json index 66938ac39..a8bfdc654 100644 --- a/src/generated/resources/data/forge/tags/item/ingots/zinc.json +++ b/src/generated/resources/data/forge/tags/item/ingots/zinc.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:zinc_ingot" + "#c:ingots/zinc" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/materials/diamond.json b/src/generated/resources/data/forge/tags/item/materials/diamond.json index a0b7317d8..64c7da7e4 100644 --- a/src/generated/resources/data/forge/tags/item/materials/diamond.json +++ b/src/generated/resources/data/forge/tags/item/materials/diamond.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "minecraft:diamond" + "#c:materials/diamond" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/materials/emerald.json b/src/generated/resources/data/forge/tags/item/materials/emerald.json index 838caf0bd..0df46f796 100644 --- a/src/generated/resources/data/forge/tags/item/materials/emerald.json +++ b/src/generated/resources/data/forge/tags/item/materials/emerald.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "minecraft:emerald" + "#c:materials/emerald" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/materials/gold.json b/src/generated/resources/data/forge/tags/item/materials/gold.json index d88f9571a..0ea7a163a 100644 --- a/src/generated/resources/data/forge/tags/item/materials/gold.json +++ b/src/generated/resources/data/forge/tags/item/materials/gold.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "minecraft:gold_ingot" + "#c:materials/gold" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/materials/iron.json b/src/generated/resources/data/forge/tags/item/materials/iron.json index 549adc471..dd6e6471e 100644 --- a/src/generated/resources/data/forge/tags/item/materials/iron.json +++ b/src/generated/resources/data/forge/tags/item/materials/iron.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "minecraft:iron_ingot" + "#c:materials/iron" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/materials/obsidian.json b/src/generated/resources/data/forge/tags/item/materials/obsidian.json index c09196458..e16e24a17 100644 --- a/src/generated/resources/data/forge/tags/item/materials/obsidian.json +++ b/src/generated/resources/data/forge/tags/item/materials/obsidian.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:obsidian_ingot" + "#c:materials/obsidian" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/materials/quartz.json b/src/generated/resources/data/forge/tags/item/materials/quartz.json index 49ac1fd15..6244f3a88 100644 --- a/src/generated/resources/data/forge/tags/item/materials/quartz.json +++ b/src/generated/resources/data/forge/tags/item/materials/quartz.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "minecraft:quartz" + "#c:materials/quartz" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/nuggets.json b/src/generated/resources/data/forge/tags/item/nuggets.json index 83c2c25b9..4f41acebb 100644 --- a/src/generated/resources/data/forge/tags/item/nuggets.json +++ b/src/generated/resources/data/forge/tags/item/nuggets.json @@ -1,27 +1,6 @@ { "replace": false, "values": [ - "#forge:nuggets/adamantine", - "#forge:nuggets/antimony", - "#forge:nuggets/aquarium", - "#forge:nuggets/bismuth", - "#forge:nuggets/brass", - "#forge:nuggets/bronze", - "#forge:nuggets/coldiron", - "#forge:nuggets/copper", - "#forge:nuggets/cupronickel", - "#forge:nuggets/electrum", - "#forge:nuggets/invar", - "#forge:nuggets/lead", - "#forge:nuggets/mercury", - "#forge:nuggets/mithril", - "#forge:nuggets/nickel", - "#forge:nuggets/pewter", - "#forge:nuggets/platinum", - "#forge:nuggets/silver", - "#forge:nuggets/starsteel", - "#forge:nuggets/steel", - "#forge:nuggets/tin", - "#forge:nuggets/zinc" + "#c:nuggets" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/nuggets/adamant.json b/src/generated/resources/data/forge/tags/item/nuggets/adamant.json index ebd5de600..d8b35a50e 100644 --- a/src/generated/resources/data/forge/tags/item/nuggets/adamant.json +++ b/src/generated/resources/data/forge/tags/item/nuggets/adamant.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "#forge:nuggets/adamantine" + "#c:nuggets/adamant" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/nuggets/adamantine.json b/src/generated/resources/data/forge/tags/item/nuggets/adamantine.json index 671d73ed9..293155ae1 100644 --- a/src/generated/resources/data/forge/tags/item/nuggets/adamantine.json +++ b/src/generated/resources/data/forge/tags/item/nuggets/adamantine.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:adamantine_nugget" + "#c:nuggets/adamantine" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/nuggets/adamantite.json b/src/generated/resources/data/forge/tags/item/nuggets/adamantite.json index ebd5de600..77fa00f88 100644 --- a/src/generated/resources/data/forge/tags/item/nuggets/adamantite.json +++ b/src/generated/resources/data/forge/tags/item/nuggets/adamantite.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "#forge:nuggets/adamantine" + "#c:nuggets/adamantite" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/nuggets/adamantium.json b/src/generated/resources/data/forge/tags/item/nuggets/adamantium.json index ebd5de600..3b056b14c 100644 --- a/src/generated/resources/data/forge/tags/item/nuggets/adamantium.json +++ b/src/generated/resources/data/forge/tags/item/nuggets/adamantium.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "#forge:nuggets/adamantine" + "#c:nuggets/adamantium" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/nuggets/antimony.json b/src/generated/resources/data/forge/tags/item/nuggets/antimony.json index c94a48b71..c190526a5 100644 --- a/src/generated/resources/data/forge/tags/item/nuggets/antimony.json +++ b/src/generated/resources/data/forge/tags/item/nuggets/antimony.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:antimony_nugget" + "#c:nuggets/antimony" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/nuggets/aquarium.json b/src/generated/resources/data/forge/tags/item/nuggets/aquarium.json index 7f2da1221..f0888b1de 100644 --- a/src/generated/resources/data/forge/tags/item/nuggets/aquarium.json +++ b/src/generated/resources/data/forge/tags/item/nuggets/aquarium.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:aquarium_nugget" + "#c:nuggets/aquarium" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/nuggets/bismuth.json b/src/generated/resources/data/forge/tags/item/nuggets/bismuth.json index b9263281c..37b88438b 100644 --- a/src/generated/resources/data/forge/tags/item/nuggets/bismuth.json +++ b/src/generated/resources/data/forge/tags/item/nuggets/bismuth.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:bismuth_nugget" + "#c:nuggets/bismuth" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/nuggets/brass.json b/src/generated/resources/data/forge/tags/item/nuggets/brass.json index de2968704..40c8ea04e 100644 --- a/src/generated/resources/data/forge/tags/item/nuggets/brass.json +++ b/src/generated/resources/data/forge/tags/item/nuggets/brass.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:brass_nugget" + "#c:nuggets/brass" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/nuggets/bronze.json b/src/generated/resources/data/forge/tags/item/nuggets/bronze.json index 6f643fb04..926486312 100644 --- a/src/generated/resources/data/forge/tags/item/nuggets/bronze.json +++ b/src/generated/resources/data/forge/tags/item/nuggets/bronze.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:bronze_nugget" + "#c:nuggets/bronze" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/nuggets/charcoal.json b/src/generated/resources/data/forge/tags/item/nuggets/charcoal.json index baeced49e..0d562a75b 100644 --- a/src/generated/resources/data/forge/tags/item/nuggets/charcoal.json +++ b/src/generated/resources/data/forge/tags/item/nuggets/charcoal.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:charcoal_nugget" + "#c:nuggets/charcoal" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/nuggets/coal.json b/src/generated/resources/data/forge/tags/item/nuggets/coal.json index c979b5f18..6c1aeb5da 100644 --- a/src/generated/resources/data/forge/tags/item/nuggets/coal.json +++ b/src/generated/resources/data/forge/tags/item/nuggets/coal.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:coal_nugget" + "#c:nuggets/coal" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/nuggets/coldiron.json b/src/generated/resources/data/forge/tags/item/nuggets/coldiron.json index 48e157f23..db740b6e5 100644 --- a/src/generated/resources/data/forge/tags/item/nuggets/coldiron.json +++ b/src/generated/resources/data/forge/tags/item/nuggets/coldiron.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:coldiron_nugget" + "#c:nuggets/coldiron" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/nuggets/copper.json b/src/generated/resources/data/forge/tags/item/nuggets/copper.json index b67eb8a32..6e123df02 100644 --- a/src/generated/resources/data/forge/tags/item/nuggets/copper.json +++ b/src/generated/resources/data/forge/tags/item/nuggets/copper.json @@ -1,7 +1,6 @@ { "replace": false, "values": [ - "basemetals:copper_nugget", - "minecraft:copper_nugget" + "#c:nuggets/copper" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/nuggets/cupronickel.json b/src/generated/resources/data/forge/tags/item/nuggets/cupronickel.json index 8d26a090f..56f450ea4 100644 --- a/src/generated/resources/data/forge/tags/item/nuggets/cupronickel.json +++ b/src/generated/resources/data/forge/tags/item/nuggets/cupronickel.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:cupronickel_nugget" + "#c:nuggets/cupronickel" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/nuggets/diamond.json b/src/generated/resources/data/forge/tags/item/nuggets/diamond.json index 4cb0b9697..eb34e57de 100644 --- a/src/generated/resources/data/forge/tags/item/nuggets/diamond.json +++ b/src/generated/resources/data/forge/tags/item/nuggets/diamond.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:diamond_nugget" + "#c:nuggets/diamond" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/nuggets/electrum.json b/src/generated/resources/data/forge/tags/item/nuggets/electrum.json index 58447b735..26e04c731 100644 --- a/src/generated/resources/data/forge/tags/item/nuggets/electrum.json +++ b/src/generated/resources/data/forge/tags/item/nuggets/electrum.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:electrum_nugget" + "#c:nuggets/electrum" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/nuggets/emerald.json b/src/generated/resources/data/forge/tags/item/nuggets/emerald.json index ed561b4a8..f1681cf72 100644 --- a/src/generated/resources/data/forge/tags/item/nuggets/emerald.json +++ b/src/generated/resources/data/forge/tags/item/nuggets/emerald.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:emerald_nugget" + "#c:nuggets/emerald" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/nuggets/gold.json b/src/generated/resources/data/forge/tags/item/nuggets/gold.json new file mode 100644 index 000000000..c99420e2b --- /dev/null +++ b/src/generated/resources/data/forge/tags/item/nuggets/gold.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "#c:nuggets/gold" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/nuggets/invar.json b/src/generated/resources/data/forge/tags/item/nuggets/invar.json index 249b4cfb0..f13fdab8a 100644 --- a/src/generated/resources/data/forge/tags/item/nuggets/invar.json +++ b/src/generated/resources/data/forge/tags/item/nuggets/invar.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:invar_nugget" + "#c:nuggets/invar" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/nuggets/iron.json b/src/generated/resources/data/forge/tags/item/nuggets/iron.json new file mode 100644 index 000000000..18d048176 --- /dev/null +++ b/src/generated/resources/data/forge/tags/item/nuggets/iron.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "#c:nuggets/iron" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/nuggets/lead.json b/src/generated/resources/data/forge/tags/item/nuggets/lead.json index 1f47348b4..668bd02be 100644 --- a/src/generated/resources/data/forge/tags/item/nuggets/lead.json +++ b/src/generated/resources/data/forge/tags/item/nuggets/lead.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:lead_nugget" + "#c:nuggets/lead" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/nuggets/mercury.json b/src/generated/resources/data/forge/tags/item/nuggets/mercury.json index 57bafefc0..b762487e6 100644 --- a/src/generated/resources/data/forge/tags/item/nuggets/mercury.json +++ b/src/generated/resources/data/forge/tags/item/nuggets/mercury.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:mercury_nugget" + "#c:nuggets/mercury" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/nuggets/mithril.json b/src/generated/resources/data/forge/tags/item/nuggets/mithril.json index 8d772ccff..e43c41faf 100644 --- a/src/generated/resources/data/forge/tags/item/nuggets/mithril.json +++ b/src/generated/resources/data/forge/tags/item/nuggets/mithril.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:mithril_nugget" + "#c:nuggets/mithril" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/nuggets/nickel.json b/src/generated/resources/data/forge/tags/item/nuggets/nickel.json index 18dfd8ebf..909ef7619 100644 --- a/src/generated/resources/data/forge/tags/item/nuggets/nickel.json +++ b/src/generated/resources/data/forge/tags/item/nuggets/nickel.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:nickel_nugget" + "#c:nuggets/nickel" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/nuggets/obsidian.json b/src/generated/resources/data/forge/tags/item/nuggets/obsidian.json index d34c485f4..cb9bdeedc 100644 --- a/src/generated/resources/data/forge/tags/item/nuggets/obsidian.json +++ b/src/generated/resources/data/forge/tags/item/nuggets/obsidian.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:obsidian_nugget" + "#c:nuggets/obsidian" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/nuggets/pewter.json b/src/generated/resources/data/forge/tags/item/nuggets/pewter.json index 005d9ddd1..6d882faac 100644 --- a/src/generated/resources/data/forge/tags/item/nuggets/pewter.json +++ b/src/generated/resources/data/forge/tags/item/nuggets/pewter.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:pewter_nugget" + "#c:nuggets/pewter" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/nuggets/platinum.json b/src/generated/resources/data/forge/tags/item/nuggets/platinum.json index 192cf9b7b..36b175ca6 100644 --- a/src/generated/resources/data/forge/tags/item/nuggets/platinum.json +++ b/src/generated/resources/data/forge/tags/item/nuggets/platinum.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:platinum_nugget" + "#c:nuggets/platinum" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/nuggets/quartz.json b/src/generated/resources/data/forge/tags/item/nuggets/quartz.json index 658a31bc5..e042a4f38 100644 --- a/src/generated/resources/data/forge/tags/item/nuggets/quartz.json +++ b/src/generated/resources/data/forge/tags/item/nuggets/quartz.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:quartz_nugget" + "#c:nuggets/quartz" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/nuggets/silver.json b/src/generated/resources/data/forge/tags/item/nuggets/silver.json index 470b94b1c..f385c5767 100644 --- a/src/generated/resources/data/forge/tags/item/nuggets/silver.json +++ b/src/generated/resources/data/forge/tags/item/nuggets/silver.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:silver_nugget" + "#c:nuggets/silver" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/nuggets/starsteel.json b/src/generated/resources/data/forge/tags/item/nuggets/starsteel.json index 231be5aeb..88404e1c5 100644 --- a/src/generated/resources/data/forge/tags/item/nuggets/starsteel.json +++ b/src/generated/resources/data/forge/tags/item/nuggets/starsteel.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:starsteel_nugget" + "#c:nuggets/starsteel" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/nuggets/steel.json b/src/generated/resources/data/forge/tags/item/nuggets/steel.json index 07ca19592..311c4fe34 100644 --- a/src/generated/resources/data/forge/tags/item/nuggets/steel.json +++ b/src/generated/resources/data/forge/tags/item/nuggets/steel.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:steel_nugget" + "#c:nuggets/steel" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/nuggets/tin.json b/src/generated/resources/data/forge/tags/item/nuggets/tin.json index 6be0657be..681548200 100644 --- a/src/generated/resources/data/forge/tags/item/nuggets/tin.json +++ b/src/generated/resources/data/forge/tags/item/nuggets/tin.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:tin_nugget" + "#c:nuggets/tin" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/nuggets/zinc.json b/src/generated/resources/data/forge/tags/item/nuggets/zinc.json index 47a62d15d..d6d07383f 100644 --- a/src/generated/resources/data/forge/tags/item/nuggets/zinc.json +++ b/src/generated/resources/data/forge/tags/item/nuggets/zinc.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:zinc_nugget" + "#c:nuggets/zinc" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/ores.json b/src/generated/resources/data/forge/tags/item/ores.json index bf700473b..9195d9493 100644 --- a/src/generated/resources/data/forge/tags/item/ores.json +++ b/src/generated/resources/data/forge/tags/item/ores.json @@ -1,18 +1,6 @@ { "replace": false, "values": [ - "#forge:ores/adamantine", - "#forge:ores/antimony", - "#forge:ores/bismuth", - "#forge:ores/coldiron", - "#forge:ores/copper", - "#forge:ores/lead", - "#forge:ores/mercury", - "#forge:ores/nickel", - "#forge:ores/platinum", - "#forge:ores/silver", - "#forge:ores/starsteel", - "#forge:ores/tin", - "#forge:ores/zinc" + "#c:ores" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/ores/adamantine.json b/src/generated/resources/data/forge/tags/item/ores/adamantine.json index fdc15c972..0cdb81b98 100644 --- a/src/generated/resources/data/forge/tags/item/ores/adamantine.json +++ b/src/generated/resources/data/forge/tags/item/ores/adamantine.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:adamantine_ore" + "#c:ores/adamantine" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/ores/antimony.json b/src/generated/resources/data/forge/tags/item/ores/antimony.json index d535177f5..e856b7bfe 100644 --- a/src/generated/resources/data/forge/tags/item/ores/antimony.json +++ b/src/generated/resources/data/forge/tags/item/ores/antimony.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:antimony_ore" + "#c:ores/antimony" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/ores/bismuth.json b/src/generated/resources/data/forge/tags/item/ores/bismuth.json index a43ac8ddb..bf0973a95 100644 --- a/src/generated/resources/data/forge/tags/item/ores/bismuth.json +++ b/src/generated/resources/data/forge/tags/item/ores/bismuth.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:bismuth_ore" + "#c:ores/bismuth" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/ores/coal.json b/src/generated/resources/data/forge/tags/item/ores/coal.json new file mode 100644 index 000000000..36f1a46d0 --- /dev/null +++ b/src/generated/resources/data/forge/tags/item/ores/coal.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "#c:ores/coal" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/ores/coldiron.json b/src/generated/resources/data/forge/tags/item/ores/coldiron.json index 968821106..8e63ac1b0 100644 --- a/src/generated/resources/data/forge/tags/item/ores/coldiron.json +++ b/src/generated/resources/data/forge/tags/item/ores/coldiron.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:coldiron_ore" + "#c:ores/coldiron" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/ores/copper.json b/src/generated/resources/data/forge/tags/item/ores/copper.json index c2e8c464f..204b49e0d 100644 --- a/src/generated/resources/data/forge/tags/item/ores/copper.json +++ b/src/generated/resources/data/forge/tags/item/ores/copper.json @@ -1,8 +1,6 @@ { "replace": false, "values": [ - "basemetals:copper_ore", - "minecraft:copper_ore", - "minecraft:deepslate_copper_ore" + "#c:ores/copper" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/ores/diamond.json b/src/generated/resources/data/forge/tags/item/ores/diamond.json new file mode 100644 index 000000000..c52006d3e --- /dev/null +++ b/src/generated/resources/data/forge/tags/item/ores/diamond.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "#c:ores/diamond" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/ores/emerald.json b/src/generated/resources/data/forge/tags/item/ores/emerald.json new file mode 100644 index 000000000..4de5b41d5 --- /dev/null +++ b/src/generated/resources/data/forge/tags/item/ores/emerald.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "#c:ores/emerald" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/ores/gold.json b/src/generated/resources/data/forge/tags/item/ores/gold.json new file mode 100644 index 000000000..cbc8b035f --- /dev/null +++ b/src/generated/resources/data/forge/tags/item/ores/gold.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "#c:ores/gold" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/ores/iron.json b/src/generated/resources/data/forge/tags/item/ores/iron.json new file mode 100644 index 000000000..34488eebb --- /dev/null +++ b/src/generated/resources/data/forge/tags/item/ores/iron.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "#c:ores/iron" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/ores/lapis.json b/src/generated/resources/data/forge/tags/item/ores/lapis.json new file mode 100644 index 000000000..ff0f4ac6e --- /dev/null +++ b/src/generated/resources/data/forge/tags/item/ores/lapis.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "#c:ores/lapis" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/ores/lead.json b/src/generated/resources/data/forge/tags/item/ores/lead.json index 71aad861f..50b0d90a4 100644 --- a/src/generated/resources/data/forge/tags/item/ores/lead.json +++ b/src/generated/resources/data/forge/tags/item/ores/lead.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:lead_ore" + "#c:ores/lead" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/ores/mercury.json b/src/generated/resources/data/forge/tags/item/ores/mercury.json index ddd01f06b..b43feadb9 100644 --- a/src/generated/resources/data/forge/tags/item/ores/mercury.json +++ b/src/generated/resources/data/forge/tags/item/ores/mercury.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:mercury_ore" + "#c:ores/mercury" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/ores/netherite_scrap.json b/src/generated/resources/data/forge/tags/item/ores/netherite_scrap.json new file mode 100644 index 000000000..7c1f62c97 --- /dev/null +++ b/src/generated/resources/data/forge/tags/item/ores/netherite_scrap.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "#c:ores/netherite_scrap" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/ores/nickel.json b/src/generated/resources/data/forge/tags/item/ores/nickel.json index 4f0eff4f1..892a815ac 100644 --- a/src/generated/resources/data/forge/tags/item/ores/nickel.json +++ b/src/generated/resources/data/forge/tags/item/ores/nickel.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:nickel_ore" + "#c:ores/nickel" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/ores/platinum.json b/src/generated/resources/data/forge/tags/item/ores/platinum.json index 0c92650c7..46ef81778 100644 --- a/src/generated/resources/data/forge/tags/item/ores/platinum.json +++ b/src/generated/resources/data/forge/tags/item/ores/platinum.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:platinum_ore" + "#c:ores/platinum" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/ores/quartz.json b/src/generated/resources/data/forge/tags/item/ores/quartz.json new file mode 100644 index 000000000..9c6749f10 --- /dev/null +++ b/src/generated/resources/data/forge/tags/item/ores/quartz.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "#c:ores/quartz" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/ores/redstone.json b/src/generated/resources/data/forge/tags/item/ores/redstone.json new file mode 100644 index 000000000..820676434 --- /dev/null +++ b/src/generated/resources/data/forge/tags/item/ores/redstone.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "#c:ores/redstone" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/ores/silver.json b/src/generated/resources/data/forge/tags/item/ores/silver.json index 4a586b22a..356d4218c 100644 --- a/src/generated/resources/data/forge/tags/item/ores/silver.json +++ b/src/generated/resources/data/forge/tags/item/ores/silver.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:silver_ore" + "#c:ores/silver" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/ores/starsteel.json b/src/generated/resources/data/forge/tags/item/ores/starsteel.json index 7e82e1027..a679e2198 100644 --- a/src/generated/resources/data/forge/tags/item/ores/starsteel.json +++ b/src/generated/resources/data/forge/tags/item/ores/starsteel.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:starsteel_ore" + "#c:ores/starsteel" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/ores/tin.json b/src/generated/resources/data/forge/tags/item/ores/tin.json index db8843130..b82e201e5 100644 --- a/src/generated/resources/data/forge/tags/item/ores/tin.json +++ b/src/generated/resources/data/forge/tags/item/ores/tin.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:tin_ore" + "#c:ores/tin" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/ores/zinc.json b/src/generated/resources/data/forge/tags/item/ores/zinc.json index 27c70fae4..35f02111d 100644 --- a/src/generated/resources/data/forge/tags/item/ores/zinc.json +++ b/src/generated/resources/data/forge/tags/item/ores/zinc.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:zinc_ore" + "#c:ores/zinc" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/plates.json b/src/generated/resources/data/forge/tags/item/plates.json index cf04bcbd2..c4efa53a7 100644 --- a/src/generated/resources/data/forge/tags/item/plates.json +++ b/src/generated/resources/data/forge/tags/item/plates.json @@ -1,30 +1,6 @@ { "replace": false, "values": [ - "#forge:plates/adamantine", - "#forge:plates/antimony", - "#forge:plates/aquarium", - "#forge:plates/bismuth", - "#forge:plates/brass", - "#forge:plates/bronze", - "#forge:plates/coldiron", - "#forge:plates/copper", - "#forge:plates/cupronickel", - "#forge:plates/diamond", - "#forge:plates/electrum", - "#forge:plates/emerald", - "#forge:plates/gold", - "#forge:plates/invar", - "#forge:plates/iron", - "#forge:plates/lead", - "#forge:plates/mithril", - "#forge:plates/nickel", - "#forge:plates/pewter", - "#forge:plates/platinum", - "#forge:plates/silver", - "#forge:plates/starsteel", - "#forge:plates/steel", - "#forge:plates/tin", - "#forge:plates/zinc" + "#c:plates" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/plates/adamantine.json b/src/generated/resources/data/forge/tags/item/plates/adamantine.json index bc59eb20a..ea665e8d7 100644 --- a/src/generated/resources/data/forge/tags/item/plates/adamantine.json +++ b/src/generated/resources/data/forge/tags/item/plates/adamantine.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:adamantine_plate" + "#c:plates/adamantine" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/plates/antimony.json b/src/generated/resources/data/forge/tags/item/plates/antimony.json index ba6e5ce57..e9e75f6af 100644 --- a/src/generated/resources/data/forge/tags/item/plates/antimony.json +++ b/src/generated/resources/data/forge/tags/item/plates/antimony.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:antimony_plate" + "#c:plates/antimony" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/plates/aquarium.json b/src/generated/resources/data/forge/tags/item/plates/aquarium.json index 01ca72763..3198bd05c 100644 --- a/src/generated/resources/data/forge/tags/item/plates/aquarium.json +++ b/src/generated/resources/data/forge/tags/item/plates/aquarium.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:aquarium_plate" + "#c:plates/aquarium" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/plates/bismuth.json b/src/generated/resources/data/forge/tags/item/plates/bismuth.json index 512f9c66d..71ae5bda2 100644 --- a/src/generated/resources/data/forge/tags/item/plates/bismuth.json +++ b/src/generated/resources/data/forge/tags/item/plates/bismuth.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:bismuth_plate" + "#c:plates/bismuth" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/plates/brass.json b/src/generated/resources/data/forge/tags/item/plates/brass.json index 9462b1479..dafb6593d 100644 --- a/src/generated/resources/data/forge/tags/item/plates/brass.json +++ b/src/generated/resources/data/forge/tags/item/plates/brass.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:brass_plate" + "#c:plates/brass" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/plates/bronze.json b/src/generated/resources/data/forge/tags/item/plates/bronze.json index f2884324e..3f405b948 100644 --- a/src/generated/resources/data/forge/tags/item/plates/bronze.json +++ b/src/generated/resources/data/forge/tags/item/plates/bronze.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:bronze_plate" + "#c:plates/bronze" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/plates/coldiron.json b/src/generated/resources/data/forge/tags/item/plates/coldiron.json index a726b9261..ce84a2813 100644 --- a/src/generated/resources/data/forge/tags/item/plates/coldiron.json +++ b/src/generated/resources/data/forge/tags/item/plates/coldiron.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:coldiron_plate" + "#c:plates/coldiron" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/plates/copper.json b/src/generated/resources/data/forge/tags/item/plates/copper.json index df9d3e96e..643dbcd40 100644 --- a/src/generated/resources/data/forge/tags/item/plates/copper.json +++ b/src/generated/resources/data/forge/tags/item/plates/copper.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:copper_plate" + "#c:plates/copper" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/plates/cupronickel.json b/src/generated/resources/data/forge/tags/item/plates/cupronickel.json index 67a870a18..002702871 100644 --- a/src/generated/resources/data/forge/tags/item/plates/cupronickel.json +++ b/src/generated/resources/data/forge/tags/item/plates/cupronickel.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:cupronickel_plate" + "#c:plates/cupronickel" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/plates/diamond.json b/src/generated/resources/data/forge/tags/item/plates/diamond.json index 5e8aecc98..a34ee0adc 100644 --- a/src/generated/resources/data/forge/tags/item/plates/diamond.json +++ b/src/generated/resources/data/forge/tags/item/plates/diamond.json @@ -1,4 +1,6 @@ { "replace": false, - "values": [] + "values": [ + "#c:plates/diamond" + ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/plates/electrum.json b/src/generated/resources/data/forge/tags/item/plates/electrum.json index 306f56385..5914bd889 100644 --- a/src/generated/resources/data/forge/tags/item/plates/electrum.json +++ b/src/generated/resources/data/forge/tags/item/plates/electrum.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:electrum_plate" + "#c:plates/electrum" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/plates/emerald.json b/src/generated/resources/data/forge/tags/item/plates/emerald.json index 5e8aecc98..6c732d70b 100644 --- a/src/generated/resources/data/forge/tags/item/plates/emerald.json +++ b/src/generated/resources/data/forge/tags/item/plates/emerald.json @@ -1,4 +1,6 @@ { "replace": false, - "values": [] + "values": [ + "#c:plates/emerald" + ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/plates/gold.json b/src/generated/resources/data/forge/tags/item/plates/gold.json index cd845c490..10ba9e00c 100644 --- a/src/generated/resources/data/forge/tags/item/plates/gold.json +++ b/src/generated/resources/data/forge/tags/item/plates/gold.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:gold_plate" + "#c:plates/gold" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/plates/invar.json b/src/generated/resources/data/forge/tags/item/plates/invar.json index 446eb0ccf..f4f03677d 100644 --- a/src/generated/resources/data/forge/tags/item/plates/invar.json +++ b/src/generated/resources/data/forge/tags/item/plates/invar.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:invar_plate" + "#c:plates/invar" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/plates/iron.json b/src/generated/resources/data/forge/tags/item/plates/iron.json index 1250b462e..92a676e93 100644 --- a/src/generated/resources/data/forge/tags/item/plates/iron.json +++ b/src/generated/resources/data/forge/tags/item/plates/iron.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:iron_plate" + "#c:plates/iron" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/plates/lead.json b/src/generated/resources/data/forge/tags/item/plates/lead.json index c8e0ce7a9..782aa0668 100644 --- a/src/generated/resources/data/forge/tags/item/plates/lead.json +++ b/src/generated/resources/data/forge/tags/item/plates/lead.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:lead_plate" + "#c:plates/lead" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/plates/mithril.json b/src/generated/resources/data/forge/tags/item/plates/mithril.json index bb8f12849..486411a64 100644 --- a/src/generated/resources/data/forge/tags/item/plates/mithril.json +++ b/src/generated/resources/data/forge/tags/item/plates/mithril.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:mithril_plate" + "#c:plates/mithril" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/plates/nickel.json b/src/generated/resources/data/forge/tags/item/plates/nickel.json index ee16328c6..d0302c46b 100644 --- a/src/generated/resources/data/forge/tags/item/plates/nickel.json +++ b/src/generated/resources/data/forge/tags/item/plates/nickel.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:nickel_plate" + "#c:plates/nickel" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/plates/pewter.json b/src/generated/resources/data/forge/tags/item/plates/pewter.json index d06bc9d31..b54a55c2b 100644 --- a/src/generated/resources/data/forge/tags/item/plates/pewter.json +++ b/src/generated/resources/data/forge/tags/item/plates/pewter.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:pewter_plate" + "#c:plates/pewter" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/plates/platinum.json b/src/generated/resources/data/forge/tags/item/plates/platinum.json index 5ac036d27..9f3ce2fcc 100644 --- a/src/generated/resources/data/forge/tags/item/plates/platinum.json +++ b/src/generated/resources/data/forge/tags/item/plates/platinum.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:platinum_plate" + "#c:plates/platinum" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/plates/silver.json b/src/generated/resources/data/forge/tags/item/plates/silver.json index 5203a23b4..a626ca6a3 100644 --- a/src/generated/resources/data/forge/tags/item/plates/silver.json +++ b/src/generated/resources/data/forge/tags/item/plates/silver.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:silver_plate" + "#c:plates/silver" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/plates/starsteel.json b/src/generated/resources/data/forge/tags/item/plates/starsteel.json index 6679f936c..04a4a0b91 100644 --- a/src/generated/resources/data/forge/tags/item/plates/starsteel.json +++ b/src/generated/resources/data/forge/tags/item/plates/starsteel.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:starsteel_plate" + "#c:plates/starsteel" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/plates/steel.json b/src/generated/resources/data/forge/tags/item/plates/steel.json index 067c2e062..c96df7d6c 100644 --- a/src/generated/resources/data/forge/tags/item/plates/steel.json +++ b/src/generated/resources/data/forge/tags/item/plates/steel.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:steel_plate" + "#c:plates/steel" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/plates/tin.json b/src/generated/resources/data/forge/tags/item/plates/tin.json index 61c7daa64..aacd8a697 100644 --- a/src/generated/resources/data/forge/tags/item/plates/tin.json +++ b/src/generated/resources/data/forge/tags/item/plates/tin.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:tin_plate" + "#c:plates/tin" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/plates/zinc.json b/src/generated/resources/data/forge/tags/item/plates/zinc.json index a96c80dd6..316b3ecb5 100644 --- a/src/generated/resources/data/forge/tags/item/plates/zinc.json +++ b/src/generated/resources/data/forge/tags/item/plates/zinc.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:zinc_plate" + "#c:plates/zinc" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/purified_ores/adamantine.json b/src/generated/resources/data/forge/tags/item/purified_ores/adamantine.json index 511af44c1..a0f533464 100644 --- a/src/generated/resources/data/forge/tags/item/purified_ores/adamantine.json +++ b/src/generated/resources/data/forge/tags/item/purified_ores/adamantine.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:adamantine_crushed_purified" + "#c:purified_ores/adamantine" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/purified_ores/antimony.json b/src/generated/resources/data/forge/tags/item/purified_ores/antimony.json index f3e66bb83..2d38c9d61 100644 --- a/src/generated/resources/data/forge/tags/item/purified_ores/antimony.json +++ b/src/generated/resources/data/forge/tags/item/purified_ores/antimony.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:antimony_crushed_purified" + "#c:purified_ores/antimony" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/purified_ores/bismuth.json b/src/generated/resources/data/forge/tags/item/purified_ores/bismuth.json index eb09ed145..00af0b49a 100644 --- a/src/generated/resources/data/forge/tags/item/purified_ores/bismuth.json +++ b/src/generated/resources/data/forge/tags/item/purified_ores/bismuth.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:bismuth_crushed_purified" + "#c:purified_ores/bismuth" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/purified_ores/coldiron.json b/src/generated/resources/data/forge/tags/item/purified_ores/coldiron.json index a6a37144b..7e873577b 100644 --- a/src/generated/resources/data/forge/tags/item/purified_ores/coldiron.json +++ b/src/generated/resources/data/forge/tags/item/purified_ores/coldiron.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:coldiron_crushed_purified" + "#c:purified_ores/coldiron" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/purified_ores/nickel.json b/src/generated/resources/data/forge/tags/item/purified_ores/nickel.json index b786d4035..8e6268a01 100644 --- a/src/generated/resources/data/forge/tags/item/purified_ores/nickel.json +++ b/src/generated/resources/data/forge/tags/item/purified_ores/nickel.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:nickel_crushed_purified" + "#c:purified_ores/nickel" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/purified_ores/platinum.json b/src/generated/resources/data/forge/tags/item/purified_ores/platinum.json index 42fc2f4ba..e47904b86 100644 --- a/src/generated/resources/data/forge/tags/item/purified_ores/platinum.json +++ b/src/generated/resources/data/forge/tags/item/purified_ores/platinum.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:platinum_crushed_purified" + "#c:purified_ores/platinum" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/purified_ores/starsteel.json b/src/generated/resources/data/forge/tags/item/purified_ores/starsteel.json index cfb376892..22a37f77f 100644 --- a/src/generated/resources/data/forge/tags/item/purified_ores/starsteel.json +++ b/src/generated/resources/data/forge/tags/item/purified_ores/starsteel.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:starsteel_crushed_purified" + "#c:purified_ores/starsteel" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/purified_ores/zinc.json b/src/generated/resources/data/forge/tags/item/purified_ores/zinc.json index 09342b965..0f647ae31 100644 --- a/src/generated/resources/data/forge/tags/item/purified_ores/zinc.json +++ b/src/generated/resources/data/forge/tags/item/purified_ores/zinc.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:zinc_crushed_purified" + "#c:purified_ores/zinc" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/raw_materials.json b/src/generated/resources/data/forge/tags/item/raw_materials.json index 77e41677c..694f50498 100644 --- a/src/generated/resources/data/forge/tags/item/raw_materials.json +++ b/src/generated/resources/data/forge/tags/item/raw_materials.json @@ -1,20 +1,6 @@ { "replace": false, "values": [ - "#forge:raw_materials/adamantine", - "#forge:raw_materials/antimony", - "#forge:raw_materials/bismuth", - "#forge:raw_materials/coldiron", - "#forge:raw_materials/copper", - "#forge:raw_materials/gold", - "#forge:raw_materials/iron", - "#forge:raw_materials/lead", - "#forge:raw_materials/mercury", - "#forge:raw_materials/nickel", - "#forge:raw_materials/platinum", - "#forge:raw_materials/silver", - "#forge:raw_materials/starsteel", - "#forge:raw_materials/tin", - "#forge:raw_materials/zinc" + "#c:raw_materials" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/raw_materials/adamantine.json b/src/generated/resources/data/forge/tags/item/raw_materials/adamantine.json index f80d90c95..c0301e29c 100644 --- a/src/generated/resources/data/forge/tags/item/raw_materials/adamantine.json +++ b/src/generated/resources/data/forge/tags/item/raw_materials/adamantine.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:adamantine_raw" + "#c:raw_materials/adamantine" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/raw_materials/antimony.json b/src/generated/resources/data/forge/tags/item/raw_materials/antimony.json index 4b316dffc..195f4c235 100644 --- a/src/generated/resources/data/forge/tags/item/raw_materials/antimony.json +++ b/src/generated/resources/data/forge/tags/item/raw_materials/antimony.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:antimony_raw" + "#c:raw_materials/antimony" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/raw_materials/bismuth.json b/src/generated/resources/data/forge/tags/item/raw_materials/bismuth.json index db000039b..b76cd1cd3 100644 --- a/src/generated/resources/data/forge/tags/item/raw_materials/bismuth.json +++ b/src/generated/resources/data/forge/tags/item/raw_materials/bismuth.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:bismuth_raw" + "#c:raw_materials/bismuth" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/raw_materials/coldiron.json b/src/generated/resources/data/forge/tags/item/raw_materials/coldiron.json index 209ad7b42..dc39384b1 100644 --- a/src/generated/resources/data/forge/tags/item/raw_materials/coldiron.json +++ b/src/generated/resources/data/forge/tags/item/raw_materials/coldiron.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:coldiron_raw" + "#c:raw_materials/coldiron" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/raw_materials/copper.json b/src/generated/resources/data/forge/tags/item/raw_materials/copper.json index cb1b852f3..601b7e559 100644 --- a/src/generated/resources/data/forge/tags/item/raw_materials/copper.json +++ b/src/generated/resources/data/forge/tags/item/raw_materials/copper.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "minecraft:raw_copper" + "#c:raw_materials/copper" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/raw_materials/gold.json b/src/generated/resources/data/forge/tags/item/raw_materials/gold.json index 3ac772464..d7f712dc0 100644 --- a/src/generated/resources/data/forge/tags/item/raw_materials/gold.json +++ b/src/generated/resources/data/forge/tags/item/raw_materials/gold.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "minecraft:raw_gold" + "#c:raw_materials/gold" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/raw_materials/iron.json b/src/generated/resources/data/forge/tags/item/raw_materials/iron.json index 9c072749c..78787acca 100644 --- a/src/generated/resources/data/forge/tags/item/raw_materials/iron.json +++ b/src/generated/resources/data/forge/tags/item/raw_materials/iron.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "minecraft:raw_iron" + "#c:raw_materials/iron" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/raw_materials/lead.json b/src/generated/resources/data/forge/tags/item/raw_materials/lead.json index 724f10c8d..bdc29fed0 100644 --- a/src/generated/resources/data/forge/tags/item/raw_materials/lead.json +++ b/src/generated/resources/data/forge/tags/item/raw_materials/lead.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:lead_raw" + "#c:raw_materials/lead" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/raw_materials/mercury.json b/src/generated/resources/data/forge/tags/item/raw_materials/mercury.json index 96e7d2152..68e0b968b 100644 --- a/src/generated/resources/data/forge/tags/item/raw_materials/mercury.json +++ b/src/generated/resources/data/forge/tags/item/raw_materials/mercury.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:mercury_raw" + "#c:raw_materials/mercury" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/raw_materials/nickel.json b/src/generated/resources/data/forge/tags/item/raw_materials/nickel.json index bd5a551f4..fdbef3116 100644 --- a/src/generated/resources/data/forge/tags/item/raw_materials/nickel.json +++ b/src/generated/resources/data/forge/tags/item/raw_materials/nickel.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:nickel_raw" + "#c:raw_materials/nickel" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/raw_materials/platinum.json b/src/generated/resources/data/forge/tags/item/raw_materials/platinum.json index 5bf2a4199..2499b35c9 100644 --- a/src/generated/resources/data/forge/tags/item/raw_materials/platinum.json +++ b/src/generated/resources/data/forge/tags/item/raw_materials/platinum.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:platinum_raw" + "#c:raw_materials/platinum" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/raw_materials/silver.json b/src/generated/resources/data/forge/tags/item/raw_materials/silver.json index e13329a01..a28bc23f2 100644 --- a/src/generated/resources/data/forge/tags/item/raw_materials/silver.json +++ b/src/generated/resources/data/forge/tags/item/raw_materials/silver.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:silver_raw" + "#c:raw_materials/silver" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/raw_materials/starsteel.json b/src/generated/resources/data/forge/tags/item/raw_materials/starsteel.json index 0623ad482..48d1fec48 100644 --- a/src/generated/resources/data/forge/tags/item/raw_materials/starsteel.json +++ b/src/generated/resources/data/forge/tags/item/raw_materials/starsteel.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:starsteel_raw" + "#c:raw_materials/starsteel" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/raw_materials/tin.json b/src/generated/resources/data/forge/tags/item/raw_materials/tin.json index a87a04ee9..64695fdec 100644 --- a/src/generated/resources/data/forge/tags/item/raw_materials/tin.json +++ b/src/generated/resources/data/forge/tags/item/raw_materials/tin.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:tin_raw" + "#c:raw_materials/tin" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/raw_materials/zinc.json b/src/generated/resources/data/forge/tags/item/raw_materials/zinc.json index 26a38f08d..4ee52916a 100644 --- a/src/generated/resources/data/forge/tags/item/raw_materials/zinc.json +++ b/src/generated/resources/data/forge/tags/item/raw_materials/zinc.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:zinc_raw" + "#c:raw_materials/zinc" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/rods.json b/src/generated/resources/data/forge/tags/item/rods.json index 51dd4c4cf..01660e79b 100644 --- a/src/generated/resources/data/forge/tags/item/rods.json +++ b/src/generated/resources/data/forge/tags/item/rods.json @@ -1,32 +1,6 @@ { "replace": false, "values": [ - "#forge:rods/adamantine", - "#forge:rods/antimony", - "#forge:rods/aquarium", - "#forge:rods/bismuth", - "#forge:rods/brass", - "#forge:rods/bronze", - "#forge:rods/coldiron", - "#forge:rods/copper", - "#forge:rods/cupronickel", - "#forge:rods/diamond", - "#forge:rods/electrum", - "#forge:rods/emerald", - "#forge:rods/gold", - "#forge:rods/invar", - "#forge:rods/iron", - "#forge:rods/lead", - "#forge:rods/mithril", - "#forge:rods/nickel", - "#forge:rods/obsidian", - "#forge:rods/pewter", - "#forge:rods/platinum", - "#forge:rods/quartz", - "#forge:rods/silver", - "#forge:rods/starsteel", - "#forge:rods/steel", - "#forge:rods/tin", - "#forge:rods/zinc" + "#c:rods" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/rods/adamantine.json b/src/generated/resources/data/forge/tags/item/rods/adamantine.json index 155845241..637f6cd6c 100644 --- a/src/generated/resources/data/forge/tags/item/rods/adamantine.json +++ b/src/generated/resources/data/forge/tags/item/rods/adamantine.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:adamantine_rod" + "#c:rods/adamantine" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/rods/antimony.json b/src/generated/resources/data/forge/tags/item/rods/antimony.json index b54b3ddc6..d3ad14f7c 100644 --- a/src/generated/resources/data/forge/tags/item/rods/antimony.json +++ b/src/generated/resources/data/forge/tags/item/rods/antimony.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:antimony_rod" + "#c:rods/antimony" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/rods/aquarium.json b/src/generated/resources/data/forge/tags/item/rods/aquarium.json index 0145ddfcf..61972f5f6 100644 --- a/src/generated/resources/data/forge/tags/item/rods/aquarium.json +++ b/src/generated/resources/data/forge/tags/item/rods/aquarium.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:aquarium_rod" + "#c:rods/aquarium" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/rods/bismuth.json b/src/generated/resources/data/forge/tags/item/rods/bismuth.json index 21f032b68..697feca19 100644 --- a/src/generated/resources/data/forge/tags/item/rods/bismuth.json +++ b/src/generated/resources/data/forge/tags/item/rods/bismuth.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:bismuth_rod" + "#c:rods/bismuth" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/rods/brass.json b/src/generated/resources/data/forge/tags/item/rods/brass.json index 1b3311de2..02ffa824c 100644 --- a/src/generated/resources/data/forge/tags/item/rods/brass.json +++ b/src/generated/resources/data/forge/tags/item/rods/brass.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:brass_rod" + "#c:rods/brass" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/rods/bronze.json b/src/generated/resources/data/forge/tags/item/rods/bronze.json index def4450c9..f8f22ab21 100644 --- a/src/generated/resources/data/forge/tags/item/rods/bronze.json +++ b/src/generated/resources/data/forge/tags/item/rods/bronze.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:bronze_rod" + "#c:rods/bronze" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/rods/coldiron.json b/src/generated/resources/data/forge/tags/item/rods/coldiron.json index f30fa836d..458037547 100644 --- a/src/generated/resources/data/forge/tags/item/rods/coldiron.json +++ b/src/generated/resources/data/forge/tags/item/rods/coldiron.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:coldiron_rod" + "#c:rods/coldiron" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/rods/copper.json b/src/generated/resources/data/forge/tags/item/rods/copper.json index ea5ca9569..4ebeab16c 100644 --- a/src/generated/resources/data/forge/tags/item/rods/copper.json +++ b/src/generated/resources/data/forge/tags/item/rods/copper.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:copper_rod" + "#c:rods/copper" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/rods/cupronickel.json b/src/generated/resources/data/forge/tags/item/rods/cupronickel.json index d1546a2d2..6001b505c 100644 --- a/src/generated/resources/data/forge/tags/item/rods/cupronickel.json +++ b/src/generated/resources/data/forge/tags/item/rods/cupronickel.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:cupronickel_rod" + "#c:rods/cupronickel" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/rods/diamond.json b/src/generated/resources/data/forge/tags/item/rods/diamond.json index 560e10f2c..bdd4c5f3d 100644 --- a/src/generated/resources/data/forge/tags/item/rods/diamond.json +++ b/src/generated/resources/data/forge/tags/item/rods/diamond.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:diamond_rod" + "#c:rods/diamond" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/rods/electrum.json b/src/generated/resources/data/forge/tags/item/rods/electrum.json index 4c4379836..e4a6ef560 100644 --- a/src/generated/resources/data/forge/tags/item/rods/electrum.json +++ b/src/generated/resources/data/forge/tags/item/rods/electrum.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:electrum_rod" + "#c:rods/electrum" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/rods/emerald.json b/src/generated/resources/data/forge/tags/item/rods/emerald.json index 08ce6801f..3a4bff290 100644 --- a/src/generated/resources/data/forge/tags/item/rods/emerald.json +++ b/src/generated/resources/data/forge/tags/item/rods/emerald.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:emerald_rod" + "#c:rods/emerald" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/rods/gold.json b/src/generated/resources/data/forge/tags/item/rods/gold.json index 3de25cd29..cdfebbca6 100644 --- a/src/generated/resources/data/forge/tags/item/rods/gold.json +++ b/src/generated/resources/data/forge/tags/item/rods/gold.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:gold_rod" + "#c:rods/gold" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/rods/invar.json b/src/generated/resources/data/forge/tags/item/rods/invar.json index 08723d56a..abaa47cc2 100644 --- a/src/generated/resources/data/forge/tags/item/rods/invar.json +++ b/src/generated/resources/data/forge/tags/item/rods/invar.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:invar_rod" + "#c:rods/invar" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/rods/iron.json b/src/generated/resources/data/forge/tags/item/rods/iron.json index e0b426639..7319b27a2 100644 --- a/src/generated/resources/data/forge/tags/item/rods/iron.json +++ b/src/generated/resources/data/forge/tags/item/rods/iron.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:iron_rod" + "#c:rods/iron" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/rods/lead.json b/src/generated/resources/data/forge/tags/item/rods/lead.json index 50401db7a..6124c676f 100644 --- a/src/generated/resources/data/forge/tags/item/rods/lead.json +++ b/src/generated/resources/data/forge/tags/item/rods/lead.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:lead_rod" + "#c:rods/lead" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/rods/mithril.json b/src/generated/resources/data/forge/tags/item/rods/mithril.json index 2f174bcd7..40546a607 100644 --- a/src/generated/resources/data/forge/tags/item/rods/mithril.json +++ b/src/generated/resources/data/forge/tags/item/rods/mithril.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:mithril_rod" + "#c:rods/mithril" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/rods/nickel.json b/src/generated/resources/data/forge/tags/item/rods/nickel.json index cd16127d9..ac70cafa2 100644 --- a/src/generated/resources/data/forge/tags/item/rods/nickel.json +++ b/src/generated/resources/data/forge/tags/item/rods/nickel.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:nickel_rod" + "#c:rods/nickel" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/rods/obsidian.json b/src/generated/resources/data/forge/tags/item/rods/obsidian.json index 7fc6eaaba..a8cca0fdb 100644 --- a/src/generated/resources/data/forge/tags/item/rods/obsidian.json +++ b/src/generated/resources/data/forge/tags/item/rods/obsidian.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:obsidian_rod" + "#c:rods/obsidian" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/rods/pewter.json b/src/generated/resources/data/forge/tags/item/rods/pewter.json index 6f80d9cbf..c2be6d815 100644 --- a/src/generated/resources/data/forge/tags/item/rods/pewter.json +++ b/src/generated/resources/data/forge/tags/item/rods/pewter.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:pewter_rod" + "#c:rods/pewter" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/rods/platinum.json b/src/generated/resources/data/forge/tags/item/rods/platinum.json index 2f16c8ae3..ce2866386 100644 --- a/src/generated/resources/data/forge/tags/item/rods/platinum.json +++ b/src/generated/resources/data/forge/tags/item/rods/platinum.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:platinum_rod" + "#c:rods/platinum" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/rods/quartz.json b/src/generated/resources/data/forge/tags/item/rods/quartz.json index cf6923723..184c9616f 100644 --- a/src/generated/resources/data/forge/tags/item/rods/quartz.json +++ b/src/generated/resources/data/forge/tags/item/rods/quartz.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:quartz_rod" + "#c:rods/quartz" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/rods/silver.json b/src/generated/resources/data/forge/tags/item/rods/silver.json index 62589aec3..523c2c84a 100644 --- a/src/generated/resources/data/forge/tags/item/rods/silver.json +++ b/src/generated/resources/data/forge/tags/item/rods/silver.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:silver_rod" + "#c:rods/silver" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/rods/starsteel.json b/src/generated/resources/data/forge/tags/item/rods/starsteel.json index 9c7fdfe0b..b4d9ceeab 100644 --- a/src/generated/resources/data/forge/tags/item/rods/starsteel.json +++ b/src/generated/resources/data/forge/tags/item/rods/starsteel.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:starsteel_rod" + "#c:rods/starsteel" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/rods/steel.json b/src/generated/resources/data/forge/tags/item/rods/steel.json index 7c079636e..7aea44b89 100644 --- a/src/generated/resources/data/forge/tags/item/rods/steel.json +++ b/src/generated/resources/data/forge/tags/item/rods/steel.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:steel_rod" + "#c:rods/steel" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/rods/stone.json b/src/generated/resources/data/forge/tags/item/rods/stone.json index 69e04110a..bcdf5a378 100644 --- a/src/generated/resources/data/forge/tags/item/rods/stone.json +++ b/src/generated/resources/data/forge/tags/item/rods/stone.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:stone_rod" + "#c:rods/stone" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/rods/tin.json b/src/generated/resources/data/forge/tags/item/rods/tin.json index 5f7c69bf0..5d6fa2392 100644 --- a/src/generated/resources/data/forge/tags/item/rods/tin.json +++ b/src/generated/resources/data/forge/tags/item/rods/tin.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:tin_rod" + "#c:rods/tin" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/rods/wooden.json b/src/generated/resources/data/forge/tags/item/rods/wooden.json new file mode 100644 index 000000000..c65877f2d --- /dev/null +++ b/src/generated/resources/data/forge/tags/item/rods/wooden.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "#c:rods/wooden" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/rods/zinc.json b/src/generated/resources/data/forge/tags/item/rods/zinc.json index 42ddcbd2c..f55392401 100644 --- a/src/generated/resources/data/forge/tags/item/rods/zinc.json +++ b/src/generated/resources/data/forge/tags/item/rods/zinc.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:zinc_rod" + "#c:rods/zinc" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/shards/adamantine.json b/src/generated/resources/data/forge/tags/item/shards/adamantine.json index f27ac1d88..6d9cfeef6 100644 --- a/src/generated/resources/data/forge/tags/item/shards/adamantine.json +++ b/src/generated/resources/data/forge/tags/item/shards/adamantine.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:adamantine_shard" + "#c:shards/adamantine" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/shards/antimony.json b/src/generated/resources/data/forge/tags/item/shards/antimony.json index c6928626a..46e0d7c48 100644 --- a/src/generated/resources/data/forge/tags/item/shards/antimony.json +++ b/src/generated/resources/data/forge/tags/item/shards/antimony.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:antimony_shard" + "#c:shards/antimony" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/shards/bismuth.json b/src/generated/resources/data/forge/tags/item/shards/bismuth.json index 29ef420b4..97b797bff 100644 --- a/src/generated/resources/data/forge/tags/item/shards/bismuth.json +++ b/src/generated/resources/data/forge/tags/item/shards/bismuth.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:bismuth_shard" + "#c:shards/bismuth" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/shards/coldiron.json b/src/generated/resources/data/forge/tags/item/shards/coldiron.json index 58d4a4d6e..e9175925c 100644 --- a/src/generated/resources/data/forge/tags/item/shards/coldiron.json +++ b/src/generated/resources/data/forge/tags/item/shards/coldiron.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:coldiron_shard" + "#c:shards/coldiron" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/shards/nickel.json b/src/generated/resources/data/forge/tags/item/shards/nickel.json index dd00186b6..2dda8a207 100644 --- a/src/generated/resources/data/forge/tags/item/shards/nickel.json +++ b/src/generated/resources/data/forge/tags/item/shards/nickel.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:nickel_shard" + "#c:shards/nickel" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/shards/platinum.json b/src/generated/resources/data/forge/tags/item/shards/platinum.json index b3fa11e8b..eac924923 100644 --- a/src/generated/resources/data/forge/tags/item/shards/platinum.json +++ b/src/generated/resources/data/forge/tags/item/shards/platinum.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:platinum_shard" + "#c:shards/platinum" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/shards/starsteel.json b/src/generated/resources/data/forge/tags/item/shards/starsteel.json index 0c476e76f..c47e5f00d 100644 --- a/src/generated/resources/data/forge/tags/item/shards/starsteel.json +++ b/src/generated/resources/data/forge/tags/item/shards/starsteel.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:starsteel_shard" + "#c:shards/starsteel" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/shards/zinc.json b/src/generated/resources/data/forge/tags/item/shards/zinc.json index a894d790b..45ee3ec2e 100644 --- a/src/generated/resources/data/forge/tags/item/shards/zinc.json +++ b/src/generated/resources/data/forge/tags/item/shards/zinc.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:zinc_shard" + "#c:shards/zinc" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/slabs/copper.json b/src/generated/resources/data/forge/tags/item/slabs/copper.json index 6695810f9..04df3c23a 100644 --- a/src/generated/resources/data/forge/tags/item/slabs/copper.json +++ b/src/generated/resources/data/forge/tags/item/slabs/copper.json @@ -1,7 +1,6 @@ { "replace": false, "values": [ - "basemetals:copper_slab", - "minecraft:cut_copper_slab" + "#c:slabs/copper" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/small_blends/aquarium.json b/src/generated/resources/data/forge/tags/item/small_blends/aquarium.json index 31093bec0..1e71fdb23 100644 --- a/src/generated/resources/data/forge/tags/item/small_blends/aquarium.json +++ b/src/generated/resources/data/forge/tags/item/small_blends/aquarium.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:aquarium_smallblend" + "#c:small_blends/aquarium" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/small_blends/brass.json b/src/generated/resources/data/forge/tags/item/small_blends/brass.json index ac3ec2b57..7f09d3a45 100644 --- a/src/generated/resources/data/forge/tags/item/small_blends/brass.json +++ b/src/generated/resources/data/forge/tags/item/small_blends/brass.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:brass_smallblend" + "#c:small_blends/brass" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/small_blends/bronze.json b/src/generated/resources/data/forge/tags/item/small_blends/bronze.json index 851c73e56..8d3b2a4ab 100644 --- a/src/generated/resources/data/forge/tags/item/small_blends/bronze.json +++ b/src/generated/resources/data/forge/tags/item/small_blends/bronze.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:bronze_smallblend" + "#c:small_blends/bronze" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/small_blends/cupronickel.json b/src/generated/resources/data/forge/tags/item/small_blends/cupronickel.json index 931b08073..2664149e5 100644 --- a/src/generated/resources/data/forge/tags/item/small_blends/cupronickel.json +++ b/src/generated/resources/data/forge/tags/item/small_blends/cupronickel.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:cupronickel_smallblend" + "#c:small_blends/cupronickel" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/small_blends/diamond.json b/src/generated/resources/data/forge/tags/item/small_blends/diamond.json index c759ec2d1..71d53196d 100644 --- a/src/generated/resources/data/forge/tags/item/small_blends/diamond.json +++ b/src/generated/resources/data/forge/tags/item/small_blends/diamond.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:diamond_smallblend" + "#c:small_blends/diamond" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/small_blends/electrum.json b/src/generated/resources/data/forge/tags/item/small_blends/electrum.json index 2fc258057..6497ebd72 100644 --- a/src/generated/resources/data/forge/tags/item/small_blends/electrum.json +++ b/src/generated/resources/data/forge/tags/item/small_blends/electrum.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:electrum_smallblend" + "#c:small_blends/electrum" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/small_blends/gold.json b/src/generated/resources/data/forge/tags/item/small_blends/gold.json index 7c0461e79..d72818a6d 100644 --- a/src/generated/resources/data/forge/tags/item/small_blends/gold.json +++ b/src/generated/resources/data/forge/tags/item/small_blends/gold.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:gold_smallblend" + "#c:small_blends/gold" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/small_blends/invar.json b/src/generated/resources/data/forge/tags/item/small_blends/invar.json index 251543a59..5e00f286f 100644 --- a/src/generated/resources/data/forge/tags/item/small_blends/invar.json +++ b/src/generated/resources/data/forge/tags/item/small_blends/invar.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:invar_smallblend" + "#c:small_blends/invar" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/small_blends/iron.json b/src/generated/resources/data/forge/tags/item/small_blends/iron.json index 83f7adec6..00b5327ba 100644 --- a/src/generated/resources/data/forge/tags/item/small_blends/iron.json +++ b/src/generated/resources/data/forge/tags/item/small_blends/iron.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:iron_smallblend" + "#c:small_blends/iron" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/small_blends/mithril.json b/src/generated/resources/data/forge/tags/item/small_blends/mithril.json index 167bae264..2632d4538 100644 --- a/src/generated/resources/data/forge/tags/item/small_blends/mithril.json +++ b/src/generated/resources/data/forge/tags/item/small_blends/mithril.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:mithril_smallblend" + "#c:small_blends/mithril" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/small_blends/pewter.json b/src/generated/resources/data/forge/tags/item/small_blends/pewter.json index a46d9ac79..7db8f971d 100644 --- a/src/generated/resources/data/forge/tags/item/small_blends/pewter.json +++ b/src/generated/resources/data/forge/tags/item/small_blends/pewter.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:pewter_smallblend" + "#c:small_blends/pewter" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/small_blends/steel.json b/src/generated/resources/data/forge/tags/item/small_blends/steel.json index 6adc9a639..a64103a67 100644 --- a/src/generated/resources/data/forge/tags/item/small_blends/steel.json +++ b/src/generated/resources/data/forge/tags/item/small_blends/steel.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:steel_smallblend" + "#c:small_blends/steel" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/sprockets/steel.json b/src/generated/resources/data/forge/tags/item/sprockets/steel.json index 1fcd62e8c..f1de89c54 100644 --- a/src/generated/resources/data/forge/tags/item/sprockets/steel.json +++ b/src/generated/resources/data/forge/tags/item/sprockets/steel.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "#forge:gears/steel" + "#c:sprockets/steel" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/stairs/copper.json b/src/generated/resources/data/forge/tags/item/stairs/copper.json index 96357a57a..691f379e2 100644 --- a/src/generated/resources/data/forge/tags/item/stairs/copper.json +++ b/src/generated/resources/data/forge/tags/item/stairs/copper.json @@ -1,7 +1,6 @@ { "replace": false, "values": [ - "basemetals:copper_stairs", - "minecraft:cut_copper_stairs" + "#c:stairs/copper" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/stone.json b/src/generated/resources/data/forge/tags/item/stone.json new file mode 100644 index 000000000..a3f20d9b0 --- /dev/null +++ b/src/generated/resources/data/forge/tags/item/stone.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "#c:stones" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/storage_blocks.json b/src/generated/resources/data/forge/tags/item/storage_blocks.json index 6819493b3..0a7be0f93 100644 --- a/src/generated/resources/data/forge/tags/item/storage_blocks.json +++ b/src/generated/resources/data/forge/tags/item/storage_blocks.json @@ -1,26 +1,6 @@ { "replace": false, "values": [ - "#forge:storage_blocks/adamantine", - "#forge:storage_blocks/antimony", - "#forge:storage_blocks/aquarium", - "#forge:storage_blocks/bismuth", - "#forge:storage_blocks/brass", - "#forge:storage_blocks/bronze", - "#forge:storage_blocks/coldiron", - "#forge:storage_blocks/copper", - "#forge:storage_blocks/cupronickel", - "#forge:storage_blocks/electrum", - "#forge:storage_blocks/invar", - "#forge:storage_blocks/lead", - "#forge:storage_blocks/mithril", - "#forge:storage_blocks/nickel", - "#forge:storage_blocks/pewter", - "#forge:storage_blocks/platinum", - "#forge:storage_blocks/silver", - "#forge:storage_blocks/starsteel", - "#forge:storage_blocks/steel", - "#forge:storage_blocks/tin", - "#forge:storage_blocks/zinc" + "#c:storage_blocks" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/storage_blocks/adamantine.json b/src/generated/resources/data/forge/tags/item/storage_blocks/adamantine.json index 17dd5862b..6cbae665c 100644 --- a/src/generated/resources/data/forge/tags/item/storage_blocks/adamantine.json +++ b/src/generated/resources/data/forge/tags/item/storage_blocks/adamantine.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:adamantine_block" + "#c:storage_blocks/adamantine" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/storage_blocks/antimony.json b/src/generated/resources/data/forge/tags/item/storage_blocks/antimony.json index daa0b4252..92079b6d5 100644 --- a/src/generated/resources/data/forge/tags/item/storage_blocks/antimony.json +++ b/src/generated/resources/data/forge/tags/item/storage_blocks/antimony.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:antimony_block" + "#c:storage_blocks/antimony" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/storage_blocks/aquarium.json b/src/generated/resources/data/forge/tags/item/storage_blocks/aquarium.json index d963cc8b6..9df0dc0fc 100644 --- a/src/generated/resources/data/forge/tags/item/storage_blocks/aquarium.json +++ b/src/generated/resources/data/forge/tags/item/storage_blocks/aquarium.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:aquarium_block" + "#c:storage_blocks/aquarium" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/storage_blocks/bismuth.json b/src/generated/resources/data/forge/tags/item/storage_blocks/bismuth.json index 950cf31a4..479994a14 100644 --- a/src/generated/resources/data/forge/tags/item/storage_blocks/bismuth.json +++ b/src/generated/resources/data/forge/tags/item/storage_blocks/bismuth.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:bismuth_block" + "#c:storage_blocks/bismuth" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/storage_blocks/brass.json b/src/generated/resources/data/forge/tags/item/storage_blocks/brass.json index 8997b5d35..f90263733 100644 --- a/src/generated/resources/data/forge/tags/item/storage_blocks/brass.json +++ b/src/generated/resources/data/forge/tags/item/storage_blocks/brass.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:brass_block" + "#c:storage_blocks/brass" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/storage_blocks/bronze.json b/src/generated/resources/data/forge/tags/item/storage_blocks/bronze.json index bc8bff634..4e5f2c42a 100644 --- a/src/generated/resources/data/forge/tags/item/storage_blocks/bronze.json +++ b/src/generated/resources/data/forge/tags/item/storage_blocks/bronze.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:bronze_block" + "#c:storage_blocks/bronze" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/storage_blocks/charcoal.json b/src/generated/resources/data/forge/tags/item/storage_blocks/charcoal.json index c09411d1a..897f6aea5 100644 --- a/src/generated/resources/data/forge/tags/item/storage_blocks/charcoal.json +++ b/src/generated/resources/data/forge/tags/item/storage_blocks/charcoal.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:charcoal_block" + "#c:storage_blocks/charcoal" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/storage_blocks/coal.json b/src/generated/resources/data/forge/tags/item/storage_blocks/coal.json new file mode 100644 index 000000000..4d100642a --- /dev/null +++ b/src/generated/resources/data/forge/tags/item/storage_blocks/coal.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "#c:storage_blocks/coal" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/storage_blocks/coldiron.json b/src/generated/resources/data/forge/tags/item/storage_blocks/coldiron.json index 0951a5514..0d72b6ed5 100644 --- a/src/generated/resources/data/forge/tags/item/storage_blocks/coldiron.json +++ b/src/generated/resources/data/forge/tags/item/storage_blocks/coldiron.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:coldiron_block" + "#c:storage_blocks/coldiron" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/storage_blocks/copper.json b/src/generated/resources/data/forge/tags/item/storage_blocks/copper.json index c094f1f5e..7c58756fc 100644 --- a/src/generated/resources/data/forge/tags/item/storage_blocks/copper.json +++ b/src/generated/resources/data/forge/tags/item/storage_blocks/copper.json @@ -1,7 +1,6 @@ { "replace": false, "values": [ - "basemetals:copper_block", - "minecraft:copper_block" + "#c:storage_blocks/copper" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/storage_blocks/cupronickel.json b/src/generated/resources/data/forge/tags/item/storage_blocks/cupronickel.json index 68717af17..6a5844987 100644 --- a/src/generated/resources/data/forge/tags/item/storage_blocks/cupronickel.json +++ b/src/generated/resources/data/forge/tags/item/storage_blocks/cupronickel.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:cupronickel_block" + "#c:storage_blocks/cupronickel" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/storage_blocks/diamond.json b/src/generated/resources/data/forge/tags/item/storage_blocks/diamond.json index bc1977755..fd4b4eaf4 100644 --- a/src/generated/resources/data/forge/tags/item/storage_blocks/diamond.json +++ b/src/generated/resources/data/forge/tags/item/storage_blocks/diamond.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "minecraft:diamond_block" + "#c:storage_blocks/diamond" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/storage_blocks/electrum.json b/src/generated/resources/data/forge/tags/item/storage_blocks/electrum.json index b154028ba..0cc551a53 100644 --- a/src/generated/resources/data/forge/tags/item/storage_blocks/electrum.json +++ b/src/generated/resources/data/forge/tags/item/storage_blocks/electrum.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:electrum_block" + "#c:storage_blocks/electrum" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/storage_blocks/emerald.json b/src/generated/resources/data/forge/tags/item/storage_blocks/emerald.json index 30e292c55..15fc307f1 100644 --- a/src/generated/resources/data/forge/tags/item/storage_blocks/emerald.json +++ b/src/generated/resources/data/forge/tags/item/storage_blocks/emerald.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "minecraft:emerald_block" + "#c:storage_blocks/emerald" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/storage_blocks/gold.json b/src/generated/resources/data/forge/tags/item/storage_blocks/gold.json index 863d47ad2..c62bf5027 100644 --- a/src/generated/resources/data/forge/tags/item/storage_blocks/gold.json +++ b/src/generated/resources/data/forge/tags/item/storage_blocks/gold.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "minecraft:gold_block" + "#c:storage_blocks/gold" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/storage_blocks/invar.json b/src/generated/resources/data/forge/tags/item/storage_blocks/invar.json index 82f524f08..7234cbd4f 100644 --- a/src/generated/resources/data/forge/tags/item/storage_blocks/invar.json +++ b/src/generated/resources/data/forge/tags/item/storage_blocks/invar.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:invar_block" + "#c:storage_blocks/invar" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/storage_blocks/iron.json b/src/generated/resources/data/forge/tags/item/storage_blocks/iron.json index f9e01c6a9..177b66643 100644 --- a/src/generated/resources/data/forge/tags/item/storage_blocks/iron.json +++ b/src/generated/resources/data/forge/tags/item/storage_blocks/iron.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "minecraft:iron_block" + "#c:storage_blocks/iron" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/storage_blocks/lapis.json b/src/generated/resources/data/forge/tags/item/storage_blocks/lapis.json new file mode 100644 index 000000000..d18456d3b --- /dev/null +++ b/src/generated/resources/data/forge/tags/item/storage_blocks/lapis.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "#c:storage_blocks/lapis" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/storage_blocks/lead.json b/src/generated/resources/data/forge/tags/item/storage_blocks/lead.json index 49532fa3e..be187d7e0 100644 --- a/src/generated/resources/data/forge/tags/item/storage_blocks/lead.json +++ b/src/generated/resources/data/forge/tags/item/storage_blocks/lead.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:lead_block" + "#c:storage_blocks/lead" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/storage_blocks/mithril.json b/src/generated/resources/data/forge/tags/item/storage_blocks/mithril.json index 06355311f..68f193e18 100644 --- a/src/generated/resources/data/forge/tags/item/storage_blocks/mithril.json +++ b/src/generated/resources/data/forge/tags/item/storage_blocks/mithril.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:mithril_block" + "#c:storage_blocks/mithril" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/storage_blocks/nickel.json b/src/generated/resources/data/forge/tags/item/storage_blocks/nickel.json index 1a3a3bffd..dfeb37a69 100644 --- a/src/generated/resources/data/forge/tags/item/storage_blocks/nickel.json +++ b/src/generated/resources/data/forge/tags/item/storage_blocks/nickel.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:nickel_block" + "#c:storage_blocks/nickel" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/storage_blocks/obsidian.json b/src/generated/resources/data/forge/tags/item/storage_blocks/obsidian.json index 03a3719e3..23bb1f731 100644 --- a/src/generated/resources/data/forge/tags/item/storage_blocks/obsidian.json +++ b/src/generated/resources/data/forge/tags/item/storage_blocks/obsidian.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "minecraft:obsidian" + "#c:storage_blocks/obsidian" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/storage_blocks/pewter.json b/src/generated/resources/data/forge/tags/item/storage_blocks/pewter.json index 03d48f873..01137bae6 100644 --- a/src/generated/resources/data/forge/tags/item/storage_blocks/pewter.json +++ b/src/generated/resources/data/forge/tags/item/storage_blocks/pewter.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:pewter_block" + "#c:storage_blocks/pewter" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/storage_blocks/platinum.json b/src/generated/resources/data/forge/tags/item/storage_blocks/platinum.json index 2127f7b12..2da8f1ef9 100644 --- a/src/generated/resources/data/forge/tags/item/storage_blocks/platinum.json +++ b/src/generated/resources/data/forge/tags/item/storage_blocks/platinum.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:platinum_block" + "#c:storage_blocks/platinum" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/storage_blocks/quartz.json b/src/generated/resources/data/forge/tags/item/storage_blocks/quartz.json index 1321f2077..9432b4954 100644 --- a/src/generated/resources/data/forge/tags/item/storage_blocks/quartz.json +++ b/src/generated/resources/data/forge/tags/item/storage_blocks/quartz.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "minecraft:quartz_block" + "#c:storage_blocks/quartz" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/storage_blocks/redstone.json b/src/generated/resources/data/forge/tags/item/storage_blocks/redstone.json new file mode 100644 index 000000000..395c52182 --- /dev/null +++ b/src/generated/resources/data/forge/tags/item/storage_blocks/redstone.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "#c:storage_blocks/redstone" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/storage_blocks/silver.json b/src/generated/resources/data/forge/tags/item/storage_blocks/silver.json index 50cd38aeb..2cf6d15c6 100644 --- a/src/generated/resources/data/forge/tags/item/storage_blocks/silver.json +++ b/src/generated/resources/data/forge/tags/item/storage_blocks/silver.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:silver_block" + "#c:storage_blocks/silver" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/storage_blocks/starsteel.json b/src/generated/resources/data/forge/tags/item/storage_blocks/starsteel.json index 451d897d3..06eb1eca1 100644 --- a/src/generated/resources/data/forge/tags/item/storage_blocks/starsteel.json +++ b/src/generated/resources/data/forge/tags/item/storage_blocks/starsteel.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:starsteel_block" + "#c:storage_blocks/starsteel" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/storage_blocks/steel.json b/src/generated/resources/data/forge/tags/item/storage_blocks/steel.json index fd64726d3..122208d8b 100644 --- a/src/generated/resources/data/forge/tags/item/storage_blocks/steel.json +++ b/src/generated/resources/data/forge/tags/item/storage_blocks/steel.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:steel_block" + "#c:storage_blocks/steel" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/storage_blocks/tin.json b/src/generated/resources/data/forge/tags/item/storage_blocks/tin.json index 9880ef345..2de053df3 100644 --- a/src/generated/resources/data/forge/tags/item/storage_blocks/tin.json +++ b/src/generated/resources/data/forge/tags/item/storage_blocks/tin.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:tin_block" + "#c:storage_blocks/tin" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/storage_blocks/zinc.json b/src/generated/resources/data/forge/tags/item/storage_blocks/zinc.json index 9d9179250..ef4fc844a 100644 --- a/src/generated/resources/data/forge/tags/item/storage_blocks/zinc.json +++ b/src/generated/resources/data/forge/tags/item/storage_blocks/zinc.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:zinc_block" + "#c:storage_blocks/zinc" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/tiny_dusts.json b/src/generated/resources/data/forge/tags/item/tiny_dusts.json index 4e0469f43..36b7dccf0 100644 --- a/src/generated/resources/data/forge/tags/item/tiny_dusts.json +++ b/src/generated/resources/data/forge/tags/item/tiny_dusts.json @@ -1,27 +1,6 @@ { "replace": false, "values": [ - "#forge:tiny_dusts/adamantine", - "#forge:tiny_dusts/antimony", - "#forge:tiny_dusts/aquarium", - "#forge:tiny_dusts/bismuth", - "#forge:tiny_dusts/brass", - "#forge:tiny_dusts/bronze", - "#forge:tiny_dusts/coldiron", - "#forge:tiny_dusts/copper", - "#forge:tiny_dusts/cupronickel", - "#forge:tiny_dusts/electrum", - "#forge:tiny_dusts/invar", - "#forge:tiny_dusts/lead", - "#forge:tiny_dusts/mercury", - "#forge:tiny_dusts/mithril", - "#forge:tiny_dusts/nickel", - "#forge:tiny_dusts/pewter", - "#forge:tiny_dusts/platinum", - "#forge:tiny_dusts/silver", - "#forge:tiny_dusts/starsteel", - "#forge:tiny_dusts/steel", - "#forge:tiny_dusts/tin", - "#forge:tiny_dusts/zinc" + "#c:tiny_dusts" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/tiny_dusts/adamantine.json b/src/generated/resources/data/forge/tags/item/tiny_dusts/adamantine.json index 96545cb5a..f2baa012f 100644 --- a/src/generated/resources/data/forge/tags/item/tiny_dusts/adamantine.json +++ b/src/generated/resources/data/forge/tags/item/tiny_dusts/adamantine.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:adamantine_smallpowder" + "#c:tiny_dusts/adamantine" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/tiny_dusts/antimony.json b/src/generated/resources/data/forge/tags/item/tiny_dusts/antimony.json index a897df884..5cc9b07a1 100644 --- a/src/generated/resources/data/forge/tags/item/tiny_dusts/antimony.json +++ b/src/generated/resources/data/forge/tags/item/tiny_dusts/antimony.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:antimony_smallpowder" + "#c:tiny_dusts/antimony" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/tiny_dusts/aquarium.json b/src/generated/resources/data/forge/tags/item/tiny_dusts/aquarium.json index 1d2cedbd7..57c6425a9 100644 --- a/src/generated/resources/data/forge/tags/item/tiny_dusts/aquarium.json +++ b/src/generated/resources/data/forge/tags/item/tiny_dusts/aquarium.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:aquarium_smallpowder" + "#c:tiny_dusts/aquarium" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/tiny_dusts/bismuth.json b/src/generated/resources/data/forge/tags/item/tiny_dusts/bismuth.json index 7ade6c090..f22c75272 100644 --- a/src/generated/resources/data/forge/tags/item/tiny_dusts/bismuth.json +++ b/src/generated/resources/data/forge/tags/item/tiny_dusts/bismuth.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:bismuth_smallpowder" + "#c:tiny_dusts/bismuth" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/tiny_dusts/brass.json b/src/generated/resources/data/forge/tags/item/tiny_dusts/brass.json index 21c853629..838666be7 100644 --- a/src/generated/resources/data/forge/tags/item/tiny_dusts/brass.json +++ b/src/generated/resources/data/forge/tags/item/tiny_dusts/brass.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:brass_smallpowder" + "#c:tiny_dusts/brass" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/tiny_dusts/bronze.json b/src/generated/resources/data/forge/tags/item/tiny_dusts/bronze.json index e61dc6643..d90741217 100644 --- a/src/generated/resources/data/forge/tags/item/tiny_dusts/bronze.json +++ b/src/generated/resources/data/forge/tags/item/tiny_dusts/bronze.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:bronze_smallpowder" + "#c:tiny_dusts/bronze" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/tiny_dusts/charcoal.json b/src/generated/resources/data/forge/tags/item/tiny_dusts/charcoal.json index 9942839a2..dcc4fe185 100644 --- a/src/generated/resources/data/forge/tags/item/tiny_dusts/charcoal.json +++ b/src/generated/resources/data/forge/tags/item/tiny_dusts/charcoal.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:charcoal_smallpowder" + "#c:tiny_dusts/charcoal" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/tiny_dusts/coal.json b/src/generated/resources/data/forge/tags/item/tiny_dusts/coal.json index a544382c5..2ed6c9347 100644 --- a/src/generated/resources/data/forge/tags/item/tiny_dusts/coal.json +++ b/src/generated/resources/data/forge/tags/item/tiny_dusts/coal.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:coal_smallpowder" + "#c:tiny_dusts/coal" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/tiny_dusts/coldiron.json b/src/generated/resources/data/forge/tags/item/tiny_dusts/coldiron.json index 43fd9743f..0e03cfb80 100644 --- a/src/generated/resources/data/forge/tags/item/tiny_dusts/coldiron.json +++ b/src/generated/resources/data/forge/tags/item/tiny_dusts/coldiron.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:coldiron_smallpowder" + "#c:tiny_dusts/coldiron" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/tiny_dusts/copper.json b/src/generated/resources/data/forge/tags/item/tiny_dusts/copper.json index 625956454..75bf6f403 100644 --- a/src/generated/resources/data/forge/tags/item/tiny_dusts/copper.json +++ b/src/generated/resources/data/forge/tags/item/tiny_dusts/copper.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:copper_smallpowder" + "#c:tiny_dusts/copper" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/tiny_dusts/cupronickel.json b/src/generated/resources/data/forge/tags/item/tiny_dusts/cupronickel.json index 55cc68848..f0aa14d3d 100644 --- a/src/generated/resources/data/forge/tags/item/tiny_dusts/cupronickel.json +++ b/src/generated/resources/data/forge/tags/item/tiny_dusts/cupronickel.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:cupronickel_smallpowder" + "#c:tiny_dusts/cupronickel" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/tiny_dusts/diamond.json b/src/generated/resources/data/forge/tags/item/tiny_dusts/diamond.json index 25e745196..41f8926be 100644 --- a/src/generated/resources/data/forge/tags/item/tiny_dusts/diamond.json +++ b/src/generated/resources/data/forge/tags/item/tiny_dusts/diamond.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:diamond_smallpowder" + "#c:tiny_dusts/diamond" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/tiny_dusts/electrum.json b/src/generated/resources/data/forge/tags/item/tiny_dusts/electrum.json index b701af809..71f52d8ca 100644 --- a/src/generated/resources/data/forge/tags/item/tiny_dusts/electrum.json +++ b/src/generated/resources/data/forge/tags/item/tiny_dusts/electrum.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:electrum_smallpowder" + "#c:tiny_dusts/electrum" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/tiny_dusts/emerald.json b/src/generated/resources/data/forge/tags/item/tiny_dusts/emerald.json index aa7671f32..14d14dc9c 100644 --- a/src/generated/resources/data/forge/tags/item/tiny_dusts/emerald.json +++ b/src/generated/resources/data/forge/tags/item/tiny_dusts/emerald.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:emerald_smallpowder" + "#c:tiny_dusts/emerald" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/tiny_dusts/gold.json b/src/generated/resources/data/forge/tags/item/tiny_dusts/gold.json index 3a925a9c5..d8eece634 100644 --- a/src/generated/resources/data/forge/tags/item/tiny_dusts/gold.json +++ b/src/generated/resources/data/forge/tags/item/tiny_dusts/gold.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:gold_smallpowder" + "#c:tiny_dusts/gold" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/tiny_dusts/invar.json b/src/generated/resources/data/forge/tags/item/tiny_dusts/invar.json index fe3577fe2..c064c614b 100644 --- a/src/generated/resources/data/forge/tags/item/tiny_dusts/invar.json +++ b/src/generated/resources/data/forge/tags/item/tiny_dusts/invar.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:invar_smallpowder" + "#c:tiny_dusts/invar" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/tiny_dusts/iron.json b/src/generated/resources/data/forge/tags/item/tiny_dusts/iron.json index 14f1652f2..c4d2fee64 100644 --- a/src/generated/resources/data/forge/tags/item/tiny_dusts/iron.json +++ b/src/generated/resources/data/forge/tags/item/tiny_dusts/iron.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:iron_smallpowder" + "#c:tiny_dusts/iron" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/tiny_dusts/lapis.json b/src/generated/resources/data/forge/tags/item/tiny_dusts/lapis.json index 056f3bcdd..9b9b010bf 100644 --- a/src/generated/resources/data/forge/tags/item/tiny_dusts/lapis.json +++ b/src/generated/resources/data/forge/tags/item/tiny_dusts/lapis.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:lapis_smallpowder" + "#c:tiny_dusts/lapis" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/tiny_dusts/lead.json b/src/generated/resources/data/forge/tags/item/tiny_dusts/lead.json index 5a6239f4c..dcb3a79ef 100644 --- a/src/generated/resources/data/forge/tags/item/tiny_dusts/lead.json +++ b/src/generated/resources/data/forge/tags/item/tiny_dusts/lead.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:lead_smallpowder" + "#c:tiny_dusts/lead" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/tiny_dusts/mercury.json b/src/generated/resources/data/forge/tags/item/tiny_dusts/mercury.json index 52dbbac29..4f2f4461e 100644 --- a/src/generated/resources/data/forge/tags/item/tiny_dusts/mercury.json +++ b/src/generated/resources/data/forge/tags/item/tiny_dusts/mercury.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:mercury_smallpowder" + "#c:tiny_dusts/mercury" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/tiny_dusts/mithril.json b/src/generated/resources/data/forge/tags/item/tiny_dusts/mithril.json index 94d5288cd..60c8e82c4 100644 --- a/src/generated/resources/data/forge/tags/item/tiny_dusts/mithril.json +++ b/src/generated/resources/data/forge/tags/item/tiny_dusts/mithril.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:mithril_smallpowder" + "#c:tiny_dusts/mithril" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/tiny_dusts/nickel.json b/src/generated/resources/data/forge/tags/item/tiny_dusts/nickel.json index 8bb776ea8..1473bf43a 100644 --- a/src/generated/resources/data/forge/tags/item/tiny_dusts/nickel.json +++ b/src/generated/resources/data/forge/tags/item/tiny_dusts/nickel.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:nickel_smallpowder" + "#c:tiny_dusts/nickel" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/tiny_dusts/obsidian.json b/src/generated/resources/data/forge/tags/item/tiny_dusts/obsidian.json index c56ba5ab7..51613ac97 100644 --- a/src/generated/resources/data/forge/tags/item/tiny_dusts/obsidian.json +++ b/src/generated/resources/data/forge/tags/item/tiny_dusts/obsidian.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:obsidian_smallpowder" + "#c:tiny_dusts/obsidian" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/tiny_dusts/pewter.json b/src/generated/resources/data/forge/tags/item/tiny_dusts/pewter.json index 642642c48..4051d5404 100644 --- a/src/generated/resources/data/forge/tags/item/tiny_dusts/pewter.json +++ b/src/generated/resources/data/forge/tags/item/tiny_dusts/pewter.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:pewter_smallpowder" + "#c:tiny_dusts/pewter" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/tiny_dusts/platinum.json b/src/generated/resources/data/forge/tags/item/tiny_dusts/platinum.json index 5a2b690f5..19b85fe66 100644 --- a/src/generated/resources/data/forge/tags/item/tiny_dusts/platinum.json +++ b/src/generated/resources/data/forge/tags/item/tiny_dusts/platinum.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:platinum_smallpowder" + "#c:tiny_dusts/platinum" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/tiny_dusts/quartz.json b/src/generated/resources/data/forge/tags/item/tiny_dusts/quartz.json index f557e5408..9dc5e56ee 100644 --- a/src/generated/resources/data/forge/tags/item/tiny_dusts/quartz.json +++ b/src/generated/resources/data/forge/tags/item/tiny_dusts/quartz.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:quartz_smallpowder" + "#c:tiny_dusts/quartz" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/tiny_dusts/redstone.json b/src/generated/resources/data/forge/tags/item/tiny_dusts/redstone.json index 7316e8407..fe1f7b176 100644 --- a/src/generated/resources/data/forge/tags/item/tiny_dusts/redstone.json +++ b/src/generated/resources/data/forge/tags/item/tiny_dusts/redstone.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:redstone_smallpowder" + "#c:tiny_dusts/redstone" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/tiny_dusts/silver.json b/src/generated/resources/data/forge/tags/item/tiny_dusts/silver.json index 3f7cba057..f175ccb81 100644 --- a/src/generated/resources/data/forge/tags/item/tiny_dusts/silver.json +++ b/src/generated/resources/data/forge/tags/item/tiny_dusts/silver.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:silver_smallpowder" + "#c:tiny_dusts/silver" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/tiny_dusts/starsteel.json b/src/generated/resources/data/forge/tags/item/tiny_dusts/starsteel.json index 80c3f16ba..4ace6ab5b 100644 --- a/src/generated/resources/data/forge/tags/item/tiny_dusts/starsteel.json +++ b/src/generated/resources/data/forge/tags/item/tiny_dusts/starsteel.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:starsteel_smallpowder" + "#c:tiny_dusts/starsteel" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/tiny_dusts/steel.json b/src/generated/resources/data/forge/tags/item/tiny_dusts/steel.json index 738450af6..db3ee7ed2 100644 --- a/src/generated/resources/data/forge/tags/item/tiny_dusts/steel.json +++ b/src/generated/resources/data/forge/tags/item/tiny_dusts/steel.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:steel_smallpowder" + "#c:tiny_dusts/steel" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/tiny_dusts/tin.json b/src/generated/resources/data/forge/tags/item/tiny_dusts/tin.json index 9c927e059..c20219d94 100644 --- a/src/generated/resources/data/forge/tags/item/tiny_dusts/tin.json +++ b/src/generated/resources/data/forge/tags/item/tiny_dusts/tin.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:tin_smallpowder" + "#c:tiny_dusts/tin" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/tiny_dusts/zinc.json b/src/generated/resources/data/forge/tags/item/tiny_dusts/zinc.json index 65e1e2c53..54c76ce57 100644 --- a/src/generated/resources/data/forge/tags/item/tiny_dusts/zinc.json +++ b/src/generated/resources/data/forge/tags/item/tiny_dusts/zinc.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "basemetals:zinc_smallpowder" + "#c:tiny_dusts/zinc" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/tools/axes/copper.json b/src/generated/resources/data/forge/tags/item/tools/axes/copper.json index 1cfda9ea7..fb38d5bc0 100644 --- a/src/generated/resources/data/forge/tags/item/tools/axes/copper.json +++ b/src/generated/resources/data/forge/tags/item/tools/axes/copper.json @@ -1,7 +1,6 @@ { "replace": false, "values": [ - "basemetals:copper_axe", - "minecraft:copper_axe" + "#c:tools/axes/copper" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/tools/hoes/copper.json b/src/generated/resources/data/forge/tags/item/tools/hoes/copper.json index 8ff1d2ec7..b270d0726 100644 --- a/src/generated/resources/data/forge/tags/item/tools/hoes/copper.json +++ b/src/generated/resources/data/forge/tags/item/tools/hoes/copper.json @@ -1,7 +1,6 @@ { "replace": false, "values": [ - "basemetals:copper_hoe", - "minecraft:copper_hoe" + "#c:tools/hoes/copper" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/tools/pickaxes/copper.json b/src/generated/resources/data/forge/tags/item/tools/pickaxes/copper.json index 3edbba3ae..afae79b27 100644 --- a/src/generated/resources/data/forge/tags/item/tools/pickaxes/copper.json +++ b/src/generated/resources/data/forge/tags/item/tools/pickaxes/copper.json @@ -1,7 +1,6 @@ { "replace": false, "values": [ - "basemetals:copper_pickaxe", - "minecraft:copper_pickaxe" + "#c:tools/pickaxes/copper" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/tools/shovels/copper.json b/src/generated/resources/data/forge/tags/item/tools/shovels/copper.json index e375f6e5e..e4bcbdc65 100644 --- a/src/generated/resources/data/forge/tags/item/tools/shovels/copper.json +++ b/src/generated/resources/data/forge/tags/item/tools/shovels/copper.json @@ -1,7 +1,6 @@ { "replace": false, "values": [ - "basemetals:copper_shovel", - "minecraft:copper_shovel" + "#c:tools/shovels/copper" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/tools/swords/copper.json b/src/generated/resources/data/forge/tags/item/tools/swords/copper.json index ffb0412c0..95fccf207 100644 --- a/src/generated/resources/data/forge/tags/item/tools/swords/copper.json +++ b/src/generated/resources/data/forge/tags/item/tools/swords/copper.json @@ -1,7 +1,6 @@ { "replace": false, "values": [ - "basemetals:copper_sword", - "minecraft:copper_sword" + "#c:tools/swords/copper" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/trapdoors/copper.json b/src/generated/resources/data/forge/tags/item/trapdoors/copper.json index 0bb1f00b1..1077ba13e 100644 --- a/src/generated/resources/data/forge/tags/item/trapdoors/copper.json +++ b/src/generated/resources/data/forge/tags/item/trapdoors/copper.json @@ -1,7 +1,6 @@ { "replace": false, "values": [ - "basemetals:copper_trapdoor", - "minecraft:copper_trapdoor" + "#c:trapdoors/copper" ] } \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/villager_trade/armorer/level_1.json b/src/generated/resources/data/minecraft/tags/villager_trade/armorer/level_1.json new file mode 100644 index 000000000..eefce616c --- /dev/null +++ b/src/generated/resources/data/minecraft/tags/villager_trade/armorer/level_1.json @@ -0,0 +1,63 @@ +{ + "replace": false, + "values": [ + "basemetals:armorer/antimony_ingot", + "basemetals:armorer/antimony_helmet", + "basemetals:armorer/antimony_chestplate", + "basemetals:armorer/antimony_leggings", + "basemetals:armorer/antimony_boots", + "basemetals:armorer/bismuth_ingot", + "basemetals:armorer/bismuth_helmet", + "basemetals:armorer/bismuth_chestplate", + "basemetals:armorer/bismuth_leggings", + "basemetals:armorer/bismuth_boots", + "basemetals:armorer/brass_ingot", + "basemetals:armorer/brass_helmet", + "basemetals:armorer/brass_chestplate", + "basemetals:armorer/brass_leggings", + "basemetals:armorer/brass_boots", + "basemetals:armorer/bronze_ingot", + "basemetals:armorer/bronze_helmet", + "basemetals:armorer/bronze_chestplate", + "basemetals:armorer/bronze_leggings", + "basemetals:armorer/bronze_boots", + "basemetals:armorer/copper_ingot", + "basemetals:armorer/copper_helmet", + "basemetals:armorer/copper_chestplate", + "basemetals:armorer/copper_leggings", + "basemetals:armorer/copper_boots", + "basemetals:armorer/lead_ingot", + "basemetals:armorer/lead_helmet", + "basemetals:armorer/lead_chestplate", + "basemetals:armorer/lead_leggings", + "basemetals:armorer/lead_boots", + "basemetals:armorer/mercury_ingot", + "basemetals:armorer/nickel_ingot", + "basemetals:armorer/nickel_helmet", + "basemetals:armorer/nickel_chestplate", + "basemetals:armorer/nickel_leggings", + "basemetals:armorer/nickel_boots", + "basemetals:armorer/pewter_ingot", + "basemetals:armorer/pewter_helmet", + "basemetals:armorer/pewter_chestplate", + "basemetals:armorer/pewter_leggings", + "basemetals:armorer/pewter_boots", + "basemetals:armorer/silver_ingot", + "basemetals:armorer/silver_helmet", + "basemetals:armorer/silver_chestplate", + "basemetals:armorer/silver_leggings", + "basemetals:armorer/silver_boots", + "basemetals:armorer/tin_ingot", + "basemetals:armorer/tin_helmet", + "basemetals:armorer/tin_chestplate", + "basemetals:armorer/tin_leggings", + "basemetals:armorer/tin_boots", + "basemetals:armorer/zinc_ingot", + "basemetals:armorer/zinc_helmet", + "basemetals:armorer/zinc_chestplate", + "basemetals:armorer/zinc_leggings", + "basemetals:armorer/zinc_boots", + "basemetals:armorer/coal_powder", + "basemetals:armorer/charcoal_powder" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/villager_trade/armorer/level_2.json b/src/generated/resources/data/minecraft/tags/villager_trade/armorer/level_2.json new file mode 100644 index 000000000..9d2b55693 --- /dev/null +++ b/src/generated/resources/data/minecraft/tags/villager_trade/armorer/level_2.json @@ -0,0 +1,37 @@ +{ + "replace": false, + "values": [ + "basemetals:armorer/brass_helmet_enchanted", + "basemetals:armorer/brass_chestplate_enchanted", + "basemetals:armorer/brass_leggings_enchanted", + "basemetals:armorer/brass_boots_enchanted", + "basemetals:armorer/cupronickel_ingot", + "basemetals:armorer/cupronickel_helmet", + "basemetals:armorer/cupronickel_chestplate", + "basemetals:armorer/cupronickel_leggings", + "basemetals:armorer/cupronickel_boots", + "basemetals:armorer/electrum_ingot", + "basemetals:armorer/electrum_helmet", + "basemetals:armorer/electrum_chestplate", + "basemetals:armorer/electrum_leggings", + "basemetals:armorer/electrum_boots", + "basemetals:armorer/invar_ingot", + "basemetals:armorer/invar_helmet", + "basemetals:armorer/invar_chestplate", + "basemetals:armorer/invar_leggings", + "basemetals:armorer/invar_boots", + "basemetals:armorer/nickel_helmet_enchanted", + "basemetals:armorer/nickel_chestplate_enchanted", + "basemetals:armorer/nickel_leggings_enchanted", + "basemetals:armorer/nickel_boots_enchanted", + "basemetals:armorer/silver_helmet_enchanted", + "basemetals:armorer/silver_chestplate_enchanted", + "basemetals:armorer/silver_leggings_enchanted", + "basemetals:armorer/silver_boots_enchanted", + "basemetals:armorer/steel_ingot", + "basemetals:armorer/steel_helmet", + "basemetals:armorer/steel_chestplate", + "basemetals:armorer/steel_leggings", + "basemetals:armorer/steel_boots" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/villager_trade/armorer/level_3.json b/src/generated/resources/data/minecraft/tags/villager_trade/armorer/level_3.json new file mode 100644 index 000000000..df96f9e6b --- /dev/null +++ b/src/generated/resources/data/minecraft/tags/villager_trade/armorer/level_3.json @@ -0,0 +1,13 @@ +{ + "replace": false, + "values": [ + "basemetals:armorer/cupronickel_helmet_enchanted", + "basemetals:armorer/cupronickel_chestplate_enchanted", + "basemetals:armorer/cupronickel_leggings_enchanted", + "basemetals:armorer/cupronickel_boots_enchanted", + "basemetals:armorer/electrum_helmet_enchanted", + "basemetals:armorer/electrum_chestplate_enchanted", + "basemetals:armorer/electrum_leggings_enchanted", + "basemetals:armorer/electrum_boots_enchanted" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/villager_trade/toolsmith/level_1.json b/src/generated/resources/data/minecraft/tags/villager_trade/toolsmith/level_1.json new file mode 100644 index 000000000..27745d4fd --- /dev/null +++ b/src/generated/resources/data/minecraft/tags/villager_trade/toolsmith/level_1.json @@ -0,0 +1,74 @@ +{ + "replace": false, + "values": [ + "basemetals:toolsmith/antimony_ingot", + "basemetals:toolsmith/antimony_pickaxe", + "basemetals:toolsmith/antimony_axe", + "basemetals:toolsmith/antimony_shovel", + "basemetals:toolsmith/antimony_hoe", + "basemetals:toolsmith/antimony_crackhammer", + "basemetals:toolsmith/bismuth_ingot", + "basemetals:toolsmith/bismuth_pickaxe", + "basemetals:toolsmith/bismuth_axe", + "basemetals:toolsmith/bismuth_shovel", + "basemetals:toolsmith/bismuth_hoe", + "basemetals:toolsmith/bismuth_crackhammer", + "basemetals:toolsmith/brass_ingot", + "basemetals:toolsmith/brass_pickaxe", + "basemetals:toolsmith/brass_axe", + "basemetals:toolsmith/brass_shovel", + "basemetals:toolsmith/brass_hoe", + "basemetals:toolsmith/brass_crackhammer", + "basemetals:toolsmith/bronze_ingot", + "basemetals:toolsmith/bronze_pickaxe", + "basemetals:toolsmith/bronze_axe", + "basemetals:toolsmith/bronze_shovel", + "basemetals:toolsmith/bronze_hoe", + "basemetals:toolsmith/bronze_crackhammer", + "basemetals:toolsmith/copper_ingot", + "basemetals:toolsmith/copper_pickaxe", + "basemetals:toolsmith/copper_axe", + "basemetals:toolsmith/copper_shovel", + "basemetals:toolsmith/copper_hoe", + "basemetals:toolsmith/copper_crackhammer", + "basemetals:toolsmith/lead_ingot", + "basemetals:toolsmith/lead_pickaxe", + "basemetals:toolsmith/lead_axe", + "basemetals:toolsmith/lead_shovel", + "basemetals:toolsmith/lead_hoe", + "basemetals:toolsmith/lead_crackhammer", + "basemetals:toolsmith/mercury_ingot", + "basemetals:toolsmith/nickel_ingot", + "basemetals:toolsmith/nickel_pickaxe", + "basemetals:toolsmith/nickel_axe", + "basemetals:toolsmith/nickel_shovel", + "basemetals:toolsmith/nickel_hoe", + "basemetals:toolsmith/nickel_crackhammer", + "basemetals:toolsmith/pewter_ingot", + "basemetals:toolsmith/pewter_pickaxe", + "basemetals:toolsmith/pewter_axe", + "basemetals:toolsmith/pewter_shovel", + "basemetals:toolsmith/pewter_hoe", + "basemetals:toolsmith/pewter_crackhammer", + "basemetals:toolsmith/silver_ingot", + "basemetals:toolsmith/silver_pickaxe", + "basemetals:toolsmith/silver_axe", + "basemetals:toolsmith/silver_shovel", + "basemetals:toolsmith/silver_hoe", + "basemetals:toolsmith/silver_crackhammer", + "basemetals:toolsmith/tin_ingot", + "basemetals:toolsmith/tin_pickaxe", + "basemetals:toolsmith/tin_axe", + "basemetals:toolsmith/tin_shovel", + "basemetals:toolsmith/tin_hoe", + "basemetals:toolsmith/tin_crackhammer", + "basemetals:toolsmith/zinc_ingot", + "basemetals:toolsmith/zinc_pickaxe", + "basemetals:toolsmith/zinc_axe", + "basemetals:toolsmith/zinc_shovel", + "basemetals:toolsmith/zinc_hoe", + "basemetals:toolsmith/zinc_crackhammer", + "basemetals:toolsmith/coal_powder", + "basemetals:toolsmith/charcoal_powder" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/villager_trade/toolsmith/level_2.json b/src/generated/resources/data/minecraft/tags/villager_trade/toolsmith/level_2.json new file mode 100644 index 000000000..61985a6e6 --- /dev/null +++ b/src/generated/resources/data/minecraft/tags/villager_trade/toolsmith/level_2.json @@ -0,0 +1,41 @@ +{ + "replace": false, + "values": [ + "basemetals:toolsmith/brass_axe_enchanted", + "basemetals:toolsmith/brass_hoe_enchanted", + "basemetals:toolsmith/brass_shovel_enchanted", + "basemetals:toolsmith/brass_pickaxe_enchanted", + "basemetals:toolsmith/cupronickel_ingot", + "basemetals:toolsmith/cupronickel_pickaxe", + "basemetals:toolsmith/cupronickel_axe", + "basemetals:toolsmith/cupronickel_shovel", + "basemetals:toolsmith/cupronickel_hoe", + "basemetals:toolsmith/cupronickel_crackhammer", + "basemetals:toolsmith/electrum_ingot", + "basemetals:toolsmith/electrum_pickaxe", + "basemetals:toolsmith/electrum_axe", + "basemetals:toolsmith/electrum_shovel", + "basemetals:toolsmith/electrum_hoe", + "basemetals:toolsmith/electrum_crackhammer", + "basemetals:toolsmith/invar_ingot", + "basemetals:toolsmith/invar_pickaxe", + "basemetals:toolsmith/invar_axe", + "basemetals:toolsmith/invar_shovel", + "basemetals:toolsmith/invar_hoe", + "basemetals:toolsmith/invar_crackhammer", + "basemetals:toolsmith/nickel_axe_enchanted", + "basemetals:toolsmith/nickel_hoe_enchanted", + "basemetals:toolsmith/nickel_shovel_enchanted", + "basemetals:toolsmith/nickel_pickaxe_enchanted", + "basemetals:toolsmith/silver_axe_enchanted", + "basemetals:toolsmith/silver_hoe_enchanted", + "basemetals:toolsmith/silver_shovel_enchanted", + "basemetals:toolsmith/silver_pickaxe_enchanted", + "basemetals:toolsmith/steel_ingot", + "basemetals:toolsmith/steel_pickaxe", + "basemetals:toolsmith/steel_axe", + "basemetals:toolsmith/steel_shovel", + "basemetals:toolsmith/steel_hoe", + "basemetals:toolsmith/steel_crackhammer" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/villager_trade/toolsmith/level_3.json b/src/generated/resources/data/minecraft/tags/villager_trade/toolsmith/level_3.json new file mode 100644 index 000000000..40c381397 --- /dev/null +++ b/src/generated/resources/data/minecraft/tags/villager_trade/toolsmith/level_3.json @@ -0,0 +1,16 @@ +{ + "replace": false, + "values": [ + "basemetals:toolsmith/brass_crackhammer_enchanted", + "basemetals:toolsmith/cupronickel_axe_enchanted", + "basemetals:toolsmith/cupronickel_hoe_enchanted", + "basemetals:toolsmith/cupronickel_shovel_enchanted", + "basemetals:toolsmith/cupronickel_pickaxe_enchanted", + "basemetals:toolsmith/electrum_axe_enchanted", + "basemetals:toolsmith/electrum_hoe_enchanted", + "basemetals:toolsmith/electrum_shovel_enchanted", + "basemetals:toolsmith/electrum_pickaxe_enchanted", + "basemetals:toolsmith/nickel_crackhammer_enchanted", + "basemetals:toolsmith/silver_crackhammer_enchanted" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/villager_trade/toolsmith/level_4.json b/src/generated/resources/data/minecraft/tags/villager_trade/toolsmith/level_4.json new file mode 100644 index 000000000..b28779fa3 --- /dev/null +++ b/src/generated/resources/data/minecraft/tags/villager_trade/toolsmith/level_4.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "basemetals:toolsmith/cupronickel_crackhammer_enchanted", + "basemetals:toolsmith/electrum_crackhammer_enchanted" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/villager_trade/weaponsmith/level_1.json b/src/generated/resources/data/minecraft/tags/villager_trade/weaponsmith/level_1.json new file mode 100644 index 000000000..231be2516 --- /dev/null +++ b/src/generated/resources/data/minecraft/tags/villager_trade/weaponsmith/level_1.json @@ -0,0 +1,52 @@ +{ + "replace": false, + "values": [ + "basemetals:weaponsmith/antimony_ingot", + "basemetals:weaponsmith/antimony_sword", + "basemetals:weaponsmith/antimony_bow", + "basemetals:weaponsmith/antimony_crossbow", + "basemetals:weaponsmith/bismuth_ingot", + "basemetals:weaponsmith/bismuth_sword", + "basemetals:weaponsmith/bismuth_bow", + "basemetals:weaponsmith/bismuth_crossbow", + "basemetals:weaponsmith/brass_ingot", + "basemetals:weaponsmith/brass_sword", + "basemetals:weaponsmith/brass_bow", + "basemetals:weaponsmith/brass_crossbow", + "basemetals:weaponsmith/bronze_ingot", + "basemetals:weaponsmith/bronze_sword", + "basemetals:weaponsmith/bronze_bow", + "basemetals:weaponsmith/bronze_crossbow", + "basemetals:weaponsmith/copper_ingot", + "basemetals:weaponsmith/copper_sword", + "basemetals:weaponsmith/copper_bow", + "basemetals:weaponsmith/copper_crossbow", + "basemetals:weaponsmith/lead_ingot", + "basemetals:weaponsmith/lead_sword", + "basemetals:weaponsmith/lead_bow", + "basemetals:weaponsmith/lead_crossbow", + "basemetals:weaponsmith/mercury_ingot", + "basemetals:weaponsmith/nickel_ingot", + "basemetals:weaponsmith/nickel_sword", + "basemetals:weaponsmith/nickel_bow", + "basemetals:weaponsmith/nickel_crossbow", + "basemetals:weaponsmith/pewter_ingot", + "basemetals:weaponsmith/pewter_sword", + "basemetals:weaponsmith/pewter_bow", + "basemetals:weaponsmith/pewter_crossbow", + "basemetals:weaponsmith/silver_ingot", + "basemetals:weaponsmith/silver_sword", + "basemetals:weaponsmith/silver_bow", + "basemetals:weaponsmith/silver_crossbow", + "basemetals:weaponsmith/tin_ingot", + "basemetals:weaponsmith/tin_sword", + "basemetals:weaponsmith/tin_bow", + "basemetals:weaponsmith/tin_crossbow", + "basemetals:weaponsmith/zinc_ingot", + "basemetals:weaponsmith/zinc_sword", + "basemetals:weaponsmith/zinc_bow", + "basemetals:weaponsmith/zinc_crossbow", + "basemetals:weaponsmith/coal_powder", + "basemetals:weaponsmith/charcoal_powder" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/villager_trade/weaponsmith/level_2.json b/src/generated/resources/data/minecraft/tags/villager_trade/weaponsmith/level_2.json new file mode 100644 index 000000000..1a72ba402 --- /dev/null +++ b/src/generated/resources/data/minecraft/tags/villager_trade/weaponsmith/level_2.json @@ -0,0 +1,30 @@ +{ + "replace": false, + "values": [ + "basemetals:weaponsmith/brass_sword_enchanted", + "basemetals:weaponsmith/brass_crossbow_enchanted", + "basemetals:weaponsmith/brass_bow_enchanted", + "basemetals:weaponsmith/cupronickel_ingot", + "basemetals:weaponsmith/cupronickel_sword", + "basemetals:weaponsmith/cupronickel_bow", + "basemetals:weaponsmith/cupronickel_crossbow", + "basemetals:weaponsmith/electrum_ingot", + "basemetals:weaponsmith/electrum_sword", + "basemetals:weaponsmith/electrum_bow", + "basemetals:weaponsmith/electrum_crossbow", + "basemetals:weaponsmith/invar_ingot", + "basemetals:weaponsmith/invar_sword", + "basemetals:weaponsmith/invar_bow", + "basemetals:weaponsmith/invar_crossbow", + "basemetals:weaponsmith/nickel_sword_enchanted", + "basemetals:weaponsmith/nickel_crossbow_enchanted", + "basemetals:weaponsmith/nickel_bow_enchanted", + "basemetals:weaponsmith/silver_sword_enchanted", + "basemetals:weaponsmith/silver_crossbow_enchanted", + "basemetals:weaponsmith/silver_bow_enchanted", + "basemetals:weaponsmith/steel_ingot", + "basemetals:weaponsmith/steel_sword", + "basemetals:weaponsmith/steel_bow", + "basemetals:weaponsmith/steel_crossbow" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/villager_trade/weaponsmith/level_3.json b/src/generated/resources/data/minecraft/tags/villager_trade/weaponsmith/level_3.json new file mode 100644 index 000000000..ac3fae24c --- /dev/null +++ b/src/generated/resources/data/minecraft/tags/villager_trade/weaponsmith/level_3.json @@ -0,0 +1,11 @@ +{ + "replace": false, + "values": [ + "basemetals:weaponsmith/cupronickel_sword_enchanted", + "basemetals:weaponsmith/cupronickel_crossbow_enchanted", + "basemetals:weaponsmith/cupronickel_bow_enchanted", + "basemetals:weaponsmith/electrum_sword_enchanted", + "basemetals:weaponsmith/electrum_crossbow_enchanted", + "basemetals:weaponsmith/electrum_bow_enchanted" + ] +} \ No newline at end of file diff --git a/src/integratedSmoke/java/zone/moddev/mc/basemetals/smoke/ConfigScreenSmoke.java b/src/integratedSmoke/java/zone/moddev/mc/basemetals/smoke/ConfigScreenSmoke.java index 46d03dc01..d30e35aa0 100644 --- a/src/integratedSmoke/java/zone/moddev/mc/basemetals/smoke/ConfigScreenSmoke.java +++ b/src/integratedSmoke/java/zone/moddev/mc/basemetals/smoke/ConfigScreenSmoke.java @@ -25,7 +25,7 @@ static void verify(Minecraft minecraft, Screen parent) { } private static void verifyOnce(Minecraft minecraft, Screen parent) { - var mod = ModList.get().getModContainerById(BaseMetals.MOD_ID).orElseThrow().getModInfo(); + var mod = ModList.getModContainerById(BaseMetals.MOD_ID).orElseThrow().getModInfo(); Screen forgeScreen = ConfigScreenHandler.getScreenFactoryFor(mod).orElseThrow().apply(minecraft, parent); require(forgeScreen instanceof BaseMetalsConfigScreen, "Forge Config button has the wrong screen"); diff --git a/src/integratedSmoke/java/zone/moddev/mc/basemetals/smoke/IntegratedWorldSmoke.java b/src/integratedSmoke/java/zone/moddev/mc/basemetals/smoke/IntegratedWorldSmoke.java index bd057bc1a..a5f767f4f 100644 --- a/src/integratedSmoke/java/zone/moddev/mc/basemetals/smoke/IntegratedWorldSmoke.java +++ b/src/integratedSmoke/java/zone/moddev/mc/basemetals/smoke/IntegratedWorldSmoke.java @@ -9,7 +9,6 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.gui.screens.TitleScreen; -import net.minecraft.client.renderer.ItemBlockRenderTypes; import net.minecraft.client.renderer.chunk.ChunkSectionLayer; import net.minecraft.core.NonNullList; import net.minecraft.core.RegistryAccess; @@ -87,7 +86,7 @@ public static void onClientTick(TickEvent.ClientTickEvent.Post event) { String expectedMods = System.getProperty("basemetals.expectedSmokeMods", ""); if (!expectedMods.isEmpty()) { var expected = new java.util.TreeSet<>(java.util.List.of(expectedMods.split(","))); - var actual = new java.util.TreeSet<>(net.minecraftforge.fml.ModList.get().getMods().stream() + var actual = new java.util.TreeSet<>(net.minecraftforge.fml.ModList.getMods().stream() .map(net.minecraftforge.forgespi.language.IModInfo::getModId).toList()); boolean allowDependencies = Boolean.getBoolean("basemetals.allowExtraSmokeMods"); if (allowDependencies ? !actual.containsAll(expected) : !actual.equals(expected)) { @@ -111,13 +110,18 @@ public static void onClientTick(TickEvent.ClientTickEvent.Post event) { verifyBarsModels(minecraft); creationStarted = true; String worldName = System.getProperty(WORLD_PROPERTY, "basemetals-integrated-smoke"); + if (Boolean.getBoolean("basemetals.integratedExistingWorldSmoke")) { + minecraft.createWorldOpenFlows().openWorld(worldName, () -> { + throw new IllegalStateException("The disposable upgrade world was not opened"); + }); + return; + } + LevelSettings levelSettings = new LevelSettings( "Base Metals Integrated Smoke", GameType.CREATIVE, - false, - Difficulty.NORMAL, + new LevelSettings.DifficultySettings(Difficulty.NORMAL, false, false), true, - new GameRules(net.minecraft.world.flag.FeatureFlags.DEFAULT_FLAGS), net.minecraft.world.level.WorldDataConfiguration.DEFAULT); BaseMetals.LOGGER.info("BASEMETALS_INTEGRATED_SMOKE creating world={}", worldName); minecraft.createWorldOpenFlows().createFreshLevel(worldName, levelSettings, @@ -127,7 +131,9 @@ public static void onClientTick(TickEvent.ClientTickEvent.Post event) { if (creationStarted && minecraft.screen instanceof net.minecraft.client.gui.screens.ConfirmScreen) { String title = minecraft.screen.getTitle().getString(); - if (!title.toLowerCase(java.util.Locale.ROOT).contains("experimental")) { + boolean finishedUpgrade = Boolean.getBoolean("basemetals.integratedExistingWorldSmoke") + && title.equals(net.minecraft.client.resources.language.I18n.get("upgradeWorld.done")); + if (!finishedUpgrade && !title.toLowerCase(java.util.Locale.ROOT).contains("experimental")) { throw new IllegalStateException("Unexpected confirmation in the disposable world: " + title); } // Forge marks modded registries experimental. This applies only to the new smoke-test world. @@ -135,11 +141,21 @@ public static void onClientTick(TickEvent.ClientTickEvent.Post event) { .map(net.minecraft.client.gui.components.Button.class::cast).findFirst().orElseThrow().onPress(new net.minecraft.client.input.KeyEvent(257, 0, 0)); } + if (creationStarted && Boolean.getBoolean("basemetals.integratedExistingWorldSmoke") + && minecraft.screen instanceof net.minecraft.client.gui.screens.BackupConfirmScreen backup) { + backup.children().stream().filter(net.minecraft.client.gui.components.Button.class::isInstance) + .map(net.minecraft.client.gui.components.Button.class::cast) + .filter(button -> button.getMessage().getString().equals( + net.minecraft.client.gui.screens.BackupConfirmScreen.BACKUP_AND_JOIN.getString())) + .findFirst().orElseThrow().onPress(new net.minecraft.client.input.KeyEvent(257, 0, 0)); + } + if (minecraft.hasSingleplayerServer() && minecraft.getSingleplayerServer() != null && minecraft.level != null && minecraft.player != null) { ServerLevel serverLevel = minecraft.getSingleplayerServer().getLevel(minecraft.level.dimension()); if (serverLevel != null && serverLevel.getServer().isRunning()) { if (!creativeBucketsChecked) { + if (Boolean.getBoolean("basemetals.embeddedPlayerSmoke")) verifyEmbeddedPlayer(minecraft); // Other mods may use server settings while building creative tooltips. verifyCreativeBuckets(minecraft); creativeBucketsChecked = true; @@ -184,17 +200,37 @@ public static void onClientTick(TickEvent.ClientTickEvent.Post event) { } } - private static java.util.List quads( - net.minecraft.client.renderer.block.model.BlockStateModel model, net.minecraft.core.Direction face) { - var result = new java.util.ArrayList(); - for (var part : model.collectParts(net.minecraft.util.RandomSource.create(0))) { + private static void verifyEmbeddedPlayer(Minecraft minecraft) { + var expected = java.util.List.of("adamantine_axe", "adamantine_bars", "adamantine_block", + "adamantine_boots", "adamantine_chestplate", "adamantine_crackhammer", + "adamantine_door", "adamantine_door", "adamantine_gear"); + for (int slot = 0; slot < expected.size(); slot++) { + var stack = minecraft.player.getInventory().getItem(slot); + var id = net.minecraftforge.registries.ForgeRegistries.ITEMS.getKey(stack.getItem()); + var data = stack.get(net.minecraft.core.component.DataComponents.CUSTOM_DATA); + if (!id.toString().equals("basemetals:" + expected.get(slot)) || data == null + || data.copyTag().getCompoundOrEmpty("basemetals_fixture") + .getStringOr("player_proof", "").isEmpty()) { + throw new IllegalStateException("Embedded player item was lost at slot " + slot + ": " + stack); + } + } + BaseMetals.LOGGER.info("BASEMETALS_EMBEDDED_PLAYER PASS inventory=9 custom_data=preserved"); + } + + private static java.util.List quads( + net.minecraft.client.renderer.block.dispatch.BlockStateModel model, net.minecraft.core.Direction face) { + var result = new java.util.ArrayList(); + var parts = new java.util.ArrayList(); + model.collectParts(net.minecraft.util.RandomSource.create(0), parts, + net.minecraftforge.client.model.data.ModelData.EMPTY); + for (var part : parts) { result.addAll(part.getQuads(face)); } return result; } - private static int[] vertices(net.minecraft.client.renderer.block.model.BakedQuad quad) { + private static int[] vertices(net.minecraft.client.resources.model.geometry.BakedQuad quad) { int[] result = new int[32]; for (int vertex = 0; vertex < 4; vertex++) { var position = quad.position(vertex); @@ -211,7 +247,7 @@ private static void verifyOreOverlayModels(Minecraft minecraft) { for (var entry : ModContent.blocksById().entrySet()) { if (!entry.getKey().endsWith("_ore")) continue; var state = entry.getValue().get().defaultBlockState(); - var model = minecraft.getBlockRenderer().getBlockModel(state); + var model = minecraft.getModelManager().getBlockStateModelSet().get(state); for (var face : net.minecraft.core.Direction.values()) { var quads = quads(model, face); if (quads.size() != 2) throw new IllegalStateException("Ore model lost a layer: " + entry.getKey()); @@ -227,9 +263,9 @@ private static void verifyOreOverlayModels(Minecraft minecraft) { }); if (!offset) throw new IllegalStateException("Ore overlay is flush with its host: " + entry.getKey()); } - var layers = model.getRenderTypes(state, net.minecraft.util.RandomSource.create(0), - net.minecraftforge.client.model.data.ModelData.EMPTY); - if (!layers.contains(ChunkSectionLayer.CUTOUT) || layers.contains(ChunkSectionLayer.SOLID)) { + var layers = renderLayers(model); + if (!layers.contains(ChunkSectionLayer.CUTOUT) || !layers.contains(ChunkSectionLayer.SOLID) + || layers.contains(ChunkSectionLayer.TRANSLUCENT)) { throw new IllegalStateException("Ore overlay is not cutout: " + entry.getKey()); } ores++; @@ -260,7 +296,7 @@ private static void verifyBarsModels(Minecraft minecraft) { continue; } - var model = minecraft.getBlockRenderer().getBlockModel(state); + var model = minecraft.getModelManager().getBlockStateModelSet().get(state); var quads = new java.util.ArrayList<>(quads(model, null)); for (var face : net.minecraft.core.Direction.values()) { quads.addAll(quads(model, face)); @@ -324,23 +360,25 @@ private static void verifyBlockRenderLayers(Minecraft minecraft) { int trapdoors = 0; for (var reference : ModContent.blocksById().values()) { Block block = reference.get(); - ChunkSectionLayer expected = null; + boolean check = false; if (block instanceof IronBarsBlock) { - expected = ChunkSectionLayer.CUTOUT; + check = true; bars++; } else if (block instanceof DoorBlock) { - expected = ChunkSectionLayer.CUTOUT; + check = true; doors++; } else if (block instanceof TrapDoorBlock) { - expected = ChunkSectionLayer.CUTOUT; + check = true; trapdoors++; } - var state = block.defaultBlockState(); - var layers = minecraft.getBlockRenderer().getBlockModel(state).getRenderTypes(state, - net.minecraft.util.RandomSource.create(0), net.minecraftforge.client.model.data.ModelData.EMPTY); - if (expected != null && (!layers.contains(expected) || layers.contains(ChunkSectionLayer.SOLID))) { - throw new IllegalStateException("BASEMETALS_INTEGRATED_SMOKE FAIL: wrong render layer for " - + net.minecraftforge.registries.ForgeRegistries.BLOCKS.getKey(block)); + + if (check) { + for (var state : block.getStateDefinition().getPossibleStates()) { + var model = minecraft.getModelManager().getBlockStateModelSet().get(state); + var faces = new java.util.ArrayList<>(quads(model, null)); + for (var direction : net.minecraft.core.Direction.values()) faces.addAll(quads(model, direction)); + for (var quad : faces) verifyQuadTransparency(quad); + } } } if (bars != 26 || doors != 26 || trapdoors != 26) { @@ -353,6 +391,48 @@ private static void verifyBlockRenderLayers(Minecraft minecraft) { bars, doors, trapdoors); } + private static void verifyQuadTransparency(net.minecraft.client.resources.model.geometry.BakedQuad quad) { + var sprite = quad.materialInfo().sprite(); + if (sprite.contents().name().getPath().equals("missingno")) { + throw new IllegalStateException("Missing transparent-block sprite"); + } + + float minU = 1, minV = 1, maxU = 0, maxV = 0; + for (int vertex = 0; vertex < 4; vertex++) { + float u = net.minecraft.client.model.geom.builders.UVPair.unpackU(quad.packedUV(vertex)); + float v = net.minecraft.client.model.geom.builders.UVPair.unpackV(quad.packedUV(vertex)); + u = Math.clamp((u - sprite.getU0()) / (sprite.getU1() - sprite.getU0()), 0, 1); + v = Math.clamp((v - sprite.getV0()) / (sprite.getV1() - sprite.getV0()), 0, 1); + minU = Math.min(minU, u); + minV = Math.min(minV, v); + maxU = Math.max(maxU, u); + maxV = Math.max(maxV, v); + } + + // Undo atlas rounding at pixel edges before checking the pixels used by this face. + int width = sprite.contents().width(); + int height = sprite.contents().height(); + minU = Math.round(minU * width) / (float) width; + maxU = Math.round(maxU * width) / (float) width; + minV = Math.round(minV * height) / (float) height; + maxV = Math.round(maxV * height) / (float) height; + var expected = ChunkSectionLayer.byTransparency(sprite.contents().computeTransparency(minU, minV, maxU, maxV)); + if (quad.materialInfo().layer() != expected || expected == ChunkSectionLayer.TRANSLUCENT) { + throw new IllegalStateException("Wrong face transparency for " + sprite.contents().name() + + ": expected=" + expected + ", actual=" + quad.materialInfo().layer()); + } + } + + private static java.util.Set renderLayers( + net.minecraft.client.renderer.block.dispatch.BlockStateModel model) { + var layers = java.util.EnumSet.noneOf(ChunkSectionLayer.class); + quads(model, null).forEach(quad -> layers.add(quad.materialInfo().layer())); + for (var face : net.minecraft.core.Direction.values()) { + quads(model, face).forEach(quad -> layers.add(quad.materialInfo().layer())); + } + return layers; + } + private static void verifyCreativeBuckets(Minecraft minecraft) { NonNullList itemsTab = NonNullList.create(); NonNullList searchTab = NonNullList.create(); @@ -385,6 +465,20 @@ private static void verifyCreativeBuckets(Minecraft minecraft) { java.util.List bucketSearch = minecraft.getConnection().searchTrees() .creativeNameSearch().search("bucket"); for (var fluid : ModContent.fluids().entrySet()) { + var appearance = net.minecraftforge.client.extensions.common.IClientFluidTypeExtensions + .of(fluid.getValue().source().get()); + for (var kind : java.util.List.of(fluid.getValue().source().get(), fluid.getValue().flowing().get())) { + var baked = minecraft.getModelManager().getFluidStateModelSet().get(kind.defaultFluidState()); + if (baked.layer() != ChunkSectionLayer.TRANSLUCENT + || !baked.stillMaterial().sprite().contents().name().equals(appearance.getStillTexture()) + || !baked.flowingMaterial().sprite().contents().name().equals(appearance.getFlowingTexture()) + || baked.tintSource() == null + || baked.tintSource().color(fluid.getValue().block().get().defaultBlockState()) + != appearance.getTintColor()) { + throw new IllegalStateException("Wrong native fluid model for " + fluid.getKey()); + } + } + net.minecraft.world.item.Item bucket = fluid.getValue().bucket().get(); ItemStack bucketStack = bucket.getDefaultInstance(); if (itemsTab.stream().noneMatch(stack -> stack.is(bucket)) @@ -407,14 +501,18 @@ private static void verifyCreativeBuckets(Minecraft minecraft) { var quads = itemQuads(model); var still = net.minecraftforge.client.extensions.common.IClientFluidTypeExtensions .of(fluid.getValue().source().get()).getStillTexture(); - if (quads.stream().noneMatch(quad -> quad.tintIndex() == 1 - && quad.sprite().contents().name().equals(still))) { + var bucketStill = still.withPath(still.getPath().replaceFirst("^block/", "item/")); + if (quads.stream().noneMatch(quad -> quad.materialInfo().tintIndex() == 1 + && quad.materialInfo().sprite().contents().name().equals(bucketStill) + && quad.materialInfo().sprite().atlasLocation().equals( + net.minecraft.client.renderer.texture.TextureAtlas.LOCATION_ITEMS))) { throw new IllegalStateException("Bucket has no tinted fluid layer: " + fluid.getKey()); } } BaseMetals.LOGGER.info( "BASEMETALS_INTEGRATED_SMOKE creative buckets PASS count={}", ModContent.fluids().size()); + BaseMetals.LOGGER.info("BASEMETALS_FLUID_MODELS PASS source_and_flowing=72"); } private static void verifyItemModels(Minecraft minecraft) { @@ -426,7 +524,7 @@ private static void verifyItemModels(Minecraft minecraft) { var quads = itemQuads(state); if (state.isEmpty() || quads.isEmpty() || quads.stream().anyMatch(quad -> - quad.sprite().contents().name().getPath().equals("missingno"))) { + quad.materialInfo().sprite().contents().name().getPath().equals("missingno"))) { throw new IllegalStateException("Missing item model or texture: " + entry.getKey()); } } @@ -434,7 +532,7 @@ private static void verifyItemModels(Minecraft minecraft) { BaseMetals.LOGGER.info("BASEMETALS_ITEM_MODELS PASS items={}", ModContent.itemsById().size()); } - private static java.util.List itemQuads( + private static java.util.List itemQuads( net.minecraft.client.renderer.item.ItemStackRenderState state) { try { var layersField = state.getClass().getDeclaredField("layers"); @@ -443,7 +541,7 @@ private static java.util.List(); + var result = new java.util.ArrayList(); for (int index = 0; index < countField.getInt(state); index++) { result.addAll(layers[index].prepareQuadList()); diff --git a/src/main/java/zone/moddev/mc/basemetals/BaseMetals.java b/src/main/java/zone/moddev/mc/basemetals/BaseMetals.java index 7e6d8d3f4..fadd00ec1 100644 --- a/src/main/java/zone/moddev/mc/basemetals/BaseMetals.java +++ b/src/main/java/zone/moddev/mc/basemetals/BaseMetals.java @@ -38,6 +38,7 @@ public BaseMetals(FMLJavaModLoadingContext context) { CrushingRecipe.SERIALIZERS.register(modBus); ModEntities.register(modBus); ModLoot.register(modBus); + zone.moddev.mc.basemetals.trade.TradeEnabledCondition.register(modBus); context.registerConfig(ModConfig.Type.COMMON, BaseMetalsConfig.SPEC); if (net.minecraftforge.fml.loading.FMLEnvironment.dist == net.minecraftforge.api.distmarker.Dist.CLIENT) { zone.moddev.mc.basemetals.client.ClientSetup.register(context); diff --git a/src/main/java/zone/moddev/mc/basemetals/BaseMetalsEvents.java b/src/main/java/zone/moddev/mc/basemetals/BaseMetalsEvents.java index b781a137f..4201672c2 100644 --- a/src/main/java/zone/moddev/mc/basemetals/BaseMetalsEvents.java +++ b/src/main/java/zone/moddev/mc/basemetals/BaseMetalsEvents.java @@ -40,8 +40,6 @@ import zone.moddev.mc.basemetals.material.MaterialDefinition; import net.minecraftforge.event.level.BlockEvent; import net.minecraftforge.eventbus.api.listener.Priority; -import net.minecraftforge.event.village.VillagerTradesEvent; -import zone.moddev.mc.basemetals.trade.BaseMetalsTrades; import zone.moddev.mc.basemetals.migration.Legacy112WorldMigrator; import net.minecraft.world.level.storage.LevelResource; import net.minecraftforge.event.server.ServerAboutToStartEvent; @@ -59,7 +57,6 @@ public static void register() { PlayerEvent.ItemCraftedEvent.BUS.addListener(handlers::onItemCrafted); PlayerEvent.ItemSmeltedEvent.BUS.addListener(handlers::onItemSmelted); BlockEvent.EntityPlaceEvent.BUS.addListener(handlers::onBlockPlaced); - VillagerTradesEvent.BUS.addListener(handlers::onVillagerTrades); } public void onPlayerLogin(PlayerEvent.PlayerLoggedInEvent event) { @@ -82,7 +79,6 @@ public void onServerAboutToStart(ServerAboutToStartEvent event) { try { java.nio.file.Path worldRoot = event.getServer().getWorldPath(LevelResource.ROOT); Legacy112WorldMigrator.migrateIfNeeded(worldRoot); - Legacy112WorldMigrator.refreshLoadedSingleplayerPlayer(event.getServer(), worldRoot); } catch (java.io.IOException exception) { throw new IllegalStateException( "Base Metals could not safely pre-flatten the legacy Forge 1.10/1.12 world", exception); @@ -203,7 +199,7 @@ public void onLivingHurt(LivingHurtEvent event) { if (target.fireImmune()) event.setAmount(event.getAmount() + 3.0F); } case "mithril" -> { - if (target.getType().is(net.minecraft.tags.EntityTypeTags.UNDEAD)) { + if (target.getType().builtInRegistryHolder().is(net.minecraft.tags.EntityTypeTags.UNDEAD)) { target.addEffect(new MobEffectInstance(MobEffects.WITHER, 60, 3)); target.addEffect(new MobEffectInstance(MobEffects.BLINDNESS, 60, 1)); } @@ -269,7 +265,4 @@ public void onBlockPlaced(BlockEvent.EntityPlaceEvent event) { } } - public void onVillagerTrades(VillagerTradesEvent event) { - BaseMetalsTrades.add(event); - } } diff --git a/src/main/java/zone/moddev/mc/basemetals/client/BaseMetalsConfigScreen.java b/src/main/java/zone/moddev/mc/basemetals/client/BaseMetalsConfigScreen.java index e3001d8de..b831d5826 100644 --- a/src/main/java/zone/moddev/mc/basemetals/client/BaseMetalsConfigScreen.java +++ b/src/main/java/zone/moddev/mc/basemetals/client/BaseMetalsConfigScreen.java @@ -3,7 +3,7 @@ import java.util.ArrayList; import java.util.List; -import net.minecraft.client.gui.GuiGraphics; +import net.minecraft.client.gui.GuiGraphicsExtractor; import net.minecraft.client.gui.components.Button; import net.minecraft.client.gui.screens.ConfirmScreen; import net.minecraft.client.gui.screens.Screen; @@ -121,10 +121,10 @@ public void onClose() { } @Override - public void render(GuiGraphics graphics, int mouseX, int mouseY, float partialTicks) { - renderBackground(graphics, mouseX, mouseY, partialTicks); - super.render(graphics, mouseX, mouseY, partialTicks); - graphics.drawCenteredString(font, title, width / 2, 12, 0xFFFFFFFF); + public void extractRenderState(GuiGraphicsExtractor graphics, int mouseX, int mouseY, float partialTicks) { + extractBackground(graphics, mouseX, mouseY, partialTicks); + super.extractRenderState(graphics, mouseX, mouseY, partialTicks); + graphics.centeredText(font, title, width / 2, 12, 0xFFFFFFFF); for (net.minecraft.client.gui.components.events.GuiEventListener child : children()) { if (child instanceof OptionButton && ((OptionButton) child).isHoveredOrFocused()) { diff --git a/src/main/java/zone/moddev/mc/basemetals/client/ClientSetup.java b/src/main/java/zone/moddev/mc/basemetals/client/ClientSetup.java index 4ed024395..9c6df9a3a 100644 --- a/src/main/java/zone/moddev/mc/basemetals/client/ClientSetup.java +++ b/src/main/java/zone/moddev/mc/basemetals/client/ClientSetup.java @@ -1,34 +1,27 @@ package zone.moddev.mc.basemetals.client; +import net.minecraft.client.renderer.block.FluidModel; +import net.minecraft.client.resources.model.sprite.Material; +import net.minecraftforge.client.ConfigScreenHandler; +import net.minecraftforge.client.event.EntityRenderersEvent; +import net.minecraftforge.client.event.ModelEvent; +import net.minecraftforge.client.extensions.common.IClientFluidTypeExtensions; +import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent; +import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext; import zone.moddev.mc.basemetals.BaseMetals; -import zone.moddev.mc.basemetals.content.MaterialItems; import zone.moddev.mc.basemetals.content.ModContent; import zone.moddev.mc.basemetals.entity.ModEntities; - -import net.minecraft.client.renderer.ItemBlockRenderTypes; -import net.minecraft.client.renderer.chunk.ChunkSectionLayer; -import net.minecraft.resources.Identifier; -import net.minecraft.world.entity.player.Player; -import net.minecraft.world.item.FishingRodItem; -import net.minecraft.world.level.block.Block; -import net.minecraft.world.level.block.DoorBlock; -import net.minecraft.world.level.block.IronBarsBlock; -import net.minecraft.world.level.block.TrapDoorBlock; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.client.event.EntityRenderersEvent; -import net.minecraftforge.eventbus.api.listener.SubscribeEvent; -import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent; -import net.minecraftforge.fml.common.Mod; +import zone.moddev.mc.orespawn.api.client.WorldSettingsExtensionRegistry; public final class ClientSetup { private ClientSetup() {} - public static void register(net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext context) { + public static void register(FMLJavaModLoadingContext context) { EntityRenderersEvent.RegisterRenderers.BUS.addListener(ClientSetup::registerRenderers); + ModelEvent.BakeFluidModels.BUS.addListener(ClientSetup::bakeFluidModels); FMLClientSetupEvent.getBus(context.getModBusGroup()).addListener(ClientSetup::clientSetup); - context.registerExtensionPoint( - net.minecraftforge.client.ConfigScreenHandler.ConfigScreenFactory.class, - () -> new net.minecraftforge.client.ConfigScreenHandler.ConfigScreenFactory( + context.registerExtensionPoint(ConfigScreenHandler.ConfigScreenFactory.class, + () -> new ConfigScreenHandler.ConfigScreenFactory( (minecraft, parent) -> new BaseMetalsConfigScreen(parent))); } @@ -38,29 +31,21 @@ public static void registerRenderers(EntityRenderersEvent.RegisterRenderers even } public static void clientSetup(FMLClientSetupEvent event) { - event.enqueueWork(() -> { - zone.moddev.mc.orespawn.api.client.WorldSettingsExtensionRegistry.registerConfigScreen( - BaseMetals.MOD_ID, BaseMetalsConfigScreen::new); - ModContent.blocksById().forEach((id, block) -> { - if (id.endsWith("_ore")) ItemBlockRenderTypes.setRenderLayer(block.get(), ChunkSectionLayer.CUTOUT); - }); - ModContent.fluids().values().forEach(fluid -> { - ItemBlockRenderTypes.setRenderLayer(fluid.source().get(), ChunkSectionLayer.TRANSLUCENT); - ItemBlockRenderTypes.setRenderLayer(fluid.flowing().get(), ChunkSectionLayer.TRANSLUCENT); - }); - ModContent.blocksById().values().stream() - .map(entry -> entry.get()) - .forEach(ClientSetup::registerBlockRenderLayer); - - - }); + event.enqueueWork(() -> WorldSettingsExtensionRegistry.registerConfigScreen( + BaseMetals.MOD_ID, BaseMetalsConfigScreen::new)); } - private static void registerBlockRenderLayer(Block block) { - if (block instanceof IronBarsBlock) { - ItemBlockRenderTypes.setRenderLayer(block, ChunkSectionLayer.CUTOUT); - } else if (block instanceof DoorBlock || block instanceof TrapDoorBlock) { - ItemBlockRenderTypes.setRenderLayer(block, ChunkSectionLayer.CUTOUT); - } + public static void bakeFluidModels(ModelEvent.BakeFluidModels event) { + ModContent.fluids().forEach((name, fluid) -> { + var appearance = IClientFluidTypeExtensions.of(fluid.source().get()); + var unbaked = new FluidModel.Unbaked( + new Material(appearance.getStillTexture(), true), + new Material(appearance.getFlowingTexture(), true), + null, state -> appearance.getTintColor()); + var model = unbaked.bake(event.materials(), () -> "Base Metals " + name); + + event.register(fluid.source().get(), model); + event.register(fluid.flowing().get(), model); + }); } } diff --git a/src/main/java/zone/moddev/mc/basemetals/client/MaterialProjectileRenderer.java b/src/main/java/zone/moddev/mc/basemetals/client/MaterialProjectileRenderer.java index 411fbd636..799cfbea9 100644 --- a/src/main/java/zone/moddev/mc/basemetals/client/MaterialProjectileRenderer.java +++ b/src/main/java/zone/moddev/mc/basemetals/client/MaterialProjectileRenderer.java @@ -9,7 +9,7 @@ import net.minecraft.client.renderer.entity.EntityRendererProvider; import net.minecraft.client.renderer.entity.state.ArrowRenderState; import net.minecraft.client.renderer.rendertype.RenderTypes; -import net.minecraft.client.renderer.state.CameraRenderState; +import net.minecraft.client.renderer.state.level.CameraRenderState; import net.minecraft.client.renderer.texture.OverlayTexture; import net.minecraft.resources.Identifier; import zone.moddev.mc.basemetals.content.MaterialBacked; diff --git a/src/main/java/zone/moddev/mc/basemetals/content/CrackhammerItem.java b/src/main/java/zone/moddev/mc/basemetals/content/CrackhammerItem.java index 9fe1aeea7..58d4045c2 100644 --- a/src/main/java/zone/moddev/mc/basemetals/content/CrackhammerItem.java +++ b/src/main/java/zone/moddev/mc/basemetals/content/CrackhammerItem.java @@ -88,7 +88,7 @@ public InteractionResult useOn(UseOnContext context) { context.getLevel().playSound(null, context.getClickedPos(), net.minecraft.sounds.SoundEvents.GRAVEL_BREAK, net.minecraft.sounds.SoundSource.BLOCKS, 0.5F, - 0.5F + (context.getLevel().random.nextFloat() * 0.3F)); + 0.5F + (context.getLevel().getRandom().nextFloat() * 0.3F)); return InteractionResult.CONSUME; } return InteractionResult.PASS; diff --git a/src/main/java/zone/moddev/mc/basemetals/content/MoltenMetalBlock.java b/src/main/java/zone/moddev/mc/basemetals/content/MoltenMetalBlock.java index 58c4b3d61..5f6b5bd09 100644 --- a/src/main/java/zone/moddev/mc/basemetals/content/MoltenMetalBlock.java +++ b/src/main/java/zone/moddev/mc/basemetals/content/MoltenMetalBlock.java @@ -27,7 +27,7 @@ public void entityInside(BlockState state, Level level, BlockPos pos, Entity ent net.minecraft.world.entity.InsideBlockEffectApplier effects, boolean intersects) { super.entityInside(state, level, pos, entity, effects, intersects); if (mercury && !level.isClientSide() && BaseMetalsConfig.MERCURY_EFFECTS.get() - && entity instanceof LivingEntity living && level.random.nextInt(32) == 0) { + && entity instanceof LivingEntity living && level.getRandom().nextInt(32) == 0) { living.addEffect(new MobEffectInstance(MobEffects.NAUSEA, 30 * 20, 2)); } } diff --git a/src/main/java/zone/moddev/mc/basemetals/migration/Legacy112WorldMigrator.java b/src/main/java/zone/moddev/mc/basemetals/migration/Legacy112WorldMigrator.java index 09f26f0c6..b8b55a2d6 100644 --- a/src/main/java/zone/moddev/mc/basemetals/migration/Legacy112WorldMigrator.java +++ b/src/main/java/zone/moddev/mc/basemetals/migration/Legacy112WorldMigrator.java @@ -43,7 +43,6 @@ import net.minecraft.nbt.NbtUtils; import net.minecraft.nbt.Tag; import net.minecraft.resources.Identifier; -import net.minecraft.server.MinecraftServer; import net.minecraft.util.datafix.DataFixTypes; import net.minecraft.util.datafix.DataFixers; import net.minecraft.world.level.block.Block; @@ -82,25 +81,19 @@ public final class Legacy112WorldMigrator { private static final String MARKER = "BASEMETALS_1_12_BLOCK_MIGRATION_COMPLETE.txt"; private static final String BACKUP_DIRECTORY = "basemetals-1.12-region-backup"; private static Path preparedWorld; - private static CompoundTag preparedPlayer; - private static int preparedVersion; private Legacy112WorldMigrator() {} static void beginWorldLoad() { preparedWorld = null; - preparedPlayer = null; - preparedVersion = 0; } - /** Keep the original player before Forge and vanilla read the old save. */ + /** Keep this load's provenance before Minecraft rewrites level.dat. */ static void prepareWorld(Path levelDat, CompoundTag root) { if (!isLegacyLevel(root)) return; CompoundTag data = root.getCompoundOrEmpty("Data"); preparedWorld = levelDat.toAbsolutePath().normalize().getParent(); - preparedVersion = data.getIntOr("DataVersion", 0); - preparedPlayer = zone.moddev.mc.basemetals.migration.NbtCompat.containsTag(data, "Player", Tag.TAG_COMPOUND) ? data.getCompoundOrEmpty("Player").copy() : null; } private static boolean isLegacyLevel(CompoundTag root) { @@ -156,8 +149,7 @@ public static void migrateIfNeeded(Path worldRoot) throws IOException { convertedDamageValues += result.convertedDamageValues(); } } - ItemMigration looseItems = restoreRewrittenSingleplayerPlayer(root) - .plus(migrateLooseInventories(root)); + ItemMigration looseItems = migrateLooseInventories(root); convertedBuckets += looseItems.convertedBuckets(); convertedItemAliases += looseItems.convertedItemAliases(); convertedDamageValues += looseItems.convertedDamageValues(); @@ -183,25 +175,6 @@ public static void migrateIfNeeded(Path worldRoot) throws IOException { BaseMetals.LOGGER.info(result); } - /** - * The integrated server reads the root Player tag before - * {@link net.minecraftforge.event.server.ServerAboutToStartEvent}. Reload - * that one tag from the corrected level.dat so the first upgraded - * single-player session receives the same item migration as playerdata. - */ - public static void refreshLoadedSingleplayerPlayer(MinecraftServer server, Path worldRoot) throws IOException { - CompoundTag loaded = server.getWorldData().getLoadedPlayerTag(); - if (loaded == null) return; - CompoundTag level = LegacyNbt.readCompressed(worldRoot.resolve("level.dat").toFile()); - CompoundTag data = level.getCompoundOrEmpty("Data"); - if (!zone.moddev.mc.basemetals.migration.NbtCompat.containsTag(data, "Player", Tag.TAG_COMPOUND)) return; - int version = data.getIntOr("DataVersion", 0); - CompoundTag corrected = DataFixTypes.PLAYER.updateToCurrentVersion(DataFixers.getDataFixer(), - data.getCompoundOrEmpty("Player"), version); - for (String key : List.copyOf(loaded.keySet())) loaded.remove(key); - loaded.merge(corrected); - } - private static Map oldBlockIds(CompoundTag level) { CompoundTag registries = level.getCompoundOrEmpty("FML").getCompoundOrEmpty("Registries"); ListTag ids = registries.getCompoundOrEmpty("minecraft:blocks").getListOrEmpty("ids"); @@ -307,7 +280,7 @@ private static RegionConversion convertRegion(Path root, Path region, Map>> 5)); if ((compression & 128) != 0) { - externalFiles.add(region.getParent().resolve("c." + chunkPos.x + "." + chunkPos.z + ".mcc")); + externalFiles.add(region.getParent().resolve("c." + chunkPos.x() + "." + chunkPos.z() + ".mcc")); } CompoundTag chunk; @@ -400,13 +373,15 @@ static CompoundTag convertChunkForTest(CompoundTag chunk, Map i private static ItemMigration migrateLooseInventories(Path root) throws IOException { List files = new ArrayList<>(); files.add(root.resolve("level.dat")); - Path playerData = root.resolve("playerdata"); - if (Files.isDirectory(playerData)) { - try (var paths = Files.list(playerData)) { - paths.filter(Files::isRegularFile) - .filter(path -> path.getFileName().toString().endsWith(".dat")) - .sorted() - .forEach(files::add); + for (String directory : List.of("playerdata", "players/data")) { + Path playerData = root.resolve(directory); + if (Files.isDirectory(playerData)) { + try (var paths = Files.list(playerData)) { + paths.filter(Files::isRegularFile) + .filter(path -> path.getFileName().toString().endsWith(".dat")) + .sorted() + .forEach(files::add); + } } } @@ -425,33 +400,6 @@ private static ItemMigration migrateLooseInventories(Path root) throws IOExcepti return converted; } - /** Restore only the player captured from this load's original legacy save. */ - private static ItemMigration restoreRewrittenSingleplayerPlayer(Path root) throws IOException { - Path currentFile = root.resolve("level.dat"); - if (!root.equals(preparedWorld) || preparedPlayer == null || !Files.isRegularFile(currentFile)) { - return ItemMigration.NONE; - } - - CompoundTag current = LegacyNbt.readCompressed(currentFile.toFile()); - CompoundTag currentData = current.getCompoundOrEmpty("Data"); - if (currentData.getIntOr("DataVersion", 0) <= LAST_SUPPORTED_LEGACY_DATA_VERSION - || !zone.moddev.mc.basemetals.migration.NbtCompat.containsTag(currentData, "Player", Tag.TAG_COMPOUND)) { - return ItemMigration.NONE; - } - - CompoundTag player = preparedPlayer.copy(); - ItemMigration migration = convertLegacyItems(player); - CompoundTag fixedPlayer = DataFixTypes.PLAYER.updateToCurrentVersion(DataFixers.getDataFixer(), - player, preparedVersion); - currentData.put("Player", fixedPlayer); - - Path backup = root.resolve(BACKUP_DIRECTORY).resolve(root.relativize(currentFile)); - Files.createDirectories(backup.getParent()); - if (!Files.exists(backup)) Files.copy(currentFile, backup, StandardCopyOption.COPY_ATTRIBUTES); - writeCompressedAtomically(currentFile, current); - return migration; - } - private static ItemMigration convertLegacyItems(Tag value) { int convertedBuckets = 0; int convertedItemAliases = 0; @@ -481,7 +429,7 @@ private static ItemMigration convertLegacyItems(Tag value) { convertedItemAliases++; } int damage = compound.getIntOr("Damage", 0); - if (item != null && item.getDefaultInstance().isDamageableItem() && damage > 0 + if (item != null && keepsLegacyDurability(targetId) && damage > 0 && zone.moddev.mc.basemetals.migration.NbtCompat.containsTag(compound, "Damage", 99)) { CompoundTag itemTag = zone.moddev.mc.basemetals.migration.NbtCompat.containsTag(compound, "tag", Tag.TAG_COMPOUND) ? compound.getCompoundOrEmpty("tag") : new CompoundTag(); @@ -513,6 +461,15 @@ private static ItemMigration convertLegacyItems(Tag value) { return new ItemMigration(convertedBuckets, convertedItemAliases, convertedDamageValues); } + static boolean keepsLegacyDurability(Identifier item) { + // Item components are not bound yet when an old world first reaches this hook. + return switch (zone.moddev.mc.basemetals.config.MaterialForm.fromPath(item.getPath())) { + case AXE, BOOTS, BOW, CHESTPLATE, CRACKHAMMER, CROSSBOW, FISHING_ROD, + HELMET, HOE, LEGGINGS, PICKAXE, SCYTHE, SHEARS, SHIELD, SHOVEL, SWORD -> true; + default -> false; + }; + } + private static void writeCompressedAtomically(Path file, CompoundTag data) throws IOException { Path temporary = file.resolveSibling(file.getFileName() + ".basemetals.tmp"); LegacyNbt.writeCompressed(data, temporary.toFile()); diff --git a/src/main/java/zone/moddev/mc/basemetals/migration/LegacyWorldDataHook.java b/src/main/java/zone/moddev/mc/basemetals/migration/LegacyWorldDataHook.java index 288cb02d7..4b1d74f68 100644 --- a/src/main/java/zone/moddev/mc/basemetals/migration/LegacyWorldDataHook.java +++ b/src/main/java/zone/moddev/mc/basemetals/migration/LegacyWorldDataHook.java @@ -88,6 +88,91 @@ public final class LegacyWorldDataHook { private LegacyWorldDataHook() {} + /** Normalize old data before Minecraft moves files and converts item components. */ + public static synchronized void prepareSelectedWorld(Path levelDat) { + prepareLegacyWorld(levelDat.toFile()); + + try { + Legacy112WorldMigrator.migrateIfNeeded(levelDat.getParent()); + preserveEmbeddedPlayer(levelDat); + copyOlderWorldCapabilities(levelDat); + } catch (IOException exception) { + throw new IllegalStateException("Could not safely prepare the saved world " + levelDat, exception); + } + } + + private static void preserveEmbeddedPlayer(Path levelDat) throws IOException { + if (!Files.isRegularFile(levelDat)) return; + + CompoundTag root = LegacyNbt.readCompressed(levelDat.toFile()); + CompoundTag data = root.getCompoundOrEmpty("Data"); + int sourceVersion = data.getIntOr("DataVersion", 0); + if (sourceVersion <= 0 || sourceVersion >= 4772 + || !NbtCompat.containsTag(data, "Player", Tag.TAG_COMPOUND)) return; + + CompoundTag player = data.getCompoundOrEmpty("Player").copy(); + java.util.UUID uuid = player.contains("UUID") + ? net.minecraft.core.UUIDUtil.LENIENT_CODEC.parse(net.minecraft.nbt.NbtOps.INSTANCE, player.get("UUID")) + .result().orElse(null) : null; + if (uuid == null && NbtCompat.containsTag(player, "UUIDMost", 99) + && NbtCompat.containsTag(player, "UUIDLeast", 99)) { + uuid = new java.util.UUID(player.getLongOr("UUIDMost", 0), player.getLongOr("UUIDLeast", 0)); + } + if (uuid == null) return; + + Path world = levelDat.getParent(); + Path file = world.resolve("playerdata/" + uuid + ".dat"); + if (Files.exists(file) || Files.exists(world.resolve("players/data/" + uuid + ".dat"))) return; + + // The native file fixer discards an embedded player with a UUID, expecting its disk file to exist. + if (!NbtCompat.containsTag(player, "DataVersion", 99)) player.putInt("DataVersion", sourceVersion); + Files.createDirectories(file.getParent()); + Path temporary = Files.createTempFile(file.getParent(), "basemetals-player-", ".tmp"); + LegacyNbt.writeCompressed(player, temporary.toFile()); + try { + Files.move(temporary, file, StandardCopyOption.ATOMIC_MOVE); + } catch (java.nio.file.AtomicMoveNotSupportedException ignored) { + Files.move(temporary, file); + } + } + + private static void copyOlderWorldCapabilities(Path levelDat) throws IOException { + if (!Files.isRegularFile(levelDat)) return; + + CompoundTag root = LegacyNbt.readCompressed(levelDat.toFile()); + CompoundTag data = root.getCompoundOrEmpty("Data"); + int sourceVersion = data.getIntOr("DataVersion", 0); + if (sourceVersion <= 0 || sourceVersion >= 4772) return; + + Path world = levelDat.getParent(); + copyCapabilities(world.resolve("data/capabilities.dat"), + world.resolve("dimensions/minecraft/overworld/data/forge/capabilities.dat")); + copyCapabilities(world.resolve("DIM-1/data/capabilities.dat"), + world.resolve("dimensions/minecraft/the_nether/data/forge/capabilities.dat")); + copyCapabilities(world.resolve("DIM1/data/capabilities.dat"), + world.resolve("dimensions/minecraft/the_end/data/forge/capabilities.dat")); + + Path dimensions = world.resolve("dimensions"); + if (Files.isDirectory(dimensions)) { + try (var paths = Files.walk(dimensions)) { + for (Path source : paths.filter(Files::isRegularFile) + .filter(path -> path.getFileName().toString().equals("capabilities.dat")) + .filter(path -> path.getParent().getFileName().toString().equals("data")).toList()) { + copyCapabilities(source, source.getParent().resolve("forge/capabilities.dat")); + } + } + } + } + + private static void copyCapabilities(Path source, Path destination) throws IOException { + if (!Files.isRegularFile(source) || Files.exists(destination)) return; + + // Keep the old file as a recovery copy; never replace native 26.1 data. + LegacyNbt.readCompressed(source.toFile()); + Files.createDirectories(destination.getParent()); + Files.copy(source, destination); + } + /** Captures the current level.dat before vanilla converts it. */ public static synchronized void prepareLegacyWorld(File levelDat) { Legacy112WorldMigrator.beginWorldLoad(); @@ -569,14 +654,17 @@ public static String normalizeLegacyRegistryName(String name) { private static void migrateLoosePlayerData(File levelDat, CompoundTag root) throws IOException { CompoundTag current = levelDat.isFile() ? LegacyNbt.readCompressed(levelDat) : root; if (migrateLegacyItems(current) > 0 && levelDat.isFile()) writeWithBackup(levelDat, current); - File playerData = new File(levelDat.getParentFile(), "playerdata"); - File[] files = playerData.listFiles((directory, name) -> name.endsWith(".dat")); - if (files == null) return; - Arrays.sort(files); - for (File file : files) { - try (FileInputStream input = new FileInputStream(file)) { - CompoundTag player = LegacyNbt.readCompressed(input); - if (migrateLegacyItems(player) > 0) writeWithBackup(file, player); + for (String directory : List.of("playerdata", "players/data")) { + File[] files = new File(levelDat.getParentFile(), directory) + .listFiles((parent, name) -> name.endsWith(".dat")); + if (files == null) continue; + + Arrays.sort(files); + for (File file : files) { + try (FileInputStream input = new FileInputStream(file)) { + CompoundTag player = LegacyNbt.readCompressed(input); + if (migrateLegacyItems(player) > 0) writeWithBackup(file, player); + } } } } diff --git a/src/main/java/zone/moddev/mc/basemetals/mixin/AnvilMenuMixin.java b/src/main/java/zone/moddev/mc/basemetals/mixin/AnvilMenuMixin.java index b0a962fca..9dd0e1126 100644 --- a/src/main/java/zone/moddev/mc/basemetals/mixin/AnvilMenuMixin.java +++ b/src/main/java/zone/moddev/mc/basemetals/mixin/AnvilMenuMixin.java @@ -14,7 +14,7 @@ @Mixin(AnvilMenu.class) abstract class AnvilMenuMixin { @Redirect( - method = "lambda$onTake$2(Lnet/minecraft/world/entity/player/Player;FLnet/minecraft/world/level/Level;Lnet/minecraft/core/BlockPos;)V", + method = "lambda$onTake$0(Lnet/minecraft/world/entity/player/Player;FLnet/minecraft/world/level/Level;Lnet/minecraft/core/BlockPos;)V", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/level/block/state/BlockState;is(Lnet/minecraft/tags/TagKey;)Z"), require = 1, allow = 1) private static boolean basemetals$includeCustomAnvil(BlockState state, TagKey tag) { diff --git a/src/main/java/zone/moddev/mc/basemetals/mixin/LevelStorageSourceMixin.java b/src/main/java/zone/moddev/mc/basemetals/mixin/LevelStorageSourceMixin.java index 59fbc8234..9575f77dd 100644 --- a/src/main/java/zone/moddev/mc/basemetals/mixin/LevelStorageSourceMixin.java +++ b/src/main/java/zone/moddev/mc/basemetals/mixin/LevelStorageSourceMixin.java @@ -2,24 +2,29 @@ import java.nio.file.Path; -import com.mojang.datafixers.DataFixer; import com.mojang.serialization.Dynamic; import net.minecraft.world.level.storage.LevelStorageSource; +import net.minecraft.world.level.storage.LevelResource; import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; import zone.moddev.mc.basemetals.migration.LegacyWorldDataHook; /** Captures original registry and item data before vanilla runs its data fixers. */ -@Mixin(LevelStorageSource.class) +@Mixin(LevelStorageSource.LevelStorageAccess.class) abstract class LevelStorageSourceMixin { - @Inject(method = "readLevelDataTagFixed", at = @At("HEAD")) - private static void basemetals$prepareWorld(Path file, DataFixer fixer, + @Shadow + public abstract Path getLevelPath(LevelResource resource); + + @Inject(method = "getUnfixedDataTag", at = @At(value = "INVOKE", + target = "Lnet/minecraft/world/level/storage/LevelStorageSource;readLevelDataTagRaw(Ljava/nio/file/Path;)Lnet/minecraft/nbt/CompoundTag;")) + private void basemetals$prepareWorld(boolean useFallback, CallbackInfoReturnable> callback) { - // A fallback backup must never make a modern world look like a legacy save. - if (file.getFileName().toString().equals("level.dat")) { - LegacyWorldDataHook.prepareLegacyWorld(file.toFile()); + // Only prepare the locked, selected world. Backups and list previews are read-only. + if (!useFallback) { + LegacyWorldDataHook.prepareSelectedWorld(getLevelPath(LevelResource.LEVEL_DATA_FILE)); } } } diff --git a/src/main/java/zone/moddev/mc/basemetals/mixin/SimpleRegionStorageMixin.java b/src/main/java/zone/moddev/mc/basemetals/mixin/SimpleRegionStorageMixin.java index 353f6b355..d7d8e846c 100644 --- a/src/main/java/zone/moddev/mc/basemetals/mixin/SimpleRegionStorageMixin.java +++ b/src/main/java/zone/moddev/mc/basemetals/mixin/SimpleRegionStorageMixin.java @@ -11,17 +11,17 @@ /** Restores legacy mod identities on either side of vanilla's chunk conversion. */ @Mixin(SimpleRegionStorage.class) abstract class SimpleRegionStorageMixin { - @Inject(method = "upgradeChunkTag(Lnet/minecraft/nbt/CompoundTag;ILnet/minecraft/nbt/CompoundTag;)Lnet/minecraft/nbt/CompoundTag;", + @Inject(method = "upgradeChunkTag(Lnet/minecraft/nbt/CompoundTag;ILnet/minecraft/nbt/CompoundTag;I)Lnet/minecraft/nbt/CompoundTag;", at = @At("HEAD")) private void basemetals$prepareChunk(CompoundTag chunk, int fallbackVersion, - CompoundTag context, CallbackInfoReturnable callback) { + CompoundTag context, int targetVersion, CallbackInfoReturnable callback) { LegacyWorldDataHook.prepareLegacyChunk(chunk); } - @Inject(method = "upgradeChunkTag(Lnet/minecraft/nbt/CompoundTag;ILnet/minecraft/nbt/CompoundTag;)Lnet/minecraft/nbt/CompoundTag;", + @Inject(method = "upgradeChunkTag(Lnet/minecraft/nbt/CompoundTag;ILnet/minecraft/nbt/CompoundTag;I)Lnet/minecraft/nbt/CompoundTag;", at = @At("RETURN"), cancellable = true) private void basemetals$finishChunk(CompoundTag chunk, int fallbackVersion, - CompoundTag context, CallbackInfoReturnable callback) { + CompoundTag context, int targetVersion, CallbackInfoReturnable callback) { callback.setReturnValue(LegacyWorldDataHook.finalizeLegacyChunk(callback.getReturnValue())); } } diff --git a/src/main/java/zone/moddev/mc/basemetals/recipe/ContentCraftingRecipe.java b/src/main/java/zone/moddev/mc/basemetals/recipe/ContentCraftingRecipe.java index c7ef46210..79159a3ce 100644 --- a/src/main/java/zone/moddev/mc/basemetals/recipe/ContentCraftingRecipe.java +++ b/src/main/java/zone/moddev/mc/basemetals/recipe/ContentCraftingRecipe.java @@ -3,8 +3,6 @@ import java.util.List; import com.mojang.serialization.MapCodec; -import net.minecraft.core.HolderLookup; -import net.minecraft.core.RegistryAccess; import net.minecraft.network.RegistryFriendlyByteBuf; import net.minecraft.network.codec.ByteBufCodecs; import net.minecraft.network.codec.StreamCodec; @@ -22,7 +20,7 @@ /** Keeps recipe IDs stable while hiding recipes that the selected mode does not allow. */ public final class ContentCraftingRecipe implements CraftingRecipe { - public static final RecipeSerializer SERIALIZER = new Serializer(); + public static final RecipeSerializer SERIALIZER = Serializer.create(); private final CraftingRecipe plain; private ContentCraftingRecipe(CraftingRecipe plain) { @@ -30,7 +28,7 @@ private ContentCraftingRecipe(CraftingRecipe plain) { } private boolean allowed() { - ItemStack result = plain.assemble(CraftingInput.EMPTY, RegistryAccess.EMPTY); + ItemStack result = plain.assemble(CraftingInput.EMPTY); return ContentPolicy.active().allows(ForgeRegistries.ITEMS.getKey(result.getItem()).toString()); } @@ -48,8 +46,8 @@ public boolean matches(CraftingInput input, Level level) { } @Override - public ItemStack assemble(CraftingInput input, HolderLookup.Provider registries) { - return allowed() ? plain.assemble(input, registries) : ItemStack.EMPTY; + public ItemStack assemble(CraftingInput input) { + return allowed() ? plain.assemble(input) : ItemStack.EMPTY; } @Override @@ -87,7 +85,7 @@ public RecipeSerializer getSerializer() { return SERIALIZER; } - private static final class Serializer implements RecipeSerializer { + private static final class Serializer { private static final MapCodec CODEC = Recipe.CODEC.fieldOf("recipe") .xmap(ContentCraftingRecipe::wrap, recipe -> recipe.plain); // Preserve empty pattern slots and tag names instead of flattening the ingredients. @@ -95,14 +93,8 @@ private static final class Serializer implements RecipeSerializer recipe.plain); - @Override - public MapCodec codec() { - return CODEC; - } - - @Override - public StreamCodec streamCodec() { - return STREAM_CODEC; + private static RecipeSerializer create() { + return new RecipeSerializer<>(CODEC, STREAM_CODEC); } } } diff --git a/src/main/java/zone/moddev/mc/basemetals/recipe/CrushingRecipe.java b/src/main/java/zone/moddev/mc/basemetals/recipe/CrushingRecipe.java index f877f8f72..be52c12f1 100644 --- a/src/main/java/zone/moddev/mc/basemetals/recipe/CrushingRecipe.java +++ b/src/main/java/zone/moddev/mc/basemetals/recipe/CrushingRecipe.java @@ -6,13 +6,9 @@ import net.minecraft.network.codec.StreamCodec; import zone.moddev.mc.basemetals.BaseMetals; -import net.minecraft.core.NonNullList; -import net.minecraft.core.Registry; -import net.minecraft.network.FriendlyByteBuf; -import net.minecraft.resources.Identifier; -import net.minecraft.util.GsonHelper; import net.minecraft.world.item.crafting.SingleRecipeInput; import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.ItemStackTemplate; import net.minecraft.world.item.crafting.Ingredient; import net.minecraft.world.item.crafting.Recipe; import net.minecraft.world.item.crafting.RecipeSerializer; @@ -30,20 +26,24 @@ public final class CrushingRecipe implements Recipe { public static final RegistryObject> TYPE = TYPES .>register("crushing", CrushingRecipeType::new); public static final RegistryObject> SERIALIZER = SERIALIZERS.register( - "crushing", Serializer::new); + "crushing", Serializer::create); public static final RegistryObject> LEGACY_SMELTING_SERIALIZER = - SERIALIZERS.register("legacy_smelting", LegacySmeltingRecipe.Serializer::new); + SERIALIZERS.register("legacy_smelting", LegacySmeltingRecipe.Serializer::create); public static final RegistryObject> PLATE_REPAIR_SERIALIZER = - SERIALIZERS.register("plate_repair", PlateRepairRecipe.Serializer::new); + SERIALIZERS.register("plate_repair", PlateRepairRecipe.Serializer::create); public static final RegistryObject> CONTENT_CRAFTING_SERIALIZER = SERIALIZERS.register("content_crafting", () -> ContentCraftingRecipe.SERIALIZER); private final Ingredient ingredient; - private final ItemStack result; + private final ItemStackTemplate result; - public CrushingRecipe(Ingredient ingredient, ItemStack result) { + public CrushingRecipe(Ingredient ingredient, ItemStackTemplate result) { this.ingredient = ingredient; - this.result = result.copy(); + this.result = result; + } + + public CrushingRecipe(Ingredient ingredient, ItemStack result) { + this(ingredient, ItemStackTemplate.fromNonEmptyStack(result)); } @Override @@ -52,19 +52,53 @@ public boolean matches(SingleRecipeInput input, Level level) { } @Override - public ItemStack assemble(SingleRecipeInput input, net.minecraft.core.HolderLookup.Provider registries) { - return result.copy(); - } - public boolean canCraftInDimensions(int width, int height) { return width * height >= 1; } - public ItemStack getResultItem(net.minecraft.core.HolderLookup.Provider registries) { return result.copy(); } - @Override public RecipeSerializer getSerializer() { return SERIALIZER.get(); } - @Override public RecipeType getType() { return TYPE.get(); } - public java.util.List getIngredients() { return java.util.List.of(ingredient); } - @Override public boolean isSpecial() { return true; } - @Override public net.minecraft.world.item.crafting.PlacementInfo placementInfo() { + public ItemStack assemble(SingleRecipeInput input) { + return result.create(); + } + + public boolean canCraftInDimensions(int width, int height) { + return width * height >= 1; + } + + public ItemStack getResultItem(net.minecraft.core.HolderLookup.Provider registries) { + return result.create(); + } + + @Override + public RecipeSerializer getSerializer() { + return SERIALIZER.get(); + } + + @Override + public RecipeType getType() { + return TYPE.get(); + } + + public java.util.List getIngredients() { + return java.util.List.of(ingredient); + } + + @Override + public boolean isSpecial() { + return true; + } + + @Override + public boolean showNotification() { + return true; + } + + @Override + public String group() { + return ""; + } + + @Override + public net.minecraft.world.item.crafting.PlacementInfo placementInfo() { return net.minecraft.world.item.crafting.PlacementInfo.NOT_PLACEABLE; } - @Override public net.minecraft.world.item.crafting.RecipeBookCategory recipeBookCategory() { + @Override + public net.minecraft.world.item.crafting.RecipeBookCategory recipeBookCategory() { return net.minecraft.world.item.crafting.RecipeBookCategories.CRAFTING_MISC; } @@ -75,20 +109,21 @@ public String toString() { } } - public static final class Serializer implements RecipeSerializer { + public static final class Serializer { private static final MapCodec CODEC = RecordCodecBuilder.mapCodec(instance -> instance.group( Ingredient.CODEC.fieldOf("ingredient").forGetter(recipe -> recipe.ingredient), - ItemStack.CODEC.fieldOf("result").forGetter(recipe -> recipe.result)) + ItemStackTemplate.CODEC.fieldOf("result").forGetter(recipe -> recipe.result)) .apply(instance, CrushingRecipe::new)); private static final StreamCodec STREAM_CODEC = StreamCodec.composite( Ingredient.CONTENTS_STREAM_CODEC, recipe -> recipe.ingredient, - ItemStack.STREAM_CODEC, recipe -> recipe.result, + ItemStackTemplate.STREAM_CODEC, recipe -> recipe.result, CrushingRecipe::new); - @Override public MapCodec codec() { return CODEC; } - @Override public StreamCodec streamCodec() { return STREAM_CODEC; } + public static RecipeSerializer create() { + return new RecipeSerializer<>(CODEC, STREAM_CODEC); + } } } diff --git a/src/main/java/zone/moddev/mc/basemetals/recipe/LegacySmeltingRecipe.java b/src/main/java/zone/moddev/mc/basemetals/recipe/LegacySmeltingRecipe.java index 112d0d766..cfe299618 100644 --- a/src/main/java/zone/moddev/mc/basemetals/recipe/LegacySmeltingRecipe.java +++ b/src/main/java/zone/moddev/mc/basemetals/recipe/LegacySmeltingRecipe.java @@ -1,39 +1,36 @@ package zone.moddev.mc.basemetals.recipe; -import com.mojang.serialization.Codec; -import com.mojang.serialization.MapCodec; -import com.mojang.serialization.codecs.RecordCodecBuilder; -import net.minecraft.network.RegistryFriendlyByteBuf; -import net.minecraft.network.codec.StreamCodec; -import net.minecraft.network.codec.ByteBufCodecs; - -import net.minecraft.network.FriendlyByteBuf; -import net.minecraft.resources.Identifier; -import net.minecraft.util.GsonHelper; import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.ItemStackTemplate; +import net.minecraft.world.item.crafting.AbstractCookingRecipe.CookingBookInfo; import net.minecraft.world.item.crafting.Ingredient; +import net.minecraft.world.item.crafting.Recipe.CommonInfo; import net.minecraft.world.item.crafting.RecipeSerializer; +import net.minecraft.world.item.crafting.SingleRecipeInput; import net.minecraft.world.item.crafting.SmeltingRecipe; +import net.minecraft.world.level.Level; +import net.minecraftforge.registries.ForgeRegistries; +import zone.moddev.mc.basemetals.config.ContentPolicy; -/** - * Keeps the existing recycling recipe IDs and counted furnace outputs. - */ +/** Keeps the existing recycling recipe IDs and counted furnace outputs. */ public final class LegacySmeltingRecipe extends SmeltingRecipe { - public LegacySmeltingRecipe(String group, Ingredient ingredient, - ItemStack result, float experience, int cookingTime) { - super(group, net.minecraft.world.item.crafting.CookingBookCategory.MISC, ingredient, result, experience, cookingTime); + public LegacySmeltingRecipe(CommonInfo commonInfo, CookingBookInfo bookInfo, + Ingredient ingredient, ItemStackTemplate result, float experience, int cookingTime) { + super(commonInfo, bookInfo, ingredient, result, experience, cookingTime); + } + + private boolean allowed() { + return ContentPolicy.active().allows(ForgeRegistries.ITEMS.getKey(result().item().value()).toString()); } @Override - public boolean matches(net.minecraft.world.item.crafting.SingleRecipeInput inventory, net.minecraft.world.level.Level world) { - return zone.moddev.mc.basemetals.config.ContentPolicy.active().allows(net.minecraftforge.registries.ForgeRegistries.ITEMS.getKey(result().getItem()).toString()) - && super.matches(inventory, world); + public boolean matches(SingleRecipeInput inventory, Level world) { + return allowed() && super.matches(inventory, world); } @Override - public ItemStack assemble(net.minecraft.world.item.crafting.SingleRecipeInput inventory, net.minecraft.core.HolderLookup.Provider registries) { - return zone.moddev.mc.basemetals.config.ContentPolicy.active().allows(net.minecraftforge.registries.ForgeRegistries.ITEMS.getKey(result().getItem()).toString()) - ? super.assemble(inventory, registries) : ItemStack.EMPTY; + public ItemStack assemble(SingleRecipeInput inventory) { + return allowed() ? super.assemble(inventory) : ItemStack.EMPTY; } @Override @@ -43,26 +40,12 @@ public RecipeSerializer getSerializer() { CrushingRecipe.LEGACY_SMELTING_SERIALIZER.get(); } - public static final class Serializer implements RecipeSerializer { - private static final MapCodec CODEC = RecordCodecBuilder.mapCodec(instance -> - instance.group( - Codec.STRING.optionalFieldOf("group", "").forGetter(LegacySmeltingRecipe::group), - Ingredient.CODEC.fieldOf("ingredient").forGetter(recipe -> recipe.input()), - ItemStack.CODEC.fieldOf("result").forGetter(recipe -> recipe.result()), - Codec.FLOAT.optionalFieldOf("experience", 0.0F).forGetter(LegacySmeltingRecipe::experience), - Codec.INT.optionalFieldOf("cookingtime", 200).forGetter(LegacySmeltingRecipe::cookingTime)) - .apply(instance, LegacySmeltingRecipe::new)); - - private static final StreamCodec STREAM_CODEC = - StreamCodec.composite( - ByteBufCodecs.STRING_UTF8, LegacySmeltingRecipe::group, - Ingredient.CONTENTS_STREAM_CODEC, recipe -> recipe.input(), - ItemStack.STREAM_CODEC, recipe -> recipe.result(), - ByteBufCodecs.FLOAT, LegacySmeltingRecipe::experience, - ByteBufCodecs.VAR_INT, LegacySmeltingRecipe::cookingTime, - LegacySmeltingRecipe::new); + public static final class Serializer { + private Serializer() {} - @Override public MapCodec codec() { return CODEC; } - @Override public StreamCodec streamCodec() { return STREAM_CODEC; } + public static RecipeSerializer create() { + return new RecipeSerializer<>(cookingMapCodec(LegacySmeltingRecipe::new, 200), + cookingStreamCodec(LegacySmeltingRecipe::new)); + } } } diff --git a/src/main/java/zone/moddev/mc/basemetals/recipe/PlateRepairRecipe.java b/src/main/java/zone/moddev/mc/basemetals/recipe/PlateRepairRecipe.java index fab367e21..9d0c228ee 100644 --- a/src/main/java/zone/moddev/mc/basemetals/recipe/PlateRepairRecipe.java +++ b/src/main/java/zone/moddev/mc/basemetals/recipe/PlateRepairRecipe.java @@ -8,14 +8,9 @@ import net.minecraft.core.registries.Registries; import net.minecraft.core.registries.BuiltInRegistries; -import net.minecraft.core.NonNullList; -import net.minecraft.network.FriendlyByteBuf; -import net.minecraft.resources.Identifier; -import net.minecraft.util.GsonHelper; import net.minecraft.world.item.crafting.CraftingInput; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; -import net.minecraft.world.item.Items; import net.minecraft.world.item.crafting.CustomRecipe; import net.minecraft.world.item.crafting.Ingredient; import net.minecraft.world.item.crafting.RecipeSerializer; @@ -30,7 +25,6 @@ public final class PlateRepairRecipe extends CustomRecipe { private final Ingredient plate; public PlateRepairRecipe(Item target, Ingredient plate) { - super(net.minecraft.world.item.crafting.CraftingBookCategory.MISC); this.target = target; this.plate = plate; } @@ -55,7 +49,7 @@ public boolean matches(CraftingInput container, Level level) { } @Override - public ItemStack assemble(CraftingInput container, net.minecraft.core.HolderLookup.Provider registries) { + public ItemStack assemble(CraftingInput container) { if (!matches(container, null)) return ItemStack.EMPTY; for (int slot = 0; slot < container.size(); slot++) { ItemStack stack = container.getItem(slot); @@ -95,7 +89,7 @@ public RecipeSerializer getSerializer() { return CrushingRecipe.PLATE_REPAIR_SERIALIZER.get(); } - public static final class Serializer implements RecipeSerializer { + public static final class Serializer { private static final MapCodec CODEC = RecordCodecBuilder.mapCodec(instance -> instance.group( BuiltInRegistries.ITEM.byNameCodec().fieldOf("target").forGetter(recipe -> recipe.target), @@ -108,7 +102,8 @@ public static final class Serializer implements RecipeSerializer recipe.plate, PlateRepairRecipe::new); - @Override public MapCodec codec() { return CODEC; } - @Override public StreamCodec streamCodec() { return STREAM_CODEC; } + public static RecipeSerializer create() { + return new RecipeSerializer<>(CODEC, STREAM_CODEC); + } } } diff --git a/src/main/java/zone/moddev/mc/basemetals/trade/BaseMetalsTrades.java b/src/main/java/zone/moddev/mc/basemetals/trade/BaseMetalsTrades.java index eb46776c3..432eeccde 100644 --- a/src/main/java/zone/moddev/mc/basemetals/trade/BaseMetalsTrades.java +++ b/src/main/java/zone/moddev/mc/basemetals/trade/BaseMetalsTrades.java @@ -1,118 +1,84 @@ package zone.moddev.mc.basemetals.trade; +import java.util.ArrayList; import java.util.List; -import zone.moddev.mc.basemetals.config.BaseMetalsConfig; +import net.minecraft.resources.Identifier; +import net.minecraft.world.item.Items; +import net.minecraftforge.registries.ForgeRegistries; import zone.moddev.mc.basemetals.content.ModContent; import zone.moddev.mc.basemetals.material.MaterialCatalogue; import zone.moddev.mc.basemetals.material.MaterialDefinition; -import net.minecraft.world.entity.npc.villager.VillagerProfession; -import net.minecraft.world.entity.npc.villager.VillagerTrades.ItemListing; -import net.minecraft.world.item.Item; -import net.minecraft.world.item.ItemStack; -import net.minecraft.world.item.Items; -import net.minecraft.world.item.enchantment.EnchantmentHelper; -import net.minecraft.world.item.trading.MerchantOffer; -import net.minecraftforge.event.village.VillagerTradesEvent; - +/** The historical smith offers, shared by data generation and regression tests. */ public final class BaseMetalsTrades { private BaseMetalsTrades() {} - public static void add(VillagerTradesEvent event) { - if (!BaseMetalsConfig.VILLAGER_TRADES.get()) return; - if (event.getType() != VillagerProfession.ARMORER - && event.getType() != VillagerProfession.TOOLSMITH - && event.getType() != VillagerProfession.WEAPONSMITH) return; - for (MaterialDefinition material : MaterialCatalogue.ALL) { - if (material.kind() == MaterialDefinition.Kind.RARE_ORE - || material.kind() == MaterialDefinition.Kind.RARE_ALLOY) continue; - int value = (int) (material.hardness() + material.strength() + material.magic() + material.toolLevel()); - int emeraldCost = Math.max(1, (int) (0.2F * value)); - int level = Math.max(1, Math.min(4, (int) (0.1F * value))); - Item ingot = material.name().equals("copper") - ? Items.COPPER_INGOT : ModContent.item(material.name() + "_ingot").get(); - event.getTrades().get(level).add(selling(ingot, 12, emeraldCost)); - if (!material.hasEquipment()) continue; - if (event.getType() == VillagerProfession.ARMORER) { - addSales(event, level, emeraldCost + (int) (material.hardness() / 2.0D), - material, "helmet", "chestplate", "leggings", "boots"); - } else if (event.getType() == VillagerProfession.TOOLSMITH) { - addSales(event, level, emeraldCost, material, "pickaxe", "axe", "shovel", "hoe", "crackhammer"); - } else if (event.getType() == VillagerProfession.WEAPONSMITH) { - addSales(event, level, - emeraldCost + ((int) (material.baseAttackDamage() / 2.0F)) - 1, - material, "sword"); - addSales(event, level, emeraldCost, material, "bow", "crossbow"); - } - if (material.magic() > 5.0D) { - addEnchantedSales(event, level, emeraldCost, material); - } - } - if (event.getType() == VillagerProfession.ARMORER || event.getType() == VillagerProfession.TOOLSMITH - || event.getType() == VillagerProfession.WEAPONSMITH) { - event.getTrades().get(1).add(selling(ModContent.item("coal_powder").get(), 10, 1)); - event.getTrades().get(1).add(selling(ModContent.item("charcoal_powder").get(), 10, 1)); - } - } + public record Offer(String id, String profession, int level, Identifier item, int count, + int emeralds, boolean enchanted) {} - private static void addSales(VillagerTradesEvent event, int level, int cost, - MaterialDefinition material, String... forms) { - for (String form : forms) { - Item item = ModContent.item(material.name() + "_" + form).get(); - if (!zone.moddev.mc.basemetals.config.ContentPolicy.active().allows(net.minecraftforge.registries.ForgeRegistries.ITEMS.getKey(item).toString())) continue; - event.getTrades().get(level).add(selling(item, cost)); - } - } + public static List offers() { + List offers = new ArrayList<>(); - private static void addEnchantedSales(VillagerTradesEvent event, int level, int cost, - MaterialDefinition material) { - int advanced = Math.min(5, level + 1); - if (event.getType() == VillagerProfession.ARMORER) { - int armorCost = cost + 7 + (int) (material.hardness() / 2.0D); - for (String form : List.of("helmet", "chestplate", "leggings", "boots")) { - if (!zone.moddev.mc.basemetals.config.ContentPolicy.active().allows("basemetals:" + material.name() + "_" + form)) continue; - event.getTrades().get(advanced).add(enchanted( - ModContent.item(material.name() + "_" + form).get(), armorCost)); - } - } else if (event.getType() == VillagerProfession.WEAPONSMITH) { - int weaponCost = cost + 6 + Math.max(0, (int) (material.baseAttackDamage() / 2.0F)); - for (String form : List.of("sword", "crossbow", "bow")) { - if (!zone.moddev.mc.basemetals.config.ContentPolicy.active().allows("basemetals:" + material.name() + "_" + form)) continue; - event.getTrades().get(advanced).add(enchanted( - ModContent.item(material.name() + "_" + form).get(), weaponCost)); - } - } else if (event.getType() == VillagerProfession.TOOLSMITH) { - for (String form : List.of("axe", "hoe", "shovel", "pickaxe")) { - if (!zone.moddev.mc.basemetals.config.ContentPolicy.active().allows("basemetals:" + material.name() + "_" + form)) continue; - event.getTrades().get(advanced).add(enchanted( - ModContent.item(material.name() + "_" + form).get(), cost + 7)); + for (String profession : List.of("armorer", "toolsmith", "weaponsmith")) { + for (MaterialDefinition material : MaterialCatalogue.ALL) { + if (material.kind() == MaterialDefinition.Kind.RARE_ORE + || material.kind() == MaterialDefinition.Kind.RARE_ALLOY) continue; + + int value = (int) (material.hardness() + material.strength() + material.magic() + material.toolLevel()); + int cost = Math.max(1, (int) (0.2F * value)); + int level = Math.max(1, Math.min(4, (int) (0.1F * value))); + var ingot = material.name().equals("copper") ? Items.COPPER_INGOT + : ModContent.item(material.name() + "_ingot").get(); + offers.add(new Offer(profession + "/" + material.name() + "_ingot", profession, level, + ForgeRegistries.ITEMS.getKey(ingot), 12, cost, false)); + + if (!material.hasEquipment()) continue; + + switch (profession) { + case "armorer" -> add(offers, profession, level, cost + (int) (material.hardness() / 2), + material, false, "helmet", "chestplate", "leggings", "boots"); + case "toolsmith" -> add(offers, profession, level, cost, + material, false, "pickaxe", "axe", "shovel", "hoe", "crackhammer"); + case "weaponsmith" -> { + add(offers, profession, level, cost + (int) (material.baseAttackDamage() / 2) - 1, + material, false, "sword"); + add(offers, profession, level, cost, material, false, "bow", "crossbow"); + } + } + + if (material.magic() <= 5) continue; + + int advanced = Math.min(5, level + 1); + switch (profession) { + case "armorer" -> add(offers, profession, advanced, cost + 7 + (int) (material.hardness() / 2), + material, true, "helmet", "chestplate", "leggings", "boots"); + case "weaponsmith" -> add(offers, profession, advanced, + cost + 6 + Math.max(0, (int) (material.baseAttackDamage() / 2)), + material, true, "sword", "crossbow", "bow"); + case "toolsmith" -> { + add(offers, profession, advanced, cost + 7, material, true, "axe", "hoe", "shovel", "pickaxe"); + add(offers, profession, Math.min(5, level + 2), cost + 7, material, true, "crackhammer"); + } + } } - if (zone.moddev.mc.basemetals.config.ContentPolicy.active().allows("basemetals:" + material.name() + "_crackhammer")) { - event.getTrades().get(Math.min(5, level + 2)).add(enchanted( - ModContent.item(material.name() + "_crackhammer").get(), cost + 7)); + + for (String fuel : List.of("coal_powder", "charcoal_powder")) { + offers.add(new Offer(profession + "/" + fuel, profession, 1, + Identifier.fromNamespaceAndPath("basemetals", fuel), 10, 1, false)); } } - } - - private static ItemListing selling(Item item, int emeralds) { - return selling(item, 1, emeralds); - } - private static ItemListing selling(Item item, int count, int emeralds) { - return (level, trader, random) -> new MerchantOffer(new net.minecraft.world.item.trading.ItemCost(Items.EMERALD, Math.max(1, emeralds)), - new ItemStack(item, count), 6, 5, 0.2F); + return List.copyOf(offers); } - private static ItemListing enchanted(Item item, int baseCost) { - return (level, trader, random) -> { - int enchantmentLevel = 5 + random.nextInt(15); - ItemStack result = EnchantmentHelper.enchantItem(random, new ItemStack(item), enchantmentLevel, - trader.registryAccess(), java.util.Optional.of(trader.registryAccess() - .lookupOrThrow(net.minecraft.core.registries.Registries.ENCHANTMENT) - .getOrThrow(net.minecraft.tags.EnchantmentTags.ON_RANDOM_LOOT))); - return new MerchantOffer(new net.minecraft.world.item.trading.ItemCost(Items.EMERALD, Math.min(64, baseCost + enchantmentLevel)), - result, 3, 15, 0.2F); - }; + private static void add(List offers, String profession, int level, int cost, + MaterialDefinition material, boolean enchanted, String... forms) { + for (String form : forms) { + String name = material.name() + "_" + form; + var item = ModContent.item(name).get(); + offers.add(new Offer(profession + "/" + name + (enchanted ? "_enchanted" : ""), + profession, level, ForgeRegistries.ITEMS.getKey(item), 1, Math.max(1, cost), enchanted)); + } } } diff --git a/src/main/java/zone/moddev/mc/basemetals/trade/TradeEnabledCondition.java b/src/main/java/zone/moddev/mc/basemetals/trade/TradeEnabledCondition.java new file mode 100644 index 000000000..77e49d66d --- /dev/null +++ b/src/main/java/zone/moddev/mc/basemetals/trade/TradeEnabledCondition.java @@ -0,0 +1,41 @@ +package zone.moddev.mc.basemetals.trade; + +import com.mojang.serialization.MapCodec; +import com.mojang.serialization.codecs.RecordCodecBuilder; +import net.minecraft.core.registries.Registries; +import net.minecraft.resources.Identifier; +import net.minecraft.world.level.storage.loot.LootContext; +import net.minecraft.world.level.storage.loot.predicates.LootItemCondition; +import net.minecraftforge.eventbus.api.bus.BusGroup; +import net.minecraftforge.registries.DeferredRegister; +import zone.moddev.mc.basemetals.BaseMetals; +import zone.moddev.mc.basemetals.config.BaseMetalsConfig; +import zone.moddev.mc.basemetals.config.ContentPolicy; + +/** Keeps the trade switch live without changing the data registry between content modes. */ +public record TradeEnabledCondition(Identifier item) implements LootItemCondition { + public static final MapCodec CODEC = RecordCodecBuilder.mapCodec(instance -> instance.group( + Identifier.CODEC.fieldOf("item").forGetter(TradeEnabledCondition::item) + ).apply(instance, TradeEnabledCondition::new)); + + private static final DeferredRegister> CONDITIONS = + DeferredRegister.create(Registries.LOOT_CONDITION_TYPE, BaseMetals.MOD_ID); + + static { + CONDITIONS.register("trade_enabled", () -> CODEC); + } + + public static void register(BusGroup bus) { + CONDITIONS.register(bus); + } + + @Override + public MapCodec codec() { + return CODEC; + } + + @Override + public boolean test(LootContext context) { + return BaseMetalsConfig.VILLAGER_TRADES.get() && ContentPolicy.active().allows(item.toString()); + } +} diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml index b2e3b7ff4..9f63f5a3f 100644 --- a/src/main/resources/META-INF/mods.toml +++ b/src/main/resources/META-INF/mods.toml @@ -14,7 +14,7 @@ description='''${mod_description}''' [[dependencies.${mod_id}]] modId="orespawn" mandatory=true -versionRange="[4.1.0.121111,5.0.0)" +versionRange="[4.1.0.2601021,5.0.0)" ordering="AFTER" side="BOTH" diff --git a/src/main/resources/assets/minecraft/atlases/blocks.json b/src/main/resources/assets/minecraft/atlases/blocks.json deleted file mode 100644 index 4304c4897..000000000 --- a/src/main/resources/assets/minecraft/atlases/blocks.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "sources": [ - { - "type": "minecraft:single", - "resource": "minecraft:item/bucket", - "sprite": "basemetals:block/bucket_base" - }, - { - "type": "minecraft:single", - "resource": "forge:item/mask/bucket_fluid", - "sprite": "basemetals:block/bucket_fluid" - }, - { - "type": "minecraft:single", - "resource": "forge:item/mask/bucket_fluid_cover", - "sprite": "basemetals:block/bucket_cover" - } - ] -} diff --git a/src/main/resources/assets/minecraft/atlases/items.json b/src/main/resources/assets/minecraft/atlases/items.json new file mode 100644 index 000000000..ba37b78e9 --- /dev/null +++ b/src/main/resources/assets/minecraft/atlases/items.json @@ -0,0 +1,29 @@ +{ + "sources": [ + { + "type": "minecraft:single", + "resource": "minecraft:item/bucket", + "sprite": "basemetals:item/bucket_base" + }, + { + "type": "minecraft:single", + "resource": "forge:item/mask/bucket_fluid", + "sprite": "basemetals:item/bucket_fluid" + }, + { + "type": "minecraft:single", + "resource": "forge:item/mask/bucket_fluid_cover", + "sprite": "basemetals:item/bucket_cover" + }, + { + "type": "minecraft:single", + "resource": "basemetals:block/molten_metal_still", + "sprite": "basemetals:item/molten_metal_still" + }, + { + "type": "minecraft:single", + "resource": "basemetals:block/mercury_still", + "sprite": "basemetals:item/mercury_still" + } + ] +} diff --git a/src/main/resources/pack.mcmeta b/src/main/resources/pack.mcmeta index 64d20e29e..ac441d481 100644 --- a/src/main/resources/pack.mcmeta +++ b/src/main/resources/pack.mcmeta @@ -1,7 +1,7 @@ { "pack": { "description": "${mod_id} resources", - "min_format": [94, 1], - "max_format": [94, 1] + "min_format": [101, 1], + "max_format": [101, 1] } } diff --git a/src/packagedClientSmoke/packaged-resources/META-INF/mods.toml b/src/packagedClientSmoke/packaged-resources/META-INF/mods.toml index 931fea1c0..53cfb688c 100644 --- a/src/packagedClientSmoke/packaged-resources/META-INF/mods.toml +++ b/src/packagedClientSmoke/packaged-resources/META-INF/mods.toml @@ -10,13 +10,13 @@ displayName="Base Metals packaged client smoke" [[dependencies.basemetals_client_smoke]] modId="basemetals" mandatory=true -versionRange="[3.1.1.121111]" +versionRange="[3.1.1.2601021]" ordering="AFTER" side="CLIENT" [[dependencies.basemetals_client_smoke]] modId="orespawn" mandatory=true -versionRange="[4.1.0.121111]" +versionRange="[4.1.0.2601021]" ordering="AFTER" side="CLIENT" diff --git a/src/packagedServerSmoke/java/zone/moddev/mc/basemetals/smoke/PackagedServerSmoke.java b/src/packagedServerSmoke/java/zone/moddev/mc/basemetals/smoke/PackagedServerSmoke.java index 8d13fffd9..4da0534b4 100644 --- a/src/packagedServerSmoke/java/zone/moddev/mc/basemetals/smoke/PackagedServerSmoke.java +++ b/src/packagedServerSmoke/java/zone/moddev/mc/basemetals/smoke/PackagedServerSmoke.java @@ -40,7 +40,7 @@ public PackagedServerSmoke() { public void onServerStarted(ServerStartedEvent event) { String baseMetals = version("basemetals"); String oreSpawn = version("orespawn"); - if (!"3.1.1.121111".equals(baseMetals) || !"4.1.0.121111".equals(oreSpawn)) { + if (!"3.1.1.2601021".equals(baseMetals) || !"4.1.0.2601021".equals(oreSpawn)) { throw new IllegalStateException("PACKAGED_SERVER_SMOKE FAIL versions basemetals=" + baseMetals + " orespawn=" + oreSpawn); } @@ -67,7 +67,7 @@ public void onServerStarted(ServerStartedEvent event) { } private static String version(String modId) { - return ModList.get().getModContainerById(modId) + return ModList.getModContainerById(modId) .orElseThrow(() -> new IllegalStateException("Missing required packaged mod " + modId)) .getModInfo().getVersion().toString(); } @@ -93,7 +93,7 @@ private static void verifyContent(net.minecraft.server.MinecraftServer server) { if (enabled != policy.allows("basemetals:adamantine_bow")) { throw new IllegalStateException("The recipe book does not follow the active content mode"); } - if (ModList.get().isLoaded("tconstruct")) verifyTinkers(); + if (ModList.isLoaded("tconstruct")) verifyTinkers(); try { verifyIntegrationRecipes(server); } catch (IOException exception) { @@ -112,7 +112,7 @@ private static void verifyIntegrationRecipes(net.minecraft.server.MinecraftServe String mod = path.contains("/thermal/") ? "thermal_expansion" : path.contains("/tconstruct/") ? "tconstruct" : path.contains("/mekanism/") ? "mekanism" : "enderio"; - if (!ModList.get().isLoaded(mod)) continue; + if (!ModList.isLoaded(mod)) continue; try (var input = server.getResourceManager().getResource(resource).orElseThrow().open()) { var json = com.google.gson.JsonParser.parseReader(new java.io.InputStreamReader( input, StandardCharsets.UTF_8)).getAsJsonObject(); @@ -176,7 +176,7 @@ private static void verifyOreSample(net.minecraft.server.MinecraftServer server) } private static void verifyTinkers() { - throw new IllegalStateException("Tinkers integration is not enabled in this Forge 1.21.11 build"); + throw new IllegalStateException("Tinkers integration is not enabled in this Forge 26.1.2 build"); } private static void verifyModernFlatTerrain(net.minecraft.server.MinecraftServer server) { diff --git a/src/packagedServerSmoke/packaged-resources/META-INF/mods.toml b/src/packagedServerSmoke/packaged-resources/META-INF/mods.toml index b03103032..15f050e2b 100644 --- a/src/packagedServerSmoke/packaged-resources/META-INF/mods.toml +++ b/src/packagedServerSmoke/packaged-resources/META-INF/mods.toml @@ -10,13 +10,13 @@ displayName="Base Metals packaged server smoke" [[dependencies.basemetals_server_smoke]] modId="basemetals" mandatory=true -versionRange="[3.1.1.121111]" +versionRange="[3.1.1.2601021]" ordering="AFTER" side="SERVER" [[dependencies.basemetals_server_smoke]] modId="orespawn" mandatory=true -versionRange="[4.1.0.121111]" +versionRange="[4.1.0.2601021]" ordering="AFTER" side="SERVER" diff --git a/src/smoke/datapack/pack.mcmeta b/src/smoke/datapack/pack.mcmeta index e601bae19..ddd71fd27 100644 --- a/src/smoke/datapack/pack.mcmeta +++ b/src/smoke/datapack/pack.mcmeta @@ -1,7 +1,7 @@ { "pack": { - "min_format": [94, 1], - "max_format": [94, 1], + "min_format": [101, 1], + "max_format": [101, 1], "description": "Base Metals custom ordinary dimension smoke fixture" } } diff --git a/src/test/java/zone/moddev/mc/basemetals/data/CommonTagCompatibilityTest.java b/src/test/java/zone/moddev/mc/basemetals/data/CommonTagCompatibilityTest.java new file mode 100644 index 000000000..5757da615 --- /dev/null +++ b/src/test/java/zone/moddev/mc/basemetals/data/CommonTagCompatibilityTest.java @@ -0,0 +1,71 @@ +package zone.moddev.mc.basemetals.data; + +import static org.junit.jupiter.api.Assertions.*; + +import java.nio.file.Files; +import java.nio.file.Path; +import java.util.HashSet; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import java.util.Set; +import com.google.gson.JsonParser; +import org.junit.jupiter.api.Test; + +class CommonTagCompatibilityTest { + @Test + void oldForgeNamesLeadToValidCommonTagsWithoutCycles() throws Exception { + Map> tags = new LinkedHashMap<>(); + for (String source : List.of("src/main/resources/data", "src/generated/resources/data")) { + Path root = Path.of(source); + try (var files = Files.walk(root)) { + for (Path file : files.filter(path -> path.toString().endsWith(".json")).toList()) { + String relative = root.relativize(file).toString().replace('\\', '/'); + String[] parts = relative.split("/", 4); + if (parts.length != 4 || !parts[1].equals("tags")) continue; + var values = JsonParser.parseString(Files.readString(file)).getAsJsonObject().getAsJsonArray("values"); + if (values == null) continue; + String id = parts[2] + "/" + parts[0] + ":" + parts[3].replaceFirst("\\.json$", ""); + tags.put(id, values.asList().stream().filter(value -> value.isJsonPrimitive()) + .map(value -> value.getAsString()).toList()); + } + } + } + + for (String legacy : Files.readAllLines(Path.of("src/test/resources/legacy_forge_tag_paths.txt"))) { + if (legacy.isBlank() || legacy.startsWith("#")) continue; + int slash = legacy.indexOf('/'); + String id = legacy.substring(0, slash) + "/forge:" + legacy.substring(slash + 1); + assertTrue(tags.containsKey(id), "Lost the released tag " + id); + } + + int aliases = 0; + for (var entry : tags.entrySet()) { + if (!entry.getKey().contains("/forge:")) continue; + assertEquals(1, entry.getValue().size(), entry.getKey()); + assertTrue(entry.getValue().getFirst().startsWith("#c:"), entry.getKey()); + visit(entry.getKey(), tags, new HashSet<>()); + aliases++; + } + assertTrue(aliases >= 458, "The legacy material tags were not all retained"); + } + + private static void visit(String id, Map> tags, Set path) throws Exception { + assertTrue(path.add(id), "Tag cycle: " + path + " -> " + id); + var values = tags.get(id); + if (values == null) { + String kind = id.substring(0, id.indexOf('/')); + String[] name = id.substring(id.indexOf('/') + 1).split(":", 2); + String resource = "/data/" + name[0] + "/tags/" + kind + "/" + name[1] + ".json"; + try (var input = CommonTagCompatibilityTest.class.getResourceAsStream(resource)) { + assertNotNull(input, "Missing native common tag " + id); + } + } else { + String kind = id.substring(0, id.indexOf('/') + 1); + for (String value : values) { + if (value.startsWith("#")) visit(kind + value.substring(1), tags, path); + } + } + path.remove(id); + } +} diff --git a/src/test/java/zone/moddev/mc/basemetals/data/CopperCompatibilityTest.java b/src/test/java/zone/moddev/mc/basemetals/data/CopperCompatibilityTest.java index 33426e606..daea4bc52 100644 --- a/src/test/java/zone/moddev/mc/basemetals/data/CopperCompatibilityTest.java +++ b/src/test/java/zone/moddev/mc/basemetals/data/CopperCompatibilityTest.java @@ -47,7 +47,10 @@ void oldCopperItemsAndBlocksRemainRegistered() throws Exception { void downstreamIngredientsAcceptOldAndVanillaCopper() throws Exception { for (var entry : VanillaCopper.equivalents().entrySet()) { String tag = VanillaCopper.ingredientTag(entry.getKey()).substring("forge:".length()); - var values = read(Path.of("src/generated/resources/data/forge/tags/item/" + tag + ".json")) + var alias = read(Path.of("src/generated/resources/data/forge/tags/item/" + tag + ".json")) + .getAsJsonArray("values").toString(); + assertTrue(alias.contains("#c:" + tag), tag); + var values = read(Path.of("src/generated/resources/data/c/tags/item/" + tag + ".json")) .getAsJsonArray("values").toString(); assertTrue(values.contains('"' + entry.getKey() + '"'), entry.getKey()); diff --git a/src/test/java/zone/moddev/mc/basemetals/data/Minecraft1211ResourceTest.java b/src/test/java/zone/moddev/mc/basemetals/data/Minecraft1211ResourceTest.java index f599ed042..52c3bc462 100644 --- a/src/test/java/zone/moddev/mc/basemetals/data/Minecraft1211ResourceTest.java +++ b/src/test/java/zone/moddev/mc/basemetals/data/Minecraft1211ResourceTest.java @@ -14,14 +14,14 @@ class Minecraft1211ResourceTest { @Test - void resourceAndDataPacksUseThe12111Formats() throws Exception { + void resourceAndDataPacksUseThe2612Formats() throws Exception { var pack = read("src/main/resources/pack.mcmeta").getAsJsonObject("pack"); - assertEquals("[94,1]", pack.get("min_format").toString()); - assertEquals("[94,1]", pack.get("max_format").toString()); + assertEquals("[101,1]", pack.get("min_format").toString()); + assertEquals("[101,1]", pack.get("max_format").toString()); net.minecraft.SharedConstants.tryDetectVersion(); var resources = net.minecraft.SharedConstants.getCurrentVersion() .packVersion(net.minecraft.server.packs.PackType.CLIENT_RESOURCES); - assertEquals(75, resources.major()); + assertEquals(84, resources.major()); assertEquals(0, resources.minor()); } diff --git a/src/test/java/zone/moddev/mc/basemetals/data/NativeAssetDefinitionTest.java b/src/test/java/zone/moddev/mc/basemetals/data/NativeAssetDefinitionTest.java index 68288d789..8bc6121ba 100644 --- a/src/test/java/zone/moddev/mc/basemetals/data/NativeAssetDefinitionTest.java +++ b/src/test/java/zone/moddev/mc/basemetals/data/NativeAssetDefinitionTest.java @@ -42,9 +42,16 @@ void armourAssetsHaveBothPlayerLayersAndTheHorseLayer() throws Exception { } @Test - void filledBucketsKeepTheirSpritesOnTheBlockAtlas() throws Exception { - var atlas = read(Path.of("src/main/resources/assets/minecraft/atlases/blocks.json")); - assertEquals(3, atlas.getAsJsonArray("sources").size()); + void filledBucketsKeepTheirSpritesOnTheItemAtlas() throws Exception { + var atlas = read(Path.of("src/main/resources/assets/minecraft/atlases/items.json")); + assertEquals(5, atlas.getAsJsonArray("sources").size()); + assertFalse(Files.exists(Path.of("src/main/resources/assets/minecraft/atlases/blocks.json"))); + + for (var source : atlas.getAsJsonArray("sources")) { + var alias = source.getAsJsonObject(); + assertTrue(alias.get("sprite").getAsString().startsWith("basemetals:item/")); + assertEquals("minecraft:single", alias.get("type").getAsString()); + } try (var files = Files.list(ASSETS.resolve("models/item"))) { var buckets = files.filter(file -> file.getFileName().toString().endsWith("_bucket.json")).toList(); @@ -52,8 +59,9 @@ void filledBucketsKeepTheirSpritesOnTheBlockAtlas() throws Exception { for (Path file : buckets) { var textures = read(file).getAsJsonObject("textures"); - assertEquals("basemetals:block/bucket_base", textures.get("base").getAsString()); - assertEquals("basemetals:block/bucket_cover", textures.get("cover").getAsString()); + assertEquals("basemetals:item/bucket_base", textures.get("base").getAsString()); + assertEquals("basemetals:item/bucket_fluid", textures.get("fluid").getAsString()); + assertEquals("basemetals:item/bucket_cover", textures.get("cover").getAsString()); assertEquals("#base", textures.get("particle").getAsString()); } } diff --git a/src/test/java/zone/moddev/mc/basemetals/data/OreOverlayModelTest.java b/src/test/java/zone/moddev/mc/basemetals/data/OreOverlayModelTest.java index d68a838e0..c73efe70f 100644 --- a/src/test/java/zone/moddev/mc/basemetals/data/OreOverlayModelTest.java +++ b/src/test/java/zone/moddev/mc/basemetals/data/OreOverlayModelTest.java @@ -71,6 +71,8 @@ private static void assertElement(JsonObject element, double from, double to, St for (Map.Entry face : faces.entrySet()) { assertEquals(texture, face.getValue().getAsJsonObject().get("texture").getAsString()); assertEquals(face.getKey(), face.getValue().getAsJsonObject().get("cullface").getAsString()); + assertEquals(JsonParser.parseString("[0,0,16,16]"), face.getValue().getAsJsonObject().get("uv"), + "Inflating the geometry must not sample pixels outside the sprite"); } } } diff --git a/src/test/java/zone/moddev/mc/basemetals/data/RawMaterialResourceTest.java b/src/test/java/zone/moddev/mc/basemetals/data/RawMaterialResourceTest.java index 39623bb65..2e3b2d286 100644 --- a/src/test/java/zone/moddev/mc/basemetals/data/RawMaterialResourceTest.java +++ b/src/test/java/zone/moddev/mc/basemetals/data/RawMaterialResourceTest.java @@ -32,9 +32,9 @@ void allRawMetalsHaveOneToOneProcessingAndDistinctTags() throws Exception { assertEquals("basemetals:" + metal + "_ingot", recipe.getAsJsonObject("result").get("id").getAsString()); } - String rawTag = Files.readString(GENERATED.resolve("data/forge/tags/item/raw_materials/" + metal + ".json")); + String rawTag = Files.readString(GENERATED.resolve("data/c/tags/item/raw_materials/" + metal + ".json")); assertTrue(rawTag.contains("basemetals:" + metal + "_raw")); - assertFalse(Files.readString(GENERATED.resolve("data/forge/tags/item/dusts/" + metal + ".json")).contains("_raw")); + assertFalse(Files.readString(GENERATED.resolve("data/c/tags/item/dusts/" + metal + ".json")).contains("_raw")); } try (Stream recipes = Files.list(GENERATED.resolve("data/basemetals/recipe"))) { diff --git a/src/test/java/zone/moddev/mc/basemetals/data/ResourceIntegrityTest.java b/src/test/java/zone/moddev/mc/basemetals/data/ResourceIntegrityTest.java index e1f6ff68e..8fe3c56a9 100644 --- a/src/test/java/zone/moddev/mc/basemetals/data/ResourceIntegrityTest.java +++ b/src/test/java/zone/moddev/mc/basemetals/data/ResourceIntegrityTest.java @@ -314,10 +314,10 @@ void crushingAliasesAndOptionalProcessingContractsAreGenerated() throws Exceptio assertCrushingRecipe("tin_nugget_crushing", "tag", "forge:nuggets/tin", "basemetals:tin_smallpowder", 1); - JsonObject adamantAlias = read(resource("data/forge/tags/item/ingots/adamantium.json")).getAsJsonObject(); - assertTrue(strings(adamantAlias.getAsJsonArray("values")).contains("#forge:ingots/adamantine")); - JsonObject sprocket = read(resource("data/forge/tags/item/sprockets/steel.json")).getAsJsonObject(); - assertTrue(strings(sprocket.getAsJsonArray("values")).contains("#forge:gears/steel")); + JsonObject adamantAlias = read(resource("data/c/tags/item/ingots/adamantium.json")).getAsJsonObject(); + assertTrue(strings(adamantAlias.getAsJsonArray("values")).contains("#c:ingots/adamantine")); + JsonObject sprocket = read(resource("data/c/tags/item/sprockets/steel.json")).getAsJsonObject(); + assertTrue(strings(sprocket.getAsJsonArray("values")).contains("#c:gears/steel")); assertConditionalRecipe("compat/mekanism/adamantine/ore_to_dirty_slurry", "mekanism"); assertConditionalRecipe("compat/thermal/alloys/bronze", "thermal_expansion"); @@ -712,19 +712,25 @@ private static void assertResource(String relative) { try { var sources = JsonParser.parseString(Files.readString( - MAIN.resolve("assets/minecraft/atlases/blocks.json"))) + MAIN.resolve("assets/minecraft/atlases/items.json"))) .getAsJsonObject().getAsJsonArray("sources"); for (var source : sources) { var alias = source.getAsJsonObject(); if (alias.has("sprite") && alias.get("sprite").getAsString().equals(sprite)) { assertEquals("minecraft:single", alias.get("type").getAsString()); - assertTrue(alias.get("resource").getAsString().matches("(?:minecraft|forge):[a-z0-9_./-]+")); + String sourceSprite = alias.get("resource").getAsString(); + if (sourceSprite.startsWith("basemetals:")) { + assertTrue(Files.isRegularFile(MAIN.resolve("assets/basemetals/textures/" + + sourceSprite.substring("basemetals:".length()) + ".png"))); + } else { + assertTrue(sourceSprite.matches("(?:minecraft|forge):[a-z0-9_./-]+")); + } return; } } } catch (IOException exception) { - throw new AssertionError("Could not read the block-atlas aliases", exception); + throw new AssertionError("Could not read the item-atlas aliases", exception); } } diff --git a/src/test/java/zone/moddev/mc/basemetals/migration/LegacyMigrationSafetyTest.java b/src/test/java/zone/moddev/mc/basemetals/migration/LegacyMigrationSafetyTest.java index bc97cb1fd..b9cf34baf 100644 --- a/src/test/java/zone/moddev/mc/basemetals/migration/LegacyMigrationSafetyTest.java +++ b/src/test/java/zone/moddev/mc/basemetals/migration/LegacyMigrationSafetyTest.java @@ -100,7 +100,7 @@ void modernExternalChunk() throws Exception { @Test void modernLz4Chunk() throws Exception { - assumeTrue(VERSION.equals("1.20.6") || VERSION.equals("1.21.11"), "Native LZ4 is not available on older targets"); + assumeTrue(VERSION.equals("1.20.6") || VERSION.equals("1.21.11") || VERSION.equals("26.1.2"), "Native LZ4 is not available on older targets"); Path world = world("lz4", false); Path file = region(world, false, true); assertTrue(nativeAccepts(file, false)); @@ -177,7 +177,7 @@ void savedRegistryCanBeScannedWithAnEmptyRegion() throws Exception { @Test void savedRegistryCanBeScannedWithLz4Chunks() throws Exception { - assumeTrue(VERSION.equals("1.20.6") || VERSION.equals("1.21.11")); + assumeTrue(VERSION.equals("1.20.6") || VERSION.equals("1.21.11") || VERSION.equals("26.1.2")); Path world = world("saved-registry-lz4", false); writeRegistry(world.resolve("basemetals-legacy-registry.dat")); Path file = region(world, false, true); @@ -190,18 +190,19 @@ void savedRegistryCanBeScannedWithLz4Chunks() throws Exception { } @Test - void firstUpgradeUsesThePlayerCapturedBeforeForgeReadsTheWorld() throws Exception { + void firstUpgradePreparesThePlayerBeforeNativeFileFixingAndNeverRestoresAnOlderCopy() throws Exception { Path world = world("first-legacy-upgrade", true); writeLevel(world.resolve("level.dat"), 1343, true, 7); - LegacyWorldDataHook.prepareLegacyWorld(world.resolve("level.dat").toFile()); + LegacyWorldDataHook.prepareSelectedWorld(world.resolve("level.dat")); + assertEquals(7, experience(world.resolve("level.dat"))); + assertTrue(Files.exists(world.resolve(MARKER))); - // Forge has now rewritten level.dat. Its backup is not our source of player data. + // A later native save is authoritative, even if an older backup still exists. writeLevel(world.resolve("level.dat"), DATA_VERSION, true, 37); writeLevel(world.resolve("level.dat_old"), 1343, true, 3); runEntry(world); - assertEquals(7, experience(world.resolve("level.dat"))); - assertTrue(Files.exists(world.resolve("basemetals-1.12-region-backup/level.dat"))); + assertEquals(37, experience(world.resolve("level.dat"))); assertTrue(Files.exists(world.resolve(MARKER))); writeLevel(world.resolve("level.dat"), DATA_VERSION, true, 38); @@ -211,7 +212,7 @@ void firstUpgradeUsesThePlayerCapturedBeforeForgeReadsTheWorld() throws Exceptio } @Test - void openingAnotherWorldClearsTheCapturedPlayer() throws Exception { + void openingAnotherWorldDoesNotCarryOverLegacyProvenance() throws Exception { Path oldWorld = world("old-world", true); writeLevel(oldWorld.resolve("level.dat"), 1343, true, 7); LegacyWorldDataHook.prepareLegacyWorld(oldWorld.resolve("level.dat").toFile()); diff --git a/src/test/java/zone/moddev/mc/basemetals/migration/LegacyWorldDataHookTest.java b/src/test/java/zone/moddev/mc/basemetals/migration/LegacyWorldDataHookTest.java index f41222cd1..95c9c5ceb 100644 --- a/src/test/java/zone/moddev/mc/basemetals/migration/LegacyWorldDataHookTest.java +++ b/src/test/java/zone/moddev/mc/basemetals/migration/LegacyWorldDataHookTest.java @@ -18,11 +18,12 @@ class LegacyWorldDataHookTest { void levelHookPassesTheFileBeforeComponentConversion() throws IOException { String hook = Files.readString(Path.of( "src/main/java/zone/moddev/mc/basemetals/mixin/LevelStorageSourceMixin.java")); - assertTrue(hook.contains("method = \"readLevelDataTagFixed\"")); - assertTrue(hook.contains("at = @At(\"HEAD\")")); - assertTrue(hook.contains("prepareLegacyWorld(file.toFile())")); - assertTrue(hook.contains("file.getFileName().toString().equals(\"level.dat\")")); - assertFalse(hook.contains("getParent")); + assertTrue(hook.contains("@Mixin(LevelStorageSource.LevelStorageAccess.class)")); + assertTrue(hook.contains("method = \"getUnfixedDataTag\"")); + assertTrue(hook.contains("at = @At(value = \"INVOKE\"")); + assertTrue(hook.contains("prepareSelectedWorld(getLevelPath(LevelResource.LEVEL_DATA_FILE))")); + assertTrue(hook.contains("if (!useFallback)")); + assertFalse(hook.contains("@Mixin(LevelStorageSource.class)")); } @Test diff --git a/src/test/java/zone/moddev/mc/basemetals/migration/LegacyWorldStorageTest.java b/src/test/java/zone/moddev/mc/basemetals/migration/LegacyWorldStorageTest.java new file mode 100644 index 000000000..da6540b23 --- /dev/null +++ b/src/test/java/zone/moddev/mc/basemetals/migration/LegacyWorldStorageTest.java @@ -0,0 +1,184 @@ +package zone.moddev.mc.basemetals.migration; + +import static org.junit.jupiter.api.Assertions.*; + +import java.nio.file.Files; +import java.nio.file.Path; +import net.minecraft.nbt.CompoundTag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.io.CleanupMode; +import org.junit.jupiter.api.io.TempDir; + +class LegacyWorldStorageTest { + @TempDir(cleanup = CleanupMode.ON_SUCCESS) + Path world; + + @Test + void previousCapabilityFileGetsANamespacedCopyAndKeepsItsOriginal() throws Exception { + level(4671); + Path old = capability("data/capabilities.dat", 42); + byte[] before = Files.readAllBytes(old); + + prepare(); + + Path current = world.resolve("dimensions/minecraft/overworld/data/forge/capabilities.dat"); + assertArrayEquals(before, Files.readAllBytes(current)); + assertArrayEquals(before, Files.readAllBytes(old)); + assertEquals(42, LegacyNbt.readCompressed(current.toFile()).getCompoundOrEmpty("data").getIntOr("marker", 0)); + prepare(); + assertArrayEquals(before, Files.readAllBytes(current)); + } + + @Test + void currentCapabilitiesAreAuthoritativeDuringAnUpgrade() throws Exception { + level(4671); + Path old = capability("data/capabilities.dat", 1); + Path current = capability("dimensions/minecraft/overworld/data/forge/capabilities.dat", 2); + byte[] before = Files.readAllBytes(current); + + prepare(); + + assertArrayEquals(before, Files.readAllBytes(current)); + assertEquals(1, LegacyNbt.readCompressed(old.toFile()).getCompoundOrEmpty("data").getIntOr("marker", 0)); + } + + @Test + void modernWorldNeverImportsALeftoverLegacyCapabilityFile() throws Exception { + level(SharedVersion.current()); + capability("data/capabilities.dat", 1); + + prepare(); + + assertFalse(Files.exists(world.resolve("dimensions/minecraft/overworld/data/forge/capabilities.dat"))); + assertFalse(Files.exists(world.resolve("basemetals-legacy-registry.dat"))); + } + + @Test + void metadataWithoutAPositiveVersionDoesNotActivateStorageMigration() throws Exception { + try (var output = Files.newOutputStream(world.resolve("level.dat"))) { + LegacyNbt.writeCompressed(new CompoundTag(), output); + } + capability("data/capabilities.dat", 1); + + prepare(); + + assertFalse(Files.exists(world.resolve("dimensions/minecraft/overworld/data/forge/capabilities.dat"))); + } + + @Test + void zeroVersionDoesNotCountAsUpgradeProvenance() throws Exception { + level(0); + capability("data/capabilities.dat", 1); + + prepare(); + + assertFalse(Files.exists(world.resolve("dimensions/minecraft/overworld/data/forge/capabilities.dat"))); + } + + private void prepare() throws Exception { + LegacyWorldDataHook.prepareSelectedWorld(world.resolve("level.dat")); + } + + @Test + void embeddedPlayerIsNotLostWhenItsOldDiskFileIsMissing() throws Exception { + embeddedPlayer(42); + + prepare(); + + Path file = world.resolve("playerdata/00000000-0000-0000-0000-000000000118.dat"); + assertTrue(Files.isRegularFile(file)); + CompoundTag player = LegacyNbt.readCompressed(file.toFile()); + assertEquals(42, player.getIntOr("XpTotal", 0)); + assertEquals(4671, player.getIntOr("DataVersion", 0)); + assertEquals(42, LegacyNbt.readCompressed(world.resolve("level.dat").toFile()) + .getCompoundOrEmpty("Data").getCompoundOrEmpty("Player").getIntOr("XpTotal", 0)); + } + + @Test + void embeddedPlayerNeverOverwritesAnExistingPlayerFile() throws Exception { + embeddedPlayer(42); + Path file = world.resolve("players/data/00000000-0000-0000-0000-000000000118.dat"); + Files.createDirectories(file.getParent()); + CompoundTag player = new CompoundTag(); + player.putInt("XpTotal", 99); + try (var output = Files.newOutputStream(file)) { + LegacyNbt.writeCompressed(player, output); + } + byte[] before = Files.readAllBytes(file); + + prepare(); + + assertArrayEquals(before, Files.readAllBytes(file)); + assertFalse(Files.exists(world.resolve("playerdata/00000000-0000-0000-0000-000000000118.dat"))); + } + + @Test + void modernWorldNeverRestoresALeftoverEmbeddedPlayer() throws Exception { + embeddedPlayer(42); + Files.copy(world.resolve("level.dat"), world.resolve("level.dat_old")); + CompoundTag current = LegacyNbt.readCompressed(world.resolve("level.dat").toFile()); + current.getCompoundOrEmpty("Data").putInt("DataVersion", SharedVersion.current()); + try (var output = Files.newOutputStream(world.resolve("level.dat"))) { + LegacyNbt.writeCompressed(current, output); + } + + prepare(); + + assertFalse(Files.exists(world.resolve("playerdata"))); + assertFalse(Files.exists(world.resolve("players"))); + } + + @Test + void staleBackupCannotSupplyAnEmbeddedPlayer() throws Exception { + embeddedPlayer(42); + Files.move(world.resolve("level.dat"), world.resolve("level.dat_old")); + level(SharedVersion.current()); + + prepare(); + + assertFalse(Files.exists(world.resolve("playerdata"))); + assertFalse(Files.exists(world.resolve("players"))); + } + + private void embeddedPlayer(int experience) throws Exception { + level(4671); + CompoundTag root = LegacyNbt.readCompressed(world.resolve("level.dat").toFile()); + CompoundTag player = new CompoundTag(); + player.putIntArray("UUID", new int[] {0, 0, 0, 280}); + player.putInt("XpTotal", experience); + root.getCompoundOrEmpty("Data").put("Player", player); + try (var output = Files.newOutputStream(world.resolve("level.dat"))) { + LegacyNbt.writeCompressed(root, output); + } + } + + private void level(int version) throws Exception { + CompoundTag data = new CompoundTag(); + data.putInt("DataVersion", version); + CompoundTag root = new CompoundTag(); + root.put("Data", data); + try (var output = Files.newOutputStream(world.resolve("level.dat"))) { + LegacyNbt.writeCompressed(root, output); + } + } + + private Path capability(String relative, int marker) throws Exception { + Path path = world.resolve(relative); + Files.createDirectories(path.getParent()); + CompoundTag payload = new CompoundTag(); + payload.putInt("marker", marker); + CompoundTag root = new CompoundTag(); + root.put("data", payload); + try (var output = Files.newOutputStream(path)) { + LegacyNbt.writeCompressed(root, output); + } + return path; + } + + private static final class SharedVersion { + static int current() { + net.minecraft.SharedConstants.tryDetectVersion(); + return net.minecraft.SharedConstants.getCurrentVersion().dataVersion().version(); + } + } +} diff --git a/src/test/java/zone/moddev/mc/basemetals/migration/NativeMigrationHooksTest.java b/src/test/java/zone/moddev/mc/basemetals/migration/NativeMigrationHooksTest.java index 77d5c04b0..bcfd8bfb7 100644 --- a/src/test/java/zone/moddev/mc/basemetals/migration/NativeMigrationHooksTest.java +++ b/src/test/java/zone/moddev/mc/basemetals/migration/NativeMigrationHooksTest.java @@ -23,19 +23,37 @@ /** Catches renamed injection targets before a packaged world is opened. */ class NativeMigrationHooksTest { + @Test + void legacyDurabilityDoesNotRequireAnEarlyItemStack() throws Exception { + for (var form : zone.moddev.mc.basemetals.config.MaterialForm.values()) { + boolean expected = java.util.Set.of("axe", "boots", "bow", "chestplate", "crackhammer", + "crossbow", "fishing_rod", "helmet", "hoe", "leggings", "pickaxe", "scythe", + "shears", "shield", "shovel", "sword").contains(form.name().toLowerCase(java.util.Locale.ROOT)); + var item = net.minecraft.resources.Identifier.parse( + "basemetals:steel_" + form.name().toLowerCase(java.util.Locale.ROOT)); + + assertEquals(expected, Legacy112WorldMigrator.keepsLegacyDurability(item), form.name()); + } + + String source = java.nio.file.Files.readString(Path.of( + "src/main/java/zone/moddev/mc/basemetals/migration/Legacy112WorldMigrator.java")); + assertTrue(!source.contains("getDefaultInstance()")); + } + @Test void levelCaptureStillRunsBeforeVanillaConversion() throws Exception { - var method = LevelStorageSource.class.getDeclaredMethod( - "readLevelDataTagFixed", Path.class, DataFixer.class); + var method = LevelStorageSource.LevelStorageAccess.class.getDeclaredMethod( + "getUnfixedDataTag", boolean.class); - assertTrue(Modifier.isStatic(method.getModifiers())); + assertTrue(Modifier.isPublic(method.getModifiers())); + assertTrue(!Modifier.isStatic(method.getModifiers())); assertEquals(Dynamic.class, method.getReturnType()); } @Test void chunkAndTerrainTargetsKeepTheirNativeSignatures() throws Exception { var upgrade = SimpleRegionStorage.class.getDeclaredMethod( - "upgradeChunkTag", CompoundTag.class, int.class, CompoundTag.class); + "upgradeChunkTag", CompoundTag.class, int.class, CompoundTag.class, int.class); var write = WorldGenRegion.class.getDeclaredMethod("ensureCanWrite", BlockPos.class); assertEquals(CompoundTag.class, upgrade.getReturnType()); @@ -69,7 +87,7 @@ void capabilityHookTargetsOnlyForgesWorldDataCodec() throws Exception { @Test void anvilWearHookTargetsOnlyTheNativeTakeCallback() throws Exception { var callback = AnvilMenu.class.getDeclaredMethod( - "lambda$onTake$2", Player.class, float.class, Level.class, BlockPos.class); + "lambda$onTake$0", Player.class, float.class, Level.class, BlockPos.class); assertTrue(Modifier.isStatic(callback.getModifiers())); assertEquals(void.class, callback.getReturnType()); diff --git a/src/test/resources/legacy_forge_tag_paths.txt b/src/test/resources/legacy_forge_tag_paths.txt new file mode 100644 index 000000000..3a64990fc --- /dev/null +++ b/src/test/resources/legacy_forge_tag_paths.txt @@ -0,0 +1,458 @@ +# Legacy Forge tags from released Base Metals 3.1.1.121111, merge 327beb7f. +block/bars/copper +block/doors/copper +block/end_stones +block/netherrack +block/ores +block/ores/adamantine +block/ores/antimony +block/ores/bismuth +block/ores/coldiron +block/ores/copper +block/ores/lead +block/ores/mercury +block/ores/nickel +block/ores/platinum +block/ores/silver +block/ores/starsteel +block/ores/tin +block/ores/zinc +block/slabs/copper +block/stairs/copper +block/storage_blocks +block/storage_blocks/adamantine +block/storage_blocks/antimony +block/storage_blocks/aquarium +block/storage_blocks/bismuth +block/storage_blocks/brass +block/storage_blocks/bronze +block/storage_blocks/charcoal +block/storage_blocks/coldiron +block/storage_blocks/copper +block/storage_blocks/cupronickel +block/storage_blocks/diamond +block/storage_blocks/electrum +block/storage_blocks/emerald +block/storage_blocks/gold +block/storage_blocks/invar +block/storage_blocks/iron +block/storage_blocks/lead +block/storage_blocks/mithril +block/storage_blocks/nickel +block/storage_blocks/obsidian +block/storage_blocks/pewter +block/storage_blocks/platinum +block/storage_blocks/quartz +block/storage_blocks/silver +block/storage_blocks/starsteel +block/storage_blocks/steel +block/storage_blocks/tin +block/storage_blocks/zinc +block/trapdoors/copper +fluid/molten_adamantine +fluid/molten_antimony +fluid/molten_aquarium +fluid/molten_bismuth +fluid/molten_brass +fluid/molten_bronze +fluid/molten_coldiron +fluid/molten_copper +fluid/molten_cupronickel +fluid/molten_electrum +fluid/molten_invar +fluid/molten_lead +fluid/molten_mercury +fluid/molten_mithril +fluid/molten_nickel +fluid/molten_pewter +fluid/molten_platinum +fluid/molten_silver +fluid/molten_starsteel +fluid/molten_steel +fluid/molten_tin +fluid/molten_zinc +item/armors/boots/copper +item/armors/chestplates/copper +item/armors/helmets/copper +item/armors/horse/copper +item/armors/leggings/copper +item/bars/copper +item/blends/aquarium +item/blends/brass +item/blends/bronze +item/blends/cupronickel +item/blends/diamond +item/blends/electrum +item/blends/gold +item/blends/invar +item/blends/iron +item/blends/mithril +item/blends/pewter +item/blends/steel +item/casings/adamantine +item/casings/antimony +item/casings/bismuth +item/casings/coldiron +item/casings/nickel +item/casings/platinum +item/casings/starsteel +item/casings/zinc +item/clumps/adamantine +item/clumps/antimony +item/clumps/bismuth +item/clumps/coldiron +item/clumps/nickel +item/clumps/platinum +item/clumps/starsteel +item/clumps/zinc +item/crushed_ores/adamantine +item/crushed_ores/antimony +item/crushed_ores/bismuth +item/crushed_ores/coldiron +item/crushed_ores/nickel +item/crushed_ores/platinum +item/crushed_ores/starsteel +item/crushed_ores/zinc +item/crystals/adamantine +item/crystals/antimony +item/crystals/bismuth +item/crystals/coldiron +item/crystals/nickel +item/crystals/platinum +item/crystals/starsteel +item/crystals/zinc +item/dense_plates/adamantine +item/dense_plates/antimony +item/dense_plates/bismuth +item/dense_plates/coldiron +item/dense_plates/nickel +item/dense_plates/platinum +item/dense_plates/starsteel +item/dense_plates/zinc +item/dirty_dusts/adamantine +item/dirty_dusts/antimony +item/dirty_dusts/bismuth +item/dirty_dusts/coldiron +item/dirty_dusts/nickel +item/dirty_dusts/platinum +item/dirty_dusts/starsteel +item/dirty_dusts/zinc +item/doors/copper +item/dusts +item/dusts/adamant +item/dusts/adamantine +item/dusts/adamantite +item/dusts/adamantium +item/dusts/antimony +item/dusts/aquarium +item/dusts/bismuth +item/dusts/brass +item/dusts/bronze +item/dusts/charcoal +item/dusts/coal +item/dusts/coldiron +item/dusts/copper +item/dusts/cupronickel +item/dusts/diamond +item/dusts/electrum +item/dusts/emerald +item/dusts/gold +item/dusts/invar +item/dusts/iron +item/dusts/lapis +item/dusts/lead +item/dusts/mercury +item/dusts/mithril +item/dusts/nickel +item/dusts/obsidian +item/dusts/pewter +item/dusts/platinum +item/dusts/prismarine +item/dusts/quartz +item/dusts/redstone +item/dusts/silver +item/dusts/starsteel +item/dusts/steel +item/dusts/tin +item/dusts/zinc +item/gears +item/gears/adamantine +item/gears/antimony +item/gears/aquarium +item/gears/bismuth +item/gears/brass +item/gears/bronze +item/gears/coldiron +item/gears/copper +item/gears/cupronickel +item/gears/diamond +item/gears/electrum +item/gears/emerald +item/gears/gold +item/gears/invar +item/gears/iron +item/gears/lead +item/gears/mithril +item/gears/nickel +item/gears/obsidian +item/gears/pewter +item/gears/platinum +item/gears/quartz +item/gears/silver +item/gears/starsteel +item/gears/steel +item/gears/stone +item/gears/tin +item/gears/wood +item/gears/zinc +item/ingots +item/ingots/adamant +item/ingots/adamantine +item/ingots/adamantite +item/ingots/adamantium +item/ingots/antimony +item/ingots/aquarium +item/ingots/bismuth +item/ingots/brass +item/ingots/bronze +item/ingots/coldiron +item/ingots/copper +item/ingots/cupronickel +item/ingots/electrum +item/ingots/invar +item/ingots/lead +item/ingots/mercury +item/ingots/mithril +item/ingots/nickel +item/ingots/obsidian +item/ingots/pewter +item/ingots/platinum +item/ingots/quicksilver +item/ingots/redstone +item/ingots/silver +item/ingots/starsteel +item/ingots/steel +item/ingots/tin +item/ingots/zinc +item/materials/diamond +item/materials/emerald +item/materials/gold +item/materials/iron +item/materials/obsidian +item/materials/quartz +item/nuggets +item/nuggets/adamant +item/nuggets/adamantine +item/nuggets/adamantite +item/nuggets/adamantium +item/nuggets/antimony +item/nuggets/aquarium +item/nuggets/bismuth +item/nuggets/brass +item/nuggets/bronze +item/nuggets/charcoal +item/nuggets/coal +item/nuggets/coldiron +item/nuggets/copper +item/nuggets/cupronickel +item/nuggets/diamond +item/nuggets/electrum +item/nuggets/emerald +item/nuggets/invar +item/nuggets/lead +item/nuggets/mercury +item/nuggets/mithril +item/nuggets/nickel +item/nuggets/obsidian +item/nuggets/pewter +item/nuggets/platinum +item/nuggets/quartz +item/nuggets/silver +item/nuggets/starsteel +item/nuggets/steel +item/nuggets/tin +item/nuggets/zinc +item/ores +item/ores/adamantine +item/ores/antimony +item/ores/bismuth +item/ores/coldiron +item/ores/copper +item/ores/lead +item/ores/mercury +item/ores/nickel +item/ores/platinum +item/ores/silver +item/ores/starsteel +item/ores/tin +item/ores/zinc +item/plates +item/plates/adamantine +item/plates/antimony +item/plates/aquarium +item/plates/bismuth +item/plates/brass +item/plates/bronze +item/plates/coldiron +item/plates/copper +item/plates/cupronickel +item/plates/diamond +item/plates/electrum +item/plates/emerald +item/plates/gold +item/plates/invar +item/plates/iron +item/plates/lead +item/plates/mithril +item/plates/nickel +item/plates/pewter +item/plates/platinum +item/plates/silver +item/plates/starsteel +item/plates/steel +item/plates/tin +item/plates/zinc +item/purified_ores/adamantine +item/purified_ores/antimony +item/purified_ores/bismuth +item/purified_ores/coldiron +item/purified_ores/nickel +item/purified_ores/platinum +item/purified_ores/starsteel +item/purified_ores/zinc +item/raw_materials +item/raw_materials/adamantine +item/raw_materials/antimony +item/raw_materials/bismuth +item/raw_materials/coldiron +item/raw_materials/copper +item/raw_materials/gold +item/raw_materials/iron +item/raw_materials/lead +item/raw_materials/mercury +item/raw_materials/nickel +item/raw_materials/platinum +item/raw_materials/silver +item/raw_materials/starsteel +item/raw_materials/tin +item/raw_materials/zinc +item/rods +item/rods/adamantine +item/rods/antimony +item/rods/aquarium +item/rods/bismuth +item/rods/brass +item/rods/bronze +item/rods/coldiron +item/rods/copper +item/rods/cupronickel +item/rods/diamond +item/rods/electrum +item/rods/emerald +item/rods/gold +item/rods/invar +item/rods/iron +item/rods/lead +item/rods/mithril +item/rods/nickel +item/rods/obsidian +item/rods/pewter +item/rods/platinum +item/rods/quartz +item/rods/silver +item/rods/starsteel +item/rods/steel +item/rods/stone +item/rods/tin +item/rods/zinc +item/shards/adamantine +item/shards/antimony +item/shards/bismuth +item/shards/coldiron +item/shards/nickel +item/shards/platinum +item/shards/starsteel +item/shards/zinc +item/slabs/copper +item/small_blends/aquarium +item/small_blends/brass +item/small_blends/bronze +item/small_blends/cupronickel +item/small_blends/diamond +item/small_blends/electrum +item/small_blends/gold +item/small_blends/invar +item/small_blends/iron +item/small_blends/mithril +item/small_blends/pewter +item/small_blends/steel +item/sprockets/steel +item/stairs/copper +item/storage_blocks +item/storage_blocks/adamantine +item/storage_blocks/antimony +item/storage_blocks/aquarium +item/storage_blocks/bismuth +item/storage_blocks/brass +item/storage_blocks/bronze +item/storage_blocks/charcoal +item/storage_blocks/coldiron +item/storage_blocks/copper +item/storage_blocks/cupronickel +item/storage_blocks/diamond +item/storage_blocks/electrum +item/storage_blocks/emerald +item/storage_blocks/gold +item/storage_blocks/invar +item/storage_blocks/iron +item/storage_blocks/lead +item/storage_blocks/mithril +item/storage_blocks/nickel +item/storage_blocks/obsidian +item/storage_blocks/pewter +item/storage_blocks/platinum +item/storage_blocks/quartz +item/storage_blocks/silver +item/storage_blocks/starsteel +item/storage_blocks/steel +item/storage_blocks/tin +item/storage_blocks/zinc +item/tiny_dusts +item/tiny_dusts/adamantine +item/tiny_dusts/antimony +item/tiny_dusts/aquarium +item/tiny_dusts/bismuth +item/tiny_dusts/brass +item/tiny_dusts/bronze +item/tiny_dusts/charcoal +item/tiny_dusts/coal +item/tiny_dusts/coldiron +item/tiny_dusts/copper +item/tiny_dusts/cupronickel +item/tiny_dusts/diamond +item/tiny_dusts/electrum +item/tiny_dusts/emerald +item/tiny_dusts/gold +item/tiny_dusts/invar +item/tiny_dusts/iron +item/tiny_dusts/lapis +item/tiny_dusts/lead +item/tiny_dusts/mercury +item/tiny_dusts/mithril +item/tiny_dusts/nickel +item/tiny_dusts/obsidian +item/tiny_dusts/pewter +item/tiny_dusts/platinum +item/tiny_dusts/quartz +item/tiny_dusts/redstone +item/tiny_dusts/silver +item/tiny_dusts/starsteel +item/tiny_dusts/steel +item/tiny_dusts/tin +item/tiny_dusts/zinc +item/tools/axes/copper +item/tools/hoes/copper +item/tools/pickaxes/copper +item/tools/shovels/copper +item/tools/swords/copper +item/trapdoors/copper diff --git a/src/upgradeSmoke/java/zone/moddev/mc/basemetals/smoke/UpgradeWorldSmoke.java b/src/upgradeSmoke/java/zone/moddev/mc/basemetals/smoke/UpgradeWorldSmoke.java index e6e7679e5..f674deddc 100644 --- a/src/upgradeSmoke/java/zone/moddev/mc/basemetals/smoke/UpgradeWorldSmoke.java +++ b/src/upgradeSmoke/java/zone/moddev/mc/basemetals/smoke/UpgradeWorldSmoke.java @@ -309,7 +309,7 @@ private static void prepareEquipmentChunks(ServerStartedEvent event) { public static void onServerTick(net.minecraftforge.event.TickEvent.ServerTickEvent.Post event) { if (pending == null || ++waitTicks < 20) return; var server = pending.getServer(); - boolean loaded = equipmentChunks.stream().allMatch(chunk -> server.overworld().areEntitiesLoaded(chunk.toLong())); + boolean loaded = equipmentChunks.stream().allMatch(chunk -> server.overworld().areEntitiesLoaded(chunk.pack())); if (!loaded && waitTicks < 200) return; if (!loaded) throw new IllegalStateException("Timed out loading upgrade equipment chunks"); ServerStartedEvent started = pending; @@ -317,7 +317,7 @@ public static void onServerTick(net.minecraftforge.event.TickEvent.ServerTickEve equipmentReady = true; onServerStarted(started); server.saveAllChunks(true, true, false); - equipmentChunks.forEach(chunk -> server.overworld().setChunkForced(chunk.x, chunk.z, false)); + equipmentChunks.forEach(chunk -> server.overworld().setChunkForced(chunk.x(), chunk.z(), false)); } private static void verifySavedAdvancements(net.minecraft.server.MinecraftServer server, @@ -351,8 +351,8 @@ private static boolean matchesSavedProperties(net.minecraft.world.level.block.st JsonObject saved) { if (!saved.has("saved_properties")) return true; var current = new java.util.LinkedHashMap(); - actual.getValues().forEach((property, value) -> current.put(property.getName(), - value.toString().toLowerCase(java.util.Locale.ROOT))); + actual.getValues().forEach(value -> current.put(value.property().getName(), + value.value().toString().toLowerCase(java.util.Locale.ROOT))); for (var entry : saved.getAsJsonObject("saved_properties").entrySet()) { String key = entry.getKey(); if (actual.getBlock() instanceof net.minecraft.world.level.block.SlabBlock && "half".equals(key)) key = "type"; diff --git a/tools/validation/README.md b/tools/validation/README.md index 4bca17e28..08ac0de0b 100644 --- a/tools/validation/README.md +++ b/tools/validation/README.md @@ -1,13 +1,13 @@ # World upgrade checks -`test_legacy_worlds.js` starts the packaged Forge 1.21.11 server against a fresh +`test_legacy_worlds.js` starts the packaged Forge 26.1.2 server against a fresh copy of each supplied world, then starts it again to check the saved result. It refuses to overwrite an existing test directory and fingerprints every source world before and after the test. -An optional `forgeVersion` selects another installed Forge 1.21.11 build for -compatibility checks; the default is the compilation target, `61.1.0`. +An optional `forgeVersion` selects another installed Forge 26.1.2 build for +compatibility checks; the default is the compilation target, `64.0.9`. -Pass a local JSON specification containing `java` (the Java 21 executable), `serverRuntime`, `output`, +Pass a local JSON specification containing `java` (the Java 25 executable), `serverRuntime`, `output`, `modJar`, `probeJar`, `oreSpawn` (a `path` and `sha256`), and a `profiles` list. Each profile needs an `id`, `world` path and expected log `marker`. Captured fixtures include a registry manifest so the probe can check each block state, @@ -50,7 +50,7 @@ It checks unchanged older configs, missing configs, matching Low Fantasy modes, and both kinds of mismatch. Matching clients disconnect and rejoin three times to check repeated connections. Existing gameplay switches must keep their values. -Its local specification needs `java` (the Java 21 executable), `serverRuntime`, `clientRuntime`, +Its local specification needs `java` (the Java 25 executable), `serverRuntime`, `clientRuntime`, `output`, `modJar`, `serverProbe`, `clientProbe`, and the same checksum-pinned `oreSpawn` object used by the world tests. The test uses localhost only and chooses a free port; no public Minecraft server is involved. diff --git a/tools/validation/compare_current_world.py b/tools/validation/compare_current_world.py index a2768a9f1..03c4722d5 100644 --- a/tools/validation/compare_current_world.py +++ b/tools/validation/compare_current_world.py @@ -7,18 +7,20 @@ import json import struct import zlib +import uuid from collections import Counter from pathlib import Path import nbtlib from compare_world_terrain import block_names, chunks +from world_paths import dimensions, player_files def saved_entities(world): # Newer Minecraft saves entities separately from the terrain chunks. - for dimension in ('', 'DIM-1', 'DIM1'): - for region in (world / dimension / 'entities').glob('*.mca'): + for dimension, folder in dimensions(world): + for region in (folder / 'entities').glob('*.mca'): data = region.read_bytes() for slot in range(1024): offset = int.from_bytes(data[slot * 4:slot * 4 + 3], 'big') * 4096 @@ -169,12 +171,26 @@ def items(value): for entity in saved_entities(world): items(entity) - items(canonical_player(nbtlib.load(world / "level.dat")["Data"].get("Player", {}))) - for player in (world / "playerdata").glob("*.dat"): - items(canonical_player(nbtlib.load(player))) + players = {file.stem: nbtlib.load(file) for file in player_files(world, "data", ".dat")} + embedded = nbtlib.load(world / "level.dat")["Data"].get("Player", {}) + identity = None + if "UUID" in embedded: + value = embedded["UUID"] + if isinstance(value, nbtlib.IntArray) and len(value) == 4: + identity = str(uuid.UUID(int=sum((int(part) & 0xffffffff) << (96 - index * 32) + for index, part in enumerate(value)))) + else: + identity = str(uuid.UUID(str(value))) + elif "UUIDMost" in embedded and "UUIDLeast" in embedded: + identity = str(uuid.UUID(int=((int(embedded["UUIDMost"]) & ((1 << 64) - 1)) << 64) + | (int(embedded["UUIDLeast"]) & ((1 << 64) - 1)))) + if identity not in players: + items(canonical_player(embedded)) + for player in players.values(): + items(canonical_player(player)) advancements = {} - for file in (world / "advancements").glob("*.json"): + for file in player_files(world, "advancements", ".json"): progress = json.loads(file.read_text(encoding="utf8")) advancements[file.name] = {key: value for key, value in progress.items() if key.startswith("basemetals:")} return blocks, stacks, advancements diff --git a/tools/validation/compare_world_terrain.py b/tools/validation/compare_world_terrain.py index 4acf7c9c3..f3042660c 100644 --- a/tools/validation/compare_world_terrain.py +++ b/tools/validation/compare_world_terrain.py @@ -9,6 +9,7 @@ from pathlib import Path import nbtlib +from world_paths import dimensions LEGACY_TERRAIN = { @@ -35,8 +36,8 @@ def chunks(world): result = {} - for dimension in ["", "DIM-1", "DIM1"]: - for region in (world / dimension / "region").glob("*.mca"): + for dimension, folder in dimensions(world): + for region in (folder / "region").glob("*.mca"): data = region.read_bytes() for slot in range(1024): offset = int.from_bytes(data[slot * 4:slot * 4 + 3], "big") * 4096 @@ -124,8 +125,8 @@ def collect(dimension, entities): for (dimension, _, _), chunk in loaded_chunks.items(): collect(dimension, chunk.get("Entities", [])) - for dimension in ["", "DIM-1", "DIM1"]: - for region in (world / dimension / "entities").glob("*.mca"): + for dimension, folder in dimensions(world): + for region in (folder / "entities").glob("*.mca"): data = region.read_bytes() for slot in range(1024): offset = int.from_bytes(data[slot * 4:slot * 4 + 3], "big") * 4096 diff --git a/tools/validation/forge_launcher.js b/tools/validation/forge_launcher.js index 9dbeff7a3..fbbd8180d 100644 --- a/tools/validation/forge_launcher.js +++ b/tools/validation/forge_launcher.js @@ -33,7 +33,8 @@ function serverArguments(runtime, directory, version, forge) { } const staged = path.join(directory, 'forge-arguments.txt'); fs.writeFileSync(staged, contents); - return ['--add-opens', 'java.base/java.lang.invoke=ALL-UNNAMED', '@' + staged, 'nogui']; + return ['-Dterminal.jline=false', '-Dterminal.ansi=false', + '--add-opens', 'java.base/java.lang.invoke=ALL-UNNAMED', '@' + staged, 'nogui']; } function clientLaunch(runtime, version, forge) { diff --git a/tools/validation/test_content_modes.js b/tools/validation/test_content_modes.js index 05be044a1..de7a83816 100644 --- a/tools/validation/test_content_modes.js +++ b/tools/validation/test_content_modes.js @@ -94,7 +94,7 @@ function verifyConfig(directory, initial) { (async () => { const results = []; - const client = clientLaunch(spec.clientRuntime, '1.21.11', '61.1.0'); + const client = clientLaunch(spec.clientRuntime, '26.1.2', '64.0.9'); const selected = spec.cases ? cases.filter(([name]) => spec.cases.includes(name)) : cases; if (!selected.length || (spec.cases && selected.length !== spec.cases.length)) { throw new Error('The requested mode-test case is unknown or duplicated.'); @@ -114,14 +114,14 @@ function verifyConfig(directory, initial) { + 'generator-settings={"layers":[{"block":"minecraft:bedrock","height":1},{"block":"minecraft:dirt","height":2},{"block":"minecraft:grass_block","height":1}],"biome":"minecraft:plains"}\n' + 'generate-structures=false\nmax-tick-time=-1\n'); const server = launch(serverDir, ['-Xms256m', '-Xmx2g', '-Dbasemetals.awaitLoginSmoke=true', - ...serverArguments(spec.serverRuntime, serverDir, '1.21.11', '61.1.0')], 'server.log'); + ...serverArguments(spec.serverRuntime, serverDir, '26.1.2', '64.0.9')], 'server.log'); let player; try { await waitFor(server, 'BASEMETALS_PACKAGED_SERVER_SMOKE PASS', 240000); player = launch(clientDir, ['-Xms512m', '-Xmx2g', '-Dbasemetals.remoteLoginSmoke=true', `-Dbasemetals.remoteAddress=127.0.0.1:${port}`, `-Dbasemetals.loginSmokeConnections=${reject ? 1 : 3}`, `-Dbasemetals.expectModeReject=${!!reject}`, ...client.args, ...client.metadata.arguments.game, - '--username', 'BMValidation', '--version', '1.21.11', '--gameDir', clientDir, + '--username', 'BMValidation', '--version', '26.1.2', '--gameDir', clientDir, '--assetsDir', path.join(spec.clientRuntime, 'assets'), '--assetIndex', client.vanilla.assetIndex.id, '--uuid', '00000000000000000000000000000118', '--accessToken', '0', '--userType', 'legacy'], 'client.log'); await waitFor(player, 'BASEMETALS_MODE_LOGIN_CLIENT PASS result=' + (reject ? 'rejected' : 'connected'), 240000); diff --git a/tools/validation/test_legacy_worlds.js b/tools/validation/test_legacy_worlds.js index 1c0b7a9d3..865dbb581 100644 --- a/tools/validation/test_legacy_worlds.js +++ b/tools/validation/test_legacy_worlds.js @@ -148,7 +148,7 @@ async function run(directory, launcher, label, marker, properties = []) { const output = fs.createWriteStream(path.join(directory, label + '.log')); const executable = phase === 'capture' ? spec.java8 : (spec.java || spec.java17); const launchArguments = phase === 'capture' ? ['-jar', launcher, 'nogui'] - : serverArguments(spec.serverRuntime, directory, '1.21.11', spec.forgeVersion || '61.1.0'); + : serverArguments(spec.serverRuntime, directory, '26.1.2', spec.forgeVersion || '64.0.9'); const child = spawn(executable, ['-Xms256m', '-Xmx2g', ...properties, ...launchArguments], { cwd: directory, windowsHide: true, stdio: ['ignore', 'pipe', 'pipe'] }); child.stdout.pipe(output, { end: false }); diff --git a/tools/validation/test_world_layout.py b/tools/validation/test_world_layout.py new file mode 100644 index 000000000..7de7db061 --- /dev/null +++ b/tools/validation/test_world_layout.py @@ -0,0 +1,76 @@ +"""The comparison tools must follow Minecraft's 26.1 file moves.""" + +import io +import json +import struct +import tempfile +import unittest +import zlib +from pathlib import Path + +import nbtlib +import compare_current_world as content +import compare_world_terrain as terrain + + +class WorldLayoutTest(unittest.TestCase): + def test_native_dimensions_keep_the_same_comparison_keys(self): + with tempfile.TemporaryDirectory() as directory: + world = Path(directory) + for name in ('overworld', 'the_nether', 'the_end'): + self.region(world / 'dimensions/minecraft' / name / 'region') + + self.assertEqual({('', 0, 0), ('DIM-1', 0, 0), ('DIM1', 0, 0)}, set(terrain.chunks(world))) + + def test_nested_custom_dimensions_are_not_skipped(self): + with tempfile.TemporaryDirectory() as directory: + world = Path(directory) + self.region(world / 'dimensions/example/nested/cavern/region') + self.assertIn(('dimensions/example/nested/cavern', 0, 0), terrain.chunks(world)) + + def test_player_files_and_advancements_follow_the_native_paths(self): + with tempfile.TemporaryDirectory() as directory: + world = Path(directory) + nbtlib.File({'Data': nbtlib.Compound()}).save(world / 'level.dat', gzipped=True) + players = world / 'players/data' + players.mkdir(parents=True) + item = nbtlib.Compound({'id': nbtlib.String('basemetals:steel_ingot'), 'count': nbtlib.Int(12)}) + nbtlib.File({'Inventory': nbtlib.List[nbtlib.Compound]([item])}).save(players / 'player.dat', gzipped=True) + advances = world / 'players/advancements' + advances.mkdir() + progress = {'basemetals:this_is_new': {'done': True}} + (advances / 'player.json').write_text(json.dumps(progress), encoding='utf8') + + _, stacks, achievements = content.snapshot(world) + + self.assertEqual(1, sum(stacks.values())) + self.assertEqual({'player.json': progress}, achievements) + + def test_embedded_and_disk_copies_of_one_player_are_counted_once(self): + with tempfile.TemporaryDirectory() as directory: + world = Path(directory) + player = nbtlib.Compound({ + 'UUID': nbtlib.IntArray([0, 0, 0, 280]), + 'Inventory': nbtlib.List[nbtlib.Compound]([ + nbtlib.Compound({'id': nbtlib.String('basemetals:steel_ingot'), 'count': nbtlib.Int(12)}) + ]), + }) + nbtlib.File({'Data': nbtlib.Compound({'Player': player})}).save(world / 'level.dat', gzipped=True) + players = world / 'playerdata' + players.mkdir() + nbtlib.File(player).save(players / '00000000-0000-0000-0000-000000000118.dat', gzipped=True) + + _, stacks, _ = content.snapshot(world) + + self.assertEqual(1, sum(stacks.values())) + + @staticmethod + def region(directory): + directory.mkdir(parents=True) + stream = io.BytesIO() + nbtlib.File({'xPos': nbtlib.Int(0), 'zPos': nbtlib.Int(0)}).write(stream) + payload = zlib.compress(stream.getvalue()) + region = bytearray(8192) + region[:4] = bytes((0, 0, 2, 1)) + region.extend(struct.pack('>I', len(payload) + 1) + bytes((2,)) + payload) + (directory / 'r.0.0.mca').write_bytes(region) diff --git a/tools/validation/world_paths.py b/tools/validation/world_paths.py new file mode 100644 index 000000000..abc8f75f5 --- /dev/null +++ b/tools/validation/world_paths.py @@ -0,0 +1,27 @@ +"""Find active save files before and after Minecraft's 26.1 storage changes.""" + + +def dimensions(world): + folders = {'': world, 'DIM-1': world / 'DIM-1', 'DIM1': world / 'DIM1'} + names = {'overworld': '', 'the_nether': 'DIM-1', 'the_end': 'DIM1'} + native = world / 'dimensions' + if native.is_dir(): + for namespace in sorted(native.iterdir()): + if not namespace.is_dir(): + continue + for folder in sorted(namespace.rglob('*')): + if not folder.is_dir() or folder.name not in ('region', 'entities'): + continue + parent = folder.parent + key = parent.relative_to(world).as_posix() + if namespace.name == 'minecraft' and parent.parent == namespace: + key = names.get(parent.name, key) + folders[key] = parent + return sorted(folders.items()) + + +def player_files(world, kind, suffix): + legacy = 'playerdata' if kind == 'data' else kind + files = {file.name: file for file in (world / legacy).glob('*' + suffix)} + files.update({file.name: file for file in (world / 'players' / kind).glob('*' + suffix)}) + return [files[name] for name in sorted(files)]