diff --git a/build.gradle b/build.gradle index a0ba2a70..a83ebd14 100644 --- a/build.gradle +++ b/build.gradle @@ -3,7 +3,7 @@ plugins { id 'eclipse' id 'idea' id 'maven-publish' - id 'net.neoforged.gradle.userdev' version '7.0.133' + id 'net.neoforged.gradle.userdev' version '7.0.142' } version = mod_version @@ -27,7 +27,8 @@ base { // Mojang ships Java 21 to end users starting in 1.20.5, so mods should target Java 21. java.toolchain.languageVersion = JavaLanguageVersion.of(21) -minecraft.accessTransformers.file rootProject.file('src/main/resources/META-INF/accesstransformer.cfg') +//minecraft.accessTransformers.file rootProject.file('src/main/resources/META-INF/accesstransformer.cfg') +//minecraft.accessTransformers.entry public net.minecraft.client.Minecraft textureManager # textureManager // Default run configurations. // These can be tweaked, removed, or duplicated as needed. diff --git a/gradle.properties b/gradle.properties index d0dc85e0..5dd60b23 100644 --- a/gradle.properties +++ b/gradle.properties @@ -10,19 +10,19 @@ neogradle.subsystems.parchment.mappingsVersion=2024.06.02 # Environment Properties # You can find the latest versions here: https://projects.neoforged.net/neoforged/neoforge # The Minecraft version must agree with the Neo version to get a valid artifact -minecraft_version=1.20.6 +minecraft_version=1.21 # The Minecraft version range can use any release version of Minecraft as bounds. # Snapshots, pre-releases, and release candidates are not guaranteed to sort properly # as they do not follow standard versioning conventions. -minecraft_version_range=[1.20.6,1.21) +minecraft_version_range=[1.21,1.21.1) # The Neo version must agree with the Minecraft version to get a valid artifact -neo_version=20.6.110-beta +neo_version=21.0.0-beta # The Neo version range can use any version of Neo as bounds -neo_version_range=[20.6,) +neo_version_range=[21.0.0-beta,) # The loader version range can only use the major version of FML as bounds -loader_version_range=[2,) +loader_version_range=[4,) -jade_version=5366595 +jade_version=5427817 ## Mod Properties @@ -34,7 +34,7 @@ mod_name=Floralis # The license of the mod. Review your options at https://choosealicense.com/. All Rights Reserved is the default. mod_license=MIT License # The mod version. See https://semver.org/ -mod_version=15.0.0 +mod_version=16.0.0 # The group ID for the mod. It is only important when publishing as an artifact to a Maven repository. # This should match the base package used for the mod sources. # See https://maven.apache.org/guides/mini/guide-naming-conventions.html diff --git a/src/generated/resources/data/c/tags/blocks/storage_blocks.json b/src/generated/resources/data/c/tags/block/storage_blocks.json similarity index 100% rename from src/generated/resources/data/c/tags/blocks/storage_blocks.json rename to src/generated/resources/data/c/tags/block/storage_blocks.json diff --git a/src/generated/resources/data/c/tags/items/fertilizer.json b/src/generated/resources/data/c/tags/item/fertilizer.json similarity index 100% rename from src/generated/resources/data/c/tags/items/fertilizer.json rename to src/generated/resources/data/c/tags/item/fertilizer.json diff --git a/src/generated/resources/data/c/tags/items/seeds.json b/src/generated/resources/data/c/tags/item/seeds.json similarity index 100% rename from src/generated/resources/data/c/tags/items/seeds.json rename to src/generated/resources/data/c/tags/item/seeds.json diff --git a/src/generated/resources/data/c/tags/items/storage_blocks.json b/src/generated/resources/data/c/tags/item/storage_blocks.json similarity index 100% rename from src/generated/resources/data/c/tags/items/storage_blocks.json rename to src/generated/resources/data/c/tags/item/storage_blocks.json diff --git a/src/generated/resources/data/floralis/advancements/recipes/misc/black_dye_block_from_black_dye.json b/src/generated/resources/data/floralis/advancement/recipes/misc/black_dye_block_from_black_dye.json similarity index 100% rename from src/generated/resources/data/floralis/advancements/recipes/misc/black_dye_block_from_black_dye.json rename to src/generated/resources/data/floralis/advancement/recipes/misc/black_dye_block_from_black_dye.json diff --git a/src/generated/resources/data/floralis/advancements/recipes/misc/black_dye_from_black_dye_block.json b/src/generated/resources/data/floralis/advancement/recipes/misc/black_dye_from_black_dye_block.json similarity index 100% rename from src/generated/resources/data/floralis/advancements/recipes/misc/black_dye_from_black_dye_block.json rename to src/generated/resources/data/floralis/advancement/recipes/misc/black_dye_from_black_dye_block.json diff --git a/src/generated/resources/data/floralis/advancements/recipes/misc/black_dye_from_smelting_black_petals.json b/src/generated/resources/data/floralis/advancement/recipes/misc/black_dye_from_smelting_black_petals.json similarity index 100% rename from src/generated/resources/data/floralis/advancements/recipes/misc/black_dye_from_smelting_black_petals.json rename to src/generated/resources/data/floralis/advancement/recipes/misc/black_dye_from_smelting_black_petals.json diff --git a/src/generated/resources/data/floralis/advancements/recipes/misc/blue_dye_block_from_blue_dye.json b/src/generated/resources/data/floralis/advancement/recipes/misc/blue_dye_block_from_blue_dye.json similarity index 100% rename from src/generated/resources/data/floralis/advancements/recipes/misc/blue_dye_block_from_blue_dye.json rename to src/generated/resources/data/floralis/advancement/recipes/misc/blue_dye_block_from_blue_dye.json diff --git a/src/generated/resources/data/floralis/advancements/recipes/misc/blue_dye_from_blue_dye_block.json b/src/generated/resources/data/floralis/advancement/recipes/misc/blue_dye_from_blue_dye_block.json similarity index 100% rename from src/generated/resources/data/floralis/advancements/recipes/misc/blue_dye_from_blue_dye_block.json rename to src/generated/resources/data/floralis/advancement/recipes/misc/blue_dye_from_blue_dye_block.json diff --git a/src/generated/resources/data/floralis/advancements/recipes/misc/blue_dye_from_smelting_blue_petals.json b/src/generated/resources/data/floralis/advancement/recipes/misc/blue_dye_from_smelting_blue_petals.json similarity index 100% rename from src/generated/resources/data/floralis/advancements/recipes/misc/blue_dye_from_smelting_blue_petals.json rename to src/generated/resources/data/floralis/advancement/recipes/misc/blue_dye_from_smelting_blue_petals.json diff --git a/src/generated/resources/data/floralis/advancements/recipes/misc/brown_dye_block_from_brown_dye.json b/src/generated/resources/data/floralis/advancement/recipes/misc/brown_dye_block_from_brown_dye.json similarity index 100% rename from src/generated/resources/data/floralis/advancements/recipes/misc/brown_dye_block_from_brown_dye.json rename to src/generated/resources/data/floralis/advancement/recipes/misc/brown_dye_block_from_brown_dye.json diff --git a/src/generated/resources/data/floralis/advancements/recipes/misc/brown_dye_from_brown_dye_block.json b/src/generated/resources/data/floralis/advancement/recipes/misc/brown_dye_from_brown_dye_block.json similarity index 100% rename from src/generated/resources/data/floralis/advancements/recipes/misc/brown_dye_from_brown_dye_block.json rename to src/generated/resources/data/floralis/advancement/recipes/misc/brown_dye_from_brown_dye_block.json diff --git a/src/generated/resources/data/floralis/advancements/recipes/misc/brown_dye_from_smelting_brown_petals.json b/src/generated/resources/data/floralis/advancement/recipes/misc/brown_dye_from_smelting_brown_petals.json similarity index 100% rename from src/generated/resources/data/floralis/advancements/recipes/misc/brown_dye_from_smelting_brown_petals.json rename to src/generated/resources/data/floralis/advancement/recipes/misc/brown_dye_from_smelting_brown_petals.json diff --git a/src/generated/resources/data/floralis/advancements/recipes/misc/cyan_dye_block_from_cyan_dye.json b/src/generated/resources/data/floralis/advancement/recipes/misc/cyan_dye_block_from_cyan_dye.json similarity index 100% rename from src/generated/resources/data/floralis/advancements/recipes/misc/cyan_dye_block_from_cyan_dye.json rename to src/generated/resources/data/floralis/advancement/recipes/misc/cyan_dye_block_from_cyan_dye.json diff --git a/src/generated/resources/data/floralis/advancements/recipes/misc/cyan_dye_from_cyan_dye_block.json b/src/generated/resources/data/floralis/advancement/recipes/misc/cyan_dye_from_cyan_dye_block.json similarity index 100% rename from src/generated/resources/data/floralis/advancements/recipes/misc/cyan_dye_from_cyan_dye_block.json rename to src/generated/resources/data/floralis/advancement/recipes/misc/cyan_dye_from_cyan_dye_block.json diff --git a/src/generated/resources/data/floralis/advancements/recipes/misc/cyan_dye_from_smelting_cyan_petals.json b/src/generated/resources/data/floralis/advancement/recipes/misc/cyan_dye_from_smelting_cyan_petals.json similarity index 100% rename from src/generated/resources/data/floralis/advancements/recipes/misc/cyan_dye_from_smelting_cyan_petals.json rename to src/generated/resources/data/floralis/advancement/recipes/misc/cyan_dye_from_smelting_cyan_petals.json diff --git a/src/generated/resources/data/floralis/advancements/recipes/misc/gray_dye_block_from_gray_dye.json b/src/generated/resources/data/floralis/advancement/recipes/misc/gray_dye_block_from_gray_dye.json similarity index 100% rename from src/generated/resources/data/floralis/advancements/recipes/misc/gray_dye_block_from_gray_dye.json rename to src/generated/resources/data/floralis/advancement/recipes/misc/gray_dye_block_from_gray_dye.json diff --git a/src/generated/resources/data/floralis/advancements/recipes/misc/gray_dye_from_gray_dye_block.json b/src/generated/resources/data/floralis/advancement/recipes/misc/gray_dye_from_gray_dye_block.json similarity index 100% rename from src/generated/resources/data/floralis/advancements/recipes/misc/gray_dye_from_gray_dye_block.json rename to src/generated/resources/data/floralis/advancement/recipes/misc/gray_dye_from_gray_dye_block.json diff --git a/src/generated/resources/data/floralis/advancements/recipes/misc/gray_dye_from_smelting_gray_petals.json b/src/generated/resources/data/floralis/advancement/recipes/misc/gray_dye_from_smelting_gray_petals.json similarity index 100% rename from src/generated/resources/data/floralis/advancements/recipes/misc/gray_dye_from_smelting_gray_petals.json rename to src/generated/resources/data/floralis/advancement/recipes/misc/gray_dye_from_smelting_gray_petals.json diff --git a/src/generated/resources/data/floralis/advancements/recipes/misc/green_dye_block_from_green_dye.json b/src/generated/resources/data/floralis/advancement/recipes/misc/green_dye_block_from_green_dye.json similarity index 100% rename from src/generated/resources/data/floralis/advancements/recipes/misc/green_dye_block_from_green_dye.json rename to src/generated/resources/data/floralis/advancement/recipes/misc/green_dye_block_from_green_dye.json diff --git a/src/generated/resources/data/floralis/advancements/recipes/misc/green_dye_from_green_dye_block.json b/src/generated/resources/data/floralis/advancement/recipes/misc/green_dye_from_green_dye_block.json similarity index 100% rename from src/generated/resources/data/floralis/advancements/recipes/misc/green_dye_from_green_dye_block.json rename to src/generated/resources/data/floralis/advancement/recipes/misc/green_dye_from_green_dye_block.json diff --git a/src/generated/resources/data/floralis/advancements/recipes/misc/green_dye_from_smelting_green_petals.json b/src/generated/resources/data/floralis/advancement/recipes/misc/green_dye_from_smelting_green_petals.json similarity index 100% rename from src/generated/resources/data/floralis/advancements/recipes/misc/green_dye_from_smelting_green_petals.json rename to src/generated/resources/data/floralis/advancement/recipes/misc/green_dye_from_smelting_green_petals.json diff --git a/src/generated/resources/data/floralis/advancements/recipes/misc/light_blue_dye_block_from_light_blue_dye.json b/src/generated/resources/data/floralis/advancement/recipes/misc/light_blue_dye_block_from_light_blue_dye.json similarity index 100% rename from src/generated/resources/data/floralis/advancements/recipes/misc/light_blue_dye_block_from_light_blue_dye.json rename to src/generated/resources/data/floralis/advancement/recipes/misc/light_blue_dye_block_from_light_blue_dye.json diff --git a/src/generated/resources/data/floralis/advancements/recipes/misc/light_blue_dye_from_light_blue_dye_block.json b/src/generated/resources/data/floralis/advancement/recipes/misc/light_blue_dye_from_light_blue_dye_block.json similarity index 100% rename from src/generated/resources/data/floralis/advancements/recipes/misc/light_blue_dye_from_light_blue_dye_block.json rename to src/generated/resources/data/floralis/advancement/recipes/misc/light_blue_dye_from_light_blue_dye_block.json diff --git a/src/generated/resources/data/floralis/advancements/recipes/misc/light_blue_dye_from_smelting_light_blue_petals.json b/src/generated/resources/data/floralis/advancement/recipes/misc/light_blue_dye_from_smelting_light_blue_petals.json similarity index 100% rename from src/generated/resources/data/floralis/advancements/recipes/misc/light_blue_dye_from_smelting_light_blue_petals.json rename to src/generated/resources/data/floralis/advancement/recipes/misc/light_blue_dye_from_smelting_light_blue_petals.json diff --git a/src/generated/resources/data/floralis/advancements/recipes/misc/light_gray_dye_block_from_light_gray_dye.json b/src/generated/resources/data/floralis/advancement/recipes/misc/light_gray_dye_block_from_light_gray_dye.json similarity index 100% rename from src/generated/resources/data/floralis/advancements/recipes/misc/light_gray_dye_block_from_light_gray_dye.json rename to src/generated/resources/data/floralis/advancement/recipes/misc/light_gray_dye_block_from_light_gray_dye.json diff --git a/src/generated/resources/data/floralis/advancements/recipes/misc/light_gray_dye_from_light_gray_dye_block.json b/src/generated/resources/data/floralis/advancement/recipes/misc/light_gray_dye_from_light_gray_dye_block.json similarity index 100% rename from src/generated/resources/data/floralis/advancements/recipes/misc/light_gray_dye_from_light_gray_dye_block.json rename to src/generated/resources/data/floralis/advancement/recipes/misc/light_gray_dye_from_light_gray_dye_block.json diff --git a/src/generated/resources/data/floralis/advancements/recipes/misc/light_gray_dye_from_smelting_light_gray_petals.json b/src/generated/resources/data/floralis/advancement/recipes/misc/light_gray_dye_from_smelting_light_gray_petals.json similarity index 100% rename from src/generated/resources/data/floralis/advancements/recipes/misc/light_gray_dye_from_smelting_light_gray_petals.json rename to src/generated/resources/data/floralis/advancement/recipes/misc/light_gray_dye_from_smelting_light_gray_petals.json diff --git a/src/generated/resources/data/floralis/advancements/recipes/misc/lime_dye_block_from_lime_dye.json b/src/generated/resources/data/floralis/advancement/recipes/misc/lime_dye_block_from_lime_dye.json similarity index 100% rename from src/generated/resources/data/floralis/advancements/recipes/misc/lime_dye_block_from_lime_dye.json rename to src/generated/resources/data/floralis/advancement/recipes/misc/lime_dye_block_from_lime_dye.json diff --git a/src/generated/resources/data/floralis/advancements/recipes/misc/lime_dye_from_lime_dye_block.json b/src/generated/resources/data/floralis/advancement/recipes/misc/lime_dye_from_lime_dye_block.json similarity index 100% rename from src/generated/resources/data/floralis/advancements/recipes/misc/lime_dye_from_lime_dye_block.json rename to src/generated/resources/data/floralis/advancement/recipes/misc/lime_dye_from_lime_dye_block.json diff --git a/src/generated/resources/data/floralis/advancements/recipes/misc/lime_dye_from_smelting_lime_petals.json b/src/generated/resources/data/floralis/advancement/recipes/misc/lime_dye_from_smelting_lime_petals.json similarity index 100% rename from src/generated/resources/data/floralis/advancements/recipes/misc/lime_dye_from_smelting_lime_petals.json rename to src/generated/resources/data/floralis/advancement/recipes/misc/lime_dye_from_smelting_lime_petals.json diff --git a/src/generated/resources/data/floralis/advancements/recipes/misc/magenta_dye_block_from_magenta_dye.json b/src/generated/resources/data/floralis/advancement/recipes/misc/magenta_dye_block_from_magenta_dye.json similarity index 100% rename from src/generated/resources/data/floralis/advancements/recipes/misc/magenta_dye_block_from_magenta_dye.json rename to src/generated/resources/data/floralis/advancement/recipes/misc/magenta_dye_block_from_magenta_dye.json diff --git a/src/generated/resources/data/floralis/advancements/recipes/misc/magenta_dye_from_magenta_dye_block.json b/src/generated/resources/data/floralis/advancement/recipes/misc/magenta_dye_from_magenta_dye_block.json similarity index 100% rename from src/generated/resources/data/floralis/advancements/recipes/misc/magenta_dye_from_magenta_dye_block.json rename to src/generated/resources/data/floralis/advancement/recipes/misc/magenta_dye_from_magenta_dye_block.json diff --git a/src/generated/resources/data/floralis/advancements/recipes/misc/magenta_dye_from_smelting_magenta_petals.json b/src/generated/resources/data/floralis/advancement/recipes/misc/magenta_dye_from_smelting_magenta_petals.json similarity index 100% rename from src/generated/resources/data/floralis/advancements/recipes/misc/magenta_dye_from_smelting_magenta_petals.json rename to src/generated/resources/data/floralis/advancement/recipes/misc/magenta_dye_from_smelting_magenta_petals.json diff --git a/src/generated/resources/data/floralis/advancements/recipes/misc/orange_dye_block_from_orange_dye.json b/src/generated/resources/data/floralis/advancement/recipes/misc/orange_dye_block_from_orange_dye.json similarity index 100% rename from src/generated/resources/data/floralis/advancements/recipes/misc/orange_dye_block_from_orange_dye.json rename to src/generated/resources/data/floralis/advancement/recipes/misc/orange_dye_block_from_orange_dye.json diff --git a/src/generated/resources/data/floralis/advancements/recipes/misc/orange_dye_from_orange_dye_block.json b/src/generated/resources/data/floralis/advancement/recipes/misc/orange_dye_from_orange_dye_block.json similarity index 100% rename from src/generated/resources/data/floralis/advancements/recipes/misc/orange_dye_from_orange_dye_block.json rename to src/generated/resources/data/floralis/advancement/recipes/misc/orange_dye_from_orange_dye_block.json diff --git a/src/generated/resources/data/floralis/advancements/recipes/misc/orange_dye_from_smelting_orange_petals.json b/src/generated/resources/data/floralis/advancement/recipes/misc/orange_dye_from_smelting_orange_petals.json similarity index 100% rename from src/generated/resources/data/floralis/advancements/recipes/misc/orange_dye_from_smelting_orange_petals.json rename to src/generated/resources/data/floralis/advancement/recipes/misc/orange_dye_from_smelting_orange_petals.json diff --git a/src/generated/resources/data/floralis/advancements/recipes/misc/pink_dye_block_from_pink_dye.json b/src/generated/resources/data/floralis/advancement/recipes/misc/pink_dye_block_from_pink_dye.json similarity index 100% rename from src/generated/resources/data/floralis/advancements/recipes/misc/pink_dye_block_from_pink_dye.json rename to src/generated/resources/data/floralis/advancement/recipes/misc/pink_dye_block_from_pink_dye.json diff --git a/src/generated/resources/data/floralis/advancements/recipes/misc/pink_dye_from_pink_dye_block.json b/src/generated/resources/data/floralis/advancement/recipes/misc/pink_dye_from_pink_dye_block.json similarity index 100% rename from src/generated/resources/data/floralis/advancements/recipes/misc/pink_dye_from_pink_dye_block.json rename to src/generated/resources/data/floralis/advancement/recipes/misc/pink_dye_from_pink_dye_block.json diff --git a/src/generated/resources/data/floralis/advancements/recipes/misc/pink_dye_from_smelting_pink_petals.json b/src/generated/resources/data/floralis/advancement/recipes/misc/pink_dye_from_smelting_pink_petals.json similarity index 100% rename from src/generated/resources/data/floralis/advancements/recipes/misc/pink_dye_from_smelting_pink_petals.json rename to src/generated/resources/data/floralis/advancement/recipes/misc/pink_dye_from_smelting_pink_petals.json diff --git a/src/generated/resources/data/floralis/advancements/recipes/misc/plant_fibers_block_from_plant_fibers.json b/src/generated/resources/data/floralis/advancement/recipes/misc/plant_fibers_block_from_plant_fibers.json similarity index 100% rename from src/generated/resources/data/floralis/advancements/recipes/misc/plant_fibers_block_from_plant_fibers.json rename to src/generated/resources/data/floralis/advancement/recipes/misc/plant_fibers_block_from_plant_fibers.json diff --git a/src/generated/resources/data/floralis/advancements/recipes/misc/plant_fibers_from_plant_fibers_block.json b/src/generated/resources/data/floralis/advancement/recipes/misc/plant_fibers_from_plant_fibers_block.json similarity index 100% rename from src/generated/resources/data/floralis/advancements/recipes/misc/plant_fibers_from_plant_fibers_block.json rename to src/generated/resources/data/floralis/advancement/recipes/misc/plant_fibers_from_plant_fibers_block.json diff --git a/src/generated/resources/data/floralis/advancements/recipes/misc/purple_dye_block_from_purple_dye.json b/src/generated/resources/data/floralis/advancement/recipes/misc/purple_dye_block_from_purple_dye.json similarity index 100% rename from src/generated/resources/data/floralis/advancements/recipes/misc/purple_dye_block_from_purple_dye.json rename to src/generated/resources/data/floralis/advancement/recipes/misc/purple_dye_block_from_purple_dye.json diff --git a/src/generated/resources/data/floralis/advancements/recipes/misc/purple_dye_from_purple_dye_block.json b/src/generated/resources/data/floralis/advancement/recipes/misc/purple_dye_from_purple_dye_block.json similarity index 100% rename from src/generated/resources/data/floralis/advancements/recipes/misc/purple_dye_from_purple_dye_block.json rename to src/generated/resources/data/floralis/advancement/recipes/misc/purple_dye_from_purple_dye_block.json diff --git a/src/generated/resources/data/floralis/advancements/recipes/misc/purple_dye_from_smelting_purple_petals.json b/src/generated/resources/data/floralis/advancement/recipes/misc/purple_dye_from_smelting_purple_petals.json similarity index 100% rename from src/generated/resources/data/floralis/advancements/recipes/misc/purple_dye_from_smelting_purple_petals.json rename to src/generated/resources/data/floralis/advancement/recipes/misc/purple_dye_from_smelting_purple_petals.json diff --git a/src/generated/resources/data/floralis/advancements/recipes/misc/red_dye_block_from_red_dye.json b/src/generated/resources/data/floralis/advancement/recipes/misc/red_dye_block_from_red_dye.json similarity index 100% rename from src/generated/resources/data/floralis/advancements/recipes/misc/red_dye_block_from_red_dye.json rename to src/generated/resources/data/floralis/advancement/recipes/misc/red_dye_block_from_red_dye.json diff --git a/src/generated/resources/data/floralis/advancements/recipes/misc/red_dye_from_red_dye_block.json b/src/generated/resources/data/floralis/advancement/recipes/misc/red_dye_from_red_dye_block.json similarity index 100% rename from src/generated/resources/data/floralis/advancements/recipes/misc/red_dye_from_red_dye_block.json rename to src/generated/resources/data/floralis/advancement/recipes/misc/red_dye_from_red_dye_block.json diff --git a/src/generated/resources/data/floralis/advancements/recipes/misc/red_dye_from_smelting_red_petals.json b/src/generated/resources/data/floralis/advancement/recipes/misc/red_dye_from_smelting_red_petals.json similarity index 100% rename from src/generated/resources/data/floralis/advancements/recipes/misc/red_dye_from_smelting_red_petals.json rename to src/generated/resources/data/floralis/advancement/recipes/misc/red_dye_from_smelting_red_petals.json diff --git a/src/generated/resources/data/floralis/advancements/recipes/misc/white_dye_block_from_white_dye.json b/src/generated/resources/data/floralis/advancement/recipes/misc/white_dye_block_from_white_dye.json similarity index 100% rename from src/generated/resources/data/floralis/advancements/recipes/misc/white_dye_block_from_white_dye.json rename to src/generated/resources/data/floralis/advancement/recipes/misc/white_dye_block_from_white_dye.json diff --git a/src/generated/resources/data/floralis/advancements/recipes/misc/white_dye_from_smelting_white_petals.json b/src/generated/resources/data/floralis/advancement/recipes/misc/white_dye_from_smelting_white_petals.json similarity index 100% rename from src/generated/resources/data/floralis/advancements/recipes/misc/white_dye_from_smelting_white_petals.json rename to src/generated/resources/data/floralis/advancement/recipes/misc/white_dye_from_smelting_white_petals.json diff --git a/src/generated/resources/data/floralis/advancements/recipes/misc/white_dye_from_white_dye_block.json b/src/generated/resources/data/floralis/advancement/recipes/misc/white_dye_from_white_dye_block.json similarity index 100% rename from src/generated/resources/data/floralis/advancements/recipes/misc/white_dye_from_white_dye_block.json rename to src/generated/resources/data/floralis/advancement/recipes/misc/white_dye_from_white_dye_block.json diff --git a/src/generated/resources/data/floralis/advancements/recipes/misc/yellow_dye_block_from_yellow_dye.json b/src/generated/resources/data/floralis/advancement/recipes/misc/yellow_dye_block_from_yellow_dye.json similarity index 100% rename from src/generated/resources/data/floralis/advancements/recipes/misc/yellow_dye_block_from_yellow_dye.json rename to src/generated/resources/data/floralis/advancement/recipes/misc/yellow_dye_block_from_yellow_dye.json diff --git a/src/generated/resources/data/floralis/advancements/recipes/misc/yellow_dye_from_smelting_yellow_petals.json b/src/generated/resources/data/floralis/advancement/recipes/misc/yellow_dye_from_smelting_yellow_petals.json similarity index 100% rename from src/generated/resources/data/floralis/advancements/recipes/misc/yellow_dye_from_smelting_yellow_petals.json rename to src/generated/resources/data/floralis/advancement/recipes/misc/yellow_dye_from_smelting_yellow_petals.json diff --git a/src/generated/resources/data/floralis/advancements/recipes/misc/yellow_dye_from_yellow_dye_block.json b/src/generated/resources/data/floralis/advancement/recipes/misc/yellow_dye_from_yellow_dye_block.json similarity index 100% rename from src/generated/resources/data/floralis/advancements/recipes/misc/yellow_dye_from_yellow_dye_block.json rename to src/generated/resources/data/floralis/advancement/recipes/misc/yellow_dye_from_yellow_dye_block.json diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/black_cactus.json b/src/generated/resources/data/floralis/loot_table/blocks/black_cactus.json similarity index 95% rename from src/generated/resources/data/floralis/loot_tables/blocks/black_cactus.json rename to src/generated/resources/data/floralis/loot_table/blocks/black_cactus.json index 358a4b8c..1d1d29b3 100644 --- a/src/generated/resources/data/floralis/loot_tables/blocks/black_cactus.json +++ b/src/generated/resources/data/floralis/loot_table/blocks/black_cactus.json @@ -22,7 +22,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -62,7 +62,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -118,7 +118,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -169,7 +169,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/black_cactus_crop.json b/src/generated/resources/data/floralis/loot_table/blocks/black_cactus_crop.json similarity index 95% rename from src/generated/resources/data/floralis/loot_tables/blocks/black_cactus_crop.json rename to src/generated/resources/data/floralis/loot_table/blocks/black_cactus_crop.json index 0f44a7f7..5097196c 100644 --- a/src/generated/resources/data/floralis/loot_tables/blocks/black_cactus_crop.json +++ b/src/generated/resources/data/floralis/loot_table/blocks/black_cactus_crop.json @@ -22,7 +22,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -67,7 +67,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -117,7 +117,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -180,7 +180,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -238,7 +238,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -296,7 +296,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/black_dye_block.json b/src/generated/resources/data/floralis/loot_table/blocks/black_dye_block.json similarity index 100% rename from src/generated/resources/data/floralis/loot_tables/blocks/black_dye_block.json rename to src/generated/resources/data/floralis/loot_table/blocks/black_dye_block.json diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/black_flower.json b/src/generated/resources/data/floralis/loot_table/blocks/black_flower.json similarity index 95% rename from src/generated/resources/data/floralis/loot_tables/blocks/black_flower.json rename to src/generated/resources/data/floralis/loot_table/blocks/black_flower.json index 1f4698ef..c994880b 100644 --- a/src/generated/resources/data/floralis/loot_tables/blocks/black_flower.json +++ b/src/generated/resources/data/floralis/loot_table/blocks/black_flower.json @@ -22,7 +22,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -62,7 +62,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -118,7 +118,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -169,7 +169,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/black_flower_crop.json b/src/generated/resources/data/floralis/loot_table/blocks/black_flower_crop.json similarity index 95% rename from src/generated/resources/data/floralis/loot_tables/blocks/black_flower_crop.json rename to src/generated/resources/data/floralis/loot_table/blocks/black_flower_crop.json index 04c6a305..bb3e0080 100644 --- a/src/generated/resources/data/floralis/loot_tables/blocks/black_flower_crop.json +++ b/src/generated/resources/data/floralis/loot_table/blocks/black_flower_crop.json @@ -22,7 +22,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -67,7 +67,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -117,7 +117,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -180,7 +180,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -238,7 +238,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -296,7 +296,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/blue_cactus.json b/src/generated/resources/data/floralis/loot_table/blocks/blue_cactus.json similarity index 95% rename from src/generated/resources/data/floralis/loot_tables/blocks/blue_cactus.json rename to src/generated/resources/data/floralis/loot_table/blocks/blue_cactus.json index 3fbefe6b..b5d033cf 100644 --- a/src/generated/resources/data/floralis/loot_tables/blocks/blue_cactus.json +++ b/src/generated/resources/data/floralis/loot_table/blocks/blue_cactus.json @@ -22,7 +22,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -62,7 +62,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -118,7 +118,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -169,7 +169,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/blue_cactus_crop.json b/src/generated/resources/data/floralis/loot_table/blocks/blue_cactus_crop.json similarity index 95% rename from src/generated/resources/data/floralis/loot_tables/blocks/blue_cactus_crop.json rename to src/generated/resources/data/floralis/loot_table/blocks/blue_cactus_crop.json index b330fef7..d65b4e14 100644 --- a/src/generated/resources/data/floralis/loot_tables/blocks/blue_cactus_crop.json +++ b/src/generated/resources/data/floralis/loot_table/blocks/blue_cactus_crop.json @@ -22,7 +22,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -67,7 +67,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -117,7 +117,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -180,7 +180,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -238,7 +238,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -296,7 +296,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/blue_dye_block.json b/src/generated/resources/data/floralis/loot_table/blocks/blue_dye_block.json similarity index 100% rename from src/generated/resources/data/floralis/loot_tables/blocks/blue_dye_block.json rename to src/generated/resources/data/floralis/loot_table/blocks/blue_dye_block.json diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/blue_flower.json b/src/generated/resources/data/floralis/loot_table/blocks/blue_flower.json similarity index 95% rename from src/generated/resources/data/floralis/loot_tables/blocks/blue_flower.json rename to src/generated/resources/data/floralis/loot_table/blocks/blue_flower.json index 0dfeefef..cd87c3bd 100644 --- a/src/generated/resources/data/floralis/loot_tables/blocks/blue_flower.json +++ b/src/generated/resources/data/floralis/loot_table/blocks/blue_flower.json @@ -22,7 +22,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -62,7 +62,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -118,7 +118,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -169,7 +169,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/blue_flower_crop.json b/src/generated/resources/data/floralis/loot_table/blocks/blue_flower_crop.json similarity index 95% rename from src/generated/resources/data/floralis/loot_tables/blocks/blue_flower_crop.json rename to src/generated/resources/data/floralis/loot_table/blocks/blue_flower_crop.json index 4fae1fcf..8f546a13 100644 --- a/src/generated/resources/data/floralis/loot_tables/blocks/blue_flower_crop.json +++ b/src/generated/resources/data/floralis/loot_table/blocks/blue_flower_crop.json @@ -22,7 +22,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -67,7 +67,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -117,7 +117,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -180,7 +180,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -238,7 +238,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -296,7 +296,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/brown_cactus.json b/src/generated/resources/data/floralis/loot_table/blocks/brown_cactus.json similarity index 95% rename from src/generated/resources/data/floralis/loot_tables/blocks/brown_cactus.json rename to src/generated/resources/data/floralis/loot_table/blocks/brown_cactus.json index b0f74207..4359365b 100644 --- a/src/generated/resources/data/floralis/loot_tables/blocks/brown_cactus.json +++ b/src/generated/resources/data/floralis/loot_table/blocks/brown_cactus.json @@ -22,7 +22,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -62,7 +62,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -118,7 +118,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -169,7 +169,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/brown_cactus_crop.json b/src/generated/resources/data/floralis/loot_table/blocks/brown_cactus_crop.json similarity index 95% rename from src/generated/resources/data/floralis/loot_tables/blocks/brown_cactus_crop.json rename to src/generated/resources/data/floralis/loot_table/blocks/brown_cactus_crop.json index 2cf514df..9cbbc8b7 100644 --- a/src/generated/resources/data/floralis/loot_tables/blocks/brown_cactus_crop.json +++ b/src/generated/resources/data/floralis/loot_table/blocks/brown_cactus_crop.json @@ -22,7 +22,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -67,7 +67,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -117,7 +117,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -180,7 +180,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -238,7 +238,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -296,7 +296,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/brown_dye_block.json b/src/generated/resources/data/floralis/loot_table/blocks/brown_dye_block.json similarity index 100% rename from src/generated/resources/data/floralis/loot_tables/blocks/brown_dye_block.json rename to src/generated/resources/data/floralis/loot_table/blocks/brown_dye_block.json diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/brown_flower.json b/src/generated/resources/data/floralis/loot_table/blocks/brown_flower.json similarity index 95% rename from src/generated/resources/data/floralis/loot_tables/blocks/brown_flower.json rename to src/generated/resources/data/floralis/loot_table/blocks/brown_flower.json index 0e711bf8..f042c1e0 100644 --- a/src/generated/resources/data/floralis/loot_tables/blocks/brown_flower.json +++ b/src/generated/resources/data/floralis/loot_table/blocks/brown_flower.json @@ -22,7 +22,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -62,7 +62,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -118,7 +118,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -169,7 +169,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/brown_flower_crop.json b/src/generated/resources/data/floralis/loot_table/blocks/brown_flower_crop.json similarity index 95% rename from src/generated/resources/data/floralis/loot_tables/blocks/brown_flower_crop.json rename to src/generated/resources/data/floralis/loot_table/blocks/brown_flower_crop.json index eff69b00..c4713371 100644 --- a/src/generated/resources/data/floralis/loot_tables/blocks/brown_flower_crop.json +++ b/src/generated/resources/data/floralis/loot_table/blocks/brown_flower_crop.json @@ -22,7 +22,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -67,7 +67,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -117,7 +117,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -180,7 +180,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -238,7 +238,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -296,7 +296,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/cloched_black_cactus_crop.json b/src/generated/resources/data/floralis/loot_table/blocks/cloched_black_cactus_crop.json similarity index 100% rename from src/generated/resources/data/floralis/loot_tables/blocks/cloched_black_cactus_crop.json rename to src/generated/resources/data/floralis/loot_table/blocks/cloched_black_cactus_crop.json diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/cloched_black_flower_crop.json b/src/generated/resources/data/floralis/loot_table/blocks/cloched_black_flower_crop.json similarity index 100% rename from src/generated/resources/data/floralis/loot_tables/blocks/cloched_black_flower_crop.json rename to src/generated/resources/data/floralis/loot_table/blocks/cloched_black_flower_crop.json diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/cloched_blue_cactus_crop.json b/src/generated/resources/data/floralis/loot_table/blocks/cloched_blue_cactus_crop.json similarity index 100% rename from src/generated/resources/data/floralis/loot_tables/blocks/cloched_blue_cactus_crop.json rename to src/generated/resources/data/floralis/loot_table/blocks/cloched_blue_cactus_crop.json diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/cloched_blue_flower_crop.json b/src/generated/resources/data/floralis/loot_table/blocks/cloched_blue_flower_crop.json similarity index 100% rename from src/generated/resources/data/floralis/loot_tables/blocks/cloched_blue_flower_crop.json rename to src/generated/resources/data/floralis/loot_table/blocks/cloched_blue_flower_crop.json diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/cloched_brown_cactus_crop.json b/src/generated/resources/data/floralis/loot_table/blocks/cloched_brown_cactus_crop.json similarity index 100% rename from src/generated/resources/data/floralis/loot_tables/blocks/cloched_brown_cactus_crop.json rename to src/generated/resources/data/floralis/loot_table/blocks/cloched_brown_cactus_crop.json diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/cloched_brown_flower_crop.json b/src/generated/resources/data/floralis/loot_table/blocks/cloched_brown_flower_crop.json similarity index 100% rename from src/generated/resources/data/floralis/loot_tables/blocks/cloched_brown_flower_crop.json rename to src/generated/resources/data/floralis/loot_table/blocks/cloched_brown_flower_crop.json diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/cloched_cyan_cactus_crop.json b/src/generated/resources/data/floralis/loot_table/blocks/cloched_cyan_cactus_crop.json similarity index 100% rename from src/generated/resources/data/floralis/loot_tables/blocks/cloched_cyan_cactus_crop.json rename to src/generated/resources/data/floralis/loot_table/blocks/cloched_cyan_cactus_crop.json diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/cloched_cyan_flower_crop.json b/src/generated/resources/data/floralis/loot_table/blocks/cloched_cyan_flower_crop.json similarity index 100% rename from src/generated/resources/data/floralis/loot_tables/blocks/cloched_cyan_flower_crop.json rename to src/generated/resources/data/floralis/loot_table/blocks/cloched_cyan_flower_crop.json diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/cloched_gray_cactus_crop.json b/src/generated/resources/data/floralis/loot_table/blocks/cloched_gray_cactus_crop.json similarity index 100% rename from src/generated/resources/data/floralis/loot_tables/blocks/cloched_gray_cactus_crop.json rename to src/generated/resources/data/floralis/loot_table/blocks/cloched_gray_cactus_crop.json diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/cloched_gray_flower_crop.json b/src/generated/resources/data/floralis/loot_table/blocks/cloched_gray_flower_crop.json similarity index 100% rename from src/generated/resources/data/floralis/loot_tables/blocks/cloched_gray_flower_crop.json rename to src/generated/resources/data/floralis/loot_table/blocks/cloched_gray_flower_crop.json diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/cloched_green_cactus_crop.json b/src/generated/resources/data/floralis/loot_table/blocks/cloched_green_cactus_crop.json similarity index 100% rename from src/generated/resources/data/floralis/loot_tables/blocks/cloched_green_cactus_crop.json rename to src/generated/resources/data/floralis/loot_table/blocks/cloched_green_cactus_crop.json diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/cloched_green_flower_crop.json b/src/generated/resources/data/floralis/loot_table/blocks/cloched_green_flower_crop.json similarity index 100% rename from src/generated/resources/data/floralis/loot_tables/blocks/cloched_green_flower_crop.json rename to src/generated/resources/data/floralis/loot_table/blocks/cloched_green_flower_crop.json diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/cloched_light_blue_cactus_crop.json b/src/generated/resources/data/floralis/loot_table/blocks/cloched_light_blue_cactus_crop.json similarity index 100% rename from src/generated/resources/data/floralis/loot_tables/blocks/cloched_light_blue_cactus_crop.json rename to src/generated/resources/data/floralis/loot_table/blocks/cloched_light_blue_cactus_crop.json diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/cloched_light_blue_flower_crop.json b/src/generated/resources/data/floralis/loot_table/blocks/cloched_light_blue_flower_crop.json similarity index 100% rename from src/generated/resources/data/floralis/loot_tables/blocks/cloched_light_blue_flower_crop.json rename to src/generated/resources/data/floralis/loot_table/blocks/cloched_light_blue_flower_crop.json diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/cloched_light_gray_cactus_crop.json b/src/generated/resources/data/floralis/loot_table/blocks/cloched_light_gray_cactus_crop.json similarity index 100% rename from src/generated/resources/data/floralis/loot_tables/blocks/cloched_light_gray_cactus_crop.json rename to src/generated/resources/data/floralis/loot_table/blocks/cloched_light_gray_cactus_crop.json diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/cloched_light_gray_flower_crop.json b/src/generated/resources/data/floralis/loot_table/blocks/cloched_light_gray_flower_crop.json similarity index 100% rename from src/generated/resources/data/floralis/loot_tables/blocks/cloched_light_gray_flower_crop.json rename to src/generated/resources/data/floralis/loot_table/blocks/cloched_light_gray_flower_crop.json diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/cloched_lime_cactus_crop.json b/src/generated/resources/data/floralis/loot_table/blocks/cloched_lime_cactus_crop.json similarity index 100% rename from src/generated/resources/data/floralis/loot_tables/blocks/cloched_lime_cactus_crop.json rename to src/generated/resources/data/floralis/loot_table/blocks/cloched_lime_cactus_crop.json diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/cloched_lime_flower_crop.json b/src/generated/resources/data/floralis/loot_table/blocks/cloched_lime_flower_crop.json similarity index 100% rename from src/generated/resources/data/floralis/loot_tables/blocks/cloched_lime_flower_crop.json rename to src/generated/resources/data/floralis/loot_table/blocks/cloched_lime_flower_crop.json diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/cloched_magenta_cactus_crop.json b/src/generated/resources/data/floralis/loot_table/blocks/cloched_magenta_cactus_crop.json similarity index 100% rename from src/generated/resources/data/floralis/loot_tables/blocks/cloched_magenta_cactus_crop.json rename to src/generated/resources/data/floralis/loot_table/blocks/cloched_magenta_cactus_crop.json diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/cloched_magenta_flower_crop.json b/src/generated/resources/data/floralis/loot_table/blocks/cloched_magenta_flower_crop.json similarity index 100% rename from src/generated/resources/data/floralis/loot_tables/blocks/cloched_magenta_flower_crop.json rename to src/generated/resources/data/floralis/loot_table/blocks/cloched_magenta_flower_crop.json diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/cloched_orange_cactus_crop.json b/src/generated/resources/data/floralis/loot_table/blocks/cloched_orange_cactus_crop.json similarity index 100% rename from src/generated/resources/data/floralis/loot_tables/blocks/cloched_orange_cactus_crop.json rename to src/generated/resources/data/floralis/loot_table/blocks/cloched_orange_cactus_crop.json diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/cloched_orange_flower_crop.json b/src/generated/resources/data/floralis/loot_table/blocks/cloched_orange_flower_crop.json similarity index 100% rename from src/generated/resources/data/floralis/loot_tables/blocks/cloched_orange_flower_crop.json rename to src/generated/resources/data/floralis/loot_table/blocks/cloched_orange_flower_crop.json diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/cloched_pink_cactus_crop.json b/src/generated/resources/data/floralis/loot_table/blocks/cloched_pink_cactus_crop.json similarity index 100% rename from src/generated/resources/data/floralis/loot_tables/blocks/cloched_pink_cactus_crop.json rename to src/generated/resources/data/floralis/loot_table/blocks/cloched_pink_cactus_crop.json diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/cloched_pink_flower_crop.json b/src/generated/resources/data/floralis/loot_table/blocks/cloched_pink_flower_crop.json similarity index 100% rename from src/generated/resources/data/floralis/loot_tables/blocks/cloched_pink_flower_crop.json rename to src/generated/resources/data/floralis/loot_table/blocks/cloched_pink_flower_crop.json diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/cloched_purple_cactus_crop.json b/src/generated/resources/data/floralis/loot_table/blocks/cloched_purple_cactus_crop.json similarity index 100% rename from src/generated/resources/data/floralis/loot_tables/blocks/cloched_purple_cactus_crop.json rename to src/generated/resources/data/floralis/loot_table/blocks/cloched_purple_cactus_crop.json diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/cloched_purple_flower_crop.json b/src/generated/resources/data/floralis/loot_table/blocks/cloched_purple_flower_crop.json similarity index 100% rename from src/generated/resources/data/floralis/loot_tables/blocks/cloched_purple_flower_crop.json rename to src/generated/resources/data/floralis/loot_table/blocks/cloched_purple_flower_crop.json diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/cloched_red_cactus_crop.json b/src/generated/resources/data/floralis/loot_table/blocks/cloched_red_cactus_crop.json similarity index 100% rename from src/generated/resources/data/floralis/loot_tables/blocks/cloched_red_cactus_crop.json rename to src/generated/resources/data/floralis/loot_table/blocks/cloched_red_cactus_crop.json diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/cloched_red_flower_crop.json b/src/generated/resources/data/floralis/loot_table/blocks/cloched_red_flower_crop.json similarity index 100% rename from src/generated/resources/data/floralis/loot_tables/blocks/cloched_red_flower_crop.json rename to src/generated/resources/data/floralis/loot_table/blocks/cloched_red_flower_crop.json diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/cloched_white_cactus_crop.json b/src/generated/resources/data/floralis/loot_table/blocks/cloched_white_cactus_crop.json similarity index 100% rename from src/generated/resources/data/floralis/loot_tables/blocks/cloched_white_cactus_crop.json rename to src/generated/resources/data/floralis/loot_table/blocks/cloched_white_cactus_crop.json diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/cloched_white_flower_crop.json b/src/generated/resources/data/floralis/loot_table/blocks/cloched_white_flower_crop.json similarity index 100% rename from src/generated/resources/data/floralis/loot_tables/blocks/cloched_white_flower_crop.json rename to src/generated/resources/data/floralis/loot_table/blocks/cloched_white_flower_crop.json diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/cloched_yellow_cactus_crop.json b/src/generated/resources/data/floralis/loot_table/blocks/cloched_yellow_cactus_crop.json similarity index 100% rename from src/generated/resources/data/floralis/loot_tables/blocks/cloched_yellow_cactus_crop.json rename to src/generated/resources/data/floralis/loot_table/blocks/cloched_yellow_cactus_crop.json diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/cloched_yellow_flower_crop.json b/src/generated/resources/data/floralis/loot_table/blocks/cloched_yellow_flower_crop.json similarity index 100% rename from src/generated/resources/data/floralis/loot_tables/blocks/cloched_yellow_flower_crop.json rename to src/generated/resources/data/floralis/loot_table/blocks/cloched_yellow_flower_crop.json diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/cyan_cactus.json b/src/generated/resources/data/floralis/loot_table/blocks/cyan_cactus.json similarity index 95% rename from src/generated/resources/data/floralis/loot_tables/blocks/cyan_cactus.json rename to src/generated/resources/data/floralis/loot_table/blocks/cyan_cactus.json index 55154a63..71db72f2 100644 --- a/src/generated/resources/data/floralis/loot_tables/blocks/cyan_cactus.json +++ b/src/generated/resources/data/floralis/loot_table/blocks/cyan_cactus.json @@ -22,7 +22,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -62,7 +62,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -118,7 +118,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -169,7 +169,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/cyan_cactus_crop.json b/src/generated/resources/data/floralis/loot_table/blocks/cyan_cactus_crop.json similarity index 95% rename from src/generated/resources/data/floralis/loot_tables/blocks/cyan_cactus_crop.json rename to src/generated/resources/data/floralis/loot_table/blocks/cyan_cactus_crop.json index c4fc1973..85619d4b 100644 --- a/src/generated/resources/data/floralis/loot_tables/blocks/cyan_cactus_crop.json +++ b/src/generated/resources/data/floralis/loot_table/blocks/cyan_cactus_crop.json @@ -22,7 +22,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -67,7 +67,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -117,7 +117,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -180,7 +180,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -238,7 +238,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -296,7 +296,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/cyan_dye_block.json b/src/generated/resources/data/floralis/loot_table/blocks/cyan_dye_block.json similarity index 100% rename from src/generated/resources/data/floralis/loot_tables/blocks/cyan_dye_block.json rename to src/generated/resources/data/floralis/loot_table/blocks/cyan_dye_block.json diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/cyan_flower.json b/src/generated/resources/data/floralis/loot_table/blocks/cyan_flower.json similarity index 95% rename from src/generated/resources/data/floralis/loot_tables/blocks/cyan_flower.json rename to src/generated/resources/data/floralis/loot_table/blocks/cyan_flower.json index 0a03693e..d261da0d 100644 --- a/src/generated/resources/data/floralis/loot_tables/blocks/cyan_flower.json +++ b/src/generated/resources/data/floralis/loot_table/blocks/cyan_flower.json @@ -22,7 +22,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -62,7 +62,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -118,7 +118,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -169,7 +169,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/cyan_flower_crop.json b/src/generated/resources/data/floralis/loot_table/blocks/cyan_flower_crop.json similarity index 95% rename from src/generated/resources/data/floralis/loot_tables/blocks/cyan_flower_crop.json rename to src/generated/resources/data/floralis/loot_table/blocks/cyan_flower_crop.json index 9662643f..bb0edf8f 100644 --- a/src/generated/resources/data/floralis/loot_tables/blocks/cyan_flower_crop.json +++ b/src/generated/resources/data/floralis/loot_table/blocks/cyan_flower_crop.json @@ -22,7 +22,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -67,7 +67,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -117,7 +117,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -180,7 +180,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -238,7 +238,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -296,7 +296,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/gray_cactus.json b/src/generated/resources/data/floralis/loot_table/blocks/gray_cactus.json similarity index 95% rename from src/generated/resources/data/floralis/loot_tables/blocks/gray_cactus.json rename to src/generated/resources/data/floralis/loot_table/blocks/gray_cactus.json index 4f582d4c..d83a17eb 100644 --- a/src/generated/resources/data/floralis/loot_tables/blocks/gray_cactus.json +++ b/src/generated/resources/data/floralis/loot_table/blocks/gray_cactus.json @@ -22,7 +22,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -62,7 +62,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -118,7 +118,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -169,7 +169,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/gray_cactus_crop.json b/src/generated/resources/data/floralis/loot_table/blocks/gray_cactus_crop.json similarity index 95% rename from src/generated/resources/data/floralis/loot_tables/blocks/gray_cactus_crop.json rename to src/generated/resources/data/floralis/loot_table/blocks/gray_cactus_crop.json index 1de93f5f..378ccf0a 100644 --- a/src/generated/resources/data/floralis/loot_tables/blocks/gray_cactus_crop.json +++ b/src/generated/resources/data/floralis/loot_table/blocks/gray_cactus_crop.json @@ -22,7 +22,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -67,7 +67,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -117,7 +117,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -180,7 +180,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -238,7 +238,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -296,7 +296,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/gray_dye_block.json b/src/generated/resources/data/floralis/loot_table/blocks/gray_dye_block.json similarity index 100% rename from src/generated/resources/data/floralis/loot_tables/blocks/gray_dye_block.json rename to src/generated/resources/data/floralis/loot_table/blocks/gray_dye_block.json diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/gray_flower.json b/src/generated/resources/data/floralis/loot_table/blocks/gray_flower.json similarity index 95% rename from src/generated/resources/data/floralis/loot_tables/blocks/gray_flower.json rename to src/generated/resources/data/floralis/loot_table/blocks/gray_flower.json index a92f0a9d..61fc0ae5 100644 --- a/src/generated/resources/data/floralis/loot_tables/blocks/gray_flower.json +++ b/src/generated/resources/data/floralis/loot_table/blocks/gray_flower.json @@ -22,7 +22,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -62,7 +62,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -118,7 +118,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -169,7 +169,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/gray_flower_crop.json b/src/generated/resources/data/floralis/loot_table/blocks/gray_flower_crop.json similarity index 95% rename from src/generated/resources/data/floralis/loot_tables/blocks/gray_flower_crop.json rename to src/generated/resources/data/floralis/loot_table/blocks/gray_flower_crop.json index b9fdc289..3608f6d8 100644 --- a/src/generated/resources/data/floralis/loot_tables/blocks/gray_flower_crop.json +++ b/src/generated/resources/data/floralis/loot_table/blocks/gray_flower_crop.json @@ -22,7 +22,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -67,7 +67,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -117,7 +117,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -180,7 +180,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -238,7 +238,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -296,7 +296,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/green_cactus.json b/src/generated/resources/data/floralis/loot_table/blocks/green_cactus.json similarity index 95% rename from src/generated/resources/data/floralis/loot_tables/blocks/green_cactus.json rename to src/generated/resources/data/floralis/loot_table/blocks/green_cactus.json index 5c140796..bbe25ea3 100644 --- a/src/generated/resources/data/floralis/loot_tables/blocks/green_cactus.json +++ b/src/generated/resources/data/floralis/loot_table/blocks/green_cactus.json @@ -22,7 +22,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -62,7 +62,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -118,7 +118,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -169,7 +169,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/green_cactus_crop.json b/src/generated/resources/data/floralis/loot_table/blocks/green_cactus_crop.json similarity index 95% rename from src/generated/resources/data/floralis/loot_tables/blocks/green_cactus_crop.json rename to src/generated/resources/data/floralis/loot_table/blocks/green_cactus_crop.json index a7f6596d..36eaacd3 100644 --- a/src/generated/resources/data/floralis/loot_tables/blocks/green_cactus_crop.json +++ b/src/generated/resources/data/floralis/loot_table/blocks/green_cactus_crop.json @@ -22,7 +22,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -67,7 +67,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -117,7 +117,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -180,7 +180,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -238,7 +238,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -296,7 +296,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/green_dye_block.json b/src/generated/resources/data/floralis/loot_table/blocks/green_dye_block.json similarity index 100% rename from src/generated/resources/data/floralis/loot_tables/blocks/green_dye_block.json rename to src/generated/resources/data/floralis/loot_table/blocks/green_dye_block.json diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/green_flower.json b/src/generated/resources/data/floralis/loot_table/blocks/green_flower.json similarity index 95% rename from src/generated/resources/data/floralis/loot_tables/blocks/green_flower.json rename to src/generated/resources/data/floralis/loot_table/blocks/green_flower.json index a48007ec..db0ea1c0 100644 --- a/src/generated/resources/data/floralis/loot_tables/blocks/green_flower.json +++ b/src/generated/resources/data/floralis/loot_table/blocks/green_flower.json @@ -22,7 +22,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -62,7 +62,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -118,7 +118,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -169,7 +169,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/green_flower_crop.json b/src/generated/resources/data/floralis/loot_table/blocks/green_flower_crop.json similarity index 95% rename from src/generated/resources/data/floralis/loot_tables/blocks/green_flower_crop.json rename to src/generated/resources/data/floralis/loot_table/blocks/green_flower_crop.json index 147b7d74..e8b55489 100644 --- a/src/generated/resources/data/floralis/loot_tables/blocks/green_flower_crop.json +++ b/src/generated/resources/data/floralis/loot_table/blocks/green_flower_crop.json @@ -22,7 +22,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -67,7 +67,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -117,7 +117,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -180,7 +180,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -238,7 +238,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -296,7 +296,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/light_blue_cactus.json b/src/generated/resources/data/floralis/loot_table/blocks/light_blue_cactus.json similarity index 95% rename from src/generated/resources/data/floralis/loot_tables/blocks/light_blue_cactus.json rename to src/generated/resources/data/floralis/loot_table/blocks/light_blue_cactus.json index 34ba4890..fa5e198b 100644 --- a/src/generated/resources/data/floralis/loot_tables/blocks/light_blue_cactus.json +++ b/src/generated/resources/data/floralis/loot_table/blocks/light_blue_cactus.json @@ -22,7 +22,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -62,7 +62,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -118,7 +118,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -169,7 +169,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/light_blue_cactus_crop.json b/src/generated/resources/data/floralis/loot_table/blocks/light_blue_cactus_crop.json similarity index 95% rename from src/generated/resources/data/floralis/loot_tables/blocks/light_blue_cactus_crop.json rename to src/generated/resources/data/floralis/loot_table/blocks/light_blue_cactus_crop.json index eb8308d0..5d95f674 100644 --- a/src/generated/resources/data/floralis/loot_tables/blocks/light_blue_cactus_crop.json +++ b/src/generated/resources/data/floralis/loot_table/blocks/light_blue_cactus_crop.json @@ -22,7 +22,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -67,7 +67,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -117,7 +117,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -180,7 +180,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -238,7 +238,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -296,7 +296,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/light_blue_dye_block.json b/src/generated/resources/data/floralis/loot_table/blocks/light_blue_dye_block.json similarity index 100% rename from src/generated/resources/data/floralis/loot_tables/blocks/light_blue_dye_block.json rename to src/generated/resources/data/floralis/loot_table/blocks/light_blue_dye_block.json diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/light_blue_flower.json b/src/generated/resources/data/floralis/loot_table/blocks/light_blue_flower.json similarity index 95% rename from src/generated/resources/data/floralis/loot_tables/blocks/light_blue_flower.json rename to src/generated/resources/data/floralis/loot_table/blocks/light_blue_flower.json index c1ea3df5..b7eb178b 100644 --- a/src/generated/resources/data/floralis/loot_tables/blocks/light_blue_flower.json +++ b/src/generated/resources/data/floralis/loot_table/blocks/light_blue_flower.json @@ -22,7 +22,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -62,7 +62,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -118,7 +118,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -169,7 +169,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/light_blue_flower_crop.json b/src/generated/resources/data/floralis/loot_table/blocks/light_blue_flower_crop.json similarity index 95% rename from src/generated/resources/data/floralis/loot_tables/blocks/light_blue_flower_crop.json rename to src/generated/resources/data/floralis/loot_table/blocks/light_blue_flower_crop.json index fd0f5d38..8a2ef2bb 100644 --- a/src/generated/resources/data/floralis/loot_tables/blocks/light_blue_flower_crop.json +++ b/src/generated/resources/data/floralis/loot_table/blocks/light_blue_flower_crop.json @@ -22,7 +22,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -67,7 +67,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -117,7 +117,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -180,7 +180,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -238,7 +238,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -296,7 +296,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/light_gray_cactus.json b/src/generated/resources/data/floralis/loot_table/blocks/light_gray_cactus.json similarity index 95% rename from src/generated/resources/data/floralis/loot_tables/blocks/light_gray_cactus.json rename to src/generated/resources/data/floralis/loot_table/blocks/light_gray_cactus.json index e7b68cfd..bdd42407 100644 --- a/src/generated/resources/data/floralis/loot_tables/blocks/light_gray_cactus.json +++ b/src/generated/resources/data/floralis/loot_table/blocks/light_gray_cactus.json @@ -22,7 +22,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -62,7 +62,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -118,7 +118,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -169,7 +169,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/light_gray_cactus_crop.json b/src/generated/resources/data/floralis/loot_table/blocks/light_gray_cactus_crop.json similarity index 95% rename from src/generated/resources/data/floralis/loot_tables/blocks/light_gray_cactus_crop.json rename to src/generated/resources/data/floralis/loot_table/blocks/light_gray_cactus_crop.json index 4e9503ad..dcd299fa 100644 --- a/src/generated/resources/data/floralis/loot_tables/blocks/light_gray_cactus_crop.json +++ b/src/generated/resources/data/floralis/loot_table/blocks/light_gray_cactus_crop.json @@ -22,7 +22,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -67,7 +67,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -117,7 +117,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -180,7 +180,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -238,7 +238,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -296,7 +296,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/light_gray_dye_block.json b/src/generated/resources/data/floralis/loot_table/blocks/light_gray_dye_block.json similarity index 100% rename from src/generated/resources/data/floralis/loot_tables/blocks/light_gray_dye_block.json rename to src/generated/resources/data/floralis/loot_table/blocks/light_gray_dye_block.json diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/light_gray_flower.json b/src/generated/resources/data/floralis/loot_table/blocks/light_gray_flower.json similarity index 95% rename from src/generated/resources/data/floralis/loot_tables/blocks/light_gray_flower.json rename to src/generated/resources/data/floralis/loot_table/blocks/light_gray_flower.json index b5a2e296..8e226b81 100644 --- a/src/generated/resources/data/floralis/loot_tables/blocks/light_gray_flower.json +++ b/src/generated/resources/data/floralis/loot_table/blocks/light_gray_flower.json @@ -22,7 +22,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -62,7 +62,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -118,7 +118,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -169,7 +169,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/light_gray_flower_crop.json b/src/generated/resources/data/floralis/loot_table/blocks/light_gray_flower_crop.json similarity index 95% rename from src/generated/resources/data/floralis/loot_tables/blocks/light_gray_flower_crop.json rename to src/generated/resources/data/floralis/loot_table/blocks/light_gray_flower_crop.json index 40dfa3c4..50f1e5c5 100644 --- a/src/generated/resources/data/floralis/loot_tables/blocks/light_gray_flower_crop.json +++ b/src/generated/resources/data/floralis/loot_table/blocks/light_gray_flower_crop.json @@ -22,7 +22,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -67,7 +67,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -117,7 +117,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -180,7 +180,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -238,7 +238,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -296,7 +296,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/lime_cactus.json b/src/generated/resources/data/floralis/loot_table/blocks/lime_cactus.json similarity index 95% rename from src/generated/resources/data/floralis/loot_tables/blocks/lime_cactus.json rename to src/generated/resources/data/floralis/loot_table/blocks/lime_cactus.json index c46da783..d1b9c28d 100644 --- a/src/generated/resources/data/floralis/loot_tables/blocks/lime_cactus.json +++ b/src/generated/resources/data/floralis/loot_table/blocks/lime_cactus.json @@ -22,7 +22,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -62,7 +62,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -118,7 +118,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -169,7 +169,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/lime_cactus_crop.json b/src/generated/resources/data/floralis/loot_table/blocks/lime_cactus_crop.json similarity index 95% rename from src/generated/resources/data/floralis/loot_tables/blocks/lime_cactus_crop.json rename to src/generated/resources/data/floralis/loot_table/blocks/lime_cactus_crop.json index 0c4134d6..1fb2af80 100644 --- a/src/generated/resources/data/floralis/loot_tables/blocks/lime_cactus_crop.json +++ b/src/generated/resources/data/floralis/loot_table/blocks/lime_cactus_crop.json @@ -22,7 +22,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -67,7 +67,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -117,7 +117,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -180,7 +180,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -238,7 +238,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -296,7 +296,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/lime_dye_block.json b/src/generated/resources/data/floralis/loot_table/blocks/lime_dye_block.json similarity index 100% rename from src/generated/resources/data/floralis/loot_tables/blocks/lime_dye_block.json rename to src/generated/resources/data/floralis/loot_table/blocks/lime_dye_block.json diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/lime_flower.json b/src/generated/resources/data/floralis/loot_table/blocks/lime_flower.json similarity index 95% rename from src/generated/resources/data/floralis/loot_tables/blocks/lime_flower.json rename to src/generated/resources/data/floralis/loot_table/blocks/lime_flower.json index ab43345e..bf2918f7 100644 --- a/src/generated/resources/data/floralis/loot_tables/blocks/lime_flower.json +++ b/src/generated/resources/data/floralis/loot_table/blocks/lime_flower.json @@ -22,7 +22,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -62,7 +62,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -118,7 +118,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -169,7 +169,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/lime_flower_crop.json b/src/generated/resources/data/floralis/loot_table/blocks/lime_flower_crop.json similarity index 95% rename from src/generated/resources/data/floralis/loot_tables/blocks/lime_flower_crop.json rename to src/generated/resources/data/floralis/loot_table/blocks/lime_flower_crop.json index a4de92c9..f60b5c33 100644 --- a/src/generated/resources/data/floralis/loot_tables/blocks/lime_flower_crop.json +++ b/src/generated/resources/data/floralis/loot_table/blocks/lime_flower_crop.json @@ -22,7 +22,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -67,7 +67,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -117,7 +117,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -180,7 +180,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -238,7 +238,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -296,7 +296,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/magenta_cactus.json b/src/generated/resources/data/floralis/loot_table/blocks/magenta_cactus.json similarity index 95% rename from src/generated/resources/data/floralis/loot_tables/blocks/magenta_cactus.json rename to src/generated/resources/data/floralis/loot_table/blocks/magenta_cactus.json index c10ba462..29e83a34 100644 --- a/src/generated/resources/data/floralis/loot_tables/blocks/magenta_cactus.json +++ b/src/generated/resources/data/floralis/loot_table/blocks/magenta_cactus.json @@ -22,7 +22,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -62,7 +62,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -118,7 +118,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -169,7 +169,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/magenta_cactus_crop.json b/src/generated/resources/data/floralis/loot_table/blocks/magenta_cactus_crop.json similarity index 95% rename from src/generated/resources/data/floralis/loot_tables/blocks/magenta_cactus_crop.json rename to src/generated/resources/data/floralis/loot_table/blocks/magenta_cactus_crop.json index d9cdc308..a41029cd 100644 --- a/src/generated/resources/data/floralis/loot_tables/blocks/magenta_cactus_crop.json +++ b/src/generated/resources/data/floralis/loot_table/blocks/magenta_cactus_crop.json @@ -22,7 +22,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -67,7 +67,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -117,7 +117,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -180,7 +180,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -238,7 +238,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -296,7 +296,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/magenta_dye_block.json b/src/generated/resources/data/floralis/loot_table/blocks/magenta_dye_block.json similarity index 100% rename from src/generated/resources/data/floralis/loot_tables/blocks/magenta_dye_block.json rename to src/generated/resources/data/floralis/loot_table/blocks/magenta_dye_block.json diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/magenta_flower.json b/src/generated/resources/data/floralis/loot_table/blocks/magenta_flower.json similarity index 95% rename from src/generated/resources/data/floralis/loot_tables/blocks/magenta_flower.json rename to src/generated/resources/data/floralis/loot_table/blocks/magenta_flower.json index f09a101b..68e9416e 100644 --- a/src/generated/resources/data/floralis/loot_tables/blocks/magenta_flower.json +++ b/src/generated/resources/data/floralis/loot_table/blocks/magenta_flower.json @@ -22,7 +22,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -62,7 +62,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -118,7 +118,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -169,7 +169,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/magenta_flower_crop.json b/src/generated/resources/data/floralis/loot_table/blocks/magenta_flower_crop.json similarity index 95% rename from src/generated/resources/data/floralis/loot_tables/blocks/magenta_flower_crop.json rename to src/generated/resources/data/floralis/loot_table/blocks/magenta_flower_crop.json index 24948882..e6d1f206 100644 --- a/src/generated/resources/data/floralis/loot_tables/blocks/magenta_flower_crop.json +++ b/src/generated/resources/data/floralis/loot_table/blocks/magenta_flower_crop.json @@ -22,7 +22,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -67,7 +67,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -117,7 +117,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -180,7 +180,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -238,7 +238,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -296,7 +296,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/orange_cactus.json b/src/generated/resources/data/floralis/loot_table/blocks/orange_cactus.json similarity index 95% rename from src/generated/resources/data/floralis/loot_tables/blocks/orange_cactus.json rename to src/generated/resources/data/floralis/loot_table/blocks/orange_cactus.json index 8baf73ba..54b1c26d 100644 --- a/src/generated/resources/data/floralis/loot_tables/blocks/orange_cactus.json +++ b/src/generated/resources/data/floralis/loot_table/blocks/orange_cactus.json @@ -22,7 +22,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -62,7 +62,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -118,7 +118,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -169,7 +169,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/orange_cactus_crop.json b/src/generated/resources/data/floralis/loot_table/blocks/orange_cactus_crop.json similarity index 95% rename from src/generated/resources/data/floralis/loot_tables/blocks/orange_cactus_crop.json rename to src/generated/resources/data/floralis/loot_table/blocks/orange_cactus_crop.json index b1c58752..f64ed507 100644 --- a/src/generated/resources/data/floralis/loot_tables/blocks/orange_cactus_crop.json +++ b/src/generated/resources/data/floralis/loot_table/blocks/orange_cactus_crop.json @@ -22,7 +22,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -67,7 +67,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -117,7 +117,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -180,7 +180,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -238,7 +238,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -296,7 +296,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/orange_dye_block.json b/src/generated/resources/data/floralis/loot_table/blocks/orange_dye_block.json similarity index 100% rename from src/generated/resources/data/floralis/loot_tables/blocks/orange_dye_block.json rename to src/generated/resources/data/floralis/loot_table/blocks/orange_dye_block.json diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/orange_flower.json b/src/generated/resources/data/floralis/loot_table/blocks/orange_flower.json similarity index 95% rename from src/generated/resources/data/floralis/loot_tables/blocks/orange_flower.json rename to src/generated/resources/data/floralis/loot_table/blocks/orange_flower.json index 289ba9bc..50afe2a6 100644 --- a/src/generated/resources/data/floralis/loot_tables/blocks/orange_flower.json +++ b/src/generated/resources/data/floralis/loot_table/blocks/orange_flower.json @@ -22,7 +22,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -62,7 +62,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -118,7 +118,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -169,7 +169,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/orange_flower_crop.json b/src/generated/resources/data/floralis/loot_table/blocks/orange_flower_crop.json similarity index 95% rename from src/generated/resources/data/floralis/loot_tables/blocks/orange_flower_crop.json rename to src/generated/resources/data/floralis/loot_table/blocks/orange_flower_crop.json index 78c98bfc..25be1841 100644 --- a/src/generated/resources/data/floralis/loot_tables/blocks/orange_flower_crop.json +++ b/src/generated/resources/data/floralis/loot_table/blocks/orange_flower_crop.json @@ -22,7 +22,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -67,7 +67,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -117,7 +117,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -180,7 +180,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -238,7 +238,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -296,7 +296,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/pink_cactus.json b/src/generated/resources/data/floralis/loot_table/blocks/pink_cactus.json similarity index 95% rename from src/generated/resources/data/floralis/loot_tables/blocks/pink_cactus.json rename to src/generated/resources/data/floralis/loot_table/blocks/pink_cactus.json index c84d92d6..14031bb1 100644 --- a/src/generated/resources/data/floralis/loot_tables/blocks/pink_cactus.json +++ b/src/generated/resources/data/floralis/loot_table/blocks/pink_cactus.json @@ -22,7 +22,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -62,7 +62,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -118,7 +118,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -169,7 +169,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/pink_cactus_crop.json b/src/generated/resources/data/floralis/loot_table/blocks/pink_cactus_crop.json similarity index 95% rename from src/generated/resources/data/floralis/loot_tables/blocks/pink_cactus_crop.json rename to src/generated/resources/data/floralis/loot_table/blocks/pink_cactus_crop.json index 981c4ccb..af8d5935 100644 --- a/src/generated/resources/data/floralis/loot_tables/blocks/pink_cactus_crop.json +++ b/src/generated/resources/data/floralis/loot_table/blocks/pink_cactus_crop.json @@ -22,7 +22,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -67,7 +67,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -117,7 +117,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -180,7 +180,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -238,7 +238,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -296,7 +296,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/pink_dye_block.json b/src/generated/resources/data/floralis/loot_table/blocks/pink_dye_block.json similarity index 100% rename from src/generated/resources/data/floralis/loot_tables/blocks/pink_dye_block.json rename to src/generated/resources/data/floralis/loot_table/blocks/pink_dye_block.json diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/pink_flower.json b/src/generated/resources/data/floralis/loot_table/blocks/pink_flower.json similarity index 95% rename from src/generated/resources/data/floralis/loot_tables/blocks/pink_flower.json rename to src/generated/resources/data/floralis/loot_table/blocks/pink_flower.json index 80085f6d..601f5a50 100644 --- a/src/generated/resources/data/floralis/loot_tables/blocks/pink_flower.json +++ b/src/generated/resources/data/floralis/loot_table/blocks/pink_flower.json @@ -22,7 +22,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -62,7 +62,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -118,7 +118,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -169,7 +169,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/pink_flower_crop.json b/src/generated/resources/data/floralis/loot_table/blocks/pink_flower_crop.json similarity index 95% rename from src/generated/resources/data/floralis/loot_tables/blocks/pink_flower_crop.json rename to src/generated/resources/data/floralis/loot_table/blocks/pink_flower_crop.json index 005f01bc..a2516ad8 100644 --- a/src/generated/resources/data/floralis/loot_tables/blocks/pink_flower_crop.json +++ b/src/generated/resources/data/floralis/loot_table/blocks/pink_flower_crop.json @@ -22,7 +22,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -67,7 +67,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -117,7 +117,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -180,7 +180,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -238,7 +238,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -296,7 +296,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/plant_fibers_block.json b/src/generated/resources/data/floralis/loot_table/blocks/plant_fibers_block.json similarity index 100% rename from src/generated/resources/data/floralis/loot_tables/blocks/plant_fibers_block.json rename to src/generated/resources/data/floralis/loot_table/blocks/plant_fibers_block.json diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/potted_black_cactus.json b/src/generated/resources/data/floralis/loot_table/blocks/potted_black_cactus.json similarity index 100% rename from src/generated/resources/data/floralis/loot_tables/blocks/potted_black_cactus.json rename to src/generated/resources/data/floralis/loot_table/blocks/potted_black_cactus.json diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/potted_black_flower.json b/src/generated/resources/data/floralis/loot_table/blocks/potted_black_flower.json similarity index 100% rename from src/generated/resources/data/floralis/loot_tables/blocks/potted_black_flower.json rename to src/generated/resources/data/floralis/loot_table/blocks/potted_black_flower.json diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/potted_blue_cactus.json b/src/generated/resources/data/floralis/loot_table/blocks/potted_blue_cactus.json similarity index 100% rename from src/generated/resources/data/floralis/loot_tables/blocks/potted_blue_cactus.json rename to src/generated/resources/data/floralis/loot_table/blocks/potted_blue_cactus.json diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/potted_blue_flower.json b/src/generated/resources/data/floralis/loot_table/blocks/potted_blue_flower.json similarity index 100% rename from src/generated/resources/data/floralis/loot_tables/blocks/potted_blue_flower.json rename to src/generated/resources/data/floralis/loot_table/blocks/potted_blue_flower.json diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/potted_brown_cactus.json b/src/generated/resources/data/floralis/loot_table/blocks/potted_brown_cactus.json similarity index 100% rename from src/generated/resources/data/floralis/loot_tables/blocks/potted_brown_cactus.json rename to src/generated/resources/data/floralis/loot_table/blocks/potted_brown_cactus.json diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/potted_brown_flower.json b/src/generated/resources/data/floralis/loot_table/blocks/potted_brown_flower.json similarity index 100% rename from src/generated/resources/data/floralis/loot_tables/blocks/potted_brown_flower.json rename to src/generated/resources/data/floralis/loot_table/blocks/potted_brown_flower.json diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/potted_cyan_cactus.json b/src/generated/resources/data/floralis/loot_table/blocks/potted_cyan_cactus.json similarity index 100% rename from src/generated/resources/data/floralis/loot_tables/blocks/potted_cyan_cactus.json rename to src/generated/resources/data/floralis/loot_table/blocks/potted_cyan_cactus.json diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/potted_cyan_flower.json b/src/generated/resources/data/floralis/loot_table/blocks/potted_cyan_flower.json similarity index 100% rename from src/generated/resources/data/floralis/loot_tables/blocks/potted_cyan_flower.json rename to src/generated/resources/data/floralis/loot_table/blocks/potted_cyan_flower.json diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/potted_gray_cactus.json b/src/generated/resources/data/floralis/loot_table/blocks/potted_gray_cactus.json similarity index 100% rename from src/generated/resources/data/floralis/loot_tables/blocks/potted_gray_cactus.json rename to src/generated/resources/data/floralis/loot_table/blocks/potted_gray_cactus.json diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/potted_gray_flower.json b/src/generated/resources/data/floralis/loot_table/blocks/potted_gray_flower.json similarity index 100% rename from src/generated/resources/data/floralis/loot_tables/blocks/potted_gray_flower.json rename to src/generated/resources/data/floralis/loot_table/blocks/potted_gray_flower.json diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/potted_green_cactus.json b/src/generated/resources/data/floralis/loot_table/blocks/potted_green_cactus.json similarity index 100% rename from src/generated/resources/data/floralis/loot_tables/blocks/potted_green_cactus.json rename to src/generated/resources/data/floralis/loot_table/blocks/potted_green_cactus.json diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/potted_green_flower.json b/src/generated/resources/data/floralis/loot_table/blocks/potted_green_flower.json similarity index 100% rename from src/generated/resources/data/floralis/loot_tables/blocks/potted_green_flower.json rename to src/generated/resources/data/floralis/loot_table/blocks/potted_green_flower.json diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/potted_light_blue_cactus.json b/src/generated/resources/data/floralis/loot_table/blocks/potted_light_blue_cactus.json similarity index 100% rename from src/generated/resources/data/floralis/loot_tables/blocks/potted_light_blue_cactus.json rename to src/generated/resources/data/floralis/loot_table/blocks/potted_light_blue_cactus.json diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/potted_light_blue_flower.json b/src/generated/resources/data/floralis/loot_table/blocks/potted_light_blue_flower.json similarity index 100% rename from src/generated/resources/data/floralis/loot_tables/blocks/potted_light_blue_flower.json rename to src/generated/resources/data/floralis/loot_table/blocks/potted_light_blue_flower.json diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/potted_light_gray_cactus.json b/src/generated/resources/data/floralis/loot_table/blocks/potted_light_gray_cactus.json similarity index 100% rename from src/generated/resources/data/floralis/loot_tables/blocks/potted_light_gray_cactus.json rename to src/generated/resources/data/floralis/loot_table/blocks/potted_light_gray_cactus.json diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/potted_light_gray_flower.json b/src/generated/resources/data/floralis/loot_table/blocks/potted_light_gray_flower.json similarity index 100% rename from src/generated/resources/data/floralis/loot_tables/blocks/potted_light_gray_flower.json rename to src/generated/resources/data/floralis/loot_table/blocks/potted_light_gray_flower.json diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/potted_lime_cactus.json b/src/generated/resources/data/floralis/loot_table/blocks/potted_lime_cactus.json similarity index 100% rename from src/generated/resources/data/floralis/loot_tables/blocks/potted_lime_cactus.json rename to src/generated/resources/data/floralis/loot_table/blocks/potted_lime_cactus.json diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/potted_lime_flower.json b/src/generated/resources/data/floralis/loot_table/blocks/potted_lime_flower.json similarity index 100% rename from src/generated/resources/data/floralis/loot_tables/blocks/potted_lime_flower.json rename to src/generated/resources/data/floralis/loot_table/blocks/potted_lime_flower.json diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/potted_magenta_cactus.json b/src/generated/resources/data/floralis/loot_table/blocks/potted_magenta_cactus.json similarity index 100% rename from src/generated/resources/data/floralis/loot_tables/blocks/potted_magenta_cactus.json rename to src/generated/resources/data/floralis/loot_table/blocks/potted_magenta_cactus.json diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/potted_magenta_flower.json b/src/generated/resources/data/floralis/loot_table/blocks/potted_magenta_flower.json similarity index 100% rename from src/generated/resources/data/floralis/loot_tables/blocks/potted_magenta_flower.json rename to src/generated/resources/data/floralis/loot_table/blocks/potted_magenta_flower.json diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/potted_orange_cactus.json b/src/generated/resources/data/floralis/loot_table/blocks/potted_orange_cactus.json similarity index 100% rename from src/generated/resources/data/floralis/loot_tables/blocks/potted_orange_cactus.json rename to src/generated/resources/data/floralis/loot_table/blocks/potted_orange_cactus.json diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/potted_orange_flower.json b/src/generated/resources/data/floralis/loot_table/blocks/potted_orange_flower.json similarity index 100% rename from src/generated/resources/data/floralis/loot_tables/blocks/potted_orange_flower.json rename to src/generated/resources/data/floralis/loot_table/blocks/potted_orange_flower.json diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/potted_pink_cactus.json b/src/generated/resources/data/floralis/loot_table/blocks/potted_pink_cactus.json similarity index 100% rename from src/generated/resources/data/floralis/loot_tables/blocks/potted_pink_cactus.json rename to src/generated/resources/data/floralis/loot_table/blocks/potted_pink_cactus.json diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/potted_pink_flower.json b/src/generated/resources/data/floralis/loot_table/blocks/potted_pink_flower.json similarity index 100% rename from src/generated/resources/data/floralis/loot_tables/blocks/potted_pink_flower.json rename to src/generated/resources/data/floralis/loot_table/blocks/potted_pink_flower.json diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/potted_purple_cactus.json b/src/generated/resources/data/floralis/loot_table/blocks/potted_purple_cactus.json similarity index 100% rename from src/generated/resources/data/floralis/loot_tables/blocks/potted_purple_cactus.json rename to src/generated/resources/data/floralis/loot_table/blocks/potted_purple_cactus.json diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/potted_purple_flower.json b/src/generated/resources/data/floralis/loot_table/blocks/potted_purple_flower.json similarity index 100% rename from src/generated/resources/data/floralis/loot_tables/blocks/potted_purple_flower.json rename to src/generated/resources/data/floralis/loot_table/blocks/potted_purple_flower.json diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/potted_red_cactus.json b/src/generated/resources/data/floralis/loot_table/blocks/potted_red_cactus.json similarity index 100% rename from src/generated/resources/data/floralis/loot_tables/blocks/potted_red_cactus.json rename to src/generated/resources/data/floralis/loot_table/blocks/potted_red_cactus.json diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/potted_red_flower.json b/src/generated/resources/data/floralis/loot_table/blocks/potted_red_flower.json similarity index 100% rename from src/generated/resources/data/floralis/loot_tables/blocks/potted_red_flower.json rename to src/generated/resources/data/floralis/loot_table/blocks/potted_red_flower.json diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/potted_white_cactus.json b/src/generated/resources/data/floralis/loot_table/blocks/potted_white_cactus.json similarity index 100% rename from src/generated/resources/data/floralis/loot_tables/blocks/potted_white_cactus.json rename to src/generated/resources/data/floralis/loot_table/blocks/potted_white_cactus.json diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/potted_white_flower.json b/src/generated/resources/data/floralis/loot_table/blocks/potted_white_flower.json similarity index 100% rename from src/generated/resources/data/floralis/loot_tables/blocks/potted_white_flower.json rename to src/generated/resources/data/floralis/loot_table/blocks/potted_white_flower.json diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/potted_yellow_cactus.json b/src/generated/resources/data/floralis/loot_table/blocks/potted_yellow_cactus.json similarity index 100% rename from src/generated/resources/data/floralis/loot_tables/blocks/potted_yellow_cactus.json rename to src/generated/resources/data/floralis/loot_table/blocks/potted_yellow_cactus.json diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/potted_yellow_flower.json b/src/generated/resources/data/floralis/loot_table/blocks/potted_yellow_flower.json similarity index 100% rename from src/generated/resources/data/floralis/loot_tables/blocks/potted_yellow_flower.json rename to src/generated/resources/data/floralis/loot_table/blocks/potted_yellow_flower.json diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/purple_cactus.json b/src/generated/resources/data/floralis/loot_table/blocks/purple_cactus.json similarity index 95% rename from src/generated/resources/data/floralis/loot_tables/blocks/purple_cactus.json rename to src/generated/resources/data/floralis/loot_table/blocks/purple_cactus.json index 6cf21b1c..f4e65efe 100644 --- a/src/generated/resources/data/floralis/loot_tables/blocks/purple_cactus.json +++ b/src/generated/resources/data/floralis/loot_table/blocks/purple_cactus.json @@ -22,7 +22,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -62,7 +62,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -118,7 +118,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -169,7 +169,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/purple_cactus_crop.json b/src/generated/resources/data/floralis/loot_table/blocks/purple_cactus_crop.json similarity index 95% rename from src/generated/resources/data/floralis/loot_tables/blocks/purple_cactus_crop.json rename to src/generated/resources/data/floralis/loot_table/blocks/purple_cactus_crop.json index 09287837..1fe3ce3f 100644 --- a/src/generated/resources/data/floralis/loot_tables/blocks/purple_cactus_crop.json +++ b/src/generated/resources/data/floralis/loot_table/blocks/purple_cactus_crop.json @@ -22,7 +22,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -67,7 +67,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -117,7 +117,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -180,7 +180,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -238,7 +238,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -296,7 +296,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/purple_dye_block.json b/src/generated/resources/data/floralis/loot_table/blocks/purple_dye_block.json similarity index 100% rename from src/generated/resources/data/floralis/loot_tables/blocks/purple_dye_block.json rename to src/generated/resources/data/floralis/loot_table/blocks/purple_dye_block.json diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/purple_flower.json b/src/generated/resources/data/floralis/loot_table/blocks/purple_flower.json similarity index 95% rename from src/generated/resources/data/floralis/loot_tables/blocks/purple_flower.json rename to src/generated/resources/data/floralis/loot_table/blocks/purple_flower.json index 7799bce2..f209c87f 100644 --- a/src/generated/resources/data/floralis/loot_tables/blocks/purple_flower.json +++ b/src/generated/resources/data/floralis/loot_table/blocks/purple_flower.json @@ -22,7 +22,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -62,7 +62,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -118,7 +118,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -169,7 +169,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/purple_flower_crop.json b/src/generated/resources/data/floralis/loot_table/blocks/purple_flower_crop.json similarity index 95% rename from src/generated/resources/data/floralis/loot_tables/blocks/purple_flower_crop.json rename to src/generated/resources/data/floralis/loot_table/blocks/purple_flower_crop.json index e057ee76..efdf9380 100644 --- a/src/generated/resources/data/floralis/loot_tables/blocks/purple_flower_crop.json +++ b/src/generated/resources/data/floralis/loot_table/blocks/purple_flower_crop.json @@ -22,7 +22,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -67,7 +67,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -117,7 +117,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -180,7 +180,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -238,7 +238,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -296,7 +296,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/red_cactus.json b/src/generated/resources/data/floralis/loot_table/blocks/red_cactus.json similarity index 95% rename from src/generated/resources/data/floralis/loot_tables/blocks/red_cactus.json rename to src/generated/resources/data/floralis/loot_table/blocks/red_cactus.json index 68cc96d2..a2d208db 100644 --- a/src/generated/resources/data/floralis/loot_tables/blocks/red_cactus.json +++ b/src/generated/resources/data/floralis/loot_table/blocks/red_cactus.json @@ -22,7 +22,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -62,7 +62,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -118,7 +118,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -169,7 +169,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/red_cactus_crop.json b/src/generated/resources/data/floralis/loot_table/blocks/red_cactus_crop.json similarity index 95% rename from src/generated/resources/data/floralis/loot_tables/blocks/red_cactus_crop.json rename to src/generated/resources/data/floralis/loot_table/blocks/red_cactus_crop.json index b54263e9..277a1e6a 100644 --- a/src/generated/resources/data/floralis/loot_tables/blocks/red_cactus_crop.json +++ b/src/generated/resources/data/floralis/loot_table/blocks/red_cactus_crop.json @@ -22,7 +22,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -67,7 +67,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -117,7 +117,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -180,7 +180,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -238,7 +238,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -296,7 +296,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/red_dye_block.json b/src/generated/resources/data/floralis/loot_table/blocks/red_dye_block.json similarity index 100% rename from src/generated/resources/data/floralis/loot_tables/blocks/red_dye_block.json rename to src/generated/resources/data/floralis/loot_table/blocks/red_dye_block.json diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/red_flower.json b/src/generated/resources/data/floralis/loot_table/blocks/red_flower.json similarity index 95% rename from src/generated/resources/data/floralis/loot_tables/blocks/red_flower.json rename to src/generated/resources/data/floralis/loot_table/blocks/red_flower.json index f0a6ecb7..a9784e28 100644 --- a/src/generated/resources/data/floralis/loot_tables/blocks/red_flower.json +++ b/src/generated/resources/data/floralis/loot_table/blocks/red_flower.json @@ -22,7 +22,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -62,7 +62,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -118,7 +118,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -169,7 +169,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/red_flower_crop.json b/src/generated/resources/data/floralis/loot_table/blocks/red_flower_crop.json similarity index 95% rename from src/generated/resources/data/floralis/loot_tables/blocks/red_flower_crop.json rename to src/generated/resources/data/floralis/loot_table/blocks/red_flower_crop.json index 34387c6e..a1f3c364 100644 --- a/src/generated/resources/data/floralis/loot_tables/blocks/red_flower_crop.json +++ b/src/generated/resources/data/floralis/loot_table/blocks/red_flower_crop.json @@ -22,7 +22,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -67,7 +67,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -117,7 +117,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -180,7 +180,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -238,7 +238,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -296,7 +296,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/white_cactus.json b/src/generated/resources/data/floralis/loot_table/blocks/white_cactus.json similarity index 95% rename from src/generated/resources/data/floralis/loot_tables/blocks/white_cactus.json rename to src/generated/resources/data/floralis/loot_table/blocks/white_cactus.json index 4ff33a08..e9d12089 100644 --- a/src/generated/resources/data/floralis/loot_tables/blocks/white_cactus.json +++ b/src/generated/resources/data/floralis/loot_table/blocks/white_cactus.json @@ -22,7 +22,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -62,7 +62,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -118,7 +118,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -169,7 +169,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/white_cactus_crop.json b/src/generated/resources/data/floralis/loot_table/blocks/white_cactus_crop.json similarity index 95% rename from src/generated/resources/data/floralis/loot_tables/blocks/white_cactus_crop.json rename to src/generated/resources/data/floralis/loot_table/blocks/white_cactus_crop.json index 2a0503c4..77fa627e 100644 --- a/src/generated/resources/data/floralis/loot_tables/blocks/white_cactus_crop.json +++ b/src/generated/resources/data/floralis/loot_table/blocks/white_cactus_crop.json @@ -22,7 +22,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -67,7 +67,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -117,7 +117,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -180,7 +180,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -238,7 +238,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -296,7 +296,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/white_dye_block.json b/src/generated/resources/data/floralis/loot_table/blocks/white_dye_block.json similarity index 100% rename from src/generated/resources/data/floralis/loot_tables/blocks/white_dye_block.json rename to src/generated/resources/data/floralis/loot_table/blocks/white_dye_block.json diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/white_flower.json b/src/generated/resources/data/floralis/loot_table/blocks/white_flower.json similarity index 95% rename from src/generated/resources/data/floralis/loot_tables/blocks/white_flower.json rename to src/generated/resources/data/floralis/loot_table/blocks/white_flower.json index 32d0bb17..64abb890 100644 --- a/src/generated/resources/data/floralis/loot_tables/blocks/white_flower.json +++ b/src/generated/resources/data/floralis/loot_table/blocks/white_flower.json @@ -22,7 +22,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -62,7 +62,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -118,7 +118,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -169,7 +169,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/white_flower_crop.json b/src/generated/resources/data/floralis/loot_table/blocks/white_flower_crop.json similarity index 95% rename from src/generated/resources/data/floralis/loot_tables/blocks/white_flower_crop.json rename to src/generated/resources/data/floralis/loot_table/blocks/white_flower_crop.json index 93089083..1b12db70 100644 --- a/src/generated/resources/data/floralis/loot_tables/blocks/white_flower_crop.json +++ b/src/generated/resources/data/floralis/loot_table/blocks/white_flower_crop.json @@ -22,7 +22,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -67,7 +67,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -117,7 +117,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -180,7 +180,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -238,7 +238,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -296,7 +296,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/yellow_cactus.json b/src/generated/resources/data/floralis/loot_table/blocks/yellow_cactus.json similarity index 95% rename from src/generated/resources/data/floralis/loot_tables/blocks/yellow_cactus.json rename to src/generated/resources/data/floralis/loot_table/blocks/yellow_cactus.json index 578146d6..c32fc5e6 100644 --- a/src/generated/resources/data/floralis/loot_tables/blocks/yellow_cactus.json +++ b/src/generated/resources/data/floralis/loot_table/blocks/yellow_cactus.json @@ -22,7 +22,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -62,7 +62,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -118,7 +118,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -169,7 +169,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/yellow_cactus_crop.json b/src/generated/resources/data/floralis/loot_table/blocks/yellow_cactus_crop.json similarity index 95% rename from src/generated/resources/data/floralis/loot_tables/blocks/yellow_cactus_crop.json rename to src/generated/resources/data/floralis/loot_table/blocks/yellow_cactus_crop.json index fb799714..49f612ff 100644 --- a/src/generated/resources/data/floralis/loot_tables/blocks/yellow_cactus_crop.json +++ b/src/generated/resources/data/floralis/loot_table/blocks/yellow_cactus_crop.json @@ -22,7 +22,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -67,7 +67,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -117,7 +117,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -180,7 +180,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -238,7 +238,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -296,7 +296,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/yellow_dye_block.json b/src/generated/resources/data/floralis/loot_table/blocks/yellow_dye_block.json similarity index 100% rename from src/generated/resources/data/floralis/loot_tables/blocks/yellow_dye_block.json rename to src/generated/resources/data/floralis/loot_table/blocks/yellow_dye_block.json diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/yellow_flower.json b/src/generated/resources/data/floralis/loot_table/blocks/yellow_flower.json similarity index 95% rename from src/generated/resources/data/floralis/loot_tables/blocks/yellow_flower.json rename to src/generated/resources/data/floralis/loot_table/blocks/yellow_flower.json index ba6f1a7c..a0965d1e 100644 --- a/src/generated/resources/data/floralis/loot_tables/blocks/yellow_flower.json +++ b/src/generated/resources/data/floralis/loot_table/blocks/yellow_flower.json @@ -22,7 +22,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -62,7 +62,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -118,7 +118,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -169,7 +169,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/yellow_flower_crop.json b/src/generated/resources/data/floralis/loot_table/blocks/yellow_flower_crop.json similarity index 95% rename from src/generated/resources/data/floralis/loot_tables/blocks/yellow_flower_crop.json rename to src/generated/resources/data/floralis/loot_table/blocks/yellow_flower_crop.json index 4fd61211..a4cd346f 100644 --- a/src/generated/resources/data/floralis/loot_tables/blocks/yellow_flower_crop.json +++ b/src/generated/resources/data/floralis/loot_table/blocks/yellow_flower_crop.json @@ -22,7 +22,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -67,7 +67,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -117,7 +117,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -180,7 +180,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -238,7 +238,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } @@ -296,7 +296,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } diff --git a/src/generated/resources/data/floralis/recipes/black_dye_block_from_black_dye.json b/src/generated/resources/data/floralis/recipe/black_dye_block_from_black_dye.json similarity index 100% rename from src/generated/resources/data/floralis/recipes/black_dye_block_from_black_dye.json rename to src/generated/resources/data/floralis/recipe/black_dye_block_from_black_dye.json diff --git a/src/generated/resources/data/floralis/recipes/black_dye_from_black_dye_block.json b/src/generated/resources/data/floralis/recipe/black_dye_from_black_dye_block.json similarity index 100% rename from src/generated/resources/data/floralis/recipes/black_dye_from_black_dye_block.json rename to src/generated/resources/data/floralis/recipe/black_dye_from_black_dye_block.json diff --git a/src/generated/resources/data/floralis/recipes/black_dye_from_smelting_black_petals.json b/src/generated/resources/data/floralis/recipe/black_dye_from_smelting_black_petals.json similarity index 100% rename from src/generated/resources/data/floralis/recipes/black_dye_from_smelting_black_petals.json rename to src/generated/resources/data/floralis/recipe/black_dye_from_smelting_black_petals.json diff --git a/src/generated/resources/data/floralis/recipes/blue_dye_block_from_blue_dye.json b/src/generated/resources/data/floralis/recipe/blue_dye_block_from_blue_dye.json similarity index 100% rename from src/generated/resources/data/floralis/recipes/blue_dye_block_from_blue_dye.json rename to src/generated/resources/data/floralis/recipe/blue_dye_block_from_blue_dye.json diff --git a/src/generated/resources/data/floralis/recipes/blue_dye_from_blue_dye_block.json b/src/generated/resources/data/floralis/recipe/blue_dye_from_blue_dye_block.json similarity index 100% rename from src/generated/resources/data/floralis/recipes/blue_dye_from_blue_dye_block.json rename to src/generated/resources/data/floralis/recipe/blue_dye_from_blue_dye_block.json diff --git a/src/generated/resources/data/floralis/recipes/blue_dye_from_smelting_blue_petals.json b/src/generated/resources/data/floralis/recipe/blue_dye_from_smelting_blue_petals.json similarity index 100% rename from src/generated/resources/data/floralis/recipes/blue_dye_from_smelting_blue_petals.json rename to src/generated/resources/data/floralis/recipe/blue_dye_from_smelting_blue_petals.json diff --git a/src/generated/resources/data/floralis/recipes/brown_dye_block_from_brown_dye.json b/src/generated/resources/data/floralis/recipe/brown_dye_block_from_brown_dye.json similarity index 100% rename from src/generated/resources/data/floralis/recipes/brown_dye_block_from_brown_dye.json rename to src/generated/resources/data/floralis/recipe/brown_dye_block_from_brown_dye.json diff --git a/src/generated/resources/data/floralis/recipes/brown_dye_from_brown_dye_block.json b/src/generated/resources/data/floralis/recipe/brown_dye_from_brown_dye_block.json similarity index 100% rename from src/generated/resources/data/floralis/recipes/brown_dye_from_brown_dye_block.json rename to src/generated/resources/data/floralis/recipe/brown_dye_from_brown_dye_block.json diff --git a/src/generated/resources/data/floralis/recipes/brown_dye_from_smelting_brown_petals.json b/src/generated/resources/data/floralis/recipe/brown_dye_from_smelting_brown_petals.json similarity index 100% rename from src/generated/resources/data/floralis/recipes/brown_dye_from_smelting_brown_petals.json rename to src/generated/resources/data/floralis/recipe/brown_dye_from_smelting_brown_petals.json diff --git a/src/generated/resources/data/floralis/recipes/cyan_dye_block_from_cyan_dye.json b/src/generated/resources/data/floralis/recipe/cyan_dye_block_from_cyan_dye.json similarity index 100% rename from src/generated/resources/data/floralis/recipes/cyan_dye_block_from_cyan_dye.json rename to src/generated/resources/data/floralis/recipe/cyan_dye_block_from_cyan_dye.json diff --git a/src/generated/resources/data/floralis/recipes/cyan_dye_from_cyan_dye_block.json b/src/generated/resources/data/floralis/recipe/cyan_dye_from_cyan_dye_block.json similarity index 100% rename from src/generated/resources/data/floralis/recipes/cyan_dye_from_cyan_dye_block.json rename to src/generated/resources/data/floralis/recipe/cyan_dye_from_cyan_dye_block.json diff --git a/src/generated/resources/data/floralis/recipes/cyan_dye_from_smelting_cyan_petals.json b/src/generated/resources/data/floralis/recipe/cyan_dye_from_smelting_cyan_petals.json similarity index 100% rename from src/generated/resources/data/floralis/recipes/cyan_dye_from_smelting_cyan_petals.json rename to src/generated/resources/data/floralis/recipe/cyan_dye_from_smelting_cyan_petals.json diff --git a/src/generated/resources/data/floralis/recipes/gray_dye_block_from_gray_dye.json b/src/generated/resources/data/floralis/recipe/gray_dye_block_from_gray_dye.json similarity index 100% rename from src/generated/resources/data/floralis/recipes/gray_dye_block_from_gray_dye.json rename to src/generated/resources/data/floralis/recipe/gray_dye_block_from_gray_dye.json diff --git a/src/generated/resources/data/floralis/recipes/gray_dye_from_gray_dye_block.json b/src/generated/resources/data/floralis/recipe/gray_dye_from_gray_dye_block.json similarity index 100% rename from src/generated/resources/data/floralis/recipes/gray_dye_from_gray_dye_block.json rename to src/generated/resources/data/floralis/recipe/gray_dye_from_gray_dye_block.json diff --git a/src/generated/resources/data/floralis/recipes/gray_dye_from_smelting_gray_petals.json b/src/generated/resources/data/floralis/recipe/gray_dye_from_smelting_gray_petals.json similarity index 100% rename from src/generated/resources/data/floralis/recipes/gray_dye_from_smelting_gray_petals.json rename to src/generated/resources/data/floralis/recipe/gray_dye_from_smelting_gray_petals.json diff --git a/src/generated/resources/data/floralis/recipes/green_dye_block_from_green_dye.json b/src/generated/resources/data/floralis/recipe/green_dye_block_from_green_dye.json similarity index 100% rename from src/generated/resources/data/floralis/recipes/green_dye_block_from_green_dye.json rename to src/generated/resources/data/floralis/recipe/green_dye_block_from_green_dye.json diff --git a/src/generated/resources/data/floralis/recipes/green_dye_from_green_dye_block.json b/src/generated/resources/data/floralis/recipe/green_dye_from_green_dye_block.json similarity index 100% rename from src/generated/resources/data/floralis/recipes/green_dye_from_green_dye_block.json rename to src/generated/resources/data/floralis/recipe/green_dye_from_green_dye_block.json diff --git a/src/generated/resources/data/floralis/recipes/green_dye_from_smelting_green_petals.json b/src/generated/resources/data/floralis/recipe/green_dye_from_smelting_green_petals.json similarity index 100% rename from src/generated/resources/data/floralis/recipes/green_dye_from_smelting_green_petals.json rename to src/generated/resources/data/floralis/recipe/green_dye_from_smelting_green_petals.json diff --git a/src/generated/resources/data/floralis/recipes/light_blue_dye_block_from_light_blue_dye.json b/src/generated/resources/data/floralis/recipe/light_blue_dye_block_from_light_blue_dye.json similarity index 100% rename from src/generated/resources/data/floralis/recipes/light_blue_dye_block_from_light_blue_dye.json rename to src/generated/resources/data/floralis/recipe/light_blue_dye_block_from_light_blue_dye.json diff --git a/src/generated/resources/data/floralis/recipes/light_blue_dye_from_light_blue_dye_block.json b/src/generated/resources/data/floralis/recipe/light_blue_dye_from_light_blue_dye_block.json similarity index 100% rename from src/generated/resources/data/floralis/recipes/light_blue_dye_from_light_blue_dye_block.json rename to src/generated/resources/data/floralis/recipe/light_blue_dye_from_light_blue_dye_block.json diff --git a/src/generated/resources/data/floralis/recipes/light_blue_dye_from_smelting_light_blue_petals.json b/src/generated/resources/data/floralis/recipe/light_blue_dye_from_smelting_light_blue_petals.json similarity index 100% rename from src/generated/resources/data/floralis/recipes/light_blue_dye_from_smelting_light_blue_petals.json rename to src/generated/resources/data/floralis/recipe/light_blue_dye_from_smelting_light_blue_petals.json diff --git a/src/generated/resources/data/floralis/recipes/light_gray_dye_block_from_light_gray_dye.json b/src/generated/resources/data/floralis/recipe/light_gray_dye_block_from_light_gray_dye.json similarity index 100% rename from src/generated/resources/data/floralis/recipes/light_gray_dye_block_from_light_gray_dye.json rename to src/generated/resources/data/floralis/recipe/light_gray_dye_block_from_light_gray_dye.json diff --git a/src/generated/resources/data/floralis/recipes/light_gray_dye_from_light_gray_dye_block.json b/src/generated/resources/data/floralis/recipe/light_gray_dye_from_light_gray_dye_block.json similarity index 100% rename from src/generated/resources/data/floralis/recipes/light_gray_dye_from_light_gray_dye_block.json rename to src/generated/resources/data/floralis/recipe/light_gray_dye_from_light_gray_dye_block.json diff --git a/src/generated/resources/data/floralis/recipes/light_gray_dye_from_smelting_light_gray_petals.json b/src/generated/resources/data/floralis/recipe/light_gray_dye_from_smelting_light_gray_petals.json similarity index 100% rename from src/generated/resources/data/floralis/recipes/light_gray_dye_from_smelting_light_gray_petals.json rename to src/generated/resources/data/floralis/recipe/light_gray_dye_from_smelting_light_gray_petals.json diff --git a/src/generated/resources/data/floralis/recipes/lime_dye_block_from_lime_dye.json b/src/generated/resources/data/floralis/recipe/lime_dye_block_from_lime_dye.json similarity index 100% rename from src/generated/resources/data/floralis/recipes/lime_dye_block_from_lime_dye.json rename to src/generated/resources/data/floralis/recipe/lime_dye_block_from_lime_dye.json diff --git a/src/generated/resources/data/floralis/recipes/lime_dye_from_lime_dye_block.json b/src/generated/resources/data/floralis/recipe/lime_dye_from_lime_dye_block.json similarity index 100% rename from src/generated/resources/data/floralis/recipes/lime_dye_from_lime_dye_block.json rename to src/generated/resources/data/floralis/recipe/lime_dye_from_lime_dye_block.json diff --git a/src/generated/resources/data/floralis/recipes/lime_dye_from_smelting_lime_petals.json b/src/generated/resources/data/floralis/recipe/lime_dye_from_smelting_lime_petals.json similarity index 100% rename from src/generated/resources/data/floralis/recipes/lime_dye_from_smelting_lime_petals.json rename to src/generated/resources/data/floralis/recipe/lime_dye_from_smelting_lime_petals.json diff --git a/src/generated/resources/data/floralis/recipes/magenta_dye_block_from_magenta_dye.json b/src/generated/resources/data/floralis/recipe/magenta_dye_block_from_magenta_dye.json similarity index 100% rename from src/generated/resources/data/floralis/recipes/magenta_dye_block_from_magenta_dye.json rename to src/generated/resources/data/floralis/recipe/magenta_dye_block_from_magenta_dye.json diff --git a/src/generated/resources/data/floralis/recipes/magenta_dye_from_magenta_dye_block.json b/src/generated/resources/data/floralis/recipe/magenta_dye_from_magenta_dye_block.json similarity index 100% rename from src/generated/resources/data/floralis/recipes/magenta_dye_from_magenta_dye_block.json rename to src/generated/resources/data/floralis/recipe/magenta_dye_from_magenta_dye_block.json diff --git a/src/generated/resources/data/floralis/recipes/magenta_dye_from_smelting_magenta_petals.json b/src/generated/resources/data/floralis/recipe/magenta_dye_from_smelting_magenta_petals.json similarity index 100% rename from src/generated/resources/data/floralis/recipes/magenta_dye_from_smelting_magenta_petals.json rename to src/generated/resources/data/floralis/recipe/magenta_dye_from_smelting_magenta_petals.json diff --git a/src/generated/resources/data/floralis/recipes/orange_dye_block_from_orange_dye.json b/src/generated/resources/data/floralis/recipe/orange_dye_block_from_orange_dye.json similarity index 100% rename from src/generated/resources/data/floralis/recipes/orange_dye_block_from_orange_dye.json rename to src/generated/resources/data/floralis/recipe/orange_dye_block_from_orange_dye.json diff --git a/src/generated/resources/data/floralis/recipes/orange_dye_from_orange_dye_block.json b/src/generated/resources/data/floralis/recipe/orange_dye_from_orange_dye_block.json similarity index 100% rename from src/generated/resources/data/floralis/recipes/orange_dye_from_orange_dye_block.json rename to src/generated/resources/data/floralis/recipe/orange_dye_from_orange_dye_block.json diff --git a/src/generated/resources/data/floralis/recipes/orange_dye_from_smelting_orange_petals.json b/src/generated/resources/data/floralis/recipe/orange_dye_from_smelting_orange_petals.json similarity index 100% rename from src/generated/resources/data/floralis/recipes/orange_dye_from_smelting_orange_petals.json rename to src/generated/resources/data/floralis/recipe/orange_dye_from_smelting_orange_petals.json diff --git a/src/generated/resources/data/floralis/recipes/pink_dye_block_from_pink_dye.json b/src/generated/resources/data/floralis/recipe/pink_dye_block_from_pink_dye.json similarity index 100% rename from src/generated/resources/data/floralis/recipes/pink_dye_block_from_pink_dye.json rename to src/generated/resources/data/floralis/recipe/pink_dye_block_from_pink_dye.json diff --git a/src/generated/resources/data/floralis/recipes/pink_dye_from_pink_dye_block.json b/src/generated/resources/data/floralis/recipe/pink_dye_from_pink_dye_block.json similarity index 100% rename from src/generated/resources/data/floralis/recipes/pink_dye_from_pink_dye_block.json rename to src/generated/resources/data/floralis/recipe/pink_dye_from_pink_dye_block.json diff --git a/src/generated/resources/data/floralis/recipes/pink_dye_from_smelting_pink_petals.json b/src/generated/resources/data/floralis/recipe/pink_dye_from_smelting_pink_petals.json similarity index 100% rename from src/generated/resources/data/floralis/recipes/pink_dye_from_smelting_pink_petals.json rename to src/generated/resources/data/floralis/recipe/pink_dye_from_smelting_pink_petals.json diff --git a/src/generated/resources/data/floralis/recipes/plant_fibers_block_from_plant_fibers.json b/src/generated/resources/data/floralis/recipe/plant_fibers_block_from_plant_fibers.json similarity index 100% rename from src/generated/resources/data/floralis/recipes/plant_fibers_block_from_plant_fibers.json rename to src/generated/resources/data/floralis/recipe/plant_fibers_block_from_plant_fibers.json diff --git a/src/generated/resources/data/floralis/recipes/plant_fibers_from_plant_fibers_block.json b/src/generated/resources/data/floralis/recipe/plant_fibers_from_plant_fibers_block.json similarity index 100% rename from src/generated/resources/data/floralis/recipes/plant_fibers_from_plant_fibers_block.json rename to src/generated/resources/data/floralis/recipe/plant_fibers_from_plant_fibers_block.json diff --git a/src/generated/resources/data/floralis/recipes/purple_dye_block_from_purple_dye.json b/src/generated/resources/data/floralis/recipe/purple_dye_block_from_purple_dye.json similarity index 100% rename from src/generated/resources/data/floralis/recipes/purple_dye_block_from_purple_dye.json rename to src/generated/resources/data/floralis/recipe/purple_dye_block_from_purple_dye.json diff --git a/src/generated/resources/data/floralis/recipes/purple_dye_from_purple_dye_block.json b/src/generated/resources/data/floralis/recipe/purple_dye_from_purple_dye_block.json similarity index 100% rename from src/generated/resources/data/floralis/recipes/purple_dye_from_purple_dye_block.json rename to src/generated/resources/data/floralis/recipe/purple_dye_from_purple_dye_block.json diff --git a/src/generated/resources/data/floralis/recipes/purple_dye_from_smelting_purple_petals.json b/src/generated/resources/data/floralis/recipe/purple_dye_from_smelting_purple_petals.json similarity index 100% rename from src/generated/resources/data/floralis/recipes/purple_dye_from_smelting_purple_petals.json rename to src/generated/resources/data/floralis/recipe/purple_dye_from_smelting_purple_petals.json diff --git a/src/generated/resources/data/floralis/recipes/red_dye_block_from_red_dye.json b/src/generated/resources/data/floralis/recipe/red_dye_block_from_red_dye.json similarity index 100% rename from src/generated/resources/data/floralis/recipes/red_dye_block_from_red_dye.json rename to src/generated/resources/data/floralis/recipe/red_dye_block_from_red_dye.json diff --git a/src/generated/resources/data/floralis/recipes/red_dye_from_red_dye_block.json b/src/generated/resources/data/floralis/recipe/red_dye_from_red_dye_block.json similarity index 100% rename from src/generated/resources/data/floralis/recipes/red_dye_from_red_dye_block.json rename to src/generated/resources/data/floralis/recipe/red_dye_from_red_dye_block.json diff --git a/src/generated/resources/data/floralis/recipes/red_dye_from_smelting_red_petals.json b/src/generated/resources/data/floralis/recipe/red_dye_from_smelting_red_petals.json similarity index 100% rename from src/generated/resources/data/floralis/recipes/red_dye_from_smelting_red_petals.json rename to src/generated/resources/data/floralis/recipe/red_dye_from_smelting_red_petals.json diff --git a/src/generated/resources/data/floralis/recipes/white_dye_block_from_white_dye.json b/src/generated/resources/data/floralis/recipe/white_dye_block_from_white_dye.json similarity index 100% rename from src/generated/resources/data/floralis/recipes/white_dye_block_from_white_dye.json rename to src/generated/resources/data/floralis/recipe/white_dye_block_from_white_dye.json diff --git a/src/generated/resources/data/floralis/recipes/white_dye_from_smelting_white_petals.json b/src/generated/resources/data/floralis/recipe/white_dye_from_smelting_white_petals.json similarity index 100% rename from src/generated/resources/data/floralis/recipes/white_dye_from_smelting_white_petals.json rename to src/generated/resources/data/floralis/recipe/white_dye_from_smelting_white_petals.json diff --git a/src/generated/resources/data/floralis/recipes/white_dye_from_white_dye_block.json b/src/generated/resources/data/floralis/recipe/white_dye_from_white_dye_block.json similarity index 100% rename from src/generated/resources/data/floralis/recipes/white_dye_from_white_dye_block.json rename to src/generated/resources/data/floralis/recipe/white_dye_from_white_dye_block.json diff --git a/src/generated/resources/data/floralis/recipes/yellow_dye_block_from_yellow_dye.json b/src/generated/resources/data/floralis/recipe/yellow_dye_block_from_yellow_dye.json similarity index 100% rename from src/generated/resources/data/floralis/recipes/yellow_dye_block_from_yellow_dye.json rename to src/generated/resources/data/floralis/recipe/yellow_dye_block_from_yellow_dye.json diff --git a/src/generated/resources/data/floralis/recipes/yellow_dye_from_smelting_yellow_petals.json b/src/generated/resources/data/floralis/recipe/yellow_dye_from_smelting_yellow_petals.json similarity index 100% rename from src/generated/resources/data/floralis/recipes/yellow_dye_from_smelting_yellow_petals.json rename to src/generated/resources/data/floralis/recipe/yellow_dye_from_smelting_yellow_petals.json diff --git a/src/generated/resources/data/floralis/recipes/yellow_dye_from_yellow_dye_block.json b/src/generated/resources/data/floralis/recipe/yellow_dye_from_yellow_dye_block.json similarity index 100% rename from src/generated/resources/data/floralis/recipes/yellow_dye_from_yellow_dye_block.json rename to src/generated/resources/data/floralis/recipe/yellow_dye_from_yellow_dye_block.json diff --git a/src/generated/resources/data/industrialforegoing/tags/items/bioreactor.json b/src/generated/resources/data/industrialforegoing/tags/item/bioreactor.json similarity index 100% rename from src/generated/resources/data/industrialforegoing/tags/items/bioreactor.json rename to src/generated/resources/data/industrialforegoing/tags/item/bioreactor.json diff --git a/src/generated/resources/data/minecraft/tags/blocks/crops.json b/src/generated/resources/data/minecraft/tags/block/crops.json similarity index 100% rename from src/generated/resources/data/minecraft/tags/blocks/crops.json rename to src/generated/resources/data/minecraft/tags/block/crops.json diff --git a/src/generated/resources/data/minecraft/tags/blocks/flower_pots.json b/src/generated/resources/data/minecraft/tags/block/flower_pots.json similarity index 100% rename from src/generated/resources/data/minecraft/tags/blocks/flower_pots.json rename to src/generated/resources/data/minecraft/tags/block/flower_pots.json diff --git a/src/generated/resources/data/minecraft/tags/blocks/mineable/hoe.json b/src/generated/resources/data/minecraft/tags/block/mineable/hoe.json similarity index 100% rename from src/generated/resources/data/minecraft/tags/blocks/mineable/hoe.json rename to src/generated/resources/data/minecraft/tags/block/mineable/hoe.json diff --git a/src/generated/resources/data/minecraft/tags/blocks/mineable/shovel.json b/src/generated/resources/data/minecraft/tags/block/mineable/shovel.json similarity index 100% rename from src/generated/resources/data/minecraft/tags/blocks/mineable/shovel.json rename to src/generated/resources/data/minecraft/tags/block/mineable/shovel.json diff --git a/src/generated/resources/data/minecraft/tags/blocks/small_flowers.json b/src/generated/resources/data/minecraft/tags/block/small_flowers.json similarity index 100% rename from src/generated/resources/data/minecraft/tags/blocks/small_flowers.json rename to src/generated/resources/data/minecraft/tags/block/small_flowers.json diff --git a/src/generated/resources/data/minecraft/tags/items/small_flowers.json b/src/generated/resources/data/minecraft/tags/item/small_flowers.json similarity index 100% rename from src/generated/resources/data/minecraft/tags/items/small_flowers.json rename to src/generated/resources/data/minecraft/tags/item/small_flowers.json diff --git a/src/main/java/com/luxtracon/floralis/Floralis.java b/src/main/java/com/luxtracon/floralis/Floralis.java index dfd62ba0..a01dac29 100644 --- a/src/main/java/com/luxtracon/floralis/Floralis.java +++ b/src/main/java/com/luxtracon/floralis/Floralis.java @@ -1,33 +1,28 @@ package com.luxtracon.floralis; -import com.luxtracon.floralis.config.FloralisConfig; -import com.luxtracon.floralis.proxy.ClientProxy; -import com.luxtracon.floralis.proxy.CommonProxy; -import com.luxtracon.floralis.registry.FloralisBlocks; -import com.luxtracon.floralis.registry.FloralisConstants; -import com.luxtracon.floralis.registry.FloralisCreativeModeTabs; -import com.luxtracon.floralis.registry.FloralisItems; +import com.luxtracon.floralis.registry.*; import net.neoforged.bus.api.IEventBus; import net.neoforged.fml.common.Mod; +import net.neoforged.fml.event.lifecycle.FMLCommonSetupEvent; -import javax.annotation.Nonnull; +import javax.annotation.ParametersAreNonnullByDefault; @SuppressWarnings("unused") +@ParametersAreNonnullByDefault + @Mod(FloralisConstants.FLORALIS) public class Floralis { - public Floralis(@Nonnull IEventBus pBus) { - pBus.addListener(ClientProxy::onCreativeModeTabRegister); - pBus.addListener(CommonProxy::onFMLCommonSetup); - pBus.addListener(CommonProxy::onGatherData); - - FloralisConfig.registerClientConfig(); - FloralisConfig.registerCommonConfig(); - FloralisConfig.registerServerConfig(); + public Floralis(IEventBus pBus) { + pBus.addListener(this::onFMLCommonSetup); FloralisBlocks.BLOCKS.register(pBus); FloralisCreativeModeTabs.CREATIVE_MODE_TABS.register(pBus); FloralisItems.ITEMS.register(pBus); } + + public void onFMLCommonSetup(FMLCommonSetupEvent pEvent) { + pEvent.enqueueWork(FloralisPottables::setup); + } } diff --git a/src/main/java/com/luxtracon/floralis/config/FloralisConfig.java b/src/main/java/com/luxtracon/floralis/config/FloralisConfig.java deleted file mode 100644 index e09a32f7..00000000 --- a/src/main/java/com/luxtracon/floralis/config/FloralisConfig.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.luxtracon.floralis.config; - -import net.neoforged.fml.ModLoadingContext; -import net.neoforged.fml.config.ModConfig; -import net.neoforged.neoforge.common.ModConfigSpec; - -public class FloralisConfig { - public static ModConfigSpec.IntValue DESERT_FARM; - public static ModConfigSpec.IntValue PLAINS_FARM; - public static ModConfigSpec.IntValue SAVANNA_FARM; - public static ModConfigSpec.IntValue SNOWY_FARM; - public static ModConfigSpec.IntValue TAIGA_FARM; - - public static void registerClientConfig() { - var builder = new ModConfigSpec.Builder(); - - ModLoadingContext.get().getActiveContainer().registerConfig(ModConfig.Type.CLIENT, builder.build()); - } - - public static void registerCommonConfig() { - var builder = new ModConfigSpec.Builder(); - - builder.comment("Structure settings").push("structureSettings"); - - DESERT_FARM = builder.comment("Default: 64. Spawn rate for cactus farms in desert villages. 0 disables spawning cactus farms in desert villages.").defineInRange("desertFarms", 64, 0, 256); - PLAINS_FARM = builder.comment("Default: 64. Spawn rate for flower farms in plains villages. 0 disables spawning flower farms in plains villages.").defineInRange("plainsFarms", 64, 0, 256); - SAVANNA_FARM = builder.comment("Default: 64. Spawn rate for flower farms in savanna villages. 0 disables spawning flower farms in savanna villages.").defineInRange("savannaFarms", 64, 0, 256); - SNOWY_FARM = builder.comment("Default: 64. Spawn rate for flower farms in snowy villages. 0 disables spawning flower farms in snowy villages.").defineInRange("snowyFarms", 64, 0, 256); - TAIGA_FARM = builder.comment("Default: 64. Spawn rate for flower farms in taiga villages. 0 disables spawning flower farms in taiga villages.").defineInRange("taigaFarms", 64, 0, 256); - - builder.pop(); - - ModLoadingContext.get().getActiveContainer().registerConfig(ModConfig.Type.COMMON, builder.build()); - } - - public static void registerServerConfig() { - var builder = new ModConfigSpec.Builder(); - - ModLoadingContext.get().getActiveContainer().registerConfig(ModConfig.Type.SERVER, builder.build()); - } -} diff --git a/src/main/java/com/luxtracon/floralis/data/FloralisBiomeModifiers.java b/src/main/java/com/luxtracon/floralis/data/FloralisBiomeModifiers.java index 4ed8510a..0e454187 100644 --- a/src/main/java/com/luxtracon/floralis/data/FloralisBiomeModifiers.java +++ b/src/main/java/com/luxtracon/floralis/data/FloralisBiomeModifiers.java @@ -21,39 +21,39 @@ @ParametersAreNonnullByDefault public class FloralisBiomeModifiers { - public static final ResourceKey WHITE_FLOWER = ResourceKey.create(NeoForgeRegistries.Keys.BIOME_MODIFIERS, new ResourceLocation(FloralisConstants.FLORALIS, "white_flower")); - public static final ResourceKey LIGHT_GRAY_FLOWER = ResourceKey.create(NeoForgeRegistries.Keys.BIOME_MODIFIERS, new ResourceLocation(FloralisConstants.FLORALIS, "light_gray_flower")); - public static final ResourceKey GRAY_FLOWER = ResourceKey.create(NeoForgeRegistries.Keys.BIOME_MODIFIERS, new ResourceLocation(FloralisConstants.FLORALIS, "gray_flower")); - public static final ResourceKey BLACK_FLOWER = ResourceKey.create(NeoForgeRegistries.Keys.BIOME_MODIFIERS, new ResourceLocation(FloralisConstants.FLORALIS, "black_flower")); - public static final ResourceKey BROWN_FLOWER = ResourceKey.create(NeoForgeRegistries.Keys.BIOME_MODIFIERS, new ResourceLocation(FloralisConstants.FLORALIS, "brown_flower")); - public static final ResourceKey RED_FLOWER = ResourceKey.create(NeoForgeRegistries.Keys.BIOME_MODIFIERS, new ResourceLocation(FloralisConstants.FLORALIS, "red_flower")); - public static final ResourceKey ORANGE_FLOWER = ResourceKey.create(NeoForgeRegistries.Keys.BIOME_MODIFIERS, new ResourceLocation(FloralisConstants.FLORALIS, "orange_flower")); - public static final ResourceKey YELLOW_FLOWER = ResourceKey.create(NeoForgeRegistries.Keys.BIOME_MODIFIERS, new ResourceLocation(FloralisConstants.FLORALIS, "yellow_flower")); - public static final ResourceKey LIME_FLOWER = ResourceKey.create(NeoForgeRegistries.Keys.BIOME_MODIFIERS, new ResourceLocation(FloralisConstants.FLORALIS, "lime_flower")); - public static final ResourceKey GREEN_FLOWER = ResourceKey.create(NeoForgeRegistries.Keys.BIOME_MODIFIERS, new ResourceLocation(FloralisConstants.FLORALIS, "green_flower")); - public static final ResourceKey CYAN_FLOWER = ResourceKey.create(NeoForgeRegistries.Keys.BIOME_MODIFIERS, new ResourceLocation(FloralisConstants.FLORALIS, "cyan_flower")); - public static final ResourceKey LIGHT_BLUE_FLOWER = ResourceKey.create(NeoForgeRegistries.Keys.BIOME_MODIFIERS, new ResourceLocation(FloralisConstants.FLORALIS, "light_blue_flower")); - public static final ResourceKey BLUE_FLOWER = ResourceKey.create(NeoForgeRegistries.Keys.BIOME_MODIFIERS, new ResourceLocation(FloralisConstants.FLORALIS, "blue_flower")); - public static final ResourceKey PURPLE_FLOWER = ResourceKey.create(NeoForgeRegistries.Keys.BIOME_MODIFIERS, new ResourceLocation(FloralisConstants.FLORALIS, "purple_flower")); - public static final ResourceKey MAGENTA_FLOWER = ResourceKey.create(NeoForgeRegistries.Keys.BIOME_MODIFIERS, new ResourceLocation(FloralisConstants.FLORALIS, "magenta_flower")); - public static final ResourceKey PINK_FLOWER = ResourceKey.create(NeoForgeRegistries.Keys.BIOME_MODIFIERS, new ResourceLocation(FloralisConstants.FLORALIS, "pink_flower")); + public static final ResourceKey WHITE_FLOWER = ResourceKey.create(NeoForgeRegistries.Keys.BIOME_MODIFIERS, ResourceLocation.fromNamespaceAndPath(FloralisConstants.FLORALIS, "white_flower")); + public static final ResourceKey LIGHT_GRAY_FLOWER = ResourceKey.create(NeoForgeRegistries.Keys.BIOME_MODIFIERS, ResourceLocation.fromNamespaceAndPath(FloralisConstants.FLORALIS, "light_gray_flower")); + public static final ResourceKey GRAY_FLOWER = ResourceKey.create(NeoForgeRegistries.Keys.BIOME_MODIFIERS, ResourceLocation.fromNamespaceAndPath(FloralisConstants.FLORALIS, "gray_flower")); + public static final ResourceKey BLACK_FLOWER = ResourceKey.create(NeoForgeRegistries.Keys.BIOME_MODIFIERS, ResourceLocation.fromNamespaceAndPath(FloralisConstants.FLORALIS, "black_flower")); + public static final ResourceKey BROWN_FLOWER = ResourceKey.create(NeoForgeRegistries.Keys.BIOME_MODIFIERS, ResourceLocation.fromNamespaceAndPath(FloralisConstants.FLORALIS, "brown_flower")); + public static final ResourceKey RED_FLOWER = ResourceKey.create(NeoForgeRegistries.Keys.BIOME_MODIFIERS, ResourceLocation.fromNamespaceAndPath(FloralisConstants.FLORALIS, "red_flower")); + public static final ResourceKey ORANGE_FLOWER = ResourceKey.create(NeoForgeRegistries.Keys.BIOME_MODIFIERS, ResourceLocation.fromNamespaceAndPath(FloralisConstants.FLORALIS, "orange_flower")); + public static final ResourceKey YELLOW_FLOWER = ResourceKey.create(NeoForgeRegistries.Keys.BIOME_MODIFIERS, ResourceLocation.fromNamespaceAndPath(FloralisConstants.FLORALIS, "yellow_flower")); + public static final ResourceKey LIME_FLOWER = ResourceKey.create(NeoForgeRegistries.Keys.BIOME_MODIFIERS, ResourceLocation.fromNamespaceAndPath(FloralisConstants.FLORALIS, "lime_flower")); + public static final ResourceKey GREEN_FLOWER = ResourceKey.create(NeoForgeRegistries.Keys.BIOME_MODIFIERS, ResourceLocation.fromNamespaceAndPath(FloralisConstants.FLORALIS, "green_flower")); + public static final ResourceKey CYAN_FLOWER = ResourceKey.create(NeoForgeRegistries.Keys.BIOME_MODIFIERS, ResourceLocation.fromNamespaceAndPath(FloralisConstants.FLORALIS, "cyan_flower")); + public static final ResourceKey LIGHT_BLUE_FLOWER = ResourceKey.create(NeoForgeRegistries.Keys.BIOME_MODIFIERS, ResourceLocation.fromNamespaceAndPath(FloralisConstants.FLORALIS, "light_blue_flower")); + public static final ResourceKey BLUE_FLOWER = ResourceKey.create(NeoForgeRegistries.Keys.BIOME_MODIFIERS, ResourceLocation.fromNamespaceAndPath(FloralisConstants.FLORALIS, "blue_flower")); + public static final ResourceKey PURPLE_FLOWER = ResourceKey.create(NeoForgeRegistries.Keys.BIOME_MODIFIERS, ResourceLocation.fromNamespaceAndPath(FloralisConstants.FLORALIS, "purple_flower")); + public static final ResourceKey MAGENTA_FLOWER = ResourceKey.create(NeoForgeRegistries.Keys.BIOME_MODIFIERS, ResourceLocation.fromNamespaceAndPath(FloralisConstants.FLORALIS, "magenta_flower")); + public static final ResourceKey PINK_FLOWER = ResourceKey.create(NeoForgeRegistries.Keys.BIOME_MODIFIERS, ResourceLocation.fromNamespaceAndPath(FloralisConstants.FLORALIS, "pink_flower")); - public static final ResourceKey WHITE_CACTUS = ResourceKey.create(NeoForgeRegistries.Keys.BIOME_MODIFIERS, new ResourceLocation(FloralisConstants.FLORALIS, "white_cactus")); - public static final ResourceKey LIGHT_GRAY_CACTUS = ResourceKey.create(NeoForgeRegistries.Keys.BIOME_MODIFIERS, new ResourceLocation(FloralisConstants.FLORALIS, "light_gray_cactus")); - public static final ResourceKey GRAY_CACTUS = ResourceKey.create(NeoForgeRegistries.Keys.BIOME_MODIFIERS, new ResourceLocation(FloralisConstants.FLORALIS, "gray_cactus")); - public static final ResourceKey BLACK_CACTUS = ResourceKey.create(NeoForgeRegistries.Keys.BIOME_MODIFIERS, new ResourceLocation(FloralisConstants.FLORALIS, "black_cactus")); - public static final ResourceKey BROWN_CACTUS = ResourceKey.create(NeoForgeRegistries.Keys.BIOME_MODIFIERS, new ResourceLocation(FloralisConstants.FLORALIS, "brown_cactus")); - public static final ResourceKey RED_CACTUS = ResourceKey.create(NeoForgeRegistries.Keys.BIOME_MODIFIERS, new ResourceLocation(FloralisConstants.FLORALIS, "red_cactus")); - public static final ResourceKey ORANGE_CACTUS = ResourceKey.create(NeoForgeRegistries.Keys.BIOME_MODIFIERS, new ResourceLocation(FloralisConstants.FLORALIS, "orange_cactus")); - public static final ResourceKey YELLOW_CACTUS = ResourceKey.create(NeoForgeRegistries.Keys.BIOME_MODIFIERS, new ResourceLocation(FloralisConstants.FLORALIS, "yellow_cactus")); - public static final ResourceKey LIME_CACTUS = ResourceKey.create(NeoForgeRegistries.Keys.BIOME_MODIFIERS, new ResourceLocation(FloralisConstants.FLORALIS, "lime_cactus")); - public static final ResourceKey GREEN_CACTUS = ResourceKey.create(NeoForgeRegistries.Keys.BIOME_MODIFIERS, new ResourceLocation(FloralisConstants.FLORALIS, "green_cactus")); - public static final ResourceKey CYAN_CACTUS = ResourceKey.create(NeoForgeRegistries.Keys.BIOME_MODIFIERS, new ResourceLocation(FloralisConstants.FLORALIS, "cyan_cactus")); - public static final ResourceKey LIGHT_BLUE_CACTUS = ResourceKey.create(NeoForgeRegistries.Keys.BIOME_MODIFIERS, new ResourceLocation(FloralisConstants.FLORALIS, "light_blue_cactus")); - public static final ResourceKey BLUE_CACTUS = ResourceKey.create(NeoForgeRegistries.Keys.BIOME_MODIFIERS, new ResourceLocation(FloralisConstants.FLORALIS, "blue_cactus")); - public static final ResourceKey PURPLE_CACTUS = ResourceKey.create(NeoForgeRegistries.Keys.BIOME_MODIFIERS, new ResourceLocation(FloralisConstants.FLORALIS, "purple_cactus")); - public static final ResourceKey MAGENTA_CACTUS = ResourceKey.create(NeoForgeRegistries.Keys.BIOME_MODIFIERS, new ResourceLocation(FloralisConstants.FLORALIS, "magenta_cactus")); - public static final ResourceKey PINK_CACTUS = ResourceKey.create(NeoForgeRegistries.Keys.BIOME_MODIFIERS, new ResourceLocation(FloralisConstants.FLORALIS, "pink_cactus")); + public static final ResourceKey WHITE_CACTUS = ResourceKey.create(NeoForgeRegistries.Keys.BIOME_MODIFIERS, ResourceLocation.fromNamespaceAndPath(FloralisConstants.FLORALIS, "white_cactus")); + public static final ResourceKey LIGHT_GRAY_CACTUS = ResourceKey.create(NeoForgeRegistries.Keys.BIOME_MODIFIERS, ResourceLocation.fromNamespaceAndPath(FloralisConstants.FLORALIS, "light_gray_cactus")); + public static final ResourceKey GRAY_CACTUS = ResourceKey.create(NeoForgeRegistries.Keys.BIOME_MODIFIERS, ResourceLocation.fromNamespaceAndPath(FloralisConstants.FLORALIS, "gray_cactus")); + public static final ResourceKey BLACK_CACTUS = ResourceKey.create(NeoForgeRegistries.Keys.BIOME_MODIFIERS, ResourceLocation.fromNamespaceAndPath(FloralisConstants.FLORALIS, "black_cactus")); + public static final ResourceKey BROWN_CACTUS = ResourceKey.create(NeoForgeRegistries.Keys.BIOME_MODIFIERS, ResourceLocation.fromNamespaceAndPath(FloralisConstants.FLORALIS, "brown_cactus")); + public static final ResourceKey RED_CACTUS = ResourceKey.create(NeoForgeRegistries.Keys.BIOME_MODIFIERS, ResourceLocation.fromNamespaceAndPath(FloralisConstants.FLORALIS, "red_cactus")); + public static final ResourceKey ORANGE_CACTUS = ResourceKey.create(NeoForgeRegistries.Keys.BIOME_MODIFIERS, ResourceLocation.fromNamespaceAndPath(FloralisConstants.FLORALIS, "orange_cactus")); + public static final ResourceKey YELLOW_CACTUS = ResourceKey.create(NeoForgeRegistries.Keys.BIOME_MODIFIERS, ResourceLocation.fromNamespaceAndPath(FloralisConstants.FLORALIS, "yellow_cactus")); + public static final ResourceKey LIME_CACTUS = ResourceKey.create(NeoForgeRegistries.Keys.BIOME_MODIFIERS, ResourceLocation.fromNamespaceAndPath(FloralisConstants.FLORALIS, "lime_cactus")); + public static final ResourceKey GREEN_CACTUS = ResourceKey.create(NeoForgeRegistries.Keys.BIOME_MODIFIERS, ResourceLocation.fromNamespaceAndPath(FloralisConstants.FLORALIS, "green_cactus")); + public static final ResourceKey CYAN_CACTUS = ResourceKey.create(NeoForgeRegistries.Keys.BIOME_MODIFIERS, ResourceLocation.fromNamespaceAndPath(FloralisConstants.FLORALIS, "cyan_cactus")); + public static final ResourceKey LIGHT_BLUE_CACTUS = ResourceKey.create(NeoForgeRegistries.Keys.BIOME_MODIFIERS, ResourceLocation.fromNamespaceAndPath(FloralisConstants.FLORALIS, "light_blue_cactus")); + public static final ResourceKey BLUE_CACTUS = ResourceKey.create(NeoForgeRegistries.Keys.BIOME_MODIFIERS, ResourceLocation.fromNamespaceAndPath(FloralisConstants.FLORALIS, "blue_cactus")); + public static final ResourceKey PURPLE_CACTUS = ResourceKey.create(NeoForgeRegistries.Keys.BIOME_MODIFIERS, ResourceLocation.fromNamespaceAndPath(FloralisConstants.FLORALIS, "purple_cactus")); + public static final ResourceKey MAGENTA_CACTUS = ResourceKey.create(NeoForgeRegistries.Keys.BIOME_MODIFIERS, ResourceLocation.fromNamespaceAndPath(FloralisConstants.FLORALIS, "magenta_cactus")); + public static final ResourceKey PINK_CACTUS = ResourceKey.create(NeoForgeRegistries.Keys.BIOME_MODIFIERS, ResourceLocation.fromNamespaceAndPath(FloralisConstants.FLORALIS, "pink_cactus")); public static void bootstrap(BootstrapContext pContext) { var biomes = pContext.lookup(Registries.BIOME); diff --git a/src/main/java/com/luxtracon/floralis/data/features/FloralisConfiguredFeatures.java b/src/main/java/com/luxtracon/floralis/data/features/FloralisConfiguredFeatures.java index 1fdca09f..6585620e 100644 --- a/src/main/java/com/luxtracon/floralis/data/features/FloralisConfiguredFeatures.java +++ b/src/main/java/com/luxtracon/floralis/data/features/FloralisConfiguredFeatures.java @@ -96,6 +96,6 @@ public static void bootstrap(BootstrapContext> pContext) } public static ResourceKey> registerKey(String pName) { - return ResourceKey.create(Registries.CONFIGURED_FEATURE, new ResourceLocation(FloralisConstants.FLORALIS, pName)); + return ResourceKey.create(Registries.CONFIGURED_FEATURE, ResourceLocation.fromNamespaceAndPath(FloralisConstants.FLORALIS, pName)); } } diff --git a/src/main/java/com/luxtracon/floralis/data/features/FloralisPlacedFeatures.java b/src/main/java/com/luxtracon/floralis/data/features/FloralisPlacedFeatures.java index a3fb94e6..741db8fc 100644 --- a/src/main/java/com/luxtracon/floralis/data/features/FloralisPlacedFeatures.java +++ b/src/main/java/com/luxtracon/floralis/data/features/FloralisPlacedFeatures.java @@ -96,6 +96,6 @@ public static void bootstrap(BootstrapContext pContext) { } public static ResourceKey registerKey(String pName) { - return ResourceKey.create(Registries.PLACED_FEATURE, new ResourceLocation(FloralisConstants.FLORALIS, pName)); + return ResourceKey.create(Registries.PLACED_FEATURE, ResourceLocation.fromNamespaceAndPath(FloralisConstants.FLORALIS, pName)); } } diff --git a/src/main/java/com/luxtracon/floralis/data/loot/FloralisBlockLoot.java b/src/main/java/com/luxtracon/floralis/data/loot/FloralisBlockLoot.java index 0efbcdb4..9ea4aad3 100644 --- a/src/main/java/com/luxtracon/floralis/data/loot/FloralisBlockLoot.java +++ b/src/main/java/com/luxtracon/floralis/data/loot/FloralisBlockLoot.java @@ -6,6 +6,8 @@ import net.minecraft.MethodsReturnNonnullByDefault; import net.minecraft.advancements.critereon.*; +import net.minecraft.core.HolderLookup; +import net.minecraft.core.registries.Registries; import net.minecraft.data.loot.BlockLootSubProvider; import net.minecraft.world.flag.FeatureFlags; import net.minecraft.world.item.Item; @@ -30,20 +32,12 @@ import java.util.stream.Collectors; @SuppressWarnings("unused") + @MethodsReturnNonnullByDefault public class FloralisBlockLoot extends BlockLootSubProvider { - public static final EnchantmentPredicate SILK_TOUCH = new EnchantmentPredicate(Enchantments.SILK_TOUCH, MinMaxBounds.Ints.atLeast(1)); - - public static final LootItemCondition.Builder SILK = MatchTool.toolMatches(ItemPredicate.Builder.item().withSubPredicate(ItemSubPredicates.ENCHANTMENTS, ItemEnchantmentsPredicate.enchantments(List.of(FloralisBlockLoot.SILK_TOUCH)))); - public static final LootItemCondition.Builder NO_SILK = FloralisBlockLoot.SILK.invert(); - public static final LootItemCondition.Builder SHEARS = MatchTool.toolMatches(ItemPredicate.Builder.item().of(Items.SHEARS)); - public static final LootItemCondition.Builder NO_SHEARS = FloralisBlockLoot.SHEARS.invert(); - public static final LootItemCondition.Builder SILK_OR_SHEARS = FloralisBlockLoot.SHEARS.or(FloralisBlockLoot.SILK); - public static final LootItemCondition.Builder NO_SILK_OR_SHEARS = FloralisBlockLoot.SILK_OR_SHEARS.invert(); - - public FloralisBlockLoot() { - super(Set.of(), FeatureFlags.REGISTRY.allFlags()); + public FloralisBlockLoot(HolderLookup.Provider pProvider) { + super(Set.of(), FeatureFlags.REGISTRY.allFlags(), pProvider); } @Override @@ -209,11 +203,13 @@ public void dropThis(Block pBlock) { } public void dropSeed(Block pBlock, Item pSeeds, Item pPetals) { - this.add(pBlock, LootTable.lootTable().withPool(LootPool.lootPool().add(LootItem.lootTableItem(pBlock).when(FloralisBlockLoot.SILK_OR_SHEARS))).withPool(LootPool.lootPool().add(LootItem.lootTableItem(pSeeds).when(FloralisBlockLoot.NO_SILK_OR_SHEARS).apply(ApplyBonusCount.addUniformBonusCount(Enchantments.FORTUNE, 2)).apply(SetItemCountFunction.setCount(ConstantValue.exactly(2.0F))))).withPool(LootPool.lootPool().add(LootItem.lootTableItem(pPetals).when(FloralisBlockLoot.NO_SILK_OR_SHEARS).apply(ApplyBonusCount.addUniformBonusCount(Enchantments.FORTUNE, 2)))).withPool(LootPool.lootPool().add(LootItem.lootTableItem(FloralisItems.PLANT_FIBERS.get()).when(FloralisBlockLoot.NO_SILK_OR_SHEARS).apply(ApplyBonusCount.addUniformBonusCount(Enchantments.FORTUNE, 2))))); + var registryLookup = this.registries.lookupOrThrow(Registries.ENCHANTMENT); + this.add(pBlock, LootTable.lootTable().withPool(LootPool.lootPool().add(LootItem.lootTableItem(pBlock).when(this.shearsOrSilk()))).withPool(LootPool.lootPool().add(LootItem.lootTableItem(pSeeds).when(this.noShearsOrSilk()).apply(ApplyBonusCount.addUniformBonusCount(registryLookup.getOrThrow(Enchantments.FORTUNE), 2)).apply(SetItemCountFunction.setCount(ConstantValue.exactly(2.0F))))).withPool(LootPool.lootPool().add(LootItem.lootTableItem(pPetals).when(this.noShearsOrSilk()).apply(ApplyBonusCount.addUniformBonusCount(registryLookup.getOrThrow(Enchantments.FORTUNE), 2)))).withPool(LootPool.lootPool().add(LootItem.lootTableItem(FloralisItems.PLANT_FIBERS.get()).when(this.noShearsOrSilk()).apply(ApplyBonusCount.addUniformBonusCount(registryLookup.getOrThrow(Enchantments.FORTUNE), 2))))); } public void dropCrop(Block pBlock, Item pItem, Item pSeeds, Item pPetals) { - this.add(pBlock, LootTable.lootTable().withPool(LootPool.lootPool().add(LootItem.lootTableItem(pItem).when(FloralisBlockLoot.SILK_OR_SHEARS).when(LootItemBlockStatePropertyCondition.hasBlockStateProperties(pBlock).setProperties(StatePropertiesPredicate.Builder.properties().hasProperty(FloralisBlockStateProperties.AGE, 5))))).withPool(LootPool.lootPool().add(LootItem.lootTableItem(pSeeds).when(FloralisBlockLoot.SILK_OR_SHEARS).when(LootItemBlockStatePropertyCondition.hasBlockStateProperties(pBlock).setProperties(StatePropertiesPredicate.Builder.properties().hasProperty(FloralisBlockStateProperties.AGE, 5)).invert()))).withPool(LootPool.lootPool().add(LootItem.lootTableItem(pSeeds).when(FloralisBlockLoot.NO_SILK_OR_SHEARS).when(LootItemBlockStatePropertyCondition.hasBlockStateProperties(pBlock).setProperties(StatePropertiesPredicate.Builder.properties().hasProperty(FloralisBlockStateProperties.AGE, 5))).apply(ApplyBonusCount.addUniformBonusCount(Enchantments.FORTUNE, 2)).apply(SetItemCountFunction.setCount(ConstantValue.exactly(2.0F))))).withPool(LootPool.lootPool().add(LootItem.lootTableItem(pPetals).when(FloralisBlockLoot.NO_SILK_OR_SHEARS).when(LootItemBlockStatePropertyCondition.hasBlockStateProperties(pBlock).setProperties(StatePropertiesPredicate.Builder.properties().hasProperty(FloralisBlockStateProperties.AGE, 5))).apply(ApplyBonusCount.addUniformBonusCount(Enchantments.FORTUNE, 2)))).withPool(LootPool.lootPool().add(LootItem.lootTableItem(FloralisItems.PLANT_FIBERS.get()).when(FloralisBlockLoot.NO_SILK_OR_SHEARS).when(LootItemBlockStatePropertyCondition.hasBlockStateProperties(pBlock).setProperties(StatePropertiesPredicate.Builder.properties().hasProperty(FloralisBlockStateProperties.AGE, 5))).apply(ApplyBonusCount.addUniformBonusCount(Enchantments.FORTUNE, 2)))).withPool(LootPool.lootPool().add(LootItem.lootTableItem(pSeeds).when(FloralisBlockLoot.NO_SILK_OR_SHEARS).when(LootItemBlockStatePropertyCondition.hasBlockStateProperties(pBlock).setProperties(StatePropertiesPredicate.Builder.properties().hasProperty(FloralisBlockStateProperties.AGE, 5)).invert())))); + var registryLookup = this.registries.lookupOrThrow(Registries.ENCHANTMENT); + this.add(pBlock, LootTable.lootTable().withPool(LootPool.lootPool().add(LootItem.lootTableItem(pItem).when(this.shearsOrSilk()).when(LootItemBlockStatePropertyCondition.hasBlockStateProperties(pBlock).setProperties(StatePropertiesPredicate.Builder.properties().hasProperty(FloralisBlockStateProperties.AGE, 5))))).withPool(LootPool.lootPool().add(LootItem.lootTableItem(pSeeds).when(this.shearsOrSilk()).when(LootItemBlockStatePropertyCondition.hasBlockStateProperties(pBlock).setProperties(StatePropertiesPredicate.Builder.properties().hasProperty(FloralisBlockStateProperties.AGE, 5)).invert()))).withPool(LootPool.lootPool().add(LootItem.lootTableItem(pSeeds).when(this.noShearsOrSilk()).when(LootItemBlockStatePropertyCondition.hasBlockStateProperties(pBlock).setProperties(StatePropertiesPredicate.Builder.properties().hasProperty(FloralisBlockStateProperties.AGE, 5))).apply(ApplyBonusCount.addUniformBonusCount(registryLookup.getOrThrow(Enchantments.FORTUNE), 2)).apply(SetItemCountFunction.setCount(ConstantValue.exactly(2.0F))))).withPool(LootPool.lootPool().add(LootItem.lootTableItem(pPetals).when(this.noShearsOrSilk()).when(LootItemBlockStatePropertyCondition.hasBlockStateProperties(pBlock).setProperties(StatePropertiesPredicate.Builder.properties().hasProperty(FloralisBlockStateProperties.AGE, 5))).apply(ApplyBonusCount.addUniformBonusCount(registryLookup.getOrThrow(Enchantments.FORTUNE), 2)))).withPool(LootPool.lootPool().add(LootItem.lootTableItem(FloralisItems.PLANT_FIBERS.get()).when(this.noShearsOrSilk()).when(LootItemBlockStatePropertyCondition.hasBlockStateProperties(pBlock).setProperties(StatePropertiesPredicate.Builder.properties().hasProperty(FloralisBlockStateProperties.AGE, 5))).apply(ApplyBonusCount.addUniformBonusCount(registryLookup.getOrThrow(Enchantments.FORTUNE), 2)))).withPool(LootPool.lootPool().add(LootItem.lootTableItem(pSeeds).when(this.noShearsOrSilk()).when(LootItemBlockStatePropertyCondition.hasBlockStateProperties(pBlock).setProperties(StatePropertiesPredicate.Builder.properties().hasProperty(FloralisBlockStateProperties.AGE, 5)).invert())))); } public void dropPots(Block pBlock, Item pItem) { @@ -228,4 +224,30 @@ public void dropNone(Block pBlock) { public Iterable getKnownBlocks() { return FloralisBlocks.BLOCKS.getEntries().stream().map(DeferredHolder::value).collect(Collectors.toList()); } + + public LootItemCondition.Builder noShears() { + return this.shears().invert(); + } + + public LootItemCondition.Builder noShearsOrSilk() { + return this.shearsOrSilk().invert(); + } + + public LootItemCondition.Builder noSilk() { + return this.silk().invert(); + } + + public LootItemCondition.Builder shears() { + return MatchTool.toolMatches(ItemPredicate.Builder.item().of(Items.SHEARS)); + } + + public LootItemCondition.Builder shearsOrSilk() { + return this.shears().or(this.silk()); + } + + public LootItemCondition.Builder silk() { + var registryLookup = this.registries.lookupOrThrow(Registries.ENCHANTMENT); + var enchantmentPredicate = new EnchantmentPredicate(registryLookup.getOrThrow(Enchantments.SILK_TOUCH), MinMaxBounds.Ints.atLeast(1)); + return MatchTool.toolMatches(ItemPredicate.Builder.item().withSubPredicate(ItemSubPredicates.ENCHANTMENTS, ItemEnchantmentsPredicate.enchantments(List.of(enchantmentPredicate)))); + } } diff --git a/src/main/java/com/luxtracon/floralis/data/tags/FloralisBiomeTags.java b/src/main/java/com/luxtracon/floralis/data/tags/FloralisBiomeTags.java index 6190411f..10cb84aa 100644 --- a/src/main/java/com/luxtracon/floralis/data/tags/FloralisBiomeTags.java +++ b/src/main/java/com/luxtracon/floralis/data/tags/FloralisBiomeTags.java @@ -19,6 +19,7 @@ import javax.annotation.ParametersAreNonnullByDefault; @SuppressWarnings("unused") + @MethodsReturnNonnullByDefault @ParametersAreNonnullByDefault @@ -39,7 +40,7 @@ public void addTags(HolderLookup.Provider pProvider) { } public static TagKey bind(String pName) { - return TagKey.create(Registries.BIOME, new ResourceLocation(pName)); + return TagKey.create(Registries.BIOME, ResourceLocation.parse(pName)); } public static TagKey cTag(String pName) { diff --git a/src/main/java/com/luxtracon/floralis/data/tags/FloralisBlockTags.java b/src/main/java/com/luxtracon/floralis/data/tags/FloralisBlockTags.java index 83fd3002..6a07a03b 100644 --- a/src/main/java/com/luxtracon/floralis/data/tags/FloralisBlockTags.java +++ b/src/main/java/com/luxtracon/floralis/data/tags/FloralisBlockTags.java @@ -21,6 +21,7 @@ import javax.annotation.ParametersAreNonnullByDefault; @SuppressWarnings("unused") + @MethodsReturnNonnullByDefault @ParametersAreNonnullByDefault @@ -175,7 +176,7 @@ protected void addTags(HolderLookup.Provider pProvider) { } public static TagKey bind(String pName) { - return TagKey.create(Registries.BLOCK, new ResourceLocation(pName)); + return TagKey.create(Registries.BLOCK, ResourceLocation.parse(pName)); } public static TagKey cTag(String pName) { diff --git a/src/main/java/com/luxtracon/floralis/data/tags/FloralisItemTags.java b/src/main/java/com/luxtracon/floralis/data/tags/FloralisItemTags.java index 1e743260..70e5113b 100644 --- a/src/main/java/com/luxtracon/floralis/data/tags/FloralisItemTags.java +++ b/src/main/java/com/luxtracon/floralis/data/tags/FloralisItemTags.java @@ -22,6 +22,7 @@ import javax.annotation.ParametersAreNonnullByDefault; @SuppressWarnings("unused") + @MethodsReturnNonnullByDefault @ParametersAreNonnullByDefault @@ -147,7 +148,7 @@ protected void addTags(HolderLookup.Provider pProvider) { } public static TagKey bind(String pName) { - return TagKey.create(Registries.ITEM, new ResourceLocation(pName)); + return TagKey.create(Registries.ITEM, ResourceLocation.parse(pName)); } public static TagKey cTag(String pName) { diff --git a/src/main/java/com/luxtracon/floralis/events/ClientModEvents.java b/src/main/java/com/luxtracon/floralis/events/ClientModEvents.java new file mode 100644 index 00000000..70cbf277 --- /dev/null +++ b/src/main/java/com/luxtracon/floralis/events/ClientModEvents.java @@ -0,0 +1,129 @@ +package com.luxtracon.floralis.events; + +import com.luxtracon.floralis.registry.FloralisBlocks; +import com.luxtracon.floralis.registry.FloralisConstants; + +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.BiomeColors; +import net.minecraft.world.level.GrassColor; +import net.minecraft.world.level.block.Block; + +import net.neoforged.api.distmarker.Dist; +import net.neoforged.bus.api.SubscribeEvent; +import net.neoforged.fml.common.EventBusSubscriber; +import net.neoforged.fml.event.lifecycle.FMLLoadCompleteEvent; + +@SuppressWarnings("deprecation, unused") + +@EventBusSubscriber(bus = EventBusSubscriber.Bus.MOD, modid = FloralisConstants.FLORALIS, value = Dist.CLIENT) +public class ClientModEvents { + + @SubscribeEvent + public static void onFMLLoadComplete(FMLLoadCompleteEvent pEvent) { + ClientModEvents.blockColor(FloralisBlocks.WHITE_FLOWER.get()); + ClientModEvents.blockColor(FloralisBlocks.LIGHT_GRAY_FLOWER.get()); + ClientModEvents.blockColor(FloralisBlocks.GRAY_FLOWER.get()); + ClientModEvents.blockColor(FloralisBlocks.BLACK_FLOWER.get()); + ClientModEvents.blockColor(FloralisBlocks.BROWN_FLOWER.get()); + ClientModEvents.blockColor(FloralisBlocks.RED_FLOWER.get()); + ClientModEvents.blockColor(FloralisBlocks.ORANGE_FLOWER.get()); + ClientModEvents.blockColor(FloralisBlocks.YELLOW_FLOWER.get()); + ClientModEvents.blockColor(FloralisBlocks.LIME_FLOWER.get()); + ClientModEvents.blockColor(FloralisBlocks.GREEN_FLOWER.get()); + ClientModEvents.blockColor(FloralisBlocks.CYAN_FLOWER.get()); + ClientModEvents.blockColor(FloralisBlocks.LIGHT_BLUE_FLOWER.get()); + ClientModEvents.blockColor(FloralisBlocks.BLUE_FLOWER.get()); + ClientModEvents.blockColor(FloralisBlocks.PURPLE_FLOWER.get()); + ClientModEvents.blockColor(FloralisBlocks.MAGENTA_FLOWER.get()); + ClientModEvents.blockColor(FloralisBlocks.PINK_FLOWER.get()); + + ClientModEvents.blockColor(FloralisBlocks.WHITE_CACTUS.get()); + ClientModEvents.blockColor(FloralisBlocks.LIGHT_GRAY_CACTUS.get()); + ClientModEvents.blockColor(FloralisBlocks.GRAY_CACTUS.get()); + ClientModEvents.blockColor(FloralisBlocks.BLACK_CACTUS.get()); + ClientModEvents.blockColor(FloralisBlocks.BROWN_CACTUS.get()); + ClientModEvents.blockColor(FloralisBlocks.RED_CACTUS.get()); + ClientModEvents.blockColor(FloralisBlocks.ORANGE_CACTUS.get()); + ClientModEvents.blockColor(FloralisBlocks.YELLOW_CACTUS.get()); + ClientModEvents.blockColor(FloralisBlocks.LIME_CACTUS.get()); + ClientModEvents.blockColor(FloralisBlocks.GREEN_CACTUS.get()); + ClientModEvents.blockColor(FloralisBlocks.CYAN_CACTUS.get()); + ClientModEvents.blockColor(FloralisBlocks.LIGHT_BLUE_CACTUS.get()); + ClientModEvents.blockColor(FloralisBlocks.BLUE_CACTUS.get()); + ClientModEvents.blockColor(FloralisBlocks.PURPLE_CACTUS.get()); + ClientModEvents.blockColor(FloralisBlocks.MAGENTA_CACTUS.get()); + ClientModEvents.blockColor(FloralisBlocks.PINK_CACTUS.get()); + + ClientModEvents.blockColor(FloralisBlocks.POTTED_WHITE_FLOWER.get()); + ClientModEvents.blockColor(FloralisBlocks.POTTED_LIGHT_GRAY_FLOWER.get()); + ClientModEvents.blockColor(FloralisBlocks.POTTED_GRAY_FLOWER.get()); + ClientModEvents.blockColor(FloralisBlocks.POTTED_BLACK_FLOWER.get()); + ClientModEvents.blockColor(FloralisBlocks.POTTED_BROWN_FLOWER.get()); + ClientModEvents.blockColor(FloralisBlocks.POTTED_RED_FLOWER.get()); + ClientModEvents.blockColor(FloralisBlocks.POTTED_ORANGE_FLOWER.get()); + ClientModEvents.blockColor(FloralisBlocks.POTTED_YELLOW_FLOWER.get()); + ClientModEvents.blockColor(FloralisBlocks.POTTED_LIME_FLOWER.get()); + ClientModEvents.blockColor(FloralisBlocks.POTTED_GREEN_FLOWER.get()); + ClientModEvents.blockColor(FloralisBlocks.POTTED_CYAN_FLOWER.get()); + ClientModEvents.blockColor(FloralisBlocks.POTTED_LIGHT_BLUE_FLOWER.get()); + ClientModEvents.blockColor(FloralisBlocks.POTTED_BLUE_FLOWER.get()); + ClientModEvents.blockColor(FloralisBlocks.POTTED_PURPLE_FLOWER.get()); + ClientModEvents.blockColor(FloralisBlocks.POTTED_MAGENTA_FLOWER.get()); + ClientModEvents.blockColor(FloralisBlocks.POTTED_PINK_FLOWER.get()); + + ClientModEvents.blockColor(FloralisBlocks.POTTED_WHITE_CACTUS.get()); + ClientModEvents.blockColor(FloralisBlocks.POTTED_LIGHT_GRAY_CACTUS.get()); + ClientModEvents.blockColor(FloralisBlocks.POTTED_GRAY_CACTUS.get()); + ClientModEvents.blockColor(FloralisBlocks.POTTED_BLACK_CACTUS.get()); + ClientModEvents.blockColor(FloralisBlocks.POTTED_BROWN_CACTUS.get()); + ClientModEvents.blockColor(FloralisBlocks.POTTED_RED_CACTUS.get()); + ClientModEvents.blockColor(FloralisBlocks.POTTED_ORANGE_CACTUS.get()); + ClientModEvents.blockColor(FloralisBlocks.POTTED_YELLOW_CACTUS.get()); + ClientModEvents.blockColor(FloralisBlocks.POTTED_LIME_CACTUS.get()); + ClientModEvents.blockColor(FloralisBlocks.POTTED_GREEN_CACTUS.get()); + ClientModEvents.blockColor(FloralisBlocks.POTTED_CYAN_CACTUS.get()); + ClientModEvents.blockColor(FloralisBlocks.POTTED_LIGHT_BLUE_CACTUS.get()); + ClientModEvents.blockColor(FloralisBlocks.POTTED_BLUE_CACTUS.get()); + ClientModEvents.blockColor(FloralisBlocks.POTTED_PURPLE_CACTUS.get()); + ClientModEvents.blockColor(FloralisBlocks.POTTED_MAGENTA_CACTUS.get()); + ClientModEvents.blockColor(FloralisBlocks.POTTED_PINK_CACTUS.get()); + + ClientModEvents.blockColor(FloralisBlocks.WHITE_FLOWER_CROP.get()); + ClientModEvents.blockColor(FloralisBlocks.LIGHT_GRAY_FLOWER_CROP.get()); + ClientModEvents.blockColor(FloralisBlocks.GRAY_FLOWER_CROP.get()); + ClientModEvents.blockColor(FloralisBlocks.BLACK_FLOWER_CROP.get()); + ClientModEvents.blockColor(FloralisBlocks.BROWN_FLOWER_CROP.get()); + ClientModEvents.blockColor(FloralisBlocks.RED_FLOWER_CROP.get()); + ClientModEvents.blockColor(FloralisBlocks.ORANGE_FLOWER_CROP.get()); + ClientModEvents.blockColor(FloralisBlocks.YELLOW_FLOWER_CROP.get()); + ClientModEvents.blockColor(FloralisBlocks.LIME_FLOWER_CROP.get()); + ClientModEvents.blockColor(FloralisBlocks.GREEN_FLOWER_CROP.get()); + ClientModEvents.blockColor(FloralisBlocks.CYAN_FLOWER_CROP.get()); + ClientModEvents.blockColor(FloralisBlocks.LIGHT_BLUE_FLOWER_CROP.get()); + ClientModEvents.blockColor(FloralisBlocks.BLUE_FLOWER_CROP.get()); + ClientModEvents.blockColor(FloralisBlocks.PURPLE_FLOWER_CROP.get()); + ClientModEvents.blockColor(FloralisBlocks.MAGENTA_FLOWER_CROP.get()); + ClientModEvents.blockColor(FloralisBlocks.PINK_FLOWER_CROP.get()); + + ClientModEvents.blockColor(FloralisBlocks.WHITE_CACTUS_CROP.get()); + ClientModEvents.blockColor(FloralisBlocks.LIGHT_GRAY_CACTUS_CROP.get()); + ClientModEvents.blockColor(FloralisBlocks.GRAY_CACTUS_CROP.get()); + ClientModEvents.blockColor(FloralisBlocks.BLACK_CACTUS_CROP.get()); + ClientModEvents.blockColor(FloralisBlocks.BROWN_CACTUS_CROP.get()); + ClientModEvents.blockColor(FloralisBlocks.RED_CACTUS_CROP.get()); + ClientModEvents.blockColor(FloralisBlocks.ORANGE_CACTUS_CROP.get()); + ClientModEvents.blockColor(FloralisBlocks.YELLOW_CACTUS_CROP.get()); + ClientModEvents.blockColor(FloralisBlocks.LIME_CACTUS_CROP.get()); + ClientModEvents.blockColor(FloralisBlocks.GREEN_CACTUS_CROP.get()); + ClientModEvents.blockColor(FloralisBlocks.CYAN_CACTUS_CROP.get()); + ClientModEvents.blockColor(FloralisBlocks.LIGHT_BLUE_CACTUS_CROP.get()); + ClientModEvents.blockColor(FloralisBlocks.BLUE_CACTUS_CROP.get()); + ClientModEvents.blockColor(FloralisBlocks.PURPLE_CACTUS_CROP.get()); + ClientModEvents.blockColor(FloralisBlocks.MAGENTA_CACTUS_CROP.get()); + ClientModEvents.blockColor(FloralisBlocks.PINK_CACTUS_CROP.get()); + } + + public static void blockColor(Block pBlock) { + Minecraft.getInstance().getBlockColors().register((pState, pLevel, pPos, pIndex) -> pLevel != null && pPos != null ? BiomeColors.getAverageGrassColor(pLevel, pPos) : GrassColor.get(0.5D, 1.0D), pBlock); + } +} diff --git a/src/main/java/com/luxtracon/floralis/events/CommonModEvents.java b/src/main/java/com/luxtracon/floralis/events/CommonModEvents.java new file mode 100644 index 00000000..cf8004fe --- /dev/null +++ b/src/main/java/com/luxtracon/floralis/events/CommonModEvents.java @@ -0,0 +1,158 @@ +package com.luxtracon.floralis.events; + +import com.luxtracon.floralis.data.FloralisBuiltinEntries; +import com.luxtracon.floralis.data.FloralisDataMaps; +import com.luxtracon.floralis.data.FloralisRecipes; +import com.luxtracon.floralis.data.FloralisRegistrySetBuilder; +import com.luxtracon.floralis.data.loot.FloralisLoot; +import com.luxtracon.floralis.data.tags.FloralisBiomeTags; +import com.luxtracon.floralis.data.tags.FloralisBlockTags; +import com.luxtracon.floralis.data.tags.FloralisItemTags; +import com.luxtracon.floralis.registry.FloralisConstants; +import com.luxtracon.floralis.registry.FloralisCreativeModeTabs; +import com.luxtracon.floralis.registry.FloralisItems; + +import net.neoforged.bus.api.SubscribeEvent; +import net.neoforged.fml.common.EventBusSubscriber; +import net.neoforged.neoforge.data.event.GatherDataEvent; +import net.neoforged.neoforge.event.BuildCreativeModeTabContentsEvent; + +import javax.annotation.ParametersAreNonnullByDefault; + +@SuppressWarnings("unused") + +@ParametersAreNonnullByDefault + +@EventBusSubscriber(bus = EventBusSubscriber.Bus.MOD, modid = FloralisConstants.FLORALIS) +public class CommonModEvents { + + @SubscribeEvent + public static void onCreativeModeTabRegister(BuildCreativeModeTabContentsEvent pEvent) { + if (pEvent.getTab().equals(FloralisCreativeModeTabs.FLORALIS.get())) { + pEvent.accept(FloralisItems.WHITE_DYE_BLOCK.get()); + pEvent.accept(FloralisItems.LIGHT_GRAY_DYE_BLOCK.get()); + pEvent.accept(FloralisItems.GRAY_DYE_BLOCK.get()); + pEvent.accept(FloralisItems.BLACK_DYE_BLOCK.get()); + pEvent.accept(FloralisItems.BROWN_DYE_BLOCK.get()); + pEvent.accept(FloralisItems.RED_DYE_BLOCK.get()); + pEvent.accept(FloralisItems.ORANGE_DYE_BLOCK.get()); + pEvent.accept(FloralisItems.YELLOW_DYE_BLOCK.get()); + pEvent.accept(FloralisItems.LIME_DYE_BLOCK.get()); + pEvent.accept(FloralisItems.GREEN_DYE_BLOCK.get()); + pEvent.accept(FloralisItems.CYAN_DYE_BLOCK.get()); + pEvent.accept(FloralisItems.LIGHT_BLUE_DYE_BLOCK.get()); + pEvent.accept(FloralisItems.BLUE_DYE_BLOCK.get()); + pEvent.accept(FloralisItems.PURPLE_DYE_BLOCK.get()); + pEvent.accept(FloralisItems.MAGENTA_DYE_BLOCK.get()); + pEvent.accept(FloralisItems.PINK_DYE_BLOCK.get()); + + pEvent.accept(FloralisItems.PLANT_FIBERS_BLOCK.get()); + + pEvent.accept(FloralisItems.WHITE_FLOWER.get()); + pEvent.accept(FloralisItems.LIGHT_GRAY_FLOWER.get()); + pEvent.accept(FloralisItems.GRAY_FLOWER.get()); + pEvent.accept(FloralisItems.BLACK_FLOWER.get()); + pEvent.accept(FloralisItems.BROWN_FLOWER.get()); + pEvent.accept(FloralisItems.RED_FLOWER.get()); + pEvent.accept(FloralisItems.ORANGE_FLOWER.get()); + pEvent.accept(FloralisItems.YELLOW_FLOWER.get()); + pEvent.accept(FloralisItems.LIME_FLOWER.get()); + pEvent.accept(FloralisItems.GREEN_FLOWER.get()); + pEvent.accept(FloralisItems.CYAN_FLOWER.get()); + pEvent.accept(FloralisItems.LIGHT_BLUE_FLOWER.get()); + pEvent.accept(FloralisItems.BLUE_FLOWER.get()); + pEvent.accept(FloralisItems.PURPLE_FLOWER.get()); + pEvent.accept(FloralisItems.MAGENTA_FLOWER.get()); + pEvent.accept(FloralisItems.PINK_FLOWER.get()); + + pEvent.accept(FloralisItems.WHITE_CACTUS.get()); + pEvent.accept(FloralisItems.LIGHT_GRAY_CACTUS.get()); + pEvent.accept(FloralisItems.GRAY_CACTUS.get()); + pEvent.accept(FloralisItems.BLACK_CACTUS.get()); + pEvent.accept(FloralisItems.BROWN_CACTUS.get()); + pEvent.accept(FloralisItems.RED_CACTUS.get()); + pEvent.accept(FloralisItems.ORANGE_CACTUS.get()); + pEvent.accept(FloralisItems.YELLOW_CACTUS.get()); + pEvent.accept(FloralisItems.LIME_CACTUS.get()); + pEvent.accept(FloralisItems.GREEN_CACTUS.get()); + pEvent.accept(FloralisItems.CYAN_CACTUS.get()); + pEvent.accept(FloralisItems.LIGHT_BLUE_CACTUS.get()); + pEvent.accept(FloralisItems.BLUE_CACTUS.get()); + pEvent.accept(FloralisItems.PURPLE_CACTUS.get()); + pEvent.accept(FloralisItems.MAGENTA_CACTUS.get()); + pEvent.accept(FloralisItems.PINK_CACTUS.get()); + + pEvent.accept(FloralisItems.WHITE_FLOWER_SEEDS.get()); + pEvent.accept(FloralisItems.LIGHT_GRAY_FLOWER_SEEDS.get()); + pEvent.accept(FloralisItems.GRAY_FLOWER_SEEDS.get()); + pEvent.accept(FloralisItems.BLACK_FLOWER_SEEDS.get()); + pEvent.accept(FloralisItems.BROWN_FLOWER_SEEDS.get()); + pEvent.accept(FloralisItems.RED_FLOWER_SEEDS.get()); + pEvent.accept(FloralisItems.ORANGE_FLOWER_SEEDS.get()); + pEvent.accept(FloralisItems.YELLOW_FLOWER_SEEDS.get()); + pEvent.accept(FloralisItems.LIME_FLOWER_SEEDS.get()); + pEvent.accept(FloralisItems.GREEN_FLOWER_SEEDS.get()); + pEvent.accept(FloralisItems.CYAN_FLOWER_SEEDS.get()); + pEvent.accept(FloralisItems.LIGHT_BLUE_FLOWER_SEEDS.get()); + pEvent.accept(FloralisItems.BLUE_FLOWER_SEEDS.get()); + pEvent.accept(FloralisItems.PURPLE_FLOWER_SEEDS.get()); + pEvent.accept(FloralisItems.MAGENTA_FLOWER_SEEDS.get()); + pEvent.accept(FloralisItems.PINK_FLOWER_SEEDS.get()); + + pEvent.accept(FloralisItems.WHITE_CACTUS_SEEDS.get()); + pEvent.accept(FloralisItems.LIGHT_GRAY_CACTUS_SEEDS.get()); + pEvent.accept(FloralisItems.GRAY_CACTUS_SEEDS.get()); + pEvent.accept(FloralisItems.BLACK_CACTUS_SEEDS.get()); + pEvent.accept(FloralisItems.BROWN_CACTUS_SEEDS.get()); + pEvent.accept(FloralisItems.RED_CACTUS_SEEDS.get()); + pEvent.accept(FloralisItems.ORANGE_CACTUS_SEEDS.get()); + pEvent.accept(FloralisItems.YELLOW_CACTUS_SEEDS.get()); + pEvent.accept(FloralisItems.LIME_CACTUS_SEEDS.get()); + pEvent.accept(FloralisItems.GREEN_CACTUS_SEEDS.get()); + pEvent.accept(FloralisItems.CYAN_CACTUS_SEEDS.get()); + pEvent.accept(FloralisItems.LIGHT_BLUE_CACTUS_SEEDS.get()); + pEvent.accept(FloralisItems.BLUE_CACTUS_SEEDS.get()); + pEvent.accept(FloralisItems.PURPLE_CACTUS_SEEDS.get()); + pEvent.accept(FloralisItems.MAGENTA_CACTUS_SEEDS.get()); + pEvent.accept(FloralisItems.PINK_CACTUS_SEEDS.get()); + + pEvent.accept(FloralisItems.WHITE_PETALS.get()); + pEvent.accept(FloralisItems.LIGHT_GRAY_PETALS.get()); + pEvent.accept(FloralisItems.GRAY_PETALS.get()); + pEvent.accept(FloralisItems.BLACK_PETALS.get()); + pEvent.accept(FloralisItems.BROWN_PETALS.get()); + pEvent.accept(FloralisItems.RED_PETALS.get()); + pEvent.accept(FloralisItems.ORANGE_PETALS.get()); + pEvent.accept(FloralisItems.YELLOW_PETALS.get()); + pEvent.accept(FloralisItems.LIME_PETALS.get()); + pEvent.accept(FloralisItems.GREEN_PETALS.get()); + pEvent.accept(FloralisItems.CYAN_PETALS.get()); + pEvent.accept(FloralisItems.LIGHT_BLUE_PETALS.get()); + pEvent.accept(FloralisItems.BLUE_PETALS.get()); + pEvent.accept(FloralisItems.PURPLE_PETALS.get()); + pEvent.accept(FloralisItems.MAGENTA_PETALS.get()); + pEvent.accept(FloralisItems.PINK_PETALS.get()); + + pEvent.accept(FloralisItems.PLANT_FIBERS.get()); + } + } + + @SubscribeEvent + public static void onGatherData(GatherDataEvent pEvent) { + var generator = pEvent.getGenerator(); + var existingFileHelper = pEvent.getExistingFileHelper(); + var packOutput = generator.getPackOutput(); + var lookupProvider = pEvent.getLookupProvider(); + + var blockTags = new FloralisBlockTags(packOutput, lookupProvider, FloralisConstants.FLORALIS, existingFileHelper); + var registrySet = new FloralisRegistrySetBuilder(); + + generator.addProvider(pEvent.includeServer(), new FloralisLoot(packOutput, lookupProvider)); + generator.addProvider(pEvent.includeServer(), new FloralisBiomeTags(packOutput, lookupProvider, FloralisConstants.FLORALIS, existingFileHelper)); + generator.addProvider(pEvent.includeServer(), blockTags); + generator.addProvider(pEvent.includeServer(), new FloralisItemTags(packOutput, lookupProvider, blockTags.contentsGetter(), FloralisConstants.FLORALIS, existingFileHelper)); + generator.addProvider(pEvent.includeServer(), new FloralisDataMaps(packOutput, lookupProvider)); + generator.addProvider(pEvent.includeServer(), new FloralisRecipes(packOutput, lookupProvider)); + generator.addProvider(pEvent.includeServer(), new FloralisBuiltinEntries(packOutput, lookupProvider, registrySet, FloralisConstants.FLORALIS)); + } +} diff --git a/src/main/java/com/luxtracon/floralis/proxy/ClientProxy.java b/src/main/java/com/luxtracon/floralis/proxy/ClientProxy.java deleted file mode 100644 index 87f1ed7a..00000000 --- a/src/main/java/com/luxtracon/floralis/proxy/ClientProxy.java +++ /dev/null @@ -1,248 +0,0 @@ -package com.luxtracon.floralis.proxy; - -import com.luxtracon.floralis.registry.FloralisBlocks; -import com.luxtracon.floralis.registry.FloralisConstants; -import com.luxtracon.floralis.registry.FloralisCreativeModeTabs; -import com.luxtracon.floralis.registry.FloralisItems; - -import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.BiomeColors; -import net.minecraft.world.level.GrassColor; -import net.minecraft.world.level.block.Block; - -import net.neoforged.api.distmarker.Dist; -import net.neoforged.bus.api.SubscribeEvent; -import net.neoforged.fml.common.EventBusSubscriber; -import net.neoforged.fml.event.lifecycle.FMLLoadCompleteEvent; -import net.neoforged.neoforge.event.BuildCreativeModeTabContentsEvent; - -import javax.annotation.ParametersAreNonnullByDefault; - -@SuppressWarnings("deprecation, unused") -@ParametersAreNonnullByDefault - -@EventBusSubscriber(bus = EventBusSubscriber.Bus.MOD, modid = FloralisConstants.FLORALIS, value = Dist.CLIENT) -public class ClientProxy { - public ClientProxy() { - - } - - public static void onCreativeModeTabRegister(BuildCreativeModeTabContentsEvent pEvent) { - if (pEvent.getTab().equals(FloralisCreativeModeTabs.FLORALIS.get())) { - pEvent.accept(FloralisItems.WHITE_DYE_BLOCK.get()); - pEvent.accept(FloralisItems.LIGHT_GRAY_DYE_BLOCK.get()); - pEvent.accept(FloralisItems.GRAY_DYE_BLOCK.get()); - pEvent.accept(FloralisItems.BLACK_DYE_BLOCK.get()); - pEvent.accept(FloralisItems.BROWN_DYE_BLOCK.get()); - pEvent.accept(FloralisItems.RED_DYE_BLOCK.get()); - pEvent.accept(FloralisItems.ORANGE_DYE_BLOCK.get()); - pEvent.accept(FloralisItems.YELLOW_DYE_BLOCK.get()); - pEvent.accept(FloralisItems.LIME_DYE_BLOCK.get()); - pEvent.accept(FloralisItems.GREEN_DYE_BLOCK.get()); - pEvent.accept(FloralisItems.CYAN_DYE_BLOCK.get()); - pEvent.accept(FloralisItems.LIGHT_BLUE_DYE_BLOCK.get()); - pEvent.accept(FloralisItems.BLUE_DYE_BLOCK.get()); - pEvent.accept(FloralisItems.PURPLE_DYE_BLOCK.get()); - pEvent.accept(FloralisItems.MAGENTA_DYE_BLOCK.get()); - pEvent.accept(FloralisItems.PINK_DYE_BLOCK.get()); - - pEvent.accept(FloralisItems.PLANT_FIBERS_BLOCK.get()); - - pEvent.accept(FloralisItems.WHITE_FLOWER.get()); - pEvent.accept(FloralisItems.LIGHT_GRAY_FLOWER.get()); - pEvent.accept(FloralisItems.GRAY_FLOWER.get()); - pEvent.accept(FloralisItems.BLACK_FLOWER.get()); - pEvent.accept(FloralisItems.BROWN_FLOWER.get()); - pEvent.accept(FloralisItems.RED_FLOWER.get()); - pEvent.accept(FloralisItems.ORANGE_FLOWER.get()); - pEvent.accept(FloralisItems.YELLOW_FLOWER.get()); - pEvent.accept(FloralisItems.LIME_FLOWER.get()); - pEvent.accept(FloralisItems.GREEN_FLOWER.get()); - pEvent.accept(FloralisItems.CYAN_FLOWER.get()); - pEvent.accept(FloralisItems.LIGHT_BLUE_FLOWER.get()); - pEvent.accept(FloralisItems.BLUE_FLOWER.get()); - pEvent.accept(FloralisItems.PURPLE_FLOWER.get()); - pEvent.accept(FloralisItems.MAGENTA_FLOWER.get()); - pEvent.accept(FloralisItems.PINK_FLOWER.get()); - - pEvent.accept(FloralisItems.WHITE_CACTUS.get()); - pEvent.accept(FloralisItems.LIGHT_GRAY_CACTUS.get()); - pEvent.accept(FloralisItems.GRAY_CACTUS.get()); - pEvent.accept(FloralisItems.BLACK_CACTUS.get()); - pEvent.accept(FloralisItems.BROWN_CACTUS.get()); - pEvent.accept(FloralisItems.RED_CACTUS.get()); - pEvent.accept(FloralisItems.ORANGE_CACTUS.get()); - pEvent.accept(FloralisItems.YELLOW_CACTUS.get()); - pEvent.accept(FloralisItems.LIME_CACTUS.get()); - pEvent.accept(FloralisItems.GREEN_CACTUS.get()); - pEvent.accept(FloralisItems.CYAN_CACTUS.get()); - pEvent.accept(FloralisItems.LIGHT_BLUE_CACTUS.get()); - pEvent.accept(FloralisItems.BLUE_CACTUS.get()); - pEvent.accept(FloralisItems.PURPLE_CACTUS.get()); - pEvent.accept(FloralisItems.MAGENTA_CACTUS.get()); - pEvent.accept(FloralisItems.PINK_CACTUS.get()); - - pEvent.accept(FloralisItems.WHITE_FLOWER_SEEDS.get()); - pEvent.accept(FloralisItems.LIGHT_GRAY_FLOWER_SEEDS.get()); - pEvent.accept(FloralisItems.GRAY_FLOWER_SEEDS.get()); - pEvent.accept(FloralisItems.BLACK_FLOWER_SEEDS.get()); - pEvent.accept(FloralisItems.BROWN_FLOWER_SEEDS.get()); - pEvent.accept(FloralisItems.RED_FLOWER_SEEDS.get()); - pEvent.accept(FloralisItems.ORANGE_FLOWER_SEEDS.get()); - pEvent.accept(FloralisItems.YELLOW_FLOWER_SEEDS.get()); - pEvent.accept(FloralisItems.LIME_FLOWER_SEEDS.get()); - pEvent.accept(FloralisItems.GREEN_FLOWER_SEEDS.get()); - pEvent.accept(FloralisItems.CYAN_FLOWER_SEEDS.get()); - pEvent.accept(FloralisItems.LIGHT_BLUE_FLOWER_SEEDS.get()); - pEvent.accept(FloralisItems.BLUE_FLOWER_SEEDS.get()); - pEvent.accept(FloralisItems.PURPLE_FLOWER_SEEDS.get()); - pEvent.accept(FloralisItems.MAGENTA_FLOWER_SEEDS.get()); - pEvent.accept(FloralisItems.PINK_FLOWER_SEEDS.get()); - - pEvent.accept(FloralisItems.WHITE_CACTUS_SEEDS.get()); - pEvent.accept(FloralisItems.LIGHT_GRAY_CACTUS_SEEDS.get()); - pEvent.accept(FloralisItems.GRAY_CACTUS_SEEDS.get()); - pEvent.accept(FloralisItems.BLACK_CACTUS_SEEDS.get()); - pEvent.accept(FloralisItems.BROWN_CACTUS_SEEDS.get()); - pEvent.accept(FloralisItems.RED_CACTUS_SEEDS.get()); - pEvent.accept(FloralisItems.ORANGE_CACTUS_SEEDS.get()); - pEvent.accept(FloralisItems.YELLOW_CACTUS_SEEDS.get()); - pEvent.accept(FloralisItems.LIME_CACTUS_SEEDS.get()); - pEvent.accept(FloralisItems.GREEN_CACTUS_SEEDS.get()); - pEvent.accept(FloralisItems.CYAN_CACTUS_SEEDS.get()); - pEvent.accept(FloralisItems.LIGHT_BLUE_CACTUS_SEEDS.get()); - pEvent.accept(FloralisItems.BLUE_CACTUS_SEEDS.get()); - pEvent.accept(FloralisItems.PURPLE_CACTUS_SEEDS.get()); - pEvent.accept(FloralisItems.MAGENTA_CACTUS_SEEDS.get()); - pEvent.accept(FloralisItems.PINK_CACTUS_SEEDS.get()); - - pEvent.accept(FloralisItems.WHITE_PETALS.get()); - pEvent.accept(FloralisItems.LIGHT_GRAY_PETALS.get()); - pEvent.accept(FloralisItems.GRAY_PETALS.get()); - pEvent.accept(FloralisItems.BLACK_PETALS.get()); - pEvent.accept(FloralisItems.BROWN_PETALS.get()); - pEvent.accept(FloralisItems.RED_PETALS.get()); - pEvent.accept(FloralisItems.ORANGE_PETALS.get()); - pEvent.accept(FloralisItems.YELLOW_PETALS.get()); - pEvent.accept(FloralisItems.LIME_PETALS.get()); - pEvent.accept(FloralisItems.GREEN_PETALS.get()); - pEvent.accept(FloralisItems.CYAN_PETALS.get()); - pEvent.accept(FloralisItems.LIGHT_BLUE_PETALS.get()); - pEvent.accept(FloralisItems.BLUE_PETALS.get()); - pEvent.accept(FloralisItems.PURPLE_PETALS.get()); - pEvent.accept(FloralisItems.MAGENTA_PETALS.get()); - pEvent.accept(FloralisItems.PINK_PETALS.get()); - - pEvent.accept(FloralisItems.PLANT_FIBERS.get()); - } - } - - @SubscribeEvent - public static void onFMLLoadComplete(FMLLoadCompleteEvent pEvent) { - ClientProxy.blockColor(FloralisBlocks.WHITE_FLOWER.get()); - ClientProxy.blockColor(FloralisBlocks.LIGHT_GRAY_FLOWER.get()); - ClientProxy.blockColor(FloralisBlocks.GRAY_FLOWER.get()); - ClientProxy.blockColor(FloralisBlocks.BLACK_FLOWER.get()); - ClientProxy.blockColor(FloralisBlocks.BROWN_FLOWER.get()); - ClientProxy.blockColor(FloralisBlocks.RED_FLOWER.get()); - ClientProxy.blockColor(FloralisBlocks.ORANGE_FLOWER.get()); - ClientProxy.blockColor(FloralisBlocks.YELLOW_FLOWER.get()); - ClientProxy.blockColor(FloralisBlocks.LIME_FLOWER.get()); - ClientProxy.blockColor(FloralisBlocks.GREEN_FLOWER.get()); - ClientProxy.blockColor(FloralisBlocks.CYAN_FLOWER.get()); - ClientProxy.blockColor(FloralisBlocks.LIGHT_BLUE_FLOWER.get()); - ClientProxy.blockColor(FloralisBlocks.BLUE_FLOWER.get()); - ClientProxy.blockColor(FloralisBlocks.PURPLE_FLOWER.get()); - ClientProxy.blockColor(FloralisBlocks.MAGENTA_FLOWER.get()); - ClientProxy.blockColor(FloralisBlocks.PINK_FLOWER.get()); - - ClientProxy.blockColor(FloralisBlocks.WHITE_CACTUS.get()); - ClientProxy.blockColor(FloralisBlocks.LIGHT_GRAY_CACTUS.get()); - ClientProxy.blockColor(FloralisBlocks.GRAY_CACTUS.get()); - ClientProxy.blockColor(FloralisBlocks.BLACK_CACTUS.get()); - ClientProxy.blockColor(FloralisBlocks.BROWN_CACTUS.get()); - ClientProxy.blockColor(FloralisBlocks.RED_CACTUS.get()); - ClientProxy.blockColor(FloralisBlocks.ORANGE_CACTUS.get()); - ClientProxy.blockColor(FloralisBlocks.YELLOW_CACTUS.get()); - ClientProxy.blockColor(FloralisBlocks.LIME_CACTUS.get()); - ClientProxy.blockColor(FloralisBlocks.GREEN_CACTUS.get()); - ClientProxy.blockColor(FloralisBlocks.CYAN_CACTUS.get()); - ClientProxy.blockColor(FloralisBlocks.LIGHT_BLUE_CACTUS.get()); - ClientProxy.blockColor(FloralisBlocks.BLUE_CACTUS.get()); - ClientProxy.blockColor(FloralisBlocks.PURPLE_CACTUS.get()); - ClientProxy.blockColor(FloralisBlocks.MAGENTA_CACTUS.get()); - ClientProxy.blockColor(FloralisBlocks.PINK_CACTUS.get()); - - ClientProxy.blockColor(FloralisBlocks.POTTED_WHITE_FLOWER.get()); - ClientProxy.blockColor(FloralisBlocks.POTTED_LIGHT_GRAY_FLOWER.get()); - ClientProxy.blockColor(FloralisBlocks.POTTED_GRAY_FLOWER.get()); - ClientProxy.blockColor(FloralisBlocks.POTTED_BLACK_FLOWER.get()); - ClientProxy.blockColor(FloralisBlocks.POTTED_BROWN_FLOWER.get()); - ClientProxy.blockColor(FloralisBlocks.POTTED_RED_FLOWER.get()); - ClientProxy.blockColor(FloralisBlocks.POTTED_ORANGE_FLOWER.get()); - ClientProxy.blockColor(FloralisBlocks.POTTED_YELLOW_FLOWER.get()); - ClientProxy.blockColor(FloralisBlocks.POTTED_LIME_FLOWER.get()); - ClientProxy.blockColor(FloralisBlocks.POTTED_GREEN_FLOWER.get()); - ClientProxy.blockColor(FloralisBlocks.POTTED_CYAN_FLOWER.get()); - ClientProxy.blockColor(FloralisBlocks.POTTED_LIGHT_BLUE_FLOWER.get()); - ClientProxy.blockColor(FloralisBlocks.POTTED_BLUE_FLOWER.get()); - ClientProxy.blockColor(FloralisBlocks.POTTED_PURPLE_FLOWER.get()); - ClientProxy.blockColor(FloralisBlocks.POTTED_MAGENTA_FLOWER.get()); - ClientProxy.blockColor(FloralisBlocks.POTTED_PINK_FLOWER.get()); - - ClientProxy.blockColor(FloralisBlocks.POTTED_WHITE_CACTUS.get()); - ClientProxy.blockColor(FloralisBlocks.POTTED_LIGHT_GRAY_CACTUS.get()); - ClientProxy.blockColor(FloralisBlocks.POTTED_GRAY_CACTUS.get()); - ClientProxy.blockColor(FloralisBlocks.POTTED_BLACK_CACTUS.get()); - ClientProxy.blockColor(FloralisBlocks.POTTED_BROWN_CACTUS.get()); - ClientProxy.blockColor(FloralisBlocks.POTTED_RED_CACTUS.get()); - ClientProxy.blockColor(FloralisBlocks.POTTED_ORANGE_CACTUS.get()); - ClientProxy.blockColor(FloralisBlocks.POTTED_YELLOW_CACTUS.get()); - ClientProxy.blockColor(FloralisBlocks.POTTED_LIME_CACTUS.get()); - ClientProxy.blockColor(FloralisBlocks.POTTED_GREEN_CACTUS.get()); - ClientProxy.blockColor(FloralisBlocks.POTTED_CYAN_CACTUS.get()); - ClientProxy.blockColor(FloralisBlocks.POTTED_LIGHT_BLUE_CACTUS.get()); - ClientProxy.blockColor(FloralisBlocks.POTTED_BLUE_CACTUS.get()); - ClientProxy.blockColor(FloralisBlocks.POTTED_PURPLE_CACTUS.get()); - ClientProxy.blockColor(FloralisBlocks.POTTED_MAGENTA_CACTUS.get()); - ClientProxy.blockColor(FloralisBlocks.POTTED_PINK_CACTUS.get()); - - ClientProxy.blockColor(FloralisBlocks.WHITE_FLOWER_CROP.get()); - ClientProxy.blockColor(FloralisBlocks.LIGHT_GRAY_FLOWER_CROP.get()); - ClientProxy.blockColor(FloralisBlocks.GRAY_FLOWER_CROP.get()); - ClientProxy.blockColor(FloralisBlocks.BLACK_FLOWER_CROP.get()); - ClientProxy.blockColor(FloralisBlocks.BROWN_FLOWER_CROP.get()); - ClientProxy.blockColor(FloralisBlocks.RED_FLOWER_CROP.get()); - ClientProxy.blockColor(FloralisBlocks.ORANGE_FLOWER_CROP.get()); - ClientProxy.blockColor(FloralisBlocks.YELLOW_FLOWER_CROP.get()); - ClientProxy.blockColor(FloralisBlocks.LIME_FLOWER_CROP.get()); - ClientProxy.blockColor(FloralisBlocks.GREEN_FLOWER_CROP.get()); - ClientProxy.blockColor(FloralisBlocks.CYAN_FLOWER_CROP.get()); - ClientProxy.blockColor(FloralisBlocks.LIGHT_BLUE_FLOWER_CROP.get()); - ClientProxy.blockColor(FloralisBlocks.BLUE_FLOWER_CROP.get()); - ClientProxy.blockColor(FloralisBlocks.PURPLE_FLOWER_CROP.get()); - ClientProxy.blockColor(FloralisBlocks.MAGENTA_FLOWER_CROP.get()); - ClientProxy.blockColor(FloralisBlocks.PINK_FLOWER_CROP.get()); - - ClientProxy.blockColor(FloralisBlocks.WHITE_CACTUS_CROP.get()); - ClientProxy.blockColor(FloralisBlocks.LIGHT_GRAY_CACTUS_CROP.get()); - ClientProxy.blockColor(FloralisBlocks.GRAY_CACTUS_CROP.get()); - ClientProxy.blockColor(FloralisBlocks.BLACK_CACTUS_CROP.get()); - ClientProxy.blockColor(FloralisBlocks.BROWN_CACTUS_CROP.get()); - ClientProxy.blockColor(FloralisBlocks.RED_CACTUS_CROP.get()); - ClientProxy.blockColor(FloralisBlocks.ORANGE_CACTUS_CROP.get()); - ClientProxy.blockColor(FloralisBlocks.YELLOW_CACTUS_CROP.get()); - ClientProxy.blockColor(FloralisBlocks.LIME_CACTUS_CROP.get()); - ClientProxy.blockColor(FloralisBlocks.GREEN_CACTUS_CROP.get()); - ClientProxy.blockColor(FloralisBlocks.CYAN_CACTUS_CROP.get()); - ClientProxy.blockColor(FloralisBlocks.LIGHT_BLUE_CACTUS_CROP.get()); - ClientProxy.blockColor(FloralisBlocks.BLUE_CACTUS_CROP.get()); - ClientProxy.blockColor(FloralisBlocks.PURPLE_CACTUS_CROP.get()); - ClientProxy.blockColor(FloralisBlocks.MAGENTA_CACTUS_CROP.get()); - ClientProxy.blockColor(FloralisBlocks.PINK_CACTUS_CROP.get()); - } - - public static void blockColor(Block pBlock) { - Minecraft.getInstance().getBlockColors().register((pState, pLevel, pPos, pIndex) -> pLevel != null && pPos != null ? BiomeColors.getAverageGrassColor(pLevel, pPos) : GrassColor.get(0.5D, 1.0D), pBlock); - } -} diff --git a/src/main/java/com/luxtracon/floralis/proxy/CommonProxy.java b/src/main/java/com/luxtracon/floralis/proxy/CommonProxy.java deleted file mode 100644 index b897f375..00000000 --- a/src/main/java/com/luxtracon/floralis/proxy/CommonProxy.java +++ /dev/null @@ -1,144 +0,0 @@ -package com.luxtracon.floralis.proxy; - -import com.google.common.collect.ImmutableMap; - -import com.luxtracon.floralis.config.FloralisConfig; -import com.luxtracon.floralis.data.FloralisBuiltinEntries; -import com.luxtracon.floralis.data.FloralisDataMaps; -import com.luxtracon.floralis.data.FloralisRecipes; -import com.luxtracon.floralis.data.FloralisRegistrySetBuilder; -import com.luxtracon.floralis.data.loot.FloralisLoot; -import com.luxtracon.floralis.data.tags.FloralisBiomeTags; -import com.luxtracon.floralis.data.tags.FloralisBlockTags; -import com.luxtracon.floralis.data.tags.FloralisItemTags; -import com.luxtracon.floralis.registry.FloralisConstants; -import com.luxtracon.floralis.registry.FloralisItems; -import com.luxtracon.floralis.registry.FloralisPottables; -import com.luxtracon.floralis.trade.EmeraldsForItemsTrade; -import com.luxtracon.floralis.trade.ItemsForEmeraldsTrade; - -import com.mojang.datafixers.util.Pair; - -import net.minecraft.core.Registry; -import net.minecraft.core.registries.Registries; -import net.minecraft.resources.ResourceKey; -import net.minecraft.resources.ResourceLocation; -import net.minecraft.world.entity.npc.VillagerProfession; -import net.minecraft.world.entity.npc.VillagerType; -import net.minecraft.world.item.Item; -import net.minecraft.world.item.ItemStack; -import net.minecraft.world.level.levelgen.structure.pools.SinglePoolElement; -import net.minecraft.world.level.levelgen.structure.pools.StructurePoolElement; -import net.minecraft.world.level.levelgen.structure.pools.StructureTemplatePool; -import net.minecraft.world.level.levelgen.structure.templatesystem.StructureProcessorList; - -import net.neoforged.bus.api.SubscribeEvent; -import net.neoforged.fml.common.EventBusSubscriber; -import net.neoforged.fml.event.lifecycle.FMLCommonSetupEvent; -import net.neoforged.neoforge.data.event.GatherDataEvent; -import net.neoforged.neoforge.event.server.ServerAboutToStartEvent; -import net.neoforged.neoforge.event.village.VillagerTradesEvent; - -import java.util.ArrayList; -import java.util.List; - -import javax.annotation.ParametersAreNonnullByDefault; - -@SuppressWarnings("unused") -@ParametersAreNonnullByDefault - -@EventBusSubscriber(modid = FloralisConstants.FLORALIS) -public class CommonProxy { - public CommonProxy() { - - } - - public static void onFMLCommonSetup(FMLCommonSetupEvent pEvent) { - pEvent.enqueueWork(FloralisPottables::setup); - } - - public static void onGatherData(GatherDataEvent pEvent) { - var generator = pEvent.getGenerator(); - var existingFileHelper = pEvent.getExistingFileHelper(); - var packOutput = generator.getPackOutput(); - var lookupProvider = pEvent.getLookupProvider(); - - var blockTags = new FloralisBlockTags(packOutput, lookupProvider, FloralisConstants.FLORALIS, existingFileHelper); - var registrySet = new FloralisRegistrySetBuilder(); - - generator.addProvider(pEvent.includeServer(), new FloralisLoot(packOutput, lookupProvider)); - generator.addProvider(pEvent.includeServer(), new FloralisBiomeTags(packOutput, lookupProvider, FloralisConstants.FLORALIS, existingFileHelper)); - generator.addProvider(pEvent.includeServer(), blockTags); - generator.addProvider(pEvent.includeServer(), new FloralisItemTags(packOutput, lookupProvider, blockTags.contentsGetter(), FloralisConstants.FLORALIS, existingFileHelper)); - generator.addProvider(pEvent.includeServer(), new FloralisDataMaps(packOutput, lookupProvider)); - generator.addProvider(pEvent.includeServer(), new FloralisRecipes(packOutput, lookupProvider)); - generator.addProvider(pEvent.includeServer(), new FloralisBuiltinEntries(packOutput, lookupProvider, registrySet, FloralisConstants.FLORALIS)); - } - - @SubscribeEvent - public static void onServerAboutToStart(ServerAboutToStartEvent pEvent) { - var registryAccess = pEvent.getServer().registryAccess(); - var processorList = registryAccess.registry(Registries.PROCESSOR_LIST).orElseThrow(); - var templatePool = registryAccess.registry(Registries.TEMPLATE_POOL).orElseThrow(); - - CommonProxy.addPieceToPool(processorList, templatePool, "floralis:village/desert/houses/farm", new ResourceLocation("minecraft:village/desert/houses"), FloralisConfig.DESERT_FARM.get()); - CommonProxy.addPieceToPool(processorList, templatePool, "floralis:village/plains/houses/farm", new ResourceLocation("minecraft:village/plains/houses"), FloralisConfig.PLAINS_FARM.get()); - CommonProxy.addPieceToPool(processorList, templatePool, "floralis:village/savanna/houses/farm", new ResourceLocation("minecraft:village/savanna/houses"), FloralisConfig.SAVANNA_FARM.get()); - CommonProxy.addPieceToPool(processorList, templatePool, "floralis:village/snowy/houses/farm", new ResourceLocation("minecraft:village/snowy/houses"), FloralisConfig.SNOWY_FARM.get()); - CommonProxy.addPieceToPool(processorList, templatePool, "floralis:village/taiga/houses/farm", new ResourceLocation("minecraft:village/taiga/houses"), FloralisConfig.TAIGA_FARM.get()); - } - - @SubscribeEvent - public static void onVillagerTrades(VillagerTradesEvent pEvent) { - if (pEvent.getType().equals(VillagerProfession.FARMER)) { - pEvent.getTrades().get(1).add(new ItemsForEmeraldsTrade(new ItemStack(FloralisItems.WHITE_PETALS.get()))); - pEvent.getTrades().get(1).add(new ItemsForEmeraldsTrade(new ItemStack(FloralisItems.LIGHT_GRAY_PETALS.get()))); - pEvent.getTrades().get(1).add(new ItemsForEmeraldsTrade(new ItemStack(FloralisItems.GRAY_PETALS.get()))); - pEvent.getTrades().get(1).add(new ItemsForEmeraldsTrade(new ItemStack(FloralisItems.BLACK_PETALS.get()))); - pEvent.getTrades().get(1).add(new ItemsForEmeraldsTrade(new ItemStack(FloralisItems.BROWN_PETALS.get()))); - pEvent.getTrades().get(1).add(new ItemsForEmeraldsTrade(new ItemStack(FloralisItems.RED_PETALS.get()))); - pEvent.getTrades().get(1).add(new ItemsForEmeraldsTrade(new ItemStack(FloralisItems.ORANGE_PETALS.get()))); - pEvent.getTrades().get(1).add(new ItemsForEmeraldsTrade(new ItemStack(FloralisItems.YELLOW_PETALS.get()))); - pEvent.getTrades().get(1).add(new ItemsForEmeraldsTrade(new ItemStack(FloralisItems.LIME_PETALS.get()))); - pEvent.getTrades().get(1).add(new ItemsForEmeraldsTrade(new ItemStack(FloralisItems.GREEN_PETALS.get()))); - pEvent.getTrades().get(1).add(new ItemsForEmeraldsTrade(new ItemStack(FloralisItems.CYAN_PETALS.get()))); - pEvent.getTrades().get(1).add(new ItemsForEmeraldsTrade(new ItemStack(FloralisItems.LIGHT_BLUE_PETALS.get()))); - pEvent.getTrades().get(1).add(new ItemsForEmeraldsTrade(new ItemStack(FloralisItems.BLUE_PETALS.get()))); - pEvent.getTrades().get(1).add(new ItemsForEmeraldsTrade(new ItemStack(FloralisItems.PURPLE_PETALS.get()))); - pEvent.getTrades().get(1).add(new ItemsForEmeraldsTrade(new ItemStack(FloralisItems.MAGENTA_PETALS.get()))); - pEvent.getTrades().get(1).add(new ItemsForEmeraldsTrade(new ItemStack(FloralisItems.PINK_PETALS.get()))); - - pEvent.getTrades().get(1).add(new EmeraldsForItemsTrade(ImmutableMap.builder().put(VillagerType.PLAINS, FloralisItems.WHITE_FLOWER_SEEDS.get()).put(VillagerType.TAIGA, FloralisItems.WHITE_FLOWER_SEEDS.get()).put(VillagerType.SNOW, FloralisItems.WHITE_FLOWER_SEEDS.get()).put(VillagerType.DESERT, FloralisItems.WHITE_CACTUS_SEEDS.get()).put(VillagerType.JUNGLE, FloralisItems.WHITE_FLOWER_SEEDS.get()).put(VillagerType.SAVANNA, FloralisItems.WHITE_FLOWER_SEEDS.get()).put(VillagerType.SWAMP, FloralisItems.WHITE_FLOWER_SEEDS.get()).build())); - pEvent.getTrades().get(1).add(new EmeraldsForItemsTrade(ImmutableMap.builder().put(VillagerType.PLAINS, FloralisItems.LIGHT_GRAY_FLOWER_SEEDS.get()).put(VillagerType.TAIGA, FloralisItems.LIGHT_GRAY_FLOWER_SEEDS.get()).put(VillagerType.SNOW, FloralisItems.LIGHT_GRAY_FLOWER_SEEDS.get()).put(VillagerType.DESERT, FloralisItems.LIGHT_GRAY_CACTUS_SEEDS.get()).put(VillagerType.JUNGLE, FloralisItems.LIGHT_GRAY_FLOWER_SEEDS.get()).put(VillagerType.SAVANNA, FloralisItems.LIGHT_GRAY_FLOWER_SEEDS.get()).put(VillagerType.SWAMP, FloralisItems.LIGHT_GRAY_FLOWER_SEEDS.get()).build())); - pEvent.getTrades().get(1).add(new EmeraldsForItemsTrade(ImmutableMap.builder().put(VillagerType.PLAINS, FloralisItems.GRAY_FLOWER_SEEDS.get()).put(VillagerType.TAIGA, FloralisItems.GRAY_FLOWER_SEEDS.get()).put(VillagerType.SNOW, FloralisItems.GRAY_FLOWER_SEEDS.get()).put(VillagerType.DESERT, FloralisItems.GRAY_CACTUS_SEEDS.get()).put(VillagerType.JUNGLE, FloralisItems.GRAY_FLOWER_SEEDS.get()).put(VillagerType.SAVANNA, FloralisItems.GRAY_FLOWER_SEEDS.get()).put(VillagerType.SWAMP, FloralisItems.GRAY_FLOWER_SEEDS.get()).build())); - pEvent.getTrades().get(1).add(new EmeraldsForItemsTrade(ImmutableMap.builder().put(VillagerType.PLAINS, FloralisItems.BLACK_FLOWER_SEEDS.get()).put(VillagerType.TAIGA, FloralisItems.BLACK_FLOWER_SEEDS.get()).put(VillagerType.SNOW, FloralisItems.BLACK_FLOWER_SEEDS.get()).put(VillagerType.DESERT, FloralisItems.BLACK_CACTUS_SEEDS.get()).put(VillagerType.JUNGLE, FloralisItems.BLACK_FLOWER_SEEDS.get()).put(VillagerType.SAVANNA, FloralisItems.BLACK_FLOWER_SEEDS.get()).put(VillagerType.SWAMP, FloralisItems.BLACK_FLOWER_SEEDS.get()).build())); - pEvent.getTrades().get(1).add(new EmeraldsForItemsTrade(ImmutableMap.builder().put(VillagerType.PLAINS, FloralisItems.BROWN_FLOWER_SEEDS.get()).put(VillagerType.TAIGA, FloralisItems.BROWN_FLOWER_SEEDS.get()).put(VillagerType.SNOW, FloralisItems.BROWN_FLOWER_SEEDS.get()).put(VillagerType.DESERT, FloralisItems.BROWN_CACTUS_SEEDS.get()).put(VillagerType.JUNGLE, FloralisItems.BROWN_FLOWER_SEEDS.get()).put(VillagerType.SAVANNA, FloralisItems.BROWN_FLOWER_SEEDS.get()).put(VillagerType.SWAMP, FloralisItems.BROWN_FLOWER_SEEDS.get()).build())); - pEvent.getTrades().get(1).add(new EmeraldsForItemsTrade(ImmutableMap.builder().put(VillagerType.PLAINS, FloralisItems.RED_FLOWER_SEEDS.get()).put(VillagerType.TAIGA, FloralisItems.RED_FLOWER_SEEDS.get()).put(VillagerType.SNOW, FloralisItems.RED_FLOWER_SEEDS.get()).put(VillagerType.DESERT, FloralisItems.RED_CACTUS_SEEDS.get()).put(VillagerType.JUNGLE, FloralisItems.RED_FLOWER_SEEDS.get()).put(VillagerType.SAVANNA, FloralisItems.RED_FLOWER_SEEDS.get()).put(VillagerType.SWAMP, FloralisItems.RED_FLOWER_SEEDS.get()).build())); - pEvent.getTrades().get(1).add(new EmeraldsForItemsTrade(ImmutableMap.builder().put(VillagerType.PLAINS, FloralisItems.ORANGE_FLOWER_SEEDS.get()).put(VillagerType.TAIGA, FloralisItems.ORANGE_FLOWER_SEEDS.get()).put(VillagerType.SNOW, FloralisItems.ORANGE_FLOWER_SEEDS.get()).put(VillagerType.DESERT, FloralisItems.ORANGE_CACTUS_SEEDS.get()).put(VillagerType.JUNGLE, FloralisItems.ORANGE_FLOWER_SEEDS.get()).put(VillagerType.SAVANNA, FloralisItems.ORANGE_FLOWER_SEEDS.get()).put(VillagerType.SWAMP, FloralisItems.ORANGE_FLOWER_SEEDS.get()).build())); - pEvent.getTrades().get(1).add(new EmeraldsForItemsTrade(ImmutableMap.builder().put(VillagerType.PLAINS, FloralisItems.YELLOW_FLOWER_SEEDS.get()).put(VillagerType.TAIGA, FloralisItems.YELLOW_FLOWER_SEEDS.get()).put(VillagerType.SNOW, FloralisItems.YELLOW_FLOWER_SEEDS.get()).put(VillagerType.DESERT, FloralisItems.YELLOW_CACTUS_SEEDS.get()).put(VillagerType.JUNGLE, FloralisItems.YELLOW_FLOWER_SEEDS.get()).put(VillagerType.SAVANNA, FloralisItems.YELLOW_FLOWER_SEEDS.get()).put(VillagerType.SWAMP, FloralisItems.YELLOW_FLOWER_SEEDS.get()).build())); - pEvent.getTrades().get(1).add(new EmeraldsForItemsTrade(ImmutableMap.builder().put(VillagerType.PLAINS, FloralisItems.LIME_FLOWER_SEEDS.get()).put(VillagerType.TAIGA, FloralisItems.LIME_FLOWER_SEEDS.get()).put(VillagerType.SNOW, FloralisItems.LIME_FLOWER_SEEDS.get()).put(VillagerType.DESERT, FloralisItems.LIME_CACTUS_SEEDS.get()).put(VillagerType.JUNGLE, FloralisItems.LIME_FLOWER_SEEDS.get()).put(VillagerType.SAVANNA, FloralisItems.LIME_FLOWER_SEEDS.get()).put(VillagerType.SWAMP, FloralisItems.LIME_FLOWER_SEEDS.get()).build())); - pEvent.getTrades().get(1).add(new EmeraldsForItemsTrade(ImmutableMap.builder().put(VillagerType.PLAINS, FloralisItems.GREEN_FLOWER_SEEDS.get()).put(VillagerType.TAIGA, FloralisItems.GREEN_FLOWER_SEEDS.get()).put(VillagerType.SNOW, FloralisItems.GREEN_FLOWER_SEEDS.get()).put(VillagerType.DESERT, FloralisItems.GREEN_CACTUS_SEEDS.get()).put(VillagerType.JUNGLE, FloralisItems.GREEN_FLOWER_SEEDS.get()).put(VillagerType.SAVANNA, FloralisItems.GREEN_FLOWER_SEEDS.get()).put(VillagerType.SWAMP, FloralisItems.GREEN_FLOWER_SEEDS.get()).build())); - pEvent.getTrades().get(1).add(new EmeraldsForItemsTrade(ImmutableMap.builder().put(VillagerType.PLAINS, FloralisItems.CYAN_FLOWER_SEEDS.get()).put(VillagerType.TAIGA, FloralisItems.CYAN_FLOWER_SEEDS.get()).put(VillagerType.SNOW, FloralisItems.CYAN_FLOWER_SEEDS.get()).put(VillagerType.DESERT, FloralisItems.CYAN_CACTUS_SEEDS.get()).put(VillagerType.JUNGLE, FloralisItems.CYAN_FLOWER_SEEDS.get()).put(VillagerType.SAVANNA, FloralisItems.CYAN_FLOWER_SEEDS.get()).put(VillagerType.SWAMP, FloralisItems.CYAN_FLOWER_SEEDS.get()).build())); - pEvent.getTrades().get(1).add(new EmeraldsForItemsTrade(ImmutableMap.builder().put(VillagerType.PLAINS, FloralisItems.LIGHT_BLUE_FLOWER_SEEDS.get()).put(VillagerType.TAIGA, FloralisItems.LIGHT_BLUE_FLOWER_SEEDS.get()).put(VillagerType.SNOW, FloralisItems.LIGHT_BLUE_FLOWER_SEEDS.get()).put(VillagerType.DESERT, FloralisItems.LIGHT_BLUE_CACTUS_SEEDS.get()).put(VillagerType.JUNGLE, FloralisItems.LIGHT_BLUE_FLOWER_SEEDS.get()).put(VillagerType.SAVANNA, FloralisItems.LIGHT_BLUE_FLOWER_SEEDS.get()).put(VillagerType.SWAMP, FloralisItems.LIGHT_BLUE_FLOWER_SEEDS.get()).build())); - pEvent.getTrades().get(1).add(new EmeraldsForItemsTrade(ImmutableMap.builder().put(VillagerType.PLAINS, FloralisItems.BLUE_FLOWER_SEEDS.get()).put(VillagerType.TAIGA, FloralisItems.BLUE_FLOWER_SEEDS.get()).put(VillagerType.SNOW, FloralisItems.BLUE_FLOWER_SEEDS.get()).put(VillagerType.DESERT, FloralisItems.BLUE_CACTUS_SEEDS.get()).put(VillagerType.JUNGLE, FloralisItems.BLUE_FLOWER_SEEDS.get()).put(VillagerType.SAVANNA, FloralisItems.BLUE_FLOWER_SEEDS.get()).put(VillagerType.SWAMP, FloralisItems.BLUE_FLOWER_SEEDS.get()).build())); - pEvent.getTrades().get(1).add(new EmeraldsForItemsTrade(ImmutableMap.builder().put(VillagerType.PLAINS, FloralisItems.PURPLE_FLOWER_SEEDS.get()).put(VillagerType.TAIGA, FloralisItems.PURPLE_FLOWER_SEEDS.get()).put(VillagerType.SNOW, FloralisItems.PURPLE_FLOWER_SEEDS.get()).put(VillagerType.DESERT, FloralisItems.PURPLE_CACTUS_SEEDS.get()).put(VillagerType.JUNGLE, FloralisItems.PURPLE_FLOWER_SEEDS.get()).put(VillagerType.SAVANNA, FloralisItems.PURPLE_FLOWER_SEEDS.get()).put(VillagerType.SWAMP, FloralisItems.PURPLE_FLOWER_SEEDS.get()).build())); - pEvent.getTrades().get(1).add(new EmeraldsForItemsTrade(ImmutableMap.builder().put(VillagerType.PLAINS, FloralisItems.MAGENTA_FLOWER_SEEDS.get()).put(VillagerType.TAIGA, FloralisItems.MAGENTA_FLOWER_SEEDS.get()).put(VillagerType.SNOW, FloralisItems.MAGENTA_FLOWER_SEEDS.get()).put(VillagerType.DESERT, FloralisItems.MAGENTA_CACTUS_SEEDS.get()).put(VillagerType.JUNGLE, FloralisItems.MAGENTA_FLOWER_SEEDS.get()).put(VillagerType.SAVANNA, FloralisItems.MAGENTA_FLOWER_SEEDS.get()).put(VillagerType.SWAMP, FloralisItems.MAGENTA_FLOWER_SEEDS.get()).build())); - pEvent.getTrades().get(1).add(new EmeraldsForItemsTrade(ImmutableMap.builder().put(VillagerType.PLAINS, FloralisItems.PINK_FLOWER_SEEDS.get()).put(VillagerType.TAIGA, FloralisItems.PINK_FLOWER_SEEDS.get()).put(VillagerType.SNOW, FloralisItems.PINK_FLOWER_SEEDS.get()).put(VillagerType.DESERT, FloralisItems.PINK_CACTUS_SEEDS.get()).put(VillagerType.JUNGLE, FloralisItems.PINK_FLOWER_SEEDS.get()).put(VillagerType.SAVANNA, FloralisItems.PINK_FLOWER_SEEDS.get()).put(VillagerType.SWAMP, FloralisItems.PINK_FLOWER_SEEDS.get()).build())); - } - } - - public static void addPieceToPool(Registry pStructureProcessorList, Registry pStructureTemplatePool, String pPiece, ResourceLocation pPool, int pWeight) { - var singlePoolElement = SinglePoolElement.legacy(pPiece, pStructureProcessorList.getHolderOrThrow(ResourceKey.create(Registries.PROCESSOR_LIST, new ResourceLocation("minecraft", "empty")))).apply(StructureTemplatePool.Projection.RIGID); - var structureTemplatePool = pStructureTemplatePool.get(pPool); - List> list; - if (structureTemplatePool != null) { - list = new ArrayList<>(structureTemplatePool.rawTemplates); - for (int i = 0; i < pWeight; i++) { - structureTemplatePool.templates.add(singlePoolElement); - } - - list.add(new Pair<>(singlePoolElement, pWeight)); - structureTemplatePool.rawTemplates = list; - } - } -} diff --git a/src/main/java/com/luxtracon/floralis/registry/FloralisPottables.java b/src/main/java/com/luxtracon/floralis/registry/FloralisPottables.java index f20ec6ba..bb931123 100644 --- a/src/main/java/com/luxtracon/floralis/registry/FloralisPottables.java +++ b/src/main/java/com/luxtracon/floralis/registry/FloralisPottables.java @@ -8,6 +8,7 @@ import java.util.function.Supplier; public class FloralisPottables { + public static void setup() { FloralisPottables.set(FloralisBlocks.WHITE_FLOWER.get(), FloralisBlocks.POTTED_WHITE_FLOWER); FloralisPottables.set(FloralisBlocks.LIGHT_GRAY_FLOWER.get(), FloralisBlocks.POTTED_LIGHT_GRAY_FLOWER); diff --git a/src/main/java/com/luxtracon/floralis/trade/EmeraldsForItemsTrade.java b/src/main/java/com/luxtracon/floralis/trade/EmeraldsForItemsTrade.java deleted file mode 100644 index 2dfbe5df..00000000 --- a/src/main/java/com/luxtracon/floralis/trade/EmeraldsForItemsTrade.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.luxtracon.floralis.trade; - -import net.minecraft.util.RandomSource; -import net.minecraft.world.entity.Entity; -import net.minecraft.world.entity.npc.VillagerDataHolder; -import net.minecraft.world.entity.npc.VillagerTrades; -import net.minecraft.world.entity.npc.VillagerType; -import net.minecraft.world.item.Item; -import net.minecraft.world.item.ItemStack; -import net.minecraft.world.item.Items; -import net.minecraft.world.item.trading.ItemCost; -import net.minecraft.world.item.trading.MerchantOffer; - -import java.util.Map; - -import javax.annotation.ParametersAreNonnullByDefault; - -@ParametersAreNonnullByDefault - -public class EmeraldsForItemsTrade implements VillagerTrades.ItemListing { - public Map map; - - public EmeraldsForItemsTrade(Map pMap) { - this.map = pMap; - } - - @Override - public MerchantOffer getOffer(Entity pTrader, RandomSource pRandom) { - return pTrader instanceof VillagerDataHolder ? new MerchantOffer(new ItemCost(this.map.get(((VillagerDataHolder) pTrader).getVillagerData().getType()), 64), new ItemStack(Items.EMERALD, 1), 12, 2, 0.05F) : null; - } -} diff --git a/src/main/java/com/luxtracon/floralis/trade/ItemsForEmeraldsTrade.java b/src/main/java/com/luxtracon/floralis/trade/ItemsForEmeraldsTrade.java deleted file mode 100644 index aa438e35..00000000 --- a/src/main/java/com/luxtracon/floralis/trade/ItemsForEmeraldsTrade.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.luxtracon.floralis.trade; - -import net.minecraft.util.RandomSource; -import net.minecraft.world.entity.Entity; -import net.minecraft.world.entity.npc.VillagerTrades; -import net.minecraft.world.item.ItemStack; -import net.minecraft.world.item.Items; -import net.minecraft.world.item.trading.ItemCost; -import net.minecraft.world.item.trading.MerchantOffer; - -import javax.annotation.ParametersAreNonnullByDefault; - -@ParametersAreNonnullByDefault - -public class ItemsForEmeraldsTrade implements VillagerTrades.ItemListing { - public ItemStack stack; - - public ItemsForEmeraldsTrade(ItemStack pStack) { - this.stack = pStack; - } - - @Override - public MerchantOffer getOffer(Entity pTrader, RandomSource pRandom) { - return new MerchantOffer(new ItemCost(Items.EMERALD, 1), new ItemStack(this.stack.getItem(), 16), 12, 1, 0.05F); - } -} diff --git a/src/main/resources/META-INF/accesstransformer.cfg b/src/main/resources/META-INF/accesstransformer.cfg deleted file mode 100644 index a33da9f4..00000000 --- a/src/main/resources/META-INF/accesstransformer.cfg +++ /dev/null @@ -1,2 +0,0 @@ -public-f net.minecraft.world.level.levelgen.structure.pools.StructureTemplatePool rawTemplates -public net.minecraft.world.level.levelgen.structure.pools.StructureTemplatePool templates diff --git a/src/main/resources/META-INF/neoforge.mods.toml b/src/main/resources/META-INF/neoforge.mods.toml index 3a042e0b..eb7cec3b 100644 --- a/src/main/resources/META-INF/neoforge.mods.toml +++ b/src/main/resources/META-INF/neoforge.mods.toml @@ -38,7 +38,7 @@ displayName="${mod_name}" #mandatory logoFile="logo.png" #optional # A text field displayed in the mod UI -credits="junshengxie, unroman" #optional +credits="Alexander317, junshengxie, unroman" #optional # A text field displayed in the mod UI authors="${mod_authors}" #optional diff --git a/src/main/resources/data/floralis/structures/village/desert/houses/farm.nbt b/src/main/resources/data/floralis/structures/village/desert/houses/farm.nbt deleted file mode 100644 index e399c18f..00000000 Binary files a/src/main/resources/data/floralis/structures/village/desert/houses/farm.nbt and /dev/null differ diff --git a/src/main/resources/data/floralis/structures/village/plains/houses/farm.nbt b/src/main/resources/data/floralis/structures/village/plains/houses/farm.nbt deleted file mode 100644 index e15e90ba..00000000 Binary files a/src/main/resources/data/floralis/structures/village/plains/houses/farm.nbt and /dev/null differ diff --git a/src/main/resources/data/floralis/structures/village/savanna/houses/farm.nbt b/src/main/resources/data/floralis/structures/village/savanna/houses/farm.nbt deleted file mode 100644 index ad05f40f..00000000 Binary files a/src/main/resources/data/floralis/structures/village/savanna/houses/farm.nbt and /dev/null differ diff --git a/src/main/resources/data/floralis/structures/village/snowy/houses/farm.nbt b/src/main/resources/data/floralis/structures/village/snowy/houses/farm.nbt deleted file mode 100644 index 4f828ba0..00000000 Binary files a/src/main/resources/data/floralis/structures/village/snowy/houses/farm.nbt and /dev/null differ diff --git a/src/main/resources/data/floralis/structures/village/taiga/houses/farm.nbt b/src/main/resources/data/floralis/structures/village/taiga/houses/farm.nbt deleted file mode 100644 index 8f72c118..00000000 Binary files a/src/main/resources/data/floralis/structures/village/taiga/houses/farm.nbt and /dev/null differ