diff --git a/build.gradle b/build.gradle index cbdc38d1..ef7c3314 100644 --- a/build.gradle +++ b/build.gradle @@ -4,6 +4,7 @@ plugins { id 'idea' id 'maven-publish' id 'net.neoforged.moddev' version '2.0.16-beta' + id "me.shedaniel.unified-publishing" version "0.1.+" } tasks.named('wrapper', Wrapper).configure { @@ -75,6 +76,7 @@ neoForge { runs { client { client() + ideName = "Run ${project.mod_id} - Client" gameDirectory = project.file('run_client') // property 'production', 'true' systemProperty 'forge.logging.console.level', 'debug' @@ -108,6 +110,7 @@ neoForge { server { server() + ideName = "Run ${project.mod_id} - Server" gameDirectory = project.file('run_server') // property 'production', 'true' systemProperty 'forge.logging.console.level', 'debug' @@ -122,6 +125,7 @@ neoForge { data { data() + ideName = "Run ${project.mod_id} - Data" gameDirectory = project.file('run_data') // property 'production', 'true' systemProperty 'forge.logging.console.level', 'debug' @@ -239,17 +243,22 @@ processResources { } } -tasks.jarJar.configure { - // TODO[3TUSK]: I don't know if it is possible to exclude these? - //exclude("/assets/${project.mod_id}/lang/en_us.existing.json") - //exclude("/assets/test") - //exclude("/org/teacon/xkdeco/data") - //exclude("/org/teacon/xkdeco/mixin/data") - //exclude("/.cache") - //exclude("/xkdeco.data.mixins.json") -} - jar { + exclude("/assets/${project.mod_id}/lang/en_us.existing.json") + exclude("/assets/test") + exclude("/org/teacon/xkdeco/data") + exclude("/org/teacon/xkdeco/mixin/data") + exclude("/.cache") + exclude("/xkdeco.data.mixins.json") + + manifest { + attributes(["Specification-Title" : mod_id, + "Specification-Version" : "1", // We are version 1 of ourselves + "Implementation-Title" : project.name, + "Implementation-Version" : realVersion, + "Implementation-Timestamp": new Date().format("yyyy-MM-dd'T'HH:mm:ssZ")]) + } + preserveFileTimestamps = false reproducibleFileOrder = true } @@ -310,18 +319,16 @@ tasks.register("githubActionOutput", TeaConDumpPathToGitHub) { task -> task.getTargetFile().set(jar.archiveFile) } -// TODO We will come back later for publication on CurseForge / Modrinth. -/* unifiedPublishing { project { - displayName = "[Forge $project.supported_version] $project.mod_version" + displayName = "[NeoForge $project.supported_version] $project.mod_version" version = realVersion // Optional, Inferred from project by default changelog = file("CHANGELOG.md").exists() ? file("CHANGELOG.md").text : "" releaseType = project.release_type // Optional, use "release", "beta" or "alpha" - gameVersions = ["1.20.1"] - gameLoaders = ["forge", "neoforge"] + gameVersions = [project.minecraft_version] + gameLoaders = ["neoforge"] - mainPublication tasks.jarJar // Declares the publicated jar + mainPublication tasks.jar //TODO test if (System.getenv("CURSE_TOKEN") != null) { curseforge { @@ -334,7 +341,7 @@ unifiedPublishing { } } - if (System.getenv("CURSE_TOKEN") != null) { + if (System.getenv("MODRINTH_TOKEN") != null) { modrinth { token = System.getenv("MODRINTH_TOKEN") id = "XlwMlNhH" // Required, must be a string, ID of Modrinth project @@ -346,4 +353,3 @@ unifiedPublishing { } } } - */ diff --git a/gradle.properties b/gradle.properties index e45d9c6b..04b40d7f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -25,6 +25,7 @@ loader_version_range=[4,) # Mod Properties mod_version=0.8.2 release_type=release +supported_version=1.21.1 remote_repo=teaconmc/XKDeco mod_id=xkdeco mod_base_package=org.teacon.xkdeco diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 0d184210..19cfad96 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/src/generated/resources/data/minecraft/tags/blocks/climbable.json b/src/generated/resources/data/minecraft/tags/block/climbable.json similarity index 100% rename from src/generated/resources/data/minecraft/tags/blocks/climbable.json rename to src/generated/resources/data/minecraft/tags/block/climbable.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/air_duct.json b/src/generated/resources/data/xkdeco/loot_table/blocks/air_duct.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/air_duct.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/air_duct.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/air_duct_oblique.json b/src/generated/resources/data/xkdeco/loot_table/blocks/air_duct_oblique.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/air_duct_oblique.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/air_duct_oblique.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/aztec_chiseled_stonebricks.json b/src/generated/resources/data/xkdeco/loot_table/blocks/aztec_chiseled_stonebricks.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/aztec_chiseled_stonebricks.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/aztec_chiseled_stonebricks.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/aztec_cut_stonebricks.json b/src/generated/resources/data/xkdeco/loot_table/blocks/aztec_cut_stonebricks.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/aztec_cut_stonebricks.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/aztec_cut_stonebricks.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/aztec_mossy_stonebrick_slab.json b/src/generated/resources/data/xkdeco/loot_table/blocks/aztec_mossy_stonebrick_slab.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/aztec_mossy_stonebrick_slab.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/aztec_mossy_stonebrick_slab.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/aztec_mossy_stonebrick_stairs.json b/src/generated/resources/data/xkdeco/loot_table/blocks/aztec_mossy_stonebrick_stairs.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/aztec_mossy_stonebrick_stairs.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/aztec_mossy_stonebrick_stairs.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/aztec_mossy_stonebricks.json b/src/generated/resources/data/xkdeco/loot_table/blocks/aztec_mossy_stonebricks.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/aztec_mossy_stonebricks.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/aztec_mossy_stonebricks.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/aztec_sculpture_stone.json b/src/generated/resources/data/xkdeco/loot_table/blocks/aztec_sculpture_stone.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/aztec_sculpture_stone.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/aztec_sculpture_stone.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/aztec_stonebrick_slab.json b/src/generated/resources/data/xkdeco/loot_table/blocks/aztec_stonebrick_slab.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/aztec_stonebrick_slab.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/aztec_stonebrick_slab.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/aztec_stonebrick_stairs.json b/src/generated/resources/data/xkdeco/loot_table/blocks/aztec_stonebrick_stairs.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/aztec_stonebrick_stairs.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/aztec_stonebrick_stairs.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/aztec_stonebricks.json b/src/generated/resources/data/xkdeco/loot_table/blocks/aztec_stonebricks.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/aztec_stonebricks.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/aztec_stonebricks.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/big_book_stack.json b/src/generated/resources/data/xkdeco/loot_table/blocks/big_book_stack.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/big_book_stack.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/big_book_stack.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/big_candlestick.json b/src/generated/resources/data/xkdeco/loot_table/blocks/big_candlestick.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/big_candlestick.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/big_candlestick.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/big_solar_system_model.json b/src/generated/resources/data/xkdeco/loot_table/blocks/big_solar_system_model.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/big_solar_system_model.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/big_solar_system_model.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/black_brick_slab.json b/src/generated/resources/data/xkdeco/loot_table/blocks/black_brick_slab.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/black_brick_slab.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/black_brick_slab.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/black_brick_stairs.json b/src/generated/resources/data/xkdeco/loot_table/blocks/black_brick_stairs.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/black_brick_stairs.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/black_brick_stairs.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/black_brick_wall.json b/src/generated/resources/data/xkdeco/loot_table/blocks/black_brick_wall.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/black_brick_wall.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/black_brick_wall.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/black_bricks.json b/src/generated/resources/data/xkdeco/loot_table/blocks/black_bricks.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/black_bricks.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/black_bricks.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/black_roof.json b/src/generated/resources/data/xkdeco/loot_table/blocks/black_roof.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/black_roof.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/black_roof.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/black_roof_deco.json b/src/generated/resources/data/xkdeco/loot_table/blocks/black_roof_deco.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/black_roof_deco.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/black_roof_deco.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/black_roof_deco_oblique.json b/src/generated/resources/data/xkdeco/loot_table/blocks/black_roof_deco_oblique.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/black_roof_deco_oblique.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/black_roof_deco_oblique.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/black_roof_eave.json b/src/generated/resources/data/xkdeco/loot_table/blocks/black_roof_eave.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/black_roof_eave.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/black_roof_eave.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/black_roof_end.json b/src/generated/resources/data/xkdeco/loot_table/blocks/black_roof_end.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/black_roof_end.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/black_roof_end.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/black_roof_flat.json b/src/generated/resources/data/xkdeco/loot_table/blocks/black_roof_flat.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/black_roof_flat.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/black_roof_flat.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/black_roof_ridge.json b/src/generated/resources/data/xkdeco/loot_table/blocks/black_roof_ridge.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/black_roof_ridge.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/black_roof_ridge.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/black_roof_ridge_end.json b/src/generated/resources/data/xkdeco/loot_table/blocks/black_roof_ridge_end.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/black_roof_ridge_end.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/black_roof_ridge_end.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/black_roof_small_eave.json b/src/generated/resources/data/xkdeco/loot_table/blocks/black_roof_small_eave.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/black_roof_small_eave.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/black_roof_small_eave.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/black_roof_small_end.json b/src/generated/resources/data/xkdeco/loot_table/blocks/black_roof_small_end.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/black_roof_small_end.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/black_roof_small_end.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/black_roof_small_flat_end.json b/src/generated/resources/data/xkdeco/loot_table/blocks/black_roof_small_flat_end.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/black_roof_small_flat_end.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/black_roof_small_flat_end.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/black_roof_small_ridge_end.json b/src/generated/resources/data/xkdeco/loot_table/blocks/black_roof_small_ridge_end.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/black_roof_small_ridge_end.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/black_roof_small_ridge_end.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/black_roof_tip.json b/src/generated/resources/data/xkdeco/loot_table/blocks/black_roof_tip.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/black_roof_tip.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/black_roof_tip.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/black_tile_slab.json b/src/generated/resources/data/xkdeco/loot_table/blocks/black_tile_slab.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/black_tile_slab.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/black_tile_slab.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/black_tile_stairs.json b/src/generated/resources/data/xkdeco/loot_table/blocks/black_tile_stairs.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/black_tile_stairs.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/black_tile_stairs.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/black_tiles.json b/src/generated/resources/data/xkdeco/loot_table/blocks/black_tiles.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/black_tiles.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/black_tiles.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/blackstone_lamp.json b/src/generated/resources/data/xkdeco/loot_table/blocks/blackstone_lamp.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/blackstone_lamp.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/blackstone_lamp.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/blackstone_pavement.json b/src/generated/resources/data/xkdeco/loot_table/blocks/blackstone_pavement.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/blackstone_pavement.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/blackstone_pavement.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/blackstone_pavement_slab.json b/src/generated/resources/data/xkdeco/loot_table/blocks/blackstone_pavement_slab.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/blackstone_pavement_slab.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/blackstone_pavement_slab.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/blackstone_pillar.json b/src/generated/resources/data/xkdeco/loot_table/blocks/blackstone_pillar.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/blackstone_pillar.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/blackstone_pillar.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/blue_roof.json b/src/generated/resources/data/xkdeco/loot_table/blocks/blue_roof.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/blue_roof.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/blue_roof.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/blue_roof_flat.json b/src/generated/resources/data/xkdeco/loot_table/blocks/blue_roof_flat.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/blue_roof_flat.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/blue_roof_flat.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/blue_roof_ridge.json b/src/generated/resources/data/xkdeco/loot_table/blocks/blue_roof_ridge.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/blue_roof_ridge.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/blue_roof_ridge.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/blue_roof_small_eave.json b/src/generated/resources/data/xkdeco/loot_table/blocks/blue_roof_small_eave.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/blue_roof_small_eave.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/blue_roof_small_eave.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/blue_roof_small_end.json b/src/generated/resources/data/xkdeco/loot_table/blocks/blue_roof_small_end.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/blue_roof_small_end.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/blue_roof_small_end.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/blue_roof_small_flat_end.json b/src/generated/resources/data/xkdeco/loot_table/blocks/blue_roof_small_flat_end.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/blue_roof_small_flat_end.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/blue_roof_small_flat_end.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/blue_roof_small_ridge_end.json b/src/generated/resources/data/xkdeco/loot_table/blocks/blue_roof_small_ridge_end.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/blue_roof_small_ridge_end.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/blue_roof_small_ridge_end.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/blue_tile_slab.json b/src/generated/resources/data/xkdeco/loot_table/blocks/blue_tile_slab.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/blue_tile_slab.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/blue_tile_slab.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/blue_tile_stairs.json b/src/generated/resources/data/xkdeco/loot_table/blocks/blue_tile_stairs.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/blue_tile_stairs.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/blue_tile_stairs.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/blue_tiles.json b/src/generated/resources/data/xkdeco/loot_table/blocks/blue_tiles.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/blue_tiles.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/blue_tiles.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/bluewhite_porcelain.json b/src/generated/resources/data/xkdeco/loot_table/blocks/bluewhite_porcelain.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/bluewhite_porcelain.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/bluewhite_porcelain.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/bluewhite_porcelain_small.json b/src/generated/resources/data/xkdeco/loot_table/blocks/bluewhite_porcelain_small.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/bluewhite_porcelain_small.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/bluewhite_porcelain_small.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/bluewhite_porcelain_tall.json b/src/generated/resources/data/xkdeco/loot_table/blocks/bluewhite_porcelain_tall.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/bluewhite_porcelain_tall.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/bluewhite_porcelain_tall.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/bottle_stack.json b/src/generated/resources/data/xkdeco/loot_table/blocks/bottle_stack.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/bottle_stack.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/bottle_stack.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/bronze_block.json b/src/generated/resources/data/xkdeco/loot_table/blocks/bronze_block.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/bronze_block.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/bronze_block.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/bronze_pillar.json b/src/generated/resources/data/xkdeco/loot_table/blocks/bronze_pillar.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/bronze_pillar.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/bronze_pillar.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/calligraphy.json b/src/generated/resources/data/xkdeco/loot_table/blocks/calligraphy.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/calligraphy.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/calligraphy.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/candlestick.json b/src/generated/resources/data/xkdeco/loot_table/blocks/candlestick.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/candlestick.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/candlestick.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/celadon_porcelain.json b/src/generated/resources/data/xkdeco/loot_table/blocks/celadon_porcelain.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/celadon_porcelain.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/celadon_porcelain.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/celadon_porcelain_small.json b/src/generated/resources/data/xkdeco/loot_table/blocks/celadon_porcelain_small.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/celadon_porcelain_small.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/celadon_porcelain_small.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/celadon_porcelain_tall.json b/src/generated/resources/data/xkdeco/loot_table/blocks/celadon_porcelain_tall.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/celadon_porcelain_tall.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/celadon_porcelain_tall.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/cherry_blossom.json b/src/generated/resources/data/xkdeco/loot_table/blocks/cherry_blossom.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/cherry_blossom.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/cherry_blossom.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/cherry_blossom_leaves.json b/src/generated/resources/data/xkdeco/loot_table/blocks/cherry_blossom_leaves.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/cherry_blossom_leaves.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/cherry_blossom_leaves.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/chiseled_bronze_block.json b/src/generated/resources/data/xkdeco/loot_table/blocks/chiseled_bronze_block.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/chiseled_bronze_block.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/chiseled_bronze_block.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/chiseled_gilded_blackstone.json b/src/generated/resources/data/xkdeco/loot_table/blocks/chiseled_gilded_blackstone.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/chiseled_gilded_blackstone.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/chiseled_gilded_blackstone.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/chiseled_gold_block.json b/src/generated/resources/data/xkdeco/loot_table/blocks/chiseled_gold_block.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/chiseled_gold_block.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/chiseled_gold_block.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/chiseled_steel_block.json b/src/generated/resources/data/xkdeco/loot_table/blocks/chiseled_steel_block.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/chiseled_steel_block.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/chiseled_steel_block.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/cobblestone_path.json b/src/generated/resources/data/xkdeco/loot_table/blocks/cobblestone_path.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/cobblestone_path.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/cobblestone_path.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/cobblestone_path_slab.json b/src/generated/resources/data/xkdeco/loot_table/blocks/cobblestone_path_slab.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/cobblestone_path_slab.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/cobblestone_path_slab.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/cobblestone_path_stairs.json b/src/generated/resources/data/xkdeco/loot_table/blocks/cobblestone_path_stairs.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/cobblestone_path_stairs.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/cobblestone_path_stairs.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/copper_tile_slab.json b/src/generated/resources/data/xkdeco/loot_table/blocks/copper_tile_slab.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/copper_tile_slab.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/copper_tile_slab.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/copper_tile_stairs.json b/src/generated/resources/data/xkdeco/loot_table/blocks/copper_tile_stairs.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/copper_tile_stairs.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/copper_tile_stairs.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/copper_tiles.json b/src/generated/resources/data/xkdeco/loot_table/blocks/copper_tiles.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/copper_tiles.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/copper_tiles.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/covered_lamp.json b/src/generated/resources/data/xkdeco/loot_table/blocks/covered_lamp.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/covered_lamp.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/covered_lamp.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/crimson_nylium_slab.json b/src/generated/resources/data/xkdeco/loot_table/blocks/crimson_nylium_slab.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/crimson_nylium_slab.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/crimson_nylium_slab.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/crossed_mud_wall_block.json b/src/generated/resources/data/xkdeco/loot_table/blocks/crossed_mud_wall_block.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/crossed_mud_wall_block.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/crossed_mud_wall_block.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/crossed_mud_wall_slab.json b/src/generated/resources/data/xkdeco/loot_table/blocks/crossed_mud_wall_slab.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/crossed_mud_wall_slab.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/crossed_mud_wall_slab.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/crossed_mud_wall_stairs.json b/src/generated/resources/data/xkdeco/loot_table/blocks/crossed_mud_wall_stairs.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/crossed_mud_wall_stairs.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/crossed_mud_wall_stairs.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/crying_obsidian_brick_slab.json b/src/generated/resources/data/xkdeco/loot_table/blocks/crying_obsidian_brick_slab.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/crying_obsidian_brick_slab.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/crying_obsidian_brick_slab.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/crying_obsidian_brick_stairs.json b/src/generated/resources/data/xkdeco/loot_table/blocks/crying_obsidian_brick_stairs.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/crying_obsidian_brick_stairs.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/crying_obsidian_brick_stairs.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/crying_obsidian_bricks.json b/src/generated/resources/data/xkdeco/loot_table/blocks/crying_obsidian_bricks.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/crying_obsidian_bricks.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/crying_obsidian_bricks.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/cup.json b/src/generated/resources/data/xkdeco/loot_table/blocks/cup.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/cup.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/cup.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/cut_bronze_block.json b/src/generated/resources/data/xkdeco/loot_table/blocks/cut_bronze_block.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/cut_bronze_block.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/cut_bronze_block.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/cut_bronze_block_slab.json b/src/generated/resources/data/xkdeco/loot_table/blocks/cut_bronze_block_slab.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/cut_bronze_block_slab.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/cut_bronze_block_slab.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/cut_bronze_block_stairs.json b/src/generated/resources/data/xkdeco/loot_table/blocks/cut_bronze_block_stairs.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/cut_bronze_block_stairs.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/cut_bronze_block_stairs.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/cut_gold_block.json b/src/generated/resources/data/xkdeco/loot_table/blocks/cut_gold_block.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/cut_gold_block.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/cut_gold_block.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/cut_gold_block_slab.json b/src/generated/resources/data/xkdeco/loot_table/blocks/cut_gold_block_slab.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/cut_gold_block_slab.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/cut_gold_block_slab.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/cut_gold_block_stairs.json b/src/generated/resources/data/xkdeco/loot_table/blocks/cut_gold_block_stairs.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/cut_gold_block_stairs.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/cut_gold_block_stairs.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/cut_obsidian.json b/src/generated/resources/data/xkdeco/loot_table/blocks/cut_obsidian.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/cut_obsidian.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/cut_obsidian.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/cut_obsidian_brick_slab.json b/src/generated/resources/data/xkdeco/loot_table/blocks/cut_obsidian_brick_slab.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/cut_obsidian_brick_slab.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/cut_obsidian_brick_slab.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/cut_obsidian_brick_stairs.json b/src/generated/resources/data/xkdeco/loot_table/blocks/cut_obsidian_brick_stairs.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/cut_obsidian_brick_stairs.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/cut_obsidian_brick_stairs.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/cut_obsidian_bricks.json b/src/generated/resources/data/xkdeco/loot_table/blocks/cut_obsidian_bricks.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/cut_obsidian_bricks.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/cut_obsidian_bricks.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/cut_obsidian_pillar.json b/src/generated/resources/data/xkdeco/loot_table/blocks/cut_obsidian_pillar.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/cut_obsidian_pillar.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/cut_obsidian_pillar.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/cut_obsidian_slab.json b/src/generated/resources/data/xkdeco/loot_table/blocks/cut_obsidian_slab.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/cut_obsidian_slab.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/cut_obsidian_slab.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/cyan_brick_slab.json b/src/generated/resources/data/xkdeco/loot_table/blocks/cyan_brick_slab.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/cyan_brick_slab.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/cyan_brick_slab.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/cyan_brick_stairs.json b/src/generated/resources/data/xkdeco/loot_table/blocks/cyan_brick_stairs.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/cyan_brick_stairs.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/cyan_brick_stairs.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/cyan_brick_wall.json b/src/generated/resources/data/xkdeco/loot_table/blocks/cyan_brick_wall.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/cyan_brick_wall.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/cyan_brick_wall.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/cyan_bricks.json b/src/generated/resources/data/xkdeco/loot_table/blocks/cyan_bricks.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/cyan_bricks.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/cyan_bricks.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/cyan_roof.json b/src/generated/resources/data/xkdeco/loot_table/blocks/cyan_roof.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/cyan_roof.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/cyan_roof.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/cyan_roof_deco.json b/src/generated/resources/data/xkdeco/loot_table/blocks/cyan_roof_deco.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/cyan_roof_deco.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/cyan_roof_deco.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/cyan_roof_deco_oblique.json b/src/generated/resources/data/xkdeco/loot_table/blocks/cyan_roof_deco_oblique.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/cyan_roof_deco_oblique.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/cyan_roof_deco_oblique.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/cyan_roof_eave.json b/src/generated/resources/data/xkdeco/loot_table/blocks/cyan_roof_eave.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/cyan_roof_eave.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/cyan_roof_eave.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/cyan_roof_end.json b/src/generated/resources/data/xkdeco/loot_table/blocks/cyan_roof_end.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/cyan_roof_end.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/cyan_roof_end.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/cyan_roof_flat.json b/src/generated/resources/data/xkdeco/loot_table/blocks/cyan_roof_flat.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/cyan_roof_flat.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/cyan_roof_flat.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/cyan_roof_ridge.json b/src/generated/resources/data/xkdeco/loot_table/blocks/cyan_roof_ridge.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/cyan_roof_ridge.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/cyan_roof_ridge.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/cyan_roof_ridge_end.json b/src/generated/resources/data/xkdeco/loot_table/blocks/cyan_roof_ridge_end.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/cyan_roof_ridge_end.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/cyan_roof_ridge_end.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/cyan_roof_small_eave.json b/src/generated/resources/data/xkdeco/loot_table/blocks/cyan_roof_small_eave.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/cyan_roof_small_eave.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/cyan_roof_small_eave.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/cyan_roof_small_end.json b/src/generated/resources/data/xkdeco/loot_table/blocks/cyan_roof_small_end.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/cyan_roof_small_end.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/cyan_roof_small_end.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/cyan_roof_small_flat_end.json b/src/generated/resources/data/xkdeco/loot_table/blocks/cyan_roof_small_flat_end.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/cyan_roof_small_flat_end.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/cyan_roof_small_flat_end.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/cyan_roof_small_ridge_end.json b/src/generated/resources/data/xkdeco/loot_table/blocks/cyan_roof_small_ridge_end.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/cyan_roof_small_ridge_end.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/cyan_roof_small_ridge_end.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/cyan_roof_tip.json b/src/generated/resources/data/xkdeco/loot_table/blocks/cyan_roof_tip.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/cyan_roof_tip.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/cyan_roof_tip.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/cyan_tile_slab.json b/src/generated/resources/data/xkdeco/loot_table/blocks/cyan_tile_slab.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/cyan_tile_slab.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/cyan_tile_slab.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/cyan_tile_stairs.json b/src/generated/resources/data/xkdeco/loot_table/blocks/cyan_tile_stairs.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/cyan_tile_stairs.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/cyan_tile_stairs.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/cyan_tiles.json b/src/generated/resources/data/xkdeco/loot_table/blocks/cyan_tiles.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/cyan_tiles.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/cyan_tiles.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/dark_column_base.json b/src/generated/resources/data/xkdeco/loot_table/blocks/dark_column_base.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/dark_column_base.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/dark_column_base.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/dark_fish_bowl.json b/src/generated/resources/data/xkdeco/loot_table/blocks/dark_fish_bowl.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/dark_fish_bowl.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/dark_fish_bowl.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/dark_stone_handrail.json b/src/generated/resources/data/xkdeco/loot_table/blocks/dark_stone_handrail.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/dark_stone_handrail.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/dark_stone_handrail.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/dark_stone_handrail_end.json b/src/generated/resources/data/xkdeco/loot_table/blocks/dark_stone_handrail_end.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/dark_stone_handrail_end.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/dark_stone_handrail_end.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/dark_stone_handrail_head.json b/src/generated/resources/data/xkdeco/loot_table/blocks/dark_stone_handrail_head.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/dark_stone_handrail_head.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/dark_stone_handrail_head.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/dark_stone_handrail_lion_statue.json b/src/generated/resources/data/xkdeco/loot_table/blocks/dark_stone_handrail_lion_statue.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/dark_stone_handrail_lion_statue.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/dark_stone_handrail_lion_statue.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/dark_stone_handrail_oblique.json b/src/generated/resources/data/xkdeco/loot_table/blocks/dark_stone_handrail_oblique.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/dark_stone_handrail_oblique.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/dark_stone_handrail_oblique.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/dark_stone_handrail_oblique_steep.json b/src/generated/resources/data/xkdeco/loot_table/blocks/dark_stone_handrail_oblique_steep.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/dark_stone_handrail_oblique_steep.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/dark_stone_handrail_oblique_steep.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/dark_wall_base.json b/src/generated/resources/data/xkdeco/loot_table/blocks/dark_wall_base.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/dark_wall_base.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/dark_wall_base.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/deepslate_lamp.json b/src/generated/resources/data/xkdeco/loot_table/blocks/deepslate_lamp.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/deepslate_lamp.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/deepslate_lamp.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/deepslate_pavement.json b/src/generated/resources/data/xkdeco/loot_table/blocks/deepslate_pavement.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/deepslate_pavement.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/deepslate_pavement.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/deepslate_pavement_slab.json b/src/generated/resources/data/xkdeco/loot_table/blocks/deepslate_pavement_slab.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/deepslate_pavement_slab.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/deepslate_pavement_slab.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/deepslate_pillar.json b/src/generated/resources/data/xkdeco/loot_table/blocks/deepslate_pillar.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/deepslate_pillar.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/deepslate_pillar.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/dirt_cobblestone.json b/src/generated/resources/data/xkdeco/loot_table/blocks/dirt_cobblestone.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/dirt_cobblestone.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/dirt_cobblestone.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/dirt_cobblestone_path.json b/src/generated/resources/data/xkdeco/loot_table/blocks/dirt_cobblestone_path.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/dirt_cobblestone_path.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/dirt_cobblestone_path.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/dirt_cobblestone_path_slab.json b/src/generated/resources/data/xkdeco/loot_table/blocks/dirt_cobblestone_path_slab.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/dirt_cobblestone_path_slab.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/dirt_cobblestone_path_slab.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/dirt_cobblestone_path_stairs.json b/src/generated/resources/data/xkdeco/loot_table/blocks/dirt_cobblestone_path_stairs.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/dirt_cobblestone_path_stairs.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/dirt_cobblestone_path_stairs.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/dirt_cobblestone_slab.json b/src/generated/resources/data/xkdeco/loot_table/blocks/dirt_cobblestone_slab.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/dirt_cobblestone_slab.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/dirt_cobblestone_slab.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/dirt_cobblestone_stairs.json b/src/generated/resources/data/xkdeco/loot_table/blocks/dirt_cobblestone_stairs.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/dirt_cobblestone_stairs.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/dirt_cobblestone_stairs.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/dirt_path_slab.json b/src/generated/resources/data/xkdeco/loot_table/blocks/dirt_path_slab.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/dirt_path_slab.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/dirt_path_slab.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/dirt_slab.json b/src/generated/resources/data/xkdeco/loot_table/blocks/dirt_slab.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/dirt_slab.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/dirt_slab.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/dirty_mud_wall_block.json b/src/generated/resources/data/xkdeco/loot_table/blocks/dirty_mud_wall_block.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/dirty_mud_wall_block.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/dirty_mud_wall_block.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/dirty_mud_wall_slab.json b/src/generated/resources/data/xkdeco/loot_table/blocks/dirty_mud_wall_slab.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/dirty_mud_wall_slab.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/dirty_mud_wall_slab.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/dirty_mud_wall_stairs.json b/src/generated/resources/data/xkdeco/loot_table/blocks/dirty_mud_wall_stairs.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/dirty_mud_wall_stairs.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/dirty_mud_wall_stairs.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/dirty_mud_wall_wall.json b/src/generated/resources/data/xkdeco/loot_table/blocks/dirty_mud_wall_wall.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/dirty_mud_wall_wall.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/dirty_mud_wall_wall.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/ebony_awning_window.json b/src/generated/resources/data/xkdeco/loot_table/blocks/ebony_awning_window.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/ebony_awning_window.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/ebony_awning_window.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/ebony_big_table.json b/src/generated/resources/data/xkdeco/loot_table/blocks/ebony_big_table.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/ebony_big_table.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/ebony_big_table.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/ebony_chair.json b/src/generated/resources/data/xkdeco/loot_table/blocks/ebony_chair.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/ebony_chair.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/ebony_chair.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/ebony_column_head.json b/src/generated/resources/data/xkdeco/loot_table/blocks/ebony_column_head.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/ebony_column_head.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/ebony_column_head.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/ebony_column_wall.json b/src/generated/resources/data/xkdeco/loot_table/blocks/ebony_column_wall.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/ebony_column_wall.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/ebony_column_wall.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/ebony_desk.json b/src/generated/resources/data/xkdeco/loot_table/blocks/ebony_desk.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/ebony_desk.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/ebony_desk.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/ebony_divided_shelf.json b/src/generated/resources/data/xkdeco/loot_table/blocks/ebony_divided_shelf.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/ebony_divided_shelf.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/ebony_divided_shelf.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/ebony_door.json b/src/generated/resources/data/xkdeco/loot_table/blocks/ebony_door.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/ebony_door.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/ebony_door.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/ebony_dougong.json b/src/generated/resources/data/xkdeco/loot_table/blocks/ebony_dougong.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/ebony_dougong.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/ebony_dougong.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/ebony_dougong_connection.json b/src/generated/resources/data/xkdeco/loot_table/blocks/ebony_dougong_connection.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/ebony_dougong_connection.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/ebony_dougong_connection.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/ebony_dougong_hollow_connection.json b/src/generated/resources/data/xkdeco/loot_table/blocks/ebony_dougong_hollow_connection.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/ebony_dougong_hollow_connection.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/ebony_dougong_hollow_connection.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/ebony_empty_shelf.json b/src/generated/resources/data/xkdeco/loot_table/blocks/ebony_empty_shelf.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/ebony_empty_shelf.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/ebony_empty_shelf.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/ebony_fence.json b/src/generated/resources/data/xkdeco/loot_table/blocks/ebony_fence.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/ebony_fence.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/ebony_fence.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/ebony_fence_gate.json b/src/generated/resources/data/xkdeco/loot_table/blocks/ebony_fence_gate.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/ebony_fence_gate.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/ebony_fence_gate.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/ebony_fence_head.json b/src/generated/resources/data/xkdeco/loot_table/blocks/ebony_fence_head.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/ebony_fence_head.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/ebony_fence_head.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/ebony_fence_oblique.json b/src/generated/resources/data/xkdeco/loot_table/blocks/ebony_fence_oblique.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/ebony_fence_oblique.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/ebony_fence_oblique.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/ebony_fence_oblique_steep.json b/src/generated/resources/data/xkdeco/loot_table/blocks/ebony_fence_oblique_steep.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/ebony_fence_oblique_steep.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/ebony_fence_oblique_steep.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/ebony_hanging_fascia.json b/src/generated/resources/data/xkdeco/loot_table/blocks/ebony_hanging_fascia.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/ebony_hanging_fascia.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/ebony_hanging_fascia.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/ebony_log.json b/src/generated/resources/data/xkdeco/loot_table/blocks/ebony_log.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/ebony_log.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/ebony_log.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/ebony_log_slab.json b/src/generated/resources/data/xkdeco/loot_table/blocks/ebony_log_slab.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/ebony_log_slab.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/ebony_log_slab.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/ebony_meiren_kao.json b/src/generated/resources/data/xkdeco/loot_table/blocks/ebony_meiren_kao.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/ebony_meiren_kao.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/ebony_meiren_kao.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/ebony_meiren_kao_with_column.json b/src/generated/resources/data/xkdeco/loot_table/blocks/ebony_meiren_kao_with_column.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/ebony_meiren_kao_with_column.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/ebony_meiren_kao_with_column.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/ebony_narrow_doors.json b/src/generated/resources/data/xkdeco/loot_table/blocks/ebony_narrow_doors.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/ebony_narrow_doors.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/ebony_narrow_doors.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/ebony_oblique_brace.json b/src/generated/resources/data/xkdeco/loot_table/blocks/ebony_oblique_brace.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/ebony_oblique_brace.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/ebony_oblique_brace.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/ebony_planks.json b/src/generated/resources/data/xkdeco/loot_table/blocks/ebony_planks.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/ebony_planks.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/ebony_planks.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/ebony_screen.json b/src/generated/resources/data/xkdeco/loot_table/blocks/ebony_screen.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/ebony_screen.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/ebony_screen.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/ebony_shelf.json b/src/generated/resources/data/xkdeco/loot_table/blocks/ebony_shelf.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/ebony_shelf.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/ebony_shelf.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/ebony_slab.json b/src/generated/resources/data/xkdeco/loot_table/blocks/ebony_slab.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/ebony_slab.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/ebony_slab.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/ebony_stairs.json b/src/generated/resources/data/xkdeco/loot_table/blocks/ebony_stairs.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/ebony_stairs.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/ebony_stairs.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/ebony_stool.json b/src/generated/resources/data/xkdeco/loot_table/blocks/ebony_stool.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/ebony_stool.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/ebony_stool.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/ebony_table.json b/src/generated/resources/data/xkdeco/loot_table/blocks/ebony_table.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/ebony_table.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/ebony_table.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/ebony_tall_table.json b/src/generated/resources/data/xkdeco/loot_table/blocks/ebony_tall_table.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/ebony_tall_table.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/ebony_tall_table.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/ebony_trapdoor.json b/src/generated/resources/data/xkdeco/loot_table/blocks/ebony_trapdoor.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/ebony_trapdoor.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/ebony_trapdoor.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/ebony_wall.json b/src/generated/resources/data/xkdeco/loot_table/blocks/ebony_wall.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/ebony_wall.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/ebony_wall.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/ebony_window.json b/src/generated/resources/data/xkdeco/loot_table/blocks/ebony_window.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/ebony_window.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/ebony_window.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/ebony_wood.json b/src/generated/resources/data/xkdeco/loot_table/blocks/ebony_wood.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/ebony_wood.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/ebony_wood.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/egyptian_brick_column.json b/src/generated/resources/data/xkdeco/loot_table/blocks/egyptian_brick_column.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/egyptian_brick_column.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/egyptian_brick_column.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/egyptian_brick_column_base.json b/src/generated/resources/data/xkdeco/loot_table/blocks/egyptian_brick_column_base.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/egyptian_brick_column_base.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/egyptian_brick_column_base.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/egyptian_brick_column_head.json b/src/generated/resources/data/xkdeco/loot_table/blocks/egyptian_brick_column_head.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/egyptian_brick_column_head.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/egyptian_brick_column_head.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/egyptian_bump_column.json b/src/generated/resources/data/xkdeco/loot_table/blocks/egyptian_bump_column.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/egyptian_bump_column.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/egyptian_bump_column.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/egyptian_bump_column_base.json b/src/generated/resources/data/xkdeco/loot_table/blocks/egyptian_bump_column_base.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/egyptian_bump_column_base.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/egyptian_bump_column_base.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/egyptian_bump_column_head.json b/src/generated/resources/data/xkdeco/loot_table/blocks/egyptian_bump_column_head.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/egyptian_bump_column_head.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/egyptian_bump_column_head.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/egyptian_carved_column.json b/src/generated/resources/data/xkdeco/loot_table/blocks/egyptian_carved_column.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/egyptian_carved_column.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/egyptian_carved_column.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/egyptian_carved_column_base.json b/src/generated/resources/data/xkdeco/loot_table/blocks/egyptian_carved_column_base.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/egyptian_carved_column_base.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/egyptian_carved_column_base.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/egyptian_column.json b/src/generated/resources/data/xkdeco/loot_table/blocks/egyptian_column.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/egyptian_column.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/egyptian_column.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/egyptian_column_base.json b/src/generated/resources/data/xkdeco/loot_table/blocks/egyptian_column_base.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/egyptian_column_base.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/egyptian_column_base.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/egyptian_column_head.json b/src/generated/resources/data/xkdeco/loot_table/blocks/egyptian_column_head.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/egyptian_column_head.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/egyptian_column_head.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/egyptian_moulding.json b/src/generated/resources/data/xkdeco/loot_table/blocks/egyptian_moulding.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/egyptian_moulding.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/egyptian_moulding.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/egyptian_moulding2.json b/src/generated/resources/data/xkdeco/loot_table/blocks/egyptian_moulding2.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/egyptian_moulding2.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/egyptian_moulding2.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/egyptian_smooth_column.json b/src/generated/resources/data/xkdeco/loot_table/blocks/egyptian_smooth_column.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/egyptian_smooth_column.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/egyptian_smooth_column.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/egyptian_smooth_column_base.json b/src/generated/resources/data/xkdeco/loot_table/blocks/egyptian_smooth_column_base.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/egyptian_smooth_column_base.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/egyptian_smooth_column_base.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/egyptian_stripe_column.json b/src/generated/resources/data/xkdeco/loot_table/blocks/egyptian_stripe_column.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/egyptian_stripe_column.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/egyptian_stripe_column.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/egyptian_stripe_column_base.json b/src/generated/resources/data/xkdeco/loot_table/blocks/egyptian_stripe_column_base.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/egyptian_stripe_column_base.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/egyptian_stripe_column_base.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/egyptian_stripe_column_head.json b/src/generated/resources/data/xkdeco/loot_table/blocks/egyptian_stripe_column_head.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/egyptian_stripe_column_head.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/egyptian_stripe_column_head.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/empty_bottle_stack.json b/src/generated/resources/data/xkdeco/loot_table/blocks/empty_bottle_stack.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/empty_bottle_stack.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/empty_bottle_stack.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/empty_candlestick.json b/src/generated/resources/data/xkdeco/loot_table/blocks/empty_candlestick.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/empty_candlestick.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/empty_candlestick.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/empty_fish_tank.json b/src/generated/resources/data/xkdeco/loot_table/blocks/empty_fish_tank.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/empty_fish_tank.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/empty_fish_tank.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/end_stone_slab.json b/src/generated/resources/data/xkdeco/loot_table/blocks/end_stone_slab.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/end_stone_slab.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/end_stone_slab.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/factory_attention.json b/src/generated/resources/data/xkdeco/loot_table/blocks/factory_attention.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/factory_attention.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/factory_attention.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/factory_attention_rusted.json b/src/generated/resources/data/xkdeco/loot_table/blocks/factory_attention_rusted.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/factory_attention_rusted.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/factory_attention_rusted.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/factory_attention_rusting.json b/src/generated/resources/data/xkdeco/loot_table/blocks/factory_attention_rusting.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/factory_attention_rusting.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/factory_attention_rusting.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/factory_biohazard.json b/src/generated/resources/data/xkdeco/loot_table/blocks/factory_biohazard.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/factory_biohazard.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/factory_biohazard.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/factory_biohazard_rusted.json b/src/generated/resources/data/xkdeco/loot_table/blocks/factory_biohazard_rusted.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/factory_biohazard_rusted.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/factory_biohazard_rusted.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/factory_biohazard_rusting.json b/src/generated/resources/data/xkdeco/loot_table/blocks/factory_biohazard_rusting.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/factory_biohazard_rusting.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/factory_biohazard_rusting.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/factory_block.json b/src/generated/resources/data/xkdeco/loot_table/blocks/factory_block.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/factory_block.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/factory_block.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/factory_block_rusted.json b/src/generated/resources/data/xkdeco/loot_table/blocks/factory_block_rusted.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/factory_block_rusted.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/factory_block_rusted.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/factory_block_rusting.json b/src/generated/resources/data/xkdeco/loot_table/blocks/factory_block_rusting.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/factory_block_rusting.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/factory_block_rusting.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/factory_ceiling_lamp.json b/src/generated/resources/data/xkdeco/loot_table/blocks/factory_ceiling_lamp.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/factory_ceiling_lamp.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/factory_ceiling_lamp.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/factory_danger.json b/src/generated/resources/data/xkdeco/loot_table/blocks/factory_danger.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/factory_danger.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/factory_danger.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/factory_danger_rusted.json b/src/generated/resources/data/xkdeco/loot_table/blocks/factory_danger_rusted.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/factory_danger_rusted.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/factory_danger_rusted.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/factory_danger_rusting.json b/src/generated/resources/data/xkdeco/loot_table/blocks/factory_danger_rusting.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/factory_danger_rusting.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/factory_danger_rusting.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/factory_electricity.json b/src/generated/resources/data/xkdeco/loot_table/blocks/factory_electricity.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/factory_electricity.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/factory_electricity.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/factory_electricity_rusted.json b/src/generated/resources/data/xkdeco/loot_table/blocks/factory_electricity_rusted.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/factory_electricity_rusted.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/factory_electricity_rusted.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/factory_electricity_rusting.json b/src/generated/resources/data/xkdeco/loot_table/blocks/factory_electricity_rusting.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/factory_electricity_rusting.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/factory_electricity_rusting.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/factory_lamp.json b/src/generated/resources/data/xkdeco/loot_table/blocks/factory_lamp.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/factory_lamp.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/factory_lamp.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/factory_lamp_block.json b/src/generated/resources/data/xkdeco/loot_table/blocks/factory_lamp_block.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/factory_lamp_block.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/factory_lamp_block.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/factory_lamp_broken.json b/src/generated/resources/data/xkdeco/loot_table/blocks/factory_lamp_broken.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/factory_lamp_broken.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/factory_lamp_broken.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/factory_lamp_slab.json b/src/generated/resources/data/xkdeco/loot_table/blocks/factory_lamp_slab.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/factory_lamp_slab.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/factory_lamp_slab.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/factory_lamp_stairs.json b/src/generated/resources/data/xkdeco/loot_table/blocks/factory_lamp_stairs.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/factory_lamp_stairs.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/factory_lamp_stairs.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/factory_light_bar.json b/src/generated/resources/data/xkdeco/loot_table/blocks/factory_light_bar.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/factory_light_bar.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/factory_light_bar.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/factory_pendant.json b/src/generated/resources/data/xkdeco/loot_table/blocks/factory_pendant.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/factory_pendant.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/factory_pendant.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/factory_radiation.json b/src/generated/resources/data/xkdeco/loot_table/blocks/factory_radiation.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/factory_radiation.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/factory_radiation.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/factory_radiation_rusted.json b/src/generated/resources/data/xkdeco/loot_table/blocks/factory_radiation_rusted.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/factory_radiation_rusted.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/factory_radiation_rusted.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/factory_radiation_rusting.json b/src/generated/resources/data/xkdeco/loot_table/blocks/factory_radiation_rusting.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/factory_radiation_rusting.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/factory_radiation_rusting.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/factory_slab.json b/src/generated/resources/data/xkdeco/loot_table/blocks/factory_slab.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/factory_slab.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/factory_slab.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/factory_slab_rusted.json b/src/generated/resources/data/xkdeco/loot_table/blocks/factory_slab_rusted.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/factory_slab_rusted.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/factory_slab_rusted.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/factory_slab_rusting.json b/src/generated/resources/data/xkdeco/loot_table/blocks/factory_slab_rusting.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/factory_slab_rusting.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/factory_slab_rusting.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/factory_stairs.json b/src/generated/resources/data/xkdeco/loot_table/blocks/factory_stairs.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/factory_stairs.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/factory_stairs.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/factory_stairs_rusted.json b/src/generated/resources/data/xkdeco/loot_table/blocks/factory_stairs_rusted.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/factory_stairs_rusted.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/factory_stairs_rusted.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/factory_stairs_rusting.json b/src/generated/resources/data/xkdeco/loot_table/blocks/factory_stairs_rusting.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/factory_stairs_rusting.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/factory_stairs_rusting.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/factory_toxic.json b/src/generated/resources/data/xkdeco/loot_table/blocks/factory_toxic.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/factory_toxic.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/factory_toxic.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/factory_toxic_rusted.json b/src/generated/resources/data/xkdeco/loot_table/blocks/factory_toxic_rusted.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/factory_toxic_rusted.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/factory_toxic_rusted.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/factory_toxic_rusting.json b/src/generated/resources/data/xkdeco/loot_table/blocks/factory_toxic_rusting.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/factory_toxic_rusting.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/factory_toxic_rusting.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/factory_trapdoor.json b/src/generated/resources/data/xkdeco/loot_table/blocks/factory_trapdoor.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/factory_trapdoor.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/factory_trapdoor.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/factory_trapdoor_rusted.json b/src/generated/resources/data/xkdeco/loot_table/blocks/factory_trapdoor_rusted.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/factory_trapdoor_rusted.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/factory_trapdoor_rusted.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/factory_trapdoor_rusting.json b/src/generated/resources/data/xkdeco/loot_table/blocks/factory_trapdoor_rusting.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/factory_trapdoor_rusting.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/factory_trapdoor_rusting.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/factory_vent_fan.json b/src/generated/resources/data/xkdeco/loot_table/blocks/factory_vent_fan.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/factory_vent_fan.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/factory_vent_fan.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/factory_vent_fan_big.json b/src/generated/resources/data/xkdeco/loot_table/blocks/factory_vent_fan_big.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/factory_vent_fan_big.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/factory_vent_fan_big.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/factory_warning_lamp.json b/src/generated/resources/data/xkdeco/loot_table/blocks/factory_warning_lamp.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/factory_warning_lamp.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/factory_warning_lamp.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/fallen_cherry_blossom.json b/src/generated/resources/data/xkdeco/loot_table/blocks/fallen_cherry_blossom.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/fallen_cherry_blossom.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/fallen_cherry_blossom.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/fallen_ginkgo_leaves.json b/src/generated/resources/data/xkdeco/loot_table/blocks/fallen_ginkgo_leaves.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/fallen_ginkgo_leaves.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/fallen_ginkgo_leaves.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/fallen_orange_maple_leaves.json b/src/generated/resources/data/xkdeco/loot_table/blocks/fallen_orange_maple_leaves.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/fallen_orange_maple_leaves.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/fallen_orange_maple_leaves.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/fallen_peach_blossom.json b/src/generated/resources/data/xkdeco/loot_table/blocks/fallen_peach_blossom.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/fallen_peach_blossom.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/fallen_peach_blossom.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/fallen_red_maple_leaves.json b/src/generated/resources/data/xkdeco/loot_table/blocks/fallen_red_maple_leaves.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/fallen_red_maple_leaves.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/fallen_red_maple_leaves.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/fallen_white_cherry_blossom.json b/src/generated/resources/data/xkdeco/loot_table/blocks/fallen_white_cherry_blossom.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/fallen_white_cherry_blossom.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/fallen_white_cherry_blossom.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/fan_blade.json b/src/generated/resources/data/xkdeco/loot_table/blocks/fan_blade.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/fan_blade.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/fan_blade.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/festival_lantern.json b/src/generated/resources/data/xkdeco/loot_table/blocks/festival_lantern.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/festival_lantern.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/festival_lantern.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/fish_bowl.json b/src/generated/resources/data/xkdeco/loot_table/blocks/fish_bowl.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/fish_bowl.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/fish_bowl.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/fish_tank.json b/src/generated/resources/data/xkdeco/loot_table/blocks/fish_tank.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/fish_tank.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/fish_tank.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/framed_mud_wall_block.json b/src/generated/resources/data/xkdeco/loot_table/blocks/framed_mud_wall_block.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/framed_mud_wall_block.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/framed_mud_wall_block.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/framed_steel_block.json b/src/generated/resources/data/xkdeco/loot_table/blocks/framed_steel_block.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/framed_steel_block.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/framed_steel_block.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/fruit_platter.json b/src/generated/resources/data/xkdeco/loot_table/blocks/fruit_platter.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/fruit_platter.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/fruit_platter.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/gilded_blackstone_brick_pillar.json b/src/generated/resources/data/xkdeco/loot_table/blocks/gilded_blackstone_brick_pillar.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/gilded_blackstone_brick_pillar.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/gilded_blackstone_brick_pillar.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/gilded_blackstone_brick_slab.json b/src/generated/resources/data/xkdeco/loot_table/blocks/gilded_blackstone_brick_slab.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/gilded_blackstone_brick_slab.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/gilded_blackstone_brick_slab.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/gilded_blackstone_brick_stairs.json b/src/generated/resources/data/xkdeco/loot_table/blocks/gilded_blackstone_brick_stairs.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/gilded_blackstone_brick_stairs.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/gilded_blackstone_brick_stairs.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/gilded_blackstone_bricks.json b/src/generated/resources/data/xkdeco/loot_table/blocks/gilded_blackstone_bricks.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/gilded_blackstone_bricks.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/gilded_blackstone_bricks.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/ginkgo_leaves.json b/src/generated/resources/data/xkdeco/loot_table/blocks/ginkgo_leaves.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/ginkgo_leaves.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/ginkgo_leaves.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/glass_door.json b/src/generated/resources/data/xkdeco/loot_table/blocks/glass_door.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/glass_door.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/glass_door.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/glass_tile_slab.json b/src/generated/resources/data/xkdeco/loot_table/blocks/glass_tile_slab.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/glass_tile_slab.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/glass_tile_slab.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/glass_tile_stairs.json b/src/generated/resources/data/xkdeco/loot_table/blocks/glass_tile_stairs.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/glass_tile_stairs.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/glass_tile_stairs.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/glass_tiles.json b/src/generated/resources/data/xkdeco/loot_table/blocks/glass_tiles.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/glass_tiles.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/glass_tiles.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/glass_trapdoor.json b/src/generated/resources/data/xkdeco/loot_table/blocks/glass_trapdoor.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/glass_trapdoor.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/glass_trapdoor.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/globe.json b/src/generated/resources/data/xkdeco/loot_table/blocks/globe.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/globe.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/globe.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/glow_item_frame_cover.json b/src/generated/resources/data/xkdeco/loot_table/blocks/glow_item_frame_cover.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/glow_item_frame_cover.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/glow_item_frame_cover.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/gold_brick_slab.json b/src/generated/resources/data/xkdeco/loot_table/blocks/gold_brick_slab.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/gold_brick_slab.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/gold_brick_slab.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/gold_brick_stairs.json b/src/generated/resources/data/xkdeco/loot_table/blocks/gold_brick_stairs.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/gold_brick_stairs.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/gold_brick_stairs.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/gold_bricks.json b/src/generated/resources/data/xkdeco/loot_table/blocks/gold_bricks.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/gold_bricks.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/gold_bricks.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/gold_pillar.json b/src/generated/resources/data/xkdeco/loot_table/blocks/gold_pillar.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/gold_pillar.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/gold_pillar.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/gorgeous_block_display.json b/src/generated/resources/data/xkdeco/loot_table/blocks/gorgeous_block_display.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/gorgeous_block_display.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/gorgeous_block_display.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/gorgeous_item_display.json b/src/generated/resources/data/xkdeco/loot_table/blocks/gorgeous_item_display.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/gorgeous_item_display.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/gorgeous_item_display.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/grass_block_slab.json b/src/generated/resources/data/xkdeco/loot_table/blocks/grass_block_slab.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/grass_block_slab.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/grass_block_slab.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/grass_cobblestone.json b/src/generated/resources/data/xkdeco/loot_table/blocks/grass_cobblestone.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/grass_cobblestone.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/grass_cobblestone.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/grass_cobblestone_path.json b/src/generated/resources/data/xkdeco/loot_table/blocks/grass_cobblestone_path.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/grass_cobblestone_path.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/grass_cobblestone_path.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/grass_cobblestone_path_slab.json b/src/generated/resources/data/xkdeco/loot_table/blocks/grass_cobblestone_path_slab.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/grass_cobblestone_path_slab.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/grass_cobblestone_path_slab.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/grass_cobblestone_path_stairs.json b/src/generated/resources/data/xkdeco/loot_table/blocks/grass_cobblestone_path_stairs.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/grass_cobblestone_path_stairs.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/grass_cobblestone_path_stairs.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/grass_cobblestone_slab.json b/src/generated/resources/data/xkdeco/loot_table/blocks/grass_cobblestone_slab.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/grass_cobblestone_slab.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/grass_cobblestone_slab.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/grass_cobblestone_stairs.json b/src/generated/resources/data/xkdeco/loot_table/blocks/grass_cobblestone_stairs.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/grass_cobblestone_stairs.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/grass_cobblestone_stairs.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/greek_column.json b/src/generated/resources/data/xkdeco/loot_table/blocks/greek_column.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/greek_column.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/greek_column.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/greek_corinthian_column_base.json b/src/generated/resources/data/xkdeco/loot_table/blocks/greek_corinthian_column_base.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/greek_corinthian_column_base.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/greek_corinthian_column_base.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/greek_corinthian_column_head.json b/src/generated/resources/data/xkdeco/loot_table/blocks/greek_corinthian_column_head.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/greek_corinthian_column_head.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/greek_corinthian_column_head.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/greek_doric_column_head.json b/src/generated/resources/data/xkdeco/loot_table/blocks/greek_doric_column_head.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/greek_doric_column_head.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/greek_doric_column_head.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/greek_ionic_column_base.json b/src/generated/resources/data/xkdeco/loot_table/blocks/greek_ionic_column_base.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/greek_ionic_column_base.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/greek_ionic_column_base.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/greek_ionic_column_head.json b/src/generated/resources/data/xkdeco/loot_table/blocks/greek_ionic_column_head.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/greek_ionic_column_head.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/greek_ionic_column_head.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/greek_ionic_column_head_corner.json b/src/generated/resources/data/xkdeco/loot_table/blocks/greek_ionic_column_head_corner.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/greek_ionic_column_head_corner.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/greek_ionic_column_head_corner.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/greek_moulding.json b/src/generated/resources/data/xkdeco/loot_table/blocks/greek_moulding.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/greek_moulding.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/greek_moulding.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/greek_moulding2.json b/src/generated/resources/data/xkdeco/loot_table/blocks/greek_moulding2.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/greek_moulding2.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/greek_moulding2.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/green_roof.json b/src/generated/resources/data/xkdeco/loot_table/blocks/green_roof.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/green_roof.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/green_roof.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/green_roof_flat.json b/src/generated/resources/data/xkdeco/loot_table/blocks/green_roof_flat.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/green_roof_flat.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/green_roof_flat.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/green_roof_ridge.json b/src/generated/resources/data/xkdeco/loot_table/blocks/green_roof_ridge.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/green_roof_ridge.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/green_roof_ridge.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/green_roof_small_eave.json b/src/generated/resources/data/xkdeco/loot_table/blocks/green_roof_small_eave.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/green_roof_small_eave.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/green_roof_small_eave.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/green_roof_small_end.json b/src/generated/resources/data/xkdeco/loot_table/blocks/green_roof_small_end.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/green_roof_small_end.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/green_roof_small_end.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/green_roof_small_flat_end.json b/src/generated/resources/data/xkdeco/loot_table/blocks/green_roof_small_flat_end.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/green_roof_small_flat_end.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/green_roof_small_flat_end.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/green_roof_small_ridge_end.json b/src/generated/resources/data/xkdeco/loot_table/blocks/green_roof_small_ridge_end.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/green_roof_small_ridge_end.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/green_roof_small_ridge_end.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/green_tile_slab.json b/src/generated/resources/data/xkdeco/loot_table/blocks/green_tile_slab.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/green_tile_slab.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/green_tile_slab.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/green_tile_stairs.json b/src/generated/resources/data/xkdeco/loot_table/blocks/green_tile_stairs.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/green_tile_stairs.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/green_tile_stairs.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/green_tiles.json b/src/generated/resources/data/xkdeco/loot_table/blocks/green_tiles.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/green_tiles.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/green_tiles.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/hanging_willow_leaves.json b/src/generated/resources/data/xkdeco/loot_table/blocks/hanging_willow_leaves.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/hanging_willow_leaves.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/hanging_willow_leaves.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/hollow_ebony_column_wall.json b/src/generated/resources/data/xkdeco/loot_table/blocks/hollow_ebony_column_wall.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/hollow_ebony_column_wall.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/hollow_ebony_column_wall.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/hollow_mahogany_column_wall.json b/src/generated/resources/data/xkdeco/loot_table/blocks/hollow_mahogany_column_wall.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/hollow_mahogany_column_wall.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/hollow_mahogany_column_wall.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/hollow_steel_bars.json b/src/generated/resources/data/xkdeco/loot_table/blocks/hollow_steel_bars.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/hollow_steel_bars.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/hollow_steel_bars.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/hollow_steel_beam.json b/src/generated/resources/data/xkdeco/loot_table/blocks/hollow_steel_beam.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/hollow_steel_beam.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/hollow_steel_beam.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/hollow_steel_beam_oblique.json b/src/generated/resources/data/xkdeco/loot_table/blocks/hollow_steel_beam_oblique.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/hollow_steel_beam_oblique.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/hollow_steel_beam_oblique.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/hollow_steel_beam_oblique_slow.json b/src/generated/resources/data/xkdeco/loot_table/blocks/hollow_steel_beam_oblique_slow.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/hollow_steel_beam_oblique_slow.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/hollow_steel_beam_oblique_slow.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/hollow_steel_beam_oblique_steep.json b/src/generated/resources/data/xkdeco/loot_table/blocks/hollow_steel_beam_oblique_steep.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/hollow_steel_beam_oblique_steep.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/hollow_steel_beam_oblique_steep.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/hollow_steel_block.json b/src/generated/resources/data/xkdeco/loot_table/blocks/hollow_steel_block.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/hollow_steel_block.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/hollow_steel_block.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/hollow_steel_half_beam.json b/src/generated/resources/data/xkdeco/loot_table/blocks/hollow_steel_half_beam.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/hollow_steel_half_beam.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/hollow_steel_half_beam.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/hollow_steel_trapdoor.json b/src/generated/resources/data/xkdeco/loot_table/blocks/hollow_steel_trapdoor.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/hollow_steel_trapdoor.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/hollow_steel_trapdoor.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/hollow_varnished_column_wall.json b/src/generated/resources/data/xkdeco/loot_table/blocks/hollow_varnished_column_wall.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/hollow_varnished_column_wall.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/hollow_varnished_column_wall.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/hologram_base.json b/src/generated/resources/data/xkdeco/loot_table/blocks/hologram_base.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/hologram_base.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/hologram_base.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/inca_brick_slab.json b/src/generated/resources/data/xkdeco/loot_table/blocks/inca_brick_slab.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/inca_brick_slab.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/inca_brick_slab.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/inca_brick_stairs.json b/src/generated/resources/data/xkdeco/loot_table/blocks/inca_brick_stairs.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/inca_brick_stairs.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/inca_brick_stairs.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/inca_bricks.json b/src/generated/resources/data/xkdeco/loot_table/blocks/inca_bricks.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/inca_bricks.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/inca_bricks.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/inca_stone.json b/src/generated/resources/data/xkdeco/loot_table/blocks/inca_stone.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/inca_stone.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/inca_stone.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/inca_stone_slab.json b/src/generated/resources/data/xkdeco/loot_table/blocks/inca_stone_slab.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/inca_stone_slab.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/inca_stone_slab.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/inca_stone_stairs.json b/src/generated/resources/data/xkdeco/loot_table/blocks/inca_stone_stairs.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/inca_stone_stairs.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/inca_stone_stairs.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/inca_stonebrick_slab.json b/src/generated/resources/data/xkdeco/loot_table/blocks/inca_stonebrick_slab.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/inca_stonebrick_slab.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/inca_stonebrick_slab.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/inca_stonebrick_stairs.json b/src/generated/resources/data/xkdeco/loot_table/blocks/inca_stonebrick_stairs.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/inca_stonebrick_stairs.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/inca_stonebrick_stairs.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/inca_stonebricks.json b/src/generated/resources/data/xkdeco/loot_table/blocks/inca_stonebricks.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/inca_stonebricks.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/inca_stonebricks.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/ink_painting.json b/src/generated/resources/data/xkdeco/loot_table/blocks/ink_painting.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/ink_painting.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/ink_painting.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/inscription_bronze_block.json b/src/generated/resources/data/xkdeco/loot_table/blocks/inscription_bronze_block.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/inscription_bronze_block.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/inscription_bronze_block.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/iron_windmill.json b/src/generated/resources/data/xkdeco/loot_table/blocks/iron_windmill.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/iron_windmill.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/iron_windmill.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/item_frame_cover.json b/src/generated/resources/data/xkdeco/loot_table/blocks/item_frame_cover.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/item_frame_cover.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/item_frame_cover.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/item_projector.json b/src/generated/resources/data/xkdeco/loot_table/blocks/item_projector.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/item_projector.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/item_projector.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/light_column_base.json b/src/generated/resources/data/xkdeco/loot_table/blocks/light_column_base.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/light_column_base.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/light_column_base.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/light_stone_handrail.json b/src/generated/resources/data/xkdeco/loot_table/blocks/light_stone_handrail.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/light_stone_handrail.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/light_stone_handrail.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/light_stone_handrail_end.json b/src/generated/resources/data/xkdeco/loot_table/blocks/light_stone_handrail_end.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/light_stone_handrail_end.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/light_stone_handrail_end.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/light_stone_handrail_head.json b/src/generated/resources/data/xkdeco/loot_table/blocks/light_stone_handrail_head.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/light_stone_handrail_head.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/light_stone_handrail_head.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/light_stone_handrail_lion_statue.json b/src/generated/resources/data/xkdeco/loot_table/blocks/light_stone_handrail_lion_statue.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/light_stone_handrail_lion_statue.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/light_stone_handrail_lion_statue.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/light_stone_handrail_oblique.json b/src/generated/resources/data/xkdeco/loot_table/blocks/light_stone_handrail_oblique.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/light_stone_handrail_oblique.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/light_stone_handrail_oblique.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/light_stone_handrail_oblique_steep.json b/src/generated/resources/data/xkdeco/loot_table/blocks/light_stone_handrail_oblique_steep.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/light_stone_handrail_oblique_steep.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/light_stone_handrail_oblique_steep.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/light_wall_base.json b/src/generated/resources/data/xkdeco/loot_table/blocks/light_wall_base.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/light_wall_base.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/light_wall_base.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/lined_mud_wall_block.json b/src/generated/resources/data/xkdeco/loot_table/blocks/lined_mud_wall_block.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/lined_mud_wall_block.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/lined_mud_wall_block.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/lined_mud_wall_slab.json b/src/generated/resources/data/xkdeco/loot_table/blocks/lined_mud_wall_slab.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/lined_mud_wall_slab.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/lined_mud_wall_slab.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/lined_mud_wall_stairs.json b/src/generated/resources/data/xkdeco/loot_table/blocks/lined_mud_wall_stairs.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/lined_mud_wall_stairs.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/lined_mud_wall_stairs.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/luxury_gilded_blackstone.json b/src/generated/resources/data/xkdeco/loot_table/blocks/luxury_gilded_blackstone.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/luxury_gilded_blackstone.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/luxury_gilded_blackstone.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/mahogany_awning_window.json b/src/generated/resources/data/xkdeco/loot_table/blocks/mahogany_awning_window.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/mahogany_awning_window.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/mahogany_awning_window.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/mahogany_big_table.json b/src/generated/resources/data/xkdeco/loot_table/blocks/mahogany_big_table.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/mahogany_big_table.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/mahogany_big_table.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/mahogany_chair.json b/src/generated/resources/data/xkdeco/loot_table/blocks/mahogany_chair.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/mahogany_chair.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/mahogany_chair.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/mahogany_column_head.json b/src/generated/resources/data/xkdeco/loot_table/blocks/mahogany_column_head.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/mahogany_column_head.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/mahogany_column_head.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/mahogany_column_wall.json b/src/generated/resources/data/xkdeco/loot_table/blocks/mahogany_column_wall.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/mahogany_column_wall.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/mahogany_column_wall.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/mahogany_desk.json b/src/generated/resources/data/xkdeco/loot_table/blocks/mahogany_desk.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/mahogany_desk.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/mahogany_desk.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/mahogany_divided_shelf.json b/src/generated/resources/data/xkdeco/loot_table/blocks/mahogany_divided_shelf.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/mahogany_divided_shelf.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/mahogany_divided_shelf.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/mahogany_door.json b/src/generated/resources/data/xkdeco/loot_table/blocks/mahogany_door.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/mahogany_door.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/mahogany_door.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/mahogany_dougong.json b/src/generated/resources/data/xkdeco/loot_table/blocks/mahogany_dougong.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/mahogany_dougong.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/mahogany_dougong.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/mahogany_dougong_connection.json b/src/generated/resources/data/xkdeco/loot_table/blocks/mahogany_dougong_connection.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/mahogany_dougong_connection.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/mahogany_dougong_connection.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/mahogany_dougong_hollow_connection.json b/src/generated/resources/data/xkdeco/loot_table/blocks/mahogany_dougong_hollow_connection.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/mahogany_dougong_hollow_connection.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/mahogany_dougong_hollow_connection.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/mahogany_empty_shelf.json b/src/generated/resources/data/xkdeco/loot_table/blocks/mahogany_empty_shelf.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/mahogany_empty_shelf.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/mahogany_empty_shelf.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/mahogany_fence.json b/src/generated/resources/data/xkdeco/loot_table/blocks/mahogany_fence.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/mahogany_fence.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/mahogany_fence.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/mahogany_fence_gate.json b/src/generated/resources/data/xkdeco/loot_table/blocks/mahogany_fence_gate.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/mahogany_fence_gate.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/mahogany_fence_gate.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/mahogany_fence_head.json b/src/generated/resources/data/xkdeco/loot_table/blocks/mahogany_fence_head.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/mahogany_fence_head.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/mahogany_fence_head.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/mahogany_fence_oblique.json b/src/generated/resources/data/xkdeco/loot_table/blocks/mahogany_fence_oblique.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/mahogany_fence_oblique.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/mahogany_fence_oblique.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/mahogany_fence_oblique_steep.json b/src/generated/resources/data/xkdeco/loot_table/blocks/mahogany_fence_oblique_steep.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/mahogany_fence_oblique_steep.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/mahogany_fence_oblique_steep.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/mahogany_hanging_fascia.json b/src/generated/resources/data/xkdeco/loot_table/blocks/mahogany_hanging_fascia.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/mahogany_hanging_fascia.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/mahogany_hanging_fascia.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/mahogany_log.json b/src/generated/resources/data/xkdeco/loot_table/blocks/mahogany_log.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/mahogany_log.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/mahogany_log.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/mahogany_log_slab.json b/src/generated/resources/data/xkdeco/loot_table/blocks/mahogany_log_slab.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/mahogany_log_slab.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/mahogany_log_slab.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/mahogany_meiren_kao.json b/src/generated/resources/data/xkdeco/loot_table/blocks/mahogany_meiren_kao.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/mahogany_meiren_kao.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/mahogany_meiren_kao.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/mahogany_meiren_kao_with_column.json b/src/generated/resources/data/xkdeco/loot_table/blocks/mahogany_meiren_kao_with_column.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/mahogany_meiren_kao_with_column.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/mahogany_meiren_kao_with_column.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/mahogany_narrow_doors.json b/src/generated/resources/data/xkdeco/loot_table/blocks/mahogany_narrow_doors.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/mahogany_narrow_doors.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/mahogany_narrow_doors.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/mahogany_oblique_brace.json b/src/generated/resources/data/xkdeco/loot_table/blocks/mahogany_oblique_brace.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/mahogany_oblique_brace.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/mahogany_oblique_brace.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/mahogany_planks.json b/src/generated/resources/data/xkdeco/loot_table/blocks/mahogany_planks.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/mahogany_planks.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/mahogany_planks.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/mahogany_screen.json b/src/generated/resources/data/xkdeco/loot_table/blocks/mahogany_screen.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/mahogany_screen.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/mahogany_screen.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/mahogany_shelf.json b/src/generated/resources/data/xkdeco/loot_table/blocks/mahogany_shelf.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/mahogany_shelf.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/mahogany_shelf.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/mahogany_slab.json b/src/generated/resources/data/xkdeco/loot_table/blocks/mahogany_slab.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/mahogany_slab.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/mahogany_slab.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/mahogany_stairs.json b/src/generated/resources/data/xkdeco/loot_table/blocks/mahogany_stairs.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/mahogany_stairs.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/mahogany_stairs.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/mahogany_stool.json b/src/generated/resources/data/xkdeco/loot_table/blocks/mahogany_stool.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/mahogany_stool.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/mahogany_stool.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/mahogany_table.json b/src/generated/resources/data/xkdeco/loot_table/blocks/mahogany_table.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/mahogany_table.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/mahogany_table.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/mahogany_tall_table.json b/src/generated/resources/data/xkdeco/loot_table/blocks/mahogany_tall_table.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/mahogany_tall_table.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/mahogany_tall_table.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/mahogany_trapdoor.json b/src/generated/resources/data/xkdeco/loot_table/blocks/mahogany_trapdoor.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/mahogany_trapdoor.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/mahogany_trapdoor.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/mahogany_wall.json b/src/generated/resources/data/xkdeco/loot_table/blocks/mahogany_wall.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/mahogany_wall.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/mahogany_wall.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/mahogany_window.json b/src/generated/resources/data/xkdeco/loot_table/blocks/mahogany_window.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/mahogany_window.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/mahogany_window.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/mahogany_wood.json b/src/generated/resources/data/xkdeco/loot_table/blocks/mahogany_wood.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/mahogany_wood.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/mahogany_wood.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/maya_brick_slab.json b/src/generated/resources/data/xkdeco/loot_table/blocks/maya_brick_slab.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/maya_brick_slab.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/maya_brick_slab.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/maya_brick_stairs.json b/src/generated/resources/data/xkdeco/loot_table/blocks/maya_brick_stairs.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/maya_brick_stairs.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/maya_brick_stairs.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/maya_brick_wall.json b/src/generated/resources/data/xkdeco/loot_table/blocks/maya_brick_wall.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/maya_brick_wall.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/maya_brick_wall.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/maya_bricks.json b/src/generated/resources/data/xkdeco/loot_table/blocks/maya_bricks.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/maya_bricks.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/maya_bricks.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/maya_calendar.json b/src/generated/resources/data/xkdeco/loot_table/blocks/maya_calendar.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/maya_calendar.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/maya_calendar.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/maya_chiseled_stonebricks.json b/src/generated/resources/data/xkdeco/loot_table/blocks/maya_chiseled_stonebricks.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/maya_chiseled_stonebricks.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/maya_chiseled_stonebricks.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/maya_column.json b/src/generated/resources/data/xkdeco/loot_table/blocks/maya_column.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/maya_column.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/maya_column.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/maya_crystal_skull.json b/src/generated/resources/data/xkdeco/loot_table/blocks/maya_crystal_skull.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/maya_crystal_skull.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/maya_crystal_skull.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/maya_cut_stonebricks.json b/src/generated/resources/data/xkdeco/loot_table/blocks/maya_cut_stonebricks.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/maya_cut_stonebricks.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/maya_cut_stonebricks.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/maya_double_screw_thread_stone.json b/src/generated/resources/data/xkdeco/loot_table/blocks/maya_double_screw_thread_stone.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/maya_double_screw_thread_stone.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/maya_double_screw_thread_stone.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/maya_mossy_brick_slab.json b/src/generated/resources/data/xkdeco/loot_table/blocks/maya_mossy_brick_slab.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/maya_mossy_brick_slab.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/maya_mossy_brick_slab.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/maya_mossy_brick_stairs.json b/src/generated/resources/data/xkdeco/loot_table/blocks/maya_mossy_brick_stairs.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/maya_mossy_brick_stairs.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/maya_mossy_brick_stairs.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/maya_mossy_brick_wall.json b/src/generated/resources/data/xkdeco/loot_table/blocks/maya_mossy_brick_wall.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/maya_mossy_brick_wall.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/maya_mossy_brick_wall.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/maya_mossy_bricks.json b/src/generated/resources/data/xkdeco/loot_table/blocks/maya_mossy_bricks.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/maya_mossy_bricks.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/maya_mossy_bricks.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/maya_mossy_pillar.json b/src/generated/resources/data/xkdeco/loot_table/blocks/maya_mossy_pillar.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/maya_mossy_pillar.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/maya_mossy_pillar.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/maya_mossy_stonebrick_slab.json b/src/generated/resources/data/xkdeco/loot_table/blocks/maya_mossy_stonebrick_slab.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/maya_mossy_stonebrick_slab.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/maya_mossy_stonebrick_slab.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/maya_mossy_stonebrick_stairs.json b/src/generated/resources/data/xkdeco/loot_table/blocks/maya_mossy_stonebrick_stairs.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/maya_mossy_stonebrick_stairs.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/maya_mossy_stonebrick_stairs.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/maya_mossy_stonebrick_wall.json b/src/generated/resources/data/xkdeco/loot_table/blocks/maya_mossy_stonebrick_wall.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/maya_mossy_stonebrick_wall.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/maya_mossy_stonebrick_wall.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/maya_mossy_stonebricks.json b/src/generated/resources/data/xkdeco/loot_table/blocks/maya_mossy_stonebricks.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/maya_mossy_stonebricks.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/maya_mossy_stonebricks.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/maya_pictogram_stone.json b/src/generated/resources/data/xkdeco/loot_table/blocks/maya_pictogram_stone.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/maya_pictogram_stone.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/maya_pictogram_stone.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/maya_pillar.json b/src/generated/resources/data/xkdeco/loot_table/blocks/maya_pillar.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/maya_pillar.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/maya_pillar.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/maya_polished_stonebrick_slab.json b/src/generated/resources/data/xkdeco/loot_table/blocks/maya_polished_stonebrick_slab.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/maya_polished_stonebrick_slab.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/maya_polished_stonebrick_slab.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/maya_polished_stonebrick_stairs.json b/src/generated/resources/data/xkdeco/loot_table/blocks/maya_polished_stonebrick_stairs.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/maya_polished_stonebrick_stairs.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/maya_polished_stonebrick_stairs.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/maya_polished_stonebricks.json b/src/generated/resources/data/xkdeco/loot_table/blocks/maya_polished_stonebricks.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/maya_polished_stonebricks.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/maya_polished_stonebricks.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/maya_quad_screw_thread_stone.json b/src/generated/resources/data/xkdeco/loot_table/blocks/maya_quad_screw_thread_stone.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/maya_quad_screw_thread_stone.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/maya_quad_screw_thread_stone.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/maya_single_screw_thread_stone.json b/src/generated/resources/data/xkdeco/loot_table/blocks/maya_single_screw_thread_stone.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/maya_single_screw_thread_stone.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/maya_single_screw_thread_stone.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/maya_skull_stone.json b/src/generated/resources/data/xkdeco/loot_table/blocks/maya_skull_stone.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/maya_skull_stone.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/maya_skull_stone.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/maya_stone.json b/src/generated/resources/data/xkdeco/loot_table/blocks/maya_stone.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/maya_stone.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/maya_stone.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/maya_stone_slab.json b/src/generated/resources/data/xkdeco/loot_table/blocks/maya_stone_slab.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/maya_stone_slab.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/maya_stone_slab.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/maya_stone_stairs.json b/src/generated/resources/data/xkdeco/loot_table/blocks/maya_stone_stairs.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/maya_stone_stairs.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/maya_stone_stairs.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/maya_stonebrick_column.json b/src/generated/resources/data/xkdeco/loot_table/blocks/maya_stonebrick_column.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/maya_stonebrick_column.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/maya_stonebrick_column.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/maya_stonebrick_slab.json b/src/generated/resources/data/xkdeco/loot_table/blocks/maya_stonebrick_slab.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/maya_stonebrick_slab.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/maya_stonebrick_slab.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/maya_stonebrick_stairs.json b/src/generated/resources/data/xkdeco/loot_table/blocks/maya_stonebrick_stairs.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/maya_stonebrick_stairs.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/maya_stonebrick_stairs.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/maya_stonebrick_wall.json b/src/generated/resources/data/xkdeco/loot_table/blocks/maya_stonebrick_wall.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/maya_stonebrick_wall.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/maya_stonebrick_wall.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/maya_stonebricks.json b/src/generated/resources/data/xkdeco/loot_table/blocks/maya_stonebricks.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/maya_stonebricks.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/maya_stonebricks.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/mechanical_block_display.json b/src/generated/resources/data/xkdeco/loot_table/blocks/mechanical_block_display.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/mechanical_block_display.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/mechanical_block_display.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/mechanical_chair.json b/src/generated/resources/data/xkdeco/loot_table/blocks/mechanical_chair.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/mechanical_chair.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/mechanical_chair.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/mechanical_console.json b/src/generated/resources/data/xkdeco/loot_table/blocks/mechanical_console.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/mechanical_console.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/mechanical_console.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/mechanical_item_display.json b/src/generated/resources/data/xkdeco/loot_table/blocks/mechanical_item_display.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/mechanical_item_display.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/mechanical_item_display.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/mechanical_screen.json b/src/generated/resources/data/xkdeco/loot_table/blocks/mechanical_screen.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/mechanical_screen.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/mechanical_screen.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/miniature_bamboo.json b/src/generated/resources/data/xkdeco/loot_table/blocks/miniature_bamboo.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/miniature_bamboo.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/miniature_bamboo.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/miniature_cherry.json b/src/generated/resources/data/xkdeco/loot_table/blocks/miniature_cherry.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/miniature_cherry.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/miniature_cherry.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/miniature_coral.json b/src/generated/resources/data/xkdeco/loot_table/blocks/miniature_coral.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/miniature_coral.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/miniature_coral.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/miniature_ginkgo.json b/src/generated/resources/data/xkdeco/loot_table/blocks/miniature_ginkgo.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/miniature_ginkgo.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/miniature_ginkgo.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/miniature_maple.json b/src/generated/resources/data/xkdeco/loot_table/blocks/miniature_maple.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/miniature_maple.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/miniature_maple.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/miniature_mount.json b/src/generated/resources/data/xkdeco/loot_table/blocks/miniature_mount.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/miniature_mount.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/miniature_mount.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/miniature_red_coral.json b/src/generated/resources/data/xkdeco/loot_table/blocks/miniature_red_coral.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/miniature_red_coral.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/miniature_red_coral.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/miniature_succulents.json b/src/generated/resources/data/xkdeco/loot_table/blocks/miniature_succulents.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/miniature_succulents.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/miniature_succulents.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/miniature_tree.json b/src/generated/resources/data/xkdeco/loot_table/blocks/miniature_tree.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/miniature_tree.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/miniature_tree.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/mossy_deepslate_brick_slab.json b/src/generated/resources/data/xkdeco/loot_table/blocks/mossy_deepslate_brick_slab.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/mossy_deepslate_brick_slab.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/mossy_deepslate_brick_slab.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/mossy_deepslate_brick_stairs.json b/src/generated/resources/data/xkdeco/loot_table/blocks/mossy_deepslate_brick_stairs.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/mossy_deepslate_brick_stairs.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/mossy_deepslate_brick_stairs.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/mossy_deepslate_bricks.json b/src/generated/resources/data/xkdeco/loot_table/blocks/mossy_deepslate_bricks.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/mossy_deepslate_bricks.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/mossy_deepslate_bricks.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/mud_wall_block.json b/src/generated/resources/data/xkdeco/loot_table/blocks/mud_wall_block.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/mud_wall_block.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/mud_wall_block.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/mud_wall_slab.json b/src/generated/resources/data/xkdeco/loot_table/blocks/mud_wall_slab.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/mud_wall_slab.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/mud_wall_slab.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/mud_wall_stairs.json b/src/generated/resources/data/xkdeco/loot_table/blocks/mud_wall_stairs.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/mud_wall_stairs.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/mud_wall_stairs.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/mud_wall_wall.json b/src/generated/resources/data/xkdeco/loot_table/blocks/mud_wall_wall.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/mud_wall_wall.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/mud_wall_wall.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/mycelium_slab.json b/src/generated/resources/data/xkdeco/loot_table/blocks/mycelium_slab.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/mycelium_slab.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/mycelium_slab.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/netherrack_slab.json b/src/generated/resources/data/xkdeco/loot_table/blocks/netherrack_slab.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/netherrack_slab.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/netherrack_slab.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/oil_lamp.json b/src/generated/resources/data/xkdeco/loot_table/blocks/oil_lamp.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/oil_lamp.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/oil_lamp.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/orange_maple_leaves.json b/src/generated/resources/data/xkdeco/loot_table/blocks/orange_maple_leaves.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/orange_maple_leaves.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/orange_maple_leaves.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/painted_gold_block.json b/src/generated/resources/data/xkdeco/loot_table/blocks/painted_gold_block.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/painted_gold_block.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/painted_gold_block.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/paper_lantern.json b/src/generated/resources/data/xkdeco/loot_table/blocks/paper_lantern.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/paper_lantern.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/paper_lantern.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/peach_blossom.json b/src/generated/resources/data/xkdeco/loot_table/blocks/peach_blossom.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/peach_blossom.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/peach_blossom.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/peach_blossom_leaves.json b/src/generated/resources/data/xkdeco/loot_table/blocks/peach_blossom_leaves.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/peach_blossom_leaves.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/peach_blossom_leaves.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/plain_block_display.json b/src/generated/resources/data/xkdeco/loot_table/blocks/plain_block_display.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/plain_block_display.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/plain_block_display.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/plain_item_display.json b/src/generated/resources/data/xkdeco/loot_table/blocks/plain_item_display.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/plain_item_display.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/plain_item_display.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/plantable_leaves.json b/src/generated/resources/data/xkdeco/loot_table/blocks/plantable_leaves.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/plantable_leaves.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/plantable_leaves.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/plantable_leaves_dark.json b/src/generated/resources/data/xkdeco/loot_table/blocks/plantable_leaves_dark.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/plantable_leaves_dark.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/plantable_leaves_dark.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/podzol_slab.json b/src/generated/resources/data/xkdeco/loot_table/blocks/podzol_slab.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/podzol_slab.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/podzol_slab.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/polished_red_sandstone.json b/src/generated/resources/data/xkdeco/loot_table/blocks/polished_red_sandstone.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/polished_red_sandstone.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/polished_red_sandstone.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/polished_red_sandstone_slab.json b/src/generated/resources/data/xkdeco/loot_table/blocks/polished_red_sandstone_slab.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/polished_red_sandstone_slab.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/polished_red_sandstone_slab.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/polished_sandstone.json b/src/generated/resources/data/xkdeco/loot_table/blocks/polished_sandstone.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/polished_sandstone.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/polished_sandstone.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/polished_sandstone_slab.json b/src/generated/resources/data/xkdeco/loot_table/blocks/polished_sandstone_slab.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/polished_sandstone_slab.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/polished_sandstone_slab.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/quartz_glass.json b/src/generated/resources/data/xkdeco/loot_table/blocks/quartz_glass.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/quartz_glass.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/quartz_glass.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/quartz_glass_slab.json b/src/generated/resources/data/xkdeco/loot_table/blocks/quartz_glass_slab.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/quartz_glass_slab.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/quartz_glass_slab.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/quartz_glass_stairs.json b/src/generated/resources/data/xkdeco/loot_table/blocks/quartz_glass_stairs.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/quartz_glass_stairs.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/quartz_glass_stairs.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/quartz_sand.json b/src/generated/resources/data/xkdeco/loot_table/blocks/quartz_sand.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/quartz_sand.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/quartz_sand.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/quartz_wall.json b/src/generated/resources/data/xkdeco/loot_table/blocks/quartz_wall.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/quartz_wall.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/quartz_wall.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/red_lantern.json b/src/generated/resources/data/xkdeco/loot_table/blocks/red_lantern.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/red_lantern.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/red_lantern.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/red_maple_leaves.json b/src/generated/resources/data/xkdeco/loot_table/blocks/red_maple_leaves.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/red_maple_leaves.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/red_maple_leaves.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/red_roof.json b/src/generated/resources/data/xkdeco/loot_table/blocks/red_roof.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/red_roof.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/red_roof.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/red_roof_flat.json b/src/generated/resources/data/xkdeco/loot_table/blocks/red_roof_flat.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/red_roof_flat.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/red_roof_flat.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/red_roof_ridge.json b/src/generated/resources/data/xkdeco/loot_table/blocks/red_roof_ridge.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/red_roof_ridge.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/red_roof_ridge.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/red_roof_small_eave.json b/src/generated/resources/data/xkdeco/loot_table/blocks/red_roof_small_eave.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/red_roof_small_eave.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/red_roof_small_eave.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/red_roof_small_end.json b/src/generated/resources/data/xkdeco/loot_table/blocks/red_roof_small_end.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/red_roof_small_end.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/red_roof_small_end.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/red_roof_small_flat_end.json b/src/generated/resources/data/xkdeco/loot_table/blocks/red_roof_small_flat_end.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/red_roof_small_flat_end.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/red_roof_small_flat_end.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/red_roof_small_ridge_end.json b/src/generated/resources/data/xkdeco/loot_table/blocks/red_roof_small_ridge_end.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/red_roof_small_ridge_end.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/red_roof_small_ridge_end.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/red_sandstone_brick_slab.json b/src/generated/resources/data/xkdeco/loot_table/blocks/red_sandstone_brick_slab.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/red_sandstone_brick_slab.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/red_sandstone_brick_slab.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/red_sandstone_brick_stairs.json b/src/generated/resources/data/xkdeco/loot_table/blocks/red_sandstone_brick_stairs.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/red_sandstone_brick_stairs.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/red_sandstone_brick_stairs.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/red_sandstone_bricks.json b/src/generated/resources/data/xkdeco/loot_table/blocks/red_sandstone_bricks.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/red_sandstone_bricks.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/red_sandstone_bricks.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/red_sandstone_pillar.json b/src/generated/resources/data/xkdeco/loot_table/blocks/red_sandstone_pillar.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/red_sandstone_pillar.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/red_sandstone_pillar.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/red_sandstone_small_brick_slab.json b/src/generated/resources/data/xkdeco/loot_table/blocks/red_sandstone_small_brick_slab.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/red_sandstone_small_brick_slab.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/red_sandstone_small_brick_slab.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/red_sandstone_small_brick_stairs.json b/src/generated/resources/data/xkdeco/loot_table/blocks/red_sandstone_small_brick_stairs.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/red_sandstone_small_brick_stairs.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/red_sandstone_small_brick_stairs.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/red_sandstone_small_bricks.json b/src/generated/resources/data/xkdeco/loot_table/blocks/red_sandstone_small_bricks.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/red_sandstone_small_bricks.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/red_sandstone_small_bricks.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/red_tile_slab.json b/src/generated/resources/data/xkdeco/loot_table/blocks/red_tile_slab.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/red_tile_slab.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/red_tile_slab.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/red_tile_stairs.json b/src/generated/resources/data/xkdeco/loot_table/blocks/red_tile_stairs.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/red_tile_stairs.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/red_tile_stairs.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/red_tiles.json b/src/generated/resources/data/xkdeco/loot_table/blocks/red_tiles.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/red_tiles.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/red_tiles.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/refreshments.json b/src/generated/resources/data/xkdeco/loot_table/blocks/refreshments.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/refreshments.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/refreshments.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/refreshments2.json b/src/generated/resources/data/xkdeco/loot_table/blocks/refreshments2.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/refreshments2.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/refreshments2.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/refreshments3.json b/src/generated/resources/data/xkdeco/loot_table/blocks/refreshments3.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/refreshments3.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/refreshments3.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/refreshments4.json b/src/generated/resources/data/xkdeco/loot_table/blocks/refreshments4.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/refreshments4.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/refreshments4.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/refreshments5.json b/src/generated/resources/data/xkdeco/loot_table/blocks/refreshments5.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/refreshments5.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/refreshments5.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/refreshments6.json b/src/generated/resources/data/xkdeco/loot_table/blocks/refreshments6.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/refreshments6.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/refreshments6.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/roman_column.json b/src/generated/resources/data/xkdeco/loot_table/blocks/roman_column.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/roman_column.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/roman_column.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/roman_column_base.json b/src/generated/resources/data/xkdeco/loot_table/blocks/roman_column_base.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/roman_column_base.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/roman_column_base.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/roman_composite_column_base.json b/src/generated/resources/data/xkdeco/loot_table/blocks/roman_composite_column_base.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/roman_composite_column_base.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/roman_composite_column_base.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/roman_composite_column_head.json b/src/generated/resources/data/xkdeco/loot_table/blocks/roman_composite_column_head.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/roman_composite_column_head.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/roman_composite_column_head.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/roman_corinthian_column_base.json b/src/generated/resources/data/xkdeco/loot_table/blocks/roman_corinthian_column_base.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/roman_corinthian_column_base.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/roman_corinthian_column_base.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/roman_corinthian_column_head.json b/src/generated/resources/data/xkdeco/loot_table/blocks/roman_corinthian_column_head.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/roman_corinthian_column_head.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/roman_corinthian_column_head.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/roman_doric_column.json b/src/generated/resources/data/xkdeco/loot_table/blocks/roman_doric_column.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/roman_doric_column.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/roman_doric_column.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/roman_doric_column_base.json b/src/generated/resources/data/xkdeco/loot_table/blocks/roman_doric_column_base.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/roman_doric_column_base.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/roman_doric_column_base.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/roman_doric_column_head.json b/src/generated/resources/data/xkdeco/loot_table/blocks/roman_doric_column_head.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/roman_doric_column_head.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/roman_doric_column_head.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/roman_ionic_column_base.json b/src/generated/resources/data/xkdeco/loot_table/blocks/roman_ionic_column_base.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/roman_ionic_column_base.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/roman_ionic_column_base.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/roman_ionic_column_head.json b/src/generated/resources/data/xkdeco/loot_table/blocks/roman_ionic_column_head.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/roman_ionic_column_head.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/roman_ionic_column_head.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/roman_ionic_column_head_corner.json b/src/generated/resources/data/xkdeco/loot_table/blocks/roman_ionic_column_head_corner.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/roman_ionic_column_head_corner.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/roman_ionic_column_head_corner.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/roman_moulding.json b/src/generated/resources/data/xkdeco/loot_table/blocks/roman_moulding.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/roman_moulding.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/roman_moulding.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/roman_moulding2.json b/src/generated/resources/data/xkdeco/loot_table/blocks/roman_moulding2.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/roman_moulding2.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/roman_moulding2.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/roman_toscan_column.json b/src/generated/resources/data/xkdeco/loot_table/blocks/roman_toscan_column.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/roman_toscan_column.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/roman_toscan_column.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/roman_toscan_column_base.json b/src/generated/resources/data/xkdeco/loot_table/blocks/roman_toscan_column_base.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/roman_toscan_column_base.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/roman_toscan_column_base.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/roman_toscan_column_head.json b/src/generated/resources/data/xkdeco/loot_table/blocks/roman_toscan_column_head.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/roman_toscan_column_head.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/roman_toscan_column_head.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/roofed_lamp.json b/src/generated/resources/data/xkdeco/loot_table/blocks/roofed_lamp.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/roofed_lamp.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/roofed_lamp.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/sandstone_brick_slab.json b/src/generated/resources/data/xkdeco/loot_table/blocks/sandstone_brick_slab.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/sandstone_brick_slab.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/sandstone_brick_slab.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/sandstone_brick_stairs.json b/src/generated/resources/data/xkdeco/loot_table/blocks/sandstone_brick_stairs.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/sandstone_brick_stairs.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/sandstone_brick_stairs.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/sandstone_bricks.json b/src/generated/resources/data/xkdeco/loot_table/blocks/sandstone_bricks.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/sandstone_bricks.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/sandstone_bricks.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/sandstone_pillar.json b/src/generated/resources/data/xkdeco/loot_table/blocks/sandstone_pillar.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/sandstone_pillar.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/sandstone_pillar.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/sandstone_small_brick_slab.json b/src/generated/resources/data/xkdeco/loot_table/blocks/sandstone_small_brick_slab.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/sandstone_small_brick_slab.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/sandstone_small_brick_slab.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/sandstone_small_brick_stairs.json b/src/generated/resources/data/xkdeco/loot_table/blocks/sandstone_small_brick_stairs.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/sandstone_small_brick_stairs.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/sandstone_small_brick_stairs.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/sandstone_small_bricks.json b/src/generated/resources/data/xkdeco/loot_table/blocks/sandstone_small_bricks.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/sandstone_small_bricks.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/sandstone_small_bricks.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/sandy_cobblestone.json b/src/generated/resources/data/xkdeco/loot_table/blocks/sandy_cobblestone.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/sandy_cobblestone.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/sandy_cobblestone.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/sandy_cobblestone_path.json b/src/generated/resources/data/xkdeco/loot_table/blocks/sandy_cobblestone_path.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/sandy_cobblestone_path.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/sandy_cobblestone_path.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/sandy_cobblestone_path_slab.json b/src/generated/resources/data/xkdeco/loot_table/blocks/sandy_cobblestone_path_slab.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/sandy_cobblestone_path_slab.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/sandy_cobblestone_path_slab.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/sandy_cobblestone_path_stairs.json b/src/generated/resources/data/xkdeco/loot_table/blocks/sandy_cobblestone_path_stairs.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/sandy_cobblestone_path_stairs.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/sandy_cobblestone_path_stairs.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/sandy_cobblestone_slab.json b/src/generated/resources/data/xkdeco/loot_table/blocks/sandy_cobblestone_slab.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/sandy_cobblestone_slab.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/sandy_cobblestone_slab.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/sandy_cobblestone_stairs.json b/src/generated/resources/data/xkdeco/loot_table/blocks/sandy_cobblestone_stairs.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/sandy_cobblestone_stairs.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/sandy_cobblestone_stairs.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/screen_cube.json b/src/generated/resources/data/xkdeco/loot_table/blocks/screen_cube.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/screen_cube.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/screen_cube.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/screen_diagram.json b/src/generated/resources/data/xkdeco/loot_table/blocks/screen_diagram.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/screen_diagram.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/screen_diagram.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/screen_dna.json b/src/generated/resources/data/xkdeco/loot_table/blocks/screen_dna.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/screen_dna.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/screen_dna.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/screen_list.json b/src/generated/resources/data/xkdeco/loot_table/blocks/screen_list.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/screen_list.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/screen_list.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/screen_message.json b/src/generated/resources/data/xkdeco/loot_table/blocks/screen_message.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/screen_message.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/screen_message.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/screen_off.json b/src/generated/resources/data/xkdeco/loot_table/blocks/screen_off.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/screen_off.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/screen_off.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/screen_three_bodies.json b/src/generated/resources/data/xkdeco/loot_table/blocks/screen_three_bodies.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/screen_three_bodies.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/screen_three_bodies.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/screen_transport.json b/src/generated/resources/data/xkdeco/loot_table/blocks/screen_transport.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/screen_transport.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/screen_transport.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/screen_wave.json b/src/generated/resources/data/xkdeco/loot_table/blocks/screen_wave.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/screen_wave.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/screen_wave.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/screw_thread_bronze_block.json b/src/generated/resources/data/xkdeco/loot_table/blocks/screw_thread_bronze_block.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/screw_thread_bronze_block.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/screw_thread_bronze_block.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/sign_entrance.json b/src/generated/resources/data/xkdeco/loot_table/blocks/sign_entrance.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/sign_entrance.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/sign_entrance.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/sign_exit.json b/src/generated/resources/data/xkdeco/loot_table/blocks/sign_exit.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/sign_exit.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/sign_exit.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/sign_left.json b/src/generated/resources/data/xkdeco/loot_table/blocks/sign_left.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/sign_left.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/sign_left.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/sign_right.json b/src/generated/resources/data/xkdeco/loot_table/blocks/sign_right.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/sign_right.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/sign_right.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/small_book_stack.json b/src/generated/resources/data/xkdeco/loot_table/blocks/small_book_stack.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/small_book_stack.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/small_book_stack.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/small_sign_ground.json b/src/generated/resources/data/xkdeco/loot_table/blocks/small_sign_ground.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/small_sign_ground.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/small_sign_ground.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/small_sign_left.json b/src/generated/resources/data/xkdeco/loot_table/blocks/small_sign_left.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/small_sign_left.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/small_sign_left.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/small_sign_right.json b/src/generated/resources/data/xkdeco/loot_table/blocks/small_sign_right.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/small_sign_right.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/small_sign_right.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/smooth_bronze_block.json b/src/generated/resources/data/xkdeco/loot_table/blocks/smooth_bronze_block.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/smooth_bronze_block.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/smooth_bronze_block.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/smooth_steel_block.json b/src/generated/resources/data/xkdeco/loot_table/blocks/smooth_steel_block.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/smooth_steel_block.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/smooth_steel_block.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/snowy_cobblestone.json b/src/generated/resources/data/xkdeco/loot_table/blocks/snowy_cobblestone.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/snowy_cobblestone.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/snowy_cobblestone.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/snowy_cobblestone_path.json b/src/generated/resources/data/xkdeco/loot_table/blocks/snowy_cobblestone_path.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/snowy_cobblestone_path.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/snowy_cobblestone_path.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/snowy_cobblestone_path_slab.json b/src/generated/resources/data/xkdeco/loot_table/blocks/snowy_cobblestone_path_slab.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/snowy_cobblestone_path_slab.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/snowy_cobblestone_path_slab.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/snowy_cobblestone_path_stairs.json b/src/generated/resources/data/xkdeco/loot_table/blocks/snowy_cobblestone_path_stairs.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/snowy_cobblestone_path_stairs.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/snowy_cobblestone_path_stairs.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/snowy_cobblestone_slab.json b/src/generated/resources/data/xkdeco/loot_table/blocks/snowy_cobblestone_slab.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/snowy_cobblestone_slab.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/snowy_cobblestone_slab.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/snowy_cobblestone_stairs.json b/src/generated/resources/data/xkdeco/loot_table/blocks/snowy_cobblestone_stairs.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/snowy_cobblestone_stairs.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/snowy_cobblestone_stairs.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/solar_system_model.json b/src/generated/resources/data/xkdeco/loot_table/blocks/solar_system_model.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/solar_system_model.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/solar_system_model.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/steel_block.json b/src/generated/resources/data/xkdeco/loot_table/blocks/steel_block.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/steel_block.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/steel_block.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/steel_filings.json b/src/generated/resources/data/xkdeco/loot_table/blocks/steel_filings.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/steel_filings.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/steel_filings.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/steel_floor.json b/src/generated/resources/data/xkdeco/loot_table/blocks/steel_floor.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/steel_floor.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/steel_floor.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/steel_floor_slab.json b/src/generated/resources/data/xkdeco/loot_table/blocks/steel_floor_slab.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/steel_floor_slab.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/steel_floor_slab.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/steel_floor_stairs.json b/src/generated/resources/data/xkdeco/loot_table/blocks/steel_floor_stairs.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/steel_floor_stairs.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/steel_floor_stairs.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/steel_ladder.json b/src/generated/resources/data/xkdeco/loot_table/blocks/steel_ladder.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/steel_ladder.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/steel_ladder.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/steel_pillar.json b/src/generated/resources/data/xkdeco/loot_table/blocks/steel_pillar.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/steel_pillar.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/steel_pillar.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/steel_safety_ladder.json b/src/generated/resources/data/xkdeco/loot_table/blocks/steel_safety_ladder.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/steel_safety_ladder.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/steel_safety_ladder.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/steel_tile_slab.json b/src/generated/resources/data/xkdeco/loot_table/blocks/steel_tile_slab.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/steel_tile_slab.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/steel_tile_slab.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/steel_tile_stairs.json b/src/generated/resources/data/xkdeco/loot_table/blocks/steel_tile_stairs.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/steel_tile_stairs.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/steel_tile_stairs.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/steel_tiles.json b/src/generated/resources/data/xkdeco/loot_table/blocks/steel_tiles.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/steel_tiles.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/steel_tiles.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/steel_trapdoor.json b/src/generated/resources/data/xkdeco/loot_table/blocks/steel_trapdoor.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/steel_trapdoor.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/steel_trapdoor.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/steel_windmill.json b/src/generated/resources/data/xkdeco/loot_table/blocks/steel_windmill.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/steel_windmill.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/steel_windmill.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/stone_brick_pavement.json b/src/generated/resources/data/xkdeco/loot_table/blocks/stone_brick_pavement.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/stone_brick_pavement.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/stone_brick_pavement.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/stone_brick_pavement_slab.json b/src/generated/resources/data/xkdeco/loot_table/blocks/stone_brick_pavement_slab.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/stone_brick_pavement_slab.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/stone_brick_pavement_slab.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/stone_brick_pillar.json b/src/generated/resources/data/xkdeco/loot_table/blocks/stone_brick_pillar.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/stone_brick_pillar.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/stone_brick_pillar.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/stone_lamp.json b/src/generated/resources/data/xkdeco/loot_table/blocks/stone_lamp.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/stone_lamp.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/stone_lamp.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/stone_water_bowl.json b/src/generated/resources/data/xkdeco/loot_table/blocks/stone_water_bowl.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/stone_water_bowl.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/stone_water_bowl.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/stone_water_tank.json b/src/generated/resources/data/xkdeco/loot_table/blocks/stone_water_tank.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/stone_water_tank.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/stone_water_tank.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/tea_ware.json b/src/generated/resources/data/xkdeco/loot_table/blocks/tea_ware.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/tea_ware.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/tea_ware.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/teapot.json b/src/generated/resources/data/xkdeco/loot_table/blocks/teapot.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/teapot.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/teapot.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/tech_block_display.json b/src/generated/resources/data/xkdeco/loot_table/blocks/tech_block_display.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/tech_block_display.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/tech_block_display.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/tech_chair.json b/src/generated/resources/data/xkdeco/loot_table/blocks/tech_chair.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/tech_chair.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/tech_chair.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/tech_console.json b/src/generated/resources/data/xkdeco/loot_table/blocks/tech_console.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/tech_console.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/tech_console.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/tech_item_display.json b/src/generated/resources/data/xkdeco/loot_table/blocks/tech_item_display.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/tech_item_display.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/tech_item_display.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/tech_lamp_block.json b/src/generated/resources/data/xkdeco/loot_table/blocks/tech_lamp_block.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/tech_lamp_block.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/tech_lamp_block.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/tech_lamp_slab.json b/src/generated/resources/data/xkdeco/loot_table/blocks/tech_lamp_slab.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/tech_lamp_slab.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/tech_lamp_slab.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/tech_lamp_stairs.json b/src/generated/resources/data/xkdeco/loot_table/blocks/tech_lamp_stairs.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/tech_lamp_stairs.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/tech_lamp_stairs.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/tech_screen.json b/src/generated/resources/data/xkdeco/loot_table/blocks/tech_screen.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/tech_screen.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/tech_screen.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/tech_table.json b/src/generated/resources/data/xkdeco/loot_table/blocks/tech_table.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/tech_table.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/tech_table.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/tech_table_bigcircle.json b/src/generated/resources/data/xkdeco/loot_table/blocks/tech_table_bigcircle.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/tech_table_bigcircle.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/tech_table_bigcircle.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/tech_table_circle.json b/src/generated/resources/data/xkdeco/loot_table/blocks/tech_table_circle.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/tech_table_circle.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/tech_table_circle.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/telescope.json b/src/generated/resources/data/xkdeco/loot_table/blocks/telescope.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/telescope.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/telescope.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/toughened_glass.json b/src/generated/resources/data/xkdeco/loot_table/blocks/toughened_glass.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/toughened_glass.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/toughened_glass.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/toughened_glass_slab.json b/src/generated/resources/data/xkdeco/loot_table/blocks/toughened_glass_slab.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/toughened_glass_slab.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/toughened_glass_slab.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/toughened_glass_stairs.json b/src/generated/resources/data/xkdeco/loot_table/blocks/toughened_glass_stairs.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/toughened_glass_stairs.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/toughened_glass_stairs.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/toughened_sand.json b/src/generated/resources/data/xkdeco/loot_table/blocks/toughened_sand.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/toughened_sand.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/toughened_sand.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/translucent_lamp_block.json b/src/generated/resources/data/xkdeco/loot_table/blocks/translucent_lamp_block.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/translucent_lamp_block.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/translucent_lamp_block.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/translucent_lamp_slab.json b/src/generated/resources/data/xkdeco/loot_table/blocks/translucent_lamp_slab.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/translucent_lamp_slab.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/translucent_lamp_slab.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/translucent_lamp_stairs.json b/src/generated/resources/data/xkdeco/loot_table/blocks/translucent_lamp_stairs.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/translucent_lamp_stairs.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/translucent_lamp_stairs.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/varnished_awning_window.json b/src/generated/resources/data/xkdeco/loot_table/blocks/varnished_awning_window.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/varnished_awning_window.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/varnished_awning_window.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/varnished_big_table.json b/src/generated/resources/data/xkdeco/loot_table/blocks/varnished_big_table.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/varnished_big_table.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/varnished_big_table.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/varnished_chair.json b/src/generated/resources/data/xkdeco/loot_table/blocks/varnished_chair.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/varnished_chair.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/varnished_chair.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/varnished_column_head.json b/src/generated/resources/data/xkdeco/loot_table/blocks/varnished_column_head.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/varnished_column_head.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/varnished_column_head.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/varnished_column_wall.json b/src/generated/resources/data/xkdeco/loot_table/blocks/varnished_column_wall.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/varnished_column_wall.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/varnished_column_wall.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/varnished_desk.json b/src/generated/resources/data/xkdeco/loot_table/blocks/varnished_desk.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/varnished_desk.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/varnished_desk.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/varnished_divided_shelf.json b/src/generated/resources/data/xkdeco/loot_table/blocks/varnished_divided_shelf.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/varnished_divided_shelf.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/varnished_divided_shelf.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/varnished_door.json b/src/generated/resources/data/xkdeco/loot_table/blocks/varnished_door.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/varnished_door.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/varnished_door.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/varnished_dougong.json b/src/generated/resources/data/xkdeco/loot_table/blocks/varnished_dougong.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/varnished_dougong.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/varnished_dougong.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/varnished_dougong_connection.json b/src/generated/resources/data/xkdeco/loot_table/blocks/varnished_dougong_connection.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/varnished_dougong_connection.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/varnished_dougong_connection.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/varnished_dougong_hollow_connection.json b/src/generated/resources/data/xkdeco/loot_table/blocks/varnished_dougong_hollow_connection.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/varnished_dougong_hollow_connection.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/varnished_dougong_hollow_connection.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/varnished_empty_shelf.json b/src/generated/resources/data/xkdeco/loot_table/blocks/varnished_empty_shelf.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/varnished_empty_shelf.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/varnished_empty_shelf.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/varnished_fence.json b/src/generated/resources/data/xkdeco/loot_table/blocks/varnished_fence.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/varnished_fence.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/varnished_fence.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/varnished_fence_gate.json b/src/generated/resources/data/xkdeco/loot_table/blocks/varnished_fence_gate.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/varnished_fence_gate.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/varnished_fence_gate.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/varnished_fence_head.json b/src/generated/resources/data/xkdeco/loot_table/blocks/varnished_fence_head.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/varnished_fence_head.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/varnished_fence_head.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/varnished_fence_oblique.json b/src/generated/resources/data/xkdeco/loot_table/blocks/varnished_fence_oblique.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/varnished_fence_oblique.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/varnished_fence_oblique.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/varnished_fence_oblique_steep.json b/src/generated/resources/data/xkdeco/loot_table/blocks/varnished_fence_oblique_steep.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/varnished_fence_oblique_steep.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/varnished_fence_oblique_steep.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/varnished_hanging_fascia.json b/src/generated/resources/data/xkdeco/loot_table/blocks/varnished_hanging_fascia.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/varnished_hanging_fascia.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/varnished_hanging_fascia.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/varnished_log.json b/src/generated/resources/data/xkdeco/loot_table/blocks/varnished_log.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/varnished_log.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/varnished_log.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/varnished_log_slab.json b/src/generated/resources/data/xkdeco/loot_table/blocks/varnished_log_slab.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/varnished_log_slab.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/varnished_log_slab.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/varnished_meiren_kao.json b/src/generated/resources/data/xkdeco/loot_table/blocks/varnished_meiren_kao.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/varnished_meiren_kao.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/varnished_meiren_kao.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/varnished_meiren_kao_with_column.json b/src/generated/resources/data/xkdeco/loot_table/blocks/varnished_meiren_kao_with_column.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/varnished_meiren_kao_with_column.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/varnished_meiren_kao_with_column.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/varnished_narrow_doors.json b/src/generated/resources/data/xkdeco/loot_table/blocks/varnished_narrow_doors.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/varnished_narrow_doors.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/varnished_narrow_doors.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/varnished_oblique_brace.json b/src/generated/resources/data/xkdeco/loot_table/blocks/varnished_oblique_brace.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/varnished_oblique_brace.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/varnished_oblique_brace.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/varnished_planks.json b/src/generated/resources/data/xkdeco/loot_table/blocks/varnished_planks.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/varnished_planks.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/varnished_planks.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/varnished_screen.json b/src/generated/resources/data/xkdeco/loot_table/blocks/varnished_screen.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/varnished_screen.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/varnished_screen.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/varnished_shelf.json b/src/generated/resources/data/xkdeco/loot_table/blocks/varnished_shelf.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/varnished_shelf.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/varnished_shelf.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/varnished_slab.json b/src/generated/resources/data/xkdeco/loot_table/blocks/varnished_slab.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/varnished_slab.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/varnished_slab.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/varnished_stairs.json b/src/generated/resources/data/xkdeco/loot_table/blocks/varnished_stairs.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/varnished_stairs.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/varnished_stairs.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/varnished_stool.json b/src/generated/resources/data/xkdeco/loot_table/blocks/varnished_stool.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/varnished_stool.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/varnished_stool.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/varnished_table.json b/src/generated/resources/data/xkdeco/loot_table/blocks/varnished_table.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/varnished_table.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/varnished_table.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/varnished_tall_table.json b/src/generated/resources/data/xkdeco/loot_table/blocks/varnished_tall_table.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/varnished_tall_table.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/varnished_tall_table.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/varnished_trapdoor.json b/src/generated/resources/data/xkdeco/loot_table/blocks/varnished_trapdoor.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/varnished_trapdoor.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/varnished_trapdoor.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/varnished_wall.json b/src/generated/resources/data/xkdeco/loot_table/blocks/varnished_wall.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/varnished_wall.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/varnished_wall.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/varnished_window.json b/src/generated/resources/data/xkdeco/loot_table/blocks/varnished_window.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/varnished_window.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/varnished_window.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/varnished_wood.json b/src/generated/resources/data/xkdeco/loot_table/blocks/varnished_wood.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/varnished_wood.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/varnished_wood.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/warped_nylium_slab.json b/src/generated/resources/data/xkdeco/loot_table/blocks/warped_nylium_slab.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/warped_nylium_slab.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/warped_nylium_slab.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/weiqi_board.json b/src/generated/resources/data/xkdeco/loot_table/blocks/weiqi_board.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/weiqi_board.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/weiqi_board.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/white_cherry_blossom.json b/src/generated/resources/data/xkdeco/loot_table/blocks/white_cherry_blossom.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/white_cherry_blossom.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/white_cherry_blossom.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/white_cherry_blossom_leaves.json b/src/generated/resources/data/xkdeco/loot_table/blocks/white_cherry_blossom_leaves.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/white_cherry_blossom_leaves.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/white_cherry_blossom_leaves.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/white_porcelain.json b/src/generated/resources/data/xkdeco/loot_table/blocks/white_porcelain.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/white_porcelain.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/white_porcelain.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/white_porcelain_small.json b/src/generated/resources/data/xkdeco/loot_table/blocks/white_porcelain_small.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/white_porcelain_small.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/white_porcelain_small.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/white_porcelain_tall.json b/src/generated/resources/data/xkdeco/loot_table/blocks/white_porcelain_tall.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/white_porcelain_tall.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/white_porcelain_tall.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/willow_leaves.json b/src/generated/resources/data/xkdeco/loot_table/blocks/willow_leaves.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/willow_leaves.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/willow_leaves.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/wood_globe.json b/src/generated/resources/data/xkdeco/loot_table/blocks/wood_globe.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/wood_globe.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/wood_globe.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/wooden_windmill.json b/src/generated/resources/data/xkdeco/loot_table/blocks/wooden_windmill.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/wooden_windmill.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/wooden_windmill.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/xiangqi_board.json b/src/generated/resources/data/xkdeco/loot_table/blocks/xiangqi_board.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/xiangqi_board.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/xiangqi_board.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/yellow_roof.json b/src/generated/resources/data/xkdeco/loot_table/blocks/yellow_roof.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/yellow_roof.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/yellow_roof.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/yellow_roof_deco.json b/src/generated/resources/data/xkdeco/loot_table/blocks/yellow_roof_deco.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/yellow_roof_deco.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/yellow_roof_deco.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/yellow_roof_deco_oblique.json b/src/generated/resources/data/xkdeco/loot_table/blocks/yellow_roof_deco_oblique.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/yellow_roof_deco_oblique.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/yellow_roof_deco_oblique.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/yellow_roof_eave.json b/src/generated/resources/data/xkdeco/loot_table/blocks/yellow_roof_eave.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/yellow_roof_eave.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/yellow_roof_eave.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/yellow_roof_end.json b/src/generated/resources/data/xkdeco/loot_table/blocks/yellow_roof_end.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/yellow_roof_end.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/yellow_roof_end.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/yellow_roof_flat.json b/src/generated/resources/data/xkdeco/loot_table/blocks/yellow_roof_flat.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/yellow_roof_flat.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/yellow_roof_flat.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/yellow_roof_ridge.json b/src/generated/resources/data/xkdeco/loot_table/blocks/yellow_roof_ridge.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/yellow_roof_ridge.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/yellow_roof_ridge.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/yellow_roof_ridge_end.json b/src/generated/resources/data/xkdeco/loot_table/blocks/yellow_roof_ridge_end.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/yellow_roof_ridge_end.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/yellow_roof_ridge_end.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/yellow_roof_small_eave.json b/src/generated/resources/data/xkdeco/loot_table/blocks/yellow_roof_small_eave.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/yellow_roof_small_eave.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/yellow_roof_small_eave.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/yellow_roof_small_end.json b/src/generated/resources/data/xkdeco/loot_table/blocks/yellow_roof_small_end.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/yellow_roof_small_end.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/yellow_roof_small_end.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/yellow_roof_small_flat_end.json b/src/generated/resources/data/xkdeco/loot_table/blocks/yellow_roof_small_flat_end.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/yellow_roof_small_flat_end.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/yellow_roof_small_flat_end.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/yellow_roof_small_ridge_end.json b/src/generated/resources/data/xkdeco/loot_table/blocks/yellow_roof_small_ridge_end.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/yellow_roof_small_ridge_end.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/yellow_roof_small_ridge_end.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/yellow_roof_tip.json b/src/generated/resources/data/xkdeco/loot_table/blocks/yellow_roof_tip.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/yellow_roof_tip.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/yellow_roof_tip.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/yellow_tile_slab.json b/src/generated/resources/data/xkdeco/loot_table/blocks/yellow_tile_slab.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/yellow_tile_slab.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/yellow_tile_slab.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/yellow_tile_stairs.json b/src/generated/resources/data/xkdeco/loot_table/blocks/yellow_tile_stairs.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/yellow_tile_stairs.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/yellow_tile_stairs.json diff --git a/src/generated/resources/data/xkdeco/loot_tables/blocks/yellow_tiles.json b/src/generated/resources/data/xkdeco/loot_table/blocks/yellow_tiles.json similarity index 100% rename from src/generated/resources/data/xkdeco/loot_tables/blocks/yellow_tiles.json rename to src/generated/resources/data/xkdeco/loot_table/blocks/yellow_tiles.json diff --git a/src/generated/resources/data/xkdeco/recipes/aztec_chiseled_stonebricks.json b/src/generated/resources/data/xkdeco/recipe/aztec_chiseled_stonebricks.json similarity index 82% rename from src/generated/resources/data/xkdeco/recipes/aztec_chiseled_stonebricks.json rename to src/generated/resources/data/xkdeco/recipe/aztec_chiseled_stonebricks.json index e1e1233d..c6f6577c 100644 --- a/src/generated/resources/data/xkdeco/recipes/aztec_chiseled_stonebricks.json +++ b/src/generated/resources/data/xkdeco/recipe/aztec_chiseled_stonebricks.json @@ -11,7 +11,7 @@ "#" ], "result": { - "item": "xkdeco:aztec_chiseled_stonebricks" + "id": "xkdeco:aztec_chiseled_stonebricks" }, "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/aztec_cut_stonebricks.json b/src/generated/resources/data/xkdeco/recipe/aztec_cut_stonebricks.json similarity index 85% rename from src/generated/resources/data/xkdeco/recipes/aztec_cut_stonebricks.json rename to src/generated/resources/data/xkdeco/recipe/aztec_cut_stonebricks.json index 96490a30..60e0afc4 100644 --- a/src/generated/resources/data/xkdeco/recipes/aztec_cut_stonebricks.json +++ b/src/generated/resources/data/xkdeco/recipe/aztec_cut_stonebricks.json @@ -12,7 +12,7 @@ ], "result": { "count": 4, - "item": "xkdeco:aztec_cut_stonebricks" + "id": "xkdeco:aztec_cut_stonebricks" }, "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/aztec_mossy_stonebrick_slab.json b/src/generated/resources/data/xkdeco/recipe/aztec_mossy_stonebrick_slab.json similarity index 83% rename from src/generated/resources/data/xkdeco/recipes/aztec_mossy_stonebrick_slab.json rename to src/generated/resources/data/xkdeco/recipe/aztec_mossy_stonebrick_slab.json index 1493c86c..b9dc252a 100644 --- a/src/generated/resources/data/xkdeco/recipes/aztec_mossy_stonebrick_slab.json +++ b/src/generated/resources/data/xkdeco/recipe/aztec_mossy_stonebrick_slab.json @@ -11,7 +11,7 @@ ], "result": { "count": 6, - "item": "xkdeco:aztec_mossy_stonebrick_slab" + "id": "xkdeco:aztec_mossy_stonebrick_slab" }, "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/aztec_mossy_stonebrick_stairs.json b/src/generated/resources/data/xkdeco/recipe/aztec_mossy_stonebrick_stairs.json similarity index 83% rename from src/generated/resources/data/xkdeco/recipes/aztec_mossy_stonebrick_stairs.json rename to src/generated/resources/data/xkdeco/recipe/aztec_mossy_stonebrick_stairs.json index 7cc938c5..3160e313 100644 --- a/src/generated/resources/data/xkdeco/recipes/aztec_mossy_stonebrick_stairs.json +++ b/src/generated/resources/data/xkdeco/recipe/aztec_mossy_stonebrick_stairs.json @@ -13,7 +13,7 @@ ], "result": { "count": 4, - "item": "xkdeco:aztec_mossy_stonebrick_stairs" + "id": "xkdeco:aztec_mossy_stonebrick_stairs" }, "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/aztec_stonebrick_slab.json b/src/generated/resources/data/xkdeco/recipe/aztec_stonebrick_slab.json similarity index 84% rename from src/generated/resources/data/xkdeco/recipes/aztec_stonebrick_slab.json rename to src/generated/resources/data/xkdeco/recipe/aztec_stonebrick_slab.json index 49a5011e..b7059936 100644 --- a/src/generated/resources/data/xkdeco/recipes/aztec_stonebrick_slab.json +++ b/src/generated/resources/data/xkdeco/recipe/aztec_stonebrick_slab.json @@ -11,7 +11,7 @@ ], "result": { "count": 6, - "item": "xkdeco:aztec_stonebrick_slab" + "id": "xkdeco:aztec_stonebrick_slab" }, "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/aztec_stonebrick_stairs.json b/src/generated/resources/data/xkdeco/recipe/aztec_stonebrick_stairs.json similarity index 85% rename from src/generated/resources/data/xkdeco/recipes/aztec_stonebrick_stairs.json rename to src/generated/resources/data/xkdeco/recipe/aztec_stonebrick_stairs.json index 358b0b4f..c0664858 100644 --- a/src/generated/resources/data/xkdeco/recipes/aztec_stonebrick_stairs.json +++ b/src/generated/resources/data/xkdeco/recipe/aztec_stonebrick_stairs.json @@ -13,7 +13,7 @@ ], "result": { "count": 4, - "item": "xkdeco:aztec_stonebrick_stairs" + "id": "xkdeco:aztec_stonebrick_stairs" }, "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/aztec_stonebricks_from_maya_stone_stonecutting.json b/src/generated/resources/data/xkdeco/recipe/aztec_stonebricks_from_maya_stone_stonecutting.json similarity index 66% rename from src/generated/resources/data/xkdeco/recipes/aztec_stonebricks_from_maya_stone_stonecutting.json rename to src/generated/resources/data/xkdeco/recipe/aztec_stonebricks_from_maya_stone_stonecutting.json index 55e5e727..9f5a45d4 100644 --- a/src/generated/resources/data/xkdeco/recipes/aztec_stonebricks_from_maya_stone_stonecutting.json +++ b/src/generated/resources/data/xkdeco/recipe/aztec_stonebricks_from_maya_stone_stonecutting.json @@ -4,5 +4,7 @@ "ingredient": { "item": "xkdeco:maya_stone" }, - "result": "xkdeco:aztec_stonebricks" + "result": { + "id": "xkdeco:aztec_stonebricks" + } } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/black_brick_slab.json b/src/generated/resources/data/xkdeco/recipe/black_brick_slab.json similarity index 85% rename from src/generated/resources/data/xkdeco/recipes/black_brick_slab.json rename to src/generated/resources/data/xkdeco/recipe/black_brick_slab.json index a20907e1..f40ea329 100644 --- a/src/generated/resources/data/xkdeco/recipes/black_brick_slab.json +++ b/src/generated/resources/data/xkdeco/recipe/black_brick_slab.json @@ -11,7 +11,7 @@ ], "result": { "count": 6, - "item": "xkdeco:black_brick_slab" + "id": "xkdeco:black_brick_slab" }, "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/black_brick_stairs.json b/src/generated/resources/data/xkdeco/recipe/black_brick_stairs.json similarity index 86% rename from src/generated/resources/data/xkdeco/recipes/black_brick_stairs.json rename to src/generated/resources/data/xkdeco/recipe/black_brick_stairs.json index fe49703d..cf9f0c22 100644 --- a/src/generated/resources/data/xkdeco/recipes/black_brick_stairs.json +++ b/src/generated/resources/data/xkdeco/recipe/black_brick_stairs.json @@ -13,7 +13,7 @@ ], "result": { "count": 4, - "item": "xkdeco:black_brick_stairs" + "id": "xkdeco:black_brick_stairs" }, "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/black_brick_wall.json b/src/generated/resources/data/xkdeco/recipe/black_brick_wall.json similarity index 86% rename from src/generated/resources/data/xkdeco/recipes/black_brick_wall.json rename to src/generated/resources/data/xkdeco/recipe/black_brick_wall.json index 905c1f02..9a1a23ac 100644 --- a/src/generated/resources/data/xkdeco/recipes/black_brick_wall.json +++ b/src/generated/resources/data/xkdeco/recipe/black_brick_wall.json @@ -12,7 +12,7 @@ ], "result": { "count": 6, - "item": "xkdeco:black_brick_wall" + "id": "xkdeco:black_brick_wall" }, "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/black_bricks.json b/src/generated/resources/data/xkdeco/recipe/black_bricks.json similarity index 89% rename from src/generated/resources/data/xkdeco/recipes/black_bricks.json rename to src/generated/resources/data/xkdeco/recipe/black_bricks.json index dc4df313..a24aadb5 100644 --- a/src/generated/resources/data/xkdeco/recipes/black_bricks.json +++ b/src/generated/resources/data/xkdeco/recipe/black_bricks.json @@ -15,7 +15,7 @@ ], "result": { "count": 6, - "item": "xkdeco:black_bricks" + "id": "xkdeco:black_bricks" }, "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/black_tile_slab.json b/src/generated/resources/data/xkdeco/recipe/black_tile_slab.json similarity index 86% rename from src/generated/resources/data/xkdeco/recipes/black_tile_slab.json rename to src/generated/resources/data/xkdeco/recipe/black_tile_slab.json index 80579b34..163379bd 100644 --- a/src/generated/resources/data/xkdeco/recipes/black_tile_slab.json +++ b/src/generated/resources/data/xkdeco/recipe/black_tile_slab.json @@ -11,7 +11,7 @@ ], "result": { "count": 6, - "item": "xkdeco:black_tile_slab" + "id": "xkdeco:black_tile_slab" }, "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/black_tile_stairs.json b/src/generated/resources/data/xkdeco/recipe/black_tile_stairs.json similarity index 86% rename from src/generated/resources/data/xkdeco/recipes/black_tile_stairs.json rename to src/generated/resources/data/xkdeco/recipe/black_tile_stairs.json index b9fba9ec..f83334d5 100644 --- a/src/generated/resources/data/xkdeco/recipes/black_tile_stairs.json +++ b/src/generated/resources/data/xkdeco/recipe/black_tile_stairs.json @@ -13,7 +13,7 @@ ], "result": { "count": 4, - "item": "xkdeco:black_tile_stairs" + "id": "xkdeco:black_tile_stairs" }, "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/black_tiles.json b/src/generated/resources/data/xkdeco/recipe/black_tiles.json similarity index 90% rename from src/generated/resources/data/xkdeco/recipes/black_tiles.json rename to src/generated/resources/data/xkdeco/recipe/black_tiles.json index ea74ec8f..dc417d57 100644 --- a/src/generated/resources/data/xkdeco/recipes/black_tiles.json +++ b/src/generated/resources/data/xkdeco/recipe/black_tiles.json @@ -15,7 +15,7 @@ ], "result": { "count": 8, - "item": "xkdeco:black_tiles" + "id": "xkdeco:black_tiles" }, "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/blackstone_pavement_slab.json b/src/generated/resources/data/xkdeco/recipe/blackstone_pavement_slab.json similarity index 83% rename from src/generated/resources/data/xkdeco/recipes/blackstone_pavement_slab.json rename to src/generated/resources/data/xkdeco/recipe/blackstone_pavement_slab.json index 01e3a341..496972d0 100644 --- a/src/generated/resources/data/xkdeco/recipes/blackstone_pavement_slab.json +++ b/src/generated/resources/data/xkdeco/recipe/blackstone_pavement_slab.json @@ -11,7 +11,7 @@ ], "result": { "count": 6, - "item": "xkdeco:blackstone_pavement_slab" + "id": "xkdeco:blackstone_pavement_slab" }, "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/blue_tile_slab.json b/src/generated/resources/data/xkdeco/recipe/blue_tile_slab.json similarity index 86% rename from src/generated/resources/data/xkdeco/recipes/blue_tile_slab.json rename to src/generated/resources/data/xkdeco/recipe/blue_tile_slab.json index 3e167236..abb713ac 100644 --- a/src/generated/resources/data/xkdeco/recipes/blue_tile_slab.json +++ b/src/generated/resources/data/xkdeco/recipe/blue_tile_slab.json @@ -11,7 +11,7 @@ ], "result": { "count": 6, - "item": "xkdeco:blue_tile_slab" + "id": "xkdeco:blue_tile_slab" }, "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/blue_tile_stairs.json b/src/generated/resources/data/xkdeco/recipe/blue_tile_stairs.json similarity index 86% rename from src/generated/resources/data/xkdeco/recipes/blue_tile_stairs.json rename to src/generated/resources/data/xkdeco/recipe/blue_tile_stairs.json index a453b073..8eab91a1 100644 --- a/src/generated/resources/data/xkdeco/recipes/blue_tile_stairs.json +++ b/src/generated/resources/data/xkdeco/recipe/blue_tile_stairs.json @@ -13,7 +13,7 @@ ], "result": { "count": 4, - "item": "xkdeco:blue_tile_stairs" + "id": "xkdeco:blue_tile_stairs" }, "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/blue_tiles.json b/src/generated/resources/data/xkdeco/recipe/blue_tiles.json similarity index 90% rename from src/generated/resources/data/xkdeco/recipes/blue_tiles.json rename to src/generated/resources/data/xkdeco/recipe/blue_tiles.json index 285b8d93..1ae4ef10 100644 --- a/src/generated/resources/data/xkdeco/recipes/blue_tiles.json +++ b/src/generated/resources/data/xkdeco/recipe/blue_tiles.json @@ -15,7 +15,7 @@ ], "result": { "count": 8, - "item": "xkdeco:blue_tiles" + "id": "xkdeco:blue_tiles" }, "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/bronze_block.json b/src/generated/resources/data/xkdeco/recipe/bronze_block.json similarity index 89% rename from src/generated/resources/data/xkdeco/recipes/bronze_block.json rename to src/generated/resources/data/xkdeco/recipe/bronze_block.json index 85d16d02..26c22b47 100644 --- a/src/generated/resources/data/xkdeco/recipes/bronze_block.json +++ b/src/generated/resources/data/xkdeco/recipe/bronze_block.json @@ -15,7 +15,7 @@ ], "result": { "count": 4, - "item": "xkdeco:bronze_block" + "id": "xkdeco:bronze_block" }, "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/cherry_blossom.json b/src/generated/resources/data/xkdeco/recipe/cherry_blossom.json similarity index 89% rename from src/generated/resources/data/xkdeco/recipes/cherry_blossom.json rename to src/generated/resources/data/xkdeco/recipe/cherry_blossom.json index 81c0109c..05a7540c 100644 --- a/src/generated/resources/data/xkdeco/recipes/cherry_blossom.json +++ b/src/generated/resources/data/xkdeco/recipe/cherry_blossom.json @@ -16,7 +16,7 @@ ], "result": { "count": 8, - "item": "xkdeco:cherry_blossom" + "id": "xkdeco:cherry_blossom" }, "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/cherry_blossom_leaves.json b/src/generated/resources/data/xkdeco/recipe/cherry_blossom_leaves.json similarity index 84% rename from src/generated/resources/data/xkdeco/recipes/cherry_blossom_leaves.json rename to src/generated/resources/data/xkdeco/recipe/cherry_blossom_leaves.json index 59ed353c..832d8b7f 100644 --- a/src/generated/resources/data/xkdeco/recipes/cherry_blossom_leaves.json +++ b/src/generated/resources/data/xkdeco/recipe/cherry_blossom_leaves.json @@ -11,6 +11,6 @@ ], "result": { "count": 2, - "item": "xkdeco:cherry_blossom_leaves" + "id": "xkdeco:cherry_blossom_leaves" } } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/cobblestone_path_slab.json b/src/generated/resources/data/xkdeco/recipe/cobblestone_path_slab.json similarity index 84% rename from src/generated/resources/data/xkdeco/recipes/cobblestone_path_slab.json rename to src/generated/resources/data/xkdeco/recipe/cobblestone_path_slab.json index 149df399..516184ea 100644 --- a/src/generated/resources/data/xkdeco/recipes/cobblestone_path_slab.json +++ b/src/generated/resources/data/xkdeco/recipe/cobblestone_path_slab.json @@ -11,7 +11,7 @@ ], "result": { "count": 6, - "item": "xkdeco:cobblestone_path_slab" + "id": "xkdeco:cobblestone_path_slab" }, "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/cobblestone_path_stairs.json b/src/generated/resources/data/xkdeco/recipe/cobblestone_path_stairs.json similarity index 85% rename from src/generated/resources/data/xkdeco/recipes/cobblestone_path_stairs.json rename to src/generated/resources/data/xkdeco/recipe/cobblestone_path_stairs.json index f3a8591f..deedd22f 100644 --- a/src/generated/resources/data/xkdeco/recipes/cobblestone_path_stairs.json +++ b/src/generated/resources/data/xkdeco/recipe/cobblestone_path_stairs.json @@ -13,7 +13,7 @@ ], "result": { "count": 4, - "item": "xkdeco:cobblestone_path_stairs" + "id": "xkdeco:cobblestone_path_stairs" }, "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/copper_tile_slab.json b/src/generated/resources/data/xkdeco/recipe/copper_tile_slab.json similarity index 85% rename from src/generated/resources/data/xkdeco/recipes/copper_tile_slab.json rename to src/generated/resources/data/xkdeco/recipe/copper_tile_slab.json index 11ea53cc..17c35cd6 100644 --- a/src/generated/resources/data/xkdeco/recipes/copper_tile_slab.json +++ b/src/generated/resources/data/xkdeco/recipe/copper_tile_slab.json @@ -11,7 +11,7 @@ ], "result": { "count": 6, - "item": "xkdeco:copper_tile_slab" + "id": "xkdeco:copper_tile_slab" }, "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/copper_tile_stairs.json b/src/generated/resources/data/xkdeco/recipe/copper_tile_stairs.json similarity index 86% rename from src/generated/resources/data/xkdeco/recipes/copper_tile_stairs.json rename to src/generated/resources/data/xkdeco/recipe/copper_tile_stairs.json index 17b8cbda..912615cc 100644 --- a/src/generated/resources/data/xkdeco/recipes/copper_tile_stairs.json +++ b/src/generated/resources/data/xkdeco/recipe/copper_tile_stairs.json @@ -13,7 +13,7 @@ ], "result": { "count": 4, - "item": "xkdeco:copper_tile_stairs" + "id": "xkdeco:copper_tile_stairs" }, "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/copper_tiles_from_copper_block.json b/src/generated/resources/data/xkdeco/recipe/copper_tiles_from_copper_block.json similarity index 91% rename from src/generated/resources/data/xkdeco/recipes/copper_tiles_from_copper_block.json rename to src/generated/resources/data/xkdeco/recipe/copper_tiles_from_copper_block.json index 800b7874..b32dbcf1 100644 --- a/src/generated/resources/data/xkdeco/recipes/copper_tiles_from_copper_block.json +++ b/src/generated/resources/data/xkdeco/recipe/copper_tiles_from_copper_block.json @@ -27,5 +27,7 @@ "item": "minecraft:waxed_oxidized_copper" } ], - "result": "xkdeco:copper_tiles" + "result": { + "id": "xkdeco:copper_tiles" + } } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/crimson_nylium_slab_from_netherrack_stonecutting.json b/src/generated/resources/data/xkdeco/recipe/crimson_nylium_slab_from_netherrack_stonecutting.json similarity index 66% rename from src/generated/resources/data/xkdeco/recipes/crimson_nylium_slab_from_netherrack_stonecutting.json rename to src/generated/resources/data/xkdeco/recipe/crimson_nylium_slab_from_netherrack_stonecutting.json index 22e5bf30..7e5d7771 100644 --- a/src/generated/resources/data/xkdeco/recipes/crimson_nylium_slab_from_netherrack_stonecutting.json +++ b/src/generated/resources/data/xkdeco/recipe/crimson_nylium_slab_from_netherrack_stonecutting.json @@ -4,5 +4,7 @@ "ingredient": { "item": "minecraft:netherrack" }, - "result": "xkdeco:crimson_nylium_slab" + "result": { + "id": "xkdeco:crimson_nylium_slab" + } } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/crying_obsidian_brick_slab.json b/src/generated/resources/data/xkdeco/recipe/crying_obsidian_brick_slab.json similarity index 83% rename from src/generated/resources/data/xkdeco/recipes/crying_obsidian_brick_slab.json rename to src/generated/resources/data/xkdeco/recipe/crying_obsidian_brick_slab.json index a7360ad0..984240f2 100644 --- a/src/generated/resources/data/xkdeco/recipes/crying_obsidian_brick_slab.json +++ b/src/generated/resources/data/xkdeco/recipe/crying_obsidian_brick_slab.json @@ -11,7 +11,7 @@ ], "result": { "count": 6, - "item": "xkdeco:crying_obsidian_brick_slab" + "id": "xkdeco:crying_obsidian_brick_slab" }, "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/crying_obsidian_brick_stairs.json b/src/generated/resources/data/xkdeco/recipe/crying_obsidian_brick_stairs.json similarity index 83% rename from src/generated/resources/data/xkdeco/recipes/crying_obsidian_brick_stairs.json rename to src/generated/resources/data/xkdeco/recipe/crying_obsidian_brick_stairs.json index 59b2bf90..facf088b 100644 --- a/src/generated/resources/data/xkdeco/recipes/crying_obsidian_brick_stairs.json +++ b/src/generated/resources/data/xkdeco/recipe/crying_obsidian_brick_stairs.json @@ -13,7 +13,7 @@ ], "result": { "count": 4, - "item": "xkdeco:crying_obsidian_brick_stairs" + "id": "xkdeco:crying_obsidian_brick_stairs" }, "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/cut_bronze_block.json b/src/generated/resources/data/xkdeco/recipe/cut_bronze_block.json similarity index 86% rename from src/generated/resources/data/xkdeco/recipes/cut_bronze_block.json rename to src/generated/resources/data/xkdeco/recipe/cut_bronze_block.json index bf02b2d3..5c0596e8 100644 --- a/src/generated/resources/data/xkdeco/recipes/cut_bronze_block.json +++ b/src/generated/resources/data/xkdeco/recipe/cut_bronze_block.json @@ -12,7 +12,7 @@ ], "result": { "count": 4, - "item": "xkdeco:cut_bronze_block" + "id": "xkdeco:cut_bronze_block" }, "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/cut_bronze_block_slab.json b/src/generated/resources/data/xkdeco/recipe/cut_bronze_block_slab.json similarity index 84% rename from src/generated/resources/data/xkdeco/recipes/cut_bronze_block_slab.json rename to src/generated/resources/data/xkdeco/recipe/cut_bronze_block_slab.json index c5c1ba75..e51b6368 100644 --- a/src/generated/resources/data/xkdeco/recipes/cut_bronze_block_slab.json +++ b/src/generated/resources/data/xkdeco/recipe/cut_bronze_block_slab.json @@ -11,7 +11,7 @@ ], "result": { "count": 6, - "item": "xkdeco:cut_bronze_block_slab" + "id": "xkdeco:cut_bronze_block_slab" }, "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/cut_bronze_block_stairs.json b/src/generated/resources/data/xkdeco/recipe/cut_bronze_block_stairs.json similarity index 85% rename from src/generated/resources/data/xkdeco/recipes/cut_bronze_block_stairs.json rename to src/generated/resources/data/xkdeco/recipe/cut_bronze_block_stairs.json index c8ef44c5..226718d7 100644 --- a/src/generated/resources/data/xkdeco/recipes/cut_bronze_block_stairs.json +++ b/src/generated/resources/data/xkdeco/recipe/cut_bronze_block_stairs.json @@ -13,7 +13,7 @@ ], "result": { "count": 4, - "item": "xkdeco:cut_bronze_block_stairs" + "id": "xkdeco:cut_bronze_block_stairs" }, "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/cut_gold_block_slab.json b/src/generated/resources/data/xkdeco/recipe/cut_gold_block_slab.json similarity index 84% rename from src/generated/resources/data/xkdeco/recipes/cut_gold_block_slab.json rename to src/generated/resources/data/xkdeco/recipe/cut_gold_block_slab.json index a461e9df..a7359468 100644 --- a/src/generated/resources/data/xkdeco/recipes/cut_gold_block_slab.json +++ b/src/generated/resources/data/xkdeco/recipe/cut_gold_block_slab.json @@ -11,7 +11,7 @@ ], "result": { "count": 6, - "item": "xkdeco:cut_gold_block_slab" + "id": "xkdeco:cut_gold_block_slab" }, "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/cut_gold_block_stairs.json b/src/generated/resources/data/xkdeco/recipe/cut_gold_block_stairs.json similarity index 85% rename from src/generated/resources/data/xkdeco/recipes/cut_gold_block_stairs.json rename to src/generated/resources/data/xkdeco/recipe/cut_gold_block_stairs.json index 6af43327..f6c0e7ce 100644 --- a/src/generated/resources/data/xkdeco/recipes/cut_gold_block_stairs.json +++ b/src/generated/resources/data/xkdeco/recipe/cut_gold_block_stairs.json @@ -13,7 +13,7 @@ ], "result": { "count": 4, - "item": "xkdeco:cut_gold_block_stairs" + "id": "xkdeco:cut_gold_block_stairs" }, "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/cut_obsidian_brick_slab.json b/src/generated/resources/data/xkdeco/recipe/cut_obsidian_brick_slab.json similarity index 84% rename from src/generated/resources/data/xkdeco/recipes/cut_obsidian_brick_slab.json rename to src/generated/resources/data/xkdeco/recipe/cut_obsidian_brick_slab.json index 1a5d0818..5c06ef5e 100644 --- a/src/generated/resources/data/xkdeco/recipes/cut_obsidian_brick_slab.json +++ b/src/generated/resources/data/xkdeco/recipe/cut_obsidian_brick_slab.json @@ -11,7 +11,7 @@ ], "result": { "count": 6, - "item": "xkdeco:cut_obsidian_brick_slab" + "id": "xkdeco:cut_obsidian_brick_slab" }, "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/cut_obsidian_brick_stairs.json b/src/generated/resources/data/xkdeco/recipe/cut_obsidian_brick_stairs.json similarity index 84% rename from src/generated/resources/data/xkdeco/recipes/cut_obsidian_brick_stairs.json rename to src/generated/resources/data/xkdeco/recipe/cut_obsidian_brick_stairs.json index 55b37c7a..696ed23d 100644 --- a/src/generated/resources/data/xkdeco/recipes/cut_obsidian_brick_stairs.json +++ b/src/generated/resources/data/xkdeco/recipe/cut_obsidian_brick_stairs.json @@ -13,7 +13,7 @@ ], "result": { "count": 4, - "item": "xkdeco:cut_obsidian_brick_stairs" + "id": "xkdeco:cut_obsidian_brick_stairs" }, "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/cut_obsidian_slab.json b/src/generated/resources/data/xkdeco/recipe/cut_obsidian_slab.json similarity index 85% rename from src/generated/resources/data/xkdeco/recipes/cut_obsidian_slab.json rename to src/generated/resources/data/xkdeco/recipe/cut_obsidian_slab.json index 191cb8e4..537e4fd2 100644 --- a/src/generated/resources/data/xkdeco/recipes/cut_obsidian_slab.json +++ b/src/generated/resources/data/xkdeco/recipe/cut_obsidian_slab.json @@ -11,7 +11,7 @@ ], "result": { "count": 6, - "item": "xkdeco:cut_obsidian_slab" + "id": "xkdeco:cut_obsidian_slab" }, "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/cyan_brick_slab.json b/src/generated/resources/data/xkdeco/recipe/cyan_brick_slab.json similarity index 86% rename from src/generated/resources/data/xkdeco/recipes/cyan_brick_slab.json rename to src/generated/resources/data/xkdeco/recipe/cyan_brick_slab.json index c2e3c184..9198fd8f 100644 --- a/src/generated/resources/data/xkdeco/recipes/cyan_brick_slab.json +++ b/src/generated/resources/data/xkdeco/recipe/cyan_brick_slab.json @@ -11,7 +11,7 @@ ], "result": { "count": 6, - "item": "xkdeco:cyan_brick_slab" + "id": "xkdeco:cyan_brick_slab" }, "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/cyan_brick_stairs.json b/src/generated/resources/data/xkdeco/recipe/cyan_brick_stairs.json similarity index 86% rename from src/generated/resources/data/xkdeco/recipes/cyan_brick_stairs.json rename to src/generated/resources/data/xkdeco/recipe/cyan_brick_stairs.json index 317591e3..ba9cd1a6 100644 --- a/src/generated/resources/data/xkdeco/recipes/cyan_brick_stairs.json +++ b/src/generated/resources/data/xkdeco/recipe/cyan_brick_stairs.json @@ -13,7 +13,7 @@ ], "result": { "count": 4, - "item": "xkdeco:cyan_brick_stairs" + "id": "xkdeco:cyan_brick_stairs" }, "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/cyan_brick_wall.json b/src/generated/resources/data/xkdeco/recipe/cyan_brick_wall.json similarity index 86% rename from src/generated/resources/data/xkdeco/recipes/cyan_brick_wall.json rename to src/generated/resources/data/xkdeco/recipe/cyan_brick_wall.json index 0763879e..318e6698 100644 --- a/src/generated/resources/data/xkdeco/recipes/cyan_brick_wall.json +++ b/src/generated/resources/data/xkdeco/recipe/cyan_brick_wall.json @@ -12,7 +12,7 @@ ], "result": { "count": 6, - "item": "xkdeco:cyan_brick_wall" + "id": "xkdeco:cyan_brick_wall" }, "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/cyan_bricks.json b/src/generated/resources/data/xkdeco/recipe/cyan_bricks.json similarity index 89% rename from src/generated/resources/data/xkdeco/recipes/cyan_bricks.json rename to src/generated/resources/data/xkdeco/recipe/cyan_bricks.json index e08034cf..eee837dd 100644 --- a/src/generated/resources/data/xkdeco/recipes/cyan_bricks.json +++ b/src/generated/resources/data/xkdeco/recipe/cyan_bricks.json @@ -15,7 +15,7 @@ ], "result": { "count": 6, - "item": "xkdeco:cyan_bricks" + "id": "xkdeco:cyan_bricks" }, "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/cyan_tile_slab.json b/src/generated/resources/data/xkdeco/recipe/cyan_tile_slab.json similarity index 86% rename from src/generated/resources/data/xkdeco/recipes/cyan_tile_slab.json rename to src/generated/resources/data/xkdeco/recipe/cyan_tile_slab.json index f31cd82a..07aa7b38 100644 --- a/src/generated/resources/data/xkdeco/recipes/cyan_tile_slab.json +++ b/src/generated/resources/data/xkdeco/recipe/cyan_tile_slab.json @@ -11,7 +11,7 @@ ], "result": { "count": 6, - "item": "xkdeco:cyan_tile_slab" + "id": "xkdeco:cyan_tile_slab" }, "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/cyan_tile_stairs.json b/src/generated/resources/data/xkdeco/recipe/cyan_tile_stairs.json similarity index 86% rename from src/generated/resources/data/xkdeco/recipes/cyan_tile_stairs.json rename to src/generated/resources/data/xkdeco/recipe/cyan_tile_stairs.json index 157137f4..b71e9194 100644 --- a/src/generated/resources/data/xkdeco/recipes/cyan_tile_stairs.json +++ b/src/generated/resources/data/xkdeco/recipe/cyan_tile_stairs.json @@ -13,7 +13,7 @@ ], "result": { "count": 4, - "item": "xkdeco:cyan_tile_stairs" + "id": "xkdeco:cyan_tile_stairs" }, "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/cyan_tiles.json b/src/generated/resources/data/xkdeco/recipe/cyan_tiles.json similarity index 90% rename from src/generated/resources/data/xkdeco/recipes/cyan_tiles.json rename to src/generated/resources/data/xkdeco/recipe/cyan_tiles.json index fc71f522..b21fcdb4 100644 --- a/src/generated/resources/data/xkdeco/recipes/cyan_tiles.json +++ b/src/generated/resources/data/xkdeco/recipe/cyan_tiles.json @@ -15,7 +15,7 @@ ], "result": { "count": 8, - "item": "xkdeco:cyan_tiles" + "id": "xkdeco:cyan_tiles" }, "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/deepslate_pavement_slab.json b/src/generated/resources/data/xkdeco/recipe/deepslate_pavement_slab.json similarity index 83% rename from src/generated/resources/data/xkdeco/recipes/deepslate_pavement_slab.json rename to src/generated/resources/data/xkdeco/recipe/deepslate_pavement_slab.json index b9ead9aa..3d0cd796 100644 --- a/src/generated/resources/data/xkdeco/recipes/deepslate_pavement_slab.json +++ b/src/generated/resources/data/xkdeco/recipe/deepslate_pavement_slab.json @@ -11,7 +11,7 @@ ], "result": { "count": 6, - "item": "xkdeco:deepslate_pavement_slab" + "id": "xkdeco:deepslate_pavement_slab" }, "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/dirt_cobblestone.json b/src/generated/resources/data/xkdeco/recipe/dirt_cobblestone.json similarity index 84% rename from src/generated/resources/data/xkdeco/recipes/dirt_cobblestone.json rename to src/generated/resources/data/xkdeco/recipe/dirt_cobblestone.json index b15302eb..43a86b3b 100644 --- a/src/generated/resources/data/xkdeco/recipes/dirt_cobblestone.json +++ b/src/generated/resources/data/xkdeco/recipe/dirt_cobblestone.json @@ -10,6 +10,6 @@ } ], "result": { - "item": "xkdeco:dirt_cobblestone" + "id": "xkdeco:dirt_cobblestone" } } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/dirt_cobblestone_path_slab.json b/src/generated/resources/data/xkdeco/recipe/dirt_cobblestone_path_slab.json similarity index 83% rename from src/generated/resources/data/xkdeco/recipes/dirt_cobblestone_path_slab.json rename to src/generated/resources/data/xkdeco/recipe/dirt_cobblestone_path_slab.json index 89149305..fae01c38 100644 --- a/src/generated/resources/data/xkdeco/recipes/dirt_cobblestone_path_slab.json +++ b/src/generated/resources/data/xkdeco/recipe/dirt_cobblestone_path_slab.json @@ -11,7 +11,7 @@ ], "result": { "count": 6, - "item": "xkdeco:dirt_cobblestone_path_slab" + "id": "xkdeco:dirt_cobblestone_path_slab" }, "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/dirt_cobblestone_path_stairs.json b/src/generated/resources/data/xkdeco/recipe/dirt_cobblestone_path_stairs.json similarity index 83% rename from src/generated/resources/data/xkdeco/recipes/dirt_cobblestone_path_stairs.json rename to src/generated/resources/data/xkdeco/recipe/dirt_cobblestone_path_stairs.json index a00b93ff..8e3036c2 100644 --- a/src/generated/resources/data/xkdeco/recipes/dirt_cobblestone_path_stairs.json +++ b/src/generated/resources/data/xkdeco/recipe/dirt_cobblestone_path_stairs.json @@ -13,7 +13,7 @@ ], "result": { "count": 4, - "item": "xkdeco:dirt_cobblestone_path_stairs" + "id": "xkdeco:dirt_cobblestone_path_stairs" }, "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/dirt_cobblestone_slab.json b/src/generated/resources/data/xkdeco/recipe/dirt_cobblestone_slab.json similarity index 84% rename from src/generated/resources/data/xkdeco/recipes/dirt_cobblestone_slab.json rename to src/generated/resources/data/xkdeco/recipe/dirt_cobblestone_slab.json index 45c636d7..40450261 100644 --- a/src/generated/resources/data/xkdeco/recipes/dirt_cobblestone_slab.json +++ b/src/generated/resources/data/xkdeco/recipe/dirt_cobblestone_slab.json @@ -11,7 +11,7 @@ ], "result": { "count": 6, - "item": "xkdeco:dirt_cobblestone_slab" + "id": "xkdeco:dirt_cobblestone_slab" }, "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/dirt_cobblestone_stairs.json b/src/generated/resources/data/xkdeco/recipe/dirt_cobblestone_stairs.json similarity index 85% rename from src/generated/resources/data/xkdeco/recipes/dirt_cobblestone_stairs.json rename to src/generated/resources/data/xkdeco/recipe/dirt_cobblestone_stairs.json index de388cec..26eb29a1 100644 --- a/src/generated/resources/data/xkdeco/recipes/dirt_cobblestone_stairs.json +++ b/src/generated/resources/data/xkdeco/recipe/dirt_cobblestone_stairs.json @@ -13,7 +13,7 @@ ], "result": { "count": 4, - "item": "xkdeco:dirt_cobblestone_stairs" + "id": "xkdeco:dirt_cobblestone_stairs" }, "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/dirt_path_slab_from_dirt_stonecutting.json b/src/generated/resources/data/xkdeco/recipe/dirt_path_slab_from_dirt_stonecutting.json similarity index 66% rename from src/generated/resources/data/xkdeco/recipes/dirt_path_slab_from_dirt_stonecutting.json rename to src/generated/resources/data/xkdeco/recipe/dirt_path_slab_from_dirt_stonecutting.json index b60dae37..78b1e9d9 100644 --- a/src/generated/resources/data/xkdeco/recipes/dirt_path_slab_from_dirt_stonecutting.json +++ b/src/generated/resources/data/xkdeco/recipe/dirt_path_slab_from_dirt_stonecutting.json @@ -4,5 +4,7 @@ "ingredient": { "item": "minecraft:dirt" }, - "result": "xkdeco:dirt_path_slab" + "result": { + "id": "xkdeco:dirt_path_slab" + } } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/dirt_slab_from_dirt_stonecutting.json b/src/generated/resources/data/xkdeco/recipe/dirt_slab_from_dirt_stonecutting.json similarity index 69% rename from src/generated/resources/data/xkdeco/recipes/dirt_slab_from_dirt_stonecutting.json rename to src/generated/resources/data/xkdeco/recipe/dirt_slab_from_dirt_stonecutting.json index 7f086f9c..95c10728 100644 --- a/src/generated/resources/data/xkdeco/recipes/dirt_slab_from_dirt_stonecutting.json +++ b/src/generated/resources/data/xkdeco/recipe/dirt_slab_from_dirt_stonecutting.json @@ -4,5 +4,7 @@ "ingredient": { "item": "minecraft:dirt" }, - "result": "xkdeco:dirt_slab" + "result": { + "id": "xkdeco:dirt_slab" + } } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/dirty_mud_wall_slab.json b/src/generated/resources/data/xkdeco/recipe/dirty_mud_wall_slab.json similarity index 85% rename from src/generated/resources/data/xkdeco/recipes/dirty_mud_wall_slab.json rename to src/generated/resources/data/xkdeco/recipe/dirty_mud_wall_slab.json index 5d8a6af1..c060062b 100644 --- a/src/generated/resources/data/xkdeco/recipes/dirty_mud_wall_slab.json +++ b/src/generated/resources/data/xkdeco/recipe/dirty_mud_wall_slab.json @@ -11,7 +11,7 @@ ], "result": { "count": 6, - "item": "xkdeco:dirty_mud_wall_slab" + "id": "xkdeco:dirty_mud_wall_slab" }, "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/dirty_mud_wall_stairs.json b/src/generated/resources/data/xkdeco/recipe/dirty_mud_wall_stairs.json similarity index 85% rename from src/generated/resources/data/xkdeco/recipes/dirty_mud_wall_stairs.json rename to src/generated/resources/data/xkdeco/recipe/dirty_mud_wall_stairs.json index acfc3da0..38ec7ab6 100644 --- a/src/generated/resources/data/xkdeco/recipes/dirty_mud_wall_stairs.json +++ b/src/generated/resources/data/xkdeco/recipe/dirty_mud_wall_stairs.json @@ -13,7 +13,7 @@ ], "result": { "count": 4, - "item": "xkdeco:dirty_mud_wall_stairs" + "id": "xkdeco:dirty_mud_wall_stairs" }, "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/dirty_mud_wall_wall.json b/src/generated/resources/data/xkdeco/recipe/dirty_mud_wall_wall.json similarity index 85% rename from src/generated/resources/data/xkdeco/recipes/dirty_mud_wall_wall.json rename to src/generated/resources/data/xkdeco/recipe/dirty_mud_wall_wall.json index 934c94c1..ac62ded3 100644 --- a/src/generated/resources/data/xkdeco/recipes/dirty_mud_wall_wall.json +++ b/src/generated/resources/data/xkdeco/recipe/dirty_mud_wall_wall.json @@ -12,7 +12,7 @@ ], "result": { "count": 6, - "item": "xkdeco:dirty_mud_wall_wall" + "id": "xkdeco:dirty_mud_wall_wall" }, "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/ebony_door.json b/src/generated/resources/data/xkdeco/recipe/ebony_door.json similarity index 88% rename from src/generated/resources/data/xkdeco/recipes/ebony_door.json rename to src/generated/resources/data/xkdeco/recipe/ebony_door.json index 047baa9c..53e6b447 100644 --- a/src/generated/resources/data/xkdeco/recipes/ebony_door.json +++ b/src/generated/resources/data/xkdeco/recipe/ebony_door.json @@ -13,7 +13,7 @@ ], "result": { "count": 3, - "item": "xkdeco:ebony_door" + "id": "xkdeco:ebony_door" }, "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/ebony_fence.json b/src/generated/resources/data/xkdeco/recipe/ebony_fence.json similarity index 89% rename from src/generated/resources/data/xkdeco/recipes/ebony_fence.json rename to src/generated/resources/data/xkdeco/recipe/ebony_fence.json index 89250650..2993d147 100644 --- a/src/generated/resources/data/xkdeco/recipes/ebony_fence.json +++ b/src/generated/resources/data/xkdeco/recipe/ebony_fence.json @@ -15,7 +15,7 @@ ], "result": { "count": 3, - "item": "xkdeco:ebony_fence" + "id": "xkdeco:ebony_fence" }, "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/ebony_fence_gate.json b/src/generated/resources/data/xkdeco/recipe/ebony_fence_gate.json similarity index 87% rename from src/generated/resources/data/xkdeco/recipes/ebony_fence_gate.json rename to src/generated/resources/data/xkdeco/recipe/ebony_fence_gate.json index 746e2f4d..cffc20cb 100644 --- a/src/generated/resources/data/xkdeco/recipes/ebony_fence_gate.json +++ b/src/generated/resources/data/xkdeco/recipe/ebony_fence_gate.json @@ -14,7 +14,7 @@ "#W#" ], "result": { - "item": "xkdeco:ebony_fence_gate" + "id": "xkdeco:ebony_fence_gate" }, "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/ebony_log_from_smoking.json b/src/generated/resources/data/xkdeco/recipe/ebony_log_from_smoking.json similarity index 77% rename from src/generated/resources/data/xkdeco/recipes/ebony_log_from_smoking.json rename to src/generated/resources/data/xkdeco/recipe/ebony_log_from_smoking.json index bc868fda..10328b80 100644 --- a/src/generated/resources/data/xkdeco/recipes/ebony_log_from_smoking.json +++ b/src/generated/resources/data/xkdeco/recipe/ebony_log_from_smoking.json @@ -6,5 +6,7 @@ "ingredient": { "item": "minecraft:dark_oak_log" }, - "result": "xkdeco:ebony_log" + "result": { + "id": "xkdeco:ebony_log" + } } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/ebony_planks.json b/src/generated/resources/data/xkdeco/recipe/ebony_planks.json similarity index 85% rename from src/generated/resources/data/xkdeco/recipes/ebony_planks.json rename to src/generated/resources/data/xkdeco/recipe/ebony_planks.json index 47de8e44..0630e3e7 100644 --- a/src/generated/resources/data/xkdeco/recipes/ebony_planks.json +++ b/src/generated/resources/data/xkdeco/recipe/ebony_planks.json @@ -9,6 +9,6 @@ ], "result": { "count": 4, - "item": "xkdeco:ebony_planks" + "id": "xkdeco:ebony_planks" } } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/ebony_planks_from_smoking.json b/src/generated/resources/data/xkdeco/recipe/ebony_planks_from_smoking.json similarity index 76% rename from src/generated/resources/data/xkdeco/recipes/ebony_planks_from_smoking.json rename to src/generated/resources/data/xkdeco/recipe/ebony_planks_from_smoking.json index dc581e12..76a4106a 100644 --- a/src/generated/resources/data/xkdeco/recipes/ebony_planks_from_smoking.json +++ b/src/generated/resources/data/xkdeco/recipe/ebony_planks_from_smoking.json @@ -6,5 +6,7 @@ "ingredient": { "item": "minecraft:dark_oak_planks" }, - "result": "xkdeco:ebony_planks" + "result": { + "id": "xkdeco:ebony_planks" + } } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/ebony_slab.json b/src/generated/resources/data/xkdeco/recipe/ebony_slab.json similarity index 87% rename from src/generated/resources/data/xkdeco/recipes/ebony_slab.json rename to src/generated/resources/data/xkdeco/recipe/ebony_slab.json index 7af6a6c6..dab78c0c 100644 --- a/src/generated/resources/data/xkdeco/recipes/ebony_slab.json +++ b/src/generated/resources/data/xkdeco/recipe/ebony_slab.json @@ -11,7 +11,7 @@ ], "result": { "count": 6, - "item": "xkdeco:ebony_slab" + "id": "xkdeco:ebony_slab" }, "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/ebony_stairs.json b/src/generated/resources/data/xkdeco/recipe/ebony_stairs.json similarity index 88% rename from src/generated/resources/data/xkdeco/recipes/ebony_stairs.json rename to src/generated/resources/data/xkdeco/recipe/ebony_stairs.json index ed3d429f..753424a7 100644 --- a/src/generated/resources/data/xkdeco/recipes/ebony_stairs.json +++ b/src/generated/resources/data/xkdeco/recipe/ebony_stairs.json @@ -13,7 +13,7 @@ ], "result": { "count": 4, - "item": "xkdeco:ebony_stairs" + "id": "xkdeco:ebony_stairs" }, "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/ebony_trapdoor.json b/src/generated/resources/data/xkdeco/recipe/ebony_trapdoor.json similarity index 87% rename from src/generated/resources/data/xkdeco/recipes/ebony_trapdoor.json rename to src/generated/resources/data/xkdeco/recipe/ebony_trapdoor.json index ad8d4c87..2c862a50 100644 --- a/src/generated/resources/data/xkdeco/recipes/ebony_trapdoor.json +++ b/src/generated/resources/data/xkdeco/recipe/ebony_trapdoor.json @@ -12,7 +12,7 @@ ], "result": { "count": 2, - "item": "xkdeco:ebony_trapdoor" + "id": "xkdeco:ebony_trapdoor" }, "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/ebony_wood.json b/src/generated/resources/data/xkdeco/recipe/ebony_wood.json similarity index 88% rename from src/generated/resources/data/xkdeco/recipes/ebony_wood.json rename to src/generated/resources/data/xkdeco/recipe/ebony_wood.json index 76aa6cf2..780305b1 100644 --- a/src/generated/resources/data/xkdeco/recipes/ebony_wood.json +++ b/src/generated/resources/data/xkdeco/recipe/ebony_wood.json @@ -13,7 +13,7 @@ ], "result": { "count": 3, - "item": "xkdeco:ebony_wood" + "id": "xkdeco:ebony_wood" }, "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/ebony_wood_from_smoking.json b/src/generated/resources/data/xkdeco/recipe/ebony_wood_from_smoking.json similarity index 76% rename from src/generated/resources/data/xkdeco/recipes/ebony_wood_from_smoking.json rename to src/generated/resources/data/xkdeco/recipe/ebony_wood_from_smoking.json index 17f0adf0..b3905bf1 100644 --- a/src/generated/resources/data/xkdeco/recipes/ebony_wood_from_smoking.json +++ b/src/generated/resources/data/xkdeco/recipe/ebony_wood_from_smoking.json @@ -6,5 +6,7 @@ "ingredient": { "item": "minecraft:dark_oak_wood" }, - "result": "xkdeco:ebony_wood" + "result": { + "id": "xkdeco:ebony_wood" + } } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/end_stone_slab_from_end_stone_stonecutting.json b/src/generated/resources/data/xkdeco/recipe/end_stone_slab_from_end_stone_stonecutting.json similarity index 67% rename from src/generated/resources/data/xkdeco/recipes/end_stone_slab_from_end_stone_stonecutting.json rename to src/generated/resources/data/xkdeco/recipe/end_stone_slab_from_end_stone_stonecutting.json index dc3708a6..8c6aea2d 100644 --- a/src/generated/resources/data/xkdeco/recipes/end_stone_slab_from_end_stone_stonecutting.json +++ b/src/generated/resources/data/xkdeco/recipe/end_stone_slab_from_end_stone_stonecutting.json @@ -4,5 +4,7 @@ "ingredient": { "item": "minecraft:end_stone" }, - "result": "xkdeco:end_stone_slab" + "result": { + "id": "xkdeco:end_stone_slab" + } } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/factory_block_from_iron_block_stonecutting.json b/src/generated/resources/data/xkdeco/recipe/factory_block_from_iron_block_stonecutting.json similarity index 68% rename from src/generated/resources/data/xkdeco/recipes/factory_block_from_iron_block_stonecutting.json rename to src/generated/resources/data/xkdeco/recipe/factory_block_from_iron_block_stonecutting.json index f12eb169..42d21c14 100644 --- a/src/generated/resources/data/xkdeco/recipes/factory_block_from_iron_block_stonecutting.json +++ b/src/generated/resources/data/xkdeco/recipe/factory_block_from_iron_block_stonecutting.json @@ -4,5 +4,7 @@ "ingredient": { "item": "minecraft:iron_block" }, - "result": "xkdeco:factory_block" + "result": { + "id": "xkdeco:factory_block" + } } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/factory_lamp.json b/src/generated/resources/data/xkdeco/recipe/factory_lamp.json similarity index 91% rename from src/generated/resources/data/xkdeco/recipes/factory_lamp.json rename to src/generated/resources/data/xkdeco/recipe/factory_lamp.json index 8261b004..97682a62 100644 --- a/src/generated/resources/data/xkdeco/recipes/factory_lamp.json +++ b/src/generated/resources/data/xkdeco/recipe/factory_lamp.json @@ -19,7 +19,7 @@ ], "result": { "count": 4, - "item": "xkdeco:factory_lamp" + "id": "xkdeco:factory_lamp" }, "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/factory_lamp_block_from_glowstone_stonecutting.json b/src/generated/resources/data/xkdeco/recipe/factory_lamp_block_from_glowstone_stonecutting.json similarity index 66% rename from src/generated/resources/data/xkdeco/recipes/factory_lamp_block_from_glowstone_stonecutting.json rename to src/generated/resources/data/xkdeco/recipe/factory_lamp_block_from_glowstone_stonecutting.json index 361dd7c5..bbf86f71 100644 --- a/src/generated/resources/data/xkdeco/recipes/factory_lamp_block_from_glowstone_stonecutting.json +++ b/src/generated/resources/data/xkdeco/recipe/factory_lamp_block_from_glowstone_stonecutting.json @@ -4,5 +4,7 @@ "ingredient": { "item": "minecraft:glowstone" }, - "result": "xkdeco:factory_lamp_block" + "result": { + "id": "xkdeco:factory_lamp_block" + } } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/factory_lamp_slab.json b/src/generated/resources/data/xkdeco/recipe/factory_lamp_slab.json similarity index 85% rename from src/generated/resources/data/xkdeco/recipes/factory_lamp_slab.json rename to src/generated/resources/data/xkdeco/recipe/factory_lamp_slab.json index d8cb29d5..0220f955 100644 --- a/src/generated/resources/data/xkdeco/recipes/factory_lamp_slab.json +++ b/src/generated/resources/data/xkdeco/recipe/factory_lamp_slab.json @@ -11,7 +11,7 @@ ], "result": { "count": 6, - "item": "xkdeco:factory_lamp_slab" + "id": "xkdeco:factory_lamp_slab" }, "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/factory_lamp_stairs.json b/src/generated/resources/data/xkdeco/recipe/factory_lamp_stairs.json similarity index 86% rename from src/generated/resources/data/xkdeco/recipes/factory_lamp_stairs.json rename to src/generated/resources/data/xkdeco/recipe/factory_lamp_stairs.json index 32648d70..a9bf231e 100644 --- a/src/generated/resources/data/xkdeco/recipes/factory_lamp_stairs.json +++ b/src/generated/resources/data/xkdeco/recipe/factory_lamp_stairs.json @@ -13,7 +13,7 @@ ], "result": { "count": 4, - "item": "xkdeco:factory_lamp_stairs" + "id": "xkdeco:factory_lamp_stairs" }, "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/factory_slab.json b/src/generated/resources/data/xkdeco/recipe/factory_slab.json similarity index 87% rename from src/generated/resources/data/xkdeco/recipes/factory_slab.json rename to src/generated/resources/data/xkdeco/recipe/factory_slab.json index 54fa19d6..dbb82617 100644 --- a/src/generated/resources/data/xkdeco/recipes/factory_slab.json +++ b/src/generated/resources/data/xkdeco/recipe/factory_slab.json @@ -11,7 +11,7 @@ ], "result": { "count": 6, - "item": "xkdeco:factory_slab" + "id": "xkdeco:factory_slab" }, "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/factory_slab_rusted.json b/src/generated/resources/data/xkdeco/recipe/factory_slab_rusted.json similarity index 85% rename from src/generated/resources/data/xkdeco/recipes/factory_slab_rusted.json rename to src/generated/resources/data/xkdeco/recipe/factory_slab_rusted.json index 2a3e9269..8983c66a 100644 --- a/src/generated/resources/data/xkdeco/recipes/factory_slab_rusted.json +++ b/src/generated/resources/data/xkdeco/recipe/factory_slab_rusted.json @@ -11,7 +11,7 @@ ], "result": { "count": 6, - "item": "xkdeco:factory_slab_rusted" + "id": "xkdeco:factory_slab_rusted" }, "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/factory_slab_rusting.json b/src/generated/resources/data/xkdeco/recipe/factory_slab_rusting.json similarity index 85% rename from src/generated/resources/data/xkdeco/recipes/factory_slab_rusting.json rename to src/generated/resources/data/xkdeco/recipe/factory_slab_rusting.json index ac0b0cdb..b2059f80 100644 --- a/src/generated/resources/data/xkdeco/recipes/factory_slab_rusting.json +++ b/src/generated/resources/data/xkdeco/recipe/factory_slab_rusting.json @@ -11,7 +11,7 @@ ], "result": { "count": 6, - "item": "xkdeco:factory_slab_rusting" + "id": "xkdeco:factory_slab_rusting" }, "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/factory_stairs.json b/src/generated/resources/data/xkdeco/recipe/factory_stairs.json similarity index 87% rename from src/generated/resources/data/xkdeco/recipes/factory_stairs.json rename to src/generated/resources/data/xkdeco/recipe/factory_stairs.json index f7eb1297..5d36fb31 100644 --- a/src/generated/resources/data/xkdeco/recipes/factory_stairs.json +++ b/src/generated/resources/data/xkdeco/recipe/factory_stairs.json @@ -13,7 +13,7 @@ ], "result": { "count": 4, - "item": "xkdeco:factory_stairs" + "id": "xkdeco:factory_stairs" }, "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/factory_stairs_rusted.json b/src/generated/resources/data/xkdeco/recipe/factory_stairs_rusted.json similarity index 85% rename from src/generated/resources/data/xkdeco/recipes/factory_stairs_rusted.json rename to src/generated/resources/data/xkdeco/recipe/factory_stairs_rusted.json index e5af1484..5395c34d 100644 --- a/src/generated/resources/data/xkdeco/recipes/factory_stairs_rusted.json +++ b/src/generated/resources/data/xkdeco/recipe/factory_stairs_rusted.json @@ -13,7 +13,7 @@ ], "result": { "count": 4, - "item": "xkdeco:factory_stairs_rusted" + "id": "xkdeco:factory_stairs_rusted" }, "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/factory_stairs_rusting.json b/src/generated/resources/data/xkdeco/recipe/factory_stairs_rusting.json similarity index 85% rename from src/generated/resources/data/xkdeco/recipes/factory_stairs_rusting.json rename to src/generated/resources/data/xkdeco/recipe/factory_stairs_rusting.json index d4afd852..9da7b40f 100644 --- a/src/generated/resources/data/xkdeco/recipes/factory_stairs_rusting.json +++ b/src/generated/resources/data/xkdeco/recipe/factory_stairs_rusting.json @@ -13,7 +13,7 @@ ], "result": { "count": 4, - "item": "xkdeco:factory_stairs_rusting" + "id": "xkdeco:factory_stairs_rusting" }, "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/factory_trapdoor.json b/src/generated/resources/data/xkdeco/recipe/factory_trapdoor.json similarity index 86% rename from src/generated/resources/data/xkdeco/recipes/factory_trapdoor.json rename to src/generated/resources/data/xkdeco/recipe/factory_trapdoor.json index c05b28e7..b53f50ab 100644 --- a/src/generated/resources/data/xkdeco/recipes/factory_trapdoor.json +++ b/src/generated/resources/data/xkdeco/recipe/factory_trapdoor.json @@ -12,7 +12,7 @@ ], "result": { "count": 2, - "item": "xkdeco:factory_trapdoor" + "id": "xkdeco:factory_trapdoor" }, "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/factory_trapdoor_rusted.json b/src/generated/resources/data/xkdeco/recipe/factory_trapdoor_rusted.json similarity index 84% rename from src/generated/resources/data/xkdeco/recipes/factory_trapdoor_rusted.json rename to src/generated/resources/data/xkdeco/recipe/factory_trapdoor_rusted.json index 1bf95a4f..805da449 100644 --- a/src/generated/resources/data/xkdeco/recipes/factory_trapdoor_rusted.json +++ b/src/generated/resources/data/xkdeco/recipe/factory_trapdoor_rusted.json @@ -12,7 +12,7 @@ ], "result": { "count": 2, - "item": "xkdeco:factory_trapdoor_rusted" + "id": "xkdeco:factory_trapdoor_rusted" }, "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/factory_trapdoor_rusting.json b/src/generated/resources/data/xkdeco/recipe/factory_trapdoor_rusting.json similarity index 84% rename from src/generated/resources/data/xkdeco/recipes/factory_trapdoor_rusting.json rename to src/generated/resources/data/xkdeco/recipe/factory_trapdoor_rusting.json index 896f6f0a..ac325d6e 100644 --- a/src/generated/resources/data/xkdeco/recipes/factory_trapdoor_rusting.json +++ b/src/generated/resources/data/xkdeco/recipe/factory_trapdoor_rusting.json @@ -12,7 +12,7 @@ ], "result": { "count": 2, - "item": "xkdeco:factory_trapdoor_rusting" + "id": "xkdeco:factory_trapdoor_rusting" }, "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/fallen_cherry_blossom.json b/src/generated/resources/data/xkdeco/recipe/fallen_cherry_blossom.json similarity index 85% rename from src/generated/resources/data/xkdeco/recipes/fallen_cherry_blossom.json rename to src/generated/resources/data/xkdeco/recipe/fallen_cherry_blossom.json index 60150df7..8a64b22d 100644 --- a/src/generated/resources/data/xkdeco/recipes/fallen_cherry_blossom.json +++ b/src/generated/resources/data/xkdeco/recipe/fallen_cherry_blossom.json @@ -12,7 +12,7 @@ ], "result": { "count": 3, - "item": "xkdeco:fallen_cherry_blossom" + "id": "xkdeco:fallen_cherry_blossom" }, "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/fallen_ginkgo_leaves.json b/src/generated/resources/data/xkdeco/recipe/fallen_ginkgo_leaves.json similarity index 85% rename from src/generated/resources/data/xkdeco/recipes/fallen_ginkgo_leaves.json rename to src/generated/resources/data/xkdeco/recipe/fallen_ginkgo_leaves.json index 4f7f5f4f..2db50591 100644 --- a/src/generated/resources/data/xkdeco/recipes/fallen_ginkgo_leaves.json +++ b/src/generated/resources/data/xkdeco/recipe/fallen_ginkgo_leaves.json @@ -12,7 +12,7 @@ ], "result": { "count": 3, - "item": "xkdeco:fallen_ginkgo_leaves" + "id": "xkdeco:fallen_ginkgo_leaves" }, "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/fallen_orange_maple_leaves.json b/src/generated/resources/data/xkdeco/recipe/fallen_orange_maple_leaves.json similarity index 84% rename from src/generated/resources/data/xkdeco/recipes/fallen_orange_maple_leaves.json rename to src/generated/resources/data/xkdeco/recipe/fallen_orange_maple_leaves.json index a436bcf3..eff727bb 100644 --- a/src/generated/resources/data/xkdeco/recipes/fallen_orange_maple_leaves.json +++ b/src/generated/resources/data/xkdeco/recipe/fallen_orange_maple_leaves.json @@ -12,7 +12,7 @@ ], "result": { "count": 3, - "item": "xkdeco:fallen_orange_maple_leaves" + "id": "xkdeco:fallen_orange_maple_leaves" }, "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/fallen_peach_blossom.json b/src/generated/resources/data/xkdeco/recipe/fallen_peach_blossom.json similarity index 85% rename from src/generated/resources/data/xkdeco/recipes/fallen_peach_blossom.json rename to src/generated/resources/data/xkdeco/recipe/fallen_peach_blossom.json index 511e4651..62778dd0 100644 --- a/src/generated/resources/data/xkdeco/recipes/fallen_peach_blossom.json +++ b/src/generated/resources/data/xkdeco/recipe/fallen_peach_blossom.json @@ -12,7 +12,7 @@ ], "result": { "count": 3, - "item": "xkdeco:fallen_peach_blossom" + "id": "xkdeco:fallen_peach_blossom" }, "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/fallen_red_maple_leaves.json b/src/generated/resources/data/xkdeco/recipe/fallen_red_maple_leaves.json similarity index 85% rename from src/generated/resources/data/xkdeco/recipes/fallen_red_maple_leaves.json rename to src/generated/resources/data/xkdeco/recipe/fallen_red_maple_leaves.json index 4e4d4fc6..dc785fe7 100644 --- a/src/generated/resources/data/xkdeco/recipes/fallen_red_maple_leaves.json +++ b/src/generated/resources/data/xkdeco/recipe/fallen_red_maple_leaves.json @@ -12,7 +12,7 @@ ], "result": { "count": 3, - "item": "xkdeco:fallen_red_maple_leaves" + "id": "xkdeco:fallen_red_maple_leaves" }, "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/fallen_white_cherry_blossom.json b/src/generated/resources/data/xkdeco/recipe/fallen_white_cherry_blossom.json similarity index 84% rename from src/generated/resources/data/xkdeco/recipes/fallen_white_cherry_blossom.json rename to src/generated/resources/data/xkdeco/recipe/fallen_white_cherry_blossom.json index 012316b1..8f84585e 100644 --- a/src/generated/resources/data/xkdeco/recipes/fallen_white_cherry_blossom.json +++ b/src/generated/resources/data/xkdeco/recipe/fallen_white_cherry_blossom.json @@ -12,7 +12,7 @@ ], "result": { "count": 3, - "item": "xkdeco:fallen_white_cherry_blossom" + "id": "xkdeco:fallen_white_cherry_blossom" }, "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/gilded_blackstone_brick_slab.json b/src/generated/resources/data/xkdeco/recipe/gilded_blackstone_brick_slab.json similarity index 82% rename from src/generated/resources/data/xkdeco/recipes/gilded_blackstone_brick_slab.json rename to src/generated/resources/data/xkdeco/recipe/gilded_blackstone_brick_slab.json index a082f499..738c734a 100644 --- a/src/generated/resources/data/xkdeco/recipes/gilded_blackstone_brick_slab.json +++ b/src/generated/resources/data/xkdeco/recipe/gilded_blackstone_brick_slab.json @@ -11,7 +11,7 @@ ], "result": { "count": 6, - "item": "xkdeco:gilded_blackstone_brick_slab" + "id": "xkdeco:gilded_blackstone_brick_slab" }, "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/gilded_blackstone_brick_stairs.json b/src/generated/resources/data/xkdeco/recipe/gilded_blackstone_brick_stairs.json similarity index 83% rename from src/generated/resources/data/xkdeco/recipes/gilded_blackstone_brick_stairs.json rename to src/generated/resources/data/xkdeco/recipe/gilded_blackstone_brick_stairs.json index c5004869..7e08e93f 100644 --- a/src/generated/resources/data/xkdeco/recipes/gilded_blackstone_brick_stairs.json +++ b/src/generated/resources/data/xkdeco/recipe/gilded_blackstone_brick_stairs.json @@ -13,7 +13,7 @@ ], "result": { "count": 4, - "item": "xkdeco:gilded_blackstone_brick_stairs" + "id": "xkdeco:gilded_blackstone_brick_stairs" }, "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/ginkgo_leaves.json b/src/generated/resources/data/xkdeco/recipe/ginkgo_leaves.json similarity index 89% rename from src/generated/resources/data/xkdeco/recipes/ginkgo_leaves.json rename to src/generated/resources/data/xkdeco/recipe/ginkgo_leaves.json index 821d5073..ee67cda9 100644 --- a/src/generated/resources/data/xkdeco/recipes/ginkgo_leaves.json +++ b/src/generated/resources/data/xkdeco/recipe/ginkgo_leaves.json @@ -16,7 +16,7 @@ ], "result": { "count": 8, - "item": "xkdeco:ginkgo_leaves" + "id": "xkdeco:ginkgo_leaves" }, "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/glass_door.json b/src/generated/resources/data/xkdeco/recipe/glass_door.json similarity index 88% rename from src/generated/resources/data/xkdeco/recipes/glass_door.json rename to src/generated/resources/data/xkdeco/recipe/glass_door.json index 7d7353ae..391570ea 100644 --- a/src/generated/resources/data/xkdeco/recipes/glass_door.json +++ b/src/generated/resources/data/xkdeco/recipe/glass_door.json @@ -13,7 +13,7 @@ ], "result": { "count": 3, - "item": "xkdeco:glass_door" + "id": "xkdeco:glass_door" }, "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/glass_tile_slab.json b/src/generated/resources/data/xkdeco/recipe/glass_tile_slab.json similarity index 86% rename from src/generated/resources/data/xkdeco/recipes/glass_tile_slab.json rename to src/generated/resources/data/xkdeco/recipe/glass_tile_slab.json index 79ddadb0..d7ea4387 100644 --- a/src/generated/resources/data/xkdeco/recipes/glass_tile_slab.json +++ b/src/generated/resources/data/xkdeco/recipe/glass_tile_slab.json @@ -11,7 +11,7 @@ ], "result": { "count": 6, - "item": "xkdeco:glass_tile_slab" + "id": "xkdeco:glass_tile_slab" }, "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/glass_tile_stairs.json b/src/generated/resources/data/xkdeco/recipe/glass_tile_stairs.json similarity index 86% rename from src/generated/resources/data/xkdeco/recipes/glass_tile_stairs.json rename to src/generated/resources/data/xkdeco/recipe/glass_tile_stairs.json index f1506755..bc2e30ab 100644 --- a/src/generated/resources/data/xkdeco/recipes/glass_tile_stairs.json +++ b/src/generated/resources/data/xkdeco/recipe/glass_tile_stairs.json @@ -13,7 +13,7 @@ ], "result": { "count": 4, - "item": "xkdeco:glass_tile_stairs" + "id": "xkdeco:glass_tile_stairs" }, "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/glass_tiles_from_glass_stonecutting.json b/src/generated/resources/data/xkdeco/recipe/glass_tiles_from_glass_stonecutting.json similarity index 68% rename from src/generated/resources/data/xkdeco/recipes/glass_tiles_from_glass_stonecutting.json rename to src/generated/resources/data/xkdeco/recipe/glass_tiles_from_glass_stonecutting.json index daf55e43..577a404f 100644 --- a/src/generated/resources/data/xkdeco/recipes/glass_tiles_from_glass_stonecutting.json +++ b/src/generated/resources/data/xkdeco/recipe/glass_tiles_from_glass_stonecutting.json @@ -4,5 +4,7 @@ "ingredient": { "item": "minecraft:glass" }, - "result": "xkdeco:glass_tiles" + "result": { + "id": "xkdeco:glass_tiles" + } } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/glass_trapdoor.json b/src/generated/resources/data/xkdeco/recipe/glass_trapdoor.json similarity index 86% rename from src/generated/resources/data/xkdeco/recipes/glass_trapdoor.json rename to src/generated/resources/data/xkdeco/recipe/glass_trapdoor.json index a2202427..0af7ec85 100644 --- a/src/generated/resources/data/xkdeco/recipes/glass_trapdoor.json +++ b/src/generated/resources/data/xkdeco/recipe/glass_trapdoor.json @@ -12,7 +12,7 @@ ], "result": { "count": 2, - "item": "xkdeco:glass_trapdoor" + "id": "xkdeco:glass_trapdoor" }, "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/glow_item_frame_cover.json b/src/generated/resources/data/xkdeco/recipe/glow_item_frame_cover.json similarity index 83% rename from src/generated/resources/data/xkdeco/recipes/glow_item_frame_cover.json rename to src/generated/resources/data/xkdeco/recipe/glow_item_frame_cover.json index fd34a88a..cb1fbc35 100644 --- a/src/generated/resources/data/xkdeco/recipes/glow_item_frame_cover.json +++ b/src/generated/resources/data/xkdeco/recipe/glow_item_frame_cover.json @@ -10,6 +10,6 @@ } ], "result": { - "item": "xkdeco:glow_item_frame_cover" + "id": "xkdeco:glow_item_frame_cover" } } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/gold_brick_slab.json b/src/generated/resources/data/xkdeco/recipe/gold_brick_slab.json similarity index 86% rename from src/generated/resources/data/xkdeco/recipes/gold_brick_slab.json rename to src/generated/resources/data/xkdeco/recipe/gold_brick_slab.json index bfd45412..71a7d40d 100644 --- a/src/generated/resources/data/xkdeco/recipes/gold_brick_slab.json +++ b/src/generated/resources/data/xkdeco/recipe/gold_brick_slab.json @@ -11,7 +11,7 @@ ], "result": { "count": 6, - "item": "xkdeco:gold_brick_slab" + "id": "xkdeco:gold_brick_slab" }, "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/gold_brick_stairs.json b/src/generated/resources/data/xkdeco/recipe/gold_brick_stairs.json similarity index 86% rename from src/generated/resources/data/xkdeco/recipes/gold_brick_stairs.json rename to src/generated/resources/data/xkdeco/recipe/gold_brick_stairs.json index 2e712669..14b2116c 100644 --- a/src/generated/resources/data/xkdeco/recipes/gold_brick_stairs.json +++ b/src/generated/resources/data/xkdeco/recipe/gold_brick_stairs.json @@ -13,7 +13,7 @@ ], "result": { "count": 4, - "item": "xkdeco:gold_brick_stairs" + "id": "xkdeco:gold_brick_stairs" }, "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/grass_block_slab_from_dirt_stonecutting.json b/src/generated/resources/data/xkdeco/recipe/grass_block_slab_from_dirt_stonecutting.json similarity index 66% rename from src/generated/resources/data/xkdeco/recipes/grass_block_slab_from_dirt_stonecutting.json rename to src/generated/resources/data/xkdeco/recipe/grass_block_slab_from_dirt_stonecutting.json index 51b208cf..ba4f7de7 100644 --- a/src/generated/resources/data/xkdeco/recipes/grass_block_slab_from_dirt_stonecutting.json +++ b/src/generated/resources/data/xkdeco/recipe/grass_block_slab_from_dirt_stonecutting.json @@ -4,5 +4,7 @@ "ingredient": { "item": "minecraft:dirt" }, - "result": "xkdeco:grass_block_slab" + "result": { + "id": "xkdeco:grass_block_slab" + } } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/grass_cobblestone.json b/src/generated/resources/data/xkdeco/recipe/grass_cobblestone.json similarity index 84% rename from src/generated/resources/data/xkdeco/recipes/grass_cobblestone.json rename to src/generated/resources/data/xkdeco/recipe/grass_cobblestone.json index 4e779061..b9b92b1d 100644 --- a/src/generated/resources/data/xkdeco/recipes/grass_cobblestone.json +++ b/src/generated/resources/data/xkdeco/recipe/grass_cobblestone.json @@ -10,6 +10,6 @@ } ], "result": { - "item": "xkdeco:grass_cobblestone" + "id": "xkdeco:grass_cobblestone" } } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/grass_cobblestone_path_slab.json b/src/generated/resources/data/xkdeco/recipe/grass_cobblestone_path_slab.json similarity index 83% rename from src/generated/resources/data/xkdeco/recipes/grass_cobblestone_path_slab.json rename to src/generated/resources/data/xkdeco/recipe/grass_cobblestone_path_slab.json index 0e6f1309..ecfcec41 100644 --- a/src/generated/resources/data/xkdeco/recipes/grass_cobblestone_path_slab.json +++ b/src/generated/resources/data/xkdeco/recipe/grass_cobblestone_path_slab.json @@ -11,7 +11,7 @@ ], "result": { "count": 6, - "item": "xkdeco:grass_cobblestone_path_slab" + "id": "xkdeco:grass_cobblestone_path_slab" }, "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/grass_cobblestone_path_stairs.json b/src/generated/resources/data/xkdeco/recipe/grass_cobblestone_path_stairs.json similarity index 83% rename from src/generated/resources/data/xkdeco/recipes/grass_cobblestone_path_stairs.json rename to src/generated/resources/data/xkdeco/recipe/grass_cobblestone_path_stairs.json index 173d1005..3d7e9b87 100644 --- a/src/generated/resources/data/xkdeco/recipes/grass_cobblestone_path_stairs.json +++ b/src/generated/resources/data/xkdeco/recipe/grass_cobblestone_path_stairs.json @@ -13,7 +13,7 @@ ], "result": { "count": 4, - "item": "xkdeco:grass_cobblestone_path_stairs" + "id": "xkdeco:grass_cobblestone_path_stairs" }, "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/grass_cobblestone_slab.json b/src/generated/resources/data/xkdeco/recipe/grass_cobblestone_slab.json similarity index 84% rename from src/generated/resources/data/xkdeco/recipes/grass_cobblestone_slab.json rename to src/generated/resources/data/xkdeco/recipe/grass_cobblestone_slab.json index 0e9bd4d1..2aae881a 100644 --- a/src/generated/resources/data/xkdeco/recipes/grass_cobblestone_slab.json +++ b/src/generated/resources/data/xkdeco/recipe/grass_cobblestone_slab.json @@ -11,7 +11,7 @@ ], "result": { "count": 6, - "item": "xkdeco:grass_cobblestone_slab" + "id": "xkdeco:grass_cobblestone_slab" }, "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/grass_cobblestone_stairs.json b/src/generated/resources/data/xkdeco/recipe/grass_cobblestone_stairs.json similarity index 84% rename from src/generated/resources/data/xkdeco/recipes/grass_cobblestone_stairs.json rename to src/generated/resources/data/xkdeco/recipe/grass_cobblestone_stairs.json index 39376640..b358b040 100644 --- a/src/generated/resources/data/xkdeco/recipes/grass_cobblestone_stairs.json +++ b/src/generated/resources/data/xkdeco/recipe/grass_cobblestone_stairs.json @@ -13,7 +13,7 @@ ], "result": { "count": 4, - "item": "xkdeco:grass_cobblestone_stairs" + "id": "xkdeco:grass_cobblestone_stairs" }, "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/green_tile_slab.json b/src/generated/resources/data/xkdeco/recipe/green_tile_slab.json similarity index 86% rename from src/generated/resources/data/xkdeco/recipes/green_tile_slab.json rename to src/generated/resources/data/xkdeco/recipe/green_tile_slab.json index c4333f26..25340842 100644 --- a/src/generated/resources/data/xkdeco/recipes/green_tile_slab.json +++ b/src/generated/resources/data/xkdeco/recipe/green_tile_slab.json @@ -11,7 +11,7 @@ ], "result": { "count": 6, - "item": "xkdeco:green_tile_slab" + "id": "xkdeco:green_tile_slab" }, "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/green_tile_stairs.json b/src/generated/resources/data/xkdeco/recipe/green_tile_stairs.json similarity index 86% rename from src/generated/resources/data/xkdeco/recipes/green_tile_stairs.json rename to src/generated/resources/data/xkdeco/recipe/green_tile_stairs.json index e71d5020..d72e3013 100644 --- a/src/generated/resources/data/xkdeco/recipes/green_tile_stairs.json +++ b/src/generated/resources/data/xkdeco/recipe/green_tile_stairs.json @@ -13,7 +13,7 @@ ], "result": { "count": 4, - "item": "xkdeco:green_tile_stairs" + "id": "xkdeco:green_tile_stairs" }, "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/green_tiles.json b/src/generated/resources/data/xkdeco/recipe/green_tiles.json similarity index 90% rename from src/generated/resources/data/xkdeco/recipes/green_tiles.json rename to src/generated/resources/data/xkdeco/recipe/green_tiles.json index f20f5956..316f8557 100644 --- a/src/generated/resources/data/xkdeco/recipes/green_tiles.json +++ b/src/generated/resources/data/xkdeco/recipe/green_tiles.json @@ -15,7 +15,7 @@ ], "result": { "count": 8, - "item": "xkdeco:green_tiles" + "id": "xkdeco:green_tiles" }, "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/hollow_steel_trapdoor.json b/src/generated/resources/data/xkdeco/recipe/hollow_steel_trapdoor.json similarity index 85% rename from src/generated/resources/data/xkdeco/recipes/hollow_steel_trapdoor.json rename to src/generated/resources/data/xkdeco/recipe/hollow_steel_trapdoor.json index 318d4b74..a926e3be 100644 --- a/src/generated/resources/data/xkdeco/recipes/hollow_steel_trapdoor.json +++ b/src/generated/resources/data/xkdeco/recipe/hollow_steel_trapdoor.json @@ -12,7 +12,7 @@ ], "result": { "count": 2, - "item": "xkdeco:hollow_steel_trapdoor" + "id": "xkdeco:hollow_steel_trapdoor" }, "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/inca_brick_slab.json b/src/generated/resources/data/xkdeco/recipe/inca_brick_slab.json similarity index 86% rename from src/generated/resources/data/xkdeco/recipes/inca_brick_slab.json rename to src/generated/resources/data/xkdeco/recipe/inca_brick_slab.json index 31b34cf7..24800f39 100644 --- a/src/generated/resources/data/xkdeco/recipes/inca_brick_slab.json +++ b/src/generated/resources/data/xkdeco/recipe/inca_brick_slab.json @@ -11,7 +11,7 @@ ], "result": { "count": 6, - "item": "xkdeco:inca_brick_slab" + "id": "xkdeco:inca_brick_slab" }, "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/inca_brick_stairs.json b/src/generated/resources/data/xkdeco/recipe/inca_brick_stairs.json similarity index 86% rename from src/generated/resources/data/xkdeco/recipes/inca_brick_stairs.json rename to src/generated/resources/data/xkdeco/recipe/inca_brick_stairs.json index 2d96dd48..127ae7b5 100644 --- a/src/generated/resources/data/xkdeco/recipes/inca_brick_stairs.json +++ b/src/generated/resources/data/xkdeco/recipe/inca_brick_stairs.json @@ -13,7 +13,7 @@ ], "result": { "count": 4, - "item": "xkdeco:inca_brick_stairs" + "id": "xkdeco:inca_brick_stairs" }, "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/inca_stone.json b/src/generated/resources/data/xkdeco/recipe/inca_stone.json similarity index 90% rename from src/generated/resources/data/xkdeco/recipes/inca_stone.json rename to src/generated/resources/data/xkdeco/recipe/inca_stone.json index 8609c5aa..0f5aecde 100644 --- a/src/generated/resources/data/xkdeco/recipes/inca_stone.json +++ b/src/generated/resources/data/xkdeco/recipe/inca_stone.json @@ -15,7 +15,7 @@ ], "result": { "count": 4, - "item": "xkdeco:inca_stone" + "id": "xkdeco:inca_stone" }, "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/inca_stone_slab.json b/src/generated/resources/data/xkdeco/recipe/inca_stone_slab.json similarity index 86% rename from src/generated/resources/data/xkdeco/recipes/inca_stone_slab.json rename to src/generated/resources/data/xkdeco/recipe/inca_stone_slab.json index 36564ca7..2f7a7aa1 100644 --- a/src/generated/resources/data/xkdeco/recipes/inca_stone_slab.json +++ b/src/generated/resources/data/xkdeco/recipe/inca_stone_slab.json @@ -11,7 +11,7 @@ ], "result": { "count": 6, - "item": "xkdeco:inca_stone_slab" + "id": "xkdeco:inca_stone_slab" }, "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/inca_stone_stairs.json b/src/generated/resources/data/xkdeco/recipe/inca_stone_stairs.json similarity index 86% rename from src/generated/resources/data/xkdeco/recipes/inca_stone_stairs.json rename to src/generated/resources/data/xkdeco/recipe/inca_stone_stairs.json index e27bcce4..ab2e5cff 100644 --- a/src/generated/resources/data/xkdeco/recipes/inca_stone_stairs.json +++ b/src/generated/resources/data/xkdeco/recipe/inca_stone_stairs.json @@ -13,7 +13,7 @@ ], "result": { "count": 4, - "item": "xkdeco:inca_stone_stairs" + "id": "xkdeco:inca_stone_stairs" }, "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/inca_stonebrick_slab.json b/src/generated/resources/data/xkdeco/recipe/inca_stonebrick_slab.json similarity index 84% rename from src/generated/resources/data/xkdeco/recipes/inca_stonebrick_slab.json rename to src/generated/resources/data/xkdeco/recipe/inca_stonebrick_slab.json index dc5cb95e..0ec1b0a3 100644 --- a/src/generated/resources/data/xkdeco/recipes/inca_stonebrick_slab.json +++ b/src/generated/resources/data/xkdeco/recipe/inca_stonebrick_slab.json @@ -11,7 +11,7 @@ ], "result": { "count": 6, - "item": "xkdeco:inca_stonebrick_slab" + "id": "xkdeco:inca_stonebrick_slab" }, "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/inca_stonebrick_stairs.json b/src/generated/resources/data/xkdeco/recipe/inca_stonebrick_stairs.json similarity index 85% rename from src/generated/resources/data/xkdeco/recipes/inca_stonebrick_stairs.json rename to src/generated/resources/data/xkdeco/recipe/inca_stonebrick_stairs.json index 6a418e2c..86441e21 100644 --- a/src/generated/resources/data/xkdeco/recipes/inca_stonebrick_stairs.json +++ b/src/generated/resources/data/xkdeco/recipe/inca_stonebrick_stairs.json @@ -13,7 +13,7 @@ ], "result": { "count": 4, - "item": "xkdeco:inca_stonebrick_stairs" + "id": "xkdeco:inca_stonebrick_stairs" }, "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/item_frame_cover_from_glass_stonecutting.json b/src/generated/resources/data/xkdeco/recipe/item_frame_cover_from_glass_stonecutting.json similarity index 66% rename from src/generated/resources/data/xkdeco/recipes/item_frame_cover_from_glass_stonecutting.json rename to src/generated/resources/data/xkdeco/recipe/item_frame_cover_from_glass_stonecutting.json index 97a3055b..53664012 100644 --- a/src/generated/resources/data/xkdeco/recipes/item_frame_cover_from_glass_stonecutting.json +++ b/src/generated/resources/data/xkdeco/recipe/item_frame_cover_from_glass_stonecutting.json @@ -4,5 +4,7 @@ "ingredient": { "item": "minecraft:glass" }, - "result": "xkdeco:item_frame_cover" + "result": { + "id": "xkdeco:item_frame_cover" + } } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/item_projector.json b/src/generated/resources/data/xkdeco/recipe/item_projector.json similarity index 88% rename from src/generated/resources/data/xkdeco/recipes/item_projector.json rename to src/generated/resources/data/xkdeco/recipe/item_projector.json index 3be8562d..53f01f86 100644 --- a/src/generated/resources/data/xkdeco/recipes/item_projector.json +++ b/src/generated/resources/data/xkdeco/recipe/item_projector.json @@ -14,7 +14,7 @@ "B" ], "result": { - "item": "xkdeco:item_projector" + "id": "xkdeco:item_projector" }, "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/lined_mud_wall_slab.json b/src/generated/resources/data/xkdeco/recipe/lined_mud_wall_slab.json similarity index 85% rename from src/generated/resources/data/xkdeco/recipes/lined_mud_wall_slab.json rename to src/generated/resources/data/xkdeco/recipe/lined_mud_wall_slab.json index 1bacdeaa..97c5f1e3 100644 --- a/src/generated/resources/data/xkdeco/recipes/lined_mud_wall_slab.json +++ b/src/generated/resources/data/xkdeco/recipe/lined_mud_wall_slab.json @@ -11,7 +11,7 @@ ], "result": { "count": 6, - "item": "xkdeco:lined_mud_wall_slab" + "id": "xkdeco:lined_mud_wall_slab" }, "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/lined_mud_wall_stairs.json b/src/generated/resources/data/xkdeco/recipe/lined_mud_wall_stairs.json similarity index 85% rename from src/generated/resources/data/xkdeco/recipes/lined_mud_wall_stairs.json rename to src/generated/resources/data/xkdeco/recipe/lined_mud_wall_stairs.json index 49b5973a..60494a9c 100644 --- a/src/generated/resources/data/xkdeco/recipes/lined_mud_wall_stairs.json +++ b/src/generated/resources/data/xkdeco/recipe/lined_mud_wall_stairs.json @@ -13,7 +13,7 @@ ], "result": { "count": 4, - "item": "xkdeco:lined_mud_wall_stairs" + "id": "xkdeco:lined_mud_wall_stairs" }, "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/mahogany_door.json b/src/generated/resources/data/xkdeco/recipe/mahogany_door.json similarity index 87% rename from src/generated/resources/data/xkdeco/recipes/mahogany_door.json rename to src/generated/resources/data/xkdeco/recipe/mahogany_door.json index ea4ea307..0179e78d 100644 --- a/src/generated/resources/data/xkdeco/recipes/mahogany_door.json +++ b/src/generated/resources/data/xkdeco/recipe/mahogany_door.json @@ -13,7 +13,7 @@ ], "result": { "count": 3, - "item": "xkdeco:mahogany_door" + "id": "xkdeco:mahogany_door" }, "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/mahogany_fence.json b/src/generated/resources/data/xkdeco/recipe/mahogany_fence.json similarity index 88% rename from src/generated/resources/data/xkdeco/recipes/mahogany_fence.json rename to src/generated/resources/data/xkdeco/recipe/mahogany_fence.json index 81af5f16..f484e0d2 100644 --- a/src/generated/resources/data/xkdeco/recipes/mahogany_fence.json +++ b/src/generated/resources/data/xkdeco/recipe/mahogany_fence.json @@ -15,7 +15,7 @@ ], "result": { "count": 3, - "item": "xkdeco:mahogany_fence" + "id": "xkdeco:mahogany_fence" }, "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/mahogany_fence_gate.json b/src/generated/resources/data/xkdeco/recipe/mahogany_fence_gate.json similarity index 87% rename from src/generated/resources/data/xkdeco/recipes/mahogany_fence_gate.json rename to src/generated/resources/data/xkdeco/recipe/mahogany_fence_gate.json index da3203cf..6d70d4d6 100644 --- a/src/generated/resources/data/xkdeco/recipes/mahogany_fence_gate.json +++ b/src/generated/resources/data/xkdeco/recipe/mahogany_fence_gate.json @@ -14,7 +14,7 @@ "#W#" ], "result": { - "item": "xkdeco:mahogany_fence_gate" + "id": "xkdeco:mahogany_fence_gate" }, "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/mahogany_log_from_smoking.json b/src/generated/resources/data/xkdeco/recipe/mahogany_log_from_smoking.json similarity index 76% rename from src/generated/resources/data/xkdeco/recipes/mahogany_log_from_smoking.json rename to src/generated/resources/data/xkdeco/recipe/mahogany_log_from_smoking.json index ad88afe9..74d3be0f 100644 --- a/src/generated/resources/data/xkdeco/recipes/mahogany_log_from_smoking.json +++ b/src/generated/resources/data/xkdeco/recipe/mahogany_log_from_smoking.json @@ -6,5 +6,7 @@ "ingredient": { "item": "minecraft:mangrove_log" }, - "result": "xkdeco:mahogany_log" + "result": { + "id": "xkdeco:mahogany_log" + } } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/mahogany_planks.json b/src/generated/resources/data/xkdeco/recipe/mahogany_planks.json similarity index 84% rename from src/generated/resources/data/xkdeco/recipes/mahogany_planks.json rename to src/generated/resources/data/xkdeco/recipe/mahogany_planks.json index 5e446b66..6f6af403 100644 --- a/src/generated/resources/data/xkdeco/recipes/mahogany_planks.json +++ b/src/generated/resources/data/xkdeco/recipe/mahogany_planks.json @@ -9,6 +9,6 @@ ], "result": { "count": 4, - "item": "xkdeco:mahogany_planks" + "id": "xkdeco:mahogany_planks" } } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/mahogany_planks_from_smoking.json b/src/generated/resources/data/xkdeco/recipe/mahogany_planks_from_smoking.json similarity index 75% rename from src/generated/resources/data/xkdeco/recipes/mahogany_planks_from_smoking.json rename to src/generated/resources/data/xkdeco/recipe/mahogany_planks_from_smoking.json index 57e618fc..6c50169b 100644 --- a/src/generated/resources/data/xkdeco/recipes/mahogany_planks_from_smoking.json +++ b/src/generated/resources/data/xkdeco/recipe/mahogany_planks_from_smoking.json @@ -6,5 +6,7 @@ "ingredient": { "item": "minecraft:mangrove_planks" }, - "result": "xkdeco:mahogany_planks" + "result": { + "id": "xkdeco:mahogany_planks" + } } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/mahogany_slab.json b/src/generated/resources/data/xkdeco/recipe/mahogany_slab.json similarity index 86% rename from src/generated/resources/data/xkdeco/recipes/mahogany_slab.json rename to src/generated/resources/data/xkdeco/recipe/mahogany_slab.json index 1a908a86..488683f4 100644 --- a/src/generated/resources/data/xkdeco/recipes/mahogany_slab.json +++ b/src/generated/resources/data/xkdeco/recipe/mahogany_slab.json @@ -11,7 +11,7 @@ ], "result": { "count": 6, - "item": "xkdeco:mahogany_slab" + "id": "xkdeco:mahogany_slab" }, "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/mahogany_stairs.json b/src/generated/resources/data/xkdeco/recipe/mahogany_stairs.json similarity index 87% rename from src/generated/resources/data/xkdeco/recipes/mahogany_stairs.json rename to src/generated/resources/data/xkdeco/recipe/mahogany_stairs.json index fbdccc9a..224833ff 100644 --- a/src/generated/resources/data/xkdeco/recipes/mahogany_stairs.json +++ b/src/generated/resources/data/xkdeco/recipe/mahogany_stairs.json @@ -13,7 +13,7 @@ ], "result": { "count": 4, - "item": "xkdeco:mahogany_stairs" + "id": "xkdeco:mahogany_stairs" }, "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/mahogany_trapdoor.json b/src/generated/resources/data/xkdeco/recipe/mahogany_trapdoor.json similarity index 86% rename from src/generated/resources/data/xkdeco/recipes/mahogany_trapdoor.json rename to src/generated/resources/data/xkdeco/recipe/mahogany_trapdoor.json index 075e41ee..d4cd7ac3 100644 --- a/src/generated/resources/data/xkdeco/recipes/mahogany_trapdoor.json +++ b/src/generated/resources/data/xkdeco/recipe/mahogany_trapdoor.json @@ -12,7 +12,7 @@ ], "result": { "count": 2, - "item": "xkdeco:mahogany_trapdoor" + "id": "xkdeco:mahogany_trapdoor" }, "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/mahogany_wood.json b/src/generated/resources/data/xkdeco/recipe/mahogany_wood.json similarity index 88% rename from src/generated/resources/data/xkdeco/recipes/mahogany_wood.json rename to src/generated/resources/data/xkdeco/recipe/mahogany_wood.json index 6e755f6e..fd83283e 100644 --- a/src/generated/resources/data/xkdeco/recipes/mahogany_wood.json +++ b/src/generated/resources/data/xkdeco/recipe/mahogany_wood.json @@ -13,7 +13,7 @@ ], "result": { "count": 3, - "item": "xkdeco:mahogany_wood" + "id": "xkdeco:mahogany_wood" }, "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/mahogany_wood_from_smoking.json b/src/generated/resources/data/xkdeco/recipe/mahogany_wood_from_smoking.json similarity index 75% rename from src/generated/resources/data/xkdeco/recipes/mahogany_wood_from_smoking.json rename to src/generated/resources/data/xkdeco/recipe/mahogany_wood_from_smoking.json index fffc15c5..b34ff46d 100644 --- a/src/generated/resources/data/xkdeco/recipes/mahogany_wood_from_smoking.json +++ b/src/generated/resources/data/xkdeco/recipe/mahogany_wood_from_smoking.json @@ -6,5 +6,7 @@ "ingredient": { "item": "minecraft:mangrove_wood" }, - "result": "xkdeco:mahogany_wood" + "result": { + "id": "xkdeco:mahogany_wood" + } } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/maya_brick_slab.json b/src/generated/resources/data/xkdeco/recipe/maya_brick_slab.json similarity index 86% rename from src/generated/resources/data/xkdeco/recipes/maya_brick_slab.json rename to src/generated/resources/data/xkdeco/recipe/maya_brick_slab.json index 9655e53d..86eea90f 100644 --- a/src/generated/resources/data/xkdeco/recipes/maya_brick_slab.json +++ b/src/generated/resources/data/xkdeco/recipe/maya_brick_slab.json @@ -11,7 +11,7 @@ ], "result": { "count": 6, - "item": "xkdeco:maya_brick_slab" + "id": "xkdeco:maya_brick_slab" }, "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/maya_brick_stairs.json b/src/generated/resources/data/xkdeco/recipe/maya_brick_stairs.json similarity index 86% rename from src/generated/resources/data/xkdeco/recipes/maya_brick_stairs.json rename to src/generated/resources/data/xkdeco/recipe/maya_brick_stairs.json index 4e3d2313..59226feb 100644 --- a/src/generated/resources/data/xkdeco/recipes/maya_brick_stairs.json +++ b/src/generated/resources/data/xkdeco/recipe/maya_brick_stairs.json @@ -13,7 +13,7 @@ ], "result": { "count": 4, - "item": "xkdeco:maya_brick_stairs" + "id": "xkdeco:maya_brick_stairs" }, "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/maya_brick_wall.json b/src/generated/resources/data/xkdeco/recipe/maya_brick_wall.json similarity index 86% rename from src/generated/resources/data/xkdeco/recipes/maya_brick_wall.json rename to src/generated/resources/data/xkdeco/recipe/maya_brick_wall.json index 34f1fc24..86eed210 100644 --- a/src/generated/resources/data/xkdeco/recipes/maya_brick_wall.json +++ b/src/generated/resources/data/xkdeco/recipe/maya_brick_wall.json @@ -12,7 +12,7 @@ ], "result": { "count": 6, - "item": "xkdeco:maya_brick_wall" + "id": "xkdeco:maya_brick_wall" }, "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/maya_chiseled_stonebricks.json b/src/generated/resources/data/xkdeco/recipe/maya_chiseled_stonebricks.json similarity index 82% rename from src/generated/resources/data/xkdeco/recipes/maya_chiseled_stonebricks.json rename to src/generated/resources/data/xkdeco/recipe/maya_chiseled_stonebricks.json index d3a0a886..79431245 100644 --- a/src/generated/resources/data/xkdeco/recipes/maya_chiseled_stonebricks.json +++ b/src/generated/resources/data/xkdeco/recipe/maya_chiseled_stonebricks.json @@ -11,7 +11,7 @@ "#" ], "result": { - "item": "xkdeco:maya_chiseled_stonebricks" + "id": "xkdeco:maya_chiseled_stonebricks" }, "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/maya_cut_stonebricks.json b/src/generated/resources/data/xkdeco/recipe/maya_cut_stonebricks.json similarity index 85% rename from src/generated/resources/data/xkdeco/recipes/maya_cut_stonebricks.json rename to src/generated/resources/data/xkdeco/recipe/maya_cut_stonebricks.json index b75f5e77..9097084f 100644 --- a/src/generated/resources/data/xkdeco/recipes/maya_cut_stonebricks.json +++ b/src/generated/resources/data/xkdeco/recipe/maya_cut_stonebricks.json @@ -12,7 +12,7 @@ ], "result": { "count": 4, - "item": "xkdeco:maya_cut_stonebricks" + "id": "xkdeco:maya_cut_stonebricks" }, "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/maya_mossy_brick_slab.json b/src/generated/resources/data/xkdeco/recipe/maya_mossy_brick_slab.json similarity index 84% rename from src/generated/resources/data/xkdeco/recipes/maya_mossy_brick_slab.json rename to src/generated/resources/data/xkdeco/recipe/maya_mossy_brick_slab.json index 599041d6..66748a1c 100644 --- a/src/generated/resources/data/xkdeco/recipes/maya_mossy_brick_slab.json +++ b/src/generated/resources/data/xkdeco/recipe/maya_mossy_brick_slab.json @@ -11,7 +11,7 @@ ], "result": { "count": 6, - "item": "xkdeco:maya_mossy_brick_slab" + "id": "xkdeco:maya_mossy_brick_slab" }, "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/maya_mossy_brick_stairs.json b/src/generated/resources/data/xkdeco/recipe/maya_mossy_brick_stairs.json similarity index 85% rename from src/generated/resources/data/xkdeco/recipes/maya_mossy_brick_stairs.json rename to src/generated/resources/data/xkdeco/recipe/maya_mossy_brick_stairs.json index 9607d473..ee12c937 100644 --- a/src/generated/resources/data/xkdeco/recipes/maya_mossy_brick_stairs.json +++ b/src/generated/resources/data/xkdeco/recipe/maya_mossy_brick_stairs.json @@ -13,7 +13,7 @@ ], "result": { "count": 4, - "item": "xkdeco:maya_mossy_brick_stairs" + "id": "xkdeco:maya_mossy_brick_stairs" }, "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/maya_mossy_brick_wall.json b/src/generated/resources/data/xkdeco/recipe/maya_mossy_brick_wall.json similarity index 84% rename from src/generated/resources/data/xkdeco/recipes/maya_mossy_brick_wall.json rename to src/generated/resources/data/xkdeco/recipe/maya_mossy_brick_wall.json index 64c3266c..12460f7d 100644 --- a/src/generated/resources/data/xkdeco/recipes/maya_mossy_brick_wall.json +++ b/src/generated/resources/data/xkdeco/recipe/maya_mossy_brick_wall.json @@ -12,7 +12,7 @@ ], "result": { "count": 6, - "item": "xkdeco:maya_mossy_brick_wall" + "id": "xkdeco:maya_mossy_brick_wall" }, "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/maya_mossy_stonebrick_slab.json b/src/generated/resources/data/xkdeco/recipe/maya_mossy_stonebrick_slab.json similarity index 83% rename from src/generated/resources/data/xkdeco/recipes/maya_mossy_stonebrick_slab.json rename to src/generated/resources/data/xkdeco/recipe/maya_mossy_stonebrick_slab.json index 2ae41e8d..3eed9b69 100644 --- a/src/generated/resources/data/xkdeco/recipes/maya_mossy_stonebrick_slab.json +++ b/src/generated/resources/data/xkdeco/recipe/maya_mossy_stonebrick_slab.json @@ -11,7 +11,7 @@ ], "result": { "count": 6, - "item": "xkdeco:maya_mossy_stonebrick_slab" + "id": "xkdeco:maya_mossy_stonebrick_slab" }, "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/maya_mossy_stonebrick_stairs.json b/src/generated/resources/data/xkdeco/recipe/maya_mossy_stonebrick_stairs.json similarity index 83% rename from src/generated/resources/data/xkdeco/recipes/maya_mossy_stonebrick_stairs.json rename to src/generated/resources/data/xkdeco/recipe/maya_mossy_stonebrick_stairs.json index b910e68f..870d777f 100644 --- a/src/generated/resources/data/xkdeco/recipes/maya_mossy_stonebrick_stairs.json +++ b/src/generated/resources/data/xkdeco/recipe/maya_mossy_stonebrick_stairs.json @@ -13,7 +13,7 @@ ], "result": { "count": 4, - "item": "xkdeco:maya_mossy_stonebrick_stairs" + "id": "xkdeco:maya_mossy_stonebrick_stairs" }, "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/maya_mossy_stonebrick_wall.json b/src/generated/resources/data/xkdeco/recipe/maya_mossy_stonebrick_wall.json similarity index 83% rename from src/generated/resources/data/xkdeco/recipes/maya_mossy_stonebrick_wall.json rename to src/generated/resources/data/xkdeco/recipe/maya_mossy_stonebrick_wall.json index bb12009c..b749e9db 100644 --- a/src/generated/resources/data/xkdeco/recipes/maya_mossy_stonebrick_wall.json +++ b/src/generated/resources/data/xkdeco/recipe/maya_mossy_stonebrick_wall.json @@ -12,7 +12,7 @@ ], "result": { "count": 6, - "item": "xkdeco:maya_mossy_stonebrick_wall" + "id": "xkdeco:maya_mossy_stonebrick_wall" }, "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/maya_polished_stonebrick_slab.json b/src/generated/resources/data/xkdeco/recipe/maya_polished_stonebrick_slab.json similarity index 82% rename from src/generated/resources/data/xkdeco/recipes/maya_polished_stonebrick_slab.json rename to src/generated/resources/data/xkdeco/recipe/maya_polished_stonebrick_slab.json index 87db5362..83fa1b61 100644 --- a/src/generated/resources/data/xkdeco/recipes/maya_polished_stonebrick_slab.json +++ b/src/generated/resources/data/xkdeco/recipe/maya_polished_stonebrick_slab.json @@ -11,7 +11,7 @@ ], "result": { "count": 6, - "item": "xkdeco:maya_polished_stonebrick_slab" + "id": "xkdeco:maya_polished_stonebrick_slab" }, "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/maya_polished_stonebrick_stairs.json b/src/generated/resources/data/xkdeco/recipe/maya_polished_stonebrick_stairs.json similarity index 83% rename from src/generated/resources/data/xkdeco/recipes/maya_polished_stonebrick_stairs.json rename to src/generated/resources/data/xkdeco/recipe/maya_polished_stonebrick_stairs.json index 0cd507a1..5b637e4b 100644 --- a/src/generated/resources/data/xkdeco/recipes/maya_polished_stonebrick_stairs.json +++ b/src/generated/resources/data/xkdeco/recipe/maya_polished_stonebrick_stairs.json @@ -13,7 +13,7 @@ ], "result": { "count": 4, - "item": "xkdeco:maya_polished_stonebrick_stairs" + "id": "xkdeco:maya_polished_stonebrick_stairs" }, "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/maya_polished_stonebricks.json b/src/generated/resources/data/xkdeco/recipe/maya_polished_stonebricks.json similarity index 83% rename from src/generated/resources/data/xkdeco/recipes/maya_polished_stonebricks.json rename to src/generated/resources/data/xkdeco/recipe/maya_polished_stonebricks.json index 5b6cdb73..583eb50f 100644 --- a/src/generated/resources/data/xkdeco/recipes/maya_polished_stonebricks.json +++ b/src/generated/resources/data/xkdeco/recipe/maya_polished_stonebricks.json @@ -12,7 +12,7 @@ ], "result": { "count": 4, - "item": "xkdeco:maya_polished_stonebricks" + "id": "xkdeco:maya_polished_stonebricks" }, "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/maya_stone.json b/src/generated/resources/data/xkdeco/recipe/maya_stone.json similarity index 90% rename from src/generated/resources/data/xkdeco/recipes/maya_stone.json rename to src/generated/resources/data/xkdeco/recipe/maya_stone.json index 7958ebeb..0c77dce5 100644 --- a/src/generated/resources/data/xkdeco/recipes/maya_stone.json +++ b/src/generated/resources/data/xkdeco/recipe/maya_stone.json @@ -15,7 +15,7 @@ ], "result": { "count": 6, - "item": "xkdeco:maya_stone" + "id": "xkdeco:maya_stone" }, "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/maya_stone_slab.json b/src/generated/resources/data/xkdeco/recipe/maya_stone_slab.json similarity index 86% rename from src/generated/resources/data/xkdeco/recipes/maya_stone_slab.json rename to src/generated/resources/data/xkdeco/recipe/maya_stone_slab.json index 66f2013e..c33f2780 100644 --- a/src/generated/resources/data/xkdeco/recipes/maya_stone_slab.json +++ b/src/generated/resources/data/xkdeco/recipe/maya_stone_slab.json @@ -11,7 +11,7 @@ ], "result": { "count": 6, - "item": "xkdeco:maya_stone_slab" + "id": "xkdeco:maya_stone_slab" }, "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/maya_stone_stairs.json b/src/generated/resources/data/xkdeco/recipe/maya_stone_stairs.json similarity index 86% rename from src/generated/resources/data/xkdeco/recipes/maya_stone_stairs.json rename to src/generated/resources/data/xkdeco/recipe/maya_stone_stairs.json index d84d7caf..fc967c93 100644 --- a/src/generated/resources/data/xkdeco/recipes/maya_stone_stairs.json +++ b/src/generated/resources/data/xkdeco/recipe/maya_stone_stairs.json @@ -13,7 +13,7 @@ ], "result": { "count": 4, - "item": "xkdeco:maya_stone_stairs" + "id": "xkdeco:maya_stone_stairs" }, "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/maya_stonebrick_slab.json b/src/generated/resources/data/xkdeco/recipe/maya_stonebrick_slab.json similarity index 84% rename from src/generated/resources/data/xkdeco/recipes/maya_stonebrick_slab.json rename to src/generated/resources/data/xkdeco/recipe/maya_stonebrick_slab.json index 6fc08613..34252960 100644 --- a/src/generated/resources/data/xkdeco/recipes/maya_stonebrick_slab.json +++ b/src/generated/resources/data/xkdeco/recipe/maya_stonebrick_slab.json @@ -11,7 +11,7 @@ ], "result": { "count": 6, - "item": "xkdeco:maya_stonebrick_slab" + "id": "xkdeco:maya_stonebrick_slab" }, "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/maya_stonebrick_stairs.json b/src/generated/resources/data/xkdeco/recipe/maya_stonebrick_stairs.json similarity index 85% rename from src/generated/resources/data/xkdeco/recipes/maya_stonebrick_stairs.json rename to src/generated/resources/data/xkdeco/recipe/maya_stonebrick_stairs.json index 530e5fa3..1e26caf6 100644 --- a/src/generated/resources/data/xkdeco/recipes/maya_stonebrick_stairs.json +++ b/src/generated/resources/data/xkdeco/recipe/maya_stonebrick_stairs.json @@ -13,7 +13,7 @@ ], "result": { "count": 4, - "item": "xkdeco:maya_stonebrick_stairs" + "id": "xkdeco:maya_stonebrick_stairs" }, "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/maya_stonebrick_wall.json b/src/generated/resources/data/xkdeco/recipe/maya_stonebrick_wall.json similarity index 85% rename from src/generated/resources/data/xkdeco/recipes/maya_stonebrick_wall.json rename to src/generated/resources/data/xkdeco/recipe/maya_stonebrick_wall.json index f74a43f9..56c70827 100644 --- a/src/generated/resources/data/xkdeco/recipes/maya_stonebrick_wall.json +++ b/src/generated/resources/data/xkdeco/recipe/maya_stonebrick_wall.json @@ -12,7 +12,7 @@ ], "result": { "count": 6, - "item": "xkdeco:maya_stonebrick_wall" + "id": "xkdeco:maya_stonebrick_wall" }, "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/mossy_deepslate_brick_slab.json b/src/generated/resources/data/xkdeco/recipe/mossy_deepslate_brick_slab.json similarity index 83% rename from src/generated/resources/data/xkdeco/recipes/mossy_deepslate_brick_slab.json rename to src/generated/resources/data/xkdeco/recipe/mossy_deepslate_brick_slab.json index e1ee20ad..8b4950ae 100644 --- a/src/generated/resources/data/xkdeco/recipes/mossy_deepslate_brick_slab.json +++ b/src/generated/resources/data/xkdeco/recipe/mossy_deepslate_brick_slab.json @@ -11,7 +11,7 @@ ], "result": { "count": 6, - "item": "xkdeco:mossy_deepslate_brick_slab" + "id": "xkdeco:mossy_deepslate_brick_slab" }, "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/mossy_deepslate_brick_stairs.json b/src/generated/resources/data/xkdeco/recipe/mossy_deepslate_brick_stairs.json similarity index 83% rename from src/generated/resources/data/xkdeco/recipes/mossy_deepslate_brick_stairs.json rename to src/generated/resources/data/xkdeco/recipe/mossy_deepslate_brick_stairs.json index 1cf88b1f..e48d6cba 100644 --- a/src/generated/resources/data/xkdeco/recipes/mossy_deepslate_brick_stairs.json +++ b/src/generated/resources/data/xkdeco/recipe/mossy_deepslate_brick_stairs.json @@ -13,7 +13,7 @@ ], "result": { "count": 4, - "item": "xkdeco:mossy_deepslate_brick_stairs" + "id": "xkdeco:mossy_deepslate_brick_stairs" }, "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/mossy_deepslate_bricks_from_moss_block.json b/src/generated/resources/data/xkdeco/recipe/mossy_deepslate_bricks_from_moss_block.json similarity index 83% rename from src/generated/resources/data/xkdeco/recipes/mossy_deepslate_bricks_from_moss_block.json rename to src/generated/resources/data/xkdeco/recipe/mossy_deepslate_bricks_from_moss_block.json index 8b05d6bb..919ec341 100644 --- a/src/generated/resources/data/xkdeco/recipes/mossy_deepslate_bricks_from_moss_block.json +++ b/src/generated/resources/data/xkdeco/recipe/mossy_deepslate_bricks_from_moss_block.json @@ -10,6 +10,6 @@ } ], "result": { - "item": "xkdeco:mossy_deepslate_bricks" + "id": "xkdeco:mossy_deepslate_bricks" } } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/mossy_deepslate_bricks_from_vine.json b/src/generated/resources/data/xkdeco/recipe/mossy_deepslate_bricks_from_vine.json similarity index 82% rename from src/generated/resources/data/xkdeco/recipes/mossy_deepslate_bricks_from_vine.json rename to src/generated/resources/data/xkdeco/recipe/mossy_deepslate_bricks_from_vine.json index 24fc9fef..d5bb3301 100644 --- a/src/generated/resources/data/xkdeco/recipes/mossy_deepslate_bricks_from_vine.json +++ b/src/generated/resources/data/xkdeco/recipe/mossy_deepslate_bricks_from_vine.json @@ -10,6 +10,6 @@ } ], "result": { - "item": "xkdeco:mossy_deepslate_bricks" + "id": "xkdeco:mossy_deepslate_bricks" } } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/mud_wall_block.json b/src/generated/resources/data/xkdeco/recipe/mud_wall_block.json similarity index 89% rename from src/generated/resources/data/xkdeco/recipes/mud_wall_block.json rename to src/generated/resources/data/xkdeco/recipe/mud_wall_block.json index bcf1cdee..96a20539 100644 --- a/src/generated/resources/data/xkdeco/recipes/mud_wall_block.json +++ b/src/generated/resources/data/xkdeco/recipe/mud_wall_block.json @@ -16,7 +16,7 @@ ], "result": { "count": 4, - "item": "xkdeco:mud_wall_block" + "id": "xkdeco:mud_wall_block" }, "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/mud_wall_slab.json b/src/generated/resources/data/xkdeco/recipe/mud_wall_slab.json similarity index 86% rename from src/generated/resources/data/xkdeco/recipes/mud_wall_slab.json rename to src/generated/resources/data/xkdeco/recipe/mud_wall_slab.json index 102f27fa..0eecfc32 100644 --- a/src/generated/resources/data/xkdeco/recipes/mud_wall_slab.json +++ b/src/generated/resources/data/xkdeco/recipe/mud_wall_slab.json @@ -11,7 +11,7 @@ ], "result": { "count": 6, - "item": "xkdeco:mud_wall_slab" + "id": "xkdeco:mud_wall_slab" }, "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/mud_wall_stairs.json b/src/generated/resources/data/xkdeco/recipe/mud_wall_stairs.json similarity index 87% rename from src/generated/resources/data/xkdeco/recipes/mud_wall_stairs.json rename to src/generated/resources/data/xkdeco/recipe/mud_wall_stairs.json index d311bb65..e7f98567 100644 --- a/src/generated/resources/data/xkdeco/recipes/mud_wall_stairs.json +++ b/src/generated/resources/data/xkdeco/recipe/mud_wall_stairs.json @@ -13,7 +13,7 @@ ], "result": { "count": 4, - "item": "xkdeco:mud_wall_stairs" + "id": "xkdeco:mud_wall_stairs" }, "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/mud_wall_wall.json b/src/generated/resources/data/xkdeco/recipe/mud_wall_wall.json similarity index 87% rename from src/generated/resources/data/xkdeco/recipes/mud_wall_wall.json rename to src/generated/resources/data/xkdeco/recipe/mud_wall_wall.json index b19e9a63..472bb972 100644 --- a/src/generated/resources/data/xkdeco/recipes/mud_wall_wall.json +++ b/src/generated/resources/data/xkdeco/recipe/mud_wall_wall.json @@ -12,7 +12,7 @@ ], "result": { "count": 6, - "item": "xkdeco:mud_wall_wall" + "id": "xkdeco:mud_wall_wall" }, "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/mycelium_slab_from_dirt_stonecutting.json b/src/generated/resources/data/xkdeco/recipe/mycelium_slab_from_dirt_stonecutting.json similarity index 67% rename from src/generated/resources/data/xkdeco/recipes/mycelium_slab_from_dirt_stonecutting.json rename to src/generated/resources/data/xkdeco/recipe/mycelium_slab_from_dirt_stonecutting.json index 87c9e3b4..5afa33be 100644 --- a/src/generated/resources/data/xkdeco/recipes/mycelium_slab_from_dirt_stonecutting.json +++ b/src/generated/resources/data/xkdeco/recipe/mycelium_slab_from_dirt_stonecutting.json @@ -4,5 +4,7 @@ "ingredient": { "item": "minecraft:dirt" }, - "result": "xkdeco:mycelium_slab" + "result": { + "id": "xkdeco:mycelium_slab" + } } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/netherrack_slab_from_netherrack_stonecutting.json b/src/generated/resources/data/xkdeco/recipe/netherrack_slab_from_netherrack_stonecutting.json similarity index 67% rename from src/generated/resources/data/xkdeco/recipes/netherrack_slab_from_netherrack_stonecutting.json rename to src/generated/resources/data/xkdeco/recipe/netherrack_slab_from_netherrack_stonecutting.json index 2bc53c70..65d5d5cf 100644 --- a/src/generated/resources/data/xkdeco/recipes/netherrack_slab_from_netherrack_stonecutting.json +++ b/src/generated/resources/data/xkdeco/recipe/netherrack_slab_from_netherrack_stonecutting.json @@ -4,5 +4,7 @@ "ingredient": { "item": "minecraft:netherrack" }, - "result": "xkdeco:netherrack_slab" + "result": { + "id": "xkdeco:netherrack_slab" + } } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/orange_maple_leaves.json b/src/generated/resources/data/xkdeco/recipe/orange_maple_leaves.json similarity index 88% rename from src/generated/resources/data/xkdeco/recipes/orange_maple_leaves.json rename to src/generated/resources/data/xkdeco/recipe/orange_maple_leaves.json index 4c19a326..62f92514 100644 --- a/src/generated/resources/data/xkdeco/recipes/orange_maple_leaves.json +++ b/src/generated/resources/data/xkdeco/recipe/orange_maple_leaves.json @@ -16,7 +16,7 @@ ], "result": { "count": 8, - "item": "xkdeco:orange_maple_leaves" + "id": "xkdeco:orange_maple_leaves" }, "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/peach_blossom.json b/src/generated/resources/data/xkdeco/recipe/peach_blossom.json similarity index 89% rename from src/generated/resources/data/xkdeco/recipes/peach_blossom.json rename to src/generated/resources/data/xkdeco/recipe/peach_blossom.json index f7961d9e..f09e124d 100644 --- a/src/generated/resources/data/xkdeco/recipes/peach_blossom.json +++ b/src/generated/resources/data/xkdeco/recipe/peach_blossom.json @@ -16,7 +16,7 @@ ], "result": { "count": 8, - "item": "xkdeco:peach_blossom" + "id": "xkdeco:peach_blossom" }, "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/peach_blossom_leaves.json b/src/generated/resources/data/xkdeco/recipe/peach_blossom_leaves.json similarity index 84% rename from src/generated/resources/data/xkdeco/recipes/peach_blossom_leaves.json rename to src/generated/resources/data/xkdeco/recipe/peach_blossom_leaves.json index 401ad705..68da3d70 100644 --- a/src/generated/resources/data/xkdeco/recipes/peach_blossom_leaves.json +++ b/src/generated/resources/data/xkdeco/recipe/peach_blossom_leaves.json @@ -11,6 +11,6 @@ ], "result": { "count": 2, - "item": "xkdeco:peach_blossom_leaves" + "id": "xkdeco:peach_blossom_leaves" } } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/plain_block_display.json b/src/generated/resources/data/xkdeco/recipe/plain_block_display.json similarity index 89% rename from src/generated/resources/data/xkdeco/recipes/plain_block_display.json rename to src/generated/resources/data/xkdeco/recipe/plain_block_display.json index 53456475..94c6ba33 100644 --- a/src/generated/resources/data/xkdeco/recipes/plain_block_display.json +++ b/src/generated/resources/data/xkdeco/recipe/plain_block_display.json @@ -18,7 +18,7 @@ "B B" ], "result": { - "item": "xkdeco:plain_block_display" + "id": "xkdeco:plain_block_display" }, "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/plain_item_display.json b/src/generated/resources/data/xkdeco/recipe/plain_item_display.json similarity index 89% rename from src/generated/resources/data/xkdeco/recipes/plain_item_display.json rename to src/generated/resources/data/xkdeco/recipe/plain_item_display.json index e9388032..c0796887 100644 --- a/src/generated/resources/data/xkdeco/recipes/plain_item_display.json +++ b/src/generated/resources/data/xkdeco/recipe/plain_item_display.json @@ -18,7 +18,7 @@ " B " ], "result": { - "item": "xkdeco:plain_item_display" + "id": "xkdeco:plain_item_display" }, "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/plantable_leaves.json b/src/generated/resources/data/xkdeco/recipe/plantable_leaves.json similarity index 88% rename from src/generated/resources/data/xkdeco/recipes/plantable_leaves.json rename to src/generated/resources/data/xkdeco/recipe/plantable_leaves.json index 49e0a886..485be610 100644 --- a/src/generated/resources/data/xkdeco/recipes/plantable_leaves.json +++ b/src/generated/resources/data/xkdeco/recipe/plantable_leaves.json @@ -16,7 +16,7 @@ ], "result": { "count": 8, - "item": "xkdeco:plantable_leaves" + "id": "xkdeco:plantable_leaves" }, "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/plantable_leaves_dark.json b/src/generated/resources/data/xkdeco/recipe/plantable_leaves_dark.json similarity index 87% rename from src/generated/resources/data/xkdeco/recipes/plantable_leaves_dark.json rename to src/generated/resources/data/xkdeco/recipe/plantable_leaves_dark.json index ff78c0b7..b2aec7ed 100644 --- a/src/generated/resources/data/xkdeco/recipes/plantable_leaves_dark.json +++ b/src/generated/resources/data/xkdeco/recipe/plantable_leaves_dark.json @@ -16,7 +16,7 @@ ], "result": { "count": 8, - "item": "xkdeco:plantable_leaves_dark" + "id": "xkdeco:plantable_leaves_dark" }, "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/podzol_slab_from_dirt_stonecutting.json b/src/generated/resources/data/xkdeco/recipe/podzol_slab_from_dirt_stonecutting.json similarity index 68% rename from src/generated/resources/data/xkdeco/recipes/podzol_slab_from_dirt_stonecutting.json rename to src/generated/resources/data/xkdeco/recipe/podzol_slab_from_dirt_stonecutting.json index a7ca3e6b..85aae369 100644 --- a/src/generated/resources/data/xkdeco/recipes/podzol_slab_from_dirt_stonecutting.json +++ b/src/generated/resources/data/xkdeco/recipe/podzol_slab_from_dirt_stonecutting.json @@ -4,5 +4,7 @@ "ingredient": { "item": "minecraft:dirt" }, - "result": "xkdeco:podzol_slab" + "result": { + "id": "xkdeco:podzol_slab" + } } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/polished_red_sandstone_slab.json b/src/generated/resources/data/xkdeco/recipe/polished_red_sandstone_slab.json similarity index 83% rename from src/generated/resources/data/xkdeco/recipes/polished_red_sandstone_slab.json rename to src/generated/resources/data/xkdeco/recipe/polished_red_sandstone_slab.json index b331e6d4..e5720ce2 100644 --- a/src/generated/resources/data/xkdeco/recipes/polished_red_sandstone_slab.json +++ b/src/generated/resources/data/xkdeco/recipe/polished_red_sandstone_slab.json @@ -11,7 +11,7 @@ ], "result": { "count": 6, - "item": "xkdeco:polished_red_sandstone_slab" + "id": "xkdeco:polished_red_sandstone_slab" }, "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/polished_sandstone_slab.json b/src/generated/resources/data/xkdeco/recipe/polished_sandstone_slab.json similarity index 83% rename from src/generated/resources/data/xkdeco/recipes/polished_sandstone_slab.json rename to src/generated/resources/data/xkdeco/recipe/polished_sandstone_slab.json index d77ced4b..d9bc08d9 100644 --- a/src/generated/resources/data/xkdeco/recipes/polished_sandstone_slab.json +++ b/src/generated/resources/data/xkdeco/recipe/polished_sandstone_slab.json @@ -11,7 +11,7 @@ ], "result": { "count": 6, - "item": "xkdeco:polished_sandstone_slab" + "id": "xkdeco:polished_sandstone_slab" }, "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/quartz_glass.json b/src/generated/resources/data/xkdeco/recipe/quartz_glass.json similarity index 75% rename from src/generated/resources/data/xkdeco/recipes/quartz_glass.json rename to src/generated/resources/data/xkdeco/recipe/quartz_glass.json index ca49420d..17c634d6 100644 --- a/src/generated/resources/data/xkdeco/recipes/quartz_glass.json +++ b/src/generated/resources/data/xkdeco/recipe/quartz_glass.json @@ -6,5 +6,7 @@ "ingredient": { "item": "xkdeco:quartz_sand" }, - "result": "xkdeco:quartz_glass" + "result": { + "id": "xkdeco:quartz_glass" + } } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/quartz_glass_slab.json b/src/generated/resources/data/xkdeco/recipe/quartz_glass_slab.json similarity index 85% rename from src/generated/resources/data/xkdeco/recipes/quartz_glass_slab.json rename to src/generated/resources/data/xkdeco/recipe/quartz_glass_slab.json index 6f962ab2..3470bbf2 100644 --- a/src/generated/resources/data/xkdeco/recipes/quartz_glass_slab.json +++ b/src/generated/resources/data/xkdeco/recipe/quartz_glass_slab.json @@ -11,7 +11,7 @@ ], "result": { "count": 6, - "item": "xkdeco:quartz_glass_slab" + "id": "xkdeco:quartz_glass_slab" }, "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/quartz_glass_stairs.json b/src/generated/resources/data/xkdeco/recipe/quartz_glass_stairs.json similarity index 86% rename from src/generated/resources/data/xkdeco/recipes/quartz_glass_stairs.json rename to src/generated/resources/data/xkdeco/recipe/quartz_glass_stairs.json index a595c4fc..5078f600 100644 --- a/src/generated/resources/data/xkdeco/recipes/quartz_glass_stairs.json +++ b/src/generated/resources/data/xkdeco/recipe/quartz_glass_stairs.json @@ -13,7 +13,7 @@ ], "result": { "count": 4, - "item": "xkdeco:quartz_glass_stairs" + "id": "xkdeco:quartz_glass_stairs" }, "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/quartz_sand_from_quartz_block_stonecutting.json b/src/generated/resources/data/xkdeco/recipe/quartz_sand_from_quartz_block_stonecutting.json similarity index 69% rename from src/generated/resources/data/xkdeco/recipes/quartz_sand_from_quartz_block_stonecutting.json rename to src/generated/resources/data/xkdeco/recipe/quartz_sand_from_quartz_block_stonecutting.json index a91dc1a1..29213ae8 100644 --- a/src/generated/resources/data/xkdeco/recipes/quartz_sand_from_quartz_block_stonecutting.json +++ b/src/generated/resources/data/xkdeco/recipe/quartz_sand_from_quartz_block_stonecutting.json @@ -4,5 +4,7 @@ "ingredient": { "item": "minecraft:quartz_block" }, - "result": "xkdeco:quartz_sand" + "result": { + "id": "xkdeco:quartz_sand" + } } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/quartz_wall_from_quartz_block_stonecutting.json b/src/generated/resources/data/xkdeco/recipe/quartz_wall_from_quartz_block_stonecutting.json similarity index 69% rename from src/generated/resources/data/xkdeco/recipes/quartz_wall_from_quartz_block_stonecutting.json rename to src/generated/resources/data/xkdeco/recipe/quartz_wall_from_quartz_block_stonecutting.json index 458846ec..3fb0b06d 100644 --- a/src/generated/resources/data/xkdeco/recipes/quartz_wall_from_quartz_block_stonecutting.json +++ b/src/generated/resources/data/xkdeco/recipe/quartz_wall_from_quartz_block_stonecutting.json @@ -4,5 +4,7 @@ "ingredient": { "item": "minecraft:quartz_block" }, - "result": "xkdeco:quartz_wall" + "result": { + "id": "xkdeco:quartz_wall" + } } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/quartz_wall_from_quartz_pillar_stonecutting.json b/src/generated/resources/data/xkdeco/recipe/quartz_wall_from_quartz_pillar_stonecutting.json similarity index 69% rename from src/generated/resources/data/xkdeco/recipes/quartz_wall_from_quartz_pillar_stonecutting.json rename to src/generated/resources/data/xkdeco/recipe/quartz_wall_from_quartz_pillar_stonecutting.json index c3320f6a..46f49696 100644 --- a/src/generated/resources/data/xkdeco/recipes/quartz_wall_from_quartz_pillar_stonecutting.json +++ b/src/generated/resources/data/xkdeco/recipe/quartz_wall_from_quartz_pillar_stonecutting.json @@ -4,5 +4,7 @@ "ingredient": { "item": "minecraft:quartz_pillar" }, - "result": "xkdeco:quartz_wall" + "result": { + "id": "xkdeco:quartz_wall" + } } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/red_maple_leaves.json b/src/generated/resources/data/xkdeco/recipe/red_maple_leaves.json similarity index 88% rename from src/generated/resources/data/xkdeco/recipes/red_maple_leaves.json rename to src/generated/resources/data/xkdeco/recipe/red_maple_leaves.json index 980186aa..40a3af41 100644 --- a/src/generated/resources/data/xkdeco/recipes/red_maple_leaves.json +++ b/src/generated/resources/data/xkdeco/recipe/red_maple_leaves.json @@ -16,7 +16,7 @@ ], "result": { "count": 8, - "item": "xkdeco:red_maple_leaves" + "id": "xkdeco:red_maple_leaves" }, "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/red_sandstone_brick_slab.json b/src/generated/resources/data/xkdeco/recipe/red_sandstone_brick_slab.json similarity index 83% rename from src/generated/resources/data/xkdeco/recipes/red_sandstone_brick_slab.json rename to src/generated/resources/data/xkdeco/recipe/red_sandstone_brick_slab.json index 6339480b..4c918ebd 100644 --- a/src/generated/resources/data/xkdeco/recipes/red_sandstone_brick_slab.json +++ b/src/generated/resources/data/xkdeco/recipe/red_sandstone_brick_slab.json @@ -11,7 +11,7 @@ ], "result": { "count": 6, - "item": "xkdeco:red_sandstone_brick_slab" + "id": "xkdeco:red_sandstone_brick_slab" }, "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/red_sandstone_brick_stairs.json b/src/generated/resources/data/xkdeco/recipe/red_sandstone_brick_stairs.json similarity index 84% rename from src/generated/resources/data/xkdeco/recipes/red_sandstone_brick_stairs.json rename to src/generated/resources/data/xkdeco/recipe/red_sandstone_brick_stairs.json index e49510d1..254bd3f5 100644 --- a/src/generated/resources/data/xkdeco/recipes/red_sandstone_brick_stairs.json +++ b/src/generated/resources/data/xkdeco/recipe/red_sandstone_brick_stairs.json @@ -13,7 +13,7 @@ ], "result": { "count": 4, - "item": "xkdeco:red_sandstone_brick_stairs" + "id": "xkdeco:red_sandstone_brick_stairs" }, "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/red_sandstone_small_brick_slab.json b/src/generated/resources/data/xkdeco/recipe/red_sandstone_small_brick_slab.json similarity index 82% rename from src/generated/resources/data/xkdeco/recipes/red_sandstone_small_brick_slab.json rename to src/generated/resources/data/xkdeco/recipe/red_sandstone_small_brick_slab.json index 57a7cadb..953bfa20 100644 --- a/src/generated/resources/data/xkdeco/recipes/red_sandstone_small_brick_slab.json +++ b/src/generated/resources/data/xkdeco/recipe/red_sandstone_small_brick_slab.json @@ -11,7 +11,7 @@ ], "result": { "count": 6, - "item": "xkdeco:red_sandstone_small_brick_slab" + "id": "xkdeco:red_sandstone_small_brick_slab" }, "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/red_sandstone_small_brick_stairs.json b/src/generated/resources/data/xkdeco/recipe/red_sandstone_small_brick_stairs.json similarity index 83% rename from src/generated/resources/data/xkdeco/recipes/red_sandstone_small_brick_stairs.json rename to src/generated/resources/data/xkdeco/recipe/red_sandstone_small_brick_stairs.json index 13d73175..2bb0c4c8 100644 --- a/src/generated/resources/data/xkdeco/recipes/red_sandstone_small_brick_stairs.json +++ b/src/generated/resources/data/xkdeco/recipe/red_sandstone_small_brick_stairs.json @@ -13,7 +13,7 @@ ], "result": { "count": 4, - "item": "xkdeco:red_sandstone_small_brick_stairs" + "id": "xkdeco:red_sandstone_small_brick_stairs" }, "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/red_tile_slab.json b/src/generated/resources/data/xkdeco/recipe/red_tile_slab.json similarity index 86% rename from src/generated/resources/data/xkdeco/recipes/red_tile_slab.json rename to src/generated/resources/data/xkdeco/recipe/red_tile_slab.json index cc6d33da..4d94c9cb 100644 --- a/src/generated/resources/data/xkdeco/recipes/red_tile_slab.json +++ b/src/generated/resources/data/xkdeco/recipe/red_tile_slab.json @@ -11,7 +11,7 @@ ], "result": { "count": 6, - "item": "xkdeco:red_tile_slab" + "id": "xkdeco:red_tile_slab" }, "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/red_tile_stairs.json b/src/generated/resources/data/xkdeco/recipe/red_tile_stairs.json similarity index 87% rename from src/generated/resources/data/xkdeco/recipes/red_tile_stairs.json rename to src/generated/resources/data/xkdeco/recipe/red_tile_stairs.json index 45e9f38c..432aec8f 100644 --- a/src/generated/resources/data/xkdeco/recipes/red_tile_stairs.json +++ b/src/generated/resources/data/xkdeco/recipe/red_tile_stairs.json @@ -13,7 +13,7 @@ ], "result": { "count": 4, - "item": "xkdeco:red_tile_stairs" + "id": "xkdeco:red_tile_stairs" }, "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/red_tiles.json b/src/generated/resources/data/xkdeco/recipe/red_tiles.json similarity index 90% rename from src/generated/resources/data/xkdeco/recipes/red_tiles.json rename to src/generated/resources/data/xkdeco/recipe/red_tiles.json index 94033088..3ef0c5f7 100644 --- a/src/generated/resources/data/xkdeco/recipes/red_tiles.json +++ b/src/generated/resources/data/xkdeco/recipe/red_tiles.json @@ -15,7 +15,7 @@ ], "result": { "count": 8, - "item": "xkdeco:red_tiles" + "id": "xkdeco:red_tiles" }, "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/sandstone_brick_slab.json b/src/generated/resources/data/xkdeco/recipe/sandstone_brick_slab.json similarity index 84% rename from src/generated/resources/data/xkdeco/recipes/sandstone_brick_slab.json rename to src/generated/resources/data/xkdeco/recipe/sandstone_brick_slab.json index eaac93cd..c12da4d8 100644 --- a/src/generated/resources/data/xkdeco/recipes/sandstone_brick_slab.json +++ b/src/generated/resources/data/xkdeco/recipe/sandstone_brick_slab.json @@ -11,7 +11,7 @@ ], "result": { "count": 6, - "item": "xkdeco:sandstone_brick_slab" + "id": "xkdeco:sandstone_brick_slab" }, "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/sandstone_brick_stairs.json b/src/generated/resources/data/xkdeco/recipe/sandstone_brick_stairs.json similarity index 85% rename from src/generated/resources/data/xkdeco/recipes/sandstone_brick_stairs.json rename to src/generated/resources/data/xkdeco/recipe/sandstone_brick_stairs.json index 61b556de..46f3f125 100644 --- a/src/generated/resources/data/xkdeco/recipes/sandstone_brick_stairs.json +++ b/src/generated/resources/data/xkdeco/recipe/sandstone_brick_stairs.json @@ -13,7 +13,7 @@ ], "result": { "count": 4, - "item": "xkdeco:sandstone_brick_stairs" + "id": "xkdeco:sandstone_brick_stairs" }, "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/sandstone_small_brick_slab.json b/src/generated/resources/data/xkdeco/recipe/sandstone_small_brick_slab.json similarity index 83% rename from src/generated/resources/data/xkdeco/recipes/sandstone_small_brick_slab.json rename to src/generated/resources/data/xkdeco/recipe/sandstone_small_brick_slab.json index a739021c..059029ba 100644 --- a/src/generated/resources/data/xkdeco/recipes/sandstone_small_brick_slab.json +++ b/src/generated/resources/data/xkdeco/recipe/sandstone_small_brick_slab.json @@ -11,7 +11,7 @@ ], "result": { "count": 6, - "item": "xkdeco:sandstone_small_brick_slab" + "id": "xkdeco:sandstone_small_brick_slab" }, "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/sandstone_small_brick_stairs.json b/src/generated/resources/data/xkdeco/recipe/sandstone_small_brick_stairs.json similarity index 83% rename from src/generated/resources/data/xkdeco/recipes/sandstone_small_brick_stairs.json rename to src/generated/resources/data/xkdeco/recipe/sandstone_small_brick_stairs.json index b50f630d..e96213c8 100644 --- a/src/generated/resources/data/xkdeco/recipes/sandstone_small_brick_stairs.json +++ b/src/generated/resources/data/xkdeco/recipe/sandstone_small_brick_stairs.json @@ -13,7 +13,7 @@ ], "result": { "count": 4, - "item": "xkdeco:sandstone_small_brick_stairs" + "id": "xkdeco:sandstone_small_brick_stairs" }, "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/sandy_cobblestone.json b/src/generated/resources/data/xkdeco/recipe/sandy_cobblestone.json similarity index 84% rename from src/generated/resources/data/xkdeco/recipes/sandy_cobblestone.json rename to src/generated/resources/data/xkdeco/recipe/sandy_cobblestone.json index 11c0c780..5dc6bbe8 100644 --- a/src/generated/resources/data/xkdeco/recipes/sandy_cobblestone.json +++ b/src/generated/resources/data/xkdeco/recipe/sandy_cobblestone.json @@ -10,6 +10,6 @@ } ], "result": { - "item": "xkdeco:sandy_cobblestone" + "id": "xkdeco:sandy_cobblestone" } } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/sandy_cobblestone_path_slab.json b/src/generated/resources/data/xkdeco/recipe/sandy_cobblestone_path_slab.json similarity index 83% rename from src/generated/resources/data/xkdeco/recipes/sandy_cobblestone_path_slab.json rename to src/generated/resources/data/xkdeco/recipe/sandy_cobblestone_path_slab.json index 5a9e5e4a..bac08a86 100644 --- a/src/generated/resources/data/xkdeco/recipes/sandy_cobblestone_path_slab.json +++ b/src/generated/resources/data/xkdeco/recipe/sandy_cobblestone_path_slab.json @@ -11,7 +11,7 @@ ], "result": { "count": 6, - "item": "xkdeco:sandy_cobblestone_path_slab" + "id": "xkdeco:sandy_cobblestone_path_slab" }, "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/sandy_cobblestone_path_stairs.json b/src/generated/resources/data/xkdeco/recipe/sandy_cobblestone_path_stairs.json similarity index 83% rename from src/generated/resources/data/xkdeco/recipes/sandy_cobblestone_path_stairs.json rename to src/generated/resources/data/xkdeco/recipe/sandy_cobblestone_path_stairs.json index 9c346e8a..450a1907 100644 --- a/src/generated/resources/data/xkdeco/recipes/sandy_cobblestone_path_stairs.json +++ b/src/generated/resources/data/xkdeco/recipe/sandy_cobblestone_path_stairs.json @@ -13,7 +13,7 @@ ], "result": { "count": 4, - "item": "xkdeco:sandy_cobblestone_path_stairs" + "id": "xkdeco:sandy_cobblestone_path_stairs" }, "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/sandy_cobblestone_slab.json b/src/generated/resources/data/xkdeco/recipe/sandy_cobblestone_slab.json similarity index 84% rename from src/generated/resources/data/xkdeco/recipes/sandy_cobblestone_slab.json rename to src/generated/resources/data/xkdeco/recipe/sandy_cobblestone_slab.json index 04ee92ce..d5c72463 100644 --- a/src/generated/resources/data/xkdeco/recipes/sandy_cobblestone_slab.json +++ b/src/generated/resources/data/xkdeco/recipe/sandy_cobblestone_slab.json @@ -11,7 +11,7 @@ ], "result": { "count": 6, - "item": "xkdeco:sandy_cobblestone_slab" + "id": "xkdeco:sandy_cobblestone_slab" }, "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/sandy_cobblestone_stairs.json b/src/generated/resources/data/xkdeco/recipe/sandy_cobblestone_stairs.json similarity index 84% rename from src/generated/resources/data/xkdeco/recipes/sandy_cobblestone_stairs.json rename to src/generated/resources/data/xkdeco/recipe/sandy_cobblestone_stairs.json index 41dcd2fb..e5b5ebcd 100644 --- a/src/generated/resources/data/xkdeco/recipes/sandy_cobblestone_stairs.json +++ b/src/generated/resources/data/xkdeco/recipe/sandy_cobblestone_stairs.json @@ -13,7 +13,7 @@ ], "result": { "count": 4, - "item": "xkdeco:sandy_cobblestone_stairs" + "id": "xkdeco:sandy_cobblestone_stairs" }, "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/smooth_bronze_block.json b/src/generated/resources/data/xkdeco/recipe/smooth_bronze_block.json similarity index 85% rename from src/generated/resources/data/xkdeco/recipes/smooth_bronze_block.json rename to src/generated/resources/data/xkdeco/recipe/smooth_bronze_block.json index 6eaa18ea..7a54a99c 100644 --- a/src/generated/resources/data/xkdeco/recipes/smooth_bronze_block.json +++ b/src/generated/resources/data/xkdeco/recipe/smooth_bronze_block.json @@ -12,7 +12,7 @@ ], "result": { "count": 4, - "item": "xkdeco:smooth_bronze_block" + "id": "xkdeco:smooth_bronze_block" }, "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/smooth_steel_block.json b/src/generated/resources/data/xkdeco/recipe/smooth_steel_block.json similarity index 85% rename from src/generated/resources/data/xkdeco/recipes/smooth_steel_block.json rename to src/generated/resources/data/xkdeco/recipe/smooth_steel_block.json index 7e2f0362..484b2119 100644 --- a/src/generated/resources/data/xkdeco/recipes/smooth_steel_block.json +++ b/src/generated/resources/data/xkdeco/recipe/smooth_steel_block.json @@ -12,7 +12,7 @@ ], "result": { "count": 4, - "item": "xkdeco:smooth_steel_block" + "id": "xkdeco:smooth_steel_block" }, "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/snowy_cobblestone.json b/src/generated/resources/data/xkdeco/recipe/snowy_cobblestone.json similarity index 84% rename from src/generated/resources/data/xkdeco/recipes/snowy_cobblestone.json rename to src/generated/resources/data/xkdeco/recipe/snowy_cobblestone.json index 33443d84..d8dea9b0 100644 --- a/src/generated/resources/data/xkdeco/recipes/snowy_cobblestone.json +++ b/src/generated/resources/data/xkdeco/recipe/snowy_cobblestone.json @@ -10,6 +10,6 @@ } ], "result": { - "item": "xkdeco:snowy_cobblestone" + "id": "xkdeco:snowy_cobblestone" } } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/snowy_cobblestone_path_slab.json b/src/generated/resources/data/xkdeco/recipe/snowy_cobblestone_path_slab.json similarity index 83% rename from src/generated/resources/data/xkdeco/recipes/snowy_cobblestone_path_slab.json rename to src/generated/resources/data/xkdeco/recipe/snowy_cobblestone_path_slab.json index 3061b165..7b233c3d 100644 --- a/src/generated/resources/data/xkdeco/recipes/snowy_cobblestone_path_slab.json +++ b/src/generated/resources/data/xkdeco/recipe/snowy_cobblestone_path_slab.json @@ -11,7 +11,7 @@ ], "result": { "count": 6, - "item": "xkdeco:snowy_cobblestone_path_slab" + "id": "xkdeco:snowy_cobblestone_path_slab" }, "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/snowy_cobblestone_path_stairs.json b/src/generated/resources/data/xkdeco/recipe/snowy_cobblestone_path_stairs.json similarity index 83% rename from src/generated/resources/data/xkdeco/recipes/snowy_cobblestone_path_stairs.json rename to src/generated/resources/data/xkdeco/recipe/snowy_cobblestone_path_stairs.json index fceef334..721dd406 100644 --- a/src/generated/resources/data/xkdeco/recipes/snowy_cobblestone_path_stairs.json +++ b/src/generated/resources/data/xkdeco/recipe/snowy_cobblestone_path_stairs.json @@ -13,7 +13,7 @@ ], "result": { "count": 4, - "item": "xkdeco:snowy_cobblestone_path_stairs" + "id": "xkdeco:snowy_cobblestone_path_stairs" }, "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/snowy_cobblestone_slab.json b/src/generated/resources/data/xkdeco/recipe/snowy_cobblestone_slab.json similarity index 84% rename from src/generated/resources/data/xkdeco/recipes/snowy_cobblestone_slab.json rename to src/generated/resources/data/xkdeco/recipe/snowy_cobblestone_slab.json index 7d356e8d..c81ba96e 100644 --- a/src/generated/resources/data/xkdeco/recipes/snowy_cobblestone_slab.json +++ b/src/generated/resources/data/xkdeco/recipe/snowy_cobblestone_slab.json @@ -11,7 +11,7 @@ ], "result": { "count": 6, - "item": "xkdeco:snowy_cobblestone_slab" + "id": "xkdeco:snowy_cobblestone_slab" }, "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/snowy_cobblestone_stairs.json b/src/generated/resources/data/xkdeco/recipe/snowy_cobblestone_stairs.json similarity index 84% rename from src/generated/resources/data/xkdeco/recipes/snowy_cobblestone_stairs.json rename to src/generated/resources/data/xkdeco/recipe/snowy_cobblestone_stairs.json index 7d0fc820..e8de6a1d 100644 --- a/src/generated/resources/data/xkdeco/recipes/snowy_cobblestone_stairs.json +++ b/src/generated/resources/data/xkdeco/recipe/snowy_cobblestone_stairs.json @@ -13,7 +13,7 @@ ], "result": { "count": 4, - "item": "xkdeco:snowy_cobblestone_stairs" + "id": "xkdeco:snowy_cobblestone_stairs" }, "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/steel_block.json b/src/generated/resources/data/xkdeco/recipe/steel_block.json similarity index 76% rename from src/generated/resources/data/xkdeco/recipes/steel_block.json rename to src/generated/resources/data/xkdeco/recipe/steel_block.json index 6bf5dd53..afd4a6be 100644 --- a/src/generated/resources/data/xkdeco/recipes/steel_block.json +++ b/src/generated/resources/data/xkdeco/recipe/steel_block.json @@ -6,5 +6,7 @@ "ingredient": { "item": "minecraft:iron_block" }, - "result": "xkdeco:steel_block" + "result": { + "id": "xkdeco:steel_block" + } } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/steel_filings_from_steel_block_stonecutting.json b/src/generated/resources/data/xkdeco/recipe/steel_filings_from_steel_block_stonecutting.json similarity index 68% rename from src/generated/resources/data/xkdeco/recipes/steel_filings_from_steel_block_stonecutting.json rename to src/generated/resources/data/xkdeco/recipe/steel_filings_from_steel_block_stonecutting.json index 751e1d6f..5045dc16 100644 --- a/src/generated/resources/data/xkdeco/recipes/steel_filings_from_steel_block_stonecutting.json +++ b/src/generated/resources/data/xkdeco/recipe/steel_filings_from_steel_block_stonecutting.json @@ -4,5 +4,7 @@ "ingredient": { "item": "xkdeco:steel_block" }, - "result": "xkdeco:steel_filings" + "result": { + "id": "xkdeco:steel_filings" + } } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/steel_floor_slab.json b/src/generated/resources/data/xkdeco/recipe/steel_floor_slab.json similarity index 85% rename from src/generated/resources/data/xkdeco/recipes/steel_floor_slab.json rename to src/generated/resources/data/xkdeco/recipe/steel_floor_slab.json index 0688700e..299082bb 100644 --- a/src/generated/resources/data/xkdeco/recipes/steel_floor_slab.json +++ b/src/generated/resources/data/xkdeco/recipe/steel_floor_slab.json @@ -11,7 +11,7 @@ ], "result": { "count": 6, - "item": "xkdeco:steel_floor_slab" + "id": "xkdeco:steel_floor_slab" }, "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/steel_floor_stairs.json b/src/generated/resources/data/xkdeco/recipe/steel_floor_stairs.json similarity index 86% rename from src/generated/resources/data/xkdeco/recipes/steel_floor_stairs.json rename to src/generated/resources/data/xkdeco/recipe/steel_floor_stairs.json index 2cb8a8a3..4329a9e2 100644 --- a/src/generated/resources/data/xkdeco/recipes/steel_floor_stairs.json +++ b/src/generated/resources/data/xkdeco/recipe/steel_floor_stairs.json @@ -13,7 +13,7 @@ ], "result": { "count": 4, - "item": "xkdeco:steel_floor_stairs" + "id": "xkdeco:steel_floor_stairs" }, "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/steel_tile_slab.json b/src/generated/resources/data/xkdeco/recipe/steel_tile_slab.json similarity index 86% rename from src/generated/resources/data/xkdeco/recipes/steel_tile_slab.json rename to src/generated/resources/data/xkdeco/recipe/steel_tile_slab.json index 6f319133..74441aa9 100644 --- a/src/generated/resources/data/xkdeco/recipes/steel_tile_slab.json +++ b/src/generated/resources/data/xkdeco/recipe/steel_tile_slab.json @@ -11,7 +11,7 @@ ], "result": { "count": 6, - "item": "xkdeco:steel_tile_slab" + "id": "xkdeco:steel_tile_slab" }, "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/steel_tile_stairs.json b/src/generated/resources/data/xkdeco/recipe/steel_tile_stairs.json similarity index 86% rename from src/generated/resources/data/xkdeco/recipes/steel_tile_stairs.json rename to src/generated/resources/data/xkdeco/recipe/steel_tile_stairs.json index 6976e3d7..b41d8db2 100644 --- a/src/generated/resources/data/xkdeco/recipes/steel_tile_stairs.json +++ b/src/generated/resources/data/xkdeco/recipe/steel_tile_stairs.json @@ -13,7 +13,7 @@ ], "result": { "count": 4, - "item": "xkdeco:steel_tile_stairs" + "id": "xkdeco:steel_tile_stairs" }, "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/steel_tiles_from_steel_block_stonecutting.json b/src/generated/resources/data/xkdeco/recipe/steel_tiles_from_steel_block_stonecutting.json similarity index 68% rename from src/generated/resources/data/xkdeco/recipes/steel_tiles_from_steel_block_stonecutting.json rename to src/generated/resources/data/xkdeco/recipe/steel_tiles_from_steel_block_stonecutting.json index a8ce10c5..bf6f962c 100644 --- a/src/generated/resources/data/xkdeco/recipes/steel_tiles_from_steel_block_stonecutting.json +++ b/src/generated/resources/data/xkdeco/recipe/steel_tiles_from_steel_block_stonecutting.json @@ -4,5 +4,7 @@ "ingredient": { "item": "xkdeco:steel_block" }, - "result": "xkdeco:steel_tiles" + "result": { + "id": "xkdeco:steel_tiles" + } } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/steel_trapdoor.json b/src/generated/resources/data/xkdeco/recipe/steel_trapdoor.json similarity index 86% rename from src/generated/resources/data/xkdeco/recipes/steel_trapdoor.json rename to src/generated/resources/data/xkdeco/recipe/steel_trapdoor.json index faacf86a..9b0a34a3 100644 --- a/src/generated/resources/data/xkdeco/recipes/steel_trapdoor.json +++ b/src/generated/resources/data/xkdeco/recipe/steel_trapdoor.json @@ -12,7 +12,7 @@ ], "result": { "count": 2, - "item": "xkdeco:steel_trapdoor" + "id": "xkdeco:steel_trapdoor" }, "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/stone_brick_pavement_slab.json b/src/generated/resources/data/xkdeco/recipe/stone_brick_pavement_slab.json similarity index 83% rename from src/generated/resources/data/xkdeco/recipes/stone_brick_pavement_slab.json rename to src/generated/resources/data/xkdeco/recipe/stone_brick_pavement_slab.json index 682ad0b3..4264518f 100644 --- a/src/generated/resources/data/xkdeco/recipes/stone_brick_pavement_slab.json +++ b/src/generated/resources/data/xkdeco/recipe/stone_brick_pavement_slab.json @@ -11,7 +11,7 @@ ], "result": { "count": 6, - "item": "xkdeco:stone_brick_pavement_slab" + "id": "xkdeco:stone_brick_pavement_slab" }, "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/tech_lamp_block_from_sea_lantern_stonecutting.json b/src/generated/resources/data/xkdeco/recipe/tech_lamp_block_from_sea_lantern_stonecutting.json similarity index 67% rename from src/generated/resources/data/xkdeco/recipes/tech_lamp_block_from_sea_lantern_stonecutting.json rename to src/generated/resources/data/xkdeco/recipe/tech_lamp_block_from_sea_lantern_stonecutting.json index 98488181..d7d0e8ef 100644 --- a/src/generated/resources/data/xkdeco/recipes/tech_lamp_block_from_sea_lantern_stonecutting.json +++ b/src/generated/resources/data/xkdeco/recipe/tech_lamp_block_from_sea_lantern_stonecutting.json @@ -4,5 +4,7 @@ "ingredient": { "item": "minecraft:sea_lantern" }, - "result": "xkdeco:tech_lamp_block" + "result": { + "id": "xkdeco:tech_lamp_block" + } } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/tech_lamp_slab.json b/src/generated/resources/data/xkdeco/recipe/tech_lamp_slab.json similarity index 86% rename from src/generated/resources/data/xkdeco/recipes/tech_lamp_slab.json rename to src/generated/resources/data/xkdeco/recipe/tech_lamp_slab.json index 2430d19e..e3548a8e 100644 --- a/src/generated/resources/data/xkdeco/recipes/tech_lamp_slab.json +++ b/src/generated/resources/data/xkdeco/recipe/tech_lamp_slab.json @@ -11,7 +11,7 @@ ], "result": { "count": 6, - "item": "xkdeco:tech_lamp_slab" + "id": "xkdeco:tech_lamp_slab" }, "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/tech_lamp_stairs.json b/src/generated/resources/data/xkdeco/recipe/tech_lamp_stairs.json similarity index 87% rename from src/generated/resources/data/xkdeco/recipes/tech_lamp_stairs.json rename to src/generated/resources/data/xkdeco/recipe/tech_lamp_stairs.json index a128a389..887bfd16 100644 --- a/src/generated/resources/data/xkdeco/recipes/tech_lamp_stairs.json +++ b/src/generated/resources/data/xkdeco/recipe/tech_lamp_stairs.json @@ -13,7 +13,7 @@ ], "result": { "count": 4, - "item": "xkdeco:tech_lamp_stairs" + "id": "xkdeco:tech_lamp_stairs" }, "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/toughened_glass.json b/src/generated/resources/data/xkdeco/recipe/toughened_glass.json similarity index 75% rename from src/generated/resources/data/xkdeco/recipes/toughened_glass.json rename to src/generated/resources/data/xkdeco/recipe/toughened_glass.json index aee563fe..8e419b52 100644 --- a/src/generated/resources/data/xkdeco/recipes/toughened_glass.json +++ b/src/generated/resources/data/xkdeco/recipe/toughened_glass.json @@ -6,5 +6,7 @@ "ingredient": { "item": "xkdeco:toughened_sand" }, - "result": "xkdeco:toughened_glass" + "result": { + "id": "xkdeco:toughened_glass" + } } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/toughened_glass_slab.json b/src/generated/resources/data/xkdeco/recipe/toughened_glass_slab.json similarity index 84% rename from src/generated/resources/data/xkdeco/recipes/toughened_glass_slab.json rename to src/generated/resources/data/xkdeco/recipe/toughened_glass_slab.json index 00c5d0d3..74ebf348 100644 --- a/src/generated/resources/data/xkdeco/recipes/toughened_glass_slab.json +++ b/src/generated/resources/data/xkdeco/recipe/toughened_glass_slab.json @@ -11,7 +11,7 @@ ], "result": { "count": 6, - "item": "xkdeco:toughened_glass_slab" + "id": "xkdeco:toughened_glass_slab" }, "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/toughened_glass_stairs.json b/src/generated/resources/data/xkdeco/recipe/toughened_glass_stairs.json similarity index 85% rename from src/generated/resources/data/xkdeco/recipes/toughened_glass_stairs.json rename to src/generated/resources/data/xkdeco/recipe/toughened_glass_stairs.json index aadb11fb..c7085b76 100644 --- a/src/generated/resources/data/xkdeco/recipes/toughened_glass_stairs.json +++ b/src/generated/resources/data/xkdeco/recipe/toughened_glass_stairs.json @@ -13,7 +13,7 @@ ], "result": { "count": 4, - "item": "xkdeco:toughened_glass_stairs" + "id": "xkdeco:toughened_glass_stairs" }, "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/toughened_sand.json b/src/generated/resources/data/xkdeco/recipe/toughened_sand.json similarity index 86% rename from src/generated/resources/data/xkdeco/recipes/toughened_sand.json rename to src/generated/resources/data/xkdeco/recipe/toughened_sand.json index 67ae3a03..f984cd6d 100644 --- a/src/generated/resources/data/xkdeco/recipes/toughened_sand.json +++ b/src/generated/resources/data/xkdeco/recipe/toughened_sand.json @@ -11,6 +11,6 @@ ], "result": { "count": 4, - "item": "xkdeco:toughened_sand" + "id": "xkdeco:toughened_sand" } } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/translucent_lamp_block.json b/src/generated/resources/data/xkdeco/recipe/translucent_lamp_block.json similarity index 83% rename from src/generated/resources/data/xkdeco/recipes/translucent_lamp_block.json rename to src/generated/resources/data/xkdeco/recipe/translucent_lamp_block.json index b5e863ea..5d83b6c6 100644 --- a/src/generated/resources/data/xkdeco/recipes/translucent_lamp_block.json +++ b/src/generated/resources/data/xkdeco/recipe/translucent_lamp_block.json @@ -11,6 +11,6 @@ ], "result": { "count": 2, - "item": "xkdeco:translucent_lamp_block" + "id": "xkdeco:translucent_lamp_block" } } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/translucent_lamp_slab.json b/src/generated/resources/data/xkdeco/recipe/translucent_lamp_slab.json similarity index 84% rename from src/generated/resources/data/xkdeco/recipes/translucent_lamp_slab.json rename to src/generated/resources/data/xkdeco/recipe/translucent_lamp_slab.json index 582fc989..5e42b3c2 100644 --- a/src/generated/resources/data/xkdeco/recipes/translucent_lamp_slab.json +++ b/src/generated/resources/data/xkdeco/recipe/translucent_lamp_slab.json @@ -11,7 +11,7 @@ ], "result": { "count": 6, - "item": "xkdeco:translucent_lamp_slab" + "id": "xkdeco:translucent_lamp_slab" }, "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/translucent_lamp_stairs.json b/src/generated/resources/data/xkdeco/recipe/translucent_lamp_stairs.json similarity index 85% rename from src/generated/resources/data/xkdeco/recipes/translucent_lamp_stairs.json rename to src/generated/resources/data/xkdeco/recipe/translucent_lamp_stairs.json index b18f7c81..13d2edc8 100644 --- a/src/generated/resources/data/xkdeco/recipes/translucent_lamp_stairs.json +++ b/src/generated/resources/data/xkdeco/recipe/translucent_lamp_stairs.json @@ -13,7 +13,7 @@ ], "result": { "count": 4, - "item": "xkdeco:translucent_lamp_stairs" + "id": "xkdeco:translucent_lamp_stairs" }, "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/varnished_door.json b/src/generated/resources/data/xkdeco/recipe/varnished_door.json similarity index 87% rename from src/generated/resources/data/xkdeco/recipes/varnished_door.json rename to src/generated/resources/data/xkdeco/recipe/varnished_door.json index 90b7a3c5..6b5f4bac 100644 --- a/src/generated/resources/data/xkdeco/recipes/varnished_door.json +++ b/src/generated/resources/data/xkdeco/recipe/varnished_door.json @@ -13,7 +13,7 @@ ], "result": { "count": 3, - "item": "xkdeco:varnished_door" + "id": "xkdeco:varnished_door" }, "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/varnished_fence.json b/src/generated/resources/data/xkdeco/recipe/varnished_fence.json similarity index 88% rename from src/generated/resources/data/xkdeco/recipes/varnished_fence.json rename to src/generated/resources/data/xkdeco/recipe/varnished_fence.json index 869d7437..9e0d4c72 100644 --- a/src/generated/resources/data/xkdeco/recipes/varnished_fence.json +++ b/src/generated/resources/data/xkdeco/recipe/varnished_fence.json @@ -15,7 +15,7 @@ ], "result": { "count": 3, - "item": "xkdeco:varnished_fence" + "id": "xkdeco:varnished_fence" }, "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/varnished_fence_gate.json b/src/generated/resources/data/xkdeco/recipe/varnished_fence_gate.json similarity index 86% rename from src/generated/resources/data/xkdeco/recipes/varnished_fence_gate.json rename to src/generated/resources/data/xkdeco/recipe/varnished_fence_gate.json index 52731ec2..8cf73193 100644 --- a/src/generated/resources/data/xkdeco/recipes/varnished_fence_gate.json +++ b/src/generated/resources/data/xkdeco/recipe/varnished_fence_gate.json @@ -14,7 +14,7 @@ "#W#" ], "result": { - "item": "xkdeco:varnished_fence_gate" + "id": "xkdeco:varnished_fence_gate" }, "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/varnished_log_from_smoking.json b/src/generated/resources/data/xkdeco/recipe/varnished_log_from_smoking.json similarity index 75% rename from src/generated/resources/data/xkdeco/recipes/varnished_log_from_smoking.json rename to src/generated/resources/data/xkdeco/recipe/varnished_log_from_smoking.json index 16e5c2d0..623d6048 100644 --- a/src/generated/resources/data/xkdeco/recipes/varnished_log_from_smoking.json +++ b/src/generated/resources/data/xkdeco/recipe/varnished_log_from_smoking.json @@ -6,5 +6,7 @@ "ingredient": { "item": "minecraft:oak_log" }, - "result": "xkdeco:varnished_log" + "result": { + "id": "xkdeco:varnished_log" + } } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/varnished_planks.json b/src/generated/resources/data/xkdeco/recipe/varnished_planks.json similarity index 83% rename from src/generated/resources/data/xkdeco/recipes/varnished_planks.json rename to src/generated/resources/data/xkdeco/recipe/varnished_planks.json index 21568c49..e71acb83 100644 --- a/src/generated/resources/data/xkdeco/recipes/varnished_planks.json +++ b/src/generated/resources/data/xkdeco/recipe/varnished_planks.json @@ -9,6 +9,6 @@ ], "result": { "count": 4, - "item": "xkdeco:varnished_planks" + "id": "xkdeco:varnished_planks" } } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/varnished_planks_from_smoking.json b/src/generated/resources/data/xkdeco/recipe/varnished_planks_from_smoking.json similarity index 74% rename from src/generated/resources/data/xkdeco/recipes/varnished_planks_from_smoking.json rename to src/generated/resources/data/xkdeco/recipe/varnished_planks_from_smoking.json index 6b0b217e..b45fb98a 100644 --- a/src/generated/resources/data/xkdeco/recipes/varnished_planks_from_smoking.json +++ b/src/generated/resources/data/xkdeco/recipe/varnished_planks_from_smoking.json @@ -6,5 +6,7 @@ "ingredient": { "item": "minecraft:oak_planks" }, - "result": "xkdeco:varnished_planks" + "result": { + "id": "xkdeco:varnished_planks" + } } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/varnished_slab.json b/src/generated/resources/data/xkdeco/recipe/varnished_slab.json similarity index 86% rename from src/generated/resources/data/xkdeco/recipes/varnished_slab.json rename to src/generated/resources/data/xkdeco/recipe/varnished_slab.json index 0c352670..f025c9f2 100644 --- a/src/generated/resources/data/xkdeco/recipes/varnished_slab.json +++ b/src/generated/resources/data/xkdeco/recipe/varnished_slab.json @@ -11,7 +11,7 @@ ], "result": { "count": 6, - "item": "xkdeco:varnished_slab" + "id": "xkdeco:varnished_slab" }, "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/varnished_stairs.json b/src/generated/resources/data/xkdeco/recipe/varnished_stairs.json similarity index 87% rename from src/generated/resources/data/xkdeco/recipes/varnished_stairs.json rename to src/generated/resources/data/xkdeco/recipe/varnished_stairs.json index bc9410d9..9bd36783 100644 --- a/src/generated/resources/data/xkdeco/recipes/varnished_stairs.json +++ b/src/generated/resources/data/xkdeco/recipe/varnished_stairs.json @@ -13,7 +13,7 @@ ], "result": { "count": 4, - "item": "xkdeco:varnished_stairs" + "id": "xkdeco:varnished_stairs" }, "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/varnished_trapdoor.json b/src/generated/resources/data/xkdeco/recipe/varnished_trapdoor.json similarity index 85% rename from src/generated/resources/data/xkdeco/recipes/varnished_trapdoor.json rename to src/generated/resources/data/xkdeco/recipe/varnished_trapdoor.json index b4644cc6..298d6585 100644 --- a/src/generated/resources/data/xkdeco/recipes/varnished_trapdoor.json +++ b/src/generated/resources/data/xkdeco/recipe/varnished_trapdoor.json @@ -12,7 +12,7 @@ ], "result": { "count": 2, - "item": "xkdeco:varnished_trapdoor" + "id": "xkdeco:varnished_trapdoor" }, "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/varnished_wood.json b/src/generated/resources/data/xkdeco/recipe/varnished_wood.json similarity index 87% rename from src/generated/resources/data/xkdeco/recipes/varnished_wood.json rename to src/generated/resources/data/xkdeco/recipe/varnished_wood.json index 4137a629..b5ccfa9b 100644 --- a/src/generated/resources/data/xkdeco/recipes/varnished_wood.json +++ b/src/generated/resources/data/xkdeco/recipe/varnished_wood.json @@ -13,7 +13,7 @@ ], "result": { "count": 3, - "item": "xkdeco:varnished_wood" + "id": "xkdeco:varnished_wood" }, "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/varnished_wood_from_smoking.json b/src/generated/resources/data/xkdeco/recipe/varnished_wood_from_smoking.json similarity index 74% rename from src/generated/resources/data/xkdeco/recipes/varnished_wood_from_smoking.json rename to src/generated/resources/data/xkdeco/recipe/varnished_wood_from_smoking.json index 43d29e20..fb951ac4 100644 --- a/src/generated/resources/data/xkdeco/recipes/varnished_wood_from_smoking.json +++ b/src/generated/resources/data/xkdeco/recipe/varnished_wood_from_smoking.json @@ -6,5 +6,7 @@ "ingredient": { "item": "minecraft:oak_wood" }, - "result": "xkdeco:varnished_wood" + "result": { + "id": "xkdeco:varnished_wood" + } } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/warped_nylium_slab_from_netherrack_stonecutting.json b/src/generated/resources/data/xkdeco/recipe/warped_nylium_slab_from_netherrack_stonecutting.json similarity index 66% rename from src/generated/resources/data/xkdeco/recipes/warped_nylium_slab_from_netherrack_stonecutting.json rename to src/generated/resources/data/xkdeco/recipe/warped_nylium_slab_from_netherrack_stonecutting.json index ce90d857..34980dc4 100644 --- a/src/generated/resources/data/xkdeco/recipes/warped_nylium_slab_from_netherrack_stonecutting.json +++ b/src/generated/resources/data/xkdeco/recipe/warped_nylium_slab_from_netherrack_stonecutting.json @@ -4,5 +4,7 @@ "ingredient": { "item": "minecraft:netherrack" }, - "result": "xkdeco:warped_nylium_slab" + "result": { + "id": "xkdeco:warped_nylium_slab" + } } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/white_cherry_blossom.json b/src/generated/resources/data/xkdeco/recipe/white_cherry_blossom.json similarity index 88% rename from src/generated/resources/data/xkdeco/recipes/white_cherry_blossom.json rename to src/generated/resources/data/xkdeco/recipe/white_cherry_blossom.json index 40e89331..f7d4368e 100644 --- a/src/generated/resources/data/xkdeco/recipes/white_cherry_blossom.json +++ b/src/generated/resources/data/xkdeco/recipe/white_cherry_blossom.json @@ -16,7 +16,7 @@ ], "result": { "count": 8, - "item": "xkdeco:white_cherry_blossom" + "id": "xkdeco:white_cherry_blossom" }, "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/white_cherry_blossom_leaves.json b/src/generated/resources/data/xkdeco/recipe/white_cherry_blossom_leaves.json similarity index 82% rename from src/generated/resources/data/xkdeco/recipes/white_cherry_blossom_leaves.json rename to src/generated/resources/data/xkdeco/recipe/white_cherry_blossom_leaves.json index f6e6dc95..18eba421 100644 --- a/src/generated/resources/data/xkdeco/recipes/white_cherry_blossom_leaves.json +++ b/src/generated/resources/data/xkdeco/recipe/white_cherry_blossom_leaves.json @@ -11,6 +11,6 @@ ], "result": { "count": 2, - "item": "xkdeco:white_cherry_blossom_leaves" + "id": "xkdeco:white_cherry_blossom_leaves" } } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/yellow_tile_slab.json b/src/generated/resources/data/xkdeco/recipe/yellow_tile_slab.json similarity index 85% rename from src/generated/resources/data/xkdeco/recipes/yellow_tile_slab.json rename to src/generated/resources/data/xkdeco/recipe/yellow_tile_slab.json index 66af0d5c..306f001c 100644 --- a/src/generated/resources/data/xkdeco/recipes/yellow_tile_slab.json +++ b/src/generated/resources/data/xkdeco/recipe/yellow_tile_slab.json @@ -11,7 +11,7 @@ ], "result": { "count": 6, - "item": "xkdeco:yellow_tile_slab" + "id": "xkdeco:yellow_tile_slab" }, "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/yellow_tile_stairs.json b/src/generated/resources/data/xkdeco/recipe/yellow_tile_stairs.json similarity index 86% rename from src/generated/resources/data/xkdeco/recipes/yellow_tile_stairs.json rename to src/generated/resources/data/xkdeco/recipe/yellow_tile_stairs.json index 553c7f69..e08beeb1 100644 --- a/src/generated/resources/data/xkdeco/recipes/yellow_tile_stairs.json +++ b/src/generated/resources/data/xkdeco/recipe/yellow_tile_stairs.json @@ -13,7 +13,7 @@ ], "result": { "count": 4, - "item": "xkdeco:yellow_tile_stairs" + "id": "xkdeco:yellow_tile_stairs" }, "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/xkdeco/recipes/yellow_tiles.json b/src/generated/resources/data/xkdeco/recipe/yellow_tiles.json similarity index 89% rename from src/generated/resources/data/xkdeco/recipes/yellow_tiles.json rename to src/generated/resources/data/xkdeco/recipe/yellow_tiles.json index 45a17e73..620877cb 100644 --- a/src/generated/resources/data/xkdeco/recipes/yellow_tiles.json +++ b/src/generated/resources/data/xkdeco/recipe/yellow_tiles.json @@ -15,7 +15,7 @@ ], "result": { "count": 8, - "item": "xkdeco:yellow_tiles" + "id": "xkdeco:yellow_tiles" }, "show_notification": true } \ No newline at end of file diff --git a/src/kiwi_generated/resources/data/kiwi/tags/blocks/sittable.json b/src/kiwi_generated/resources/data/kiwi/tags/block/sittable.json similarity index 100% rename from src/kiwi_generated/resources/data/kiwi/tags/blocks/sittable.json rename to src/kiwi_generated/resources/data/kiwi/tags/block/sittable.json diff --git a/src/kiwi_generated/resources/data/kiwi/tags/blocks/sustain_plant.json b/src/kiwi_generated/resources/data/kiwi/tags/block/sustain_plant.json similarity index 100% rename from src/kiwi_generated/resources/data/kiwi/tags/blocks/sustain_plant.json rename to src/kiwi_generated/resources/data/kiwi/tags/block/sustain_plant.json diff --git a/src/kiwi_generated/resources/data/minecraft/tags/blocks/doors.json b/src/kiwi_generated/resources/data/minecraft/tags/block/doors.json similarity index 100% rename from src/kiwi_generated/resources/data/minecraft/tags/blocks/doors.json rename to src/kiwi_generated/resources/data/minecraft/tags/block/doors.json diff --git a/src/kiwi_generated/resources/data/minecraft/tags/blocks/fence_gates.json b/src/kiwi_generated/resources/data/minecraft/tags/block/fence_gates.json similarity index 100% rename from src/kiwi_generated/resources/data/minecraft/tags/blocks/fence_gates.json rename to src/kiwi_generated/resources/data/minecraft/tags/block/fence_gates.json diff --git a/src/kiwi_generated/resources/data/minecraft/tags/blocks/impermeable.json b/src/kiwi_generated/resources/data/minecraft/tags/block/impermeable.json similarity index 100% rename from src/kiwi_generated/resources/data/minecraft/tags/blocks/impermeable.json rename to src/kiwi_generated/resources/data/minecraft/tags/block/impermeable.json diff --git a/src/kiwi_generated/resources/data/minecraft/tags/blocks/leaves.json b/src/kiwi_generated/resources/data/minecraft/tags/block/leaves.json similarity index 100% rename from src/kiwi_generated/resources/data/minecraft/tags/blocks/leaves.json rename to src/kiwi_generated/resources/data/minecraft/tags/block/leaves.json diff --git a/src/kiwi_generated/resources/data/minecraft/tags/blocks/mineable/axe.json b/src/kiwi_generated/resources/data/minecraft/tags/block/mineable/axe.json similarity index 100% rename from src/kiwi_generated/resources/data/minecraft/tags/blocks/mineable/axe.json rename to src/kiwi_generated/resources/data/minecraft/tags/block/mineable/axe.json diff --git a/src/kiwi_generated/resources/data/minecraft/tags/blocks/mineable/hoe.json b/src/kiwi_generated/resources/data/minecraft/tags/block/mineable/hoe.json similarity index 100% rename from src/kiwi_generated/resources/data/minecraft/tags/blocks/mineable/hoe.json rename to src/kiwi_generated/resources/data/minecraft/tags/block/mineable/hoe.json diff --git a/src/kiwi_generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json b/src/kiwi_generated/resources/data/minecraft/tags/block/mineable/pickaxe.json similarity index 100% rename from src/kiwi_generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json rename to src/kiwi_generated/resources/data/minecraft/tags/block/mineable/pickaxe.json diff --git a/src/kiwi_generated/resources/data/minecraft/tags/blocks/mineable/shovel.json b/src/kiwi_generated/resources/data/minecraft/tags/block/mineable/shovel.json similarity index 100% rename from src/kiwi_generated/resources/data/minecraft/tags/blocks/mineable/shovel.json rename to src/kiwi_generated/resources/data/minecraft/tags/block/mineable/shovel.json diff --git a/src/kiwi_generated/resources/data/minecraft/tags/blocks/needs_stone_tool.json b/src/kiwi_generated/resources/data/minecraft/tags/block/needs_stone_tool.json similarity index 100% rename from src/kiwi_generated/resources/data/minecraft/tags/blocks/needs_stone_tool.json rename to src/kiwi_generated/resources/data/minecraft/tags/block/needs_stone_tool.json diff --git a/src/kiwi_generated/resources/data/minecraft/tags/blocks/slabs.json b/src/kiwi_generated/resources/data/minecraft/tags/block/slabs.json similarity index 100% rename from src/kiwi_generated/resources/data/minecraft/tags/blocks/slabs.json rename to src/kiwi_generated/resources/data/minecraft/tags/block/slabs.json diff --git a/src/kiwi_generated/resources/data/minecraft/tags/blocks/stairs.json b/src/kiwi_generated/resources/data/minecraft/tags/block/stairs.json similarity index 100% rename from src/kiwi_generated/resources/data/minecraft/tags/blocks/stairs.json rename to src/kiwi_generated/resources/data/minecraft/tags/block/stairs.json diff --git a/src/kiwi_generated/resources/data/minecraft/tags/blocks/trapdoors.json b/src/kiwi_generated/resources/data/minecraft/tags/block/trapdoors.json similarity index 100% rename from src/kiwi_generated/resources/data/minecraft/tags/blocks/trapdoors.json rename to src/kiwi_generated/resources/data/minecraft/tags/block/trapdoors.json diff --git a/src/kiwi_generated/resources/data/minecraft/tags/blocks/walls.json b/src/kiwi_generated/resources/data/minecraft/tags/block/walls.json similarity index 100% rename from src/kiwi_generated/resources/data/minecraft/tags/blocks/walls.json rename to src/kiwi_generated/resources/data/minecraft/tags/block/walls.json diff --git a/src/kiwi_generated/resources/data/minecraft/tags/blocks/wooden_doors.json b/src/kiwi_generated/resources/data/minecraft/tags/block/wooden_doors.json similarity index 100% rename from src/kiwi_generated/resources/data/minecraft/tags/blocks/wooden_doors.json rename to src/kiwi_generated/resources/data/minecraft/tags/block/wooden_doors.json diff --git a/src/kiwi_generated/resources/data/minecraft/tags/blocks/wooden_fences.json b/src/kiwi_generated/resources/data/minecraft/tags/block/wooden_fences.json similarity index 100% rename from src/kiwi_generated/resources/data/minecraft/tags/blocks/wooden_fences.json rename to src/kiwi_generated/resources/data/minecraft/tags/block/wooden_fences.json diff --git a/src/kiwi_generated/resources/data/minecraft/tags/blocks/wooden_slabs.json b/src/kiwi_generated/resources/data/minecraft/tags/block/wooden_slabs.json similarity index 100% rename from src/kiwi_generated/resources/data/minecraft/tags/blocks/wooden_slabs.json rename to src/kiwi_generated/resources/data/minecraft/tags/block/wooden_slabs.json diff --git a/src/kiwi_generated/resources/data/minecraft/tags/blocks/wooden_stairs.json b/src/kiwi_generated/resources/data/minecraft/tags/block/wooden_stairs.json similarity index 100% rename from src/kiwi_generated/resources/data/minecraft/tags/blocks/wooden_stairs.json rename to src/kiwi_generated/resources/data/minecraft/tags/block/wooden_stairs.json diff --git a/src/kiwi_generated/resources/data/minecraft/tags/blocks/wooden_trapdoors.json b/src/kiwi_generated/resources/data/minecraft/tags/block/wooden_trapdoors.json similarity index 100% rename from src/kiwi_generated/resources/data/minecraft/tags/blocks/wooden_trapdoors.json rename to src/kiwi_generated/resources/data/minecraft/tags/block/wooden_trapdoors.json diff --git a/src/kiwi_generated/resources/data/xkdeco/tags/blocks/air_ducts.json b/src/kiwi_generated/resources/data/xkdeco/tags/block/air_ducts.json similarity index 100% rename from src/kiwi_generated/resources/data/xkdeco/tags/blocks/air_ducts.json rename to src/kiwi_generated/resources/data/xkdeco/tags/block/air_ducts.json diff --git a/src/kiwi_generated/resources/data/xkdeco/tags/blocks/ebony_logs.json b/src/kiwi_generated/resources/data/xkdeco/tags/block/ebony_logs.json similarity index 100% rename from src/kiwi_generated/resources/data/xkdeco/tags/blocks/ebony_logs.json rename to src/kiwi_generated/resources/data/xkdeco/tags/block/ebony_logs.json diff --git a/src/kiwi_generated/resources/data/xkdeco/tags/blocks/mahogany_logs.json b/src/kiwi_generated/resources/data/xkdeco/tags/block/mahogany_logs.json similarity index 100% rename from src/kiwi_generated/resources/data/xkdeco/tags/blocks/mahogany_logs.json rename to src/kiwi_generated/resources/data/xkdeco/tags/block/mahogany_logs.json diff --git a/src/kiwi_generated/resources/data/xkdeco/tags/blocks/roof_flat.json b/src/kiwi_generated/resources/data/xkdeco/tags/block/roof_flat.json similarity index 100% rename from src/kiwi_generated/resources/data/xkdeco/tags/blocks/roof_flat.json rename to src/kiwi_generated/resources/data/xkdeco/tags/block/roof_flat.json diff --git a/src/kiwi_generated/resources/data/xkdeco/tags/blocks/roof_ridge.json b/src/kiwi_generated/resources/data/xkdeco/tags/block/roof_ridge.json similarity index 100% rename from src/kiwi_generated/resources/data/xkdeco/tags/blocks/roof_ridge.json rename to src/kiwi_generated/resources/data/xkdeco/tags/block/roof_ridge.json diff --git a/src/kiwi_generated/resources/data/xkdeco/tags/blocks/varnished_logs.json b/src/kiwi_generated/resources/data/xkdeco/tags/block/varnished_logs.json similarity index 100% rename from src/kiwi_generated/resources/data/xkdeco/tags/blocks/varnished_logs.json rename to src/kiwi_generated/resources/data/xkdeco/tags/block/varnished_logs.json diff --git a/src/kiwi_generated/resources/data/xkdeco/tags/items/ebony_logs.json b/src/kiwi_generated/resources/data/xkdeco/tags/item/ebony_logs.json similarity index 100% rename from src/kiwi_generated/resources/data/xkdeco/tags/items/ebony_logs.json rename to src/kiwi_generated/resources/data/xkdeco/tags/item/ebony_logs.json diff --git a/src/kiwi_generated/resources/data/xkdeco/tags/items/mahogany_logs.json b/src/kiwi_generated/resources/data/xkdeco/tags/item/mahogany_logs.json similarity index 100% rename from src/kiwi_generated/resources/data/xkdeco/tags/items/mahogany_logs.json rename to src/kiwi_generated/resources/data/xkdeco/tags/item/mahogany_logs.json diff --git a/src/kiwi_generated/resources/data/xkdeco/tags/items/varnished_logs.json b/src/kiwi_generated/resources/data/xkdeco/tags/item/varnished_logs.json similarity index 100% rename from src/kiwi_generated/resources/data/xkdeco/tags/items/varnished_logs.json rename to src/kiwi_generated/resources/data/xkdeco/tags/item/varnished_logs.json diff --git a/src/main/java/org/teacon/xkdeco/block/AirDuctBlock.java b/src/main/java/org/teacon/xkdeco/block/AirDuctBlock.java index 5e10e05e..a751ef2c 100644 --- a/src/main/java/org/teacon/xkdeco/block/AirDuctBlock.java +++ b/src/main/java/org/teacon/xkdeco/block/AirDuctBlock.java @@ -10,7 +10,6 @@ import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; -import net.minecraft.world.InteractionHand; import net.minecraft.world.InteractionResult; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.Items; @@ -24,12 +23,13 @@ import net.minecraft.world.level.block.state.StateDefinition; import net.minecraft.world.level.block.state.properties.BooleanProperty; import net.minecraft.world.phys.BlockHitResult; +import snownee.kiwi.customization.block.BasicBlock; import snownee.kiwi.customization.placement.PlaceSlot; import snownee.kiwi.util.NotNullByDefault; @SuppressWarnings("deprecation") @NotNullByDefault -public class AirDuctBlock extends Block implements CheckedWaterloggedBlock { +public class AirDuctBlock extends BasicBlock { private static final Direction[] DIRECTIONS = Direction.values(); diff --git a/src/main/java/org/teacon/xkdeco/block/CheckedWaterloggedBlock.java b/src/main/java/org/teacon/xkdeco/block/CheckedWaterloggedBlock.java deleted file mode 100644 index 4236cee5..00000000 --- a/src/main/java/org/teacon/xkdeco/block/CheckedWaterloggedBlock.java +++ /dev/null @@ -1,41 +0,0 @@ -package org.teacon.xkdeco.block; - -import net.minecraft.core.BlockPos; -import net.minecraft.world.entity.player.Player; -import net.minecraft.world.item.ItemStack; -import net.minecraft.world.level.BlockGetter; -import net.minecraft.world.level.LevelAccessor; -import net.minecraft.world.level.block.SimpleWaterloggedBlock; -import net.minecraft.world.level.block.state.BlockState; -import net.minecraft.world.level.block.state.properties.BlockStateProperties; -import net.minecraft.world.level.material.Fluid; -import net.minecraft.world.level.material.FluidState; - -import org.jetbrains.annotations.NotNull; - -import javax.annotation.Nullable; - -public interface CheckedWaterloggedBlock extends SimpleWaterloggedBlock { - @Override - default boolean canPlaceLiquid(Player p, BlockGetter level, BlockPos pos, BlockState state, Fluid fluid) { - return state.hasProperty(BlockStateProperties.WATERLOGGED) && SimpleWaterloggedBlock.super.canPlaceLiquid( - p, level, pos, state, fluid); - } - - @Override - default boolean placeLiquid(LevelAccessor pLevel, BlockPos pPos, BlockState pState, FluidState pFluidState) { - return pState.hasProperty(BlockStateProperties.WATERLOGGED) && SimpleWaterloggedBlock.super.placeLiquid( - pLevel, - pPos, - pState, - pFluidState); - } - - @Override - default @NotNull ItemStack pickupBlock(@Nullable Player player, LevelAccessor pLevel, BlockPos pPos, BlockState pState) { - if (!pState.hasProperty(BlockStateProperties.WATERLOGGED)) { - return ItemStack.EMPTY; - } - return SimpleWaterloggedBlock.super.pickupBlock(player, pLevel, pPos, pState); - } -} diff --git a/src/main/java/org/teacon/xkdeco/block/DisplayBlock.java b/src/main/java/org/teacon/xkdeco/block/DisplayBlock.java index cd163f51..3f76a0b0 100644 --- a/src/main/java/org/teacon/xkdeco/block/DisplayBlock.java +++ b/src/main/java/org/teacon/xkdeco/block/DisplayBlock.java @@ -17,6 +17,7 @@ import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.phys.BlockHitResult; import snownee.kiwi.block.ModBlock; +import snownee.kiwi.customization.block.CheckedWaterloggedBlock; import snownee.kiwi.util.NotNullByDefault; @NotNullByDefault diff --git a/src/main/java/org/teacon/xkdeco/block/FallenLeavesBlock.java b/src/main/java/org/teacon/xkdeco/block/FallenLeavesBlock.java index a6049d15..3a02f4e0 100644 --- a/src/main/java/org/teacon/xkdeco/block/FallenLeavesBlock.java +++ b/src/main/java/org/teacon/xkdeco/block/FallenLeavesBlock.java @@ -1,7 +1,5 @@ package org.teacon.xkdeco.block; -import net.minecraft.world.level.block.state.properties.EnumProperty; - import org.jetbrains.annotations.NotNull; import net.minecraft.core.BlockPos; @@ -12,9 +10,11 @@ import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.SlabBlock; import net.minecraft.world.level.block.state.BlockState; +import net.minecraft.world.level.block.state.properties.EnumProperty; import net.minecraft.world.level.block.state.properties.SlabType; +import snownee.kiwi.util.NotNullByDefault; -//@NotNullByDefault +@NotNullByDefault public final class FallenLeavesBlock extends Block { private static final EnumProperty HALF = XKDStateProperties.HALF; @@ -31,7 +31,9 @@ public BlockState updateShape( BlockPos pPos, BlockPos pNeighborPos) { if (pDirection == Direction.DOWN) { - pState = pState.setValue(HALF, isBottomSlab(pNeighborState) ? XKDStateProperties.RoofHalf.LOWER : XKDStateProperties.RoofHalf.UPPER); + pState = pState.setValue( + HALF, + isBottomSlab(pNeighborState) ? XKDStateProperties.RoofHalf.LOWER : XKDStateProperties.RoofHalf.UPPER); } return pState; } @@ -39,7 +41,9 @@ public BlockState updateShape( @Override public @NotNull BlockState getStateForPlacement(BlockPlaceContext pContext) { BlockState blockState = pContext.getLevel().getBlockState(pContext.getClickedPos().below()); - return defaultBlockState().setValue(HALF, isBottomSlab(blockState) ? XKDStateProperties.RoofHalf.LOWER : XKDStateProperties.RoofHalf.UPPER); + return defaultBlockState().setValue( + HALF, + isBottomSlab(blockState) ? XKDStateProperties.RoofHalf.LOWER : XKDStateProperties.RoofHalf.UPPER); } private static boolean isBottomSlab(BlockState state) { diff --git a/src/main/java/org/teacon/xkdeco/block/HangingFasciaBlock.java b/src/main/java/org/teacon/xkdeco/block/HangingFasciaBlock.java index 5cf9eea2..b6159398 100644 --- a/src/main/java/org/teacon/xkdeco/block/HangingFasciaBlock.java +++ b/src/main/java/org/teacon/xkdeco/block/HangingFasciaBlock.java @@ -18,10 +18,11 @@ import net.minecraft.world.level.block.state.StateDefinition; import net.minecraft.world.level.block.state.properties.BlockStateProperties; import net.minecraft.world.level.block.state.properties.EnumProperty; +import snownee.kiwi.customization.block.BasicBlock; import snownee.kiwi.util.NotNullByDefault; @NotNullByDefault -public class HangingFasciaBlock extends Block implements CheckedWaterloggedBlock { +public class HangingFasciaBlock extends BasicBlock { public static final EnumProperty SIDE = EnumProperty.create("side", Side.class); public static final EnumProperty AXIS = BlockStateProperties.HORIZONTAL_AXIS; diff --git a/src/main/java/org/teacon/xkdeco/block/ItemDisplayBlock.java b/src/main/java/org/teacon/xkdeco/block/ItemDisplayBlock.java index 34b61ed9..64344023 100644 --- a/src/main/java/org/teacon/xkdeco/block/ItemDisplayBlock.java +++ b/src/main/java/org/teacon/xkdeco/block/ItemDisplayBlock.java @@ -1,7 +1,5 @@ package org.teacon.xkdeco.block; -import net.minecraft.world.ItemInteractionResult; - import org.jetbrains.annotations.Nullable; import org.teacon.xkdeco.blockentity.ItemDisplayBlockEntity; @@ -13,7 +11,7 @@ import net.minecraft.util.Mth; import net.minecraft.util.SegmentedAnglePrecision; import net.minecraft.world.InteractionHand; -import net.minecraft.world.InteractionResult; +import net.minecraft.world.ItemInteractionResult; import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemStack; @@ -25,7 +23,6 @@ import net.minecraft.world.level.block.state.properties.BlockStateProperties; import net.minecraft.world.level.block.state.properties.BooleanProperty; import net.minecraft.world.phys.BlockHitResult; -import snownee.kiwi.customization.block.loader.BlockCodecs; import snownee.kiwi.util.NotNullByDefault; @NotNullByDefault @@ -33,7 +30,7 @@ public class ItemDisplayBlock extends DisplayBlock { private static final SegmentedAnglePrecision SEGMENTED_ANGLE8 = new SegmentedAnglePrecision(3); private static final float angleStep = Mth.PI / 4 * 20; public static final MapCodec CODEC = RecordCodecBuilder.mapCodec(instance -> instance.group( - Block.propertiesCodec(), + propertiesCodec(), Codec.BOOL.optionalFieldOf("projector", false).forGetter(block -> block.projector) ).apply(instance, ItemDisplayBlock::new)); public static final BooleanProperty POWERED = BlockStateProperties.POWERED; @@ -111,4 +108,9 @@ public void setPlacedBy(Level pLevel, BlockPos pPos, BlockState pState, @Nullabl super.setPlacedBy(pLevel, pPos, pState, pPlacer, pStack); setSpin(pLevel, pPos, pPlacer); } + + @Override + protected MapCodec codec() { + return CODEC; + } } diff --git a/src/main/java/org/teacon/xkdeco/block/ObliqueAirDuctBlock.java b/src/main/java/org/teacon/xkdeco/block/ObliqueAirDuctBlock.java index d72759d3..bc62fa48 100644 --- a/src/main/java/org/teacon/xkdeco/block/ObliqueAirDuctBlock.java +++ b/src/main/java/org/teacon/xkdeco/block/ObliqueAirDuctBlock.java @@ -6,11 +6,11 @@ import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.Level; -import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.phys.BlockHitResult; +import snownee.kiwi.customization.block.BasicBlock; -public class ObliqueAirDuctBlock extends Block implements CheckedWaterloggedBlock { +public class ObliqueAirDuctBlock extends BasicBlock { public ObliqueAirDuctBlock(Properties properties) { super(properties); } diff --git a/src/main/java/org/teacon/xkdeco/block/ObliqueHollowSteelBeamBlock.java b/src/main/java/org/teacon/xkdeco/block/ObliqueHollowSteelBeamBlock.java index beff2b6c..444bfcf0 100644 --- a/src/main/java/org/teacon/xkdeco/block/ObliqueHollowSteelBeamBlock.java +++ b/src/main/java/org/teacon/xkdeco/block/ObliqueHollowSteelBeamBlock.java @@ -6,11 +6,11 @@ import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.Level; -import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.phys.BlockHitResult; +import snownee.kiwi.customization.block.BasicBlock; -public class ObliqueHollowSteelBeamBlock extends Block implements CheckedWaterloggedBlock { +public class ObliqueHollowSteelBeamBlock extends BasicBlock { public ObliqueHollowSteelBeamBlock(Properties properties) { super(properties); } diff --git a/src/main/java/org/teacon/xkdeco/block/OneDirectionFenceGateBlock.java b/src/main/java/org/teacon/xkdeco/block/OneDirectionFenceGateBlock.java index c3663b6c..5dedf409 100644 --- a/src/main/java/org/teacon/xkdeco/block/OneDirectionFenceGateBlock.java +++ b/src/main/java/org/teacon/xkdeco/block/OneDirectionFenceGateBlock.java @@ -1,7 +1,5 @@ package org.teacon.xkdeco.block; -import net.minecraft.world.level.block.Block; - import org.teacon.xkdeco.util.CommonProxy; import com.mojang.serialization.MapCodec; @@ -18,25 +16,25 @@ import net.minecraft.world.level.block.state.properties.WoodType; import net.minecraft.world.level.gameevent.GameEvent; import net.minecraft.world.phys.BlockHitResult; -import snownee.kiwi.customization.block.loader.BlockCodecs; public class OneDirectionFenceGateBlock extends FenceGateBlock { // If you declare a specific type, that means your type is invariant. // No ? extends nor ? super for you. // To comply this constraint, we have to make this a MapCodec, // instead of the more proper MapCodec. - public static final MapCodec CODEC = RecordCodecBuilder.mapCodec((instance) -> instance.group( - Block.propertiesCodec(), - WoodType.CODEC.optionalFieldOf("wood_type", WoodType.OAK).forGetter($ -> WoodType.OAK) + public static final MapCodec CODEC = RecordCodecBuilder.mapCodec((instance) -> instance.group( + WoodType.CODEC.optionalFieldOf("wood_type", WoodType.OAK).forGetter($ -> WoodType.OAK), + propertiesCodec() ).apply(instance, OneDirectionFenceGateBlock::new)); - public OneDirectionFenceGateBlock(Properties pProperties, WoodType pType) { + public OneDirectionFenceGateBlock(WoodType pType, Properties pProperties) { super(pType, pProperties); } @Override public MapCodec codec() { - return CODEC; + //noinspection unchecked + return (MapCodec) (Object) CODEC; } @Override diff --git a/src/main/java/org/teacon/xkdeco/block/SpecialSlabBlock.java b/src/main/java/org/teacon/xkdeco/block/SpecialSlabBlock.java index 7f75c8e3..5dcab9ac 100644 --- a/src/main/java/org/teacon/xkdeco/block/SpecialSlabBlock.java +++ b/src/main/java/org/teacon/xkdeco/block/SpecialSlabBlock.java @@ -28,13 +28,12 @@ import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.block.state.properties.SlabType; import net.minecraft.world.level.gameevent.GameEvent; -import snownee.kiwi.customization.block.loader.BlockCodecs; @MethodsReturnNonnullByDefault @ParametersAreNonnullByDefault public class SpecialSlabBlock extends SlabBlock { public static final MapCodec CODEC = RecordCodecBuilder.mapCodec(instance -> instance.group( - Block.propertiesCodec(), + propertiesCodec(), StringRepresentable.fromEnum(Type::values).fieldOf("type").forGetter(block -> block.type) ).apply(instance, SpecialSlabBlock::new)); private static final Supplier DIRT_SLAB = Suppliers.memoize(() -> BuiltInRegistries.BLOCK.get(XKDeco.id("dirt_slab"))); diff --git a/src/main/java/org/teacon/xkdeco/block/XKDBlock.java b/src/main/java/org/teacon/xkdeco/block/XKDBlock.java index 1a82c465..34a5c47d 100644 --- a/src/main/java/org/teacon/xkdeco/block/XKDBlock.java +++ b/src/main/java/org/teacon/xkdeco/block/XKDBlock.java @@ -6,8 +6,9 @@ import net.minecraft.tags.TagKey; import net.minecraft.world.level.block.Block; import snownee.kiwi.AbstractModule; +import snownee.kiwi.customization.block.BasicBlock; -public class XKDBlock extends Block implements CheckedWaterloggedBlock, XKDPlatformBlock { +public class XKDBlock extends BasicBlock implements XKDPlatformBlock { public static final TagKey AIR_DUCTS = AbstractModule.blockTag(XKDeco.ID, "air_ducts"); public XKDBlock(Properties properties) { diff --git a/src/main/java/org/teacon/xkdeco/blockentity/ItemDisplayBlockEntity.java b/src/main/java/org/teacon/xkdeco/blockentity/ItemDisplayBlockEntity.java index 08684157..66dbd717 100644 --- a/src/main/java/org/teacon/xkdeco/blockentity/ItemDisplayBlockEntity.java +++ b/src/main/java/org/teacon/xkdeco/blockentity/ItemDisplayBlockEntity.java @@ -4,17 +4,17 @@ */ package org.teacon.xkdeco.blockentity; -import net.minecraft.core.HolderLookup; - import org.jetbrains.annotations.NotNull; import org.teacon.xkdeco.block.ItemDisplayBlock; import org.teacon.xkdeco.init.XKDecoEntityTypes; import net.minecraft.core.BlockPos; +import net.minecraft.core.HolderLookup; import net.minecraft.nbt.CompoundTag; import net.minecraft.world.level.block.state.BlockState; +import snownee.kiwi.util.NotNullByDefault; -//@NotNullByDefault +@NotNullByDefault public class ItemDisplayBlockEntity extends SingleSlotContainerBlockEntity { public static final String SPIN_KEY = "FixedSpin"; private float fixedSpin; diff --git a/src/main/java/org/teacon/xkdeco/blockentity/SingleSlotContainerBlockEntity.java b/src/main/java/org/teacon/xkdeco/blockentity/SingleSlotContainerBlockEntity.java index 7d833813..ae3e21bb 100644 --- a/src/main/java/org/teacon/xkdeco/blockentity/SingleSlotContainerBlockEntity.java +++ b/src/main/java/org/teacon/xkdeco/blockentity/SingleSlotContainerBlockEntity.java @@ -21,8 +21,9 @@ import net.minecraft.world.level.block.entity.BaseContainerBlockEntity; import net.minecraft.world.level.block.entity.BlockEntityType; import net.minecraft.world.level.block.state.BlockState; +import snownee.kiwi.util.NotNullByDefault; -//@NotNullByDefault +@NotNullByDefault public class SingleSlotContainerBlockEntity extends BaseContainerBlockEntity { public static final String ITEM_STACK_KEY = "Display"; protected ItemStack item = ItemStack.EMPTY; diff --git a/src/main/java/org/teacon/xkdeco/client/renderer/ItemDisplayRenderer.java b/src/main/java/org/teacon/xkdeco/client/renderer/ItemDisplayRenderer.java index d4624144..f915e077 100644 --- a/src/main/java/org/teacon/xkdeco/client/renderer/ItemDisplayRenderer.java +++ b/src/main/java/org/teacon/xkdeco/client/renderer/ItemDisplayRenderer.java @@ -2,8 +2,6 @@ import java.util.Objects; -import net.minecraft.world.phys.AABB; - import org.teacon.xkdeco.blockentity.ItemDisplayBlockEntity; import com.mojang.blaze3d.vertex.PoseStack; @@ -22,9 +20,11 @@ import net.minecraft.world.item.ItemDisplayContext; import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.LightLayer; +import net.minecraft.world.phys.AABB; import net.minecraft.world.phys.Vec3; +import snownee.kiwi.util.NotNullByDefault; -//@NotNullByDefault +@NotNullByDefault public final class ItemDisplayRenderer implements BlockEntityRenderer { private final ItemRenderer itemRenderer; private final RandomSource random = RandomSource.create(); diff --git a/src/main/java/org/teacon/xkdeco/data/XKDBlockLootTableProvider.java b/src/main/java/org/teacon/xkdeco/data/XKDBlockLootTableProvider.java index a228a53c..2bcbae6a 100644 --- a/src/main/java/org/teacon/xkdeco/data/XKDBlockLootTableProvider.java +++ b/src/main/java/org/teacon/xkdeco/data/XKDBlockLootTableProvider.java @@ -3,14 +3,13 @@ import java.util.concurrent.CompletableFuture; import java.util.stream.IntStream; -import net.minecraft.core.HolderLookup; - import org.teacon.xkdeco.XKDeco; import org.teacon.xkdeco.block.MimicWallBlock; import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput; import net.fabricmc.fabric.api.datagen.v1.provider.FabricBlockLootTableProvider; import net.minecraft.advancements.critereon.StatePropertiesPredicate; +import net.minecraft.core.HolderLookup; import net.minecraft.core.registries.BuiltInRegistries; import net.minecraft.core.registries.Registries; import net.minecraft.world.item.Items; diff --git a/src/main/java/org/teacon/xkdeco/data/XKDModelProvider.java b/src/main/java/org/teacon/xkdeco/data/XKDModelProvider.java index 532947f2..742fc951 100644 --- a/src/main/java/org/teacon/xkdeco/data/XKDModelProvider.java +++ b/src/main/java/org/teacon/xkdeco/data/XKDModelProvider.java @@ -21,6 +21,7 @@ import org.teacon.xkdeco.block.BlockDisplayBlock; import org.teacon.xkdeco.block.HangingFasciaBlock; import org.teacon.xkdeco.block.ItemDisplayBlock; +import org.teacon.xkdeco.block.XKDStateProperties; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Lists; @@ -56,13 +57,9 @@ import net.minecraft.world.level.block.state.properties.SlabType; import net.minecraft.world.level.block.state.properties.StairsShape; import net.minecraft.world.level.block.state.properties.WallSide; - -import org.teacon.xkdeco.block.XKDStateProperties; - import snownee.kiwi.customization.block.KBlockSettings; import snownee.kiwi.customization.block.component.LayeredComponent; import snownee.kiwi.customization.block.loader.KBlockComponents; - import snownee.kiwi.util.GameObjectLookup; import snownee.kiwi.util.NotNullByDefault; diff --git a/src/main/java/org/teacon/xkdeco/util/ClientProxy.java b/src/main/java/org/teacon/xkdeco/util/ClientProxy.java index ab457763..d67205f7 100644 --- a/src/main/java/org/teacon/xkdeco/util/ClientProxy.java +++ b/src/main/java/org/teacon/xkdeco/util/ClientProxy.java @@ -1,16 +1,5 @@ package org.teacon.xkdeco.util; -import net.neoforged.api.distmarker.Dist; -import net.neoforged.bus.api.IEventBus; -import net.neoforged.fml.common.Mod; - -import net.neoforged.neoforge.client.event.EntityRenderersEvent; -import net.neoforged.neoforge.client.event.ModelEvent; -import net.neoforged.neoforge.client.event.RegisterClientReloadListenersEvent; - -import net.neoforged.neoforge.client.model.geometry.IGeometryLoader; -import net.neoforged.neoforge.event.AddPackFindersEvent; - import org.teacon.xkdeco.XKDeco; import org.teacon.xkdeco.client.forge.UnbakedGeometryWrapper; import org.teacon.xkdeco.client.model.AirDuctModel; @@ -28,20 +17,28 @@ import javax.annotation.ParametersAreNonnullByDefault; import net.minecraft.resources.ResourceLocation; import net.minecraft.util.GsonHelper; +import net.neoforged.api.distmarker.Dist; +import net.neoforged.bus.api.IEventBus; +import net.neoforged.fml.common.Mod; +import net.neoforged.neoforge.client.event.EntityRenderersEvent; +import net.neoforged.neoforge.client.event.ModelEvent; +import net.neoforged.neoforge.client.event.RegisterClientReloadListenersEvent; +import net.neoforged.neoforge.client.model.geometry.IGeometryLoader; +import net.neoforged.neoforge.event.AddPackFindersEvent; @Mod(value = XKDeco.ID, dist = Dist.CLIENT) @ParametersAreNonnullByDefault -public final class ClientProxy { // TODO[3TUSK]: We need to stop using the name "ClientProxy" ASAP +public final class ClientProxy { public static void setItemRenderers(RegisterClientReloadListenersEvent event) { event.registerReloadListener(XKDecoWithoutLevelRenderer.INSTANCE); } public static void setEntityRenderers(EntityRenderersEvent.RegisterRenderers event) { - event.registerBlockEntityRenderer(XKDecoEntityTypes.MIMIC_WALL.get(), MimicWallRenderer::new); - event.registerBlockEntityRenderer(XKDecoEntityTypes.ITEM_DISPLAY.get(), ItemDisplayRenderer::new); - event.registerBlockEntityRenderer(XKDecoEntityTypes.ITEM_PROJECTOR.get(), ItemDisplayRenderer::new); - event.registerBlockEntityRenderer(XKDecoEntityTypes.BLOCK_DISPLAY.get(), BlockDisplayRenderer::new); + event.registerBlockEntityRenderer(XKDecoEntityTypes.MIMIC_WALL.getOrCreate(), MimicWallRenderer::new); + event.registerBlockEntityRenderer(XKDecoEntityTypes.ITEM_DISPLAY.getOrCreate(), ItemDisplayRenderer::new); + event.registerBlockEntityRenderer(XKDecoEntityTypes.ITEM_PROJECTOR.getOrCreate(), ItemDisplayRenderer::new); + event.registerBlockEntityRenderer(XKDecoEntityTypes.BLOCK_DISPLAY.getOrCreate(), BlockDisplayRenderer::new); } public static void setAdditionalPackFinder(AddPackFindersEvent event) { diff --git a/src/main/java/org/teacon/xkdeco/util/CommonProxy.java b/src/main/java/org/teacon/xkdeco/util/CommonProxy.java index 0af9e511..253f5ed7 100644 --- a/src/main/java/org/teacon/xkdeco/util/CommonProxy.java +++ b/src/main/java/org/teacon/xkdeco/util/CommonProxy.java @@ -1,26 +1,15 @@ package org.teacon.xkdeco.util; -import net.minecraft.world.level.block.Block; -import net.neoforged.bus.api.EventPriority; -import net.neoforged.bus.api.IEventBus; -import net.neoforged.fml.common.Mod; - -import net.neoforged.neoforge.data.event.GatherDataEvent; - import org.teacon.xkdeco.XKDeco; import org.teacon.xkdeco.block.AirDuctBlock; import org.teacon.xkdeco.block.ItemDisplayBlock; import org.teacon.xkdeco.block.OneDirectionFenceGateBlock; import org.teacon.xkdeco.block.SpecialSlabBlock; import org.teacon.xkdeco.block.XKDBlock; -import org.teacon.xkdeco.data.XKDDataGen; import org.teacon.xkdeco.duck.XKDPlayer; import org.teacon.xkdeco.init.MimicWallsLoader; import org.teacon.xkdeco.mixin.forge.FenceGateBlockAccess; -import javax.annotation.ParametersAreNonnullByDefault; -import net.fabricmc.fabric.api.datagen.v1.FabricDataGenerator; -import net.minecraft.MethodsReturnNonnullByDefault; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.sounds.SoundEvent; @@ -29,16 +18,18 @@ import net.minecraft.world.entity.Pose; import net.minecraft.world.level.Level; import net.minecraft.world.level.LevelReader; +import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.FenceGateBlock; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.phys.AABB; import net.minecraft.world.phys.Vec3; +import net.neoforged.bus.api.EventPriority; +import net.neoforged.bus.api.IEventBus; +import net.neoforged.fml.common.Mod; import snownee.kiwi.customization.block.loader.BlockCodecs; @Mod(XKDeco.ID) -@MethodsReturnNonnullByDefault -@ParametersAreNonnullByDefault -public class CommonProxy { // TODO[3TUSK]: We need to stop using the name "CommonProxy" ASAP +public class CommonProxy { public CommonProxy(IEventBus modEventBus) { modEventBus.addListener(EventPriority.LOWEST, MimicWallsLoader::addMimicWallBlocks); @@ -49,8 +40,6 @@ public CommonProxy(IEventBus modEventBus) { // new XKDDataGen().onInitializeDataGenerator(dataGenerator); //}); - // Physical client check is replaced by NeoForge's sided @Mod entrypoint. - BlockCodecs.register(XKDeco.id("block"), Block.simpleCodec(XKDBlock::new)); BlockCodecs.register(XKDeco.id("special_slab"), SpecialSlabBlock.CODEC); BlockCodecs.register(XKDeco.id("one_direction_fence_gate"), OneDirectionFenceGateBlock.CODEC);