diff --git a/.gitattributes b/.gitattributes index 13cf95ba..7b89270f 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,4 +1,5 @@ # 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/ linguist-generated=true text eol=lf \ No newline at end of file +src/generated/ linguist-generated=true text eol=lf +src/main/generated_resources/ linguist-generated=true text eol=lf diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 535106d9..ce195d0e 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -12,26 +12,28 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 - - name: Set up JDK - uses: actions/setup-java@v4 - with: - java-version: '21' - distribution: 'temurin' - - uses: actions/cache@v4 - with: - path: | - ~/.gradle/caches - key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }} - restore-keys: | - ${{ runner.os }}-gradle- - - name: Grant execute permission for gradlew - run: chmod +x gradlew - - name: Build with Gradle - run: ./gradlew build --info - - name: Stop gradle daemon - run: ./gradlew --stop - - uses: actions/upload-artifact@v4 - with: - name: Allomancy jar - path: build/libs/*.jar + - uses: actions/checkout@v4 + - name: Set up JDK + uses: actions/setup-java@v4 + with: + java-version: '21' + distribution: 'temurin' + - uses: actions/cache@v4 + with: + path: | + ~/.gradle/caches + key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }} + restore-keys: | + ${{ runner.os }}-gradle- + - name: Grant execute permission for gradlew + run: chmod +x gradlew + - name: Build with Gradle + run: ./gradlew build --info + - name: Run gametests + run: ./gradlew runGameTestServer + - name: Stop gradle daemon + run: ./gradlew --stop + - uses: actions/upload-artifact@v4 + with: + name: Allomancy jar + path: build/libs/*.jar diff --git a/.gitignore b/.gitignore index 2a7d62b9..0bb390b7 100644 --- a/.gitignore +++ b/.gitignore @@ -13,4 +13,4 @@ TODO.txt /.vscode /logs -/src/generated/resources/.cache/ +/src/main/generated_resources/.cache/ diff --git a/build.gradle b/build.gradle index 80accf46..f9f918d5 100644 --- a/build.gradle +++ b/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java-library' id 'maven-publish' - id 'net.neoforged.moddev' version '1.0.23' + id 'net.neoforged.moddev' version '2.0.72' id 'idea' } @@ -26,7 +26,12 @@ base { } // Mojang ships Java 21 to end users starting in 1.20.5, so mods should target Java 21. -java.toolchain.languageVersion = JavaLanguageVersion.of(21) +java { + toolchain.languageVersion = JavaLanguageVersion.of(21) + withSourcesJar() +} + +def gametest_mod_id = mod_id + "_test" neoForge { version = project.neo_version @@ -36,48 +41,47 @@ neoForge { minecraftVersion = project.parchment_minecraft_version } + addModdingDependenciesTo(sourceSets.test) + runs { client { client() - gameDirectory = project.file('runs/client') - systemProperty 'neoforge.enabledGameTestNamespaces', project.mod_id + sourceSet = sourceSets.test } client2 { client() - gameDirectory = project.file('runs/client') - systemProperty 'neoforge.enabledGameTestNamespaces', project.mod_id programArguments.addAll('--username', 'Dev2') } server { server() - gameDirectory = project.file('runs/server') - 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. gameTestServer { type = "gameTestServer" - gameDirectory = project.file('runs/gameTestServer') - systemProperty 'neoforge.enabledGameTestNamespaces', project.mod_id + sourceSet = sourceSets.test } 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() + programArguments.addAll '--mod', project.mod_id, '--all', '--output', file('src/main/generated_resources/').getAbsolutePath(), '--existing', file('src/main/resources/').getAbsolutePath() } // applies to all the run configs above configureEach { // Recommended logging data for a userdev environment systemProperty 'forge.logging.markers', 'REGISTRIES' - + systemProperty 'neoforge.enableGameTest', 'true' + systemProperty 'neoforge.enabledGameTestNamespaces', "${project.mod_id},${gametest_mod_id}" + gameDirectory = project.file('runs/' + name) // Recommended logging level for the console logLevel = org.slf4j.event.Level.DEBUG + + jvmArguments.addAll '-Xmx4G' } } @@ -86,11 +90,14 @@ neoForge { "${mod_id}" { sourceSet(sourceSets.main) } + "${gametest_mod_id}" { + sourceSet(sourceSets.test) + } } } // Include resources generated by data generators. -sourceSets.main.resources { srcDir 'src/generated/resources' } +sourceSets.main.resources { srcDir 'src/main/generated_resources' } // Sets up a dependency configuration called 'localRuntime'. // This configuration should be used instead of 'runtimeOnly' to declare @@ -116,10 +123,10 @@ repositories { dependencies { - dependencies { - implementation "curse.maven:jade-324717:${jade_id}" - // api "curse.maven:jade-324717:${jade_api}" - } + implementation "curse.maven:jade-324717:${jade_id}" + // api "curse.maven:jade-324717:${jade_api}" + + localRuntime(testImplementation("net.neoforged:testframework:${neo_version}")) } // This block of code expands all declared replace properties in the specified resource targets. @@ -197,6 +204,10 @@ artifacts { archives deobfJar } +test { + enabled = false +} + //////////////// // IntelliJ Project Import diff --git a/gradle.properties b/gradle.properties index 5dd3b350..205b33cf 100644 --- a/gradle.properties +++ b/gradle.properties @@ -35,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.2.0b1 +mod_version=5.2.0b2 # 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 @@ -45,3 +45,5 @@ mod_authors=legobmw99 # The description of the mod. This is a simple multiline text string that is used for display purposes in the mod list. mod_description=Adds Brandon Sanderson's Allomancy to Minecraft! +# Prevent NG attempting to make the test sourceset a junit one +neogradle.subsystems.conventions.sourcesets.automatic-inclusion=false \ No newline at end of file diff --git a/src/generated/resources/assets/allomancy/blockstates/aluminum_block.json b/src/main/generated_resources/assets/allomancy/blockstates/aluminum_block.json similarity index 100% rename from src/generated/resources/assets/allomancy/blockstates/aluminum_block.json rename to src/main/generated_resources/assets/allomancy/blockstates/aluminum_block.json diff --git a/src/generated/resources/assets/allomancy/blockstates/aluminum_ore.json b/src/main/generated_resources/assets/allomancy/blockstates/aluminum_ore.json similarity index 100% rename from src/generated/resources/assets/allomancy/blockstates/aluminum_ore.json rename to src/main/generated_resources/assets/allomancy/blockstates/aluminum_ore.json diff --git a/src/generated/resources/assets/allomancy/blockstates/bendalloy_block.json b/src/main/generated_resources/assets/allomancy/blockstates/bendalloy_block.json similarity index 100% rename from src/generated/resources/assets/allomancy/blockstates/bendalloy_block.json rename to src/main/generated_resources/assets/allomancy/blockstates/bendalloy_block.json diff --git a/src/generated/resources/assets/allomancy/blockstates/brass_block.json b/src/main/generated_resources/assets/allomancy/blockstates/brass_block.json similarity index 100% rename from src/generated/resources/assets/allomancy/blockstates/brass_block.json rename to src/main/generated_resources/assets/allomancy/blockstates/brass_block.json diff --git a/src/generated/resources/assets/allomancy/blockstates/bronze_block.json b/src/main/generated_resources/assets/allomancy/blockstates/bronze_block.json similarity index 100% rename from src/generated/resources/assets/allomancy/blockstates/bronze_block.json rename to src/main/generated_resources/assets/allomancy/blockstates/bronze_block.json diff --git a/src/generated/resources/assets/allomancy/blockstates/cadmium_block.json b/src/main/generated_resources/assets/allomancy/blockstates/cadmium_block.json similarity index 100% rename from src/generated/resources/assets/allomancy/blockstates/cadmium_block.json rename to src/main/generated_resources/assets/allomancy/blockstates/cadmium_block.json diff --git a/src/generated/resources/assets/allomancy/blockstates/cadmium_ore.json b/src/main/generated_resources/assets/allomancy/blockstates/cadmium_ore.json similarity index 100% rename from src/generated/resources/assets/allomancy/blockstates/cadmium_ore.json rename to src/main/generated_resources/assets/allomancy/blockstates/cadmium_ore.json diff --git a/src/generated/resources/assets/allomancy/blockstates/chromium_block.json b/src/main/generated_resources/assets/allomancy/blockstates/chromium_block.json similarity index 100% rename from src/generated/resources/assets/allomancy/blockstates/chromium_block.json rename to src/main/generated_resources/assets/allomancy/blockstates/chromium_block.json diff --git a/src/generated/resources/assets/allomancy/blockstates/chromium_ore.json b/src/main/generated_resources/assets/allomancy/blockstates/chromium_ore.json similarity index 100% rename from src/generated/resources/assets/allomancy/blockstates/chromium_ore.json rename to src/main/generated_resources/assets/allomancy/blockstates/chromium_ore.json diff --git a/src/generated/resources/assets/allomancy/blockstates/deepslate_aluminum_ore.json b/src/main/generated_resources/assets/allomancy/blockstates/deepslate_aluminum_ore.json similarity index 100% rename from src/generated/resources/assets/allomancy/blockstates/deepslate_aluminum_ore.json rename to src/main/generated_resources/assets/allomancy/blockstates/deepslate_aluminum_ore.json diff --git a/src/generated/resources/assets/allomancy/blockstates/deepslate_cadmium_ore.json b/src/main/generated_resources/assets/allomancy/blockstates/deepslate_cadmium_ore.json similarity index 100% rename from src/generated/resources/assets/allomancy/blockstates/deepslate_cadmium_ore.json rename to src/main/generated_resources/assets/allomancy/blockstates/deepslate_cadmium_ore.json diff --git a/src/generated/resources/assets/allomancy/blockstates/deepslate_chromium_ore.json b/src/main/generated_resources/assets/allomancy/blockstates/deepslate_chromium_ore.json similarity index 100% rename from src/generated/resources/assets/allomancy/blockstates/deepslate_chromium_ore.json rename to src/main/generated_resources/assets/allomancy/blockstates/deepslate_chromium_ore.json diff --git a/src/generated/resources/assets/allomancy/blockstates/deepslate_lead_ore.json b/src/main/generated_resources/assets/allomancy/blockstates/deepslate_lead_ore.json similarity index 100% rename from src/generated/resources/assets/allomancy/blockstates/deepslate_lead_ore.json rename to src/main/generated_resources/assets/allomancy/blockstates/deepslate_lead_ore.json diff --git a/src/generated/resources/assets/allomancy/blockstates/deepslate_silver_ore.json b/src/main/generated_resources/assets/allomancy/blockstates/deepslate_silver_ore.json similarity index 100% rename from src/generated/resources/assets/allomancy/blockstates/deepslate_silver_ore.json rename to src/main/generated_resources/assets/allomancy/blockstates/deepslate_silver_ore.json diff --git a/src/generated/resources/assets/allomancy/blockstates/deepslate_tin_ore.json b/src/main/generated_resources/assets/allomancy/blockstates/deepslate_tin_ore.json similarity index 100% rename from src/generated/resources/assets/allomancy/blockstates/deepslate_tin_ore.json rename to src/main/generated_resources/assets/allomancy/blockstates/deepslate_tin_ore.json diff --git a/src/generated/resources/assets/allomancy/blockstates/deepslate_zinc_ore.json b/src/main/generated_resources/assets/allomancy/blockstates/deepslate_zinc_ore.json similarity index 100% rename from src/generated/resources/assets/allomancy/blockstates/deepslate_zinc_ore.json rename to src/main/generated_resources/assets/allomancy/blockstates/deepslate_zinc_ore.json diff --git a/src/generated/resources/assets/allomancy/blockstates/duralumin_block.json b/src/main/generated_resources/assets/allomancy/blockstates/duralumin_block.json similarity index 100% rename from src/generated/resources/assets/allomancy/blockstates/duralumin_block.json rename to src/main/generated_resources/assets/allomancy/blockstates/duralumin_block.json diff --git a/src/generated/resources/assets/allomancy/blockstates/electrum_block.json b/src/main/generated_resources/assets/allomancy/blockstates/electrum_block.json similarity index 100% rename from src/generated/resources/assets/allomancy/blockstates/electrum_block.json rename to src/main/generated_resources/assets/allomancy/blockstates/electrum_block.json diff --git a/src/generated/resources/assets/allomancy/blockstates/inverted_iron_button.json b/src/main/generated_resources/assets/allomancy/blockstates/inverted_iron_button.json similarity index 100% rename from src/generated/resources/assets/allomancy/blockstates/inverted_iron_button.json rename to src/main/generated_resources/assets/allomancy/blockstates/inverted_iron_button.json diff --git a/src/generated/resources/assets/allomancy/blockstates/iron_button.json b/src/main/generated_resources/assets/allomancy/blockstates/iron_button.json similarity index 100% rename from src/generated/resources/assets/allomancy/blockstates/iron_button.json rename to src/main/generated_resources/assets/allomancy/blockstates/iron_button.json diff --git a/src/generated/resources/assets/allomancy/blockstates/iron_lever.json b/src/main/generated_resources/assets/allomancy/blockstates/iron_lever.json similarity index 100% rename from src/generated/resources/assets/allomancy/blockstates/iron_lever.json rename to src/main/generated_resources/assets/allomancy/blockstates/iron_lever.json diff --git a/src/generated/resources/assets/allomancy/blockstates/lead_block.json b/src/main/generated_resources/assets/allomancy/blockstates/lead_block.json similarity index 100% rename from src/generated/resources/assets/allomancy/blockstates/lead_block.json rename to src/main/generated_resources/assets/allomancy/blockstates/lead_block.json diff --git a/src/generated/resources/assets/allomancy/blockstates/lead_ore.json b/src/main/generated_resources/assets/allomancy/blockstates/lead_ore.json similarity index 100% rename from src/generated/resources/assets/allomancy/blockstates/lead_ore.json rename to src/main/generated_resources/assets/allomancy/blockstates/lead_ore.json diff --git a/src/generated/resources/assets/allomancy/blockstates/nicrosil_block.json b/src/main/generated_resources/assets/allomancy/blockstates/nicrosil_block.json similarity index 100% rename from src/generated/resources/assets/allomancy/blockstates/nicrosil_block.json rename to src/main/generated_resources/assets/allomancy/blockstates/nicrosil_block.json diff --git a/src/generated/resources/assets/allomancy/blockstates/pewter_block.json b/src/main/generated_resources/assets/allomancy/blockstates/pewter_block.json similarity index 100% rename from src/generated/resources/assets/allomancy/blockstates/pewter_block.json rename to src/main/generated_resources/assets/allomancy/blockstates/pewter_block.json diff --git a/src/generated/resources/assets/allomancy/blockstates/raw_aluminum_block.json b/src/main/generated_resources/assets/allomancy/blockstates/raw_aluminum_block.json similarity index 100% rename from src/generated/resources/assets/allomancy/blockstates/raw_aluminum_block.json rename to src/main/generated_resources/assets/allomancy/blockstates/raw_aluminum_block.json diff --git a/src/generated/resources/assets/allomancy/blockstates/raw_cadmium_block.json b/src/main/generated_resources/assets/allomancy/blockstates/raw_cadmium_block.json similarity index 100% rename from src/generated/resources/assets/allomancy/blockstates/raw_cadmium_block.json rename to src/main/generated_resources/assets/allomancy/blockstates/raw_cadmium_block.json diff --git a/src/generated/resources/assets/allomancy/blockstates/raw_chromium_block.json b/src/main/generated_resources/assets/allomancy/blockstates/raw_chromium_block.json similarity index 100% rename from src/generated/resources/assets/allomancy/blockstates/raw_chromium_block.json rename to src/main/generated_resources/assets/allomancy/blockstates/raw_chromium_block.json diff --git a/src/generated/resources/assets/allomancy/blockstates/raw_lead_block.json b/src/main/generated_resources/assets/allomancy/blockstates/raw_lead_block.json similarity index 100% rename from src/generated/resources/assets/allomancy/blockstates/raw_lead_block.json rename to src/main/generated_resources/assets/allomancy/blockstates/raw_lead_block.json diff --git a/src/generated/resources/assets/allomancy/blockstates/raw_silver_block.json b/src/main/generated_resources/assets/allomancy/blockstates/raw_silver_block.json similarity index 100% rename from src/generated/resources/assets/allomancy/blockstates/raw_silver_block.json rename to src/main/generated_resources/assets/allomancy/blockstates/raw_silver_block.json diff --git a/src/generated/resources/assets/allomancy/blockstates/raw_tin_block.json b/src/main/generated_resources/assets/allomancy/blockstates/raw_tin_block.json similarity index 100% rename from src/generated/resources/assets/allomancy/blockstates/raw_tin_block.json rename to src/main/generated_resources/assets/allomancy/blockstates/raw_tin_block.json diff --git a/src/generated/resources/assets/allomancy/blockstates/raw_zinc_block.json b/src/main/generated_resources/assets/allomancy/blockstates/raw_zinc_block.json similarity index 100% rename from src/generated/resources/assets/allomancy/blockstates/raw_zinc_block.json rename to src/main/generated_resources/assets/allomancy/blockstates/raw_zinc_block.json diff --git a/src/generated/resources/assets/allomancy/blockstates/silver_block.json b/src/main/generated_resources/assets/allomancy/blockstates/silver_block.json similarity index 100% rename from src/generated/resources/assets/allomancy/blockstates/silver_block.json rename to src/main/generated_resources/assets/allomancy/blockstates/silver_block.json diff --git a/src/generated/resources/assets/allomancy/blockstates/silver_ore.json b/src/main/generated_resources/assets/allomancy/blockstates/silver_ore.json similarity index 100% rename from src/generated/resources/assets/allomancy/blockstates/silver_ore.json rename to src/main/generated_resources/assets/allomancy/blockstates/silver_ore.json diff --git a/src/generated/resources/assets/allomancy/blockstates/steel_block.json b/src/main/generated_resources/assets/allomancy/blockstates/steel_block.json similarity index 100% rename from src/generated/resources/assets/allomancy/blockstates/steel_block.json rename to src/main/generated_resources/assets/allomancy/blockstates/steel_block.json diff --git a/src/generated/resources/assets/allomancy/blockstates/tin_block.json b/src/main/generated_resources/assets/allomancy/blockstates/tin_block.json similarity index 100% rename from src/generated/resources/assets/allomancy/blockstates/tin_block.json rename to src/main/generated_resources/assets/allomancy/blockstates/tin_block.json diff --git a/src/generated/resources/assets/allomancy/blockstates/tin_ore.json b/src/main/generated_resources/assets/allomancy/blockstates/tin_ore.json similarity index 100% rename from src/generated/resources/assets/allomancy/blockstates/tin_ore.json rename to src/main/generated_resources/assets/allomancy/blockstates/tin_ore.json diff --git a/src/generated/resources/assets/allomancy/blockstates/zinc_block.json b/src/main/generated_resources/assets/allomancy/blockstates/zinc_block.json similarity index 100% rename from src/generated/resources/assets/allomancy/blockstates/zinc_block.json rename to src/main/generated_resources/assets/allomancy/blockstates/zinc_block.json diff --git a/src/generated/resources/assets/allomancy/blockstates/zinc_ore.json b/src/main/generated_resources/assets/allomancy/blockstates/zinc_ore.json similarity index 100% rename from src/generated/resources/assets/allomancy/blockstates/zinc_ore.json rename to src/main/generated_resources/assets/allomancy/blockstates/zinc_ore.json diff --git a/src/generated/resources/assets/allomancy/equipment/aluminum.json b/src/main/generated_resources/assets/allomancy/equipment/aluminum.json similarity index 100% rename from src/generated/resources/assets/allomancy/equipment/aluminum.json rename to src/main/generated_resources/assets/allomancy/equipment/aluminum.json diff --git a/src/generated/resources/assets/allomancy/equipment/wool.json b/src/main/generated_resources/assets/allomancy/equipment/wool.json similarity index 100% rename from src/generated/resources/assets/allomancy/equipment/wool.json rename to src/main/generated_resources/assets/allomancy/equipment/wool.json diff --git a/src/generated/resources/assets/allomancy/items/allomantic_grinder.json b/src/main/generated_resources/assets/allomancy/items/allomantic_grinder.json similarity index 100% rename from src/generated/resources/assets/allomancy/items/allomantic_grinder.json rename to src/main/generated_resources/assets/allomancy/items/allomantic_grinder.json diff --git a/src/generated/resources/assets/allomancy/items/aluminum_block.json b/src/main/generated_resources/assets/allomancy/items/aluminum_block.json similarity index 100% rename from src/generated/resources/assets/allomancy/items/aluminum_block.json rename to src/main/generated_resources/assets/allomancy/items/aluminum_block.json diff --git a/src/generated/resources/assets/allomancy/items/aluminum_flakes.json b/src/main/generated_resources/assets/allomancy/items/aluminum_flakes.json similarity index 100% rename from src/generated/resources/assets/allomancy/items/aluminum_flakes.json rename to src/main/generated_resources/assets/allomancy/items/aluminum_flakes.json diff --git a/src/generated/resources/assets/allomancy/items/aluminum_helmet.json b/src/main/generated_resources/assets/allomancy/items/aluminum_helmet.json similarity index 100% rename from src/generated/resources/assets/allomancy/items/aluminum_helmet.json rename to src/main/generated_resources/assets/allomancy/items/aluminum_helmet.json diff --git a/src/generated/resources/assets/allomancy/items/aluminum_ingot.json b/src/main/generated_resources/assets/allomancy/items/aluminum_ingot.json similarity index 100% rename from src/generated/resources/assets/allomancy/items/aluminum_ingot.json rename to src/main/generated_resources/assets/allomancy/items/aluminum_ingot.json diff --git a/src/generated/resources/assets/allomancy/items/aluminum_nugget.json b/src/main/generated_resources/assets/allomancy/items/aluminum_nugget.json similarity index 100% rename from src/generated/resources/assets/allomancy/items/aluminum_nugget.json rename to src/main/generated_resources/assets/allomancy/items/aluminum_nugget.json diff --git a/src/generated/resources/assets/allomancy/items/aluminum_ore.json b/src/main/generated_resources/assets/allomancy/items/aluminum_ore.json similarity index 100% rename from src/generated/resources/assets/allomancy/items/aluminum_ore.json rename to src/main/generated_resources/assets/allomancy/items/aluminum_ore.json diff --git a/src/generated/resources/assets/allomancy/items/aluminum_pattern.json b/src/main/generated_resources/assets/allomancy/items/aluminum_pattern.json similarity index 100% rename from src/generated/resources/assets/allomancy/items/aluminum_pattern.json rename to src/main/generated_resources/assets/allomancy/items/aluminum_pattern.json diff --git a/src/generated/resources/assets/allomancy/items/bendalloy_block.json b/src/main/generated_resources/assets/allomancy/items/bendalloy_block.json similarity index 100% rename from src/generated/resources/assets/allomancy/items/bendalloy_block.json rename to src/main/generated_resources/assets/allomancy/items/bendalloy_block.json diff --git a/src/generated/resources/assets/allomancy/items/bendalloy_flakes.json b/src/main/generated_resources/assets/allomancy/items/bendalloy_flakes.json similarity index 100% rename from src/generated/resources/assets/allomancy/items/bendalloy_flakes.json rename to src/main/generated_resources/assets/allomancy/items/bendalloy_flakes.json diff --git a/src/generated/resources/assets/allomancy/items/bendalloy_ingot.json b/src/main/generated_resources/assets/allomancy/items/bendalloy_ingot.json similarity index 100% rename from src/generated/resources/assets/allomancy/items/bendalloy_ingot.json rename to src/main/generated_resources/assets/allomancy/items/bendalloy_ingot.json diff --git a/src/generated/resources/assets/allomancy/items/bendalloy_nugget.json b/src/main/generated_resources/assets/allomancy/items/bendalloy_nugget.json similarity index 100% rename from src/generated/resources/assets/allomancy/items/bendalloy_nugget.json rename to src/main/generated_resources/assets/allomancy/items/bendalloy_nugget.json diff --git a/src/generated/resources/assets/allomancy/items/bendalloy_pattern.json b/src/main/generated_resources/assets/allomancy/items/bendalloy_pattern.json similarity index 100% rename from src/generated/resources/assets/allomancy/items/bendalloy_pattern.json rename to src/main/generated_resources/assets/allomancy/items/bendalloy_pattern.json diff --git a/src/generated/resources/assets/allomancy/items/brass_block.json b/src/main/generated_resources/assets/allomancy/items/brass_block.json similarity index 100% rename from src/generated/resources/assets/allomancy/items/brass_block.json rename to src/main/generated_resources/assets/allomancy/items/brass_block.json diff --git a/src/generated/resources/assets/allomancy/items/brass_flakes.json b/src/main/generated_resources/assets/allomancy/items/brass_flakes.json similarity index 100% rename from src/generated/resources/assets/allomancy/items/brass_flakes.json rename to src/main/generated_resources/assets/allomancy/items/brass_flakes.json diff --git a/src/generated/resources/assets/allomancy/items/brass_ingot.json b/src/main/generated_resources/assets/allomancy/items/brass_ingot.json similarity index 100% rename from src/generated/resources/assets/allomancy/items/brass_ingot.json rename to src/main/generated_resources/assets/allomancy/items/brass_ingot.json diff --git a/src/generated/resources/assets/allomancy/items/brass_nugget.json b/src/main/generated_resources/assets/allomancy/items/brass_nugget.json similarity index 100% rename from src/generated/resources/assets/allomancy/items/brass_nugget.json rename to src/main/generated_resources/assets/allomancy/items/brass_nugget.json diff --git a/src/generated/resources/assets/allomancy/items/brass_pattern.json b/src/main/generated_resources/assets/allomancy/items/brass_pattern.json similarity index 100% rename from src/generated/resources/assets/allomancy/items/brass_pattern.json rename to src/main/generated_resources/assets/allomancy/items/brass_pattern.json diff --git a/src/generated/resources/assets/allomancy/items/bronze_block.json b/src/main/generated_resources/assets/allomancy/items/bronze_block.json similarity index 100% rename from src/generated/resources/assets/allomancy/items/bronze_block.json rename to src/main/generated_resources/assets/allomancy/items/bronze_block.json diff --git a/src/generated/resources/assets/allomancy/items/bronze_flakes.json b/src/main/generated_resources/assets/allomancy/items/bronze_flakes.json similarity index 100% rename from src/generated/resources/assets/allomancy/items/bronze_flakes.json rename to src/main/generated_resources/assets/allomancy/items/bronze_flakes.json diff --git a/src/generated/resources/assets/allomancy/items/bronze_ingot.json b/src/main/generated_resources/assets/allomancy/items/bronze_ingot.json similarity index 100% rename from src/generated/resources/assets/allomancy/items/bronze_ingot.json rename to src/main/generated_resources/assets/allomancy/items/bronze_ingot.json diff --git a/src/generated/resources/assets/allomancy/items/bronze_nugget.json b/src/main/generated_resources/assets/allomancy/items/bronze_nugget.json similarity index 100% rename from src/generated/resources/assets/allomancy/items/bronze_nugget.json rename to src/main/generated_resources/assets/allomancy/items/bronze_nugget.json diff --git a/src/generated/resources/assets/allomancy/items/bronze_pattern.json b/src/main/generated_resources/assets/allomancy/items/bronze_pattern.json similarity index 100% rename from src/generated/resources/assets/allomancy/items/bronze_pattern.json rename to src/main/generated_resources/assets/allomancy/items/bronze_pattern.json diff --git a/src/generated/resources/assets/allomancy/items/cadmium_block.json b/src/main/generated_resources/assets/allomancy/items/cadmium_block.json similarity index 100% rename from src/generated/resources/assets/allomancy/items/cadmium_block.json rename to src/main/generated_resources/assets/allomancy/items/cadmium_block.json diff --git a/src/generated/resources/assets/allomancy/items/cadmium_flakes.json b/src/main/generated_resources/assets/allomancy/items/cadmium_flakes.json similarity index 100% rename from src/generated/resources/assets/allomancy/items/cadmium_flakes.json rename to src/main/generated_resources/assets/allomancy/items/cadmium_flakes.json diff --git a/src/generated/resources/assets/allomancy/items/cadmium_ingot.json b/src/main/generated_resources/assets/allomancy/items/cadmium_ingot.json similarity index 100% rename from src/generated/resources/assets/allomancy/items/cadmium_ingot.json rename to src/main/generated_resources/assets/allomancy/items/cadmium_ingot.json diff --git a/src/generated/resources/assets/allomancy/items/cadmium_nugget.json b/src/main/generated_resources/assets/allomancy/items/cadmium_nugget.json similarity index 100% rename from src/generated/resources/assets/allomancy/items/cadmium_nugget.json rename to src/main/generated_resources/assets/allomancy/items/cadmium_nugget.json diff --git a/src/generated/resources/assets/allomancy/items/cadmium_ore.json b/src/main/generated_resources/assets/allomancy/items/cadmium_ore.json similarity index 100% rename from src/generated/resources/assets/allomancy/items/cadmium_ore.json rename to src/main/generated_resources/assets/allomancy/items/cadmium_ore.json diff --git a/src/generated/resources/assets/allomancy/items/cadmium_pattern.json b/src/main/generated_resources/assets/allomancy/items/cadmium_pattern.json similarity index 100% rename from src/generated/resources/assets/allomancy/items/cadmium_pattern.json rename to src/main/generated_resources/assets/allomancy/items/cadmium_pattern.json diff --git a/src/generated/resources/assets/allomancy/items/chromium_block.json b/src/main/generated_resources/assets/allomancy/items/chromium_block.json similarity index 100% rename from src/generated/resources/assets/allomancy/items/chromium_block.json rename to src/main/generated_resources/assets/allomancy/items/chromium_block.json diff --git a/src/generated/resources/assets/allomancy/items/chromium_flakes.json b/src/main/generated_resources/assets/allomancy/items/chromium_flakes.json similarity index 100% rename from src/generated/resources/assets/allomancy/items/chromium_flakes.json rename to src/main/generated_resources/assets/allomancy/items/chromium_flakes.json diff --git a/src/generated/resources/assets/allomancy/items/chromium_ingot.json b/src/main/generated_resources/assets/allomancy/items/chromium_ingot.json similarity index 100% rename from src/generated/resources/assets/allomancy/items/chromium_ingot.json rename to src/main/generated_resources/assets/allomancy/items/chromium_ingot.json diff --git a/src/generated/resources/assets/allomancy/items/chromium_nugget.json b/src/main/generated_resources/assets/allomancy/items/chromium_nugget.json similarity index 100% rename from src/generated/resources/assets/allomancy/items/chromium_nugget.json rename to src/main/generated_resources/assets/allomancy/items/chromium_nugget.json diff --git a/src/generated/resources/assets/allomancy/items/chromium_ore.json b/src/main/generated_resources/assets/allomancy/items/chromium_ore.json similarity index 100% rename from src/generated/resources/assets/allomancy/items/chromium_ore.json rename to src/main/generated_resources/assets/allomancy/items/chromium_ore.json diff --git a/src/generated/resources/assets/allomancy/items/chromium_pattern.json b/src/main/generated_resources/assets/allomancy/items/chromium_pattern.json similarity index 100% rename from src/generated/resources/assets/allomancy/items/chromium_pattern.json rename to src/main/generated_resources/assets/allomancy/items/chromium_pattern.json diff --git a/src/generated/resources/assets/allomancy/items/coin_bag.json b/src/main/generated_resources/assets/allomancy/items/coin_bag.json similarity index 100% rename from src/generated/resources/assets/allomancy/items/coin_bag.json rename to src/main/generated_resources/assets/allomancy/items/coin_bag.json diff --git a/src/generated/resources/assets/allomancy/items/copper_flakes.json b/src/main/generated_resources/assets/allomancy/items/copper_flakes.json similarity index 100% rename from src/generated/resources/assets/allomancy/items/copper_flakes.json rename to src/main/generated_resources/assets/allomancy/items/copper_flakes.json diff --git a/src/generated/resources/assets/allomancy/items/copper_pattern.json b/src/main/generated_resources/assets/allomancy/items/copper_pattern.json similarity index 100% rename from src/generated/resources/assets/allomancy/items/copper_pattern.json rename to src/main/generated_resources/assets/allomancy/items/copper_pattern.json diff --git a/src/generated/resources/assets/allomancy/items/deepslate_aluminum_ore.json b/src/main/generated_resources/assets/allomancy/items/deepslate_aluminum_ore.json similarity index 100% rename from src/generated/resources/assets/allomancy/items/deepslate_aluminum_ore.json rename to src/main/generated_resources/assets/allomancy/items/deepslate_aluminum_ore.json diff --git a/src/generated/resources/assets/allomancy/items/deepslate_cadmium_ore.json b/src/main/generated_resources/assets/allomancy/items/deepslate_cadmium_ore.json similarity index 100% rename from src/generated/resources/assets/allomancy/items/deepslate_cadmium_ore.json rename to src/main/generated_resources/assets/allomancy/items/deepslate_cadmium_ore.json diff --git a/src/generated/resources/assets/allomancy/items/deepslate_chromium_ore.json b/src/main/generated_resources/assets/allomancy/items/deepslate_chromium_ore.json similarity index 100% rename from src/generated/resources/assets/allomancy/items/deepslate_chromium_ore.json rename to src/main/generated_resources/assets/allomancy/items/deepslate_chromium_ore.json diff --git a/src/generated/resources/assets/allomancy/items/deepslate_lead_ore.json b/src/main/generated_resources/assets/allomancy/items/deepslate_lead_ore.json similarity index 100% rename from src/generated/resources/assets/allomancy/items/deepslate_lead_ore.json rename to src/main/generated_resources/assets/allomancy/items/deepslate_lead_ore.json diff --git a/src/generated/resources/assets/allomancy/items/deepslate_silver_ore.json b/src/main/generated_resources/assets/allomancy/items/deepslate_silver_ore.json similarity index 100% rename from src/generated/resources/assets/allomancy/items/deepslate_silver_ore.json rename to src/main/generated_resources/assets/allomancy/items/deepslate_silver_ore.json diff --git a/src/generated/resources/assets/allomancy/items/deepslate_tin_ore.json b/src/main/generated_resources/assets/allomancy/items/deepslate_tin_ore.json similarity index 100% rename from src/generated/resources/assets/allomancy/items/deepslate_tin_ore.json rename to src/main/generated_resources/assets/allomancy/items/deepslate_tin_ore.json diff --git a/src/generated/resources/assets/allomancy/items/deepslate_zinc_ore.json b/src/main/generated_resources/assets/allomancy/items/deepslate_zinc_ore.json similarity index 100% rename from src/generated/resources/assets/allomancy/items/deepslate_zinc_ore.json rename to src/main/generated_resources/assets/allomancy/items/deepslate_zinc_ore.json diff --git a/src/generated/resources/assets/allomancy/items/duralumin_block.json b/src/main/generated_resources/assets/allomancy/items/duralumin_block.json similarity index 100% rename from src/generated/resources/assets/allomancy/items/duralumin_block.json rename to src/main/generated_resources/assets/allomancy/items/duralumin_block.json diff --git a/src/generated/resources/assets/allomancy/items/duralumin_flakes.json b/src/main/generated_resources/assets/allomancy/items/duralumin_flakes.json similarity index 100% rename from src/generated/resources/assets/allomancy/items/duralumin_flakes.json rename to src/main/generated_resources/assets/allomancy/items/duralumin_flakes.json diff --git a/src/generated/resources/assets/allomancy/items/duralumin_ingot.json b/src/main/generated_resources/assets/allomancy/items/duralumin_ingot.json similarity index 100% rename from src/generated/resources/assets/allomancy/items/duralumin_ingot.json rename to src/main/generated_resources/assets/allomancy/items/duralumin_ingot.json diff --git a/src/generated/resources/assets/allomancy/items/duralumin_nugget.json b/src/main/generated_resources/assets/allomancy/items/duralumin_nugget.json similarity index 100% rename from src/generated/resources/assets/allomancy/items/duralumin_nugget.json rename to src/main/generated_resources/assets/allomancy/items/duralumin_nugget.json diff --git a/src/generated/resources/assets/allomancy/items/duralumin_pattern.json b/src/main/generated_resources/assets/allomancy/items/duralumin_pattern.json similarity index 100% rename from src/generated/resources/assets/allomancy/items/duralumin_pattern.json rename to src/main/generated_resources/assets/allomancy/items/duralumin_pattern.json diff --git a/src/generated/resources/assets/allomancy/items/electrum_block.json b/src/main/generated_resources/assets/allomancy/items/electrum_block.json similarity index 100% rename from src/generated/resources/assets/allomancy/items/electrum_block.json rename to src/main/generated_resources/assets/allomancy/items/electrum_block.json diff --git a/src/generated/resources/assets/allomancy/items/electrum_flakes.json b/src/main/generated_resources/assets/allomancy/items/electrum_flakes.json similarity index 100% rename from src/generated/resources/assets/allomancy/items/electrum_flakes.json rename to src/main/generated_resources/assets/allomancy/items/electrum_flakes.json diff --git a/src/generated/resources/assets/allomancy/items/electrum_ingot.json b/src/main/generated_resources/assets/allomancy/items/electrum_ingot.json similarity index 100% rename from src/generated/resources/assets/allomancy/items/electrum_ingot.json rename to src/main/generated_resources/assets/allomancy/items/electrum_ingot.json diff --git a/src/generated/resources/assets/allomancy/items/electrum_nugget.json b/src/main/generated_resources/assets/allomancy/items/electrum_nugget.json similarity index 100% rename from src/generated/resources/assets/allomancy/items/electrum_nugget.json rename to src/main/generated_resources/assets/allomancy/items/electrum_nugget.json diff --git a/src/generated/resources/assets/allomancy/items/electrum_pattern.json b/src/main/generated_resources/assets/allomancy/items/electrum_pattern.json similarity index 100% rename from src/generated/resources/assets/allomancy/items/electrum_pattern.json rename to src/main/generated_resources/assets/allomancy/items/electrum_pattern.json diff --git a/src/generated/resources/assets/allomancy/items/gold_flakes.json b/src/main/generated_resources/assets/allomancy/items/gold_flakes.json similarity index 100% rename from src/generated/resources/assets/allomancy/items/gold_flakes.json rename to src/main/generated_resources/assets/allomancy/items/gold_flakes.json diff --git a/src/generated/resources/assets/allomancy/items/gold_pattern.json b/src/main/generated_resources/assets/allomancy/items/gold_pattern.json similarity index 100% rename from src/generated/resources/assets/allomancy/items/gold_pattern.json rename to src/main/generated_resources/assets/allomancy/items/gold_pattern.json diff --git a/src/generated/resources/assets/allomancy/items/inverted_iron_button.json b/src/main/generated_resources/assets/allomancy/items/inverted_iron_button.json similarity index 100% rename from src/generated/resources/assets/allomancy/items/inverted_iron_button.json rename to src/main/generated_resources/assets/allomancy/items/inverted_iron_button.json diff --git a/src/generated/resources/assets/allomancy/items/iron_button.json b/src/main/generated_resources/assets/allomancy/items/iron_button.json similarity index 100% rename from src/generated/resources/assets/allomancy/items/iron_button.json rename to src/main/generated_resources/assets/allomancy/items/iron_button.json diff --git a/src/generated/resources/assets/allomancy/items/iron_flakes.json b/src/main/generated_resources/assets/allomancy/items/iron_flakes.json similarity index 100% rename from src/generated/resources/assets/allomancy/items/iron_flakes.json rename to src/main/generated_resources/assets/allomancy/items/iron_flakes.json diff --git a/src/generated/resources/assets/allomancy/items/iron_lever.json b/src/main/generated_resources/assets/allomancy/items/iron_lever.json similarity index 100% rename from src/generated/resources/assets/allomancy/items/iron_lever.json rename to src/main/generated_resources/assets/allomancy/items/iron_lever.json diff --git a/src/generated/resources/assets/allomancy/items/iron_pattern.json b/src/main/generated_resources/assets/allomancy/items/iron_pattern.json similarity index 100% rename from src/generated/resources/assets/allomancy/items/iron_pattern.json rename to src/main/generated_resources/assets/allomancy/items/iron_pattern.json diff --git a/src/generated/resources/assets/allomancy/items/koloss_blade.json b/src/main/generated_resources/assets/allomancy/items/koloss_blade.json similarity index 100% rename from src/generated/resources/assets/allomancy/items/koloss_blade.json rename to src/main/generated_resources/assets/allomancy/items/koloss_blade.json diff --git a/src/generated/resources/assets/allomancy/items/lead_block.json b/src/main/generated_resources/assets/allomancy/items/lead_block.json similarity index 100% rename from src/generated/resources/assets/allomancy/items/lead_block.json rename to src/main/generated_resources/assets/allomancy/items/lead_block.json diff --git a/src/generated/resources/assets/allomancy/items/lead_flakes.json b/src/main/generated_resources/assets/allomancy/items/lead_flakes.json similarity index 100% rename from src/generated/resources/assets/allomancy/items/lead_flakes.json rename to src/main/generated_resources/assets/allomancy/items/lead_flakes.json diff --git a/src/generated/resources/assets/allomancy/items/lead_ingot.json b/src/main/generated_resources/assets/allomancy/items/lead_ingot.json similarity index 100% rename from src/generated/resources/assets/allomancy/items/lead_ingot.json rename to src/main/generated_resources/assets/allomancy/items/lead_ingot.json diff --git a/src/generated/resources/assets/allomancy/items/lead_nugget.json b/src/main/generated_resources/assets/allomancy/items/lead_nugget.json similarity index 100% rename from src/generated/resources/assets/allomancy/items/lead_nugget.json rename to src/main/generated_resources/assets/allomancy/items/lead_nugget.json diff --git a/src/generated/resources/assets/allomancy/items/lead_ore.json b/src/main/generated_resources/assets/allomancy/items/lead_ore.json similarity index 100% rename from src/generated/resources/assets/allomancy/items/lead_ore.json rename to src/main/generated_resources/assets/allomancy/items/lead_ore.json diff --git a/src/generated/resources/assets/allomancy/items/lerasium_nugget.json b/src/main/generated_resources/assets/allomancy/items/lerasium_nugget.json similarity index 100% rename from src/generated/resources/assets/allomancy/items/lerasium_nugget.json rename to src/main/generated_resources/assets/allomancy/items/lerasium_nugget.json diff --git a/src/generated/resources/assets/allomancy/items/mistcloak.json b/src/main/generated_resources/assets/allomancy/items/mistcloak.json similarity index 100% rename from src/generated/resources/assets/allomancy/items/mistcloak.json rename to src/main/generated_resources/assets/allomancy/items/mistcloak.json diff --git a/src/generated/resources/assets/allomancy/items/nicrosil_block.json b/src/main/generated_resources/assets/allomancy/items/nicrosil_block.json similarity index 100% rename from src/generated/resources/assets/allomancy/items/nicrosil_block.json rename to src/main/generated_resources/assets/allomancy/items/nicrosil_block.json diff --git a/src/generated/resources/assets/allomancy/items/nicrosil_flakes.json b/src/main/generated_resources/assets/allomancy/items/nicrosil_flakes.json similarity index 100% rename from src/generated/resources/assets/allomancy/items/nicrosil_flakes.json rename to src/main/generated_resources/assets/allomancy/items/nicrosil_flakes.json diff --git a/src/generated/resources/assets/allomancy/items/nicrosil_ingot.json b/src/main/generated_resources/assets/allomancy/items/nicrosil_ingot.json similarity index 100% rename from src/generated/resources/assets/allomancy/items/nicrosil_ingot.json rename to src/main/generated_resources/assets/allomancy/items/nicrosil_ingot.json diff --git a/src/generated/resources/assets/allomancy/items/nicrosil_nugget.json b/src/main/generated_resources/assets/allomancy/items/nicrosil_nugget.json similarity index 100% rename from src/generated/resources/assets/allomancy/items/nicrosil_nugget.json rename to src/main/generated_resources/assets/allomancy/items/nicrosil_nugget.json diff --git a/src/generated/resources/assets/allomancy/items/nicrosil_pattern.json b/src/main/generated_resources/assets/allomancy/items/nicrosil_pattern.json similarity index 100% rename from src/generated/resources/assets/allomancy/items/nicrosil_pattern.json rename to src/main/generated_resources/assets/allomancy/items/nicrosil_pattern.json diff --git a/src/generated/resources/assets/allomancy/items/obsidian_dagger.json b/src/main/generated_resources/assets/allomancy/items/obsidian_dagger.json similarity index 100% rename from src/generated/resources/assets/allomancy/items/obsidian_dagger.json rename to src/main/generated_resources/assets/allomancy/items/obsidian_dagger.json diff --git a/src/generated/resources/assets/allomancy/items/pewter_block.json b/src/main/generated_resources/assets/allomancy/items/pewter_block.json similarity index 100% rename from src/generated/resources/assets/allomancy/items/pewter_block.json rename to src/main/generated_resources/assets/allomancy/items/pewter_block.json diff --git a/src/generated/resources/assets/allomancy/items/pewter_flakes.json b/src/main/generated_resources/assets/allomancy/items/pewter_flakes.json similarity index 100% rename from src/generated/resources/assets/allomancy/items/pewter_flakes.json rename to src/main/generated_resources/assets/allomancy/items/pewter_flakes.json diff --git a/src/generated/resources/assets/allomancy/items/pewter_ingot.json b/src/main/generated_resources/assets/allomancy/items/pewter_ingot.json similarity index 100% rename from src/generated/resources/assets/allomancy/items/pewter_ingot.json rename to src/main/generated_resources/assets/allomancy/items/pewter_ingot.json diff --git a/src/generated/resources/assets/allomancy/items/pewter_nugget.json b/src/main/generated_resources/assets/allomancy/items/pewter_nugget.json similarity index 100% rename from src/generated/resources/assets/allomancy/items/pewter_nugget.json rename to src/main/generated_resources/assets/allomancy/items/pewter_nugget.json diff --git a/src/generated/resources/assets/allomancy/items/pewter_pattern.json b/src/main/generated_resources/assets/allomancy/items/pewter_pattern.json similarity index 100% rename from src/generated/resources/assets/allomancy/items/pewter_pattern.json rename to src/main/generated_resources/assets/allomancy/items/pewter_pattern.json diff --git a/src/generated/resources/assets/allomancy/items/raw_aluminum.json b/src/main/generated_resources/assets/allomancy/items/raw_aluminum.json similarity index 100% rename from src/generated/resources/assets/allomancy/items/raw_aluminum.json rename to src/main/generated_resources/assets/allomancy/items/raw_aluminum.json diff --git a/src/generated/resources/assets/allomancy/items/raw_aluminum_block.json b/src/main/generated_resources/assets/allomancy/items/raw_aluminum_block.json similarity index 100% rename from src/generated/resources/assets/allomancy/items/raw_aluminum_block.json rename to src/main/generated_resources/assets/allomancy/items/raw_aluminum_block.json diff --git a/src/generated/resources/assets/allomancy/items/raw_cadmium.json b/src/main/generated_resources/assets/allomancy/items/raw_cadmium.json similarity index 100% rename from src/generated/resources/assets/allomancy/items/raw_cadmium.json rename to src/main/generated_resources/assets/allomancy/items/raw_cadmium.json diff --git a/src/generated/resources/assets/allomancy/items/raw_cadmium_block.json b/src/main/generated_resources/assets/allomancy/items/raw_cadmium_block.json similarity index 100% rename from src/generated/resources/assets/allomancy/items/raw_cadmium_block.json rename to src/main/generated_resources/assets/allomancy/items/raw_cadmium_block.json diff --git a/src/generated/resources/assets/allomancy/items/raw_chromium.json b/src/main/generated_resources/assets/allomancy/items/raw_chromium.json similarity index 100% rename from src/generated/resources/assets/allomancy/items/raw_chromium.json rename to src/main/generated_resources/assets/allomancy/items/raw_chromium.json diff --git a/src/generated/resources/assets/allomancy/items/raw_chromium_block.json b/src/main/generated_resources/assets/allomancy/items/raw_chromium_block.json similarity index 100% rename from src/generated/resources/assets/allomancy/items/raw_chromium_block.json rename to src/main/generated_resources/assets/allomancy/items/raw_chromium_block.json diff --git a/src/generated/resources/assets/allomancy/items/raw_lead.json b/src/main/generated_resources/assets/allomancy/items/raw_lead.json similarity index 100% rename from src/generated/resources/assets/allomancy/items/raw_lead.json rename to src/main/generated_resources/assets/allomancy/items/raw_lead.json diff --git a/src/generated/resources/assets/allomancy/items/raw_lead_block.json b/src/main/generated_resources/assets/allomancy/items/raw_lead_block.json similarity index 100% rename from src/generated/resources/assets/allomancy/items/raw_lead_block.json rename to src/main/generated_resources/assets/allomancy/items/raw_lead_block.json diff --git a/src/generated/resources/assets/allomancy/items/raw_silver.json b/src/main/generated_resources/assets/allomancy/items/raw_silver.json similarity index 100% rename from src/generated/resources/assets/allomancy/items/raw_silver.json rename to src/main/generated_resources/assets/allomancy/items/raw_silver.json diff --git a/src/generated/resources/assets/allomancy/items/raw_silver_block.json b/src/main/generated_resources/assets/allomancy/items/raw_silver_block.json similarity index 100% rename from src/generated/resources/assets/allomancy/items/raw_silver_block.json rename to src/main/generated_resources/assets/allomancy/items/raw_silver_block.json diff --git a/src/generated/resources/assets/allomancy/items/raw_tin.json b/src/main/generated_resources/assets/allomancy/items/raw_tin.json similarity index 100% rename from src/generated/resources/assets/allomancy/items/raw_tin.json rename to src/main/generated_resources/assets/allomancy/items/raw_tin.json diff --git a/src/generated/resources/assets/allomancy/items/raw_tin_block.json b/src/main/generated_resources/assets/allomancy/items/raw_tin_block.json similarity index 100% rename from src/generated/resources/assets/allomancy/items/raw_tin_block.json rename to src/main/generated_resources/assets/allomancy/items/raw_tin_block.json diff --git a/src/generated/resources/assets/allomancy/items/raw_zinc.json b/src/main/generated_resources/assets/allomancy/items/raw_zinc.json similarity index 100% rename from src/generated/resources/assets/allomancy/items/raw_zinc.json rename to src/main/generated_resources/assets/allomancy/items/raw_zinc.json diff --git a/src/generated/resources/assets/allomancy/items/raw_zinc_block.json b/src/main/generated_resources/assets/allomancy/items/raw_zinc_block.json similarity index 100% rename from src/generated/resources/assets/allomancy/items/raw_zinc_block.json rename to src/main/generated_resources/assets/allomancy/items/raw_zinc_block.json diff --git a/src/generated/resources/assets/allomancy/items/silver_block.json b/src/main/generated_resources/assets/allomancy/items/silver_block.json similarity index 100% rename from src/generated/resources/assets/allomancy/items/silver_block.json rename to src/main/generated_resources/assets/allomancy/items/silver_block.json diff --git a/src/generated/resources/assets/allomancy/items/silver_flakes.json b/src/main/generated_resources/assets/allomancy/items/silver_flakes.json similarity index 100% rename from src/generated/resources/assets/allomancy/items/silver_flakes.json rename to src/main/generated_resources/assets/allomancy/items/silver_flakes.json diff --git a/src/generated/resources/assets/allomancy/items/silver_ingot.json b/src/main/generated_resources/assets/allomancy/items/silver_ingot.json similarity index 100% rename from src/generated/resources/assets/allomancy/items/silver_ingot.json rename to src/main/generated_resources/assets/allomancy/items/silver_ingot.json diff --git a/src/generated/resources/assets/allomancy/items/silver_nugget.json b/src/main/generated_resources/assets/allomancy/items/silver_nugget.json similarity index 100% rename from src/generated/resources/assets/allomancy/items/silver_nugget.json rename to src/main/generated_resources/assets/allomancy/items/silver_nugget.json diff --git a/src/generated/resources/assets/allomancy/items/silver_ore.json b/src/main/generated_resources/assets/allomancy/items/silver_ore.json similarity index 100% rename from src/generated/resources/assets/allomancy/items/silver_ore.json rename to src/main/generated_resources/assets/allomancy/items/silver_ore.json diff --git a/src/generated/resources/assets/allomancy/items/steel_block.json b/src/main/generated_resources/assets/allomancy/items/steel_block.json similarity index 100% rename from src/generated/resources/assets/allomancy/items/steel_block.json rename to src/main/generated_resources/assets/allomancy/items/steel_block.json diff --git a/src/generated/resources/assets/allomancy/items/steel_flakes.json b/src/main/generated_resources/assets/allomancy/items/steel_flakes.json similarity index 100% rename from src/generated/resources/assets/allomancy/items/steel_flakes.json rename to src/main/generated_resources/assets/allomancy/items/steel_flakes.json diff --git a/src/generated/resources/assets/allomancy/items/steel_ingot.json b/src/main/generated_resources/assets/allomancy/items/steel_ingot.json similarity index 100% rename from src/generated/resources/assets/allomancy/items/steel_ingot.json rename to src/main/generated_resources/assets/allomancy/items/steel_ingot.json diff --git a/src/generated/resources/assets/allomancy/items/steel_nugget.json b/src/main/generated_resources/assets/allomancy/items/steel_nugget.json similarity index 100% rename from src/generated/resources/assets/allomancy/items/steel_nugget.json rename to src/main/generated_resources/assets/allomancy/items/steel_nugget.json diff --git a/src/generated/resources/assets/allomancy/items/steel_pattern.json b/src/main/generated_resources/assets/allomancy/items/steel_pattern.json similarity index 100% rename from src/generated/resources/assets/allomancy/items/steel_pattern.json rename to src/main/generated_resources/assets/allomancy/items/steel_pattern.json diff --git a/src/generated/resources/assets/allomancy/items/tin_block.json b/src/main/generated_resources/assets/allomancy/items/tin_block.json similarity index 100% rename from src/generated/resources/assets/allomancy/items/tin_block.json rename to src/main/generated_resources/assets/allomancy/items/tin_block.json diff --git a/src/generated/resources/assets/allomancy/items/tin_flakes.json b/src/main/generated_resources/assets/allomancy/items/tin_flakes.json similarity index 100% rename from src/generated/resources/assets/allomancy/items/tin_flakes.json rename to src/main/generated_resources/assets/allomancy/items/tin_flakes.json diff --git a/src/generated/resources/assets/allomancy/items/tin_ingot.json b/src/main/generated_resources/assets/allomancy/items/tin_ingot.json similarity index 100% rename from src/generated/resources/assets/allomancy/items/tin_ingot.json rename to src/main/generated_resources/assets/allomancy/items/tin_ingot.json diff --git a/src/generated/resources/assets/allomancy/items/tin_nugget.json b/src/main/generated_resources/assets/allomancy/items/tin_nugget.json similarity index 100% rename from src/generated/resources/assets/allomancy/items/tin_nugget.json rename to src/main/generated_resources/assets/allomancy/items/tin_nugget.json diff --git a/src/generated/resources/assets/allomancy/items/tin_ore.json b/src/main/generated_resources/assets/allomancy/items/tin_ore.json similarity index 100% rename from src/generated/resources/assets/allomancy/items/tin_ore.json rename to src/main/generated_resources/assets/allomancy/items/tin_ore.json diff --git a/src/generated/resources/assets/allomancy/items/tin_pattern.json b/src/main/generated_resources/assets/allomancy/items/tin_pattern.json similarity index 100% rename from src/generated/resources/assets/allomancy/items/tin_pattern.json rename to src/main/generated_resources/assets/allomancy/items/tin_pattern.json diff --git a/src/generated/resources/assets/allomancy/items/vial.json b/src/main/generated_resources/assets/allomancy/items/vial.json similarity index 100% rename from src/generated/resources/assets/allomancy/items/vial.json rename to src/main/generated_resources/assets/allomancy/items/vial.json diff --git a/src/generated/resources/assets/allomancy/items/zinc_block.json b/src/main/generated_resources/assets/allomancy/items/zinc_block.json similarity index 100% rename from src/generated/resources/assets/allomancy/items/zinc_block.json rename to src/main/generated_resources/assets/allomancy/items/zinc_block.json diff --git a/src/generated/resources/assets/allomancy/items/zinc_flakes.json b/src/main/generated_resources/assets/allomancy/items/zinc_flakes.json similarity index 100% rename from src/generated/resources/assets/allomancy/items/zinc_flakes.json rename to src/main/generated_resources/assets/allomancy/items/zinc_flakes.json diff --git a/src/generated/resources/assets/allomancy/items/zinc_ingot.json b/src/main/generated_resources/assets/allomancy/items/zinc_ingot.json similarity index 100% rename from src/generated/resources/assets/allomancy/items/zinc_ingot.json rename to src/main/generated_resources/assets/allomancy/items/zinc_ingot.json diff --git a/src/generated/resources/assets/allomancy/items/zinc_nugget.json b/src/main/generated_resources/assets/allomancy/items/zinc_nugget.json similarity index 100% rename from src/generated/resources/assets/allomancy/items/zinc_nugget.json rename to src/main/generated_resources/assets/allomancy/items/zinc_nugget.json diff --git a/src/generated/resources/assets/allomancy/items/zinc_ore.json b/src/main/generated_resources/assets/allomancy/items/zinc_ore.json similarity index 100% rename from src/generated/resources/assets/allomancy/items/zinc_ore.json rename to src/main/generated_resources/assets/allomancy/items/zinc_ore.json diff --git a/src/generated/resources/assets/allomancy/items/zinc_pattern.json b/src/main/generated_resources/assets/allomancy/items/zinc_pattern.json similarity index 100% rename from src/generated/resources/assets/allomancy/items/zinc_pattern.json rename to src/main/generated_resources/assets/allomancy/items/zinc_pattern.json diff --git a/src/generated/resources/assets/allomancy/lang/en_us.json b/src/main/generated_resources/assets/allomancy/lang/en_us.json similarity index 100% rename from src/generated/resources/assets/allomancy/lang/en_us.json rename to src/main/generated_resources/assets/allomancy/lang/en_us.json diff --git a/src/generated/resources/assets/allomancy/models/block/aluminum_block.json b/src/main/generated_resources/assets/allomancy/models/block/aluminum_block.json similarity index 100% rename from src/generated/resources/assets/allomancy/models/block/aluminum_block.json rename to src/main/generated_resources/assets/allomancy/models/block/aluminum_block.json diff --git a/src/generated/resources/assets/allomancy/models/block/aluminum_ore.json b/src/main/generated_resources/assets/allomancy/models/block/aluminum_ore.json similarity index 100% rename from src/generated/resources/assets/allomancy/models/block/aluminum_ore.json rename to src/main/generated_resources/assets/allomancy/models/block/aluminum_ore.json diff --git a/src/generated/resources/assets/allomancy/models/block/bendalloy_block.json b/src/main/generated_resources/assets/allomancy/models/block/bendalloy_block.json similarity index 100% rename from src/generated/resources/assets/allomancy/models/block/bendalloy_block.json rename to src/main/generated_resources/assets/allomancy/models/block/bendalloy_block.json diff --git a/src/generated/resources/assets/allomancy/models/block/brass_block.json b/src/main/generated_resources/assets/allomancy/models/block/brass_block.json similarity index 100% rename from src/generated/resources/assets/allomancy/models/block/brass_block.json rename to src/main/generated_resources/assets/allomancy/models/block/brass_block.json diff --git a/src/generated/resources/assets/allomancy/models/block/bronze_block.json b/src/main/generated_resources/assets/allomancy/models/block/bronze_block.json similarity index 100% rename from src/generated/resources/assets/allomancy/models/block/bronze_block.json rename to src/main/generated_resources/assets/allomancy/models/block/bronze_block.json diff --git a/src/generated/resources/assets/allomancy/models/block/cadmium_block.json b/src/main/generated_resources/assets/allomancy/models/block/cadmium_block.json similarity index 100% rename from src/generated/resources/assets/allomancy/models/block/cadmium_block.json rename to src/main/generated_resources/assets/allomancy/models/block/cadmium_block.json diff --git a/src/generated/resources/assets/allomancy/models/block/cadmium_ore.json b/src/main/generated_resources/assets/allomancy/models/block/cadmium_ore.json similarity index 100% rename from src/generated/resources/assets/allomancy/models/block/cadmium_ore.json rename to src/main/generated_resources/assets/allomancy/models/block/cadmium_ore.json diff --git a/src/generated/resources/assets/allomancy/models/block/chromium_block.json b/src/main/generated_resources/assets/allomancy/models/block/chromium_block.json similarity index 100% rename from src/generated/resources/assets/allomancy/models/block/chromium_block.json rename to src/main/generated_resources/assets/allomancy/models/block/chromium_block.json diff --git a/src/generated/resources/assets/allomancy/models/block/chromium_ore.json b/src/main/generated_resources/assets/allomancy/models/block/chromium_ore.json similarity index 100% rename from src/generated/resources/assets/allomancy/models/block/chromium_ore.json rename to src/main/generated_resources/assets/allomancy/models/block/chromium_ore.json diff --git a/src/generated/resources/assets/allomancy/models/block/deepslate_aluminum_ore.json b/src/main/generated_resources/assets/allomancy/models/block/deepslate_aluminum_ore.json similarity index 100% rename from src/generated/resources/assets/allomancy/models/block/deepslate_aluminum_ore.json rename to src/main/generated_resources/assets/allomancy/models/block/deepslate_aluminum_ore.json diff --git a/src/generated/resources/assets/allomancy/models/block/deepslate_cadmium_ore.json b/src/main/generated_resources/assets/allomancy/models/block/deepslate_cadmium_ore.json similarity index 100% rename from src/generated/resources/assets/allomancy/models/block/deepslate_cadmium_ore.json rename to src/main/generated_resources/assets/allomancy/models/block/deepslate_cadmium_ore.json diff --git a/src/generated/resources/assets/allomancy/models/block/deepslate_chromium_ore.json b/src/main/generated_resources/assets/allomancy/models/block/deepslate_chromium_ore.json similarity index 100% rename from src/generated/resources/assets/allomancy/models/block/deepslate_chromium_ore.json rename to src/main/generated_resources/assets/allomancy/models/block/deepslate_chromium_ore.json diff --git a/src/generated/resources/assets/allomancy/models/block/deepslate_lead_ore.json b/src/main/generated_resources/assets/allomancy/models/block/deepslate_lead_ore.json similarity index 100% rename from src/generated/resources/assets/allomancy/models/block/deepslate_lead_ore.json rename to src/main/generated_resources/assets/allomancy/models/block/deepslate_lead_ore.json diff --git a/src/generated/resources/assets/allomancy/models/block/deepslate_silver_ore.json b/src/main/generated_resources/assets/allomancy/models/block/deepslate_silver_ore.json similarity index 100% rename from src/generated/resources/assets/allomancy/models/block/deepslate_silver_ore.json rename to src/main/generated_resources/assets/allomancy/models/block/deepslate_silver_ore.json diff --git a/src/generated/resources/assets/allomancy/models/block/deepslate_tin_ore.json b/src/main/generated_resources/assets/allomancy/models/block/deepslate_tin_ore.json similarity index 100% rename from src/generated/resources/assets/allomancy/models/block/deepslate_tin_ore.json rename to src/main/generated_resources/assets/allomancy/models/block/deepslate_tin_ore.json diff --git a/src/generated/resources/assets/allomancy/models/block/deepslate_zinc_ore.json b/src/main/generated_resources/assets/allomancy/models/block/deepslate_zinc_ore.json similarity index 100% rename from src/generated/resources/assets/allomancy/models/block/deepslate_zinc_ore.json rename to src/main/generated_resources/assets/allomancy/models/block/deepslate_zinc_ore.json diff --git a/src/generated/resources/assets/allomancy/models/block/duralumin_block.json b/src/main/generated_resources/assets/allomancy/models/block/duralumin_block.json similarity index 100% rename from src/generated/resources/assets/allomancy/models/block/duralumin_block.json rename to src/main/generated_resources/assets/allomancy/models/block/duralumin_block.json diff --git a/src/generated/resources/assets/allomancy/models/block/electrum_block.json b/src/main/generated_resources/assets/allomancy/models/block/electrum_block.json similarity index 100% rename from src/generated/resources/assets/allomancy/models/block/electrum_block.json rename to src/main/generated_resources/assets/allomancy/models/block/electrum_block.json diff --git a/src/generated/resources/assets/allomancy/models/block/iron_button.json b/src/main/generated_resources/assets/allomancy/models/block/iron_button.json similarity index 100% rename from src/generated/resources/assets/allomancy/models/block/iron_button.json rename to src/main/generated_resources/assets/allomancy/models/block/iron_button.json diff --git a/src/generated/resources/assets/allomancy/models/block/iron_button_inventory.json b/src/main/generated_resources/assets/allomancy/models/block/iron_button_inventory.json similarity index 100% rename from src/generated/resources/assets/allomancy/models/block/iron_button_inventory.json rename to src/main/generated_resources/assets/allomancy/models/block/iron_button_inventory.json diff --git a/src/generated/resources/assets/allomancy/models/block/iron_button_pressed.json b/src/main/generated_resources/assets/allomancy/models/block/iron_button_pressed.json similarity index 100% rename from src/generated/resources/assets/allomancy/models/block/iron_button_pressed.json rename to src/main/generated_resources/assets/allomancy/models/block/iron_button_pressed.json diff --git a/src/generated/resources/assets/allomancy/models/block/iron_lever.json b/src/main/generated_resources/assets/allomancy/models/block/iron_lever.json similarity index 100% rename from src/generated/resources/assets/allomancy/models/block/iron_lever.json rename to src/main/generated_resources/assets/allomancy/models/block/iron_lever.json diff --git a/src/generated/resources/assets/allomancy/models/block/iron_lever_on.json b/src/main/generated_resources/assets/allomancy/models/block/iron_lever_on.json similarity index 100% rename from src/generated/resources/assets/allomancy/models/block/iron_lever_on.json rename to src/main/generated_resources/assets/allomancy/models/block/iron_lever_on.json diff --git a/src/generated/resources/assets/allomancy/models/block/lead_block.json b/src/main/generated_resources/assets/allomancy/models/block/lead_block.json similarity index 100% rename from src/generated/resources/assets/allomancy/models/block/lead_block.json rename to src/main/generated_resources/assets/allomancy/models/block/lead_block.json diff --git a/src/generated/resources/assets/allomancy/models/block/lead_ore.json b/src/main/generated_resources/assets/allomancy/models/block/lead_ore.json similarity index 100% rename from src/generated/resources/assets/allomancy/models/block/lead_ore.json rename to src/main/generated_resources/assets/allomancy/models/block/lead_ore.json diff --git a/src/generated/resources/assets/allomancy/models/block/nicrosil_block.json b/src/main/generated_resources/assets/allomancy/models/block/nicrosil_block.json similarity index 100% rename from src/generated/resources/assets/allomancy/models/block/nicrosil_block.json rename to src/main/generated_resources/assets/allomancy/models/block/nicrosil_block.json diff --git a/src/generated/resources/assets/allomancy/models/block/pewter_block.json b/src/main/generated_resources/assets/allomancy/models/block/pewter_block.json similarity index 100% rename from src/generated/resources/assets/allomancy/models/block/pewter_block.json rename to src/main/generated_resources/assets/allomancy/models/block/pewter_block.json diff --git a/src/generated/resources/assets/allomancy/models/block/raw_aluminum_block.json b/src/main/generated_resources/assets/allomancy/models/block/raw_aluminum_block.json similarity index 100% rename from src/generated/resources/assets/allomancy/models/block/raw_aluminum_block.json rename to src/main/generated_resources/assets/allomancy/models/block/raw_aluminum_block.json diff --git a/src/generated/resources/assets/allomancy/models/block/raw_cadmium_block.json b/src/main/generated_resources/assets/allomancy/models/block/raw_cadmium_block.json similarity index 100% rename from src/generated/resources/assets/allomancy/models/block/raw_cadmium_block.json rename to src/main/generated_resources/assets/allomancy/models/block/raw_cadmium_block.json diff --git a/src/generated/resources/assets/allomancy/models/block/raw_chromium_block.json b/src/main/generated_resources/assets/allomancy/models/block/raw_chromium_block.json similarity index 100% rename from src/generated/resources/assets/allomancy/models/block/raw_chromium_block.json rename to src/main/generated_resources/assets/allomancy/models/block/raw_chromium_block.json diff --git a/src/generated/resources/assets/allomancy/models/block/raw_lead_block.json b/src/main/generated_resources/assets/allomancy/models/block/raw_lead_block.json similarity index 100% rename from src/generated/resources/assets/allomancy/models/block/raw_lead_block.json rename to src/main/generated_resources/assets/allomancy/models/block/raw_lead_block.json diff --git a/src/generated/resources/assets/allomancy/models/block/raw_silver_block.json b/src/main/generated_resources/assets/allomancy/models/block/raw_silver_block.json similarity index 100% rename from src/generated/resources/assets/allomancy/models/block/raw_silver_block.json rename to src/main/generated_resources/assets/allomancy/models/block/raw_silver_block.json diff --git a/src/generated/resources/assets/allomancy/models/block/raw_tin_block.json b/src/main/generated_resources/assets/allomancy/models/block/raw_tin_block.json similarity index 100% rename from src/generated/resources/assets/allomancy/models/block/raw_tin_block.json rename to src/main/generated_resources/assets/allomancy/models/block/raw_tin_block.json diff --git a/src/generated/resources/assets/allomancy/models/block/raw_zinc_block.json b/src/main/generated_resources/assets/allomancy/models/block/raw_zinc_block.json similarity index 100% rename from src/generated/resources/assets/allomancy/models/block/raw_zinc_block.json rename to src/main/generated_resources/assets/allomancy/models/block/raw_zinc_block.json diff --git a/src/generated/resources/assets/allomancy/models/block/silver_block.json b/src/main/generated_resources/assets/allomancy/models/block/silver_block.json similarity index 100% rename from src/generated/resources/assets/allomancy/models/block/silver_block.json rename to src/main/generated_resources/assets/allomancy/models/block/silver_block.json diff --git a/src/generated/resources/assets/allomancy/models/block/silver_ore.json b/src/main/generated_resources/assets/allomancy/models/block/silver_ore.json similarity index 100% rename from src/generated/resources/assets/allomancy/models/block/silver_ore.json rename to src/main/generated_resources/assets/allomancy/models/block/silver_ore.json diff --git a/src/generated/resources/assets/allomancy/models/block/steel_block.json b/src/main/generated_resources/assets/allomancy/models/block/steel_block.json similarity index 100% rename from src/generated/resources/assets/allomancy/models/block/steel_block.json rename to src/main/generated_resources/assets/allomancy/models/block/steel_block.json diff --git a/src/generated/resources/assets/allomancy/models/block/tin_block.json b/src/main/generated_resources/assets/allomancy/models/block/tin_block.json similarity index 100% rename from src/generated/resources/assets/allomancy/models/block/tin_block.json rename to src/main/generated_resources/assets/allomancy/models/block/tin_block.json diff --git a/src/generated/resources/assets/allomancy/models/block/tin_ore.json b/src/main/generated_resources/assets/allomancy/models/block/tin_ore.json similarity index 100% rename from src/generated/resources/assets/allomancy/models/block/tin_ore.json rename to src/main/generated_resources/assets/allomancy/models/block/tin_ore.json diff --git a/src/generated/resources/assets/allomancy/models/block/zinc_block.json b/src/main/generated_resources/assets/allomancy/models/block/zinc_block.json similarity index 100% rename from src/generated/resources/assets/allomancy/models/block/zinc_block.json rename to src/main/generated_resources/assets/allomancy/models/block/zinc_block.json diff --git a/src/generated/resources/assets/allomancy/models/block/zinc_ore.json b/src/main/generated_resources/assets/allomancy/models/block/zinc_ore.json similarity index 100% rename from src/generated/resources/assets/allomancy/models/block/zinc_ore.json rename to src/main/generated_resources/assets/allomancy/models/block/zinc_ore.json diff --git a/src/generated/resources/assets/allomancy/models/item/allomantic_grinder.json b/src/main/generated_resources/assets/allomancy/models/item/allomantic_grinder.json similarity index 100% rename from src/generated/resources/assets/allomancy/models/item/allomantic_grinder.json rename to src/main/generated_resources/assets/allomancy/models/item/allomantic_grinder.json diff --git a/src/generated/resources/assets/allomancy/models/item/aluminum_flakes.json b/src/main/generated_resources/assets/allomancy/models/item/aluminum_flakes.json similarity index 100% rename from src/generated/resources/assets/allomancy/models/item/aluminum_flakes.json rename to src/main/generated_resources/assets/allomancy/models/item/aluminum_flakes.json diff --git a/src/generated/resources/assets/allomancy/models/item/aluminum_helmet.json b/src/main/generated_resources/assets/allomancy/models/item/aluminum_helmet.json similarity index 100% rename from src/generated/resources/assets/allomancy/models/item/aluminum_helmet.json rename to src/main/generated_resources/assets/allomancy/models/item/aluminum_helmet.json diff --git a/src/generated/resources/assets/allomancy/models/item/aluminum_helmet_amethyst_trim.json b/src/main/generated_resources/assets/allomancy/models/item/aluminum_helmet_amethyst_trim.json similarity index 100% rename from src/generated/resources/assets/allomancy/models/item/aluminum_helmet_amethyst_trim.json rename to src/main/generated_resources/assets/allomancy/models/item/aluminum_helmet_amethyst_trim.json diff --git a/src/generated/resources/assets/allomancy/models/item/aluminum_helmet_copper_trim.json b/src/main/generated_resources/assets/allomancy/models/item/aluminum_helmet_copper_trim.json similarity index 100% rename from src/generated/resources/assets/allomancy/models/item/aluminum_helmet_copper_trim.json rename to src/main/generated_resources/assets/allomancy/models/item/aluminum_helmet_copper_trim.json diff --git a/src/generated/resources/assets/allomancy/models/item/aluminum_helmet_diamond_trim.json b/src/main/generated_resources/assets/allomancy/models/item/aluminum_helmet_diamond_trim.json similarity index 100% rename from src/generated/resources/assets/allomancy/models/item/aluminum_helmet_diamond_trim.json rename to src/main/generated_resources/assets/allomancy/models/item/aluminum_helmet_diamond_trim.json diff --git a/src/generated/resources/assets/allomancy/models/item/aluminum_helmet_emerald_trim.json b/src/main/generated_resources/assets/allomancy/models/item/aluminum_helmet_emerald_trim.json similarity index 100% rename from src/generated/resources/assets/allomancy/models/item/aluminum_helmet_emerald_trim.json rename to src/main/generated_resources/assets/allomancy/models/item/aluminum_helmet_emerald_trim.json diff --git a/src/generated/resources/assets/allomancy/models/item/aluminum_helmet_gold_trim.json b/src/main/generated_resources/assets/allomancy/models/item/aluminum_helmet_gold_trim.json similarity index 100% rename from src/generated/resources/assets/allomancy/models/item/aluminum_helmet_gold_trim.json rename to src/main/generated_resources/assets/allomancy/models/item/aluminum_helmet_gold_trim.json diff --git a/src/generated/resources/assets/allomancy/models/item/aluminum_helmet_iron_trim.json b/src/main/generated_resources/assets/allomancy/models/item/aluminum_helmet_iron_trim.json similarity index 100% rename from src/generated/resources/assets/allomancy/models/item/aluminum_helmet_iron_trim.json rename to src/main/generated_resources/assets/allomancy/models/item/aluminum_helmet_iron_trim.json diff --git a/src/generated/resources/assets/allomancy/models/item/aluminum_helmet_lapis_trim.json b/src/main/generated_resources/assets/allomancy/models/item/aluminum_helmet_lapis_trim.json similarity index 100% rename from src/generated/resources/assets/allomancy/models/item/aluminum_helmet_lapis_trim.json rename to src/main/generated_resources/assets/allomancy/models/item/aluminum_helmet_lapis_trim.json diff --git a/src/generated/resources/assets/allomancy/models/item/aluminum_helmet_netherite_trim.json b/src/main/generated_resources/assets/allomancy/models/item/aluminum_helmet_netherite_trim.json similarity index 100% rename from src/generated/resources/assets/allomancy/models/item/aluminum_helmet_netherite_trim.json rename to src/main/generated_resources/assets/allomancy/models/item/aluminum_helmet_netherite_trim.json diff --git a/src/generated/resources/assets/allomancy/models/item/aluminum_helmet_quartz_trim.json b/src/main/generated_resources/assets/allomancy/models/item/aluminum_helmet_quartz_trim.json similarity index 100% rename from src/generated/resources/assets/allomancy/models/item/aluminum_helmet_quartz_trim.json rename to src/main/generated_resources/assets/allomancy/models/item/aluminum_helmet_quartz_trim.json diff --git a/src/generated/resources/assets/allomancy/models/item/aluminum_helmet_redstone_trim.json b/src/main/generated_resources/assets/allomancy/models/item/aluminum_helmet_redstone_trim.json similarity index 100% rename from src/generated/resources/assets/allomancy/models/item/aluminum_helmet_redstone_trim.json rename to src/main/generated_resources/assets/allomancy/models/item/aluminum_helmet_redstone_trim.json diff --git a/src/generated/resources/assets/allomancy/models/item/aluminum_helmet_resin_trim.json b/src/main/generated_resources/assets/allomancy/models/item/aluminum_helmet_resin_trim.json similarity index 100% rename from src/generated/resources/assets/allomancy/models/item/aluminum_helmet_resin_trim.json rename to src/main/generated_resources/assets/allomancy/models/item/aluminum_helmet_resin_trim.json diff --git a/src/generated/resources/assets/allomancy/models/item/aluminum_ingot.json b/src/main/generated_resources/assets/allomancy/models/item/aluminum_ingot.json similarity index 100% rename from src/generated/resources/assets/allomancy/models/item/aluminum_ingot.json rename to src/main/generated_resources/assets/allomancy/models/item/aluminum_ingot.json diff --git a/src/generated/resources/assets/allomancy/models/item/aluminum_nugget.json b/src/main/generated_resources/assets/allomancy/models/item/aluminum_nugget.json similarity index 100% rename from src/generated/resources/assets/allomancy/models/item/aluminum_nugget.json rename to src/main/generated_resources/assets/allomancy/models/item/aluminum_nugget.json diff --git a/src/generated/resources/assets/allomancy/models/item/aluminum_pattern.json b/src/main/generated_resources/assets/allomancy/models/item/aluminum_pattern.json similarity index 100% rename from src/generated/resources/assets/allomancy/models/item/aluminum_pattern.json rename to src/main/generated_resources/assets/allomancy/models/item/aluminum_pattern.json diff --git a/src/generated/resources/assets/allomancy/models/item/bendalloy_flakes.json b/src/main/generated_resources/assets/allomancy/models/item/bendalloy_flakes.json similarity index 100% rename from src/generated/resources/assets/allomancy/models/item/bendalloy_flakes.json rename to src/main/generated_resources/assets/allomancy/models/item/bendalloy_flakes.json diff --git a/src/generated/resources/assets/allomancy/models/item/bendalloy_ingot.json b/src/main/generated_resources/assets/allomancy/models/item/bendalloy_ingot.json similarity index 100% rename from src/generated/resources/assets/allomancy/models/item/bendalloy_ingot.json rename to src/main/generated_resources/assets/allomancy/models/item/bendalloy_ingot.json diff --git a/src/generated/resources/assets/allomancy/models/item/bendalloy_nugget.json b/src/main/generated_resources/assets/allomancy/models/item/bendalloy_nugget.json similarity index 100% rename from src/generated/resources/assets/allomancy/models/item/bendalloy_nugget.json rename to src/main/generated_resources/assets/allomancy/models/item/bendalloy_nugget.json diff --git a/src/generated/resources/assets/allomancy/models/item/bendalloy_pattern.json b/src/main/generated_resources/assets/allomancy/models/item/bendalloy_pattern.json similarity index 100% rename from src/generated/resources/assets/allomancy/models/item/bendalloy_pattern.json rename to src/main/generated_resources/assets/allomancy/models/item/bendalloy_pattern.json diff --git a/src/generated/resources/assets/allomancy/models/item/brass_flakes.json b/src/main/generated_resources/assets/allomancy/models/item/brass_flakes.json similarity index 100% rename from src/generated/resources/assets/allomancy/models/item/brass_flakes.json rename to src/main/generated_resources/assets/allomancy/models/item/brass_flakes.json diff --git a/src/generated/resources/assets/allomancy/models/item/brass_ingot.json b/src/main/generated_resources/assets/allomancy/models/item/brass_ingot.json similarity index 100% rename from src/generated/resources/assets/allomancy/models/item/brass_ingot.json rename to src/main/generated_resources/assets/allomancy/models/item/brass_ingot.json diff --git a/src/generated/resources/assets/allomancy/models/item/brass_nugget.json b/src/main/generated_resources/assets/allomancy/models/item/brass_nugget.json similarity index 100% rename from src/generated/resources/assets/allomancy/models/item/brass_nugget.json rename to src/main/generated_resources/assets/allomancy/models/item/brass_nugget.json diff --git a/src/generated/resources/assets/allomancy/models/item/brass_pattern.json b/src/main/generated_resources/assets/allomancy/models/item/brass_pattern.json similarity index 100% rename from src/generated/resources/assets/allomancy/models/item/brass_pattern.json rename to src/main/generated_resources/assets/allomancy/models/item/brass_pattern.json diff --git a/src/generated/resources/assets/allomancy/models/item/bronze_flakes.json b/src/main/generated_resources/assets/allomancy/models/item/bronze_flakes.json similarity index 100% rename from src/generated/resources/assets/allomancy/models/item/bronze_flakes.json rename to src/main/generated_resources/assets/allomancy/models/item/bronze_flakes.json diff --git a/src/generated/resources/assets/allomancy/models/item/bronze_ingot.json b/src/main/generated_resources/assets/allomancy/models/item/bronze_ingot.json similarity index 100% rename from src/generated/resources/assets/allomancy/models/item/bronze_ingot.json rename to src/main/generated_resources/assets/allomancy/models/item/bronze_ingot.json diff --git a/src/generated/resources/assets/allomancy/models/item/bronze_nugget.json b/src/main/generated_resources/assets/allomancy/models/item/bronze_nugget.json similarity index 100% rename from src/generated/resources/assets/allomancy/models/item/bronze_nugget.json rename to src/main/generated_resources/assets/allomancy/models/item/bronze_nugget.json diff --git a/src/generated/resources/assets/allomancy/models/item/bronze_pattern.json b/src/main/generated_resources/assets/allomancy/models/item/bronze_pattern.json similarity index 100% rename from src/generated/resources/assets/allomancy/models/item/bronze_pattern.json rename to src/main/generated_resources/assets/allomancy/models/item/bronze_pattern.json diff --git a/src/generated/resources/assets/allomancy/models/item/cadmium_flakes.json b/src/main/generated_resources/assets/allomancy/models/item/cadmium_flakes.json similarity index 100% rename from src/generated/resources/assets/allomancy/models/item/cadmium_flakes.json rename to src/main/generated_resources/assets/allomancy/models/item/cadmium_flakes.json diff --git a/src/generated/resources/assets/allomancy/models/item/cadmium_ingot.json b/src/main/generated_resources/assets/allomancy/models/item/cadmium_ingot.json similarity index 100% rename from src/generated/resources/assets/allomancy/models/item/cadmium_ingot.json rename to src/main/generated_resources/assets/allomancy/models/item/cadmium_ingot.json diff --git a/src/generated/resources/assets/allomancy/models/item/cadmium_nugget.json b/src/main/generated_resources/assets/allomancy/models/item/cadmium_nugget.json similarity index 100% rename from src/generated/resources/assets/allomancy/models/item/cadmium_nugget.json rename to src/main/generated_resources/assets/allomancy/models/item/cadmium_nugget.json diff --git a/src/generated/resources/assets/allomancy/models/item/cadmium_pattern.json b/src/main/generated_resources/assets/allomancy/models/item/cadmium_pattern.json similarity index 100% rename from src/generated/resources/assets/allomancy/models/item/cadmium_pattern.json rename to src/main/generated_resources/assets/allomancy/models/item/cadmium_pattern.json diff --git a/src/generated/resources/assets/allomancy/models/item/chromium_flakes.json b/src/main/generated_resources/assets/allomancy/models/item/chromium_flakes.json similarity index 100% rename from src/generated/resources/assets/allomancy/models/item/chromium_flakes.json rename to src/main/generated_resources/assets/allomancy/models/item/chromium_flakes.json diff --git a/src/generated/resources/assets/allomancy/models/item/chromium_ingot.json b/src/main/generated_resources/assets/allomancy/models/item/chromium_ingot.json similarity index 100% rename from src/generated/resources/assets/allomancy/models/item/chromium_ingot.json rename to src/main/generated_resources/assets/allomancy/models/item/chromium_ingot.json diff --git a/src/generated/resources/assets/allomancy/models/item/chromium_nugget.json b/src/main/generated_resources/assets/allomancy/models/item/chromium_nugget.json similarity index 100% rename from src/generated/resources/assets/allomancy/models/item/chromium_nugget.json rename to src/main/generated_resources/assets/allomancy/models/item/chromium_nugget.json diff --git a/src/generated/resources/assets/allomancy/models/item/chromium_pattern.json b/src/main/generated_resources/assets/allomancy/models/item/chromium_pattern.json similarity index 100% rename from src/generated/resources/assets/allomancy/models/item/chromium_pattern.json rename to src/main/generated_resources/assets/allomancy/models/item/chromium_pattern.json diff --git a/src/generated/resources/assets/allomancy/models/item/coin_bag.json b/src/main/generated_resources/assets/allomancy/models/item/coin_bag.json similarity index 100% rename from src/generated/resources/assets/allomancy/models/item/coin_bag.json rename to src/main/generated_resources/assets/allomancy/models/item/coin_bag.json diff --git a/src/generated/resources/assets/allomancy/models/item/copper_flakes.json b/src/main/generated_resources/assets/allomancy/models/item/copper_flakes.json similarity index 100% rename from src/generated/resources/assets/allomancy/models/item/copper_flakes.json rename to src/main/generated_resources/assets/allomancy/models/item/copper_flakes.json diff --git a/src/generated/resources/assets/allomancy/models/item/copper_pattern.json b/src/main/generated_resources/assets/allomancy/models/item/copper_pattern.json similarity index 100% rename from src/generated/resources/assets/allomancy/models/item/copper_pattern.json rename to src/main/generated_resources/assets/allomancy/models/item/copper_pattern.json diff --git a/src/generated/resources/assets/allomancy/models/item/duralumin_flakes.json b/src/main/generated_resources/assets/allomancy/models/item/duralumin_flakes.json similarity index 100% rename from src/generated/resources/assets/allomancy/models/item/duralumin_flakes.json rename to src/main/generated_resources/assets/allomancy/models/item/duralumin_flakes.json diff --git a/src/generated/resources/assets/allomancy/models/item/duralumin_ingot.json b/src/main/generated_resources/assets/allomancy/models/item/duralumin_ingot.json similarity index 100% rename from src/generated/resources/assets/allomancy/models/item/duralumin_ingot.json rename to src/main/generated_resources/assets/allomancy/models/item/duralumin_ingot.json diff --git a/src/generated/resources/assets/allomancy/models/item/duralumin_nugget.json b/src/main/generated_resources/assets/allomancy/models/item/duralumin_nugget.json similarity index 100% rename from src/generated/resources/assets/allomancy/models/item/duralumin_nugget.json rename to src/main/generated_resources/assets/allomancy/models/item/duralumin_nugget.json diff --git a/src/generated/resources/assets/allomancy/models/item/duralumin_pattern.json b/src/main/generated_resources/assets/allomancy/models/item/duralumin_pattern.json similarity index 100% rename from src/generated/resources/assets/allomancy/models/item/duralumin_pattern.json rename to src/main/generated_resources/assets/allomancy/models/item/duralumin_pattern.json diff --git a/src/generated/resources/assets/allomancy/models/item/electrum_flakes.json b/src/main/generated_resources/assets/allomancy/models/item/electrum_flakes.json similarity index 100% rename from src/generated/resources/assets/allomancy/models/item/electrum_flakes.json rename to src/main/generated_resources/assets/allomancy/models/item/electrum_flakes.json diff --git a/src/generated/resources/assets/allomancy/models/item/electrum_ingot.json b/src/main/generated_resources/assets/allomancy/models/item/electrum_ingot.json similarity index 100% rename from src/generated/resources/assets/allomancy/models/item/electrum_ingot.json rename to src/main/generated_resources/assets/allomancy/models/item/electrum_ingot.json diff --git a/src/generated/resources/assets/allomancy/models/item/electrum_nugget.json b/src/main/generated_resources/assets/allomancy/models/item/electrum_nugget.json similarity index 100% rename from src/generated/resources/assets/allomancy/models/item/electrum_nugget.json rename to src/main/generated_resources/assets/allomancy/models/item/electrum_nugget.json diff --git a/src/generated/resources/assets/allomancy/models/item/electrum_pattern.json b/src/main/generated_resources/assets/allomancy/models/item/electrum_pattern.json similarity index 100% rename from src/generated/resources/assets/allomancy/models/item/electrum_pattern.json rename to src/main/generated_resources/assets/allomancy/models/item/electrum_pattern.json diff --git a/src/generated/resources/assets/allomancy/models/item/gold_flakes.json b/src/main/generated_resources/assets/allomancy/models/item/gold_flakes.json similarity index 100% rename from src/generated/resources/assets/allomancy/models/item/gold_flakes.json rename to src/main/generated_resources/assets/allomancy/models/item/gold_flakes.json diff --git a/src/generated/resources/assets/allomancy/models/item/gold_pattern.json b/src/main/generated_resources/assets/allomancy/models/item/gold_pattern.json similarity index 100% rename from src/generated/resources/assets/allomancy/models/item/gold_pattern.json rename to src/main/generated_resources/assets/allomancy/models/item/gold_pattern.json diff --git a/src/generated/resources/assets/allomancy/models/item/iron_flakes.json b/src/main/generated_resources/assets/allomancy/models/item/iron_flakes.json similarity index 100% rename from src/generated/resources/assets/allomancy/models/item/iron_flakes.json rename to src/main/generated_resources/assets/allomancy/models/item/iron_flakes.json diff --git a/src/generated/resources/assets/allomancy/models/item/iron_lever.json b/src/main/generated_resources/assets/allomancy/models/item/iron_lever.json similarity index 100% rename from src/generated/resources/assets/allomancy/models/item/iron_lever.json rename to src/main/generated_resources/assets/allomancy/models/item/iron_lever.json diff --git a/src/generated/resources/assets/allomancy/models/item/iron_pattern.json b/src/main/generated_resources/assets/allomancy/models/item/iron_pattern.json similarity index 100% rename from src/generated/resources/assets/allomancy/models/item/iron_pattern.json rename to src/main/generated_resources/assets/allomancy/models/item/iron_pattern.json diff --git a/src/generated/resources/assets/allomancy/models/item/koloss_blade.json b/src/main/generated_resources/assets/allomancy/models/item/koloss_blade.json similarity index 100% rename from src/generated/resources/assets/allomancy/models/item/koloss_blade.json rename to src/main/generated_resources/assets/allomancy/models/item/koloss_blade.json diff --git a/src/generated/resources/assets/allomancy/models/item/lead_flakes.json b/src/main/generated_resources/assets/allomancy/models/item/lead_flakes.json similarity index 100% rename from src/generated/resources/assets/allomancy/models/item/lead_flakes.json rename to src/main/generated_resources/assets/allomancy/models/item/lead_flakes.json diff --git a/src/generated/resources/assets/allomancy/models/item/lead_ingot.json b/src/main/generated_resources/assets/allomancy/models/item/lead_ingot.json similarity index 100% rename from src/generated/resources/assets/allomancy/models/item/lead_ingot.json rename to src/main/generated_resources/assets/allomancy/models/item/lead_ingot.json diff --git a/src/generated/resources/assets/allomancy/models/item/lead_nugget.json b/src/main/generated_resources/assets/allomancy/models/item/lead_nugget.json similarity index 100% rename from src/generated/resources/assets/allomancy/models/item/lead_nugget.json rename to src/main/generated_resources/assets/allomancy/models/item/lead_nugget.json diff --git a/src/generated/resources/assets/allomancy/models/item/lerasium_nugget.json b/src/main/generated_resources/assets/allomancy/models/item/lerasium_nugget.json similarity index 100% rename from src/generated/resources/assets/allomancy/models/item/lerasium_nugget.json rename to src/main/generated_resources/assets/allomancy/models/item/lerasium_nugget.json diff --git a/src/generated/resources/assets/allomancy/models/item/mistcloak.json b/src/main/generated_resources/assets/allomancy/models/item/mistcloak.json similarity index 100% rename from src/generated/resources/assets/allomancy/models/item/mistcloak.json rename to src/main/generated_resources/assets/allomancy/models/item/mistcloak.json diff --git a/src/generated/resources/assets/allomancy/models/item/mistcloak_amethyst_trim.json b/src/main/generated_resources/assets/allomancy/models/item/mistcloak_amethyst_trim.json similarity index 100% rename from src/generated/resources/assets/allomancy/models/item/mistcloak_amethyst_trim.json rename to src/main/generated_resources/assets/allomancy/models/item/mistcloak_amethyst_trim.json diff --git a/src/generated/resources/assets/allomancy/models/item/mistcloak_copper_trim.json b/src/main/generated_resources/assets/allomancy/models/item/mistcloak_copper_trim.json similarity index 100% rename from src/generated/resources/assets/allomancy/models/item/mistcloak_copper_trim.json rename to src/main/generated_resources/assets/allomancy/models/item/mistcloak_copper_trim.json diff --git a/src/generated/resources/assets/allomancy/models/item/mistcloak_diamond_trim.json b/src/main/generated_resources/assets/allomancy/models/item/mistcloak_diamond_trim.json similarity index 100% rename from src/generated/resources/assets/allomancy/models/item/mistcloak_diamond_trim.json rename to src/main/generated_resources/assets/allomancy/models/item/mistcloak_diamond_trim.json diff --git a/src/generated/resources/assets/allomancy/models/item/mistcloak_emerald_trim.json b/src/main/generated_resources/assets/allomancy/models/item/mistcloak_emerald_trim.json similarity index 100% rename from src/generated/resources/assets/allomancy/models/item/mistcloak_emerald_trim.json rename to src/main/generated_resources/assets/allomancy/models/item/mistcloak_emerald_trim.json diff --git a/src/generated/resources/assets/allomancy/models/item/mistcloak_gold_trim.json b/src/main/generated_resources/assets/allomancy/models/item/mistcloak_gold_trim.json similarity index 100% rename from src/generated/resources/assets/allomancy/models/item/mistcloak_gold_trim.json rename to src/main/generated_resources/assets/allomancy/models/item/mistcloak_gold_trim.json diff --git a/src/generated/resources/assets/allomancy/models/item/mistcloak_iron_trim.json b/src/main/generated_resources/assets/allomancy/models/item/mistcloak_iron_trim.json similarity index 100% rename from src/generated/resources/assets/allomancy/models/item/mistcloak_iron_trim.json rename to src/main/generated_resources/assets/allomancy/models/item/mistcloak_iron_trim.json diff --git a/src/generated/resources/assets/allomancy/models/item/mistcloak_lapis_trim.json b/src/main/generated_resources/assets/allomancy/models/item/mistcloak_lapis_trim.json similarity index 100% rename from src/generated/resources/assets/allomancy/models/item/mistcloak_lapis_trim.json rename to src/main/generated_resources/assets/allomancy/models/item/mistcloak_lapis_trim.json diff --git a/src/generated/resources/assets/allomancy/models/item/mistcloak_netherite_trim.json b/src/main/generated_resources/assets/allomancy/models/item/mistcloak_netherite_trim.json similarity index 100% rename from src/generated/resources/assets/allomancy/models/item/mistcloak_netherite_trim.json rename to src/main/generated_resources/assets/allomancy/models/item/mistcloak_netherite_trim.json diff --git a/src/generated/resources/assets/allomancy/models/item/mistcloak_quartz_trim.json b/src/main/generated_resources/assets/allomancy/models/item/mistcloak_quartz_trim.json similarity index 100% rename from src/generated/resources/assets/allomancy/models/item/mistcloak_quartz_trim.json rename to src/main/generated_resources/assets/allomancy/models/item/mistcloak_quartz_trim.json diff --git a/src/generated/resources/assets/allomancy/models/item/mistcloak_redstone_trim.json b/src/main/generated_resources/assets/allomancy/models/item/mistcloak_redstone_trim.json similarity index 100% rename from src/generated/resources/assets/allomancy/models/item/mistcloak_redstone_trim.json rename to src/main/generated_resources/assets/allomancy/models/item/mistcloak_redstone_trim.json diff --git a/src/generated/resources/assets/allomancy/models/item/mistcloak_resin_trim.json b/src/main/generated_resources/assets/allomancy/models/item/mistcloak_resin_trim.json similarity index 100% rename from src/generated/resources/assets/allomancy/models/item/mistcloak_resin_trim.json rename to src/main/generated_resources/assets/allomancy/models/item/mistcloak_resin_trim.json diff --git a/src/generated/resources/assets/allomancy/models/item/nicrosil_flakes.json b/src/main/generated_resources/assets/allomancy/models/item/nicrosil_flakes.json similarity index 100% rename from src/generated/resources/assets/allomancy/models/item/nicrosil_flakes.json rename to src/main/generated_resources/assets/allomancy/models/item/nicrosil_flakes.json diff --git a/src/generated/resources/assets/allomancy/models/item/nicrosil_ingot.json b/src/main/generated_resources/assets/allomancy/models/item/nicrosil_ingot.json similarity index 100% rename from src/generated/resources/assets/allomancy/models/item/nicrosil_ingot.json rename to src/main/generated_resources/assets/allomancy/models/item/nicrosil_ingot.json diff --git a/src/generated/resources/assets/allomancy/models/item/nicrosil_nugget.json b/src/main/generated_resources/assets/allomancy/models/item/nicrosil_nugget.json similarity index 100% rename from src/generated/resources/assets/allomancy/models/item/nicrosil_nugget.json rename to src/main/generated_resources/assets/allomancy/models/item/nicrosil_nugget.json diff --git a/src/generated/resources/assets/allomancy/models/item/nicrosil_pattern.json b/src/main/generated_resources/assets/allomancy/models/item/nicrosil_pattern.json similarity index 100% rename from src/generated/resources/assets/allomancy/models/item/nicrosil_pattern.json rename to src/main/generated_resources/assets/allomancy/models/item/nicrosil_pattern.json diff --git a/src/generated/resources/assets/allomancy/models/item/obsidian_dagger.json b/src/main/generated_resources/assets/allomancy/models/item/obsidian_dagger.json similarity index 100% rename from src/generated/resources/assets/allomancy/models/item/obsidian_dagger.json rename to src/main/generated_resources/assets/allomancy/models/item/obsidian_dagger.json diff --git a/src/generated/resources/assets/allomancy/models/item/pewter_flakes.json b/src/main/generated_resources/assets/allomancy/models/item/pewter_flakes.json similarity index 100% rename from src/generated/resources/assets/allomancy/models/item/pewter_flakes.json rename to src/main/generated_resources/assets/allomancy/models/item/pewter_flakes.json diff --git a/src/generated/resources/assets/allomancy/models/item/pewter_ingot.json b/src/main/generated_resources/assets/allomancy/models/item/pewter_ingot.json similarity index 100% rename from src/generated/resources/assets/allomancy/models/item/pewter_ingot.json rename to src/main/generated_resources/assets/allomancy/models/item/pewter_ingot.json diff --git a/src/generated/resources/assets/allomancy/models/item/pewter_nugget.json b/src/main/generated_resources/assets/allomancy/models/item/pewter_nugget.json similarity index 100% rename from src/generated/resources/assets/allomancy/models/item/pewter_nugget.json rename to src/main/generated_resources/assets/allomancy/models/item/pewter_nugget.json diff --git a/src/generated/resources/assets/allomancy/models/item/pewter_pattern.json b/src/main/generated_resources/assets/allomancy/models/item/pewter_pattern.json similarity index 100% rename from src/generated/resources/assets/allomancy/models/item/pewter_pattern.json rename to src/main/generated_resources/assets/allomancy/models/item/pewter_pattern.json diff --git a/src/generated/resources/assets/allomancy/models/item/raw_aluminum.json b/src/main/generated_resources/assets/allomancy/models/item/raw_aluminum.json similarity index 100% rename from src/generated/resources/assets/allomancy/models/item/raw_aluminum.json rename to src/main/generated_resources/assets/allomancy/models/item/raw_aluminum.json diff --git a/src/generated/resources/assets/allomancy/models/item/raw_cadmium.json b/src/main/generated_resources/assets/allomancy/models/item/raw_cadmium.json similarity index 100% rename from src/generated/resources/assets/allomancy/models/item/raw_cadmium.json rename to src/main/generated_resources/assets/allomancy/models/item/raw_cadmium.json diff --git a/src/generated/resources/assets/allomancy/models/item/raw_chromium.json b/src/main/generated_resources/assets/allomancy/models/item/raw_chromium.json similarity index 100% rename from src/generated/resources/assets/allomancy/models/item/raw_chromium.json rename to src/main/generated_resources/assets/allomancy/models/item/raw_chromium.json diff --git a/src/generated/resources/assets/allomancy/models/item/raw_lead.json b/src/main/generated_resources/assets/allomancy/models/item/raw_lead.json similarity index 100% rename from src/generated/resources/assets/allomancy/models/item/raw_lead.json rename to src/main/generated_resources/assets/allomancy/models/item/raw_lead.json diff --git a/src/generated/resources/assets/allomancy/models/item/raw_silver.json b/src/main/generated_resources/assets/allomancy/models/item/raw_silver.json similarity index 100% rename from src/generated/resources/assets/allomancy/models/item/raw_silver.json rename to src/main/generated_resources/assets/allomancy/models/item/raw_silver.json diff --git a/src/generated/resources/assets/allomancy/models/item/raw_tin.json b/src/main/generated_resources/assets/allomancy/models/item/raw_tin.json similarity index 100% rename from src/generated/resources/assets/allomancy/models/item/raw_tin.json rename to src/main/generated_resources/assets/allomancy/models/item/raw_tin.json diff --git a/src/generated/resources/assets/allomancy/models/item/raw_zinc.json b/src/main/generated_resources/assets/allomancy/models/item/raw_zinc.json similarity index 100% rename from src/generated/resources/assets/allomancy/models/item/raw_zinc.json rename to src/main/generated_resources/assets/allomancy/models/item/raw_zinc.json diff --git a/src/generated/resources/assets/allomancy/models/item/silver_flakes.json b/src/main/generated_resources/assets/allomancy/models/item/silver_flakes.json similarity index 100% rename from src/generated/resources/assets/allomancy/models/item/silver_flakes.json rename to src/main/generated_resources/assets/allomancy/models/item/silver_flakes.json diff --git a/src/generated/resources/assets/allomancy/models/item/silver_ingot.json b/src/main/generated_resources/assets/allomancy/models/item/silver_ingot.json similarity index 100% rename from src/generated/resources/assets/allomancy/models/item/silver_ingot.json rename to src/main/generated_resources/assets/allomancy/models/item/silver_ingot.json diff --git a/src/generated/resources/assets/allomancy/models/item/silver_nugget.json b/src/main/generated_resources/assets/allomancy/models/item/silver_nugget.json similarity index 100% rename from src/generated/resources/assets/allomancy/models/item/silver_nugget.json rename to src/main/generated_resources/assets/allomancy/models/item/silver_nugget.json diff --git a/src/generated/resources/assets/allomancy/models/item/steel_flakes.json b/src/main/generated_resources/assets/allomancy/models/item/steel_flakes.json similarity index 100% rename from src/generated/resources/assets/allomancy/models/item/steel_flakes.json rename to src/main/generated_resources/assets/allomancy/models/item/steel_flakes.json diff --git a/src/generated/resources/assets/allomancy/models/item/steel_ingot.json b/src/main/generated_resources/assets/allomancy/models/item/steel_ingot.json similarity index 100% rename from src/generated/resources/assets/allomancy/models/item/steel_ingot.json rename to src/main/generated_resources/assets/allomancy/models/item/steel_ingot.json diff --git a/src/generated/resources/assets/allomancy/models/item/steel_nugget.json b/src/main/generated_resources/assets/allomancy/models/item/steel_nugget.json similarity index 100% rename from src/generated/resources/assets/allomancy/models/item/steel_nugget.json rename to src/main/generated_resources/assets/allomancy/models/item/steel_nugget.json diff --git a/src/generated/resources/assets/allomancy/models/item/steel_pattern.json b/src/main/generated_resources/assets/allomancy/models/item/steel_pattern.json similarity index 100% rename from src/generated/resources/assets/allomancy/models/item/steel_pattern.json rename to src/main/generated_resources/assets/allomancy/models/item/steel_pattern.json diff --git a/src/generated/resources/assets/allomancy/models/item/tin_flakes.json b/src/main/generated_resources/assets/allomancy/models/item/tin_flakes.json similarity index 100% rename from src/generated/resources/assets/allomancy/models/item/tin_flakes.json rename to src/main/generated_resources/assets/allomancy/models/item/tin_flakes.json diff --git a/src/generated/resources/assets/allomancy/models/item/tin_ingot.json b/src/main/generated_resources/assets/allomancy/models/item/tin_ingot.json similarity index 100% rename from src/generated/resources/assets/allomancy/models/item/tin_ingot.json rename to src/main/generated_resources/assets/allomancy/models/item/tin_ingot.json diff --git a/src/generated/resources/assets/allomancy/models/item/tin_nugget.json b/src/main/generated_resources/assets/allomancy/models/item/tin_nugget.json similarity index 100% rename from src/generated/resources/assets/allomancy/models/item/tin_nugget.json rename to src/main/generated_resources/assets/allomancy/models/item/tin_nugget.json diff --git a/src/generated/resources/assets/allomancy/models/item/tin_pattern.json b/src/main/generated_resources/assets/allomancy/models/item/tin_pattern.json similarity index 100% rename from src/generated/resources/assets/allomancy/models/item/tin_pattern.json rename to src/main/generated_resources/assets/allomancy/models/item/tin_pattern.json diff --git a/src/generated/resources/assets/allomancy/models/item/vial.json b/src/main/generated_resources/assets/allomancy/models/item/vial.json similarity index 100% rename from src/generated/resources/assets/allomancy/models/item/vial.json rename to src/main/generated_resources/assets/allomancy/models/item/vial.json diff --git a/src/generated/resources/assets/allomancy/models/item/vial_filled.json b/src/main/generated_resources/assets/allomancy/models/item/vial_filled.json similarity index 100% rename from src/generated/resources/assets/allomancy/models/item/vial_filled.json rename to src/main/generated_resources/assets/allomancy/models/item/vial_filled.json diff --git a/src/generated/resources/assets/allomancy/models/item/zinc_flakes.json b/src/main/generated_resources/assets/allomancy/models/item/zinc_flakes.json similarity index 100% rename from src/generated/resources/assets/allomancy/models/item/zinc_flakes.json rename to src/main/generated_resources/assets/allomancy/models/item/zinc_flakes.json diff --git a/src/generated/resources/assets/allomancy/models/item/zinc_ingot.json b/src/main/generated_resources/assets/allomancy/models/item/zinc_ingot.json similarity index 100% rename from src/generated/resources/assets/allomancy/models/item/zinc_ingot.json rename to src/main/generated_resources/assets/allomancy/models/item/zinc_ingot.json diff --git a/src/generated/resources/assets/allomancy/models/item/zinc_nugget.json b/src/main/generated_resources/assets/allomancy/models/item/zinc_nugget.json similarity index 100% rename from src/generated/resources/assets/allomancy/models/item/zinc_nugget.json rename to src/main/generated_resources/assets/allomancy/models/item/zinc_nugget.json diff --git a/src/generated/resources/assets/allomancy/models/item/zinc_pattern.json b/src/main/generated_resources/assets/allomancy/models/item/zinc_pattern.json similarity index 100% rename from src/generated/resources/assets/allomancy/models/item/zinc_pattern.json rename to src/main/generated_resources/assets/allomancy/models/item/zinc_pattern.json diff --git a/src/generated/resources/assets/allomancy/particles/sound_particle.json b/src/main/generated_resources/assets/allomancy/particles/sound_particle.json similarity index 100% rename from src/generated/resources/assets/allomancy/particles/sound_particle.json rename to src/main/generated_resources/assets/allomancy/particles/sound_particle.json diff --git a/src/generated/resources/data/allomancy/advancement/main/become_mistborn.json b/src/main/generated_resources/data/allomancy/advancement/main/become_mistborn.json similarity index 100% rename from src/generated/resources/data/allomancy/advancement/main/become_mistborn.json rename to src/main/generated_resources/data/allomancy/advancement/main/become_mistborn.json diff --git a/src/generated/resources/data/allomancy/advancement/main/coinshot.json b/src/main/generated_resources/data/allomancy/advancement/main/coinshot.json similarity index 100% rename from src/generated/resources/data/allomancy/advancement/main/coinshot.json rename to src/main/generated_resources/data/allomancy/advancement/main/coinshot.json diff --git a/src/generated/resources/data/allomancy/advancement/main/consequences.json b/src/main/generated_resources/data/allomancy/advancement/main/consequences.json similarity index 100% rename from src/generated/resources/data/allomancy/advancement/main/consequences.json rename to src/main/generated_resources/data/allomancy/advancement/main/consequences.json diff --git a/src/generated/resources/data/allomancy/advancement/main/dna_entangled.json b/src/main/generated_resources/data/allomancy/advancement/main/dna_entangled.json similarity index 100% rename from src/generated/resources/data/allomancy/advancement/main/dna_entangled.json rename to src/main/generated_resources/data/allomancy/advancement/main/dna_entangled.json diff --git a/src/generated/resources/data/allomancy/advancement/main/going_loud.json b/src/main/generated_resources/data/allomancy/advancement/main/going_loud.json similarity index 100% rename from src/generated/resources/data/allomancy/advancement/main/going_loud.json rename to src/main/generated_resources/data/allomancy/advancement/main/going_loud.json diff --git a/src/generated/resources/data/allomancy/advancement/main/metallic_collector.json b/src/main/generated_resources/data/allomancy/advancement/main/metallic_collector.json similarity index 100% rename from src/generated/resources/data/allomancy/advancement/main/metallic_collector.json rename to src/main/generated_resources/data/allomancy/advancement/main/metallic_collector.json diff --git a/src/generated/resources/data/allomancy/advancement/main/metallurgist.json b/src/main/generated_resources/data/allomancy/advancement/main/metallurgist.json similarity index 100% rename from src/generated/resources/data/allomancy/advancement/main/metallurgist.json rename to src/main/generated_resources/data/allomancy/advancement/main/metallurgist.json diff --git a/src/generated/resources/data/allomancy/advancement/main/tin_foil_hat.json b/src/main/generated_resources/data/allomancy/advancement/main/tin_foil_hat.json similarity index 100% rename from src/generated/resources/data/allomancy/advancement/main/tin_foil_hat.json rename to src/main/generated_resources/data/allomancy/advancement/main/tin_foil_hat.json diff --git a/src/generated/resources/data/allomancy/advancement/recipes/building_blocks/aluminum_block.json b/src/main/generated_resources/data/allomancy/advancement/recipes/building_blocks/aluminum_block.json similarity index 100% rename from src/generated/resources/data/allomancy/advancement/recipes/building_blocks/aluminum_block.json rename to src/main/generated_resources/data/allomancy/advancement/recipes/building_blocks/aluminum_block.json diff --git a/src/generated/resources/data/allomancy/advancement/recipes/building_blocks/bendalloy_block.json b/src/main/generated_resources/data/allomancy/advancement/recipes/building_blocks/bendalloy_block.json similarity index 100% rename from src/generated/resources/data/allomancy/advancement/recipes/building_blocks/bendalloy_block.json rename to src/main/generated_resources/data/allomancy/advancement/recipes/building_blocks/bendalloy_block.json diff --git a/src/generated/resources/data/allomancy/advancement/recipes/building_blocks/brass_block.json b/src/main/generated_resources/data/allomancy/advancement/recipes/building_blocks/brass_block.json similarity index 100% rename from src/generated/resources/data/allomancy/advancement/recipes/building_blocks/brass_block.json rename to src/main/generated_resources/data/allomancy/advancement/recipes/building_blocks/brass_block.json diff --git a/src/generated/resources/data/allomancy/advancement/recipes/building_blocks/bronze_block.json b/src/main/generated_resources/data/allomancy/advancement/recipes/building_blocks/bronze_block.json similarity index 100% rename from src/generated/resources/data/allomancy/advancement/recipes/building_blocks/bronze_block.json rename to src/main/generated_resources/data/allomancy/advancement/recipes/building_blocks/bronze_block.json diff --git a/src/generated/resources/data/allomancy/advancement/recipes/building_blocks/cadmium_block.json b/src/main/generated_resources/data/allomancy/advancement/recipes/building_blocks/cadmium_block.json similarity index 100% rename from src/generated/resources/data/allomancy/advancement/recipes/building_blocks/cadmium_block.json rename to src/main/generated_resources/data/allomancy/advancement/recipes/building_blocks/cadmium_block.json diff --git a/src/generated/resources/data/allomancy/advancement/recipes/building_blocks/chromium_block.json b/src/main/generated_resources/data/allomancy/advancement/recipes/building_blocks/chromium_block.json similarity index 100% rename from src/generated/resources/data/allomancy/advancement/recipes/building_blocks/chromium_block.json rename to src/main/generated_resources/data/allomancy/advancement/recipes/building_blocks/chromium_block.json diff --git a/src/generated/resources/data/allomancy/advancement/recipes/building_blocks/duralumin_block.json b/src/main/generated_resources/data/allomancy/advancement/recipes/building_blocks/duralumin_block.json similarity index 100% rename from src/generated/resources/data/allomancy/advancement/recipes/building_blocks/duralumin_block.json rename to src/main/generated_resources/data/allomancy/advancement/recipes/building_blocks/duralumin_block.json diff --git a/src/generated/resources/data/allomancy/advancement/recipes/building_blocks/electrum_block.json b/src/main/generated_resources/data/allomancy/advancement/recipes/building_blocks/electrum_block.json similarity index 100% rename from src/generated/resources/data/allomancy/advancement/recipes/building_blocks/electrum_block.json rename to src/main/generated_resources/data/allomancy/advancement/recipes/building_blocks/electrum_block.json diff --git a/src/generated/resources/data/allomancy/advancement/recipes/building_blocks/lead_block.json b/src/main/generated_resources/data/allomancy/advancement/recipes/building_blocks/lead_block.json similarity index 100% rename from src/generated/resources/data/allomancy/advancement/recipes/building_blocks/lead_block.json rename to src/main/generated_resources/data/allomancy/advancement/recipes/building_blocks/lead_block.json diff --git a/src/generated/resources/data/allomancy/advancement/recipes/building_blocks/nicrosil_block.json b/src/main/generated_resources/data/allomancy/advancement/recipes/building_blocks/nicrosil_block.json similarity index 100% rename from src/generated/resources/data/allomancy/advancement/recipes/building_blocks/nicrosil_block.json rename to src/main/generated_resources/data/allomancy/advancement/recipes/building_blocks/nicrosil_block.json diff --git a/src/generated/resources/data/allomancy/advancement/recipes/building_blocks/pewter_block.json b/src/main/generated_resources/data/allomancy/advancement/recipes/building_blocks/pewter_block.json similarity index 100% rename from src/generated/resources/data/allomancy/advancement/recipes/building_blocks/pewter_block.json rename to src/main/generated_resources/data/allomancy/advancement/recipes/building_blocks/pewter_block.json diff --git a/src/generated/resources/data/allomancy/advancement/recipes/building_blocks/silver_block.json b/src/main/generated_resources/data/allomancy/advancement/recipes/building_blocks/silver_block.json similarity index 100% rename from src/generated/resources/data/allomancy/advancement/recipes/building_blocks/silver_block.json rename to src/main/generated_resources/data/allomancy/advancement/recipes/building_blocks/silver_block.json diff --git a/src/generated/resources/data/allomancy/advancement/recipes/building_blocks/steel_block.json b/src/main/generated_resources/data/allomancy/advancement/recipes/building_blocks/steel_block.json similarity index 100% rename from src/generated/resources/data/allomancy/advancement/recipes/building_blocks/steel_block.json rename to src/main/generated_resources/data/allomancy/advancement/recipes/building_blocks/steel_block.json diff --git a/src/generated/resources/data/allomancy/advancement/recipes/building_blocks/tin_block.json b/src/main/generated_resources/data/allomancy/advancement/recipes/building_blocks/tin_block.json similarity index 100% rename from src/generated/resources/data/allomancy/advancement/recipes/building_blocks/tin_block.json rename to src/main/generated_resources/data/allomancy/advancement/recipes/building_blocks/tin_block.json diff --git a/src/generated/resources/data/allomancy/advancement/recipes/building_blocks/zinc_block.json b/src/main/generated_resources/data/allomancy/advancement/recipes/building_blocks/zinc_block.json similarity index 100% rename from src/generated/resources/data/allomancy/advancement/recipes/building_blocks/zinc_block.json rename to src/main/generated_resources/data/allomancy/advancement/recipes/building_blocks/zinc_block.json diff --git a/src/generated/resources/data/allomancy/advancement/recipes/combat/aluminum_helmet.json b/src/main/generated_resources/data/allomancy/advancement/recipes/combat/aluminum_helmet.json similarity index 100% rename from src/generated/resources/data/allomancy/advancement/recipes/combat/aluminum_helmet.json rename to src/main/generated_resources/data/allomancy/advancement/recipes/combat/aluminum_helmet.json diff --git a/src/generated/resources/data/allomancy/advancement/recipes/combat/coin_bag.json b/src/main/generated_resources/data/allomancy/advancement/recipes/combat/coin_bag.json similarity index 100% rename from src/generated/resources/data/allomancy/advancement/recipes/combat/coin_bag.json rename to src/main/generated_resources/data/allomancy/advancement/recipes/combat/coin_bag.json diff --git a/src/generated/resources/data/allomancy/advancement/recipes/combat/koloss_blade.json b/src/main/generated_resources/data/allomancy/advancement/recipes/combat/koloss_blade.json similarity index 100% rename from src/generated/resources/data/allomancy/advancement/recipes/combat/koloss_blade.json rename to src/main/generated_resources/data/allomancy/advancement/recipes/combat/koloss_blade.json diff --git a/src/generated/resources/data/allomancy/advancement/recipes/combat/mistcloak.json b/src/main/generated_resources/data/allomancy/advancement/recipes/combat/mistcloak.json similarity index 100% rename from src/generated/resources/data/allomancy/advancement/recipes/combat/mistcloak.json rename to src/main/generated_resources/data/allomancy/advancement/recipes/combat/mistcloak.json diff --git a/src/generated/resources/data/allomancy/advancement/recipes/combat/obsidian_dagger.json b/src/main/generated_resources/data/allomancy/advancement/recipes/combat/obsidian_dagger.json similarity index 100% rename from src/generated/resources/data/allomancy/advancement/recipes/combat/obsidian_dagger.json rename to src/main/generated_resources/data/allomancy/advancement/recipes/combat/obsidian_dagger.json diff --git a/src/generated/resources/data/allomancy/advancement/recipes/food/allomantic_grinder.json b/src/main/generated_resources/data/allomancy/advancement/recipes/food/allomantic_grinder.json similarity index 100% rename from src/generated/resources/data/allomancy/advancement/recipes/food/allomantic_grinder.json rename to src/main/generated_resources/data/allomancy/advancement/recipes/food/allomantic_grinder.json diff --git a/src/generated/resources/data/allomancy/advancement/recipes/food/vial.json b/src/main/generated_resources/data/allomancy/advancement/recipes/food/vial.json similarity index 100% rename from src/generated/resources/data/allomancy/advancement/recipes/food/vial.json rename to src/main/generated_resources/data/allomancy/advancement/recipes/food/vial.json diff --git a/src/generated/resources/data/allomancy/advancement/recipes/misc/aluminum_flakes.json b/src/main/generated_resources/data/allomancy/advancement/recipes/misc/aluminum_flakes.json similarity index 100% rename from src/generated/resources/data/allomancy/advancement/recipes/misc/aluminum_flakes.json rename to src/main/generated_resources/data/allomancy/advancement/recipes/misc/aluminum_flakes.json diff --git a/src/generated/resources/data/allomancy/advancement/recipes/misc/aluminum_ingot_from_block.json b/src/main/generated_resources/data/allomancy/advancement/recipes/misc/aluminum_ingot_from_block.json similarity index 100% rename from src/generated/resources/data/allomancy/advancement/recipes/misc/aluminum_ingot_from_block.json rename to src/main/generated_resources/data/allomancy/advancement/recipes/misc/aluminum_ingot_from_block.json diff --git a/src/generated/resources/data/allomancy/advancement/recipes/misc/aluminum_ingot_from_nuggets.json b/src/main/generated_resources/data/allomancy/advancement/recipes/misc/aluminum_ingot_from_nuggets.json similarity index 100% rename from src/generated/resources/data/allomancy/advancement/recipes/misc/aluminum_ingot_from_nuggets.json rename to src/main/generated_resources/data/allomancy/advancement/recipes/misc/aluminum_ingot_from_nuggets.json diff --git a/src/generated/resources/data/allomancy/advancement/recipes/misc/aluminum_nugget.json b/src/main/generated_resources/data/allomancy/advancement/recipes/misc/aluminum_nugget.json similarity index 100% rename from src/generated/resources/data/allomancy/advancement/recipes/misc/aluminum_nugget.json rename to src/main/generated_resources/data/allomancy/advancement/recipes/misc/aluminum_nugget.json diff --git a/src/generated/resources/data/allomancy/advancement/recipes/misc/aluminum_pattern.json b/src/main/generated_resources/data/allomancy/advancement/recipes/misc/aluminum_pattern.json similarity index 100% rename from src/generated/resources/data/allomancy/advancement/recipes/misc/aluminum_pattern.json rename to src/main/generated_resources/data/allomancy/advancement/recipes/misc/aluminum_pattern.json diff --git a/src/generated/resources/data/allomancy/advancement/recipes/misc/bendalloy_flakes.json b/src/main/generated_resources/data/allomancy/advancement/recipes/misc/bendalloy_flakes.json similarity index 100% rename from src/generated/resources/data/allomancy/advancement/recipes/misc/bendalloy_flakes.json rename to src/main/generated_resources/data/allomancy/advancement/recipes/misc/bendalloy_flakes.json diff --git a/src/generated/resources/data/allomancy/advancement/recipes/misc/bendalloy_flakes_from_mixing.json b/src/main/generated_resources/data/allomancy/advancement/recipes/misc/bendalloy_flakes_from_mixing.json similarity index 100% rename from src/generated/resources/data/allomancy/advancement/recipes/misc/bendalloy_flakes_from_mixing.json rename to src/main/generated_resources/data/allomancy/advancement/recipes/misc/bendalloy_flakes_from_mixing.json diff --git a/src/generated/resources/data/allomancy/advancement/recipes/misc/bendalloy_ingot_from_alloying.json b/src/main/generated_resources/data/allomancy/advancement/recipes/misc/bendalloy_ingot_from_alloying.json similarity index 100% rename from src/generated/resources/data/allomancy/advancement/recipes/misc/bendalloy_ingot_from_alloying.json rename to src/main/generated_resources/data/allomancy/advancement/recipes/misc/bendalloy_ingot_from_alloying.json diff --git a/src/generated/resources/data/allomancy/advancement/recipes/misc/bendalloy_ingot_from_block.json b/src/main/generated_resources/data/allomancy/advancement/recipes/misc/bendalloy_ingot_from_block.json similarity index 100% rename from src/generated/resources/data/allomancy/advancement/recipes/misc/bendalloy_ingot_from_block.json rename to src/main/generated_resources/data/allomancy/advancement/recipes/misc/bendalloy_ingot_from_block.json diff --git a/src/generated/resources/data/allomancy/advancement/recipes/misc/bendalloy_ingot_from_nuggets.json b/src/main/generated_resources/data/allomancy/advancement/recipes/misc/bendalloy_ingot_from_nuggets.json similarity index 100% rename from src/generated/resources/data/allomancy/advancement/recipes/misc/bendalloy_ingot_from_nuggets.json rename to src/main/generated_resources/data/allomancy/advancement/recipes/misc/bendalloy_ingot_from_nuggets.json diff --git a/src/generated/resources/data/allomancy/advancement/recipes/misc/bendalloy_nugget.json b/src/main/generated_resources/data/allomancy/advancement/recipes/misc/bendalloy_nugget.json similarity index 100% rename from src/generated/resources/data/allomancy/advancement/recipes/misc/bendalloy_nugget.json rename to src/main/generated_resources/data/allomancy/advancement/recipes/misc/bendalloy_nugget.json diff --git a/src/generated/resources/data/allomancy/advancement/recipes/misc/bendalloy_pattern.json b/src/main/generated_resources/data/allomancy/advancement/recipes/misc/bendalloy_pattern.json similarity index 100% rename from src/generated/resources/data/allomancy/advancement/recipes/misc/bendalloy_pattern.json rename to src/main/generated_resources/data/allomancy/advancement/recipes/misc/bendalloy_pattern.json diff --git a/src/generated/resources/data/allomancy/advancement/recipes/misc/brass_flakes.json b/src/main/generated_resources/data/allomancy/advancement/recipes/misc/brass_flakes.json similarity index 100% rename from src/generated/resources/data/allomancy/advancement/recipes/misc/brass_flakes.json rename to src/main/generated_resources/data/allomancy/advancement/recipes/misc/brass_flakes.json diff --git a/src/generated/resources/data/allomancy/advancement/recipes/misc/brass_flakes_from_mixing.json b/src/main/generated_resources/data/allomancy/advancement/recipes/misc/brass_flakes_from_mixing.json similarity index 100% rename from src/generated/resources/data/allomancy/advancement/recipes/misc/brass_flakes_from_mixing.json rename to src/main/generated_resources/data/allomancy/advancement/recipes/misc/brass_flakes_from_mixing.json diff --git a/src/generated/resources/data/allomancy/advancement/recipes/misc/brass_ingot_from_alloying.json b/src/main/generated_resources/data/allomancy/advancement/recipes/misc/brass_ingot_from_alloying.json similarity index 100% rename from src/generated/resources/data/allomancy/advancement/recipes/misc/brass_ingot_from_alloying.json rename to src/main/generated_resources/data/allomancy/advancement/recipes/misc/brass_ingot_from_alloying.json diff --git a/src/generated/resources/data/allomancy/advancement/recipes/misc/brass_ingot_from_block.json b/src/main/generated_resources/data/allomancy/advancement/recipes/misc/brass_ingot_from_block.json similarity index 100% rename from src/generated/resources/data/allomancy/advancement/recipes/misc/brass_ingot_from_block.json rename to src/main/generated_resources/data/allomancy/advancement/recipes/misc/brass_ingot_from_block.json diff --git a/src/generated/resources/data/allomancy/advancement/recipes/misc/brass_ingot_from_nuggets.json b/src/main/generated_resources/data/allomancy/advancement/recipes/misc/brass_ingot_from_nuggets.json similarity index 100% rename from src/generated/resources/data/allomancy/advancement/recipes/misc/brass_ingot_from_nuggets.json rename to src/main/generated_resources/data/allomancy/advancement/recipes/misc/brass_ingot_from_nuggets.json diff --git a/src/generated/resources/data/allomancy/advancement/recipes/misc/brass_nugget.json b/src/main/generated_resources/data/allomancy/advancement/recipes/misc/brass_nugget.json similarity index 100% rename from src/generated/resources/data/allomancy/advancement/recipes/misc/brass_nugget.json rename to src/main/generated_resources/data/allomancy/advancement/recipes/misc/brass_nugget.json diff --git a/src/generated/resources/data/allomancy/advancement/recipes/misc/brass_pattern.json b/src/main/generated_resources/data/allomancy/advancement/recipes/misc/brass_pattern.json similarity index 100% rename from src/generated/resources/data/allomancy/advancement/recipes/misc/brass_pattern.json rename to src/main/generated_resources/data/allomancy/advancement/recipes/misc/brass_pattern.json diff --git a/src/generated/resources/data/allomancy/advancement/recipes/misc/bronze_flakes.json b/src/main/generated_resources/data/allomancy/advancement/recipes/misc/bronze_flakes.json similarity index 100% rename from src/generated/resources/data/allomancy/advancement/recipes/misc/bronze_flakes.json rename to src/main/generated_resources/data/allomancy/advancement/recipes/misc/bronze_flakes.json diff --git a/src/generated/resources/data/allomancy/advancement/recipes/misc/bronze_flakes_from_mixing.json b/src/main/generated_resources/data/allomancy/advancement/recipes/misc/bronze_flakes_from_mixing.json similarity index 100% rename from src/generated/resources/data/allomancy/advancement/recipes/misc/bronze_flakes_from_mixing.json rename to src/main/generated_resources/data/allomancy/advancement/recipes/misc/bronze_flakes_from_mixing.json diff --git a/src/generated/resources/data/allomancy/advancement/recipes/misc/bronze_ingot_from_alloying.json b/src/main/generated_resources/data/allomancy/advancement/recipes/misc/bronze_ingot_from_alloying.json similarity index 100% rename from src/generated/resources/data/allomancy/advancement/recipes/misc/bronze_ingot_from_alloying.json rename to src/main/generated_resources/data/allomancy/advancement/recipes/misc/bronze_ingot_from_alloying.json diff --git a/src/generated/resources/data/allomancy/advancement/recipes/misc/bronze_ingot_from_block.json b/src/main/generated_resources/data/allomancy/advancement/recipes/misc/bronze_ingot_from_block.json similarity index 100% rename from src/generated/resources/data/allomancy/advancement/recipes/misc/bronze_ingot_from_block.json rename to src/main/generated_resources/data/allomancy/advancement/recipes/misc/bronze_ingot_from_block.json diff --git a/src/generated/resources/data/allomancy/advancement/recipes/misc/bronze_ingot_from_nuggets.json b/src/main/generated_resources/data/allomancy/advancement/recipes/misc/bronze_ingot_from_nuggets.json similarity index 100% rename from src/generated/resources/data/allomancy/advancement/recipes/misc/bronze_ingot_from_nuggets.json rename to src/main/generated_resources/data/allomancy/advancement/recipes/misc/bronze_ingot_from_nuggets.json diff --git a/src/generated/resources/data/allomancy/advancement/recipes/misc/bronze_nugget.json b/src/main/generated_resources/data/allomancy/advancement/recipes/misc/bronze_nugget.json similarity index 100% rename from src/generated/resources/data/allomancy/advancement/recipes/misc/bronze_nugget.json rename to src/main/generated_resources/data/allomancy/advancement/recipes/misc/bronze_nugget.json diff --git a/src/generated/resources/data/allomancy/advancement/recipes/misc/bronze_pattern.json b/src/main/generated_resources/data/allomancy/advancement/recipes/misc/bronze_pattern.json similarity index 100% rename from src/generated/resources/data/allomancy/advancement/recipes/misc/bronze_pattern.json rename to src/main/generated_resources/data/allomancy/advancement/recipes/misc/bronze_pattern.json diff --git a/src/generated/resources/data/allomancy/advancement/recipes/misc/cadmium_flakes.json b/src/main/generated_resources/data/allomancy/advancement/recipes/misc/cadmium_flakes.json similarity index 100% rename from src/generated/resources/data/allomancy/advancement/recipes/misc/cadmium_flakes.json rename to src/main/generated_resources/data/allomancy/advancement/recipes/misc/cadmium_flakes.json diff --git a/src/generated/resources/data/allomancy/advancement/recipes/misc/cadmium_ingot_from_block.json b/src/main/generated_resources/data/allomancy/advancement/recipes/misc/cadmium_ingot_from_block.json similarity index 100% rename from src/generated/resources/data/allomancy/advancement/recipes/misc/cadmium_ingot_from_block.json rename to src/main/generated_resources/data/allomancy/advancement/recipes/misc/cadmium_ingot_from_block.json diff --git a/src/generated/resources/data/allomancy/advancement/recipes/misc/cadmium_ingot_from_nuggets.json b/src/main/generated_resources/data/allomancy/advancement/recipes/misc/cadmium_ingot_from_nuggets.json similarity index 100% rename from src/generated/resources/data/allomancy/advancement/recipes/misc/cadmium_ingot_from_nuggets.json rename to src/main/generated_resources/data/allomancy/advancement/recipes/misc/cadmium_ingot_from_nuggets.json diff --git a/src/generated/resources/data/allomancy/advancement/recipes/misc/cadmium_nugget.json b/src/main/generated_resources/data/allomancy/advancement/recipes/misc/cadmium_nugget.json similarity index 100% rename from src/generated/resources/data/allomancy/advancement/recipes/misc/cadmium_nugget.json rename to src/main/generated_resources/data/allomancy/advancement/recipes/misc/cadmium_nugget.json diff --git a/src/generated/resources/data/allomancy/advancement/recipes/misc/cadmium_pattern.json b/src/main/generated_resources/data/allomancy/advancement/recipes/misc/cadmium_pattern.json similarity index 100% rename from src/generated/resources/data/allomancy/advancement/recipes/misc/cadmium_pattern.json rename to src/main/generated_resources/data/allomancy/advancement/recipes/misc/cadmium_pattern.json diff --git a/src/generated/resources/data/allomancy/advancement/recipes/misc/chromium_flakes.json b/src/main/generated_resources/data/allomancy/advancement/recipes/misc/chromium_flakes.json similarity index 100% rename from src/generated/resources/data/allomancy/advancement/recipes/misc/chromium_flakes.json rename to src/main/generated_resources/data/allomancy/advancement/recipes/misc/chromium_flakes.json diff --git a/src/generated/resources/data/allomancy/advancement/recipes/misc/chromium_ingot_from_block.json b/src/main/generated_resources/data/allomancy/advancement/recipes/misc/chromium_ingot_from_block.json similarity index 100% rename from src/generated/resources/data/allomancy/advancement/recipes/misc/chromium_ingot_from_block.json rename to src/main/generated_resources/data/allomancy/advancement/recipes/misc/chromium_ingot_from_block.json diff --git a/src/generated/resources/data/allomancy/advancement/recipes/misc/chromium_ingot_from_nuggets.json b/src/main/generated_resources/data/allomancy/advancement/recipes/misc/chromium_ingot_from_nuggets.json similarity index 100% rename from src/generated/resources/data/allomancy/advancement/recipes/misc/chromium_ingot_from_nuggets.json rename to src/main/generated_resources/data/allomancy/advancement/recipes/misc/chromium_ingot_from_nuggets.json diff --git a/src/generated/resources/data/allomancy/advancement/recipes/misc/chromium_nugget.json b/src/main/generated_resources/data/allomancy/advancement/recipes/misc/chromium_nugget.json similarity index 100% rename from src/generated/resources/data/allomancy/advancement/recipes/misc/chromium_nugget.json rename to src/main/generated_resources/data/allomancy/advancement/recipes/misc/chromium_nugget.json diff --git a/src/generated/resources/data/allomancy/advancement/recipes/misc/chromium_pattern.json b/src/main/generated_resources/data/allomancy/advancement/recipes/misc/chromium_pattern.json similarity index 100% rename from src/generated/resources/data/allomancy/advancement/recipes/misc/chromium_pattern.json rename to src/main/generated_resources/data/allomancy/advancement/recipes/misc/chromium_pattern.json diff --git a/src/generated/resources/data/allomancy/advancement/recipes/misc/copper_flakes.json b/src/main/generated_resources/data/allomancy/advancement/recipes/misc/copper_flakes.json similarity index 100% rename from src/generated/resources/data/allomancy/advancement/recipes/misc/copper_flakes.json rename to src/main/generated_resources/data/allomancy/advancement/recipes/misc/copper_flakes.json diff --git a/src/generated/resources/data/allomancy/advancement/recipes/misc/copper_pattern.json b/src/main/generated_resources/data/allomancy/advancement/recipes/misc/copper_pattern.json similarity index 100% rename from src/generated/resources/data/allomancy/advancement/recipes/misc/copper_pattern.json rename to src/main/generated_resources/data/allomancy/advancement/recipes/misc/copper_pattern.json diff --git a/src/generated/resources/data/allomancy/advancement/recipes/misc/duralumin_flakes.json b/src/main/generated_resources/data/allomancy/advancement/recipes/misc/duralumin_flakes.json similarity index 100% rename from src/generated/resources/data/allomancy/advancement/recipes/misc/duralumin_flakes.json rename to src/main/generated_resources/data/allomancy/advancement/recipes/misc/duralumin_flakes.json diff --git a/src/generated/resources/data/allomancy/advancement/recipes/misc/duralumin_flakes_from_mixing.json b/src/main/generated_resources/data/allomancy/advancement/recipes/misc/duralumin_flakes_from_mixing.json similarity index 100% rename from src/generated/resources/data/allomancy/advancement/recipes/misc/duralumin_flakes_from_mixing.json rename to src/main/generated_resources/data/allomancy/advancement/recipes/misc/duralumin_flakes_from_mixing.json diff --git a/src/generated/resources/data/allomancy/advancement/recipes/misc/duralumin_ingot_from_alloying.json b/src/main/generated_resources/data/allomancy/advancement/recipes/misc/duralumin_ingot_from_alloying.json similarity index 100% rename from src/generated/resources/data/allomancy/advancement/recipes/misc/duralumin_ingot_from_alloying.json rename to src/main/generated_resources/data/allomancy/advancement/recipes/misc/duralumin_ingot_from_alloying.json diff --git a/src/generated/resources/data/allomancy/advancement/recipes/misc/duralumin_ingot_from_block.json b/src/main/generated_resources/data/allomancy/advancement/recipes/misc/duralumin_ingot_from_block.json similarity index 100% rename from src/generated/resources/data/allomancy/advancement/recipes/misc/duralumin_ingot_from_block.json rename to src/main/generated_resources/data/allomancy/advancement/recipes/misc/duralumin_ingot_from_block.json diff --git a/src/generated/resources/data/allomancy/advancement/recipes/misc/duralumin_ingot_from_nuggets.json b/src/main/generated_resources/data/allomancy/advancement/recipes/misc/duralumin_ingot_from_nuggets.json similarity index 100% rename from src/generated/resources/data/allomancy/advancement/recipes/misc/duralumin_ingot_from_nuggets.json rename to src/main/generated_resources/data/allomancy/advancement/recipes/misc/duralumin_ingot_from_nuggets.json diff --git a/src/generated/resources/data/allomancy/advancement/recipes/misc/duralumin_nugget.json b/src/main/generated_resources/data/allomancy/advancement/recipes/misc/duralumin_nugget.json similarity index 100% rename from src/generated/resources/data/allomancy/advancement/recipes/misc/duralumin_nugget.json rename to src/main/generated_resources/data/allomancy/advancement/recipes/misc/duralumin_nugget.json diff --git a/src/generated/resources/data/allomancy/advancement/recipes/misc/duralumin_pattern.json b/src/main/generated_resources/data/allomancy/advancement/recipes/misc/duralumin_pattern.json similarity index 100% rename from src/generated/resources/data/allomancy/advancement/recipes/misc/duralumin_pattern.json rename to src/main/generated_resources/data/allomancy/advancement/recipes/misc/duralumin_pattern.json diff --git a/src/generated/resources/data/allomancy/advancement/recipes/misc/electrum_flakes.json b/src/main/generated_resources/data/allomancy/advancement/recipes/misc/electrum_flakes.json similarity index 100% rename from src/generated/resources/data/allomancy/advancement/recipes/misc/electrum_flakes.json rename to src/main/generated_resources/data/allomancy/advancement/recipes/misc/electrum_flakes.json diff --git a/src/generated/resources/data/allomancy/advancement/recipes/misc/electrum_flakes_from_mixing.json b/src/main/generated_resources/data/allomancy/advancement/recipes/misc/electrum_flakes_from_mixing.json similarity index 100% rename from src/generated/resources/data/allomancy/advancement/recipes/misc/electrum_flakes_from_mixing.json rename to src/main/generated_resources/data/allomancy/advancement/recipes/misc/electrum_flakes_from_mixing.json diff --git a/src/generated/resources/data/allomancy/advancement/recipes/misc/electrum_ingot_from_alloying.json b/src/main/generated_resources/data/allomancy/advancement/recipes/misc/electrum_ingot_from_alloying.json similarity index 100% rename from src/generated/resources/data/allomancy/advancement/recipes/misc/electrum_ingot_from_alloying.json rename to src/main/generated_resources/data/allomancy/advancement/recipes/misc/electrum_ingot_from_alloying.json diff --git a/src/generated/resources/data/allomancy/advancement/recipes/misc/electrum_ingot_from_block.json b/src/main/generated_resources/data/allomancy/advancement/recipes/misc/electrum_ingot_from_block.json similarity index 100% rename from src/generated/resources/data/allomancy/advancement/recipes/misc/electrum_ingot_from_block.json rename to src/main/generated_resources/data/allomancy/advancement/recipes/misc/electrum_ingot_from_block.json diff --git a/src/generated/resources/data/allomancy/advancement/recipes/misc/electrum_ingot_from_nuggets.json b/src/main/generated_resources/data/allomancy/advancement/recipes/misc/electrum_ingot_from_nuggets.json similarity index 100% rename from src/generated/resources/data/allomancy/advancement/recipes/misc/electrum_ingot_from_nuggets.json rename to src/main/generated_resources/data/allomancy/advancement/recipes/misc/electrum_ingot_from_nuggets.json diff --git a/src/generated/resources/data/allomancy/advancement/recipes/misc/electrum_nugget.json b/src/main/generated_resources/data/allomancy/advancement/recipes/misc/electrum_nugget.json similarity index 100% rename from src/generated/resources/data/allomancy/advancement/recipes/misc/electrum_nugget.json rename to src/main/generated_resources/data/allomancy/advancement/recipes/misc/electrum_nugget.json diff --git a/src/generated/resources/data/allomancy/advancement/recipes/misc/electrum_pattern.json b/src/main/generated_resources/data/allomancy/advancement/recipes/misc/electrum_pattern.json similarity index 100% rename from src/generated/resources/data/allomancy/advancement/recipes/misc/electrum_pattern.json rename to src/main/generated_resources/data/allomancy/advancement/recipes/misc/electrum_pattern.json diff --git a/src/generated/resources/data/allomancy/advancement/recipes/misc/gold_flakes.json b/src/main/generated_resources/data/allomancy/advancement/recipes/misc/gold_flakes.json similarity index 100% rename from src/generated/resources/data/allomancy/advancement/recipes/misc/gold_flakes.json rename to src/main/generated_resources/data/allomancy/advancement/recipes/misc/gold_flakes.json diff --git a/src/generated/resources/data/allomancy/advancement/recipes/misc/gold_pattern.json b/src/main/generated_resources/data/allomancy/advancement/recipes/misc/gold_pattern.json similarity index 100% rename from src/generated/resources/data/allomancy/advancement/recipes/misc/gold_pattern.json rename to src/main/generated_resources/data/allomancy/advancement/recipes/misc/gold_pattern.json diff --git a/src/generated/resources/data/allomancy/advancement/recipes/misc/iron_flakes.json b/src/main/generated_resources/data/allomancy/advancement/recipes/misc/iron_flakes.json similarity index 100% rename from src/generated/resources/data/allomancy/advancement/recipes/misc/iron_flakes.json rename to src/main/generated_resources/data/allomancy/advancement/recipes/misc/iron_flakes.json diff --git a/src/generated/resources/data/allomancy/advancement/recipes/misc/iron_pattern.json b/src/main/generated_resources/data/allomancy/advancement/recipes/misc/iron_pattern.json similarity index 100% rename from src/generated/resources/data/allomancy/advancement/recipes/misc/iron_pattern.json rename to src/main/generated_resources/data/allomancy/advancement/recipes/misc/iron_pattern.json diff --git a/src/generated/resources/data/allomancy/advancement/recipes/misc/lead_flakes.json b/src/main/generated_resources/data/allomancy/advancement/recipes/misc/lead_flakes.json similarity index 100% rename from src/generated/resources/data/allomancy/advancement/recipes/misc/lead_flakes.json rename to src/main/generated_resources/data/allomancy/advancement/recipes/misc/lead_flakes.json diff --git a/src/generated/resources/data/allomancy/advancement/recipes/misc/lead_ingot_from_block.json b/src/main/generated_resources/data/allomancy/advancement/recipes/misc/lead_ingot_from_block.json similarity index 100% rename from src/generated/resources/data/allomancy/advancement/recipes/misc/lead_ingot_from_block.json rename to src/main/generated_resources/data/allomancy/advancement/recipes/misc/lead_ingot_from_block.json diff --git a/src/generated/resources/data/allomancy/advancement/recipes/misc/lead_ingot_from_nuggets.json b/src/main/generated_resources/data/allomancy/advancement/recipes/misc/lead_ingot_from_nuggets.json similarity index 100% rename from src/generated/resources/data/allomancy/advancement/recipes/misc/lead_ingot_from_nuggets.json rename to src/main/generated_resources/data/allomancy/advancement/recipes/misc/lead_ingot_from_nuggets.json diff --git a/src/generated/resources/data/allomancy/advancement/recipes/misc/lead_nugget.json b/src/main/generated_resources/data/allomancy/advancement/recipes/misc/lead_nugget.json similarity index 100% rename from src/generated/resources/data/allomancy/advancement/recipes/misc/lead_nugget.json rename to src/main/generated_resources/data/allomancy/advancement/recipes/misc/lead_nugget.json diff --git a/src/generated/resources/data/allomancy/advancement/recipes/misc/lerasium_nugget.json b/src/main/generated_resources/data/allomancy/advancement/recipes/misc/lerasium_nugget.json similarity index 100% rename from src/generated/resources/data/allomancy/advancement/recipes/misc/lerasium_nugget.json rename to src/main/generated_resources/data/allomancy/advancement/recipes/misc/lerasium_nugget.json diff --git a/src/generated/resources/data/allomancy/advancement/recipes/misc/nicrosil_flakes.json b/src/main/generated_resources/data/allomancy/advancement/recipes/misc/nicrosil_flakes.json similarity index 100% rename from src/generated/resources/data/allomancy/advancement/recipes/misc/nicrosil_flakes.json rename to src/main/generated_resources/data/allomancy/advancement/recipes/misc/nicrosil_flakes.json diff --git a/src/generated/resources/data/allomancy/advancement/recipes/misc/nicrosil_flakes_from_mixing.json b/src/main/generated_resources/data/allomancy/advancement/recipes/misc/nicrosil_flakes_from_mixing.json similarity index 100% rename from src/generated/resources/data/allomancy/advancement/recipes/misc/nicrosil_flakes_from_mixing.json rename to src/main/generated_resources/data/allomancy/advancement/recipes/misc/nicrosil_flakes_from_mixing.json diff --git a/src/generated/resources/data/allomancy/advancement/recipes/misc/nicrosil_ingot_from_alloying.json b/src/main/generated_resources/data/allomancy/advancement/recipes/misc/nicrosil_ingot_from_alloying.json similarity index 100% rename from src/generated/resources/data/allomancy/advancement/recipes/misc/nicrosil_ingot_from_alloying.json rename to src/main/generated_resources/data/allomancy/advancement/recipes/misc/nicrosil_ingot_from_alloying.json diff --git a/src/generated/resources/data/allomancy/advancement/recipes/misc/nicrosil_ingot_from_block.json b/src/main/generated_resources/data/allomancy/advancement/recipes/misc/nicrosil_ingot_from_block.json similarity index 100% rename from src/generated/resources/data/allomancy/advancement/recipes/misc/nicrosil_ingot_from_block.json rename to src/main/generated_resources/data/allomancy/advancement/recipes/misc/nicrosil_ingot_from_block.json diff --git a/src/generated/resources/data/allomancy/advancement/recipes/misc/nicrosil_ingot_from_nuggets.json b/src/main/generated_resources/data/allomancy/advancement/recipes/misc/nicrosil_ingot_from_nuggets.json similarity index 100% rename from src/generated/resources/data/allomancy/advancement/recipes/misc/nicrosil_ingot_from_nuggets.json rename to src/main/generated_resources/data/allomancy/advancement/recipes/misc/nicrosil_ingot_from_nuggets.json diff --git a/src/generated/resources/data/allomancy/advancement/recipes/misc/nicrosil_nugget.json b/src/main/generated_resources/data/allomancy/advancement/recipes/misc/nicrosil_nugget.json similarity index 100% rename from src/generated/resources/data/allomancy/advancement/recipes/misc/nicrosil_nugget.json rename to src/main/generated_resources/data/allomancy/advancement/recipes/misc/nicrosil_nugget.json diff --git a/src/generated/resources/data/allomancy/advancement/recipes/misc/nicrosil_pattern.json b/src/main/generated_resources/data/allomancy/advancement/recipes/misc/nicrosil_pattern.json similarity index 100% rename from src/generated/resources/data/allomancy/advancement/recipes/misc/nicrosil_pattern.json rename to src/main/generated_resources/data/allomancy/advancement/recipes/misc/nicrosil_pattern.json diff --git a/src/generated/resources/data/allomancy/advancement/recipes/misc/pewter_flakes.json b/src/main/generated_resources/data/allomancy/advancement/recipes/misc/pewter_flakes.json similarity index 100% rename from src/generated/resources/data/allomancy/advancement/recipes/misc/pewter_flakes.json rename to src/main/generated_resources/data/allomancy/advancement/recipes/misc/pewter_flakes.json diff --git a/src/generated/resources/data/allomancy/advancement/recipes/misc/pewter_flakes_from_mixing.json b/src/main/generated_resources/data/allomancy/advancement/recipes/misc/pewter_flakes_from_mixing.json similarity index 100% rename from src/generated/resources/data/allomancy/advancement/recipes/misc/pewter_flakes_from_mixing.json rename to src/main/generated_resources/data/allomancy/advancement/recipes/misc/pewter_flakes_from_mixing.json diff --git a/src/generated/resources/data/allomancy/advancement/recipes/misc/pewter_ingot_from_alloying.json b/src/main/generated_resources/data/allomancy/advancement/recipes/misc/pewter_ingot_from_alloying.json similarity index 100% rename from src/generated/resources/data/allomancy/advancement/recipes/misc/pewter_ingot_from_alloying.json rename to src/main/generated_resources/data/allomancy/advancement/recipes/misc/pewter_ingot_from_alloying.json diff --git a/src/generated/resources/data/allomancy/advancement/recipes/misc/pewter_ingot_from_block.json b/src/main/generated_resources/data/allomancy/advancement/recipes/misc/pewter_ingot_from_block.json similarity index 100% rename from src/generated/resources/data/allomancy/advancement/recipes/misc/pewter_ingot_from_block.json rename to src/main/generated_resources/data/allomancy/advancement/recipes/misc/pewter_ingot_from_block.json diff --git a/src/generated/resources/data/allomancy/advancement/recipes/misc/pewter_ingot_from_nuggets.json b/src/main/generated_resources/data/allomancy/advancement/recipes/misc/pewter_ingot_from_nuggets.json similarity index 100% rename from src/generated/resources/data/allomancy/advancement/recipes/misc/pewter_ingot_from_nuggets.json rename to src/main/generated_resources/data/allomancy/advancement/recipes/misc/pewter_ingot_from_nuggets.json diff --git a/src/generated/resources/data/allomancy/advancement/recipes/misc/pewter_nugget.json b/src/main/generated_resources/data/allomancy/advancement/recipes/misc/pewter_nugget.json similarity index 100% rename from src/generated/resources/data/allomancy/advancement/recipes/misc/pewter_nugget.json rename to src/main/generated_resources/data/allomancy/advancement/recipes/misc/pewter_nugget.json diff --git a/src/generated/resources/data/allomancy/advancement/recipes/misc/pewter_pattern.json b/src/main/generated_resources/data/allomancy/advancement/recipes/misc/pewter_pattern.json similarity index 100% rename from src/generated/resources/data/allomancy/advancement/recipes/misc/pewter_pattern.json rename to src/main/generated_resources/data/allomancy/advancement/recipes/misc/pewter_pattern.json diff --git a/src/generated/resources/data/allomancy/advancement/recipes/misc/silver_flakes.json b/src/main/generated_resources/data/allomancy/advancement/recipes/misc/silver_flakes.json similarity index 100% rename from src/generated/resources/data/allomancy/advancement/recipes/misc/silver_flakes.json rename to src/main/generated_resources/data/allomancy/advancement/recipes/misc/silver_flakes.json diff --git a/src/generated/resources/data/allomancy/advancement/recipes/misc/silver_ingot_from_block.json b/src/main/generated_resources/data/allomancy/advancement/recipes/misc/silver_ingot_from_block.json similarity index 100% rename from src/generated/resources/data/allomancy/advancement/recipes/misc/silver_ingot_from_block.json rename to src/main/generated_resources/data/allomancy/advancement/recipes/misc/silver_ingot_from_block.json diff --git a/src/generated/resources/data/allomancy/advancement/recipes/misc/silver_ingot_from_nuggets.json b/src/main/generated_resources/data/allomancy/advancement/recipes/misc/silver_ingot_from_nuggets.json similarity index 100% rename from src/generated/resources/data/allomancy/advancement/recipes/misc/silver_ingot_from_nuggets.json rename to src/main/generated_resources/data/allomancy/advancement/recipes/misc/silver_ingot_from_nuggets.json diff --git a/src/generated/resources/data/allomancy/advancement/recipes/misc/silver_nugget.json b/src/main/generated_resources/data/allomancy/advancement/recipes/misc/silver_nugget.json similarity index 100% rename from src/generated/resources/data/allomancy/advancement/recipes/misc/silver_nugget.json rename to src/main/generated_resources/data/allomancy/advancement/recipes/misc/silver_nugget.json diff --git a/src/generated/resources/data/allomancy/advancement/recipes/misc/steel_flakes.json b/src/main/generated_resources/data/allomancy/advancement/recipes/misc/steel_flakes.json similarity index 100% rename from src/generated/resources/data/allomancy/advancement/recipes/misc/steel_flakes.json rename to src/main/generated_resources/data/allomancy/advancement/recipes/misc/steel_flakes.json diff --git a/src/generated/resources/data/allomancy/advancement/recipes/misc/steel_flakes_from_mixing.json b/src/main/generated_resources/data/allomancy/advancement/recipes/misc/steel_flakes_from_mixing.json similarity index 100% rename from src/generated/resources/data/allomancy/advancement/recipes/misc/steel_flakes_from_mixing.json rename to src/main/generated_resources/data/allomancy/advancement/recipes/misc/steel_flakes_from_mixing.json diff --git a/src/generated/resources/data/allomancy/advancement/recipes/misc/steel_ingot_from_alloying.json b/src/main/generated_resources/data/allomancy/advancement/recipes/misc/steel_ingot_from_alloying.json similarity index 100% rename from src/generated/resources/data/allomancy/advancement/recipes/misc/steel_ingot_from_alloying.json rename to src/main/generated_resources/data/allomancy/advancement/recipes/misc/steel_ingot_from_alloying.json diff --git a/src/generated/resources/data/allomancy/advancement/recipes/misc/steel_ingot_from_block.json b/src/main/generated_resources/data/allomancy/advancement/recipes/misc/steel_ingot_from_block.json similarity index 100% rename from src/generated/resources/data/allomancy/advancement/recipes/misc/steel_ingot_from_block.json rename to src/main/generated_resources/data/allomancy/advancement/recipes/misc/steel_ingot_from_block.json diff --git a/src/generated/resources/data/allomancy/advancement/recipes/misc/steel_ingot_from_nuggets.json b/src/main/generated_resources/data/allomancy/advancement/recipes/misc/steel_ingot_from_nuggets.json similarity index 100% rename from src/generated/resources/data/allomancy/advancement/recipes/misc/steel_ingot_from_nuggets.json rename to src/main/generated_resources/data/allomancy/advancement/recipes/misc/steel_ingot_from_nuggets.json diff --git a/src/generated/resources/data/allomancy/advancement/recipes/misc/steel_nugget.json b/src/main/generated_resources/data/allomancy/advancement/recipes/misc/steel_nugget.json similarity index 100% rename from src/generated/resources/data/allomancy/advancement/recipes/misc/steel_nugget.json rename to src/main/generated_resources/data/allomancy/advancement/recipes/misc/steel_nugget.json diff --git a/src/generated/resources/data/allomancy/advancement/recipes/misc/steel_pattern.json b/src/main/generated_resources/data/allomancy/advancement/recipes/misc/steel_pattern.json similarity index 100% rename from src/generated/resources/data/allomancy/advancement/recipes/misc/steel_pattern.json rename to src/main/generated_resources/data/allomancy/advancement/recipes/misc/steel_pattern.json diff --git a/src/generated/resources/data/allomancy/advancement/recipes/misc/tin_flakes.json b/src/main/generated_resources/data/allomancy/advancement/recipes/misc/tin_flakes.json similarity index 100% rename from src/generated/resources/data/allomancy/advancement/recipes/misc/tin_flakes.json rename to src/main/generated_resources/data/allomancy/advancement/recipes/misc/tin_flakes.json diff --git a/src/generated/resources/data/allomancy/advancement/recipes/misc/tin_ingot_from_block.json b/src/main/generated_resources/data/allomancy/advancement/recipes/misc/tin_ingot_from_block.json similarity index 100% rename from src/generated/resources/data/allomancy/advancement/recipes/misc/tin_ingot_from_block.json rename to src/main/generated_resources/data/allomancy/advancement/recipes/misc/tin_ingot_from_block.json diff --git a/src/generated/resources/data/allomancy/advancement/recipes/misc/tin_ingot_from_nuggets.json b/src/main/generated_resources/data/allomancy/advancement/recipes/misc/tin_ingot_from_nuggets.json similarity index 100% rename from src/generated/resources/data/allomancy/advancement/recipes/misc/tin_ingot_from_nuggets.json rename to src/main/generated_resources/data/allomancy/advancement/recipes/misc/tin_ingot_from_nuggets.json diff --git a/src/generated/resources/data/allomancy/advancement/recipes/misc/tin_nugget.json b/src/main/generated_resources/data/allomancy/advancement/recipes/misc/tin_nugget.json similarity index 100% rename from src/generated/resources/data/allomancy/advancement/recipes/misc/tin_nugget.json rename to src/main/generated_resources/data/allomancy/advancement/recipes/misc/tin_nugget.json diff --git a/src/generated/resources/data/allomancy/advancement/recipes/misc/tin_pattern.json b/src/main/generated_resources/data/allomancy/advancement/recipes/misc/tin_pattern.json similarity index 100% rename from src/generated/resources/data/allomancy/advancement/recipes/misc/tin_pattern.json rename to src/main/generated_resources/data/allomancy/advancement/recipes/misc/tin_pattern.json diff --git a/src/generated/resources/data/allomancy/advancement/recipes/misc/zinc_flakes.json b/src/main/generated_resources/data/allomancy/advancement/recipes/misc/zinc_flakes.json similarity index 100% rename from src/generated/resources/data/allomancy/advancement/recipes/misc/zinc_flakes.json rename to src/main/generated_resources/data/allomancy/advancement/recipes/misc/zinc_flakes.json diff --git a/src/generated/resources/data/allomancy/advancement/recipes/misc/zinc_ingot_from_block.json b/src/main/generated_resources/data/allomancy/advancement/recipes/misc/zinc_ingot_from_block.json similarity index 100% rename from src/generated/resources/data/allomancy/advancement/recipes/misc/zinc_ingot_from_block.json rename to src/main/generated_resources/data/allomancy/advancement/recipes/misc/zinc_ingot_from_block.json diff --git a/src/generated/resources/data/allomancy/advancement/recipes/misc/zinc_ingot_from_nuggets.json b/src/main/generated_resources/data/allomancy/advancement/recipes/misc/zinc_ingot_from_nuggets.json similarity index 100% rename from src/generated/resources/data/allomancy/advancement/recipes/misc/zinc_ingot_from_nuggets.json rename to src/main/generated_resources/data/allomancy/advancement/recipes/misc/zinc_ingot_from_nuggets.json diff --git a/src/generated/resources/data/allomancy/advancement/recipes/misc/zinc_nugget.json b/src/main/generated_resources/data/allomancy/advancement/recipes/misc/zinc_nugget.json similarity index 100% rename from src/generated/resources/data/allomancy/advancement/recipes/misc/zinc_nugget.json rename to src/main/generated_resources/data/allomancy/advancement/recipes/misc/zinc_nugget.json diff --git a/src/generated/resources/data/allomancy/advancement/recipes/misc/zinc_pattern.json b/src/main/generated_resources/data/allomancy/advancement/recipes/misc/zinc_pattern.json similarity index 100% rename from src/generated/resources/data/allomancy/advancement/recipes/misc/zinc_pattern.json rename to src/main/generated_resources/data/allomancy/advancement/recipes/misc/zinc_pattern.json diff --git a/src/generated/resources/data/allomancy/advancement/recipes/redstone/inverted_from_iron_button.json b/src/main/generated_resources/data/allomancy/advancement/recipes/redstone/inverted_from_iron_button.json similarity index 100% rename from src/generated/resources/data/allomancy/advancement/recipes/redstone/inverted_from_iron_button.json rename to src/main/generated_resources/data/allomancy/advancement/recipes/redstone/inverted_from_iron_button.json diff --git a/src/generated/resources/data/allomancy/advancement/recipes/redstone/iron_button.json b/src/main/generated_resources/data/allomancy/advancement/recipes/redstone/iron_button.json similarity index 100% rename from src/generated/resources/data/allomancy/advancement/recipes/redstone/iron_button.json rename to src/main/generated_resources/data/allomancy/advancement/recipes/redstone/iron_button.json diff --git a/src/generated/resources/data/allomancy/advancement/recipes/redstone/iron_button_from_inverted.json b/src/main/generated_resources/data/allomancy/advancement/recipes/redstone/iron_button_from_inverted.json similarity index 100% rename from src/generated/resources/data/allomancy/advancement/recipes/redstone/iron_button_from_inverted.json rename to src/main/generated_resources/data/allomancy/advancement/recipes/redstone/iron_button_from_inverted.json diff --git a/src/generated/resources/data/allomancy/advancement/recipes/redstone/iron_lever.json b/src/main/generated_resources/data/allomancy/advancement/recipes/redstone/iron_lever.json similarity index 100% rename from src/generated/resources/data/allomancy/advancement/recipes/redstone/iron_lever.json rename to src/main/generated_resources/data/allomancy/advancement/recipes/redstone/iron_lever.json diff --git a/src/generated/resources/data/allomancy/banner_pattern/aluminum.json b/src/main/generated_resources/data/allomancy/banner_pattern/aluminum.json similarity index 100% rename from src/generated/resources/data/allomancy/banner_pattern/aluminum.json rename to src/main/generated_resources/data/allomancy/banner_pattern/aluminum.json diff --git a/src/generated/resources/data/allomancy/banner_pattern/bendalloy.json b/src/main/generated_resources/data/allomancy/banner_pattern/bendalloy.json similarity index 100% rename from src/generated/resources/data/allomancy/banner_pattern/bendalloy.json rename to src/main/generated_resources/data/allomancy/banner_pattern/bendalloy.json diff --git a/src/generated/resources/data/allomancy/banner_pattern/brass.json b/src/main/generated_resources/data/allomancy/banner_pattern/brass.json similarity index 100% rename from src/generated/resources/data/allomancy/banner_pattern/brass.json rename to src/main/generated_resources/data/allomancy/banner_pattern/brass.json diff --git a/src/generated/resources/data/allomancy/banner_pattern/bronze.json b/src/main/generated_resources/data/allomancy/banner_pattern/bronze.json similarity index 100% rename from src/generated/resources/data/allomancy/banner_pattern/bronze.json rename to src/main/generated_resources/data/allomancy/banner_pattern/bronze.json diff --git a/src/generated/resources/data/allomancy/banner_pattern/cadmium.json b/src/main/generated_resources/data/allomancy/banner_pattern/cadmium.json similarity index 100% rename from src/generated/resources/data/allomancy/banner_pattern/cadmium.json rename to src/main/generated_resources/data/allomancy/banner_pattern/cadmium.json diff --git a/src/generated/resources/data/allomancy/banner_pattern/chromium.json b/src/main/generated_resources/data/allomancy/banner_pattern/chromium.json similarity index 100% rename from src/generated/resources/data/allomancy/banner_pattern/chromium.json rename to src/main/generated_resources/data/allomancy/banner_pattern/chromium.json diff --git a/src/generated/resources/data/allomancy/banner_pattern/copper.json b/src/main/generated_resources/data/allomancy/banner_pattern/copper.json similarity index 100% rename from src/generated/resources/data/allomancy/banner_pattern/copper.json rename to src/main/generated_resources/data/allomancy/banner_pattern/copper.json diff --git a/src/generated/resources/data/allomancy/banner_pattern/duralumin.json b/src/main/generated_resources/data/allomancy/banner_pattern/duralumin.json similarity index 100% rename from src/generated/resources/data/allomancy/banner_pattern/duralumin.json rename to src/main/generated_resources/data/allomancy/banner_pattern/duralumin.json diff --git a/src/generated/resources/data/allomancy/banner_pattern/electrum.json b/src/main/generated_resources/data/allomancy/banner_pattern/electrum.json similarity index 100% rename from src/generated/resources/data/allomancy/banner_pattern/electrum.json rename to src/main/generated_resources/data/allomancy/banner_pattern/electrum.json diff --git a/src/generated/resources/data/allomancy/banner_pattern/gold.json b/src/main/generated_resources/data/allomancy/banner_pattern/gold.json similarity index 100% rename from src/generated/resources/data/allomancy/banner_pattern/gold.json rename to src/main/generated_resources/data/allomancy/banner_pattern/gold.json diff --git a/src/generated/resources/data/allomancy/banner_pattern/iron.json b/src/main/generated_resources/data/allomancy/banner_pattern/iron.json similarity index 100% rename from src/generated/resources/data/allomancy/banner_pattern/iron.json rename to src/main/generated_resources/data/allomancy/banner_pattern/iron.json diff --git a/src/generated/resources/data/allomancy/banner_pattern/nicrosil.json b/src/main/generated_resources/data/allomancy/banner_pattern/nicrosil.json similarity index 100% rename from src/generated/resources/data/allomancy/banner_pattern/nicrosil.json rename to src/main/generated_resources/data/allomancy/banner_pattern/nicrosil.json diff --git a/src/generated/resources/data/allomancy/banner_pattern/pewter.json b/src/main/generated_resources/data/allomancy/banner_pattern/pewter.json similarity index 100% rename from src/generated/resources/data/allomancy/banner_pattern/pewter.json rename to src/main/generated_resources/data/allomancy/banner_pattern/pewter.json diff --git a/src/generated/resources/data/allomancy/banner_pattern/steel.json b/src/main/generated_resources/data/allomancy/banner_pattern/steel.json similarity index 100% rename from src/generated/resources/data/allomancy/banner_pattern/steel.json rename to src/main/generated_resources/data/allomancy/banner_pattern/steel.json diff --git a/src/generated/resources/data/allomancy/banner_pattern/tin.json b/src/main/generated_resources/data/allomancy/banner_pattern/tin.json similarity index 100% rename from src/generated/resources/data/allomancy/banner_pattern/tin.json rename to src/main/generated_resources/data/allomancy/banner_pattern/tin.json diff --git a/src/generated/resources/data/allomancy/banner_pattern/zinc.json b/src/main/generated_resources/data/allomancy/banner_pattern/zinc.json similarity index 100% rename from src/generated/resources/data/allomancy/banner_pattern/zinc.json rename to src/main/generated_resources/data/allomancy/banner_pattern/zinc.json diff --git a/src/generated/resources/data/allomancy/damage_type/coin.json b/src/main/generated_resources/data/allomancy/damage_type/coin.json similarity index 100% rename from src/generated/resources/data/allomancy/damage_type/coin.json rename to src/main/generated_resources/data/allomancy/damage_type/coin.json diff --git a/src/generated/resources/data/allomancy/loot_modifiers/lerasium_loot.json b/src/main/generated_resources/data/allomancy/loot_modifiers/lerasium_loot.json similarity index 100% rename from src/generated/resources/data/allomancy/loot_modifiers/lerasium_loot.json rename to src/main/generated_resources/data/allomancy/loot_modifiers/lerasium_loot.json diff --git a/src/generated/resources/data/allomancy/loot_modifiers/unbreakable_dagger_loot.json b/src/main/generated_resources/data/allomancy/loot_modifiers/unbreakable_dagger_loot.json similarity index 100% rename from src/generated/resources/data/allomancy/loot_modifiers/unbreakable_dagger_loot.json rename to src/main/generated_resources/data/allomancy/loot_modifiers/unbreakable_dagger_loot.json diff --git a/src/generated/resources/data/allomancy/loot_table/blocks/aluminum_block.json b/src/main/generated_resources/data/allomancy/loot_table/blocks/aluminum_block.json similarity index 100% rename from src/generated/resources/data/allomancy/loot_table/blocks/aluminum_block.json rename to src/main/generated_resources/data/allomancy/loot_table/blocks/aluminum_block.json diff --git a/src/generated/resources/data/allomancy/loot_table/blocks/aluminum_ore.json b/src/main/generated_resources/data/allomancy/loot_table/blocks/aluminum_ore.json similarity index 100% rename from src/generated/resources/data/allomancy/loot_table/blocks/aluminum_ore.json rename to src/main/generated_resources/data/allomancy/loot_table/blocks/aluminum_ore.json diff --git a/src/generated/resources/data/allomancy/loot_table/blocks/bendalloy_block.json b/src/main/generated_resources/data/allomancy/loot_table/blocks/bendalloy_block.json similarity index 100% rename from src/generated/resources/data/allomancy/loot_table/blocks/bendalloy_block.json rename to src/main/generated_resources/data/allomancy/loot_table/blocks/bendalloy_block.json diff --git a/src/generated/resources/data/allomancy/loot_table/blocks/brass_block.json b/src/main/generated_resources/data/allomancy/loot_table/blocks/brass_block.json similarity index 100% rename from src/generated/resources/data/allomancy/loot_table/blocks/brass_block.json rename to src/main/generated_resources/data/allomancy/loot_table/blocks/brass_block.json diff --git a/src/generated/resources/data/allomancy/loot_table/blocks/bronze_block.json b/src/main/generated_resources/data/allomancy/loot_table/blocks/bronze_block.json similarity index 100% rename from src/generated/resources/data/allomancy/loot_table/blocks/bronze_block.json rename to src/main/generated_resources/data/allomancy/loot_table/blocks/bronze_block.json diff --git a/src/generated/resources/data/allomancy/loot_table/blocks/cadmium_block.json b/src/main/generated_resources/data/allomancy/loot_table/blocks/cadmium_block.json similarity index 100% rename from src/generated/resources/data/allomancy/loot_table/blocks/cadmium_block.json rename to src/main/generated_resources/data/allomancy/loot_table/blocks/cadmium_block.json diff --git a/src/generated/resources/data/allomancy/loot_table/blocks/cadmium_ore.json b/src/main/generated_resources/data/allomancy/loot_table/blocks/cadmium_ore.json similarity index 100% rename from src/generated/resources/data/allomancy/loot_table/blocks/cadmium_ore.json rename to src/main/generated_resources/data/allomancy/loot_table/blocks/cadmium_ore.json diff --git a/src/generated/resources/data/allomancy/loot_table/blocks/chromium_block.json b/src/main/generated_resources/data/allomancy/loot_table/blocks/chromium_block.json similarity index 100% rename from src/generated/resources/data/allomancy/loot_table/blocks/chromium_block.json rename to src/main/generated_resources/data/allomancy/loot_table/blocks/chromium_block.json diff --git a/src/generated/resources/data/allomancy/loot_table/blocks/chromium_ore.json b/src/main/generated_resources/data/allomancy/loot_table/blocks/chromium_ore.json similarity index 100% rename from src/generated/resources/data/allomancy/loot_table/blocks/chromium_ore.json rename to src/main/generated_resources/data/allomancy/loot_table/blocks/chromium_ore.json diff --git a/src/generated/resources/data/allomancy/loot_table/blocks/deepslate_aluminum_ore.json b/src/main/generated_resources/data/allomancy/loot_table/blocks/deepslate_aluminum_ore.json similarity index 100% rename from src/generated/resources/data/allomancy/loot_table/blocks/deepslate_aluminum_ore.json rename to src/main/generated_resources/data/allomancy/loot_table/blocks/deepslate_aluminum_ore.json diff --git a/src/generated/resources/data/allomancy/loot_table/blocks/deepslate_cadmium_ore.json b/src/main/generated_resources/data/allomancy/loot_table/blocks/deepslate_cadmium_ore.json similarity index 100% rename from src/generated/resources/data/allomancy/loot_table/blocks/deepslate_cadmium_ore.json rename to src/main/generated_resources/data/allomancy/loot_table/blocks/deepslate_cadmium_ore.json diff --git a/src/generated/resources/data/allomancy/loot_table/blocks/deepslate_chromium_ore.json b/src/main/generated_resources/data/allomancy/loot_table/blocks/deepslate_chromium_ore.json similarity index 100% rename from src/generated/resources/data/allomancy/loot_table/blocks/deepslate_chromium_ore.json rename to src/main/generated_resources/data/allomancy/loot_table/blocks/deepslate_chromium_ore.json diff --git a/src/generated/resources/data/allomancy/loot_table/blocks/deepslate_lead_ore.json b/src/main/generated_resources/data/allomancy/loot_table/blocks/deepslate_lead_ore.json similarity index 100% rename from src/generated/resources/data/allomancy/loot_table/blocks/deepslate_lead_ore.json rename to src/main/generated_resources/data/allomancy/loot_table/blocks/deepslate_lead_ore.json diff --git a/src/generated/resources/data/allomancy/loot_table/blocks/deepslate_silver_ore.json b/src/main/generated_resources/data/allomancy/loot_table/blocks/deepslate_silver_ore.json similarity index 100% rename from src/generated/resources/data/allomancy/loot_table/blocks/deepslate_silver_ore.json rename to src/main/generated_resources/data/allomancy/loot_table/blocks/deepslate_silver_ore.json diff --git a/src/generated/resources/data/allomancy/loot_table/blocks/deepslate_tin_ore.json b/src/main/generated_resources/data/allomancy/loot_table/blocks/deepslate_tin_ore.json similarity index 100% rename from src/generated/resources/data/allomancy/loot_table/blocks/deepslate_tin_ore.json rename to src/main/generated_resources/data/allomancy/loot_table/blocks/deepslate_tin_ore.json diff --git a/src/generated/resources/data/allomancy/loot_table/blocks/deepslate_zinc_ore.json b/src/main/generated_resources/data/allomancy/loot_table/blocks/deepslate_zinc_ore.json similarity index 100% rename from src/generated/resources/data/allomancy/loot_table/blocks/deepslate_zinc_ore.json rename to src/main/generated_resources/data/allomancy/loot_table/blocks/deepslate_zinc_ore.json diff --git a/src/generated/resources/data/allomancy/loot_table/blocks/duralumin_block.json b/src/main/generated_resources/data/allomancy/loot_table/blocks/duralumin_block.json similarity index 100% rename from src/generated/resources/data/allomancy/loot_table/blocks/duralumin_block.json rename to src/main/generated_resources/data/allomancy/loot_table/blocks/duralumin_block.json diff --git a/src/generated/resources/data/allomancy/loot_table/blocks/electrum_block.json b/src/main/generated_resources/data/allomancy/loot_table/blocks/electrum_block.json similarity index 100% rename from src/generated/resources/data/allomancy/loot_table/blocks/electrum_block.json rename to src/main/generated_resources/data/allomancy/loot_table/blocks/electrum_block.json diff --git a/src/generated/resources/data/allomancy/loot_table/blocks/inverted_iron_button.json b/src/main/generated_resources/data/allomancy/loot_table/blocks/inverted_iron_button.json similarity index 100% rename from src/generated/resources/data/allomancy/loot_table/blocks/inverted_iron_button.json rename to src/main/generated_resources/data/allomancy/loot_table/blocks/inverted_iron_button.json diff --git a/src/generated/resources/data/allomancy/loot_table/blocks/iron_button.json b/src/main/generated_resources/data/allomancy/loot_table/blocks/iron_button.json similarity index 100% rename from src/generated/resources/data/allomancy/loot_table/blocks/iron_button.json rename to src/main/generated_resources/data/allomancy/loot_table/blocks/iron_button.json diff --git a/src/generated/resources/data/allomancy/loot_table/blocks/iron_lever.json b/src/main/generated_resources/data/allomancy/loot_table/blocks/iron_lever.json similarity index 100% rename from src/generated/resources/data/allomancy/loot_table/blocks/iron_lever.json rename to src/main/generated_resources/data/allomancy/loot_table/blocks/iron_lever.json diff --git a/src/generated/resources/data/allomancy/loot_table/blocks/lead_block.json b/src/main/generated_resources/data/allomancy/loot_table/blocks/lead_block.json similarity index 100% rename from src/generated/resources/data/allomancy/loot_table/blocks/lead_block.json rename to src/main/generated_resources/data/allomancy/loot_table/blocks/lead_block.json diff --git a/src/generated/resources/data/allomancy/loot_table/blocks/lead_ore.json b/src/main/generated_resources/data/allomancy/loot_table/blocks/lead_ore.json similarity index 100% rename from src/generated/resources/data/allomancy/loot_table/blocks/lead_ore.json rename to src/main/generated_resources/data/allomancy/loot_table/blocks/lead_ore.json diff --git a/src/generated/resources/data/allomancy/loot_table/blocks/nicrosil_block.json b/src/main/generated_resources/data/allomancy/loot_table/blocks/nicrosil_block.json similarity index 100% rename from src/generated/resources/data/allomancy/loot_table/blocks/nicrosil_block.json rename to src/main/generated_resources/data/allomancy/loot_table/blocks/nicrosil_block.json diff --git a/src/generated/resources/data/allomancy/loot_table/blocks/pewter_block.json b/src/main/generated_resources/data/allomancy/loot_table/blocks/pewter_block.json similarity index 100% rename from src/generated/resources/data/allomancy/loot_table/blocks/pewter_block.json rename to src/main/generated_resources/data/allomancy/loot_table/blocks/pewter_block.json diff --git a/src/generated/resources/data/allomancy/loot_table/blocks/raw_aluminum_block.json b/src/main/generated_resources/data/allomancy/loot_table/blocks/raw_aluminum_block.json similarity index 100% rename from src/generated/resources/data/allomancy/loot_table/blocks/raw_aluminum_block.json rename to src/main/generated_resources/data/allomancy/loot_table/blocks/raw_aluminum_block.json diff --git a/src/generated/resources/data/allomancy/loot_table/blocks/raw_cadmium_block.json b/src/main/generated_resources/data/allomancy/loot_table/blocks/raw_cadmium_block.json similarity index 100% rename from src/generated/resources/data/allomancy/loot_table/blocks/raw_cadmium_block.json rename to src/main/generated_resources/data/allomancy/loot_table/blocks/raw_cadmium_block.json diff --git a/src/generated/resources/data/allomancy/loot_table/blocks/raw_chromium_block.json b/src/main/generated_resources/data/allomancy/loot_table/blocks/raw_chromium_block.json similarity index 100% rename from src/generated/resources/data/allomancy/loot_table/blocks/raw_chromium_block.json rename to src/main/generated_resources/data/allomancy/loot_table/blocks/raw_chromium_block.json diff --git a/src/generated/resources/data/allomancy/loot_table/blocks/raw_lead_block.json b/src/main/generated_resources/data/allomancy/loot_table/blocks/raw_lead_block.json similarity index 100% rename from src/generated/resources/data/allomancy/loot_table/blocks/raw_lead_block.json rename to src/main/generated_resources/data/allomancy/loot_table/blocks/raw_lead_block.json diff --git a/src/generated/resources/data/allomancy/loot_table/blocks/raw_silver_block.json b/src/main/generated_resources/data/allomancy/loot_table/blocks/raw_silver_block.json similarity index 100% rename from src/generated/resources/data/allomancy/loot_table/blocks/raw_silver_block.json rename to src/main/generated_resources/data/allomancy/loot_table/blocks/raw_silver_block.json diff --git a/src/generated/resources/data/allomancy/loot_table/blocks/raw_tin_block.json b/src/main/generated_resources/data/allomancy/loot_table/blocks/raw_tin_block.json similarity index 100% rename from src/generated/resources/data/allomancy/loot_table/blocks/raw_tin_block.json rename to src/main/generated_resources/data/allomancy/loot_table/blocks/raw_tin_block.json diff --git a/src/generated/resources/data/allomancy/loot_table/blocks/raw_zinc_block.json b/src/main/generated_resources/data/allomancy/loot_table/blocks/raw_zinc_block.json similarity index 100% rename from src/generated/resources/data/allomancy/loot_table/blocks/raw_zinc_block.json rename to src/main/generated_resources/data/allomancy/loot_table/blocks/raw_zinc_block.json diff --git a/src/generated/resources/data/allomancy/loot_table/blocks/silver_block.json b/src/main/generated_resources/data/allomancy/loot_table/blocks/silver_block.json similarity index 100% rename from src/generated/resources/data/allomancy/loot_table/blocks/silver_block.json rename to src/main/generated_resources/data/allomancy/loot_table/blocks/silver_block.json diff --git a/src/generated/resources/data/allomancy/loot_table/blocks/silver_ore.json b/src/main/generated_resources/data/allomancy/loot_table/blocks/silver_ore.json similarity index 100% rename from src/generated/resources/data/allomancy/loot_table/blocks/silver_ore.json rename to src/main/generated_resources/data/allomancy/loot_table/blocks/silver_ore.json diff --git a/src/generated/resources/data/allomancy/loot_table/blocks/steel_block.json b/src/main/generated_resources/data/allomancy/loot_table/blocks/steel_block.json similarity index 100% rename from src/generated/resources/data/allomancy/loot_table/blocks/steel_block.json rename to src/main/generated_resources/data/allomancy/loot_table/blocks/steel_block.json diff --git a/src/generated/resources/data/allomancy/loot_table/blocks/tin_block.json b/src/main/generated_resources/data/allomancy/loot_table/blocks/tin_block.json similarity index 100% rename from src/generated/resources/data/allomancy/loot_table/blocks/tin_block.json rename to src/main/generated_resources/data/allomancy/loot_table/blocks/tin_block.json diff --git a/src/generated/resources/data/allomancy/loot_table/blocks/tin_ore.json b/src/main/generated_resources/data/allomancy/loot_table/blocks/tin_ore.json similarity index 100% rename from src/generated/resources/data/allomancy/loot_table/blocks/tin_ore.json rename to src/main/generated_resources/data/allomancy/loot_table/blocks/tin_ore.json diff --git a/src/generated/resources/data/allomancy/loot_table/blocks/zinc_block.json b/src/main/generated_resources/data/allomancy/loot_table/blocks/zinc_block.json similarity index 100% rename from src/generated/resources/data/allomancy/loot_table/blocks/zinc_block.json rename to src/main/generated_resources/data/allomancy/loot_table/blocks/zinc_block.json diff --git a/src/generated/resources/data/allomancy/loot_table/blocks/zinc_ore.json b/src/main/generated_resources/data/allomancy/loot_table/blocks/zinc_ore.json similarity index 100% rename from src/generated/resources/data/allomancy/loot_table/blocks/zinc_ore.json rename to src/main/generated_resources/data/allomancy/loot_table/blocks/zinc_ore.json diff --git a/src/generated/resources/data/allomancy/neoforge/biome_modifier/overworld_ores.json b/src/main/generated_resources/data/allomancy/neoforge/biome_modifier/overworld_ores.json similarity index 100% rename from src/generated/resources/data/allomancy/neoforge/biome_modifier/overworld_ores.json rename to src/main/generated_resources/data/allomancy/neoforge/biome_modifier/overworld_ores.json diff --git a/src/generated/resources/data/allomancy/recipe/allomantic_grinder.json b/src/main/generated_resources/data/allomancy/recipe/allomantic_grinder.json similarity index 100% rename from src/generated/resources/data/allomancy/recipe/allomantic_grinder.json rename to src/main/generated_resources/data/allomancy/recipe/allomantic_grinder.json diff --git a/src/generated/resources/data/allomancy/recipe/aluminum_block.json b/src/main/generated_resources/data/allomancy/recipe/aluminum_block.json similarity index 100% rename from src/generated/resources/data/allomancy/recipe/aluminum_block.json rename to src/main/generated_resources/data/allomancy/recipe/aluminum_block.json diff --git a/src/generated/resources/data/allomancy/recipe/aluminum_flakes.json b/src/main/generated_resources/data/allomancy/recipe/aluminum_flakes.json similarity index 100% rename from src/generated/resources/data/allomancy/recipe/aluminum_flakes.json rename to src/main/generated_resources/data/allomancy/recipe/aluminum_flakes.json diff --git a/src/generated/resources/data/allomancy/recipe/aluminum_helmet.json b/src/main/generated_resources/data/allomancy/recipe/aluminum_helmet.json similarity index 100% rename from src/generated/resources/data/allomancy/recipe/aluminum_helmet.json rename to src/main/generated_resources/data/allomancy/recipe/aluminum_helmet.json diff --git a/src/generated/resources/data/allomancy/recipe/aluminum_ingot_from_block.json b/src/main/generated_resources/data/allomancy/recipe/aluminum_ingot_from_block.json similarity index 100% rename from src/generated/resources/data/allomancy/recipe/aluminum_ingot_from_block.json rename to src/main/generated_resources/data/allomancy/recipe/aluminum_ingot_from_block.json diff --git a/src/generated/resources/data/allomancy/recipe/aluminum_ingot_from_nuggets.json b/src/main/generated_resources/data/allomancy/recipe/aluminum_ingot_from_nuggets.json similarity index 100% rename from src/generated/resources/data/allomancy/recipe/aluminum_ingot_from_nuggets.json rename to src/main/generated_resources/data/allomancy/recipe/aluminum_ingot_from_nuggets.json diff --git a/src/generated/resources/data/allomancy/recipe/aluminum_nugget.json b/src/main/generated_resources/data/allomancy/recipe/aluminum_nugget.json similarity index 100% rename from src/generated/resources/data/allomancy/recipe/aluminum_nugget.json rename to src/main/generated_resources/data/allomancy/recipe/aluminum_nugget.json diff --git a/src/generated/resources/data/allomancy/recipe/aluminum_pattern.json b/src/main/generated_resources/data/allomancy/recipe/aluminum_pattern.json similarity index 100% rename from src/generated/resources/data/allomancy/recipe/aluminum_pattern.json rename to src/main/generated_resources/data/allomancy/recipe/aluminum_pattern.json diff --git a/src/generated/resources/data/allomancy/recipe/bendalloy_block.json b/src/main/generated_resources/data/allomancy/recipe/bendalloy_block.json similarity index 100% rename from src/generated/resources/data/allomancy/recipe/bendalloy_block.json rename to src/main/generated_resources/data/allomancy/recipe/bendalloy_block.json diff --git a/src/generated/resources/data/allomancy/recipe/bendalloy_flakes.json b/src/main/generated_resources/data/allomancy/recipe/bendalloy_flakes.json similarity index 100% rename from src/generated/resources/data/allomancy/recipe/bendalloy_flakes.json rename to src/main/generated_resources/data/allomancy/recipe/bendalloy_flakes.json diff --git a/src/generated/resources/data/allomancy/recipe/bendalloy_flakes_from_mixing.json b/src/main/generated_resources/data/allomancy/recipe/bendalloy_flakes_from_mixing.json similarity index 100% rename from src/generated/resources/data/allomancy/recipe/bendalloy_flakes_from_mixing.json rename to src/main/generated_resources/data/allomancy/recipe/bendalloy_flakes_from_mixing.json diff --git a/src/generated/resources/data/allomancy/recipe/bendalloy_ingot_from_alloying.json b/src/main/generated_resources/data/allomancy/recipe/bendalloy_ingot_from_alloying.json similarity index 100% rename from src/generated/resources/data/allomancy/recipe/bendalloy_ingot_from_alloying.json rename to src/main/generated_resources/data/allomancy/recipe/bendalloy_ingot_from_alloying.json diff --git a/src/generated/resources/data/allomancy/recipe/bendalloy_ingot_from_block.json b/src/main/generated_resources/data/allomancy/recipe/bendalloy_ingot_from_block.json similarity index 100% rename from src/generated/resources/data/allomancy/recipe/bendalloy_ingot_from_block.json rename to src/main/generated_resources/data/allomancy/recipe/bendalloy_ingot_from_block.json diff --git a/src/generated/resources/data/allomancy/recipe/bendalloy_ingot_from_nuggets.json b/src/main/generated_resources/data/allomancy/recipe/bendalloy_ingot_from_nuggets.json similarity index 100% rename from src/generated/resources/data/allomancy/recipe/bendalloy_ingot_from_nuggets.json rename to src/main/generated_resources/data/allomancy/recipe/bendalloy_ingot_from_nuggets.json diff --git a/src/generated/resources/data/allomancy/recipe/bendalloy_nugget.json b/src/main/generated_resources/data/allomancy/recipe/bendalloy_nugget.json similarity index 100% rename from src/generated/resources/data/allomancy/recipe/bendalloy_nugget.json rename to src/main/generated_resources/data/allomancy/recipe/bendalloy_nugget.json diff --git a/src/generated/resources/data/allomancy/recipe/bendalloy_pattern.json b/src/main/generated_resources/data/allomancy/recipe/bendalloy_pattern.json similarity index 100% rename from src/generated/resources/data/allomancy/recipe/bendalloy_pattern.json rename to src/main/generated_resources/data/allomancy/recipe/bendalloy_pattern.json diff --git a/src/generated/resources/data/allomancy/recipe/brass_block.json b/src/main/generated_resources/data/allomancy/recipe/brass_block.json similarity index 100% rename from src/generated/resources/data/allomancy/recipe/brass_block.json rename to src/main/generated_resources/data/allomancy/recipe/brass_block.json diff --git a/src/generated/resources/data/allomancy/recipe/brass_flakes.json b/src/main/generated_resources/data/allomancy/recipe/brass_flakes.json similarity index 100% rename from src/generated/resources/data/allomancy/recipe/brass_flakes.json rename to src/main/generated_resources/data/allomancy/recipe/brass_flakes.json diff --git a/src/generated/resources/data/allomancy/recipe/brass_flakes_from_mixing.json b/src/main/generated_resources/data/allomancy/recipe/brass_flakes_from_mixing.json similarity index 100% rename from src/generated/resources/data/allomancy/recipe/brass_flakes_from_mixing.json rename to src/main/generated_resources/data/allomancy/recipe/brass_flakes_from_mixing.json diff --git a/src/generated/resources/data/allomancy/recipe/brass_ingot_from_alloying.json b/src/main/generated_resources/data/allomancy/recipe/brass_ingot_from_alloying.json similarity index 100% rename from src/generated/resources/data/allomancy/recipe/brass_ingot_from_alloying.json rename to src/main/generated_resources/data/allomancy/recipe/brass_ingot_from_alloying.json diff --git a/src/generated/resources/data/allomancy/recipe/brass_ingot_from_block.json b/src/main/generated_resources/data/allomancy/recipe/brass_ingot_from_block.json similarity index 100% rename from src/generated/resources/data/allomancy/recipe/brass_ingot_from_block.json rename to src/main/generated_resources/data/allomancy/recipe/brass_ingot_from_block.json diff --git a/src/generated/resources/data/allomancy/recipe/brass_ingot_from_nuggets.json b/src/main/generated_resources/data/allomancy/recipe/brass_ingot_from_nuggets.json similarity index 100% rename from src/generated/resources/data/allomancy/recipe/brass_ingot_from_nuggets.json rename to src/main/generated_resources/data/allomancy/recipe/brass_ingot_from_nuggets.json diff --git a/src/generated/resources/data/allomancy/recipe/brass_nugget.json b/src/main/generated_resources/data/allomancy/recipe/brass_nugget.json similarity index 100% rename from src/generated/resources/data/allomancy/recipe/brass_nugget.json rename to src/main/generated_resources/data/allomancy/recipe/brass_nugget.json diff --git a/src/generated/resources/data/allomancy/recipe/brass_pattern.json b/src/main/generated_resources/data/allomancy/recipe/brass_pattern.json similarity index 100% rename from src/generated/resources/data/allomancy/recipe/brass_pattern.json rename to src/main/generated_resources/data/allomancy/recipe/brass_pattern.json diff --git a/src/generated/resources/data/allomancy/recipe/bronze_block.json b/src/main/generated_resources/data/allomancy/recipe/bronze_block.json similarity index 100% rename from src/generated/resources/data/allomancy/recipe/bronze_block.json rename to src/main/generated_resources/data/allomancy/recipe/bronze_block.json diff --git a/src/generated/resources/data/allomancy/recipe/bronze_flakes.json b/src/main/generated_resources/data/allomancy/recipe/bronze_flakes.json similarity index 100% rename from src/generated/resources/data/allomancy/recipe/bronze_flakes.json rename to src/main/generated_resources/data/allomancy/recipe/bronze_flakes.json diff --git a/src/generated/resources/data/allomancy/recipe/bronze_flakes_from_mixing.json b/src/main/generated_resources/data/allomancy/recipe/bronze_flakes_from_mixing.json similarity index 100% rename from src/generated/resources/data/allomancy/recipe/bronze_flakes_from_mixing.json rename to src/main/generated_resources/data/allomancy/recipe/bronze_flakes_from_mixing.json diff --git a/src/generated/resources/data/allomancy/recipe/bronze_ingot_from_alloying.json b/src/main/generated_resources/data/allomancy/recipe/bronze_ingot_from_alloying.json similarity index 100% rename from src/generated/resources/data/allomancy/recipe/bronze_ingot_from_alloying.json rename to src/main/generated_resources/data/allomancy/recipe/bronze_ingot_from_alloying.json diff --git a/src/generated/resources/data/allomancy/recipe/bronze_ingot_from_block.json b/src/main/generated_resources/data/allomancy/recipe/bronze_ingot_from_block.json similarity index 100% rename from src/generated/resources/data/allomancy/recipe/bronze_ingot_from_block.json rename to src/main/generated_resources/data/allomancy/recipe/bronze_ingot_from_block.json diff --git a/src/generated/resources/data/allomancy/recipe/bronze_ingot_from_nuggets.json b/src/main/generated_resources/data/allomancy/recipe/bronze_ingot_from_nuggets.json similarity index 100% rename from src/generated/resources/data/allomancy/recipe/bronze_ingot_from_nuggets.json rename to src/main/generated_resources/data/allomancy/recipe/bronze_ingot_from_nuggets.json diff --git a/src/generated/resources/data/allomancy/recipe/bronze_nugget.json b/src/main/generated_resources/data/allomancy/recipe/bronze_nugget.json similarity index 100% rename from src/generated/resources/data/allomancy/recipe/bronze_nugget.json rename to src/main/generated_resources/data/allomancy/recipe/bronze_nugget.json diff --git a/src/generated/resources/data/allomancy/recipe/bronze_pattern.json b/src/main/generated_resources/data/allomancy/recipe/bronze_pattern.json similarity index 100% rename from src/generated/resources/data/allomancy/recipe/bronze_pattern.json rename to src/main/generated_resources/data/allomancy/recipe/bronze_pattern.json diff --git a/src/generated/resources/data/allomancy/recipe/cadmium_block.json b/src/main/generated_resources/data/allomancy/recipe/cadmium_block.json similarity index 100% rename from src/generated/resources/data/allomancy/recipe/cadmium_block.json rename to src/main/generated_resources/data/allomancy/recipe/cadmium_block.json diff --git a/src/generated/resources/data/allomancy/recipe/cadmium_flakes.json b/src/main/generated_resources/data/allomancy/recipe/cadmium_flakes.json similarity index 100% rename from src/generated/resources/data/allomancy/recipe/cadmium_flakes.json rename to src/main/generated_resources/data/allomancy/recipe/cadmium_flakes.json diff --git a/src/generated/resources/data/allomancy/recipe/cadmium_ingot_from_block.json b/src/main/generated_resources/data/allomancy/recipe/cadmium_ingot_from_block.json similarity index 100% rename from src/generated/resources/data/allomancy/recipe/cadmium_ingot_from_block.json rename to src/main/generated_resources/data/allomancy/recipe/cadmium_ingot_from_block.json diff --git a/src/generated/resources/data/allomancy/recipe/cadmium_ingot_from_nuggets.json b/src/main/generated_resources/data/allomancy/recipe/cadmium_ingot_from_nuggets.json similarity index 100% rename from src/generated/resources/data/allomancy/recipe/cadmium_ingot_from_nuggets.json rename to src/main/generated_resources/data/allomancy/recipe/cadmium_ingot_from_nuggets.json diff --git a/src/generated/resources/data/allomancy/recipe/cadmium_nugget.json b/src/main/generated_resources/data/allomancy/recipe/cadmium_nugget.json similarity index 100% rename from src/generated/resources/data/allomancy/recipe/cadmium_nugget.json rename to src/main/generated_resources/data/allomancy/recipe/cadmium_nugget.json diff --git a/src/generated/resources/data/allomancy/recipe/cadmium_pattern.json b/src/main/generated_resources/data/allomancy/recipe/cadmium_pattern.json similarity index 100% rename from src/generated/resources/data/allomancy/recipe/cadmium_pattern.json rename to src/main/generated_resources/data/allomancy/recipe/cadmium_pattern.json diff --git a/src/generated/resources/data/allomancy/recipe/chromium_block.json b/src/main/generated_resources/data/allomancy/recipe/chromium_block.json similarity index 100% rename from src/generated/resources/data/allomancy/recipe/chromium_block.json rename to src/main/generated_resources/data/allomancy/recipe/chromium_block.json diff --git a/src/generated/resources/data/allomancy/recipe/chromium_flakes.json b/src/main/generated_resources/data/allomancy/recipe/chromium_flakes.json similarity index 100% rename from src/generated/resources/data/allomancy/recipe/chromium_flakes.json rename to src/main/generated_resources/data/allomancy/recipe/chromium_flakes.json diff --git a/src/generated/resources/data/allomancy/recipe/chromium_ingot_from_block.json b/src/main/generated_resources/data/allomancy/recipe/chromium_ingot_from_block.json similarity index 100% rename from src/generated/resources/data/allomancy/recipe/chromium_ingot_from_block.json rename to src/main/generated_resources/data/allomancy/recipe/chromium_ingot_from_block.json diff --git a/src/generated/resources/data/allomancy/recipe/chromium_ingot_from_nuggets.json b/src/main/generated_resources/data/allomancy/recipe/chromium_ingot_from_nuggets.json similarity index 100% rename from src/generated/resources/data/allomancy/recipe/chromium_ingot_from_nuggets.json rename to src/main/generated_resources/data/allomancy/recipe/chromium_ingot_from_nuggets.json diff --git a/src/generated/resources/data/allomancy/recipe/chromium_nugget.json b/src/main/generated_resources/data/allomancy/recipe/chromium_nugget.json similarity index 100% rename from src/generated/resources/data/allomancy/recipe/chromium_nugget.json rename to src/main/generated_resources/data/allomancy/recipe/chromium_nugget.json diff --git a/src/generated/resources/data/allomancy/recipe/chromium_pattern.json b/src/main/generated_resources/data/allomancy/recipe/chromium_pattern.json similarity index 100% rename from src/generated/resources/data/allomancy/recipe/chromium_pattern.json rename to src/main/generated_resources/data/allomancy/recipe/chromium_pattern.json diff --git a/src/generated/resources/data/allomancy/recipe/coin_bag.json b/src/main/generated_resources/data/allomancy/recipe/coin_bag.json similarity index 100% rename from src/generated/resources/data/allomancy/recipe/coin_bag.json rename to src/main/generated_resources/data/allomancy/recipe/coin_bag.json diff --git a/src/generated/resources/data/allomancy/recipe/copper_flakes.json b/src/main/generated_resources/data/allomancy/recipe/copper_flakes.json similarity index 100% rename from src/generated/resources/data/allomancy/recipe/copper_flakes.json rename to src/main/generated_resources/data/allomancy/recipe/copper_flakes.json diff --git a/src/generated/resources/data/allomancy/recipe/copper_pattern.json b/src/main/generated_resources/data/allomancy/recipe/copper_pattern.json similarity index 100% rename from src/generated/resources/data/allomancy/recipe/copper_pattern.json rename to src/main/generated_resources/data/allomancy/recipe/copper_pattern.json diff --git a/src/generated/resources/data/allomancy/recipe/duralumin_block.json b/src/main/generated_resources/data/allomancy/recipe/duralumin_block.json similarity index 100% rename from src/generated/resources/data/allomancy/recipe/duralumin_block.json rename to src/main/generated_resources/data/allomancy/recipe/duralumin_block.json diff --git a/src/generated/resources/data/allomancy/recipe/duralumin_flakes.json b/src/main/generated_resources/data/allomancy/recipe/duralumin_flakes.json similarity index 100% rename from src/generated/resources/data/allomancy/recipe/duralumin_flakes.json rename to src/main/generated_resources/data/allomancy/recipe/duralumin_flakes.json diff --git a/src/generated/resources/data/allomancy/recipe/duralumin_flakes_from_mixing.json b/src/main/generated_resources/data/allomancy/recipe/duralumin_flakes_from_mixing.json similarity index 100% rename from src/generated/resources/data/allomancy/recipe/duralumin_flakes_from_mixing.json rename to src/main/generated_resources/data/allomancy/recipe/duralumin_flakes_from_mixing.json diff --git a/src/generated/resources/data/allomancy/recipe/duralumin_ingot_from_alloying.json b/src/main/generated_resources/data/allomancy/recipe/duralumin_ingot_from_alloying.json similarity index 100% rename from src/generated/resources/data/allomancy/recipe/duralumin_ingot_from_alloying.json rename to src/main/generated_resources/data/allomancy/recipe/duralumin_ingot_from_alloying.json diff --git a/src/generated/resources/data/allomancy/recipe/duralumin_ingot_from_block.json b/src/main/generated_resources/data/allomancy/recipe/duralumin_ingot_from_block.json similarity index 100% rename from src/generated/resources/data/allomancy/recipe/duralumin_ingot_from_block.json rename to src/main/generated_resources/data/allomancy/recipe/duralumin_ingot_from_block.json diff --git a/src/generated/resources/data/allomancy/recipe/duralumin_ingot_from_nuggets.json b/src/main/generated_resources/data/allomancy/recipe/duralumin_ingot_from_nuggets.json similarity index 100% rename from src/generated/resources/data/allomancy/recipe/duralumin_ingot_from_nuggets.json rename to src/main/generated_resources/data/allomancy/recipe/duralumin_ingot_from_nuggets.json diff --git a/src/generated/resources/data/allomancy/recipe/duralumin_nugget.json b/src/main/generated_resources/data/allomancy/recipe/duralumin_nugget.json similarity index 100% rename from src/generated/resources/data/allomancy/recipe/duralumin_nugget.json rename to src/main/generated_resources/data/allomancy/recipe/duralumin_nugget.json diff --git a/src/generated/resources/data/allomancy/recipe/duralumin_pattern.json b/src/main/generated_resources/data/allomancy/recipe/duralumin_pattern.json similarity index 100% rename from src/generated/resources/data/allomancy/recipe/duralumin_pattern.json rename to src/main/generated_resources/data/allomancy/recipe/duralumin_pattern.json diff --git a/src/generated/resources/data/allomancy/recipe/electrum_block.json b/src/main/generated_resources/data/allomancy/recipe/electrum_block.json similarity index 100% rename from src/generated/resources/data/allomancy/recipe/electrum_block.json rename to src/main/generated_resources/data/allomancy/recipe/electrum_block.json diff --git a/src/generated/resources/data/allomancy/recipe/electrum_flakes.json b/src/main/generated_resources/data/allomancy/recipe/electrum_flakes.json similarity index 100% rename from src/generated/resources/data/allomancy/recipe/electrum_flakes.json rename to src/main/generated_resources/data/allomancy/recipe/electrum_flakes.json diff --git a/src/generated/resources/data/allomancy/recipe/electrum_flakes_from_mixing.json b/src/main/generated_resources/data/allomancy/recipe/electrum_flakes_from_mixing.json similarity index 100% rename from src/generated/resources/data/allomancy/recipe/electrum_flakes_from_mixing.json rename to src/main/generated_resources/data/allomancy/recipe/electrum_flakes_from_mixing.json diff --git a/src/generated/resources/data/allomancy/recipe/electrum_ingot_from_alloying.json b/src/main/generated_resources/data/allomancy/recipe/electrum_ingot_from_alloying.json similarity index 100% rename from src/generated/resources/data/allomancy/recipe/electrum_ingot_from_alloying.json rename to src/main/generated_resources/data/allomancy/recipe/electrum_ingot_from_alloying.json diff --git a/src/generated/resources/data/allomancy/recipe/electrum_ingot_from_block.json b/src/main/generated_resources/data/allomancy/recipe/electrum_ingot_from_block.json similarity index 100% rename from src/generated/resources/data/allomancy/recipe/electrum_ingot_from_block.json rename to src/main/generated_resources/data/allomancy/recipe/electrum_ingot_from_block.json diff --git a/src/generated/resources/data/allomancy/recipe/electrum_ingot_from_nuggets.json b/src/main/generated_resources/data/allomancy/recipe/electrum_ingot_from_nuggets.json similarity index 100% rename from src/generated/resources/data/allomancy/recipe/electrum_ingot_from_nuggets.json rename to src/main/generated_resources/data/allomancy/recipe/electrum_ingot_from_nuggets.json diff --git a/src/generated/resources/data/allomancy/recipe/electrum_nugget.json b/src/main/generated_resources/data/allomancy/recipe/electrum_nugget.json similarity index 100% rename from src/generated/resources/data/allomancy/recipe/electrum_nugget.json rename to src/main/generated_resources/data/allomancy/recipe/electrum_nugget.json diff --git a/src/generated/resources/data/allomancy/recipe/electrum_pattern.json b/src/main/generated_resources/data/allomancy/recipe/electrum_pattern.json similarity index 100% rename from src/generated/resources/data/allomancy/recipe/electrum_pattern.json rename to src/main/generated_resources/data/allomancy/recipe/electrum_pattern.json diff --git a/src/generated/resources/data/allomancy/recipe/gold_flakes.json b/src/main/generated_resources/data/allomancy/recipe/gold_flakes.json similarity index 100% rename from src/generated/resources/data/allomancy/recipe/gold_flakes.json rename to src/main/generated_resources/data/allomancy/recipe/gold_flakes.json diff --git a/src/generated/resources/data/allomancy/recipe/gold_pattern.json b/src/main/generated_resources/data/allomancy/recipe/gold_pattern.json similarity index 100% rename from src/generated/resources/data/allomancy/recipe/gold_pattern.json rename to src/main/generated_resources/data/allomancy/recipe/gold_pattern.json diff --git a/src/generated/resources/data/allomancy/recipe/inverted_from_iron_button.json b/src/main/generated_resources/data/allomancy/recipe/inverted_from_iron_button.json similarity index 100% rename from src/generated/resources/data/allomancy/recipe/inverted_from_iron_button.json rename to src/main/generated_resources/data/allomancy/recipe/inverted_from_iron_button.json diff --git a/src/generated/resources/data/allomancy/recipe/iron_button.json b/src/main/generated_resources/data/allomancy/recipe/iron_button.json similarity index 100% rename from src/generated/resources/data/allomancy/recipe/iron_button.json rename to src/main/generated_resources/data/allomancy/recipe/iron_button.json diff --git a/src/generated/resources/data/allomancy/recipe/iron_button_from_inverted.json b/src/main/generated_resources/data/allomancy/recipe/iron_button_from_inverted.json similarity index 100% rename from src/generated/resources/data/allomancy/recipe/iron_button_from_inverted.json rename to src/main/generated_resources/data/allomancy/recipe/iron_button_from_inverted.json diff --git a/src/generated/resources/data/allomancy/recipe/iron_flakes.json b/src/main/generated_resources/data/allomancy/recipe/iron_flakes.json similarity index 100% rename from src/generated/resources/data/allomancy/recipe/iron_flakes.json rename to src/main/generated_resources/data/allomancy/recipe/iron_flakes.json diff --git a/src/generated/resources/data/allomancy/recipe/iron_lever.json b/src/main/generated_resources/data/allomancy/recipe/iron_lever.json similarity index 100% rename from src/generated/resources/data/allomancy/recipe/iron_lever.json rename to src/main/generated_resources/data/allomancy/recipe/iron_lever.json diff --git a/src/generated/resources/data/allomancy/recipe/iron_pattern.json b/src/main/generated_resources/data/allomancy/recipe/iron_pattern.json similarity index 100% rename from src/generated/resources/data/allomancy/recipe/iron_pattern.json rename to src/main/generated_resources/data/allomancy/recipe/iron_pattern.json diff --git a/src/generated/resources/data/allomancy/recipe/koloss_blade.json b/src/main/generated_resources/data/allomancy/recipe/koloss_blade.json similarity index 100% rename from src/generated/resources/data/allomancy/recipe/koloss_blade.json rename to src/main/generated_resources/data/allomancy/recipe/koloss_blade.json diff --git a/src/generated/resources/data/allomancy/recipe/lead_block.json b/src/main/generated_resources/data/allomancy/recipe/lead_block.json similarity index 100% rename from src/generated/resources/data/allomancy/recipe/lead_block.json rename to src/main/generated_resources/data/allomancy/recipe/lead_block.json diff --git a/src/generated/resources/data/allomancy/recipe/lead_flakes.json b/src/main/generated_resources/data/allomancy/recipe/lead_flakes.json similarity index 100% rename from src/generated/resources/data/allomancy/recipe/lead_flakes.json rename to src/main/generated_resources/data/allomancy/recipe/lead_flakes.json diff --git a/src/generated/resources/data/allomancy/recipe/lead_ingot_from_block.json b/src/main/generated_resources/data/allomancy/recipe/lead_ingot_from_block.json similarity index 100% rename from src/generated/resources/data/allomancy/recipe/lead_ingot_from_block.json rename to src/main/generated_resources/data/allomancy/recipe/lead_ingot_from_block.json diff --git a/src/generated/resources/data/allomancy/recipe/lead_ingot_from_nuggets.json b/src/main/generated_resources/data/allomancy/recipe/lead_ingot_from_nuggets.json similarity index 100% rename from src/generated/resources/data/allomancy/recipe/lead_ingot_from_nuggets.json rename to src/main/generated_resources/data/allomancy/recipe/lead_ingot_from_nuggets.json diff --git a/src/generated/resources/data/allomancy/recipe/lead_nugget.json b/src/main/generated_resources/data/allomancy/recipe/lead_nugget.json similarity index 100% rename from src/generated/resources/data/allomancy/recipe/lead_nugget.json rename to src/main/generated_resources/data/allomancy/recipe/lead_nugget.json diff --git a/src/generated/resources/data/allomancy/recipe/lerasium_nugget.json b/src/main/generated_resources/data/allomancy/recipe/lerasium_nugget.json similarity index 100% rename from src/generated/resources/data/allomancy/recipe/lerasium_nugget.json rename to src/main/generated_resources/data/allomancy/recipe/lerasium_nugget.json diff --git a/src/generated/resources/data/allomancy/recipe/mistcloak.json b/src/main/generated_resources/data/allomancy/recipe/mistcloak.json similarity index 100% rename from src/generated/resources/data/allomancy/recipe/mistcloak.json rename to src/main/generated_resources/data/allomancy/recipe/mistcloak.json diff --git a/src/generated/resources/data/allomancy/recipe/nicrosil_block.json b/src/main/generated_resources/data/allomancy/recipe/nicrosil_block.json similarity index 100% rename from src/generated/resources/data/allomancy/recipe/nicrosil_block.json rename to src/main/generated_resources/data/allomancy/recipe/nicrosil_block.json diff --git a/src/generated/resources/data/allomancy/recipe/nicrosil_flakes.json b/src/main/generated_resources/data/allomancy/recipe/nicrosil_flakes.json similarity index 100% rename from src/generated/resources/data/allomancy/recipe/nicrosil_flakes.json rename to src/main/generated_resources/data/allomancy/recipe/nicrosil_flakes.json diff --git a/src/generated/resources/data/allomancy/recipe/nicrosil_flakes_from_mixing.json b/src/main/generated_resources/data/allomancy/recipe/nicrosil_flakes_from_mixing.json similarity index 100% rename from src/generated/resources/data/allomancy/recipe/nicrosil_flakes_from_mixing.json rename to src/main/generated_resources/data/allomancy/recipe/nicrosil_flakes_from_mixing.json diff --git a/src/generated/resources/data/allomancy/recipe/nicrosil_ingot_from_alloying.json b/src/main/generated_resources/data/allomancy/recipe/nicrosil_ingot_from_alloying.json similarity index 100% rename from src/generated/resources/data/allomancy/recipe/nicrosil_ingot_from_alloying.json rename to src/main/generated_resources/data/allomancy/recipe/nicrosil_ingot_from_alloying.json diff --git a/src/generated/resources/data/allomancy/recipe/nicrosil_ingot_from_block.json b/src/main/generated_resources/data/allomancy/recipe/nicrosil_ingot_from_block.json similarity index 100% rename from src/generated/resources/data/allomancy/recipe/nicrosil_ingot_from_block.json rename to src/main/generated_resources/data/allomancy/recipe/nicrosil_ingot_from_block.json diff --git a/src/generated/resources/data/allomancy/recipe/nicrosil_ingot_from_nuggets.json b/src/main/generated_resources/data/allomancy/recipe/nicrosil_ingot_from_nuggets.json similarity index 100% rename from src/generated/resources/data/allomancy/recipe/nicrosil_ingot_from_nuggets.json rename to src/main/generated_resources/data/allomancy/recipe/nicrosil_ingot_from_nuggets.json diff --git a/src/generated/resources/data/allomancy/recipe/nicrosil_nugget.json b/src/main/generated_resources/data/allomancy/recipe/nicrosil_nugget.json similarity index 100% rename from src/generated/resources/data/allomancy/recipe/nicrosil_nugget.json rename to src/main/generated_resources/data/allomancy/recipe/nicrosil_nugget.json diff --git a/src/generated/resources/data/allomancy/recipe/nicrosil_pattern.json b/src/main/generated_resources/data/allomancy/recipe/nicrosil_pattern.json similarity index 100% rename from src/generated/resources/data/allomancy/recipe/nicrosil_pattern.json rename to src/main/generated_resources/data/allomancy/recipe/nicrosil_pattern.json diff --git a/src/generated/resources/data/allomancy/recipe/obsidian_dagger.json b/src/main/generated_resources/data/allomancy/recipe/obsidian_dagger.json similarity index 100% rename from src/generated/resources/data/allomancy/recipe/obsidian_dagger.json rename to src/main/generated_resources/data/allomancy/recipe/obsidian_dagger.json diff --git a/src/generated/resources/data/allomancy/recipe/pewter_block.json b/src/main/generated_resources/data/allomancy/recipe/pewter_block.json similarity index 100% rename from src/generated/resources/data/allomancy/recipe/pewter_block.json rename to src/main/generated_resources/data/allomancy/recipe/pewter_block.json diff --git a/src/generated/resources/data/allomancy/recipe/pewter_flakes.json b/src/main/generated_resources/data/allomancy/recipe/pewter_flakes.json similarity index 100% rename from src/generated/resources/data/allomancy/recipe/pewter_flakes.json rename to src/main/generated_resources/data/allomancy/recipe/pewter_flakes.json diff --git a/src/generated/resources/data/allomancy/recipe/pewter_flakes_from_mixing.json b/src/main/generated_resources/data/allomancy/recipe/pewter_flakes_from_mixing.json similarity index 100% rename from src/generated/resources/data/allomancy/recipe/pewter_flakes_from_mixing.json rename to src/main/generated_resources/data/allomancy/recipe/pewter_flakes_from_mixing.json diff --git a/src/generated/resources/data/allomancy/recipe/pewter_ingot_from_alloying.json b/src/main/generated_resources/data/allomancy/recipe/pewter_ingot_from_alloying.json similarity index 100% rename from src/generated/resources/data/allomancy/recipe/pewter_ingot_from_alloying.json rename to src/main/generated_resources/data/allomancy/recipe/pewter_ingot_from_alloying.json diff --git a/src/generated/resources/data/allomancy/recipe/pewter_ingot_from_block.json b/src/main/generated_resources/data/allomancy/recipe/pewter_ingot_from_block.json similarity index 100% rename from src/generated/resources/data/allomancy/recipe/pewter_ingot_from_block.json rename to src/main/generated_resources/data/allomancy/recipe/pewter_ingot_from_block.json diff --git a/src/generated/resources/data/allomancy/recipe/pewter_ingot_from_nuggets.json b/src/main/generated_resources/data/allomancy/recipe/pewter_ingot_from_nuggets.json similarity index 100% rename from src/generated/resources/data/allomancy/recipe/pewter_ingot_from_nuggets.json rename to src/main/generated_resources/data/allomancy/recipe/pewter_ingot_from_nuggets.json diff --git a/src/generated/resources/data/allomancy/recipe/pewter_nugget.json b/src/main/generated_resources/data/allomancy/recipe/pewter_nugget.json similarity index 100% rename from src/generated/resources/data/allomancy/recipe/pewter_nugget.json rename to src/main/generated_resources/data/allomancy/recipe/pewter_nugget.json diff --git a/src/generated/resources/data/allomancy/recipe/pewter_pattern.json b/src/main/generated_resources/data/allomancy/recipe/pewter_pattern.json similarity index 100% rename from src/generated/resources/data/allomancy/recipe/pewter_pattern.json rename to src/main/generated_resources/data/allomancy/recipe/pewter_pattern.json diff --git a/src/generated/resources/data/allomancy/recipe/silver_block.json b/src/main/generated_resources/data/allomancy/recipe/silver_block.json similarity index 100% rename from src/generated/resources/data/allomancy/recipe/silver_block.json rename to src/main/generated_resources/data/allomancy/recipe/silver_block.json diff --git a/src/generated/resources/data/allomancy/recipe/silver_flakes.json b/src/main/generated_resources/data/allomancy/recipe/silver_flakes.json similarity index 100% rename from src/generated/resources/data/allomancy/recipe/silver_flakes.json rename to src/main/generated_resources/data/allomancy/recipe/silver_flakes.json diff --git a/src/generated/resources/data/allomancy/recipe/silver_ingot_from_block.json b/src/main/generated_resources/data/allomancy/recipe/silver_ingot_from_block.json similarity index 100% rename from src/generated/resources/data/allomancy/recipe/silver_ingot_from_block.json rename to src/main/generated_resources/data/allomancy/recipe/silver_ingot_from_block.json diff --git a/src/generated/resources/data/allomancy/recipe/silver_ingot_from_nuggets.json b/src/main/generated_resources/data/allomancy/recipe/silver_ingot_from_nuggets.json similarity index 100% rename from src/generated/resources/data/allomancy/recipe/silver_ingot_from_nuggets.json rename to src/main/generated_resources/data/allomancy/recipe/silver_ingot_from_nuggets.json diff --git a/src/generated/resources/data/allomancy/recipe/silver_nugget.json b/src/main/generated_resources/data/allomancy/recipe/silver_nugget.json similarity index 100% rename from src/generated/resources/data/allomancy/recipe/silver_nugget.json rename to src/main/generated_resources/data/allomancy/recipe/silver_nugget.json diff --git a/src/generated/resources/data/allomancy/recipe/steel_block.json b/src/main/generated_resources/data/allomancy/recipe/steel_block.json similarity index 100% rename from src/generated/resources/data/allomancy/recipe/steel_block.json rename to src/main/generated_resources/data/allomancy/recipe/steel_block.json diff --git a/src/generated/resources/data/allomancy/recipe/steel_flakes.json b/src/main/generated_resources/data/allomancy/recipe/steel_flakes.json similarity index 100% rename from src/generated/resources/data/allomancy/recipe/steel_flakes.json rename to src/main/generated_resources/data/allomancy/recipe/steel_flakes.json diff --git a/src/generated/resources/data/allomancy/recipe/steel_flakes_from_mixing.json b/src/main/generated_resources/data/allomancy/recipe/steel_flakes_from_mixing.json similarity index 100% rename from src/generated/resources/data/allomancy/recipe/steel_flakes_from_mixing.json rename to src/main/generated_resources/data/allomancy/recipe/steel_flakes_from_mixing.json diff --git a/src/generated/resources/data/allomancy/recipe/steel_ingot_from_alloying.json b/src/main/generated_resources/data/allomancy/recipe/steel_ingot_from_alloying.json similarity index 100% rename from src/generated/resources/data/allomancy/recipe/steel_ingot_from_alloying.json rename to src/main/generated_resources/data/allomancy/recipe/steel_ingot_from_alloying.json diff --git a/src/generated/resources/data/allomancy/recipe/steel_ingot_from_block.json b/src/main/generated_resources/data/allomancy/recipe/steel_ingot_from_block.json similarity index 100% rename from src/generated/resources/data/allomancy/recipe/steel_ingot_from_block.json rename to src/main/generated_resources/data/allomancy/recipe/steel_ingot_from_block.json diff --git a/src/generated/resources/data/allomancy/recipe/steel_ingot_from_nuggets.json b/src/main/generated_resources/data/allomancy/recipe/steel_ingot_from_nuggets.json similarity index 100% rename from src/generated/resources/data/allomancy/recipe/steel_ingot_from_nuggets.json rename to src/main/generated_resources/data/allomancy/recipe/steel_ingot_from_nuggets.json diff --git a/src/generated/resources/data/allomancy/recipe/steel_nugget.json b/src/main/generated_resources/data/allomancy/recipe/steel_nugget.json similarity index 100% rename from src/generated/resources/data/allomancy/recipe/steel_nugget.json rename to src/main/generated_resources/data/allomancy/recipe/steel_nugget.json diff --git a/src/generated/resources/data/allomancy/recipe/steel_pattern.json b/src/main/generated_resources/data/allomancy/recipe/steel_pattern.json similarity index 100% rename from src/generated/resources/data/allomancy/recipe/steel_pattern.json rename to src/main/generated_resources/data/allomancy/recipe/steel_pattern.json diff --git a/src/generated/resources/data/allomancy/recipe/tin_block.json b/src/main/generated_resources/data/allomancy/recipe/tin_block.json similarity index 100% rename from src/generated/resources/data/allomancy/recipe/tin_block.json rename to src/main/generated_resources/data/allomancy/recipe/tin_block.json diff --git a/src/generated/resources/data/allomancy/recipe/tin_flakes.json b/src/main/generated_resources/data/allomancy/recipe/tin_flakes.json similarity index 100% rename from src/generated/resources/data/allomancy/recipe/tin_flakes.json rename to src/main/generated_resources/data/allomancy/recipe/tin_flakes.json diff --git a/src/generated/resources/data/allomancy/recipe/tin_ingot_from_block.json b/src/main/generated_resources/data/allomancy/recipe/tin_ingot_from_block.json similarity index 100% rename from src/generated/resources/data/allomancy/recipe/tin_ingot_from_block.json rename to src/main/generated_resources/data/allomancy/recipe/tin_ingot_from_block.json diff --git a/src/generated/resources/data/allomancy/recipe/tin_ingot_from_nuggets.json b/src/main/generated_resources/data/allomancy/recipe/tin_ingot_from_nuggets.json similarity index 100% rename from src/generated/resources/data/allomancy/recipe/tin_ingot_from_nuggets.json rename to src/main/generated_resources/data/allomancy/recipe/tin_ingot_from_nuggets.json diff --git a/src/generated/resources/data/allomancy/recipe/tin_nugget.json b/src/main/generated_resources/data/allomancy/recipe/tin_nugget.json similarity index 100% rename from src/generated/resources/data/allomancy/recipe/tin_nugget.json rename to src/main/generated_resources/data/allomancy/recipe/tin_nugget.json diff --git a/src/generated/resources/data/allomancy/recipe/tin_pattern.json b/src/main/generated_resources/data/allomancy/recipe/tin_pattern.json similarity index 100% rename from src/generated/resources/data/allomancy/recipe/tin_pattern.json rename to src/main/generated_resources/data/allomancy/recipe/tin_pattern.json diff --git a/src/generated/resources/data/allomancy/recipe/vial.json b/src/main/generated_resources/data/allomancy/recipe/vial.json similarity index 100% rename from src/generated/resources/data/allomancy/recipe/vial.json rename to src/main/generated_resources/data/allomancy/recipe/vial.json diff --git a/src/generated/resources/data/allomancy/recipe/vial_filling_recipe.json b/src/main/generated_resources/data/allomancy/recipe/vial_filling_recipe.json similarity index 100% rename from src/generated/resources/data/allomancy/recipe/vial_filling_recipe.json rename to src/main/generated_resources/data/allomancy/recipe/vial_filling_recipe.json diff --git a/src/generated/resources/data/allomancy/recipe/zinc_block.json b/src/main/generated_resources/data/allomancy/recipe/zinc_block.json similarity index 100% rename from src/generated/resources/data/allomancy/recipe/zinc_block.json rename to src/main/generated_resources/data/allomancy/recipe/zinc_block.json diff --git a/src/generated/resources/data/allomancy/recipe/zinc_flakes.json b/src/main/generated_resources/data/allomancy/recipe/zinc_flakes.json similarity index 100% rename from src/generated/resources/data/allomancy/recipe/zinc_flakes.json rename to src/main/generated_resources/data/allomancy/recipe/zinc_flakes.json diff --git a/src/generated/resources/data/allomancy/recipe/zinc_ingot_from_block.json b/src/main/generated_resources/data/allomancy/recipe/zinc_ingot_from_block.json similarity index 100% rename from src/generated/resources/data/allomancy/recipe/zinc_ingot_from_block.json rename to src/main/generated_resources/data/allomancy/recipe/zinc_ingot_from_block.json diff --git a/src/generated/resources/data/allomancy/recipe/zinc_ingot_from_nuggets.json b/src/main/generated_resources/data/allomancy/recipe/zinc_ingot_from_nuggets.json similarity index 100% rename from src/generated/resources/data/allomancy/recipe/zinc_ingot_from_nuggets.json rename to src/main/generated_resources/data/allomancy/recipe/zinc_ingot_from_nuggets.json diff --git a/src/generated/resources/data/allomancy/recipe/zinc_nugget.json b/src/main/generated_resources/data/allomancy/recipe/zinc_nugget.json similarity index 100% rename from src/generated/resources/data/allomancy/recipe/zinc_nugget.json rename to src/main/generated_resources/data/allomancy/recipe/zinc_nugget.json diff --git a/src/generated/resources/data/allomancy/recipe/zinc_pattern.json b/src/main/generated_resources/data/allomancy/recipe/zinc_pattern.json similarity index 100% rename from src/generated/resources/data/allomancy/recipe/zinc_pattern.json rename to src/main/generated_resources/data/allomancy/recipe/zinc_pattern.json diff --git a/src/generated/resources/data/allomancy/tags/banner_pattern/aluminum.json b/src/main/generated_resources/data/allomancy/tags/banner_pattern/aluminum.json similarity index 100% rename from src/generated/resources/data/allomancy/tags/banner_pattern/aluminum.json rename to src/main/generated_resources/data/allomancy/tags/banner_pattern/aluminum.json diff --git a/src/generated/resources/data/allomancy/tags/banner_pattern/bendalloy.json b/src/main/generated_resources/data/allomancy/tags/banner_pattern/bendalloy.json similarity index 100% rename from src/generated/resources/data/allomancy/tags/banner_pattern/bendalloy.json rename to src/main/generated_resources/data/allomancy/tags/banner_pattern/bendalloy.json diff --git a/src/generated/resources/data/allomancy/tags/banner_pattern/brass.json b/src/main/generated_resources/data/allomancy/tags/banner_pattern/brass.json similarity index 100% rename from src/generated/resources/data/allomancy/tags/banner_pattern/brass.json rename to src/main/generated_resources/data/allomancy/tags/banner_pattern/brass.json diff --git a/src/generated/resources/data/allomancy/tags/banner_pattern/bronze.json b/src/main/generated_resources/data/allomancy/tags/banner_pattern/bronze.json similarity index 100% rename from src/generated/resources/data/allomancy/tags/banner_pattern/bronze.json rename to src/main/generated_resources/data/allomancy/tags/banner_pattern/bronze.json diff --git a/src/generated/resources/data/allomancy/tags/banner_pattern/cadmium.json b/src/main/generated_resources/data/allomancy/tags/banner_pattern/cadmium.json similarity index 100% rename from src/generated/resources/data/allomancy/tags/banner_pattern/cadmium.json rename to src/main/generated_resources/data/allomancy/tags/banner_pattern/cadmium.json diff --git a/src/generated/resources/data/allomancy/tags/banner_pattern/chromium.json b/src/main/generated_resources/data/allomancy/tags/banner_pattern/chromium.json similarity index 100% rename from src/generated/resources/data/allomancy/tags/banner_pattern/chromium.json rename to src/main/generated_resources/data/allomancy/tags/banner_pattern/chromium.json diff --git a/src/generated/resources/data/allomancy/tags/banner_pattern/copper.json b/src/main/generated_resources/data/allomancy/tags/banner_pattern/copper.json similarity index 100% rename from src/generated/resources/data/allomancy/tags/banner_pattern/copper.json rename to src/main/generated_resources/data/allomancy/tags/banner_pattern/copper.json diff --git a/src/generated/resources/data/allomancy/tags/banner_pattern/duralumin.json b/src/main/generated_resources/data/allomancy/tags/banner_pattern/duralumin.json similarity index 100% rename from src/generated/resources/data/allomancy/tags/banner_pattern/duralumin.json rename to src/main/generated_resources/data/allomancy/tags/banner_pattern/duralumin.json diff --git a/src/generated/resources/data/allomancy/tags/banner_pattern/electrum.json b/src/main/generated_resources/data/allomancy/tags/banner_pattern/electrum.json similarity index 100% rename from src/generated/resources/data/allomancy/tags/banner_pattern/electrum.json rename to src/main/generated_resources/data/allomancy/tags/banner_pattern/electrum.json diff --git a/src/generated/resources/data/allomancy/tags/banner_pattern/gold.json b/src/main/generated_resources/data/allomancy/tags/banner_pattern/gold.json similarity index 100% rename from src/generated/resources/data/allomancy/tags/banner_pattern/gold.json rename to src/main/generated_resources/data/allomancy/tags/banner_pattern/gold.json diff --git a/src/generated/resources/data/allomancy/tags/banner_pattern/iron.json b/src/main/generated_resources/data/allomancy/tags/banner_pattern/iron.json similarity index 100% rename from src/generated/resources/data/allomancy/tags/banner_pattern/iron.json rename to src/main/generated_resources/data/allomancy/tags/banner_pattern/iron.json diff --git a/src/generated/resources/data/allomancy/tags/banner_pattern/nicrosil.json b/src/main/generated_resources/data/allomancy/tags/banner_pattern/nicrosil.json similarity index 100% rename from src/generated/resources/data/allomancy/tags/banner_pattern/nicrosil.json rename to src/main/generated_resources/data/allomancy/tags/banner_pattern/nicrosil.json diff --git a/src/generated/resources/data/allomancy/tags/banner_pattern/pewter.json b/src/main/generated_resources/data/allomancy/tags/banner_pattern/pewter.json similarity index 100% rename from src/generated/resources/data/allomancy/tags/banner_pattern/pewter.json rename to src/main/generated_resources/data/allomancy/tags/banner_pattern/pewter.json diff --git a/src/generated/resources/data/allomancy/tags/banner_pattern/steel.json b/src/main/generated_resources/data/allomancy/tags/banner_pattern/steel.json similarity index 100% rename from src/generated/resources/data/allomancy/tags/banner_pattern/steel.json rename to src/main/generated_resources/data/allomancy/tags/banner_pattern/steel.json diff --git a/src/generated/resources/data/allomancy/tags/banner_pattern/tin.json b/src/main/generated_resources/data/allomancy/tags/banner_pattern/tin.json similarity index 100% rename from src/generated/resources/data/allomancy/tags/banner_pattern/tin.json rename to src/main/generated_resources/data/allomancy/tags/banner_pattern/tin.json diff --git a/src/generated/resources/data/allomancy/tags/banner_pattern/zinc.json b/src/main/generated_resources/data/allomancy/tags/banner_pattern/zinc.json similarity index 100% rename from src/generated/resources/data/allomancy/tags/banner_pattern/zinc.json rename to src/main/generated_resources/data/allomancy/tags/banner_pattern/zinc.json diff --git a/src/generated/resources/data/allomancy/tags/damage_type/is_coin_hit.json b/src/main/generated_resources/data/allomancy/tags/damage_type/is_coin_hit.json similarity index 100% rename from src/generated/resources/data/allomancy/tags/damage_type/is_coin_hit.json rename to src/main/generated_resources/data/allomancy/tags/damage_type/is_coin_hit.json diff --git a/src/main/generated_resources/data/allomancy/tags/item/metal_flakes.json b/src/main/generated_resources/data/allomancy/tags/item/metal_flakes.json new file mode 100644 index 00000000..53e95b27 --- /dev/null +++ b/src/main/generated_resources/data/allomancy/tags/item/metal_flakes.json @@ -0,0 +1,22 @@ +{ + "values": [ + "allomancy:iron_flakes", + "allomancy:steel_flakes", + "allomancy:tin_flakes", + "allomancy:pewter_flakes", + "allomancy:zinc_flakes", + "allomancy:brass_flakes", + "allomancy:copper_flakes", + "allomancy:bronze_flakes", + "allomancy:aluminum_flakes", + "allomancy:duralumin_flakes", + "allomancy:chromium_flakes", + "allomancy:nicrosil_flakes", + "allomancy:gold_flakes", + "allomancy:electrum_flakes", + "allomancy:cadmium_flakes", + "allomancy:bendalloy_flakes", + "allomancy:lead_flakes", + "allomancy:silver_flakes" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/allomancy/tags/item/obsidian_tool_materials.json b/src/main/generated_resources/data/allomancy/tags/item/obsidian_tool_materials.json similarity index 100% rename from src/generated/resources/data/allomancy/tags/item/obsidian_tool_materials.json rename to src/main/generated_resources/data/allomancy/tags/item/obsidian_tool_materials.json diff --git a/src/generated/resources/data/allomancy/tags/item/repairs_aluminum_armor.json b/src/main/generated_resources/data/allomancy/tags/item/repairs_aluminum_armor.json similarity index 100% rename from src/generated/resources/data/allomancy/tags/item/repairs_aluminum_armor.json rename to src/main/generated_resources/data/allomancy/tags/item/repairs_aluminum_armor.json diff --git a/src/generated/resources/data/allomancy/tags/item/repairs_wool_armor.json b/src/main/generated_resources/data/allomancy/tags/item/repairs_wool_armor.json similarity index 100% rename from src/generated/resources/data/allomancy/tags/item/repairs_wool_armor.json rename to src/main/generated_resources/data/allomancy/tags/item/repairs_wool_armor.json diff --git a/src/generated/resources/data/allomancy/worldgen/configured_feature/aluminum_ore_feature.json b/src/main/generated_resources/data/allomancy/worldgen/configured_feature/aluminum_ore_feature.json similarity index 100% rename from src/generated/resources/data/allomancy/worldgen/configured_feature/aluminum_ore_feature.json rename to src/main/generated_resources/data/allomancy/worldgen/configured_feature/aluminum_ore_feature.json diff --git a/src/generated/resources/data/allomancy/worldgen/configured_feature/cadmium_ore_feature.json b/src/main/generated_resources/data/allomancy/worldgen/configured_feature/cadmium_ore_feature.json similarity index 100% rename from src/generated/resources/data/allomancy/worldgen/configured_feature/cadmium_ore_feature.json rename to src/main/generated_resources/data/allomancy/worldgen/configured_feature/cadmium_ore_feature.json diff --git a/src/generated/resources/data/allomancy/worldgen/configured_feature/chromium_ore_feature.json b/src/main/generated_resources/data/allomancy/worldgen/configured_feature/chromium_ore_feature.json similarity index 100% rename from src/generated/resources/data/allomancy/worldgen/configured_feature/chromium_ore_feature.json rename to src/main/generated_resources/data/allomancy/worldgen/configured_feature/chromium_ore_feature.json diff --git a/src/generated/resources/data/allomancy/worldgen/configured_feature/lead_ore_feature.json b/src/main/generated_resources/data/allomancy/worldgen/configured_feature/lead_ore_feature.json similarity index 100% rename from src/generated/resources/data/allomancy/worldgen/configured_feature/lead_ore_feature.json rename to src/main/generated_resources/data/allomancy/worldgen/configured_feature/lead_ore_feature.json diff --git a/src/generated/resources/data/allomancy/worldgen/configured_feature/silver_ore_feature.json b/src/main/generated_resources/data/allomancy/worldgen/configured_feature/silver_ore_feature.json similarity index 100% rename from src/generated/resources/data/allomancy/worldgen/configured_feature/silver_ore_feature.json rename to src/main/generated_resources/data/allomancy/worldgen/configured_feature/silver_ore_feature.json diff --git a/src/generated/resources/data/allomancy/worldgen/configured_feature/tin_ore_feature.json b/src/main/generated_resources/data/allomancy/worldgen/configured_feature/tin_ore_feature.json similarity index 100% rename from src/generated/resources/data/allomancy/worldgen/configured_feature/tin_ore_feature.json rename to src/main/generated_resources/data/allomancy/worldgen/configured_feature/tin_ore_feature.json diff --git a/src/generated/resources/data/allomancy/worldgen/configured_feature/zinc_ore_feature.json b/src/main/generated_resources/data/allomancy/worldgen/configured_feature/zinc_ore_feature.json similarity index 100% rename from src/generated/resources/data/allomancy/worldgen/configured_feature/zinc_ore_feature.json rename to src/main/generated_resources/data/allomancy/worldgen/configured_feature/zinc_ore_feature.json diff --git a/src/generated/resources/data/allomancy/worldgen/placed_feature/aluminum_ore.json b/src/main/generated_resources/data/allomancy/worldgen/placed_feature/aluminum_ore.json similarity index 100% rename from src/generated/resources/data/allomancy/worldgen/placed_feature/aluminum_ore.json rename to src/main/generated_resources/data/allomancy/worldgen/placed_feature/aluminum_ore.json diff --git a/src/generated/resources/data/allomancy/worldgen/placed_feature/cadmium_ore.json b/src/main/generated_resources/data/allomancy/worldgen/placed_feature/cadmium_ore.json similarity index 100% rename from src/generated/resources/data/allomancy/worldgen/placed_feature/cadmium_ore.json rename to src/main/generated_resources/data/allomancy/worldgen/placed_feature/cadmium_ore.json diff --git a/src/generated/resources/data/allomancy/worldgen/placed_feature/chromium_ore.json b/src/main/generated_resources/data/allomancy/worldgen/placed_feature/chromium_ore.json similarity index 100% rename from src/generated/resources/data/allomancy/worldgen/placed_feature/chromium_ore.json rename to src/main/generated_resources/data/allomancy/worldgen/placed_feature/chromium_ore.json diff --git a/src/generated/resources/data/allomancy/worldgen/placed_feature/lead_ore.json b/src/main/generated_resources/data/allomancy/worldgen/placed_feature/lead_ore.json similarity index 100% rename from src/generated/resources/data/allomancy/worldgen/placed_feature/lead_ore.json rename to src/main/generated_resources/data/allomancy/worldgen/placed_feature/lead_ore.json diff --git a/src/generated/resources/data/allomancy/worldgen/placed_feature/silver_ore.json b/src/main/generated_resources/data/allomancy/worldgen/placed_feature/silver_ore.json similarity index 100% rename from src/generated/resources/data/allomancy/worldgen/placed_feature/silver_ore.json rename to src/main/generated_resources/data/allomancy/worldgen/placed_feature/silver_ore.json diff --git a/src/generated/resources/data/allomancy/worldgen/placed_feature/tin_ore.json b/src/main/generated_resources/data/allomancy/worldgen/placed_feature/tin_ore.json similarity index 100% rename from src/generated/resources/data/allomancy/worldgen/placed_feature/tin_ore.json rename to src/main/generated_resources/data/allomancy/worldgen/placed_feature/tin_ore.json diff --git a/src/generated/resources/data/allomancy/worldgen/placed_feature/zinc_ore.json b/src/main/generated_resources/data/allomancy/worldgen/placed_feature/zinc_ore.json similarity index 100% rename from src/generated/resources/data/allomancy/worldgen/placed_feature/zinc_ore.json rename to src/main/generated_resources/data/allomancy/worldgen/placed_feature/zinc_ore.json diff --git a/src/generated/resources/data/c/tags/block/ores.json b/src/main/generated_resources/data/c/tags/block/ores.json similarity index 100% rename from src/generated/resources/data/c/tags/block/ores.json rename to src/main/generated_resources/data/c/tags/block/ores.json diff --git a/src/generated/resources/data/c/tags/block/ores/aluminum.json b/src/main/generated_resources/data/c/tags/block/ores/aluminum.json similarity index 100% rename from src/generated/resources/data/c/tags/block/ores/aluminum.json rename to src/main/generated_resources/data/c/tags/block/ores/aluminum.json diff --git a/src/generated/resources/data/c/tags/block/ores/cadmium.json b/src/main/generated_resources/data/c/tags/block/ores/cadmium.json similarity index 100% rename from src/generated/resources/data/c/tags/block/ores/cadmium.json rename to src/main/generated_resources/data/c/tags/block/ores/cadmium.json diff --git a/src/generated/resources/data/c/tags/block/ores/chromium.json b/src/main/generated_resources/data/c/tags/block/ores/chromium.json similarity index 100% rename from src/generated/resources/data/c/tags/block/ores/chromium.json rename to src/main/generated_resources/data/c/tags/block/ores/chromium.json diff --git a/src/generated/resources/data/c/tags/block/ores/lead.json b/src/main/generated_resources/data/c/tags/block/ores/lead.json similarity index 100% rename from src/generated/resources/data/c/tags/block/ores/lead.json rename to src/main/generated_resources/data/c/tags/block/ores/lead.json diff --git a/src/generated/resources/data/c/tags/block/ores/silver.json b/src/main/generated_resources/data/c/tags/block/ores/silver.json similarity index 100% rename from src/generated/resources/data/c/tags/block/ores/silver.json rename to src/main/generated_resources/data/c/tags/block/ores/silver.json diff --git a/src/generated/resources/data/c/tags/block/ores/tin.json b/src/main/generated_resources/data/c/tags/block/ores/tin.json similarity index 100% rename from src/generated/resources/data/c/tags/block/ores/tin.json rename to src/main/generated_resources/data/c/tags/block/ores/tin.json diff --git a/src/generated/resources/data/c/tags/block/ores/zinc.json b/src/main/generated_resources/data/c/tags/block/ores/zinc.json similarity index 100% rename from src/generated/resources/data/c/tags/block/ores/zinc.json rename to src/main/generated_resources/data/c/tags/block/ores/zinc.json diff --git a/src/generated/resources/data/c/tags/block/ores_in_ground/deepslate.json b/src/main/generated_resources/data/c/tags/block/ores_in_ground/deepslate.json similarity index 100% rename from src/generated/resources/data/c/tags/block/ores_in_ground/deepslate.json rename to src/main/generated_resources/data/c/tags/block/ores_in_ground/deepslate.json diff --git a/src/generated/resources/data/c/tags/block/ores_in_ground/stone.json b/src/main/generated_resources/data/c/tags/block/ores_in_ground/stone.json similarity index 100% rename from src/generated/resources/data/c/tags/block/ores_in_ground/stone.json rename to src/main/generated_resources/data/c/tags/block/ores_in_ground/stone.json diff --git a/src/generated/resources/data/c/tags/block/storage_blocks.json b/src/main/generated_resources/data/c/tags/block/storage_blocks.json similarity index 100% rename from src/generated/resources/data/c/tags/block/storage_blocks.json rename to src/main/generated_resources/data/c/tags/block/storage_blocks.json diff --git a/src/generated/resources/data/c/tags/block/storage_blocks/aluminum.json b/src/main/generated_resources/data/c/tags/block/storage_blocks/aluminum.json similarity index 100% rename from src/generated/resources/data/c/tags/block/storage_blocks/aluminum.json rename to src/main/generated_resources/data/c/tags/block/storage_blocks/aluminum.json diff --git a/src/generated/resources/data/c/tags/block/storage_blocks/bendalloy.json b/src/main/generated_resources/data/c/tags/block/storage_blocks/bendalloy.json similarity index 100% rename from src/generated/resources/data/c/tags/block/storage_blocks/bendalloy.json rename to src/main/generated_resources/data/c/tags/block/storage_blocks/bendalloy.json diff --git a/src/generated/resources/data/c/tags/block/storage_blocks/brass.json b/src/main/generated_resources/data/c/tags/block/storage_blocks/brass.json similarity index 100% rename from src/generated/resources/data/c/tags/block/storage_blocks/brass.json rename to src/main/generated_resources/data/c/tags/block/storage_blocks/brass.json diff --git a/src/generated/resources/data/c/tags/block/storage_blocks/bronze.json b/src/main/generated_resources/data/c/tags/block/storage_blocks/bronze.json similarity index 100% rename from src/generated/resources/data/c/tags/block/storage_blocks/bronze.json rename to src/main/generated_resources/data/c/tags/block/storage_blocks/bronze.json diff --git a/src/generated/resources/data/c/tags/block/storage_blocks/cadmium.json b/src/main/generated_resources/data/c/tags/block/storage_blocks/cadmium.json similarity index 100% rename from src/generated/resources/data/c/tags/block/storage_blocks/cadmium.json rename to src/main/generated_resources/data/c/tags/block/storage_blocks/cadmium.json diff --git a/src/generated/resources/data/c/tags/block/storage_blocks/chromium.json b/src/main/generated_resources/data/c/tags/block/storage_blocks/chromium.json similarity index 100% rename from src/generated/resources/data/c/tags/block/storage_blocks/chromium.json rename to src/main/generated_resources/data/c/tags/block/storage_blocks/chromium.json diff --git a/src/generated/resources/data/c/tags/block/storage_blocks/duralumin.json b/src/main/generated_resources/data/c/tags/block/storage_blocks/duralumin.json similarity index 100% rename from src/generated/resources/data/c/tags/block/storage_blocks/duralumin.json rename to src/main/generated_resources/data/c/tags/block/storage_blocks/duralumin.json diff --git a/src/generated/resources/data/c/tags/block/storage_blocks/electrum.json b/src/main/generated_resources/data/c/tags/block/storage_blocks/electrum.json similarity index 100% rename from src/generated/resources/data/c/tags/block/storage_blocks/electrum.json rename to src/main/generated_resources/data/c/tags/block/storage_blocks/electrum.json diff --git a/src/generated/resources/data/c/tags/block/storage_blocks/lead.json b/src/main/generated_resources/data/c/tags/block/storage_blocks/lead.json similarity index 100% rename from src/generated/resources/data/c/tags/block/storage_blocks/lead.json rename to src/main/generated_resources/data/c/tags/block/storage_blocks/lead.json diff --git a/src/generated/resources/data/c/tags/block/storage_blocks/nicrosil.json b/src/main/generated_resources/data/c/tags/block/storage_blocks/nicrosil.json similarity index 100% rename from src/generated/resources/data/c/tags/block/storage_blocks/nicrosil.json rename to src/main/generated_resources/data/c/tags/block/storage_blocks/nicrosil.json diff --git a/src/generated/resources/data/c/tags/block/storage_blocks/pewter.json b/src/main/generated_resources/data/c/tags/block/storage_blocks/pewter.json similarity index 100% rename from src/generated/resources/data/c/tags/block/storage_blocks/pewter.json rename to src/main/generated_resources/data/c/tags/block/storage_blocks/pewter.json diff --git a/src/generated/resources/data/c/tags/block/storage_blocks/raw_aluminum.json b/src/main/generated_resources/data/c/tags/block/storage_blocks/raw_aluminum.json similarity index 100% rename from src/generated/resources/data/c/tags/block/storage_blocks/raw_aluminum.json rename to src/main/generated_resources/data/c/tags/block/storage_blocks/raw_aluminum.json diff --git a/src/generated/resources/data/c/tags/block/storage_blocks/raw_cadmium.json b/src/main/generated_resources/data/c/tags/block/storage_blocks/raw_cadmium.json similarity index 100% rename from src/generated/resources/data/c/tags/block/storage_blocks/raw_cadmium.json rename to src/main/generated_resources/data/c/tags/block/storage_blocks/raw_cadmium.json diff --git a/src/generated/resources/data/c/tags/block/storage_blocks/raw_chromium.json b/src/main/generated_resources/data/c/tags/block/storage_blocks/raw_chromium.json similarity index 100% rename from src/generated/resources/data/c/tags/block/storage_blocks/raw_chromium.json rename to src/main/generated_resources/data/c/tags/block/storage_blocks/raw_chromium.json diff --git a/src/generated/resources/data/c/tags/block/storage_blocks/raw_lead.json b/src/main/generated_resources/data/c/tags/block/storage_blocks/raw_lead.json similarity index 100% rename from src/generated/resources/data/c/tags/block/storage_blocks/raw_lead.json rename to src/main/generated_resources/data/c/tags/block/storage_blocks/raw_lead.json diff --git a/src/generated/resources/data/c/tags/block/storage_blocks/raw_silver.json b/src/main/generated_resources/data/c/tags/block/storage_blocks/raw_silver.json similarity index 100% rename from src/generated/resources/data/c/tags/block/storage_blocks/raw_silver.json rename to src/main/generated_resources/data/c/tags/block/storage_blocks/raw_silver.json diff --git a/src/generated/resources/data/c/tags/block/storage_blocks/raw_tin.json b/src/main/generated_resources/data/c/tags/block/storage_blocks/raw_tin.json similarity index 100% rename from src/generated/resources/data/c/tags/block/storage_blocks/raw_tin.json rename to src/main/generated_resources/data/c/tags/block/storage_blocks/raw_tin.json diff --git a/src/generated/resources/data/c/tags/block/storage_blocks/raw_zinc.json b/src/main/generated_resources/data/c/tags/block/storage_blocks/raw_zinc.json similarity index 100% rename from src/generated/resources/data/c/tags/block/storage_blocks/raw_zinc.json rename to src/main/generated_resources/data/c/tags/block/storage_blocks/raw_zinc.json diff --git a/src/generated/resources/data/c/tags/block/storage_blocks/silver.json b/src/main/generated_resources/data/c/tags/block/storage_blocks/silver.json similarity index 100% rename from src/generated/resources/data/c/tags/block/storage_blocks/silver.json rename to src/main/generated_resources/data/c/tags/block/storage_blocks/silver.json diff --git a/src/generated/resources/data/c/tags/block/storage_blocks/steel.json b/src/main/generated_resources/data/c/tags/block/storage_blocks/steel.json similarity index 100% rename from src/generated/resources/data/c/tags/block/storage_blocks/steel.json rename to src/main/generated_resources/data/c/tags/block/storage_blocks/steel.json diff --git a/src/generated/resources/data/c/tags/block/storage_blocks/tin.json b/src/main/generated_resources/data/c/tags/block/storage_blocks/tin.json similarity index 100% rename from src/generated/resources/data/c/tags/block/storage_blocks/tin.json rename to src/main/generated_resources/data/c/tags/block/storage_blocks/tin.json diff --git a/src/generated/resources/data/c/tags/block/storage_blocks/zinc.json b/src/main/generated_resources/data/c/tags/block/storage_blocks/zinc.json similarity index 100% rename from src/generated/resources/data/c/tags/block/storage_blocks/zinc.json rename to src/main/generated_resources/data/c/tags/block/storage_blocks/zinc.json diff --git a/src/generated/resources/data/c/tags/item/ingots.json b/src/main/generated_resources/data/c/tags/item/ingots.json similarity index 100% rename from src/generated/resources/data/c/tags/item/ingots.json rename to src/main/generated_resources/data/c/tags/item/ingots.json diff --git a/src/generated/resources/data/c/tags/item/ingots/aluminum.json b/src/main/generated_resources/data/c/tags/item/ingots/aluminum.json similarity index 100% rename from src/generated/resources/data/c/tags/item/ingots/aluminum.json rename to src/main/generated_resources/data/c/tags/item/ingots/aluminum.json diff --git a/src/generated/resources/data/c/tags/item/ingots/bendalloy.json b/src/main/generated_resources/data/c/tags/item/ingots/bendalloy.json similarity index 100% rename from src/generated/resources/data/c/tags/item/ingots/bendalloy.json rename to src/main/generated_resources/data/c/tags/item/ingots/bendalloy.json diff --git a/src/generated/resources/data/c/tags/item/ingots/brass.json b/src/main/generated_resources/data/c/tags/item/ingots/brass.json similarity index 100% rename from src/generated/resources/data/c/tags/item/ingots/brass.json rename to src/main/generated_resources/data/c/tags/item/ingots/brass.json diff --git a/src/generated/resources/data/c/tags/item/ingots/bronze.json b/src/main/generated_resources/data/c/tags/item/ingots/bronze.json similarity index 100% rename from src/generated/resources/data/c/tags/item/ingots/bronze.json rename to src/main/generated_resources/data/c/tags/item/ingots/bronze.json diff --git a/src/generated/resources/data/c/tags/item/ingots/cadmium.json b/src/main/generated_resources/data/c/tags/item/ingots/cadmium.json similarity index 100% rename from src/generated/resources/data/c/tags/item/ingots/cadmium.json rename to src/main/generated_resources/data/c/tags/item/ingots/cadmium.json diff --git a/src/generated/resources/data/c/tags/item/ingots/chromium.json b/src/main/generated_resources/data/c/tags/item/ingots/chromium.json similarity index 100% rename from src/generated/resources/data/c/tags/item/ingots/chromium.json rename to src/main/generated_resources/data/c/tags/item/ingots/chromium.json diff --git a/src/generated/resources/data/c/tags/item/ingots/duralumin.json b/src/main/generated_resources/data/c/tags/item/ingots/duralumin.json similarity index 100% rename from src/generated/resources/data/c/tags/item/ingots/duralumin.json rename to src/main/generated_resources/data/c/tags/item/ingots/duralumin.json diff --git a/src/generated/resources/data/c/tags/item/ingots/electrum.json b/src/main/generated_resources/data/c/tags/item/ingots/electrum.json similarity index 100% rename from src/generated/resources/data/c/tags/item/ingots/electrum.json rename to src/main/generated_resources/data/c/tags/item/ingots/electrum.json diff --git a/src/generated/resources/data/c/tags/item/ingots/lead.json b/src/main/generated_resources/data/c/tags/item/ingots/lead.json similarity index 100% rename from src/generated/resources/data/c/tags/item/ingots/lead.json rename to src/main/generated_resources/data/c/tags/item/ingots/lead.json diff --git a/src/generated/resources/data/c/tags/item/ingots/nicrosil.json b/src/main/generated_resources/data/c/tags/item/ingots/nicrosil.json similarity index 100% rename from src/generated/resources/data/c/tags/item/ingots/nicrosil.json rename to src/main/generated_resources/data/c/tags/item/ingots/nicrosil.json diff --git a/src/generated/resources/data/c/tags/item/ingots/pewter.json b/src/main/generated_resources/data/c/tags/item/ingots/pewter.json similarity index 100% rename from src/generated/resources/data/c/tags/item/ingots/pewter.json rename to src/main/generated_resources/data/c/tags/item/ingots/pewter.json diff --git a/src/generated/resources/data/c/tags/item/ingots/silver.json b/src/main/generated_resources/data/c/tags/item/ingots/silver.json similarity index 100% rename from src/generated/resources/data/c/tags/item/ingots/silver.json rename to src/main/generated_resources/data/c/tags/item/ingots/silver.json diff --git a/src/generated/resources/data/c/tags/item/ingots/steel.json b/src/main/generated_resources/data/c/tags/item/ingots/steel.json similarity index 100% rename from src/generated/resources/data/c/tags/item/ingots/steel.json rename to src/main/generated_resources/data/c/tags/item/ingots/steel.json diff --git a/src/generated/resources/data/c/tags/item/ingots/tin.json b/src/main/generated_resources/data/c/tags/item/ingots/tin.json similarity index 100% rename from src/generated/resources/data/c/tags/item/ingots/tin.json rename to src/main/generated_resources/data/c/tags/item/ingots/tin.json diff --git a/src/generated/resources/data/c/tags/item/ingots/zinc.json b/src/main/generated_resources/data/c/tags/item/ingots/zinc.json similarity index 100% rename from src/generated/resources/data/c/tags/item/ingots/zinc.json rename to src/main/generated_resources/data/c/tags/item/ingots/zinc.json diff --git a/src/generated/resources/data/c/tags/item/nuggets.json b/src/main/generated_resources/data/c/tags/item/nuggets.json similarity index 100% rename from src/generated/resources/data/c/tags/item/nuggets.json rename to src/main/generated_resources/data/c/tags/item/nuggets.json diff --git a/src/generated/resources/data/c/tags/item/nuggets/aluminum.json b/src/main/generated_resources/data/c/tags/item/nuggets/aluminum.json similarity index 100% rename from src/generated/resources/data/c/tags/item/nuggets/aluminum.json rename to src/main/generated_resources/data/c/tags/item/nuggets/aluminum.json diff --git a/src/generated/resources/data/c/tags/item/nuggets/bendalloy.json b/src/main/generated_resources/data/c/tags/item/nuggets/bendalloy.json similarity index 100% rename from src/generated/resources/data/c/tags/item/nuggets/bendalloy.json rename to src/main/generated_resources/data/c/tags/item/nuggets/bendalloy.json diff --git a/src/generated/resources/data/c/tags/item/nuggets/brass.json b/src/main/generated_resources/data/c/tags/item/nuggets/brass.json similarity index 100% rename from src/generated/resources/data/c/tags/item/nuggets/brass.json rename to src/main/generated_resources/data/c/tags/item/nuggets/brass.json diff --git a/src/generated/resources/data/c/tags/item/nuggets/bronze.json b/src/main/generated_resources/data/c/tags/item/nuggets/bronze.json similarity index 100% rename from src/generated/resources/data/c/tags/item/nuggets/bronze.json rename to src/main/generated_resources/data/c/tags/item/nuggets/bronze.json diff --git a/src/generated/resources/data/c/tags/item/nuggets/cadmium.json b/src/main/generated_resources/data/c/tags/item/nuggets/cadmium.json similarity index 100% rename from src/generated/resources/data/c/tags/item/nuggets/cadmium.json rename to src/main/generated_resources/data/c/tags/item/nuggets/cadmium.json diff --git a/src/generated/resources/data/c/tags/item/nuggets/chromium.json b/src/main/generated_resources/data/c/tags/item/nuggets/chromium.json similarity index 100% rename from src/generated/resources/data/c/tags/item/nuggets/chromium.json rename to src/main/generated_resources/data/c/tags/item/nuggets/chromium.json diff --git a/src/generated/resources/data/c/tags/item/nuggets/duralumin.json b/src/main/generated_resources/data/c/tags/item/nuggets/duralumin.json similarity index 100% rename from src/generated/resources/data/c/tags/item/nuggets/duralumin.json rename to src/main/generated_resources/data/c/tags/item/nuggets/duralumin.json diff --git a/src/generated/resources/data/c/tags/item/nuggets/electrum.json b/src/main/generated_resources/data/c/tags/item/nuggets/electrum.json similarity index 100% rename from src/generated/resources/data/c/tags/item/nuggets/electrum.json rename to src/main/generated_resources/data/c/tags/item/nuggets/electrum.json diff --git a/src/generated/resources/data/c/tags/item/nuggets/lead.json b/src/main/generated_resources/data/c/tags/item/nuggets/lead.json similarity index 100% rename from src/generated/resources/data/c/tags/item/nuggets/lead.json rename to src/main/generated_resources/data/c/tags/item/nuggets/lead.json diff --git a/src/generated/resources/data/c/tags/item/nuggets/nicrosil.json b/src/main/generated_resources/data/c/tags/item/nuggets/nicrosil.json similarity index 100% rename from src/generated/resources/data/c/tags/item/nuggets/nicrosil.json rename to src/main/generated_resources/data/c/tags/item/nuggets/nicrosil.json diff --git a/src/generated/resources/data/c/tags/item/nuggets/pewter.json b/src/main/generated_resources/data/c/tags/item/nuggets/pewter.json similarity index 100% rename from src/generated/resources/data/c/tags/item/nuggets/pewter.json rename to src/main/generated_resources/data/c/tags/item/nuggets/pewter.json diff --git a/src/generated/resources/data/c/tags/item/nuggets/silver.json b/src/main/generated_resources/data/c/tags/item/nuggets/silver.json similarity index 100% rename from src/generated/resources/data/c/tags/item/nuggets/silver.json rename to src/main/generated_resources/data/c/tags/item/nuggets/silver.json diff --git a/src/generated/resources/data/c/tags/item/nuggets/steel.json b/src/main/generated_resources/data/c/tags/item/nuggets/steel.json similarity index 100% rename from src/generated/resources/data/c/tags/item/nuggets/steel.json rename to src/main/generated_resources/data/c/tags/item/nuggets/steel.json diff --git a/src/generated/resources/data/c/tags/item/nuggets/tin.json b/src/main/generated_resources/data/c/tags/item/nuggets/tin.json similarity index 100% rename from src/generated/resources/data/c/tags/item/nuggets/tin.json rename to src/main/generated_resources/data/c/tags/item/nuggets/tin.json diff --git a/src/generated/resources/data/c/tags/item/nuggets/zinc.json b/src/main/generated_resources/data/c/tags/item/nuggets/zinc.json similarity index 100% rename from src/generated/resources/data/c/tags/item/nuggets/zinc.json rename to src/main/generated_resources/data/c/tags/item/nuggets/zinc.json diff --git a/src/generated/resources/data/c/tags/item/ores.json b/src/main/generated_resources/data/c/tags/item/ores.json similarity index 100% rename from src/generated/resources/data/c/tags/item/ores.json rename to src/main/generated_resources/data/c/tags/item/ores.json diff --git a/src/generated/resources/data/c/tags/item/ores/aluminum.json b/src/main/generated_resources/data/c/tags/item/ores/aluminum.json similarity index 100% rename from src/generated/resources/data/c/tags/item/ores/aluminum.json rename to src/main/generated_resources/data/c/tags/item/ores/aluminum.json diff --git a/src/generated/resources/data/c/tags/item/ores/cadmium.json b/src/main/generated_resources/data/c/tags/item/ores/cadmium.json similarity index 100% rename from src/generated/resources/data/c/tags/item/ores/cadmium.json rename to src/main/generated_resources/data/c/tags/item/ores/cadmium.json diff --git a/src/generated/resources/data/c/tags/item/ores/chromium.json b/src/main/generated_resources/data/c/tags/item/ores/chromium.json similarity index 100% rename from src/generated/resources/data/c/tags/item/ores/chromium.json rename to src/main/generated_resources/data/c/tags/item/ores/chromium.json diff --git a/src/generated/resources/data/c/tags/item/ores/lead.json b/src/main/generated_resources/data/c/tags/item/ores/lead.json similarity index 100% rename from src/generated/resources/data/c/tags/item/ores/lead.json rename to src/main/generated_resources/data/c/tags/item/ores/lead.json diff --git a/src/generated/resources/data/c/tags/item/ores/silver.json b/src/main/generated_resources/data/c/tags/item/ores/silver.json similarity index 100% rename from src/generated/resources/data/c/tags/item/ores/silver.json rename to src/main/generated_resources/data/c/tags/item/ores/silver.json diff --git a/src/generated/resources/data/c/tags/item/ores/tin.json b/src/main/generated_resources/data/c/tags/item/ores/tin.json similarity index 100% rename from src/generated/resources/data/c/tags/item/ores/tin.json rename to src/main/generated_resources/data/c/tags/item/ores/tin.json diff --git a/src/generated/resources/data/c/tags/item/ores/zinc.json b/src/main/generated_resources/data/c/tags/item/ores/zinc.json similarity index 100% rename from src/generated/resources/data/c/tags/item/ores/zinc.json rename to src/main/generated_resources/data/c/tags/item/ores/zinc.json diff --git a/src/generated/resources/data/c/tags/item/ores_in_ground/deepslate.json b/src/main/generated_resources/data/c/tags/item/ores_in_ground/deepslate.json similarity index 100% rename from src/generated/resources/data/c/tags/item/ores_in_ground/deepslate.json rename to src/main/generated_resources/data/c/tags/item/ores_in_ground/deepslate.json diff --git a/src/generated/resources/data/c/tags/item/ores_in_ground/stone.json b/src/main/generated_resources/data/c/tags/item/ores_in_ground/stone.json similarity index 100% rename from src/generated/resources/data/c/tags/item/ores_in_ground/stone.json rename to src/main/generated_resources/data/c/tags/item/ores_in_ground/stone.json diff --git a/src/generated/resources/data/c/tags/item/raw_materials.json b/src/main/generated_resources/data/c/tags/item/raw_materials.json similarity index 100% rename from src/generated/resources/data/c/tags/item/raw_materials.json rename to src/main/generated_resources/data/c/tags/item/raw_materials.json diff --git a/src/generated/resources/data/c/tags/item/raw_materials/aluminum.json b/src/main/generated_resources/data/c/tags/item/raw_materials/aluminum.json similarity index 100% rename from src/generated/resources/data/c/tags/item/raw_materials/aluminum.json rename to src/main/generated_resources/data/c/tags/item/raw_materials/aluminum.json diff --git a/src/generated/resources/data/c/tags/item/raw_materials/cadmium.json b/src/main/generated_resources/data/c/tags/item/raw_materials/cadmium.json similarity index 100% rename from src/generated/resources/data/c/tags/item/raw_materials/cadmium.json rename to src/main/generated_resources/data/c/tags/item/raw_materials/cadmium.json diff --git a/src/generated/resources/data/c/tags/item/raw_materials/chromium.json b/src/main/generated_resources/data/c/tags/item/raw_materials/chromium.json similarity index 100% rename from src/generated/resources/data/c/tags/item/raw_materials/chromium.json rename to src/main/generated_resources/data/c/tags/item/raw_materials/chromium.json diff --git a/src/generated/resources/data/c/tags/item/raw_materials/lead.json b/src/main/generated_resources/data/c/tags/item/raw_materials/lead.json similarity index 100% rename from src/generated/resources/data/c/tags/item/raw_materials/lead.json rename to src/main/generated_resources/data/c/tags/item/raw_materials/lead.json diff --git a/src/generated/resources/data/c/tags/item/raw_materials/silver.json b/src/main/generated_resources/data/c/tags/item/raw_materials/silver.json similarity index 100% rename from src/generated/resources/data/c/tags/item/raw_materials/silver.json rename to src/main/generated_resources/data/c/tags/item/raw_materials/silver.json diff --git a/src/generated/resources/data/c/tags/item/raw_materials/tin.json b/src/main/generated_resources/data/c/tags/item/raw_materials/tin.json similarity index 100% rename from src/generated/resources/data/c/tags/item/raw_materials/tin.json rename to src/main/generated_resources/data/c/tags/item/raw_materials/tin.json diff --git a/src/generated/resources/data/c/tags/item/raw_materials/zinc.json b/src/main/generated_resources/data/c/tags/item/raw_materials/zinc.json similarity index 100% rename from src/generated/resources/data/c/tags/item/raw_materials/zinc.json rename to src/main/generated_resources/data/c/tags/item/raw_materials/zinc.json diff --git a/src/generated/resources/data/c/tags/item/storage_blocks.json b/src/main/generated_resources/data/c/tags/item/storage_blocks.json similarity index 100% rename from src/generated/resources/data/c/tags/item/storage_blocks.json rename to src/main/generated_resources/data/c/tags/item/storage_blocks.json diff --git a/src/generated/resources/data/c/tags/item/storage_blocks/aluminum.json b/src/main/generated_resources/data/c/tags/item/storage_blocks/aluminum.json similarity index 100% rename from src/generated/resources/data/c/tags/item/storage_blocks/aluminum.json rename to src/main/generated_resources/data/c/tags/item/storage_blocks/aluminum.json diff --git a/src/generated/resources/data/c/tags/item/storage_blocks/bendalloy.json b/src/main/generated_resources/data/c/tags/item/storage_blocks/bendalloy.json similarity index 100% rename from src/generated/resources/data/c/tags/item/storage_blocks/bendalloy.json rename to src/main/generated_resources/data/c/tags/item/storage_blocks/bendalloy.json diff --git a/src/generated/resources/data/c/tags/item/storage_blocks/brass.json b/src/main/generated_resources/data/c/tags/item/storage_blocks/brass.json similarity index 100% rename from src/generated/resources/data/c/tags/item/storage_blocks/brass.json rename to src/main/generated_resources/data/c/tags/item/storage_blocks/brass.json diff --git a/src/generated/resources/data/c/tags/item/storage_blocks/bronze.json b/src/main/generated_resources/data/c/tags/item/storage_blocks/bronze.json similarity index 100% rename from src/generated/resources/data/c/tags/item/storage_blocks/bronze.json rename to src/main/generated_resources/data/c/tags/item/storage_blocks/bronze.json diff --git a/src/generated/resources/data/c/tags/item/storage_blocks/cadmium.json b/src/main/generated_resources/data/c/tags/item/storage_blocks/cadmium.json similarity index 100% rename from src/generated/resources/data/c/tags/item/storage_blocks/cadmium.json rename to src/main/generated_resources/data/c/tags/item/storage_blocks/cadmium.json diff --git a/src/generated/resources/data/c/tags/item/storage_blocks/chromium.json b/src/main/generated_resources/data/c/tags/item/storage_blocks/chromium.json similarity index 100% rename from src/generated/resources/data/c/tags/item/storage_blocks/chromium.json rename to src/main/generated_resources/data/c/tags/item/storage_blocks/chromium.json diff --git a/src/generated/resources/data/c/tags/item/storage_blocks/duralumin.json b/src/main/generated_resources/data/c/tags/item/storage_blocks/duralumin.json similarity index 100% rename from src/generated/resources/data/c/tags/item/storage_blocks/duralumin.json rename to src/main/generated_resources/data/c/tags/item/storage_blocks/duralumin.json diff --git a/src/generated/resources/data/c/tags/item/storage_blocks/electrum.json b/src/main/generated_resources/data/c/tags/item/storage_blocks/electrum.json similarity index 100% rename from src/generated/resources/data/c/tags/item/storage_blocks/electrum.json rename to src/main/generated_resources/data/c/tags/item/storage_blocks/electrum.json diff --git a/src/generated/resources/data/c/tags/item/storage_blocks/lead.json b/src/main/generated_resources/data/c/tags/item/storage_blocks/lead.json similarity index 100% rename from src/generated/resources/data/c/tags/item/storage_blocks/lead.json rename to src/main/generated_resources/data/c/tags/item/storage_blocks/lead.json diff --git a/src/generated/resources/data/c/tags/item/storage_blocks/nicrosil.json b/src/main/generated_resources/data/c/tags/item/storage_blocks/nicrosil.json similarity index 100% rename from src/generated/resources/data/c/tags/item/storage_blocks/nicrosil.json rename to src/main/generated_resources/data/c/tags/item/storage_blocks/nicrosil.json diff --git a/src/generated/resources/data/c/tags/item/storage_blocks/pewter.json b/src/main/generated_resources/data/c/tags/item/storage_blocks/pewter.json similarity index 100% rename from src/generated/resources/data/c/tags/item/storage_blocks/pewter.json rename to src/main/generated_resources/data/c/tags/item/storage_blocks/pewter.json diff --git a/src/generated/resources/data/c/tags/item/storage_blocks/raw_aluminum.json b/src/main/generated_resources/data/c/tags/item/storage_blocks/raw_aluminum.json similarity index 100% rename from src/generated/resources/data/c/tags/item/storage_blocks/raw_aluminum.json rename to src/main/generated_resources/data/c/tags/item/storage_blocks/raw_aluminum.json diff --git a/src/generated/resources/data/c/tags/item/storage_blocks/raw_cadmium.json b/src/main/generated_resources/data/c/tags/item/storage_blocks/raw_cadmium.json similarity index 100% rename from src/generated/resources/data/c/tags/item/storage_blocks/raw_cadmium.json rename to src/main/generated_resources/data/c/tags/item/storage_blocks/raw_cadmium.json diff --git a/src/generated/resources/data/c/tags/item/storage_blocks/raw_chromium.json b/src/main/generated_resources/data/c/tags/item/storage_blocks/raw_chromium.json similarity index 100% rename from src/generated/resources/data/c/tags/item/storage_blocks/raw_chromium.json rename to src/main/generated_resources/data/c/tags/item/storage_blocks/raw_chromium.json diff --git a/src/generated/resources/data/c/tags/item/storage_blocks/raw_lead.json b/src/main/generated_resources/data/c/tags/item/storage_blocks/raw_lead.json similarity index 100% rename from src/generated/resources/data/c/tags/item/storage_blocks/raw_lead.json rename to src/main/generated_resources/data/c/tags/item/storage_blocks/raw_lead.json diff --git a/src/generated/resources/data/c/tags/item/storage_blocks/raw_silver.json b/src/main/generated_resources/data/c/tags/item/storage_blocks/raw_silver.json similarity index 100% rename from src/generated/resources/data/c/tags/item/storage_blocks/raw_silver.json rename to src/main/generated_resources/data/c/tags/item/storage_blocks/raw_silver.json diff --git a/src/generated/resources/data/c/tags/item/storage_blocks/raw_tin.json b/src/main/generated_resources/data/c/tags/item/storage_blocks/raw_tin.json similarity index 100% rename from src/generated/resources/data/c/tags/item/storage_blocks/raw_tin.json rename to src/main/generated_resources/data/c/tags/item/storage_blocks/raw_tin.json diff --git a/src/generated/resources/data/c/tags/item/storage_blocks/raw_zinc.json b/src/main/generated_resources/data/c/tags/item/storage_blocks/raw_zinc.json similarity index 100% rename from src/generated/resources/data/c/tags/item/storage_blocks/raw_zinc.json rename to src/main/generated_resources/data/c/tags/item/storage_blocks/raw_zinc.json diff --git a/src/generated/resources/data/c/tags/item/storage_blocks/silver.json b/src/main/generated_resources/data/c/tags/item/storage_blocks/silver.json similarity index 100% rename from src/generated/resources/data/c/tags/item/storage_blocks/silver.json rename to src/main/generated_resources/data/c/tags/item/storage_blocks/silver.json diff --git a/src/generated/resources/data/c/tags/item/storage_blocks/steel.json b/src/main/generated_resources/data/c/tags/item/storage_blocks/steel.json similarity index 100% rename from src/generated/resources/data/c/tags/item/storage_blocks/steel.json rename to src/main/generated_resources/data/c/tags/item/storage_blocks/steel.json diff --git a/src/generated/resources/data/c/tags/item/storage_blocks/tin.json b/src/main/generated_resources/data/c/tags/item/storage_blocks/tin.json similarity index 100% rename from src/generated/resources/data/c/tags/item/storage_blocks/tin.json rename to src/main/generated_resources/data/c/tags/item/storage_blocks/tin.json diff --git a/src/generated/resources/data/c/tags/item/storage_blocks/zinc.json b/src/main/generated_resources/data/c/tags/item/storage_blocks/zinc.json similarity index 100% rename from src/generated/resources/data/c/tags/item/storage_blocks/zinc.json rename to src/main/generated_resources/data/c/tags/item/storage_blocks/zinc.json diff --git a/src/generated/resources/data/minecraft/advancement/recipes/misc/aluminum_ingot_from_blasting_aluminum_ore.json b/src/main/generated_resources/data/minecraft/advancement/recipes/misc/aluminum_ingot_from_blasting_aluminum_ore.json similarity index 100% rename from src/generated/resources/data/minecraft/advancement/recipes/misc/aluminum_ingot_from_blasting_aluminum_ore.json rename to src/main/generated_resources/data/minecraft/advancement/recipes/misc/aluminum_ingot_from_blasting_aluminum_ore.json diff --git a/src/generated/resources/data/minecraft/advancement/recipes/misc/aluminum_ingot_from_blasting_deepslate_aluminum_ore.json b/src/main/generated_resources/data/minecraft/advancement/recipes/misc/aluminum_ingot_from_blasting_deepslate_aluminum_ore.json similarity index 100% rename from src/generated/resources/data/minecraft/advancement/recipes/misc/aluminum_ingot_from_blasting_deepslate_aluminum_ore.json rename to src/main/generated_resources/data/minecraft/advancement/recipes/misc/aluminum_ingot_from_blasting_deepslate_aluminum_ore.json diff --git a/src/generated/resources/data/minecraft/advancement/recipes/misc/aluminum_ingot_from_blasting_raw_aluminum.json b/src/main/generated_resources/data/minecraft/advancement/recipes/misc/aluminum_ingot_from_blasting_raw_aluminum.json similarity index 100% rename from src/generated/resources/data/minecraft/advancement/recipes/misc/aluminum_ingot_from_blasting_raw_aluminum.json rename to src/main/generated_resources/data/minecraft/advancement/recipes/misc/aluminum_ingot_from_blasting_raw_aluminum.json diff --git a/src/generated/resources/data/minecraft/advancement/recipes/misc/aluminum_ingot_from_smelting_aluminum_ore.json b/src/main/generated_resources/data/minecraft/advancement/recipes/misc/aluminum_ingot_from_smelting_aluminum_ore.json similarity index 100% rename from src/generated/resources/data/minecraft/advancement/recipes/misc/aluminum_ingot_from_smelting_aluminum_ore.json rename to src/main/generated_resources/data/minecraft/advancement/recipes/misc/aluminum_ingot_from_smelting_aluminum_ore.json diff --git a/src/generated/resources/data/minecraft/advancement/recipes/misc/aluminum_ingot_from_smelting_deepslate_aluminum_ore.json b/src/main/generated_resources/data/minecraft/advancement/recipes/misc/aluminum_ingot_from_smelting_deepslate_aluminum_ore.json similarity index 100% rename from src/generated/resources/data/minecraft/advancement/recipes/misc/aluminum_ingot_from_smelting_deepslate_aluminum_ore.json rename to src/main/generated_resources/data/minecraft/advancement/recipes/misc/aluminum_ingot_from_smelting_deepslate_aluminum_ore.json diff --git a/src/generated/resources/data/minecraft/advancement/recipes/misc/aluminum_ingot_from_smelting_raw_aluminum.json b/src/main/generated_resources/data/minecraft/advancement/recipes/misc/aluminum_ingot_from_smelting_raw_aluminum.json similarity index 100% rename from src/generated/resources/data/minecraft/advancement/recipes/misc/aluminum_ingot_from_smelting_raw_aluminum.json rename to src/main/generated_resources/data/minecraft/advancement/recipes/misc/aluminum_ingot_from_smelting_raw_aluminum.json diff --git a/src/generated/resources/data/minecraft/advancement/recipes/misc/cadmium_ingot_from_blasting_cadmium_ore.json b/src/main/generated_resources/data/minecraft/advancement/recipes/misc/cadmium_ingot_from_blasting_cadmium_ore.json similarity index 100% rename from src/generated/resources/data/minecraft/advancement/recipes/misc/cadmium_ingot_from_blasting_cadmium_ore.json rename to src/main/generated_resources/data/minecraft/advancement/recipes/misc/cadmium_ingot_from_blasting_cadmium_ore.json diff --git a/src/generated/resources/data/minecraft/advancement/recipes/misc/cadmium_ingot_from_blasting_deepslate_cadmium_ore.json b/src/main/generated_resources/data/minecraft/advancement/recipes/misc/cadmium_ingot_from_blasting_deepslate_cadmium_ore.json similarity index 100% rename from src/generated/resources/data/minecraft/advancement/recipes/misc/cadmium_ingot_from_blasting_deepslate_cadmium_ore.json rename to src/main/generated_resources/data/minecraft/advancement/recipes/misc/cadmium_ingot_from_blasting_deepslate_cadmium_ore.json diff --git a/src/generated/resources/data/minecraft/advancement/recipes/misc/cadmium_ingot_from_blasting_raw_cadmium.json b/src/main/generated_resources/data/minecraft/advancement/recipes/misc/cadmium_ingot_from_blasting_raw_cadmium.json similarity index 100% rename from src/generated/resources/data/minecraft/advancement/recipes/misc/cadmium_ingot_from_blasting_raw_cadmium.json rename to src/main/generated_resources/data/minecraft/advancement/recipes/misc/cadmium_ingot_from_blasting_raw_cadmium.json diff --git a/src/generated/resources/data/minecraft/advancement/recipes/misc/cadmium_ingot_from_smelting_cadmium_ore.json b/src/main/generated_resources/data/minecraft/advancement/recipes/misc/cadmium_ingot_from_smelting_cadmium_ore.json similarity index 100% rename from src/generated/resources/data/minecraft/advancement/recipes/misc/cadmium_ingot_from_smelting_cadmium_ore.json rename to src/main/generated_resources/data/minecraft/advancement/recipes/misc/cadmium_ingot_from_smelting_cadmium_ore.json diff --git a/src/generated/resources/data/minecraft/advancement/recipes/misc/cadmium_ingot_from_smelting_deepslate_cadmium_ore.json b/src/main/generated_resources/data/minecraft/advancement/recipes/misc/cadmium_ingot_from_smelting_deepslate_cadmium_ore.json similarity index 100% rename from src/generated/resources/data/minecraft/advancement/recipes/misc/cadmium_ingot_from_smelting_deepslate_cadmium_ore.json rename to src/main/generated_resources/data/minecraft/advancement/recipes/misc/cadmium_ingot_from_smelting_deepslate_cadmium_ore.json diff --git a/src/generated/resources/data/minecraft/advancement/recipes/misc/cadmium_ingot_from_smelting_raw_cadmium.json b/src/main/generated_resources/data/minecraft/advancement/recipes/misc/cadmium_ingot_from_smelting_raw_cadmium.json similarity index 100% rename from src/generated/resources/data/minecraft/advancement/recipes/misc/cadmium_ingot_from_smelting_raw_cadmium.json rename to src/main/generated_resources/data/minecraft/advancement/recipes/misc/cadmium_ingot_from_smelting_raw_cadmium.json diff --git a/src/generated/resources/data/minecraft/advancement/recipes/misc/chromium_ingot_from_blasting_chromium_ore.json b/src/main/generated_resources/data/minecraft/advancement/recipes/misc/chromium_ingot_from_blasting_chromium_ore.json similarity index 100% rename from src/generated/resources/data/minecraft/advancement/recipes/misc/chromium_ingot_from_blasting_chromium_ore.json rename to src/main/generated_resources/data/minecraft/advancement/recipes/misc/chromium_ingot_from_blasting_chromium_ore.json diff --git a/src/generated/resources/data/minecraft/advancement/recipes/misc/chromium_ingot_from_blasting_deepslate_chromium_ore.json b/src/main/generated_resources/data/minecraft/advancement/recipes/misc/chromium_ingot_from_blasting_deepslate_chromium_ore.json similarity index 100% rename from src/generated/resources/data/minecraft/advancement/recipes/misc/chromium_ingot_from_blasting_deepslate_chromium_ore.json rename to src/main/generated_resources/data/minecraft/advancement/recipes/misc/chromium_ingot_from_blasting_deepslate_chromium_ore.json diff --git a/src/generated/resources/data/minecraft/advancement/recipes/misc/chromium_ingot_from_blasting_raw_chromium.json b/src/main/generated_resources/data/minecraft/advancement/recipes/misc/chromium_ingot_from_blasting_raw_chromium.json similarity index 100% rename from src/generated/resources/data/minecraft/advancement/recipes/misc/chromium_ingot_from_blasting_raw_chromium.json rename to src/main/generated_resources/data/minecraft/advancement/recipes/misc/chromium_ingot_from_blasting_raw_chromium.json diff --git a/src/generated/resources/data/minecraft/advancement/recipes/misc/chromium_ingot_from_smelting_chromium_ore.json b/src/main/generated_resources/data/minecraft/advancement/recipes/misc/chromium_ingot_from_smelting_chromium_ore.json similarity index 100% rename from src/generated/resources/data/minecraft/advancement/recipes/misc/chromium_ingot_from_smelting_chromium_ore.json rename to src/main/generated_resources/data/minecraft/advancement/recipes/misc/chromium_ingot_from_smelting_chromium_ore.json diff --git a/src/generated/resources/data/minecraft/advancement/recipes/misc/chromium_ingot_from_smelting_deepslate_chromium_ore.json b/src/main/generated_resources/data/minecraft/advancement/recipes/misc/chromium_ingot_from_smelting_deepslate_chromium_ore.json similarity index 100% rename from src/generated/resources/data/minecraft/advancement/recipes/misc/chromium_ingot_from_smelting_deepslate_chromium_ore.json rename to src/main/generated_resources/data/minecraft/advancement/recipes/misc/chromium_ingot_from_smelting_deepslate_chromium_ore.json diff --git a/src/generated/resources/data/minecraft/advancement/recipes/misc/chromium_ingot_from_smelting_raw_chromium.json b/src/main/generated_resources/data/minecraft/advancement/recipes/misc/chromium_ingot_from_smelting_raw_chromium.json similarity index 100% rename from src/generated/resources/data/minecraft/advancement/recipes/misc/chromium_ingot_from_smelting_raw_chromium.json rename to src/main/generated_resources/data/minecraft/advancement/recipes/misc/chromium_ingot_from_smelting_raw_chromium.json diff --git a/src/generated/resources/data/minecraft/advancement/recipes/misc/lead_ingot_from_blasting_deepslate_lead_ore.json b/src/main/generated_resources/data/minecraft/advancement/recipes/misc/lead_ingot_from_blasting_deepslate_lead_ore.json similarity index 100% rename from src/generated/resources/data/minecraft/advancement/recipes/misc/lead_ingot_from_blasting_deepslate_lead_ore.json rename to src/main/generated_resources/data/minecraft/advancement/recipes/misc/lead_ingot_from_blasting_deepslate_lead_ore.json diff --git a/src/generated/resources/data/minecraft/advancement/recipes/misc/lead_ingot_from_blasting_lead_ore.json b/src/main/generated_resources/data/minecraft/advancement/recipes/misc/lead_ingot_from_blasting_lead_ore.json similarity index 100% rename from src/generated/resources/data/minecraft/advancement/recipes/misc/lead_ingot_from_blasting_lead_ore.json rename to src/main/generated_resources/data/minecraft/advancement/recipes/misc/lead_ingot_from_blasting_lead_ore.json diff --git a/src/generated/resources/data/minecraft/advancement/recipes/misc/lead_ingot_from_blasting_raw_lead.json b/src/main/generated_resources/data/minecraft/advancement/recipes/misc/lead_ingot_from_blasting_raw_lead.json similarity index 100% rename from src/generated/resources/data/minecraft/advancement/recipes/misc/lead_ingot_from_blasting_raw_lead.json rename to src/main/generated_resources/data/minecraft/advancement/recipes/misc/lead_ingot_from_blasting_raw_lead.json diff --git a/src/generated/resources/data/minecraft/advancement/recipes/misc/lead_ingot_from_smelting_deepslate_lead_ore.json b/src/main/generated_resources/data/minecraft/advancement/recipes/misc/lead_ingot_from_smelting_deepslate_lead_ore.json similarity index 100% rename from src/generated/resources/data/minecraft/advancement/recipes/misc/lead_ingot_from_smelting_deepslate_lead_ore.json rename to src/main/generated_resources/data/minecraft/advancement/recipes/misc/lead_ingot_from_smelting_deepslate_lead_ore.json diff --git a/src/generated/resources/data/minecraft/advancement/recipes/misc/lead_ingot_from_smelting_lead_ore.json b/src/main/generated_resources/data/minecraft/advancement/recipes/misc/lead_ingot_from_smelting_lead_ore.json similarity index 100% rename from src/generated/resources/data/minecraft/advancement/recipes/misc/lead_ingot_from_smelting_lead_ore.json rename to src/main/generated_resources/data/minecraft/advancement/recipes/misc/lead_ingot_from_smelting_lead_ore.json diff --git a/src/generated/resources/data/minecraft/advancement/recipes/misc/lead_ingot_from_smelting_raw_lead.json b/src/main/generated_resources/data/minecraft/advancement/recipes/misc/lead_ingot_from_smelting_raw_lead.json similarity index 100% rename from src/generated/resources/data/minecraft/advancement/recipes/misc/lead_ingot_from_smelting_raw_lead.json rename to src/main/generated_resources/data/minecraft/advancement/recipes/misc/lead_ingot_from_smelting_raw_lead.json diff --git a/src/generated/resources/data/minecraft/advancement/recipes/misc/silver_ingot_from_blasting_deepslate_silver_ore.json b/src/main/generated_resources/data/minecraft/advancement/recipes/misc/silver_ingot_from_blasting_deepslate_silver_ore.json similarity index 100% rename from src/generated/resources/data/minecraft/advancement/recipes/misc/silver_ingot_from_blasting_deepslate_silver_ore.json rename to src/main/generated_resources/data/minecraft/advancement/recipes/misc/silver_ingot_from_blasting_deepslate_silver_ore.json diff --git a/src/generated/resources/data/minecraft/advancement/recipes/misc/silver_ingot_from_blasting_raw_silver.json b/src/main/generated_resources/data/minecraft/advancement/recipes/misc/silver_ingot_from_blasting_raw_silver.json similarity index 100% rename from src/generated/resources/data/minecraft/advancement/recipes/misc/silver_ingot_from_blasting_raw_silver.json rename to src/main/generated_resources/data/minecraft/advancement/recipes/misc/silver_ingot_from_blasting_raw_silver.json diff --git a/src/generated/resources/data/minecraft/advancement/recipes/misc/silver_ingot_from_blasting_silver_ore.json b/src/main/generated_resources/data/minecraft/advancement/recipes/misc/silver_ingot_from_blasting_silver_ore.json similarity index 100% rename from src/generated/resources/data/minecraft/advancement/recipes/misc/silver_ingot_from_blasting_silver_ore.json rename to src/main/generated_resources/data/minecraft/advancement/recipes/misc/silver_ingot_from_blasting_silver_ore.json diff --git a/src/generated/resources/data/minecraft/advancement/recipes/misc/silver_ingot_from_smelting_deepslate_silver_ore.json b/src/main/generated_resources/data/minecraft/advancement/recipes/misc/silver_ingot_from_smelting_deepslate_silver_ore.json similarity index 100% rename from src/generated/resources/data/minecraft/advancement/recipes/misc/silver_ingot_from_smelting_deepslate_silver_ore.json rename to src/main/generated_resources/data/minecraft/advancement/recipes/misc/silver_ingot_from_smelting_deepslate_silver_ore.json diff --git a/src/generated/resources/data/minecraft/advancement/recipes/misc/silver_ingot_from_smelting_raw_silver.json b/src/main/generated_resources/data/minecraft/advancement/recipes/misc/silver_ingot_from_smelting_raw_silver.json similarity index 100% rename from src/generated/resources/data/minecraft/advancement/recipes/misc/silver_ingot_from_smelting_raw_silver.json rename to src/main/generated_resources/data/minecraft/advancement/recipes/misc/silver_ingot_from_smelting_raw_silver.json diff --git a/src/generated/resources/data/minecraft/advancement/recipes/misc/silver_ingot_from_smelting_silver_ore.json b/src/main/generated_resources/data/minecraft/advancement/recipes/misc/silver_ingot_from_smelting_silver_ore.json similarity index 100% rename from src/generated/resources/data/minecraft/advancement/recipes/misc/silver_ingot_from_smelting_silver_ore.json rename to src/main/generated_resources/data/minecraft/advancement/recipes/misc/silver_ingot_from_smelting_silver_ore.json diff --git a/src/generated/resources/data/minecraft/advancement/recipes/misc/tin_ingot_from_blasting_deepslate_tin_ore.json b/src/main/generated_resources/data/minecraft/advancement/recipes/misc/tin_ingot_from_blasting_deepslate_tin_ore.json similarity index 100% rename from src/generated/resources/data/minecraft/advancement/recipes/misc/tin_ingot_from_blasting_deepslate_tin_ore.json rename to src/main/generated_resources/data/minecraft/advancement/recipes/misc/tin_ingot_from_blasting_deepslate_tin_ore.json diff --git a/src/generated/resources/data/minecraft/advancement/recipes/misc/tin_ingot_from_blasting_raw_tin.json b/src/main/generated_resources/data/minecraft/advancement/recipes/misc/tin_ingot_from_blasting_raw_tin.json similarity index 100% rename from src/generated/resources/data/minecraft/advancement/recipes/misc/tin_ingot_from_blasting_raw_tin.json rename to src/main/generated_resources/data/minecraft/advancement/recipes/misc/tin_ingot_from_blasting_raw_tin.json diff --git a/src/generated/resources/data/minecraft/advancement/recipes/misc/tin_ingot_from_blasting_tin_ore.json b/src/main/generated_resources/data/minecraft/advancement/recipes/misc/tin_ingot_from_blasting_tin_ore.json similarity index 100% rename from src/generated/resources/data/minecraft/advancement/recipes/misc/tin_ingot_from_blasting_tin_ore.json rename to src/main/generated_resources/data/minecraft/advancement/recipes/misc/tin_ingot_from_blasting_tin_ore.json diff --git a/src/generated/resources/data/minecraft/advancement/recipes/misc/tin_ingot_from_smelting_deepslate_tin_ore.json b/src/main/generated_resources/data/minecraft/advancement/recipes/misc/tin_ingot_from_smelting_deepslate_tin_ore.json similarity index 100% rename from src/generated/resources/data/minecraft/advancement/recipes/misc/tin_ingot_from_smelting_deepslate_tin_ore.json rename to src/main/generated_resources/data/minecraft/advancement/recipes/misc/tin_ingot_from_smelting_deepslate_tin_ore.json diff --git a/src/generated/resources/data/minecraft/advancement/recipes/misc/tin_ingot_from_smelting_raw_tin.json b/src/main/generated_resources/data/minecraft/advancement/recipes/misc/tin_ingot_from_smelting_raw_tin.json similarity index 100% rename from src/generated/resources/data/minecraft/advancement/recipes/misc/tin_ingot_from_smelting_raw_tin.json rename to src/main/generated_resources/data/minecraft/advancement/recipes/misc/tin_ingot_from_smelting_raw_tin.json diff --git a/src/generated/resources/data/minecraft/advancement/recipes/misc/tin_ingot_from_smelting_tin_ore.json b/src/main/generated_resources/data/minecraft/advancement/recipes/misc/tin_ingot_from_smelting_tin_ore.json similarity index 100% rename from src/generated/resources/data/minecraft/advancement/recipes/misc/tin_ingot_from_smelting_tin_ore.json rename to src/main/generated_resources/data/minecraft/advancement/recipes/misc/tin_ingot_from_smelting_tin_ore.json diff --git a/src/generated/resources/data/minecraft/advancement/recipes/misc/zinc_ingot_from_blasting_deepslate_zinc_ore.json b/src/main/generated_resources/data/minecraft/advancement/recipes/misc/zinc_ingot_from_blasting_deepslate_zinc_ore.json similarity index 100% rename from src/generated/resources/data/minecraft/advancement/recipes/misc/zinc_ingot_from_blasting_deepslate_zinc_ore.json rename to src/main/generated_resources/data/minecraft/advancement/recipes/misc/zinc_ingot_from_blasting_deepslate_zinc_ore.json diff --git a/src/generated/resources/data/minecraft/advancement/recipes/misc/zinc_ingot_from_blasting_raw_zinc.json b/src/main/generated_resources/data/minecraft/advancement/recipes/misc/zinc_ingot_from_blasting_raw_zinc.json similarity index 100% rename from src/generated/resources/data/minecraft/advancement/recipes/misc/zinc_ingot_from_blasting_raw_zinc.json rename to src/main/generated_resources/data/minecraft/advancement/recipes/misc/zinc_ingot_from_blasting_raw_zinc.json diff --git a/src/generated/resources/data/minecraft/advancement/recipes/misc/zinc_ingot_from_blasting_zinc_ore.json b/src/main/generated_resources/data/minecraft/advancement/recipes/misc/zinc_ingot_from_blasting_zinc_ore.json similarity index 100% rename from src/generated/resources/data/minecraft/advancement/recipes/misc/zinc_ingot_from_blasting_zinc_ore.json rename to src/main/generated_resources/data/minecraft/advancement/recipes/misc/zinc_ingot_from_blasting_zinc_ore.json diff --git a/src/generated/resources/data/minecraft/advancement/recipes/misc/zinc_ingot_from_smelting_deepslate_zinc_ore.json b/src/main/generated_resources/data/minecraft/advancement/recipes/misc/zinc_ingot_from_smelting_deepslate_zinc_ore.json similarity index 100% rename from src/generated/resources/data/minecraft/advancement/recipes/misc/zinc_ingot_from_smelting_deepslate_zinc_ore.json rename to src/main/generated_resources/data/minecraft/advancement/recipes/misc/zinc_ingot_from_smelting_deepslate_zinc_ore.json diff --git a/src/generated/resources/data/minecraft/advancement/recipes/misc/zinc_ingot_from_smelting_raw_zinc.json b/src/main/generated_resources/data/minecraft/advancement/recipes/misc/zinc_ingot_from_smelting_raw_zinc.json similarity index 100% rename from src/generated/resources/data/minecraft/advancement/recipes/misc/zinc_ingot_from_smelting_raw_zinc.json rename to src/main/generated_resources/data/minecraft/advancement/recipes/misc/zinc_ingot_from_smelting_raw_zinc.json diff --git a/src/generated/resources/data/minecraft/advancement/recipes/misc/zinc_ingot_from_smelting_zinc_ore.json b/src/main/generated_resources/data/minecraft/advancement/recipes/misc/zinc_ingot_from_smelting_zinc_ore.json similarity index 100% rename from src/generated/resources/data/minecraft/advancement/recipes/misc/zinc_ingot_from_smelting_zinc_ore.json rename to src/main/generated_resources/data/minecraft/advancement/recipes/misc/zinc_ingot_from_smelting_zinc_ore.json diff --git a/src/generated/resources/data/minecraft/recipe/aluminum_ingot_from_blasting_aluminum_ore.json b/src/main/generated_resources/data/minecraft/recipe/aluminum_ingot_from_blasting_aluminum_ore.json similarity index 100% rename from src/generated/resources/data/minecraft/recipe/aluminum_ingot_from_blasting_aluminum_ore.json rename to src/main/generated_resources/data/minecraft/recipe/aluminum_ingot_from_blasting_aluminum_ore.json diff --git a/src/generated/resources/data/minecraft/recipe/aluminum_ingot_from_blasting_deepslate_aluminum_ore.json b/src/main/generated_resources/data/minecraft/recipe/aluminum_ingot_from_blasting_deepslate_aluminum_ore.json similarity index 100% rename from src/generated/resources/data/minecraft/recipe/aluminum_ingot_from_blasting_deepslate_aluminum_ore.json rename to src/main/generated_resources/data/minecraft/recipe/aluminum_ingot_from_blasting_deepslate_aluminum_ore.json diff --git a/src/generated/resources/data/minecraft/recipe/aluminum_ingot_from_blasting_raw_aluminum.json b/src/main/generated_resources/data/minecraft/recipe/aluminum_ingot_from_blasting_raw_aluminum.json similarity index 100% rename from src/generated/resources/data/minecraft/recipe/aluminum_ingot_from_blasting_raw_aluminum.json rename to src/main/generated_resources/data/minecraft/recipe/aluminum_ingot_from_blasting_raw_aluminum.json diff --git a/src/generated/resources/data/minecraft/recipe/aluminum_ingot_from_smelting_aluminum_ore.json b/src/main/generated_resources/data/minecraft/recipe/aluminum_ingot_from_smelting_aluminum_ore.json similarity index 100% rename from src/generated/resources/data/minecraft/recipe/aluminum_ingot_from_smelting_aluminum_ore.json rename to src/main/generated_resources/data/minecraft/recipe/aluminum_ingot_from_smelting_aluminum_ore.json diff --git a/src/generated/resources/data/minecraft/recipe/aluminum_ingot_from_smelting_deepslate_aluminum_ore.json b/src/main/generated_resources/data/minecraft/recipe/aluminum_ingot_from_smelting_deepslate_aluminum_ore.json similarity index 100% rename from src/generated/resources/data/minecraft/recipe/aluminum_ingot_from_smelting_deepslate_aluminum_ore.json rename to src/main/generated_resources/data/minecraft/recipe/aluminum_ingot_from_smelting_deepslate_aluminum_ore.json diff --git a/src/generated/resources/data/minecraft/recipe/aluminum_ingot_from_smelting_raw_aluminum.json b/src/main/generated_resources/data/minecraft/recipe/aluminum_ingot_from_smelting_raw_aluminum.json similarity index 100% rename from src/generated/resources/data/minecraft/recipe/aluminum_ingot_from_smelting_raw_aluminum.json rename to src/main/generated_resources/data/minecraft/recipe/aluminum_ingot_from_smelting_raw_aluminum.json diff --git a/src/generated/resources/data/minecraft/recipe/cadmium_ingot_from_blasting_cadmium_ore.json b/src/main/generated_resources/data/minecraft/recipe/cadmium_ingot_from_blasting_cadmium_ore.json similarity index 100% rename from src/generated/resources/data/minecraft/recipe/cadmium_ingot_from_blasting_cadmium_ore.json rename to src/main/generated_resources/data/minecraft/recipe/cadmium_ingot_from_blasting_cadmium_ore.json diff --git a/src/generated/resources/data/minecraft/recipe/cadmium_ingot_from_blasting_deepslate_cadmium_ore.json b/src/main/generated_resources/data/minecraft/recipe/cadmium_ingot_from_blasting_deepslate_cadmium_ore.json similarity index 100% rename from src/generated/resources/data/minecraft/recipe/cadmium_ingot_from_blasting_deepslate_cadmium_ore.json rename to src/main/generated_resources/data/minecraft/recipe/cadmium_ingot_from_blasting_deepslate_cadmium_ore.json diff --git a/src/generated/resources/data/minecraft/recipe/cadmium_ingot_from_blasting_raw_cadmium.json b/src/main/generated_resources/data/minecraft/recipe/cadmium_ingot_from_blasting_raw_cadmium.json similarity index 100% rename from src/generated/resources/data/minecraft/recipe/cadmium_ingot_from_blasting_raw_cadmium.json rename to src/main/generated_resources/data/minecraft/recipe/cadmium_ingot_from_blasting_raw_cadmium.json diff --git a/src/generated/resources/data/minecraft/recipe/cadmium_ingot_from_smelting_cadmium_ore.json b/src/main/generated_resources/data/minecraft/recipe/cadmium_ingot_from_smelting_cadmium_ore.json similarity index 100% rename from src/generated/resources/data/minecraft/recipe/cadmium_ingot_from_smelting_cadmium_ore.json rename to src/main/generated_resources/data/minecraft/recipe/cadmium_ingot_from_smelting_cadmium_ore.json diff --git a/src/generated/resources/data/minecraft/recipe/cadmium_ingot_from_smelting_deepslate_cadmium_ore.json b/src/main/generated_resources/data/minecraft/recipe/cadmium_ingot_from_smelting_deepslate_cadmium_ore.json similarity index 100% rename from src/generated/resources/data/minecraft/recipe/cadmium_ingot_from_smelting_deepslate_cadmium_ore.json rename to src/main/generated_resources/data/minecraft/recipe/cadmium_ingot_from_smelting_deepslate_cadmium_ore.json diff --git a/src/generated/resources/data/minecraft/recipe/cadmium_ingot_from_smelting_raw_cadmium.json b/src/main/generated_resources/data/minecraft/recipe/cadmium_ingot_from_smelting_raw_cadmium.json similarity index 100% rename from src/generated/resources/data/minecraft/recipe/cadmium_ingot_from_smelting_raw_cadmium.json rename to src/main/generated_resources/data/minecraft/recipe/cadmium_ingot_from_smelting_raw_cadmium.json diff --git a/src/generated/resources/data/minecraft/recipe/chromium_ingot_from_blasting_chromium_ore.json b/src/main/generated_resources/data/minecraft/recipe/chromium_ingot_from_blasting_chromium_ore.json similarity index 100% rename from src/generated/resources/data/minecraft/recipe/chromium_ingot_from_blasting_chromium_ore.json rename to src/main/generated_resources/data/minecraft/recipe/chromium_ingot_from_blasting_chromium_ore.json diff --git a/src/generated/resources/data/minecraft/recipe/chromium_ingot_from_blasting_deepslate_chromium_ore.json b/src/main/generated_resources/data/minecraft/recipe/chromium_ingot_from_blasting_deepslate_chromium_ore.json similarity index 100% rename from src/generated/resources/data/minecraft/recipe/chromium_ingot_from_blasting_deepslate_chromium_ore.json rename to src/main/generated_resources/data/minecraft/recipe/chromium_ingot_from_blasting_deepslate_chromium_ore.json diff --git a/src/generated/resources/data/minecraft/recipe/chromium_ingot_from_blasting_raw_chromium.json b/src/main/generated_resources/data/minecraft/recipe/chromium_ingot_from_blasting_raw_chromium.json similarity index 100% rename from src/generated/resources/data/minecraft/recipe/chromium_ingot_from_blasting_raw_chromium.json rename to src/main/generated_resources/data/minecraft/recipe/chromium_ingot_from_blasting_raw_chromium.json diff --git a/src/generated/resources/data/minecraft/recipe/chromium_ingot_from_smelting_chromium_ore.json b/src/main/generated_resources/data/minecraft/recipe/chromium_ingot_from_smelting_chromium_ore.json similarity index 100% rename from src/generated/resources/data/minecraft/recipe/chromium_ingot_from_smelting_chromium_ore.json rename to src/main/generated_resources/data/minecraft/recipe/chromium_ingot_from_smelting_chromium_ore.json diff --git a/src/generated/resources/data/minecraft/recipe/chromium_ingot_from_smelting_deepslate_chromium_ore.json b/src/main/generated_resources/data/minecraft/recipe/chromium_ingot_from_smelting_deepslate_chromium_ore.json similarity index 100% rename from src/generated/resources/data/minecraft/recipe/chromium_ingot_from_smelting_deepslate_chromium_ore.json rename to src/main/generated_resources/data/minecraft/recipe/chromium_ingot_from_smelting_deepslate_chromium_ore.json diff --git a/src/generated/resources/data/minecraft/recipe/chromium_ingot_from_smelting_raw_chromium.json b/src/main/generated_resources/data/minecraft/recipe/chromium_ingot_from_smelting_raw_chromium.json similarity index 100% rename from src/generated/resources/data/minecraft/recipe/chromium_ingot_from_smelting_raw_chromium.json rename to src/main/generated_resources/data/minecraft/recipe/chromium_ingot_from_smelting_raw_chromium.json diff --git a/src/generated/resources/data/minecraft/recipe/lead_ingot_from_blasting_deepslate_lead_ore.json b/src/main/generated_resources/data/minecraft/recipe/lead_ingot_from_blasting_deepslate_lead_ore.json similarity index 100% rename from src/generated/resources/data/minecraft/recipe/lead_ingot_from_blasting_deepslate_lead_ore.json rename to src/main/generated_resources/data/minecraft/recipe/lead_ingot_from_blasting_deepslate_lead_ore.json diff --git a/src/generated/resources/data/minecraft/recipe/lead_ingot_from_blasting_lead_ore.json b/src/main/generated_resources/data/minecraft/recipe/lead_ingot_from_blasting_lead_ore.json similarity index 100% rename from src/generated/resources/data/minecraft/recipe/lead_ingot_from_blasting_lead_ore.json rename to src/main/generated_resources/data/minecraft/recipe/lead_ingot_from_blasting_lead_ore.json diff --git a/src/generated/resources/data/minecraft/recipe/lead_ingot_from_blasting_raw_lead.json b/src/main/generated_resources/data/minecraft/recipe/lead_ingot_from_blasting_raw_lead.json similarity index 100% rename from src/generated/resources/data/minecraft/recipe/lead_ingot_from_blasting_raw_lead.json rename to src/main/generated_resources/data/minecraft/recipe/lead_ingot_from_blasting_raw_lead.json diff --git a/src/generated/resources/data/minecraft/recipe/lead_ingot_from_smelting_deepslate_lead_ore.json b/src/main/generated_resources/data/minecraft/recipe/lead_ingot_from_smelting_deepslate_lead_ore.json similarity index 100% rename from src/generated/resources/data/minecraft/recipe/lead_ingot_from_smelting_deepslate_lead_ore.json rename to src/main/generated_resources/data/minecraft/recipe/lead_ingot_from_smelting_deepslate_lead_ore.json diff --git a/src/generated/resources/data/minecraft/recipe/lead_ingot_from_smelting_lead_ore.json b/src/main/generated_resources/data/minecraft/recipe/lead_ingot_from_smelting_lead_ore.json similarity index 100% rename from src/generated/resources/data/minecraft/recipe/lead_ingot_from_smelting_lead_ore.json rename to src/main/generated_resources/data/minecraft/recipe/lead_ingot_from_smelting_lead_ore.json diff --git a/src/generated/resources/data/minecraft/recipe/lead_ingot_from_smelting_raw_lead.json b/src/main/generated_resources/data/minecraft/recipe/lead_ingot_from_smelting_raw_lead.json similarity index 100% rename from src/generated/resources/data/minecraft/recipe/lead_ingot_from_smelting_raw_lead.json rename to src/main/generated_resources/data/minecraft/recipe/lead_ingot_from_smelting_raw_lead.json diff --git a/src/generated/resources/data/minecraft/recipe/silver_ingot_from_blasting_deepslate_silver_ore.json b/src/main/generated_resources/data/minecraft/recipe/silver_ingot_from_blasting_deepslate_silver_ore.json similarity index 100% rename from src/generated/resources/data/minecraft/recipe/silver_ingot_from_blasting_deepslate_silver_ore.json rename to src/main/generated_resources/data/minecraft/recipe/silver_ingot_from_blasting_deepslate_silver_ore.json diff --git a/src/generated/resources/data/minecraft/recipe/silver_ingot_from_blasting_raw_silver.json b/src/main/generated_resources/data/minecraft/recipe/silver_ingot_from_blasting_raw_silver.json similarity index 100% rename from src/generated/resources/data/minecraft/recipe/silver_ingot_from_blasting_raw_silver.json rename to src/main/generated_resources/data/minecraft/recipe/silver_ingot_from_blasting_raw_silver.json diff --git a/src/generated/resources/data/minecraft/recipe/silver_ingot_from_blasting_silver_ore.json b/src/main/generated_resources/data/minecraft/recipe/silver_ingot_from_blasting_silver_ore.json similarity index 100% rename from src/generated/resources/data/minecraft/recipe/silver_ingot_from_blasting_silver_ore.json rename to src/main/generated_resources/data/minecraft/recipe/silver_ingot_from_blasting_silver_ore.json diff --git a/src/generated/resources/data/minecraft/recipe/silver_ingot_from_smelting_deepslate_silver_ore.json b/src/main/generated_resources/data/minecraft/recipe/silver_ingot_from_smelting_deepslate_silver_ore.json similarity index 100% rename from src/generated/resources/data/minecraft/recipe/silver_ingot_from_smelting_deepslate_silver_ore.json rename to src/main/generated_resources/data/minecraft/recipe/silver_ingot_from_smelting_deepslate_silver_ore.json diff --git a/src/generated/resources/data/minecraft/recipe/silver_ingot_from_smelting_raw_silver.json b/src/main/generated_resources/data/minecraft/recipe/silver_ingot_from_smelting_raw_silver.json similarity index 100% rename from src/generated/resources/data/minecraft/recipe/silver_ingot_from_smelting_raw_silver.json rename to src/main/generated_resources/data/minecraft/recipe/silver_ingot_from_smelting_raw_silver.json diff --git a/src/generated/resources/data/minecraft/recipe/silver_ingot_from_smelting_silver_ore.json b/src/main/generated_resources/data/minecraft/recipe/silver_ingot_from_smelting_silver_ore.json similarity index 100% rename from src/generated/resources/data/minecraft/recipe/silver_ingot_from_smelting_silver_ore.json rename to src/main/generated_resources/data/minecraft/recipe/silver_ingot_from_smelting_silver_ore.json diff --git a/src/generated/resources/data/minecraft/recipe/tin_ingot_from_blasting_deepslate_tin_ore.json b/src/main/generated_resources/data/minecraft/recipe/tin_ingot_from_blasting_deepslate_tin_ore.json similarity index 100% rename from src/generated/resources/data/minecraft/recipe/tin_ingot_from_blasting_deepslate_tin_ore.json rename to src/main/generated_resources/data/minecraft/recipe/tin_ingot_from_blasting_deepslate_tin_ore.json diff --git a/src/generated/resources/data/minecraft/recipe/tin_ingot_from_blasting_raw_tin.json b/src/main/generated_resources/data/minecraft/recipe/tin_ingot_from_blasting_raw_tin.json similarity index 100% rename from src/generated/resources/data/minecraft/recipe/tin_ingot_from_blasting_raw_tin.json rename to src/main/generated_resources/data/minecraft/recipe/tin_ingot_from_blasting_raw_tin.json diff --git a/src/generated/resources/data/minecraft/recipe/tin_ingot_from_blasting_tin_ore.json b/src/main/generated_resources/data/minecraft/recipe/tin_ingot_from_blasting_tin_ore.json similarity index 100% rename from src/generated/resources/data/minecraft/recipe/tin_ingot_from_blasting_tin_ore.json rename to src/main/generated_resources/data/minecraft/recipe/tin_ingot_from_blasting_tin_ore.json diff --git a/src/generated/resources/data/minecraft/recipe/tin_ingot_from_smelting_deepslate_tin_ore.json b/src/main/generated_resources/data/minecraft/recipe/tin_ingot_from_smelting_deepslate_tin_ore.json similarity index 100% rename from src/generated/resources/data/minecraft/recipe/tin_ingot_from_smelting_deepslate_tin_ore.json rename to src/main/generated_resources/data/minecraft/recipe/tin_ingot_from_smelting_deepslate_tin_ore.json diff --git a/src/generated/resources/data/minecraft/recipe/tin_ingot_from_smelting_raw_tin.json b/src/main/generated_resources/data/minecraft/recipe/tin_ingot_from_smelting_raw_tin.json similarity index 100% rename from src/generated/resources/data/minecraft/recipe/tin_ingot_from_smelting_raw_tin.json rename to src/main/generated_resources/data/minecraft/recipe/tin_ingot_from_smelting_raw_tin.json diff --git a/src/generated/resources/data/minecraft/recipe/tin_ingot_from_smelting_tin_ore.json b/src/main/generated_resources/data/minecraft/recipe/tin_ingot_from_smelting_tin_ore.json similarity index 100% rename from src/generated/resources/data/minecraft/recipe/tin_ingot_from_smelting_tin_ore.json rename to src/main/generated_resources/data/minecraft/recipe/tin_ingot_from_smelting_tin_ore.json diff --git a/src/generated/resources/data/minecraft/recipe/zinc_ingot_from_blasting_deepslate_zinc_ore.json b/src/main/generated_resources/data/minecraft/recipe/zinc_ingot_from_blasting_deepslate_zinc_ore.json similarity index 100% rename from src/generated/resources/data/minecraft/recipe/zinc_ingot_from_blasting_deepslate_zinc_ore.json rename to src/main/generated_resources/data/minecraft/recipe/zinc_ingot_from_blasting_deepslate_zinc_ore.json diff --git a/src/generated/resources/data/minecraft/recipe/zinc_ingot_from_blasting_raw_zinc.json b/src/main/generated_resources/data/minecraft/recipe/zinc_ingot_from_blasting_raw_zinc.json similarity index 100% rename from src/generated/resources/data/minecraft/recipe/zinc_ingot_from_blasting_raw_zinc.json rename to src/main/generated_resources/data/minecraft/recipe/zinc_ingot_from_blasting_raw_zinc.json diff --git a/src/generated/resources/data/minecraft/recipe/zinc_ingot_from_blasting_zinc_ore.json b/src/main/generated_resources/data/minecraft/recipe/zinc_ingot_from_blasting_zinc_ore.json similarity index 100% rename from src/generated/resources/data/minecraft/recipe/zinc_ingot_from_blasting_zinc_ore.json rename to src/main/generated_resources/data/minecraft/recipe/zinc_ingot_from_blasting_zinc_ore.json diff --git a/src/generated/resources/data/minecraft/recipe/zinc_ingot_from_smelting_deepslate_zinc_ore.json b/src/main/generated_resources/data/minecraft/recipe/zinc_ingot_from_smelting_deepslate_zinc_ore.json similarity index 100% rename from src/generated/resources/data/minecraft/recipe/zinc_ingot_from_smelting_deepslate_zinc_ore.json rename to src/main/generated_resources/data/minecraft/recipe/zinc_ingot_from_smelting_deepslate_zinc_ore.json diff --git a/src/generated/resources/data/minecraft/recipe/zinc_ingot_from_smelting_raw_zinc.json b/src/main/generated_resources/data/minecraft/recipe/zinc_ingot_from_smelting_raw_zinc.json similarity index 100% rename from src/generated/resources/data/minecraft/recipe/zinc_ingot_from_smelting_raw_zinc.json rename to src/main/generated_resources/data/minecraft/recipe/zinc_ingot_from_smelting_raw_zinc.json diff --git a/src/generated/resources/data/minecraft/recipe/zinc_ingot_from_smelting_zinc_ore.json b/src/main/generated_resources/data/minecraft/recipe/zinc_ingot_from_smelting_zinc_ore.json similarity index 100% rename from src/generated/resources/data/minecraft/recipe/zinc_ingot_from_smelting_zinc_ore.json rename to src/main/generated_resources/data/minecraft/recipe/zinc_ingot_from_smelting_zinc_ore.json diff --git a/src/generated/resources/data/minecraft/tags/block/beacon_base_blocks.json b/src/main/generated_resources/data/minecraft/tags/block/beacon_base_blocks.json similarity index 100% rename from src/generated/resources/data/minecraft/tags/block/beacon_base_blocks.json rename to src/main/generated_resources/data/minecraft/tags/block/beacon_base_blocks.json diff --git a/src/generated/resources/data/minecraft/tags/block/mineable/pickaxe.json b/src/main/generated_resources/data/minecraft/tags/block/mineable/pickaxe.json similarity index 100% rename from src/generated/resources/data/minecraft/tags/block/mineable/pickaxe.json rename to src/main/generated_resources/data/minecraft/tags/block/mineable/pickaxe.json diff --git a/src/generated/resources/data/minecraft/tags/block/needs_stone_tool.json b/src/main/generated_resources/data/minecraft/tags/block/needs_stone_tool.json similarity index 100% rename from src/generated/resources/data/minecraft/tags/block/needs_stone_tool.json rename to src/main/generated_resources/data/minecraft/tags/block/needs_stone_tool.json diff --git a/src/generated/resources/data/minecraft/tags/damage_type/is_projectile.json b/src/main/generated_resources/data/minecraft/tags/damage_type/is_projectile.json similarity index 100% rename from src/generated/resources/data/minecraft/tags/damage_type/is_projectile.json rename to src/main/generated_resources/data/minecraft/tags/damage_type/is_projectile.json diff --git a/src/generated/resources/data/minecraft/tags/item/chest_armor.json b/src/main/generated_resources/data/minecraft/tags/item/chest_armor.json similarity index 100% rename from src/generated/resources/data/minecraft/tags/item/chest_armor.json rename to src/main/generated_resources/data/minecraft/tags/item/chest_armor.json diff --git a/src/generated/resources/data/minecraft/tags/item/gaze_disguise_equipment.json b/src/main/generated_resources/data/minecraft/tags/item/gaze_disguise_equipment.json similarity index 100% rename from src/generated/resources/data/minecraft/tags/item/gaze_disguise_equipment.json rename to src/main/generated_resources/data/minecraft/tags/item/gaze_disguise_equipment.json diff --git a/src/generated/resources/data/minecraft/tags/item/swords.json b/src/main/generated_resources/data/minecraft/tags/item/swords.json similarity index 100% rename from src/generated/resources/data/minecraft/tags/item/swords.json rename to src/main/generated_resources/data/minecraft/tags/item/swords.json diff --git a/src/generated/resources/data/minecraft/tags/item/trimmable_armor.json b/src/main/generated_resources/data/minecraft/tags/item/trimmable_armor.json similarity index 100% rename from src/generated/resources/data/minecraft/tags/item/trimmable_armor.json rename to src/main/generated_resources/data/minecraft/tags/item/trimmable_armor.json diff --git a/src/generated/resources/data/neoforge/loot_modifiers/global_loot_modifiers.json b/src/main/generated_resources/data/neoforge/loot_modifiers/global_loot_modifiers.json similarity index 100% rename from src/generated/resources/data/neoforge/loot_modifiers/global_loot_modifiers.json rename to src/main/generated_resources/data/neoforge/loot_modifiers/global_loot_modifiers.json diff --git a/src/generated/resources/data/neoforge/tags/damage_type/is_magic.json b/src/main/generated_resources/data/neoforge/tags/damage_type/is_magic.json similarity index 100% rename from src/generated/resources/data/neoforge/tags/damage_type/is_magic.json rename to src/main/generated_resources/data/neoforge/tags/damage_type/is_magic.json diff --git a/src/main/java/com/legobmw99/allomancy/datagen/Advancements.java b/src/main/java/com/legobmw99/allomancy/datagen/Advancements.java index 9659c890..88b494ce 100644 --- a/src/main/java/com/legobmw99/allomancy/datagen/Advancements.java +++ b/src/main/java/com/legobmw99/allomancy/datagen/Advancements.java @@ -66,9 +66,7 @@ public void generate(HolderLookup.Provider registries, Consumer builder.set(FLAKE_STORAGE.get(), gold)); event.modify(Items.GOLDEN_CARROT, builder -> builder.set(FLAKE_STORAGE.get(), gold)); 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 c05b44c9..db288db6 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 @@ -135,17 +135,20 @@ public void onConsume(Level level, LivingEntity entity, ItemStack stack, Consuma } } + public static class Mutable { private final EnumSet flakes = EnumSet.noneOf(Metal.class); - public void add(Metal mt) { + public Mutable add(Metal mt) { this.flakes.add(mt); + return this; } - public void addAll(FlakeStorage other) { + public Mutable addAll(FlakeStorage other) { if (other != null) { this.flakes.addAll(other.flakes); } + return this; } public FlakeStorage toImmutable() { 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 131b9eb6..5c3bc77e 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 @@ -48,7 +48,6 @@ protected void onExplosionHit(BlockState pState, BlockPos pPos, Explosion pExplosion, BiConsumer pDropConsumer) { - super.onExplosionHit(pState, pLevel, pPos, pExplosion, pDropConsumer); } @Override 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 ab6b7345..e2b06885 100644 --- a/src/main/java/com/legobmw99/allomancy/modules/materials/MaterialsSetup.java +++ b/src/main/java/com/legobmw99/allomancy/modules/materials/MaterialsSetup.java @@ -14,9 +14,12 @@ import net.minecraft.resources.ResourceKey; import net.minecraft.tags.BiomeTags; import net.minecraft.tags.BlockTags; +import net.minecraft.tags.ItemTags; +import net.minecraft.tags.TagKey; import net.minecraft.util.valueproviders.UniformInt; import net.minecraft.world.item.BlockItem; import net.minecraft.world.item.Item; +import net.minecraft.world.item.Items; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.Blocks; import net.minecraft.world.level.block.DropExperienceBlock; @@ -69,6 +72,8 @@ public String toString() { public static final DeferredRegister.Blocks BLOCKS = DeferredRegister.createBlocks(Allomancy.MODID); private static final DeferredRegister.Items ITEMS = DeferredRegister.createItems(Allomancy.MODID); + + public static final TagKey FLAKES_TAG = ItemTags.create(Allomancy.rl("metal_flakes")); public static final List> FLAKES = new ArrayList<>(); public static final List> NUGGETS = new ArrayList<>(); public static final List> INGOTS = new ArrayList<>(); 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 876ac69b..82705e82 100644 --- a/src/main/java/com/legobmw99/allomancy/modules/powers/CommonEventHandler.java +++ b/src/main/java/com/legobmw99/allomancy/modules/powers/CommonEventHandler.java @@ -18,6 +18,7 @@ import net.minecraft.nbt.CompoundTag; import net.minecraft.nbt.NbtAccounter; import net.minecraft.nbt.NbtIo; +import net.minecraft.server.level.ServerLevel; import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.damagesource.DamageTypes; import net.minecraft.world.effect.MobEffectInstance; @@ -207,8 +208,9 @@ public static void onEntityHurt(final LivingIncomingDamageEvent event) { if (event.getEntity() instanceof ServerPlayer player) { var data = player.getData(AllomancerAttachment.ALLOMANCY_DATA); if (data.isBurning(Metal.PEWTER)) { - Allomancy.LOGGER.debug("Reducing Damage"); - event.setAmount(event.getAmount() - 2); + float newDamage = Math.max(0, event.getAmount() - 2); + Allomancy.LOGGER.trace("Reducing damage to {} on {}", newDamage, player); + event.setAmount(newDamage); // Note that they took damage, will come in to play if they stop burning data.setDamageStored(data.getDamageStored() + 2); Network.syncAllomancerData(player); @@ -222,7 +224,7 @@ public static void onInvulnerabilityCheck(final EntityInvulnerabilityCheckEvent var data = player.getData(AllomancerAttachment.ALLOMANCY_DATA); if (data.isBurning(Metal.PEWTER) && data.isEnhanced()) { // Duralumin invulnerability - Allomancy.LOGGER.debug("Canceling Damage"); + Allomancy.LOGGER.debug("Canceling damage for {}", player); event.setInvulnerable(true); } @@ -249,46 +251,44 @@ public static void onInvulnerabilityCheck(final EntityInvulnerabilityCheckEvent @SubscribeEvent public static void onWorldTick(final LevelTickEvent.Post event) { Level level = event.getLevel(); - var list = level.players(); - for (int i = list.size() - 1; i >= 0; i--) { - Player curPlayer = list.get(i); - playerPowerTick(curPlayer, level); + if (level instanceof ServerLevel l) { + var list = l.players(); + for (int i = list.size() - 1; i >= 0; i--) { + var curPlayer = list.get(i); + playerPowerTick(curPlayer, l); + } } + } - private static void playerPowerTick(Player curPlayer, Level level) { + private static void playerPowerTick(ServerPlayer curPlayer, ServerLevel level) { var data = curPlayer.getData(AllomancerAttachment.ALLOMANCY_DATA); if (!data.isUninvested()) { - if (curPlayer instanceof ServerPlayer player) { - // Run the necessary updates on the player's metals - boolean syncRequired = data.tickBurning(); + // Run the necessary updates on the player's metals + boolean syncRequired = data.tickBurning(); - /********************************************* - * ALUMINUM AND DURALUMIN * - *********************************************/ - if (data.isBurning(Metal.ALUMINUM)) { - Enhancement.wipePlayer(curPlayer); + /********************************************* + * ALUMINUM AND DURALUMIN * + *********************************************/ + if (data.isBurning(Metal.ALUMINUM)) { + Enhancement.wipePlayer(curPlayer); + syncRequired = true; + } + if (data.isBurning(Metal.DURALUMIN) && !data.isEnhanced()) { + data.setEnhanced(2); + Network.sync(new EnhanceTimePayload(2, curPlayer.getId()), curPlayer); + } else if (!data.isBurning(Metal.DURALUMIN) && data.isEnhanced()) { + data.decrementEnhanced(); + if (!data.isEnhanced()) { //Enhancement ran out this tick + Network.sync(new EnhanceTimePayload(false, curPlayer.getId()), curPlayer); + data.drainMetals(Arrays.stream(Metal.values()).filter(data::isBurning).toArray(Metal[]::new)); syncRequired = true; } - if (data.isBurning(Metal.DURALUMIN) && !data.isEnhanced()) { - data.setEnhanced(2); - Network.sync(new EnhanceTimePayload(2, player.getId()), player); - } else if (!data.isBurning(Metal.DURALUMIN) && data.isEnhanced()) { - data.decrementEnhanced(); - if (!data.isEnhanced()) { //Enhancement ran out this tick - Network.sync(new EnhanceTimePayload(false, player.getId()), player); - data.drainMetals(Arrays.stream(Metal.values()).filter(data::isBurning).toArray(Metal[]::new)); - syncRequired = true; - } - } - - if (syncRequired) { - Network.syncAllomancerData(player); - } } + /********************************************* * CHROMIUM (enhanced) * *********************************************/ @@ -348,6 +348,7 @@ private static void playerPowerTick(Player curPlayer, Level level) { if (data.getDamageStored() > 0) { if (level.random.nextInt(200) == 0) { data.setDamageStored(data.getDamageStored() - 1); + syncRequired = true; } } @@ -355,7 +356,8 @@ private static void playerPowerTick(Player curPlayer, Level level) { // Damage the player if they have stored damage and pewter cuts out if (!data.isBurning(Metal.PEWTER) && (data.getDamageStored() > 0)) { data.setDamageStored(data.getDamageStored() - 1); - curPlayer.hurt(level.damageSources().magic(), 2); + curPlayer.hurtServer(level, level.damageSources().magic(), 2); + syncRequired = true; } @@ -365,6 +367,10 @@ private static void playerPowerTick(Player curPlayer, Level level) { if (data.isEnhanced() && data.isBurning(Metal.COPPER)) { curPlayer.addEffect(new MobEffectInstance(MobEffects.INVISIBILITY, 20, 50, true, false)); } + + if (syncRequired) { + Network.syncAllomancerData(curPlayer); + } } } } diff --git a/src/main/java/com/legobmw99/allomancy/modules/powers/client/network/ClientPayloadHandler.java b/src/main/java/com/legobmw99/allomancy/modules/powers/client/network/ClientPayloadHandler.java index 670cb9de..26f90bab 100644 --- a/src/main/java/com/legobmw99/allomancy/modules/powers/client/network/ClientPayloadHandler.java +++ b/src/main/java/com/legobmw99/allomancy/modules/powers/client/network/ClientPayloadHandler.java @@ -29,7 +29,7 @@ public static void updateAllomancer(AllomancerDataPayload payload, IPayloadConte if (burningAfter < burningBefore) { Sounds.soundForBurnChange(false); } - } else { + } else if (player != null) { player .getData(AllomancerAttachment.ALLOMANCY_DATA) .deserializeNBT(ctx.player().registryAccess(), payload.nbt()); 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 03ec0833..f782d7cb 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 @@ -151,7 +151,7 @@ public int getStored(Metal metal) { } public void incrementStored(Metal metal) { - if (this.metal_amounts[metal.getIndex()] <= MAX_STORAGE) { + if (this.metal_amounts[metal.getIndex()] < MAX_STORAGE) { this.metal_amounts[metal.getIndex()]++; } } 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 387d1673..d616a4a8 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 @@ -9,7 +9,6 @@ import net.minecraft.server.level.ServerLevel; import net.minecraft.server.level.ServerPlayer; 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.TeleportTransition; import net.minecraft.world.phys.AABB; @@ -26,14 +25,11 @@ private Enhancement() {} * * @param player The player to wipe */ - public static void wipePlayer(Player player) { + public static void wipePlayer(ServerPlayer player) { var data = player.getData(AllomancerAttachment.ALLOMANCY_DATA); data.drainMetals(Metal.values()); player.removeAllEffects(); - - if (player instanceof ServerPlayer sp) { - Network.syncAllomancerData(sp); - } + Network.syncAllomancerData(player); } /** @@ -44,27 +40,25 @@ public static void wipePlayer(Player player) { * @param dimension Dimension to call {@link Entity#changeDimension} on * @param pos BlockPos to move the player to using {@link Entity#teleportTo(double, double, double)} */ - private static void teleport(Player player, Level world, ResourceKey dimension, BlockPos pos) { - if (!world.isClientSide) { - if (player != null) { - if (player.isPassenger()) { - player.stopRiding(); - } - - if (player.level().dimension() != dimension) { - //change dimension - player = (Player) player.teleport( - new TeleportTransition(world.getServer().getLevel(dimension), Vec3.atBottomCenterOf(pos), - Vec3.ZERO, player.getXRot(), player.getYRot(), DO_NOTHING)); - } + private static void teleport(ServerPlayer player, ServerLevel world, ResourceKey dimension, BlockPos pos) { + if (player != null) { + if (player.isPassenger()) { + player.stopRiding(); + } - player.teleportTo(pos.getX(), pos.getY() + 1.5, pos.getZ()); - player.fallDistance = 0.0F; + if (player.level().dimension() != dimension) { + //change dimension + player = player.teleport( + new TeleportTransition(world.getServer().getLevel(dimension), Vec3.atBottomCenterOf(pos), + Vec3.ZERO, player.getXRot(), player.getYRot(), DO_NOTHING)); } + var center = pos.above().getCenter(); + player.teleportTo(center.x(), center.y(), center.z()); + player.fallDistance = 0.0F; } } - public static void teleportToLastDeath(Player curPlayer, Level level, IAllomancerData data) { + public static void teleportToLastDeath(ServerPlayer curPlayer, ServerLevel level, IAllomancerData data) { ResourceKey deathDim = data.getDeathDim(); if (deathDim != null) { teleport(curPlayer, level, deathDim, data.getDeathLoc()); @@ -75,7 +69,7 @@ public static void teleportToLastDeath(Player curPlayer, Level level, IAllomance } } - public static void teleportToSpawn(Player curPlayer, Level level, IAllomancerData data) { + public static void teleportToSpawn(ServerPlayer curPlayer, ServerLevel level, IAllomancerData data) { ResourceKey spawnDim = data.getSpawnDim(); BlockPos spawnLoc; @@ -94,12 +88,14 @@ public static void teleportToSpawn(Player curPlayer, Level level, IAllomancerDat data.drainMetals(Metal.ELECTRUM); } - public static void wipeNearby(Player curPlayer, Level level) { - if (level instanceof ServerLevel) { - int max = 20; - Vec3 negative = curPlayer.position().add(-max, -max, -max); - Vec3 positive = curPlayer.position().add(max, max, max); - level.getEntitiesOfClass(Player.class, new AABB(negative, positive)).forEach(Enhancement::wipePlayer); - } + public static void wipeNearby(ServerPlayer curPlayer, ServerLevel level) { + int max = 20; + Vec3 negative = curPlayer.position().add(-max, -max, -max); + Vec3 positive = curPlayer.position().add(max, max, max); + level + .getEntitiesOfClass(ServerPlayer.class, new AABB(negative, positive)) + .stream() + .filter(player -> !Emotional.hasTinFoilHat(player)) + .forEach(Enhancement::wipePlayer); } } diff --git a/src/main/java/com/legobmw99/allomancy/modules/powers/util/Temporal.java b/src/main/java/com/legobmw99/allomancy/modules/powers/util/Temporal.java index 14bff309..b0ee45aa 100644 --- a/src/main/java/com/legobmw99/allomancy/modules/powers/util/Temporal.java +++ b/src/main/java/com/legobmw99/allomancy/modules/powers/util/Temporal.java @@ -3,11 +3,10 @@ import com.legobmw99.allomancy.api.data.IAllomancerData; import net.minecraft.core.BlockPos; import net.minecraft.server.level.ServerLevel; +import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.effect.MobEffectInstance; import net.minecraft.world.effect.MobEffects; import net.minecraft.world.entity.LivingEntity; -import net.minecraft.world.entity.player.Player; -import net.minecraft.world.level.Level; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.EntityBlock; import net.minecraft.world.level.block.entity.BlockEntity; @@ -20,44 +19,42 @@ public final class Temporal { private Temporal() {} @SuppressWarnings("unchecked") - public static void speedUpNearby(Player curPlayer, Level level, IAllomancerData data) { + public static void speedUpNearby(ServerPlayer curPlayer, ServerLevel level, IAllomancerData data) { curPlayer.addEffect(new MobEffectInstance(MobEffects.DIG_SPEED, 10, 3, true, false)); - if (level instanceof ServerLevel serverLevel) { - int max = data.isEnhanced() ? 10 : 5; - BlockPos negative = curPlayer.blockPosition().offset(-max, -max, -max); - BlockPos positive = curPlayer.blockPosition().offset(max, max, max); - serverLevel - .getEntitiesOfClass(LivingEntity.class, AABB.encapsulatingFullBlocks(negative, positive)) - .forEach(entity -> { - entity.aiStep(); - entity.aiStep(); - }); - BlockPos.betweenClosedStream(negative, positive).forEach(bp -> { - BlockState block = level.getBlockState(bp); - BlockEntity te = level.getBlockEntity(bp); - if (te == null) { - if (block.isRandomlyTicking()) { - for (int i = 0; i < max * 4 / 15; i++) { - block.randomTick(serverLevel, bp, serverLevel.random); - } + int max = data.isEnhanced() ? 10 : 5; + BlockPos negative = curPlayer.blockPosition().offset(-max, -max, -max); + BlockPos positive = curPlayer.blockPosition().offset(max, max, max); + level + .getEntitiesOfClass(LivingEntity.class, AABB.encapsulatingFullBlocks(negative, positive)) + .forEach(entity -> { + entity.aiStep(); + entity.aiStep(); + }); + BlockPos.betweenClosedStream(negative, positive).forEach(bp -> { + BlockState block = level.getBlockState(bp); + BlockEntity te = level.getBlockEntity(bp); + if (te == null) { + if (block.isRandomlyTicking()) { + for (int i = 0; i < max * 4 / 15; i++) { + block.randomTick(level, bp, level.random); } - } else { - Block underlying_block = block.getBlock(); - if (underlying_block instanceof EntityBlock eb) { - BlockEntityTicker ticker = eb.getTicker(level, block, te.getType()); - if (ticker != null) { - for (int i = 0; i < max * 4 / 3; i++) { - ticker.tick(level, bp, block, te); - } + } + } else { + Block underlying_block = block.getBlock(); + if (underlying_block instanceof EntityBlock eb) { + BlockEntityTicker ticker = eb.getTicker(level, block, te.getType()); + if (ticker != null) { + for (int i = 0; i < max * 4 / 3; i++) { + ticker.tick(level, bp, block, te); } } } - }); - } + } + }); } - public static void slowDownNearby(Player curPlayer, Level level, IAllomancerData data) { + public static void slowDownNearby(ServerPlayer curPlayer, ServerLevel level, IAllomancerData data) { int max = data.isEnhanced() ? 20 : 10; Vec3 negative = curPlayer.position().add(-max, -max, -max); Vec3 positive = curPlayer.position().add(max, max, max); diff --git a/src/test/java/com/legobmw99/allomancy/test/AllomancyTest.java b/src/test/java/com/legobmw99/allomancy/test/AllomancyTest.java new file mode 100644 index 00000000..70000b51 --- /dev/null +++ b/src/test/java/com/legobmw99/allomancy/test/AllomancyTest.java @@ -0,0 +1,43 @@ +package com.legobmw99.allomancy.test; + +import com.legobmw99.allomancy.test.modules.consumables.recipe.GrinderCraftingTest; +import net.minecraft.resources.ResourceLocation; +import net.neoforged.bus.api.IEventBus; +import net.neoforged.fml.ModContainer; +import net.neoforged.fml.common.Mod; +import net.neoforged.testframework.conf.ClientConfiguration; +import net.neoforged.testframework.conf.Feature; +import net.neoforged.testframework.conf.FrameworkConfiguration; +import net.neoforged.testframework.impl.MutableTestFramework; +import net.neoforged.testframework.summary.GitHubActionsStepSummaryDumper; +import org.lwjgl.glfw.GLFW; + +@Mod(AllomancyTest.MODID) +public class AllomancyTest { + public static final String MODID = "allomancy_test"; + + public AllomancyTest(IEventBus bus, ModContainer container) { + final MutableTestFramework framework = FrameworkConfiguration + .builder(rl("tests")) + .clientConfiguration(() -> { + ClientConfiguration.Builder builder = ClientConfiguration.builder(); + builder.toggleOverlayKey(GLFW.GLFW_KEY_J); + builder.openManagerKey(GLFW.GLFW_KEY_N); + return builder.build(); + }) + .enable(Feature.CLIENT_SYNC, Feature.CLIENT_MODIFICATIONS, Feature.MAGIC_ANNOTATIONS, + Feature.GAMETEST) + .dumpers(new GitHubActionsStepSummaryDumper()) + .build() + .create(); + + GrinderCraftingTest.register(framework.tests()::register); + + framework.init(bus, container); + } + + + public static ResourceLocation rl(String path) { + return ResourceLocation.fromNamespaceAndPath(MODID, path); + } +} diff --git a/src/test/java/com/legobmw99/allomancy/test/modules/combat/CoinBagTest.java b/src/test/java/com/legobmw99/allomancy/test/modules/combat/CoinBagTest.java new file mode 100644 index 00000000..053be8eb --- /dev/null +++ b/src/test/java/com/legobmw99/allomancy/test/modules/combat/CoinBagTest.java @@ -0,0 +1,69 @@ +package com.legobmw99.allomancy.test.modules.combat; + +import com.legobmw99.allomancy.api.enums.Metal; +import com.legobmw99.allomancy.modules.combat.CombatSetup; +import com.legobmw99.allomancy.modules.materials.MaterialsSetup; +import com.legobmw99.allomancy.modules.powers.data.AllomancerAttachment; +import com.legobmw99.allomancy.test.util.AllomancyTestHelper; +import net.minecraft.gametest.framework.GameTest; +import net.minecraft.world.InteractionHand; +import net.minecraft.world.InteractionResult; +import net.minecraft.world.item.ItemStack; +import net.neoforged.testframework.annotation.ForEachTest; +import net.neoforged.testframework.annotation.TestHolder; +import net.neoforged.testframework.gametest.EmptyTemplate; + +import java.util.Set; + +@ForEachTest(groups = "items") + +public class CoinBagTest { + + @GameTest + @EmptyTemplate + @TestHolder(description = "Tests that clicking the coin bag creates an entity which drops the nugget fired") + public static void coinBagShoots(AllomancyTestHelper helper) { + var player = helper.makeMistbornPlayer(); + player.preventItemPickup(); + var data = player.getData(AllomancerAttachment.ALLOMANCY_DATA); + data.setBurning(Metal.STEEL, true); + + var nugget = MaterialsSetup.NUGGETS.get(Metal.CADMIUM.getIndex()).get(); + player.setItemInHand(InteractionHand.OFF_HAND, new ItemStack(nugget, 1)); + + helper + .startSequence() + .thenMap(() -> helper.useItem(player, CombatSetup.COIN_BAG)) + .thenExecute(res -> helper.assertTrue(res instanceof InteractionResult.Success, "failed to fire")) + .thenExecute(() -> { + helper.assertFalse(player.getInventory().hasAnyOf(Set.of(nugget)), "Player didn't spend ammo"); + helper.assertFalse(helper.getEntities(CombatSetup.NUGGET_PROJECTILE.get()).isEmpty(), + "Didn't spawn coin"); + }) + .thenExecuteAfter(10, () -> helper.assertItemEntityPresent(nugget)) + .thenSucceed(); + } + + + @GameTest + @EmptyTemplate + @TestHolder(description = "Tests that clicking the coin bag does nothing without steel") + public static void coinBagNeedsSteel(AllomancyTestHelper helper) { + var player = helper.makeMistbornPlayer(); + player.preventItemPickup(); + + var nugget = MaterialsSetup.NUGGETS.get(Metal.CADMIUM.getIndex()).get(); + player.setItemInHand(InteractionHand.OFF_HAND, new ItemStack(nugget, 1)); + + helper + .startSequence() + .thenMap(() -> helper.useItem(player, CombatSetup.COIN_BAG)) + .thenExecute(res -> helper.assertTrue(res instanceof InteractionResult.Fail, "Still fired")) + .thenExecute(() -> { + helper.assertTrue(player.getInventory().hasAnyOf(Set.of(nugget)), "Player spent ammo"); + helper.assertTrue(helper.getEntities(CombatSetup.NUGGET_PROJECTILE.get()).isEmpty(), + "Still spawned coin"); + }) + .thenSucceed(); + } +} diff --git a/src/test/java/com/legobmw99/allomancy/test/modules/combat/KolossBladeTest.java b/src/test/java/com/legobmw99/allomancy/test/modules/combat/KolossBladeTest.java new file mode 100644 index 00000000..6a666a38 --- /dev/null +++ b/src/test/java/com/legobmw99/allomancy/test/modules/combat/KolossBladeTest.java @@ -0,0 +1,77 @@ +package com.legobmw99.allomancy.test.modules.combat; + +import com.legobmw99.allomancy.api.enums.Metal; +import com.legobmw99.allomancy.modules.combat.CombatSetup; +import com.legobmw99.allomancy.modules.powers.data.AllomancerAttachment; +import com.legobmw99.allomancy.test.util.AllomancyTestHelper; +import net.minecraft.gametest.framework.GameTest; +import net.minecraft.world.InteractionHand; +import net.minecraft.world.effect.MobEffectInstance; +import net.minecraft.world.effect.MobEffects; +import net.neoforged.testframework.annotation.ForEachTest; +import net.neoforged.testframework.annotation.TestHolder; +import net.neoforged.testframework.gametest.EmptyTemplate; + +@ForEachTest(groups = "items") +public class KolossBladeTest { + + @GameTest + @EmptyTemplate("1x3x1") + @TestHolder(description = "Tests that a not-strong player gets debuffs from holding a Koloss sword") + public static void kolossBladeDebuffs(AllomancyTestHelper helper) { + var player = helper.makeTickingPlayer(); + + helper + .startSequence() + .thenExecute( + () -> player.setItemInHand(InteractionHand.MAIN_HAND, CombatSetup.KOLOSS_BLADE.toStack())) + .thenExecuteAfter(5, () -> { + helper.assertMobEffectPresent(player, MobEffects.DIG_SLOWDOWN, "Blade didn't cause fatigue"); + helper.assertMobEffectPresent(player, MobEffects.WEAKNESS, "Blade didn't cause weakness"); + helper.assertMobEffectPresent(player, MobEffects.MOVEMENT_SLOWDOWN, + "Blade didn't cause slowness"); + }) + .thenSucceed(); + } + + @GameTest + @EmptyTemplate("1x3x1") + @TestHolder(description = "Tests that a pewter burner can wield a Koloss sword") + public static void kolossBladePewter(AllomancyTestHelper helper) { + var player = helper.makeMistbornPlayer(); + var data = player.getData(AllomancerAttachment.ALLOMANCY_DATA); + + data.setBurning(Metal.PEWTER, true); + + helper + .startSequence() + .thenExecute( + () -> player.setItemInHand(InteractionHand.MAIN_HAND, CombatSetup.KOLOSS_BLADE.toStack())) + .thenExecuteAfter(5, () -> { + helper.assertMobEffectAbsent(player, MobEffects.DIG_SLOWDOWN, "Blade still caused fatigue"); + helper.assertMobEffectAbsent(player, MobEffects.WEAKNESS, "Blade still caused weakness"); + helper.assertMobEffectAbsent(player, MobEffects.MOVEMENT_SLOWDOWN, "Blade still caused slowness"); + }) + .thenSucceed(); + } + + @GameTest + @EmptyTemplate("1x3x1") + @TestHolder(description = "Tests that a strenghtened player can wield a Koloss sword") + public static void kolossBladeStrength(AllomancyTestHelper helper) { + var player = helper.makeTickingPlayer(); + + player.addEffect(new MobEffectInstance(MobEffects.DAMAGE_BOOST, -1, 2)); + + helper + .startSequence() + .thenExecute( + () -> player.setItemInHand(InteractionHand.MAIN_HAND, CombatSetup.KOLOSS_BLADE.toStack())) + .thenExecuteAfter(5, () -> { + helper.assertMobEffectAbsent(player, MobEffects.DIG_SLOWDOWN, "Blade still caused fatigue"); + helper.assertMobEffectAbsent(player, MobEffects.WEAKNESS, "Blade still caused weakness"); + helper.assertMobEffectAbsent(player, MobEffects.MOVEMENT_SLOWDOWN, "Blade still caused slowness"); + }) + .thenSucceed(); + } +} diff --git a/src/test/java/com/legobmw99/allomancy/test/modules/consumables/ConsumingTest.java b/src/test/java/com/legobmw99/allomancy/test/modules/consumables/ConsumingTest.java new file mode 100644 index 00000000..9538e7fb --- /dev/null +++ b/src/test/java/com/legobmw99/allomancy/test/modules/consumables/ConsumingTest.java @@ -0,0 +1,143 @@ +package com.legobmw99.allomancy.test.modules.consumables; + +import com.legobmw99.allomancy.api.enums.Metal; +import com.legobmw99.allomancy.modules.consumables.ConsumeSetup; +import com.legobmw99.allomancy.modules.consumables.item.VialItem; +import com.legobmw99.allomancy.modules.consumables.item.component.FlakeStorage; +import com.legobmw99.allomancy.modules.powers.data.AllomancerAttachment; +import com.legobmw99.allomancy.test.util.AllomancyTestHelper; +import net.minecraft.gametest.framework.GameTest; +import net.minecraft.world.Difficulty; +import net.minecraft.world.InteractionHand; +import net.minecraft.world.InteractionResult; +import net.minecraft.world.entity.EntityType; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.Items; +import net.neoforged.testframework.annotation.ForEachTest; +import net.neoforged.testframework.annotation.TestHolder; +import net.neoforged.testframework.gametest.EmptyTemplate; + +import static com.legobmw99.allomancy.modules.powers.data.AllomancerData.MAX_STORAGE; + +@ForEachTest(groups = "items") +public class ConsumingTest { + + @GameTest + @EmptyTemplate("1x10x1") + @TestHolder(description = "Tests that using Lerasium makes a player a Mistborn") + public static void lerasiumMakesMistborn(AllomancyTestHelper helper) { + var player = helper.makeTickingPlayer(); + + helper + .startSequence() + .thenMap(() -> helper.useItem(player, ConsumeSetup.LERASIUM_NUGGET)) + .thenWaitUntil(4, () -> { + helper.assertTrue(player.getItemInHand(InteractionHand.MAIN_HAND).isEmpty(), + "Lerasium never got eaten"); + helper.assertTrue(player.getData(AllomancerAttachment.ALLOMANCY_DATA).isMistborn(), + "Player never got invested"); + helper.assertFalse(helper.getEntities(EntityType.LIGHTNING_BOLT).isEmpty(), + "Didn't spawn lightning"); + }) + .thenIdle(4) + .thenSucceed(); + } + + + @GameTest + @EmptyTemplate("1x3x1") + @TestHolder(description = "Tests that existing Mistborn can't consume lerasium") + public static void mistbornCantEatLerasium(AllomancyTestHelper helper) { + var player = helper.makeMistbornPlayer(); + + helper + .startSequence() + .thenMap(() -> helper.useItem(player, ConsumeSetup.LERASIUM_NUGGET)) + .thenExecute(res -> helper.assertValueEqual(res, InteractionResult.FAIL, "Still consumed lerasium")) + .thenExecute(() -> helper.assertPlayerHasItem(player, ConsumeSetup.LERASIUM_NUGGET.get())) + .thenSucceed(); + } + + + @GameTest + @EmptyTemplate("1x3x1") + @TestHolder(description = "Tests that drinking a vial gives the player metals") + public static void vialIncreasesStorage(AllomancyTestHelper helper) { + var player = helper.makeTickingPlayer(); + var vial = new ItemStack(ConsumeSetup.VIAL.get(), 1); + VialItem.fillVial(vial, new FlakeStorage.Mutable().add(Metal.IRON).add(Metal.GOLD).toImmutable()); + var data = player.getData(AllomancerAttachment.ALLOMANCY_DATA); + for (int i = 0; i < MAX_STORAGE; i++) { + data.incrementStored(Metal.GOLD); + } + + helper.startSequence().thenMap(() -> helper.useItem(player, vial)).thenWaitUntil(6, () -> { + helper.assertValueEqual(player.getData(AllomancerAttachment.ALLOMANCY_DATA).getStored(Metal.IRON), 1, + "Player never got more metal"); + helper.assertValueEqual(player.getData(AllomancerAttachment.ALLOMANCY_DATA).getStored(Metal.GOLD), + MAX_STORAGE, "Player got too much gold"); + helper.assertFalse(player.getItemInHand(InteractionHand.MAIN_HAND).has(ConsumeSetup.FLAKE_STORAGE), + "Vial never got eaten"); + }).thenSucceed(); + } + + @GameTest + @EmptyTemplate("1x3x1") + @TestHolder(description = "Tests that you can't drink a vial when those metals are full") + public static void vialStopsWhenFull(AllomancyTestHelper helper) { + var player = helper.makeTickingPlayer(); + var vial = new ItemStack(ConsumeSetup.VIAL.get(), 1); + VialItem.fillVial(vial, new FlakeStorage.Mutable().add(Metal.IRON).toImmutable()); + var data = player.getData(AllomancerAttachment.ALLOMANCY_DATA); + for (int i = 0; i < MAX_STORAGE; i++) { + for (Metal m : Metal.values()) { + data.incrementStored(m); + } + } + + helper + .startSequence() + .thenMap(() -> helper.useItem(player, vial)) + .thenExecute(res -> helper.assertValueEqual(res, InteractionResult.FAIL, "Still consumed vial")) + .thenExecute(() -> { + helper.assertValueEqual(player.getData(AllomancerAttachment.ALLOMANCY_DATA).getStored(Metal.IRON), + MAX_STORAGE, "Player never got more metal"); + helper.assertTrue(player.getItemInHand(InteractionHand.MAIN_HAND).has(ConsumeSetup.FLAKE_STORAGE), + "Vial got eaten"); + }) + .thenSucceed(); + } + + + @GameTest + @EmptyTemplate("1x3x1") + @TestHolder(description = "Tests that consuming golden apples also grants stored gold") + public static void specialItemConsumption(AllomancyTestHelper helper) { + var player = helper.makeTickingPlayer(); + var vial = new ItemStack(ConsumeSetup.VIAL.get(), 1); + VialItem.fillVial(vial, new FlakeStorage.Mutable().add(Metal.IRON).add(Metal.GOLD).toImmutable()); + + + helper + .startSequence() + .thenExecute(() -> helper.requireDifficulty(Difficulty.HARD)) + .thenMap(() -> helper.useItem(player, Items.GOLDEN_APPLE)) + .thenExecute(res -> helper.assertValueEqual(res, InteractionResult.CONSUME, "Didn't eat")) + .thenWaitUntil(32, () -> { + helper.assertValueEqual(player.getData(AllomancerAttachment.ALLOMANCY_DATA).getStored(Metal.GOLD), + 1, "Player never got more metal"); + helper.assertTrue(player.getItemInHand(InteractionHand.MAIN_HAND).isEmpty(), + "Gapple never got eaten"); + }) + .thenMap(() -> helper.useItem(player, Items.ENCHANTED_GOLDEN_APPLE)) + .thenExecute(res -> helper.assertValueEqual(res, InteractionResult.CONSUME, "Didn't eat")) + .thenWaitUntil(32, () -> { + helper.assertValueEqual(player.getData(AllomancerAttachment.ALLOMANCY_DATA).getStored(Metal.GOLD), + 10, "Player never got more metal"); + helper.assertTrue(player.getItemInHand(InteractionHand.MAIN_HAND).isEmpty(), + "Gapple never got eaten"); + }) + .thenSucceed(); + } + +} \ No newline at end of file diff --git a/src/test/java/com/legobmw99/allomancy/test/modules/consumables/recipe/GrinderCraftingTest.java b/src/test/java/com/legobmw99/allomancy/test/modules/consumables/recipe/GrinderCraftingTest.java new file mode 100644 index 00000000..bf130c41 --- /dev/null +++ b/src/test/java/com/legobmw99/allomancy/test/modules/consumables/recipe/GrinderCraftingTest.java @@ -0,0 +1,67 @@ +package com.legobmw99.allomancy.test.modules.consumables.recipe; + +import com.legobmw99.allomancy.api.enums.Metal; +import com.legobmw99.allomancy.modules.consumables.ConsumeSetup; +import com.legobmw99.allomancy.modules.materials.MaterialsSetup; +import com.legobmw99.allomancy.test.AllomancyTest; +import com.legobmw99.allomancy.test.util.CallbackTest; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.Items; +import net.minecraft.world.level.levelgen.structure.templatesystem.StructureTemplate; +import net.neoforged.neoforge.gametest.GameTestHolder; +import net.neoforged.testframework.Test; +import net.neoforged.testframework.annotation.RegisterStructureTemplate; +import net.neoforged.testframework.gametest.StructureTemplateBuilder; + +import java.util.function.Consumer; +import java.util.function.Supplier; + +// for automation, this class is done in a more vanilla GameTest style. +@GameTestHolder(AllomancyTest.MODID) +public class GrinderCraftingTest { + + @RegisterStructureTemplate(AllomancyTest.MODID + ":crafter") + public static final StructureTemplate CRAFTER = StructureTemplateBuilder.empty(1, 2, 2); + + + private static Item getIngotItem(int metal_idx) { + Supplier res = MaterialsSetup.INGOTS.get(metal_idx); + if (res != null) { + return res.get(); + } + return switch (Metal.values()[metal_idx]) { + case IRON -> Items.IRON_INGOT; + case COPPER -> Items.COPPER_INGOT; + case GOLD -> Items.GOLD_INGOT; + default -> throw new IllegalStateException("Unexpected value: " + metal_idx); + }; + } + + private static String getMetalName(int metal_idx) { + if (metal_idx == MaterialsSetup.LEAD) { + return "lead"; + } + if (metal_idx == MaterialsSetup.SILVER) { + return "silver"; + } + return Metal.values()[metal_idx].getName(); + } + + + public static void register(Consumer add) { + String structureName = AllomancyTest.MODID + ":crafter"; + for (int i = 0; i < MaterialsSetup.METAL_ITEM_LEN; i++) { + int I = i; + add.accept(new CallbackTest("crafting_" + getMetalName(i) + "_flakes", helper -> { + var ingot = getIngotItem(I); + var flake = MaterialsSetup.FLAKES.get(I).get(); + helper.succeedIfCrafts(barrel -> { + var craftedFlake = barrel.getItem(0).is(flake) && barrel.getItem(0).getCount() == 2; + var retainedGrinder = barrel.getItem(1).is(ConsumeSetup.ALLOMANTIC_GRINDER.get()); + var damagedGrinder = barrel.getItem(1).getDamageValue() == 1; + return craftedFlake && retainedGrinder && damagedGrinder; + }, () -> "Failed to craft flakes", ConsumeSetup.ALLOMANTIC_GRINDER, ingot); + }, structureName, "crafting")); + } + } +} diff --git a/src/test/java/com/legobmw99/allomancy/test/modules/consumables/recipe/VialCraftingTest.java b/src/test/java/com/legobmw99/allomancy/test/modules/consumables/recipe/VialCraftingTest.java new file mode 100644 index 00000000..148c998d --- /dev/null +++ b/src/test/java/com/legobmw99/allomancy/test/modules/consumables/recipe/VialCraftingTest.java @@ -0,0 +1,44 @@ +package com.legobmw99.allomancy.test.modules.consumables.recipe; + +import com.legobmw99.allomancy.api.enums.Metal; +import com.legobmw99.allomancy.modules.consumables.ConsumeSetup; +import com.legobmw99.allomancy.modules.consumables.item.VialItem; +import com.legobmw99.allomancy.modules.consumables.item.component.FlakeStorage; +import com.legobmw99.allomancy.modules.materials.MaterialsSetup; +import com.legobmw99.allomancy.test.util.AllomancyTestHelper; +import net.minecraft.gametest.framework.GameTest; +import net.minecraft.world.item.ItemStack; +import net.neoforged.testframework.annotation.ForEachTest; +import net.neoforged.testframework.annotation.TestHolder; +import net.neoforged.testframework.gametest.EmptyTemplate; + +@ForEachTest(groups = "crafting") +public class VialCraftingTest { + + @GameTest + @EmptyTemplate("1x2x2") + @TestHolder(description = "Tests that vial crafting works for multiple flakes") + public static void vialCraftingWorks(AllomancyTestHelper helper) { + helper.succeedIfCrafts(barrel -> { + ItemStack out = barrel.getItem(0); + return out.getCount() == 1 && out.is(ConsumeSetup.VIAL.get()) && + out.get(ConsumeSetup.FLAKE_STORAGE).contains(Metal.IRON) && + out.get(ConsumeSetup.FLAKE_STORAGE).contains(Metal.GOLD); + }, () -> "Didn't craft vial!", ConsumeSetup.VIAL, + MaterialsSetup.FLAKES.get(Metal.IRON.getIndex()), + MaterialsSetup.FLAKES.get(Metal.GOLD.getIndex())); + } + + + @GameTest + @EmptyTemplate("1x2x2") + @TestHolder(description = "Tests that vial crafting is prevented if a specific metal is already present") + public static void vialCraftingPreventDupes(AllomancyTestHelper helper) { + var vial = new ItemStack(ConsumeSetup.VIAL.get(), 1); + VialItem.fillVial(vial, new FlakeStorage.Mutable().add(Metal.IRON).toImmutable()); + + helper.succeedIfCraftingFails(vial, MaterialsSetup.FLAKES.get(Metal.IRON.getIndex()), + MaterialsSetup.FLAKES.get(Metal.GOLD.getIndex())); + + } +} diff --git a/src/test/java/com/legobmw99/allomancy/test/modules/extras/BlocksTest.java b/src/test/java/com/legobmw99/allomancy/test/modules/extras/BlocksTest.java new file mode 100644 index 00000000..f95754fe --- /dev/null +++ b/src/test/java/com/legobmw99/allomancy/test/modules/extras/BlocksTest.java @@ -0,0 +1,146 @@ +package com.legobmw99.allomancy.test.modules.extras; + +import com.legobmw99.allomancy.modules.extras.ExtrasSetup; +import com.legobmw99.allomancy.test.util.AllomancyTestHelper; +import net.minecraft.core.BlockPos; +import net.minecraft.core.Direction; +import net.minecraft.gametest.framework.GameTest; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.Items; +import net.minecraft.world.level.block.Blocks; +import net.minecraft.world.level.block.LeverBlock; +import net.minecraft.world.level.block.entity.DispenserBlockEntity; +import net.minecraft.world.level.block.state.properties.AttachFace; +import net.minecraft.world.level.block.state.properties.BlockStateProperties; +import net.neoforged.testframework.annotation.ForEachTest; +import net.neoforged.testframework.annotation.TestHolder; +import net.neoforged.testframework.gametest.EmptyTemplate; +import net.neoforged.testframework.gametest.ExtendedGameTestHelper; + +@ForEachTest(groups = "blocks") +public class BlocksTest { + + + @GameTest + @EmptyTemplate + @TestHolder(description = "Tests that blocks have expected capability") + public static void haveCaps(ExtendedGameTestHelper helper) { + + BlockPos button = new BlockPos(1, 2, 1); + BlockPos inv_button = button.east(); + BlockPos lever = button.west(); + BlockPos bell = button.north(); + + helper + .startSequence() + .thenExecute(() -> helper.setBlock(bell, Blocks.BELL)) + .thenExecute(() -> helper.setBlock(button.below(), Blocks.REDSTONE_LAMP)) + .thenExecute(() -> helper.setBlock(button, ExtrasSetup.IRON_BUTTON + .get() + .defaultBlockState() + .setValue(LeverBlock.FACE, AttachFace.FLOOR))) + .thenExecute(() -> helper.setBlock(inv_button.below(), Blocks.REDSTONE_LAMP)) + .thenExecute(() -> helper.setBlock(inv_button, ExtrasSetup.INVERTED_IRON_BUTTON + .get() + .defaultBlockState() + .setValue(LeverBlock.FACE, AttachFace.FLOOR))) + .thenExecute(() -> helper.setBlock(lever.below(), Blocks.REDSTONE_LAMP)) + .thenExecute(() -> helper.setBlock(lever, ExtrasSetup.IRON_LEVER + .get() + .defaultBlockState() + .setValue(LeverBlock.FACE, AttachFace.FLOOR))) + .thenExecute(() -> { + helper.requireCapability(ExtrasSetup.ALLOMANTICALLY_USABLE_BLOCK, bell, null); + helper.requireCapability(ExtrasSetup.ALLOMANTICALLY_USABLE_BLOCK, button, null); + helper.requireCapability(ExtrasSetup.ALLOMANTICALLY_USABLE_BLOCK, inv_button, null); + helper.requireCapability(ExtrasSetup.ALLOMANTICALLY_USABLE_BLOCK, lever, null); + }) + .thenSucceed(); + + } + + + @GameTest + @EmptyTemplate + @TestHolder(description = "Tests that you can't just click to use the iron redstone components") + public static void cantJustClick(AllomancyTestHelper helper) { + + BlockPos button = new BlockPos(1, 2, 1); + BlockPos inv_button = button.east(); + BlockPos lever = button.west(); + + var player = helper.makeTickingPlayer(); + helper + .startSequence() + .thenExecute(() -> helper.setBlock(button.below(), Blocks.REDSTONE_LAMP)) + .thenExecute(() -> helper.setBlock(button, ExtrasSetup.IRON_BUTTON + .get() + .defaultBlockState() + .setValue(LeverBlock.FACE, AttachFace.FLOOR))) + .thenExecute(() -> helper.setBlock(inv_button.below(), Blocks.REDSTONE_LAMP)) + .thenExecute(() -> helper.setBlock(inv_button, ExtrasSetup.INVERTED_IRON_BUTTON + .get() + .defaultBlockState() + .setValue(LeverBlock.FACE, AttachFace.FLOOR))) + .thenExecute(() -> helper.setBlock(lever.below(), Blocks.REDSTONE_LAMP)) + .thenExecute(() -> helper.setBlock(lever, ExtrasSetup.IRON_LEVER + .get() + .defaultBlockState() + .setValue(LeverBlock.FACE, AttachFace.FLOOR))) + .thenExecute(() -> { + helper.useBlock(button, player); + helper.useBlock(inv_button, player); + helper.useBlock(lever, player); + }) + .thenExecuteAfter(5, () -> { + helper.assertBlockProperty(button.below(), BlockStateProperties.LIT, false); + helper.assertBlockProperty(inv_button.below(), BlockStateProperties.LIT, false); + helper.assertBlockProperty(lever.below(), BlockStateProperties.LIT, false); + }) + .thenSucceed(); + + } + + + @GameTest + @EmptyTemplate("3x4x3") + @TestHolder(description = "Tests that wind charges don't activate the iron redstone components") + public static void chargesDoNothing(ExtendedGameTestHelper helper) { + + BlockPos button = new BlockPos(1, 1, 1); + BlockPos inv_button = button.east(); + BlockPos lever = button.west(); + + helper + .startSequence() + .thenExecute(() -> helper.setBlock(button.below(), Blocks.REDSTONE_LAMP)) + .thenExecute(() -> helper.setBlock(button, ExtrasSetup.IRON_BUTTON + .get() + .defaultBlockState() + .setValue(LeverBlock.FACE, AttachFace.FLOOR))) + .thenExecute(() -> helper.setBlock(inv_button.below(), Blocks.REDSTONE_LAMP)) + .thenExecute(() -> helper.setBlock(inv_button, ExtrasSetup.INVERTED_IRON_BUTTON + .get() + .defaultBlockState() + .setValue(LeverBlock.FACE, AttachFace.FLOOR))) + .thenExecute(() -> helper.setBlock(lever.below(), Blocks.REDSTONE_LAMP)) + .thenExecute(() -> helper.setBlock(lever, ExtrasSetup.IRON_LEVER + .get() + .defaultBlockState() + .setValue(LeverBlock.FACE, AttachFace.FLOOR))) + .thenExecute(() -> helper.setBlock(1, 3, 1, Blocks.DISPENSER + .defaultBlockState() + .setValue(BlockStateProperties.FACING, Direction.DOWN))) + .thenExecute(() -> helper + .getBlockEntity(1, 3, 1, DispenserBlockEntity.class) + .setItem(0, new ItemStack(Items.WIND_CHARGE, 1))) + .thenExecute(() -> helper.pulseRedstone(1, 3, 2, 0)) + .thenExecuteAfter(10, () -> { + helper.assertBlockProperty(button.below(), BlockStateProperties.LIT, false); + helper.assertBlockProperty(inv_button.below(), BlockStateProperties.LIT, false); + helper.assertBlockProperty(lever.below(), BlockStateProperties.LIT, false); + }) + .thenSucceed(); + + } +} diff --git a/src/test/java/com/legobmw99/allomancy/test/modules/extras/CommandTest.java b/src/test/java/com/legobmw99/allomancy/test/modules/extras/CommandTest.java new file mode 100644 index 00000000..3b2993f9 --- /dev/null +++ b/src/test/java/com/legobmw99/allomancy/test/modules/extras/CommandTest.java @@ -0,0 +1,95 @@ +package com.legobmw99.allomancy.test.modules.extras; + +import com.legobmw99.allomancy.modules.powers.data.AllomancerAttachment; +import com.legobmw99.allomancy.test.util.TattleTaleStack; +import net.minecraft.commands.Commands; +import net.minecraft.core.BlockPos; +import net.minecraft.gametest.framework.GameTest; +import net.minecraft.world.phys.Vec3; +import net.neoforged.testframework.annotation.ForEachTest; +import net.neoforged.testframework.annotation.TestHolder; +import net.neoforged.testframework.gametest.EmptyTemplate; +import net.neoforged.testframework.gametest.ExtendedGameTestHelper; + +@ForEachTest(groups = "command") +public class CommandTest { + + @GameTest + @EmptyTemplate("1x3x1") + @TestHolder(description = "Tests that you can add and remove powers") + public static void allomancyPowerWorks(ExtendedGameTestHelper helper) { + var player = helper.makeOpMockPlayer(Commands.LEVEL_GAMEMASTERS); + var stack = TattleTaleStack.createCommandSourceStack(player); + + helper.startSequence() + // add random power + .thenExecute(() -> helper + .getLevel() + .getServer() + .getCommands() + .performPrefixedCommand(stack, "/ap add random")).thenExecuteAfter(5, () -> { + helper.assertFalse(stack.hadError(), "Command failed: " + stack.errors()); + helper.assertFalse(player.getData(AllomancerAttachment.ALLOMANCY_DATA).isUninvested(), + "Player is still uninvested"); + + }) + // remove it + .thenExecute(() -> helper + .getLevel() + .getServer() + .getCommands() + .performPrefixedCommand(stack, "/allomancy remove random")).thenExecuteAfter(5, () -> { + helper.assertFalse(stack.hadError(), "Command failed: " + stack.errors()); + helper.assertTrue(player.getData(AllomancerAttachment.ALLOMANCY_DATA).isUninvested(), + "Player is still invested"); + }).thenSucceed(); + } + + @GameTest + @EmptyTemplate("1x3x1") + @TestHolder(description = "Tests that normal players can't use /ap") + public static void allomancyPowerNeedsPerms(ExtendedGameTestHelper helper) { + var player = helper.makeOpMockPlayer(Commands.LEVEL_ALL); + var stack = TattleTaleStack.createCommandSourceStack(player); + + helper.startSequence() + // add random power + .thenExecute(() -> helper + .getLevel() + .getServer() + .getCommands() + .performPrefixedCommand(stack, "/ap add random")).thenExecuteAfter(5, () -> { + + helper.assertTrue(stack.hadError(), "No permission error"); + helper.assertTrue(player.getData(AllomancerAttachment.ALLOMANCY_DATA).isUninvested(), + "Player got invested"); + }).thenSucceed(); + } + + @GameTest + @EmptyTemplate("1x3x1") + @TestHolder(description = "Tests that anyone can use /ap get") + public static void allomancyGet(ExtendedGameTestHelper helper) { + var player = helper.makeOpMockPlayer(Commands.LEVEL_ALL); + player.moveTo(Vec3.atCenterOf(helper.absolutePos(BlockPos.ZERO))); + var data = player.getData(AllomancerAttachment.ALLOMANCY_DATA); + data.setMistborn(); + var stack = TattleTaleStack.createCommandSourceStack(player); + + helper.startSequence() + // add random power + .thenExecute(() -> helper + .getLevel() + .getServer() + .getCommands() + .performPrefixedCommand(stack, "/allomancy get")).thenExecuteAfter(5, () -> { + helper.assertFalse(stack.hadError(), "Command failed: " + stack.errors()); + helper.assertValueEqual(stack.results(), + player.getScoreboardName() + " currently has Allomantic powers: all", + "Get command result"); + }).thenSucceed(); + } + + +} + diff --git a/src/test/java/com/legobmw99/allomancy/test/modules/powers/DataTest.java b/src/test/java/com/legobmw99/allomancy/test/modules/powers/DataTest.java new file mode 100644 index 00000000..c7d0d806 --- /dev/null +++ b/src/test/java/com/legobmw99/allomancy/test/modules/powers/DataTest.java @@ -0,0 +1,81 @@ +package com.legobmw99.allomancy.test.modules.powers; + +import com.legobmw99.allomancy.api.enums.Metal; +import com.legobmw99.allomancy.modules.materials.MaterialsSetup; +import com.legobmw99.allomancy.modules.powers.data.AllomancerAttachment; +import com.legobmw99.allomancy.test.util.AllomancyTestHelper; +import net.minecraft.gametest.framework.GameTest; +import net.minecraft.world.InteractionHand; +import net.minecraft.world.entity.Entity; +import net.minecraft.world.level.GameType; +import net.minecraft.world.level.Level; +import net.neoforged.testframework.annotation.ForEachTest; +import net.neoforged.testframework.annotation.TestHolder; +import net.neoforged.testframework.gametest.EmptyTemplate; +import net.neoforged.testframework.gametest.ExtendedGameTestHelper; + +@ForEachTest(groups = "data") +public class DataTest { + @GameTest + @EmptyTemplate("1x3x1") + @TestHolder(description = "Tests that an empty cap is uninvested") + public static void emptyDataTest(ExtendedGameTestHelper helper) { + var player = helper.makeMockPlayer(GameType.SURVIVAL); + var data = player.getData(AllomancerAttachment.ALLOMANCY_DATA); + + helper.assertTrue(data.isUninvested(), "Default data is invested"); + helper.succeed(); + } + + @GameTest + @EmptyTemplate("1x3x1") + @TestHolder(description = "Tests that a new player is made a Misting and given a flake") + public static void randomMistingTest(AllomancyTestHelper helper) { + var player = helper.makeTickingPlayer(); + var data = player.getData(AllomancerAttachment.ALLOMANCY_DATA); + + helper.assertFalse(data.isUninvested(), "Player is not misting"); + helper.assertFalse(data.isMistborn(), "Player is full mistborn"); + helper.assertTrue(player.getItemInHand(InteractionHand.MAIN_HAND).is(MaterialsSetup.FLAKES_TAG), + "Misting wasn't given flake"); + helper.succeed(); + } + + + @GameTest + @EmptyTemplate("1x3x1") + @TestHolder(description = "Tests that data is handled correctly during various respawns") + public static void dataOnRespawnTest(AllomancyTestHelper helper) { + var player = helper.makeMistbornPlayer(); + + player.setRespawnPosition(Level.OVERWORLD, player.blockPosition(), 0.0f, true, true); + + var returningPlayer = + player.getServer().getPlayerList().respawn(player, true, Entity.RemovalReason.CHANGED_DIMENSION); + + helper.assertTrue(returningPlayer.getData(AllomancerAttachment.ALLOMANCY_DATA).isMistborn(), + "Player lost investment on teleport"); + helper.assertTrue(returningPlayer.getData(AllomancerAttachment.ALLOMANCY_DATA).getStored(Metal.STEEL) == 10, + "Player lost inventory on teleport"); + + var respawnedPlayer = + player.getServer().getPlayerList().respawn(returningPlayer, false, Entity.RemovalReason.KILLED); + + helper.assertTrue(respawnedPlayer.getData(AllomancerAttachment.ALLOMANCY_DATA).isMistborn(), + "Player lost investment on death"); + helper.assertTrue(respawnedPlayer.getData(AllomancerAttachment.ALLOMANCY_DATA).getStored(Metal.STEEL) == 0, + "Player kept inventory on death"); + + + var respawnedPlayerKeepInv = + player.getServer().getPlayerList().respawn(returningPlayer, true, Entity.RemovalReason.KILLED); + + helper.assertTrue(respawnedPlayerKeepInv.getData(AllomancerAttachment.ALLOMANCY_DATA).isMistborn(), + "Player lost investment on death"); + helper.assertTrue( + respawnedPlayerKeepInv.getData(AllomancerAttachment.ALLOMANCY_DATA).getStored(Metal.STEEL) == 10, + "Player lost inventory with KeepInventory"); + + helper.succeed(); + } +} diff --git a/src/test/java/com/legobmw99/allomancy/test/modules/powers/PassivePowerTest.java b/src/test/java/com/legobmw99/allomancy/test/modules/powers/PassivePowerTest.java new file mode 100644 index 00000000..17727c06 --- /dev/null +++ b/src/test/java/com/legobmw99/allomancy/test/modules/powers/PassivePowerTest.java @@ -0,0 +1,347 @@ +package com.legobmw99.allomancy.test.modules.powers; + +import com.legobmw99.allomancy.api.enums.Metal; +import com.legobmw99.allomancy.modules.combat.CombatSetup; +import com.legobmw99.allomancy.modules.materials.MaterialsSetup; +import com.legobmw99.allomancy.modules.powers.data.AllomancerAttachment; +import com.legobmw99.allomancy.test.AllomancyTest; +import com.legobmw99.allomancy.test.util.AllomancyTestHelper; +import net.minecraft.core.BlockPos; +import net.minecraft.gametest.framework.GameTest; +import net.minecraft.world.InteractionHand; +import net.minecraft.world.effect.MobEffectInstance; +import net.minecraft.world.effect.MobEffects; +import net.minecraft.world.entity.EntityType; +import net.minecraft.world.entity.EquipmentSlot; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.Items; +import net.minecraft.world.level.Level; +import net.minecraft.world.level.block.Blocks; +import net.minecraft.world.level.block.CropBlock; +import net.minecraft.world.level.block.FarmBlock; +import net.minecraft.world.level.block.entity.FurnaceBlockEntity; +import net.minecraft.world.level.levelgen.structure.templatesystem.StructureTemplate; +import net.neoforged.testframework.annotation.ForEachTest; +import net.neoforged.testframework.annotation.RegisterStructureTemplate; +import net.neoforged.testframework.annotation.TestHolder; +import net.neoforged.testframework.gametest.EmptyTemplate; +import net.neoforged.testframework.gametest.StructureTemplateBuilder; + +import java.util.List; + +@ForEachTest(groups = "passive_powers") +public class PassivePowerTest { + + @GameTest + @EmptyTemplate("1x3x1") + @TestHolder(description = "Tests that burning aluminum drains all metals and removes effects") + public static void aluminiumDrainsInstantly(AllomancyTestHelper helper) { + var player = helper.makeMistbornPlayer(); + var data = player.getData(AllomancerAttachment.ALLOMANCY_DATA); + + player.addEffect(new MobEffectInstance(MobEffects.FIRE_RESISTANCE, -1, 0, true, true)); + + data.setBurning(Metal.PEWTER, true); + data.setBurning(Metal.ALUMINUM, true); + + + helper.succeedOnTickWhen(1, () -> { + helper.assertFalse(data.isBurning(Metal.ALUMINUM), "Aluminum still burning after a tick"); + helper.assertTrue(data.getStored(Metal.PEWTER) == 0, + "Pewter (burning) was not drained by burning Aluminum"); + helper.assertTrue(data.getStored(Metal.STEEL) == 0, + "Steel (extinguished) was not drained by burning Aluminum"); + helper.assertFalse(data.isBurning(Metal.PEWTER), "Pewter still burning after empty"); + helper.assertTrue(player.getActiveEffects().isEmpty(), "Aluminium didn't remove effects"); + }); + } + + @GameTest + @EmptyTemplate("1x3x1") + @TestHolder(description = "Tests that duralumin drains all burning metals when it runs out") + public static void duraluminDrainsWhenExtinguished(AllomancyTestHelper helper) { + var player = helper.makeMistbornPlayer(); + var data = player.getData(AllomancerAttachment.ALLOMANCY_DATA); + data.setBurning(Metal.PEWTER, true); + data.drainMetals(List.of(Metal.DURALUMIN).toArray(Metal[]::new)); + data.incrementStored(Metal.DURALUMIN); + data.setBurning(Metal.DURALUMIN, true); + + // wait until it burns out + helper.succeedOnTickWhen(41, () -> { + helper.assertFalse(data.isBurning(Metal.DURALUMIN), "Duralumin still burning"); + helper.assertTrue(data.getStored(Metal.PEWTER) == 0, + "Pewter (burning) was not drained by extinguishing Duralumin"); + helper.assertTrue(data.getStored(Metal.STEEL) == 10, + "Steel (extinguished) was drained by extinguishing Duralumin"); + helper.assertFalse(data.isBurning(Metal.PEWTER), "Pewter still burning after empty"); + }); + } + + @GameTest + @EmptyTemplate("1x3x1") + @TestHolder(description = "Tests that burning tin removes blindness and grants night vision") + public static void tinClearsBlindness(AllomancyTestHelper helper) { + var player = helper.makeMistbornPlayer(); + var data = player.getData(AllomancerAttachment.ALLOMANCY_DATA); + + player.addEffect(new MobEffectInstance(MobEffects.BLINDNESS, -1, 0, true, true)); + + data.setBurning(Metal.TIN, true); + + helper.succeedOnTickWhen(1, () -> { + helper.assertMobEffectAbsent(player, MobEffects.BLINDNESS, "Tin didn't remove blindness"); + helper.assertMobEffectPresent(player, MobEffects.NIGHT_VISION, "Tin didn't grant night vision"); + }); + } + + @GameTest + @EmptyTemplate("1x3x1") + @TestHolder(description = "Tests that pewter provides general buff potion effects") + public static void pewterGivesBuffs(AllomancyTestHelper helper) { + var player = helper.makeMistbornPlayer(); + var data = player.getData(AllomancerAttachment.ALLOMANCY_DATA); + + data.setBurning(Metal.PEWTER, true); + + helper.succeedOnTickWhen(1, () -> { + helper.assertMobEffectPresent(player, MobEffects.MOVEMENT_SPEED, "Pewter didn't grant speed"); + helper.assertMobEffectPresent(player, MobEffects.DIG_SPEED, "Pewter didn't grant haste"); + helper.assertMobEffectPresent(player, MobEffects.JUMP, "Pewter didn't grant jump boost"); + }); + } + + @GameTest(timeoutTicks = 150) + @EmptyTemplate("1x3x1") + @TestHolder(description = "Tests that pewter stores some of the damage it prevents") + public static void pewterPreventsAndStoresSomeDamage(AllomancyTestHelper helper) { + var player = helper.makeMistbornPlayer(); + var data = player.getData(AllomancerAttachment.ALLOMANCY_DATA); + helper + .startSequence() + .thenExecute(() -> { + player.causeFoodExhaustion(40); + data.setBurning(Metal.PEWTER, true); + }) + .thenExecute(() -> helper.setBlock(0, 0, 0, Blocks.CACTUS)) + .thenIdle(40) + + .thenExecute(() -> helper.assertValueEqual(player.getHealth(), player.getMaxHealth(), + "Player health after some paper cuts")) + .thenExecute(() -> { + data.setBurning(Metal.PEWTER, false); + helper.setBlock(0, 0, 0, Blocks.AIR); + }) + .thenIdle(80) + .thenExecute(() -> helper.assertTrue(Math.abs(2.0 - player.getHealth()) < 0.0001, + "Player not damaged after pewter extinguished: " + + player.getHealth())) + .thenSucceed(); + } + + @GameTest(timeoutTicks = 400) + @EmptyTemplate("1x3x1") + @TestHolder(description = "Tests that duralumin and tin may give you nausea") + public static void duraluminTinMakesYouIll(AllomancyTestHelper helper) { + // technically random + var player = helper.makeMistbornPlayer(); + var data = player.getData(AllomancerAttachment.ALLOMANCY_DATA); + + data.setBurning(Metal.TIN, true); + data.setBurning(Metal.DURALUMIN, true); + + helper.succeedWhen(() -> { + helper.assertTrue(data.isEnhanced(), "Duralumin isn't enhancing"); + helper.assertMobEffectPresent(player, MobEffects.CONFUSION, "Player is not confused"); + }); + } + + @GameTest + @EmptyTemplate("1x3x1") + @TestHolder(description = "Tests that duralumin and pewter cancel damage") + public static void duraluminPewterMakesInvuln(AllomancyTestHelper helper) { + var player = helper.makeMistbornPlayer(); + var data = player.getData(AllomancerAttachment.ALLOMANCY_DATA); + helper + .startSequence() + .thenExecute(() -> { + data.setBurning(Metal.PEWTER, true); + data.setBurning(Metal.DURALUMIN, true); + }) + .thenIdle(1) + .thenMap(() -> player.hurtServer(player.serverLevel(), player.damageSources().wither(), 100)) + .thenExecute(res -> helper.assertFalse(res, "Player still injured")) + .thenExecute(() -> helper.assertValueEqual(player.getHealth(), player.getMaxHealth(), + "Player health changed")) + .thenSucceed(); + } + + + @GameTest + @EmptyTemplate(value = "5x3x5", floor = true) + @TestHolder(description = "Tests that duralumin and pewter let you instakill with the Koloss sword") + public static void duraluminPewterDamageOutput(AllomancyTestHelper helper) { + var player = helper.makeMistbornPlayer(); + var data = player.getData(AllomancerAttachment.ALLOMANCY_DATA); + helper + .startSequence() + .thenExecute(() -> { + data.setBurning(Metal.PEWTER, true); + data.setBurning(Metal.DURALUMIN, true); + }) + .thenIdle(1) + .thenMap(() -> helper.spawnWithNoFreeWill(EntityType.WITHER, 1, 0, 1)) + .thenExecute( + wither -> wither.hurtServer(player.serverLevel(), player.damageSources().playerAttack(player), + 4)) + .thenExecute( + wither -> helper.assertTrue(Math.abs((wither.getMaxHealth() - 12) - wither.getHealth()) < 1, + "Wither damaged an unexpected amount")) + .thenExecute( + () -> player.setItemInHand(InteractionHand.MAIN_HAND, CombatSetup.KOLOSS_BLADE.toStack())) + .thenExecute( + wither -> wither.hurtServer(player.serverLevel(), player.damageSources().playerAttack(player), + 1)) + .thenExecute(wither -> helper.assertTrue(wither.isDeadOrDying(), "Wither lived")) + .thenSucceed(); + } + + + + @GameTest + @EmptyTemplate(value = "5x3x5", floor = true) + @TestHolder(description = "Tests that duralumin and electrum moves you to your spawn") + public static void duraluminElectrumMovesToSpawn(AllomancyTestHelper helper) { + var player = helper.makeMistbornPlayer(); + player.moveToCorner(); + var data = player.getData(AllomancerAttachment.ALLOMANCY_DATA); + + var farCorner = helper.absolutePos(new BlockPos(4, 0, 4)); + player.setRespawnPosition(Level.OVERWORLD, farCorner, 0.0f, true, true); + data.setBurning(Metal.ELECTRUM, true); + data.setBurning(Metal.DURALUMIN, true); + + + helper.succeedOnTickWhen(1, () -> { + helper.assertFalse(data.isBurning(Metal.ELECTRUM), "Electrum didn't extinguish"); + helper.assertTrue(data.getStored(Metal.ELECTRUM) == 0, "Electrum didn't run out"); + helper.assertTrue(data.getStored(Metal.DURALUMIN) == 0, "Duralumin didn't run out"); + helper.assertEntityInstancePresent(player, new BlockPos(4, 2, 4)); + }); + } + + @GameTest + @EmptyTemplate(value = "5x3x5", floor = true) + @TestHolder(description = "Tests that duralumin and gold moves you to your death location") + public static void duraluminGoldMovesToDeath(AllomancyTestHelper helper) { + var player = helper.makeMistbornPlayer(); + player.moveToCorner(); + var data = player.getData(AllomancerAttachment.ALLOMANCY_DATA); + + var farCorner = helper.absolutePos(new BlockPos(4, 0, 4)); + // can't test actual death due to it creating a non-GameTestPlayer + data.setDeathLoc(farCorner, player.level().dimension()); + data.setBurning(Metal.GOLD, true); + data.setBurning(Metal.DURALUMIN, true); + helper.succeedOnTickWhen(1, () -> { + helper.assertFalse(data.isBurning(Metal.GOLD), "Gold didn't extinguish"); + helper.assertTrue(data.getStored(Metal.GOLD) == 0, "Gold didn't run out"); + helper.assertTrue(data.getStored(Metal.DURALUMIN) == 0, "Duralumin didn't run out"); + helper.assertEntityInstancePresent(player, new BlockPos(4, 2, 4)); + }); + } + + @GameTest + @EmptyTemplate(value = "5x3x5", floor = true) + @TestHolder(description = "Tests that duralumin and chrome wipes nearby players") + public static void duraluminChromeWipesOthers(AllomancyTestHelper helper) { + var player = helper.makeMistbornPlayer(); + var data = player.getData(AllomancerAttachment.ALLOMANCY_DATA); + + data.setBurning(Metal.CHROMIUM, true); + data.setBurning(Metal.DURALUMIN, true); + + var player2 = helper.makeMistbornPlayer(); + player2.moveToCorner(); + player2.setItemSlot(EquipmentSlot.HEAD, ItemStack.EMPTY); + var data2 = player2.getData(AllomancerAttachment.ALLOMANCY_DATA); + + var player3 = helper.makeMistbornPlayer(); + player3.moveTo(helper.absoluteVec(new BlockPos(4, 1, 4).getCenter()).subtract(0, 0.5, 0)); + var data3 = player3.getData(AllomancerAttachment.ALLOMANCY_DATA); + + helper.succeedOnTickWhen(1, () -> { + helper.assertTrue(data.isEnhanced(), "Duralumin isn't enhancing"); + helper.assertTrue(data2.getStored(Metal.STEEL) == 0, "Player2 wasn't wiped"); + helper.assertTrue(data3.getStored(Metal.STEEL) == 10, "Player3 was wiped"); + }); + } + + @GameTest + @EmptyTemplate("1x3x1") + @TestHolder(description = "Tests that duralumin and copper grants invisibility") + public static void duraluminCopperMakesYouInvis(AllomancyTestHelper helper) { + var player = helper.makeMistbornPlayer(); + var data = player.getData(AllomancerAttachment.ALLOMANCY_DATA); + + data.setBurning(Metal.COPPER, true); + data.setBurning(Metal.DURALUMIN, true); + + helper.succeedOnTickWhen(1, () -> { + helper.assertTrue(data.isEnhanced(), "Duralumin isn't enhancing"); + helper.assertMobEffectPresent(player, MobEffects.INVISIBILITY, "Player is not invisible"); + }); + } + + @RegisterStructureTemplate(AllomancyTest.MODID + ":wheat") + public static final StructureTemplate WHEAT = StructureTemplateBuilder + .withSize(3, 5, 3) + .placeSustainedWater(1, 1, 1, Blocks.STONE.defaultBlockState()) + .set(2, 1, 2, Blocks.FARMLAND.defaultBlockState().setValue(FarmBlock.MOISTURE, 7)) + .set(2, 2, 2, Blocks.WHEAT.defaultBlockState()) + .build(); + + @GameTest(template = AllomancyTest.MODID + ":wheat") + @TestHolder(description = "Tests that bendalloy speeds up random ticks") + public static void bendalloyGrowsCrops(AllomancyTestHelper helper) { + BlockPos wheat = new BlockPos(2, 2, 2); + + var player = helper.makeMistbornPlayer(); + var data = player.getData(AllomancerAttachment.ALLOMANCY_DATA); + + data.setBurning(Metal.BENDALLOY, true); + + helper.succeedWhen(() -> { + helper.assertTrue(data.isBurning(Metal.BENDALLOY), "Bendalloy went out"); + helper.assertBlockPresent(Blocks.WHEAT, wheat); + helper.assertBlockProperty(wheat, CropBlock.AGE, CropBlock.MAX_AGE); + }); + + } + + + @RegisterStructureTemplate(AllomancyTest.MODID + ":furnace") + public static final StructureTemplate FURNACE = + StructureTemplateBuilder.withSize(1, 3, 1).set(0, 0, 0, Blocks.FURNACE.defaultBlockState()).build(); + + @GameTest(template = AllomancyTest.MODID + ":furnace") + @TestHolder(description = "Tests that bendalloy accelerates ticking blocks") + public static void bendalloyAcceleratesFurnaces(AllomancyTestHelper helper) { + BlockPos furnace = new BlockPos(0, 0, 0); + FurnaceBlockEntity furnaceEntity = helper.getBlockEntity(furnace, FurnaceBlockEntity.class); + furnaceEntity.setItem(0, new ItemStack(MaterialsSetup.RAW_ORE_ITEMS.getFirst().get(), 1)); + furnaceEntity.setItem(1, new ItemStack(Items.STICK, 2)); + + var player = helper.makeMistbornPlayer(); + var data = player.getData(AllomancerAttachment.ALLOMANCY_DATA); + data.setBurning(Metal.BENDALLOY, true); + helper.succeedOnTickWhen(29, () -> { + helper.assertTrue(data.isBurning(Metal.BENDALLOY), "Bendalloy went out"); + helper.assertContainerContains(furnace, MaterialsSetup.INGOTS.get(Metal.ALUMINUM.getIndex()).get()); + + helper.assertTrue(furnaceEntity.getItem(1).isEmpty(), "Fuel didn't burn out"); + helper.assertTrue(furnaceEntity.getItem(0).isEmpty(), "item didn't smelt"); + }); + + } +} diff --git a/src/test/java/com/legobmw99/allomancy/test/modules/world/LootTableTest.java b/src/test/java/com/legobmw99/allomancy/test/modules/world/LootTableTest.java new file mode 100644 index 00000000..82eaf2ae --- /dev/null +++ b/src/test/java/com/legobmw99/allomancy/test/modules/world/LootTableTest.java @@ -0,0 +1,49 @@ +package com.legobmw99.allomancy.test.modules.world; + +import com.legobmw99.allomancy.modules.combat.CombatSetup; +import com.legobmw99.allomancy.modules.consumables.ConsumeSetup; +import com.legobmw99.allomancy.test.util.AllomancyTestHelper; +import net.minecraft.core.BlockPos; +import net.minecraft.gametest.framework.GameTest; +import net.minecraft.world.entity.item.ItemEntity; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.level.block.Blocks; +import net.minecraft.world.level.block.entity.ChestBlockEntity; +import net.minecraft.world.level.storage.loot.BuiltInLootTables; +import net.neoforged.testframework.annotation.ForEachTest; +import net.neoforged.testframework.annotation.TestHolder; +import net.neoforged.testframework.gametest.EmptyTemplate; + +@ForEachTest(groups = "world") +public class LootTableTest { + @GameTest + @EmptyTemplate("1x2x1") + @TestHolder(description = "Tests that lerasium shows up in vanilla loot tables") + public static void lerasiumLootInjected(AllomancyTestHelper helper) { + helper.startSequence().thenWaitUntil(() -> { + helper.setBlock(BlockPos.ZERO, Blocks.CHEST); + helper + .getBlockEntity(BlockPos.ZERO, ChestBlockEntity.class) + .setLootTable(BuiltInLootTables.SIMPLE_DUNGEON); + helper.breakBlock(BlockPos.ZERO, ItemStack.EMPTY, null); + helper.assertItemEntityPresent(ConsumeSetup.LERASIUM_NUGGET.get()); + helper.killAllEntitiesOfClass(ItemEntity.class); + }).thenSucceed(); + } + + + @GameTest + @EmptyTemplate("1x2x1") + @TestHolder(description = "Tests that daggers shows up in vanilla loot tables") + public static void daggerLootInjected(AllomancyTestHelper helper) { + helper.startSequence().thenWaitUntil(() -> { + helper.setBlock(BlockPos.ZERO, Blocks.CHEST); + helper + .getBlockEntity(BlockPos.ZERO, ChestBlockEntity.class) + .setLootTable(BuiltInLootTables.END_CITY_TREASURE); + helper.breakBlock(BlockPos.ZERO, ItemStack.EMPTY, null); + helper.assertItemEntityPresent(CombatSetup.OBSIDIAN_DAGGER.get()); + helper.killAllEntitiesOfClass(ItemEntity.class); + }).thenSucceed(); + } +} diff --git a/src/test/java/com/legobmw99/allomancy/test/util/AllomancyTestHelper.java b/src/test/java/com/legobmw99/allomancy/test/util/AllomancyTestHelper.java new file mode 100644 index 00000000..50a5c0d1 --- /dev/null +++ b/src/test/java/com/legobmw99/allomancy/test/util/AllomancyTestHelper.java @@ -0,0 +1,119 @@ +package com.legobmw99.allomancy.test.util; + +import com.legobmw99.allomancy.api.enums.Metal; +import com.legobmw99.allomancy.modules.combat.CombatSetup; +import com.legobmw99.allomancy.modules.powers.data.AllomancerAttachment; +import com.legobmw99.allomancy.modules.powers.data.AllomancerData; +import net.minecraft.core.BlockPos; +import net.minecraft.core.Direction; +import net.minecraft.core.FrontAndTop; +import net.minecraft.gametest.framework.GameTestAssertPosException; +import net.minecraft.gametest.framework.GameTestInfo; +import net.minecraft.server.level.ServerPlayer; +import net.minecraft.world.InteractionHand; +import net.minecraft.world.InteractionResult; +import net.minecraft.world.entity.EquipmentSlot; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.level.GameType; +import net.minecraft.world.level.ItemLike; +import net.minecraft.world.level.block.Blocks; +import net.minecraft.world.level.block.entity.BaseContainerBlockEntity; +import net.minecraft.world.level.block.entity.CrafterBlockEntity; +import net.minecraft.world.level.block.state.properties.BlockStateProperties; +import net.neoforged.testframework.gametest.ExtendedGameTestHelper; +import net.neoforged.testframework.gametest.GameTestPlayer; + +import java.util.Arrays; +import java.util.function.Predicate; +import java.util.function.Supplier; +import java.util.stream.Stream; + +public class AllomancyTestHelper extends ExtendedGameTestHelper { + + public AllomancyTestHelper(GameTestInfo info) { + super(info); + } + + public InteractionResult useItem(ServerPlayer player, ItemLike item) { + return useItem(player, new ItemStack(item)); + } + + public InteractionResult useItem(ServerPlayer player, ItemStack stack) { + player.setItemInHand(InteractionHand.MAIN_HAND, stack); + return player.gameMode.useItem(player, player.serverLevel(), player.getItemInHand(InteractionHand.MAIN_HAND), + InteractionHand.MAIN_HAND); + } + + private static final BlockPos CRAFTER = new BlockPos(0, 0, 1); + private static final BlockPos OUTPUT = new BlockPos(0, 0, 0); + + void craft(ItemStack... items) { + this.setBlock(CRAFTER, Blocks.CRAFTER + .defaultBlockState() + .setValue(BlockStateProperties.ORIENTATION, + FrontAndTop.fromFrontAndTop(this.getTestRotation().rotate(Direction.NORTH), Direction.UP))); + this.setBlock(OUTPUT, Blocks.BARREL); + + CrafterBlockEntity crafter_ent = this.getBlockEntity(CRAFTER, CrafterBlockEntity.class); + for (int i = 0; i < items.length; i++) { + crafter_ent.setItem(i, items[i]); + } + this.pulseRedstone(CRAFTER.above(), 0); + } + + void craft(ItemLike... items) { + this.craft(Arrays.stream(items).map(ItemStack::new).toArray(ItemStack[]::new)); + } + + void craft(ItemStack stack1, ItemLike... items) { + this.craft( + Stream.concat(Stream.of(stack1), Arrays.stream(items).map(ItemStack::new)).toArray(ItemStack[]::new)); + } + + public void succeedIfCrafts(Predicate pred, + Supplier exceptionMessage, + ItemLike... items) { + this.startSequence().thenExecute(() -> this.craft(items)).thenExecuteAfter(4, () -> { + this.assertContainerEmpty(CRAFTER); + + + BaseContainerBlockEntity output = this.getBlockEntity(OUTPUT, BaseContainerBlockEntity.class); + if (!pred.test(output)) { + throw new GameTestAssertPosException(exceptionMessage.get(), this.absolutePos(CRAFTER), CRAFTER, + this.getTick()); + + } + }).thenSucceed(); + } + + public void succeedIfCraftingFails(ItemStack stack, ItemLike... items) { + this.startSequence().thenExecute(() -> this.craft(stack, items)).thenExecuteAfter(4, () -> { + this.assertContainerEmpty(OUTPUT); + for (var item : items) { + this.assertContainerContains(CRAFTER, item.asItem()); + } + }).thenSucceed(); + + } + + public GameTestPlayer makeTickingPlayer() { + return this.makeTickingMockServerPlayerInLevel(GameType.SURVIVAL).moveToCentre(); + } + + public GameTestPlayer makeMistbornPlayer() { + var player = this.makeTickingPlayer(); + player.setItemSlot(EquipmentSlot.HEAD, CombatSetup.ALUMINUM_HELMET.toStack()); + player.setItemSlot(EquipmentSlot.CHEST, CombatSetup.MISTCLOAK.toStack()); + var data = player.getData(AllomancerAttachment.ALLOMANCY_DATA); + + data.setMistborn(); + for (Metal m : Metal.values()) { + for (int i = 0; i < AllomancerData.MAX_STORAGE; i++) { + data.incrementStored(m); + } + } + + return player; + } + +} diff --git a/src/test/java/com/legobmw99/allomancy/test/util/CallbackTest.java b/src/test/java/com/legobmw99/allomancy/test/util/CallbackTest.java new file mode 100644 index 00000000..edfc2fb6 --- /dev/null +++ b/src/test/java/com/legobmw99/allomancy/test/util/CallbackTest.java @@ -0,0 +1,53 @@ +package com.legobmw99.allomancy.test.util; + +import net.minecraft.gametest.framework.GameTestAssertException; +import net.minecraft.network.chat.Component; +import net.minecraft.world.level.block.Rotation; +import net.neoforged.testframework.TestFramework; +import net.neoforged.testframework.gametest.GameTestData; +import net.neoforged.testframework.impl.TestFrameworkImpl; +import net.neoforged.testframework.impl.test.AbstractTest; +import org.jetbrains.annotations.Nullable; + +import java.util.List; +import java.util.function.Consumer; + +// Similar to net.neoforged.testframework.impl.test.MethodBasedGameTestTest +public class CallbackTest extends AbstractTest.Dynamic { + private final Consumer callback; + + public CallbackTest(String id, + Consumer callback, + String structureName, + @Nullable String group) { + this.callback = callback; + + this.id = id; + this.visuals = new Visuals(Component.literal(TestFrameworkImpl.capitaliseWords(id, "_")), List.of()); + if (group != null) { + this.groups.add(group); + } + this.gameTestData = + new GameTestData(null, structureName, true, 1, 1, this::onGameTest, 100, 0, Rotation.NONE, false); + } + + CallbackTest(String id, Consumer callback, String structureName) { + this(id, callback, structureName, null); + } + + @Override + public void init(TestFramework framework) { + super.init(framework); + + onGameTest(AllomancyTestHelper.class, helper -> { + try { + callback.accept(helper); + } catch (GameTestAssertException exception) { + throw exception; + } catch (Throwable exception) { + throw new RuntimeException("Encountered exception running callback-based gametest test: " + callback, + exception); + } + }); + } +} diff --git a/src/test/java/com/legobmw99/allomancy/test/util/TattleTaleStack.java b/src/test/java/com/legobmw99/allomancy/test/util/TattleTaleStack.java new file mode 100644 index 00000000..fdf00b04 --- /dev/null +++ b/src/test/java/com/legobmw99/allomancy/test/util/TattleTaleStack.java @@ -0,0 +1,86 @@ +package com.legobmw99.allomancy.test.util; + +import com.legobmw99.allomancy.test.modules.extras.CommandTest; +import net.minecraft.commands.CommandSource; +import net.minecraft.commands.CommandSourceStack; +import net.minecraft.network.chat.Component; +import net.minecraft.server.MinecraftServer; +import net.minecraft.server.level.ServerLevel; +import net.minecraft.server.level.ServerPlayer; +import net.minecraft.world.entity.Entity; +import net.minecraft.world.phys.Vec2; +import net.minecraft.world.phys.Vec3; + +import java.util.ArrayList; +import java.util.List; +import java.util.function.Supplier; + +public final class TattleTaleStack extends CommandSourceStack { + public static TattleTaleStack createCommandSourceStack(ServerPlayer player) { + return new TattleTaleStack(CommandSource.NULL, player.position(), player.getRotationVector(), + player.serverLevel(), player.getPermissionLevel(), player.getName().getString(), + player.getDisplayName(), player.level().getServer(), player); + } + + public TattleTaleStack(CommandSource p_81302_, + Vec3 p_81303_, + Vec2 p_81304_, + ServerLevel p_81305_, + int p_81306_, + String p_81307_, + Component p_81308_, + MinecraftServer p_81309_, + Entity p_81310_) { + super(p_81302_, p_81303_, p_81304_, p_81305_, p_81306_, p_81307_, p_81308_, p_81309_, p_81310_); + } + + final List errors = new ArrayList<>(); + final List results = new ArrayList<>(); + + public boolean hadError() { + return !errors.isEmpty(); + } + + public String errors() { + return commaSeparate(this.errors); + + } + + public String results() { + return commaSeparate(this.results); + } + + @Override + public void sendSuccess(Supplier messageSupplier, boolean allowLogging) { + var comp = messageSupplier.get(); + results.add(comp); + + super.sendSuccess(() -> comp, allowLogging); + } + + @Override + public void sendSystemMessage(Component message) { + results.add(message); + + super.sendSystemMessage(message); + } + + @Override + public void sendFailure(Component failure) { + errors.add(failure); + super.sendFailure(failure); + } + + static String commaSeparate(List components) { + StringBuilder s = new StringBuilder(); + for (var r : components) { + s.append(r.getString()); + s.append(", "); + } + var len = s.length(); + if (len > 2) { + s.delete(len - 2, len); + } + return s.toString(); + } +} diff --git a/src/test/resources/META-INF/neoforge.mods.toml b/src/test/resources/META-INF/neoforge.mods.toml new file mode 100644 index 00000000..29f9185b --- /dev/null +++ b/src/test/resources/META-INF/neoforge.mods.toml @@ -0,0 +1,16 @@ +modLoader = "javafml" +loaderVersion = "[2,)" +credits = "" +authors = "legobmw99" +license = "GPL v3" + +[[mods]] #mandatory +modId = "allomancy_test" #mandatory +version = "1.0" #mandatory +displayName = "Allomancy Test" +description = "Allomancy Test" + +[[dependencies.allomancy_test]] +modId = "allomancy" +type = "required" +ordering = "AFTER" \ No newline at end of file