diff --git a/.gitattributes b/.gitattributes index f811f6ae..13cf95ba 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,5 +1,4 @@ # Disable autocrlf on generated files, they always generate with LF # Add any extra files or paths here to make git stop saying they # are changed when only line endings change. -src/generated/**/.cache/cache text eol=lf -src/generated/**/*.json text eol=lf +src/generated/ linguist-generated=true text eol=lf \ No newline at end of file diff --git a/README.md b/README.md index b8fc9f0f..eb4c463c 100644 --- a/README.md +++ b/README.md @@ -1,11 +1,11 @@ -Allomancy 5.1.0 +Allomancy 5.2.0 =============== [![ CurseForge](http://cf.way2muchnoise.eu/256282.svg)](https://minecraft.curseforge.com/projects/allomancy) [![Modrinth Downloads](https://img.shields.io/modrinth/dt/allomancy?color=00AF5C&label=downloads&style=flat-square&logo=modrinth)](https://modrinth.com/mod/allomancy) [![Build status](https://github.com/legobmw99/Allomancy/actions/workflows/gradle.yml/badge.svg)](https://github.com/legobmw99/Allomancy/actions) This mod adds the basics of [Allomancy](http://coppermind.net/wiki/Allomancy) from Brandon Sanderson's book series *Mistborn*. -This mod is currently updated for `Minecraft 1.21` and `NeoForge 21.0.143` +This mod is currently updated for `Minecraft 1.21.4` and `NeoForge 21.4.30` Please verify and report any issues! diff --git a/build.gradle b/build.gradle index c52dcb5e..689f7c15 100644 --- a/build.gradle +++ b/build.gradle @@ -1,10 +1,8 @@ plugins { id 'java-library' - id 'eclipse' - id 'idea' id 'maven-publish' - id 'net.neoforged.gradle.userdev' version '7.0.157' - id 'net.neoforged.gradle.mixin' version '7.0.157' + id 'net.neoforged.moddev' version '1.0.23' + id 'idea' } tasks.named('wrapper', Wrapper).configure { @@ -27,58 +25,83 @@ base { archivesName = mod_id } -// Mojang ships Java 17 to end users in 1.18+, so your mod should target Java 17. +// Mojang ships Java 21 to end users starting in 1.20.5, so mods should target Java 21. java.toolchain.languageVersion = JavaLanguageVersion.of(21) -// Default run configurations. -// These can be tweaked, removed, or duplicated as needed. -runs { - // applies to all the run configs below - configureEach { - // Recommended logging data for a userdev environment - // The markers can be added/remove as needed separated by commas. - // "SCAN": For mods scan. - // "REGISTRIES": For firing of registry events. - // "REGISTRYDUMP": For getting the contents of all registries. - systemProperty 'forge.logging.markers', 'REGISTRIES' - - // Recommended logging level for the console - // You can set various levels here. - // Please read: https://stackoverflow.com/questions/2031163/when-to-use-the-different-log-levels - systemProperty 'forge.logging.console.level', 'debug' - - modSource project.sourceSets.main - } +neoForge { + // Specify the version of NeoForge to use. + version = project.neo_version - client { - // Comma-separated list of namespaces to load gametests from. Empty = all namespaces. - systemProperty 'forge.enabledGameTestNamespaces', project.mod_id + parchment { + mappingsVersion = project.parchment_mappings_version + minecraftVersion = project.parchment_minecraft_version } - server { - systemProperty 'forge.enabledGameTestNamespaces', project.mod_id - } + // This line is optional. Access Transformers are automatically detected + // accessTransformers = project.files('src/main/resources/META-INF/accesstransformer.cfg') + + // Default run configurations. + // These can be tweaked, removed, or duplicated as needed. + runs { + client { + client() + gameDirectory = project.file('runs/client') + // Comma-separated list of namespaces to load gametests from. Empty = all namespaces. + systemProperty 'neoforge.enabledGameTestNamespaces', project.mod_id + } - // This run config launches GameTestServer and runs all registered gametests, then exits. - // By default, the server will crash when no gametests are provided. - // The gametest system is also enabled by default for other run configs under the /test command. - gameTestServer { - systemProperty 'forge.enabledGameTestNamespaces', project.mod_id - } + server { + server() + gameDirectory = project.file('runs/server') + systemProperty 'neoforge.enabledGameTestNamespaces', project.mod_id + } - data { - // example of overriding the workingDirectory set in configureEach above, uncomment if you want to use it - // workingDirectory project.file('run-data') + // This run config launches GameTestServer and runs all registered gametests, then exits. + // By default, the server will crash when no gametests are provided. + // The gametest system is also enabled by default for other run configs under the /test command. + gameTestServer { + type = "gameTestServer" + gameDirectory = project.file('runs/gameTestServer') + systemProperty 'neoforge.enabledGameTestNamespaces', project.mod_id + } + + clientData { + clientData() + gameDirectory = project.file('runs/clientData') + // Specify the modid for data generation, where to output the resulting resource, and where to look for existing resources. + programArguments.addAll '--mod', project.mod_id, '--all', '--output', file('src/generated/resources/').getAbsolutePath(), '--existing', file('src/main/resources/').getAbsolutePath() + } - // Specify the modid for data generation, where to output the resulting resource, and where to look for existing resources. - programArguments.addAll '--mod', project.mod_id, '--all', '--output', file('src/generated/resources/').getAbsolutePath(), '--existing', file('src/main/resources/').getAbsolutePath() + // applies to all the run configs above + configureEach { + // Recommended logging data for a userdev environment + // The markers can be added/remove as needed separated by commas. + // "SCAN": For mods scan. + // "REGISTRIES": For firing of registry events. + // "REGISTRYDUMP": For getting the contents of all registries. + systemProperty 'forge.logging.markers', 'REGISTRIES' + + // Recommended logging level for the console + // You can set various levels here. + // Please read: https://stackoverflow.com/questions/2031163/when-to-use-the-different-log-levels + logLevel = org.slf4j.event.Level.DEBUG + } + } + + mods { + // define mod <-> source bindings + // these are used to tell the game which sources are for which mod + // mostly optional in a single mod project + // but multi mod projects should define one per mod + "${mod_id}" { + sourceSet(sourceSets.main) + } } } // Include resources generated by data generators. sourceSets.main.resources { srcDir 'src/generated/resources' } - // Sets up a dependency configuration called 'localRuntime'. // This configuration should be used instead of 'runtimeOnly' to declare // a dependency that will be present for runtime testing but that is @@ -88,9 +111,6 @@ configurations { } repositories { - // Put repositories for dependencies here - // ForgeGradle automatically adds the Forge maven and Maven Central for you - // If you have mod jar dependencies in ./libs, you can declare them as a repository like so. // See https://docs.gradle.org/current/userguide/declaring_repositories.html#sub:flat_dir_resolver // flatDir { @@ -104,56 +124,17 @@ repositories { } } -mixin { - // add sourceSets.main, "${mod_id}.refmap.json" - // Sets up the mixin config; this gets added to run configurations and the manifest in the final jar - config "${mod_id}.mixins.json" - - // Enables exporting mixin-changed classes to .mixin.out in the run folder - // debug.export = true -} dependencies { - // Specify the version of Minecraft to use. - // Depending on the plugin applied there are several options. We will assume you applied the userdev plugin as shown above. - // The group for userdev is net.neoforged, the module name is neoforge, and the version is the same as the neoforge version. - // You can however also use the vanilla plugin (net.neoforged.gradle.vanilla) to use a version of Minecraft without the neoforge loader. - // And its provides the option to then use net.minecraft as the group, and one of; client, server or joined as the module name, plus the game version as version. - // For all intends and purposes: You can treat this dependency as if it is a normal library you would use. - implementation "net.neoforged:neoforge:${neo_version}" - - // Example mod dependency with JEI - // The JEI API is declared for compile time use, while the full JEI artifact is used at runtime - // compileOnly "mezz.jei:jei-${mc_version}-common-api:${jei_version}" - // compileOnly "mezz.jei:jei-${mc_version}-forge-api:${jei_version}" - // runtimeOnly "mezz.jei:jei-${mc_version}-forge:${jei_version}" - - dependencies { - implementation "curse.maven:jade-324717:${jade_id}" + dependencies { + implementation "curse.maven:jade-324717:${jade_id}" // api "curse.maven:jade-324717:${jade_api}" - } - - // Example mod dependency using a mod jar from ./libs with a flat dir repository - // This maps to ./libs/coolmod-${mc_version}-${coolmod_version}.jar - // The group id is ignored when searching -- in this case, it is "blank" - // implementation "blank:coolmod-${mc_version}:${coolmod_version}" - - // Example mod dependency using a file as dependency - // implementation files("libs/coolmod-${mc_version}-${coolmod_version}.jar") - - // Example project dependency using a sister or child project: - // implementation project(":myproject") - - // For more info: - // http://www.gradle.org/docs/current/userguide/artifact_dependencies_tutorial.html - // http://www.gradle.org/docs/current/userguide/dependency_management.html + } } // This block of code expands all declared replace properties in the specified resource targets. // A missing property will result in an error. Properties are expanded using ${} Groovy notation. -// When "copyIdeResources" is enabled, this will also run before the game launches in IDE environments. -// See https://docs.gradle.org/current/dsl/org.gradle.language.jvm.tasks.ProcessResources.html -tasks.withType(ProcessResources).configureEach { +var generateModMetadata = tasks.register("generateModMetadata", ProcessResources) { var replaceProperties = [ minecraft_version : minecraft_version, minecraft_version_range: minecraft_version_range, @@ -170,10 +151,16 @@ tasks.withType(ProcessResources).configureEach { ] inputs.properties replaceProperties - filesMatching(['META-INF/neoforge.mods.toml']) { - expand replaceProperties - } + expand replaceProperties + from "src/main/templates" + into "build/generated/sources/modMetadata" } +// Include the output of "generateModMetadata" as an input directory for the build +// this works with both building through Gradle and the IDE. +sourceSets.main.resources.srcDir generateModMetadata +// To avoid having to run "generateModMetadata" manually, make it run on every project reload +neoForge.ideSyncTask generateModMetadata + // Example configuration to allow publishing using the maven-publish plugin publishing { diff --git a/gradle.properties b/gradle.properties index 88a477c6..c8772c5f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,30 +1,31 @@ # Sets default memory used for gradle commands. Can be overridden by user or command line properties. -org.gradle.jvmargs=-Xmx4G -org.gradle.daemon=false -org.gradle.debug=false +org.gradle.jvmargs=-Xmx2G +org.gradle.daemon=true +org.gradle.parallel=true +org.gradle.caching=true +# org.gradle.configuration-cache=true ## Environment Properties # You can find the latest versions here: https://projects.neoforged.net/neoforged/neoforge # The Minecraft version must agree with the Neo version to get a valid artifact -minecraft_version=1.21 +minecraft_version=1.21.4 # The Minecraft version range can use any release version of Minecraft as bounds. # Snapshots, pre-releases, and release candidates are not guaranteed to sort properly # as they do not follow standard versioning conventions. -minecraft_version_range=[1.21,1.22) +minecraft_version_range=[1.21.4,1.22) # The Neo version must agree with the Minecraft version to get a valid artifact -neo_version=21.0.143 +neo_version=21.4.30-beta # The Neo version range can use any version of Neo as bounds -neo_version_range=[21.0.143,) +neo_version_range=[21.4.30-beta,) # The loader version range can only use the major version of FML as bounds loader_version_range=[4,) # read more on this at https://github.com/neoforged/NeoGradle/blob/NG_7.0/README.md#apply-parchment-mappings # you can also find the latest versions at: https://parchmentmc.org/docs/getting-started -neogradle.subsystems.parchment.minecraftVersion=1.21 -neogradle.subsystems.parchment.mappingsVersion=2024.07.28 +parchment_minecraft_version=1.21.4 +parchment_mappings_version=2024.12.07 # https://www.curseforge.com/minecraft/mc-mods/jade/files/all -jade_id=5572926 -jade_api=5427895 -jade_version_range=[15,) +jade_id=5976531 +jade_version_range=[17,) ## Mod Properties # The unique mod identifier for the mod. Must be lowercase in English locale. Must fit the regex [a-z][a-z0-9_]{1,63} # Must match the String constant located in the main mod class annotated with @Mod. @@ -34,7 +35,7 @@ mod_name=Allomancy # The license of the mod. Review your options at https://choosealicense.com/. All Rights Reserved is the default. mod_license=GPL v3 # The mod version. See https://semver.org/ -mod_version=5.1.0 +mod_version=5.2.0b1 # 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 diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index e6441136..a4b76b95 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index b82aa23a..e2847c82 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew index 1aa94a42..f5feea6d 100644 --- a/gradlew +++ b/gradlew @@ -15,6 +15,8 @@ # See the License for the specific language governing permissions and # limitations under the License. # +# SPDX-License-Identifier: Apache-2.0 +# ############################################################################## # @@ -55,7 +57,7 @@ # Darwin, MinGW, and NonStop. # # (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt # within the Gradle project. # # You can find Gradle at https://github.com/gradle/gradle/. @@ -84,7 +86,8 @@ done # shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) -APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s +' "$PWD" ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum diff --git a/gradlew.bat b/gradlew.bat index 25da30db..9d21a218 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -13,6 +13,8 @@ @rem See the License for the specific language governing permissions and @rem limitations under the License. @rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem @if "%DEBUG%"=="" @echo off @rem ########################################################################## diff --git a/settings.gradle b/settings.gradle index fd1434c1..b9766173 100644 --- a/settings.gradle +++ b/settings.gradle @@ -7,5 +7,5 @@ pluginManagement { } plugins { - id 'org.gradle.toolchains.foojay-resolver-convention' version '0.8.0' + id 'org.gradle.toolchains.foojay-resolver-convention' version '0.9.0' } \ No newline at end of file diff --git a/src/generated/resources/assets/allomancy/equipment/aluminum.json b/src/generated/resources/assets/allomancy/equipment/aluminum.json new file mode 100644 index 00000000..da8cb859 --- /dev/null +++ b/src/generated/resources/assets/allomancy/equipment/aluminum.json @@ -0,0 +1,9 @@ +{ + "layers": { + "humanoid": [ + { + "texture": "allomancy:aluminum" + } + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/allomancy/equipment/wool.json b/src/generated/resources/assets/allomancy/equipment/wool.json new file mode 100644 index 00000000..0b1edde0 --- /dev/null +++ b/src/generated/resources/assets/allomancy/equipment/wool.json @@ -0,0 +1,9 @@ +{ + "layers": { + "humanoid": [ + { + "texture": "allomancy:mistcloak" + } + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/allomancy/lang/en_us.json b/src/generated/resources/assets/allomancy/lang/en_us.json index 58912ff3..3b5ea314 100644 --- a/src/generated/resources/assets/allomancy/lang/en_us.json +++ b/src/generated/resources/assets/allomancy/lang/en_us.json @@ -340,53 +340,42 @@ "item.allomancy.aluminum_helmet": "Aluminum Helmet", "item.allomancy.aluminum_ingot": "Aluminum Ingot", "item.allomancy.aluminum_nugget": "Aluminum Nugget", - "item.allomancy.aluminum_pattern": "Banner Pattern", - "item.allomancy.aluminum_pattern.desc": "Aluminum Symbol", + "item.allomancy.aluminum_pattern": "Aluminum Banner Pattern", "item.allomancy.bendalloy_flakes": "Bendalloy Flakes", "item.allomancy.bendalloy_ingot": "Bendalloy Ingot", "item.allomancy.bendalloy_nugget": "Bendalloy Nugget", - "item.allomancy.bendalloy_pattern": "Banner Pattern", - "item.allomancy.bendalloy_pattern.desc": "Bendalloy Symbol", + "item.allomancy.bendalloy_pattern": "Bendalloy Banner Pattern", "item.allomancy.brass_flakes": "Brass Flakes", "item.allomancy.brass_ingot": "Brass Ingot", "item.allomancy.brass_nugget": "Brass Nugget", - "item.allomancy.brass_pattern": "Banner Pattern", - "item.allomancy.brass_pattern.desc": "Brass Symbol", + "item.allomancy.brass_pattern": "Brass Banner Pattern", "item.allomancy.bronze_flakes": "Bronze Flakes", "item.allomancy.bronze_ingot": "Bronze Ingot", "item.allomancy.bronze_nugget": "Bronze Nugget", - "item.allomancy.bronze_pattern": "Banner Pattern", - "item.allomancy.bronze_pattern.desc": "Bronze Symbol", + "item.allomancy.bronze_pattern": "Bronze Banner Pattern", "item.allomancy.cadmium_flakes": "Cadmium Flakes", "item.allomancy.cadmium_ingot": "Cadmium Ingot", "item.allomancy.cadmium_nugget": "Cadmium Nugget", - "item.allomancy.cadmium_pattern": "Banner Pattern", - "item.allomancy.cadmium_pattern.desc": "Cadmium Symbol", + "item.allomancy.cadmium_pattern": "Cadmium Banner Pattern", "item.allomancy.chromium_flakes": "Chromium Flakes", "item.allomancy.chromium_ingot": "Chromium Ingot", "item.allomancy.chromium_nugget": "Chromium Nugget", - "item.allomancy.chromium_pattern": "Banner Pattern", - "item.allomancy.chromium_pattern.desc": "Chromium Symbol", + "item.allomancy.chromium_pattern": "Chromium Banner Pattern", "item.allomancy.coin_bag": "Coin Bag", "item.allomancy.copper_flakes": "Copper Flakes", - "item.allomancy.copper_pattern": "Banner Pattern", - "item.allomancy.copper_pattern.desc": "Copper Symbol", + "item.allomancy.copper_pattern": "Copper Banner Pattern", "item.allomancy.duralumin_flakes": "Duralumin Flakes", "item.allomancy.duralumin_ingot": "Duralumin Ingot", "item.allomancy.duralumin_nugget": "Duralumin Nugget", - "item.allomancy.duralumin_pattern": "Banner Pattern", - "item.allomancy.duralumin_pattern.desc": "Duralumin Symbol", + "item.allomancy.duralumin_pattern": "Duralumin Banner Pattern", "item.allomancy.electrum_flakes": "Electrum Flakes", "item.allomancy.electrum_ingot": "Electrum Ingot", "item.allomancy.electrum_nugget": "Electrum Nugget", - "item.allomancy.electrum_pattern": "Banner Pattern", - "item.allomancy.electrum_pattern.desc": "Electrum Symbol", + "item.allomancy.electrum_pattern": "Electrum Banner Pattern", "item.allomancy.gold_flakes": "Gold Flakes", - "item.allomancy.gold_pattern": "Banner Pattern", - "item.allomancy.gold_pattern.desc": "Gold Symbol", + "item.allomancy.gold_pattern": "Gold Banner Pattern", "item.allomancy.iron_flakes": "Iron Flakes", - "item.allomancy.iron_pattern": "Banner Pattern", - "item.allomancy.iron_pattern.desc": "Iron Symbol", + "item.allomancy.iron_pattern": "Iron Banner Pattern", "item.allomancy.koloss_blade": "Koloss Blade", "item.allomancy.koloss_blade.lore": "This item is too heavy for the average person to wield.", "item.allomancy.lead_flakes": "Lead Flakes", @@ -398,14 +387,12 @@ "item.allomancy.nicrosil_flakes": "Nicrosil Flakes", "item.allomancy.nicrosil_ingot": "Nicrosil Ingot", "item.allomancy.nicrosil_nugget": "Nicrosil Nugget", - "item.allomancy.nicrosil_pattern": "Banner Pattern", - "item.allomancy.nicrosil_pattern.desc": "Nicrosil Symbol", + "item.allomancy.nicrosil_pattern": "Nicrosil Banner Pattern", "item.allomancy.obsidian_dagger": "Obsidian Dagger", "item.allomancy.pewter_flakes": "Pewter Flakes", "item.allomancy.pewter_ingot": "Pewter Ingot", "item.allomancy.pewter_nugget": "Pewter Nugget", - "item.allomancy.pewter_pattern": "Banner Pattern", - "item.allomancy.pewter_pattern.desc": "Pewter Symbol", + "item.allomancy.pewter_pattern": "Pewter Banner Pattern", "item.allomancy.raw_aluminum": "Raw Aluminum", "item.allomancy.raw_cadmium": "Raw Cadmium", "item.allomancy.raw_chromium": "Raw Chromium", @@ -419,19 +406,16 @@ "item.allomancy.steel_flakes": "Steel Flakes", "item.allomancy.steel_ingot": "Steel Ingot", "item.allomancy.steel_nugget": "Steel Nugget", - "item.allomancy.steel_pattern": "Banner Pattern", - "item.allomancy.steel_pattern.desc": "Steel Symbol", + "item.allomancy.steel_pattern": "Steel Banner Pattern", "item.allomancy.tin_flakes": "Tin Flakes", "item.allomancy.tin_ingot": "Tin Ingot", "item.allomancy.tin_nugget": "Tin Nugget", - "item.allomancy.tin_pattern": "Banner Pattern", - "item.allomancy.tin_pattern.desc": "Tin Symbol", + "item.allomancy.tin_pattern": "Tin Banner Pattern", "item.allomancy.vial": "Allomantic Vial", "item.allomancy.zinc_flakes": "Zinc Flakes", "item.allomancy.zinc_ingot": "Zinc Ingot", "item.allomancy.zinc_nugget": "Zinc Nugget", - "item.allomancy.zinc_pattern": "Banner Pattern", - "item.allomancy.zinc_pattern.desc": "Zinc Symbol", + "item.allomancy.zinc_pattern": "Zinc Banner Pattern", "key.burn": "Burn Metals", "key.categories.allomancy": "Allomancy", "key.hud": "Show Vial HUD", diff --git a/src/generated/resources/assets/allomancy/models/item/vial.json b/src/generated/resources/assets/allomancy/models/item/vial.json index 0108fc2d..1b46344e 100644 --- a/src/generated/resources/assets/allomancy/models/item/vial.json +++ b/src/generated/resources/assets/allomancy/models/item/vial.json @@ -1,13 +1,5 @@ { "parent": "minecraft:item/generated", - "overrides": [ - { - "model": "allomancy:item/vial_filled", - "predicate": { - "minecraft:custom_model_data": 1.0 - } - } - ], "textures": { "layer0": "allomancy:item/vial" } diff --git a/src/generated/resources/data/allomancy/advancement/main/metallic_collector.json b/src/generated/resources/data/allomancy/advancement/main/metallic_collector.json index 7a6d76d3..87dbb607 100644 --- a/src/generated/resources/data/allomancy/advancement/main/metallic_collector.json +++ b/src/generated/resources/data/allomancy/advancement/main/metallic_collector.json @@ -189,7 +189,9 @@ "frame": "challenge", "icon": { "components": { - "minecraft:custom_model_data": 1 + "allomancy:flake_storage": [ + "gold" + ] }, "count": 1, "id": "allomancy:vial" diff --git a/src/generated/resources/data/allomancy/recipe/allomantic_grinder.json b/src/generated/resources/data/allomancy/recipe/allomantic_grinder.json index e5fbb784..256e115a 100644 --- a/src/generated/resources/data/allomancy/recipe/allomantic_grinder.json +++ b/src/generated/resources/data/allomancy/recipe/allomantic_grinder.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "g": { - "tag": "c:ingots/gold" - }, - "i": { - "tag": "c:ingots/iron" - } + "g": "#c:ingots/gold", + "i": "#c:ingots/iron" }, "pattern": [ "ggg", diff --git a/src/generated/resources/data/allomancy/recipe/aluminum_block.json b/src/generated/resources/data/allomancy/recipe/aluminum_block.json index bdcb6615..6329233d 100644 --- a/src/generated/resources/data/allomancy/recipe/aluminum_block.json +++ b/src/generated/resources/data/allomancy/recipe/aluminum_block.json @@ -2,33 +2,15 @@ "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ - { - "item": "allomancy:aluminum_ingot" - }, - { - "item": "allomancy:aluminum_ingot" - }, - { - "item": "allomancy:aluminum_ingot" - }, - { - "item": "allomancy:aluminum_ingot" - }, - { - "item": "allomancy:aluminum_ingot" - }, - { - "item": "allomancy:aluminum_ingot" - }, - { - "item": "allomancy:aluminum_ingot" - }, - { - "item": "allomancy:aluminum_ingot" - }, - { - "item": "allomancy:aluminum_ingot" - } + "allomancy:aluminum_ingot", + "allomancy:aluminum_ingot", + "allomancy:aluminum_ingot", + "allomancy:aluminum_ingot", + "allomancy:aluminum_ingot", + "allomancy:aluminum_ingot", + "allomancy:aluminum_ingot", + "allomancy:aluminum_ingot", + "allomancy:aluminum_ingot" ], "result": { "count": 1, diff --git a/src/generated/resources/data/allomancy/recipe/aluminum_flakes.json b/src/generated/resources/data/allomancy/recipe/aluminum_flakes.json index 2a422cfa..c2a7f097 100644 --- a/src/generated/resources/data/allomancy/recipe/aluminum_flakes.json +++ b/src/generated/resources/data/allomancy/recipe/aluminum_flakes.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "allomancy:allomantic_grinder" - }, - { - "tag": "c:ingots/aluminum" - } + "allomancy:allomantic_grinder", + "#c:ingots/aluminum" ], "result": { "count": 2, diff --git a/src/generated/resources/data/allomancy/recipe/aluminum_helmet.json b/src/generated/resources/data/allomancy/recipe/aluminum_helmet.json index 89e10c7f..2edcbdef 100644 --- a/src/generated/resources/data/allomancy/recipe/aluminum_helmet.json +++ b/src/generated/resources/data/allomancy/recipe/aluminum_helmet.json @@ -2,9 +2,7 @@ "type": "minecraft:crafting_shaped", "category": "equipment", "key": { - "A": { - "tag": "c:ingots/aluminum" - } + "A": "#c:ingots/aluminum" }, "pattern": [ "AAA", diff --git a/src/generated/resources/data/allomancy/recipe/aluminum_ingot_from_block.json b/src/generated/resources/data/allomancy/recipe/aluminum_ingot_from_block.json index d6436dc2..4bb299df 100644 --- a/src/generated/resources/data/allomancy/recipe/aluminum_ingot_from_block.json +++ b/src/generated/resources/data/allomancy/recipe/aluminum_ingot_from_block.json @@ -2,9 +2,7 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "allomancy:aluminum_block" - } + "allomancy:aluminum_block" ], "result": { "count": 9, diff --git a/src/generated/resources/data/allomancy/recipe/aluminum_ingot_from_nuggets.json b/src/generated/resources/data/allomancy/recipe/aluminum_ingot_from_nuggets.json index 72475cad..258ddeb6 100644 --- a/src/generated/resources/data/allomancy/recipe/aluminum_ingot_from_nuggets.json +++ b/src/generated/resources/data/allomancy/recipe/aluminum_ingot_from_nuggets.json @@ -2,33 +2,15 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "allomancy:aluminum_nugget" - }, - { - "item": "allomancy:aluminum_nugget" - }, - { - "item": "allomancy:aluminum_nugget" - }, - { - "item": "allomancy:aluminum_nugget" - }, - { - "item": "allomancy:aluminum_nugget" - }, - { - "item": "allomancy:aluminum_nugget" - }, - { - "item": "allomancy:aluminum_nugget" - }, - { - "item": "allomancy:aluminum_nugget" - }, - { - "item": "allomancy:aluminum_nugget" - } + "allomancy:aluminum_nugget", + "allomancy:aluminum_nugget", + "allomancy:aluminum_nugget", + "allomancy:aluminum_nugget", + "allomancy:aluminum_nugget", + "allomancy:aluminum_nugget", + "allomancy:aluminum_nugget", + "allomancy:aluminum_nugget", + "allomancy:aluminum_nugget" ], "result": { "count": 1, diff --git a/src/generated/resources/data/allomancy/recipe/aluminum_nugget.json b/src/generated/resources/data/allomancy/recipe/aluminum_nugget.json index 151c3cda..c9dbdf30 100644 --- a/src/generated/resources/data/allomancy/recipe/aluminum_nugget.json +++ b/src/generated/resources/data/allomancy/recipe/aluminum_nugget.json @@ -2,9 +2,7 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "allomancy:aluminum_ingot" - } + "allomancy:aluminum_ingot" ], "result": { "count": 9, diff --git a/src/generated/resources/data/allomancy/recipe/aluminum_pattern.json b/src/generated/resources/data/allomancy/recipe/aluminum_pattern.json index aa7c32d0..521f7095 100644 --- a/src/generated/resources/data/allomancy/recipe/aluminum_pattern.json +++ b/src/generated/resources/data/allomancy/recipe/aluminum_pattern.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "minecraft:paper" - }, - { - "item": "allomancy:aluminum_flakes" - } + "minecraft:paper", + "allomancy:aluminum_flakes" ], "result": { "count": 1, diff --git a/src/generated/resources/data/allomancy/recipe/bendalloy_block.json b/src/generated/resources/data/allomancy/recipe/bendalloy_block.json index e4c54281..458eb38e 100644 --- a/src/generated/resources/data/allomancy/recipe/bendalloy_block.json +++ b/src/generated/resources/data/allomancy/recipe/bendalloy_block.json @@ -2,33 +2,15 @@ "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ - { - "item": "allomancy:bendalloy_ingot" - }, - { - "item": "allomancy:bendalloy_ingot" - }, - { - "item": "allomancy:bendalloy_ingot" - }, - { - "item": "allomancy:bendalloy_ingot" - }, - { - "item": "allomancy:bendalloy_ingot" - }, - { - "item": "allomancy:bendalloy_ingot" - }, - { - "item": "allomancy:bendalloy_ingot" - }, - { - "item": "allomancy:bendalloy_ingot" - }, - { - "item": "allomancy:bendalloy_ingot" - } + "allomancy:bendalloy_ingot", + "allomancy:bendalloy_ingot", + "allomancy:bendalloy_ingot", + "allomancy:bendalloy_ingot", + "allomancy:bendalloy_ingot", + "allomancy:bendalloy_ingot", + "allomancy:bendalloy_ingot", + "allomancy:bendalloy_ingot", + "allomancy:bendalloy_ingot" ], "result": { "count": 1, diff --git a/src/generated/resources/data/allomancy/recipe/bendalloy_flakes.json b/src/generated/resources/data/allomancy/recipe/bendalloy_flakes.json index 9da88b8f..6a0b9cea 100644 --- a/src/generated/resources/data/allomancy/recipe/bendalloy_flakes.json +++ b/src/generated/resources/data/allomancy/recipe/bendalloy_flakes.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "allomancy:allomantic_grinder" - }, - { - "tag": "c:ingots/bendalloy" - } + "allomancy:allomantic_grinder", + "#c:ingots/bendalloy" ], "result": { "count": 2, diff --git a/src/generated/resources/data/allomancy/recipe/bendalloy_flakes_from_mixing.json b/src/generated/resources/data/allomancy/recipe/bendalloy_flakes_from_mixing.json index f83c5efe..d74a395e 100644 --- a/src/generated/resources/data/allomancy/recipe/bendalloy_flakes_from_mixing.json +++ b/src/generated/resources/data/allomancy/recipe/bendalloy_flakes_from_mixing.json @@ -2,15 +2,9 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "allomancy:cadmium_flakes" - }, - { - "item": "allomancy:cadmium_flakes" - }, - { - "item": "allomancy:lead_flakes" - } + "allomancy:cadmium_flakes", + "allomancy:cadmium_flakes", + "allomancy:lead_flakes" ], "result": { "count": 3, diff --git a/src/generated/resources/data/allomancy/recipe/bendalloy_ingot_from_alloying.json b/src/generated/resources/data/allomancy/recipe/bendalloy_ingot_from_alloying.json index c887dbac..dc0b6525 100644 --- a/src/generated/resources/data/allomancy/recipe/bendalloy_ingot_from_alloying.json +++ b/src/generated/resources/data/allomancy/recipe/bendalloy_ingot_from_alloying.json @@ -2,15 +2,9 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "tag": "c:ingots/cadmium" - }, - { - "tag": "c:ingots/cadmium" - }, - { - "tag": "c:ingots/lead" - } + "#c:ingots/cadmium", + "#c:ingots/cadmium", + "#c:ingots/lead" ], "result": { "count": 3, diff --git a/src/generated/resources/data/allomancy/recipe/bendalloy_ingot_from_block.json b/src/generated/resources/data/allomancy/recipe/bendalloy_ingot_from_block.json index 51bea5ee..aec7d730 100644 --- a/src/generated/resources/data/allomancy/recipe/bendalloy_ingot_from_block.json +++ b/src/generated/resources/data/allomancy/recipe/bendalloy_ingot_from_block.json @@ -2,9 +2,7 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "allomancy:bendalloy_block" - } + "allomancy:bendalloy_block" ], "result": { "count": 9, diff --git a/src/generated/resources/data/allomancy/recipe/bendalloy_ingot_from_nuggets.json b/src/generated/resources/data/allomancy/recipe/bendalloy_ingot_from_nuggets.json index 1be499e8..7f1055e3 100644 --- a/src/generated/resources/data/allomancy/recipe/bendalloy_ingot_from_nuggets.json +++ b/src/generated/resources/data/allomancy/recipe/bendalloy_ingot_from_nuggets.json @@ -2,33 +2,15 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "allomancy:bendalloy_nugget" - }, - { - "item": "allomancy:bendalloy_nugget" - }, - { - "item": "allomancy:bendalloy_nugget" - }, - { - "item": "allomancy:bendalloy_nugget" - }, - { - "item": "allomancy:bendalloy_nugget" - }, - { - "item": "allomancy:bendalloy_nugget" - }, - { - "item": "allomancy:bendalloy_nugget" - }, - { - "item": "allomancy:bendalloy_nugget" - }, - { - "item": "allomancy:bendalloy_nugget" - } + "allomancy:bendalloy_nugget", + "allomancy:bendalloy_nugget", + "allomancy:bendalloy_nugget", + "allomancy:bendalloy_nugget", + "allomancy:bendalloy_nugget", + "allomancy:bendalloy_nugget", + "allomancy:bendalloy_nugget", + "allomancy:bendalloy_nugget", + "allomancy:bendalloy_nugget" ], "result": { "count": 1, diff --git a/src/generated/resources/data/allomancy/recipe/bendalloy_nugget.json b/src/generated/resources/data/allomancy/recipe/bendalloy_nugget.json index 8aab64c6..4a97f4b1 100644 --- a/src/generated/resources/data/allomancy/recipe/bendalloy_nugget.json +++ b/src/generated/resources/data/allomancy/recipe/bendalloy_nugget.json @@ -2,9 +2,7 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "allomancy:bendalloy_ingot" - } + "allomancy:bendalloy_ingot" ], "result": { "count": 9, diff --git a/src/generated/resources/data/allomancy/recipe/bendalloy_pattern.json b/src/generated/resources/data/allomancy/recipe/bendalloy_pattern.json index ffaa5148..97111835 100644 --- a/src/generated/resources/data/allomancy/recipe/bendalloy_pattern.json +++ b/src/generated/resources/data/allomancy/recipe/bendalloy_pattern.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "minecraft:paper" - }, - { - "item": "allomancy:bendalloy_flakes" - } + "minecraft:paper", + "allomancy:bendalloy_flakes" ], "result": { "count": 1, diff --git a/src/generated/resources/data/allomancy/recipe/brass_block.json b/src/generated/resources/data/allomancy/recipe/brass_block.json index 070beb01..6368da88 100644 --- a/src/generated/resources/data/allomancy/recipe/brass_block.json +++ b/src/generated/resources/data/allomancy/recipe/brass_block.json @@ -2,33 +2,15 @@ "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ - { - "item": "allomancy:brass_ingot" - }, - { - "item": "allomancy:brass_ingot" - }, - { - "item": "allomancy:brass_ingot" - }, - { - "item": "allomancy:brass_ingot" - }, - { - "item": "allomancy:brass_ingot" - }, - { - "item": "allomancy:brass_ingot" - }, - { - "item": "allomancy:brass_ingot" - }, - { - "item": "allomancy:brass_ingot" - }, - { - "item": "allomancy:brass_ingot" - } + "allomancy:brass_ingot", + "allomancy:brass_ingot", + "allomancy:brass_ingot", + "allomancy:brass_ingot", + "allomancy:brass_ingot", + "allomancy:brass_ingot", + "allomancy:brass_ingot", + "allomancy:brass_ingot", + "allomancy:brass_ingot" ], "result": { "count": 1, diff --git a/src/generated/resources/data/allomancy/recipe/brass_flakes.json b/src/generated/resources/data/allomancy/recipe/brass_flakes.json index c70084ad..d28ffab9 100644 --- a/src/generated/resources/data/allomancy/recipe/brass_flakes.json +++ b/src/generated/resources/data/allomancy/recipe/brass_flakes.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "allomancy:allomantic_grinder" - }, - { - "tag": "c:ingots/brass" - } + "allomancy:allomantic_grinder", + "#c:ingots/brass" ], "result": { "count": 2, diff --git a/src/generated/resources/data/allomancy/recipe/brass_flakes_from_mixing.json b/src/generated/resources/data/allomancy/recipe/brass_flakes_from_mixing.json index 3f5fe1b1..186a64b0 100644 --- a/src/generated/resources/data/allomancy/recipe/brass_flakes_from_mixing.json +++ b/src/generated/resources/data/allomancy/recipe/brass_flakes_from_mixing.json @@ -2,18 +2,10 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "allomancy:copper_flakes" - }, - { - "item": "allomancy:copper_flakes" - }, - { - "item": "allomancy:copper_flakes" - }, - { - "item": "allomancy:zinc_flakes" - } + "allomancy:copper_flakes", + "allomancy:copper_flakes", + "allomancy:copper_flakes", + "allomancy:zinc_flakes" ], "result": { "count": 4, diff --git a/src/generated/resources/data/allomancy/recipe/brass_ingot_from_alloying.json b/src/generated/resources/data/allomancy/recipe/brass_ingot_from_alloying.json index 1a9d4537..4a62a2c1 100644 --- a/src/generated/resources/data/allomancy/recipe/brass_ingot_from_alloying.json +++ b/src/generated/resources/data/allomancy/recipe/brass_ingot_from_alloying.json @@ -2,18 +2,10 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "minecraft:copper_ingot" - }, - { - "item": "minecraft:copper_ingot" - }, - { - "item": "minecraft:copper_ingot" - }, - { - "tag": "c:ingots/zinc" - } + "minecraft:copper_ingot", + "minecraft:copper_ingot", + "minecraft:copper_ingot", + "#c:ingots/zinc" ], "result": { "count": 4, diff --git a/src/generated/resources/data/allomancy/recipe/brass_ingot_from_block.json b/src/generated/resources/data/allomancy/recipe/brass_ingot_from_block.json index aa159f58..8b7352fc 100644 --- a/src/generated/resources/data/allomancy/recipe/brass_ingot_from_block.json +++ b/src/generated/resources/data/allomancy/recipe/brass_ingot_from_block.json @@ -2,9 +2,7 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "allomancy:brass_block" - } + "allomancy:brass_block" ], "result": { "count": 9, diff --git a/src/generated/resources/data/allomancy/recipe/brass_ingot_from_nuggets.json b/src/generated/resources/data/allomancy/recipe/brass_ingot_from_nuggets.json index 4f62ffb1..777ccebc 100644 --- a/src/generated/resources/data/allomancy/recipe/brass_ingot_from_nuggets.json +++ b/src/generated/resources/data/allomancy/recipe/brass_ingot_from_nuggets.json @@ -2,33 +2,15 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "allomancy:brass_nugget" - }, - { - "item": "allomancy:brass_nugget" - }, - { - "item": "allomancy:brass_nugget" - }, - { - "item": "allomancy:brass_nugget" - }, - { - "item": "allomancy:brass_nugget" - }, - { - "item": "allomancy:brass_nugget" - }, - { - "item": "allomancy:brass_nugget" - }, - { - "item": "allomancy:brass_nugget" - }, - { - "item": "allomancy:brass_nugget" - } + "allomancy:brass_nugget", + "allomancy:brass_nugget", + "allomancy:brass_nugget", + "allomancy:brass_nugget", + "allomancy:brass_nugget", + "allomancy:brass_nugget", + "allomancy:brass_nugget", + "allomancy:brass_nugget", + "allomancy:brass_nugget" ], "result": { "count": 1, diff --git a/src/generated/resources/data/allomancy/recipe/brass_nugget.json b/src/generated/resources/data/allomancy/recipe/brass_nugget.json index d10a6371..91424ec9 100644 --- a/src/generated/resources/data/allomancy/recipe/brass_nugget.json +++ b/src/generated/resources/data/allomancy/recipe/brass_nugget.json @@ -2,9 +2,7 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "allomancy:brass_ingot" - } + "allomancy:brass_ingot" ], "result": { "count": 9, diff --git a/src/generated/resources/data/allomancy/recipe/brass_pattern.json b/src/generated/resources/data/allomancy/recipe/brass_pattern.json index 692fb01f..62c5a024 100644 --- a/src/generated/resources/data/allomancy/recipe/brass_pattern.json +++ b/src/generated/resources/data/allomancy/recipe/brass_pattern.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "minecraft:paper" - }, - { - "item": "allomancy:brass_flakes" - } + "minecraft:paper", + "allomancy:brass_flakes" ], "result": { "count": 1, diff --git a/src/generated/resources/data/allomancy/recipe/bronze_block.json b/src/generated/resources/data/allomancy/recipe/bronze_block.json index 22cfaf16..fae8bef4 100644 --- a/src/generated/resources/data/allomancy/recipe/bronze_block.json +++ b/src/generated/resources/data/allomancy/recipe/bronze_block.json @@ -2,33 +2,15 @@ "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ - { - "item": "allomancy:bronze_ingot" - }, - { - "item": "allomancy:bronze_ingot" - }, - { - "item": "allomancy:bronze_ingot" - }, - { - "item": "allomancy:bronze_ingot" - }, - { - "item": "allomancy:bronze_ingot" - }, - { - "item": "allomancy:bronze_ingot" - }, - { - "item": "allomancy:bronze_ingot" - }, - { - "item": "allomancy:bronze_ingot" - }, - { - "item": "allomancy:bronze_ingot" - } + "allomancy:bronze_ingot", + "allomancy:bronze_ingot", + "allomancy:bronze_ingot", + "allomancy:bronze_ingot", + "allomancy:bronze_ingot", + "allomancy:bronze_ingot", + "allomancy:bronze_ingot", + "allomancy:bronze_ingot", + "allomancy:bronze_ingot" ], "result": { "count": 1, diff --git a/src/generated/resources/data/allomancy/recipe/bronze_flakes.json b/src/generated/resources/data/allomancy/recipe/bronze_flakes.json index 60b46fd3..9af11f36 100644 --- a/src/generated/resources/data/allomancy/recipe/bronze_flakes.json +++ b/src/generated/resources/data/allomancy/recipe/bronze_flakes.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "allomancy:allomantic_grinder" - }, - { - "tag": "c:ingots/bronze" - } + "allomancy:allomantic_grinder", + "#c:ingots/bronze" ], "result": { "count": 2, diff --git a/src/generated/resources/data/allomancy/recipe/bronze_flakes_from_mixing.json b/src/generated/resources/data/allomancy/recipe/bronze_flakes_from_mixing.json index a6c0c39c..d1fa3734 100644 --- a/src/generated/resources/data/allomancy/recipe/bronze_flakes_from_mixing.json +++ b/src/generated/resources/data/allomancy/recipe/bronze_flakes_from_mixing.json @@ -2,18 +2,10 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "allomancy:copper_flakes" - }, - { - "item": "allomancy:copper_flakes" - }, - { - "item": "allomancy:copper_flakes" - }, - { - "item": "allomancy:tin_flakes" - } + "allomancy:copper_flakes", + "allomancy:copper_flakes", + "allomancy:copper_flakes", + "allomancy:tin_flakes" ], "result": { "count": 4, diff --git a/src/generated/resources/data/allomancy/recipe/bronze_ingot_from_alloying.json b/src/generated/resources/data/allomancy/recipe/bronze_ingot_from_alloying.json index 687344d6..93481c86 100644 --- a/src/generated/resources/data/allomancy/recipe/bronze_ingot_from_alloying.json +++ b/src/generated/resources/data/allomancy/recipe/bronze_ingot_from_alloying.json @@ -2,18 +2,10 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "minecraft:copper_ingot" - }, - { - "item": "minecraft:copper_ingot" - }, - { - "item": "minecraft:copper_ingot" - }, - { - "tag": "c:ingots/tin" - } + "minecraft:copper_ingot", + "minecraft:copper_ingot", + "minecraft:copper_ingot", + "#c:ingots/tin" ], "result": { "count": 4, diff --git a/src/generated/resources/data/allomancy/recipe/bronze_ingot_from_block.json b/src/generated/resources/data/allomancy/recipe/bronze_ingot_from_block.json index 6af4a3af..ee9d75d3 100644 --- a/src/generated/resources/data/allomancy/recipe/bronze_ingot_from_block.json +++ b/src/generated/resources/data/allomancy/recipe/bronze_ingot_from_block.json @@ -2,9 +2,7 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "allomancy:bronze_block" - } + "allomancy:bronze_block" ], "result": { "count": 9, diff --git a/src/generated/resources/data/allomancy/recipe/bronze_ingot_from_nuggets.json b/src/generated/resources/data/allomancy/recipe/bronze_ingot_from_nuggets.json index d16736e2..3f41a07c 100644 --- a/src/generated/resources/data/allomancy/recipe/bronze_ingot_from_nuggets.json +++ b/src/generated/resources/data/allomancy/recipe/bronze_ingot_from_nuggets.json @@ -2,33 +2,15 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "allomancy:bronze_nugget" - }, - { - "item": "allomancy:bronze_nugget" - }, - { - "item": "allomancy:bronze_nugget" - }, - { - "item": "allomancy:bronze_nugget" - }, - { - "item": "allomancy:bronze_nugget" - }, - { - "item": "allomancy:bronze_nugget" - }, - { - "item": "allomancy:bronze_nugget" - }, - { - "item": "allomancy:bronze_nugget" - }, - { - "item": "allomancy:bronze_nugget" - } + "allomancy:bronze_nugget", + "allomancy:bronze_nugget", + "allomancy:bronze_nugget", + "allomancy:bronze_nugget", + "allomancy:bronze_nugget", + "allomancy:bronze_nugget", + "allomancy:bronze_nugget", + "allomancy:bronze_nugget", + "allomancy:bronze_nugget" ], "result": { "count": 1, diff --git a/src/generated/resources/data/allomancy/recipe/bronze_nugget.json b/src/generated/resources/data/allomancy/recipe/bronze_nugget.json index 8c156e8c..45832188 100644 --- a/src/generated/resources/data/allomancy/recipe/bronze_nugget.json +++ b/src/generated/resources/data/allomancy/recipe/bronze_nugget.json @@ -2,9 +2,7 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "allomancy:bronze_ingot" - } + "allomancy:bronze_ingot" ], "result": { "count": 9, diff --git a/src/generated/resources/data/allomancy/recipe/bronze_pattern.json b/src/generated/resources/data/allomancy/recipe/bronze_pattern.json index 84393b10..4a90ea87 100644 --- a/src/generated/resources/data/allomancy/recipe/bronze_pattern.json +++ b/src/generated/resources/data/allomancy/recipe/bronze_pattern.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "minecraft:paper" - }, - { - "item": "allomancy:bronze_flakes" - } + "minecraft:paper", + "allomancy:bronze_flakes" ], "result": { "count": 1, diff --git a/src/generated/resources/data/allomancy/recipe/cadmium_block.json b/src/generated/resources/data/allomancy/recipe/cadmium_block.json index ab7dee67..1391f531 100644 --- a/src/generated/resources/data/allomancy/recipe/cadmium_block.json +++ b/src/generated/resources/data/allomancy/recipe/cadmium_block.json @@ -2,33 +2,15 @@ "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ - { - "item": "allomancy:cadmium_ingot" - }, - { - "item": "allomancy:cadmium_ingot" - }, - { - "item": "allomancy:cadmium_ingot" - }, - { - "item": "allomancy:cadmium_ingot" - }, - { - "item": "allomancy:cadmium_ingot" - }, - { - "item": "allomancy:cadmium_ingot" - }, - { - "item": "allomancy:cadmium_ingot" - }, - { - "item": "allomancy:cadmium_ingot" - }, - { - "item": "allomancy:cadmium_ingot" - } + "allomancy:cadmium_ingot", + "allomancy:cadmium_ingot", + "allomancy:cadmium_ingot", + "allomancy:cadmium_ingot", + "allomancy:cadmium_ingot", + "allomancy:cadmium_ingot", + "allomancy:cadmium_ingot", + "allomancy:cadmium_ingot", + "allomancy:cadmium_ingot" ], "result": { "count": 1, diff --git a/src/generated/resources/data/allomancy/recipe/cadmium_flakes.json b/src/generated/resources/data/allomancy/recipe/cadmium_flakes.json index 3cb6774f..aeae672b 100644 --- a/src/generated/resources/data/allomancy/recipe/cadmium_flakes.json +++ b/src/generated/resources/data/allomancy/recipe/cadmium_flakes.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "allomancy:allomantic_grinder" - }, - { - "tag": "c:ingots/cadmium" - } + "allomancy:allomantic_grinder", + "#c:ingots/cadmium" ], "result": { "count": 2, diff --git a/src/generated/resources/data/allomancy/recipe/cadmium_ingot_from_block.json b/src/generated/resources/data/allomancy/recipe/cadmium_ingot_from_block.json index 83edf7c6..cfdee804 100644 --- a/src/generated/resources/data/allomancy/recipe/cadmium_ingot_from_block.json +++ b/src/generated/resources/data/allomancy/recipe/cadmium_ingot_from_block.json @@ -2,9 +2,7 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "allomancy:cadmium_block" - } + "allomancy:cadmium_block" ], "result": { "count": 9, diff --git a/src/generated/resources/data/allomancy/recipe/cadmium_ingot_from_nuggets.json b/src/generated/resources/data/allomancy/recipe/cadmium_ingot_from_nuggets.json index 8cd16bec..3b09dbd4 100644 --- a/src/generated/resources/data/allomancy/recipe/cadmium_ingot_from_nuggets.json +++ b/src/generated/resources/data/allomancy/recipe/cadmium_ingot_from_nuggets.json @@ -2,33 +2,15 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "allomancy:cadmium_nugget" - }, - { - "item": "allomancy:cadmium_nugget" - }, - { - "item": "allomancy:cadmium_nugget" - }, - { - "item": "allomancy:cadmium_nugget" - }, - { - "item": "allomancy:cadmium_nugget" - }, - { - "item": "allomancy:cadmium_nugget" - }, - { - "item": "allomancy:cadmium_nugget" - }, - { - "item": "allomancy:cadmium_nugget" - }, - { - "item": "allomancy:cadmium_nugget" - } + "allomancy:cadmium_nugget", + "allomancy:cadmium_nugget", + "allomancy:cadmium_nugget", + "allomancy:cadmium_nugget", + "allomancy:cadmium_nugget", + "allomancy:cadmium_nugget", + "allomancy:cadmium_nugget", + "allomancy:cadmium_nugget", + "allomancy:cadmium_nugget" ], "result": { "count": 1, diff --git a/src/generated/resources/data/allomancy/recipe/cadmium_nugget.json b/src/generated/resources/data/allomancy/recipe/cadmium_nugget.json index 1b9bf1ba..90bb3e3f 100644 --- a/src/generated/resources/data/allomancy/recipe/cadmium_nugget.json +++ b/src/generated/resources/data/allomancy/recipe/cadmium_nugget.json @@ -2,9 +2,7 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "allomancy:cadmium_ingot" - } + "allomancy:cadmium_ingot" ], "result": { "count": 9, diff --git a/src/generated/resources/data/allomancy/recipe/cadmium_pattern.json b/src/generated/resources/data/allomancy/recipe/cadmium_pattern.json index 048b44c7..d35ae6b3 100644 --- a/src/generated/resources/data/allomancy/recipe/cadmium_pattern.json +++ b/src/generated/resources/data/allomancy/recipe/cadmium_pattern.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "minecraft:paper" - }, - { - "item": "allomancy:cadmium_flakes" - } + "minecraft:paper", + "allomancy:cadmium_flakes" ], "result": { "count": 1, diff --git a/src/generated/resources/data/allomancy/recipe/chromium_block.json b/src/generated/resources/data/allomancy/recipe/chromium_block.json index 8de328a2..c42eff5d 100644 --- a/src/generated/resources/data/allomancy/recipe/chromium_block.json +++ b/src/generated/resources/data/allomancy/recipe/chromium_block.json @@ -2,33 +2,15 @@ "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ - { - "item": "allomancy:chromium_ingot" - }, - { - "item": "allomancy:chromium_ingot" - }, - { - "item": "allomancy:chromium_ingot" - }, - { - "item": "allomancy:chromium_ingot" - }, - { - "item": "allomancy:chromium_ingot" - }, - { - "item": "allomancy:chromium_ingot" - }, - { - "item": "allomancy:chromium_ingot" - }, - { - "item": "allomancy:chromium_ingot" - }, - { - "item": "allomancy:chromium_ingot" - } + "allomancy:chromium_ingot", + "allomancy:chromium_ingot", + "allomancy:chromium_ingot", + "allomancy:chromium_ingot", + "allomancy:chromium_ingot", + "allomancy:chromium_ingot", + "allomancy:chromium_ingot", + "allomancy:chromium_ingot", + "allomancy:chromium_ingot" ], "result": { "count": 1, diff --git a/src/generated/resources/data/allomancy/recipe/chromium_flakes.json b/src/generated/resources/data/allomancy/recipe/chromium_flakes.json index 0fa1128e..e7c62009 100644 --- a/src/generated/resources/data/allomancy/recipe/chromium_flakes.json +++ b/src/generated/resources/data/allomancy/recipe/chromium_flakes.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "allomancy:allomantic_grinder" - }, - { - "tag": "c:ingots/chromium" - } + "allomancy:allomantic_grinder", + "#c:ingots/chromium" ], "result": { "count": 2, diff --git a/src/generated/resources/data/allomancy/recipe/chromium_ingot_from_block.json b/src/generated/resources/data/allomancy/recipe/chromium_ingot_from_block.json index f8ac78d1..85d65725 100644 --- a/src/generated/resources/data/allomancy/recipe/chromium_ingot_from_block.json +++ b/src/generated/resources/data/allomancy/recipe/chromium_ingot_from_block.json @@ -2,9 +2,7 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "allomancy:chromium_block" - } + "allomancy:chromium_block" ], "result": { "count": 9, diff --git a/src/generated/resources/data/allomancy/recipe/chromium_ingot_from_nuggets.json b/src/generated/resources/data/allomancy/recipe/chromium_ingot_from_nuggets.json index 697bcef8..b080aef9 100644 --- a/src/generated/resources/data/allomancy/recipe/chromium_ingot_from_nuggets.json +++ b/src/generated/resources/data/allomancy/recipe/chromium_ingot_from_nuggets.json @@ -2,33 +2,15 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "allomancy:chromium_nugget" - }, - { - "item": "allomancy:chromium_nugget" - }, - { - "item": "allomancy:chromium_nugget" - }, - { - "item": "allomancy:chromium_nugget" - }, - { - "item": "allomancy:chromium_nugget" - }, - { - "item": "allomancy:chromium_nugget" - }, - { - "item": "allomancy:chromium_nugget" - }, - { - "item": "allomancy:chromium_nugget" - }, - { - "item": "allomancy:chromium_nugget" - } + "allomancy:chromium_nugget", + "allomancy:chromium_nugget", + "allomancy:chromium_nugget", + "allomancy:chromium_nugget", + "allomancy:chromium_nugget", + "allomancy:chromium_nugget", + "allomancy:chromium_nugget", + "allomancy:chromium_nugget", + "allomancy:chromium_nugget" ], "result": { "count": 1, diff --git a/src/generated/resources/data/allomancy/recipe/chromium_nugget.json b/src/generated/resources/data/allomancy/recipe/chromium_nugget.json index 944cb649..ff6bc8fb 100644 --- a/src/generated/resources/data/allomancy/recipe/chromium_nugget.json +++ b/src/generated/resources/data/allomancy/recipe/chromium_nugget.json @@ -2,9 +2,7 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "allomancy:chromium_ingot" - } + "allomancy:chromium_ingot" ], "result": { "count": 9, diff --git a/src/generated/resources/data/allomancy/recipe/chromium_pattern.json b/src/generated/resources/data/allomancy/recipe/chromium_pattern.json index 482bfe88..9c824461 100644 --- a/src/generated/resources/data/allomancy/recipe/chromium_pattern.json +++ b/src/generated/resources/data/allomancy/recipe/chromium_pattern.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "minecraft:paper" - }, - { - "item": "allomancy:chromium_flakes" - } + "minecraft:paper", + "allomancy:chromium_flakes" ], "result": { "count": 1, diff --git a/src/generated/resources/data/allomancy/recipe/coin_bag.json b/src/generated/resources/data/allomancy/recipe/coin_bag.json index 6deaca5c..24bc8eb6 100644 --- a/src/generated/resources/data/allomancy/recipe/coin_bag.json +++ b/src/generated/resources/data/allomancy/recipe/coin_bag.json @@ -2,15 +2,9 @@ "type": "minecraft:crafting_shaped", "category": "equipment", "key": { - "#": { - "item": "minecraft:lead" - }, - "g": { - "item": "minecraft:gold_nugget" - }, - "l": { - "item": "minecraft:leather" - } + "#": "minecraft:lead", + "g": "minecraft:gold_nugget", + "l": "minecraft:leather" }, "pattern": [ " #g", diff --git a/src/generated/resources/data/allomancy/recipe/copper_flakes.json b/src/generated/resources/data/allomancy/recipe/copper_flakes.json index d198edc5..434b8ba3 100644 --- a/src/generated/resources/data/allomancy/recipe/copper_flakes.json +++ b/src/generated/resources/data/allomancy/recipe/copper_flakes.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "allomancy:allomantic_grinder" - }, - { - "tag": "c:ingots/copper" - } + "allomancy:allomantic_grinder", + "#c:ingots/copper" ], "result": { "count": 2, diff --git a/src/generated/resources/data/allomancy/recipe/copper_pattern.json b/src/generated/resources/data/allomancy/recipe/copper_pattern.json index d18210c2..2ec39b39 100644 --- a/src/generated/resources/data/allomancy/recipe/copper_pattern.json +++ b/src/generated/resources/data/allomancy/recipe/copper_pattern.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "minecraft:paper" - }, - { - "item": "allomancy:copper_flakes" - } + "minecraft:paper", + "allomancy:copper_flakes" ], "result": { "count": 1, diff --git a/src/generated/resources/data/allomancy/recipe/duralumin_block.json b/src/generated/resources/data/allomancy/recipe/duralumin_block.json index 00132a48..0f987349 100644 --- a/src/generated/resources/data/allomancy/recipe/duralumin_block.json +++ b/src/generated/resources/data/allomancy/recipe/duralumin_block.json @@ -2,33 +2,15 @@ "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ - { - "item": "allomancy:duralumin_ingot" - }, - { - "item": "allomancy:duralumin_ingot" - }, - { - "item": "allomancy:duralumin_ingot" - }, - { - "item": "allomancy:duralumin_ingot" - }, - { - "item": "allomancy:duralumin_ingot" - }, - { - "item": "allomancy:duralumin_ingot" - }, - { - "item": "allomancy:duralumin_ingot" - }, - { - "item": "allomancy:duralumin_ingot" - }, - { - "item": "allomancy:duralumin_ingot" - } + "allomancy:duralumin_ingot", + "allomancy:duralumin_ingot", + "allomancy:duralumin_ingot", + "allomancy:duralumin_ingot", + "allomancy:duralumin_ingot", + "allomancy:duralumin_ingot", + "allomancy:duralumin_ingot", + "allomancy:duralumin_ingot", + "allomancy:duralumin_ingot" ], "result": { "count": 1, diff --git a/src/generated/resources/data/allomancy/recipe/duralumin_flakes.json b/src/generated/resources/data/allomancy/recipe/duralumin_flakes.json index c9538392..9fd0309e 100644 --- a/src/generated/resources/data/allomancy/recipe/duralumin_flakes.json +++ b/src/generated/resources/data/allomancy/recipe/duralumin_flakes.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "allomancy:allomantic_grinder" - }, - { - "tag": "c:ingots/duralumin" - } + "allomancy:allomantic_grinder", + "#c:ingots/duralumin" ], "result": { "count": 2, diff --git a/src/generated/resources/data/allomancy/recipe/duralumin_flakes_from_mixing.json b/src/generated/resources/data/allomancy/recipe/duralumin_flakes_from_mixing.json index 2b784036..cf453114 100644 --- a/src/generated/resources/data/allomancy/recipe/duralumin_flakes_from_mixing.json +++ b/src/generated/resources/data/allomancy/recipe/duralumin_flakes_from_mixing.json @@ -2,18 +2,10 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "allomancy:aluminum_flakes" - }, - { - "item": "allomancy:aluminum_flakes" - }, - { - "item": "allomancy:aluminum_flakes" - }, - { - "item": "allomancy:copper_flakes" - } + "allomancy:aluminum_flakes", + "allomancy:aluminum_flakes", + "allomancy:aluminum_flakes", + "allomancy:copper_flakes" ], "result": { "count": 4, diff --git a/src/generated/resources/data/allomancy/recipe/duralumin_ingot_from_alloying.json b/src/generated/resources/data/allomancy/recipe/duralumin_ingot_from_alloying.json index 3a4d986c..cc1f488a 100644 --- a/src/generated/resources/data/allomancy/recipe/duralumin_ingot_from_alloying.json +++ b/src/generated/resources/data/allomancy/recipe/duralumin_ingot_from_alloying.json @@ -2,18 +2,10 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "tag": "c:ingots/aluminum" - }, - { - "tag": "c:ingots/aluminum" - }, - { - "tag": "c:ingots/aluminum" - }, - { - "item": "minecraft:copper_ingot" - } + "#c:ingots/aluminum", + "#c:ingots/aluminum", + "#c:ingots/aluminum", + "minecraft:copper_ingot" ], "result": { "count": 4, diff --git a/src/generated/resources/data/allomancy/recipe/duralumin_ingot_from_block.json b/src/generated/resources/data/allomancy/recipe/duralumin_ingot_from_block.json index a2b10eb3..ec51acc1 100644 --- a/src/generated/resources/data/allomancy/recipe/duralumin_ingot_from_block.json +++ b/src/generated/resources/data/allomancy/recipe/duralumin_ingot_from_block.json @@ -2,9 +2,7 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "allomancy:duralumin_block" - } + "allomancy:duralumin_block" ], "result": { "count": 9, diff --git a/src/generated/resources/data/allomancy/recipe/duralumin_ingot_from_nuggets.json b/src/generated/resources/data/allomancy/recipe/duralumin_ingot_from_nuggets.json index 6b94c610..9fea69ae 100644 --- a/src/generated/resources/data/allomancy/recipe/duralumin_ingot_from_nuggets.json +++ b/src/generated/resources/data/allomancy/recipe/duralumin_ingot_from_nuggets.json @@ -2,33 +2,15 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "allomancy:duralumin_nugget" - }, - { - "item": "allomancy:duralumin_nugget" - }, - { - "item": "allomancy:duralumin_nugget" - }, - { - "item": "allomancy:duralumin_nugget" - }, - { - "item": "allomancy:duralumin_nugget" - }, - { - "item": "allomancy:duralumin_nugget" - }, - { - "item": "allomancy:duralumin_nugget" - }, - { - "item": "allomancy:duralumin_nugget" - }, - { - "item": "allomancy:duralumin_nugget" - } + "allomancy:duralumin_nugget", + "allomancy:duralumin_nugget", + "allomancy:duralumin_nugget", + "allomancy:duralumin_nugget", + "allomancy:duralumin_nugget", + "allomancy:duralumin_nugget", + "allomancy:duralumin_nugget", + "allomancy:duralumin_nugget", + "allomancy:duralumin_nugget" ], "result": { "count": 1, diff --git a/src/generated/resources/data/allomancy/recipe/duralumin_nugget.json b/src/generated/resources/data/allomancy/recipe/duralumin_nugget.json index af1ca3a6..707c2f72 100644 --- a/src/generated/resources/data/allomancy/recipe/duralumin_nugget.json +++ b/src/generated/resources/data/allomancy/recipe/duralumin_nugget.json @@ -2,9 +2,7 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "allomancy:duralumin_ingot" - } + "allomancy:duralumin_ingot" ], "result": { "count": 9, diff --git a/src/generated/resources/data/allomancy/recipe/duralumin_pattern.json b/src/generated/resources/data/allomancy/recipe/duralumin_pattern.json index 6c372500..8e1a9247 100644 --- a/src/generated/resources/data/allomancy/recipe/duralumin_pattern.json +++ b/src/generated/resources/data/allomancy/recipe/duralumin_pattern.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "minecraft:paper" - }, - { - "item": "allomancy:duralumin_flakes" - } + "minecraft:paper", + "allomancy:duralumin_flakes" ], "result": { "count": 1, diff --git a/src/generated/resources/data/allomancy/recipe/electrum_block.json b/src/generated/resources/data/allomancy/recipe/electrum_block.json index 53a2e17b..90496569 100644 --- a/src/generated/resources/data/allomancy/recipe/electrum_block.json +++ b/src/generated/resources/data/allomancy/recipe/electrum_block.json @@ -2,33 +2,15 @@ "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ - { - "item": "allomancy:electrum_ingot" - }, - { - "item": "allomancy:electrum_ingot" - }, - { - "item": "allomancy:electrum_ingot" - }, - { - "item": "allomancy:electrum_ingot" - }, - { - "item": "allomancy:electrum_ingot" - }, - { - "item": "allomancy:electrum_ingot" - }, - { - "item": "allomancy:electrum_ingot" - }, - { - "item": "allomancy:electrum_ingot" - }, - { - "item": "allomancy:electrum_ingot" - } + "allomancy:electrum_ingot", + "allomancy:electrum_ingot", + "allomancy:electrum_ingot", + "allomancy:electrum_ingot", + "allomancy:electrum_ingot", + "allomancy:electrum_ingot", + "allomancy:electrum_ingot", + "allomancy:electrum_ingot", + "allomancy:electrum_ingot" ], "result": { "count": 1, diff --git a/src/generated/resources/data/allomancy/recipe/electrum_flakes.json b/src/generated/resources/data/allomancy/recipe/electrum_flakes.json index 141ea296..713979e9 100644 --- a/src/generated/resources/data/allomancy/recipe/electrum_flakes.json +++ b/src/generated/resources/data/allomancy/recipe/electrum_flakes.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "allomancy:allomantic_grinder" - }, - { - "tag": "c:ingots/electrum" - } + "allomancy:allomantic_grinder", + "#c:ingots/electrum" ], "result": { "count": 2, diff --git a/src/generated/resources/data/allomancy/recipe/electrum_flakes_from_mixing.json b/src/generated/resources/data/allomancy/recipe/electrum_flakes_from_mixing.json index 2948e643..be2064c0 100644 --- a/src/generated/resources/data/allomancy/recipe/electrum_flakes_from_mixing.json +++ b/src/generated/resources/data/allomancy/recipe/electrum_flakes_from_mixing.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "allomancy:gold_flakes" - }, - { - "item": "allomancy:silver_flakes" - } + "allomancy:gold_flakes", + "allomancy:silver_flakes" ], "result": { "count": 2, diff --git a/src/generated/resources/data/allomancy/recipe/electrum_ingot_from_alloying.json b/src/generated/resources/data/allomancy/recipe/electrum_ingot_from_alloying.json index 83607e68..b3118655 100644 --- a/src/generated/resources/data/allomancy/recipe/electrum_ingot_from_alloying.json +++ b/src/generated/resources/data/allomancy/recipe/electrum_ingot_from_alloying.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "tag": "c:ingots/silver" - }, - { - "item": "minecraft:gold_ingot" - } + "#c:ingots/silver", + "minecraft:gold_ingot" ], "result": { "count": 2, diff --git a/src/generated/resources/data/allomancy/recipe/electrum_ingot_from_block.json b/src/generated/resources/data/allomancy/recipe/electrum_ingot_from_block.json index 27c2a898..7d07b3e7 100644 --- a/src/generated/resources/data/allomancy/recipe/electrum_ingot_from_block.json +++ b/src/generated/resources/data/allomancy/recipe/electrum_ingot_from_block.json @@ -2,9 +2,7 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "allomancy:electrum_block" - } + "allomancy:electrum_block" ], "result": { "count": 9, diff --git a/src/generated/resources/data/allomancy/recipe/electrum_ingot_from_nuggets.json b/src/generated/resources/data/allomancy/recipe/electrum_ingot_from_nuggets.json index 833d046e..6d41cadb 100644 --- a/src/generated/resources/data/allomancy/recipe/electrum_ingot_from_nuggets.json +++ b/src/generated/resources/data/allomancy/recipe/electrum_ingot_from_nuggets.json @@ -2,33 +2,15 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "allomancy:electrum_nugget" - }, - { - "item": "allomancy:electrum_nugget" - }, - { - "item": "allomancy:electrum_nugget" - }, - { - "item": "allomancy:electrum_nugget" - }, - { - "item": "allomancy:electrum_nugget" - }, - { - "item": "allomancy:electrum_nugget" - }, - { - "item": "allomancy:electrum_nugget" - }, - { - "item": "allomancy:electrum_nugget" - }, - { - "item": "allomancy:electrum_nugget" - } + "allomancy:electrum_nugget", + "allomancy:electrum_nugget", + "allomancy:electrum_nugget", + "allomancy:electrum_nugget", + "allomancy:electrum_nugget", + "allomancy:electrum_nugget", + "allomancy:electrum_nugget", + "allomancy:electrum_nugget", + "allomancy:electrum_nugget" ], "result": { "count": 1, diff --git a/src/generated/resources/data/allomancy/recipe/electrum_nugget.json b/src/generated/resources/data/allomancy/recipe/electrum_nugget.json index a6149a8b..a15e6ebd 100644 --- a/src/generated/resources/data/allomancy/recipe/electrum_nugget.json +++ b/src/generated/resources/data/allomancy/recipe/electrum_nugget.json @@ -2,9 +2,7 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "allomancy:electrum_ingot" - } + "allomancy:electrum_ingot" ], "result": { "count": 9, diff --git a/src/generated/resources/data/allomancy/recipe/electrum_pattern.json b/src/generated/resources/data/allomancy/recipe/electrum_pattern.json index 74d156dc..4ec1997e 100644 --- a/src/generated/resources/data/allomancy/recipe/electrum_pattern.json +++ b/src/generated/resources/data/allomancy/recipe/electrum_pattern.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "minecraft:paper" - }, - { - "item": "allomancy:electrum_flakes" - } + "minecraft:paper", + "allomancy:electrum_flakes" ], "result": { "count": 1, diff --git a/src/generated/resources/data/allomancy/recipe/gold_flakes.json b/src/generated/resources/data/allomancy/recipe/gold_flakes.json index 61c8ceb1..d50fa97c 100644 --- a/src/generated/resources/data/allomancy/recipe/gold_flakes.json +++ b/src/generated/resources/data/allomancy/recipe/gold_flakes.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "allomancy:allomantic_grinder" - }, - { - "tag": "c:ingots/gold" - } + "allomancy:allomantic_grinder", + "#c:ingots/gold" ], "result": { "count": 2, diff --git a/src/generated/resources/data/allomancy/recipe/gold_pattern.json b/src/generated/resources/data/allomancy/recipe/gold_pattern.json index 95e021f2..70fe7cef 100644 --- a/src/generated/resources/data/allomancy/recipe/gold_pattern.json +++ b/src/generated/resources/data/allomancy/recipe/gold_pattern.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "minecraft:paper" - }, - { - "item": "allomancy:gold_flakes" - } + "minecraft:paper", + "allomancy:gold_flakes" ], "result": { "count": 1, diff --git a/src/generated/resources/data/allomancy/recipe/inverted_from_iron_button.json b/src/generated/resources/data/allomancy/recipe/inverted_from_iron_button.json index 7efba234..58fc23a6 100644 --- a/src/generated/resources/data/allomancy/recipe/inverted_from_iron_button.json +++ b/src/generated/resources/data/allomancy/recipe/inverted_from_iron_button.json @@ -2,9 +2,7 @@ "type": "minecraft:crafting_shapeless", "category": "redstone", "ingredients": [ - { - "item": "allomancy:iron_button" - } + "allomancy:iron_button" ], "result": { "count": 1, diff --git a/src/generated/resources/data/allomancy/recipe/iron_button.json b/src/generated/resources/data/allomancy/recipe/iron_button.json index bf52ed5f..af982c80 100644 --- a/src/generated/resources/data/allomancy/recipe/iron_button.json +++ b/src/generated/resources/data/allomancy/recipe/iron_button.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shaped", "category": "redstone", "key": { - "I": { - "tag": "c:storage_blocks/iron" - }, - "i": { - "tag": "c:ingots/iron" - } + "I": "#c:storage_blocks/iron", + "i": "#c:ingots/iron" }, "pattern": [ "i", diff --git a/src/generated/resources/data/allomancy/recipe/iron_button_from_inverted.json b/src/generated/resources/data/allomancy/recipe/iron_button_from_inverted.json index 63fffada..aad8afe3 100644 --- a/src/generated/resources/data/allomancy/recipe/iron_button_from_inverted.json +++ b/src/generated/resources/data/allomancy/recipe/iron_button_from_inverted.json @@ -2,9 +2,7 @@ "type": "minecraft:crafting_shapeless", "category": "redstone", "ingredients": [ - { - "item": "allomancy:inverted_iron_button" - } + "allomancy:inverted_iron_button" ], "result": { "count": 1, diff --git a/src/generated/resources/data/allomancy/recipe/iron_flakes.json b/src/generated/resources/data/allomancy/recipe/iron_flakes.json index 6fe8f491..f85c008a 100644 --- a/src/generated/resources/data/allomancy/recipe/iron_flakes.json +++ b/src/generated/resources/data/allomancy/recipe/iron_flakes.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "allomancy:allomantic_grinder" - }, - { - "tag": "c:ingots/iron" - } + "allomancy:allomantic_grinder", + "#c:ingots/iron" ], "result": { "count": 2, diff --git a/src/generated/resources/data/allomancy/recipe/iron_lever.json b/src/generated/resources/data/allomancy/recipe/iron_lever.json index 687856c6..668556d1 100644 --- a/src/generated/resources/data/allomancy/recipe/iron_lever.json +++ b/src/generated/resources/data/allomancy/recipe/iron_lever.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shaped", "category": "redstone", "key": { - "I": { - "tag": "c:storage_blocks/iron" - }, - "s": { - "item": "minecraft:stick" - } + "I": "#c:storage_blocks/iron", + "s": "minecraft:stick" }, "pattern": [ "s", diff --git a/src/generated/resources/data/allomancy/recipe/iron_pattern.json b/src/generated/resources/data/allomancy/recipe/iron_pattern.json index 21dd8d11..e631f90e 100644 --- a/src/generated/resources/data/allomancy/recipe/iron_pattern.json +++ b/src/generated/resources/data/allomancy/recipe/iron_pattern.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "minecraft:paper" - }, - { - "item": "allomancy:iron_flakes" - } + "minecraft:paper", + "allomancy:iron_flakes" ], "result": { "count": 1, diff --git a/src/generated/resources/data/allomancy/recipe/koloss_blade.json b/src/generated/resources/data/allomancy/recipe/koloss_blade.json index abef746a..bcc94ca9 100644 --- a/src/generated/resources/data/allomancy/recipe/koloss_blade.json +++ b/src/generated/resources/data/allomancy/recipe/koloss_blade.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shaped", "category": "equipment", "key": { - "C": { - "item": "minecraft:cobblestone" - }, - "s": { - "item": "minecraft:stick" - } + "C": "minecraft:cobblestone", + "s": "minecraft:stick" }, "pattern": [ "CC", diff --git a/src/generated/resources/data/allomancy/recipe/lead_block.json b/src/generated/resources/data/allomancy/recipe/lead_block.json index 3f475952..81da7c2f 100644 --- a/src/generated/resources/data/allomancy/recipe/lead_block.json +++ b/src/generated/resources/data/allomancy/recipe/lead_block.json @@ -2,33 +2,15 @@ "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ - { - "item": "allomancy:lead_ingot" - }, - { - "item": "allomancy:lead_ingot" - }, - { - "item": "allomancy:lead_ingot" - }, - { - "item": "allomancy:lead_ingot" - }, - { - "item": "allomancy:lead_ingot" - }, - { - "item": "allomancy:lead_ingot" - }, - { - "item": "allomancy:lead_ingot" - }, - { - "item": "allomancy:lead_ingot" - }, - { - "item": "allomancy:lead_ingot" - } + "allomancy:lead_ingot", + "allomancy:lead_ingot", + "allomancy:lead_ingot", + "allomancy:lead_ingot", + "allomancy:lead_ingot", + "allomancy:lead_ingot", + "allomancy:lead_ingot", + "allomancy:lead_ingot", + "allomancy:lead_ingot" ], "result": { "count": 1, diff --git a/src/generated/resources/data/allomancy/recipe/lead_flakes.json b/src/generated/resources/data/allomancy/recipe/lead_flakes.json index d24672ac..4ee36380 100644 --- a/src/generated/resources/data/allomancy/recipe/lead_flakes.json +++ b/src/generated/resources/data/allomancy/recipe/lead_flakes.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "allomancy:allomantic_grinder" - }, - { - "tag": "c:ingots/lead" - } + "allomancy:allomantic_grinder", + "#c:ingots/lead" ], "result": { "count": 2, diff --git a/src/generated/resources/data/allomancy/recipe/lead_ingot_from_block.json b/src/generated/resources/data/allomancy/recipe/lead_ingot_from_block.json index 2707c5ea..31734cfe 100644 --- a/src/generated/resources/data/allomancy/recipe/lead_ingot_from_block.json +++ b/src/generated/resources/data/allomancy/recipe/lead_ingot_from_block.json @@ -2,9 +2,7 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "allomancy:lead_block" - } + "allomancy:lead_block" ], "result": { "count": 9, diff --git a/src/generated/resources/data/allomancy/recipe/lead_ingot_from_nuggets.json b/src/generated/resources/data/allomancy/recipe/lead_ingot_from_nuggets.json index 70752922..b92fb986 100644 --- a/src/generated/resources/data/allomancy/recipe/lead_ingot_from_nuggets.json +++ b/src/generated/resources/data/allomancy/recipe/lead_ingot_from_nuggets.json @@ -2,33 +2,15 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "allomancy:lead_nugget" - }, - { - "item": "allomancy:lead_nugget" - }, - { - "item": "allomancy:lead_nugget" - }, - { - "item": "allomancy:lead_nugget" - }, - { - "item": "allomancy:lead_nugget" - }, - { - "item": "allomancy:lead_nugget" - }, - { - "item": "allomancy:lead_nugget" - }, - { - "item": "allomancy:lead_nugget" - }, - { - "item": "allomancy:lead_nugget" - } + "allomancy:lead_nugget", + "allomancy:lead_nugget", + "allomancy:lead_nugget", + "allomancy:lead_nugget", + "allomancy:lead_nugget", + "allomancy:lead_nugget", + "allomancy:lead_nugget", + "allomancy:lead_nugget", + "allomancy:lead_nugget" ], "result": { "count": 1, diff --git a/src/generated/resources/data/allomancy/recipe/lead_nugget.json b/src/generated/resources/data/allomancy/recipe/lead_nugget.json index 819e85e4..2833888a 100644 --- a/src/generated/resources/data/allomancy/recipe/lead_nugget.json +++ b/src/generated/resources/data/allomancy/recipe/lead_nugget.json @@ -2,9 +2,7 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "allomancy:lead_ingot" - } + "allomancy:lead_ingot" ], "result": { "count": 9, diff --git a/src/generated/resources/data/allomancy/recipe/lerasium_nugget.json b/src/generated/resources/data/allomancy/recipe/lerasium_nugget.json index 19658a9e..198b3614 100644 --- a/src/generated/resources/data/allomancy/recipe/lerasium_nugget.json +++ b/src/generated/resources/data/allomancy/recipe/lerasium_nugget.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "minecraft:nether_star" - }, - { - "tag": "c:storage_blocks/gold" - } + "minecraft:nether_star", + "#c:storage_blocks/gold" ], "result": { "count": 1, diff --git a/src/generated/resources/data/allomancy/recipe/mistcloak.json b/src/generated/resources/data/allomancy/recipe/mistcloak.json index bbd3f2a8..a564eff8 100644 --- a/src/generated/resources/data/allomancy/recipe/mistcloak.json +++ b/src/generated/resources/data/allomancy/recipe/mistcloak.json @@ -2,9 +2,7 @@ "type": "minecraft:crafting_shaped", "category": "equipment", "key": { - "W": { - "item": "minecraft:gray_wool" - } + "W": "minecraft:gray_wool" }, "pattern": [ "W W", diff --git a/src/generated/resources/data/allomancy/recipe/nicrosil_block.json b/src/generated/resources/data/allomancy/recipe/nicrosil_block.json index 13f4d646..708f5da9 100644 --- a/src/generated/resources/data/allomancy/recipe/nicrosil_block.json +++ b/src/generated/resources/data/allomancy/recipe/nicrosil_block.json @@ -2,33 +2,15 @@ "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ - { - "item": "allomancy:nicrosil_ingot" - }, - { - "item": "allomancy:nicrosil_ingot" - }, - { - "item": "allomancy:nicrosil_ingot" - }, - { - "item": "allomancy:nicrosil_ingot" - }, - { - "item": "allomancy:nicrosil_ingot" - }, - { - "item": "allomancy:nicrosil_ingot" - }, - { - "item": "allomancy:nicrosil_ingot" - }, - { - "item": "allomancy:nicrosil_ingot" - }, - { - "item": "allomancy:nicrosil_ingot" - } + "allomancy:nicrosil_ingot", + "allomancy:nicrosil_ingot", + "allomancy:nicrosil_ingot", + "allomancy:nicrosil_ingot", + "allomancy:nicrosil_ingot", + "allomancy:nicrosil_ingot", + "allomancy:nicrosil_ingot", + "allomancy:nicrosil_ingot", + "allomancy:nicrosil_ingot" ], "result": { "count": 1, diff --git a/src/generated/resources/data/allomancy/recipe/nicrosil_flakes.json b/src/generated/resources/data/allomancy/recipe/nicrosil_flakes.json index c9fa6c4d..ef84d8ae 100644 --- a/src/generated/resources/data/allomancy/recipe/nicrosil_flakes.json +++ b/src/generated/resources/data/allomancy/recipe/nicrosil_flakes.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "allomancy:allomantic_grinder" - }, - { - "tag": "c:ingots/nicrosil" - } + "allomancy:allomantic_grinder", + "#c:ingots/nicrosil" ], "result": { "count": 2, diff --git a/src/generated/resources/data/allomancy/recipe/nicrosil_flakes_from_mixing.json b/src/generated/resources/data/allomancy/recipe/nicrosil_flakes_from_mixing.json index 276c1635..d6c7584b 100644 --- a/src/generated/resources/data/allomancy/recipe/nicrosil_flakes_from_mixing.json +++ b/src/generated/resources/data/allomancy/recipe/nicrosil_flakes_from_mixing.json @@ -2,18 +2,10 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "allomancy:chromium_flakes" - }, - { - "item": "allomancy:chromium_flakes" - }, - { - "item": "allomancy:chromium_flakes" - }, - { - "item": "allomancy:iron_flakes" - } + "allomancy:chromium_flakes", + "allomancy:chromium_flakes", + "allomancy:chromium_flakes", + "allomancy:iron_flakes" ], "result": { "count": 4, diff --git a/src/generated/resources/data/allomancy/recipe/nicrosil_ingot_from_alloying.json b/src/generated/resources/data/allomancy/recipe/nicrosil_ingot_from_alloying.json index 260486e1..2cb408d1 100644 --- a/src/generated/resources/data/allomancy/recipe/nicrosil_ingot_from_alloying.json +++ b/src/generated/resources/data/allomancy/recipe/nicrosil_ingot_from_alloying.json @@ -2,18 +2,10 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "tag": "c:ingots/chromium" - }, - { - "tag": "c:ingots/chromium" - }, - { - "tag": "c:ingots/chromium" - }, - { - "item": "minecraft:iron_ingot" - } + "#c:ingots/chromium", + "#c:ingots/chromium", + "#c:ingots/chromium", + "minecraft:iron_ingot" ], "result": { "count": 4, diff --git a/src/generated/resources/data/allomancy/recipe/nicrosil_ingot_from_block.json b/src/generated/resources/data/allomancy/recipe/nicrosil_ingot_from_block.json index 467642ff..9b50ae3e 100644 --- a/src/generated/resources/data/allomancy/recipe/nicrosil_ingot_from_block.json +++ b/src/generated/resources/data/allomancy/recipe/nicrosil_ingot_from_block.json @@ -2,9 +2,7 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "allomancy:nicrosil_block" - } + "allomancy:nicrosil_block" ], "result": { "count": 9, diff --git a/src/generated/resources/data/allomancy/recipe/nicrosil_ingot_from_nuggets.json b/src/generated/resources/data/allomancy/recipe/nicrosil_ingot_from_nuggets.json index 8e5bcf8a..85c0d246 100644 --- a/src/generated/resources/data/allomancy/recipe/nicrosil_ingot_from_nuggets.json +++ b/src/generated/resources/data/allomancy/recipe/nicrosil_ingot_from_nuggets.json @@ -2,33 +2,15 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "allomancy:nicrosil_nugget" - }, - { - "item": "allomancy:nicrosil_nugget" - }, - { - "item": "allomancy:nicrosil_nugget" - }, - { - "item": "allomancy:nicrosil_nugget" - }, - { - "item": "allomancy:nicrosil_nugget" - }, - { - "item": "allomancy:nicrosil_nugget" - }, - { - "item": "allomancy:nicrosil_nugget" - }, - { - "item": "allomancy:nicrosil_nugget" - }, - { - "item": "allomancy:nicrosil_nugget" - } + "allomancy:nicrosil_nugget", + "allomancy:nicrosil_nugget", + "allomancy:nicrosil_nugget", + "allomancy:nicrosil_nugget", + "allomancy:nicrosil_nugget", + "allomancy:nicrosil_nugget", + "allomancy:nicrosil_nugget", + "allomancy:nicrosil_nugget", + "allomancy:nicrosil_nugget" ], "result": { "count": 1, diff --git a/src/generated/resources/data/allomancy/recipe/nicrosil_nugget.json b/src/generated/resources/data/allomancy/recipe/nicrosil_nugget.json index 8131995f..9bde2e99 100644 --- a/src/generated/resources/data/allomancy/recipe/nicrosil_nugget.json +++ b/src/generated/resources/data/allomancy/recipe/nicrosil_nugget.json @@ -2,9 +2,7 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "allomancy:nicrosil_ingot" - } + "allomancy:nicrosil_ingot" ], "result": { "count": 9, diff --git a/src/generated/resources/data/allomancy/recipe/nicrosil_pattern.json b/src/generated/resources/data/allomancy/recipe/nicrosil_pattern.json index d07710df..0248e9c4 100644 --- a/src/generated/resources/data/allomancy/recipe/nicrosil_pattern.json +++ b/src/generated/resources/data/allomancy/recipe/nicrosil_pattern.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "minecraft:paper" - }, - { - "item": "allomancy:nicrosil_flakes" - } + "minecraft:paper", + "allomancy:nicrosil_flakes" ], "result": { "count": 1, diff --git a/src/generated/resources/data/allomancy/recipe/obsidian_dagger.json b/src/generated/resources/data/allomancy/recipe/obsidian_dagger.json index dd2b39c3..9fe3a24e 100644 --- a/src/generated/resources/data/allomancy/recipe/obsidian_dagger.json +++ b/src/generated/resources/data/allomancy/recipe/obsidian_dagger.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shaped", "category": "equipment", "key": { - "O": { - "tag": "c:obsidians" - }, - "s": { - "item": "minecraft:stick" - } + "O": "#c:obsidians", + "s": "minecraft:stick" }, "pattern": [ " O", diff --git a/src/generated/resources/data/allomancy/recipe/pewter_block.json b/src/generated/resources/data/allomancy/recipe/pewter_block.json index b0d661f0..1ad38c16 100644 --- a/src/generated/resources/data/allomancy/recipe/pewter_block.json +++ b/src/generated/resources/data/allomancy/recipe/pewter_block.json @@ -2,33 +2,15 @@ "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ - { - "item": "allomancy:pewter_ingot" - }, - { - "item": "allomancy:pewter_ingot" - }, - { - "item": "allomancy:pewter_ingot" - }, - { - "item": "allomancy:pewter_ingot" - }, - { - "item": "allomancy:pewter_ingot" - }, - { - "item": "allomancy:pewter_ingot" - }, - { - "item": "allomancy:pewter_ingot" - }, - { - "item": "allomancy:pewter_ingot" - }, - { - "item": "allomancy:pewter_ingot" - } + "allomancy:pewter_ingot", + "allomancy:pewter_ingot", + "allomancy:pewter_ingot", + "allomancy:pewter_ingot", + "allomancy:pewter_ingot", + "allomancy:pewter_ingot", + "allomancy:pewter_ingot", + "allomancy:pewter_ingot", + "allomancy:pewter_ingot" ], "result": { "count": 1, diff --git a/src/generated/resources/data/allomancy/recipe/pewter_flakes.json b/src/generated/resources/data/allomancy/recipe/pewter_flakes.json index f4c05d6f..e238df0a 100644 --- a/src/generated/resources/data/allomancy/recipe/pewter_flakes.json +++ b/src/generated/resources/data/allomancy/recipe/pewter_flakes.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "allomancy:allomantic_grinder" - }, - { - "tag": "c:ingots/pewter" - } + "allomancy:allomantic_grinder", + "#c:ingots/pewter" ], "result": { "count": 2, diff --git a/src/generated/resources/data/allomancy/recipe/pewter_flakes_from_mixing.json b/src/generated/resources/data/allomancy/recipe/pewter_flakes_from_mixing.json index 8825bbba..16edf014 100644 --- a/src/generated/resources/data/allomancy/recipe/pewter_flakes_from_mixing.json +++ b/src/generated/resources/data/allomancy/recipe/pewter_flakes_from_mixing.json @@ -2,15 +2,9 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "allomancy:tin_flakes" - }, - { - "item": "allomancy:tin_flakes" - }, - { - "item": "allomancy:lead_flakes" - } + "allomancy:tin_flakes", + "allomancy:tin_flakes", + "allomancy:lead_flakes" ], "result": { "count": 3, diff --git a/src/generated/resources/data/allomancy/recipe/pewter_ingot_from_alloying.json b/src/generated/resources/data/allomancy/recipe/pewter_ingot_from_alloying.json index 71ff0cc2..be3e9b59 100644 --- a/src/generated/resources/data/allomancy/recipe/pewter_ingot_from_alloying.json +++ b/src/generated/resources/data/allomancy/recipe/pewter_ingot_from_alloying.json @@ -2,15 +2,9 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "tag": "c:ingots/tin" - }, - { - "tag": "c:ingots/tin" - }, - { - "tag": "c:ingots/lead" - } + "#c:ingots/tin", + "#c:ingots/tin", + "#c:ingots/lead" ], "result": { "count": 3, diff --git a/src/generated/resources/data/allomancy/recipe/pewter_ingot_from_block.json b/src/generated/resources/data/allomancy/recipe/pewter_ingot_from_block.json index 475e9319..c4854c45 100644 --- a/src/generated/resources/data/allomancy/recipe/pewter_ingot_from_block.json +++ b/src/generated/resources/data/allomancy/recipe/pewter_ingot_from_block.json @@ -2,9 +2,7 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "allomancy:pewter_block" - } + "allomancy:pewter_block" ], "result": { "count": 9, diff --git a/src/generated/resources/data/allomancy/recipe/pewter_ingot_from_nuggets.json b/src/generated/resources/data/allomancy/recipe/pewter_ingot_from_nuggets.json index 4ea49aa8..24c7a767 100644 --- a/src/generated/resources/data/allomancy/recipe/pewter_ingot_from_nuggets.json +++ b/src/generated/resources/data/allomancy/recipe/pewter_ingot_from_nuggets.json @@ -2,33 +2,15 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "allomancy:pewter_nugget" - }, - { - "item": "allomancy:pewter_nugget" - }, - { - "item": "allomancy:pewter_nugget" - }, - { - "item": "allomancy:pewter_nugget" - }, - { - "item": "allomancy:pewter_nugget" - }, - { - "item": "allomancy:pewter_nugget" - }, - { - "item": "allomancy:pewter_nugget" - }, - { - "item": "allomancy:pewter_nugget" - }, - { - "item": "allomancy:pewter_nugget" - } + "allomancy:pewter_nugget", + "allomancy:pewter_nugget", + "allomancy:pewter_nugget", + "allomancy:pewter_nugget", + "allomancy:pewter_nugget", + "allomancy:pewter_nugget", + "allomancy:pewter_nugget", + "allomancy:pewter_nugget", + "allomancy:pewter_nugget" ], "result": { "count": 1, diff --git a/src/generated/resources/data/allomancy/recipe/pewter_nugget.json b/src/generated/resources/data/allomancy/recipe/pewter_nugget.json index 364ed286..79108dbb 100644 --- a/src/generated/resources/data/allomancy/recipe/pewter_nugget.json +++ b/src/generated/resources/data/allomancy/recipe/pewter_nugget.json @@ -2,9 +2,7 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "allomancy:pewter_ingot" - } + "allomancy:pewter_ingot" ], "result": { "count": 9, diff --git a/src/generated/resources/data/allomancy/recipe/pewter_pattern.json b/src/generated/resources/data/allomancy/recipe/pewter_pattern.json index 6556aa6f..7a3de2a4 100644 --- a/src/generated/resources/data/allomancy/recipe/pewter_pattern.json +++ b/src/generated/resources/data/allomancy/recipe/pewter_pattern.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "minecraft:paper" - }, - { - "item": "allomancy:pewter_flakes" - } + "minecraft:paper", + "allomancy:pewter_flakes" ], "result": { "count": 1, diff --git a/src/generated/resources/data/allomancy/recipe/silver_block.json b/src/generated/resources/data/allomancy/recipe/silver_block.json index 1be16fec..561ecf9f 100644 --- a/src/generated/resources/data/allomancy/recipe/silver_block.json +++ b/src/generated/resources/data/allomancy/recipe/silver_block.json @@ -2,33 +2,15 @@ "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ - { - "item": "allomancy:silver_ingot" - }, - { - "item": "allomancy:silver_ingot" - }, - { - "item": "allomancy:silver_ingot" - }, - { - "item": "allomancy:silver_ingot" - }, - { - "item": "allomancy:silver_ingot" - }, - { - "item": "allomancy:silver_ingot" - }, - { - "item": "allomancy:silver_ingot" - }, - { - "item": "allomancy:silver_ingot" - }, - { - "item": "allomancy:silver_ingot" - } + "allomancy:silver_ingot", + "allomancy:silver_ingot", + "allomancy:silver_ingot", + "allomancy:silver_ingot", + "allomancy:silver_ingot", + "allomancy:silver_ingot", + "allomancy:silver_ingot", + "allomancy:silver_ingot", + "allomancy:silver_ingot" ], "result": { "count": 1, diff --git a/src/generated/resources/data/allomancy/recipe/silver_flakes.json b/src/generated/resources/data/allomancy/recipe/silver_flakes.json index c3f012c3..bfa8c56e 100644 --- a/src/generated/resources/data/allomancy/recipe/silver_flakes.json +++ b/src/generated/resources/data/allomancy/recipe/silver_flakes.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "allomancy:allomantic_grinder" - }, - { - "tag": "c:ingots/silver" - } + "allomancy:allomantic_grinder", + "#c:ingots/silver" ], "result": { "count": 2, diff --git a/src/generated/resources/data/allomancy/recipe/silver_ingot_from_block.json b/src/generated/resources/data/allomancy/recipe/silver_ingot_from_block.json index d01c29d0..c5c75c7d 100644 --- a/src/generated/resources/data/allomancy/recipe/silver_ingot_from_block.json +++ b/src/generated/resources/data/allomancy/recipe/silver_ingot_from_block.json @@ -2,9 +2,7 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "allomancy:silver_block" - } + "allomancy:silver_block" ], "result": { "count": 9, diff --git a/src/generated/resources/data/allomancy/recipe/silver_ingot_from_nuggets.json b/src/generated/resources/data/allomancy/recipe/silver_ingot_from_nuggets.json index 69d5e6b3..71d0d6f3 100644 --- a/src/generated/resources/data/allomancy/recipe/silver_ingot_from_nuggets.json +++ b/src/generated/resources/data/allomancy/recipe/silver_ingot_from_nuggets.json @@ -2,33 +2,15 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "allomancy:silver_nugget" - }, - { - "item": "allomancy:silver_nugget" - }, - { - "item": "allomancy:silver_nugget" - }, - { - "item": "allomancy:silver_nugget" - }, - { - "item": "allomancy:silver_nugget" - }, - { - "item": "allomancy:silver_nugget" - }, - { - "item": "allomancy:silver_nugget" - }, - { - "item": "allomancy:silver_nugget" - }, - { - "item": "allomancy:silver_nugget" - } + "allomancy:silver_nugget", + "allomancy:silver_nugget", + "allomancy:silver_nugget", + "allomancy:silver_nugget", + "allomancy:silver_nugget", + "allomancy:silver_nugget", + "allomancy:silver_nugget", + "allomancy:silver_nugget", + "allomancy:silver_nugget" ], "result": { "count": 1, diff --git a/src/generated/resources/data/allomancy/recipe/silver_nugget.json b/src/generated/resources/data/allomancy/recipe/silver_nugget.json index 645a5d8d..f044a0ea 100644 --- a/src/generated/resources/data/allomancy/recipe/silver_nugget.json +++ b/src/generated/resources/data/allomancy/recipe/silver_nugget.json @@ -2,9 +2,7 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "allomancy:silver_ingot" - } + "allomancy:silver_ingot" ], "result": { "count": 9, diff --git a/src/generated/resources/data/allomancy/recipe/steel_block.json b/src/generated/resources/data/allomancy/recipe/steel_block.json index 2e12962e..7efcb1f7 100644 --- a/src/generated/resources/data/allomancy/recipe/steel_block.json +++ b/src/generated/resources/data/allomancy/recipe/steel_block.json @@ -2,33 +2,15 @@ "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ - { - "item": "allomancy:steel_ingot" - }, - { - "item": "allomancy:steel_ingot" - }, - { - "item": "allomancy:steel_ingot" - }, - { - "item": "allomancy:steel_ingot" - }, - { - "item": "allomancy:steel_ingot" - }, - { - "item": "allomancy:steel_ingot" - }, - { - "item": "allomancy:steel_ingot" - }, - { - "item": "allomancy:steel_ingot" - }, - { - "item": "allomancy:steel_ingot" - } + "allomancy:steel_ingot", + "allomancy:steel_ingot", + "allomancy:steel_ingot", + "allomancy:steel_ingot", + "allomancy:steel_ingot", + "allomancy:steel_ingot", + "allomancy:steel_ingot", + "allomancy:steel_ingot", + "allomancy:steel_ingot" ], "result": { "count": 1, diff --git a/src/generated/resources/data/allomancy/recipe/steel_flakes.json b/src/generated/resources/data/allomancy/recipe/steel_flakes.json index 8448f16c..42f9d25e 100644 --- a/src/generated/resources/data/allomancy/recipe/steel_flakes.json +++ b/src/generated/resources/data/allomancy/recipe/steel_flakes.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "allomancy:allomantic_grinder" - }, - { - "tag": "c:ingots/steel" - } + "allomancy:allomantic_grinder", + "#c:ingots/steel" ], "result": { "count": 2, diff --git a/src/generated/resources/data/allomancy/recipe/steel_flakes_from_mixing.json b/src/generated/resources/data/allomancy/recipe/steel_flakes_from_mixing.json index 2355d0a4..db03674e 100644 --- a/src/generated/resources/data/allomancy/recipe/steel_flakes_from_mixing.json +++ b/src/generated/resources/data/allomancy/recipe/steel_flakes_from_mixing.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "minecraft:coal" - }, - { - "item": "allomancy:iron_flakes" - } + "minecraft:coal", + "allomancy:iron_flakes" ], "result": { "count": 2, diff --git a/src/generated/resources/data/allomancy/recipe/steel_ingot_from_alloying.json b/src/generated/resources/data/allomancy/recipe/steel_ingot_from_alloying.json index 13e4bfee..047833ac 100644 --- a/src/generated/resources/data/allomancy/recipe/steel_ingot_from_alloying.json +++ b/src/generated/resources/data/allomancy/recipe/steel_ingot_from_alloying.json @@ -2,18 +2,10 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "minecraft:iron_ingot" - }, - { - "item": "minecraft:iron_ingot" - }, - { - "item": "minecraft:iron_ingot" - }, - { - "item": "minecraft:coal" - } + "minecraft:iron_ingot", + "minecraft:iron_ingot", + "minecraft:iron_ingot", + "minecraft:coal" ], "result": { "count": 4, diff --git a/src/generated/resources/data/allomancy/recipe/steel_ingot_from_block.json b/src/generated/resources/data/allomancy/recipe/steel_ingot_from_block.json index 96ab26d1..7609b6ed 100644 --- a/src/generated/resources/data/allomancy/recipe/steel_ingot_from_block.json +++ b/src/generated/resources/data/allomancy/recipe/steel_ingot_from_block.json @@ -2,9 +2,7 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "allomancy:steel_block" - } + "allomancy:steel_block" ], "result": { "count": 9, diff --git a/src/generated/resources/data/allomancy/recipe/steel_ingot_from_nuggets.json b/src/generated/resources/data/allomancy/recipe/steel_ingot_from_nuggets.json index e0b1ca5d..80e96ea5 100644 --- a/src/generated/resources/data/allomancy/recipe/steel_ingot_from_nuggets.json +++ b/src/generated/resources/data/allomancy/recipe/steel_ingot_from_nuggets.json @@ -2,33 +2,15 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "allomancy:steel_nugget" - }, - { - "item": "allomancy:steel_nugget" - }, - { - "item": "allomancy:steel_nugget" - }, - { - "item": "allomancy:steel_nugget" - }, - { - "item": "allomancy:steel_nugget" - }, - { - "item": "allomancy:steel_nugget" - }, - { - "item": "allomancy:steel_nugget" - }, - { - "item": "allomancy:steel_nugget" - }, - { - "item": "allomancy:steel_nugget" - } + "allomancy:steel_nugget", + "allomancy:steel_nugget", + "allomancy:steel_nugget", + "allomancy:steel_nugget", + "allomancy:steel_nugget", + "allomancy:steel_nugget", + "allomancy:steel_nugget", + "allomancy:steel_nugget", + "allomancy:steel_nugget" ], "result": { "count": 1, diff --git a/src/generated/resources/data/allomancy/recipe/steel_nugget.json b/src/generated/resources/data/allomancy/recipe/steel_nugget.json index 5aec0083..43a776d0 100644 --- a/src/generated/resources/data/allomancy/recipe/steel_nugget.json +++ b/src/generated/resources/data/allomancy/recipe/steel_nugget.json @@ -2,9 +2,7 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "allomancy:steel_ingot" - } + "allomancy:steel_ingot" ], "result": { "count": 9, diff --git a/src/generated/resources/data/allomancy/recipe/steel_pattern.json b/src/generated/resources/data/allomancy/recipe/steel_pattern.json index 5a2985f0..d4f87281 100644 --- a/src/generated/resources/data/allomancy/recipe/steel_pattern.json +++ b/src/generated/resources/data/allomancy/recipe/steel_pattern.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "minecraft:paper" - }, - { - "item": "allomancy:steel_flakes" - } + "minecraft:paper", + "allomancy:steel_flakes" ], "result": { "count": 1, diff --git a/src/generated/resources/data/allomancy/recipe/tin_block.json b/src/generated/resources/data/allomancy/recipe/tin_block.json index 091f299e..be830f14 100644 --- a/src/generated/resources/data/allomancy/recipe/tin_block.json +++ b/src/generated/resources/data/allomancy/recipe/tin_block.json @@ -2,33 +2,15 @@ "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ - { - "item": "allomancy:tin_ingot" - }, - { - "item": "allomancy:tin_ingot" - }, - { - "item": "allomancy:tin_ingot" - }, - { - "item": "allomancy:tin_ingot" - }, - { - "item": "allomancy:tin_ingot" - }, - { - "item": "allomancy:tin_ingot" - }, - { - "item": "allomancy:tin_ingot" - }, - { - "item": "allomancy:tin_ingot" - }, - { - "item": "allomancy:tin_ingot" - } + "allomancy:tin_ingot", + "allomancy:tin_ingot", + "allomancy:tin_ingot", + "allomancy:tin_ingot", + "allomancy:tin_ingot", + "allomancy:tin_ingot", + "allomancy:tin_ingot", + "allomancy:tin_ingot", + "allomancy:tin_ingot" ], "result": { "count": 1, diff --git a/src/generated/resources/data/allomancy/recipe/tin_flakes.json b/src/generated/resources/data/allomancy/recipe/tin_flakes.json index 8df4ab42..0ad4020b 100644 --- a/src/generated/resources/data/allomancy/recipe/tin_flakes.json +++ b/src/generated/resources/data/allomancy/recipe/tin_flakes.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "allomancy:allomantic_grinder" - }, - { - "tag": "c:ingots/tin" - } + "allomancy:allomantic_grinder", + "#c:ingots/tin" ], "result": { "count": 2, diff --git a/src/generated/resources/data/allomancy/recipe/tin_ingot_from_block.json b/src/generated/resources/data/allomancy/recipe/tin_ingot_from_block.json index 5c5563d9..3ac35566 100644 --- a/src/generated/resources/data/allomancy/recipe/tin_ingot_from_block.json +++ b/src/generated/resources/data/allomancy/recipe/tin_ingot_from_block.json @@ -2,9 +2,7 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "allomancy:tin_block" - } + "allomancy:tin_block" ], "result": { "count": 9, diff --git a/src/generated/resources/data/allomancy/recipe/tin_ingot_from_nuggets.json b/src/generated/resources/data/allomancy/recipe/tin_ingot_from_nuggets.json index 92804a69..3fe97987 100644 --- a/src/generated/resources/data/allomancy/recipe/tin_ingot_from_nuggets.json +++ b/src/generated/resources/data/allomancy/recipe/tin_ingot_from_nuggets.json @@ -2,33 +2,15 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "allomancy:tin_nugget" - }, - { - "item": "allomancy:tin_nugget" - }, - { - "item": "allomancy:tin_nugget" - }, - { - "item": "allomancy:tin_nugget" - }, - { - "item": "allomancy:tin_nugget" - }, - { - "item": "allomancy:tin_nugget" - }, - { - "item": "allomancy:tin_nugget" - }, - { - "item": "allomancy:tin_nugget" - }, - { - "item": "allomancy:tin_nugget" - } + "allomancy:tin_nugget", + "allomancy:tin_nugget", + "allomancy:tin_nugget", + "allomancy:tin_nugget", + "allomancy:tin_nugget", + "allomancy:tin_nugget", + "allomancy:tin_nugget", + "allomancy:tin_nugget", + "allomancy:tin_nugget" ], "result": { "count": 1, diff --git a/src/generated/resources/data/allomancy/recipe/tin_nugget.json b/src/generated/resources/data/allomancy/recipe/tin_nugget.json index 1840ca1e..09fc303c 100644 --- a/src/generated/resources/data/allomancy/recipe/tin_nugget.json +++ b/src/generated/resources/data/allomancy/recipe/tin_nugget.json @@ -2,9 +2,7 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "allomancy:tin_ingot" - } + "allomancy:tin_ingot" ], "result": { "count": 9, diff --git a/src/generated/resources/data/allomancy/recipe/tin_pattern.json b/src/generated/resources/data/allomancy/recipe/tin_pattern.json index 9cf34369..24ef680c 100644 --- a/src/generated/resources/data/allomancy/recipe/tin_pattern.json +++ b/src/generated/resources/data/allomancy/recipe/tin_pattern.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "minecraft:paper" - }, - { - "item": "allomancy:tin_flakes" - } + "minecraft:paper", + "allomancy:tin_flakes" ], "result": { "count": 1, diff --git a/src/generated/resources/data/allomancy/recipe/vial.json b/src/generated/resources/data/allomancy/recipe/vial.json index 5d8a29de..0aafe0c8 100644 --- a/src/generated/resources/data/allomancy/recipe/vial.json +++ b/src/generated/resources/data/allomancy/recipe/vial.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "G": { - "item": "minecraft:glass" - }, - "S": { - "tag": "minecraft:wooden_slabs" - } + "G": "minecraft:glass", + "S": "#minecraft:wooden_slabs" }, "pattern": [ " S ", diff --git a/src/generated/resources/data/allomancy/recipe/zinc_block.json b/src/generated/resources/data/allomancy/recipe/zinc_block.json index a30e32f1..4660760e 100644 --- a/src/generated/resources/data/allomancy/recipe/zinc_block.json +++ b/src/generated/resources/data/allomancy/recipe/zinc_block.json @@ -2,33 +2,15 @@ "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ - { - "item": "allomancy:zinc_ingot" - }, - { - "item": "allomancy:zinc_ingot" - }, - { - "item": "allomancy:zinc_ingot" - }, - { - "item": "allomancy:zinc_ingot" - }, - { - "item": "allomancy:zinc_ingot" - }, - { - "item": "allomancy:zinc_ingot" - }, - { - "item": "allomancy:zinc_ingot" - }, - { - "item": "allomancy:zinc_ingot" - }, - { - "item": "allomancy:zinc_ingot" - } + "allomancy:zinc_ingot", + "allomancy:zinc_ingot", + "allomancy:zinc_ingot", + "allomancy:zinc_ingot", + "allomancy:zinc_ingot", + "allomancy:zinc_ingot", + "allomancy:zinc_ingot", + "allomancy:zinc_ingot", + "allomancy:zinc_ingot" ], "result": { "count": 1, diff --git a/src/generated/resources/data/allomancy/recipe/zinc_flakes.json b/src/generated/resources/data/allomancy/recipe/zinc_flakes.json index 2acc71de..153e0825 100644 --- a/src/generated/resources/data/allomancy/recipe/zinc_flakes.json +++ b/src/generated/resources/data/allomancy/recipe/zinc_flakes.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "allomancy:allomantic_grinder" - }, - { - "tag": "c:ingots/zinc" - } + "allomancy:allomantic_grinder", + "#c:ingots/zinc" ], "result": { "count": 2, diff --git a/src/generated/resources/data/allomancy/recipe/zinc_ingot_from_block.json b/src/generated/resources/data/allomancy/recipe/zinc_ingot_from_block.json index 01ad2a8c..9179f6b2 100644 --- a/src/generated/resources/data/allomancy/recipe/zinc_ingot_from_block.json +++ b/src/generated/resources/data/allomancy/recipe/zinc_ingot_from_block.json @@ -2,9 +2,7 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "allomancy:zinc_block" - } + "allomancy:zinc_block" ], "result": { "count": 9, diff --git a/src/generated/resources/data/allomancy/recipe/zinc_ingot_from_nuggets.json b/src/generated/resources/data/allomancy/recipe/zinc_ingot_from_nuggets.json index cac3231b..7ff835ea 100644 --- a/src/generated/resources/data/allomancy/recipe/zinc_ingot_from_nuggets.json +++ b/src/generated/resources/data/allomancy/recipe/zinc_ingot_from_nuggets.json @@ -2,33 +2,15 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "allomancy:zinc_nugget" - }, - { - "item": "allomancy:zinc_nugget" - }, - { - "item": "allomancy:zinc_nugget" - }, - { - "item": "allomancy:zinc_nugget" - }, - { - "item": "allomancy:zinc_nugget" - }, - { - "item": "allomancy:zinc_nugget" - }, - { - "item": "allomancy:zinc_nugget" - }, - { - "item": "allomancy:zinc_nugget" - }, - { - "item": "allomancy:zinc_nugget" - } + "allomancy:zinc_nugget", + "allomancy:zinc_nugget", + "allomancy:zinc_nugget", + "allomancy:zinc_nugget", + "allomancy:zinc_nugget", + "allomancy:zinc_nugget", + "allomancy:zinc_nugget", + "allomancy:zinc_nugget", + "allomancy:zinc_nugget" ], "result": { "count": 1, diff --git a/src/generated/resources/data/allomancy/recipe/zinc_nugget.json b/src/generated/resources/data/allomancy/recipe/zinc_nugget.json index 84d836a9..8efdc8d8 100644 --- a/src/generated/resources/data/allomancy/recipe/zinc_nugget.json +++ b/src/generated/resources/data/allomancy/recipe/zinc_nugget.json @@ -2,9 +2,7 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "allomancy:zinc_ingot" - } + "allomancy:zinc_ingot" ], "result": { "count": 9, diff --git a/src/generated/resources/data/allomancy/recipe/zinc_pattern.json b/src/generated/resources/data/allomancy/recipe/zinc_pattern.json index 43750aae..70f166db 100644 --- a/src/generated/resources/data/allomancy/recipe/zinc_pattern.json +++ b/src/generated/resources/data/allomancy/recipe/zinc_pattern.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "minecraft:paper" - }, - { - "item": "allomancy:zinc_flakes" - } + "minecraft:paper", + "allomancy:zinc_flakes" ], "result": { "count": 1, diff --git a/src/generated/resources/data/allomancy/tags/item/obsidian_tool_materials.json b/src/generated/resources/data/allomancy/tags/item/obsidian_tool_materials.json new file mode 100644 index 00000000..756686dd --- /dev/null +++ b/src/generated/resources/data/allomancy/tags/item/obsidian_tool_materials.json @@ -0,0 +1,6 @@ +{ + "values": [ + "minecraft:obsidian", + "minecraft:crying_obsidian" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/allomancy/tags/item/repairs_aluminum_armor.json b/src/generated/resources/data/allomancy/tags/item/repairs_aluminum_armor.json new file mode 100644 index 00000000..39ac146b --- /dev/null +++ b/src/generated/resources/data/allomancy/tags/item/repairs_aluminum_armor.json @@ -0,0 +1,5 @@ +{ + "values": [ + "#c:ingots/aluminum" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/allomancy/tags/item/repairs_wool_armor.json b/src/generated/resources/data/allomancy/tags/item/repairs_wool_armor.json new file mode 100644 index 00000000..63aa59fe --- /dev/null +++ b/src/generated/resources/data/allomancy/tags/item/repairs_wool_armor.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:gray_wool" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/allomancy/advancement/recipes/misc/aluminum_ingot_from_aluminum_ore.json b/src/generated/resources/data/minecraft/advancement/recipes/misc/aluminum_ingot_from_blasting_aluminum_ore.json similarity index 79% rename from src/generated/resources/data/allomancy/advancement/recipes/misc/aluminum_ingot_from_aluminum_ore.json rename to src/generated/resources/data/minecraft/advancement/recipes/misc/aluminum_ingot_from_blasting_aluminum_ore.json index cf5091f5..4cdfaa4a 100644 --- a/src/generated/resources/data/allomancy/advancement/recipes/misc/aluminum_ingot_from_aluminum_ore.json +++ b/src/generated/resources/data/minecraft/advancement/recipes/misc/aluminum_ingot_from_blasting_aluminum_ore.json @@ -13,7 +13,7 @@ }, "has_the_recipe": { "conditions": { - "recipe": "allomancy:aluminum_ingot_from_aluminum_ore" + "recipe": "minecraft:aluminum_ingot_from_blasting_aluminum_ore" }, "trigger": "minecraft:recipe_unlocked" } @@ -26,7 +26,7 @@ ], "rewards": { "recipes": [ - "allomancy:aluminum_ingot_from_aluminum_ore" + "minecraft:aluminum_ingot_from_blasting_aluminum_ore" ] } } \ No newline at end of file diff --git a/src/generated/resources/data/allomancy/advancement/recipes/misc/aluminum_ingot_from_deepslate_aluminum_ore.json b/src/generated/resources/data/minecraft/advancement/recipes/misc/aluminum_ingot_from_blasting_deepslate_aluminum_ore.json similarity index 77% rename from src/generated/resources/data/allomancy/advancement/recipes/misc/aluminum_ingot_from_deepslate_aluminum_ore.json rename to src/generated/resources/data/minecraft/advancement/recipes/misc/aluminum_ingot_from_blasting_deepslate_aluminum_ore.json index 514918c4..aa3e5745 100644 --- a/src/generated/resources/data/allomancy/advancement/recipes/misc/aluminum_ingot_from_deepslate_aluminum_ore.json +++ b/src/generated/resources/data/minecraft/advancement/recipes/misc/aluminum_ingot_from_blasting_deepslate_aluminum_ore.json @@ -13,7 +13,7 @@ }, "has_the_recipe": { "conditions": { - "recipe": "allomancy:aluminum_ingot_from_deepslate_aluminum_ore" + "recipe": "minecraft:aluminum_ingot_from_blasting_deepslate_aluminum_ore" }, "trigger": "minecraft:recipe_unlocked" } @@ -26,7 +26,7 @@ ], "rewards": { "recipes": [ - "allomancy:aluminum_ingot_from_deepslate_aluminum_ore" + "minecraft:aluminum_ingot_from_blasting_deepslate_aluminum_ore" ] } } \ No newline at end of file diff --git a/src/generated/resources/data/allomancy/advancement/recipes/misc/aluminum_ingot_from_raw_aluminum.json b/src/generated/resources/data/minecraft/advancement/recipes/misc/aluminum_ingot_from_blasting_raw_aluminum.json similarity index 79% rename from src/generated/resources/data/allomancy/advancement/recipes/misc/aluminum_ingot_from_raw_aluminum.json rename to src/generated/resources/data/minecraft/advancement/recipes/misc/aluminum_ingot_from_blasting_raw_aluminum.json index ae6105a2..00b2ee6d 100644 --- a/src/generated/resources/data/allomancy/advancement/recipes/misc/aluminum_ingot_from_raw_aluminum.json +++ b/src/generated/resources/data/minecraft/advancement/recipes/misc/aluminum_ingot_from_blasting_raw_aluminum.json @@ -13,7 +13,7 @@ }, "has_the_recipe": { "conditions": { - "recipe": "allomancy:aluminum_ingot_from_raw_aluminum" + "recipe": "minecraft:aluminum_ingot_from_blasting_raw_aluminum" }, "trigger": "minecraft:recipe_unlocked" } @@ -26,7 +26,7 @@ ], "rewards": { "recipes": [ - "allomancy:aluminum_ingot_from_raw_aluminum" + "minecraft:aluminum_ingot_from_blasting_raw_aluminum" ] } } \ No newline at end of file diff --git a/src/generated/resources/data/allomancy/advancement/recipes/misc/aluminum_ingot_from_aluminum_ore_from_blasting.json b/src/generated/resources/data/minecraft/advancement/recipes/misc/aluminum_ingot_from_smelting_aluminum_ore.json similarity index 78% rename from src/generated/resources/data/allomancy/advancement/recipes/misc/aluminum_ingot_from_aluminum_ore_from_blasting.json rename to src/generated/resources/data/minecraft/advancement/recipes/misc/aluminum_ingot_from_smelting_aluminum_ore.json index 5af6b966..71f42e7d 100644 --- a/src/generated/resources/data/allomancy/advancement/recipes/misc/aluminum_ingot_from_aluminum_ore_from_blasting.json +++ b/src/generated/resources/data/minecraft/advancement/recipes/misc/aluminum_ingot_from_smelting_aluminum_ore.json @@ -13,7 +13,7 @@ }, "has_the_recipe": { "conditions": { - "recipe": "allomancy:aluminum_ingot_from_aluminum_ore_from_blasting" + "recipe": "minecraft:aluminum_ingot_from_smelting_aluminum_ore" }, "trigger": "minecraft:recipe_unlocked" } @@ -26,7 +26,7 @@ ], "rewards": { "recipes": [ - "allomancy:aluminum_ingot_from_aluminum_ore_from_blasting" + "minecraft:aluminum_ingot_from_smelting_aluminum_ore" ] } } \ No newline at end of file diff --git a/src/generated/resources/data/allomancy/advancement/recipes/misc/aluminum_ingot_from_deepslate_aluminum_ore_from_blasting.json b/src/generated/resources/data/minecraft/advancement/recipes/misc/aluminum_ingot_from_smelting_deepslate_aluminum_ore.json similarity index 76% rename from src/generated/resources/data/allomancy/advancement/recipes/misc/aluminum_ingot_from_deepslate_aluminum_ore_from_blasting.json rename to src/generated/resources/data/minecraft/advancement/recipes/misc/aluminum_ingot_from_smelting_deepslate_aluminum_ore.json index f088b7e5..3bfdbd60 100644 --- a/src/generated/resources/data/allomancy/advancement/recipes/misc/aluminum_ingot_from_deepslate_aluminum_ore_from_blasting.json +++ b/src/generated/resources/data/minecraft/advancement/recipes/misc/aluminum_ingot_from_smelting_deepslate_aluminum_ore.json @@ -13,7 +13,7 @@ }, "has_the_recipe": { "conditions": { - "recipe": "allomancy:aluminum_ingot_from_deepslate_aluminum_ore_from_blasting" + "recipe": "minecraft:aluminum_ingot_from_smelting_deepslate_aluminum_ore" }, "trigger": "minecraft:recipe_unlocked" } @@ -26,7 +26,7 @@ ], "rewards": { "recipes": [ - "allomancy:aluminum_ingot_from_deepslate_aluminum_ore_from_blasting" + "minecraft:aluminum_ingot_from_smelting_deepslate_aluminum_ore" ] } } \ No newline at end of file diff --git a/src/generated/resources/data/allomancy/advancement/recipes/misc/aluminum_ingot_from_raw_aluminum_from_blasting.json b/src/generated/resources/data/minecraft/advancement/recipes/misc/aluminum_ingot_from_smelting_raw_aluminum.json similarity index 78% rename from src/generated/resources/data/allomancy/advancement/recipes/misc/aluminum_ingot_from_raw_aluminum_from_blasting.json rename to src/generated/resources/data/minecraft/advancement/recipes/misc/aluminum_ingot_from_smelting_raw_aluminum.json index 71509dae..3035775b 100644 --- a/src/generated/resources/data/allomancy/advancement/recipes/misc/aluminum_ingot_from_raw_aluminum_from_blasting.json +++ b/src/generated/resources/data/minecraft/advancement/recipes/misc/aluminum_ingot_from_smelting_raw_aluminum.json @@ -13,7 +13,7 @@ }, "has_the_recipe": { "conditions": { - "recipe": "allomancy:aluminum_ingot_from_raw_aluminum_from_blasting" + "recipe": "minecraft:aluminum_ingot_from_smelting_raw_aluminum" }, "trigger": "minecraft:recipe_unlocked" } @@ -26,7 +26,7 @@ ], "rewards": { "recipes": [ - "allomancy:aluminum_ingot_from_raw_aluminum_from_blasting" + "minecraft:aluminum_ingot_from_smelting_raw_aluminum" ] } } \ No newline at end of file diff --git a/src/generated/resources/data/allomancy/advancement/recipes/misc/cadmium_ingot_from_cadmium_ore.json b/src/generated/resources/data/minecraft/advancement/recipes/misc/cadmium_ingot_from_blasting_cadmium_ore.json similarity index 79% rename from src/generated/resources/data/allomancy/advancement/recipes/misc/cadmium_ingot_from_cadmium_ore.json rename to src/generated/resources/data/minecraft/advancement/recipes/misc/cadmium_ingot_from_blasting_cadmium_ore.json index bd82fcc7..c7b7ed0b 100644 --- a/src/generated/resources/data/allomancy/advancement/recipes/misc/cadmium_ingot_from_cadmium_ore.json +++ b/src/generated/resources/data/minecraft/advancement/recipes/misc/cadmium_ingot_from_blasting_cadmium_ore.json @@ -13,7 +13,7 @@ }, "has_the_recipe": { "conditions": { - "recipe": "allomancy:cadmium_ingot_from_cadmium_ore" + "recipe": "minecraft:cadmium_ingot_from_blasting_cadmium_ore" }, "trigger": "minecraft:recipe_unlocked" } @@ -26,7 +26,7 @@ ], "rewards": { "recipes": [ - "allomancy:cadmium_ingot_from_cadmium_ore" + "minecraft:cadmium_ingot_from_blasting_cadmium_ore" ] } } \ No newline at end of file diff --git a/src/generated/resources/data/allomancy/advancement/recipes/misc/cadmium_ingot_from_deepslate_cadmium_ore.json b/src/generated/resources/data/minecraft/advancement/recipes/misc/cadmium_ingot_from_blasting_deepslate_cadmium_ore.json similarity index 78% rename from src/generated/resources/data/allomancy/advancement/recipes/misc/cadmium_ingot_from_deepslate_cadmium_ore.json rename to src/generated/resources/data/minecraft/advancement/recipes/misc/cadmium_ingot_from_blasting_deepslate_cadmium_ore.json index 44eedfd0..a93ac79f 100644 --- a/src/generated/resources/data/allomancy/advancement/recipes/misc/cadmium_ingot_from_deepslate_cadmium_ore.json +++ b/src/generated/resources/data/minecraft/advancement/recipes/misc/cadmium_ingot_from_blasting_deepslate_cadmium_ore.json @@ -13,7 +13,7 @@ }, "has_the_recipe": { "conditions": { - "recipe": "allomancy:cadmium_ingot_from_deepslate_cadmium_ore" + "recipe": "minecraft:cadmium_ingot_from_blasting_deepslate_cadmium_ore" }, "trigger": "minecraft:recipe_unlocked" } @@ -26,7 +26,7 @@ ], "rewards": { "recipes": [ - "allomancy:cadmium_ingot_from_deepslate_cadmium_ore" + "minecraft:cadmium_ingot_from_blasting_deepslate_cadmium_ore" ] } } \ No newline at end of file diff --git a/src/generated/resources/data/allomancy/advancement/recipes/misc/cadmium_ingot_from_raw_cadmium.json b/src/generated/resources/data/minecraft/advancement/recipes/misc/cadmium_ingot_from_blasting_raw_cadmium.json similarity index 79% rename from src/generated/resources/data/allomancy/advancement/recipes/misc/cadmium_ingot_from_raw_cadmium.json rename to src/generated/resources/data/minecraft/advancement/recipes/misc/cadmium_ingot_from_blasting_raw_cadmium.json index 11d4da18..cfacd248 100644 --- a/src/generated/resources/data/allomancy/advancement/recipes/misc/cadmium_ingot_from_raw_cadmium.json +++ b/src/generated/resources/data/minecraft/advancement/recipes/misc/cadmium_ingot_from_blasting_raw_cadmium.json @@ -13,7 +13,7 @@ }, "has_the_recipe": { "conditions": { - "recipe": "allomancy:cadmium_ingot_from_raw_cadmium" + "recipe": "minecraft:cadmium_ingot_from_blasting_raw_cadmium" }, "trigger": "minecraft:recipe_unlocked" } @@ -26,7 +26,7 @@ ], "rewards": { "recipes": [ - "allomancy:cadmium_ingot_from_raw_cadmium" + "minecraft:cadmium_ingot_from_blasting_raw_cadmium" ] } } \ No newline at end of file diff --git a/src/generated/resources/data/allomancy/advancement/recipes/misc/cadmium_ingot_from_cadmium_ore_from_blasting.json b/src/generated/resources/data/minecraft/advancement/recipes/misc/cadmium_ingot_from_smelting_cadmium_ore.json similarity index 78% rename from src/generated/resources/data/allomancy/advancement/recipes/misc/cadmium_ingot_from_cadmium_ore_from_blasting.json rename to src/generated/resources/data/minecraft/advancement/recipes/misc/cadmium_ingot_from_smelting_cadmium_ore.json index 6ebf9c54..3e453932 100644 --- a/src/generated/resources/data/allomancy/advancement/recipes/misc/cadmium_ingot_from_cadmium_ore_from_blasting.json +++ b/src/generated/resources/data/minecraft/advancement/recipes/misc/cadmium_ingot_from_smelting_cadmium_ore.json @@ -13,7 +13,7 @@ }, "has_the_recipe": { "conditions": { - "recipe": "allomancy:cadmium_ingot_from_cadmium_ore_from_blasting" + "recipe": "minecraft:cadmium_ingot_from_smelting_cadmium_ore" }, "trigger": "minecraft:recipe_unlocked" } @@ -26,7 +26,7 @@ ], "rewards": { "recipes": [ - "allomancy:cadmium_ingot_from_cadmium_ore_from_blasting" + "minecraft:cadmium_ingot_from_smelting_cadmium_ore" ] } } \ No newline at end of file diff --git a/src/generated/resources/data/allomancy/advancement/recipes/misc/cadmium_ingot_from_deepslate_cadmium_ore_from_blasting.json b/src/generated/resources/data/minecraft/advancement/recipes/misc/cadmium_ingot_from_smelting_deepslate_cadmium_ore.json similarity index 77% rename from src/generated/resources/data/allomancy/advancement/recipes/misc/cadmium_ingot_from_deepslate_cadmium_ore_from_blasting.json rename to src/generated/resources/data/minecraft/advancement/recipes/misc/cadmium_ingot_from_smelting_deepslate_cadmium_ore.json index 31ce9b24..2c893038 100644 --- a/src/generated/resources/data/allomancy/advancement/recipes/misc/cadmium_ingot_from_deepslate_cadmium_ore_from_blasting.json +++ b/src/generated/resources/data/minecraft/advancement/recipes/misc/cadmium_ingot_from_smelting_deepslate_cadmium_ore.json @@ -13,7 +13,7 @@ }, "has_the_recipe": { "conditions": { - "recipe": "allomancy:cadmium_ingot_from_deepslate_cadmium_ore_from_blasting" + "recipe": "minecraft:cadmium_ingot_from_smelting_deepslate_cadmium_ore" }, "trigger": "minecraft:recipe_unlocked" } @@ -26,7 +26,7 @@ ], "rewards": { "recipes": [ - "allomancy:cadmium_ingot_from_deepslate_cadmium_ore_from_blasting" + "minecraft:cadmium_ingot_from_smelting_deepslate_cadmium_ore" ] } } \ No newline at end of file diff --git a/src/generated/resources/data/allomancy/advancement/recipes/misc/cadmium_ingot_from_raw_cadmium_from_blasting.json b/src/generated/resources/data/minecraft/advancement/recipes/misc/cadmium_ingot_from_smelting_raw_cadmium.json similarity index 78% rename from src/generated/resources/data/allomancy/advancement/recipes/misc/cadmium_ingot_from_raw_cadmium_from_blasting.json rename to src/generated/resources/data/minecraft/advancement/recipes/misc/cadmium_ingot_from_smelting_raw_cadmium.json index d26495ef..0f1273ae 100644 --- a/src/generated/resources/data/allomancy/advancement/recipes/misc/cadmium_ingot_from_raw_cadmium_from_blasting.json +++ b/src/generated/resources/data/minecraft/advancement/recipes/misc/cadmium_ingot_from_smelting_raw_cadmium.json @@ -13,7 +13,7 @@ }, "has_the_recipe": { "conditions": { - "recipe": "allomancy:cadmium_ingot_from_raw_cadmium_from_blasting" + "recipe": "minecraft:cadmium_ingot_from_smelting_raw_cadmium" }, "trigger": "minecraft:recipe_unlocked" } @@ -26,7 +26,7 @@ ], "rewards": { "recipes": [ - "allomancy:cadmium_ingot_from_raw_cadmium_from_blasting" + "minecraft:cadmium_ingot_from_smelting_raw_cadmium" ] } } \ No newline at end of file diff --git a/src/generated/resources/data/allomancy/advancement/recipes/misc/chromium_ingot_from_chromium_ore.json b/src/generated/resources/data/minecraft/advancement/recipes/misc/chromium_ingot_from_blasting_chromium_ore.json similarity index 79% rename from src/generated/resources/data/allomancy/advancement/recipes/misc/chromium_ingot_from_chromium_ore.json rename to src/generated/resources/data/minecraft/advancement/recipes/misc/chromium_ingot_from_blasting_chromium_ore.json index fac27144..6cda0ae9 100644 --- a/src/generated/resources/data/allomancy/advancement/recipes/misc/chromium_ingot_from_chromium_ore.json +++ b/src/generated/resources/data/minecraft/advancement/recipes/misc/chromium_ingot_from_blasting_chromium_ore.json @@ -13,7 +13,7 @@ }, "has_the_recipe": { "conditions": { - "recipe": "allomancy:chromium_ingot_from_chromium_ore" + "recipe": "minecraft:chromium_ingot_from_blasting_chromium_ore" }, "trigger": "minecraft:recipe_unlocked" } @@ -26,7 +26,7 @@ ], "rewards": { "recipes": [ - "allomancy:chromium_ingot_from_chromium_ore" + "minecraft:chromium_ingot_from_blasting_chromium_ore" ] } } \ No newline at end of file diff --git a/src/generated/resources/data/allomancy/advancement/recipes/misc/chromium_ingot_from_deepslate_chromium_ore.json b/src/generated/resources/data/minecraft/advancement/recipes/misc/chromium_ingot_from_blasting_deepslate_chromium_ore.json similarity index 77% rename from src/generated/resources/data/allomancy/advancement/recipes/misc/chromium_ingot_from_deepslate_chromium_ore.json rename to src/generated/resources/data/minecraft/advancement/recipes/misc/chromium_ingot_from_blasting_deepslate_chromium_ore.json index 60f7220f..52fec002 100644 --- a/src/generated/resources/data/allomancy/advancement/recipes/misc/chromium_ingot_from_deepslate_chromium_ore.json +++ b/src/generated/resources/data/minecraft/advancement/recipes/misc/chromium_ingot_from_blasting_deepslate_chromium_ore.json @@ -13,7 +13,7 @@ }, "has_the_recipe": { "conditions": { - "recipe": "allomancy:chromium_ingot_from_deepslate_chromium_ore" + "recipe": "minecraft:chromium_ingot_from_blasting_deepslate_chromium_ore" }, "trigger": "minecraft:recipe_unlocked" } @@ -26,7 +26,7 @@ ], "rewards": { "recipes": [ - "allomancy:chromium_ingot_from_deepslate_chromium_ore" + "minecraft:chromium_ingot_from_blasting_deepslate_chromium_ore" ] } } \ No newline at end of file diff --git a/src/generated/resources/data/allomancy/advancement/recipes/misc/chromium_ingot_from_raw_chromium.json b/src/generated/resources/data/minecraft/advancement/recipes/misc/chromium_ingot_from_blasting_raw_chromium.json similarity index 79% rename from src/generated/resources/data/allomancy/advancement/recipes/misc/chromium_ingot_from_raw_chromium.json rename to src/generated/resources/data/minecraft/advancement/recipes/misc/chromium_ingot_from_blasting_raw_chromium.json index 3bded0c7..413029a4 100644 --- a/src/generated/resources/data/allomancy/advancement/recipes/misc/chromium_ingot_from_raw_chromium.json +++ b/src/generated/resources/data/minecraft/advancement/recipes/misc/chromium_ingot_from_blasting_raw_chromium.json @@ -13,7 +13,7 @@ }, "has_the_recipe": { "conditions": { - "recipe": "allomancy:chromium_ingot_from_raw_chromium" + "recipe": "minecraft:chromium_ingot_from_blasting_raw_chromium" }, "trigger": "minecraft:recipe_unlocked" } @@ -26,7 +26,7 @@ ], "rewards": { "recipes": [ - "allomancy:chromium_ingot_from_raw_chromium" + "minecraft:chromium_ingot_from_blasting_raw_chromium" ] } } \ No newline at end of file diff --git a/src/generated/resources/data/allomancy/advancement/recipes/misc/chromium_ingot_from_chromium_ore_from_blasting.json b/src/generated/resources/data/minecraft/advancement/recipes/misc/chromium_ingot_from_smelting_chromium_ore.json similarity index 78% rename from src/generated/resources/data/allomancy/advancement/recipes/misc/chromium_ingot_from_chromium_ore_from_blasting.json rename to src/generated/resources/data/minecraft/advancement/recipes/misc/chromium_ingot_from_smelting_chromium_ore.json index f50666e4..b0f7d91d 100644 --- a/src/generated/resources/data/allomancy/advancement/recipes/misc/chromium_ingot_from_chromium_ore_from_blasting.json +++ b/src/generated/resources/data/minecraft/advancement/recipes/misc/chromium_ingot_from_smelting_chromium_ore.json @@ -13,7 +13,7 @@ }, "has_the_recipe": { "conditions": { - "recipe": "allomancy:chromium_ingot_from_chromium_ore_from_blasting" + "recipe": "minecraft:chromium_ingot_from_smelting_chromium_ore" }, "trigger": "minecraft:recipe_unlocked" } @@ -26,7 +26,7 @@ ], "rewards": { "recipes": [ - "allomancy:chromium_ingot_from_chromium_ore_from_blasting" + "minecraft:chromium_ingot_from_smelting_chromium_ore" ] } } \ No newline at end of file diff --git a/src/generated/resources/data/allomancy/advancement/recipes/misc/chromium_ingot_from_deepslate_chromium_ore_from_blasting.json b/src/generated/resources/data/minecraft/advancement/recipes/misc/chromium_ingot_from_smelting_deepslate_chromium_ore.json similarity index 76% rename from src/generated/resources/data/allomancy/advancement/recipes/misc/chromium_ingot_from_deepslate_chromium_ore_from_blasting.json rename to src/generated/resources/data/minecraft/advancement/recipes/misc/chromium_ingot_from_smelting_deepslate_chromium_ore.json index ef5c8a4c..85e08412 100644 --- a/src/generated/resources/data/allomancy/advancement/recipes/misc/chromium_ingot_from_deepslate_chromium_ore_from_blasting.json +++ b/src/generated/resources/data/minecraft/advancement/recipes/misc/chromium_ingot_from_smelting_deepslate_chromium_ore.json @@ -13,7 +13,7 @@ }, "has_the_recipe": { "conditions": { - "recipe": "allomancy:chromium_ingot_from_deepslate_chromium_ore_from_blasting" + "recipe": "minecraft:chromium_ingot_from_smelting_deepslate_chromium_ore" }, "trigger": "minecraft:recipe_unlocked" } @@ -26,7 +26,7 @@ ], "rewards": { "recipes": [ - "allomancy:chromium_ingot_from_deepslate_chromium_ore_from_blasting" + "minecraft:chromium_ingot_from_smelting_deepslate_chromium_ore" ] } } \ No newline at end of file diff --git a/src/generated/resources/data/allomancy/advancement/recipes/misc/chromium_ingot_from_raw_chromium_from_blasting.json b/src/generated/resources/data/minecraft/advancement/recipes/misc/chromium_ingot_from_smelting_raw_chromium.json similarity index 78% rename from src/generated/resources/data/allomancy/advancement/recipes/misc/chromium_ingot_from_raw_chromium_from_blasting.json rename to src/generated/resources/data/minecraft/advancement/recipes/misc/chromium_ingot_from_smelting_raw_chromium.json index 76e5a13a..340de049 100644 --- a/src/generated/resources/data/allomancy/advancement/recipes/misc/chromium_ingot_from_raw_chromium_from_blasting.json +++ b/src/generated/resources/data/minecraft/advancement/recipes/misc/chromium_ingot_from_smelting_raw_chromium.json @@ -13,7 +13,7 @@ }, "has_the_recipe": { "conditions": { - "recipe": "allomancy:chromium_ingot_from_raw_chromium_from_blasting" + "recipe": "minecraft:chromium_ingot_from_smelting_raw_chromium" }, "trigger": "minecraft:recipe_unlocked" } @@ -26,7 +26,7 @@ ], "rewards": { "recipes": [ - "allomancy:chromium_ingot_from_raw_chromium_from_blasting" + "minecraft:chromium_ingot_from_smelting_raw_chromium" ] } } \ No newline at end of file diff --git a/src/generated/resources/data/allomancy/advancement/recipes/misc/lead_ingot_from_deepslate_lead_ore.json b/src/generated/resources/data/minecraft/advancement/recipes/misc/lead_ingot_from_blasting_deepslate_lead_ore.json similarity index 79% rename from src/generated/resources/data/allomancy/advancement/recipes/misc/lead_ingot_from_deepslate_lead_ore.json rename to src/generated/resources/data/minecraft/advancement/recipes/misc/lead_ingot_from_blasting_deepslate_lead_ore.json index 2aa7dfd2..83bf304d 100644 --- a/src/generated/resources/data/allomancy/advancement/recipes/misc/lead_ingot_from_deepslate_lead_ore.json +++ b/src/generated/resources/data/minecraft/advancement/recipes/misc/lead_ingot_from_blasting_deepslate_lead_ore.json @@ -13,7 +13,7 @@ }, "has_the_recipe": { "conditions": { - "recipe": "allomancy:lead_ingot_from_deepslate_lead_ore" + "recipe": "minecraft:lead_ingot_from_blasting_deepslate_lead_ore" }, "trigger": "minecraft:recipe_unlocked" } @@ -26,7 +26,7 @@ ], "rewards": { "recipes": [ - "allomancy:lead_ingot_from_deepslate_lead_ore" + "minecraft:lead_ingot_from_blasting_deepslate_lead_ore" ] } } \ No newline at end of file diff --git a/src/generated/resources/data/allomancy/advancement/recipes/misc/lead_ingot_from_lead_ore.json b/src/generated/resources/data/minecraft/advancement/recipes/misc/lead_ingot_from_blasting_lead_ore.json similarity index 80% rename from src/generated/resources/data/allomancy/advancement/recipes/misc/lead_ingot_from_lead_ore.json rename to src/generated/resources/data/minecraft/advancement/recipes/misc/lead_ingot_from_blasting_lead_ore.json index 17fbf7b1..fb1b04a1 100644 --- a/src/generated/resources/data/allomancy/advancement/recipes/misc/lead_ingot_from_lead_ore.json +++ b/src/generated/resources/data/minecraft/advancement/recipes/misc/lead_ingot_from_blasting_lead_ore.json @@ -13,7 +13,7 @@ }, "has_the_recipe": { "conditions": { - "recipe": "allomancy:lead_ingot_from_lead_ore" + "recipe": "minecraft:lead_ingot_from_blasting_lead_ore" }, "trigger": "minecraft:recipe_unlocked" } @@ -26,7 +26,7 @@ ], "rewards": { "recipes": [ - "allomancy:lead_ingot_from_lead_ore" + "minecraft:lead_ingot_from_blasting_lead_ore" ] } } \ No newline at end of file diff --git a/src/generated/resources/data/allomancy/advancement/recipes/misc/lead_ingot_from_raw_lead.json b/src/generated/resources/data/minecraft/advancement/recipes/misc/lead_ingot_from_blasting_raw_lead.json similarity index 80% rename from src/generated/resources/data/allomancy/advancement/recipes/misc/lead_ingot_from_raw_lead.json rename to src/generated/resources/data/minecraft/advancement/recipes/misc/lead_ingot_from_blasting_raw_lead.json index 297cc471..7c6b7fd0 100644 --- a/src/generated/resources/data/allomancy/advancement/recipes/misc/lead_ingot_from_raw_lead.json +++ b/src/generated/resources/data/minecraft/advancement/recipes/misc/lead_ingot_from_blasting_raw_lead.json @@ -13,7 +13,7 @@ }, "has_the_recipe": { "conditions": { - "recipe": "allomancy:lead_ingot_from_raw_lead" + "recipe": "minecraft:lead_ingot_from_blasting_raw_lead" }, "trigger": "minecraft:recipe_unlocked" } @@ -26,7 +26,7 @@ ], "rewards": { "recipes": [ - "allomancy:lead_ingot_from_raw_lead" + "minecraft:lead_ingot_from_blasting_raw_lead" ] } } \ No newline at end of file diff --git a/src/generated/resources/data/allomancy/advancement/recipes/misc/lead_ingot_from_deepslate_lead_ore_from_blasting.json b/src/generated/resources/data/minecraft/advancement/recipes/misc/lead_ingot_from_smelting_deepslate_lead_ore.json similarity index 78% rename from src/generated/resources/data/allomancy/advancement/recipes/misc/lead_ingot_from_deepslate_lead_ore_from_blasting.json rename to src/generated/resources/data/minecraft/advancement/recipes/misc/lead_ingot_from_smelting_deepslate_lead_ore.json index 4b1241c0..f7d18766 100644 --- a/src/generated/resources/data/allomancy/advancement/recipes/misc/lead_ingot_from_deepslate_lead_ore_from_blasting.json +++ b/src/generated/resources/data/minecraft/advancement/recipes/misc/lead_ingot_from_smelting_deepslate_lead_ore.json @@ -13,7 +13,7 @@ }, "has_the_recipe": { "conditions": { - "recipe": "allomancy:lead_ingot_from_deepslate_lead_ore_from_blasting" + "recipe": "minecraft:lead_ingot_from_smelting_deepslate_lead_ore" }, "trigger": "minecraft:recipe_unlocked" } @@ -26,7 +26,7 @@ ], "rewards": { "recipes": [ - "allomancy:lead_ingot_from_deepslate_lead_ore_from_blasting" + "minecraft:lead_ingot_from_smelting_deepslate_lead_ore" ] } } \ No newline at end of file diff --git a/src/generated/resources/data/allomancy/advancement/recipes/misc/lead_ingot_from_lead_ore_from_blasting.json b/src/generated/resources/data/minecraft/advancement/recipes/misc/lead_ingot_from_smelting_lead_ore.json similarity index 79% rename from src/generated/resources/data/allomancy/advancement/recipes/misc/lead_ingot_from_lead_ore_from_blasting.json rename to src/generated/resources/data/minecraft/advancement/recipes/misc/lead_ingot_from_smelting_lead_ore.json index 9c42ddeb..ce19a3fe 100644 --- a/src/generated/resources/data/allomancy/advancement/recipes/misc/lead_ingot_from_lead_ore_from_blasting.json +++ b/src/generated/resources/data/minecraft/advancement/recipes/misc/lead_ingot_from_smelting_lead_ore.json @@ -13,7 +13,7 @@ }, "has_the_recipe": { "conditions": { - "recipe": "allomancy:lead_ingot_from_lead_ore_from_blasting" + "recipe": "minecraft:lead_ingot_from_smelting_lead_ore" }, "trigger": "minecraft:recipe_unlocked" } @@ -26,7 +26,7 @@ ], "rewards": { "recipes": [ - "allomancy:lead_ingot_from_lead_ore_from_blasting" + "minecraft:lead_ingot_from_smelting_lead_ore" ] } } \ No newline at end of file diff --git a/src/generated/resources/data/allomancy/advancement/recipes/misc/lead_ingot_from_raw_lead_from_blasting.json b/src/generated/resources/data/minecraft/advancement/recipes/misc/lead_ingot_from_smelting_raw_lead.json similarity index 79% rename from src/generated/resources/data/allomancy/advancement/recipes/misc/lead_ingot_from_raw_lead_from_blasting.json rename to src/generated/resources/data/minecraft/advancement/recipes/misc/lead_ingot_from_smelting_raw_lead.json index f10d02dd..b660f790 100644 --- a/src/generated/resources/data/allomancy/advancement/recipes/misc/lead_ingot_from_raw_lead_from_blasting.json +++ b/src/generated/resources/data/minecraft/advancement/recipes/misc/lead_ingot_from_smelting_raw_lead.json @@ -13,7 +13,7 @@ }, "has_the_recipe": { "conditions": { - "recipe": "allomancy:lead_ingot_from_raw_lead_from_blasting" + "recipe": "minecraft:lead_ingot_from_smelting_raw_lead" }, "trigger": "minecraft:recipe_unlocked" } @@ -26,7 +26,7 @@ ], "rewards": { "recipes": [ - "allomancy:lead_ingot_from_raw_lead_from_blasting" + "minecraft:lead_ingot_from_smelting_raw_lead" ] } } \ No newline at end of file diff --git a/src/generated/resources/data/allomancy/advancement/recipes/misc/silver_ingot_from_deepslate_silver_ore.json b/src/generated/resources/data/minecraft/advancement/recipes/misc/silver_ingot_from_blasting_deepslate_silver_ore.json similarity index 78% rename from src/generated/resources/data/allomancy/advancement/recipes/misc/silver_ingot_from_deepslate_silver_ore.json rename to src/generated/resources/data/minecraft/advancement/recipes/misc/silver_ingot_from_blasting_deepslate_silver_ore.json index bec710f1..b963e66b 100644 --- a/src/generated/resources/data/allomancy/advancement/recipes/misc/silver_ingot_from_deepslate_silver_ore.json +++ b/src/generated/resources/data/minecraft/advancement/recipes/misc/silver_ingot_from_blasting_deepslate_silver_ore.json @@ -13,7 +13,7 @@ }, "has_the_recipe": { "conditions": { - "recipe": "allomancy:silver_ingot_from_deepslate_silver_ore" + "recipe": "minecraft:silver_ingot_from_blasting_deepslate_silver_ore" }, "trigger": "minecraft:recipe_unlocked" } @@ -26,7 +26,7 @@ ], "rewards": { "recipes": [ - "allomancy:silver_ingot_from_deepslate_silver_ore" + "minecraft:silver_ingot_from_blasting_deepslate_silver_ore" ] } } \ No newline at end of file diff --git a/src/generated/resources/data/allomancy/advancement/recipes/misc/silver_ingot_from_raw_silver.json b/src/generated/resources/data/minecraft/advancement/recipes/misc/silver_ingot_from_blasting_raw_silver.json similarity index 80% rename from src/generated/resources/data/allomancy/advancement/recipes/misc/silver_ingot_from_raw_silver.json rename to src/generated/resources/data/minecraft/advancement/recipes/misc/silver_ingot_from_blasting_raw_silver.json index be13791e..e0ed0543 100644 --- a/src/generated/resources/data/allomancy/advancement/recipes/misc/silver_ingot_from_raw_silver.json +++ b/src/generated/resources/data/minecraft/advancement/recipes/misc/silver_ingot_from_blasting_raw_silver.json @@ -13,7 +13,7 @@ }, "has_the_recipe": { "conditions": { - "recipe": "allomancy:silver_ingot_from_raw_silver" + "recipe": "minecraft:silver_ingot_from_blasting_raw_silver" }, "trigger": "minecraft:recipe_unlocked" } @@ -26,7 +26,7 @@ ], "rewards": { "recipes": [ - "allomancy:silver_ingot_from_raw_silver" + "minecraft:silver_ingot_from_blasting_raw_silver" ] } } \ No newline at end of file diff --git a/src/generated/resources/data/allomancy/advancement/recipes/misc/silver_ingot_from_silver_ore.json b/src/generated/resources/data/minecraft/advancement/recipes/misc/silver_ingot_from_blasting_silver_ore.json similarity index 80% rename from src/generated/resources/data/allomancy/advancement/recipes/misc/silver_ingot_from_silver_ore.json rename to src/generated/resources/data/minecraft/advancement/recipes/misc/silver_ingot_from_blasting_silver_ore.json index 126549fc..71e79bc7 100644 --- a/src/generated/resources/data/allomancy/advancement/recipes/misc/silver_ingot_from_silver_ore.json +++ b/src/generated/resources/data/minecraft/advancement/recipes/misc/silver_ingot_from_blasting_silver_ore.json @@ -13,7 +13,7 @@ }, "has_the_recipe": { "conditions": { - "recipe": "allomancy:silver_ingot_from_silver_ore" + "recipe": "minecraft:silver_ingot_from_blasting_silver_ore" }, "trigger": "minecraft:recipe_unlocked" } @@ -26,7 +26,7 @@ ], "rewards": { "recipes": [ - "allomancy:silver_ingot_from_silver_ore" + "minecraft:silver_ingot_from_blasting_silver_ore" ] } } \ No newline at end of file diff --git a/src/generated/resources/data/allomancy/advancement/recipes/misc/silver_ingot_from_deepslate_silver_ore_from_blasting.json b/src/generated/resources/data/minecraft/advancement/recipes/misc/silver_ingot_from_smelting_deepslate_silver_ore.json similarity index 77% rename from src/generated/resources/data/allomancy/advancement/recipes/misc/silver_ingot_from_deepslate_silver_ore_from_blasting.json rename to src/generated/resources/data/minecraft/advancement/recipes/misc/silver_ingot_from_smelting_deepslate_silver_ore.json index 593d7da6..38d0727d 100644 --- a/src/generated/resources/data/allomancy/advancement/recipes/misc/silver_ingot_from_deepslate_silver_ore_from_blasting.json +++ b/src/generated/resources/data/minecraft/advancement/recipes/misc/silver_ingot_from_smelting_deepslate_silver_ore.json @@ -13,7 +13,7 @@ }, "has_the_recipe": { "conditions": { - "recipe": "allomancy:silver_ingot_from_deepslate_silver_ore_from_blasting" + "recipe": "minecraft:silver_ingot_from_smelting_deepslate_silver_ore" }, "trigger": "minecraft:recipe_unlocked" } @@ -26,7 +26,7 @@ ], "rewards": { "recipes": [ - "allomancy:silver_ingot_from_deepslate_silver_ore_from_blasting" + "minecraft:silver_ingot_from_smelting_deepslate_silver_ore" ] } } \ No newline at end of file diff --git a/src/generated/resources/data/allomancy/advancement/recipes/misc/silver_ingot_from_raw_silver_from_blasting.json b/src/generated/resources/data/minecraft/advancement/recipes/misc/silver_ingot_from_smelting_raw_silver.json similarity index 78% rename from src/generated/resources/data/allomancy/advancement/recipes/misc/silver_ingot_from_raw_silver_from_blasting.json rename to src/generated/resources/data/minecraft/advancement/recipes/misc/silver_ingot_from_smelting_raw_silver.json index 02c80ad2..8aa29034 100644 --- a/src/generated/resources/data/allomancy/advancement/recipes/misc/silver_ingot_from_raw_silver_from_blasting.json +++ b/src/generated/resources/data/minecraft/advancement/recipes/misc/silver_ingot_from_smelting_raw_silver.json @@ -13,7 +13,7 @@ }, "has_the_recipe": { "conditions": { - "recipe": "allomancy:silver_ingot_from_raw_silver_from_blasting" + "recipe": "minecraft:silver_ingot_from_smelting_raw_silver" }, "trigger": "minecraft:recipe_unlocked" } @@ -26,7 +26,7 @@ ], "rewards": { "recipes": [ - "allomancy:silver_ingot_from_raw_silver_from_blasting" + "minecraft:silver_ingot_from_smelting_raw_silver" ] } } \ No newline at end of file diff --git a/src/generated/resources/data/allomancy/advancement/recipes/misc/silver_ingot_from_silver_ore_from_blasting.json b/src/generated/resources/data/minecraft/advancement/recipes/misc/silver_ingot_from_smelting_silver_ore.json similarity index 78% rename from src/generated/resources/data/allomancy/advancement/recipes/misc/silver_ingot_from_silver_ore_from_blasting.json rename to src/generated/resources/data/minecraft/advancement/recipes/misc/silver_ingot_from_smelting_silver_ore.json index 85e527af..1c9fa549 100644 --- a/src/generated/resources/data/allomancy/advancement/recipes/misc/silver_ingot_from_silver_ore_from_blasting.json +++ b/src/generated/resources/data/minecraft/advancement/recipes/misc/silver_ingot_from_smelting_silver_ore.json @@ -13,7 +13,7 @@ }, "has_the_recipe": { "conditions": { - "recipe": "allomancy:silver_ingot_from_silver_ore_from_blasting" + "recipe": "minecraft:silver_ingot_from_smelting_silver_ore" }, "trigger": "minecraft:recipe_unlocked" } @@ -26,7 +26,7 @@ ], "rewards": { "recipes": [ - "allomancy:silver_ingot_from_silver_ore_from_blasting" + "minecraft:silver_ingot_from_smelting_silver_ore" ] } } \ No newline at end of file diff --git a/src/generated/resources/data/allomancy/advancement/recipes/misc/tin_ingot_from_deepslate_tin_ore.json b/src/generated/resources/data/minecraft/advancement/recipes/misc/tin_ingot_from_blasting_deepslate_tin_ore.json similarity index 79% rename from src/generated/resources/data/allomancy/advancement/recipes/misc/tin_ingot_from_deepslate_tin_ore.json rename to src/generated/resources/data/minecraft/advancement/recipes/misc/tin_ingot_from_blasting_deepslate_tin_ore.json index 0825dfa6..e70563a5 100644 --- a/src/generated/resources/data/allomancy/advancement/recipes/misc/tin_ingot_from_deepslate_tin_ore.json +++ b/src/generated/resources/data/minecraft/advancement/recipes/misc/tin_ingot_from_blasting_deepslate_tin_ore.json @@ -13,7 +13,7 @@ }, "has_the_recipe": { "conditions": { - "recipe": "allomancy:tin_ingot_from_deepslate_tin_ore" + "recipe": "minecraft:tin_ingot_from_blasting_deepslate_tin_ore" }, "trigger": "minecraft:recipe_unlocked" } @@ -26,7 +26,7 @@ ], "rewards": { "recipes": [ - "allomancy:tin_ingot_from_deepslate_tin_ore" + "minecraft:tin_ingot_from_blasting_deepslate_tin_ore" ] } } \ No newline at end of file diff --git a/src/generated/resources/data/allomancy/advancement/recipes/misc/tin_ingot_from_raw_tin.json b/src/generated/resources/data/minecraft/advancement/recipes/misc/tin_ingot_from_blasting_raw_tin.json similarity index 81% rename from src/generated/resources/data/allomancy/advancement/recipes/misc/tin_ingot_from_raw_tin.json rename to src/generated/resources/data/minecraft/advancement/recipes/misc/tin_ingot_from_blasting_raw_tin.json index 8ad80fa0..378c8360 100644 --- a/src/generated/resources/data/allomancy/advancement/recipes/misc/tin_ingot_from_raw_tin.json +++ b/src/generated/resources/data/minecraft/advancement/recipes/misc/tin_ingot_from_blasting_raw_tin.json @@ -13,7 +13,7 @@ }, "has_the_recipe": { "conditions": { - "recipe": "allomancy:tin_ingot_from_raw_tin" + "recipe": "minecraft:tin_ingot_from_blasting_raw_tin" }, "trigger": "minecraft:recipe_unlocked" } @@ -26,7 +26,7 @@ ], "rewards": { "recipes": [ - "allomancy:tin_ingot_from_raw_tin" + "minecraft:tin_ingot_from_blasting_raw_tin" ] } } \ No newline at end of file diff --git a/src/generated/resources/data/allomancy/advancement/recipes/misc/tin_ingot_from_tin_ore.json b/src/generated/resources/data/minecraft/advancement/recipes/misc/tin_ingot_from_blasting_tin_ore.json similarity index 81% rename from src/generated/resources/data/allomancy/advancement/recipes/misc/tin_ingot_from_tin_ore.json rename to src/generated/resources/data/minecraft/advancement/recipes/misc/tin_ingot_from_blasting_tin_ore.json index fd7a9412..969603fe 100644 --- a/src/generated/resources/data/allomancy/advancement/recipes/misc/tin_ingot_from_tin_ore.json +++ b/src/generated/resources/data/minecraft/advancement/recipes/misc/tin_ingot_from_blasting_tin_ore.json @@ -3,7 +3,7 @@ "criteria": { "has_the_recipe": { "conditions": { - "recipe": "allomancy:tin_ingot_from_tin_ore" + "recipe": "minecraft:tin_ingot_from_blasting_tin_ore" }, "trigger": "minecraft:recipe_unlocked" }, @@ -26,7 +26,7 @@ ], "rewards": { "recipes": [ - "allomancy:tin_ingot_from_tin_ore" + "minecraft:tin_ingot_from_blasting_tin_ore" ] } } \ No newline at end of file diff --git a/src/generated/resources/data/allomancy/advancement/recipes/misc/tin_ingot_from_deepslate_tin_ore_from_blasting.json b/src/generated/resources/data/minecraft/advancement/recipes/misc/tin_ingot_from_smelting_deepslate_tin_ore.json similarity index 78% rename from src/generated/resources/data/allomancy/advancement/recipes/misc/tin_ingot_from_deepslate_tin_ore_from_blasting.json rename to src/generated/resources/data/minecraft/advancement/recipes/misc/tin_ingot_from_smelting_deepslate_tin_ore.json index c02b6695..227e519c 100644 --- a/src/generated/resources/data/allomancy/advancement/recipes/misc/tin_ingot_from_deepslate_tin_ore_from_blasting.json +++ b/src/generated/resources/data/minecraft/advancement/recipes/misc/tin_ingot_from_smelting_deepslate_tin_ore.json @@ -13,7 +13,7 @@ }, "has_the_recipe": { "conditions": { - "recipe": "allomancy:tin_ingot_from_deepslate_tin_ore_from_blasting" + "recipe": "minecraft:tin_ingot_from_smelting_deepslate_tin_ore" }, "trigger": "minecraft:recipe_unlocked" } @@ -26,7 +26,7 @@ ], "rewards": { "recipes": [ - "allomancy:tin_ingot_from_deepslate_tin_ore_from_blasting" + "minecraft:tin_ingot_from_smelting_deepslate_tin_ore" ] } } \ No newline at end of file diff --git a/src/generated/resources/data/allomancy/advancement/recipes/misc/tin_ingot_from_raw_tin_from_blasting.json b/src/generated/resources/data/minecraft/advancement/recipes/misc/tin_ingot_from_smelting_raw_tin.json similarity index 80% rename from src/generated/resources/data/allomancy/advancement/recipes/misc/tin_ingot_from_raw_tin_from_blasting.json rename to src/generated/resources/data/minecraft/advancement/recipes/misc/tin_ingot_from_smelting_raw_tin.json index c2f50fc7..c72ca66d 100644 --- a/src/generated/resources/data/allomancy/advancement/recipes/misc/tin_ingot_from_raw_tin_from_blasting.json +++ b/src/generated/resources/data/minecraft/advancement/recipes/misc/tin_ingot_from_smelting_raw_tin.json @@ -13,7 +13,7 @@ }, "has_the_recipe": { "conditions": { - "recipe": "allomancy:tin_ingot_from_raw_tin_from_blasting" + "recipe": "minecraft:tin_ingot_from_smelting_raw_tin" }, "trigger": "minecraft:recipe_unlocked" } @@ -26,7 +26,7 @@ ], "rewards": { "recipes": [ - "allomancy:tin_ingot_from_raw_tin_from_blasting" + "minecraft:tin_ingot_from_smelting_raw_tin" ] } } \ No newline at end of file diff --git a/src/generated/resources/data/allomancy/advancement/recipes/misc/tin_ingot_from_tin_ore_from_blasting.json b/src/generated/resources/data/minecraft/advancement/recipes/misc/tin_ingot_from_smelting_tin_ore.json similarity index 80% rename from src/generated/resources/data/allomancy/advancement/recipes/misc/tin_ingot_from_tin_ore_from_blasting.json rename to src/generated/resources/data/minecraft/advancement/recipes/misc/tin_ingot_from_smelting_tin_ore.json index aac3e820..49ad5952 100644 --- a/src/generated/resources/data/allomancy/advancement/recipes/misc/tin_ingot_from_tin_ore_from_blasting.json +++ b/src/generated/resources/data/minecraft/advancement/recipes/misc/tin_ingot_from_smelting_tin_ore.json @@ -3,7 +3,7 @@ "criteria": { "has_the_recipe": { "conditions": { - "recipe": "allomancy:tin_ingot_from_tin_ore_from_blasting" + "recipe": "minecraft:tin_ingot_from_smelting_tin_ore" }, "trigger": "minecraft:recipe_unlocked" }, @@ -26,7 +26,7 @@ ], "rewards": { "recipes": [ - "allomancy:tin_ingot_from_tin_ore_from_blasting" + "minecraft:tin_ingot_from_smelting_tin_ore" ] } } \ No newline at end of file diff --git a/src/generated/resources/data/allomancy/advancement/recipes/misc/zinc_ingot_from_deepslate_zinc_ore.json b/src/generated/resources/data/minecraft/advancement/recipes/misc/zinc_ingot_from_blasting_deepslate_zinc_ore.json similarity index 79% rename from src/generated/resources/data/allomancy/advancement/recipes/misc/zinc_ingot_from_deepslate_zinc_ore.json rename to src/generated/resources/data/minecraft/advancement/recipes/misc/zinc_ingot_from_blasting_deepslate_zinc_ore.json index 0bb49a5c..4430cd4e 100644 --- a/src/generated/resources/data/allomancy/advancement/recipes/misc/zinc_ingot_from_deepslate_zinc_ore.json +++ b/src/generated/resources/data/minecraft/advancement/recipes/misc/zinc_ingot_from_blasting_deepslate_zinc_ore.json @@ -13,7 +13,7 @@ }, "has_the_recipe": { "conditions": { - "recipe": "allomancy:zinc_ingot_from_deepslate_zinc_ore" + "recipe": "minecraft:zinc_ingot_from_blasting_deepslate_zinc_ore" }, "trigger": "minecraft:recipe_unlocked" } @@ -26,7 +26,7 @@ ], "rewards": { "recipes": [ - "allomancy:zinc_ingot_from_deepslate_zinc_ore" + "minecraft:zinc_ingot_from_blasting_deepslate_zinc_ore" ] } } \ No newline at end of file diff --git a/src/generated/resources/data/allomancy/advancement/recipes/misc/zinc_ingot_from_raw_zinc.json b/src/generated/resources/data/minecraft/advancement/recipes/misc/zinc_ingot_from_blasting_raw_zinc.json similarity index 80% rename from src/generated/resources/data/allomancy/advancement/recipes/misc/zinc_ingot_from_raw_zinc.json rename to src/generated/resources/data/minecraft/advancement/recipes/misc/zinc_ingot_from_blasting_raw_zinc.json index 75818cb8..166024d7 100644 --- a/src/generated/resources/data/allomancy/advancement/recipes/misc/zinc_ingot_from_raw_zinc.json +++ b/src/generated/resources/data/minecraft/advancement/recipes/misc/zinc_ingot_from_blasting_raw_zinc.json @@ -13,7 +13,7 @@ }, "has_the_recipe": { "conditions": { - "recipe": "allomancy:zinc_ingot_from_raw_zinc" + "recipe": "minecraft:zinc_ingot_from_blasting_raw_zinc" }, "trigger": "minecraft:recipe_unlocked" } @@ -26,7 +26,7 @@ ], "rewards": { "recipes": [ - "allomancy:zinc_ingot_from_raw_zinc" + "minecraft:zinc_ingot_from_blasting_raw_zinc" ] } } \ No newline at end of file diff --git a/src/generated/resources/data/allomancy/advancement/recipes/misc/zinc_ingot_from_zinc_ore.json b/src/generated/resources/data/minecraft/advancement/recipes/misc/zinc_ingot_from_blasting_zinc_ore.json similarity index 80% rename from src/generated/resources/data/allomancy/advancement/recipes/misc/zinc_ingot_from_zinc_ore.json rename to src/generated/resources/data/minecraft/advancement/recipes/misc/zinc_ingot_from_blasting_zinc_ore.json index 3b59c7ce..ec398344 100644 --- a/src/generated/resources/data/allomancy/advancement/recipes/misc/zinc_ingot_from_zinc_ore.json +++ b/src/generated/resources/data/minecraft/advancement/recipes/misc/zinc_ingot_from_blasting_zinc_ore.json @@ -3,7 +3,7 @@ "criteria": { "has_the_recipe": { "conditions": { - "recipe": "allomancy:zinc_ingot_from_zinc_ore" + "recipe": "minecraft:zinc_ingot_from_blasting_zinc_ore" }, "trigger": "minecraft:recipe_unlocked" }, @@ -26,7 +26,7 @@ ], "rewards": { "recipes": [ - "allomancy:zinc_ingot_from_zinc_ore" + "minecraft:zinc_ingot_from_blasting_zinc_ore" ] } } \ No newline at end of file diff --git a/src/generated/resources/data/allomancy/advancement/recipes/misc/zinc_ingot_from_deepslate_zinc_ore_from_blasting.json b/src/generated/resources/data/minecraft/advancement/recipes/misc/zinc_ingot_from_smelting_deepslate_zinc_ore.json similarity index 78% rename from src/generated/resources/data/allomancy/advancement/recipes/misc/zinc_ingot_from_deepslate_zinc_ore_from_blasting.json rename to src/generated/resources/data/minecraft/advancement/recipes/misc/zinc_ingot_from_smelting_deepslate_zinc_ore.json index 91225391..f6889c0c 100644 --- a/src/generated/resources/data/allomancy/advancement/recipes/misc/zinc_ingot_from_deepslate_zinc_ore_from_blasting.json +++ b/src/generated/resources/data/minecraft/advancement/recipes/misc/zinc_ingot_from_smelting_deepslate_zinc_ore.json @@ -13,7 +13,7 @@ }, "has_the_recipe": { "conditions": { - "recipe": "allomancy:zinc_ingot_from_deepslate_zinc_ore_from_blasting" + "recipe": "minecraft:zinc_ingot_from_smelting_deepslate_zinc_ore" }, "trigger": "minecraft:recipe_unlocked" } @@ -26,7 +26,7 @@ ], "rewards": { "recipes": [ - "allomancy:zinc_ingot_from_deepslate_zinc_ore_from_blasting" + "minecraft:zinc_ingot_from_smelting_deepslate_zinc_ore" ] } } \ No newline at end of file diff --git a/src/generated/resources/data/allomancy/advancement/recipes/misc/zinc_ingot_from_raw_zinc_from_blasting.json b/src/generated/resources/data/minecraft/advancement/recipes/misc/zinc_ingot_from_smelting_raw_zinc.json similarity index 79% rename from src/generated/resources/data/allomancy/advancement/recipes/misc/zinc_ingot_from_raw_zinc_from_blasting.json rename to src/generated/resources/data/minecraft/advancement/recipes/misc/zinc_ingot_from_smelting_raw_zinc.json index f7cc5e02..87272276 100644 --- a/src/generated/resources/data/allomancy/advancement/recipes/misc/zinc_ingot_from_raw_zinc_from_blasting.json +++ b/src/generated/resources/data/minecraft/advancement/recipes/misc/zinc_ingot_from_smelting_raw_zinc.json @@ -13,7 +13,7 @@ }, "has_the_recipe": { "conditions": { - "recipe": "allomancy:zinc_ingot_from_raw_zinc_from_blasting" + "recipe": "minecraft:zinc_ingot_from_smelting_raw_zinc" }, "trigger": "minecraft:recipe_unlocked" } @@ -26,7 +26,7 @@ ], "rewards": { "recipes": [ - "allomancy:zinc_ingot_from_raw_zinc_from_blasting" + "minecraft:zinc_ingot_from_smelting_raw_zinc" ] } } \ No newline at end of file diff --git a/src/generated/resources/data/allomancy/advancement/recipes/misc/zinc_ingot_from_zinc_ore_from_blasting.json b/src/generated/resources/data/minecraft/advancement/recipes/misc/zinc_ingot_from_smelting_zinc_ore.json similarity index 79% rename from src/generated/resources/data/allomancy/advancement/recipes/misc/zinc_ingot_from_zinc_ore_from_blasting.json rename to src/generated/resources/data/minecraft/advancement/recipes/misc/zinc_ingot_from_smelting_zinc_ore.json index 82edaca3..bf3398e8 100644 --- a/src/generated/resources/data/allomancy/advancement/recipes/misc/zinc_ingot_from_zinc_ore_from_blasting.json +++ b/src/generated/resources/data/minecraft/advancement/recipes/misc/zinc_ingot_from_smelting_zinc_ore.json @@ -3,7 +3,7 @@ "criteria": { "has_the_recipe": { "conditions": { - "recipe": "allomancy:zinc_ingot_from_zinc_ore_from_blasting" + "recipe": "minecraft:zinc_ingot_from_smelting_zinc_ore" }, "trigger": "minecraft:recipe_unlocked" }, @@ -26,7 +26,7 @@ ], "rewards": { "recipes": [ - "allomancy:zinc_ingot_from_zinc_ore_from_blasting" + "minecraft:zinc_ingot_from_smelting_zinc_ore" ] } } \ No newline at end of file diff --git a/src/generated/resources/data/allomancy/recipe/aluminum_ingot_from_raw_aluminum_from_blasting.json b/src/generated/resources/data/minecraft/recipe/aluminum_ingot_from_blasting_aluminum_ore.json similarity index 70% rename from src/generated/resources/data/allomancy/recipe/aluminum_ingot_from_raw_aluminum_from_blasting.json rename to src/generated/resources/data/minecraft/recipe/aluminum_ingot_from_blasting_aluminum_ore.json index cdafe80e..e3a7ffed 100644 --- a/src/generated/resources/data/allomancy/recipe/aluminum_ingot_from_raw_aluminum_from_blasting.json +++ b/src/generated/resources/data/minecraft/recipe/aluminum_ingot_from_blasting_aluminum_ore.json @@ -3,9 +3,8 @@ "category": "misc", "cookingtime": 100, "experience": 0.6, - "ingredient": { - "item": "allomancy:raw_aluminum" - }, + "group": "aluminum_ingot", + "ingredient": "allomancy:aluminum_ore", "result": { "count": 1, "id": "allomancy:aluminum_ingot" diff --git a/src/generated/resources/data/allomancy/recipe/aluminum_ingot_from_deepslate_aluminum_ore_from_blasting.json b/src/generated/resources/data/minecraft/recipe/aluminum_ingot_from_blasting_deepslate_aluminum_ore.json similarity index 67% rename from src/generated/resources/data/allomancy/recipe/aluminum_ingot_from_deepslate_aluminum_ore_from_blasting.json rename to src/generated/resources/data/minecraft/recipe/aluminum_ingot_from_blasting_deepslate_aluminum_ore.json index d749dbb3..82cf928b 100644 --- a/src/generated/resources/data/allomancy/recipe/aluminum_ingot_from_deepslate_aluminum_ore_from_blasting.json +++ b/src/generated/resources/data/minecraft/recipe/aluminum_ingot_from_blasting_deepslate_aluminum_ore.json @@ -3,9 +3,8 @@ "category": "misc", "cookingtime": 100, "experience": 0.6, - "ingredient": { - "item": "allomancy:deepslate_aluminum_ore" - }, + "group": "aluminum_ingot", + "ingredient": "allomancy:deepslate_aluminum_ore", "result": { "count": 1, "id": "allomancy:aluminum_ingot" diff --git a/src/generated/resources/data/allomancy/recipe/aluminum_ingot_from_aluminum_ore_from_blasting.json b/src/generated/resources/data/minecraft/recipe/aluminum_ingot_from_blasting_raw_aluminum.json similarity index 70% rename from src/generated/resources/data/allomancy/recipe/aluminum_ingot_from_aluminum_ore_from_blasting.json rename to src/generated/resources/data/minecraft/recipe/aluminum_ingot_from_blasting_raw_aluminum.json index a40feb0b..76c63557 100644 --- a/src/generated/resources/data/allomancy/recipe/aluminum_ingot_from_aluminum_ore_from_blasting.json +++ b/src/generated/resources/data/minecraft/recipe/aluminum_ingot_from_blasting_raw_aluminum.json @@ -3,9 +3,8 @@ "category": "misc", "cookingtime": 100, "experience": 0.6, - "ingredient": { - "item": "allomancy:aluminum_ore" - }, + "group": "aluminum_ingot", + "ingredient": "allomancy:raw_aluminum", "result": { "count": 1, "id": "allomancy:aluminum_ingot" diff --git a/src/generated/resources/data/allomancy/recipe/aluminum_ingot_from_aluminum_ore.json b/src/generated/resources/data/minecraft/recipe/aluminum_ingot_from_smelting_aluminum_ore.json similarity index 70% rename from src/generated/resources/data/allomancy/recipe/aluminum_ingot_from_aluminum_ore.json rename to src/generated/resources/data/minecraft/recipe/aluminum_ingot_from_smelting_aluminum_ore.json index 81ab659e..7ad83add 100644 --- a/src/generated/resources/data/allomancy/recipe/aluminum_ingot_from_aluminum_ore.json +++ b/src/generated/resources/data/minecraft/recipe/aluminum_ingot_from_smelting_aluminum_ore.json @@ -3,9 +3,8 @@ "category": "misc", "cookingtime": 200, "experience": 0.6, - "ingredient": { - "item": "allomancy:aluminum_ore" - }, + "group": "aluminum_ingot", + "ingredient": "allomancy:aluminum_ore", "result": { "count": 1, "id": "allomancy:aluminum_ingot" diff --git a/src/generated/resources/data/allomancy/recipe/aluminum_ingot_from_deepslate_aluminum_ore.json b/src/generated/resources/data/minecraft/recipe/aluminum_ingot_from_smelting_deepslate_aluminum_ore.json similarity index 67% rename from src/generated/resources/data/allomancy/recipe/aluminum_ingot_from_deepslate_aluminum_ore.json rename to src/generated/resources/data/minecraft/recipe/aluminum_ingot_from_smelting_deepslate_aluminum_ore.json index 4b4b2894..e6193943 100644 --- a/src/generated/resources/data/allomancy/recipe/aluminum_ingot_from_deepslate_aluminum_ore.json +++ b/src/generated/resources/data/minecraft/recipe/aluminum_ingot_from_smelting_deepslate_aluminum_ore.json @@ -3,9 +3,8 @@ "category": "misc", "cookingtime": 200, "experience": 0.6, - "ingredient": { - "item": "allomancy:deepslate_aluminum_ore" - }, + "group": "aluminum_ingot", + "ingredient": "allomancy:deepslate_aluminum_ore", "result": { "count": 1, "id": "allomancy:aluminum_ingot" diff --git a/src/generated/resources/data/allomancy/recipe/aluminum_ingot_from_raw_aluminum.json b/src/generated/resources/data/minecraft/recipe/aluminum_ingot_from_smelting_raw_aluminum.json similarity index 70% rename from src/generated/resources/data/allomancy/recipe/aluminum_ingot_from_raw_aluminum.json rename to src/generated/resources/data/minecraft/recipe/aluminum_ingot_from_smelting_raw_aluminum.json index 02449321..03375247 100644 --- a/src/generated/resources/data/allomancy/recipe/aluminum_ingot_from_raw_aluminum.json +++ b/src/generated/resources/data/minecraft/recipe/aluminum_ingot_from_smelting_raw_aluminum.json @@ -3,9 +3,8 @@ "category": "misc", "cookingtime": 200, "experience": 0.6, - "ingredient": { - "item": "allomancy:raw_aluminum" - }, + "group": "aluminum_ingot", + "ingredient": "allomancy:raw_aluminum", "result": { "count": 1, "id": "allomancy:aluminum_ingot" diff --git a/src/generated/resources/data/allomancy/recipe/cadmium_ingot_from_raw_cadmium_from_blasting.json b/src/generated/resources/data/minecraft/recipe/cadmium_ingot_from_blasting_cadmium_ore.json similarity index 71% rename from src/generated/resources/data/allomancy/recipe/cadmium_ingot_from_raw_cadmium_from_blasting.json rename to src/generated/resources/data/minecraft/recipe/cadmium_ingot_from_blasting_cadmium_ore.json index c9945e4a..790c6878 100644 --- a/src/generated/resources/data/allomancy/recipe/cadmium_ingot_from_raw_cadmium_from_blasting.json +++ b/src/generated/resources/data/minecraft/recipe/cadmium_ingot_from_blasting_cadmium_ore.json @@ -3,9 +3,8 @@ "category": "misc", "cookingtime": 100, "experience": 0.7, - "ingredient": { - "item": "allomancy:raw_cadmium" - }, + "group": "cadmium_ingot", + "ingredient": "allomancy:cadmium_ore", "result": { "count": 1, "id": "allomancy:cadmium_ingot" diff --git a/src/generated/resources/data/allomancy/recipe/cadmium_ingot_from_cadmium_ore_from_blasting.json b/src/generated/resources/data/minecraft/recipe/cadmium_ingot_from_blasting_deepslate_cadmium_ore.json similarity index 68% rename from src/generated/resources/data/allomancy/recipe/cadmium_ingot_from_cadmium_ore_from_blasting.json rename to src/generated/resources/data/minecraft/recipe/cadmium_ingot_from_blasting_deepslate_cadmium_ore.json index b15ac439..9ae597ae 100644 --- a/src/generated/resources/data/allomancy/recipe/cadmium_ingot_from_cadmium_ore_from_blasting.json +++ b/src/generated/resources/data/minecraft/recipe/cadmium_ingot_from_blasting_deepslate_cadmium_ore.json @@ -3,9 +3,8 @@ "category": "misc", "cookingtime": 100, "experience": 0.7, - "ingredient": { - "item": "allomancy:cadmium_ore" - }, + "group": "cadmium_ingot", + "ingredient": "allomancy:deepslate_cadmium_ore", "result": { "count": 1, "id": "allomancy:cadmium_ingot" diff --git a/src/generated/resources/data/allomancy/recipe/cadmium_ingot_from_deepslate_cadmium_ore_from_blasting.json b/src/generated/resources/data/minecraft/recipe/cadmium_ingot_from_blasting_raw_cadmium.json similarity index 71% rename from src/generated/resources/data/allomancy/recipe/cadmium_ingot_from_deepslate_cadmium_ore_from_blasting.json rename to src/generated/resources/data/minecraft/recipe/cadmium_ingot_from_blasting_raw_cadmium.json index b83c75ea..6899a5fa 100644 --- a/src/generated/resources/data/allomancy/recipe/cadmium_ingot_from_deepslate_cadmium_ore_from_blasting.json +++ b/src/generated/resources/data/minecraft/recipe/cadmium_ingot_from_blasting_raw_cadmium.json @@ -3,9 +3,8 @@ "category": "misc", "cookingtime": 100, "experience": 0.7, - "ingredient": { - "item": "allomancy:deepslate_cadmium_ore" - }, + "group": "cadmium_ingot", + "ingredient": "allomancy:raw_cadmium", "result": { "count": 1, "id": "allomancy:cadmium_ingot" diff --git a/src/generated/resources/data/allomancy/recipe/cadmium_ingot_from_deepslate_cadmium_ore.json b/src/generated/resources/data/minecraft/recipe/cadmium_ingot_from_smelting_cadmium_ore.json similarity index 71% rename from src/generated/resources/data/allomancy/recipe/cadmium_ingot_from_deepslate_cadmium_ore.json rename to src/generated/resources/data/minecraft/recipe/cadmium_ingot_from_smelting_cadmium_ore.json index 0e565c81..85efb1b0 100644 --- a/src/generated/resources/data/allomancy/recipe/cadmium_ingot_from_deepslate_cadmium_ore.json +++ b/src/generated/resources/data/minecraft/recipe/cadmium_ingot_from_smelting_cadmium_ore.json @@ -3,9 +3,8 @@ "category": "misc", "cookingtime": 200, "experience": 0.7, - "ingredient": { - "item": "allomancy:deepslate_cadmium_ore" - }, + "group": "cadmium_ingot", + "ingredient": "allomancy:cadmium_ore", "result": { "count": 1, "id": "allomancy:cadmium_ingot" diff --git a/src/generated/resources/data/allomancy/recipe/cadmium_ingot_from_raw_cadmium.json b/src/generated/resources/data/minecraft/recipe/cadmium_ingot_from_smelting_deepslate_cadmium_ore.json similarity index 68% rename from src/generated/resources/data/allomancy/recipe/cadmium_ingot_from_raw_cadmium.json rename to src/generated/resources/data/minecraft/recipe/cadmium_ingot_from_smelting_deepslate_cadmium_ore.json index cbc1bbfd..be553668 100644 --- a/src/generated/resources/data/allomancy/recipe/cadmium_ingot_from_raw_cadmium.json +++ b/src/generated/resources/data/minecraft/recipe/cadmium_ingot_from_smelting_deepslate_cadmium_ore.json @@ -3,9 +3,8 @@ "category": "misc", "cookingtime": 200, "experience": 0.7, - "ingredient": { - "item": "allomancy:raw_cadmium" - }, + "group": "cadmium_ingot", + "ingredient": "allomancy:deepslate_cadmium_ore", "result": { "count": 1, "id": "allomancy:cadmium_ingot" diff --git a/src/generated/resources/data/allomancy/recipe/cadmium_ingot_from_cadmium_ore.json b/src/generated/resources/data/minecraft/recipe/cadmium_ingot_from_smelting_raw_cadmium.json similarity index 71% rename from src/generated/resources/data/allomancy/recipe/cadmium_ingot_from_cadmium_ore.json rename to src/generated/resources/data/minecraft/recipe/cadmium_ingot_from_smelting_raw_cadmium.json index 5236c2e3..d9ee8e5f 100644 --- a/src/generated/resources/data/allomancy/recipe/cadmium_ingot_from_cadmium_ore.json +++ b/src/generated/resources/data/minecraft/recipe/cadmium_ingot_from_smelting_raw_cadmium.json @@ -3,9 +3,8 @@ "category": "misc", "cookingtime": 200, "experience": 0.7, - "ingredient": { - "item": "allomancy:cadmium_ore" - }, + "group": "cadmium_ingot", + "ingredient": "allomancy:raw_cadmium", "result": { "count": 1, "id": "allomancy:cadmium_ingot" diff --git a/src/generated/resources/data/allomancy/recipe/chromium_ingot_from_deepslate_chromium_ore_from_blasting.json b/src/generated/resources/data/minecraft/recipe/chromium_ingot_from_blasting_chromium_ore.json similarity index 70% rename from src/generated/resources/data/allomancy/recipe/chromium_ingot_from_deepslate_chromium_ore_from_blasting.json rename to src/generated/resources/data/minecraft/recipe/chromium_ingot_from_blasting_chromium_ore.json index e44f77b6..cf11d3ca 100644 --- a/src/generated/resources/data/allomancy/recipe/chromium_ingot_from_deepslate_chromium_ore_from_blasting.json +++ b/src/generated/resources/data/minecraft/recipe/chromium_ingot_from_blasting_chromium_ore.json @@ -3,9 +3,8 @@ "category": "misc", "cookingtime": 100, "experience": 0.7, - "ingredient": { - "item": "allomancy:deepslate_chromium_ore" - }, + "group": "chromium_ingot", + "ingredient": "allomancy:chromium_ore", "result": { "count": 1, "id": "allomancy:chromium_ingot" diff --git a/src/generated/resources/data/allomancy/recipe/chromium_ingot_from_chromium_ore_from_blasting.json b/src/generated/resources/data/minecraft/recipe/chromium_ingot_from_blasting_deepslate_chromium_ore.json similarity index 67% rename from src/generated/resources/data/allomancy/recipe/chromium_ingot_from_chromium_ore_from_blasting.json rename to src/generated/resources/data/minecraft/recipe/chromium_ingot_from_blasting_deepslate_chromium_ore.json index f084095d..7a896e15 100644 --- a/src/generated/resources/data/allomancy/recipe/chromium_ingot_from_chromium_ore_from_blasting.json +++ b/src/generated/resources/data/minecraft/recipe/chromium_ingot_from_blasting_deepslate_chromium_ore.json @@ -3,9 +3,8 @@ "category": "misc", "cookingtime": 100, "experience": 0.7, - "ingredient": { - "item": "allomancy:chromium_ore" - }, + "group": "chromium_ingot", + "ingredient": "allomancy:deepslate_chromium_ore", "result": { "count": 1, "id": "allomancy:chromium_ingot" diff --git a/src/generated/resources/data/allomancy/recipe/chromium_ingot_from_raw_chromium_from_blasting.json b/src/generated/resources/data/minecraft/recipe/chromium_ingot_from_blasting_raw_chromium.json similarity index 70% rename from src/generated/resources/data/allomancy/recipe/chromium_ingot_from_raw_chromium_from_blasting.json rename to src/generated/resources/data/minecraft/recipe/chromium_ingot_from_blasting_raw_chromium.json index cf34f20f..6f921dd8 100644 --- a/src/generated/resources/data/allomancy/recipe/chromium_ingot_from_raw_chromium_from_blasting.json +++ b/src/generated/resources/data/minecraft/recipe/chromium_ingot_from_blasting_raw_chromium.json @@ -3,9 +3,8 @@ "category": "misc", "cookingtime": 100, "experience": 0.7, - "ingredient": { - "item": "allomancy:raw_chromium" - }, + "group": "chromium_ingot", + "ingredient": "allomancy:raw_chromium", "result": { "count": 1, "id": "allomancy:chromium_ingot" diff --git a/src/generated/resources/data/allomancy/recipe/chromium_ingot_from_deepslate_chromium_ore.json b/src/generated/resources/data/minecraft/recipe/chromium_ingot_from_smelting_chromium_ore.json similarity index 70% rename from src/generated/resources/data/allomancy/recipe/chromium_ingot_from_deepslate_chromium_ore.json rename to src/generated/resources/data/minecraft/recipe/chromium_ingot_from_smelting_chromium_ore.json index f8cc9479..872aeee9 100644 --- a/src/generated/resources/data/allomancy/recipe/chromium_ingot_from_deepslate_chromium_ore.json +++ b/src/generated/resources/data/minecraft/recipe/chromium_ingot_from_smelting_chromium_ore.json @@ -3,9 +3,8 @@ "category": "misc", "cookingtime": 200, "experience": 0.7, - "ingredient": { - "item": "allomancy:deepslate_chromium_ore" - }, + "group": "chromium_ingot", + "ingredient": "allomancy:chromium_ore", "result": { "count": 1, "id": "allomancy:chromium_ingot" diff --git a/src/generated/resources/data/allomancy/recipe/chromium_ingot_from_chromium_ore.json b/src/generated/resources/data/minecraft/recipe/chromium_ingot_from_smelting_deepslate_chromium_ore.json similarity index 67% rename from src/generated/resources/data/allomancy/recipe/chromium_ingot_from_chromium_ore.json rename to src/generated/resources/data/minecraft/recipe/chromium_ingot_from_smelting_deepslate_chromium_ore.json index 112d54ea..bd6a6832 100644 --- a/src/generated/resources/data/allomancy/recipe/chromium_ingot_from_chromium_ore.json +++ b/src/generated/resources/data/minecraft/recipe/chromium_ingot_from_smelting_deepslate_chromium_ore.json @@ -3,9 +3,8 @@ "category": "misc", "cookingtime": 200, "experience": 0.7, - "ingredient": { - "item": "allomancy:chromium_ore" - }, + "group": "chromium_ingot", + "ingredient": "allomancy:deepslate_chromium_ore", "result": { "count": 1, "id": "allomancy:chromium_ingot" diff --git a/src/generated/resources/data/allomancy/recipe/chromium_ingot_from_raw_chromium.json b/src/generated/resources/data/minecraft/recipe/chromium_ingot_from_smelting_raw_chromium.json similarity index 70% rename from src/generated/resources/data/allomancy/recipe/chromium_ingot_from_raw_chromium.json rename to src/generated/resources/data/minecraft/recipe/chromium_ingot_from_smelting_raw_chromium.json index 9d4d8fad..6a192ebe 100644 --- a/src/generated/resources/data/allomancy/recipe/chromium_ingot_from_raw_chromium.json +++ b/src/generated/resources/data/minecraft/recipe/chromium_ingot_from_smelting_raw_chromium.json @@ -3,9 +3,8 @@ "category": "misc", "cookingtime": 200, "experience": 0.7, - "ingredient": { - "item": "allomancy:raw_chromium" - }, + "group": "chromium_ingot", + "ingredient": "allomancy:raw_chromium", "result": { "count": 1, "id": "allomancy:chromium_ingot" diff --git a/src/generated/resources/data/allomancy/recipe/lead_ingot_from_deepslate_lead_ore_from_blasting.json b/src/generated/resources/data/minecraft/recipe/lead_ingot_from_blasting_deepslate_lead_ore.json similarity index 69% rename from src/generated/resources/data/allomancy/recipe/lead_ingot_from_deepslate_lead_ore_from_blasting.json rename to src/generated/resources/data/minecraft/recipe/lead_ingot_from_blasting_deepslate_lead_ore.json index 28fa179c..44ebf20f 100644 --- a/src/generated/resources/data/allomancy/recipe/lead_ingot_from_deepslate_lead_ore_from_blasting.json +++ b/src/generated/resources/data/minecraft/recipe/lead_ingot_from_blasting_deepslate_lead_ore.json @@ -3,9 +3,8 @@ "category": "misc", "cookingtime": 100, "experience": 0.4, - "ingredient": { - "item": "allomancy:deepslate_lead_ore" - }, + "group": "lead_ingot", + "ingredient": "allomancy:deepslate_lead_ore", "result": { "count": 1, "id": "allomancy:lead_ingot" diff --git a/src/generated/resources/data/allomancy/recipe/lead_ingot_from_lead_ore_from_blasting.json b/src/generated/resources/data/minecraft/recipe/lead_ingot_from_blasting_lead_ore.json similarity index 72% rename from src/generated/resources/data/allomancy/recipe/lead_ingot_from_lead_ore_from_blasting.json rename to src/generated/resources/data/minecraft/recipe/lead_ingot_from_blasting_lead_ore.json index ceb135de..22d05c83 100644 --- a/src/generated/resources/data/allomancy/recipe/lead_ingot_from_lead_ore_from_blasting.json +++ b/src/generated/resources/data/minecraft/recipe/lead_ingot_from_blasting_lead_ore.json @@ -3,9 +3,8 @@ "category": "misc", "cookingtime": 100, "experience": 0.4, - "ingredient": { - "item": "allomancy:lead_ore" - }, + "group": "lead_ingot", + "ingredient": "allomancy:lead_ore", "result": { "count": 1, "id": "allomancy:lead_ingot" diff --git a/src/generated/resources/data/allomancy/recipe/lead_ingot_from_raw_lead_from_blasting.json b/src/generated/resources/data/minecraft/recipe/lead_ingot_from_blasting_raw_lead.json similarity index 72% rename from src/generated/resources/data/allomancy/recipe/lead_ingot_from_raw_lead_from_blasting.json rename to src/generated/resources/data/minecraft/recipe/lead_ingot_from_blasting_raw_lead.json index 99df53e1..3f5f897d 100644 --- a/src/generated/resources/data/allomancy/recipe/lead_ingot_from_raw_lead_from_blasting.json +++ b/src/generated/resources/data/minecraft/recipe/lead_ingot_from_blasting_raw_lead.json @@ -3,9 +3,8 @@ "category": "misc", "cookingtime": 100, "experience": 0.4, - "ingredient": { - "item": "allomancy:raw_lead" - }, + "group": "lead_ingot", + "ingredient": "allomancy:raw_lead", "result": { "count": 1, "id": "allomancy:lead_ingot" diff --git a/src/generated/resources/data/allomancy/recipe/lead_ingot_from_deepslate_lead_ore.json b/src/generated/resources/data/minecraft/recipe/lead_ingot_from_smelting_deepslate_lead_ore.json similarity index 69% rename from src/generated/resources/data/allomancy/recipe/lead_ingot_from_deepslate_lead_ore.json rename to src/generated/resources/data/minecraft/recipe/lead_ingot_from_smelting_deepslate_lead_ore.json index 24b12d88..931604a7 100644 --- a/src/generated/resources/data/allomancy/recipe/lead_ingot_from_deepslate_lead_ore.json +++ b/src/generated/resources/data/minecraft/recipe/lead_ingot_from_smelting_deepslate_lead_ore.json @@ -3,9 +3,8 @@ "category": "misc", "cookingtime": 200, "experience": 0.4, - "ingredient": { - "item": "allomancy:deepslate_lead_ore" - }, + "group": "lead_ingot", + "ingredient": "allomancy:deepslate_lead_ore", "result": { "count": 1, "id": "allomancy:lead_ingot" diff --git a/src/generated/resources/data/allomancy/recipe/lead_ingot_from_raw_lead.json b/src/generated/resources/data/minecraft/recipe/lead_ingot_from_smelting_lead_ore.json similarity index 72% rename from src/generated/resources/data/allomancy/recipe/lead_ingot_from_raw_lead.json rename to src/generated/resources/data/minecraft/recipe/lead_ingot_from_smelting_lead_ore.json index d66db375..b0b9e194 100644 --- a/src/generated/resources/data/allomancy/recipe/lead_ingot_from_raw_lead.json +++ b/src/generated/resources/data/minecraft/recipe/lead_ingot_from_smelting_lead_ore.json @@ -3,9 +3,8 @@ "category": "misc", "cookingtime": 200, "experience": 0.4, - "ingredient": { - "item": "allomancy:raw_lead" - }, + "group": "lead_ingot", + "ingredient": "allomancy:lead_ore", "result": { "count": 1, "id": "allomancy:lead_ingot" diff --git a/src/generated/resources/data/allomancy/recipe/lead_ingot_from_lead_ore.json b/src/generated/resources/data/minecraft/recipe/lead_ingot_from_smelting_raw_lead.json similarity index 72% rename from src/generated/resources/data/allomancy/recipe/lead_ingot_from_lead_ore.json rename to src/generated/resources/data/minecraft/recipe/lead_ingot_from_smelting_raw_lead.json index 3fa6d427..41d95612 100644 --- a/src/generated/resources/data/allomancy/recipe/lead_ingot_from_lead_ore.json +++ b/src/generated/resources/data/minecraft/recipe/lead_ingot_from_smelting_raw_lead.json @@ -3,9 +3,8 @@ "category": "misc", "cookingtime": 200, "experience": 0.4, - "ingredient": { - "item": "allomancy:lead_ore" - }, + "group": "lead_ingot", + "ingredient": "allomancy:raw_lead", "result": { "count": 1, "id": "allomancy:lead_ingot" diff --git a/src/generated/resources/data/allomancy/recipe/silver_ingot_from_deepslate_silver_ore_from_blasting.json b/src/generated/resources/data/minecraft/recipe/silver_ingot_from_blasting_deepslate_silver_ore.json similarity index 68% rename from src/generated/resources/data/allomancy/recipe/silver_ingot_from_deepslate_silver_ore_from_blasting.json rename to src/generated/resources/data/minecraft/recipe/silver_ingot_from_blasting_deepslate_silver_ore.json index 3b64032e..16398b7b 100644 --- a/src/generated/resources/data/allomancy/recipe/silver_ingot_from_deepslate_silver_ore_from_blasting.json +++ b/src/generated/resources/data/minecraft/recipe/silver_ingot_from_blasting_deepslate_silver_ore.json @@ -3,9 +3,8 @@ "category": "misc", "cookingtime": 100, "experience": 1.0, - "ingredient": { - "item": "allomancy:deepslate_silver_ore" - }, + "group": "silver_ingot", + "ingredient": "allomancy:deepslate_silver_ore", "result": { "count": 1, "id": "allomancy:silver_ingot" diff --git a/src/generated/resources/data/allomancy/recipe/silver_ingot_from_silver_ore_from_blasting.json b/src/generated/resources/data/minecraft/recipe/silver_ingot_from_blasting_raw_silver.json similarity index 71% rename from src/generated/resources/data/allomancy/recipe/silver_ingot_from_silver_ore_from_blasting.json rename to src/generated/resources/data/minecraft/recipe/silver_ingot_from_blasting_raw_silver.json index 5fea57d3..266abe64 100644 --- a/src/generated/resources/data/allomancy/recipe/silver_ingot_from_silver_ore_from_blasting.json +++ b/src/generated/resources/data/minecraft/recipe/silver_ingot_from_blasting_raw_silver.json @@ -3,9 +3,8 @@ "category": "misc", "cookingtime": 100, "experience": 1.0, - "ingredient": { - "item": "allomancy:silver_ore" - }, + "group": "silver_ingot", + "ingredient": "allomancy:raw_silver", "result": { "count": 1, "id": "allomancy:silver_ingot" diff --git a/src/generated/resources/data/allomancy/recipe/silver_ingot_from_raw_silver_from_blasting.json b/src/generated/resources/data/minecraft/recipe/silver_ingot_from_blasting_silver_ore.json similarity index 71% rename from src/generated/resources/data/allomancy/recipe/silver_ingot_from_raw_silver_from_blasting.json rename to src/generated/resources/data/minecraft/recipe/silver_ingot_from_blasting_silver_ore.json index f911b1de..cb7e01ce 100644 --- a/src/generated/resources/data/allomancy/recipe/silver_ingot_from_raw_silver_from_blasting.json +++ b/src/generated/resources/data/minecraft/recipe/silver_ingot_from_blasting_silver_ore.json @@ -3,9 +3,8 @@ "category": "misc", "cookingtime": 100, "experience": 1.0, - "ingredient": { - "item": "allomancy:raw_silver" - }, + "group": "silver_ingot", + "ingredient": "allomancy:silver_ore", "result": { "count": 1, "id": "allomancy:silver_ingot" diff --git a/src/generated/resources/data/allomancy/recipe/silver_ingot_from_deepslate_silver_ore.json b/src/generated/resources/data/minecraft/recipe/silver_ingot_from_smelting_deepslate_silver_ore.json similarity index 68% rename from src/generated/resources/data/allomancy/recipe/silver_ingot_from_deepslate_silver_ore.json rename to src/generated/resources/data/minecraft/recipe/silver_ingot_from_smelting_deepslate_silver_ore.json index c5bffa2d..1e62a27b 100644 --- a/src/generated/resources/data/allomancy/recipe/silver_ingot_from_deepslate_silver_ore.json +++ b/src/generated/resources/data/minecraft/recipe/silver_ingot_from_smelting_deepslate_silver_ore.json @@ -3,9 +3,8 @@ "category": "misc", "cookingtime": 200, "experience": 1.0, - "ingredient": { - "item": "allomancy:deepslate_silver_ore" - }, + "group": "silver_ingot", + "ingredient": "allomancy:deepslate_silver_ore", "result": { "count": 1, "id": "allomancy:silver_ingot" diff --git a/src/generated/resources/data/allomancy/recipe/silver_ingot_from_silver_ore.json b/src/generated/resources/data/minecraft/recipe/silver_ingot_from_smelting_raw_silver.json similarity index 71% rename from src/generated/resources/data/allomancy/recipe/silver_ingot_from_silver_ore.json rename to src/generated/resources/data/minecraft/recipe/silver_ingot_from_smelting_raw_silver.json index 939c4cc2..63b86640 100644 --- a/src/generated/resources/data/allomancy/recipe/silver_ingot_from_silver_ore.json +++ b/src/generated/resources/data/minecraft/recipe/silver_ingot_from_smelting_raw_silver.json @@ -3,9 +3,8 @@ "category": "misc", "cookingtime": 200, "experience": 1.0, - "ingredient": { - "item": "allomancy:silver_ore" - }, + "group": "silver_ingot", + "ingredient": "allomancy:raw_silver", "result": { "count": 1, "id": "allomancy:silver_ingot" diff --git a/src/generated/resources/data/allomancy/recipe/silver_ingot_from_raw_silver.json b/src/generated/resources/data/minecraft/recipe/silver_ingot_from_smelting_silver_ore.json similarity index 71% rename from src/generated/resources/data/allomancy/recipe/silver_ingot_from_raw_silver.json rename to src/generated/resources/data/minecraft/recipe/silver_ingot_from_smelting_silver_ore.json index befb1b19..3ffd855a 100644 --- a/src/generated/resources/data/allomancy/recipe/silver_ingot_from_raw_silver.json +++ b/src/generated/resources/data/minecraft/recipe/silver_ingot_from_smelting_silver_ore.json @@ -3,9 +3,8 @@ "category": "misc", "cookingtime": 200, "experience": 1.0, - "ingredient": { - "item": "allomancy:raw_silver" - }, + "group": "silver_ingot", + "ingredient": "allomancy:silver_ore", "result": { "count": 1, "id": "allomancy:silver_ingot" diff --git a/src/generated/resources/data/allomancy/recipe/tin_ingot_from_deepslate_tin_ore_from_blasting.json b/src/generated/resources/data/minecraft/recipe/tin_ingot_from_blasting_deepslate_tin_ore.json similarity index 70% rename from src/generated/resources/data/allomancy/recipe/tin_ingot_from_deepslate_tin_ore_from_blasting.json rename to src/generated/resources/data/minecraft/recipe/tin_ingot_from_blasting_deepslate_tin_ore.json index 891d8457..476bd674 100644 --- a/src/generated/resources/data/allomancy/recipe/tin_ingot_from_deepslate_tin_ore_from_blasting.json +++ b/src/generated/resources/data/minecraft/recipe/tin_ingot_from_blasting_deepslate_tin_ore.json @@ -3,9 +3,8 @@ "category": "misc", "cookingtime": 100, "experience": 0.6, - "ingredient": { - "item": "allomancy:deepslate_tin_ore" - }, + "group": "tin_ingot", + "ingredient": "allomancy:deepslate_tin_ore", "result": { "count": 1, "id": "allomancy:tin_ingot" diff --git a/src/generated/resources/data/allomancy/recipe/tin_ingot_from_tin_ore_from_blasting.json b/src/generated/resources/data/minecraft/recipe/tin_ingot_from_blasting_raw_tin.json similarity index 73% rename from src/generated/resources/data/allomancy/recipe/tin_ingot_from_tin_ore_from_blasting.json rename to src/generated/resources/data/minecraft/recipe/tin_ingot_from_blasting_raw_tin.json index aa55ab73..c582d437 100644 --- a/src/generated/resources/data/allomancy/recipe/tin_ingot_from_tin_ore_from_blasting.json +++ b/src/generated/resources/data/minecraft/recipe/tin_ingot_from_blasting_raw_tin.json @@ -3,9 +3,8 @@ "category": "misc", "cookingtime": 100, "experience": 0.6, - "ingredient": { - "item": "allomancy:tin_ore" - }, + "group": "tin_ingot", + "ingredient": "allomancy:raw_tin", "result": { "count": 1, "id": "allomancy:tin_ingot" diff --git a/src/generated/resources/data/allomancy/recipe/tin_ingot_from_raw_tin_from_blasting.json b/src/generated/resources/data/minecraft/recipe/tin_ingot_from_blasting_tin_ore.json similarity index 73% rename from src/generated/resources/data/allomancy/recipe/tin_ingot_from_raw_tin_from_blasting.json rename to src/generated/resources/data/minecraft/recipe/tin_ingot_from_blasting_tin_ore.json index 5d7f6c7b..ae038937 100644 --- a/src/generated/resources/data/allomancy/recipe/tin_ingot_from_raw_tin_from_blasting.json +++ b/src/generated/resources/data/minecraft/recipe/tin_ingot_from_blasting_tin_ore.json @@ -3,9 +3,8 @@ "category": "misc", "cookingtime": 100, "experience": 0.6, - "ingredient": { - "item": "allomancy:raw_tin" - }, + "group": "tin_ingot", + "ingredient": "allomancy:tin_ore", "result": { "count": 1, "id": "allomancy:tin_ingot" diff --git a/src/generated/resources/data/allomancy/recipe/tin_ingot_from_deepslate_tin_ore.json b/src/generated/resources/data/minecraft/recipe/tin_ingot_from_smelting_deepslate_tin_ore.json similarity index 70% rename from src/generated/resources/data/allomancy/recipe/tin_ingot_from_deepslate_tin_ore.json rename to src/generated/resources/data/minecraft/recipe/tin_ingot_from_smelting_deepslate_tin_ore.json index 6414bea3..47850d50 100644 --- a/src/generated/resources/data/allomancy/recipe/tin_ingot_from_deepslate_tin_ore.json +++ b/src/generated/resources/data/minecraft/recipe/tin_ingot_from_smelting_deepslate_tin_ore.json @@ -3,9 +3,8 @@ "category": "misc", "cookingtime": 200, "experience": 0.6, - "ingredient": { - "item": "allomancy:deepslate_tin_ore" - }, + "group": "tin_ingot", + "ingredient": "allomancy:deepslate_tin_ore", "result": { "count": 1, "id": "allomancy:tin_ingot" diff --git a/src/generated/resources/data/allomancy/recipe/tin_ingot_from_tin_ore.json b/src/generated/resources/data/minecraft/recipe/tin_ingot_from_smelting_raw_tin.json similarity index 73% rename from src/generated/resources/data/allomancy/recipe/tin_ingot_from_tin_ore.json rename to src/generated/resources/data/minecraft/recipe/tin_ingot_from_smelting_raw_tin.json index 06e2d347..d72b1f22 100644 --- a/src/generated/resources/data/allomancy/recipe/tin_ingot_from_tin_ore.json +++ b/src/generated/resources/data/minecraft/recipe/tin_ingot_from_smelting_raw_tin.json @@ -3,9 +3,8 @@ "category": "misc", "cookingtime": 200, "experience": 0.6, - "ingredient": { - "item": "allomancy:tin_ore" - }, + "group": "tin_ingot", + "ingredient": "allomancy:raw_tin", "result": { "count": 1, "id": "allomancy:tin_ingot" diff --git a/src/generated/resources/data/allomancy/recipe/tin_ingot_from_raw_tin.json b/src/generated/resources/data/minecraft/recipe/tin_ingot_from_smelting_tin_ore.json similarity index 73% rename from src/generated/resources/data/allomancy/recipe/tin_ingot_from_raw_tin.json rename to src/generated/resources/data/minecraft/recipe/tin_ingot_from_smelting_tin_ore.json index 04768497..3159583b 100644 --- a/src/generated/resources/data/allomancy/recipe/tin_ingot_from_raw_tin.json +++ b/src/generated/resources/data/minecraft/recipe/tin_ingot_from_smelting_tin_ore.json @@ -3,9 +3,8 @@ "category": "misc", "cookingtime": 200, "experience": 0.6, - "ingredient": { - "item": "allomancy:raw_tin" - }, + "group": "tin_ingot", + "ingredient": "allomancy:tin_ore", "result": { "count": 1, "id": "allomancy:tin_ingot" diff --git a/src/generated/resources/data/allomancy/recipe/zinc_ingot_from_deepslate_zinc_ore_from_blasting.json b/src/generated/resources/data/minecraft/recipe/zinc_ingot_from_blasting_deepslate_zinc_ore.json similarity index 69% rename from src/generated/resources/data/allomancy/recipe/zinc_ingot_from_deepslate_zinc_ore_from_blasting.json rename to src/generated/resources/data/minecraft/recipe/zinc_ingot_from_blasting_deepslate_zinc_ore.json index 40a4d251..818b995f 100644 --- a/src/generated/resources/data/allomancy/recipe/zinc_ingot_from_deepslate_zinc_ore_from_blasting.json +++ b/src/generated/resources/data/minecraft/recipe/zinc_ingot_from_blasting_deepslate_zinc_ore.json @@ -3,9 +3,8 @@ "category": "misc", "cookingtime": 100, "experience": 0.6, - "ingredient": { - "item": "allomancy:deepslate_zinc_ore" - }, + "group": "zinc_ingot", + "ingredient": "allomancy:deepslate_zinc_ore", "result": { "count": 1, "id": "allomancy:zinc_ingot" diff --git a/src/generated/resources/data/allomancy/recipe/zinc_ingot_from_zinc_ore_from_blasting.json b/src/generated/resources/data/minecraft/recipe/zinc_ingot_from_blasting_raw_zinc.json similarity index 72% rename from src/generated/resources/data/allomancy/recipe/zinc_ingot_from_zinc_ore_from_blasting.json rename to src/generated/resources/data/minecraft/recipe/zinc_ingot_from_blasting_raw_zinc.json index 064ca3ab..1437949e 100644 --- a/src/generated/resources/data/allomancy/recipe/zinc_ingot_from_zinc_ore_from_blasting.json +++ b/src/generated/resources/data/minecraft/recipe/zinc_ingot_from_blasting_raw_zinc.json @@ -3,9 +3,8 @@ "category": "misc", "cookingtime": 100, "experience": 0.6, - "ingredient": { - "item": "allomancy:zinc_ore" - }, + "group": "zinc_ingot", + "ingredient": "allomancy:raw_zinc", "result": { "count": 1, "id": "allomancy:zinc_ingot" diff --git a/src/generated/resources/data/allomancy/recipe/zinc_ingot_from_raw_zinc_from_blasting.json b/src/generated/resources/data/minecraft/recipe/zinc_ingot_from_blasting_zinc_ore.json similarity index 72% rename from src/generated/resources/data/allomancy/recipe/zinc_ingot_from_raw_zinc_from_blasting.json rename to src/generated/resources/data/minecraft/recipe/zinc_ingot_from_blasting_zinc_ore.json index 98823242..a6b494c3 100644 --- a/src/generated/resources/data/allomancy/recipe/zinc_ingot_from_raw_zinc_from_blasting.json +++ b/src/generated/resources/data/minecraft/recipe/zinc_ingot_from_blasting_zinc_ore.json @@ -3,9 +3,8 @@ "category": "misc", "cookingtime": 100, "experience": 0.6, - "ingredient": { - "item": "allomancy:raw_zinc" - }, + "group": "zinc_ingot", + "ingredient": "allomancy:zinc_ore", "result": { "count": 1, "id": "allomancy:zinc_ingot" diff --git a/src/generated/resources/data/allomancy/recipe/zinc_ingot_from_deepslate_zinc_ore.json b/src/generated/resources/data/minecraft/recipe/zinc_ingot_from_smelting_deepslate_zinc_ore.json similarity index 69% rename from src/generated/resources/data/allomancy/recipe/zinc_ingot_from_deepslate_zinc_ore.json rename to src/generated/resources/data/minecraft/recipe/zinc_ingot_from_smelting_deepslate_zinc_ore.json index 1e135824..ca01893e 100644 --- a/src/generated/resources/data/allomancy/recipe/zinc_ingot_from_deepslate_zinc_ore.json +++ b/src/generated/resources/data/minecraft/recipe/zinc_ingot_from_smelting_deepslate_zinc_ore.json @@ -3,9 +3,8 @@ "category": "misc", "cookingtime": 200, "experience": 0.6, - "ingredient": { - "item": "allomancy:deepslate_zinc_ore" - }, + "group": "zinc_ingot", + "ingredient": "allomancy:deepslate_zinc_ore", "result": { "count": 1, "id": "allomancy:zinc_ingot" diff --git a/src/generated/resources/data/allomancy/recipe/zinc_ingot_from_zinc_ore.json b/src/generated/resources/data/minecraft/recipe/zinc_ingot_from_smelting_raw_zinc.json similarity index 72% rename from src/generated/resources/data/allomancy/recipe/zinc_ingot_from_zinc_ore.json rename to src/generated/resources/data/minecraft/recipe/zinc_ingot_from_smelting_raw_zinc.json index 65e0f831..9101f51d 100644 --- a/src/generated/resources/data/allomancy/recipe/zinc_ingot_from_zinc_ore.json +++ b/src/generated/resources/data/minecraft/recipe/zinc_ingot_from_smelting_raw_zinc.json @@ -3,9 +3,8 @@ "category": "misc", "cookingtime": 200, "experience": 0.6, - "ingredient": { - "item": "allomancy:zinc_ore" - }, + "group": "zinc_ingot", + "ingredient": "allomancy:raw_zinc", "result": { "count": 1, "id": "allomancy:zinc_ingot" diff --git a/src/generated/resources/data/allomancy/recipe/zinc_ingot_from_raw_zinc.json b/src/generated/resources/data/minecraft/recipe/zinc_ingot_from_smelting_zinc_ore.json similarity index 72% rename from src/generated/resources/data/allomancy/recipe/zinc_ingot_from_raw_zinc.json rename to src/generated/resources/data/minecraft/recipe/zinc_ingot_from_smelting_zinc_ore.json index 39254b7f..ad58922a 100644 --- a/src/generated/resources/data/allomancy/recipe/zinc_ingot_from_raw_zinc.json +++ b/src/generated/resources/data/minecraft/recipe/zinc_ingot_from_smelting_zinc_ore.json @@ -3,9 +3,8 @@ "category": "misc", "cookingtime": 200, "experience": 0.6, - "ingredient": { - "item": "allomancy:raw_zinc" - }, + "group": "zinc_ingot", + "ingredient": "allomancy:zinc_ore", "result": { "count": 1, "id": "allomancy:zinc_ingot" diff --git a/src/generated/resources/data/minecraft/tags/item/chest_armor.json b/src/generated/resources/data/minecraft/tags/item/chest_armor.json new file mode 100644 index 00000000..a2675280 --- /dev/null +++ b/src/generated/resources/data/minecraft/tags/item/chest_armor.json @@ -0,0 +1,5 @@ +{ + "values": [ + "allomancy:mistcloak" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/item/gaze_disguise_equipment.json b/src/generated/resources/data/minecraft/tags/item/gaze_disguise_equipment.json new file mode 100644 index 00000000..c377a716 --- /dev/null +++ b/src/generated/resources/data/minecraft/tags/item/gaze_disguise_equipment.json @@ -0,0 +1,5 @@ +{ + "values": [ + "allomancy:aluminum_helmet" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/item/swords.json b/src/generated/resources/data/minecraft/tags/item/swords.json index b7dbf9fa..1407bfa4 100644 --- a/src/generated/resources/data/minecraft/tags/item/swords.json +++ b/src/generated/resources/data/minecraft/tags/item/swords.json @@ -1,6 +1,5 @@ { "values": [ - "allomancy:obsidian_dagger", "allomancy:koloss_blade" ] } \ No newline at end of file diff --git a/src/main/java/com/legobmw99/allomancy/datagen/Advancements.java b/src/main/java/com/legobmw99/allomancy/datagen/Advancements.java index e2dae856..cc1a45ed 100644 --- a/src/main/java/com/legobmw99/allomancy/datagen/Advancements.java +++ b/src/main/java/com/legobmw99/allomancy/datagen/Advancements.java @@ -4,6 +4,7 @@ import com.legobmw99.allomancy.api.enums.Metal; import com.legobmw99.allomancy.modules.combat.CombatSetup; import com.legobmw99.allomancy.modules.consumables.ConsumeSetup; +import com.legobmw99.allomancy.modules.consumables.item.component.FlakeStorage; import com.legobmw99.allomancy.modules.extras.advancement.AllomanticallyActivatedBlockTrigger; import com.legobmw99.allomancy.modules.extras.advancement.MetalUsedOnEntityTrigger; import com.legobmw99.allomancy.modules.extras.advancement.MetalUsedOnPlayerTrigger; @@ -11,12 +12,11 @@ import net.minecraft.advancements.*; import net.minecraft.advancements.critereon.*; import net.minecraft.core.HolderLookup; -import net.minecraft.core.component.DataComponents; +import net.minecraft.core.registries.Registries; import net.minecraft.network.chat.Component; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.entity.EntityType; import net.minecraft.world.item.ItemStack; -import net.minecraft.world.item.component.CustomModelData; import net.minecraft.world.level.block.Blocks; import net.neoforged.neoforge.common.data.AdvancementProvider; import net.neoforged.neoforge.common.data.ExistingFileHelper; @@ -30,6 +30,8 @@ class Advancements implements AdvancementProvider.AdvancementGenerator { public void generate(HolderLookup.Provider registries, Consumer saver, ExistingFileHelper existingFileHelper) { + var getter = registries.lookupOrThrow(Registries.ITEM); + Advancement.Builder .advancement() .parent(Advancement.Builder @@ -65,12 +67,14 @@ public void generate(HolderLookup.Provider registries, Component.translatable("advancements.become_mistborn.desc"), null, AdvancementType.CHALLENGE, true, true, true) .addCriterion("lerasium_nugget", - ConsumeItemTrigger.TriggerInstance.usedItem(ConsumeSetup.LERASIUM_NUGGET.get())) + ConsumeItemTrigger.TriggerInstance.usedItem(getter, ConsumeSetup.LERASIUM_NUGGET.get())) .rewards(AdvancementRewards.Builder.experience(100)) .save(saver, "allomancy:main/become_mistborn"); ItemStack vial = new ItemStack(ConsumeSetup.VIAL.get()); - vial.set(DataComponents.CUSTOM_MODEL_DATA, new CustomModelData(1)); + var storage = new FlakeStorage.Mutable(); + storage.add(Metal.GOLD); + vial.set(ConsumeSetup.FLAKE_STORAGE.get(), storage.toImmutable()); var allMetals = Advancement.Builder .advancement() @@ -110,7 +114,8 @@ public void generate(HolderLookup.Provider registries, .equipment() .head(ItemPredicate.Builder .item() - .of(CombatSetup.ALUMINUM_HELMET)))); + .of(getter, + CombatSetup.ALUMINUM_HELMET)))); Advancement.Builder .advancement() @@ -129,7 +134,10 @@ public void generate(HolderLookup.Provider registries, .requirements(AdvancementRequirements.Strategy.OR) .save(saver, "allomancy:main/tin_foil_hat"); - var ironGolemPredicate = EntityPredicate.wrap(EntityPredicate.Builder.entity().of(EntityType.IRON_GOLEM)); + var ironGolemPredicate = EntityPredicate.wrap(EntityPredicate.Builder + .entity() + .of(registries.lookupOrThrow(Registries.ENTITY_TYPE), + EntityType.IRON_GOLEM)); Advancement.Builder .advancement() diff --git a/src/main/java/com/legobmw99/allomancy/datagen/DataGenerators.java b/src/main/java/com/legobmw99/allomancy/datagen/DataGenerators.java index 9e14603d..7af23fbb 100644 --- a/src/main/java/com/legobmw99/allomancy/datagen/DataGenerators.java +++ b/src/main/java/com/legobmw99/allomancy/datagen/DataGenerators.java @@ -4,6 +4,7 @@ import net.minecraft.core.HolderLookup; import net.minecraft.data.loot.LootTableProvider; import net.minecraft.world.level.storage.loot.parameters.LootContextParamSets; +import net.neoforged.api.distmarker.Dist; import net.neoforged.bus.api.SubscribeEvent; import net.neoforged.fml.common.EventBusSubscriber; import net.neoforged.neoforge.common.data.AdvancementProvider; @@ -14,41 +15,44 @@ import java.util.List; import java.util.concurrent.CompletableFuture; -@EventBusSubscriber(bus = EventBusSubscriber.Bus.MOD, modid = Allomancy.MODID) +@EventBusSubscriber(bus = EventBusSubscriber.Bus.MOD, modid = Allomancy.MODID, value = Dist.CLIENT) public class DataGenerators { @SubscribeEvent - public static void gatherData(final GatherDataEvent event) { + public static void gatherData(final GatherDataEvent.Client event) { var generator = event.getGenerator(); var packOutput = generator.getPackOutput(); var lookup = event.getLookupProvider(); var fileHelper = event.getExistingFileHelper(); - generator.addProvider(event.includeServer(), new Recipes(packOutput, lookup)); - generator.addProvider(event.includeServer(), new LootTableProvider(packOutput, Collections.emptySet(), - List.of(new LootTableProvider.SubProviderEntry( - BlockLootTables::new, - LootContextParamSets.BLOCK)), - lookup)); - generator.addProvider(event.includeServer(), new LootModifiers(packOutput, lookup)); + + event.addProvider(new Recipes.Runner(packOutput, lookup)); + + event.addProvider(new LootTableProvider(packOutput, Collections.emptySet(), + List.of(new LootTableProvider.SubProviderEntry(BlockLootTables::new, + LootContextParamSets.BLOCK)), + lookup)); + event.addProvider(new LootModifiers(packOutput, lookup)); BlockTags blocktags = new BlockTags(packOutput, lookup, fileHelper); - generator.addProvider(event.includeServer(), blocktags); - generator.addProvider(event.includeServer(), - new ItemTags(packOutput, lookup, blocktags.contentsGetter(), fileHelper)); - generator.addProvider(event.includeServer(), - new AdvancementProvider(packOutput, lookup, fileHelper, List.of(new Advancements()))); + event.addProvider(blocktags); + event.addProvider(new ItemTags(packOutput, lookup, blocktags.contentsGetter(), fileHelper)); + event.addProvider(new AdvancementProvider(packOutput, lookup, fileHelper, List.of(new Advancements()))); DatapackBuiltinEntriesProvider datapackProvider = new DatapackEntries(packOutput, lookup); CompletableFuture lookupProvider = datapackProvider.getRegistryProvider(); - generator.addProvider(event.includeServer(), datapackProvider); - generator.addProvider(event.includeServer(), new DamageTags(packOutput, lookupProvider, fileHelper)); - generator.addProvider(event.includeServer(), new BannerTags(packOutput, lookupProvider, fileHelper)); + event.addProvider(datapackProvider); + event.addProvider(new DamageTags(packOutput, lookupProvider, fileHelper)); + event.addProvider(new BannerTags(packOutput, lookupProvider, fileHelper)); - generator.addProvider(event.includeClient(), new Languages(packOutput)); - generator.addProvider(event.includeClient(), new BlockStates(packOutput, fileHelper)); - generator.addProvider(event.includeClient(), new ItemModels(packOutput, fileHelper)); + event.addProvider(new Languages(packOutput)); + event.addProvider(new BlockStates(packOutput, fileHelper)); + event.addProvider(new ItemModels(packOutput, fileHelper)); + event.addProvider(new EquipmentAssets(packOutput)); + // TODO client item models. None are interesting except Vial is conditional on having the component + // can also support smithing for aluminum hats + // waiting on https://github.com/neoforged/NeoForge/pull/1725 } } diff --git a/src/main/java/com/legobmw99/allomancy/datagen/EquipmentAssets.java b/src/main/java/com/legobmw99/allomancy/datagen/EquipmentAssets.java new file mode 100644 index 00000000..96812086 --- /dev/null +++ b/src/main/java/com/legobmw99/allomancy/datagen/EquipmentAssets.java @@ -0,0 +1,60 @@ +package com.legobmw99.allomancy.datagen; + +import com.legobmw99.allomancy.Allomancy; +import net.minecraft.client.resources.model.EquipmentClientInfo; +import net.minecraft.data.CachedOutput; +import net.minecraft.data.DataProvider; +import net.minecraft.data.PackOutput; +import net.minecraft.resources.ResourceLocation; + +import java.util.HashMap; +import java.util.Map; +import java.util.Optional; +import java.util.concurrent.CompletableFuture; +import java.util.function.BiConsumer; + +public class EquipmentAssets implements DataProvider { + + private final PackOutput.PathProvider path; + + public EquipmentAssets(PackOutput output) { + this.path = output.createPathProvider(PackOutput.Target.RESOURCE_PACK, "equipment"); + } + + private void add(BiConsumer registrar) { + registrar.accept(ResourceLocation.fromNamespaceAndPath(Allomancy.MODID, "wool"), + + EquipmentClientInfo + .builder() + .addLayers(EquipmentClientInfo.LayerType.HUMANOID, new EquipmentClientInfo.Layer( + ResourceLocation.fromNamespaceAndPath(Allomancy.MODID, "mistcloak"), + Optional.empty(), false)) + .build()); + + registrar.accept(ResourceLocation.fromNamespaceAndPath(Allomancy.MODID, "aluminum"), + + EquipmentClientInfo + .builder() + .addLayers(EquipmentClientInfo.LayerType.HUMANOID, new EquipmentClientInfo.Layer( + ResourceLocation.fromNamespaceAndPath(Allomancy.MODID, "aluminum"), + Optional.empty(), false)) + .build()); + } + + @Override + public CompletableFuture run(CachedOutput cache) { + Map map = new HashMap<>(); + this.add((name, model) -> { + if (map.putIfAbsent(name, model) != null) { + throw new IllegalStateException("Tried to register equipment model twice for id: " + name); + } + }); + return DataProvider.saveAll(cache, EquipmentClientInfo.CODEC, this.path, map); + } + + + @Override + public String getName() { + return "Allomancy equipment"; + } +} diff --git a/src/main/java/com/legobmw99/allomancy/datagen/ItemModels.java b/src/main/java/com/legobmw99/allomancy/datagen/ItemModels.java index a037578a..c98cf37a 100644 --- a/src/main/java/com/legobmw99/allomancy/datagen/ItemModels.java +++ b/src/main/java/com/legobmw99/allomancy/datagen/ItemModels.java @@ -75,17 +75,11 @@ protected void registerModels() { } Allomancy.LOGGER.debug("Creating Item Model for allomancy:vial (filled)"); - var mf = getBuilder("vial_filled") + getBuilder("vial_filled") .parent(getExistingFile(mcLoc("item/generated"))) .texture("layer0", modLoc("item/full_vial")); Allomancy.LOGGER.debug("Creating Item Model for allomancy:vial"); - getBuilder("vial") - .parent(getExistingFile(mcLoc("item/generated"))) - .texture("layer0", modLoc("item/vial")) - .override() - .predicate(mcLoc("custom_model_data"), 1) - .model(mf) - .end(); + getBuilder("vial").parent(getExistingFile(mcLoc("item/generated"))).texture("layer0", modLoc("item/vial")); } diff --git a/src/main/java/com/legobmw99/allomancy/datagen/ItemTags.java b/src/main/java/com/legobmw99/allomancy/datagen/ItemTags.java index ead67687..0f21b062 100644 --- a/src/main/java/com/legobmw99/allomancy/datagen/ItemTags.java +++ b/src/main/java/com/legobmw99/allomancy/datagen/ItemTags.java @@ -3,6 +3,7 @@ import com.legobmw99.allomancy.Allomancy; import com.legobmw99.allomancy.api.enums.Metal; import com.legobmw99.allomancy.modules.combat.CombatSetup; +import com.legobmw99.allomancy.modules.combat.item.ObsidianDaggerItem; import com.legobmw99.allomancy.modules.materials.MaterialsSetup; import net.minecraft.core.HolderLookup; import net.minecraft.data.PackOutput; @@ -11,6 +12,7 @@ import net.minecraft.resources.ResourceKey; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.item.Item; +import net.minecraft.world.item.Items; import net.minecraft.world.level.block.Block; import net.neoforged.neoforge.common.data.ExistingFileHelper; @@ -78,10 +80,18 @@ protected void addTags(HolderLookup.Provider pProvider) { addCommonTag("raw_materials/" + MaterialsSetup.ORE_METALS[i], raw); } - tag(net.minecraft.tags.ItemTags.SWORDS) + tag(net.minecraft.tags.ItemTags.SWORDS).replace(false).add(CombatSetup.KOLOSS_BLADE.get()); + + tag(net.minecraft.tags.ItemTags.CHEST_ARMOR).replace(false).add(CombatSetup.MISTCLOAK.get()); + + tag(CombatSetup.REPAIRS_MISTCLOAK).add(Items.GRAY_WOOL); + tag(ObsidianDaggerItem.OBSIDIAN_REPAIR).add(Items.OBSIDIAN).add(Items.CRYING_OBSIDIAN); + tag(CombatSetup.REPAIRS_ALUMINUM).addTag( + net.minecraft.tags.ItemTags.create(ResourceLocation.fromNamespaceAndPath("c", "ingots/aluminum"))); + + tag(net.minecraft.tags.ItemTags.GAZE_DISGUISE_EQUIPMENT) .replace(false) - .add(CombatSetup.OBSIDIAN_DAGGER.get()) - .add(CombatSetup.KOLOSS_BLADE.get()); + .add(CombatSetup.ALUMINUM_HELMET.get()); } @SafeVarargs diff --git a/src/main/java/com/legobmw99/allomancy/datagen/Languages.java b/src/main/java/com/legobmw99/allomancy/datagen/Languages.java index a44fce14..807e88b5 100644 --- a/src/main/java/com/legobmw99/allomancy/datagen/Languages.java +++ b/src/main/java/com/legobmw99/allomancy/datagen/Languages.java @@ -79,8 +79,7 @@ protected void addTranslations() { add("key.metals." + mt.getName(), "Toggle " + getDisplayName(mt)); add(MaterialsSetup.FLAKES.get(mt.getIndex()).get(), getDisplayName(mt) + " Flakes"); - add(ExtrasSetup.PATTERN_ITEMS.get(mt.getIndex()).get(), "Banner Pattern"); - add("item.allomancy." + mt.getName() + "_pattern.desc", getDisplayName(mt) + " Symbol"); + add(ExtrasSetup.PATTERN_ITEMS.get(mt.getIndex()).get(), getDisplayName(mt) + " Banner Pattern"); if (mt.isVanilla()) { continue; diff --git a/src/main/java/com/legobmw99/allomancy/datagen/Recipes.java b/src/main/java/com/legobmw99/allomancy/datagen/Recipes.java index b39700ea..8bc5219e 100644 --- a/src/main/java/com/legobmw99/allomancy/datagen/Recipes.java +++ b/src/main/java/com/legobmw99/allomancy/datagen/Recipes.java @@ -8,8 +8,10 @@ import com.legobmw99.allomancy.modules.extras.ExtrasSetup; import com.legobmw99.allomancy.modules.materials.MaterialsSetup; import net.minecraft.advancements.critereon.InventoryChangeTrigger; +import net.minecraft.core.HolderGetter; import net.minecraft.core.HolderLookup; import net.minecraft.core.registries.BuiltInRegistries; +import net.minecraft.core.registries.Registries; import net.minecraft.data.PackOutput; import net.minecraft.data.recipes.*; import net.minecraft.resources.ResourceLocation; @@ -21,18 +23,18 @@ import net.minecraft.world.level.ItemLike; import net.neoforged.neoforge.common.Tags; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Map; -import java.util.Set; +import java.util.*; import java.util.concurrent.CompletableFuture; -class Recipes extends RecipeProvider { - +final class Recipes extends RecipeProvider { private final Map defaultIngredients = new HashMap<>(); - Recipes(PackOutput packOutput, CompletableFuture lookupProvider) { - super(packOutput, lookupProvider); + private final HolderGetter items; + + private Recipes(HolderLookup.Provider registries, RecipeOutput output) { + super(registries, output); + this.items = registries.lookupOrThrow(Registries.ITEM); + add('i', Tags.Items.INGOTS_IRON); add('g', Tags.Items.INGOTS_GOLD); add('s', Items.STICK); @@ -47,26 +49,26 @@ class Recipes extends RecipeProvider { } - private static void buildShapeless(RecipeOutput consumer, - RecipeCategory cat, - ItemLike result, - int count, - Item criterion, - Ingredient... ingredients) { + private void buildShapeless(RecipeOutput consumer, + RecipeCategory cat, + ItemLike result, + int count, + Item criterion, + Ingredient... ingredients) { buildShapeless(consumer, cat, result, count, criterion, "", ingredients); } - private static void buildShapeless(RecipeOutput consumer, - RecipeCategory cat, - ItemLike result, - int count, - Item criterion, - String save, - Ingredient... ingredients) { + private void buildShapeless(RecipeOutput consumer, + RecipeCategory cat, + ItemLike result, + int count, + Item criterion, + String save, + Ingredient... ingredients) { Allomancy.LOGGER.debug("Creating Shapeless Recipe for {}", BuiltInRegistries.ITEM.getKey(result.asItem()) + " " + save); - ShapelessRecipeBuilder builder = ShapelessRecipeBuilder.shapeless(cat, result, count); + ShapelessRecipeBuilder builder = ShapelessRecipeBuilder.shapeless(this.items, cat, result, count); builder.unlockedBy("has_" + BuiltInRegistries.ITEM.getKey(criterion).getPath(), InventoryChangeTrigger.TriggerInstance.hasItems(criterion)); @@ -82,29 +84,12 @@ private static void buildShapeless(RecipeOutput consumer, } } - private static void buildSmeltingAndBlasting(RecipeOutput consumer, - ItemLike result, - ItemLike ingredient, - float xp) { - Allomancy.LOGGER.debug("Creating Smelting and Blasting Recipe for {}", - BuiltInRegistries.ITEM.getKey(result.asItem())); - - SimpleCookingRecipeBuilder smelt = - SimpleCookingRecipeBuilder.smelting(ing(ingredient), RecipeCategory.MISC, result, xp, 200); - SimpleCookingRecipeBuilder blast = - SimpleCookingRecipeBuilder.blasting(ing(ingredient), RecipeCategory.MISC, result, xp, 100); - - smelt.unlockedBy("has_" + BuiltInRegistries.ITEM.getKey(ingredient.asItem()).getPath(), - InventoryChangeTrigger.TriggerInstance.hasItems(ingredient)); - blast.unlockedBy("has_" + BuiltInRegistries.ITEM.getKey(ingredient.asItem()).getPath(), - InventoryChangeTrigger.TriggerInstance.hasItems(ingredient)); - - var name = BuiltInRegistries.ITEM.getKey(result.asItem()) + "_from_" + - BuiltInRegistries.ITEM.getKey(ingredient.asItem()).getPath(); - - smelt.save(consumer, name); - blast.save(consumer, name + "_from_blasting"); + private void buildSmeltingAndBlasting(ItemLike result, List ingredient, float xp) { + String name = BuiltInRegistries.ITEM.getKey(result.asItem()).getPath(); + Allomancy.LOGGER.debug("Creating Smelting and Blasting Recipe for {}", name); + this.oreBlasting(ingredient, RecipeCategory.MISC, result, xp, 100, name); + this.oreSmelting(ingredient, RecipeCategory.MISC, result, xp, 200, name); } private static String mixing_save(String metal) { @@ -115,12 +100,12 @@ private static String alloy_save(String metal) { return metal + "_ingot_from_alloying"; } - private static Ingredient ing(String tag) { - return Ingredient.of(ItemTags.create(ResourceLocation.parse(tag))); + private Ingredient ing(String tag) { + return tag(ItemTags.create(ResourceLocation.parse(tag))); } - private static Ingredient ing(TagKey tag) { - return Ingredient.of(tag); + private Ingredient ing(TagKey tag) { + return tag(tag); } private static Ingredient ing(ItemLike itemProvider) { @@ -146,8 +131,8 @@ private static Ingredient[] repeatWith(Ingredient ing, int n, Ingredient... extr } @Override - protected void buildRecipes(RecipeOutput consumer) { - + protected void buildRecipes() { + var consumer = this.output; // Basic Shaped Recipes buildShaped(consumer, RecipeCategory.REDSTONE, ExtrasSetup.IRON_LEVER.get(), Items.IRON_INGOT, "s", "I"); buildShaped(consumer, RecipeCategory.REDSTONE, ExtrasSetup.IRON_BUTTON.get(), Items.IRON_INGOT, "i", "I"); @@ -161,6 +146,7 @@ protected void buildRecipes(RecipeOutput consumer) { buildShaped(consumer, RecipeCategory.FOOD, ConsumeSetup.ALLOMANTIC_GRINDER.get(), Items.IRON_INGOT, "ggg", "iii", "ggg"); + buildShaped(consumer, RecipeCategory.FOOD, ConsumeSetup.VIAL.get(), 4, Items.GLASS, " S ", "G G", " G "); buildShaped(consumer, RecipeCategory.COMBAT, CombatSetup.MISTCLOAK.get(), ConsumeSetup.VIAL.get(), "W W", "WWW", "WWW"); @@ -183,9 +169,7 @@ protected void buildRecipes(RecipeOutput consumer) { var ore = MaterialsSetup.ORE_BLOCKS_ITEMS.get(i).get(); var deep_ore = MaterialsSetup.DEEPSLATE_ORE_BLOCKS_ITEMS.get(i).get(); var ingot = MaterialsSetup.INGOTS.get(ore_metal_indexes[i]).get(); - buildSmeltingAndBlasting(consumer, ingot, raw, ore_metal_xp[i]); - buildSmeltingAndBlasting(consumer, ingot, ore, ore_metal_xp[i]); - buildSmeltingAndBlasting(consumer, ingot, deep_ore, ore_metal_xp[i]); + buildSmeltingAndBlasting(ingot, List.of(raw, ore, deep_ore), ore_metal_xp[i]); } @@ -308,7 +292,8 @@ protected void buildRecipes(RecipeOutput consumer) { Allomancy.LOGGER.debug("Creating Shaped Recipe for allomancy:coin_bag"); ShapedRecipeBuilder - .shaped(RecipeCategory.COMBAT, CombatSetup.COIN_BAG.get()) + .shaped(this.registries.lookupOrThrow(Registries.ITEM), RecipeCategory.COMBAT, + CombatSetup.COIN_BAG.get()) .unlockedBy("has_gold_nugget", InventoryChangeTrigger.TriggerInstance.hasItems(Items.GOLD_NUGGET)) .showNotification(true) .define('#', Items.LEAD) @@ -332,7 +317,8 @@ private void buildShaped(RecipeOutput consumer, String... lines) { Allomancy.LOGGER.debug("Creating Shaped Recipe for {}", BuiltInRegistries.ITEM.getKey(result.asItem())); - ShapedRecipeBuilder builder = ShapedRecipeBuilder.shaped(cat, result, count); + ShapedRecipeBuilder builder = + ShapedRecipeBuilder.shaped(this.registries.lookupOrThrow(Registries.ITEM), cat, result, count); builder.unlockedBy("has_" + BuiltInRegistries.ITEM.getKey(criterion).getPath(), InventoryChangeTrigger.TriggerInstance.hasItems(criterion)); @@ -362,7 +348,7 @@ private void buildShaped(RecipeOutput consumer, } private void add(char c, TagKey itemTag) { - this.defaultIngredients.put(c, Ingredient.of(itemTag)); + this.defaultIngredients.put(c, tag(itemTag)); } private void add(char c, ItemLike itemProvider) { @@ -373,5 +359,19 @@ private void add(char c, Ingredient ingredient) { this.defaultIngredients.put(c, ingredient); } + public static class Runner extends RecipeProvider.Runner { + public Runner(PackOutput out, CompletableFuture lookup) { + super(out, lookup); + } + @Override + protected RecipeProvider createRecipeProvider(HolderLookup.Provider registries, RecipeOutput output) { + return new Recipes(registries, output); + } + + @Override + public String getName() { + return "Allomancy recipes"; + } + } } diff --git a/src/main/java/com/legobmw99/allomancy/modules/combat/CombatSetup.java b/src/main/java/com/legobmw99/allomancy/modules/combat/CombatSetup.java index 63456620..0835368b 100644 --- a/src/main/java/com/legobmw99/allomancy/modules/combat/CombatSetup.java +++ b/src/main/java/com/legobmw99/allomancy/modules/combat/CombatSetup.java @@ -1,17 +1,17 @@ package com.legobmw99.allomancy.modules.combat; import com.legobmw99.allomancy.Allomancy; -import com.legobmw99.allomancy.api.enums.Metal; import com.legobmw99.allomancy.modules.combat.entity.ProjectileNuggetEntity; import com.legobmw99.allomancy.modules.combat.item.CoinBagItem; import com.legobmw99.allomancy.modules.combat.item.KolossBladeItem; import com.legobmw99.allomancy.modules.combat.item.ObsidianDaggerItem; -import com.legobmw99.allomancy.modules.materials.MaterialsSetup; import net.minecraft.Util; +import net.minecraft.core.component.DataComponents; import net.minecraft.core.registries.Registries; import net.minecraft.resources.ResourceKey; import net.minecraft.resources.ResourceLocation; import net.minecraft.sounds.SoundEvents; +import net.minecraft.tags.ItemTags; import net.minecraft.tags.TagKey; import net.minecraft.world.damagesource.DamageType; import net.minecraft.world.entity.EntityType; @@ -19,19 +19,17 @@ import net.minecraft.world.entity.MobCategory; import net.minecraft.world.entity.ai.attributes.AttributeModifier; import net.minecraft.world.entity.ai.attributes.Attributes; -import net.minecraft.world.item.ArmorItem; -import net.minecraft.world.item.ArmorMaterial; import net.minecraft.world.item.Item; -import net.minecraft.world.item.Items; +import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.component.ItemAttributeModifiers; -import net.minecraft.world.item.crafting.Ingredient; +import net.minecraft.world.item.equipment.ArmorMaterial; +import net.minecraft.world.item.equipment.ArmorType; +import net.minecraft.world.item.equipment.EquipmentAssets; import net.neoforged.bus.api.IEventBus; -import net.neoforged.neoforge.registries.DeferredHolder; import net.neoforged.neoforge.registries.DeferredItem; import net.neoforged.neoforge.registries.DeferredRegister; import java.util.EnumMap; -import java.util.List; import java.util.function.Supplier; public final class CombatSetup { @@ -46,62 +44,70 @@ public final class CombatSetup { public static final ResourceKey COIN_DAMAGE = ResourceKey.create(Registries.DAMAGE_TYPE, ResourceLocation.fromNamespaceAndPath( Allomancy.MODID, "coin")); - public static final DeferredItem COIN_BAG = ITEMS.register("coin_bag", CoinBagItem::new); + public static final DeferredItem COIN_BAG = ITEMS.registerItem("coin_bag", CoinBagItem::new); public static final DeferredItem OBSIDIAN_DAGGER = - ITEMS.register("obsidian_dagger", ObsidianDaggerItem::new); + ITEMS.registerItem("obsidian_dagger", ObsidianDaggerItem::new); public static final DeferredItem KOLOSS_BLADE = - ITEMS.register("koloss_blade", KolossBladeItem::new); - private static final DeferredRegister ARMOR_MATERIALS = - DeferredRegister.create(Registries.ARMOR_MATERIAL, Allomancy.MODID); - - private static final DeferredHolder WOOL_ARMOR = - - ARMOR_MATERIALS.register("wool", - () -> new ArmorMaterial(Util.make(new EnumMap<>(ArmorItem.Type.class), map -> { - map.put(ArmorItem.Type.BOOTS, 0); - map.put(ArmorItem.Type.LEGGINGS, 0); - map.put(ArmorItem.Type.CHESTPLATE, 4); - map.put(ArmorItem.Type.HELMET, 0); - map.put(ArmorItem.Type.BODY, 0); - }), 15, SoundEvents.ARMOR_EQUIP_LEATHER, () -> Ingredient.of(Items.GRAY_WOOL), - List.of(new ArmorMaterial.Layer( - ResourceLocation.fromNamespaceAndPath( - Allomancy.MODID, "wool"))), 0, 0)); - - private static final DeferredHolder ALUMINUM_ARMOR = - ARMOR_MATERIALS.register("aluminum", - () -> new ArmorMaterial(Util.make(new EnumMap<>(ArmorItem.Type.class), map -> { - map.put(ArmorItem.Type.BOOTS, 0); - map.put(ArmorItem.Type.LEGGINGS, 0); - map.put(ArmorItem.Type.CHESTPLATE, 0); - map.put(ArmorItem.Type.HELMET, 2); - map.put(ArmorItem.Type.BODY, 0); - }), 0, SoundEvents.ARMOR_EQUIP_IRON, () -> Ingredient.of( - MaterialsSetup.INGOTS.get(Metal.ALUMINUM.getIndex())), - List.of(new ArmorMaterial.Layer( - ResourceLocation.fromNamespaceAndPath( - Allomancy.MODID, "aluminum"))), 0, 0)); - - - private static final Item.Properties MISTCLOAK_PROPS = - - new Item.Properties().attributes(ItemAttributeModifiers - .builder() - .add(Attributes.MOVEMENT_SPEED, new AttributeModifier( - ResourceLocation.fromNamespaceAndPath(Allomancy.MODID, - "mistcloak_speed"), - 0.25, - AttributeModifier.Operation.ADD_MULTIPLIED_TOTAL), - EquipmentSlotGroup.CHEST) - .build()); - - public static final DeferredItem MISTCLOAK = - ITEMS.register("mistcloak", () -> new ArmorItem(WOOL_ARMOR, ArmorItem.Type.CHESTPLATE, MISTCLOAK_PROPS)); - - public static final DeferredItem ALUMINUM_HELMET = ITEMS.register("aluminum_helmet", - () -> new ArmorItem(ALUMINUM_ARMOR, - ArmorItem.Type.HELMET, - new Item.Properties())); + ITEMS.registerItem("koloss_blade", KolossBladeItem::new); + + public static TagKey REPAIRS_MISTCLOAK = + ItemTags.create(ResourceLocation.fromNamespaceAndPath(Allomancy.MODID, "repairs_wool_armor")); + + private static final ArmorMaterial WOOL_ARMOR = + new ArmorMaterial(5, Util.make(new EnumMap<>(ArmorType.class), map -> { + map.put(ArmorType.BOOTS, 0); + map.put(ArmorType.LEGGINGS, 0); + map.put(ArmorType.CHESTPLATE, 4); + map.put(ArmorType.HELMET, 0); + map.put(ArmorType.BODY, 0); + }), 15, SoundEvents.ARMOR_EQUIP_LEATHER, 0.0f, 0.0f, REPAIRS_MISTCLOAK, + ResourceKey.create(EquipmentAssets.ROOT_ID, + ResourceLocation.fromNamespaceAndPath(Allomancy.MODID, "wool"))); + + + public static TagKey REPAIRS_ALUMINUM = + ItemTags.create(ResourceLocation.fromNamespaceAndPath(Allomancy.MODID, "repairs_aluminum_armor")); + + private static final ArmorMaterial ALUMINUM_ARMOR = + new ArmorMaterial(15, Util.make(new EnumMap<>(ArmorType.class), map -> { + map.put(ArmorType.BOOTS, 0); + map.put(ArmorType.LEGGINGS, 0); + map.put(ArmorType.CHESTPLATE, 0); + map.put(ArmorType.HELMET, 2); + map.put(ArmorType.BODY, 0); + }), 1, SoundEvents.ARMOR_EQUIP_IRON, 0.0F, 0.0F, REPAIRS_ALUMINUM, + ResourceKey.create(EquipmentAssets.ROOT_ID, + ResourceLocation.fromNamespaceAndPath(Allomancy.MODID, "aluminum"))); + + + public static final DeferredItem MISTCLOAK = + + ITEMS.registerItem("mistcloak", (props) -> + + new Item(WOOL_ARMOR.humanoidProperties(props, ArmorType.CHESTPLATE) + // note: overrides normal armor, which is fine + .attributes(ItemAttributeModifiers + .builder() + .add(Attributes.MOVEMENT_SPEED, new AttributeModifier( + ResourceLocation.fromNamespaceAndPath( + Allomancy.MODID, "mistcloak_speed") + , 0.25, + AttributeModifier.Operation.ADD_MULTIPLIED_TOTAL), + EquipmentSlotGroup.CHEST) + .build()))); + + public static final DeferredItem ALUMINUM_HELMET = + + ITEMS.registerItem("aluminum_helmet", (props) -> new Item(ALUMINUM_ARMOR + .humanoidProperties(props, + ArmorType.HELMET) + .component(DataComponents.ENCHANTABLE, + null)) { + @Override + public boolean isBookEnchantable(ItemStack stack, ItemStack book) { + return false; + } + }); public static final Supplier> NUGGET_PROJECTILE = @@ -110,12 +116,13 @@ public final class CombatSetup { .setShouldReceiveVelocityUpdates(true) .setUpdateInterval(20) .sized(0.25F, 0.25F) - .build("nugget_projectile")); + .build(ResourceKey.create(Registries.ENTITY_TYPE, + ResourceLocation.fromNamespaceAndPath(Allomancy.MODID, + "nugget_projectile")))); private CombatSetup() {} public static void register(IEventBus bus) { - ARMOR_MATERIALS.register(bus); ENTITIES.register(bus); ITEMS.register(bus); } diff --git a/src/main/java/com/legobmw99/allomancy/modules/combat/entity/ProjectileNuggetEntity.java b/src/main/java/com/legobmw99/allomancy/modules/combat/entity/ProjectileNuggetEntity.java index 0acb81b7..3fd8ba57 100644 --- a/src/main/java/com/legobmw99/allomancy/modules/combat/entity/ProjectileNuggetEntity.java +++ b/src/main/java/com/legobmw99/allomancy/modules/combat/entity/ProjectileNuggetEntity.java @@ -5,6 +5,7 @@ import net.minecraft.network.syncher.EntityDataAccessor; import net.minecraft.network.syncher.EntityDataSerializers; import net.minecraft.network.syncher.SynchedEntityData; +import net.minecraft.server.level.ServerLevel; import net.minecraft.world.damagesource.DamageSource; import net.minecraft.world.entity.EntityType; import net.minecraft.world.entity.LivingEntity; @@ -29,11 +30,9 @@ public class ProjectileNuggetEntity extends ThrowableItemProjectile implements I public ProjectileNuggetEntity(LivingEntity livingEntityIn, Level worldIn, ItemStack itemIn, float damageIn) { - super(CombatSetup.NUGGET_PROJECTILE.get(), livingEntityIn, worldIn); - if (livingEntityIn instanceof Player player) { - if (player.getAbilities().instabuild) { - this.dropItem = false; - } + super(CombatSetup.NUGGET_PROJECTILE.get(), livingEntityIn, worldIn, itemIn); + if (livingEntityIn instanceof Player player && player.getAbilities().instabuild) { + this.dropItem = false; } if (!itemIn.isEmpty()) { this.entityData.set(ITEM, itemIn.copy()); @@ -62,20 +61,19 @@ protected void onHit(HitResult rayTraceResult) { } if (rayTraceResult.getType() == HitResult.Type.ENTITY) { - ((EntityHitResult) rayTraceResult).getEntity().hurt(this.makeDamage(), this.damage); + ((EntityHitResult) rayTraceResult).getEntity().hurtOrSimulate(this.makeDamage(), this.damage); } - if (!this.level().isClientSide) { + if (this.level() instanceof ServerLevel level) { ItemStack ammo = new ItemStack(this.entityData.get(ITEM).getItem(), 1); - if (this.level().getGameRules().getBoolean(GameRules.RULE_DOBLOCKDROPS) && + if (level.getGameRules().getBoolean(GameRules.RULE_DOBLOCKDROPS) && rayTraceResult.getType() != HitResult.Type.ENTITY && this.dropItem) { - this - .level() - .addFreshEntity(new ItemEntity(this.level(), this.position().x(), this.position().y(), - this.position().z(), ammo)); + level.addFreshEntity( + new ItemEntity(this.level(), this.position().x(), this.position().y(), this.position().z(), + ammo)); } - this.kill(); + this.kill(level); } } @@ -83,8 +81,8 @@ private DamageSource makeDamage() { return new DamageSource(this .level() .registryAccess() - .registryOrThrow(Registries.DAMAGE_TYPE) - .getHolderOrThrow(CombatSetup.COIN_DAMAGE), this, this.getOwner()); + .lookupOrThrow(Registries.DAMAGE_TYPE) + .getOrThrow(CombatSetup.COIN_DAMAGE), this, this.getOwner()); } public ItemStack getItem() { diff --git a/src/main/java/com/legobmw99/allomancy/modules/combat/item/CoinBagItem.java b/src/main/java/com/legobmw99/allomancy/modules/combat/item/CoinBagItem.java index 81ce2a74..40772460 100644 --- a/src/main/java/com/legobmw99/allomancy/modules/combat/item/CoinBagItem.java +++ b/src/main/java/com/legobmw99/allomancy/modules/combat/item/CoinBagItem.java @@ -4,11 +4,11 @@ import com.legobmw99.allomancy.modules.combat.entity.ProjectileNuggetEntity; import com.legobmw99.allomancy.modules.powers.data.AllomancerAttachment; import com.legobmw99.allomancy.modules.powers.util.Physical; +import net.minecraft.core.component.DataComponents; import net.minecraft.core.registries.BuiltInRegistries; import net.minecraft.server.level.ServerLevel; import net.minecraft.world.InteractionHand; import net.minecraft.world.InteractionResult; -import net.minecraft.world.InteractionResultHolder; import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.entity.player.Player; import net.minecraft.world.entity.projectile.Projectile; @@ -27,8 +27,8 @@ public class CoinBagItem extends ProjectileWeaponItem { BuiltInRegistries.ITEM.getKey(item).getPath().contains("nugget"); }; - public CoinBagItem() { - super(new Item.Properties().stacksTo(1)); + public CoinBagItem(Item.Properties props) { + super(props.stacksTo(1).component(DataComponents.ENCHANTABLE, null)); } private static Ammo getAmmoFromItem(Item itemIn) { @@ -45,7 +45,7 @@ public Predicate getAllSupportedProjectiles() { } @Override - public InteractionResultHolder use(Level world, Player player, InteractionHand hand) { + public InteractionResult use(Level world, Player player, InteractionHand hand) { ItemStack weapon = player.getItemInHand(hand); ItemStack ammo = player.getProjectile(weapon); if (ammo.getItem() instanceof ArrowItem) { // the above get function has silly default behavior @@ -63,13 +63,13 @@ public InteractionResultHolder use(Level world, Player player, Intera ammo.shrink(1); } - return new InteractionResultHolder<>(InteractionResult.SUCCESS, player.getItemInHand(hand)); + return InteractionResult.SUCCESS; } } - return new InteractionResultHolder<>(InteractionResult.FAIL, player.getItemInHand(hand)); + return InteractionResult.FAIL; } @@ -87,10 +87,6 @@ protected Projectile createProjectile(Level pLevel, return new ProjectileNuggetEntity(pShooter, pLevel, pAmmo, dmg); } - @Override - public int getEnchantmentValue() { - return 0; - } @Override public int getDefaultProjectileRange() { diff --git a/src/main/java/com/legobmw99/allomancy/modules/combat/item/KolossBladeItem.java b/src/main/java/com/legobmw99/allomancy/modules/combat/item/KolossBladeItem.java index 16a4e09e..6325134b 100644 --- a/src/main/java/com/legobmw99/allomancy/modules/combat/item/KolossBladeItem.java +++ b/src/main/java/com/legobmw99/allomancy/modules/combat/item/KolossBladeItem.java @@ -4,31 +4,39 @@ import com.legobmw99.allomancy.modules.powers.data.AllomancerAttachment; import com.legobmw99.allomancy.util.ItemDisplay; import net.minecraft.ChatFormatting; -import net.minecraft.network.chat.Component; -import net.minecraft.tags.TagKey; +import net.minecraft.core.component.DataComponents; +import net.minecraft.tags.BlockTags; +import net.minecraft.tags.ItemTags; import net.minecraft.world.effect.MobEffectInstance; import net.minecraft.world.effect.MobEffects; import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.entity.player.Player; -import net.minecraft.world.item.*; -import net.minecraft.world.item.crafting.Ingredient; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.SwordItem; +import net.minecraft.world.item.ToolMaterial; +import net.minecraft.world.item.component.ItemLore; import net.minecraft.world.level.Level; -import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.state.BlockState; import java.util.List; public class KolossBladeItem extends SwordItem { - private static final int ATTACK_DAMAGE = 9; + private static final int ATTACK_DAMAGE = 17; private static final float ATTACK_SPEED = -2.6F; - private static final Tier SLOW_STONE = new SlowStoneTier(); + private static final ToolMaterial SLOW_STONE = + new ToolMaterial(BlockTags.INCORRECT_FOR_STONE_TOOL, 131, ATTACK_SPEED, 1.0F, ATTACK_DAMAGE, + ItemTags.STONE_TOOL_MATERIALS); - public KolossBladeItem() { - super(SLOW_STONE, - new Item.Properties().attributes(createAttributes(SLOW_STONE, ATTACK_DAMAGE, ATTACK_SPEED))); + public KolossBladeItem(Item.Properties props) { + super(SLOW_STONE + .applySwordProperties(props, ATTACK_DAMAGE, ATTACK_SPEED) + .component(DataComponents.LORE, new ItemLore( + List.of(ItemDisplay.addColorToText("item.allomancy.koloss_blade.lore", + ChatFormatting.GRAY))))); } @Override @@ -53,51 +61,10 @@ public boolean canDisableShield(ItemStack stack, ItemStack shield, LivingEntity (attacker.getData(AllomancerAttachment.ALLOMANCY_DATA).isBurning(Metal.PEWTER)); } - @Override - public void appendHoverText(ItemStack stack, - Item.TooltipContext ctx, - List tooltip, - TooltipFlag flagIn) { - super.appendHoverText(stack, ctx, tooltip, flagIn); - Component lore = ItemDisplay.addColorToText("item.allomancy.koloss_blade.lore", ChatFormatting.GRAY); - tooltip.add(lore); - } - @Override public boolean isCorrectToolForDrops(ItemStack pStack, BlockState pState) { return false; } - private static class SlowStoneTier implements Tier { - @Override - public int getUses() { - return Tiers.STONE.getUses(); - } - - @Override - public float getSpeed() { - return ATTACK_SPEED; - } - - @Override - public float getAttackDamageBonus() { - return ATTACK_DAMAGE; - } - @Override - public TagKey getIncorrectBlocksForDrops() { - return Tiers.STONE.getIncorrectBlocksForDrops(); - } - - @Override - public int getEnchantmentValue() { - return Tiers.STONE.getEnchantmentValue(); - } - - @Override - public Ingredient getRepairIngredient() { - return Tiers.STONE.getRepairIngredient(); - } - - } } diff --git a/src/main/java/com/legobmw99/allomancy/modules/combat/item/ObsidianDaggerItem.java b/src/main/java/com/legobmw99/allomancy/modules/combat/item/ObsidianDaggerItem.java index 61ebe1c5..27debb38 100644 --- a/src/main/java/com/legobmw99/allomancy/modules/combat/item/ObsidianDaggerItem.java +++ b/src/main/java/com/legobmw99/allomancy/modules/combat/item/ObsidianDaggerItem.java @@ -1,29 +1,35 @@ package com.legobmw99.allomancy.modules.combat.item; +import com.legobmw99.allomancy.Allomancy; import net.minecraft.core.Holder; +import net.minecraft.core.component.DataComponents; +import net.minecraft.resources.ResourceLocation; import net.minecraft.tags.BlockTags; +import net.minecraft.tags.ItemTags; import net.minecraft.tags.TagKey; import net.minecraft.world.item.*; -import net.minecraft.world.item.crafting.Ingredient; import net.minecraft.world.item.enchantment.Enchantment; import net.minecraft.world.item.enchantment.EnchantmentEffectComponents; import net.minecraft.world.item.enchantment.EnchantmentHelper; import net.minecraft.world.item.enchantment.Enchantments; -import net.minecraft.world.level.block.Block; -import net.minecraft.world.level.block.Blocks; import net.minecraft.world.level.block.state.BlockState; public class ObsidianDaggerItem extends SwordItem { - private static final int ATTACK_DAMAGE = 12; + private static final int ATTACK_DAMAGE = 23; private static final float ATTACK_SPEED = 9.2F; - private static final Tier tier = new ObsidianTier(); - - public ObsidianDaggerItem() { - super(tier, new Item.Properties() - .attributes(createAttributes(tier, ATTACK_DAMAGE, ATTACK_SPEED)) - .rarity(Rarity.UNCOMMON)); + public static final TagKey OBSIDIAN_REPAIR = + ItemTags.create(ResourceLocation.fromNamespaceAndPath(Allomancy.MODID, "obsidian_tool_materials")); + private static final ToolMaterial OBSIDIAN = + new ToolMaterial(BlockTags.INCORRECT_FOR_WOODEN_TOOL, 2, ATTACK_SPEED, 1.0F, ATTACK_DAMAGE, + OBSIDIAN_REPAIR); + + public ObsidianDaggerItem(Item.Properties props) { + super(OBSIDIAN + .applySwordProperties(props, ATTACK_DAMAGE, ATTACK_SPEED) + .rarity(Rarity.UNCOMMON) + .component(DataComponents.ENCHANTABLE, null)); } // prevent dagger from mining @@ -53,42 +59,4 @@ public boolean isPrimaryItemFor(ItemStack stack, Holder enchantment } return super.isPrimaryItemFor(stack, enchantment); } - - @Override - public float getXpRepairRatio(ItemStack stack) { - return 0; - } - - private static class ObsidianTier implements Tier { - @Override - public int getUses() { - return 2; - } - - @Override - public float getSpeed() { - return ATTACK_SPEED; - } - - @Override - public float getAttackDamageBonus() { - return ATTACK_DAMAGE; - } - - @Override - public TagKey getIncorrectBlocksForDrops() { - return BlockTags.INCORRECT_FOR_WOODEN_TOOL; - } - - @Override - public int getEnchantmentValue() { - return 1; - } - - @Override - public Ingredient getRepairIngredient() { - return Ingredient.of(Blocks.OBSIDIAN); - } - - } } diff --git a/src/main/java/com/legobmw99/allomancy/modules/consumables/ConsumeSetup.java b/src/main/java/com/legobmw99/allomancy/modules/consumables/ConsumeSetup.java index bd35822e..564c7974 100644 --- a/src/main/java/com/legobmw99/allomancy/modules/consumables/ConsumeSetup.java +++ b/src/main/java/com/legobmw99/allomancy/modules/consumables/ConsumeSetup.java @@ -10,6 +10,7 @@ import net.minecraft.core.component.DataComponentType; import net.minecraft.core.registries.Registries; import net.minecraft.world.item.Items; +import net.minecraft.world.item.crafting.CustomRecipe; import net.minecraft.world.item.crafting.RecipeSerializer; import net.neoforged.bus.api.IEventBus; import net.neoforged.neoforge.event.ModifyDefaultComponentsEvent; @@ -21,7 +22,7 @@ public final class ConsumeSetup { private static final DeferredRegister.DataComponents DATA_COMPONENTS = - DeferredRegister.createDataComponents(Allomancy.MODID); + DeferredRegister.createDataComponents(Registries.DATA_COMPONENT_TYPE, Allomancy.MODID); public static final Supplier> FLAKE_STORAGE = DATA_COMPONENTS.registerComponentType("flake_storage", builder -> builder .persistent(FlakeStorage.CODEC) @@ -30,15 +31,15 @@ public final class ConsumeSetup { private static final DeferredRegister.Items ITEMS = DeferredRegister.createItems(Allomancy.MODID); public static final DeferredItem ALLOMANTIC_GRINDER = - ITEMS.register("allomantic_grinder", GrinderItem::new); + ITEMS.registerItem("allomantic_grinder", GrinderItem::new); public static final DeferredItem LERASIUM_NUGGET = - ITEMS.register("lerasium_nugget", LerasiumItem::new); - public static final DeferredItem VIAL = ITEMS.register("vial", VialItem::new); + ITEMS.registerItem("lerasium_nugget", LerasiumItem::new); + public static final DeferredItem VIAL = ITEMS.registerItem("vial", VialItem::new); private static final DeferredRegister> RECIPES = DeferredRegister.create(Registries.RECIPE_SERIALIZER, Allomancy.MODID); - public static final Supplier VIAL_RECIPE_SERIALIZER = - RECIPES.register("vial_filling", VialItemRecipe.Serializer::new); + public static final Supplier> VIAL_RECIPE_SERIALIZER = + RECIPES.register("vial_filling", () -> new CustomRecipe.Serializer<>(VialItemRecipe::new)); private ConsumeSetup() {} @@ -54,7 +55,6 @@ public static void onModifyComponents(final ModifyDefaultComponentsEvent event) storage.add(Metal.GOLD); FlakeStorage gold = storage.toImmutable(); - // TODO hide tooltip on these? event.modify(Items.GOLDEN_APPLE, builder -> builder.set(FLAKE_STORAGE.get(), gold)); event.modify(Items.GOLDEN_CARROT, builder -> builder.set(FLAKE_STORAGE.get(), gold)); event.modify(Items.ENCHANTED_GOLDEN_APPLE, builder -> builder.set(FLAKE_STORAGE.get(), gold)); diff --git a/src/main/java/com/legobmw99/allomancy/modules/consumables/item/GrinderItem.java b/src/main/java/com/legobmw99/allomancy/modules/consumables/item/GrinderItem.java index 00df56e8..83092fd6 100644 --- a/src/main/java/com/legobmw99/allomancy/modules/consumables/item/GrinderItem.java +++ b/src/main/java/com/legobmw99/allomancy/modules/consumables/item/GrinderItem.java @@ -5,13 +5,12 @@ public class GrinderItem extends Item { - public GrinderItem() { - super(new Item.Properties().setNoRepair().durability(256)); + public GrinderItem(Item.Properties props) { + super(props.durability(256)); } - @Override - public ItemStack getCraftingRemainingItem(ItemStack itemStack) { + public ItemStack getCraftingRemainder(ItemStack itemStack) { ItemStack damaged = itemStack.copy(); damaged.setDamageValue(damaged.getDamageValue() + 1); if (damaged.getDamageValue() >= damaged.getMaxDamage()) { @@ -20,16 +19,6 @@ public ItemStack getCraftingRemainingItem(ItemStack itemStack) { return damaged; } - @Override - public boolean hasCraftingRemainingItem(ItemStack stack) { - return stack.getDamageValue() < stack.getMaxDamage(); - } - - @Override - public boolean hasCraftingRemainingItem() { - return true; - } - @Override public boolean isDamageable(ItemStack stack) { diff --git a/src/main/java/com/legobmw99/allomancy/modules/consumables/item/LerasiumItem.java b/src/main/java/com/legobmw99/allomancy/modules/consumables/item/LerasiumItem.java index 3b88328b..554df2aa 100644 --- a/src/main/java/com/legobmw99/allomancy/modules/consumables/item/LerasiumItem.java +++ b/src/main/java/com/legobmw99/allomancy/modules/consumables/item/LerasiumItem.java @@ -3,56 +3,61 @@ import com.legobmw99.allomancy.modules.powers.data.AllomancerAttachment; import com.legobmw99.allomancy.util.ItemDisplay; import net.minecraft.ChatFormatting; -import net.minecraft.advancements.CriteriaTriggers; -import net.minecraft.network.chat.Component; -import net.minecraft.server.level.ServerPlayer; -import net.minecraft.stats.Stats; +import net.minecraft.core.component.DataComponents; +import net.minecraft.sounds.SoundEvents; import net.minecraft.world.InteractionHand; import net.minecraft.world.InteractionResult; -import net.minecraft.world.InteractionResultHolder; import net.minecraft.world.effect.MobEffectInstance; import net.minecraft.world.effect.MobEffects; import net.minecraft.world.entity.EntityType; import net.minecraft.world.entity.LightningBolt; import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.entity.player.Player; -import net.minecraft.world.food.FoodProperties; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.ItemUseAnimation; import net.minecraft.world.item.Rarity; -import net.minecraft.world.item.TooltipFlag; +import net.minecraft.world.item.component.Consumable; +import net.minecraft.world.item.component.ItemLore; import net.minecraft.world.level.Level; import java.util.List; public class LerasiumItem extends Item { - private static final FoodProperties lerasium = - new FoodProperties.Builder().fast().alwaysEdible().saturationModifier(0).nutrition(0).build(); - public LerasiumItem() { - super(new Item.Properties().rarity(Rarity.EPIC).stacksTo(1).food(lerasium)); + private static final Consumable lerasium_consumable = Consumable + .builder() + .consumeSeconds(0.2f) + .animation(ItemUseAnimation.EAT) + .sound(SoundEvents.GENERIC_EAT) + .hasConsumeParticles(false) + .build(); + + public LerasiumItem(Item.Properties props) { + super(props + .rarity(Rarity.EPIC) + .stacksTo(1) + .component(DataComponents.CONSUMABLE, lerasium_consumable) + .component(DataComponents.LORE, new ItemLore( + List.of(ItemDisplay.addColorToText("item.allomancy.lerasium_nugget.lore", + ChatFormatting.LIGHT_PURPLE))))); } @Override - public InteractionResultHolder use(Level world, Player player, InteractionHand hand) { - ItemStack itemStackIn = player.getItemInHand(hand); - + public InteractionResult use(Level world, Player player, InteractionHand hand) { if (!player.getData(AllomancerAttachment.ALLOMANCY_DATA).isMistborn()) { player.startUsingItem(hand); - return new InteractionResultHolder<>(InteractionResult.SUCCESS, itemStackIn); + return InteractionResult.SUCCESS; } - return new InteractionResultHolder<>(InteractionResult.FAIL, itemStackIn); + return InteractionResult.FAIL; } @Override public ItemStack finishUsingItem(ItemStack stack, Level world, LivingEntity livingEntity) { - if (livingEntity instanceof ServerPlayer serverplayer) { - CriteriaTriggers.CONSUME_ITEM.trigger(serverplayer, stack); - serverplayer.awardStat(Stats.ITEM_USED.get(this)); - } + if (livingEntity instanceof Player) { livingEntity.getData(AllomancerAttachment.ALLOMANCY_DATA).setMistborn(); //Fancy-shmancy effects @@ -67,23 +72,6 @@ public ItemStack finishUsingItem(ItemStack stack, Level world, LivingEntity livi } - @Override - public void appendHoverText(ItemStack stack, - Item.TooltipContext ctx, - List tooltip, - TooltipFlag flagIn) { - super.appendHoverText(stack, ctx, tooltip, flagIn); - Component lore = - ItemDisplay.addColorToText("item.allomancy.lerasium_nugget.lore", ChatFormatting.LIGHT_PURPLE); - tooltip.add(lore); - - } - - @Override - public int getUseDuration(ItemStack stack, LivingEntity livingEntity) { - return 4; - } - @Override public boolean isFoil(ItemStack stack) { //Add enchantment glint diff --git a/src/main/java/com/legobmw99/allomancy/modules/consumables/item/VialItem.java b/src/main/java/com/legobmw99/allomancy/modules/consumables/item/VialItem.java index 5ec09ca8..7a7f39d8 100644 --- a/src/main/java/com/legobmw99/allomancy/modules/consumables/item/VialItem.java +++ b/src/main/java/com/legobmw99/allomancy/modules/consumables/item/VialItem.java @@ -6,60 +6,42 @@ import com.legobmw99.allomancy.modules.consumables.item.component.FlakeStorage; import com.legobmw99.allomancy.modules.powers.data.AllomancerAttachment; import com.legobmw99.allomancy.modules.powers.data.AllomancerData; -import net.minecraft.advancements.CriteriaTriggers; import net.minecraft.core.component.DataComponents; import net.minecraft.nbt.CompoundTag; -import net.minecraft.server.level.ServerPlayer; -import net.minecraft.stats.Stats; +import net.minecraft.sounds.SoundEvents; import net.minecraft.world.InteractionHand; import net.minecraft.world.InteractionResult; -import net.minecraft.world.InteractionResultHolder; -import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.entity.player.Player; -import net.minecraft.world.item.*; +import net.minecraft.world.food.FoodProperties; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.ItemUseAnimation; +import net.minecraft.world.item.Rarity; +import net.minecraft.world.item.component.Consumable; import net.minecraft.world.item.component.CustomData; -import net.minecraft.world.item.component.CustomModelData; +import net.minecraft.world.item.component.UseRemainder; import net.minecraft.world.level.Level; import static com.legobmw99.allomancy.modules.consumables.ConsumeSetup.FLAKE_STORAGE; public class VialItem extends Item { - - private static final CustomModelData FILLED_MODEL_DATA = new CustomModelData(1); - - public VialItem() { - super(new Item.Properties().stacksTo(32).rarity(Rarity.COMMON)); - } - - - @Override - public ItemStack finishUsingItem(ItemStack stack, Level world, LivingEntity livingEntity) { - if (livingEntity instanceof ServerPlayer serverplayer) { - CriteriaTriggers.CONSUME_ITEM.trigger(serverplayer, stack); - serverplayer.awardStat(Stats.ITEM_USED.get(this)); - } - if (livingEntity instanceof Player player) { - return ItemUtils.createFilledResult(stack, player, new ItemStack(ConsumeSetup.VIAL.get()), true); - } else { - stack.consume(1, livingEntity); - return stack; - } + private static final FoodProperties vial_food = + new FoodProperties.Builder().alwaysEdible().saturationModifier(0).nutrition(0).build(); + + private static final Consumable vial_consumable = Consumable + .builder() + .consumeSeconds(0.3f) + .animation(ItemUseAnimation.DRINK) + .sound(SoundEvents.GENERIC_DRINK) + .hasConsumeParticles(false) + .build(); + + public VialItem(Item.Properties props) { + super(props.stacksTo(32).food(vial_food, vial_consumable).rarity(Rarity.COMMON)); } @Override - public int getUseDuration(ItemStack stack, LivingEntity livingEntity) { - return 6; - } - - - @Override - public UseAnim getUseAnimation(ItemStack stack) { - return UseAnim.DRINK; - } - - - @Override - public InteractionResultHolder use(Level worldIn, Player playerIn, InteractionHand hand) { + public InteractionResult use(Level worldIn, Player playerIn, InteractionHand hand) { ItemStack itemStackIn = playerIn.getItemInHand(hand); var data = playerIn.getData(AllomancerAttachment.ALLOMANCY_DATA); @@ -78,19 +60,18 @@ public InteractionResultHolder use(Level worldIn, Player playerIn, In if (filling != full) { playerIn.startUsingItem(hand); - return new InteractionResultHolder<>(InteractionResult.SUCCESS, itemStackIn); + return InteractionResult.SUCCESS; } } - return new InteractionResultHolder<>(InteractionResult.FAIL, itemStackIn); + return InteractionResult.FAIL; } public static void fillVial(ItemStack stack, FlakeStorage storage) { stack.set(FLAKE_STORAGE, storage); if (storage == null) { - stack.set(DataComponents.CUSTOM_MODEL_DATA, null); stack.set(DataComponents.RARITY, Rarity.COMMON); } else { - stack.set(DataComponents.CUSTOM_MODEL_DATA, FILLED_MODEL_DATA); + stack.set(DataComponents.USE_REMAINDER, new UseRemainder(new ItemStack(ConsumeSetup.VIAL.get()))); stack.set(DataComponents.RARITY, Rarity.UNCOMMON); } @@ -105,6 +86,9 @@ public static void fillVial(ItemStack stack, FlakeStorage storage) { public void verifyComponentsAfterLoad(ItemStack pStack) { super.verifyComponentsAfterLoad(pStack); if (pStack.has(FLAKE_STORAGE)) { + if (!pStack.has(DataComponents.USE_REMAINDER)) { + pStack.set(DataComponents.USE_REMAINDER, new UseRemainder(new ItemStack(ConsumeSetup.VIAL.get()))); + } return; } diff --git a/src/main/java/com/legobmw99/allomancy/modules/consumables/item/component/FlakeStorage.java b/src/main/java/com/legobmw99/allomancy/modules/consumables/item/component/FlakeStorage.java index 56fb49f5..b89199af 100644 --- a/src/main/java/com/legobmw99/allomancy/modules/consumables/item/component/FlakeStorage.java +++ b/src/main/java/com/legobmw99/allomancy/modules/consumables/item/component/FlakeStorage.java @@ -1,6 +1,8 @@ package com.legobmw99.allomancy.modules.consumables.item.component; import com.legobmw99.allomancy.api.enums.Metal; +import com.legobmw99.allomancy.modules.powers.data.AllomancerAttachment; +import com.legobmw99.allomancy.modules.powers.data.AllomancerData; import com.legobmw99.allomancy.util.ItemDisplay; import com.mojang.serialization.Codec; import io.netty.buffer.ByteBuf; @@ -8,14 +10,22 @@ import net.minecraft.client.gui.screens.Screen; import net.minecraft.network.chat.Component; import net.minecraft.network.codec.StreamCodec; +import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.item.Item; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.Items; import net.minecraft.world.item.TooltipFlag; +import net.minecraft.world.item.component.Consumable; +import net.minecraft.world.item.component.ConsumableListener; import net.minecraft.world.item.component.TooltipProvider; +import net.minecraft.world.level.Level; import java.util.EnumSet; import java.util.function.Consumer; -public final class FlakeStorage implements TooltipProvider { +import static com.legobmw99.allomancy.modules.consumables.ConsumeSetup.FLAKE_STORAGE; + +public final class FlakeStorage implements TooltipProvider, ConsumableListener { private final EnumSet flakes; @@ -107,6 +117,26 @@ public void addToTooltip(Item.TooltipContext ctx, Consumer tooltip, T } } + @Override + public void onConsume(Level level, LivingEntity entity, ItemStack stack, Consumable consumable) { + FlakeStorage storage = stack.get(FLAKE_STORAGE); + + if (storage == null || !entity.hasData(AllomancerAttachment.ALLOMANCY_DATA)) { + return; + } + var data = entity.getData(AllomancerAttachment.ALLOMANCY_DATA); + if (stack.getItem() == Items.ENCHANTED_GOLDEN_APPLE && storage.contains(Metal.GOLD)) { + for (int i = 0; i < AllomancerData.MAX_STORAGE; i++) { + data.incrementStored(Metal.GOLD); + } + } + for (Metal mt : Metal.values()) { + if (storage.contains(mt)) { + data.incrementStored(mt); + } + } + } + public static class Mutable { private final EnumSet flakes = EnumSet.noneOf(Metal.class); diff --git a/src/main/java/com/legobmw99/allomancy/modules/consumables/item/recipe/VialItemRecipe.java b/src/main/java/com/legobmw99/allomancy/modules/consumables/item/recipe/VialItemRecipe.java index 8439ccf9..b998d6d8 100644 --- a/src/main/java/com/legobmw99/allomancy/modules/consumables/item/recipe/VialItemRecipe.java +++ b/src/main/java/com/legobmw99/allomancy/modules/consumables/item/recipe/VialItemRecipe.java @@ -106,22 +106,11 @@ public boolean isSpecial() { } - @Override - public boolean canCraftInDimensions(int width, int height) { - return width * height >= 2; - } - @Nonnull @Override - public RecipeSerializer getSerializer() { + public RecipeSerializer getSerializer() { return ConsumeSetup.VIAL_RECIPE_SERIALIZER.get(); } - public static class Serializer extends SimpleCraftingRecipeSerializer { - - public Serializer() { - super(VialItemRecipe::new); - } - } } diff --git a/src/main/java/com/legobmw99/allomancy/modules/extras/ExtrasSetup.java b/src/main/java/com/legobmw99/allomancy/modules/extras/ExtrasSetup.java index f63afd4b..bb45461f 100644 --- a/src/main/java/com/legobmw99/allomancy/modules/extras/ExtrasSetup.java +++ b/src/main/java/com/legobmw99/allomancy/modules/extras/ExtrasSetup.java @@ -10,10 +10,13 @@ import com.legobmw99.allomancy.modules.extras.block.IronLeverBlock; import com.legobmw99.allomancy.modules.extras.command.AllomancyPowerCommand; import com.legobmw99.allomancy.modules.extras.command.AllomancyPowerType; +import com.legobmw99.allomancy.util.ItemDisplay; +import net.minecraft.ChatFormatting; import net.minecraft.advancements.CriterionTrigger; import net.minecraft.commands.synchronization.ArgumentTypeInfo; import net.minecraft.commands.synchronization.ArgumentTypeInfos; import net.minecraft.commands.synchronization.SingletonArgumentInfo; +import net.minecraft.core.component.DataComponents; import net.minecraft.core.registries.Registries; import net.minecraft.data.worldgen.BootstrapContext; import net.minecraft.resources.ResourceKey; @@ -23,9 +26,12 @@ import net.minecraft.world.item.BannerPatternItem; import net.minecraft.world.item.BlockItem; import net.minecraft.world.item.Item; +import net.minecraft.world.item.component.ItemLore; import net.minecraft.world.level.block.BellBlock; +import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.Blocks; import net.minecraft.world.level.block.entity.BannerPattern; +import net.minecraft.world.level.block.state.BlockBehaviour; import net.minecraft.world.phys.BlockHitResult; import net.minecraft.world.phys.Vec3; import net.neoforged.bus.api.IEventBus; @@ -51,21 +57,30 @@ public final class ExtrasSetup { // Provide the queried type. Here, we want to look up `IItemHandler` instances. IAllomanticallyUsable.class); + + private static final BlockBehaviour.Properties IRON_REDSTONE_PROPS = + Block.Properties.of().noCollission().strength(1.0F); + + private static final Item.Properties IRON_REDSTONE_LORE = new Item.Properties().component(DataComponents.LORE, + new ItemLore( + List.of(ItemDisplay.addColorToText( + "block.allomancy.iron_activation.lore", + ChatFormatting.GRAY)))); public static final DeferredBlock IRON_BUTTON = - BLOCKS.register("iron_button", () -> new IronButtonBlock(true)); + BLOCKS.registerBlock("iron_button", (props) -> new IronButtonBlock(true, props), IRON_REDSTONE_PROPS); + public static final DeferredItem IRON_BUTTON_ITEM = + ITEMS.registerSimpleBlockItem(IRON_BUTTON, IRON_REDSTONE_LORE); - public static final DeferredItem IRON_BUTTON_ITEM = - ITEMS.register("iron_button", () -> new BlockItem(IRON_BUTTON.get(), new Item.Properties())); public static final DeferredBlock INVERTED_IRON_BUTTON = - BLOCKS.register("inverted_iron_button", () -> new IronButtonBlock(false)); + BLOCKS.registerBlock("inverted_iron_button", (props) -> new IronButtonBlock(false, props), + IRON_REDSTONE_PROPS); + public static final DeferredItem INVERTED_IRON_BUTTON_ITEM = + ITEMS.registerSimpleBlockItem(INVERTED_IRON_BUTTON, IRON_REDSTONE_LORE); - public static final DeferredItem INVERTED_IRON_BUTTON_ITEM = ITEMS.register("inverted_iron_button", - () -> new BlockItem( - INVERTED_IRON_BUTTON.get(), - new Item.Properties())); - public static final DeferredBlock IRON_LEVER = BLOCKS.register("iron_lever", IronLeverBlock::new); - public static final DeferredItem IRON_LEVER_ITEM = - ITEMS.register("iron_lever", () -> new BlockItem(IRON_LEVER.get(), new Item.Properties())); + public static final DeferredBlock IRON_LEVER = + BLOCKS.registerBlock("iron_lever", IronLeverBlock::new, IRON_REDSTONE_PROPS); + public static final DeferredItem IRON_LEVER_ITEM = + ITEMS.registerSimpleBlockItem(IRON_LEVER, IRON_REDSTONE_LORE); public static final List> PATTERNS = new ArrayList<>(); public static final List> PATTERN_KEYS = new ArrayList<>(); @@ -92,9 +107,8 @@ public final class ExtrasSetup { ResourceLocation.fromNamespaceAndPath(Allomancy.MODID, name)); PATTERN_KEYS.add(pattern_key); - var pattern_item = ITEMS.register(name + "_pattern", () -> new BannerPatternItem(pattern_key, - new Item.Properties().stacksTo( - 1))); + var pattern_item = ITEMS.registerItem(name + "_pattern", + (props) -> new BannerPatternItem(pattern_key, props.stacksTo(1))); PATTERN_ITEMS.add(pattern_item); } } diff --git a/src/main/java/com/legobmw99/allomancy/modules/extras/block/IronButtonBlock.java b/src/main/java/com/legobmw99/allomancy/modules/extras/block/IronButtonBlock.java index 9ae4c5a0..5a77de73 100644 --- a/src/main/java/com/legobmw99/allomancy/modules/extras/block/IronButtonBlock.java +++ b/src/main/java/com/legobmw99/allomancy/modules/extras/block/IronButtonBlock.java @@ -2,21 +2,15 @@ import com.legobmw99.allomancy.api.block.IAllomanticallyUsable; import com.legobmw99.allomancy.modules.extras.ExtrasSetup; -import com.legobmw99.allomancy.util.ItemDisplay; -import net.minecraft.ChatFormatting; import net.minecraft.core.BlockPos; -import net.minecraft.network.chat.Component; -import net.minecraft.network.chat.MutableComponent; +import net.minecraft.server.level.ServerLevel; import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.InteractionResult; import net.minecraft.world.entity.player.Player; -import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; -import net.minecraft.world.item.TooltipFlag; import net.minecraft.world.level.BlockGetter; import net.minecraft.world.level.Explosion; import net.minecraft.world.level.Level; -import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.ButtonBlock; import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraft.world.level.block.state.BlockState; @@ -27,7 +21,6 @@ import net.minecraft.world.phys.shapes.VoxelShape; import net.neoforged.neoforge.capabilities.IBlockCapabilityProvider; -import java.util.List; import java.util.function.BiConsumer; public class IronButtonBlock extends ButtonBlock { @@ -35,8 +28,8 @@ public class IronButtonBlock extends ButtonBlock { private final boolean activatedOnPush; - public IronButtonBlock(boolean activatedOnPush) { - super(BlockSetType.IRON, 35, Block.Properties.of().noCollission().strength(1.0F)); + public IronButtonBlock(boolean activatedOnPush, Properties props) { + super(BlockSetType.IRON, 35, props); this.activatedOnPush = activatedOnPush; } @@ -55,7 +48,7 @@ protected InteractionResult useWithoutItem(BlockState pState, @Override protected void onExplosionHit(BlockState pState, - Level pLevel, + ServerLevel pLevel, BlockPos pPos, Explosion pExplosion, BiConsumer pDropConsumer) { @@ -70,17 +63,6 @@ public VoxelShape getShape(BlockState pState, BlockGetter pLevel, BlockPos pPos, return super.getShape(pState, pLevel, pPos, pContext); } - @Override - public void appendHoverText(ItemStack stack, - Item.TooltipContext ctx, - List tooltip, - TooltipFlag flagIn) { - super.appendHoverText(stack, ctx, tooltip, flagIn); - MutableComponent lore = - ItemDisplay.addColorToText("block.allomancy.iron_activation.lore", ChatFormatting.GRAY); - tooltip.add(lore); - } - public static class AllomanticUseCapabilityProvider implements IBlockCapabilityProvider { diff --git a/src/main/java/com/legobmw99/allomancy/modules/extras/block/IronLeverBlock.java b/src/main/java/com/legobmw99/allomancy/modules/extras/block/IronLeverBlock.java index 468a2606..91dea0f0 100644 --- a/src/main/java/com/legobmw99/allomancy/modules/extras/block/IronLeverBlock.java +++ b/src/main/java/com/legobmw99/allomancy/modules/extras/block/IronLeverBlock.java @@ -2,21 +2,16 @@ import com.legobmw99.allomancy.api.block.IAllomanticallyUsable; import com.legobmw99.allomancy.modules.extras.ExtrasSetup; -import com.legobmw99.allomancy.util.ItemDisplay; -import net.minecraft.ChatFormatting; import net.minecraft.core.BlockPos; -import net.minecraft.network.chat.Component; +import net.minecraft.server.level.ServerLevel; import net.minecraft.server.level.ServerPlayer; import net.minecraft.sounds.SoundEvents; import net.minecraft.sounds.SoundSource; import net.minecraft.world.InteractionResult; import net.minecraft.world.entity.player.Player; -import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; -import net.minecraft.world.item.TooltipFlag; import net.minecraft.world.level.Explosion; import net.minecraft.world.level.Level; -import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.LeverBlock; import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraft.world.level.block.state.BlockState; @@ -24,13 +19,12 @@ import net.minecraft.world.phys.BlockHitResult; import net.neoforged.neoforge.capabilities.IBlockCapabilityProvider; -import java.util.List; import java.util.function.BiConsumer; public class IronLeverBlock extends LeverBlock { - public IronLeverBlock() { - super(Block.Properties.of().noCollission().strength(1.0F)); + public IronLeverBlock(Properties props) { + super(props); } @Override @@ -44,23 +38,13 @@ protected InteractionResult useWithoutItem(BlockState pState, @Override protected void onExplosionHit(BlockState pState, - Level pLevel, + ServerLevel pLevel, BlockPos pPos, Explosion pExplosion, BiConsumer pDropConsumer) { } - @Override - public void appendHoverText(ItemStack stack, - Item.TooltipContext ctx, - List tooltip, - TooltipFlag flagIn) { - super.appendHoverText(stack, ctx, tooltip, flagIn); - Component lore = ItemDisplay.addColorToText("block.allomancy.iron_activation.lore", ChatFormatting.GRAY); - tooltip.add(lore); - } - public static class AllomanticUseCapabilityProvider implements IBlockCapabilityProvider { diff --git a/src/main/java/com/legobmw99/allomancy/modules/materials/MaterialsSetup.java b/src/main/java/com/legobmw99/allomancy/modules/materials/MaterialsSetup.java index f6528e19..fc007011 100644 --- a/src/main/java/com/legobmw99/allomancy/modules/materials/MaterialsSetup.java +++ b/src/main/java/com/legobmw99/allomancy/modules/materials/MaterialsSetup.java @@ -76,15 +76,15 @@ public String toString() { public static final List> NUGGETS = new ArrayList<>(); public static final List> INGOTS = new ArrayList<>(); public static final List> STORAGE_BLOCKS = new ArrayList<>(); - public static final List> STORAGE_BLOCK_ITEMS = new ArrayList<>(); + public static final List> STORAGE_BLOCK_ITEMS = new ArrayList<>(); public static final List> ORE_BLOCKS = new ArrayList<>(); - public static final List> ORE_BLOCKS_ITEMS = new ArrayList<>(); + public static final List> ORE_BLOCKS_ITEMS = new ArrayList<>(); public static final List> DEEPSLATE_ORE_BLOCKS = new ArrayList<>(); - public static final List> DEEPSLATE_ORE_BLOCKS_ITEMS = new ArrayList<>(); + public static final List> DEEPSLATE_ORE_BLOCKS_ITEMS = new ArrayList<>(); public static final List> RAW_ORE_BLOCKS = new ArrayList<>(); - public static final List> RAW_ORE_BLOCKS_ITEMS = new ArrayList<>(); + public static final List> RAW_ORE_BLOCKS_ITEMS = new ArrayList<>(); public static final List> RAW_ORE_ITEMS = new ArrayList<>(); public static int METAL_ITEM_LEN = Metal.values().length; @@ -94,7 +94,7 @@ public String toString() { static { for (Metal mt : Metal.values()) { String name = mt.getName(); - FLAKES.add(ITEMS.register(name + "_flakes", MaterialsSetup::createStandardItem)); + FLAKES.add(ITEMS.registerSimpleItem(name + "_flakes")); if (mt.isVanilla()) { NUGGETS.add(null); @@ -102,47 +102,39 @@ public String toString() { STORAGE_BLOCKS.add(null); STORAGE_BLOCK_ITEMS.add(null); } else { - NUGGETS.add(ITEMS.register(name + "_nugget", MaterialsSetup::createStandardItem)); - INGOTS.add(ITEMS.register(name + "_ingot", MaterialsSetup::createStandardItem)); - STORAGE_BLOCKS.add(BLOCKS.register(name + "_block", MaterialsSetup::createStandardBlock)); - STORAGE_BLOCK_ITEMS.add(ITEMS.register(name + "_block", - () -> new BlockItem(STORAGE_BLOCKS.get(mt.getIndex()).get(), - new Item.Properties()))); + NUGGETS.add(ITEMS.registerSimpleItem(name + "_nugget")); + INGOTS.add(ITEMS.registerSimpleItem(name + "_ingot")); + STORAGE_BLOCKS.add(registerStandardBlock(name + "_block")); + STORAGE_BLOCK_ITEMS.add(ITEMS.registerSimpleBlockItem(STORAGE_BLOCKS.get(mt.getIndex()))); } } - FLAKES.add(ITEMS.register("lead_flakes", MaterialsSetup::createStandardItem)); - NUGGETS.add(ITEMS.register("lead_nugget", MaterialsSetup::createStandardItem)); - INGOTS.add(ITEMS.register("lead_ingot", MaterialsSetup::createStandardItem)); - STORAGE_BLOCKS.add(BLOCKS.register("lead_block", MaterialsSetup::createStandardBlock)); - STORAGE_BLOCK_ITEMS.add(ITEMS.register("lead_block", () -> new BlockItem(STORAGE_BLOCKS.get(LEAD).get(), - new Item.Properties()))); - - FLAKES.add(ITEMS.register("silver_flakes", MaterialsSetup::createStandardItem)); - NUGGETS.add(ITEMS.register("silver_nugget", MaterialsSetup::createStandardItem)); - INGOTS.add(ITEMS.register("silver_ingot", MaterialsSetup::createStandardItem)); - STORAGE_BLOCKS.add(BLOCKS.register("silver_block", MaterialsSetup::createStandardBlock)); - STORAGE_BLOCK_ITEMS.add(ITEMS.register("silver_block", () -> new BlockItem(STORAGE_BLOCKS.get(SILVER).get(), - new Item.Properties()))); + FLAKES.add(ITEMS.registerSimpleItem("lead_flakes")); + NUGGETS.add(ITEMS.registerSimpleItem("lead_nugget")); + INGOTS.add(ITEMS.registerSimpleItem("lead_ingot")); + STORAGE_BLOCKS.add(registerStandardBlock("lead_block")); + STORAGE_BLOCK_ITEMS.add(ITEMS.registerSimpleBlockItem(STORAGE_BLOCKS.get(LEAD))); + + FLAKES.add(ITEMS.registerSimpleItem("silver_flakes")); + NUGGETS.add(ITEMS.registerSimpleItem("silver_nugget")); + INGOTS.add(ITEMS.registerSimpleItem("silver_ingot")); + STORAGE_BLOCKS.add(registerStandardBlock("silver_block")); + STORAGE_BLOCK_ITEMS.add(ITEMS.registerSimpleBlockItem(STORAGE_BLOCKS.get(SILVER))); for (var ore_config : ORE_METALS) { String ore = ore_config.name(); - var ore_block = BLOCKS.register(ore + "_ore", MaterialsSetup::createStandardOre); + var ore_block = registerStandardOre(ore + "_ore"); ORE_BLOCKS.add(ore_block); - ORE_BLOCKS_ITEMS.add( - ITEMS.register(ore + "_ore", () -> new BlockItem(ore_block.get(), new Item.Properties()))); + ORE_BLOCKS_ITEMS.add(ITEMS.registerSimpleBlockItem(ore_block)); - var ds_ore_block = BLOCKS.register("deepslate_" + ore + "_ore", MaterialsSetup::createDeepslateBlock); + var ds_ore_block = registerDeepslateOre("deepslate_" + ore + "_ore"); DEEPSLATE_ORE_BLOCKS.add(ds_ore_block); - DEEPSLATE_ORE_BLOCKS_ITEMS.add(ITEMS.register("deepslate_" + ore + "_ore", - () -> new BlockItem(ds_ore_block.get(), - new Item.Properties()))); + DEEPSLATE_ORE_BLOCKS_ITEMS.add(ITEMS.registerSimpleBlockItem((ds_ore_block))); - var raw_ore_block = BLOCKS.register("raw_" + ore + "_block", MaterialsSetup::createStandardBlock); + var raw_ore_block = registerStandardBlock("raw_" + ore + "_block"); RAW_ORE_BLOCKS.add(raw_ore_block); - RAW_ORE_BLOCKS_ITEMS.add(ITEMS.register("raw_" + ore + "_block", - () -> new BlockItem(raw_ore_block.get(), new Item.Properties()))); + RAW_ORE_BLOCKS_ITEMS.add(ITEMS.registerSimpleBlockItem(raw_ore_block)); - RAW_ORE_ITEMS.add(ITEMS.register("raw_" + ore, MaterialsSetup::createStandardItem)); + RAW_ORE_ITEMS.add(ITEMS.registerSimpleItem("raw_" + ore)); } } @@ -159,22 +151,21 @@ public static void register(IEventBus bus) { GLM.register(bus); } - private static Block createStandardBlock() { - return new Block(Blocks.STONE.properties().strength(2.1F).requiresCorrectToolForDrops()); + private static DeferredBlock registerStandardBlock(String name) { + return BLOCKS.registerBlock(name, Block::new, + Blocks.STONE.properties().strength(2.1F).requiresCorrectToolForDrops()); } - private static Block createStandardOre() { - return new DropExperienceBlock(UniformInt.of(2, 5), Blocks.IRON_ORE.properties()); + private static DeferredBlock registerStandardOre(String name) { + return BLOCKS.registerBlock(name, props -> new DropExperienceBlock(UniformInt.of(2, 5), props), + Blocks.IRON_ORE.properties()); } - private static Block createDeepslateBlock() { - return new DropExperienceBlock(UniformInt.of(2, 5), - Blocks.DEEPSLATE_IRON_ORE.properties().strength(4.5F, 3.0F)); + private static DeferredBlock registerDeepslateOre(String name) { + return BLOCKS.registerBlock(name, props -> new DropExperienceBlock(UniformInt.of(2, 5), props), + Blocks.DEEPSLATE_IRON_ORE.properties().strength(4.5F, 3.0F)); } - private static Item createStandardItem() { - return new Item(new Item.Properties()); - } public static void bootstrapConfigured(BootstrapContext> bootstrap) { RuleTest stone = new TagMatchTest(BlockTags.STONE_ORE_REPLACEABLES); diff --git a/src/main/java/com/legobmw99/allomancy/modules/powers/CommonEventHandler.java b/src/main/java/com/legobmw99/allomancy/modules/powers/CommonEventHandler.java index e9537250..d081ad89 100644 --- a/src/main/java/com/legobmw99/allomancy/modules/powers/CommonEventHandler.java +++ b/src/main/java/com/legobmw99/allomancy/modules/powers/CommonEventHandler.java @@ -3,7 +3,6 @@ import com.legobmw99.allomancy.Allomancy; import com.legobmw99.allomancy.api.enums.Metal; import com.legobmw99.allomancy.modules.combat.item.KolossBladeItem; -import com.legobmw99.allomancy.modules.consumables.item.component.FlakeStorage; import com.legobmw99.allomancy.modules.extras.ExtrasSetup; import com.legobmw99.allomancy.modules.materials.MaterialsSetup; import com.legobmw99.allomancy.modules.powers.data.AllomancerAttachment; @@ -26,13 +25,11 @@ import net.minecraft.world.entity.item.ItemEntity; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemStack; -import net.minecraft.world.item.Items; import net.minecraft.world.level.GameRules; import net.minecraft.world.level.Level; import net.neoforged.bus.api.SubscribeEvent; import net.neoforged.neoforge.event.entity.EntityInvulnerabilityCheckEvent; import net.neoforged.neoforge.event.entity.living.LivingDeathEvent; -import net.neoforged.neoforge.event.entity.living.LivingEntityUseItemEvent; import net.neoforged.neoforge.event.entity.living.LivingIncomingDamageEvent; import net.neoforged.neoforge.event.entity.player.PlayerEvent; import net.neoforged.neoforge.event.entity.player.PlayerSetSpawnEvent; @@ -41,8 +38,6 @@ import java.io.File; import java.util.Arrays; -import static com.legobmw99.allomancy.modules.consumables.ConsumeSetup.FLAKE_STORAGE; - public final class CommonEventHandler { @@ -123,7 +118,7 @@ public static void onJoinWorld(final PlayerEvent.PlayerLoggedInEvent event) { @SubscribeEvent public static void onPlayerClone(final PlayerEvent.Clone event) { if (!event.getEntity().level().isClientSide() && event.getEntity() instanceof ServerPlayer player) { - if (event.isWasDeath() && !player.level().getGameRules().getBoolean(GameRules.RULE_KEEPINVENTORY)) { + if (event.isWasDeath() && !player.serverLevel().getGameRules().getBoolean(GameRules.RULE_KEEPINVENTORY)) { // if they died and keepInventory isn't set, they shouldn't keep their metals. var data = player.getData(AllomancerAttachment.ALLOMANCY_DATA); for (Metal mt : Metal.values()) { @@ -221,27 +216,6 @@ public static void onEntityHurt(final LivingIncomingDamageEvent event) { } } - - @SubscribeEvent - public static void onPlayerFinishUsingItem(final LivingEntityUseItemEvent.Finish event) { - FlakeStorage storage = event.getItem().get(FLAKE_STORAGE); - - if (storage == null || !event.getEntity().hasData(AllomancerAttachment.ALLOMANCY_DATA)) { - return; - } - var data = event.getEntity().getData(AllomancerAttachment.ALLOMANCY_DATA); - if (event.getItem().getItem() == Items.ENCHANTED_GOLDEN_APPLE && storage.contains(Metal.GOLD)) { - for (int i = 0; i < AllomancerData.MAX_STORAGE; i++) { - data.incrementStored(Metal.GOLD); - } - } - for (Metal mt : Metal.values()) { - if (storage.contains(mt)) { - data.incrementStored(mt); - } - } - } - @SubscribeEvent public static void onInvulnerabilityCheck(final EntityInvulnerabilityCheckEvent event) { if (event.getEntity() instanceof ServerPlayer player) { @@ -259,8 +233,8 @@ public static void onInvulnerabilityCheck(final EntityInvulnerabilityCheckEvent .equals(player .level() .registryAccess() - .registryOrThrow(Registries.DAMAGE_TYPE) - .getHolderOrThrow(DamageTypes.FALL) + .lookupOrThrow(Registries.DAMAGE_TYPE) + .getOrThrow(DamageTypes.FALL) .value())) { BlockPos on = player.getOnPos(); if (Physical.isBlockStateMetallic(player.level().getBlockState(on)) || diff --git a/src/main/java/com/legobmw99/allomancy/modules/powers/client/gui/MetalOverlay.java b/src/main/java/com/legobmw99/allomancy/modules/powers/client/gui/MetalOverlay.java index 2a0de19b..8cf43897 100644 --- a/src/main/java/com/legobmw99/allomancy/modules/powers/client/gui/MetalOverlay.java +++ b/src/main/java/com/legobmw99/allomancy/modules/powers/client/gui/MetalOverlay.java @@ -10,7 +10,8 @@ import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.gui.LayeredDraw; import net.minecraft.client.player.LocalPlayer; -import net.minecraft.client.renderer.GameRenderer; +import net.minecraft.client.renderer.CoreShaders; +import net.minecraft.client.renderer.RenderType; import net.minecraft.resources.ResourceLocation; import net.neoforged.neoforge.client.event.RegisterGuiLayersEvent; @@ -34,7 +35,7 @@ public final class MetalOverlay implements LayeredDraw.Layer { private MetalOverlay() {} public static void registerGUI(final RegisterGuiLayersEvent evt) { - evt.registerBelowAll(ResourceLocation.fromNamespaceAndPath(Allomancy.MODID, "metal_display"), + evt.registerAboveAll(ResourceLocation.fromNamespaceAndPath(Allomancy.MODID, "metal_display"), new MetalOverlay()); } @@ -45,7 +46,8 @@ private static void blit(GuiGraphics graphics, float vOffset, int uWidth, int vHeight) { - graphics.blit(meterLoc, x, y, 0, uOffset, vOffset, uWidth, vHeight, 128, 128); + graphics.blit(RenderType::guiTexturedOverlay, meterLoc, x, y, uOffset, vOffset, uWidth, vHeight, uWidth, + vHeight, 128, 128); } @Override @@ -71,7 +73,7 @@ public void render(GuiGraphics gui, DeltaTracker deltaTracker) { int renderX = PowersConfig.overlay_position.get().getX(gui.guiWidth()); int renderY = PowersConfig.overlay_position.get().getY(gui.guiHeight()); - RenderSystem.setShader(GameRenderer::getPositionTexShader); + RenderSystem.setShader(CoreShaders.POSITION_TEX); RenderSystem.setShaderTexture(0, meterLoc); diff --git a/src/main/java/com/legobmw99/allomancy/modules/powers/client/gui/MetalSelectScreen.java b/src/main/java/com/legobmw99/allomancy/modules/powers/client/gui/MetalSelectScreen.java index bb11ddd3..94f54ebd 100644 --- a/src/main/java/com/legobmw99/allomancy/modules/powers/client/gui/MetalSelectScreen.java +++ b/src/main/java/com/legobmw99/allomancy/modules/powers/client/gui/MetalSelectScreen.java @@ -21,7 +21,8 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.gui.screens.Screen; -import net.minecraft.client.renderer.GameRenderer; +import net.minecraft.client.renderer.CoreShaders; +import net.minecraft.client.renderer.RenderType; import net.minecraft.network.chat.Component; import net.minecraft.resources.ResourceLocation; import net.minecraft.sounds.SoundEvents; @@ -83,7 +84,7 @@ public void render(GuiGraphics guiGraphics, int mx, int my, float partialTicks) RenderSystem.disableCull(); RenderSystem.enableBlend(); - RenderSystem.setShader(GameRenderer::getPositionColorShader); + RenderSystem.setShader(CoreShaders.POSITION_COLOR); for (int seg = 0; seg < segments; seg++) { @@ -156,9 +157,10 @@ public void render(GuiGraphics guiGraphics, int mx, int my, float partialTicks) double mod = 0.8; int xdp = (int) ((xp - x) * mod + x); int ydp = (int) ((yp - y) * mod + y); - RenderSystem.setShader(GameRenderer::getPositionTexShader); + RenderSystem.setShader(CoreShaders.POSITION_TEX); RenderSystem.setShaderTexture(0, METAL_ICONS[toMetalIndex(seg)]); - guiGraphics.blit(METAL_ICONS[toMetalIndex(seg)], xdp - 8, ydp - 8, 0, 0, 16, 16, 16, 16); + guiGraphics.blit(RenderType::guiTexturedOverlay, METAL_ICONS[toMetalIndex(seg)], xdp - 8, ydp - 8, 0, 0, + 16, 16, 16, 16); } diff --git a/src/main/java/com/legobmw99/allomancy/modules/powers/client/util/Inputs.java b/src/main/java/com/legobmw99/allomancy/modules/powers/client/util/Inputs.java index 3c5fb6f5..fb013ac3 100644 --- a/src/main/java/com/legobmw99/allomancy/modules/powers/client/util/Inputs.java +++ b/src/main/java/com/legobmw99/allomancy/modules/powers/client/util/Inputs.java @@ -5,15 +5,10 @@ import com.legobmw99.allomancy.modules.powers.client.gui.MetalSelectScreen; import com.legobmw99.allomancy.modules.powers.client.network.PowerRequests; import com.legobmw99.allomancy.modules.powers.data.AllomancerAttachment; -import com.mojang.blaze3d.platform.InputConstants; import net.minecraft.client.KeyMapping; import net.minecraft.client.Minecraft; -import net.minecraft.client.Options; -import net.minecraft.client.player.Input; -import net.minecraft.client.player.LocalPlayer; -import net.minecraft.world.effect.MobEffects; +import net.minecraft.client.player.ClientInput; import net.minecraft.world.entity.Entity; -import net.minecraft.world.entity.ai.attributes.Attributes; import net.minecraft.world.entity.player.Player; import net.minecraft.world.entity.projectile.ProjectileUtil; import net.minecraft.world.phys.AABB; @@ -42,7 +37,7 @@ private Inputs() {} @Nullable public static HitResult getMouseOverExtended(float dist) { var mc = Minecraft.getInstance(); - float partialTicks = mc.getTimer().getGameTimeDeltaPartialTick(false); + float partialTicks = mc.getDeltaTracker().getGameTimeDeltaPartialTick(false); HitResult objectMouseOver = null; Entity entity = mc.getCameraEntity(); if (entity != null) { @@ -73,35 +68,41 @@ public static HitResult getMouseOverExtended(float dist) { } - public static void fakeMovement(Input input) { - Options options = Minecraft.getInstance().options; - LocalPlayer player = Minecraft.getInstance().player; - float f = (float) player.getAttributeValue(Attributes.SNEAKING_SPEED); - var window = Minecraft.getInstance().getWindow().getWindow(); - // from KeyboardInput#tick - input.up = InputConstants.isKeyDown(window, options.keyUp.getKey().getValue()); - input.down = InputConstants.isKeyDown(window, options.keyDown.getKey().getValue()); - input.left = InputConstants.isKeyDown(window, options.keyLeft.getKey().getValue()); - input.right = InputConstants.isKeyDown(window, options.keyRight.getKey().getValue()); - input.forwardImpulse = input.up == input.down ? 0.0f : (input.up ? 1.0f : -1.0f); - input.leftImpulse = input.left == input.right ? 0.0f : (input.left ? 1.0f : -1.0f); - input.jumping = InputConstants.isKeyDown(window, options.keyJump.getKey().getValue()); - input.shiftKeyDown = InputConstants.isKeyDown(window, options.keyShift.getKey().getValue()); - if (player.isMovingSlowly()) { - input.leftImpulse *= f; - input.forwardImpulse *= f; + private static float calculateImpulse(boolean input, boolean otherInput) { + if (input == otherInput) { + return 0.0F; + } else { + return input ? 1.0F : -1.0F; } + } - // from LocalPlayer#aiStep - if (!player.isSprinting() && (!(player.isInWater() || player.isInFluidType( - (fluidType, height) -> player.canSwimInFluidType(fluidType))) || - (player.isUnderWater() || player.canStartSwimming())) && - input.forwardImpulse >= 0.8 && !player.isUsingItem() && - (player.getFoodData().getFoodLevel() > 6.0F || player.mayFly()) && - !player.hasEffect(MobEffects.BLINDNESS) && - InputConstants.isKeyDown(window, options.keySprint.getKey().getValue())) { - player.setSprinting(true); - } + public static void fakeMovement(ClientInput input) { + // TODO not working + // // See similar code in https://github.com/gigaherz/ToolBelt/blob/master/src/main/java/dev/gigaherz/toolbelt/client/ToolBeltClient.java#L186 + // Options options = Minecraft.getInstance().options; + // LocalPlayer player = Minecraft.getInstance().player; + // var window = Minecraft.getInstance().getWindow().getWindow(); + // + // input.tick(); + // // from KeyboardInput#tick + // input.keyPresses = new Input(options.keyUp.isDown(), options.keyDown.isDown(), options.keyLeft + // .isDown(), + // options.keyRight.isDown(), options.keyJump.isDown(), options + // .keyShift.isDown(), + // options.keySprint.isDown()); + // input.forwardImpulse = calculateImpulse(input.keyPresses.forward(), input.keyPresses.backward()); + // input.leftImpulse = calculateImpulse(input.keyPresses.left(), input.keyPresses.right()); + + // // from LocalPlayer#aiStep + // if (!player.isSprinting() && (!(player.isInWater() || player.isInFluidType( + // (fluidType, height) -> player.canSwimInFluidType(fluidType))) || + // (player.isUnderWater() || player.canStartSwimming())) && + // input.forwardImpulse >= 0.8 && !player.isUsingItem() && + // (player.getFoodData().getFoodLevel() > 6.0F || player.mayFly()) && + // !player.hasEffect(MobEffects.BLINDNESS) && + // InputConstants.isKeyDown(window, options.keySprint.getKey().getValue())) { + // player.setSprinting(true); + // } } public static void registerKeyBinding(final RegisterKeyMappingsEvent evt) { diff --git a/src/main/java/com/legobmw99/allomancy/modules/powers/client/util/Rendering.java b/src/main/java/com/legobmw99/allomancy/modules/powers/client/util/Rendering.java index 9ba0d11c..9a05447b 100644 --- a/src/main/java/com/legobmw99/allomancy/modules/powers/client/util/Rendering.java +++ b/src/main/java/com/legobmw99/allomancy/modules/powers/client/util/Rendering.java @@ -3,7 +3,7 @@ import com.mojang.blaze3d.systems.RenderSystem; import com.mojang.blaze3d.vertex.*; import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.GameRenderer; +import net.minecraft.client.renderer.CoreShaders; import net.minecraft.world.phys.Vec3; import org.joml.Matrix4f; @@ -39,7 +39,6 @@ public static void drawMetalLine(PoseStack stack, public static void doneDrawingLines(PoseStack stack) { stack.popPose(); - RenderSystem.applyModelViewMatrix(); RenderSystem.disableBlend(); RenderSystem.enablePolygonOffset(); @@ -50,7 +49,7 @@ public static void doneDrawingLines(PoseStack stack) { } public static PoseStack prepareToDrawLines(PoseStack start) { - RenderSystem.setShader(GameRenderer::getRendertypeLinesShader); + RenderSystem.setShader(CoreShaders.RENDERTYPE_LINES); RenderSystem.disableDepthTest(); RenderSystem.depthMask(false); RenderSystem.disableCull(); @@ -61,7 +60,6 @@ public static PoseStack prepareToDrawLines(PoseStack start) { start.pushPose(); Vec3 view = Minecraft.getInstance().gameRenderer.getMainCamera().getPosition(); start.translate(-view.x, -view.y, -view.z); - RenderSystem.applyModelViewMatrix(); return start; } } diff --git a/src/main/java/com/legobmw99/allomancy/modules/powers/client/util/Tracking.java b/src/main/java/com/legobmw99/allomancy/modules/powers/client/util/Tracking.java index df0f5e5b..cc7fa6c9 100644 --- a/src/main/java/com/legobmw99/allomancy/modules/powers/client/util/Tracking.java +++ b/src/main/java/com/legobmw99/allomancy/modules/powers/client/util/Tracking.java @@ -64,8 +64,8 @@ public void tick() { // Add metal blobs to metal list if (this.blobFuture == null || this.blobFuture.isDone()) { - // TODO cache chunks? https://github.com/TelepathicGrunt/Bumblezone/blob/c8ca66e62e102d512393bec7186e3764e13434bf/common/src/main/java/com/telepathicgrunt/the_bumblezone/items/essence/LifeEssence.java#L150-L192 - this.blobFuture = Util.backgroundExecutor().submit(() -> { + // future: cache chunks? https://github.com/TelepathicGrunt/Bumblezone/blob/c8ca66e62e102d512393bec7186e3764e13434bf/common/src/main/java/com/telepathicgrunt/the_bumblezone/items/essence/LifeEssence.java#L150-L192 + this.blobFuture = Util.backgroundExecutor().service().submit(() -> { this.seen.clear(); BlockPos .betweenClosed(negative.getX(), negative.getY(), negative.getZ(), positive.getX(), @@ -78,7 +78,7 @@ public void tick() { } else if (this.blobFuture != null) { // previously we were burning this.blobFuture = null; - this.metal_blobs.clearBothAsync(Util.backgroundExecutor()); + this.metal_blobs.clearBothAsync(Util.backgroundExecutor().service()); this.metal_entities.clear(); } diff --git a/src/main/java/com/legobmw99/allomancy/modules/powers/data/AllomancerData.java b/src/main/java/com/legobmw99/allomancy/modules/powers/data/AllomancerData.java index e62a1279..03ec0833 100644 --- a/src/main/java/com/legobmw99/allomancy/modules/powers/data/AllomancerData.java +++ b/src/main/java/com/legobmw99/allomancy/modules/powers/data/AllomancerData.java @@ -202,7 +202,6 @@ public ResourceKey getDeathDim() { if (this.death_dimension == null) { return null; } - // TODO figure out if this is what the holder is for return ResourceKey.create(Registries.DIMENSION, ResourceLocation.parse(this.death_dimension)); } diff --git a/src/main/java/com/legobmw99/allomancy/modules/powers/entity/ai/AIAttackOnCollideExtended.java b/src/main/java/com/legobmw99/allomancy/modules/powers/entity/ai/AIAttackOnCollideExtended.java index 2214a7b4..90a69e37 100644 --- a/src/main/java/com/legobmw99/allomancy/modules/powers/entity/ai/AIAttackOnCollideExtended.java +++ b/src/main/java/com/legobmw99/allomancy/modules/powers/entity/ai/AIAttackOnCollideExtended.java @@ -140,7 +140,7 @@ public void tick() { } if (this.attacker instanceof Monster) { - this.attacker.doHurtTarget(livingEntity); + this.attacker.doHurtTarget(getServerLevel(livingEntity), livingEntity); } else { livingEntity.hurt(livingEntity.level().damageSources().mobAttack(this.attacker), 3); } diff --git a/src/main/java/com/legobmw99/allomancy/modules/powers/util/Emotional.java b/src/main/java/com/legobmw99/allomancy/modules/powers/util/Emotional.java index 54d940e4..d5e26ea4 100644 --- a/src/main/java/com/legobmw99/allomancy/modules/powers/util/Emotional.java +++ b/src/main/java/com/legobmw99/allomancy/modules/powers/util/Emotional.java @@ -4,6 +4,7 @@ import com.legobmw99.allomancy.modules.combat.CombatSetup; import com.legobmw99.allomancy.modules.powers.entity.ai.AIAttackOnCollideExtended; import com.legobmw99.allomancy.modules.powers.entity.ai.AIEvilAttack; +import net.minecraft.server.level.ServerLevel; import net.minecraft.world.entity.EquipmentSlot; import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.entity.PathfinderMob; @@ -46,7 +47,7 @@ public static void riot(PathfinderMob target, Player allomancer, boolean enhance //Add new goals target.setTarget(allomancer); target.setLastHurtByMob(allomancer); - // TODO: try to use PrioritizedGoal::startExecuting for already hostiles + // future: try to use PrioritizedGoal::startExecuting for already hostiles target.targetSelector.addGoal(1, new AIAttackOnCollideExtended(target, 1.0d, false)); target.targetSelector.addGoal(2, new NearestAttackableTargetGoal<>(target, Player.class, false)); target.targetSelector.addGoal(1, new NearestAttackableTargetGoal<>(target, target.getClass(), false)); @@ -75,7 +76,9 @@ public static void riot(PathfinderMob target, Player allomancer, boolean enhance .level() .explode(target, target.position().x(), target.position().y(), target.position().z(), 1.2F, false, Level.ExplosionInteraction.MOB); - target.kill(); + if (target.level() instanceof ServerLevel level) { + target.kill(level); + } } } catch (Exception e) { Allomancy.LOGGER.error("Failed to riot entity {}! Please report this error!", target, e); diff --git a/src/main/java/com/legobmw99/allomancy/modules/powers/util/Enhancement.java b/src/main/java/com/legobmw99/allomancy/modules/powers/util/Enhancement.java index 340769fa..387d1673 100644 --- a/src/main/java/com/legobmw99/allomancy/modules/powers/util/Enhancement.java +++ b/src/main/java/com/legobmw99/allomancy/modules/powers/util/Enhancement.java @@ -11,11 +11,12 @@ import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.player.Player; import net.minecraft.world.level.Level; -import net.minecraft.world.level.portal.DimensionTransition; +import net.minecraft.world.level.portal.TeleportTransition; import net.minecraft.world.phys.AABB; import net.minecraft.world.phys.Vec3; -import static net.minecraft.world.level.portal.DimensionTransition.DO_NOTHING; +import static net.minecraft.world.level.portal.TeleportTransition.DO_NOTHING; + public final class Enhancement { private Enhancement() {} @@ -52,9 +53,9 @@ private static void teleport(Player player, Level world, ResourceKey dime if (player.level().dimension() != dimension) { //change dimension - player = (Player) player.changeDimension( - new DimensionTransition(world.getServer().getLevel(dimension), Vec3.atBottomCenterOf(pos), - Vec3.ZERO, player.getXRot(), player.getYRot(), DO_NOTHING)); + player = (Player) player.teleport( + new TeleportTransition(world.getServer().getLevel(dimension), Vec3.atBottomCenterOf(pos), + Vec3.ZERO, player.getXRot(), player.getYRot(), DO_NOTHING)); } player.teleportTo(pos.getX(), pos.getY() + 1.5, pos.getZ()); diff --git a/src/main/java/com/legobmw99/allomancy/modules/powers/util/Physical.java b/src/main/java/com/legobmw99/allomancy/modules/powers/util/Physical.java index f2725387..3e1c534c 100644 --- a/src/main/java/com/legobmw99/allomancy/modules/powers/util/Physical.java +++ b/src/main/java/com/legobmw99/allomancy/modules/powers/util/Physical.java @@ -132,6 +132,7 @@ public static void lurch(double directionScalar, Entity toMove, BlockPos block) // Only save players from fall damage if (toMove instanceof ServerPlayer) { + // TODO should also change startingToFallPosition? toMove.fallDistance = 0; } } @@ -206,6 +207,9 @@ public static List default_whitelist() { add(Items.MUSIC_DISC_CREATOR_MUSIC_BOX); add(Items.TRIAL_KEY); add(Items.OMINOUS_TRIAL_KEY); + add(Items.MACE); + add(Items.SPYGLASS); + add(Items.BOLT_ARMOR_TRIM_SMITHING_TEMPLATE); add(Blocks.ANVIL); add(Blocks.CHIPPED_ANVIL); diff --git a/src/main/resources/assets/allomancy/items/allomantic_grinder.json b/src/main/resources/assets/allomancy/items/allomantic_grinder.json new file mode 100644 index 00000000..87124729 --- /dev/null +++ b/src/main/resources/assets/allomancy/items/allomantic_grinder.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "allomancy:item/allomantic_grinder" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/allomancy/items/aluminum_block.json b/src/main/resources/assets/allomancy/items/aluminum_block.json new file mode 100644 index 00000000..2446d381 --- /dev/null +++ b/src/main/resources/assets/allomancy/items/aluminum_block.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "allomancy:item/aluminum_block" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/allomancy/items/aluminum_flakes.json b/src/main/resources/assets/allomancy/items/aluminum_flakes.json new file mode 100644 index 00000000..e922b9a6 --- /dev/null +++ b/src/main/resources/assets/allomancy/items/aluminum_flakes.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "allomancy:item/aluminum_flakes" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/allomancy/items/aluminum_helmet.json b/src/main/resources/assets/allomancy/items/aluminum_helmet.json new file mode 100644 index 00000000..f77a120e --- /dev/null +++ b/src/main/resources/assets/allomancy/items/aluminum_helmet.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "allomancy:item/aluminum_helmet" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/allomancy/items/aluminum_ingot.json b/src/main/resources/assets/allomancy/items/aluminum_ingot.json new file mode 100644 index 00000000..aa7685bc --- /dev/null +++ b/src/main/resources/assets/allomancy/items/aluminum_ingot.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "allomancy:item/aluminum_ingot" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/allomancy/items/aluminum_nugget.json b/src/main/resources/assets/allomancy/items/aluminum_nugget.json new file mode 100644 index 00000000..d229b826 --- /dev/null +++ b/src/main/resources/assets/allomancy/items/aluminum_nugget.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "allomancy:item/aluminum_nugget" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/allomancy/items/aluminum_ore.json b/src/main/resources/assets/allomancy/items/aluminum_ore.json new file mode 100644 index 00000000..4c9790a1 --- /dev/null +++ b/src/main/resources/assets/allomancy/items/aluminum_ore.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "allomancy:item/aluminum_ore" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/allomancy/items/aluminum_pattern.json b/src/main/resources/assets/allomancy/items/aluminum_pattern.json new file mode 100644 index 00000000..ab526905 --- /dev/null +++ b/src/main/resources/assets/allomancy/items/aluminum_pattern.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "allomancy:item/aluminum_pattern" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/allomancy/items/bendalloy_block.json b/src/main/resources/assets/allomancy/items/bendalloy_block.json new file mode 100644 index 00000000..e1825429 --- /dev/null +++ b/src/main/resources/assets/allomancy/items/bendalloy_block.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "allomancy:item/bendalloy_block" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/allomancy/items/bendalloy_flakes.json b/src/main/resources/assets/allomancy/items/bendalloy_flakes.json new file mode 100644 index 00000000..266dc14f --- /dev/null +++ b/src/main/resources/assets/allomancy/items/bendalloy_flakes.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "allomancy:item/bendalloy_flakes" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/allomancy/items/bendalloy_ingot.json b/src/main/resources/assets/allomancy/items/bendalloy_ingot.json new file mode 100644 index 00000000..cc8d9357 --- /dev/null +++ b/src/main/resources/assets/allomancy/items/bendalloy_ingot.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "allomancy:item/bendalloy_ingot" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/allomancy/items/bendalloy_nugget.json b/src/main/resources/assets/allomancy/items/bendalloy_nugget.json new file mode 100644 index 00000000..99ddb522 --- /dev/null +++ b/src/main/resources/assets/allomancy/items/bendalloy_nugget.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "allomancy:item/bendalloy_nugget" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/allomancy/items/bendalloy_pattern.json b/src/main/resources/assets/allomancy/items/bendalloy_pattern.json new file mode 100644 index 00000000..295d43d8 --- /dev/null +++ b/src/main/resources/assets/allomancy/items/bendalloy_pattern.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "allomancy:item/bendalloy_pattern" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/allomancy/items/brass_block.json b/src/main/resources/assets/allomancy/items/brass_block.json new file mode 100644 index 00000000..8ff451f3 --- /dev/null +++ b/src/main/resources/assets/allomancy/items/brass_block.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "allomancy:item/brass_block" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/allomancy/items/brass_flakes.json b/src/main/resources/assets/allomancy/items/brass_flakes.json new file mode 100644 index 00000000..24f217cc --- /dev/null +++ b/src/main/resources/assets/allomancy/items/brass_flakes.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "allomancy:item/brass_flakes" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/allomancy/items/brass_ingot.json b/src/main/resources/assets/allomancy/items/brass_ingot.json new file mode 100644 index 00000000..175044a1 --- /dev/null +++ b/src/main/resources/assets/allomancy/items/brass_ingot.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "allomancy:item/brass_ingot" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/allomancy/items/brass_nugget.json b/src/main/resources/assets/allomancy/items/brass_nugget.json new file mode 100644 index 00000000..b454d593 --- /dev/null +++ b/src/main/resources/assets/allomancy/items/brass_nugget.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "allomancy:item/brass_nugget" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/allomancy/items/brass_pattern.json b/src/main/resources/assets/allomancy/items/brass_pattern.json new file mode 100644 index 00000000..402f13d7 --- /dev/null +++ b/src/main/resources/assets/allomancy/items/brass_pattern.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "allomancy:item/brass_pattern" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/allomancy/items/bronze_block.json b/src/main/resources/assets/allomancy/items/bronze_block.json new file mode 100644 index 00000000..d2824c4d --- /dev/null +++ b/src/main/resources/assets/allomancy/items/bronze_block.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "allomancy:item/bronze_block" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/allomancy/items/bronze_flakes.json b/src/main/resources/assets/allomancy/items/bronze_flakes.json new file mode 100644 index 00000000..f32e6803 --- /dev/null +++ b/src/main/resources/assets/allomancy/items/bronze_flakes.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "allomancy:item/bronze_flakes" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/allomancy/items/bronze_ingot.json b/src/main/resources/assets/allomancy/items/bronze_ingot.json new file mode 100644 index 00000000..d6a88b58 --- /dev/null +++ b/src/main/resources/assets/allomancy/items/bronze_ingot.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "allomancy:item/bronze_ingot" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/allomancy/items/bronze_nugget.json b/src/main/resources/assets/allomancy/items/bronze_nugget.json new file mode 100644 index 00000000..b810d440 --- /dev/null +++ b/src/main/resources/assets/allomancy/items/bronze_nugget.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "allomancy:item/bronze_nugget" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/allomancy/items/bronze_pattern.json b/src/main/resources/assets/allomancy/items/bronze_pattern.json new file mode 100644 index 00000000..bfc8ef2d --- /dev/null +++ b/src/main/resources/assets/allomancy/items/bronze_pattern.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "allomancy:item/bronze_pattern" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/allomancy/items/cadmium_block.json b/src/main/resources/assets/allomancy/items/cadmium_block.json new file mode 100644 index 00000000..b8039ba5 --- /dev/null +++ b/src/main/resources/assets/allomancy/items/cadmium_block.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "allomancy:item/cadmium_block" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/allomancy/items/cadmium_flakes.json b/src/main/resources/assets/allomancy/items/cadmium_flakes.json new file mode 100644 index 00000000..094fb016 --- /dev/null +++ b/src/main/resources/assets/allomancy/items/cadmium_flakes.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "allomancy:item/cadmium_flakes" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/allomancy/items/cadmium_ingot.json b/src/main/resources/assets/allomancy/items/cadmium_ingot.json new file mode 100644 index 00000000..95478d20 --- /dev/null +++ b/src/main/resources/assets/allomancy/items/cadmium_ingot.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "allomancy:item/cadmium_ingot" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/allomancy/items/cadmium_nugget.json b/src/main/resources/assets/allomancy/items/cadmium_nugget.json new file mode 100644 index 00000000..ce3cc0b4 --- /dev/null +++ b/src/main/resources/assets/allomancy/items/cadmium_nugget.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "allomancy:item/cadmium_nugget" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/allomancy/items/cadmium_ore.json b/src/main/resources/assets/allomancy/items/cadmium_ore.json new file mode 100644 index 00000000..5e4f6383 --- /dev/null +++ b/src/main/resources/assets/allomancy/items/cadmium_ore.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "allomancy:item/cadmium_ore" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/allomancy/items/cadmium_pattern.json b/src/main/resources/assets/allomancy/items/cadmium_pattern.json new file mode 100644 index 00000000..993d5f96 --- /dev/null +++ b/src/main/resources/assets/allomancy/items/cadmium_pattern.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "allomancy:item/cadmium_pattern" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/allomancy/items/chromium_block.json b/src/main/resources/assets/allomancy/items/chromium_block.json new file mode 100644 index 00000000..248ea286 --- /dev/null +++ b/src/main/resources/assets/allomancy/items/chromium_block.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "allomancy:item/chromium_block" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/allomancy/items/chromium_flakes.json b/src/main/resources/assets/allomancy/items/chromium_flakes.json new file mode 100644 index 00000000..5fb40acb --- /dev/null +++ b/src/main/resources/assets/allomancy/items/chromium_flakes.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "allomancy:item/chromium_flakes" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/allomancy/items/chromium_ingot.json b/src/main/resources/assets/allomancy/items/chromium_ingot.json new file mode 100644 index 00000000..b2975489 --- /dev/null +++ b/src/main/resources/assets/allomancy/items/chromium_ingot.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "allomancy:item/chromium_ingot" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/allomancy/items/chromium_nugget.json b/src/main/resources/assets/allomancy/items/chromium_nugget.json new file mode 100644 index 00000000..e01917e9 --- /dev/null +++ b/src/main/resources/assets/allomancy/items/chromium_nugget.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "allomancy:item/chromium_nugget" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/allomancy/items/chromium_ore.json b/src/main/resources/assets/allomancy/items/chromium_ore.json new file mode 100644 index 00000000..913daddd --- /dev/null +++ b/src/main/resources/assets/allomancy/items/chromium_ore.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "allomancy:item/chromium_ore" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/allomancy/items/chromium_pattern.json b/src/main/resources/assets/allomancy/items/chromium_pattern.json new file mode 100644 index 00000000..fb5fa6d8 --- /dev/null +++ b/src/main/resources/assets/allomancy/items/chromium_pattern.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "allomancy:item/chromium_pattern" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/allomancy/items/coin_bag.json b/src/main/resources/assets/allomancy/items/coin_bag.json new file mode 100644 index 00000000..d7a00b26 --- /dev/null +++ b/src/main/resources/assets/allomancy/items/coin_bag.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "allomancy:item/coin_bag" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/allomancy/items/copper_flakes.json b/src/main/resources/assets/allomancy/items/copper_flakes.json new file mode 100644 index 00000000..d50a8836 --- /dev/null +++ b/src/main/resources/assets/allomancy/items/copper_flakes.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "allomancy:item/copper_flakes" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/allomancy/items/copper_pattern.json b/src/main/resources/assets/allomancy/items/copper_pattern.json new file mode 100644 index 00000000..ac98a0ab --- /dev/null +++ b/src/main/resources/assets/allomancy/items/copper_pattern.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "allomancy:item/copper_pattern" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/allomancy/items/deepslate_aluminum_ore.json b/src/main/resources/assets/allomancy/items/deepslate_aluminum_ore.json new file mode 100644 index 00000000..fd402210 --- /dev/null +++ b/src/main/resources/assets/allomancy/items/deepslate_aluminum_ore.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "allomancy:item/deepslate_aluminum_ore" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/allomancy/items/deepslate_cadmium_ore.json b/src/main/resources/assets/allomancy/items/deepslate_cadmium_ore.json new file mode 100644 index 00000000..8042c985 --- /dev/null +++ b/src/main/resources/assets/allomancy/items/deepslate_cadmium_ore.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "allomancy:item/deepslate_cadmium_ore" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/allomancy/items/deepslate_chromium_ore.json b/src/main/resources/assets/allomancy/items/deepslate_chromium_ore.json new file mode 100644 index 00000000..ec671fab --- /dev/null +++ b/src/main/resources/assets/allomancy/items/deepslate_chromium_ore.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "allomancy:item/deepslate_chromium_ore" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/allomancy/items/deepslate_lead_ore.json b/src/main/resources/assets/allomancy/items/deepslate_lead_ore.json new file mode 100644 index 00000000..ab2eb4e2 --- /dev/null +++ b/src/main/resources/assets/allomancy/items/deepslate_lead_ore.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "allomancy:item/deepslate_lead_ore" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/allomancy/items/deepslate_silver_ore.json b/src/main/resources/assets/allomancy/items/deepslate_silver_ore.json new file mode 100644 index 00000000..59ae8ba1 --- /dev/null +++ b/src/main/resources/assets/allomancy/items/deepslate_silver_ore.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "allomancy:item/deepslate_silver_ore" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/allomancy/items/deepslate_tin_ore.json b/src/main/resources/assets/allomancy/items/deepslate_tin_ore.json new file mode 100644 index 00000000..7aa5a3f9 --- /dev/null +++ b/src/main/resources/assets/allomancy/items/deepslate_tin_ore.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "allomancy:item/deepslate_tin_ore" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/allomancy/items/deepslate_zinc_ore.json b/src/main/resources/assets/allomancy/items/deepslate_zinc_ore.json new file mode 100644 index 00000000..293def46 --- /dev/null +++ b/src/main/resources/assets/allomancy/items/deepslate_zinc_ore.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "allomancy:item/deepslate_zinc_ore" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/allomancy/items/duralumin_block.json b/src/main/resources/assets/allomancy/items/duralumin_block.json new file mode 100644 index 00000000..e126be8f --- /dev/null +++ b/src/main/resources/assets/allomancy/items/duralumin_block.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "allomancy:item/duralumin_block" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/allomancy/items/duralumin_flakes.json b/src/main/resources/assets/allomancy/items/duralumin_flakes.json new file mode 100644 index 00000000..cd3e3df8 --- /dev/null +++ b/src/main/resources/assets/allomancy/items/duralumin_flakes.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "allomancy:item/duralumin_flakes" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/allomancy/items/duralumin_ingot.json b/src/main/resources/assets/allomancy/items/duralumin_ingot.json new file mode 100644 index 00000000..9ee45b26 --- /dev/null +++ b/src/main/resources/assets/allomancy/items/duralumin_ingot.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "allomancy:item/duralumin_ingot" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/allomancy/items/duralumin_nugget.json b/src/main/resources/assets/allomancy/items/duralumin_nugget.json new file mode 100644 index 00000000..00c4d206 --- /dev/null +++ b/src/main/resources/assets/allomancy/items/duralumin_nugget.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "allomancy:item/duralumin_nugget" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/allomancy/items/duralumin_pattern.json b/src/main/resources/assets/allomancy/items/duralumin_pattern.json new file mode 100644 index 00000000..9efbda0f --- /dev/null +++ b/src/main/resources/assets/allomancy/items/duralumin_pattern.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "allomancy:item/duralumin_pattern" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/allomancy/items/electrum_block.json b/src/main/resources/assets/allomancy/items/electrum_block.json new file mode 100644 index 00000000..f7bc7375 --- /dev/null +++ b/src/main/resources/assets/allomancy/items/electrum_block.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "allomancy:item/electrum_block" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/allomancy/items/electrum_flakes.json b/src/main/resources/assets/allomancy/items/electrum_flakes.json new file mode 100644 index 00000000..e44793e8 --- /dev/null +++ b/src/main/resources/assets/allomancy/items/electrum_flakes.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "allomancy:item/electrum_flakes" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/allomancy/items/electrum_ingot.json b/src/main/resources/assets/allomancy/items/electrum_ingot.json new file mode 100644 index 00000000..10584433 --- /dev/null +++ b/src/main/resources/assets/allomancy/items/electrum_ingot.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "allomancy:item/electrum_ingot" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/allomancy/items/electrum_nugget.json b/src/main/resources/assets/allomancy/items/electrum_nugget.json new file mode 100644 index 00000000..31f63dc6 --- /dev/null +++ b/src/main/resources/assets/allomancy/items/electrum_nugget.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "allomancy:item/electrum_nugget" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/allomancy/items/electrum_pattern.json b/src/main/resources/assets/allomancy/items/electrum_pattern.json new file mode 100644 index 00000000..44051c2b --- /dev/null +++ b/src/main/resources/assets/allomancy/items/electrum_pattern.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "allomancy:item/electrum_pattern" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/allomancy/items/gold_flakes.json b/src/main/resources/assets/allomancy/items/gold_flakes.json new file mode 100644 index 00000000..365feaf8 --- /dev/null +++ b/src/main/resources/assets/allomancy/items/gold_flakes.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "allomancy:item/gold_flakes" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/allomancy/items/gold_pattern.json b/src/main/resources/assets/allomancy/items/gold_pattern.json new file mode 100644 index 00000000..eb100758 --- /dev/null +++ b/src/main/resources/assets/allomancy/items/gold_pattern.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "allomancy:item/gold_pattern" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/allomancy/items/inverted_iron_button.json b/src/main/resources/assets/allomancy/items/inverted_iron_button.json new file mode 100644 index 00000000..d37bc413 --- /dev/null +++ b/src/main/resources/assets/allomancy/items/inverted_iron_button.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "allomancy:item/inverted_iron_button" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/allomancy/items/iron_button.json b/src/main/resources/assets/allomancy/items/iron_button.json new file mode 100644 index 00000000..4fda970e --- /dev/null +++ b/src/main/resources/assets/allomancy/items/iron_button.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "allomancy:item/iron_button" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/allomancy/items/iron_flakes.json b/src/main/resources/assets/allomancy/items/iron_flakes.json new file mode 100644 index 00000000..91ddd9a6 --- /dev/null +++ b/src/main/resources/assets/allomancy/items/iron_flakes.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "allomancy:item/iron_flakes" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/allomancy/items/iron_lever.json b/src/main/resources/assets/allomancy/items/iron_lever.json new file mode 100644 index 00000000..60f210f0 --- /dev/null +++ b/src/main/resources/assets/allomancy/items/iron_lever.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "allomancy:item/iron_lever" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/allomancy/items/iron_pattern.json b/src/main/resources/assets/allomancy/items/iron_pattern.json new file mode 100644 index 00000000..f3c913ad --- /dev/null +++ b/src/main/resources/assets/allomancy/items/iron_pattern.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "allomancy:item/iron_pattern" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/allomancy/items/koloss_blade.json b/src/main/resources/assets/allomancy/items/koloss_blade.json new file mode 100644 index 00000000..1bb26ce0 --- /dev/null +++ b/src/main/resources/assets/allomancy/items/koloss_blade.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "allomancy:item/koloss_blade" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/allomancy/items/lead_block.json b/src/main/resources/assets/allomancy/items/lead_block.json new file mode 100644 index 00000000..3f7f4e43 --- /dev/null +++ b/src/main/resources/assets/allomancy/items/lead_block.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "allomancy:item/lead_block" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/allomancy/items/lead_flakes.json b/src/main/resources/assets/allomancy/items/lead_flakes.json new file mode 100644 index 00000000..6d630f74 --- /dev/null +++ b/src/main/resources/assets/allomancy/items/lead_flakes.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "allomancy:item/lead_flakes" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/allomancy/items/lead_ingot.json b/src/main/resources/assets/allomancy/items/lead_ingot.json new file mode 100644 index 00000000..fc496c90 --- /dev/null +++ b/src/main/resources/assets/allomancy/items/lead_ingot.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "allomancy:item/lead_ingot" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/allomancy/items/lead_nugget.json b/src/main/resources/assets/allomancy/items/lead_nugget.json new file mode 100644 index 00000000..b4424856 --- /dev/null +++ b/src/main/resources/assets/allomancy/items/lead_nugget.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "allomancy:item/lead_nugget" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/allomancy/items/lead_ore.json b/src/main/resources/assets/allomancy/items/lead_ore.json new file mode 100644 index 00000000..bdd0a617 --- /dev/null +++ b/src/main/resources/assets/allomancy/items/lead_ore.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "allomancy:item/lead_ore" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/allomancy/items/lerasium_nugget.json b/src/main/resources/assets/allomancy/items/lerasium_nugget.json new file mode 100644 index 00000000..7573ac61 --- /dev/null +++ b/src/main/resources/assets/allomancy/items/lerasium_nugget.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "allomancy:item/lerasium_nugget" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/allomancy/items/mistcloak.json b/src/main/resources/assets/allomancy/items/mistcloak.json new file mode 100644 index 00000000..edb5bcac --- /dev/null +++ b/src/main/resources/assets/allomancy/items/mistcloak.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "allomancy:item/mistcloak" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/allomancy/items/nicrosil_block.json b/src/main/resources/assets/allomancy/items/nicrosil_block.json new file mode 100644 index 00000000..666c5192 --- /dev/null +++ b/src/main/resources/assets/allomancy/items/nicrosil_block.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "allomancy:item/nicrosil_block" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/allomancy/items/nicrosil_flakes.json b/src/main/resources/assets/allomancy/items/nicrosil_flakes.json new file mode 100644 index 00000000..ad1b0080 --- /dev/null +++ b/src/main/resources/assets/allomancy/items/nicrosil_flakes.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "allomancy:item/nicrosil_flakes" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/allomancy/items/nicrosil_ingot.json b/src/main/resources/assets/allomancy/items/nicrosil_ingot.json new file mode 100644 index 00000000..4bbb1065 --- /dev/null +++ b/src/main/resources/assets/allomancy/items/nicrosil_ingot.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "allomancy:item/nicrosil_ingot" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/allomancy/items/nicrosil_nugget.json b/src/main/resources/assets/allomancy/items/nicrosil_nugget.json new file mode 100644 index 00000000..25603139 --- /dev/null +++ b/src/main/resources/assets/allomancy/items/nicrosil_nugget.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "allomancy:item/nicrosil_nugget" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/allomancy/items/nicrosil_pattern.json b/src/main/resources/assets/allomancy/items/nicrosil_pattern.json new file mode 100644 index 00000000..131cd73d --- /dev/null +++ b/src/main/resources/assets/allomancy/items/nicrosil_pattern.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "allomancy:item/nicrosil_pattern" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/allomancy/items/obsidian_dagger.json b/src/main/resources/assets/allomancy/items/obsidian_dagger.json new file mode 100644 index 00000000..488aeddc --- /dev/null +++ b/src/main/resources/assets/allomancy/items/obsidian_dagger.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "allomancy:item/obsidian_dagger" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/allomancy/items/pewter_block.json b/src/main/resources/assets/allomancy/items/pewter_block.json new file mode 100644 index 00000000..b42ae929 --- /dev/null +++ b/src/main/resources/assets/allomancy/items/pewter_block.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "allomancy:item/pewter_block" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/allomancy/items/pewter_flakes.json b/src/main/resources/assets/allomancy/items/pewter_flakes.json new file mode 100644 index 00000000..423a7340 --- /dev/null +++ b/src/main/resources/assets/allomancy/items/pewter_flakes.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "allomancy:item/pewter_flakes" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/allomancy/items/pewter_ingot.json b/src/main/resources/assets/allomancy/items/pewter_ingot.json new file mode 100644 index 00000000..9978b429 --- /dev/null +++ b/src/main/resources/assets/allomancy/items/pewter_ingot.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "allomancy:item/pewter_ingot" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/allomancy/items/pewter_nugget.json b/src/main/resources/assets/allomancy/items/pewter_nugget.json new file mode 100644 index 00000000..e47c8ba8 --- /dev/null +++ b/src/main/resources/assets/allomancy/items/pewter_nugget.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "allomancy:item/pewter_nugget" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/allomancy/items/pewter_pattern.json b/src/main/resources/assets/allomancy/items/pewter_pattern.json new file mode 100644 index 00000000..89d64ace --- /dev/null +++ b/src/main/resources/assets/allomancy/items/pewter_pattern.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "allomancy:item/pewter_pattern" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/allomancy/items/raw_aluminum.json b/src/main/resources/assets/allomancy/items/raw_aluminum.json new file mode 100644 index 00000000..5538cc0c --- /dev/null +++ b/src/main/resources/assets/allomancy/items/raw_aluminum.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "allomancy:item/raw_aluminum" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/allomancy/items/raw_aluminum_block.json b/src/main/resources/assets/allomancy/items/raw_aluminum_block.json new file mode 100644 index 00000000..3c73a2f2 --- /dev/null +++ b/src/main/resources/assets/allomancy/items/raw_aluminum_block.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "allomancy:item/raw_aluminum_block" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/allomancy/items/raw_cadmium.json b/src/main/resources/assets/allomancy/items/raw_cadmium.json new file mode 100644 index 00000000..7fd0e9dd --- /dev/null +++ b/src/main/resources/assets/allomancy/items/raw_cadmium.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "allomancy:item/raw_cadmium" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/allomancy/items/raw_cadmium_block.json b/src/main/resources/assets/allomancy/items/raw_cadmium_block.json new file mode 100644 index 00000000..9e55f451 --- /dev/null +++ b/src/main/resources/assets/allomancy/items/raw_cadmium_block.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "allomancy:item/raw_cadmium_block" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/allomancy/items/raw_chromium.json b/src/main/resources/assets/allomancy/items/raw_chromium.json new file mode 100644 index 00000000..987f248a --- /dev/null +++ b/src/main/resources/assets/allomancy/items/raw_chromium.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "allomancy:item/raw_chromium" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/allomancy/items/raw_chromium_block.json b/src/main/resources/assets/allomancy/items/raw_chromium_block.json new file mode 100644 index 00000000..1ebc805a --- /dev/null +++ b/src/main/resources/assets/allomancy/items/raw_chromium_block.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "allomancy:item/raw_chromium_block" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/allomancy/items/raw_lead.json b/src/main/resources/assets/allomancy/items/raw_lead.json new file mode 100644 index 00000000..144e7f80 --- /dev/null +++ b/src/main/resources/assets/allomancy/items/raw_lead.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "allomancy:item/raw_lead" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/allomancy/items/raw_lead_block.json b/src/main/resources/assets/allomancy/items/raw_lead_block.json new file mode 100644 index 00000000..499086d5 --- /dev/null +++ b/src/main/resources/assets/allomancy/items/raw_lead_block.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "allomancy:item/raw_lead_block" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/allomancy/items/raw_silver.json b/src/main/resources/assets/allomancy/items/raw_silver.json new file mode 100644 index 00000000..aed7f424 --- /dev/null +++ b/src/main/resources/assets/allomancy/items/raw_silver.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "allomancy:item/raw_silver" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/allomancy/items/raw_silver_block.json b/src/main/resources/assets/allomancy/items/raw_silver_block.json new file mode 100644 index 00000000..ca3131e0 --- /dev/null +++ b/src/main/resources/assets/allomancy/items/raw_silver_block.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "allomancy:item/raw_silver_block" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/allomancy/items/raw_tin.json b/src/main/resources/assets/allomancy/items/raw_tin.json new file mode 100644 index 00000000..90ea282c --- /dev/null +++ b/src/main/resources/assets/allomancy/items/raw_tin.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "allomancy:item/raw_tin" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/allomancy/items/raw_tin_block.json b/src/main/resources/assets/allomancy/items/raw_tin_block.json new file mode 100644 index 00000000..5d2ad592 --- /dev/null +++ b/src/main/resources/assets/allomancy/items/raw_tin_block.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "allomancy:item/raw_tin_block" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/allomancy/items/raw_zinc.json b/src/main/resources/assets/allomancy/items/raw_zinc.json new file mode 100644 index 00000000..aa0ef22b --- /dev/null +++ b/src/main/resources/assets/allomancy/items/raw_zinc.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "allomancy:item/raw_zinc" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/allomancy/items/raw_zinc_block.json b/src/main/resources/assets/allomancy/items/raw_zinc_block.json new file mode 100644 index 00000000..639fb966 --- /dev/null +++ b/src/main/resources/assets/allomancy/items/raw_zinc_block.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "allomancy:item/raw_zinc_block" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/allomancy/items/silver_block.json b/src/main/resources/assets/allomancy/items/silver_block.json new file mode 100644 index 00000000..772d0157 --- /dev/null +++ b/src/main/resources/assets/allomancy/items/silver_block.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "allomancy:item/silver_block" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/allomancy/items/silver_flakes.json b/src/main/resources/assets/allomancy/items/silver_flakes.json new file mode 100644 index 00000000..880e8439 --- /dev/null +++ b/src/main/resources/assets/allomancy/items/silver_flakes.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "allomancy:item/silver_flakes" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/allomancy/items/silver_ingot.json b/src/main/resources/assets/allomancy/items/silver_ingot.json new file mode 100644 index 00000000..ad849cf9 --- /dev/null +++ b/src/main/resources/assets/allomancy/items/silver_ingot.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "allomancy:item/silver_ingot" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/allomancy/items/silver_nugget.json b/src/main/resources/assets/allomancy/items/silver_nugget.json new file mode 100644 index 00000000..13deb469 --- /dev/null +++ b/src/main/resources/assets/allomancy/items/silver_nugget.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "allomancy:item/silver_nugget" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/allomancy/items/silver_ore.json b/src/main/resources/assets/allomancy/items/silver_ore.json new file mode 100644 index 00000000..f380463e --- /dev/null +++ b/src/main/resources/assets/allomancy/items/silver_ore.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "allomancy:item/silver_ore" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/allomancy/items/steel_block.json b/src/main/resources/assets/allomancy/items/steel_block.json new file mode 100644 index 00000000..6f65f170 --- /dev/null +++ b/src/main/resources/assets/allomancy/items/steel_block.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "allomancy:item/steel_block" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/allomancy/items/steel_flakes.json b/src/main/resources/assets/allomancy/items/steel_flakes.json new file mode 100644 index 00000000..41c4b0fe --- /dev/null +++ b/src/main/resources/assets/allomancy/items/steel_flakes.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "allomancy:item/steel_flakes" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/allomancy/items/steel_ingot.json b/src/main/resources/assets/allomancy/items/steel_ingot.json new file mode 100644 index 00000000..2ad131c6 --- /dev/null +++ b/src/main/resources/assets/allomancy/items/steel_ingot.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "allomancy:item/steel_ingot" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/allomancy/items/steel_nugget.json b/src/main/resources/assets/allomancy/items/steel_nugget.json new file mode 100644 index 00000000..ddea6c32 --- /dev/null +++ b/src/main/resources/assets/allomancy/items/steel_nugget.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "allomancy:item/steel_nugget" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/allomancy/items/steel_pattern.json b/src/main/resources/assets/allomancy/items/steel_pattern.json new file mode 100644 index 00000000..33ff44f2 --- /dev/null +++ b/src/main/resources/assets/allomancy/items/steel_pattern.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "allomancy:item/steel_pattern" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/allomancy/items/tin_block.json b/src/main/resources/assets/allomancy/items/tin_block.json new file mode 100644 index 00000000..88bbbb0d --- /dev/null +++ b/src/main/resources/assets/allomancy/items/tin_block.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "allomancy:item/tin_block" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/allomancy/items/tin_flakes.json b/src/main/resources/assets/allomancy/items/tin_flakes.json new file mode 100644 index 00000000..2d2c5bae --- /dev/null +++ b/src/main/resources/assets/allomancy/items/tin_flakes.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "allomancy:item/tin_flakes" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/allomancy/items/tin_ingot.json b/src/main/resources/assets/allomancy/items/tin_ingot.json new file mode 100644 index 00000000..5cd3d2f1 --- /dev/null +++ b/src/main/resources/assets/allomancy/items/tin_ingot.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "allomancy:item/tin_ingot" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/allomancy/items/tin_nugget.json b/src/main/resources/assets/allomancy/items/tin_nugget.json new file mode 100644 index 00000000..e21a5bc9 --- /dev/null +++ b/src/main/resources/assets/allomancy/items/tin_nugget.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "allomancy:item/tin_nugget" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/allomancy/items/tin_ore.json b/src/main/resources/assets/allomancy/items/tin_ore.json new file mode 100644 index 00000000..070dc677 --- /dev/null +++ b/src/main/resources/assets/allomancy/items/tin_ore.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "allomancy:item/tin_ore" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/allomancy/items/tin_pattern.json b/src/main/resources/assets/allomancy/items/tin_pattern.json new file mode 100644 index 00000000..8e09b97b --- /dev/null +++ b/src/main/resources/assets/allomancy/items/tin_pattern.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "allomancy:item/tin_pattern" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/allomancy/items/vial.json b/src/main/resources/assets/allomancy/items/vial.json new file mode 100644 index 00000000..8552dc5b --- /dev/null +++ b/src/main/resources/assets/allomancy/items/vial.json @@ -0,0 +1,15 @@ +{ + "model": { + "type": "minecraft:condition", + "property": "minecraft:has_component", + "component": "allomancy:flake_storage", + "on_true": { + "type": "minecraft:model", + "model": "allomancy:item/vial_filled" + }, + "on_false": { + "type": "minecraft:model", + "model": "allomancy:item/vial" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/allomancy/items/zinc_block.json b/src/main/resources/assets/allomancy/items/zinc_block.json new file mode 100644 index 00000000..37731f6d --- /dev/null +++ b/src/main/resources/assets/allomancy/items/zinc_block.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "allomancy:item/zinc_block" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/allomancy/items/zinc_flakes.json b/src/main/resources/assets/allomancy/items/zinc_flakes.json new file mode 100644 index 00000000..f0d9c765 --- /dev/null +++ b/src/main/resources/assets/allomancy/items/zinc_flakes.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "allomancy:item/zinc_flakes" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/allomancy/items/zinc_ingot.json b/src/main/resources/assets/allomancy/items/zinc_ingot.json new file mode 100644 index 00000000..485654b5 --- /dev/null +++ b/src/main/resources/assets/allomancy/items/zinc_ingot.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "allomancy:item/zinc_ingot" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/allomancy/items/zinc_nugget.json b/src/main/resources/assets/allomancy/items/zinc_nugget.json new file mode 100644 index 00000000..66f16077 --- /dev/null +++ b/src/main/resources/assets/allomancy/items/zinc_nugget.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "allomancy:item/zinc_nugget" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/allomancy/items/zinc_ore.json b/src/main/resources/assets/allomancy/items/zinc_ore.json new file mode 100644 index 00000000..dae8ad1c --- /dev/null +++ b/src/main/resources/assets/allomancy/items/zinc_ore.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "allomancy:item/zinc_ore" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/allomancy/items/zinc_pattern.json b/src/main/resources/assets/allomancy/items/zinc_pattern.json new file mode 100644 index 00000000..fc3b2cd8 --- /dev/null +++ b/src/main/resources/assets/allomancy/items/zinc_pattern.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "allomancy:item/zinc_pattern" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/allomancy/textures/models/armor/aluminum_layer_1.png b/src/main/resources/assets/allomancy/textures/entity/equipment/humanoid/aluminum.png similarity index 100% rename from src/main/resources/assets/allomancy/textures/models/armor/aluminum_layer_1.png rename to src/main/resources/assets/allomancy/textures/entity/equipment/humanoid/aluminum.png diff --git a/src/main/resources/assets/allomancy/textures/models/armor/wool_layer_1.png b/src/main/resources/assets/allomancy/textures/entity/equipment/humanoid/mistcloak.png similarity index 100% rename from src/main/resources/assets/allomancy/textures/models/armor/wool_layer_1.png rename to src/main/resources/assets/allomancy/textures/entity/equipment/humanoid/mistcloak.png diff --git a/src/main/resources/assets/allomancy/textures/item/aluminum_pattern.png b/src/main/resources/assets/allomancy/textures/item/aluminum_pattern.png index 6f29d2a2..3971dc65 100644 Binary files a/src/main/resources/assets/allomancy/textures/item/aluminum_pattern.png and b/src/main/resources/assets/allomancy/textures/item/aluminum_pattern.png differ diff --git a/src/main/resources/assets/allomancy/textures/item/bendalloy_pattern.png b/src/main/resources/assets/allomancy/textures/item/bendalloy_pattern.png index 6f29d2a2..d6e3bafe 100644 Binary files a/src/main/resources/assets/allomancy/textures/item/bendalloy_pattern.png and b/src/main/resources/assets/allomancy/textures/item/bendalloy_pattern.png differ diff --git a/src/main/resources/assets/allomancy/textures/item/brass_pattern.png b/src/main/resources/assets/allomancy/textures/item/brass_pattern.png index 6f29d2a2..81eedaff 100644 Binary files a/src/main/resources/assets/allomancy/textures/item/brass_pattern.png and b/src/main/resources/assets/allomancy/textures/item/brass_pattern.png differ diff --git a/src/main/resources/assets/allomancy/textures/item/bronze_pattern.png b/src/main/resources/assets/allomancy/textures/item/bronze_pattern.png index 6f29d2a2..244ffbb8 100644 Binary files a/src/main/resources/assets/allomancy/textures/item/bronze_pattern.png and b/src/main/resources/assets/allomancy/textures/item/bronze_pattern.png differ diff --git a/src/main/resources/assets/allomancy/textures/item/cadmium_pattern.png b/src/main/resources/assets/allomancy/textures/item/cadmium_pattern.png index 6f29d2a2..4da6713b 100644 Binary files a/src/main/resources/assets/allomancy/textures/item/cadmium_pattern.png and b/src/main/resources/assets/allomancy/textures/item/cadmium_pattern.png differ diff --git a/src/main/resources/assets/allomancy/textures/item/chromium_pattern.png b/src/main/resources/assets/allomancy/textures/item/chromium_pattern.png index 6f29d2a2..c4b02ec2 100644 Binary files a/src/main/resources/assets/allomancy/textures/item/chromium_pattern.png and b/src/main/resources/assets/allomancy/textures/item/chromium_pattern.png differ diff --git a/src/main/resources/assets/allomancy/textures/item/copper_pattern.png b/src/main/resources/assets/allomancy/textures/item/copper_pattern.png index 6f29d2a2..618317bd 100644 Binary files a/src/main/resources/assets/allomancy/textures/item/copper_pattern.png and b/src/main/resources/assets/allomancy/textures/item/copper_pattern.png differ diff --git a/src/main/resources/assets/allomancy/textures/item/duralumin_pattern.png b/src/main/resources/assets/allomancy/textures/item/duralumin_pattern.png index 6f29d2a2..577b1903 100644 Binary files a/src/main/resources/assets/allomancy/textures/item/duralumin_pattern.png and b/src/main/resources/assets/allomancy/textures/item/duralumin_pattern.png differ diff --git a/src/main/resources/assets/allomancy/textures/item/electrum_pattern.png b/src/main/resources/assets/allomancy/textures/item/electrum_pattern.png index 6f29d2a2..1932cc99 100644 Binary files a/src/main/resources/assets/allomancy/textures/item/electrum_pattern.png and b/src/main/resources/assets/allomancy/textures/item/electrum_pattern.png differ diff --git a/src/main/resources/assets/allomancy/textures/item/gold_pattern.png b/src/main/resources/assets/allomancy/textures/item/gold_pattern.png index 6f29d2a2..8482c4ba 100644 Binary files a/src/main/resources/assets/allomancy/textures/item/gold_pattern.png and b/src/main/resources/assets/allomancy/textures/item/gold_pattern.png differ diff --git a/src/main/resources/assets/allomancy/textures/item/iron_pattern.png b/src/main/resources/assets/allomancy/textures/item/iron_pattern.png index 6f29d2a2..b2dedc3e 100644 Binary files a/src/main/resources/assets/allomancy/textures/item/iron_pattern.png and b/src/main/resources/assets/allomancy/textures/item/iron_pattern.png differ diff --git a/src/main/resources/assets/allomancy/textures/item/nicrosil_pattern.png b/src/main/resources/assets/allomancy/textures/item/nicrosil_pattern.png index 6f29d2a2..614856c3 100644 Binary files a/src/main/resources/assets/allomancy/textures/item/nicrosil_pattern.png and b/src/main/resources/assets/allomancy/textures/item/nicrosil_pattern.png differ diff --git a/src/main/resources/assets/allomancy/textures/item/pewter_pattern.png b/src/main/resources/assets/allomancy/textures/item/pewter_pattern.png index 6f29d2a2..095f5e43 100644 Binary files a/src/main/resources/assets/allomancy/textures/item/pewter_pattern.png and b/src/main/resources/assets/allomancy/textures/item/pewter_pattern.png differ diff --git a/src/main/resources/assets/allomancy/textures/item/steel_pattern.png b/src/main/resources/assets/allomancy/textures/item/steel_pattern.png index 6f29d2a2..e5d7505a 100644 Binary files a/src/main/resources/assets/allomancy/textures/item/steel_pattern.png and b/src/main/resources/assets/allomancy/textures/item/steel_pattern.png differ diff --git a/src/main/resources/assets/allomancy/textures/item/tin_pattern.png b/src/main/resources/assets/allomancy/textures/item/tin_pattern.png index 6f29d2a2..3ed5cde7 100644 Binary files a/src/main/resources/assets/allomancy/textures/item/tin_pattern.png and b/src/main/resources/assets/allomancy/textures/item/tin_pattern.png differ diff --git a/src/main/resources/assets/allomancy/textures/item/zinc_pattern.png b/src/main/resources/assets/allomancy/textures/item/zinc_pattern.png index 6f29d2a2..1a5f8212 100644 Binary files a/src/main/resources/assets/allomancy/textures/item/zinc_pattern.png and b/src/main/resources/assets/allomancy/textures/item/zinc_pattern.png differ diff --git a/src/main/resources/META-INF/neoforge.mods.toml b/src/main/templates/META-INF/neoforge.mods.toml similarity index 100% rename from src/main/resources/META-INF/neoforge.mods.toml rename to src/main/templates/META-INF/neoforge.mods.toml